8608 files changed, 63328 insertions, 93689 deletions

diff --git a/Manifest b/Manifest
index 31439a4c5e3a..7d3d19c956d2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29453 BLAKE2B 236d5b702a2640a29b87b3282b530f6799810d6a457c387807ec22593456a5e54e8cfd9ec09649e6dccd2a12a2139ce06b555ab8b3be06c40423c4d92c387d8e SHA512 a932d799679561d59ff6cb49b43715233ae7f321f904f0b007d5641123a0a4d1a897b393fab0e6c8a9d5351485b5d656a1545323e9089bb95b41b003cd97819e
-TIMESTAMP 2020-09-23T21:38:31Z
+MANIFEST Manifest.files.gz 29454 BLAKE2B 0d41e1b067919f8600828701c74dfee230791e710eb37119963a1351e557fac15e2032c5bf4260618d58fde2398eebce2461c22e31c29f8012e3681642a01264 SHA512 eb26c1687039c26bffd488dfa9dec4597245236ba0c4d2fe0ab2e2a370d6eedffc479045240d338dcfa191f30d247fee91232d74cdbd35f2b24ce4c0c860417e
+TIMESTAMP 2020-09-30T15:38:37Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl9rwFdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl90pn1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBo1xAAnlJLcMRmAFWePkyniC8lwxS+f0P8Wu9ljFCL5QOTFMvG+J+HZwDnpZB6
-LvQ8ZmvrdefHE7y9J8tUIjJ4MIakKTh2QerAqLsKrbP5cxdIiUkP66+uPEGM+Dhy
-nKx8uSQifpSgkyI5n7rrHqQXvk4F2qrv/lkW4M9Ta+nw0I3Aa0IzFnDc1ODXWC5j
-advpChsemH9I1h7CBECI+U2vl7xE+EXixAmFCxIjj9EWSMxL/xt7iIvK/XfJFSSF
-Wj9HePMiJyCBYJUSjnLzEfhGK9eSIcIt0ibhu9VHAylS0j0qezPaKsIvnvDDG5x/
-VbPYBRBI9SJgaLZWTmBqRz8ehmn0TBSgyyYz9kxHMmbKOeEgyXl3BJCAQEK3bzbx
-ijRrl3XzMpmcDQAl+DEJc/hn1jXJ01+JTu9WCDhrd3hvfEcBtC5UMobeW3ofjMr8
-t/GjBG/2m3XxLWKDC59XOatWRBHPL7sm82yfTyM25Jj72Db+UgDWLX4ov1MrXwx7
-/3x7BOphmvh1yEa5yytNJL2Wk7ozm555EQNpluXhuzGy2H4Zz7U6d3f3wvJsFVsN
-pmeNBmm0t8CCXLmY72CSfaiXa9TZznTf/a+xPaCqigqgy+x4hrxC5iN/KdDMSJ2T
-LTGOhbdCmavCtlv5DTxnOsJech5y6K8PETF2Hk9Xev3+gv0zlIo=
-=hnSt
+klCLBQ//TM+HXE/X6plHErjVo1i/ACCgmOOo9p4SANwha8ulveZnlR5h3U96Vw+M
+gn6J13MtY9cSng6QOYpogVbUwO8fnpEqrcN+R7qAd8ZK/VuwrVU0U9XyJsZqNYOR
+sGzemHfPtU3A9CbNAEnq3WHMXNYC0is1mkYTzFuySFQyKmFYFvUHxRtY2SFiiZUL
+LDWRWvLb2d6vAoO/pJ4WhYZQV5nwknBO6Z47iQNpXkaG5cmMjSCfLHB0w51LvKIg
+SHcIjlsmgyuP8yzfT56JnwFzB7b/gYY+yDS/YPvVH3dUHLQloWZRbMoPGfNesVqT
+kXw8WWx4Gsom+/3/4IfPNzwnnQIxPmGvDdzZFJDUTgBvtz5Sk7ldRGiJMuXetda/
+R6zuvN1Yeub8qNwj4s4yzQCfzjLj8q9YplJS5DYRqQg0nq+kffOlQPu4gr9HHUV+
+3SLt2MiXNKegiZNM1B343NoF4w0RZLchCEb+2hqiqDn0fL9pk9A2IFlGyC8zPhB8
+SU1lU5Y+bUQkcVjXILN+o6SODyhhmjV53BDzOEs9J98rpG2x9kLhY6XzODkG3X0m
+itqoumIqE1w0gkoPz/xvzgAwPi+er7efPYFN5/2Tf3Lan9ineXL0XakR87z2MgZl
+HnsfhYHjzxDLDya2fDLhFpe17KPBoD1i8EgizZRG4TSFM+FHi0A=
+=jRe2
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index abb9a5ea656f..3ab301ae2d08 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 27654857fb59..e8d554fa87dc 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/gamemode/Manifest b/acct-group/gamemode/Manifest
new file mode 100644
index 000000000000..2309f8716b7f
--- /dev/null
+++ b/acct-group/gamemode/Manifest
@@ -0,0 +1,2 @@
+EBUILD gamemode-0.ebuild 221 BLAKE2B fb883727b359ae9eaef0a38f6d64bdd404bfca8036d65b6eb14e84b83b26b329ec517b502c40c62e061046990939d53fb2921e3dccde0cf5a4753eb337408585 SHA512 d696dd8fce6e6cf753d763fd150452b2835ed995d557f2357a311678f8bcdb19e952240ce69762763af94e6a92d9386c5e0e88e068fdf59b8a04f2fef17ac57f
+MISC metadata.xml 367 BLAKE2B 65b766163246840517525658e81e83dd8670a95df6421c866e19503c7f07ba9664ce94f35dd356cc41105f9b559ee1ce72d7c76c935c0bc0a327415b3ff156a7 SHA512 6e50491a88bbc7f02bdd2eeae5cac2c62b45d9868fd7e0747f24a224eea2e0bf5a216e3209a53dcb06fc18625d4d4442fd3706f81a859067df24dcc4e2873717
diff --git a/acct-group/gamemode/gamemode-0.ebuild b/acct-group/gamemode/gamemode-0.ebuild
new file mode 100644
index 000000000000..addb5e4d722e
--- /dev/null
+++ b/acct-group/gamemode/gamemode-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the system-wide games-util/gamemode resource group"
+ACCT_GROUP_ID=385
diff --git a/acct-group/gamemode/metadata.xml b/acct-group/gamemode/metadata.xml
new file mode 100644
index 000000000000..eea561c5517f
--- /dev/null
+++ b/acct-group/gamemode/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>hurikhan77+bgo@gmail.com</email>
+		<name>Kai Krakow</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/tinyproxy/Manifest b/acct-group/tinyproxy/Manifest
new file mode 100644
index 000000000000..ac47065c8f5e
--- /dev/null
+++ b/acct-group/tinyproxy/Manifest
@@ -0,0 +1,2 @@
+EBUILD tinyproxy-0.ebuild 189 BLAKE2B 4a19ebe0433b2cd553b5f842368016d75091c84e0a1f2419a597b8232448f374f9547e25e9a2b8b8a5ade65c05b2108562c74308d9551ab74c0bf717444cc562 SHA512 c1d166c2253f11ad27570cbc2a9ac3cfc32872e5f2b8d82d573c5ea44cbbd673b40fc95b2a5d98b10cadcfd425701541ee27faf0258a6e5fc41395dac040d0c0
+MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/acct-group/tinyproxy/metadata.xml b/acct-group/tinyproxy/metadata.xml
new file mode 100644
index 000000000000..c67d4dcaca5b
--- /dev/null
+++ b/acct-group/tinyproxy/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>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/tinyproxy/tinyproxy-0.ebuild b/acct-group/tinyproxy/tinyproxy-0.ebuild
new file mode 100644
index 000000000000..24a884b47c59
--- /dev/null
+++ b/acct-group/tinyproxy/tinyproxy-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="gid for net-proxy/tinyproxy"
+
+ACCT_GROUP_ID=186
diff --git a/acct-group/ttrssd/Manifest b/acct-group/ttrssd/Manifest
new file mode 100644
index 000000000000..b90db7ce9ab6
--- /dev/null
+++ b/acct-group/ttrssd/Manifest
@@ -0,0 +1,2 @@
+EBUILD ttrssd-0.ebuild 186 BLAKE2B 5724e778f961f3f86223e43d20fb8ccaedeabd42fd9489680753970ec952a92b9dc8ecfdb4ec9069f984a73781e06928fabadb73a8db91366231e752f024e29d SHA512 0dab9558571e6fa1a25a4b33551e68da79a7f982077fc82011f66ae1c8f895d495335fe8e5babacdb8752dc2ebd40823a0393a7d9f4c48c0c13b278cb703a59d
+MISC metadata.xml 247 BLAKE2B a6d015c1baf8e0e54108f65597e6436b8ca094101d024f983cdd729f91d30200b11b4ee0311ab8715eb7254b66e6986c049a0dc4b40f7dac0eb99f6eebf2b939 SHA512 85a929ccb27847519c5f405e28485e82549988b7e7227d491b423b2553471ee18a7200461120c70fb614b6a48b0fdcf39a2ab8b1a5ecd88ed8dc85a7b30088ee
diff --git a/acct-group/ttrssd/metadata.xml b/acct-group/ttrssd/metadata.xml
new file mode 100644
index 000000000000..3b94165dd3d1
--- /dev/null
+++ b/acct-group/ttrssd/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>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/ttrssd/ttrssd-0.ebuild b/acct-group/ttrssd/ttrssd-0.ebuild
new file mode 100644
index 000000000000..1d5fcc70b9ab
--- /dev/null
+++ b/acct-group/ttrssd/ttrssd-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for www-apps/tt-rss"
+ACCT_GROUP_ID=386
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index ebcab8b6b00b..3b0ac32ca347 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/tinyproxy/Manifest b/acct-user/tinyproxy/Manifest
new file mode 100644
index 000000000000..a7d15408d7a6
--- /dev/null
+++ b/acct-user/tinyproxy/Manifest
@@ -0,0 +1,2 @@
+EBUILD tinyproxy-0.ebuild 237 BLAKE2B bb7a90cc5110c82e6d9964d2d4b70729c7fb60f90d744e50fdbbb2f53fc7697b6336bd393e261a9a7cb228a6b54e001584b2f303de994d62337991dbd4bc3083 SHA512 420f426fdf1ecaf90a0fb6a2cf108f15e4555101afb6c63fb3948435ecc3c9385dfda1d7a7d7a3302879fe81819f9dc52ed8767dc11d695a95c4a4dc34e2b0a5
+MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/acct-user/tinyproxy/metadata.xml b/acct-user/tinyproxy/metadata.xml
new file mode 100644
index 000000000000..c67d4dcaca5b
--- /dev/null
+++ b/acct-user/tinyproxy/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>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/tinyproxy/tinyproxy-0.ebuild b/acct-user/tinyproxy/tinyproxy-0.ebuild
new file mode 100644
index 000000000000..fe5783267fe3
--- /dev/null
+++ b/acct-user/tinyproxy/tinyproxy-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="uid for net-proxy/tinyproxy"
+ACCT_USER_ID=186
+ACCT_USER_GROUPS=( tinyproxy )
+
+acct-user_add_deps
diff --git a/acct-user/ttrssd/Manifest b/acct-user/ttrssd/Manifest
new file mode 100644
index 000000000000..1cf34db5fed6
--- /dev/null
+++ b/acct-user/ttrssd/Manifest
@@ -0,0 +1,2 @@
+EBUILD ttrssd-0.ebuild 231 BLAKE2B a051a89c8f058c775ecff1b165fa391a2bd21784031649e272f0aa099ea14b90d087820ac604520c589ef71f399bc8d766c59c53db40fa5e1247d6400d7d8ebc SHA512 ec15ea80ee3bbc6c331cbead869902615ec94ac3e07970a66f6371168bbc6f357412e2e277d31e721be10a47f3182a668f53a3cc52ba5d758fd22a184e4f00db
+MISC metadata.xml 247 BLAKE2B a6d015c1baf8e0e54108f65597e6436b8ca094101d024f983cdd729f91d30200b11b4ee0311ab8715eb7254b66e6986c049a0dc4b40f7dac0eb99f6eebf2b939 SHA512 85a929ccb27847519c5f405e28485e82549988b7e7227d491b423b2553471ee18a7200461120c70fb614b6a48b0fdcf39a2ab8b1a5ecd88ed8dc85a7b30088ee
diff --git a/acct-user/ttrssd/metadata.xml b/acct-user/ttrssd/metadata.xml
new file mode 100644
index 000000000000..3b94165dd3d1
--- /dev/null
+++ b/acct-user/ttrssd/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>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/ttrssd/ttrssd-0.ebuild b/acct-user/ttrssd/ttrssd-0.ebuild
new file mode 100644
index 000000000000..1d4f4efcaaf8
--- /dev/null
+++ b/acct-user/ttrssd/ttrssd-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for www-apps/tt-rss"
+ACCT_USER_ID=386
+ACCT_USER_GROUPS=( ttrssd )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index b0892e8f39c7..76e9484a32c3 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest
index 68f2af1d952c..54fd8db884e8 100644
--- a/app-accessibility/espeak/Manifest
+++ b/app-accessibility/espeak/Manifest
@@ -1,7 +1,4 @@
 AUX espeak-1.48.04-gcc-6-fix.patch 531 BLAKE2B e17d5304b52ab2e805f63d685f05bf5343a9fd1b64876091b64469ec652296a5de2d04e40b639bd1acb455e133330bfbc270e0d3293b4c487ca174e97d2d4837 SHA512 92966a8f3ef3a4cca2b208216ae9ecd65efdb67001b4ed8c0868bc95bc87fec88826f7554a5239c97269dc673cec8ac70f36c9f3fe186f0a5e6eca924e0bb681
-DIST espeak-1.47.11-source.zip 2813649 BLAKE2B 0ebeabcfd8193dd0d37c43974616f5fc4d769bde7b0a730b37456cd1ab580ab84b5bc141804f4c25d7bff6f4b401fe46764e0117cd9c4a55e2216de6965c17b7 SHA512 77c3989fbd0e4aadae0da2d7f1c587854895ae103633704ee5b4042b0618897d01edffa80b1f13e6cbf356f2f31beaf4fdb7e90e4ab641d5286d559aaefe932b
 DIST espeak-1.48.04-source.zip 3019245 BLAKE2B a29da5eab832fa76b180049765f7fa671ebf47c0a68ee2cdfb0f4466846d97b2bf7b8f07dba747e236a27c9b077000bfd471e35b9744ffac7c9014679f5c04fd SHA512 f0759e6ace2604c8cbb19e8c3fd4b106edf4dcece247a6677f6b734af7746c35a367126edfbe585396c98f6c54f07e25d64bfab35e258e64f09bd2c0833247fa
-EBUILD espeak-1.47.11-r1.ebuild 2168 BLAKE2B 2135fbf742dc9c1222a01dd3c571387d17b4feb8cd8230e54a76492440e6d25672363887caa55b0ff672479052ac421aeb94aefe085a8cd95bfba9f73651f30b SHA512 b2cd30ce382ec869c04a310d7de495feed225e2e8ba6a54eba7a61515f26633bd96cbe096c03c4153c5678fa695100ed03b613ad62a5810a0c18879c09e50449
 EBUILD espeak-1.48.04-r1.ebuild 2231 BLAKE2B 5d52c5d706fc4b94e109c1a230300c38987f7e0c93de96995e60f84e0de2727372fa06bdf850f951f78fc8d247b10c366aefd5795b7c034c468b552a54d9a7be SHA512 0a88d6efe82d6b340a053f2871cbf60e36f579b6bfde6c82e63f765a14593174e5b8e3692f027b64f710d6d55bd49d6cd503779a606a0713559092c5f19e5e0b
-EBUILD espeak-1.48.04.ebuild 2184 BLAKE2B 6b64fb9c609d35c708e6caac07671efa7faa0ee6ef20857283991898b76b8752ec1325c3011468d90c1a46574b33d3cd5f6e630617cf2e2f50abdd344d7c0b53 SHA512 25f0d32cc339ffe486127cc65e455cb5c5d757f3bd919c1a070af17645b09982fe70b5ab6932433701e040096f3adcc65d3ed93c65dcb80ba5c8e52b5d437659
 MISC metadata.xml 425 BLAKE2B a6169a58eac6bcb96da0494648d79f9d5de93430a267d7530f98204562da315deee7ac12f33b0b31e00bd25d190d63a89d00496f6f571ff9cbeb20bb9ee1e9bc SHA512 b3022c321c69fc77c743a0ef402af1801d426e3b72e84754100a4197a5a82df99bfe85b05411d0510e93a262b91d10d63189ff878af91383583e718b8e468f77
diff --git a/app-accessibility/espeak/espeak-1.47.11-r1.ebuild b/app-accessibility/espeak/espeak-1.47.11-r1.ebuild
deleted file mode 100644
index 1682a370839d..000000000000
--- a/app-accessibility/espeak/espeak-1.47.11-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-MY_P="${P}-source"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-DESCRIPTION="Speech synthesizer for English and other languages"
-HOMEPAGE="http://espeak.sourceforge.net/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="portaudio pulseaudio"
-
-COMMON_DEPEND=" portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip"
-
-RDEPEND="${COMMON_DEPEND}
-	media-sound/sox"
-
-S=${WORKDIR}/${MY_P}/src
-
-get_audio() {
-	if use portaudio && use pulseaudio; then
-		echo runtime
-	elif use portaudio; then
-		echo portaudio
-	elif use pulseaudio; then
-		echo pulseaudio
-	else
-		echo none
-	fi
-}
-
-src_prepare() {
-	# gentoo uses portaudio 19.
-	mv -f portaudio19.h portaudio.h
-}
-
-src_compile() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		AR="$(tc-getAR)" \
-		AUDIO="$(get_audio)" \
-		all
-
-	einfo "Fixing byte order of phoneme data files"
-	pushd ../platforms/big_endian > /dev/null
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}"
-	./espeak-phoneme-data \
-		../../espeak-data \
-		. \
-		../../espeak-data/phondata-manifest
-	cp -f phondata phonindex phontab "../../espeak-data"
-}
-
-src_install() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		DESTDIR="${D}" \
-		AUDIO="$(get_audio)" \
-		install
-
-	cd ..
-	insinto /usr/share/espeak-data
-	doins -r dictsource
-	dodoc ChangeLog.txt ReadMe
-	dohtml -r docs/*
-}
-
-pkg_preinst() {
-	local voicedir="${ROOT}/usr/share/${PN}-data/voices/en"
-	if [ -d "${voicedir}" ]; then
-		rm -rf "${voicedir}"
-	fi
-}
-
-pkg_postinst() {
-	if ! use portaudio && ! use pulseaudio; then
-		ewarn "Since portaudio and pulseaudio are not in your use flags,"
-		ewarn "espeak will only be able to create wav files."
-		ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
-		ewarn "with either portaudio or pulseaudio USE flag enabled."
-	fi
-}
diff --git a/app-accessibility/espeak/espeak-1.48.04.ebuild b/app-accessibility/espeak/espeak-1.48.04.ebuild
deleted file mode 100644
index 0ab3acc0376a..000000000000
--- a/app-accessibility/espeak/espeak-1.48.04.ebuild
+++ /dev/null
@@ -1,97 +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
-
-MY_P="${P}-source"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-DESCRIPTION="Speech synthesizer for English and other languages"
-HOMEPAGE="http://espeak.sourceforge.net/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="portaudio pulseaudio"
-
-COMMON_DEPEND=" portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip"
-
-RDEPEND="${COMMON_DEPEND}
-	media-sound/sox"
-
-S=${WORKDIR}/${MY_P}/src
-
-get_audio() {
-	if use portaudio && use pulseaudio; then
-		echo runtime
-	elif use portaudio; then
-		echo portaudio
-	elif use pulseaudio; then
-		echo pulseaudio
-	else
-		echo none
-	fi
-}
-
-src_prepare() {
-	# gentoo uses portaudio 19.
-	mv -f portaudio19.h portaudio.h
-}
-
-src_compile() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		AR="$(tc-getAR)" \
-		AUDIO="$(get_audio)" \
-		all
-
-	einfo "Fixing byte order of phoneme data files"
-	pushd ../platforms/big_endian > /dev/null
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}"
-	./espeak-phoneme-data \
-		../../espeak-data \
-		. \
-		../../espeak-data/phondata-manifest
-	cp -f phondata phonindex phontab "../../espeak-data"
-}
-
-src_install() {
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="\$(PREFIX)/$(get_libdir)" \
-		DESTDIR="${D}" \
-		AUDIO="$(get_audio)" \
-		install
-
-	cd ..
-	insinto /usr/share/espeak-data
-	doins -r dictsource
-	dodoc ChangeLog.txt ReadMe
-	dohtml -r docs/*
-}
-
-pkg_preinst() {
-	local voicedir="${ROOT}/usr/share/${PN}-data/voices/en"
-	if [ -d "${voicedir}" ]; then
-		rm -rf "${voicedir}"
-	fi
-}
-
-pkg_postinst() {
-	if ! use portaudio && ! use pulseaudio; then
-		ewarn "Since portaudio and pulseaudio are not in your use flags,"
-		ewarn "espeak will only be able to create wav files."
-		ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}"
-		ewarn "with either portaudio or pulseaudio USE flag enabled."
-	fi
-}
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index e989ac7810de..2dc0f2a57670 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -5,5 +5,5 @@ DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338
 DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96
 DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7
 EBUILD speech-tools-2.1-r4.ebuild 3050 BLAKE2B 55f937d6a041b5008b7e182502fd9fbd325497219207c2ed90221629f848aaaa500e3310e190d9123c976d33bb0fe111ba6600de43b7cd2cb6905b80aec893ce SHA512 9ff9c6888c37d184eb3ce3bfab898579145e50d45e6624a1560ecfa0ecc479e24a8ec430e664cdcc62382b90843ae918059c4ec28526cc1286a477cc86a1466e
-EBUILD speech-tools-2.5.0.ebuild 3711 BLAKE2B f3a9e139161f7c35e6159b4ba751e11958d269f18336bcb0576f3cc989ac54054e252d9be4b7461adf35f433ee314a7b2648a0f467856351969016d21b7b3d54 SHA512 1aed28cb7292d4a2e52bacb4ece1667ae9bebc123bf7c9f14b1bfe588a04fe3b139dd06fe2d630b6daa2cf2d334c70d6e25031332d187b9093a8d8d2dee3f575
+EBUILD speech-tools-2.5.0.ebuild 3757 BLAKE2B bee264c810d542b78ef9d780976f3aa1100b8ae1de6607db6081b78e7b2bbb8abf4db69c0cc1a988d6d23ae89cf1df63aed2aa01ae879c7d61ab1a5ec54fb447 SHA512 7bdca463250497882905e469c1d7cef96a84501482957ddf5f763b3d040da824f44d6b02c623f9cb387788888706fe9b0e58e7fa1a3a7301454419dd21350f21
 MISC metadata.xml 482 BLAKE2B 2638ba066698967011156e0333f367bed8b4a6ffcf765afe64d976724264db09fa2dfb8c6a10f35e3bc298d0b1e9604f8081a74d130a7afbf4ddd019dfffab8b SHA512 1752986ddb186ab10d069dce7ee81c7d0077673a06682e15f4e66a5a87cb29ba4e126a2a627f5f43e388a1d180e243d5362cceae943b1f90b35f54c19de1d2ee
diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
index 184920c28003..8a41ef402844 100644
--- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild
@@ -79,20 +79,24 @@ src_prepare() {
 
 src_configure() {
 	local CONFIG=config/config.in
+
 	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die
+
 	if use nas; then
 		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \
 			${CONFIG} || die
 	fi
+
 	if ! use X; then
 		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die
 	fi
+
 	econf
 }
 
 src_compile() {
 	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+		AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/app-accessibility/speechd-el/Manifest b/app-accessibility/speechd-el/Manifest
index cde1a5460e4a..4ae042ce3f75 100644
--- a/app-accessibility/speechd-el/Manifest
+++ b/app-accessibility/speechd-el/Manifest
@@ -1,5 +1,3 @@
-DIST speechd-el-2.5.tar.gz 183278 BLAKE2B 7ed220a742642d1d22a25ad247e7184183099e93cee37dc0309346d7ad41bd7d2a54e15bae49366af8b31925bfdac43173042ddb4a0851970ac0eaee07461977 SHA512 b4e5d00d3a86be9c42172ab48c5b0c0f5f25817cb542302f04e29f594422247e4b008428dfaaa1bb2e208a71f126b9c86d25186974606bf5764212a0d6a1a09f
 DIST speechd-el-2.8.tar.gz 474614 BLAKE2B 36ac862c2f14b3f9b5be25bf666c466093f8e5bf3d456058d73a4eef0cc766d9b36ce990d8a3ee8161edb4190637a199853ac77eaedc28afd101ebd95842c47f SHA512 1a34e433d5ae61c83dfb7d3a9f26e25210613355f3a71e7601f15865cd9693db81dd9f559aef41bd3142d25702db88006bb9fd2053b597799f1b68c48911a3d2
-EBUILD speechd-el-2.5.ebuild 952 BLAKE2B a76fabbf502fecd527e3e6039dbd93b4e588201f36098c699a9595f8e133ab2de3a76d6e6e4798f767c0f9a7bd902d84a8bff98ade642815a63785023529f733 SHA512 8e093afa0ceb7bbd429cf10ef149ce3725f05e03e6c3552f8f10d0bd5f303bbb2470920c9b4be5d7934a29b5849a812d03596f08fa2b1d28d56a9372cdd98e63
-EBUILD speechd-el-2.8.ebuild 998 BLAKE2B 67990080958dfaafdaf0fc2111fe3fbec42e761fa2d08b5ba7f8e66160bac6cdaaa9970d5ac93499f676a063abce74f49899855a54d0c5a8c05571c933f5a238 SHA512 e56f218ac4ce05348915550a0b04c637918c4b5f469f57b383968d6796618dbf5ca2e629a7886a401714340f9bce4e253180093be95611464720946d332b4b16
-MISC metadata.xml 520 BLAKE2B e22bed4d2f247ed68b685beb59b81ac8fedf50f4d45399400f8d41822120c2537ea53eb55004d16932039fa17b6dce7beb9fd74afb6af6a6cc38187cf25d46a8 SHA512 a3eac680b1c15b152cb6de69f0b4e421b83019eafb49ce781caf9388446f131dea00c0903fd17066d7deb85fa3c789ed4d593d3fb5a09362a673cb0a93c7e6a3
+EBUILD speechd-el-2.8.ebuild 997 BLAKE2B 9b71cd85168ca1cea2b5fb1aff7348e5a72114c21c056ff3a9e290f950b7dc4158906d6a51112b2d70cafa0e94a9a5a20e2510fc25afb697eda1de9a14deba75 SHA512 8afe0e3582dce9bbbcd3506cc89eb95e664da1f0b939762d6b1f9008989cca6eadda5a8d33f1ce2e5904e3d7f1c13c22a8ff4d222dbc628b467dd7cb493fa86d
+MISC metadata.xml 463 BLAKE2B a97c4ff69a8a6db27cee2d6f5af14521e021dadb47c3eee89a71781c8c241698cfbb5c524375a6c86444c345b6ec4c65103e0e47afab6d57f157b75722aa931f SHA512 7d5ad40f8bda917fac4f3b178621e9403c7c5bc1814224cfc98ba17cf827da349cfed0c2accb80724c316363e2dce925c5f8385507a924a9a1963344592a0726
diff --git a/app-accessibility/speechd-el/metadata.xml b/app-accessibility/speechd-el/metadata.xml
index 298ece6d7d62..fb498827c3b3 100644
--- a/app-accessibility/speechd-el/metadata.xml
+++ b/app-accessibility/speechd-el/metadata.xml
@@ -12,7 +12,4 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<use>
-  <flag name="brltty">brltty support</flag>
-</use>
 </pkgmetadata>
diff --git a/app-accessibility/speechd-el/speechd-el-2.5.ebuild b/app-accessibility/speechd-el/speechd-el-2.5.ebuild
deleted file mode 100644
index f01f6acc0a06..000000000000
--- a/app-accessibility/speechd-el/speechd-el-2.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit elisp
-
-DESCRIPTION="Emacs speech support"
-HOMEPAGE="http://www.freebsoft.org/speechd-el"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="brltty"
-
-DEPEND=""
-RDEPEND=">=app-accessibility/speech-dispatcher-0.7
-	brltty? ( app-accessibility/brltty )"
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	dobin speechd-log-extractor
-	dodoc ANNOUNCE NEWS README speechd-speak.pdf
-	doinfo speechd-el.info
-}
-
-pkg_postinst() {
-	elog "Execute the following commands from within emacs to get it to speak:"
-	elog "  M-x load-library RET speechd-speak RET"
-	elog "  M-x speechd-speak RET"
-	elog
-	elog "or add the following to your ~/.emacs file:"
-	elog
-	elog "(autoload 'speechd-speak \"speechd-speak\" nil t)"
-	elog '(speechd-speak)'
-}
diff --git a/app-accessibility/speechd-el/speechd-el-2.8.ebuild b/app-accessibility/speechd-el/speechd-el-2.8.ebuild
index 1a4b1a7769de..2193ed224eda 100644
--- a/app-accessibility/speechd-el/speechd-el-2.8.ebuild
+++ b/app-accessibility/speechd-el/speechd-el-2.8.ebuild
@@ -6,12 +6,12 @@ EAPI=7
 inherit elisp
 
 DESCRIPTION="Emacs speech support"
-HOMEPAGE="http://www.freebsoft.org/speechd-el"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
+HOMEPAGE="https://www.freebsoft.org/speechd-el"
+SRC_URI="https://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND=">=app-accessibility/speech-dispatcher-0.7"
 
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index befb8afb24c2..0a0c13f70d31 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/aerospike-amc-community/Manifest b/app-admin/aerospike-amc-community/Manifest
index b09f8ae41e3f..1fe1ed42f51f 100644
--- a/app-admin/aerospike-amc-community/Manifest
+++ b/app-admin/aerospike-amc-community/Manifest
@@ -1,8 +1,6 @@
 AUX amc.init 562 BLAKE2B f4aed655b924f345905aa8d3f149799ad299086cca1555e4902e09b376a47e2da8a34445446b00f7508cf4b6ef1d7eb83df93ae6af7c89d9b6e23d027ea5ce45 SHA512 4f50237b23ec1d2257791266ee5ee4c8b963bb0429c7386d50e4ba74ee8a451cd99a8dde277ed92b490a9b40bf33f5f6920e66c777e388bae43cfe402d255094
 AUX amc.init.4 401 BLAKE2B a649832bdbc6dc33de0f87ac0037b1c38212b97abdec16d25d714db6c183fcaed0eb8374d7fecccaf8c8cdeff2c125007b4a924e208721e9d6a8e83befb93dc6 SHA512 00cca21719821efff950d272bfe1c35bbedaf5597507d2b19ecdf6f6c2e7ac7c1c1bdd42474177551e55b9751060ec396add7f4cc94f693537c105f5cbe1bac6
 AUX amc.init2 583 BLAKE2B 0745a48ecfdc060ac9995c0634761d9b16d7d190df9d6a3d8fd7ec415fda486157e22f6f7ff03b2d4a3afe93632a67e7ad07214831007101bd9ebc71557f6003 SHA512 c91d1e66a6bcd286efec425295fc168c7d277f0d4886c9e0cd43f49e58b9c9ae0b0c2c453d278404d4d07935c55baf91bffe272699de095df13028316cc0d317
-DIST aerospike-amc-community-3.6.13.all.x86_64.deb 1436414 BLAKE2B cd823dd1c546fe69948ef3f77fa8bf0a68a8d95ed3ee778272b84c39b1b1bc4e5afef803931ce859fd957421f4816358590a3c1e0845fdc524a0f029b52ce828 SHA512 8077f8c51aab39ca701eb1ada633a3a378e02fed39ef2e565fed57fa57cf12da6c69a2b3d93e179110c29043a0a5a114512d30752eab6356e1b819ae490d23bb
 DIST aerospike-amc-community-4.0.19.tar.gz 7868527 BLAKE2B 69835bdf3d7f1a4b23cd63bb7344c50b6bbbdc04fd55b2d6ec5783a429a442fa6cdf985c77cb4ac73f8ac0663ed2524c8d7a853e970cc086335cf810fd9eaecf SHA512 821de8569bf020b9a2b829e71aab5d48d25639620468aa0b3ed28dc24e0d57bc61be60939425c0a69c418602fa2fbf5ef60f1870edb3f04fa40a2a2aca281218
-EBUILD aerospike-amc-community-3.6.13-r2.ebuild 1388 BLAKE2B f971126d5b86b400227213acaa81e4505dcf239175d4cdf385a97f853a14e15fe7c9da007c0442ee4c1c9cbb646e15e7d7f307f9f2273eb45d51f468f0355a41 SHA512 9db72a868567033910b7e2ac823cc39203119d8620e0527fe91bc144ac9ea8a2475e61c3ae9726ea954f9af4ac6b0cb1689883a0162a15259c91dae3b0daffc9
 EBUILD aerospike-amc-community-4.0.19-r1.ebuild 539 BLAKE2B f68e4bdeed829f5340c2ce1dd15773da038a1755e7682aa4cc02236e7654ff956f87582be75bcea950c1aafd9f8b26848039990354ac780a9574425ae93b3a55 SHA512 89c275ed1d9706a4cd9bf068f0ab6d7931f6a7b346248b5ced94163e98434461b2c22226c0c83a75cec4f5f13a0efec63ab3a09c8537d513fe6bc1dcdd4681f4
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r2.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r2.ebuild
deleted file mode 100644
index 7c372174c825..000000000000
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Web UI based monitoring tool for Aerospike Community Edition Server"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}.all.x86_64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-python/eventlet
-	dev-python/flask
-	dev-python/greenlet
-	dev-python/setproctitle
-	www-servers/gunicorn"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	mkdir "${P}"
-	tar -xf data.tar.xz -C "${S}" || die
-	tar -xzf "${S}"/opt/amc.tar.gz -C "${S}"/opt/ || die
-}
-
-src_install() {
-	mv opt/amc/amc/* opt/amc/
-	rm -rf opt/amc/amc
-	rm -f opt/amc/install
-	rm -f opt/amc/bin/uninstall
-	rm -f opt/amc/bin/amc_*.sh
-	rm -f opt/amc/bin/gunicorn
-	rm -rf opt/amc/server/site-packages/
-	rm -rf opt/amc/server/setups/
-
-	insinto /etc/logrotate.d
-	newins opt/amc/config/logrotate amc
-	rm -f opt/amc/config/logrotate
-
-	insinto /etc/cron.daily
-	newins opt/amc/config/logcron amc
-	rm -f opt/amc/config/logcron
-
-	sed -e 's@/tmp/amc.pid@/run/amc.pid@g' -i opt/amc/config/gunicorn_config.py || die
-
-	insinto /etc/amc/config
-	doins -r opt/amc/config/*
-	rm -rf opt/amc/config/
-
-	echo "${PV}" > opt/amc/amc_version
-
-	insinto /opt/amc/
-	doins -r opt/amc/*
-
-	keepdir /var/log/amc
-
-	newinitd "${FILESDIR}"/amc.init2 amc
-}
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index 4a53ac0c40f9..a9b71bc2e076 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1,6 +1,9 @@
 AUX apg-2.3.0b-cracklib.patch 920 BLAKE2B d1b0decd8a35db02ee8132350a04f61ada715e3316113ac0afa98b85602cf62594f392b14710c617426273acaf0d2d01a930b00809ba84d9ba3bf05b3ff9a327 SHA512 11fba45b144b28c613d6c9dc4cd2ed62d18ab306dfe2fb8e347e3d809d80f605096168b770fee70f9205f07f94aa87f8afe183551133431ad387d383a9b093a3
 AUX apg-2.3.0b-crypt_password.patch 844 BLAKE2B c87ccb6002eac2c363a5b35dc033badf3968562956a4f49697c98368293aa98f2420ff56ac742a7308a2373183c3883c5bce30cd1d8cb72f6f788df2891f8275 SHA512 bde5b1bbc4084cd4d2630ea92ed73c970cd217554638d17980c4d56b0da2f55cd7cafbc76b5073bd0415a7698b70df9d357f0c1731353dae46990e9407d7bb94
+AUX apg-2.3.0b_p20150129-cracklib.patch 1485 BLAKE2B e6df97af3cfe408d68a86461733a060a7045d9cafd1a82821c56756b6c69d27aba5ba6b7b189346daf52cd407703e07ccff4a66965953f0a20c1ac19add4a064 SHA512 d7e3b210627ac6df34cb380c9b6bfdfd3eff790750082c7ebc40a837a88c73467f0e5847633a51b32c7634a57821b06c704bace511dfae18bc5d3e473f9e43ad
 AUX apg-glibc-2.4.patch 260 BLAKE2B b30c414ed89f22eb7dc2d0e3b115dbbc0845aba06f2a9dc0dea61fb36d9ccfa231d56959e7f02b3f1fb337654eec5cf2bd60c53ce24e112470c9fc9b9c225680 SHA512 27463b291aee051a4a149664cfd3dea524a34cd88d5cb90c5b4891fe0722aad9993cfd10df555455890ea631d8844d566d23cbb3812f8cb2859e131ea4c42114
 DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
+DIST apg-2.3.0b_p20150129.tar.xz 313372 BLAKE2B f5a1b894a0379294c478020de512af047aec2e7c9d881cb2f4c79df88583707b5ce0e995623915b6bd11b720e60e0f8696e0ddce472441cb1d04f3bf7a818e32 SHA512 7be813368b4b6fe4ae2882d85c40b6cf80ad44b7aa7e46c8cb97926ef89edf4f59e9a4c76a7aa9f725ac6ce1f0df361f8b68ef6dce798e1e0a8d55767c7a16e8
 EBUILD apg-2.3.0b-r7.ebuild 1239 BLAKE2B 2a055b82dfe3a78baa04b03cbce4c9bc73c43373e54f52cb41e3b9f886c5d3e40cd687df0603193426b57cb0012336ff41bff0d9f22be25455fb884b2e4585f1 SHA512 ebc9adc8af01ebd0109ef693ca63c6a374fd458980c602cbb6556b913059708ae10dd2c78b9fcd8ffed2833d0da559ff7a0c88de6953662f287589ecb902f83d
-MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
+EBUILD apg-2.3.0b_p20150129.ebuild 833 BLAKE2B e27c5f98156804de422c5f742ad17b757ee0fec888c3f3ebaaaf29331283a185ac9f9f7c0d0e24c60257295e63369729306ec094cfea619ad8e33425589e22c3 SHA512 d482bab8448b61ba4cb2f0272295cb709dafd509509d49312ee3a4340d56132aef80a5e18a4ba5758eb295adf002b0a46178664ab5e7097b9b31931619cf3874
+MISC metadata.xml 323 BLAKE2B 3b44b94032a0312054a8d1b5e1d77d8104646ca23a5ee93f20e34a93947184353a2c953141a1de172639fff8100eaf8eda38d1a65690ae99dbc3e533464dff6c SHA512 63dcf35a66f95ba538cc976762491f8e248d5679fe854f06f6c98394731c61f28f66f49bab54e5fad3d48a6cb8f611d2afb90f5ddf48a55eb60ca1b26a649926
diff --git a/app-admin/apg/apg-2.3.0b_p20150129.ebuild b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
new file mode 100644
index 000000000000..0d351d723be8
--- /dev/null
+++ b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+BASEVER=$(ver_cut 1-4)
+
+DESCRIPTION="Another Password Generator"
+HOMEPAGE="https://github.com/wilx/apg"
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cracklib"
+
+DEPEND="cracklib? ( sys-libs/cracklib )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-${BASEVER}-crypt_password.patch"
+	"${FILESDIR}/${P}-cracklib.patch"
+)
+
+DOCS=( CHANGES README THANKS TODO doc/APG_TIPS doc/rfc0972.txt doc/rfc1750.txt )
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with cracklib)
+}
+
+src_install() {
+	default
+	doman doc/man/apg*
+}
diff --git a/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch b/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch
new file mode 100644
index 000000000000..b019f565e154
--- /dev/null
+++ b/app-admin/apg/files/apg-2.3.0b_p20150129-cracklib.patch
@@ -0,0 +1,47 @@
+commit 8c3976544af138aa5d8bc21aa5bc80ba91babc92
+Author: Andrew Savchenko <bircoph@gentoo.org>
+Date:   Wed Sep 30 17:12:18 2020 +0300
+
+    add cracklib support to the new build system
+
+diff --git a/Makefile.am b/Makefile.am
+index 42068bf..3871295 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,9 +19,15 @@ common_apg_sources = \
+         convert.c
+ 
+ apg_SOURCES = $(common_apg_sources)
++if HAVE_CRACKLIB
++apg_LDFLAGS = -lcrack
++apg_CPPFLAGS = -DAPG_USE_CRACKLIB -DCRACKLIB_DICTPATH=\"/usr/lib/cracklib_dict\"
++endif
+ 
+ apgd_SOURCES = $(common_apg_sources)
+ apgd_CPPFLAGS = -DCLISERV
++apgd_CPPFLAGS += $(apg_CPPFLAGS)
++apgd_LDFLAGS = $(apg_LDFLAGS)
+ 
+ apgbfm_SOURCES = apgbfm.c bloom.c sha/sha.c errors.c getopt.c convert.c
+ apgbfm_CPPFLAGS = -DAPGBFM
+diff --git a/configure.ac b/configure.ac
+index d8fd056..75483d1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,8 +43,16 @@ AC_SEARCH_LIBS([strerror], [cposix])
+ AC_CHECK_FUNCS([getpass gettimeofday inet_ntoa memset strchr strerror])
+ AC_CHECK_FUNCS([crypt])
+ 
++AC_ARG_WITH([cracklib],
++    AC_HELP_STRING([--with-cracklib], [Use cracklib for strong password checking [default=no]]))
++AS_IF([test "x$with_cracklib" = "xyes"],[
++    AC_SEARCH_LIBS([FascistCheck],[crack],[HAVE_CRACKLIB=1],
++        AC_MSG_ERROR([cracklib requested but not found]))
++])
++
+ LT_PREREQ([2.4.2])
+ LT_INIT([win32-dll disable-static pic-only])
+ 
++AM_CONDITIONAL([HAVE_CRACKLIB],[test "x$HAVE_CRACKLIB" != "x"])
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 585b0dc75dda..039bfee611a0 100644
--- a/app-admin/apg/metadata.xml
+++ b/app-admin/apg/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	</pkgmetadata>
+	<maintainer type="person">
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">wilx/apg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
index f0a11caf0fb2..4dcaf30fcd5b 100644
--- a/app-admin/bastille/Manifest
+++ b/app-admin/bastille/Manifest
@@ -3,6 +3,5 @@ AUX bastille-3.0.9-perl.patch 1049 BLAKE2B 2a82c1883bf795b83a86d34e29fc2b3495123
 AUX bastille-3.0.9-renamewidgets.patch 2015 BLAKE2B 12003ebd9d40296e5285b45b063050787fc71c8d0f1002e07407105eaa2678ed25e2dbee66bd9c057047b323076e19e258a5efd2156c043b3d1fba5a92f8ef70 SHA512 28cf0f8a5bf11c29127f128fee80bd0a169960996b4d97b3666d7cfb2485850ca040670deaaf9d0c728e08747adefeecf02c4647cbd4c0e3673cf327c9b46f92
 DIST Bastille-3.0.9.tar.bz2 319045 BLAKE2B 480288c6e9fc5462e8e6ca84665d5769aab4252813ff478ab0519d382e1f03994da008ac2818b1d4214a09607c7316711665bce154121b3029bace6f2822df09 SHA512 a97ab2c2bb64c655d43ddcfd4000cee8666787e5b5923390e3155b258c3a2cf7d131abd474f9b0dd415eb455b664ab26a875da6636268b2a715ea87dd4dae2f0
 DIST bastille-3.0.9-gentoo-0.2.patch.bz2 14117 BLAKE2B 9c4383eae9e27cc4e110553a21424cd2811172c32609b0d3bcc72ccc3f61ba7cd76bfdbee969de5a89c22d0c1dd91b9ba92ce27ea5ac2b7260e5c0e1ce424be5 SHA512 a4ecfc064d6cf8c12b6f53c81dea841931df270293b03c39266861121f3def28fcbc4127b3bc9374028983e584736fb85361443badaadec7441cfb1570bdea8f
-EBUILD bastille-3.0.9-r1.ebuild 1571 BLAKE2B 1c6d3bf7b0bb37dd60ada30354a097e3cbfc8b80d0f8dccda92a983241cfb759dc97f4c550ee0edfdf674b2249b1ca9629f9808e1b9447693056224d95e6489c SHA512 ff9048baa2a2a47bb7848c298bebe7bca41b249c3ff37ccbd313a0d8930e310de2edd14ecae0abd4043245a0d9564002ae7b8ed4cd4737f6ec51679555297daf
 EBUILD bastille-3.0.9-r2.ebuild 1713 BLAKE2B 751966d54e66ab1d86caf0bcd81eec1ad1642677d69598c8a44ca7b4151888c0975bd2f64307714c62e1b7ec27b7db6e80c89e7e235061205c9510883ac0243b SHA512 7b250fa0d0dd26662c5547d1aac700200baa139e5b439d9401b2613893b95775bdf3131ef9dc91a83748ad0ca51b550bbceaadb3975429b81976089cea154b12
 MISC metadata.xml 335 BLAKE2B c697944d835cd494f8b523f6ff035eb704cece47594480dcdc41c26bb958fb35a7a2c00e7195c0647cf308e7fe963cbcd334aaa49822a53b27bec76d31a34f88 SHA512 d87baaebf80becdabfaf4214b7ea268455eaa806353a53e51a4342ed9a13ea981b4f4c7169ad323fc21fff69e314f3e397981701271db66447c17ad2440892d5
diff --git a/app-admin/bastille/bastille-3.0.9-r1.ebuild b/app-admin/bastille/bastille-3.0.9-r1.ebuild
deleted file mode 100644
index 19860743e3f6..000000000000
--- a/app-admin/bastille/bastille-3.0.9-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit eutils perl-module
-
-PATCHVER=0.2
-MY_PN=${PN/b/B}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_PN}
-DESCRIPTION="Bastille-Linux is a security hardening tool"
-HOMEPAGE="http://bastille-linux.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="X"
-
-RDEPEND="
-	app-admin/logrotate
-	dev-perl/Curses
-	net-firewall/iptables
-	net-firewall/psad
-	virtual/logger
-	X? ( dev-perl/Tk )
-"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
-
-	# make sure the Perl modules go into vendor dir
-	epatch "${FILESDIR}/${P}-perl.patch"
-	perl_set_version
-
-	cd "${S}" || die
-	chmod a+x Install.sh bastille-ipchains bastille-netfilter
-}
-
-src_install() {
-	perl_set_version
-	export VENDOR_LIB
-
-	cd "${S}" || die
-	DESTDIR="${D}" ./Install.sh
-
-	# Example configs
-	cd "${S}" || die
-	insinto /usr/share/Bastille
-	doins *.config
-
-	newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
-
-	# Documentation
-	cd "${S}" || die
-	dodoc *.txt BUGS Change* README*
-	cd "${S}"/docs || die
-	doman *.1m
-}
-
-pkg_postinst() {
-	elog "Please be aware that when using the Server Lax, Server Moderate, or"
-	elog "Server Paranoia configurations, you may need to use InteractiveBastille"
-	elog "to set any advanced network information, such as masquerading and"
-	elog "internal interfaces, if you plan to use them."
-}
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
index e500933cc6a7..23f8e702bd9e 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -1,7 +1,5 @@
 AUX checksec-1.7.2-path.patch 510 BLAKE2B d17d260f41cf0c7e71accfa4b728a9c35511d1d1a90726bbd3a7fbbc401b69e6245f596c62d323013d29142d256eca6d792c6256f4b5d752bf55e64f96e7798a SHA512 5a5af3c35f8e8ca0ef0c44bc84ea3108bdd96c7ee98c3bda31a0f5308fd843c47a0d825fdff39e1995260391a7a747187ef804250fd0da6ccad5f93b3595a706
 DIST checksec-1.11.1.tar.gz 198151 BLAKE2B 2b45834adb045dbf75a0ffab4f03b2640d068a48df20c628223bcf71c94300cf32ccbce8f47c6dd02b6dd9e12b924e4e7221b68eb781351ced52e09ce0cb3848 SHA512 dd742d6c9bc567b10f8d50f5edd2e1f3439b469ced46da05f53e14c0fe5c90310114564e674afc8c7f55170e07beb6359263e1fd153e4b29f3edb4e88cfbf8c0
-DIST checksec-1.7.5.tar.gz 51266 BLAKE2B a77e6d0bf52bc8a0ec18c0f1ffe883b68acccaaee6fd0d1714d456c31c3004b5d9279c3926885be168befba1dc7a75b1269dac5cb5847c247470e765601f08e6 SHA512 7269fb3628907f6fe4e8b720d2dcbd5bf8586e1821bd758533dff6255c6a52be9146b58f60abea798ee92471c3d5ad9e867fa7ad4b8e5ea2d8aa03d5a3b83098
-DIST checksec-1.8.0.tar.gz 52391 BLAKE2B 3720e4faae5aa82172c673ce7ddc662db1433b82d25f25be4c219f1664da8af687d2a5ee9c05703e9f151a998be9226e896e125b7cff05d3881e61e8a9f5c918 SHA512 0236e40ba8b4f7c13ebd3b51f22dd05e6c4442e8646b5a1ee814556d9a6ca19f9bae638af33a6bfec2f8ef95567d222a20dcdcd9eae6ffb7ea5261919f020283
 DIST checksec-1.9.0.tar.gz 196168 BLAKE2B f9095a516f166e9a407c9796e28ed7da4ffd97686923745e46b0ab4110f084690781995b6cc190234b8a26fe1e6eb2c8f32f7f15191f0dbc26b38048c87e9a2d SHA512 8bf68dd0b86a6eceb6f5eb016a15ed1bf7d086777c3ec1c62848ec23e62dceed4579404d76824f17b8e1305e679ba6204f0dc4c224f7a11067651f33c2d96515
 DIST checksec-2.0.1.tar.gz 199903 BLAKE2B 726d3f868cc73649f7a3cd42270ab1c6965d6bed772f3c612064c54dad569e748f5a2d24df2b8663328442ba8126fe0edac04b0034ba6a23bf6e32ca93a78e30 SHA512 b2466b621b6ddb3fa01cfc5eb3dc301d6d616b26ddd2017a622ba2a24e9daf8f5e294236d1dda695fd9ab25fa411724b5f7dbdabc944cdc124e4369c176f35b4
 DIST checksec-2.1.0.tar.gz 200384 BLAKE2B 6e954f574c632da1aee629aecd7ded6286879ba6156252c3d4b5d11f52e3c457bb1d9223934c70f402aaa1e8a8f8d530b55c7f860c024c86c2c2bbcbe9216646 SHA512 66090777de15c492090da3494127037ffe20a169b426b054b3a8f642e9c980b2a99d5c8f8411715d74b1faed41023fb17770d3f07eec5b9efda0a43b64c07a74
@@ -10,8 +8,6 @@ DIST checksec-2.2.1.tar.gz 2241504 BLAKE2B 65d71e4ad589494d34ae0458f4b3e453f6bfb
 DIST checksec-2.2.2.tar.gz 2241541 BLAKE2B 310553aa419373acc9b86bd25d801a99db0173ef76d8ccfdce4b185102a8ad39a91ade906c521c9caf7989aab1da42c35cbfe5e8fcbea23eafb47f917bb87718 SHA512 d975a9cea60869ddda445515396b67b6ea3c9b33770e711071e1cff684f89b4718b135a3a3c1a88b11b96ccde0df72d6b7924cade0619d24e38db428251d22b0
 DIST checksec-2.2.3.tar.gz 2241535 BLAKE2B 850977dc14d1b57dc947f81af904aca71a7d664bf695619de2b6f7a1014a95176813c4fcd8c39a6c89b028291fa1a08a2beaf6f4dce27f53624202bb0e72ed2c SHA512 d1516dc4321f30a57f88d3279fa228b4dbb0f16345c3c7e9d89575ddc3ed9dffae42f392e76321a5a9aba876717aae959365fc829f0abb58c1c21f34dbbf59b7
 EBUILD checksec-1.11.1.ebuild 757 BLAKE2B cb3a4bb1505399b4b6b8f13e5237bb17f74d153a088d782427e2e8c53b2422f740455dca99ff29de6bf3fccaff2b1c8b1bea7ba760d08fadf8eb99bfee9f6150 SHA512 5669162f5f0d7e6c679bbf4cbb374d71c18452c7ac59451d5a4d39979f14dee9cebb91d63a37b61e38ea09d62e6931c3c48e853219dca6109c1cba32aceba52c
-EBUILD checksec-1.7.5.ebuild 761 BLAKE2B 928d7f91b7ac04ac04a9bcfaa14f8ea781eaaf2be75182d7b8d0f3cf63e0bdf9178d03da87732da11286ba172e2368eb5fa490021c3d5d71f3419d426b7b911d SHA512 5a15da1104314647688e68017189e1b661f0efd58d3a7ad5a788ab2cdda79249dce9c07e9db48d775ace6d8fb8679f2cb6669c1f16758f9c6e736e9eca2d57ba
-EBUILD checksec-1.8.0.ebuild 763 BLAKE2B 3456a3d42a58795e00cf46689bc60a99357dfec5a8ea7c43841584c10d4fe8bceb3d3c0e3a4965cd38e7c718b6c716a36cdbf895635a458122aaa34324f13600 SHA512 dd2af6317e19baef0e21112b6a64783dd1ccffaf2f0f2d80acf802b4ee14b021be23548375c9c86c8a073da38bbe4f1c58c533cb5b16cf60e082f8164dc84738
 EBUILD checksec-1.9.0.ebuild 757 BLAKE2B 526fb5bd77d4f06d01dafef1174eae285b5ee2a1ae72882f1d05d07ec141b519ef39f622f16f4e098c3df0b31f8419b6460f2d51a462b09324519efa3235fa67 SHA512 29ec62f61fbf71e19aae933ea6b01e6f606c043e50d4c004214219a04cbc96d8ede61a444a822e1a83c0245e0e379ee553e5f4bc2d7d11a2577aa0b2e9f9eeae
 EBUILD checksec-2.0.1.ebuild 759 BLAKE2B 18b155566819f22cd16c0c13798bda4b70da1bbdc5cbf94c0977d2edcf6877f7819fc91421d6be8619c8a20f7d2fac3fce2f698a41f25aea727e3f843b1ddaab SHA512 3b34ecfcc2c1c73ec5a8565e9c07415bf6b1d6a682c6f7c8b17db07917706c9247c7c67aaca7d03d894547892a978efe11e4fa01322e80c9093d0a6d3b0d0386
 EBUILD checksec-2.1.0.ebuild 757 BLAKE2B f638f3ec54f7d6f7ed1d6b5affb2cc8801ea61686f962e7e7d43391ec7512dc6902e8a0a5ba3c7efc1ac8cb549b7ecf0baa5558acba9d4ee969fab635d1eb36a SHA512 974d9f5c147385193d1525bf5cfac3dc7a9c027d0fde69cdbdd33de9ad384c3de624643da737f978c6efb7f121f3c7d71a5152582cc92a767f23ede3b2a74974
diff --git a/app-admin/checksec/checksec-1.7.5.ebuild b/app-admin/checksec/checksec-1.7.5.ebuild
deleted file mode 100644
index da34dcf8e557..000000000000
--- a/app-admin/checksec/checksec-1.7.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
-	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
-}
-
-src_install() {
-	default
-
-	doman extras/man/*
-
-	insinto /usr/share/zsh/site-functions
-	doins extras/zsh/_${PN}
-
-	dobin ${PN}
-}
diff --git a/app-admin/checksec/checksec-1.8.0.ebuild b/app-admin/checksec/checksec-1.8.0.ebuild
deleted file mode 100644
index eb85bc06b860..000000000000
--- a/app-admin/checksec/checksec-1.8.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_PN=${PN}.sh
-DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
-HOMEPAGE="https://github.com/slimm609/checksec.sh"
-SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.2-path.patch
-	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
-}
-
-src_install() {
-	default
-
-	doman extras/man/*
-
-	insinto /usr/share/zsh/site-functions
-	doins extras/zsh/_${PN}
-
-	dobin ${PN}
-}
diff --git a/app-admin/cpulimit/Manifest b/app-admin/cpulimit/Manifest
index dac9d5726bc1..e3486ff29bea 100644
--- a/app-admin/cpulimit/Manifest
+++ b/app-admin/cpulimit/Manifest
@@ -1,8 +1,4 @@
 AUX cpulimit.8 1451 BLAKE2B d65e5e47767e6202635cdb1247c343f2a68e49b70b0748e16d7eb8a5e17344ccaa929d77bfc29462d61909b9363d9486b709f9a23552aa0d2db58aac04d410e7 SHA512 3cceb217f5053aa6583a13ada2ef9ed6370859bb072474fcc6fef88f5184985b0a369b1f0c1ead634b07a1318ea1f81a4f4128de95513f9e6cabdf86223f6083
-DIST cpulimit-1.8.tar.gz 20610 BLAKE2B 4b80322b035d79267a97a491e51b2ae82488c59f4383e2dbf87d178a4a69d03a4d1aa653eccd8d801fac48e95c2f0780bd46881f4d38626b3c28b73f0a53bd71 SHA512 3098236139b092eb706ec2a6b84528a090b3f4b8b3adfc8debda1b92ffa119ed9adc508898e0f98add593561f5f6b67d52e0966de01a682a6e2e885e3c47b0fa
-DIST cpulimit-2.2.tar.gz 22224 BLAKE2B e59e65c0bd38ff93b2daaef6858c46cc99b8a1345e5a6dc66b871b1b1c7930557b6d6607d9b61e0538195aaf5fc8eda42edacda38a2f729aa56eb582bb9343a7 SHA512 e708b27e969024ed37689341d76979e5041c050c259359c46f988cfc55f571c16c17f48ca63cd93349041b76bb2c314ab69af36634fec5212e49aa0d0cb0a46e
 DIST cpulimit-2.4.tar.gz 24669 BLAKE2B e0fe0d6766e76e6e2a68dcdc553039400233daabbb14ce4a9dae46a7b694d2ecd660f4c1d13f417a74b12365c719780c732a03bd91c6384d1e7118d0fce521fb SHA512 008dc3fbdcbd8afd875a2a1ce03d609db595c6e110803140c676d3713ea60f4877a1bb8e7aa0e8b669dce31522ad81e2703f616341a0f4cbc69a6b01865b66d0
-EBUILD cpulimit-1.8.ebuild 575 BLAKE2B 6d289bdc46838d5c495908533e0d4c5419ddd7f5f7024a7acd39858cfe46544662ab64adb03dc967c146fa49be34a8ddf6fa2c027733f40b240b85fc7ca9f576 SHA512 5b726887834de6eb7ccaef9d8797998a4bd82e3cd06c8e8982895d9780178afda4778ed2a3a55bdf89125ee78d179c594c1ca82d3d7f7bbad4384d83e6da5cf4
-EBUILD cpulimit-2.2.ebuild 593 BLAKE2B 1571a3b20a315aeac1c051e04691bb71ac832d969908de2e85a95b68876c51d3479476adc5bae4a1f248b98bb0dd27d712209d8d628e71b6dbafc488aa96524c SHA512 a488c04229230cbcc83f800ae39a391a61d8ecb7c704bdeaba85d6dcfc02179e939bbf098b26520350be25350f3ec3a8a2a709cf25991b7777b53a609c6942ac
 EBUILD cpulimit-2.4.ebuild 637 BLAKE2B efcc65d22d2e18aec1fcc72d2e6efce525e4c5eb5ddc295690cfe5e8075e8e7b551420a500118e1d19ba34892ad0f562566383a1e6235c0c33303a0c95ac079b SHA512 ede24c34a0a8f35f8127c81fbf0857f64817cd5f21be4c73cc53d32b80dfbc18eb558caad64eba93d052f14cfb4349359696dd906ebca104d910df08e10321d7
 MISC metadata.xml 328 BLAKE2B cfd9269eca123a335dd8b842cf59029ae1aef98293d1f955cd4cf33ddd56a658c1aba076e7de6318720c4ee0a282bee3c5282dab611e316a1ddbbf45c18af334 SHA512 5bf3122d96aba89083a0776bfeb5cd1ca84cdabc59a1ad4e158b1b50e4eb42b3ebf7a45a51807af380a040c6ae106ddc30c97003a2398e7944bce932fb35d8b1
diff --git a/app-admin/cpulimit/cpulimit-1.8.ebuild b/app-admin/cpulimit/cpulimit-1.8.ebuild
deleted file mode 100644
index bdc78ff5f3f2..000000000000
--- a/app-admin/cpulimit/cpulimit-1.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Limits the CPU usage of a process"
-HOMEPAGE="http://cpulimit.sourceforge.net"
-SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	tc-export CC
-	# set correct VERSION
-	sed -i -e '/^#define VERSION/s/1.7/1.8/' cpulimit.c || die 'sed on VERSION string failed'
-}
-
-src_install() {
-	dosbin ${PN}
-	doman "${FILESDIR}/${PN}.8"
-}
diff --git a/app-admin/cpulimit/cpulimit-2.2.ebuild b/app-admin/cpulimit/cpulimit-2.2.ebuild
deleted file mode 100644
index 8df40c18cf64..000000000000
--- a/app-admin/cpulimit/cpulimit-2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Limits the CPU usage of a process"
-HOMEPAGE="http://cpulimit.sourceforge.net"
-SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	tc-export CC
-	# set correct VERSION
-	sed -i -e "/^#define VERSION/s@[[:digit:]\.]\+\$@${PV}@" cpulimit.c || die 'sed on VERSION string failed'
-}
-
-src_install() {
-	dosbin ${PN}
-	doman "${FILESDIR}/${PN}.8"
-}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index e993367bcc9a..5fad7f71b031 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.17.0.tar.gz 4399134 BLAKE2B d065cdbe698792afe19e1058c3e0e6c112c8ed66a0fdab8b182918022cc10cf51d4d1eb8eff42c2ff27250cbde56b627110f9b581e73d7ccbe32746081bf6de7 SHA512 2a60c80c87d9ca33dc3708c4c60b6219431751a522a9e5869fe255c1c68247c0863e9f098cc85c4652ad1ffde08386634d5374c4ddb2c82828f201a37a214075
-EBUILD exo-1.17.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
+DIST exo-1.18.0.tar.gz 4625622 BLAKE2B 618aec5cec7a41f06963d728c627f043f08ba39695691154118261a6fb71bac93cdb07b039e74e05a464227dca4da66c17c4c319553894f2d46af6203a36a038 SHA512 862dd138a6b6cbf9471206a07cf4447df113a77f44523e72e89a1f87362086fa168ded51d43c32408946b8cf2d6cb9668ff29818494a2eb6d94b0ef7d3bf4420
+EBUILD exo-1.18.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.17.0.ebuild b/app-admin/exo/exo-1.18.0.ebuild
index 0c2c8d861fe4..0c2c8d861fe4 100644
--- a/app-admin/exo/exo-1.17.0.ebuild
+++ b/app-admin/exo/exo-1.18.0.ebuild
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index 73e34210ddc2..63508216c066 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -1,37 +1,3 @@
-AUX github-backup-utils-python27.patch 497 BLAKE2B 204708abe587590b2479783f5fc355ab035a08af8dd85ccec600828384917ca6806abe3d50ada9ce133435b797d698699d777432e49f8a63513b2ae21e59baaf SHA512 9eb416ea2a9847d84d56da84c6355942f3320f8ed97711e602ab74e81f9dca32eff54f68a83586403c415e63fb7d13a0b6b67aa7b01cd05732160df08b9164a7
-AUX github-backup-utils-tarball-fix.patch 1440 BLAKE2B 8b6ff7b996317de913f82670da1e688bfb2796b51db9cb515a6a2d33d2f690e24030b9213c0ebd08fab316aded4d561f9b0d5e2fb1fc5f20d0190234e59e64af SHA512 738227c94b8c9cb569258ce2573db0ff9c8a216c74d891944969173add6eb31c0c46696d20977d986b5c29a9cdb2b3934563ed220527ef798de1cbeb680f6533
-DIST github-backup-utils-2.10.0.tar.gz 73061 BLAKE2B 072a3cf8b3a775b368e4f5c89f7b9b29f7fec26bf4fd9abec58a6f1d4f02a981881a547bbdede8f8b64d0ed01dfba334193132a5d1363de3f4cd8f11d9047602 SHA512 e4ec432289da71e7c8d50023e4874b4aef5e99b27f67c42ebadc61473f5b0bce473f768ff19d1d611d91944ce887ad496535f1bc8d6557a31a99353e100f7776
-DIST github-backup-utils-2.11.0.tar.gz 75105 BLAKE2B f14f30db263cc304aac0d2a9a6d82883067b80bd69292018876fa1b01b1e47d9f8dd44bdafed0eb1198fdabe2b25ec8e6f20117ae905a2ae17bb9a17174642ea SHA512 7d96aff4c2e2bcce7b2b2d32854e759d561de8e683a13d3890bbbc5177cea861a666a60527b4b6ec4d4d7e8123bfff4618b6dfd0c3db73b1829cca0c43c0a9ec
-DIST github-backup-utils-2.11.1.tar.gz 79378 BLAKE2B d887cf6d3e41c1537816edc6073a85c66dcaae0db5882187f5c9202ecaef0c7ad6c3593145a6619cc27e106cacd5343f4b26615569890e112db4ec67f98293f6 SHA512 7bdd34386d8604bfddb07d958d6cc435ec3e00705a83e53730f44a82a02eb98be311b73bba299db80513169a0680641927d9e2e9583b936c4fffa86de2ce2cda
-DIST github-backup-utils-2.11.2.tar.gz 79492 BLAKE2B 0eeba783fda89c862d1b6ecb56bc51dcb5130cc3ae8b35f38bba2b6fd850ee086d0b808f5cebb74617a1dea2f4ea3843c60a6162ac97e3139211b3796cc052d9 SHA512 64a622b090c8fe02ffba3c50b213ca177cc87e6aa41991cc3ee5031fc07b707e5f108f32d9346d2cd727939d76779d1f46dc6733e399c70e58ff8cb54087ddb8
-DIST github-backup-utils-2.13.0.tar.gz 79173 BLAKE2B 567865ede11d200a9dbc4641d9820864d72a325aa6b6439f3633b5fccf2d2a55fdd8f9351a280321d0ee5a1bc7f331369ed09b2e8e5274a9442f98227c82963c SHA512 e78c299b0131d76bd9f5d916f72a1a361a8ea706789c93d60b1980d348c4dad75e371ad84c725d8d8b05c45984d0edcf612d1a9e69e63657c212a848d359ad28
-DIST github-backup-utils-2.13.2.tar.gz 83126 BLAKE2B f79d378a1126a16f366930a40ca6db43865c2615edb65b13a3b4a1ac693f3f3419f6b821ec4454cd2b4858fd13038ca66e158c37338b671f69f14aca2e36c6de SHA512 b394dfde420d2f1adbaad6b61a665fa99e6a35007fd5162114ec01629a04be31780f3f36e9133456bbb015c6a3939430b5d65572e580d8757f023a2309d104ca
-DIST github-backup-utils-2.14.2.tar.gz 84628 BLAKE2B 579088448da16330083ee4ffbbd2d9e286eac7bf89bc9146bb4eaed8aee42971238ea997625da2e5c6f10097b329ffb7db876aab20acdbe7d17c1a8bcb9a3801 SHA512 6a93861441388866ba57c8be13ece0df6967e711fd643138c00490ce439fb74d29ceb5b482f6315d1a47df0cb90ab4a835bb25bdcc92172f5f200b5900108bd4
-DIST github-backup-utils-2.15.0.tar.gz 84856 BLAKE2B cc31d45711d4b26d246e08565b48bf5b65e3c6127bbeb01064273e4bcc8e3f3b5fd8e439cd4717c4c8d103113b00eba4ed670737169ce6ffa7a8256b08386e01 SHA512 3294641c8220cd7d5e212e47b7011f188432e5e6437e6d97a9d6c38182fd451a0229588ee28872d5c1bb1b0cab93eb612586a268761d42cb763f38ad13ec0ab4
-DIST github-backup-utils-2.15.1.tar.gz 84627 BLAKE2B 14f448a8c15b45cdf2a2868d70d90bd91228bbeb3d7534fd89ed1812fd1bcc52e9720d4063fc33f9463035eb34736c919c888c17b2602ebb772fdef4830592f5 SHA512 72a0c70ef629f17a2b3be12661379a94150181c0ac87803e4490a9b927e84760917e936e3346d2da6a0ec004ef8fa9b1297b41341bce115a2dd26bbcc62c1843
-DIST github-backup-utils-2.16.1.tar.gz 84847 BLAKE2B 5c6c0cbe8268ae176321739582783e920454efbebb62a0058ceeddb675a46050db3126897054c0120a74bcfa16bd28b4dd311cbd6a5e23dac262a49bc026c90d SHA512 bde17ed47ec0b89fd95e0a018cc0709045da6f27ffbf492d555219a09e3fcca612d67da1e0d5786fa8ea08a7eaa6d183dc1d40fd45d7bace5d05899ae0007fcb
-DIST github-backup-utils-2.17.0.tar.gz 89926 BLAKE2B 82e89d616f78d630a4c537ad110f1097fd4925f9d0b45ebd117a5f4dbce21ec84bddd1f7a2cfebc52464e8fff9117bd4b0cc5e862e666d4b3d05f11a9b88730d SHA512 aeae5d5f662a687e13ff0aed54801759480ba39e31f0ad49a9ecc4fabad5aa5e124e774c7b939a366a33135e81614d1cee6f1004481bbe94150b48a11f222a90
-DIST github-backup-utils-2.18.0.tar.gz 90357 BLAKE2B e9f6c155246914a36d26ec8cddf4a1e9feca73b3450ceb8e6df11df7c077b86f18cfa23b51e77425ba4e28ce4a3664200c1ddb15e6eb856d6b8930379dd3e348 SHA512 1778bf4cf404444e567f9f6b98bcd01bf9880939b4645692d75dbf10e7b31b40678521b66fbdabfedef648561f34709492b7860ce16442757e161db2ffda45a2
-DIST github-backup-utils-2.19.1.tar.gz 90260 BLAKE2B 403feca60cc6037a2fbcb4cc467520fb3283916fdc78e16e960656b695e1c55341c55e74fe246c56fbc2cd86a85e33bcede4d94132adaa446ea48ed8f3f75022 SHA512 60155021d23eadc5ab1ddcadf95dbab43f19456c0e7ef34e93c75d173c1279b354c7019b304d72cabcac674edbd0c4a0c4e50c08606a8559ea662858a9cdb206
-DIST github-backup-utils-2.20.2.tar.gz 92628 BLAKE2B a6c9fb91b005d20b15ce0b2fc289a145bbfd8316aca4511300cda8a9f1b1e52afb9619a9f467e6e87eec673244776a0bf469d0d4a4c608af0f462eae7a06dc44 SHA512 0d2c56fd2e98c8f858cf3a03e2c2d84c20555716d015cdf1f0a789171cb6ea301050a41d1314a15316258f3f159123ba21526c1fd69cba548e8f259c70a92ab9
-DIST github-backup-utils-2.21.0.tar.gz 89907 BLAKE2B 4261d127a73bc4701521f6c5078444c38b3d97ac4ab883f644e02057090b8a53b6c86849b988175416b6fb0566327b9938f28887417fef109dd59c1b246cf961 SHA512 fc037d180ce6cb238d4613583a1551256ffbc58ec8276945905c0127fb6e29f7d547dfdcbec30bb581202ce0447365642218e18ed8865f01e76037898d0a5126
-EBUILD github-backup-utils-2.10.0-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
-EBUILD github-backup-utils-2.10.0.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
-EBUILD github-backup-utils-2.11.0-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
-EBUILD github-backup-utils-2.11.0.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
-EBUILD github-backup-utils-2.11.1-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
-EBUILD github-backup-utils-2.11.1.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
-EBUILD github-backup-utils-2.11.2-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
-EBUILD github-backup-utils-2.11.2.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
-EBUILD github-backup-utils-2.13.0.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.13.2.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.14.2.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.15.0.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.15.1.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.16.1.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.17.0.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
-EBUILD github-backup-utils-2.18.0.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
-EBUILD github-backup-utils-2.19.1.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
-EBUILD github-backup-utils-2.20.2.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
-EBUILD github-backup-utils-2.21.0.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
+DIST github-backup-utils-2.22.0.tar.gz 102576 BLAKE2B ce9007c8a5d2843ccc2b3d11b03c13840b89d6ae7906d63420cc0e18191766c92c91e1072723439610ae8bdfdd0174601d1e3b7211cd6a1c9a748f9f793ff760 SHA512 e77b4afc6f90b16caf61dc4313787dab0751590b4819dca2d7e21acd0ca774d19ea359171b76f2892ca0fb4f86fd4240e77b00e107de79d496fea429fb12cee8
+EBUILD github-backup-utils-2.22.0.ebuild 1126 BLAKE2B 9e16911d27c5813a8e08cc387462a9c74d7deb4c848c3529e30c682e75588e7ef10bc458932a2eee7f9a6d8fda14e7d7c0648512f56e072c4b5756f04b0af689 SHA512 90b8a464f4eb4a245f9aa97797478fc72208d609ae633987251960600e34fb2c13dcafc209629aac7edcbf3360c45757a24b052c5ac64f39d677ce38d9e37346
 MISC metadata.xml 342 BLAKE2B 9f590d0c03e75e395500a57d1b99020742fb9fc04835b6fca8a896435dec7ba274204df2c5356ec1ef101f721a4bafdb848299c57b209c8d9aa41efdeb674e8f SHA512 5a9f0cb678377962ec6e4cf33ed40423e568f15cb71dfe5dd87e427a21584043e5698bbb2baa5b77907bf8f15c9ad8cfa8b05b4fdcdf2c8876ceb968afcb2d07
diff --git a/app-admin/github-backup-utils/files/github-backup-utils-python27.patch b/app-admin/github-backup-utils/files/github-backup-utils-python27.patch
deleted file mode 100644
index c305b688ceca..000000000000
--- a/app-admin/github-backup-utils/files/github-backup-utils-python27.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/bin/python b/test/bin/python
-index c79b0a4..a9c2991 100755
---- a/test/bin/python
-+++ b/test/bin/python
-@@ -18,7 +18,7 @@ cat >/dev/null
- # verify the python compiles at least. if this fails then the python code passed
- # to -c failed basic syntax checks.
- echo "$2" |
--/usr/bin/python -c "import sys; __import__('compiler').parse(sys.stdin.read())"
-+/usr/bin/python2.7 -c "import sys; __import__('compiler').parse(sys.stdin.read())"
- 
- # pretend we found zero processes.
- echo 0
diff --git a/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch b/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch
deleted file mode 100644
index b0f0b8de3140..000000000000
--- a/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit ef6709b5e3510a7d0bcf0db91dbf5af5bc27b001
-Author: Austin English <austinenglish@gmail.com>
-Date:   Tue Nov 28 16:36:39 2017 -0600
-
-    test/test-ghe-backup.sh: skip test if not in a git checkout
-
-diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
-index 296429e..08bced2 100755
---- a/test/test-ghe-backup.sh
-+++ b/test/test-ghe-backup.sh
-@@ -475,14 +475,20 @@ begin_test "ghe-backup stores version when not run from a clone"
-   # Make sure this doesn't exist
-   rm -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version"
- 
--  tmpdir=$(mktemp -d $TRASHDIR/foo.XXXXXX)
--  git clone $ROOTDIR $tmpdir/backup-utils
--  cd $tmpdir/backup-utils
--  rm -rf .git
--  ./bin/ghe-backup
--
--  # verify that ghe-backup wrote its version information to the host
--  [ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
-+  tmpdir=$(mktemp -d "$TRASHDIR/foo.XXXXXX")
-+
-+  # If user is running the tests extracted from a release tarball, git clone will fail.
-+  if GIT_DIR="$ROOTDIR/.git" git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
-+      git clone "$ROOTDIR" "$tmpdir/backup-utils"
-+      cd "$tmpdir/backup-utils"
-+      rm -rf .git
-+      ./bin/ghe-backup
-+
-+      # Verify that ghe-backup wrote its version information to the host
-+      [ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
-+  else
-+      echo ".git directory not found, skipping ghe-backup not from a clone test"
-+  fi
- )
- end_test
- 
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
deleted file mode 100644
index fb7dd4be7234..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
-	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
-
-	# Fix for python3 systems
-	eapply "${FILESDIR}/github-backup-utils-python27.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
deleted file mode 100644
index c7f2534ca0c2..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
deleted file mode 100644
index fb7dd4be7234..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
-	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
-
-	# Fix for python3 systems
-	eapply "${FILESDIR}/github-backup-utils-python27.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
deleted file mode 100644
index c7f2534ca0c2..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
deleted file mode 100644
index fb7dd4be7234..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
-	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
-
-	# Fix for python3 systems
-	eapply "${FILESDIR}/github-backup-utils-python27.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
deleted file mode 100644
index c7f2534ca0c2..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
deleted file mode 100644
index fb7dd4be7234..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
-	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
-
-	# Fix for python3 systems
-	eapply "${FILESDIR}/github-backup-utils-python27.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
deleted file mode 100644
index c7f2534ca0c2..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.13.0.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
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.13.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=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.14.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=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.15.0.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
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.15.1.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
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.16.1.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
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild
deleted file mode 100644
index 28f539a9db37..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.17.0.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
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild
deleted file mode 100644
index 9a251dd782d8..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.18.0.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
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild
deleted file mode 100644
index 9a251dd782d8..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.19.1.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
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.20.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.20.2.ebuild
deleted file mode 100644
index 9a251dd782d8..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.20.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
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.21.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.21.0.ebuild
deleted file mode 100644
index 9a251dd782d8..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.21.0.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
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	sys-apps/moreutils
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-
-dodoc -r docs/*
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild
new file mode 100644
index 000000000000..cdc41c6dad52
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.22.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Python3 support: https://github.com/github/backup-utils/pull/627
+PYTHON_COMPAT=(python3_{6,7,8})
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# moreutils parallel is now used for speedups in main code:
+# https://github.com/github/backup-utils/pull/635
+RDEPEND="net-misc/rsync
+	sys-apps/moreutils"
+
+# tests invoke parallel & rsync
+DEPEND="test? (
+	${RDEPEND}
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+
+	dodoc -r docs/*
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index cfc949ebf98f..6eb30457a412 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -1,11 +1,7 @@
-DIST haskell-updater-1.2.10.tar.gz 26586 BLAKE2B adc46f85118fa55e530aa079ef2df0663b178b15311f4f2ff6474db75aacf1277238a27a2bb98841fc1fe50b556d7f01a677861b3ce9559fe809a02db401ef8d SHA512 c0a72ae77362e5ed4ea0e244449175454119b1284756adeb43534bf58b661f3cabb88e08bd5903d415a9f95a6de309753dedf974ddd853b300fd215250e0ad7c
 DIST haskell-updater-1.2.12.tar.gz 26708 BLAKE2B d0b040cb3b6211b3c5c60f8cfa3dbccbf9cb15d246b21609a21aac746a8a034e284fe0b99891b5035980252a7aa8b376ad943f32882dc29e16226d95583cb053 SHA512 f3a993cb556919bf2e57fdaca7eea9146abc59096e779cbffb69a5c29fc5f6ef889c8ccf4d8331dbd9279919ea91bb05a16d83ad70085d5ef5a44d61120fe7e7
-DIST haskell-updater-1.2.9.tar.gz 26675 BLAKE2B a3d11cdcee886a07d87cd2888a9deea1d963b7234b4a10a6b78e9467fae4e9382c92f14a6ba0593f86bf9422ab2cb4bec823de96f34b463590ae18429c118edb SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da
 DIST haskell-updater-1.3.1.tar.gz 26573 BLAKE2B 68e5357e8f24b9b372dba4feac76595cbf35602d9d9094d616497c9d0040177b5f1def5833770041b693220717f3a4976877e0608858d5d8d4dddd26620c71e5 SHA512 39c36c4a8997806bb4d64625bc9ed72334a68e57f8c32f75d0c3704ab52b3b68605444c89480e5186c04bb275b3608ea9544366ebc5a00e010cc5fb4ae8296df
 DIST haskell-updater-1.3.2.tar.gz 26133 BLAKE2B ea72850e5ca35ec18fa00136c654435a852b072aea0402003c962abbb0e0f09e8a84568f78c9186324b0b0ee9658de1b413670e268cfe1c0056810b8c61b479c SHA512 a4d80ecb65efa9ae21008e04b1363ff2196df4ba431fc5ec899bb9904c598c7a109a38f7dd86dd2dc86faca8ed5083d036d700e7f7796840ee5470401c24f3d9
-EBUILD haskell-updater-1.2.10.ebuild 1027 BLAKE2B 50859793aa557110a1120aff3f22b7841318502f4c710851246c1847df505f02af7323711cb51249f7774cb452c1c6207b989e96de50acb76e87887350ef5a68 SHA512 ddd96b11e6da8006c488cecb95aae19473f1490de6e8cc7adc9ab58d44600054caa3bf8015f84f53bd806d3035dcb7db48c2b7b26ca04d57e9d85e1ad728a8f7
 EBUILD haskell-updater-1.2.12-r1.ebuild 1037 BLAKE2B ef35b3e4d5f936770a7ecefb3d94971078031298fe832fb5c56e2004dd476030b5e0742ea29dff976a59e7aa895062cecc494ae5953e49dbf5836ed536e93bbe SHA512 979671949e1ed11cfece3f0bec2ca8baf634c303fa7f61e2aea56a2d60f2f6692c548716172bf1caa3ba4f626bfb5100cf61be47f1758e2ddf0cd6bd65fb3f11
-EBUILD haskell-updater-1.2.9.ebuild 1027 BLAKE2B 50859793aa557110a1120aff3f22b7841318502f4c710851246c1847df505f02af7323711cb51249f7774cb452c1c6207b989e96de50acb76e87887350ef5a68 SHA512 ddd96b11e6da8006c488cecb95aae19473f1490de6e8cc7adc9ab58d44600054caa3bf8015f84f53bd806d3035dcb7db48c2b7b26ca04d57e9d85e1ad728a8f7
 EBUILD haskell-updater-1.3.1.ebuild 1048 BLAKE2B 43bb858e8a653c0feb06b3f4dbbfaff1f3facee0e3d04242e0d618423d63baab1cfb816607417881bcabcb8beb3ffa112dde18e15c3138745141b544d1cda07a SHA512 8c5f336bc8998af7d5381a949e7de202a9b1e04309e13c0cc2a5de720fef9383b967dae565a4fcdd9221ca83dd0bb1c07132adba1786290d4a93e1319a1502c2
 EBUILD haskell-updater-1.3.2.ebuild 1048 BLAKE2B 43bb858e8a653c0feb06b3f4dbbfaff1f3facee0e3d04242e0d618423d63baab1cfb816607417881bcabcb8beb3ffa112dde18e15c3138745141b544d1cda07a SHA512 8c5f336bc8998af7d5381a949e7de202a9b1e04309e13c0cc2a5de720fef9383b967dae565a4fcdd9221ca83dd0bb1c07132adba1786290d4a93e1319a1502c2
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
deleted file mode 100644
index 83ccef6f2133..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-		sys-apps/pkgcore )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
deleted file mode 100644
index 83ccef6f2133..000000000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-		sys-apps/pkgcore )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 296402afadb1..95563ebfd019 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,7 +1,3 @@
-DIST hcloud-1.17.0.tar.xz 687880 BLAKE2B c83530946dd04afc59d45a2bbb12b6a4034dfe5b8c3826e4e78f29e88891672c21e896fd9d24394ce943f9b6574928ae144a564abde3fec8a243cc5fc87e8bdb SHA512 5025357392e9b7661876f059a416e6d6f9eea89e16a9abaacaeb72506aaa5d4d6a193e266d23f01cd0f5d32048f66a3f6e22a1c9c042c2e3183a1e164da2ccc6
-DIST hcloud-1.18.0.tar.xz 691988 BLAKE2B 1d0d6cac56cefa9023796f259fce238952766e038568d843259845d8ebeb040b75dab9dc18908003fba1a10fc76fd45936e46db50536e26dd90a47354feba34a SHA512 39b09b5b79f1e8715fbc17c8576e51955b7729032385fd1aed3f171c56d041d0576dc99662fc9e222f5fe1837a4fddbd57cd406d98fd38a5b9eb116d2a83af3a
 DIST hcloud-1.19.1.tar.xz 781068 BLAKE2B 74362fae9255121771a9e03f187ea6f101e71ed4ab226c218d33a335b740dc72d0df78e76d4c28e1b4760e1c76fe4dcba40f6a41db99cd0955ecb221d5314767 SHA512 24434de9396b30843698feff549163a23443f8536f3e2298edf23620f107dcf5287701c10aba10c4f6ecd61fa4b6a1a80661d9a330c3a4a11d1c986f750550ec
-EBUILD hcloud-1.17.0.ebuild 712 BLAKE2B 989221cd61ab4500042665da2679e7f611c9a7db8ce4f38ce81ee40be0d292c4be438846cf643bc056f3785889adba86765a6ee7845ec66cac15481933d9b8ce SHA512 761fa5b38c983a29cd12c069d1c79b141f88b077071351935b670c87e5534a96c9436c8dbd4479ef8401811539c2ab5124b62fc0eccb07a53a85980f9b6622a5
-EBUILD hcloud-1.18.0.ebuild 713 BLAKE2B 64b198fe517c5b6d22fb6024249e86236336cdb4cd7dda78f252cb3bad4af5e7f279358f8370d00fc4013b03331515ff8439aa82cf42f12cc05cafb532d07247 SHA512 dfdddb5e8356d7bfa8a641ea6f2e75747f0e0812a924f9b0e2517c5b6cf7f1e59769d336a37de8eba4eb03230746cc0bb15cab76e47957795a69ae465a96d978
-EBUILD hcloud-1.19.1.ebuild 713 BLAKE2B 64b198fe517c5b6d22fb6024249e86236336cdb4cd7dda78f252cb3bad4af5e7f279358f8370d00fc4013b03331515ff8439aa82cf42f12cc05cafb532d07247 SHA512 dfdddb5e8356d7bfa8a641ea6f2e75747f0e0812a924f9b0e2517c5b6cf7f1e59769d336a37de8eba4eb03230746cc0bb15cab76e47957795a69ae465a96d978
+EBUILD hcloud-1.19.1.ebuild 712 BLAKE2B 989221cd61ab4500042665da2679e7f611c9a7db8ce4f38ce81ee40be0d292c4be438846cf643bc056f3785889adba86765a6ee7845ec66cac15481933d9b8ce SHA512 761fa5b38c983a29cd12c069d1c79b141f88b077071351935b670c87e5534a96c9436c8dbd4479ef8401811539c2ab5124b62fc0eccb07a53a85980f9b6622a5
 MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a
diff --git a/app-admin/hcloud/hcloud-1.17.0.ebuild b/app-admin/hcloud/hcloud-1.17.0.ebuild
deleted file mode 100644
index 8d044f742d31..000000000000
--- a/app-admin/hcloud/hcloud-1.17.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A command-line interface for Hetzner Cloud"
-HOMEPAGE="https://github.com/hetznercloud/cli"
-SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-QA_FLAGS_IGNORED=".*"
-
-src_compile() {
-	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
-}
-
-src_test() {
-	# For upstream a simple test is run 'hcloud version'
-	./hcloud version
-	if [[ $? -ne 0 ]]
-	then
-		die "Test failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/hcloud/hcloud-1.18.0.ebuild b/app-admin/hcloud/hcloud-1.18.0.ebuild
deleted file mode 100644
index bdb4bb4366ef..000000000000
--- a/app-admin/hcloud/hcloud-1.18.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A command-line interface for Hetzner Cloud"
-HOMEPAGE="https://github.com/hetznercloud/cli"
-SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-QA_FLAGS_IGNORED=".*"
-
-src_compile() {
-	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
-}
-
-src_test() {
-	# For upstream a simple test is run 'hcloud version'
-	./hcloud version
-	if [[ $? -ne 0 ]]
-	then
-		die "Test failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/hcloud/hcloud-1.19.1.ebuild b/app-admin/hcloud/hcloud-1.19.1.ebuild
index bdb4bb4366ef..8d044f742d31 100644
--- a/app-admin/hcloud/hcloud-1.19.1.ebuild
+++ b/app-admin/hcloud/hcloud-1.19.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 IUSE=""
 DEPEND="dev-lang/go:="
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 50b8d98b58e1..1c2a88e56135 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -4,6 +4,8 @@ AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a
 AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
 DIST mcelog-170.tar.gz 312911 BLAKE2B bab27c60fca937442a0f07929eaedd392c3e8de3e5f705f717d787652b6c0fa91e42169b835ea2527729c487773c7baabfceeebd3fd58d64a853ff17d8fdd8a8 SHA512 f5d29bde88cd3925c0e629850adce7f1040ecc4703c45427424f5d56f28a0add1fb24538e5c4e0749743c92479d3ea6da583c23bb41eb6a8d899626d818cb6a4
 DIST mcelog-172.tar.gz 313103 BLAKE2B f3acf5a5ebd1db92f7cddfa0e8a848bd6fbd361932ae52400c26f5aeaf7727f6dfd278ab7c1282229d9208474add124401a4665a4febe0debffad7818bcf6223 SHA512 adfde12b9f6f21ec6276c55d3554a3cdbf156e44df2f85c28d9d608418fa57b3f4a0bfcbacd13e92b77eddc1efdaeacfe3c89d203b8cbd3757f35fe419806547
+DIST mcelog-173.tar.gz 313098 BLAKE2B f9ddcd85294bdcb1d9e8e888040af94e5e17f4902efb47788b69737bb3408e59014481f822ea083947725f75b7db21250f4c645e7b409a6c23ce7a9ce3708a62 SHA512 fd83828d19f889e3cbb2ffda8fca95f3097644161bfe2ede1fd7600718fa56d343cd985b831eb643dc613a453730e07847de0f05fb14b4a03a8dcd73281199e8
 EBUILD mcelog-170.ebuild 1367 BLAKE2B 420ec47206fdc6484a7aafc47005ff34a82bd689da636958c99df79fd884fc25f353aee6a63a3673c4357d0f6e5716309251704a26865766d0ea8d135cbc2c15 SHA512 7f980c2058ea1a07c2934a2cc49b8bdb083b6a4fd3a6c1eaf2a9889fbc845f36a6f6c3b27a6b69162badf71824d219bcad047265f77b064a15cb3ad8ffd4a6cb
 EBUILD mcelog-172.ebuild 1369 BLAKE2B 28898352135feee6b52597bc287a9662dedcda130127b27d504641117f102422da9c41cc6dbdc70bebbe50f8c43f63ef997199406c4618e9ac1a58a985d74e33 SHA512 ed1b2bc475a69db7772e5ee18b56766ca7cb4776f09fa14ff7baefd369127be5167ccf56e038d6e793277a0928b1f8b25437ab7b6aa103ef1608acc15450dc21
+EBUILD mcelog-173.ebuild 1369 BLAKE2B 28898352135feee6b52597bc287a9662dedcda130127b27d504641117f102422da9c41cc6dbdc70bebbe50f8c43f63ef997199406c4618e9ac1a58a985d74e33 SHA512 ed1b2bc475a69db7772e5ee18b56766ca7cb4776f09fa14ff7baefd369127be5167ccf56e038d6e793277a0928b1f8b25437ab7b6aa103ef1608acc15450dc21
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-173.ebuild b/app-admin/mcelog/mcelog-173.ebuild
new file mode 100644
index 000000000000..e0b67a2d755e
--- /dev/null
+++ b/app-admin/mcelog/mcelog-173.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	insinto /etc/cron.daily
+	newins ${PN}.cron ${PN}
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+	einfo
+	einfo "A sample cronjob is installed into /etc/cron.daily"
+	einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 29a6bddc3a22..3ca6afb055e0 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -10,8 +10,8 @@ EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8d
 EBUILD mongo-tools-3.6.17.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
 EBUILD mongo-tools-4.0.12.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-4.0.16.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
-EBUILD mongo-tools-4.0.19.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
+EBUILD mongo-tools-4.0.19.ebuild 1612 BLAKE2B 388fce2721c6febaf554a4eaf68d3ec2def017e01b0a88ff7acb039b06dfd90081776dd1628ea4c51612b55e5fd113176c1b87fd9dd8d14991bcb8e6b21e462d SHA512 123c899168d48b40b75cabf913ad76eea8bad3f0537101a312988191d4cf6cb07b3f5b14232d92bac2785d92d1229ae2209c1f96843c845cde6967dcf9ef4c95
 EBUILD mongo-tools-4.2.3.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
 EBUILD mongo-tools-4.2.6.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
-EBUILD mongo-tools-4.2.8.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
+EBUILD mongo-tools-4.2.8.ebuild 1619 BLAKE2B 1faf21c01243af30bbc274c99995ea875579473f53485d8100b487d1934880c495d9cb276e346646ecdad476a56284e90646cc83ac1dc47a1ce0cba7bf670f98 SHA512 91811cd08ce9d3e3577ccd0ba845ba9880e6bf681dc14925fb5a43a750914b4e1732d578ff64335ad935665548ddacfa59bc0fc22abed2d053cec0e6da1af939
 MISC metadata.xml 331 BLAKE2B 62e95d5bc17f92830615f6a251ac64e2824c9fb7bf5025f0d3898fa2d0cfd0a033fef7e04d6536b4122241462674148ee0516f0ac54ee30587f375404ff86c6e SHA512 00442ab0d006a7e4fb525dcd9df46d45eafa25f85afe5964bc98efd0996898a1b27334d939ea2d5cc843b5249632613585e0a40d9fa0f227334040c8c3d7b741
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.19.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.19.ebuild
index 86f626904b91..1be2c812c418 100644
--- a/app-admin/mongo-tools/mongo-tools-4.0.19.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.0.19.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/mongo-tools/mongo-tools-4.2.8.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.8.ebuild
index 7d8cc9a0ebc2..083aebc281b1 100644
--- a/app-admin/mongo-tools/mongo-tools-4.2.8.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.2.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/passook/Manifest b/app-admin/passook/Manifest
deleted file mode 100644
index 2ea8de9df8bc..000000000000
--- a/app-admin/passook/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX passook.patch 778 BLAKE2B cf0e4af5987f70e3bee262d3a11f3bdd8c96686b0f28de3eeff7b248c0b8ade17efe5b1da8f165113d4231e1ebc67abd8b1053916b95022f4e7b24e49b449171 SHA512 cbba3e7b7353acb43056db909ec868eaa741dc81eba3596c4c51e88f7b0922f7637d0a3a862377eba0f20eef52ca43314e3964cb011bd3fc7e3436724d9289d6
-DIST passook-20121001.tar.gz 13992 BLAKE2B c253fafa45c1f3ff30c91bc697ffece20fd6a58f36075909043041b281d558ab0a9e4352d867e00404bed81bdf44a5bf236bfeb72b9f41fd5ffe78a3b33a9900 SHA512 8c3c72f3001fc3c88060f77685b4f238d42dd65d599522604cf3f3fede2c3b94f4a12622e006d10a4f026283b885f90e4f2e2fa9282a48e181480bec4e2d13cb
-EBUILD passook-20121001.ebuild 669 BLAKE2B f6af186354f31c7d6e5d272f29ef05fd108ce2fadc24b0be9ccfa77400268d702b7412e6cff8bdaa92a273883fc1851a8deff60dc911bb264af0cae6ed11b53d SHA512 f1f9b5b48155eef9999e6d5f0fe54f4bb6a178879b5000d3b047763a200f63f1b063778b2be038a21a47ba29d2e84c860a80e25c03c51b985482a375244ebb59
-MISC metadata.xml 393 BLAKE2B 024b68ca2ae37df6718088689b79d3d70546681a051deeedd6012f7cc2d987208437831ad8423f8bddd40fa894cb2f27b96ed2be65ac3776a5be4a8aa86e60d0 SHA512 f08f94a5ae03e1b89f218db3b462bd595905ac95336be3cf1eb43b3e018101c5b2dfb5d526f285c1a51388214463d6676d770ae805be21b2bc1463069c93467f
diff --git a/app-admin/passook/files/passook.patch b/app-admin/passook/files/passook.patch
deleted file mode 100644
index db14e6ec817c..000000000000
--- a/app-admin/passook/files/passook.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- passook.orig
-+++ passook
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
- 
- srand;
- $p = 3; #default pronouce level
-@@ -38,7 +38,7 @@
- }
- 
- sub fourletterword {
--	my $grepstring = 'egrep "^....$" /usr/dict/words';
-+	my $grepstring = 'egrep "^....$" @GENTOO_PORTAGE_EPREFIX@/usr/share/dict/words';
- 	my @fourletters = split(/\n/,`$grepstring`); 
- 	my $word = $fourletters[rand(@fourletters)];
-         $word = &tangle($word) if ($p<5);
-@@ -46,7 +46,7 @@
- }
- 
- sub threeletterword {
--	my $grepstring = 'egrep "^...$" /usr/dict/words';
-+	my $grepstring = 'egrep "^...$" @GENTOO_PORTAGE_EPREFIX@/usr/share/dict/words';
- 	my @threeletters = split(/\n/,`$grepstring`);
- 	my $word = $threeletters[rand(@threeletters)];
- 	$word = &tangle($word) if ($p<5);
diff --git a/app-admin/passook/metadata.xml b/app-admin/passook/metadata.xml
deleted file mode 100644
index f7a29ccaa787..000000000000
--- a/app-admin/passook/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>Passook is a perl script that generates passwords. You can
-	customize the security of the password generated.</longdescription>
-	<upstream>
-		<remote-id type="github">mackers/passook</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/passook/passook-20121001.ebuild b/app-admin/passook/passook-20121001.ebuild
deleted file mode 100644
index 4cbd2bae4926..000000000000
--- a/app-admin/passook/passook-20121001.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils prefix
-
-DESCRIPTION="Password generator capable of generating pronounceable and/or secure passwords"
-HOMEPAGE="https://github.com/mackers/passook"
-# snapshot of https://github.com/mackers/passook.git
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="dev-lang/perl
-	sys-apps/miscfiles"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/passook.patch
-	eprefixify passook
-}
-
-src_install() {
-	dobin passook
-	dodoc README passook.cgi
-}
diff --git a/app-admin/ps_mem/Manifest b/app-admin/ps_mem/Manifest
index 38029526ad06..aa62cdfba854 100644
--- a/app-admin/ps_mem/Manifest
+++ b/app-admin/ps_mem/Manifest
@@ -1,5 +1,5 @@
 DIST ps_mem-3.13.tar.gz 18331 BLAKE2B a0689a98597e02a63cc83188e717421bf873b9202c0f524165ffc838fd438c539209c2f4e6561226bda8c6f85364707d29d13519d6d3e53a6d34cb39378d2de1 SHA512 bf5affaede5f052cc878d46ef81186511a1e8f5939cd7e8560ab2df9faf4dc31566cb4172d956cdcf1e6fc5586ba3458ba1011aee3720f6b7eeb3cf40b4f90dc
 DIST ps_mem-3.13_p20200417.tar.gz 18472 BLAKE2B 43e04d0357458107fb25600024243baaec703124fc58a819c011c847a52ad6fb7384ef38a5aa965e3ae88288cca6c76a15819466839eb729a63c4492eaa4ec0d SHA512 9694cec5d696a42dfe2f60dd024f541283e2f52aafb499ee2e551574133262bb0fc4bf6eb0e7075fb1b129aff6cd8fe6968f411f56ee1d31eb6f9aebff2d9852
 EBUILD ps_mem-3.13-r1.ebuild 676 BLAKE2B 2921f9ecbcec6bf8e3251362eefebdf0a3c9a36d150463a3104c1637adf876dd451e3aa742aa002955aeedc3536836fb963a78f0066d43362aae4cbbb62abd14 SHA512 95dbdfbd232d6a0415f8f825cb750ba6cf40facce0ead984de057063f045215746f3cc7f7d1f5ac0cfed1e01a0930d9d711c5f0639de7cc4244e1a2a98319ff4
-EBUILD ps_mem-3.13_p20200417.ebuild 713 BLAKE2B e5b9a9999946695f5bc467038d147f16b3c0042207414f0b0a6eb82bf0bc65ac209c00bac6b90581e240ed6ed557ebc2f82964106de1ffe3bc8fc6654844c4a1 SHA512 bb9d22c33131fc982aaa63f1328863b14c8ec2543a677de69a4275f176ff043fb246cf7f694602d54c1e58b9b6ccca96743da970520de2d4e9ec291520157770
+EBUILD ps_mem-3.13_p20200417.ebuild 710 BLAKE2B e8edf41454c83751c272b1ea69c0606c8aef4e20da522dfa83733c4f90735ea9f94ed785b8d0e863578356ae99c58e2c0d428fc6b0d9224b0ebbd51941152e66 SHA512 9458978de046dc70ec8a3f6e44ada401b1a079fcea5afaee5247f0a6ff2919d50dfabd74a5c4284a2902e5e4f43f466e6e112b728cfe163b50a7147b79168fc6
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild b/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild
index 738db1ad89cc..91108a61195a 100644
--- a/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild
+++ b/app-admin/ps_mem/ps_mem-3.13_p20200417.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pixelb/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 sparc x86"
 IUSE=""
 
 python_install() {
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 33b606d2c9af..da9c48fe284b 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -3,9 +3,7 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_6.15.0-1stretch_amd64.deb 22581842 BLAKE2B 19c45427e56a41f6030836129a7fb2824ea47f1000745a8c74b0968c61f719d3cef9a0e02f51009b8e91c4ad66445c074ccc203754bb13d82007316a3d053c60 SHA512 4ec7e04fb6bab697bfccd369740a57f735476a4614dbfa1f7c893901f5ffb9d6ce3d79886b6e035805b1a8f2c3de3e0b9b468b08909881df6022c9700c7a2768
 DIST puppet-agent_6.15.0-1stretch_i386.deb 22917002 BLAKE2B 5bab2b6cdde11a46e64996074e8db50d48d004b601c0d08ddfde9c8dec0c0f62da1176b9148d084f0250b582460606b7cd0a97291d157a186b7a97dee4184c51 SHA512 89e676491f7b7b44c9c747b129166db7b025adf76d9911d12d7d026aa8d04de293d3d1c638ca309ee8ed45a37c49b4ab0076ea0c711ac0e43f4297084446784f
-DIST puppet-agent_6.17.0-1focal_amd64.deb 22317432 BLAKE2B 570ef37c8e170ab1d615782322c895b0eba3193ac51dd221a8f9597c34c923c36874a5add1cf1074160c86dd4c4acc3ff1b65709cee2c0cddd84abe57c300faf SHA512 541010d896c891040154b22eed3f2e39b026cfef5669c95016ba1aa5b919002fcf2b8d2a15cde8efd104fc2e0699a8cb5cc3914bc039a27280f97f7f67d7b153
 DIST puppet-agent_6.18.0-1focal_amd64.deb 22258752 BLAKE2B 547d06b16b2c95ec9be72bd82e1aa0a4a4b511075da73f29ebecdef32ca4ed9b965a38a7c071d9bcc8c444b6974159df97f020878c0e4a20d1f50ff23d4c1129 SHA512 00f0cfd96176f5311f0bab14016ab88da03ecc10fd9e2bf28fc2d9a399600c56a97e23095694be5382005fef0df1c4fe3ff0d1aec3a46d85f74c729a3c62476a
 EBUILD puppet-agent-6.15.0.ebuild 2016 BLAKE2B 4f4382314410a9401868382b65e5ce627e9c706120dc21a537b71b390bd56480988b36e51f000303542d8711f2aebd47860605e8f52087c895e9453d2992a84a SHA512 45a7eaf2fbd6c66b672943192a92826ee10da6f0ba3a4d8cdc6c9ad2103d2fa534587dc31f5505bc8c9a23474e604ac58af0b328723668cd772a1e75fe6d0d5f
-EBUILD puppet-agent-6.17.0.ebuild 2067 BLAKE2B fbaa5ddfc2c3085a877a0adb546a8ced6242fcfeffa180cee4588dd6ac0f35ef15b58869f1b22dbc4d92b2344780ad64ae9ef41fa6a46f71bc50fd2f89031ea5 SHA512 154315c97b9ec493d6923e066df73d58a33e6f0c7bc33162d8fcb5b5eb86df3ebd7af93d9cc8a0463d6d19f7650209610fe391a5b530b7b57e147738cc567d9e
-EBUILD puppet-agent-6.18.0.ebuild 2068 BLAKE2B fa894f7b4b85afe9cb403d17617ae13ef9bdd566c6ff5e70edfeec2fd3733c3f5b93c2cc08f4f7b35112d2f8d3af0f3ce8e99abf865f345b3e3bea46ac788de1 SHA512 55eaa06a91b994cd4422f0a7c3f67cd25317729a96110e28a291bf2965855f1cd53aa731fc920ad424d27a80ad210aac2f9e6046c44116b363729193791032f8
+EBUILD puppet-agent-6.18.0.ebuild 2067 BLAKE2B fbaa5ddfc2c3085a877a0adb546a8ced6242fcfeffa180cee4588dd6ac0f35ef15b58869f1b22dbc4d92b2344780ad64ae9ef41fa6a46f71bc50fd2f89031ea5 SHA512 154315c97b9ec493d6923e066df73d58a33e6f0c7bc33162d8fcb5b5eb86df3ebd7af93d9cc8a0463d6d19f7650209610fe391a5b530b7b57e147738cc567d9e
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-6.17.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.17.0.ebuild
deleted file mode 100644
index c33a9ee73c47..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.17.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what
-	acct-user/puppet
-	acct-group/puppet"
-
-DEPEND="
-	${CDEPEND}
-	app-admin/augeas"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/libselinux
-	sys-libs/glibc
-	sys-libs/readline:0/8
-	sys-libs/libxcrypt
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
diff --git a/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild
index d2a6b4ff967b..c33a9ee73c47 100644
--- a/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 5e28f97a52b5..e5cd955308c3 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,10 +6,8 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd SHA512 996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3
 DIST puppet-5.5.21.tar.gz 2997149 BLAKE2B b42fd79132ce0aab02724c7aa38fc39a216df38266b9ee8078b433860b675f36b3c4da0d13d8fb456069250e6cb6470686c83581bc6b57801a44375f829be195 SHA512 b33191c104cb58fc842d065c3cf7dec8ce723ddc9b273c930f56692e252eb6c51bc3b0442db6500cf015fe24ec3eb133428aa09d845ca92b05de2da39bce8bfd
-DIST puppet-6.17.0.tar.gz 2901101 BLAKE2B 59e75d1b2a8d02285ab867d3b63b1656e29c418f4844b21100e135b306e16f82284690565e5354f515499ec7bc0e2ff688308e077cc4656076a38f49bb1bedf9 SHA512 2ebf31cce1dcc4ce0bf9403f56d3f97a41a4014111be1f27e340de8e4db157549bc4609068ee6396be3c88ff1a93b40792692a5b01140fa66a1f5a82453ba1d1
 DIST puppet-6.18.0.tar.gz 2911742 BLAKE2B 75ecb14a0cf96c1c54d09f88f91984805834288a166e74c5b9648d5f9ad60a6c279100f32f148659772a22fc01d21345bf765ed47518bfa9bd81d06c17587efd SHA512 a14994aea502fbc78219967e2d711952b580df1e7befeab2d254a73f28036c6c7923d167a20bc61c9abe76000f93dcd3cba92b3353540e2a26fc27b10b06efe1
 EBUILD puppet-5.5.19-r1.ebuild 3692 BLAKE2B 7aa03944368b7395b4c587230a39536db28d0a46352bd5c6f7ec457ca29a3e6d9a3672a9b74591d3382909dc4f9ecf6ec73853ad5722b26becafb5c1a1264912 SHA512 6012739c4d92cf576ea482f99e9d560633103116b40be7df8cc3a9e89f9efeef3e02317dbbed1207a91c5372ef7702d723c37207488ecd6ececad5d0df6de9a2
 EBUILD puppet-5.5.21.ebuild 3757 BLAKE2B 84bc423625d9ec703ef345fd0bbc44241e5abcd4c964290778a84a636e30a7b87153bb5c450a7b9e61f488279f28553969eb777deebb6ef22c923929b28f3b2c SHA512 cd1be53da064ad5641de2d4566f36f9733201c92ea68b3d36b416a8f786075d148a9a7f48eb1a67eca3567016f381bbc86c2a4dd6f4e3919befed2ae0bb75196
-EBUILD puppet-6.17.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
-EBUILD puppet-6.18.0.ebuild 3639 BLAKE2B 818e60019ca433e92b51946d2ad453c16a844820a5edbd91d3acd1a08b654dfdeb441dffd52ea4ef1418b1e4e0194df2391aae93a9d959b4f9dbb4121182bb2c SHA512 85bc153ff019d9db4cbb5eb334662b2c39e293abb646480122d141fe1f84b49fbc98b3f255e8877b421d1274c7fc3946dc6cf28a3ff8dfda437e7b7661243678
+EBUILD puppet-6.18.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-6.17.0.ebuild b/app-admin/puppet/puppet-6.17.0.ebuild
deleted file mode 100644
index 11fd2d3c5085..000000000000
--- a/app-admin/puppet/puppet-6.17.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppet/puppet-6.18.0.ebuild b/app-admin/puppet/puppet-6.18.0.ebuild
index f50ee1410b08..11fd2d3c5085 100644
--- a/app-admin/puppet/puppet-6.18.0.ebuild
+++ b/app-admin/puppet/puppet-6.18.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 384693ac6705..2916e3f75536 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,7 +1,5 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-6.11.2.tar.gz 44799680 BLAKE2B c40048d1fe6cf62371f2adb1a5361b34b1f46e6b344a7565ad9565f2ec4ae3cf1bd4927904c797be92c223dcc98e2302359af753228d09424372ea894cd5d5aa SHA512 af5d5f61147e8b67812af405b3b087897925869a62eb0749a5a59ae72e76bdcfe95879b0cb6d993ee85a00c44c6867e1864c0d22ceac7b854bca248ae1a00ccc
 DIST puppetdb-6.12.0.tar.gz 46375914 BLAKE2B 7d1a884881e9aa324b0d2a8cd49bf47e4014ff6bc23e94c76c27b3736c75f3cdcead76aea159de17ce1255381e32bb126f9cbf55297f64454fcca6ffd7f28b46 SHA512 040f8653c422e312857f82a8f040a33128f49c7900978a22b9ae672172ec41d2037e323de5aad3c50a630058b6b95c025bae05b3ea923e2321e94f97390998dc
-EBUILD puppetdb-6.11.2.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
-EBUILD puppetdb-6.12.0.ebuild 2649 BLAKE2B 61c2280603f62775d7e3c06142c0bad6d28795dfd396c45c73680e7d33b034e8f656994a21b304e438f89fc9d700e722bdbbc94dec544cda0f6abbe560c9d1e1 SHA512 1dbf062b0f95659020fcd4ec207aeb658a62e35e74f868d95c91ccabf1115b22536be505fb2de84427a6506c47ecd7cbb3ca0164f618e4d297b921a629065b6c
+EBUILD puppetdb-6.12.0.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.11.2.ebuild b/app-admin/puppetdb/puppetdb-6.11.2.ebuild
deleted file mode 100644
index 784885ac312f..000000000000
--- a/app-admin/puppetdb/puppetdb-6.11.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+="acct-user/puppetdb
-	acct-group/puppetdb"
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-6.12.0.ebuild b/app-admin/puppetdb/puppetdb-6.12.0.ebuild
index 5a7a32bcf49c..784885ac312f 100644
--- a/app-admin/puppetdb/puppetdb-6.12.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+="acct-user/puppetdb
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index b964471ce60a..8d8a9e6d7bc2 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,7 +1,5 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
-DIST puppetserver-6.12.1.tar.gz 60422470 BLAKE2B fd3fa33262a5ae83fb6889079a85c262d74d55b0ffb9ed297d60399c442d7a1676cfc54afd3e25721d6e4a4ad926c43a1f8f1a9db206ee6145280601c501fe09 SHA512 9ad5d3e266f91b8a1ef09302a1f8889f139909fb20268f714fb894dcff2379a01c78baafdab1102a26c26903cefe92ac833c2b20e9ea6f8d379af2dd11c20407
 DIST puppetserver-6.13.0.tar.gz 61890579 BLAKE2B be514b3c41dcc018715e949f1f1c86317499baa22fa70e5f7e8df89211b566651ab4de469afadf14fcd1dbc9b1d0b0c21452c313f74052eb8d65bbd591231194 SHA512 ab67ebf94c37a50999a5597e1ceeadf606296c2b6e557bd6ee2bb99ac44b7c8fe8df892f4e3bccb9f0e3822fc480f61a27d6799b7dfc8df12e058c7074d589f9
-EBUILD puppetserver-6.12.1.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
-EBUILD puppetserver-6.13.0.ebuild 5329 BLAKE2B 5c95f3bb71eec4b03add549fb79d3217d8d27011039aa0cf4aa41e7e405713dbfe42134f1b4f28926d41acb2d8766c5b648c7ce508bd5141e6bbd409460c9aa8 SHA512 79e7cac0efab3c480be57f739c17bda61cc74d05cd8541de20be5d2ab64524c33ebf5793e9369d69fc65f55d6c46b8a6501163bd6e2ee4ffb78263094018e58a
+EBUILD puppetserver-6.13.0.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-6.12.1.ebuild b/app-admin/puppetserver/puppetserver-6.12.1.ebuild
deleted file mode 100644
index 5385eacc0c94..000000000000
--- a/app-admin/puppetserver/puppetserver-6.12.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
-	acct-group/puppet"
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	dodir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	insopts -m 0644
-	insinto /usr/lib/tmpfiles.d
-	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-6.13.0.ebuild b/app-admin/puppetserver/puppetserver-6.13.0.ebuild
index 94b63776bb90..5385eacc0c94 100644
--- a/app-admin/puppetserver/puppetserver-6.13.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.13.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
index 9658b9a2beb7..ddbdac998aa5 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -3,10 +3,7 @@ AUX sagan-1.0.0-liblognorm-json-c.patch 2840 BLAKE2B 569957ec95bf5fc5bb1e844ba1d
 AUX sagan.confd 239 BLAKE2B 2ca76c1bd5bdb7b29f007a4d93602f020f76b10d6e4313e138e09b49de0b0c6796bc729f32e88831881bdcd52637bfb3a8e42481d89a09648a2833a000570ace SHA512 7ee746984d3bb3361e3155860d54e307f9b94b9e3f98c09c29b4259cd37d7aefe969b5b942c04048328ec23265a2689b22403c32e3552b8062201aca2ef3ac34
 AUX sagan.init 432 BLAKE2B 561344909a8f6610504f91bf72ba6fa89ac03fdacacd3189372f466b690b3421c3f1a8ce4750b747c53613c75f9b61696ec7b3c490597eb0eca36ebece23a26e SHA512 c5ec82e48ac33785a0e63deb6b2079e97a2f9b5f96682ccbf646b4deae5782cbceb5756b17fdff7af8cafd4e561e298d842c4c4f4aa5229ccc58f5f0fc06e6f7
 AUX sagan.init-r1 424 BLAKE2B e6fdd676e772d2abfca02215026a95321edecb41fcbeec3aa45afe15abd667e323ec2f21375d41c692b9648017002c0b410d551034dcbd3f060f5bb1e2f95026 SHA512 341754a9b18fa4b4082a852cec2eaa5ea78be33eb9d8cdef5b7ec61a9d67d3b264b2c6a2aef030bd85d3644539447345c88fd23ebe99145e40f990f565706809
-DIST sagan-0.2.3.tar.gz 231774 BLAKE2B b385a4b22f2fe7567dbb0c52ec022794eacf057a0dc797daa0432ef4bdfc344473a500298825f56a32513025e9c7cee3ff70fc577d7a9454e87022510a71edb4 SHA512 2110f3d34db69cb5c453b8e37d06debeea7531ebf15a9b78954ac1657ddce34feaaff87d14695759c3deb2eed5ecc0e6fec5881fb5037af8efa6c3c9600242cc
 DIST sagan-1.0.0RC3.tar.gz 285207 BLAKE2B 7322ffc73a8e86f07ef106b04feb9140ba94a51b9e286ef0c0b0d3fa609e8e03cef4c75e1d32502c1b70a4c078d8601d2a1c58058137bb793c8a52cecc4be20b SHA512 29388a339b290bb4de2359c0c54b9e1d43ef207b223a499a1a4faa36de4d9590a777a796dd773948e995d052b71f3ef47ca5bad5c133116c4dbb53b4fe336123
-EBUILD sagan-0.2.3-r1.ebuild 2036 BLAKE2B e6c21884fdcfb2facbd58710bf392a8f1035fa1b618a0e681b36ae8cbe5c15c4f4a7bcd23688b78ec54741bc0cdd7f20c3be49f20b0f9b9f5c847ee85944941f SHA512 480306cf980503d7be31af758a4ea1f9e4b7d8179b9aa0f2fc4bcbf3be78b5d16c9cf900b07daf3bb1c5fb94ce73e4c78ed6da8ac0f423d5339d9d334786ade8
-EBUILD sagan-0.2.3.ebuild 2024 BLAKE2B c3d9db48c8aa738f812ce22b5c3c1ab4ed436b8130480a30f7daad2f64dca7d425fccfec0668c96bcd18ee2fd5a4f3b49b8c1f785eaa9d4030c8865f0327cc69 SHA512 892c84a08c01258e6cafb52c8e5b12fcd38b4644c9160645baf39cf37dd1e270b951e9dcdc8aa1c720445b89f9848fb3905cbe7b806ad4e292be3f0f1d72be40
 EBUILD sagan-1.0.0_rc3-r1.ebuild 2248 BLAKE2B 602ea4352f8a83d55c53e26136d44613f6fce83bb8adfd40d58a1bd5c0da57b3dbadecb723f37680b7def468729c30fec1e9fad28801ca5b322a14a5dd814115 SHA512 0739f9f740e3468b848a1e446ad22f2bf1e0fe988a0a0a56873ec26284fc3cde41eba8aacc2233679706b2d9730a4fe2c1588be5f456ee0a52eb15fe96528732
 EBUILD sagan-1.0.0_rc3.ebuild 2080 BLAKE2B a82272fc36cbd9eafa62cf7da9bd0b412c06f4d235861be44be21fd811fddcbe299e75dcdd56370787a3f9f35c47592a3dcc2d9608457e532ce1c0ee3dc68c44 SHA512 3dcc104b0f36a134cc0217c7c5f6373d13a6b479f8f97545953b8c551d28c330515176914c9f3447211a5c6882c68b90e656e53d61a9221489e1229f6302344f
 MISC metadata.xml 711 BLAKE2B 19677ce6a88bd62ae22cc1383a8f671082c0f2b844d3e75344e5ff3aa01bc51e4826b3c02f30221af0f9b2b620e9bc9ccb2a6c55944d1b34de072c7f985531eb SHA512 0ddee4d50afea4e3813b9ffc57d444b95c56773f58a469e28d99a85bda787143a23f4adae995632283b2ec5269cbe38e3ffecd294448c675169c4ef10033afb6
diff --git a/app-admin/sagan/sagan-0.2.3-r1.ebuild b/app-admin/sagan/sagan-0.2.3-r1.ebuild
deleted file mode 100644
index 99142b741816..000000000000
--- a/app-admin/sagan/sagan-0.2.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
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils user
-
-DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
-HOMEPAGE="http://sagan.quadrantsec.com/"
-SRC_URI="http://sagan.quadrantsec.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+libdnet +lognorm mysql +pcap postgres smtp snort"
-
-RDEPEND="dev-libs/libpcre
-	app-admin/sagan-rules[lognorm?]
-	smtp? ( net-libs/libesmtp )
-	pcap? ( net-libs/libpcap )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:* )
-	lognorm? ( dev-libs/liblognorm )
-	libdnet? ( dev-libs/libdnet )
-	snort? ( >=net-analyzer/snortsam-2.50 )
-	"
-
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
-PATCHES=( "${FILESDIR}"/mysql_check.patch )
-
-pkg_setup() {
-	enewgroup sagan
-	enewuser sagan -1 -1 /dev/null sagan
-}
-
-src_configure() {
-	 local myeconfargs=(
-		$(use_enable mysql)
-		$(use_enable postgres postgresql)
-		$(use_enable smtp esmtp)
-		$(use_enable lognorm)
-		$(use_enable libdnet)
-		$(use_enable pcap libpcap)
-		$(use_enable snort snortsam)
-		--disable-prelude
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	diropts -g sagan -o sagan -m 775
-
-	dodir /var/log/sagan
-
-	keepdir /var/log/sagan
-
-	touch "${ED}"/var/log/sagan/sagan.log
-	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
-
-	newinitd "${FILESDIR}"/sagan.init sagan
-	newconfd "${FILESDIR}"/sagan.confd sagan
-
-	insinto /usr/share/doc/${PF}/examples
-	doins -r extra/*
-}
-
-pkg_postinst() {
-	if use smtp; then
-		ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
-		ewarn "email, create valid writable home directory for user 'sagan'"
-		ewarn "For security reasons it was created with /dev/null home directory"
-	fi
-
-	einfo "For configuration assistance see"
-	einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
-}
diff --git a/app-admin/sagan/sagan-0.2.3.ebuild b/app-admin/sagan/sagan-0.2.3.ebuild
deleted file mode 100644
index 64c6a49c8ba3..000000000000
--- a/app-admin/sagan/sagan-0.2.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils user
-
-DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
-HOMEPAGE="http://sagan.quadrantsec.com/"
-SRC_URI="http://sagan.quadrantsec.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+libdnet +lognorm mysql +pcap postgres smtp snort"
-
-RDEPEND="dev-libs/libpcre
-	app-admin/sagan-rules[lognorm?]
-	smtp? ( net-libs/libesmtp )
-	pcap? ( net-libs/libpcap )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql:* )
-	lognorm? ( dev-libs/liblognorm )
-	libdnet? ( dev-libs/libdnet )
-	snort? ( >=net-analyzer/snortsam-2.50 )
-	"
-
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
-PATCHES=( "${FILESDIR}"/mysql_check.patch )
-
-pkg_setup() {
-	enewgroup sagan
-	enewuser sagan -1 -1 /dev/null sagan
-}
-
-src_configure() {
-	 local myeconfargs=(
-		$(use_enable mysql)
-		$(use_enable postgres postgresql)
-		$(use_enable smtp esmtp)
-		$(use_enable lognorm)
-		$(use_enable libdnet)
-		$(use_enable pcap libpcap)
-		$(use_enable snort snortsam)
-		--disable-prelude
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	diropts -g sagan -o sagan -m 775
-
-	dodir /var/log/sagan
-
-	keepdir /var/log/sagan
-
-	touch "${ED}"/var/log/sagan/sagan.log
-	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
-
-	newinitd "${FILESDIR}"/sagan.init sagan
-	newconfd "${FILESDIR}"/sagan.confd sagan
-
-	insinto /usr/share/doc/${PF}/examples
-	doins -r extra/*
-}
-
-pkg_postinst() {
-	if use smtp; then
-		ewarn "You have enabled smtp use flag. If you plan on using Sagan with"
-		ewarn "email, create valid writable home directory for user 'sagan'"
-		ewarn "For security reasons it was created with /dev/null home directory"
-	fi
-
-	einfo "For configuration assistance see"
-	einfo "http://wiki.quadrantsec.com/bin/view/Main/SaganHOWTO"
-}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index d26b326a5386..a79bac69264f 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,8 @@
 AUX sudo-1.9.2-glibc-2.32.patch 10057 BLAKE2B 2027bbef7db5f4a523959e9456ebe625028f55607a22869bcc7deb9ec3787d28d3955fc0a0670976c557f070fa31a56bb167d1c6618f955163a240f852c5a4f6 SHA512 de7147130e923ce083637231f5e5a6dcf41cdd1a2bf901754b573239898d144938ebaaa55a8b1cd44138f313bfa59de6b8eac5d18ecb7c61e501dc0213f144b6
 DIST sudo-1.9.2.tar.gz 3890859 BLAKE2B 879917b8045c999a17ef36006732509aa546ee6bb04de77191fb637aa0420d54f9e51ec69b697c22119d638393e9c84efcc1ca5e6e8ee5f0c08bb1ca07f3acea SHA512 20afdf2604b1c93395157382b24f225cd1ff88d3a892362e2d69fecd240c4e7171f05032c08be1778cd1dea6e460025e4241f57272fac0ea3550e220b6d73d21
-DIST sudo-1.9.3.tar.gz 3956793 BLAKE2B 9bfd486806513ee9163c0904dac790a88b11ac8cf620ef08563984454fa51a9fab945300c8040f83a2a5a9264faa521deda7b76efa0b15e5f28374db8d5a26aa SHA512 21b59aa20240ea45dc7211ca7851cce104da462dd237081f9a79bcb8362280f6ea264c1c54d59de58d1375d45d8e10827848591bcfd3ec889c66126bee438544
+DIST sudo-1.9.3p1.tar.gz 3958071 BLAKE2B b681c120faa5dc7f25e27c1be423d68cea70f63dcdfea2183fd386a34dec0376555453399d3f8886c66c6507343648d40b59a058710432154061b210df2a704c SHA512 3ad13fd03e5b371fd6bf7909731ffc11431d2182a744b654f7e5d4b810e47955d49bc78f551afe13ec56acbce694139c33a15bc022cea41b17af5496b8b7f89f
 EBUILD sudo-1.9.2-r1.ebuild 7013 BLAKE2B db8445fef0e42c472efeae9210c773b89145b2a578a6705ab77b8dcfe56ce976e5f0a747bb3884dbd8741facc6ba7051517315a644cfbfc01a90958b271e336e SHA512 e76ff722a7dea45b23f7144fce001c05ce1fa12348ca8ec0e586160b69dacc99e9bc8b877962b525b94255517f7d1d862590e1a73cd436791f7b8985dc17a7a8
 EBUILD sudo-1.9.2.ebuild 6922 BLAKE2B ca1543dde3d569c92ea36d494ac8c11eb9c6fccfaf1c34696cbf7e37e8f88009c9805fccf658423fe6898493289383d3dfb1562a6a99e8f17fab9b4d7e84c76c SHA512 8559891753c2ee5679edefffb878a21be2c861fd07427a760d79e6aecbfa0cabba3a8ab8a1bcd56b5c1e1ca5d454c657360ef00ad1de9f0c868d32627a3a9ddc
-EBUILD sudo-1.9.3.ebuild 6931 BLAKE2B 3e606d2d8186da9b882969e864f90c34bb0b473589abd9e114550fe945a60076e159262085cb3766d14ba061806334ceba3665b2fc37f22e2f589c819335c9f6 SHA512 ff619dd0a8d6842a2bae2cf564cf58797c3ce63bb3acd1fbfe14ebfd511018ea8c3fe993002ed1278fda4403f9e413198c19a69623f0e6548dfb6597c554f357
+EBUILD sudo-1.9.3_p1.ebuild 6931 BLAKE2B 3e606d2d8186da9b882969e864f90c34bb0b473589abd9e114550fe945a60076e159262085cb3766d14ba061806334ceba3665b2fc37f22e2f589c819335c9f6 SHA512 ff619dd0a8d6842a2bae2cf564cf58797c3ce63bb3acd1fbfe14ebfd511018ea8c3fe993002ed1278fda4403f9e413198c19a69623f0e6548dfb6597c554f357
 EBUILD sudo-9999.ebuild 6821 BLAKE2B 6ec4c8325e4275d902df02e971ca9b3e87a24b312cabcec7909c8ce94c4662aabada79fe550305603ad92151483bb3ba02a92b1ac49807ed0ba6fa7b14da0f12 SHA512 92536adcffa6e1c62e701d7a00a9032a60d559aa114d196e9851f198321ea8d027e9f7caf598f9d0eae2182362520a3c1ba62117d13b8e8b8ed6c5d9f212e7ac
 MISC metadata.xml 1161 BLAKE2B 0c501bf06edca82993ece857f9f7565f99da15df36c916bc9dc57e78bccf2b247c382e97dd6c97cc7f5375e1a0513c1a30ecbf097516e96319fd1797257fb117 SHA512 d6bc9cf11ea1bd28c19bfe167580556af517d92c958d63cd7872ab5076840eca39a7ab3d1f56e84fc0fcfb675d7a89c23ccdd3629f665c45232be1140eb950ac
diff --git a/app-admin/sudo/sudo-1.9.3.ebuild b/app-admin/sudo/sudo-1.9.3_p1.ebuild
index d0873828489a..d0873828489a 100644
--- a/app-admin/sudo/sudo-1.9.3.ebuild
+++ b/app-admin/sudo/sudo-1.9.3_p1.ebuild
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 25027521ac9a..43e488d50cd5 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 9cb0a7f9dd5b..0f58e6113790 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -22,5 +22,5 @@ AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1a
 DIST clamav-0.102.4.tar.gz 13234444 BLAKE2B 7109da3e2281472032777b8a9d14ca6ff345aead33e5aaf0b9d1ff4721459926062f789dd1f7e8637155e4b9f3bce9f78127bf450f32baf3f1006b8083d3431a SHA512 29893deb8d2d913dff72331875d3dc3a10356bfb254ddfe1c1933b3ea4f8b76c96a1b840f95e72be36cbc0e00b9ec35e395225ef264761f53e709bb1026a4f09
 DIST clamav-0.103.0.tar.gz 13357078 BLAKE2B 6c4b05043f560a56f967642094ba4a9f9bd52268994ac43a99446650a78dafe0ec851b9ebcfe95f3e216fd7942e4756f2e20bda67ca9187e55523fbba9ca56d8 SHA512 e0712ed3c068dc8dab1d31b7cbc19cd69c62875fdcf314abb28e6f42660daf162a3aae69e0a008919e7b809675b68d35f79d3cb98379442bcbc6f5c8ee4313bf
 EBUILD clamav-0.102.4.ebuild 6960 BLAKE2B 292ee4bf55f790a6002f10d4ea040272af557665e5251338d34a43760ffcb667c4fae1f581193425d3555c64b7dc71198621fe09309a9c2831b657162c71a5ed SHA512 8932730bfa50b9b467e3f59256b51054a51a12b52d9c54fb0b4c0b80ce06e8e897d4dd90b2b0044b3b8913a44d5c7aaaee3a177c821e7efe99af1fb4d52e3032
-EBUILD clamav-0.103.0-r1.ebuild 7195 BLAKE2B c18b4ae4563472beda8125f2e554414ae8af01c11532569e92b3a45cbc6ef2dd30db1e6b2eb7e8ac0a8d4a511989b50b2e1d4bb623fd547bf82c7c45d1f1832e SHA512 acc96f49d8fc669ed0ccb69b9a8043058fd03be12568972f7349b9e1c67746cf008712499eb3215395556a957e7cebdc41540d57f21cc89ff827148922ffe2ee
+EBUILD clamav-0.103.0-r1.ebuild 7363 BLAKE2B 270f546a204e8d863f45526630869e1ced9073de929903b4ad9c81b2b9684c3880b1395c6a467a92b5dabbdc6d236aee04b20d876f0ed0b79a3a0611f658d08f SHA512 0d38b9dd2808cad34941272458d5a439580f5838d1ca30b5753c1216cde16e4e25b833cc63819e75d74c0b7e877b53ab5f92ee46297c0b8f96801fc33ec9a658
 MISC metadata.xml 933 BLAKE2B 867499e23131bf714cdddd911ef727dc6e487be8c6f0be1985611bc2ce8bfbee639e114f8ade6a6b9418095d03a45095030168912ab21484da81385c53255b05 SHA512 c0a3132dbfafbdb8852d621de187cfbd5daa30ab682593b88c77278e0c8a58fb57ed1427b9f8aa798926ccc94db4a19eeec77915f06de9b0cd182237aa77a892
diff --git a/app-antivirus/clamav/clamav-0.103.0-r1.ebuild b/app-antivirus/clamav/clamav-0.103.0-r1.ebuild
index 4217bc62b775..52721c9856a2 100644
--- a/app-antivirus/clamav/clamav-0.103.0-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.0-r1.ebuild
@@ -39,7 +39,10 @@ CDEPEND="acct-group/clamav
 	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
 	xml? ( dev-libs/libxml2 )"
 
-BDEPEND="virtual/pkgconfig"
+# We need at least autoconf-2.69-r5 because that's the first (patched)
+# version of it in Gentoo that supports ./configure --runstatedir.
+BDEPEND=">=sys-devel/autoconf-2.69-r5
+	virtual/pkgconfig"
 
 DEPEND="${CDEPEND}
 	metadata-analysis-api? ( dev-libs/json-c:* )
diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest
index 2d3c6679bc7c..176e32e8bc71 100644
--- a/app-antivirus/clamtk/Manifest
+++ b/app-antivirus/clamtk/Manifest
@@ -1,7 +1,9 @@
 DIST clamtk-6.05.tar.xz 230076 BLAKE2B 577a2f6cec4cde7d72be2ee519d3fb26b9b713f199f1b526eea8a4bc3fd997ca60ceff1c2478fea568c27a648a16f1962c406c7ed00b75c3e545d4ee0f6ece45 SHA512 d7d49c186cce226649f9b449802a1ada52ddb51e2954de16ca379618e0ab8517ed80f934e2ee0f03d5dbc6c0fd2015f76b0f32230e0a526d71008692dd817fd2
+DIST clamtk-6.06.tar.xz 232024 BLAKE2B a9a7310410f685bb6cae24ae6cee45b31a524b88cf75c9346617614e5dba43f3942d39dd6d484d656906c3fbb2122ab3858ab017c0e79d5ed9271b2968b750d2 SHA512 ee4d09e0f3c703bef5a1b3e1bdc97d3d1d91998c98e82a2fb1e3326fa8fdff32d7bbef7d9e2bf2b6292fa1982b1efb3b5cdb4cdd7afb17f6ffd0e089d8b4539a
 DIST clamtk-gnome-0.05.tar.xz 15148 BLAKE2B d72ad0c9b3272c1a21d3722994152e23aeb01bd79d006cbcd3545c2689887b4f596daeeef72a13d9cdd9cfc89c4091963b4a1917824bbb06be4678f2c446a114 SHA512 a5d3b0e87889880272aa61a0feebca8e885c7fa964bad767351c826188c236f2152b3c43328b6aa720c5942b2bf1da69916d3664358c274813a6ac032ee4dea0
 DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee73581c5d1d400c1b28908c5ea2524a8f5d1110b1e949038378613fb4d5607d5123eebe91df695a53d0dd489302 SHA512 145ddd349010e0bb6fe3295e50d6e15a2dd96e604babbd5de4cb49ba75169d2050777cac38e40ac6a64cb89ddf94025d610aca73136c75f81115d0a2d863d24e
 DIST nemo-sendto-clamtk-0.04.tar.xz 4228 BLAKE2B ce656d4f021bc30cd12fb2ee5f98a78c1f1fdb2460ed2cbba0b572408617f91b39b2ca2fe542b9cec7be79b4b9fdfd685f5553e1a671454ca1e6723241dcb805 SHA512 2b5d3abbc4ae5dbc71b1b7bc836df88ad51e6afa00d5e954b5c1355a70c0420b6fef895e1cb5cccb86a662aee2039cef6c01821c1347fa155b5da3529b25562c
 DIST thunar-sendto-clamtk-0.06.tar.xz 4416 BLAKE2B 6b9f8857fead9f175af0a5fd3585790c49865b07016ddbc0dfc21f761ecbac32d97a65731fdca0335fd4852af9efc93c06ecb994f769a5efeade35cb734e9924 SHA512 f3b6f296213ad5974f8134d682cce4e426d9730d1898e8f7ea474e27314ee47957b033bbd7f16196cabf054eccec844c05ff8c8f9a98ad013a7f89b899cee591
 EBUILD clamtk-6.05.ebuild 3803 BLAKE2B 73a137c5ca828a794493b7b19771a6a76eed6130453ba52593af59a0f4b80effb95f9d9d87f9040c5e1cc746688a18271bb3bbf0c51b3ec0b4bdc2f46047ace2 SHA512 20a9b5ef9f8178f25b89b4266f04f4408ed7d6d2447fefa63d6ae7eb19bc2f509840b92c4399f3c2209b37d14002c34777cfcccc9045137be643bb14e0e3a25b
+EBUILD clamtk-6.06.ebuild 3805 BLAKE2B 0b76cc3d64e3f15ebb66dc3da58d46e84ab8bc3ad497b12ddf5b5bca57143bfb78de56aec60f197d5d2778157d53f8136f2a744649f481f68908d796d5380954 SHA512 e7a91930d53b4d9d87e0a4b5cb2e93e5bcdc4a5e44ed69450a1401c22e4a8ca55aa5da3bb81537ee723f6d58ec69df6517a1f024db645e8154b2a496ee8a5004
 MISC metadata.xml 809 BLAKE2B 6c61c6d564fd120a1996f0620eb94af868a19a4a2178ebf694bda8f7a926b42848723911d2b45ed6a8199a969802d62e574422d22a76163fea2eb8d053553236 SHA512 984613fcdc7d6c2dd02475f3a9ca0f1e68e66c59961d9e43532722b5ac4c8022a4daff30742eec959da5317d4f3e10c2608538b50bad5b4d95af5ba7731f75b7
diff --git a/app-antivirus/clamtk/clamtk-6.06.ebuild b/app-antivirus/clamtk/clamtk-6.06.ebuild
new file mode 100644
index 000000000000..51d6b124ca0d
--- /dev/null
+++ b/app-antivirus/clamtk/clamtk-6.06.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit desktop perl-functions python-single-r1 xdg-utils
+
+MY_PV_KDE="0.18"
+MY_PV_NAUTILUS="0.05"
+MY_PV_NEMO="0.04"
+MY_PV_THUNAR="0.06"
+
+DESCRIPTION="A graphical front-end for ClamAV"
+HOMEPAGE="https://gitlab.com/dave_m/clamtk/wikis/Home"
+SRC_URI="
+	https://bitbucket.org/davem_/${PN}-gtk3/downloads/${P}.tar.xz
+	kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz )
+	nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz )
+	nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz )
+	thunar? ( https://bitbucket.org/davem_/thunar-sendto-${PN}/downloads/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz )
+"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde nautilus nemo +nls thunar"
+REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-antivirus/clamav
+	dev-perl/File-chdir
+	dev-perl/Gtk3
+	dev-perl/JSON
+	dev-perl/LWP-Protocol-https
+	dev-perl/LWP-UserAgent-Cached
+	dev-perl/Locale-gettext
+	dev-perl/Text-CSV
+	dev-perl/glib-perl
+	dev-perl/libwww-perl
+	virtual/perl-Digest-MD5
+	virtual/perl-Digest-SHA
+	virtual/perl-Encode
+	virtual/perl-MIME-Base64
+	virtual/perl-Time-Piece
+	nautilus? (
+		${PYTHON_DEPS}
+		dev-python/nautilus-python[${PYTHON_SINGLE_USEDEP}]
+	)
+"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" )
+
+pkg_setup() {
+	use nautilus && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	unpack "${S}"/clamtk.1.gz
+
+	use kde && unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
+	use nautilus && unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
+	use nemo && unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
+	use thunar && unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
+}
+
+src_install() {
+	dobin clamtk
+
+	perl_set_version
+	insinto "${VENDOR_LIB}"/ClamTk
+	doins lib/*.pm
+
+	use nls && domo po/*.mo
+
+	doicon images/clamtk.png images/clamtk.xpm
+
+	domenu clamtk.desktop
+
+	doman ../clamtk.1
+
+	if use kde; then
+		insinto /usr/share/kservices5/ServiceMenus
+		doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop
+
+		doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm
+
+		doman ../clamtk-kde.1
+
+		docinto dolphin
+		dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md
+	fi
+
+	if use nautilus; then
+		insinto /usr/share/nautilus-python/extensions
+		doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py
+
+		doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png
+
+		doman ../clamtk-gnome.1
+
+		docinto nautilus
+		dodoc ../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES ../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER ../clamtk-gnome-${MY_PV_NAUTILUS}/README.md
+	fi
+
+	if use nemo; then
+		insinto /usr/share/nemo/actions/
+		doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action
+
+		doman ../nemo-sendto-clamtk.1
+
+		docinto nemo
+		dodoc ../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES ../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER ../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md
+	fi
+
+	if use thunar; then
+		insinto /usr/share/Thunar/sendto
+		doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop
+
+		doman ../thunar-sendto-clamtk.1
+
+		docinto thunar
+		dodoc ../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES ../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER ../thunar-sendto-clamtk-${MY_PV_THUNAR}/README
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 40d5cf92ef4d..fd8c9e9f216c 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/alien/Manifest b/app-arch/alien/Manifest
index 182f53549941..b002e230ff05 100644
--- a/app-arch/alien/Manifest
+++ b/app-arch/alien/Manifest
@@ -1,5 +1,4 @@
 AUX alien-8.95-tar-extensions.patch 733 BLAKE2B 75aa07b9c3b4b3e48d381309caeef41ad312c7d71c81958eb74193752276240dcf6ca91fbf5a4dc6279a35cf6a6c90e77a11ee8ec7f5b087a50bfd6ba089710f SHA512 6bcaea2b8a0dd5bd5a493aaf6f0b19edb691e49fc7684486da2331621619745baeaa30d88889d8aa345f989016a096745b875aca2c01c5b8127e93903f4e8b10
 DIST alien-8.95.tar.xz 56940 BLAKE2B c2f6b71d39800a7bc4ab00bcd50d165855bad4eb1a17fe217aeb302c6b7af701bcd9445276d7e522db7e6c81f1e8d7e9e2ada99f9d7505e6ec958ae87df7c9f7 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c
 EBUILD alien-8.95-r1.ebuild 757 BLAKE2B 4405c7b813c6dc61473768888c500c7d6044fd119e4703e2d333f399e8fe404d171365e9020095879365ba26e597379ab8fa0ec579417961d0aa11c4d31f2fd5 SHA512 f6fc5b2d718907090c14de20501414f3e3125b9f62779f29190526222be223deed56443bd0c74c1b12cfff058efa22facf45833fff20c85913ec4c5f29d46c56
-EBUILD alien-8.95.ebuild 696 BLAKE2B 1785203f35b867eded394f0d69ca38f2dbb7c567ffed5926b7955346effa7ae98b83104ed22eed28584dbb021a458f88ca0a149aa42c8576dc387f9c4e1743a2 SHA512 12fb32985c5b140412c5d3fedb6ead77df3b56bd53810add90b4dfefefc9c77744335ccd390f7f7e9178ad5cd7e587bf1a38c03e71e4d734dc882aea837ee7b2
 MISC metadata.xml 299 BLAKE2B f0c85fbabcb5ea8dd194f3560a66469354932c2df8a09aacfa26eb980bf1b301ff1d59e5c5196e4014fc637b7f78361ab031930409509c4529a08e78c8d540b6 SHA512 bdfc3c82d7f1c34ba9ee5c104ce164a73e4dea8d9cbbed424f2f9e6a16da20ccd081d02a39a45000a49d265bbcbd362b34ed91c4688396cf73e423591de2b46b
diff --git a/app-arch/alien/alien-8.95.ebuild b/app-arch/alien/alien-8.95.ebuild
deleted file mode 100644
index be9c45f58237..000000000000
--- a/app-arch/alien/alien-8.95.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
-HOMEPAGE="http://kitenet.net/programs/alien"
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 x86"
-IUSE="+bzip2"
-
-RDEPEND="
-	app-arch/rpm
-	app-arch/dpkg
-	dev-util/debhelper
-	>=app-arch/tar-1.14.91
-	bzip2? (
-		app-arch/bzip2
-	)"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e s%'$(VARPREFIX)'%${D}% -e s%'$(PREFIX)'%${D}/usr%g \
-		-i "${S}"/Makefile.PL || die "sed failed."
-}
diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
index 76c7ce321479..90ff6c4ccd41 100644
--- a/app-arch/dump/Manifest
+++ b/app-arch/dump/Manifest
@@ -1,5 +1,4 @@
 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 2158 BLAKE2B 8c5cdda5ec805dd9fa7ef6b06ca0cc127f7cedef8c85d9c745fe06e978376050f31439c2699a7eb8c08bb7cc08fa3cdb34fc87ba1a8aa80ed462c8e2a5d27b0b SHA512 12b8a4af5901751d728df14e8d631b97f9565d4104b8172cdf05879355304d0275a160eada6c510127070defb0ee5a5a900a7435078654c88581ca9c85332162
-EBUILD dump-0.4.46.ebuild 2139 BLAKE2B 8c214683d2c223b6223e76c30b0d458dd5e8ea35247908c222b3aee69e687d016f369e4b54e9b7cda6a1101a5be419ddf92556302593d31d94e37fd0ea888c6b SHA512 409678d809e15a545e1a9fb74afddb9e0776575307d020bde5c61401a1f4afc9a3d6e8551d94f52b22a3952322420b3d129eec91f823b4d697db1d0a2a3e1192
 MISC metadata.xml 442 BLAKE2B 2538d02cfc5053f384863f9b9eb06d0d143d5e53e6e5155d1b242b943fa9255afbb244cac5f79de78ac9bfe38197b1fe86d1c67602d7d2bbf63fa29424e56333 SHA512 37d2ba01ab35909dab9b0f96ea9f8de02ab9999d7da7724d04b4e5430a4d133ccec1cbd007fe9a6cbba619d39dcd66b48dc93b61cc1afa030b541574b7a75957
diff --git a/app-arch/dump/dump-0.4.46.ebuild b/app-arch/dump/dump-0.4.46.ebuild
deleted file mode 100644
index f7ff465b84eb..000000000000
--- a/app-arch/dump/dump-0.4.46.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator
-
-MY_P="${PN}-$(replace_version_separator 2 b)"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Dump/restore ext2fs backup utilities"
-HOMEPAGE="http://dump.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-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"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	ermt? ( ssl )
-	ssl? ( zlib )
-	test? ( sqlite? ( uuid ) )
-"
-
-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] )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	virtual/os-headers"
-
-src_configure() {
-	local myeconfargs=(
-		--with-dumpdatespath=/etc/dumpdates
-		--with-rmtpath='$(sbindir)/rmt'
-		--enable-blkid
-		$(use_enable bzip2)
-		$(use_enable debug)
-		$(use_enable ermt)
-		$(use_enable lzo)
-		$(use_enable readline)
-		$(use_enable selinux)
-		$(use_enable sqlite)
-		$(use_enable ssl)
-		$(use_enable static static-progs)
-		$(use_enable uuid)
-		$(use_enable zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/sbin/{,dump-}rmt || die
-	mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die
-	use ermt && newsbin rmt/ermt dump-ermt
-
-	dodoc KNOWNBUGS MAINTAINERS REPORTING-BUGS
-	dodoc -r examples
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'."
-		ewarn "This is to avoid conflicts with app-arch/tar 'rmt'."
-	fi
-}
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index d1f3f1c1599b..485ff154843a 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,3 +1,5 @@
 DIST engrampa-1.24.0.tar.xz 1678920 BLAKE2B c40ba6a77d667f25853f6ae8cef51a54b32402e9446d6712bcfe8b6cfbddcc39e076604fad6ead1717bcedc52716be028ac9bf912c5762fa204e3ee5d6be10bb SHA512 b6996e224ef52d8fd7102e4498193faa62056e8c22aa260ab5c6361533744f78755d500536ec0e03fd8b42b71da56d3f58d9d760809d20b572bee02fdee07cce
+DIST engrampa-1.24.1.tar.xz 1680000 BLAKE2B 3059f98e5db99aabe270a89d7edf334ddca8b9cfd963a34f8b7b99356a1b7a9b14c9f641ea6582f893a5f6e4fe46dde00e5375d7b1c71b80299a7f5121839549 SHA512 9d51f24987cecfdd2c560b1ac8f8699bb5ed010bcd5b4a449a1103f725bc63046d0813d28424a3ae7dfcee0568dbf2a282f27ac5512b1c342dafeaec5bcd3b4b
 EBUILD engrampa-1.24.0-r1.ebuild 1731 BLAKE2B c3481a8dd2b5a938a817fb34e0ca33cde7c9401cfa562186e7536efd613d36d50ad1060e9f9d176503c430d12f536e8e8a528c518e67695479c790bebcbb17d8 SHA512 01f928deea86747e76525e07e3a98649abe16a2b15504f21abbc827b9f2baaebc7d42b6e4d3241f9fcf842e6f8fdaa3b4ea19901cca2d2b6faf6b212e0830f30
+EBUILD engrampa-1.24.1.ebuild 1683 BLAKE2B 67f456aa9579f4a44a70da9826928c85b503d853f96e58ffa9aaba9bd608d5f5220b675281b4d2de5b2d10ac4657fdf68a0699f87af2299dbee77ce55191d779 SHA512 9cb2057885f56df5d8ad0c17aa5e7ec14ff9920a1fac41555457d0ec35d3749f4b5251429785f01b074373dfa6f94854e935eb67365971b5e2d499caaf245506
 MISC metadata.xml 590 BLAKE2B a67378188ec008cbb9e6790dc02a042f0ae46e3f5c1bd2a277923bf3a05682523f884e1d9858f6406430cd54a6c33754a5dd695acb360bc99f7939bd3160e931 SHA512 9c3b2fbe1667d3408600a10b63be3141136acabfe6ed53a637ff5fbeff50a44ca7f0463b48597dc1473eb29ae31e7f222e11cc68432fdc12f34c7bca38bb89d5
diff --git a/app-arch/engrampa/engrampa-1.24.1.ebuild b/app-arch/engrampa/engrampa-1.24.1.ebuild
new file mode 100644
index 000000000000..d1e58a38197e
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.24.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate readme.gentoo-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="caja magic packagekit"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/json-glib-0.14
+	virtual/libintl
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[X]
+	x11-libs/libSM
+	x11-libs/pango
+	caja? ( >=mate-base/caja-1.17.1 )
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!!app-arch/mate-file-archiver
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		$(use_enable caja caja-actions) \
+		$(use_enable magic) \
+		$(use_enable packagekit)
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+	optfeature "Support for 7-zip"  app-arch/p7zip
+	optfeature "Support for ace"  app-arch/unace
+	optfeature "Support for arj"  app-arch/arj
+	optfeature "Support for cpio"  app-arch/cpio
+	optfeature "Support for deb"  app-arch/dpkg
+	optfeature "Support for iso"  app-cdr/cdrtools
+	optfeature "Support for jar,zip"  app-arch/zip app-arch/unzip
+	optfeature "Support for lha"  app-arch/lha
+	optfeature "Support for lzma"  app-arch/xz-utils
+	optfeature "Support for lzop"  app-arch/lzop
+	optfeature "Support for rar"  app-arch/unrar
+	optfeature "Support for rpm"  app-arch/rpm
+	optfeature "Support for unstuff"  app-arch/stuffit
+	optfeature "Support for zoo"  app-arch/zoo
+}
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index 2b8dbd59b120..58b4c2a44411 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -2,7 +2,6 @@ AUX pbzip2-1.1.10-makefile.patch 263 BLAKE2B 32043c1a47504a2e901d9c4cb4360f295d3
 AUX pbzip2-1.1.12-data_truncation_fix.patch 3348 BLAKE2B 848afb0cb6311a28ba958346fdda210aa7bb325c8e3a174c7359e574322f8eb41a04d8e785aa70332de953db170706e9c1fefef6d7274ebfbc211769f4dc88dd SHA512 c6bac8fe33f9d123358c1a01cdb94a8dd6be4c63553f62568311f06b25cf371ab7d881797ebb0d66d9f772c5644fe1f38a70fdbd64b99adaaed82f1e96dcc966
 DIST pbzip2-1.1.12.tar.gz 47826 BLAKE2B 62b1e47b7b67f2a27f31032654506552c33e68121dd50d3496dc746a405cf783807c4966058feb1aebda2080ae1d1d22e944d057ea3a0dba2f9247ea46b23eb0 SHA512 bb68e87867295b89ee6fb76a8b72834daebf0ca6c16b2f10bce67fe7386716a728acd28bf46a9732087202ca0cc774f02c741b0b58801184bb7550f6fd119cd6
 DIST pbzip2-1.1.13.tar.gz 48015 BLAKE2B 1bb410acadc728963c3a04d2665fb1b1f0c206a893ed90352a9c16512e9bd5f82c3f5f3b383b382134bbe904735a1c8a81615a8bc54de8c6bc91633d9ce72c57 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8
-EBUILD pbzip2-1.1.12-r1.ebuild 1121 BLAKE2B 14a9f667c480bda2dfad9cf6f0128b58464743f094c0c7bf0127d49e2c6ae9074442c7a4929440b317c500fe9778a172ff9b18254e2eec1a75e0cbe64de7fdc4 SHA512 e8c84b0a868234a6072873f9b3b51166466d53a406068625189287f0a9037e5296f73c9b28a3041c3f6c1d642c4bcdfa474946dae44e04a0a3e7134fe21afbd6
 EBUILD pbzip2-1.1.12.ebuild 1063 BLAKE2B c3c26ee7b9a2793bed7b3f1beafbabe30a73b61bd5fcddf604668c4a88cf46fca08774fed7b0e3c592b4f72f9d9fc20b7b25d00614cb725cab7aea51a3ed3c79 SHA512 455ea431161a116e62f3ebb1cdd6547e418cd43d60588c47f0dfca520fd6ea0bb884103a3f5d314a2556d8a7d92d2e659cde734fac478a545c7aeace83e21c32
 EBUILD pbzip2-1.1.13.ebuild 1140 BLAKE2B 8af7cf7d85ca0e1b5392d840cf739a018de1212c7d6cda213417b452ff5066f2b11270e2edeb4a8ef70fa35de68e6a0d2cfc16c393acd45cd820dc263b387cec SHA512 35b0abcb9cef5d09a2452569a25a9182e73705b6b3c22d1147eb5804388009d48d4fca388729c254eee3108336ebda13f20904f08d17792e8f9af0c3953f1ed9
 MISC metadata.xml 443 BLAKE2B 3a25a8281989265bb3339d4b46442e5c73920567ff19bd12e57a6aa41d40534428e409ca9dc548318d2487288e12e2c6bb305809c7585c3d6742c8709a649d9e SHA512 fbac33ec453bfd5c9cec5ca30ce938281a9d1d280e8936977d77e3fe23e802345814e343d9824cef18164aa3ad2b2aab421239593bfe36f100dcd787739761d0
diff --git a/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild b/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
deleted file mode 100644
index 8590d21d4811..000000000000
--- a/app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic eutils toolchain-funcs
-
-DESCRIPTION="Parallel bzip2 (de)compressor using libbz2"
-HOMEPAGE="http://compression.ca/pbzip2/ https://launchpad.net/pbzip2"
-SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BZIP2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="static symlink"
-
-LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	symlink? ( !app-arch/lbzip2[symlink] )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.1.10-makefile.patch \
-		"${FILESDIR}"/${P}-data_truncation_fix.patch
-	tc-export CXX
-	use static && append-ldflags -static
-}
-
-src_install() {
-	dobin pbzip2
-	dodoc AUTHORS ChangeLog README
-	doman pbzip2.1
-	dosym pbzip2 /usr/bin/pbunzip2
-
-	if use symlink ; then
-		local s
-		for s in bzip2 bunzip2 bzcat ; do
-			dosym pbzip2 /usr/bin/${s}
-		done
-	fi
-}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 81c2d3c4c068..2028b991655b 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 56892ca25a53..cdf63f5225b1 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -15,5 +15,7 @@ AUX newscripts/bacula-dir.initd 318 BLAKE2B f482ce3c49ff8106244b62946ab8bc4ab14d
 AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876d20919bf3f5a779595507e50185457464371878b3e18293302a0c1016bce3aca7e432837397bde64a0e6188be8a SHA512 8230bde8cbfdf2fc4892fb90891a85e36b2be42e4f2ea2140248f08f22bcfe3f1d8c3b419347a9b40143c3f2b4c75d7834cbadb3ed8b8372462580ffcf268bf7
 AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4
 DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70
+DIST bacula-9.6.6.tar.gz 4253303 BLAKE2B 131353e24265f64dd3c4e0632bee93d2a170d3ed88626ab80f1804e7a218eb86c5ac7507f4a4fe5ef7d4472a1c90ef0f45e1a6ad0a4a65a1fa8f1a8f63287e3f SHA512 1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a
 EBUILD bacula-9.6.5.ebuild 12367 BLAKE2B 80a045af37209989d6c6fcaba37a6185ab51faf737e6ccf75a911bc7fa3774a749213b332de725bd1ac3f983addf4cda2c46f549df90cc63422148c8a9e7aa99 SHA512 d49696d6a280ac96a3d478d6ea1c69980b3c056036c00a9794f3c83ffa019dc9c3ac22317260234dbcc231ac10b3e99309f6184732da41eaebb0a92076b89aec
+EBUILD bacula-9.6.6.ebuild 12370 BLAKE2B 43991de038a55b65dd3c693090f387d246acbd7d855c64e5682684a95852ccf15b87abf52a1135440a17b652689c6e090513b86df018165c9e3faf3f477798dd SHA512 ab1df73e75afc8035a7bb21707ef5cf0af3b7fc62c898c78d03e42342945fe27ce763e10d14f6b768b935925dc37447b4d5fda6c112e36e67941803e5441980d
 MISC metadata.xml 696 BLAKE2B 9a24744f1035e27017f140768b70ab4406e80e1eec452968cfa82e7686876d359ac7a90f9c5998356fc9b4170b9132842d3295877cfa6740d6f1d42e804afbcf SHA512 dcf03b8409574b0e4fb43fefc1f24f7ebc096ff04d79beef0bd31714b233f324bec87387cad8f3eb5c08ab972feae82a32702718aaef39255eec07e6e0352875
diff --git a/app-backup/bacula/bacula-9.6.6.ebuild b/app-backup/bacula/bacula-9.6.6.ebuild
new file mode 100644
index 000000000000..8b6104a81e97
--- /dev/null
+++ b/app-backup/bacula/bacula-9.6.6.ebuild
@@ -0,0 +1,428 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop libtool qmake-utils systemd
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="https://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	!bacula-clientonly? (
+		!bacula-nodir? ( virtual/mta )
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) )
+		sqlite? ( dev-db/sqlite:3 )
+	)
+	dev-libs/gmp:0
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtsvg:5
+		x11-libs/qwt:6
+	)
+	logwatch? ( sys-apps/logwatch )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		sys-libs/zlib[static-libs]
+		acl? ( virtual/acl[static-libs(+)] )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		sys-libs/zlib
+		acl? ( virtual/acl )
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+"
+RDEPEND="${DEPEND}
+	acct-user/bacula
+	acct-group/bacula
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			app-arch/mt-st
+			sys-block/mtx
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+REQUIRED_USE="
+	!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+	static? ( bacula-clientonly )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	if use bacula-clientonly && use static && use qt5; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS and CFLAGS
+	eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+	# bug #328701
+	eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	eapply -p0 "${FILESDIR}"/9.6.3/${PN}-9.6.3-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	eapply_user
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# build 'bat' for Qt5
+	export QMAKE="$(qt5_get_bindir)"/qmake
+
+	# adapt to >=Qt-5.9 (see bug #644566)
+	# qmake needs an existing target file to generate install instructions
+	sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+		src/qt-console/bat.pro.in || die
+	mkdir src/qt-console/.libs || die
+	touch src/qt-console/.libs/bat || die
+	chmod 755 src/qt-console/.libs/bat || die
+
+	# fix handling of libressl version
+	# needs separate handling for <libressl-2.7 and >=libressl2.7
+	# (see bug #655520)
+	if has_version "<dev-libs/libressl-2.7"; then
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch
+	else
+		eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch
+	fi
+
+	# Don't let program install man pages directly
+	sed -i -e 's/ manpages//' Makefile.in || die
+
+	# correct installation for plugins to mode 0755 (bug #725946)
+	sed -i -e "s/(INSTALL_PROGRAM) /(INSTALL_LIB) /" src/plugins/fd/Makefile.in ||die
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf}
+			--with-${mydbtype}"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt5 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable batch-insert) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-archivedir=/var/lib/bacula/tmp \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_systemunitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--without-s3 \
+		--host=${CHOST} \
+		${myconf}
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt5 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /usr/share/logwatch/scripts/services
+			dodir /usr/share/logwatch/scripts/shared
+			dodir /etc/logwatch/conf/logfiles
+			dodir /etc/logwatch/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	# Install all man pages
+	doman "${S}"/manpages/*.[18]
+
+	if ! use qt5; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+
+	if use bacula-clientonly || use bacula-nodir ; then
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	einfo
+	einfo "A group 'bacula' has been created. Any users you add to this"
+	einfo "group have access to files created by the daemons."
+	einfo
+	einfo "A user 'bacula' has been created.  Please see the bacula manual"
+	einfo "for information about running bacula as a non-root user."
+	einfo
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 9.0.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt5'."
+	einfo
+	einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during"
+	einfo "restores, so be sure to set it to an appropriate in dir in the bacula config."
+}
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index 8c3f93b7b9b1..3b8963e7ff94 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1,23 +1,6 @@
-DIST btrbk-0.27.0.tar.xz 86648 BLAKE2B bebb1c56b5c08e588829697df1d00e89366582d7c501ffc7c72baf8136ec62ac1f9b7aea300f1ba20c6060646e80916a52e2b83a85b383cb04289867d82b2a53 SHA512 2d65d32cecdd8598d5028a78a449559563bf38a172849e0a13ccfa8129189a044cb2d007561b5c7e611c8bbbe069fd9c1177085dca519c88d40233fb0d49db36
-DIST btrbk-0.27.1.tar.xz 86764 BLAKE2B a46514a94e6f49f83f92bba6f545738fe6a0b274a7eb39a132a41e1f89e0e6428ee8e29164ca2ba249bf98d2c7a5f682a81bb5c113a9cd5af12e4abf98669684 SHA512 b30be9fa2459d34d33ed0c2ef1b4f2e7010d1d7f9dc6e6e3236550307b7e2f2f517a61d21bcd2aca3ed0750ef64259bb51c32ff26abcc70008db92e1a66212bd
-DIST btrbk-0.27.2.tar.xz 87012 BLAKE2B 7b25ce04e088b9c3df1f5d4f41ec3e6aef7e48bebb8fcd4c4a8365bb73d26dd09afdf1814985362b28958a93df2797dd62444475024f66bd027303955a160604 SHA512 497d1dd1d2de712d4de80d0bfcdf6995590fd5308b81d7198af7cebe81c45fd53c8940265c1451eb95339636cf0e4c2a9162befb7cdd48cc8d4142b4e9ca75f1
-DIST btrbk-0.28.0.tar.xz 99336 BLAKE2B 4becaac5a34029e57345baa3c8bb787032ddfdc523882f6334e7a0985a53194956342f792dd9022cb151aacbd64497b87aafee838b5811f716de4efc7eb54a10 SHA512 f4f3118daf55a80604dafec77087851860cfab8720d3f193ac4eec804ca39e60e3bb31d7feb45dd10c8b35b2844c680462a16f2ac0bdbd71731907f511bdc358
-DIST btrbk-0.28.1.tar.xz 94740 BLAKE2B 75313aabab7208083e06a2d4bb607950c7d5d0e87188a9a8f8c97cba1549cc2d3bcfff14b2bc2d20898c44bcc0fe50d74db2e16b213dde852d89704704b70ece SHA512 0e24908b3162b2ab67e0482a38fb966bf33b3c3ee5b2f62259673af14e9309bc4707bd049403579240ec416efae6643a8b5da73f4763e3dc01b3893047e92581
-DIST btrbk-0.28.2.tar.xz 94888 BLAKE2B 4501a8bbe1c88e2449c67d3c5e2322c8b3d3bd5b855cbc0451ff59a3e9aea66de4110587f786fee8f21acfb8a7e496f80a21a91a0e0756d37130bd49a76bb26f SHA512 43e9e0dfe48b0b0c8d1b64e2ce447b9dde9c494b2ad233d68e6ad0648d746d1e950751199f72affe77e06b0c94567912b399bd0b6aa8ebc31dd8fb87ef9ae0ae
-DIST btrbk-0.28.3.tar.xz 95000 BLAKE2B 95de0eae8621b313e9dce3a90ba416a0e4553b05e7e9e1432bd740941ea4b7bdc154a6dd34c9cf7b7ef9fb98f46fd4bc99a3b37933b4c9bd21ef493a7f51e2a5 SHA512 a2919527ab14486113c075fdb2646ee70fa20c813e5a69fc8a0cd16b75bc7aaccee338b272da938f6223a4be8c2d539839426b55ce72d338c7cf20680a41a849
-DIST btrbk-0.29.0.tar.xz 97632 BLAKE2B dc7b63804a2a4ff99ae33e2247363402cfa683bad852c1b70bbb8fc3571730a690589cff1184a3c6e63b66b385430027b55da959e7dca96b7eca6eff900be109 SHA512 e3b0fd45bcaafa4fe53e230bb66cc23ae950dd91251d5e4d19a576021f2dcc52b219cd348b1b747224c2da803b47554266f4fc91c092a62decedc74ac59b9b28
 DIST btrbk-0.29.1.tar.xz 98320 BLAKE2B f7e4939fec27cc85847d7cae8797de9c59040de641ed4c3c4dcd37102daad1d3910e2ef40c3ad486614a167a7d2206c92b961ba6e5d78e351dedb8de565e3172 SHA512 78bb24fff3606bcf5cb3f4b7e31c5423ca01208cf667efa6a67978696b06ffd4f368aed372d57372ef268ea9329d51f8abd7e2e9dc59dfb0d3133c992d1d788e
 DIST btrbk-0.30.0.tar.xz 101104 BLAKE2B f963fa64a409810552f1232e42d2d7ed740cbcf498098307ebff31a6e4db06d43a2c4fd5df6120847a009fd606ea4453ca93eaa6cf7a18744d557f94722876f8 SHA512 127d184fda13cb036c737f2cad428ef8313af46ceac0b6d273d670656f874d0e096bcd2daf96a2b6e7087a9985e47a99a905515376a9270171575166ca5d6449
-EBUILD btrbk-0.27.0.ebuild 2086 BLAKE2B 6c0b94e96b695df63a57f044cf2238ab24ea5e11849fd69cd68592c300274d4d52e0e44c22a9fd4e9663c90378c591cb44ab2bd70932e68832134989c22a0e37 SHA512 94c88b77bbf0c831e7f2aedf3e0706b98e29ee505b4ab1470a81cbc4f597ccdf46e0c27f9ace51c0659c5e3f73baf70a1d1f2cc7dc944db28770c385b7078523
-EBUILD btrbk-0.27.1-r1.ebuild 2264 BLAKE2B c91380d9f5fa7c192e2bb4bbef659737b0c2016de78cb31034fbb9dc01fad3665d903dc453398a36e28ab271b4eed454a7eb6145655801af7e1db1ea20c8969c SHA512 6342b8889162d8bb2871f66709ccc710f68da9f56ac829755b1a7085f63252fc6a1c4b7ff6c67add47994e09d1128399688f48819c774751e4b64249cc557849
-EBUILD btrbk-0.27.1.ebuild 2089 BLAKE2B 069c9bf2b1dc5789b2867fc07b47640c6689cb926d101926b77e0a1160a93d8cd3c978fefb8d1a28bca52a0dc8c0a36e26d2db4229c78238d054e8735c221674 SHA512 12cf213f9c05e14b73d213bb7294080ae363d766eb41427d6da36f796688a20abe461d15d42cf4b41785116659cd7bcedf337d564e6e6a625dd3376dd4ade5f1
-EBUILD btrbk-0.27.2.ebuild 2306 BLAKE2B 3f90c5446166ec67d46be13824b18b549d55af9cb4c952c2a27c12757acd617dd57944b73c78b85252a16a3fac67b7907835e0f2a6c4178539371e693780e25e SHA512 13f79e67d3cbd4e36adf55be72ca7e131fbe9e7c20326bc31453db418b91b0324b4365ea814ffd556cc51bd8781f3aa4c518b80a853208e2a8da9dc0cb08a74e
-EBUILD btrbk-0.28.0.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24
-EBUILD btrbk-0.28.1.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24
-EBUILD btrbk-0.28.2.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24
-EBUILD btrbk-0.28.3.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24
-EBUILD btrbk-0.29.0.ebuild 2318 BLAKE2B 284c2259dd56ee7469bfa9e4638be53c858d09a9b22f81a3bb00c01f643f2f817d3dd1eb1e36d79b85d9ff335c5d7eae26925bf60d7a282403132992e4263b8c SHA512 090848519b5bbd036940eaceb140115ea94c9bcdcb413f82b962fe51034cb979a596afdbea73055e5043a3b1694cd4b53f75de47d6d0e037f432c3ea20d9a392
 EBUILD btrbk-0.29.1.ebuild 2322 BLAKE2B afba2b06ace683bc10c725b5093d1f15183063405245117fcbcb14efe349c1c4cf1874bbacdea9120ed4fba2e36c7d65a7bcc6bf66afa301d636a3298d2acb19 SHA512 969f28f3ef93f08c7675b5b82a2b73a75a469d9f30c0e755924cfb0364ecfa8dae2cd9909767f0802d6ae6ec329dc79f3dd414b2fa27ec44c51ec3670e3686e7
-EBUILD btrbk-0.30.0.ebuild 2325 BLAKE2B e3191fe3f7029d38291d531733e6ee2250aa0dcc930763ca27f1e58bee6c1d3a4e9b7d5b38b002989be72756451f86395982b5cf1388db38617e2ac3a527b20d SHA512 fcb454f017725d182d5df4fee63d7fb4e3e20f03553b4673c1c0414e4badc1c4650b9d2f969eda628c8acfea9dbe934e9d7af93263c5d84be7451353ea52ca8b
-EBUILD btrbk-9999.ebuild 2318 BLAKE2B 284c2259dd56ee7469bfa9e4638be53c858d09a9b22f81a3bb00c01f643f2f817d3dd1eb1e36d79b85d9ff335c5d7eae26925bf60d7a282403132992e4263b8c SHA512 090848519b5bbd036940eaceb140115ea94c9bcdcb413f82b962fe51034cb979a596afdbea73055e5043a3b1694cd4b53f75de47d6d0e037f432c3ea20d9a392
-MISC metadata.xml 1064 BLAKE2B eb19e75607e19d3bca7caebbf8b6a393ea4113b17ced56dc858d12967a800336a8057bfb93aa660db15a76d516b02e031abb36a0b183a37cd06754e4d64efa2b SHA512 5aba440ded91bd42d2dc991a09065d016d3c2b42efdc25a69184c21b27ac1ef41784f7d66f94fcd11cb3624aa8535201c40f0680ea26dc59842efd2b217a4fe9
+EBUILD btrbk-0.30.0.ebuild 2385 BLAKE2B 7733659ac5eb9e49a734802b9627726fa4367caef762d370df19f4ee3eecf166bac35e306f304becf112cdbeb8b89e9202fbd0d3f1f02b9f7a6e5e0e3e2d0795 SHA512 c80a94617c0b11519eca8165a696454cac9a8bdbbff75950b000329c546225e50d28256670f93b03123f66504cab5fd0f56da8e0ecd12294d2eb371401888cd0
+EBUILD btrbk-9999.ebuild 2378 BLAKE2B f09a3bc3cb7eebebeffd590f0cb0309e9c260c596bf6b7c3af19fca240a61233446bfa9c689a6c5ec27a8727f9977111dd1f63d76ed38973393491cd1b7e6f21 SHA512 b17e9102bda13b106bac86da01d012d49af6971932314b253966fd8ceb0953cd19da7043cdc60ec950830a36f5b91f73f2ff9110e55ef9db3a87153375e7f93c
+MISC metadata.xml 1049 BLAKE2B e47ff64c01332ae21819c07797a50835327aa113662bed85043abb179c30ede2a96fa944ecba889622190e441a5d1e5eb49724194643b026446fc6288a8140d3 SHA512 e8d0fcbf7baee25c842f284f72c8894cafe246ef3925a2e40754add811fc1bcd34e5358d39ccf2977f9f3d4515c98750b1d45e80b1fd447e47e13cb2bdae4d89
diff --git a/app-backup/btrbk/btrbk-0.27.0.ebuild b/app-backup/btrbk/btrbk-0.27.0.ebuild
deleted file mode 100644
index a9edd2bb91d7..000000000000
--- a/app-backup/btrbk/btrbk-0.27.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+pv"
-
-DEPEND=">=app-text/asciidoc-8.6.0
-	app-text/xmlto"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-3.18.2"
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.27.1-r1.ebuild b/app-backup/btrbk/btrbk-0.27.1-r1.ebuild
deleted file mode 100644
index 57a9fcb682a9..000000000000
--- a/app-backup/btrbk/btrbk-0.27.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+pv +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-3.18.2"
-
-src_compile() {
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" ${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.27.1.ebuild b/app-backup/btrbk/btrbk-0.27.1.ebuild
deleted file mode 100644
index 5781a69d01fc..000000000000
--- a/app-backup/btrbk/btrbk-0.27.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+pv"
-
-DEPEND=">=app-text/asciidoc-8.6.0
-	app-text/xmlto"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-3.18.2"
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.27.2.ebuild b/app-backup/btrbk/btrbk-0.27.2.ebuild
deleted file mode 100644
index 327ff48d7a8d..000000000000
--- a/app-backup/btrbk/btrbk-0.27.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+pv +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	use doc && emake -C doc COMPRESS=no
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake \
-		COMPRESS=no \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.28.0.ebuild b/app-backup/btrbk/btrbk-0.28.0.ebuild
deleted file mode 100644
index c649cd367ac8..000000000000
--- a/app-backup/btrbk/btrbk-0.28.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+pv +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.28.1.ebuild b/app-backup/btrbk/btrbk-0.28.1.ebuild
deleted file mode 100644
index c649cd367ac8..000000000000
--- a/app-backup/btrbk/btrbk-0.28.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+pv +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.28.2.ebuild b/app-backup/btrbk/btrbk-0.28.2.ebuild
deleted file mode 100644
index c649cd367ac8..000000000000
--- a/app-backup/btrbk/btrbk-0.28.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+pv +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.28.3.ebuild b/app-backup/btrbk/btrbk-0.28.3.ebuild
deleted file mode 100644
index c649cd367ac8..000000000000
--- a/app-backup/btrbk/btrbk-0.28.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+pv +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	pv? ( sys-apps/pv )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.29.0.ebuild b/app-backup/btrbk/btrbk-0.29.0.ebuild
deleted file mode 100644
index f82156e37d50..000000000000
--- a/app-backup/btrbk/btrbk-0.29.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.30.0.ebuild b/app-backup/btrbk/btrbk-0.30.0.ebuild
index 73afd3da3703..11509324b00e 100644
--- a/app-backup/btrbk/btrbk-0.30.0.ebuild
+++ b/app-backup/btrbk/btrbk-0.30.0.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
 HOMEPAGE="https://digint.ch/btrbk/"
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+mbuffer +doc"
+IUSE="+mbuffer +doc +lsbtr"
 
 DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
 
@@ -34,6 +34,7 @@ src_compile() {
 src_install() {
 	local targets="install-bin install-etc install-share install-systemd"
 	use doc && targets="${targets} install-man install-doc"
+	use lsbtr && targets="${targets} install-bin-links"
 	emake \
 		DESTDIR="${D}" \
 		DOCDIR="/usr/share/doc/${PF}" \
diff --git a/app-backup/btrbk/btrbk-9999.ebuild b/app-backup/btrbk/btrbk-9999.ebuild
index f82156e37d50..9406cd634c9b 100644
--- a/app-backup/btrbk/btrbk-9999.ebuild
+++ b/app-backup/btrbk/btrbk-9999.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
 HOMEPAGE="https://digint.ch/btrbk/"
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+mbuffer +doc"
+IUSE="+mbuffer +doc +lsbtr"
 
 DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
 
@@ -34,6 +34,7 @@ src_compile() {
 src_install() {
 	local targets="install-bin install-etc install-share install-systemd"
 	use doc && targets="${targets} install-man install-doc"
+	use lsbtr && targets="${targets} install-bin-links"
 	emake \
 		DESTDIR="${D}" \
 		DOCDIR="/usr/share/doc/${PF}" \
diff --git a/app-backup/btrbk/metadata.xml b/app-backup/btrbk/metadata.xml
index c8d33bb141b4..b066b9973551 100644
--- a/app-backup/btrbk/metadata.xml
+++ b/app-backup/btrbk/metadata.xml
@@ -20,7 +20,7 @@
         <remote-id type="github">digint/btrbk</remote-id>
     </upstream>
     <use>
-        <flag name="pv">Use sys-apps/pv to enable progress bar functionality</flag>
         <flag name="mbuffer">Use sys-block/mbuffer to enable progress bar and buffering/limiting functionality</flag>
+        <flag name="lsbtr">Enable the lsbtr command-line tool</flag>
     </use>
 </pkgmetadata>
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index 63e5e1be6ef8..01741156ce37 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -1,12 +1,10 @@
 AUX README.gentoo 122 BLAKE2B 2b8d4ce5a1388adaeb694bafbacae8daf7c417f1849ed54afd834888b96a94510238c9a621077fe9c2974b0b55c2b918a8e9b5493207b2f2cee7e846bb2532e4 SHA512 6d649c051529f6cc5a748f3f63c3d2f54ecf07d0a01fe6f091b7541b53c261120db521a112ac5bc8155fc330218a72b9a82f1801918b294dea22914ec6ac4a94
-DIST duply_1.11.2.tgz 44094 BLAKE2B 0aa52f9654bbb873564aaa180b5762b4a5bae1cf0da85d79fedfa6e59d27ada48061d78481b550615452dfba2428535d7b0665ce421abfdd1902ede0e83f7110 SHA512 20833c774705f83ec7efc88a7605c925ea5e56536a2338c6bd3a65ae789ffa7fabb03206b396fd92fb8ccf13cf0d72dbecdf705780e345a2cb1804783623e420
 DIST duply_1.11.3.tgz 44198 BLAKE2B 368c8a5d145068da00fccb970188bc64574365517211d3eca253c34f820dd520777f56ebc0dfddeca2fc910558e73bf6a2adac6287422b47d5a5751d43a74b86 SHA512 5817d4571c27288b227add04e84fa0066e278cdbc819a9332cb6fa2aaf6609e923abe9824ac704fed250b961300c57ca1de945af03370287f7cbf68876513457
 DIST duply_1.9.2.tgz 36222 BLAKE2B e1c028423eb8631598b662ad33f3cf24088f11e84ba2b28c818aa580eb69f069885af7cef5780fe457357066b88c7077e3b691ca5a87fc02f429fa416aa39f70 SHA512 9ef5e22f43a6854e413ed1c2b88b10d0ae75cff7b2bcd927d20a588234555e9b7eff25d094f688f9d4f8510eba6bc20f7635c0de9ab9b402966075595922333e
 DIST duply_2.0.1.tgz 44914 BLAKE2B 022a99e585a6231e85af84ae161988037fecf885a2a97d078e1a64b2176268ea6ef3c68e4843a967715ff362e8f24826cd800f0c1b32c4b187f5261d2b9cad67 SHA512 28f1670f2579956cb4d0d5727403e8b9f4afcdd8ea79e117536dfb89b3f3cf6a7bc7eb802bc4dcd39fc6a443a9f8fa3fe722f2b8336186517184940ce6fa73ec
 DIST duply_2.0.2.tgz 45406 BLAKE2B 46299930a2e05c5d3759e7a90a6bab8b41b28bdab95c945f1bbb5977d78cf5b72090edfb10bd69b2539c65b7c3804d45eb6b400866c6337fc4acdc283f8003e0 SHA512 2f53d380445272a2354f6914c39373e93d27fdcc5c712d7041fc798547280cebff53882f93d0467d86fc044b8a3a73a6b2fe04a9eaadae55b58bc9c617bab48a
 DIST duply_2.0.3.tgz 45542 BLAKE2B 101e19712546c71af16f5988f1d1a70139414b03fa6abcf9b82b8a656a9fd7385b4c9f524eb0e62e3af1b9d0b9a494e47505f2c829d39745c8b88ce56e6608a6 SHA512 c24dd57f75ab80795d67baf8a7ab79a5ae9608c7faea0ae8b711045371ef0cba49c855cfa0610f030c1c37734775b50052fd1e4162420cb3db624f984e4e8bc1
 DIST duply_2.2.2.tgz 50848 BLAKE2B d24c88c57a1a1da83827fbda3ba73249bea96de3b9503b842357182e871ac519b609d6d05d5972cd9a268354fd4d9db87d57680d478714e5f19256b70f23fa42 SHA512 2c072f3812989d2d20f9698b5a59eebe5ca8d45eda25622b9e9903748c8fa18374f8d64e0897b7587f62a6a292b277302d15c6785c6b4dd96e127162a5dae358
-EBUILD duply-1.11.2.ebuild 586 BLAKE2B d49c29b3a57e4992162b37ef550670097175b76c20f166785bf940b4aa8de1bd709658f39ae6d97d2e4620616cbd525654b9c11cd0245e1b1297238cba286134 SHA512 9c260dfe8d5b8604cd17181c7cf91f8f180c5c7623bb615a7ceb68970e2162ef0905f8e19aa4525561865ea1803156cbc77dfe287db6b99db229fb07d998e961
 EBUILD duply-1.11.3.ebuild 589 BLAKE2B a2809b3b4c11f4a29915edc004b1d117416b5551a371a4e950760bb63cdf06867b3e4d077bf4840aaa488035e94e2870225f81bc0d60b58c99d6132d5774f54f SHA512 c56bdb7d9e4d183494c0498c004fa21114a86b651336648cc5b2e0036a2d2b51acced93acdadc26b828f50a37f404446330f5671d420c4ed26c05642e5262a9f
 EBUILD duply-1.9.2.ebuild 515 BLAKE2B f684ee48cb886dc61947ff27bd4d22f14be12fa70e3d5ffb80071c519bf850ecfa2dfaaad529cdfe4d9d394cde6bba9e0d19bedb37c920b1195d84a6289d76a9 SHA512 4a1c380148270581af3a0096f3f0e5263ad0c7507066c8c308c262eaef28e3f59fb02f85d150d73e61ae93273c4a0efd45fc78ace3a160b878b8f708b855fb1b
 EBUILD duply-2.0.1.ebuild 588 BLAKE2B caa38a62e139fecdadbda7bca01d1c1cc2ae998a09dca27c18015b28e907a6a2d603f6b6437cc7e766f378d93733ee9cd98c4a3be502d3f1622ddd4ae900da38 SHA512 aff7359b9c6b4c48b6902cb3c16a18581c01e68a83b7eab89ecb091d31021c8353425ae5be197ed9034914381f884927a75b7d8386cf32e3744efbc3528ca50d
diff --git a/app-backup/duply/duply-1.11.2.ebuild b/app-backup/duply/duply-1.11.2.ebuild
deleted file mode 100644
index 4ac44196694c..000000000000
--- a/app-backup/duply/duply-1.11.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="A shell frontend for duplicity"
-HOMEPAGE="http://duply.net"
-SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/txt2man"
-RDEPEND="app-backup/duplicity"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_install() {
-	dobin ${PN}
-	./${PN} txt2man > ${PN}.1 || die
-	doman ${PN}.1
-	dodoc CHANGELOG.txt
-	readme.gentoo_create_doc
-}
diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest
index e455ed14333c..fd3f7d28b43d 100644
--- a/app-backup/rear/Manifest
+++ b/app-backup/rear/Manifest
@@ -1,10 +1,3 @@
-AUX rear-1.15-add-support-for-gentoo-kernels.patch 817 BLAKE2B 1bd821856ec3b52f7addd7d438d8a2bb412587fd29b3acfcdba99dd769fd217a7dbe1a264431382981cd79e4802819b80d53340841be2d8104beae8be1c48de2 SHA512 b60b77276c6be79324c8df30365950cc864751c96e6373c8231a60a6293046571cb2dad75423f3e1beaea28597c52a431e7d16b01d8c8cb6f279cd1428670659
-DIST rear-1.15.tar.gz 258153 BLAKE2B 1172806962df7d1a5f278d1aeb696e38d482f1710c6b13dba6b00f60f51fd3c02ba6d28c9c5e4b1a648468f9a6f5987b47ca1f819c8e66c9b6f209c75b0ba0b6 SHA512 dc953c33b82f221de6c2acd7ffbb26c34b86aebcd7f8a4d7d520a1d08c15c723fed75326b8e19614f5e09f6436d392091b362b350ffad06caf10c711eb97fcb2
-DIST rear-1.17.0.tar.gz 299444 BLAKE2B bbada2b5705a5ff0f82b97974f14de728a779847a6b410e0be71033404ae08f0ba6c4bd76c07aba0195aa677c174ebf016bbb6a17f3aa2698bed24bcb50618f3 SHA512 4b9991dc14138e6a2cd28c9fb9f1dcf46ea1a580454bb2c966024481657a102cc849baf6af5ebfa0793ac3f5ebff5b07abc87d1e4b02e1496a0f87b8cf79284e
-DIST rear-1.17.1.tar.gz 303253 BLAKE2B 3c84a76b0aaf1ef72191a49976aa86ce4fcf7c9aee1c6c85af3d68d80e0c6a7ba0d16e109847c7753a626ef34df9ee05f2912b30df5e205303c194831bd5af77 SHA512 66595e962345c0e61c5152f11aee6745ec348acc02d0cbc717faaca8618c83211d8c45ec5e80a17ba9d8c8ad9c6d2ecb109f827d976eb0d126bfc44cf4b49afc
 DIST rear-2.4.tar.gz 611731 BLAKE2B f7cb6955302e0be6178393a678f050729b827f822df91d28245655d414892f225e25125f7e3bfad080e139ddc9c728121894b4ebde48c4dff2a8071fb4a5d46e SHA512 8a20c0ffd913b1b4c27f6125c1ca31404daaceccb2bfff7932f1ea402806657252afc3f6719c75dcab2de18b7975f83544dac92f43a742654f90494454d7c088
-EBUILD rear-1.15-r1.ebuild 1269 BLAKE2B 230b0c105085cf6f66aeb8f1f5ba300cd410e9cd7b4365311c49af254a3096eebd11c37f0333e4425ed4bbc3921fae0151568d6ece42c56f07aacd84e2e3d0f3 SHA512 149a082a7bf73e733f3ae4012746de1ed862a15660b2475b2db4f55229e0199af67d2629976e6a04ea59da4c8c1d8327e950926db3441171f37a654e843a2bb2
-EBUILD rear-1.17.0.ebuild 1250 BLAKE2B 2606e7c56f30df23bf71fc2be5e5bb501b112c3eb6508a783eac63fe1d0cfd2ba90d8f49565641c5d635cafd9de377fb13c62b0e031dbb203779a86ee66ad1af SHA512 6bbb7135eb4894e44733e98e62547dd383344b3dd52bab478e531c13f3172ded0e17dd4dd4142dffd17b71ffd3a4e172c7db69e1b8eab5360d477d120f7dbf22
-EBUILD rear-1.17.1.ebuild 1250 BLAKE2B 2606e7c56f30df23bf71fc2be5e5bb501b112c3eb6508a783eac63fe1d0cfd2ba90d8f49565641c5d635cafd9de377fb13c62b0e031dbb203779a86ee66ad1af SHA512 6bbb7135eb4894e44733e98e62547dd383344b3dd52bab478e531c13f3172ded0e17dd4dd4142dffd17b71ffd3a4e172c7db69e1b8eab5360d477d120f7dbf22
 EBUILD rear-2.4.ebuild 848 BLAKE2B cb6d62e0984c11bbde7f61cea72f16b10119c98047341100b2c6e8dcdb25a02551f5f8683df2b4efc65727ba9777b057f388e28dd2a6df95bde3cc37606a960d SHA512 78a8fd39ea5df4f65362a33c5d18dc16e52cea47b0aeaaf10ada27eb0ed01679b0254c55bba318ff1464f9ca55c3dd606b99a4cb71c37956eb961e64dba099b7
 MISC metadata.xml 765 BLAKE2B e50aae371c5b339a75e4b234c2202eb10513d37e29b2de3b4364b644f54019b4674100ac2906ed94b9625df35611206bdb9e6f3e252c5fa9669468762c9d9f82 SHA512 e3c84e1ac8cb0520150777a34b6dd5d4143f566900f42f7ef9b19f1af6629ef77701feed2d632205a446cc1972c2956c0de1a2a1c8c53b9979004cb18abd5830
diff --git a/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch b/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch
deleted file mode 100644
index 608685418676..000000000000
--- a/app-backup/rear/files/rear-1.15-add-support-for-gentoo-kernels.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
-index 6816f37..ec437e4 100644
---- a/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
-+++ b/usr/share/rear/pack/Linux-i386/30_copy_kernel.sh
-@@ -50,6 +50,14 @@ if [ ! -s "$KERNEL_FILE" ]; then
- 		else
- 			Error "Could not find Arch kernel /boot/vmlinuz[-linux|26]"
- 		fi
-+	elif [ -f /etc/gentoo-release ]; then
-+		if [ -f "/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}" ]; then
-+     		KERNEL_FILE="/boot/kernel-genkernel-${REAL_MACHINE}-${KERNEL_VERSION}"
-+     	elif [ -f "/boot/kernel-${KERNEL_VERSION}" ]; then
-+     		KERNEL_FILE="/boot/kernel-${KERNEL_VERSION}"
-+		else
-+     		Error "Could not find Gentoo kernel"
-+		fi
- 	else
- 		Error "Could not find a matching kernel in /boot !"
- 	fi
diff --git a/app-backup/rear/rear-1.15-r1.ebuild b/app-backup/rear/rear-1.15-r1.ebuild
deleted file mode 100644
index 1ea1bebbf87b..000000000000
--- a/app-backup/rear/rear-1.15-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A setup-and-forget Linux bare metal disaster recovery solution"
-HOMEPAGE="http://relax-and-recover.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="libressl udev"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-dialup/mingetty
-	net-fs/nfs-utils
-	sys-apps/iproute2
-	sys-apps/lsb-release
-	sys-apps/util-linux
-	sys-block/parted
-	sys-boot/syslinux
-	virtual/cdrtools
-	udev? ( virtual/udev )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-add-support-for-gentoo-kernels.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	# Deploy udev USB rule and udev will autostart ReaR workflows in case a USB
-	# drive with the label 'REAR_000' is connected, which in turn is the
-	# default label when running the `rear format` command.
-	if use udev ; then
-		insinto /lib/udev/rules.d
-		doins etc/udev/rules.d/62-${PN}-usb.rules
-	fi
-
-	# Copy main script-file and documentation.
-	dosbin usr/sbin/${PN}
-	doman doc/${PN}.8
-	dodoc README
-
-	# Copy configurations files.
-	insinto /etc
-	doins -r etc/${PN}/
-
-	insinto /usr/share/
-	doins -r usr/share/${PN}/
-}
diff --git a/app-backup/rear/rear-1.17.0.ebuild b/app-backup/rear/rear-1.17.0.ebuild
deleted file mode 100644
index cb3a99906765..000000000000
--- a/app-backup/rear/rear-1.17.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A setup-and-forget Linux bare metal disaster recovery solution"
-HOMEPAGE="http://relax-and-recover.org/"
-MY_PV=${PV%.*}
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="libressl udev"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-dialup/mingetty
-	net-fs/nfs-utils
-	sys-apps/gawk
-	sys-apps/iproute2
-	sys-apps/lsb-release
-	sys-apps/util-linux
-	sys-block/parted
-	sys-boot/syslinux
-	virtual/cdrtools
-	udev? ( virtual/udev )
-"
-
-src_compile() { :; }
-
-src_install() {
-	# Deploy udev USB rule and udev will autostart ReaR workflows in case a USB
-	# drive with the label 'REAR_000' is connected, which in turn is the
-	# default label when running the `rear format` command.
-	if use udev ; then
-		insinto /lib/udev/rules.d
-		doins etc/udev/rules.d/62-${PN}-usb.rules
-	fi
-
-	# Copy main script-file and documentation.
-	dosbin usr/sbin/${PN}
-	doman doc/${PN}.8
-	dodoc README
-
-	# Copy configurations files.
-	insinto /etc
-	doins -r etc/${PN}/
-
-	insinto /usr/share/
-	doins -r usr/share/${PN}/
-}
diff --git a/app-backup/rear/rear-1.17.1.ebuild b/app-backup/rear/rear-1.17.1.ebuild
deleted file mode 100644
index cb3a99906765..000000000000
--- a/app-backup/rear/rear-1.17.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A setup-and-forget Linux bare metal disaster recovery solution"
-HOMEPAGE="http://relax-and-recover.org/"
-MY_PV=${PV%.*}
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="libressl udev"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-dialup/mingetty
-	net-fs/nfs-utils
-	sys-apps/gawk
-	sys-apps/iproute2
-	sys-apps/lsb-release
-	sys-apps/util-linux
-	sys-block/parted
-	sys-boot/syslinux
-	virtual/cdrtools
-	udev? ( virtual/udev )
-"
-
-src_compile() { :; }
-
-src_install() {
-	# Deploy udev USB rule and udev will autostart ReaR workflows in case a USB
-	# drive with the label 'REAR_000' is connected, which in turn is the
-	# default label when running the `rear format` command.
-	if use udev ; then
-		insinto /lib/udev/rules.d
-		doins etc/udev/rules.d/62-${PN}-usb.rules
-	fi
-
-	# Copy main script-file and documentation.
-	dosbin usr/sbin/${PN}
-	doman doc/${PN}.8
-	dodoc README
-
-	# Copy configurations files.
-	insinto /etc
-	doins -r etc/${PN}/
-
-	insinto /usr/share/
-	doins -r usr/share/${PN}/
-}
diff --git a/app-backup/tarsnap/Manifest b/app-backup/tarsnap/Manifest
index ea1ac20b950f..2f0101cfacf2 100644
--- a/app-backup/tarsnap/Manifest
+++ b/app-backup/tarsnap/Manifest
@@ -1,7 +1,5 @@
-DIST tarsnap-autoconf-1.0.35.tgz 600115 BLAKE2B d2dc76a444e6095f00ba3742fa0aca5fd13263e5cc1ad666c222983ef5a5a9c9c72b5af18283ad33bef690328b9eab0c70fe908b33d87b286b1eacd55b664a4d SHA512 70f932b172717d7f0d6f96a357487b8f8ad13cb7332d73878f629c3abf0862da54a0621092d81ce8cd9eb8380cf5b4c32e89df4d890949429fc84737024dcb61
 DIST tarsnap-autoconf-1.0.37.tgz 629450 BLAKE2B 440858098c5c3f2be6fb6b1473ab4fade158203162c04fbc4c2e051f443c7ce3246ab0701e117bccb436b8f1f022e986ec67f653a3c34b9c36da99ca85d73bc8 SHA512 050053f2109b74cda16511cf35ab2c11e0470ba745c661d254b7c17efde9e629830d519896b343dbd4f48ee739dfef47b724eb5e2e78c3e7dbc4ae018a536a5f
 DIST tarsnap-autoconf-1.0.39.tgz 641089 BLAKE2B 4da7fa75c2a6df3186fac4f39a511532ae866c287a2bdc8dcc22049b53fcc903305f84fae9258793bc0c7a47b208d0bf2995143ee7b4296a35b4ca41d65d9a09 SHA512 dec8a72144a3a7fd42b006933c904b812894ca9fe2c57ecc4fbba817b9b49c8f15517530a00b0c3a9897e3182b4d9aee525334537806a9c4f7308086678fa2b4
-EBUILD tarsnap-1.0.35.ebuild 895 BLAKE2B ecf21e91cb7c9cdfdc32da8c266406a5d646361e6597dc78e75e987acc38fc87dab513d48feb321b22aeceac9d3ae5874c670ca6c523f13af942d6972e398b57 SHA512 ef92677942b4303492aa290d921e9bec93716a8e310b26bbff0b77c356bdeea4e158091c53d32812404e4573251bd8c1414b20a249d42aa8f09581350d33a1ba
 EBUILD tarsnap-1.0.37.ebuild 927 BLAKE2B e04c236550c9ecf356e9742584e1f15c255058df521276b37d4989e66b25c0551ab24e820963f8a7fdd82695c504f03ada3f241b0aa1ed6e01eae061dfc61072 SHA512 6193ff9f8fc4bcb2ac0f8aabe56c4edf9a7af5545c74f00df6a439666be44d42990089e7b5d366cbf07eec2102c84a4ee80fbac9a671fcca593f3d05ceae5246
 EBUILD tarsnap-1.0.39.ebuild 927 BLAKE2B 99903c67abc023f0eecd115579a5f56a99ff5f6394e6266d1dbed0f2ff4be3dc6d1e9b3666e35648efcb20f1f54875fd574521643c8e0d69b014af9fc6406e79 SHA512 b65f02f394250063e9f8df8c31dc77d90a6388b03d111ca03c40c97048bb51f6cbd42ace5aa3a2c25df19dd5d606f794afa4ef177b11dd038e3b8cc1da746e29
 MISC metadata.xml 275 BLAKE2B 2998d89884ee6c9d7c561577399f14407518c581b2eb5e04a0a7e92d0012fb7da12914f64ede0dc92672eebeb4c32fd96190798cc38d709f59840855c8192fc3 SHA512 5cfcef332788131c3e3b46355f30c3b06fb247f83bcb722e1c4afd5cef5189c3fcb5ba80b55bbf90570661f91c10f9d2803920ed09cd8b2ec76e90775cb44249
diff --git a/app-backup/tarsnap/tarsnap-1.0.35.ebuild b/app-backup/tarsnap/tarsnap-1.0.35.ebuild
deleted file mode 100644
index 17f77b783b74..000000000000
--- a/app-backup/tarsnap/tarsnap-1.0.35.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Online backups for the truly paranoid"
-HOMEPAGE="http://www.tarsnap.com/"
-SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz"
-
-LICENSE="tarsnap"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl bzip2 libressl lzma cpu_flags_x86_sse2 xattr"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/e2fsprogs-libs
-	sys-libs/zlib
-	acl? ( sys-apps/acl )
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	virtual/os-headers" # Required for "magic.h"
-
-S=${WORKDIR}/${PN}-autoconf-${PV}
-
-src_configure() {
-	econf \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable xattr) \
-		$(use_enable acl) \
-		$(use_with bzip2 bz2lib) \
-		--without-lzmadec \
-		$(use_with lzma)
-}
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 0f3aeb09b35a..2fb723ee437a 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 1b246cec8387..ea73b3a5315b 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -3,6 +3,6 @@ DIST siege-4.0.4.tar.gz 523102 BLAKE2B 2d69dd37fea7ff35e05b41d500d4efb5b4fe60d93
 DIST siege-4.0.5.tar.gz 525122 BLAKE2B 6d7410255d9682eeb6755bbf2eb6fd189d1c6e5e4c8bf4ed430e0ad4157ee6af9148a1bfe554167b74a6250b4897a3d34eb1c6c10cc91ff2352419769b9db975 SHA512 61f1b0a9fb4f9738f51932d5203a0ee6435aa413975dc3f5c7afafd74ec206e1ec20f5134171f740f55465e6c015df8bdac1775bc04be50bb10d0516e1a62d53
 DIST siege-4.0.7.tar.gz 525654 BLAKE2B b97c7309d33387d15327dc39ae115bebdfe64fa0debea2da87590ce801d2f590622392ea1ecc6be9f2973ff9b37dfc0f5f0fef232a4593410c4503db6c78771f SHA512 2dcccc50a2d8cd0d6c18efe776b871b999f6918c078898845fec34bb2b1b8ec03e0b95792dd963aaefb054e4f4e27f604ed95c0de5f8a34cbf738f66a2307abc
 EBUILD siege-4.0.4.ebuild 1123 BLAKE2B 8af237cd30a38f95543ab429ccd143bd336c46c4ffe6dac966219cf95c20fe73b74dbab4d576f0574c3f3f3d2fd02883b351e2492ef7da480b3ba6c025b5b6cf SHA512 19470077886d58d05d1e63d067137e3816af44639d49a59bc81f685be077790bcd927e27297ec7205173472edccf692cb7fb249af7404c6ab037baa588228d7d
-EBUILD siege-4.0.5.ebuild 1276 BLAKE2B a147f76b6c4c9dc2c6ed31018d37542e8770c08bfb4518223c32b8300047c151df97d2a2d4520d762427897c834fb1f3c9b1d4b3b42cb1adfc4d6eee9ce6105d SHA512 64eb3e28254dd5d864819bebe11999870b0e50b1c9d739be7a93971f8b43fdbc48bae4a7800e82d3946ed1fc5400ce2288912086bda296450a9d2ef7f2fc5aeb
+EBUILD siege-4.0.5.ebuild 1275 BLAKE2B c576911dadc810da8459e1c7d87be18b41da2275a9d445b2fbd15eaedea616db81bc11aeedb119c28df74322ef28fb9a92fc2248ae8025756dd2096f38ee5c44 SHA512 1aa8ad1f8d47675fa6284c02bc3db4b086c04bfb5cddc3c0566fdd1fb82fd2ee8b56f9e6bb08781d3844415c3bd4fba21e098b83c676a4a4c95c1ccb5a2f7883
 EBUILD siege-4.0.7.ebuild 1282 BLAKE2B 06bf17a997e3574e38bf042de960a15841370e5b45e81cf614b98e0bff0455fe34947af29b0382a69f4283c275a080358310630c9daf32f6a766bb6cac0b1c61 SHA512 208fe4e9dc1affd93862373c2c5ee4531a9ab9f1510d7548c9773ea4bb4c22998117547818374f7740c56853d9a119b8297c6542c35fbd489f27eb02676627cc
 MISC metadata.xml 832 BLAKE2B f56d0661ec0f81d5f155be79e6b52712bead41876a1ad2049e9597ba8923b7c0583d1176b64d4f6c76d18adc84f8eba244170e218f4987c6e499138334295be5 SHA512 7f0697daa7194a1a4565f83cb8654272b4e6ed630f41f7be83dd9a972c93ed2f1267f5ddd9f3063f39445b7a02f4c9645e0c0e4239262a98b536b28f96a11266
diff --git a/app-benchmarks/siege/siege-4.0.5.ebuild b/app-benchmarks/siege/siege-4.0.5.ebuild
index eb04541a5d40..48cafb2e2b8d 100644
--- a/app-benchmarks/siege/siege-4.0.5.ebuild
+++ b/app-benchmarks/siege/siege-4.0.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.joedog.org/siege-home https://github.com/JoeDog/siege"
 SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos"
 SLOT="0"
 IUSE="libressl ssl"
 
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index f05bc756d7f3..1b0cb3e38946 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,4 +1,4 @@
 AUX stress-ng-0.11.17-makefile.patch 1752 BLAKE2B 999a2bd729c0b3d3184010ffe5ffb5d59cf82fead7a16199c2ce1abd37dcfd3a665f4644b8d740ece4b92fa2f543e84d57952b13bac728a78ed0f749d106459c SHA512 affe4f5a324e009f10f0ed26dd8dc6d1ab7938da8574392c2514f307c1e4a46a85b0fcf7c3820e6f147f1150483f811b314d82b73ca7f605167ffa8d50c4691d
-DIST stress-ng-0.11.20.tar.xz 480540 BLAKE2B 97ef2726ae5882c405ac752b56fa14e1a08a428b2ff2685b2d513438394b86184aa412ce97ea428a6ab4ec42c29c6bd4f5c28da9331c27c477d29a8fbe070a74 SHA512 08dda9ec44d9bde873b0186c4dbf3b15090c261316f0ec0ceed5378d31780b85038f898957c892393fef593ad5c913d044c1db8e2b60c68d88f5678d0209b6ac
-EBUILD stress-ng-0.11.20.ebuild 856 BLAKE2B e233b69680e269bab98b3dcb9abb8b68990235f0ac6a8b199a1c68132eaa68fa0e5baa98588a300d1c1beb16bed7e27365baa1dd6e4f1c76372591807dc39ce0 SHA512 ce1a5efbf92221048451b3fda8a32c8216f40af5c79b9e0ba216efb1e81fa037ac0f4ebb269a61753d8bbbc0cb82a1fc5abd50d27ce2ef47a59118ca77023cbf
+DIST stress-ng-0.11.21.tar.xz 485764 BLAKE2B 69ab6ac25c66ee903820e6936a467d0802be32fd2eeec762d11979eeddcbee37e1a2b19b68408553173226ae3493f700fbb92f7d6707e372cfe5d59bbc9d6e94 SHA512 ec41d57f1d58150efc5db5cf96d8b2d8f6f2453cce2f5b2275b8cacb68fad6acfe7fe3004326413ab4ee02098a340938a3cf04404141f1310a05e07abaf7b500
+EBUILD stress-ng-0.11.21.ebuild 856 BLAKE2B e233b69680e269bab98b3dcb9abb8b68990235f0ac6a8b199a1c68132eaa68fa0e5baa98588a300d1c1beb16bed7e27365baa1dd6e4f1c76372591807dc39ce0 SHA512 ce1a5efbf92221048451b3fda8a32c8216f40af5c79b9e0ba216efb1e81fa037ac0f4ebb269a61753d8bbbc0cb82a1fc5abd50d27ce2ef47a59118ca77023cbf
 MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1
diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.20.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.21.ebuild
index 3985c5e05705..3985c5e05705 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.11.20.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.11.21.ebuild
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 30708a53bc24..c1fedd23089c 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/dumpet/Manifest b/app-cdr/dumpet/Manifest
index d68cc472cce3..93dc69ebff98 100644
--- a/app-cdr/dumpet/Manifest
+++ b/app-cdr/dumpet/Manifest
@@ -1,6 +1,4 @@
 AUX musl-byteswap-fix.patch 294 BLAKE2B 1967a0ec276357db52b57ed84b2f111dd456477b0ba01f018e2823e2498764c1cb0119838b5d455991438104965ac679e86cfc0fa4ba71ca89ddb4e1b3de1145 SHA512 7cba10e469b80bb895c8e3c03b3e3184482b54acabdf602226d9dfdd62004bcf5a48ceeed0fa30edc3e789b4be321383c63adf4f726baa6e89960949bde58a58
 DIST dumpet-2.1_p20140601.tar.gz 20140 BLAKE2B def3e7948096e2543bf24324b17c3b3123b867e750971858cb403732efde6c217fcf1c04955a0dd4ed2f99fdaedecab1becdcc1027645e7a955ed1addf11daa1 SHA512 161911ae136aa81abff5a591593acf421a4101e3f80cb259c5b2190581d5cbd06641eefe4c873d40d1b2adabedb2e42ef7fdd0a6e39ec98e1927550ae8960eda
-EBUILD dumpet-2.1_p20140601-r1.ebuild 865 BLAKE2B 05fe70b1311e20e32e5b199555613d70ad6ccfa1f2a748ffe61133945cd05a4b88e6e2eea78140bc781338fdd609bb8e535860768c500f60f793722ee8ccecc8 SHA512 d30ff2f0d940e404323bb0f9c2e52ad4c26034aad295dff9dd0ecc771d4c3e2bad130007fbd1513ca3f282ebd0098368b443c25974fa6714e81df7a8e2553075
 EBUILD dumpet-2.1_p20140601-r2.ebuild 918 BLAKE2B b7236f9ba6bc556e61d7cede87f0e6b574db1424be8379e57ebb8cb310c4750c43594d349e338a15636486f772f107c7188eb2fb24325565b98725763f97e9cf SHA512 fb835a7c8f653d08b3aad3e9c0617fdbdb636f6753e737619f1c0ee55ae56d2ec713796a4446024eb59be90a7395d8bba5818233f4a1f3c0bb763d24ac29b369
-EBUILD dumpet-2.1_p20140601-r3.ebuild 953 BLAKE2B 08426c94faf86ccd0d044a4c89181f0f56e7039128574b2ef397ebde87c7e9dd181db5b55372400c594b749be8567eba48afa19fd43cc8b1c7f8fdc073d08a43 SHA512 1207bf6f10570460214501716ef59d53d3e5f929cb803b0ec6c34171082984ad0de83b6f36b8b5f43a1285af5bdacc895a5ee1991554763f27b6602d0338e17b
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-cdr/dumpet/dumpet-2.1_p20140601-r1.ebuild b/app-cdr/dumpet/dumpet-2.1_p20140601-r1.ebuild
deleted file mode 100644
index 19c4ac78d11d..000000000000
--- a/app-cdr/dumpet/dumpet-2.1_p20140601-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs vcs-snapshot
-
-COMMIT="8f47670dd582c96ad1b6dd3c9b9da0acebded5d8"
-
-DESCRIPTION="A tool to dump and debug bootable CD-like images"
-HOMEPAGE="https://github.com/rhboot/dumpet"
-SRC_URI="https://github.com/rhboot/dumpet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-#Restrict tests since required test file is unavailable
-RESTRICT="test"
-
-RDEPEND="dev-libs/libxml2
-	dev-libs/popt"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/valgrind )"
-
-src_prepare() {
-	sed -i Makefile \
-		-e "s/^install : all$/install :/" \
-		-e "s/^CFLAGS:=/CFLAGS?=/" \
-		-e "s/^CC:=/CC?=/" \
-		|| die
-	default
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" dumpet
-}
-
-pkg_setup() {
-	tc-export CC
-}
diff --git a/app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild b/app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild
deleted file mode 100644
index 00b1082b508b..000000000000
--- a/app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs vcs-snapshot
-
-COMMIT="8f47670dd582c96ad1b6dd3c9b9da0acebded5d8"
-
-DESCRIPTION="A tool to dump and debug bootable CD-like images"
-HOMEPAGE="https://github.com/rhboot/dumpet"
-SRC_URI="https://github.com/rhboot/dumpet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-#Restrict tests since required test file is unavailable
-RESTRICT="test"
-
-RDEPEND="dev-libs/libxml2
-	dev-libs/popt"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/valgrind )"
-
-PATCHES=( "${FILESDIR}"/musl-byteswap-fix.patch )
-
-src_prepare() {
-	sed -i Makefile \
-		-e "s/^install : all$/install :/" \
-		-e "s/^CFLAGS:=/CFLAGS?=/" \
-		-e "s/^CC:=/CC?=/" \
-		-e '/^LFLAGS/ s/$/$(LDFLAGS)/' \
-		|| die
-	default
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" dumpet
-}
-
-pkg_setup() {
-	tc-export CC
-}
diff --git a/app-cdr/pburn/Manifest b/app-cdr/pburn/Manifest
deleted file mode 100644
index 0114ca77dc85..000000000000
--- a/app-cdr/pburn/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pburn-3.4.3.pet 66536 BLAKE2B 9a3129f5a7d85adbbf376c92b40eaf4036a931987752da3a18a265474d60913df47d0a29e06574ee5018c552ebff85dcd149f4f13b9a69655c5a78169eb8ccce SHA512 8bd67dfb9b3c08510ff9b675ec69929a0719871e2c9924fb4defe41147e2c7096b305776cca7f07fe7a28ec65133106636ee5804ca43ca2b5f6e1fe487eed99c
-EBUILD pburn-3.4.3.ebuild 1114 BLAKE2B 9eff85207ba26301d1ca23f2e5ce3ce748e2d2a06eb6881be10783e071ae8cbfcf4fe2ff9e28f65b5db8d4558670c2df604daf8adb02a02de125def25c0a8bb5 SHA512 7bb35d89f8d0e78f4973338cfa9488ca229fc2d4c80a1dd78df8f23466c018793b5a244c2720d3af945389c35999969313d7f202f36be8d55825f70f370d4ea8
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/pburn/metadata.xml b/app-cdr/pburn/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-cdr/pburn/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-cdr/pburn/pburn-3.4.3.ebuild b/app-cdr/pburn/pburn-3.4.3.ebuild
deleted file mode 100644
index 4b38d8c05bdb..000000000000
--- a/app-cdr/pburn/pburn-3.4.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# wget --user puppy --password linux "http://www.meownplanet.net/zigbert/${P}.pet"
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="A burning tool with GTK+ frontend"
-HOMEPAGE="http://murga-linux.com/puppy/viewtopic.php?t=23881"
-SRC_URI="mirror://gentoo/${P}.pet"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-admin/killproc
-	app-cdr/cddetect
-	app-cdr/dvd+rw-tools
-	sys-apps/hotplug2stdout
-	virtual/cdrtools
-	>=x11-misc/gtkdialog-0.8.0"
-DEPEND="app-arch/pet2tgz"
-
-src_unpack() {
-	pet2tgz -i "${DISTDIR}"/${P}.pet -o "${WORKDIR}"/${P}.tar.gz
-	unpack ./${P}.tar.gz
-}
-
-src_prepare() {
-	cat <<-EOF > "${T}"/${PN}
-	#!/bin/bash
-	"/usr/share/${PN}/${PN}" "\$@"
-	EOF
-
-	sed -i -e 's:usleep:/sbin/&:' usr/local/pburn/box_splash || die
-}
-
-src_install() {
-	dobin "${T}"/${PN}
-
-	dodir /usr/share
-	cp -dpR usr/local/${PN} "${D}"/usr/share || die
-
-	make_desktop_entry \
-		${PN} \
-		"Pburn CD/DVD/Blu-ray writer" \
-		/usr/share/${PN}/${PN}20.png \
-		"AudioVideo;DiscBurning"
-
-	dohtml -r usr/share/doc/${PN}
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 9d700e347788..988f36e063e2 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 68b7601afed7..7bbdb98f7156 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,9 +1,7 @@
 AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9eab0c96481cbbcfe064efc81afb25e8819746051e3f47b325eb97d213b7ebf95df60a195a5d16d68332f42d SHA512 a8d6245b09e80e2c9082589e62c2687234ee7838d19255e07aadfd05ddffdb1817e38eac434e71d5f0e19b7f9a88a51126349ae4aa324a634769050dbf433f0d
 AUX efitools-1.8.1-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601cac7d797a7e0de7ca3bc59d5799f1a63b6f6a8ac0a2edf87b50ecc4bc9eba21778ceab3e4fab23280dde92b2ce6e8294268a2886f720 SHA512 27a5331f00fc3d8f18187120940b6e46c6267c0478663378a28c5beb80a761422162e002836a4f0db096a6386cbb2e2c5e328e9355638aab82b9556c992b9e0f
-DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb
 DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
 DIST efitools-1.9.2.tar.gz 116037 BLAKE2B b3540932eb112e362fd0eed47090360603807dcaec8c6a10058618f8252eeb5dcbbd703d313cb6fadae62c1312815080cf2c77fc86f9dfc9f9afca24ad97f584 SHA512 77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8
-EBUILD efitools-1.7.0.ebuild 787 BLAKE2B 9c2daade67b20bb4fb7b38413ff174695a40889e509c0828f68fc8d1eb1a0d0c7ed2cdc32d05608cff53317c4ca4db3133ec041cb86ffdac2b1d1287c00c3043 SHA512 66b40139afd0f071db68891152a25c9d6993be948e100817b26eb3fa547d09580bd4e9bfff8916c58a7f2bd38bfe4221edd1452d58a59e251629f5689f88740e
 EBUILD efitools-1.8.1.ebuild 1349 BLAKE2B ffc55485773daf9bfab8069f8c6b1cce41daef3bcd6d5df82868aeec8e0c8fc83f69b2b4cf9565b66f8e03ada9042637902d54516772ff850d79c17423c595b4 SHA512 e686d262e3973b1fe727d960d3b97bb284b1d3795644a2dccb89204b377db0e30d2b435174ed5d622f00da2256994a4c997fe92fdc2954dfe1964d25a1ab0ef5
 EBUILD efitools-1.9.2.ebuild 1352 BLAKE2B 11335277bff81f0a7cbca7626b0951c835e781afdef9db2ac56e8163f16b67afbbe4db692bde9defbc2d442ab30f30207acf4d9d69f3bf2c10e3a1b96474b626 SHA512 336c0495a76a0ddae566708b637aaa69708ad3d86d90ba111cb1e59e3a53edaa33232bea59f1e4e99cf6ecd9448dc40cf2ed63d0a02e3aa18aeb0ae1387a7dba
 MISC metadata.xml 217 BLAKE2B 42ce05c77b1d33a62b5cd9e26a0dbc801edf537bd1482da9f3680a430e3714cd9adea45649fd6bec858e3de1863d0c855451ae8fe1e4b8aa2c6b2ae9a8e343a3 SHA512 b9ca3681462c901c78bdc3ee840596fb6f5151d6b555abd1b74c570fa83e9b5b964cc0988538c892bbf70d2963add9d39af56a6fe353ca7641a6f3aede49be82
diff --git a/app-crypt/efitools/efitools-1.7.0.ebuild b/app-crypt/efitools/efitools-1.7.0.ebuild
deleted file mode 100644
index c47c9b03a9e0..000000000000
--- a/app-crypt/efitools/efitools-1.7.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git/snapshot/v${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libressl"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-apps/util-linux"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	>=sys-boot/gnu-efi-3.0u
-	app-crypt/sbsigntools
-	virtual/pkgconfig
-	dev-perl/File-Slurp"
-
-S=${WORKDIR}/v${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}/1.7.0-Make.rules.patch"
-	epatch_user
-}
diff --git a/app-crypt/jetring/Manifest b/app-crypt/jetring/Manifest
index 1253dc95e022..3a63b2cc530e 100644
--- a/app-crypt/jetring/Manifest
+++ b/app-crypt/jetring/Manifest
@@ -1,6 +1,4 @@
 AUX jetring-0.21-parallel.patch 762 BLAKE2B 0cdb8e21c3afcf17fdf8dc2eb3c9d9728c1139f0599572168b00cc95581f4c84072b2b3c15f188a120c65d1d9ac678ff1b7721b6e3afc62796849697ce623c1f SHA512 67f866eb53bf6aab22ff955a8ecc4ae9907f2b6cc430e12c5183a18c23488b53ec1de8271dc853f1a429463228f80aa2f90b6161a5350bc6d85db50de95a5f0b
-DIST jetring_0.25.tar.xz 208944 BLAKE2B 417565c1590f677542f81b6f457482ff1c8219317b90d12666a8b497608f5ee16466c03f68d8c4424c4bb92a0713fefb243dc621eee9cd10f7cf3495590143bd SHA512 aa9de0c7c034093789bf74c75533e678b0822cf0d1261d1b906fd5ef2decb41654bf2facc5c06b469367bb1a0fea4c862c0836fd00635779a2e8dd4f3c08ff46
 DIST jetring_0.27.tar.xz 209376 BLAKE2B 08081611d42f63dbfd0d8c44c67932ae6428ce244f9f2c01466bae0baef54e4ccaa67f78825004a0292bc619efd44b247b7982669cf5b29b366c4c20f776984a SHA512 707f480d6b5ef2943fcd54776631d2290ec892bcccb0a3099f28262e4660d844d1db135fa4070538ffcf1ddeda00c09dd258707857e0f1af0fcadb407cca383a
-EBUILD jetring-0.25.ebuild 660 BLAKE2B 4beaf7607a56c28d9d80c5707c58757a60a9ddf5dc192ad070f2e8fb932affa52bc88dc086a04f942b0dc7a050c09d27adbe75987168367b1775adb2b71165ce SHA512 26bd7f1dfb4520d82478994cd51deb34030843db4c4caaff325e47ec4779decc7f972656bcf519fb54dd7e39149b0894c99dbe1db176487e8f5292142936eb27
 EBUILD jetring-0.27.ebuild 677 BLAKE2B ba40e08faaa387666e6bf5a3c4c1e4c7410ed870fe696d5f90d79f351c13c3120b553f063c956c21326b8b1c5dec6dc39099fe2a90ab5e7a855f9362c7e6aec2 SHA512 4961d70e626c3df8a968a6dc1902f313f1ba32564577aa9a94bef0ccc5d76f1980c19ebb965850f6e41e03b29547826167ee1c16b8f0352d704b0261047a7c78
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-crypt/jetring/jetring-0.25.ebuild b/app-crypt/jetring/jetring-0.25.ebuild
deleted file mode 100644
index 1e93e84f2d90..000000000000
--- a/app-crypt/jetring/jetring-0.25.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="GPG keyring maintenance using changesets"
-HOMEPAGE="http://joeyh.name/code/jetring/"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-crypt/gnupg"
-RDEPEND="
-	${DEPEND}
-	dev-lang/perl
-	"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.21-parallel.patch
-}
-
-src_compile() {
-	addpredict "/run/user/$(id -u)/gnupg/"
-	default
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/${PN}/
-	doins -r example
-
-	doman ${PN}*.[0-9]
-}
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index f4af00baa4e2..32a07c34990b 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1,5 +1,5 @@
 DIST jitterentropy-2.1.2.tar.gz 24112 BLAKE2B 9328fcc6ac09b79765d53248e4d6d01be47348c6f22f660175de888a884ea9e65253cc2e6fd3620a96f69dd0051b97ea3c46462a24c8e0c94d2bba19afab059e SHA512 b1ba2fe22c6b7d5bca64bb1611f2da3f53f1979e515a16141ccf330e3ca27a6944f0e45f0db57f4e3963a30ea4b34920ce9173f9c4f3ea82b820dc739cbd95f4
 DIST jitterentropy-2.2.0.tar.gz 25556 BLAKE2B d0a8faa9131e9fd5712fad4179725ac29ba813e0d77e5ae9dc905841b92f67fc51e79c407142b2e8c3473f92a59a5b03f03d2013bd7e5d1ae07110da52461255 SHA512 4701a7e0a82ee583cbde5edfdacb737a5f588b42c61b16434b5a11bdfb1a108e7b9df8b8b38d9e92290e702b33f2ae8774580d6a71e6e8ac3af295ffc8ff5ff9
 EBUILD jitterentropy-2.1.2.ebuild 1009 BLAKE2B c8eeade1025e141eb03b5038822a66a688cf00cfa7fcb939744b2b1c569673d409f90100697c492a19b5838e81a12f292ee8bc739567a1716eac8b8a1c3940ea SHA512 c56b8da555882df70493402572fbbed3a3ca5b2ef5f63d1f653dbc54f92554cad428d315b872a899c1f33e90e25d3254c1af40844e4eb3559d03a7ba10d990e9
-EBUILD jitterentropy-2.2.0.ebuild 929 BLAKE2B a4aa0fdfcd7daf5749565c18fd0f62f94f0d0ee21907cfc3f261cff166065483c0f300e9dd9cd938a357dd94af581c8519db591ce9ba175be427ab581ac4fb37 SHA512 cbd3df7f31608143aa1a96642fbdd1b4035e083b6a9ccebfbc5bb9ce1d3877aa2b20f938df377fa85a21f3c0191844db54aaa2816e023334771d20f7b31d5fc1
+EBUILD jitterentropy-2.2.0.ebuild 925 BLAKE2B 6106ec1161b49e575b1549f67ae98fbc1c1a225928d39b155b04e33a2e6eb4a98672d344c23ba66a9509e0198c75fb78bea25a7640d38d3f7e98b657e3af79ff SHA512 71bce4e2efd58e54cba5407912a8807b98d9651f557a4896b7007015a18325a1ae1f3f9c169ca159e08f395192f1f7a174e4f382754412031a9b3551eea7da7c
 MISC metadata.xml 666 BLAKE2B 88598964271ee05c8427e8547d25dd50eb50bec1dafcaef064328dbca5140b9221b1d1823a1dc54289b73501556579fb39a85c49a6c25d6447a677e8db0f6252 SHA512 d6baaef1aa2e0958492872e7b0ba2c6c86dfa7e281268b6cb230c2cc2c8132df04e664e0449d24885357a1a791bb354253778e0e5f2436fa612b6e0c509729e0
diff --git a/app-crypt/jitterentropy/jitterentropy-2.2.0.ebuild b/app-crypt/jitterentropy/jitterentropy-2.2.0.ebuild
index f4a146544007..41cf317760f6 100644
--- a/app-crypt/jitterentropy/jitterentropy-2.2.0.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="static-libs"
 
 S="${WORKDIR}/${PN}-library-${PV}"
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index 721ad0572f40..84b975c9ae82 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -4,26 +4,11 @@ AUX monkeysphere-0.36_non_default_port.patch 418 BLAKE2B 8abc99d21b539e1b11eab3c
 AUX monkeysphere-0.36_openpgp2ssh_sanity_check.patch 1194 BLAKE2B af75804e5ea457c63e6e904e2f1ffde393e3ab06a8222527b825212f44b253ad7d418a1d10a6abd2204332065a2ba5bbbdff09a14181f0fc8bcac6808cdc64fd SHA512 b14c421e5880407b3acb845b235c89c5338a1fc1285b514679de09371db38e42aa3371ef2916c57d5ab10f08bc19f5c864762ff7eaf0a054d2817bc6bcaab488
 AUX monkeysphere-0.36_tests_gnupg2.patch 2272 BLAKE2B fd690dfe4fd357f7a6c551698c8cc897d2c5f34ae44fffd77f4a63de9a25173b3f84dfe7aa3877cd0c724650de250c72ee55f63e1aa658421188658691f02270 SHA512 e75f82793419dd2e99aa95765e9d954437d0e78294ed4188a9e7fa246b85ddbcd755eb566a1e9a9c20f2f2634150d65caa0715993863f59f9146f5cc95457975
 AUX monkeysphere-0.36_userid_empty_line.patch 292 BLAKE2B 5ce813bca6235a365d69f3c8d19b6f39dbb981af57e8171efeeb921f2e0b9c4e73c531838a87e3275809e427a3d7b7e75ad88341ab3dc05a5258f6a7fab6af6d SHA512 15b8e8ff71537e79d069d0f298326cc6705931c58ff1cf2f16c5486e587fe69f610dc1e0ebd0006e0bdef12f936685a0594dc3f9dbdadb928fba25a8e2982eb7
-AUX monkeysphere-0.37_default_shell.patch 466 BLAKE2B be3f2818c3d31400235fe413fb55ea79cdad0cf441a3a841465d11c9467f948f790337dfc1c07bd1bead1f3c58a3b157800b64eb9bc98ada7f263fd7b1c221f4 SHA512 c77042e07372ae2b7434c03529a10afd5d13f99af025cecf53bd433341a3c70ada4cedd904de67090f36cd3dcd7f77f7a46b739116b1248b432803fc137fa7e8
-AUX monkeysphere-0.37_hd_od.patch 528 BLAKE2B 9ba0ae67297716b2379fc7141f6e60f0af68f9290654641946ad94fb6e04d16ede747bd334639c96c6f241e98331cba1373bf5a1c012a15460b58cffe0227ce3 SHA512 412656731fced9ca5e7b1c253e8cacfc47bf45ce7ff28da9e1db1582aa84fa75f098cdd098dc6d33198eedbc87ea397569ebf0045b6291106481e7a11fb04e55
-AUX monkeysphere-0.38-asprintf.patch 1569 BLAKE2B 2acab74551104685ff7735ba732362be00fcaa4e83326b52a36fda5ad514a5f367f03889e05181013531b1f1a15a36dbd80085cac6271f4484e399fd6839b150 SHA512 d750a948a9149c6110ca513743403588b4d861fbbe5c661401f4e0406d4ecbf03d9ca02e4eaf4f469aaa23925f2bc8dde4c155d72fadf26c02291e76571a6c70
-AUX monkeysphere-0.38-revert-executable-patch.patch 4379 BLAKE2B e599a5e13454aa9748c57d02df67f902b9337b345347622fdbdda428b0340a8672baef2ee254a17526077cc56eb2563b248a4bf42db8f24f374f139ffddfed4f SHA512 21c38c63200de7250ce90724f3dd51ee39fc2110f52b0815a592d4c49e7c32e08b3aa56b17b5a680e77727793768bed04938e7d3e85a15308ef894fbe2593f8b
-AUX monkeysphere-0.38-syssharedir-whitespace.patch 2408 BLAKE2B 89fa5bafb1c450216bdbabb7c202f2ad472c4a06720c976798852c2f8c996328e0da2dfc4c7bfaff212cd689609658976d5afa5795ed8c9c99eedc82d8ff7ca6 SHA512 7287ddcead490b188265c7bd001072125e5abe25431303853ba7bd512330d8bef9197b563745211dbde358a4107880915bd8489164be1dce72e46d9d790d2620
-AUX monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch 1700 BLAKE2B 81e72232976d71d7b3570c0fbb4852862997fe7e38e5858826fb1772fb8dbb51b1790e9c99bb6fcd082a54f0d9556ca0e05aa1ea34a2e5410da4ea6f4e938399 SHA512 1a23a1f02e98c86f45701105819ea1ff78f87132d7195ac2aebb0fda8c867b360e12ab8701c9579625af6d54851db30a93647c351ecbb3d99c5963b039628cbb
 AUX monkeysphere-0.44-install-uncompressed-man-pages.patch 1580 BLAKE2B 54db4bdeb8d93406d6f9fa222118c98e0a1cfbbdaaf02f280024a41a9c4842aecbbcd6735cdc9ed9949e0e5463f8bf940b642b632c385d48d4dcf36a28a1cd69 SHA512 c4c677e08130ac01a3e98ba21f5e68e5bd7ce4765b44ed91ca5e0506d22937fc13f1a0dfdcd86f1e093e666882452b112a52b954d5f33ee73a47381a28d2e11c
 DIST monkeysphere_0.36.orig.tar.gz 98876 BLAKE2B 5f8dcd5349cd038208fcc00dff19c7d001ca8b763f223e832c820bc4f09391ff78667f80af691c0234aed810f4d5aa77d26a378a88b41a4b115ab528e0cdd9ed SHA512 eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8
-DIST monkeysphere_0.37.orig.tar.gz 99557 BLAKE2B d32d127927bcf3494933282fcc343ffd32841a8afe84c78b9b29ae30fa374328295d3610475aacd8e2cf0962130c2a73b338c702dff4f904b6fd23b33ad0331b SHA512 ebf636caaa0985a2495314375a9d78d131173ccedc116993e02b7bbc0ddc8c43c718dc65cb725619ecf7e72e0b7e11b941f3eb342d7c23d17ca0507b2ab28512
-DIST monkeysphere_0.38.orig.tar.gz 107546 BLAKE2B 627b0fbed52e651d57fd359e79b91689eeca47ea58335125061cba72f863a582d39536504124e18805c39b3c43e5096edb6db0e32c5c80570689bd55e2936a3b SHA512 fd87460fe16b0133fd507ff93926a5dea6419343b45c3ba33e6e981333646f4fa840c127bb1f3e7750bc3ede66c5e07f4155557a8354cf38d89159422dca390f
-DIST monkeysphere_0.39.orig.tar.gz 107735 BLAKE2B 5e4df72c8c78f6325f79c93b7de1407af2ceb1d2b6be43476d3e0dc5b2505ae97c589deec2bcb64a7dbb3a661221891b89e126086d08df09aef07b07452344f7 SHA512 069acbc3e4f1409a130d4efc95875c72b9e4c55af6ff211fb954a90ff26605ecf9cdbbe7d7f7849de479cafaab7957a33fccefd5f2d54a2317f18bc5454190c2
 DIST monkeysphere_0.41.orig.tar.gz 109040 BLAKE2B dadbd65c879bc8e73e7dd1360ebe7f7242aef125af3907d4487f8d0711afda6d87736ab82938867201eead5c1008d192dbd90602eff5a4843d990b3c87ee2949 SHA512 fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962
-DIST monkeysphere_0.42.orig.tar.gz 110415 BLAKE2B 281ce2841b9f088f632aa6f487dc6b669911dc343bd2cbbe3dddfcc2ace9a1f2f747bfbb6d831c071a5ebae9c34d4809b1b1f90277e7d3fe1e8f0d42f363f52f SHA512 82e3b0f5f5532c75c1ccf2bd6269f7f4292f38956236fdb7813117a85ef36852b7d7c000552555ab0e233df9a84d7f4e5e86edd007bfcebdd6cde2e808f489f5
 DIST monkeysphere_0.44.orig.tar.gz 110289 BLAKE2B 8a067035d3a40436fd5c27291ab25f15d475d9a0f17b51259c0431c77841807af93cb04d045b77c5f5dda3cd0061ab52561fdb62a704715d0d8cbbf96cb43259 SHA512 cb3c655a08b1c0a382502f8609f57d0c870fe4491b1b967e9931bdfd146b3926470496577949630452e073f04442b91a1ef679254c0f3091a834f3429e0f8e93
-EBUILD monkeysphere-0.36-r1.ebuild 1187 BLAKE2B 6b0f8b0e240a372e13b1aaf0dd4f7fdbfd08093d2e8f9e0a3dc71e7590643eb814978573a9098a134f402470162459832040252bcb19657a958e7ede5caada87 SHA512 380cd2eb925360506c6a3237d642131c9a6e257e219d19d5b6902034b056f6984296f9f1621d81c012f75456658eb57487fa609a0748df7aa11397fc0d5b89bc
 EBUILD monkeysphere-0.36-r2.ebuild 1781 BLAKE2B 76df9b0b9204bdc2b9250b00e30660ac613c34efa3a2bff2f7a01aa05bf838455c8fd0dda653594619e0255b42ddf7ebcd8f5d3dc3ee65e949948d7249424395 SHA512 f6da7b96ffce5bc0e6eb4fa83df65f47b12882b65fe44f3c8e45b2d38387cc82de9185262ad6fe93a9cddb61929ea3651c7a30979a572dc9ac5a1d24550255f8
-EBUILD monkeysphere-0.37.ebuild 1459 BLAKE2B e9196602c64910a1cc816993c36fce60926354958403c78753cd9eaf5b737ecc6194639614387fa8bd65c4cfb398d0eb548583a95f2b20649f8d7ec575e7355a SHA512 5181dc7b06a7a5910bafe37438c152f54d4c0f6949cc6fc8a8e203324d16c345e18475c7a854709c722ff3d4d72c66b121a653c6f86d3a33a24ad16b0097f0c3
-EBUILD monkeysphere-0.38.ebuild 1612 BLAKE2B 4591fa6e98486ebf67ebfad50f20e272086422221448933652a687b6c857d35c5f50d8698188d07454d422357cfe5cbbe1c67fb27fccbc501ec9161579884f41 SHA512 f24a5d308d28b4435c5e02b55f113ba4d5ca8c75d458c65573663c1dd97b03ac43a08d9cf5ff8ea198e00a27653f129276f89f70421da7de26e709aba5f3e5ea
-EBUILD monkeysphere-0.39.ebuild 1441 BLAKE2B 588283fd2a272a963781f0ee4a6a1e24b157642a987bd4a54d40e82a3d5cca3d3cb8d408250a369916041abe16ae722824ad863ba4cb374144a0388cd4b841a6 SHA512 1eac7528acd605c46e1b0c869afc43e6e603b4f191650568b5ca9c478f22efdd0b41c31d09daf341309d8a31cdac8f2bc1ac29408f48315709a9923589f46b1a
 EBUILD monkeysphere-0.41.ebuild 1372 BLAKE2B a290eb661701e8e2e930a25c584d54fc9c31b9373e0d181ffaa03074d04b8c39c7540c9e2a5bb4fc4558354103d34d9ebcdee29a5d941b32a7be673f2efb7f9f SHA512 5f044379bf2b0577bd322685eed5951c6271e8b55ee8338ccc517fc239f743ee43160c32b8293e8a8c345ef395fea7845e1cb4ddc33a705f75c5ef25f227b91f
-EBUILD monkeysphere-0.42.ebuild 1371 BLAKE2B a2c27a481725a6167955da764046e66e10f03897c448b2852dac1006b3471a32ffef480bb610e2c9c5f9c1269bd9390c6ec50cf85883a97346b17aae9833a759 SHA512 6cec984b7674b6a7b38cc65ac9e46d796292c9a17535b726c699836acee7f1694a3cb2f01dc8217263eaf0df1ed95eb82913962756f7bbf95a83f74e41dc9d4f
 EBUILD monkeysphere-0.44.ebuild 1081 BLAKE2B 9c99e3a87ab77e83f1bc8c42c24142f5fbc318c9726c344a79d11508f0d767253e9d118dfade187bc7ecf023c53b0dd2d9dbea9896be3ecba1da030845b25aa4 SHA512 7228951f276d62d01e302f5dcba2cdebcbf0bf4e4dab2986b8d6f9332d4f1e7fa20eaa6a049d7744c15bd5c2eabb9ddaf3bfacc41f38a3244841b0d26ae49b7a
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch
deleted file mode 100644
index f979114181d1..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.37_default_shell.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r d0c02fe6a949 src/share/common
---- a/src/share/common	Sun Oct 06 19:21:18 2013 +0200
-+++ b/src/share/common	Sun Oct 06 19:21:49 2013 +0200
-@@ -108,7 +108,7 @@
-          # if root, su command as monkeysphere user
- 	'root')
-             # requote arguments using bash builtin feature (see "help printf"):
--	    su "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
-+	    su -s /bin/bash "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
- 	    ;;
- 
- 	# otherwise, fail
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch b/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch
deleted file mode 100644
index 7cdaa74b5735..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.37_hd_od.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 6150774ec7f4 tests/keytrans
---- a/tests/keytrans	Sun Feb 16 20:11:02 2014 +0100
-+++ b/tests/keytrans	Sun Feb 16 20:11:40 2014 +0100
-@@ -104,8 +104,8 @@
-     <(gpg --list-packets < "$TEMPDIR"/converted.secret.key)
- 
- diff -u \
--    <(hd "$TEMPDIR"/secret.key) \
--    <(hd "$TEMPDIR"/converted.secret.key)
-+    <(od -xc "$TEMPDIR"/secret.key) \
-+    <(od -xc "$TEMPDIR"/converted.secret.key)
- 
- KEYFPR=$(gpg --fingerprint --with-colons --list-keys | grep ^fpr | cut -f10 -d:)
- KEYID=$(printf "%s" "$KEYFPR" | cut -b25-40)
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch b/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch
deleted file mode 100644
index dbf9d5f590ca..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.38-asprintf.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b756fd2e58ab013b5c9bfc2658ed9ad48868067c Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Sun, 7 Aug 2016 18:24:47 -0400
-Subject: [PATCH] avoid warning about unused asprintf return value
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-some versions of gcc produce this warning, which is treated as an
-error due to our conservative defaults in Makefile:
-
-src/agent-transfer/main.c: In function ‘main’:
-src/agent-transfer/main.c:676:5: error: ignoring return value of ‘asprintf’, declared with attribute warn_unused_result [-Werror=unused-result]
-     asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
-     ^
-cc1: all warnings being treated as errors
-
-this patch avoids the warning.
----
- src/agent-transfer/main.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/agent-transfer/main.c b/src/agent-transfer/main.c
-index 406aaa3..3038f5c 100644
---- a/src/agent-transfer/main.c
-+++ b/src/agent-transfer/main.c
-@@ -672,8 +672,13 @@ int main (int argc, const char* argv[]) {
-     return 1;
-   }
- 
--  if (!args.comment)
--    asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
-+  if (!args.comment) {
-+    err = asprintf (&alt_comment, "GnuPG keygrip %s", args.keygrip);
-+    if (err < 0) {
-+      fprintf (stderr, "failed to generate key comment\n");
-+      return 1;
-+    }
-+  }
-   
-   err = send_to_ssh_agent (&e, ssh_sock_fd, args.seconds, args.confirm,
-                            args.comment ? args.comment : alt_comment);
--- 
-2.7.3
-
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch b/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch
deleted file mode 100644
index 4d98c0a7cf5b..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.38-revert-executable-patch.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From c75c7553a88e387013e2b4310f4c4956adfd8a98 Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Mon, 8 Aug 2016 20:45:07 -0400
-Subject: [PATCH 1/2] avoid treating src/share/common as an executable
-
-having src/share/common treated as an executable (commit
-ed10318d3760b56e57d5e1bef04ab57761ab8bd1) was actually a terrible
-idea.
-
-In addition to causing "monkeysphere version" to print the version
-number twice, it meant that any invocation of a monkeysphere command
-that sourced src/share/common and had a first argument that happened
-to be a function name would accidentally invoke that function.
-
-This commit reverts that idea.
----
- Makefile                   | 2 +-
- src/share/common           | 5 -----
- src/share/ma/add_certifier | 2 +-
- src/share/ma/update_users  | 2 +-
- src/share/mh/add_revoker   | 2 +-
- 5 files changed, 4 insertions(+), 9 deletions(-)
- mode change 100755 => 100644 src/share/common
-
-diff --git a/Makefile b/Makefile
-index 608a317..768564a 100755
---- a/Makefile
-+++ b/Makefile
-@@ -55,7 +55,7 @@ install: all installman
- 	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
- 	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
- 	install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
--	install -m 0755 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
-+	install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
- 	install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
- 	sed -i 's:__SYSCONFDIR_PREFIX__:$(ETCPREFIX):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv
- 	sed -i 's:__SYSDATADIR_PREFIX__:$(LOCALSTATEDIR):' $(DESTDIR)$(PREFIX)/share/monkeysphere/defaultenv
-diff --git a/src/share/common b/src/share/common
-old mode 100755
-new mode 100644
-index 66181a3..b10a040
---- a/src/share/common
-+++ b/src/share/common
-@@ -1,4 +1,3 @@
--#!/usr/bin/env bash
- # -*-shell-script-*-
- # This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
- 
-@@ -1022,7 +1021,3 @@ report_cruft() {
- 	printf "The directories above are backups left over from a monkeysphere transition.\nThey may contain copies of sensitive data (host keys, certifier lists), but\nthey are no longer needed by monkeysphere.\nYou may remove them at any time.\n\n" | log info
-     fi
- }
--
--if [ -n "$1" ] && [ "$(type -t "$1" || true)" = "function" ]; then
--    "$@"
--fi
-diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
-index 1d450e7..5416aa9 100644
---- a/src/share/ma/add_certifier
-+++ b/src/share/ma/add_certifier
-@@ -101,7 +101,7 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then
-     # check the key is ok as monkeysphere user before loading
-     log debug "checking keys in file..."
-     fingerprint=$(su_monkeysphere_user \
--	"${SYSSHAREDIR}/common" list_primary_fingerprints < "$keyID")
-+	bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$keyID")
- 
-     if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
- 	failure "There was not exactly one gpg key in the file."
-diff --git a/src/share/ma/update_users b/src/share/ma/update_users
-index d23c125..4f83e0c 100644
---- a/src/share/ma/update_users
-+++ b/src/share/ma/update_users
-@@ -79,7 +79,7 @@ for uname in $unames ; do
- 
- 	    # process authorized_user_ids file, as monkeysphere user
- 	    su_monkeysphere_user \
--		/usr/bin/env "STRICT_MODES=$STRICT_MODES" "${SYSSHAREDIR}/common" process_authorized_user_ids - \
-+		/usr/bin/env "STRICT_MODES=$STRICT_MODES" bash -c ". ${SYSSHAREDIR}/common && process_authorized_user_ids -" \
- 		< "$authorizedUserIDs" \
- 		> "$tmpAuthorizedKeys"
- 
-diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
-index 28b11ac..e00ac4e 100644
---- a/src/share/mh/add_revoker
-+++ b/src/share/mh/add_revoker
-@@ -52,7 +52,7 @@ if [ -f "$revokerKeyID" -o "$revokerKeyID" = '-' ] ; then
-     # check the key is ok as monkeysphere user before loading
-     log debug "checking keys in file..."
-     fingerprint=$(su_monkeysphere_user \
--	"${SYSSHAREDIR}/common" list_primary_fingerprints < "$revokerKeyID")
-+	bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$revokerKeyID")
- 
-     if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
- 	failure "There was not exactly one gpg key in the file."
--- 
-2.7.3
-
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.38-syssharedir-whitespace.patch b/app-crypt/monkeysphere/files/monkeysphere-0.38-syssharedir-whitespace.patch
deleted file mode 100644
index 65d3ba6a95aa..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.38-syssharedir-whitespace.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 0e339de4772b6de1849dc55790821c3dd5943be3 Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Tue, 9 Aug 2016 09:39:45 -0400
-Subject: [PATCH 2/2] ensure that this works even if SYSSHAREDIR has whitespace
-
----
- src/share/ma/add_certifier | 2 +-
- src/share/ma/update_users  | 2 +-
- src/share/mh/add_revoker   | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
-index 5416aa9..9488806 100644
---- a/src/share/ma/add_certifier
-+++ b/src/share/ma/add_certifier
-@@ -101,7 +101,7 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then
-     # check the key is ok as monkeysphere user before loading
-     log debug "checking keys in file..."
-     fingerprint=$(su_monkeysphere_user \
--	bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$keyID")
-+	bash -c "$(printf ". %q && list_primary_fingerprints" "${SYSSHAREDIR}/common")" < "$keyID")
- 
-     if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
- 	failure "There was not exactly one gpg key in the file."
-diff --git a/src/share/ma/update_users b/src/share/ma/update_users
-index 4f83e0c..a0ec21b 100644
---- a/src/share/ma/update_users
-+++ b/src/share/ma/update_users
-@@ -79,7 +79,7 @@ for uname in $unames ; do
- 
- 	    # process authorized_user_ids file, as monkeysphere user
- 	    su_monkeysphere_user \
--		/usr/bin/env "STRICT_MODES=$STRICT_MODES" bash -c ". ${SYSSHAREDIR}/common && process_authorized_user_ids -" \
-+		/usr/bin/env "STRICT_MODES=$STRICT_MODES" bash -c "$(printf ". %q && process_authorized_user_ids -" "${SYSSHAREDIR}/common")"\
- 		< "$authorizedUserIDs" \
- 		> "$tmpAuthorizedKeys"
- 
-diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
-index e00ac4e..de08961 100644
---- a/src/share/mh/add_revoker
-+++ b/src/share/mh/add_revoker
-@@ -52,7 +52,7 @@ if [ -f "$revokerKeyID" -o "$revokerKeyID" = '-' ] ; then
-     # check the key is ok as monkeysphere user before loading
-     log debug "checking keys in file..."
-     fingerprint=$(su_monkeysphere_user \
--	bash -c ". ${SYSSHAREDIR}/common && list_primary_fingerprints" < "$revokerKeyID")
-+	bash -c "$(printf ". %q && list_primary_fingerprints" "${SYSSHAREDIR}/common")" < "$revokerKeyID")
- 
-     if [ $(printf "%s" "$fingerprint" | egrep -c '^[A-F0-9]{40}$') -ne 1 ] ; then
- 	failure "There was not exactly one gpg key in the file."
--- 
-2.7.3
-
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch b/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch
deleted file mode 100644
index 776e633b3d73..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.39-make-tests-work-with-gnupg-2.1.15.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b1dd8fb1b84c6eea25523c3ea746852b3dce6034 Mon Sep 17 00:00:00 2001
-From: Valo <valo@autoproduzioni.net>
-Date: Wed, 31 Aug 2016 14:00:05 -0400
-Subject: [PATCH] Make tests pass with GnuPG 2.1.15
-
-2.1.15 appears to always emit the fingerprint lines in these cases,
-while 2.1.14 did not.
----
- tests/keytrans | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/keytrans b/tests/keytrans
-index 3076e3f..5c7d2c8 100755
---- a/tests/keytrans
-+++ b/tests/keytrans
-@@ -140,7 +140,7 @@ uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest
- sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8
- EOF
- 
--diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')
-+diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')
- 
- echo "##################################################"
- echo "### sleeping to avoid test suite breakage on fast"
-@@ -170,7 +170,7 @@ rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8
- EOF
- 
- 
--diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')
-+diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')
- 
- 
- echo "##################################################"
-@@ -206,7 +206,7 @@ sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8
- EOF
- 
- echo "test: diff expected gpg list output"
--diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru | sed 's/:*$//')
-+diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')
- 
- sort >"$TEMPDIR"/expectedout <<EOF
- $KEYFPR
--- 
-2.7.3
-
diff --git a/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild b/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild
deleted file mode 100644
index 953836fdace6..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.36-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-SRC_URI="http://archive.${PN}.info/debian/pool/${PN}/${PN::1}/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-# Tests do weird things with network and fail OOTB.
-RESTRICT="test"
-
-RDEPEND="
-	app-crypt/gnupg
-	app-misc/lockfile-progs
-	dev-perl/Crypt-OpenSSL-RSA
-	dev-perl/Digest-SHA1
-	|| ( net-analyzer/netcat net-misc/socat )"
-DEPEND="${RDEPEND}
-	test? ( net-misc/socat )"
-
-pkg_setup()
-{
-	einfo "Creating named group and user"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_prepare()
-{
-	epatch "${FILESDIR}/${P}_default_shell.patch" \
-		"${FILESDIR}/${P}_non_default_port.patch" \
-		"${FILESDIR}/${P}_userid_empty_line.patch"
-
-	sed -i "s#share/doc/${PN}#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
-	default
-
-	dodir /var/lib/${PN}
-	fowners root:${PN} /var/lib/${PN}
-	fperms 751 /var/lib/${PN}
-}
-
-pkg_postinst()
-{
-	${PN}-authentication setup || die
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.37.ebuild b/app-crypt/monkeysphere/monkeysphere-0.37.ebuild
deleted file mode 100644
index 7276dff3dadb..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.37.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 eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-IUSE=""
-SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="amd64 ~arm x86"
-
-DOCS=( README Changelog )
-
-# Tests fail upstream for SSH connection. Issue has been reported.
-RESTRICT="test"
-
-DEPEND="app-crypt/gnupg:0=
-	net-misc/socat:0=
-	dev-perl/Crypt-OpenSSL-RSA:0=
-	dev-perl/Digest-SHA1:0=
-	app-misc/lockfile-progs:0="
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
-	einfo "Creating named group and user"
-	enewgroup monkeysphere
-	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
-	# Using fperms and fowner in src_install leave unusable config with error
-	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
-	chown root:monkeysphere /var/lib/monkeysphere
-	chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
-	epatch "${FILESDIR}/${P}_default_shell.patch"\
-	       "${FILESDIR}/${P}_hd_od.patch"
-
-	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
-	default
-	dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
-	monkeysphere-authentication setup || die
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.38.ebuild b/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
deleted file mode 100644
index a919d40924de..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.38.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-IUSE=""
-SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DOCS=( README Changelog )
-
-# Tests fail upstream for SSH connection. Issue has been reported.
-RESTRICT="test"
-
-DEPEND="app-crypt/gnupg:0=
-	net-misc/socat:0=
-	dev-perl/Crypt-OpenSSL-RSA:0=
-	dev-perl/Digest-SHA1:0=
-	app-misc/lockfile-progs:0="
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
-	einfo "Creating named group and user"
-	enewgroup monkeysphere
-	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
-	# Using fperms and fowner in src_install leave unusable config with error
-	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
-	chown root:monkeysphere /var/lib/monkeysphere
-	chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
-	epatch \
-		"${FILESDIR}/${P}-asprintf.patch" \
-		"${FILESDIR}/${P}-revert-executable-patch.patch" \
-		"${FILESDIR}/${P}-syssharedir-whitespace.patch" \
-		"${FILESDIR}/${PN}-0.37_default_shell.patch" \
-		"${FILESDIR}/${PN}-0.37_hd_od.patch"
-
-	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
-	default
-	dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
-	monkeysphere-authentication setup || die
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.39.ebuild b/app-crypt/monkeysphere/monkeysphere-0.39.ebuild
deleted file mode 100644
index a7f0efd409b1..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.39.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-IUSE=""
-SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DOCS=( README Changelog )
-
-# Tests fail upstream for SSH connection. Issue has been reported.
-RESTRICT="test"
-
-DEPEND="app-crypt/gnupg:0=
-	net-misc/socat:0=
-	dev-perl/Crypt-OpenSSL-RSA:0=
-	dev-perl/Digest-SHA1:0=
-	app-misc/lockfile-progs:0="
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
-	einfo "Creating named group and user"
-	enewgroup monkeysphere
-	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
-	# Using fperms and fowner in src_install leave unusable config with error
-	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
-	chown root:monkeysphere /var/lib/monkeysphere
-	chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
-	epatch "${FILESDIR}/${P}-make-tests-work-with-gnupg-2.1.15.patch"
-
-	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
-	default
-	dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
-	monkeysphere-authentication setup || die
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.42.ebuild b/app-crypt/monkeysphere/monkeysphere-0.42.ebuild
deleted file mode 100644
index 4223ab8f9879..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.42.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-IUSE=""
-SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DOCS=( README Changelog )
-
-## Tests fail upstream for SSH connection. Issue has been reported.
-RESTRICT="test"
-
-DEPEND="app-crypt/gnupg:0=
-	net-misc/socat:0=
-	dev-perl/Crypt-OpenSSL-RSA:0=
-	dev-perl/Digest-SHA1:0=
-	app-misc/lockfile-progs:0="
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
-	einfo "Creating named group and user"
-	enewgroup monkeysphere
-	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
-	# Using fperms and fowner in src_install leave unusable config with error
-	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
-	chown root:monkeysphere /var/lib/monkeysphere
-	chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
-	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
-	default
-	dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
-	monkeysphere-authentication setup || die
-}
diff --git a/app-crypt/rotix/Manifest b/app-crypt/rotix/Manifest
index 8b285f2f9f8b..73829a825603 100644
--- a/app-crypt/rotix/Manifest
+++ b/app-crypt/rotix/Manifest
@@ -2,8 +2,6 @@ AUX 0.83-respect-CFLAGS-and-dont-strip.patch 623 BLAKE2B 62cff4d1566fbb926314240
 AUX rotix-0.83-interix.patch 252 BLAKE2B 319f34ee0d874d5a608259d4fd3f018ec085ec28f96b8a620b4b1606b844acec7d3b665e62b5c032bbe2d928f924d1dcbc519628a8ccde9e0ac259be2f485871 SHA512 4c3862c22fb6c39f8f9653d7415414f28c31f91eeac284fa277c2527abe0a4d549f1eda141a5409b9ba171bbab3c4a2b9c66ecf438413e542682a85b2c549b8c
 AUX rotix-0.83-locale.diff 256 BLAKE2B a7564979a38ff517bbe0592ba12e2aab92c44fc828180c2587ec4b5db3acf4ffbf71feba959625faf93b9fd997d39c9330e4255e8c875bbc1653b66fe140e1c9 SHA512 7b8c82bac78c48f5d43c0246c41e7a7910f0119cc7b56500789d722d87f00e9d2356150063e07ae281435d5af60f9e15956c5bc0b236ea5f225435886117c4b0
 AUX rotix-0.83-locale.patch 206 BLAKE2B 98f179037eaebee3ca2c1f41d543dba29fc61209518b3abec238473a38da0d3140aed50ed5a33ed1d0656336df2f3a236cd0f8ced9f0795d807710f1978f881f SHA512 caa6430c0bf96fccae2547524c7eb81170e27ef2adb054671db0f1d8f88ed6a4960b827d1781af4adbf5216c00e007a48071b1b4237f5a691bd46e45bbd599a0
-DIST rotix-0.83.tar.bz2 14685 BLAKE2B 296e094dfef2b35db39041e92d350befc970f3594c7aa2962b4dba0215e99b50ea887d3d636dc2e38ee570b60462bcf8304a6f7ee005315fa115b821ee0f29ad SHA512 1f318e15bd51cc197d9d9fc36e37b29c18fe7a8e8c40654c69ccf97d32b896afa7cc517c562750f6c1262baddbb451bd8a29ada994176e442630d8ed56ccf572
 DIST rotix-0.83.tar.gz 15412 BLAKE2B 4a0db309fa23af3e15a63263e40a2b27e2ebf1e0cf162f2776ebd5237621207eee3a41374170c2e0441104704bde4aff8f929fc5ad8994dfcf4fd1cb5a461696 SHA512 bffe527714f35a99f3322e87d1e2fcbafd38f3a7677e2ca816988df2ce1567ce064f0ab7a543fab3dc2d73f148675fe069c398a5d9c7bb285cb6b1658c3fbffb
 EBUILD rotix-0.83-r1.ebuild 825 BLAKE2B 9da93ce9ab9307d21a9e91529fdf5b87a0b7307b3f0b682f4c714f12e631d57aac40adaf1e5e7311608a848aa41bd4fa5f49a704dc5902cde844ce82a728a6d7 SHA512 0733a1481af75bbd68d0d7da07f2f779397a0ab764699ff577d8d74ae87d62950b39ee765ab818b40c249d321ea58aa5d9c60d02691b9e372d771a7b77f80e9d
-EBUILD rotix-0.83.ebuild 803 BLAKE2B 8c7b1cc3aa763d66ecab9a9082b72040e0c91734dad8701387f2e296d7d300a98bc6074af1e8da7bad0eab7d7a2bb4d562f0cd48efd8c7f61cf4aea712ccc352 SHA512 d1f06b48dfef707e1753f035763a02a4f8032d6255c86d8b79ad0cdfd5a2c5f42f4008c658d7c4ab01539b96882da4948ef865b08d3eadd6dfb679ec0481b3cf
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/rotix/rotix-0.83.ebuild b/app-crypt/rotix/rotix-0.83.ebuild
deleted file mode 100644
index 725b3796bad1..000000000000
--- a/app-crypt/rotix/rotix-0.83.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic
-
-DESCRIPTION="Rotix allows you to generate rotational obfuscations"
-HOMEPAGE="https://github.com/shemminga/rotix"
-SRC_URI="http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-respect-CFLAGS-and-dont-strip.patch
-	epatch "${FILESDIR}"/${P}-locale.diff
-	epatch "${FILESDIR}"/${P}-interix.patch
-}
-
-src_configure() {
-	use elibc_glibc || append-flags -lintl
-	econf --i18n=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/app-crypt/sbsigntools/Manifest b/app-crypt/sbsigntools/Manifest
index 79e480109a4c..a0db801b8460 100644
--- a/app-crypt/sbsigntools/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@@ -2,10 +2,8 @@ AUX 0002-image.c-clear-image-variable.patch 822 BLAKE2B acb775f625ecd081d9b3d7e4
 AUX 0003-Fix-for-multi-sign.patch 1452 BLAKE2B eaa6e39c18d13f3819d5852eda27eb5a8d589241224965392f1b1e067b5cb9ff0ece7fa83697e5fb6f5f8dd0acec15b7bbe57fcd5f761fcb2e8e1fc51193641f SHA512 2aba55a116536e7f41e4aac2fd33eeb92cf89b14bcdd8b93b6e9dc9bdaf2f0162134e56f7d365640445bf801ad8590f6d49f14cdf80b791324647067d52ae435
 AUX sbsigntools-0.9.1-openssl-1.1.0-compat.patch 4727 BLAKE2B 3b47c8086220cf12778bf5cd6018627a30ea349677eeb2cfcd1eaa1b83a25d39499ab21a1a123181a51f4138624c17e574050216f59c480e38d9774936f8b6f0 SHA512 6946e1d67161345088aee3ab54129b6e904b6008f2b275ab4eb55ed24fb2b866029f7d7ca856c5dfe76c395580f04709ad1be974369a1b4954b9e87cf812fd4b
 DIST sbsigntool-0.8-ccan.tar.gz 113537 BLAKE2B 8fbf27463d30c1895930628a145be2d521ae4f6adb7af3299bf2f5f4319fd643df0a07347ef6851bd41d233af4c3fc5f77002771af1c43aa0f20665aef2390b8 SHA512 6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09
-DIST sbsigntool_0.6.orig.tar.gz 212375 BLAKE2B fab9141c7fbfa01ec24f975503ac83be4ae0664251a1311afb3d95124fec3750ce20a5ffab35b6965d4ee4585ab4ee91f25ae49488214a983b6fc006071d0968 SHA512 ed314d1cb7278cf5f27d4c3cd17f2195678419a7f9e47770429b6f95df35f7df035331e60c45970183ddd9b150a9b752f876c777929598b0525872b3255af95c
 DIST sbsigntools-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
 DIST sbsigntools-0.9.2.tar.gz 56525 BLAKE2B 0bce1f534aa960672eab6a415e287b79ff9f18eb947e2217ad4533081f8b854e160b57828afbb56423b2dcab723d3a8aacb2e6affeb2057d17ce3c1761d96b11 SHA512 060753ed9c8db794e4755cc66c1940a2ccc89f4ddf0e825da1f1e6eaa75fc67c21060ee4b5dfb0c757b69e6f5959bfa68156d9f95a945cf63c6a20f1414a2c27
-EBUILD sbsigntools-0.6-r2.ebuild 1116 BLAKE2B 1e571c2018b72de8a454a380042897678f2308e8afab91b5e90c99eff266950e7374fc099b28d0d22b1a560bf6784eb6c77345c2b92e302f9ed98c80d4f3c45a SHA512 c11a43f77549f884c3a7c55333a62970239142340bc7ee6b85d029e3a07ee47a0b71265878ad99778bc7e48d7b0cee68c0e358bc8d914a0590796490e98aaba0
 EBUILD sbsigntools-0.9.1-r1.ebuild 1315 BLAKE2B 1c26e9e3ac83f540fc701f06b85ccbc1d6964f1c86f355694b7ab76d2cab7906426822fd18a5f12f45bb0db123392a3cefb58f83d4f964fa0b5cae0917bdaa66 SHA512 6c97ed18cc616afa98088be44e4eb39efc502f9dc3344cf3323ca4b0a1718b0393c7c4c6e8d480c15440a9dc87a143cd3975e2de3ebed504fdc80f604c540f15
 EBUILD sbsigntools-0.9.2.ebuild 1254 BLAKE2B ac843eafcfe52a3aaf0eefc520ecda1e84dcee28b5a28c087a69045ba736437bb896cc9328407ec7809f85dd56c2aa47d5562456bc0daa8ff9bd0213210ead38 SHA512 0aed75d6d5d073db6749953a3b53d31563f2e6c37b50afe6b09b96476e607dfe26d19e21e17d1ea573f7135333bad2b19ed4e1d39f54ea0d82411a9c8ecf7c08
 MISC metadata.xml 291 BLAKE2B 0aeb75750176d719f10db508a8924d0bf2fe75e8544b275a7c7e11c44320ce4f7819febb093dd3083a33a998a225f2a3b882407a8ffc03d1a57d03cbfc0a7ff2 SHA512 f7a520fc9a216ff983bd3d361c6ddb3b635eb5dcd94ed042e7c5d0beb0b4e10cdb231e2b4ace599ebb93d4bb46e071a744f1a780ec83f451bb2ee6bad4c2d8cc
diff --git a/app-crypt/sbsigntools/sbsigntools-0.6-r2.ebuild b/app-crypt/sbsigntools/sbsigntools-0.6-r2.ebuild
deleted file mode 100644
index 519693684dce..000000000000
--- a/app-crypt/sbsigntools/sbsigntools-0.6-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN="${PN::-1}"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
-HOMEPAGE="https://launchpad.net/ubuntu/+source/sbsigntool"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-apps/util-linux"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	sys-boot/gnu-efi
-	sys-libs/binutils-libs
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	local iarch
-	case ${ARCH} in
-		ia64)  iarch=ia64 ;;
-		x86)   iarch=ia32 ;;
-		amd64) iarch=x86_64 ;;
-		*)     die "unsupported architecture: ${ARCH}" ;;
-	esac
-	sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure || die
-	sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.in || die
-	sed -i "/^AR /s:=.*:= $(tc-getAR):" lib/ccan/Makefile.in || die #481480
-	epatch "${FILESDIR}"/0002-image.c-clear-image-variable.patch
-	epatch "${FILESDIR}"/0003-Fix-for-multi-sign.patch
-}
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index 2563abceb0b2..5ffc3af941f4 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -3,6 +3,5 @@ AUX shash-0.2.6-binary-files.patch 898 BLAKE2B 892a6bed771a8906b5b00a47b1b13df37
 AUX shash-0.2.6-format-security.patch 413 BLAKE2B 4bcb4a803b8a69c7568d89dfbb900687627f1f51ddefd60b814aa1195daeb6c8026ad1dd55f17fa78ef54fc592b94e9704440f66a47a1c7a70fea0172167e0d7 SHA512 295e5d147c6b66814fb5b863ceab39bec87cdca0d3f1ff3e9d10e59b090a171d96efba080447f1520358ccc4daf8e926c3403e69f966cabdb33722d030ba1b04
 AUX shash.bash-completion 856 BLAKE2B 259204c4579326baa2b68d32e87bb8d6bcb4bd25646d851a68efe28927dc4c61e409092581036a777cddcf4941c12ff51e53f97c30b361cde05f4e89b65abda8 SHA512 1d6f57c5d1d75a576bb2536dc9a7518263e2c34da127f0450e1c7900038a8c9e4a379533ff34ddccf0c62cb53284f0fdab41510f71a05a337e39bcab578ed2b8
 DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b
-EBUILD shash-0.2.6-r2.ebuild 870 BLAKE2B 395e230748d12a013bb5c4c2ad51e307c14d45d861a9ef8dbce3d75c5fa0891f0f142091d970b38485c07538af187c2d2cc974e354cae752de46bff3610c536b SHA512 fe1de7d66a9491423a672f12771f44f91e6127a8e1e804cf65712b9002dd3566630f2d3b0afa867d28c0416594a7bbecec35daed425bd4db38648e731101fde2
 EBUILD shash-0.2.6-r3.ebuild 937 BLAKE2B 89412a67cd61f33d382d312e8daa5dbc60e77b835ae368e6eff27407878582bcd294d8d40edb155b4b561f0896ad8140925e71037ae287b1aed9da0d24c82b7e SHA512 19ff1da2920d3b2142b7188f138a5718a1588d5d8a94b011bc9fa72ac926bf0aaef019f6161bb718574f0329ebecf49b841cbcaa1b7fc991e911db2656fce6ce
 MISC metadata.xml 389 BLAKE2B 0f19c78e6c95b99b0de3da4896ded3dbfcd482650294efb1a7b0961a6ea884e30241bfe431fe9c85ced61c45cc0e123f52847953b4e4a2bd86e4a14894190d2e SHA512 dfecd29a48ac51dfbb2d4ab6bc71d4538da61541b7ca3beb34edc4d321a97d881044e4f5815d8cb1a4715dc18dc5a9b58520e3d8697b8cbf35a6f795c13c87d6
diff --git a/app-crypt/shash/shash-0.2.6-r2.ebuild b/app-crypt/shash/shash-0.2.6-r2.ebuild
deleted file mode 100644
index 98f92bc76d3f..000000000000
--- a/app-crypt/shash/shash-0.2.6-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="Generate or check digests or MACs of files"
-HOMEPAGE="http://mcrypt.hellug.gr/shash/"
-SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="static"
-
-DEPEND=">=app-crypt/mhash-0.8.18-r1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-manpage-fixes.patch
-	epatch "${FILESDIR}"/${P}-binary-files.patch
-}
-
-src_configure() {
-	econf $(use_enable static static-link)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog INSTALL NEWS doc/sample.shashrc doc/FORMAT
-	newbashcomp "${FILESDIR}"/shash.bash-completion ${PN}
-}
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index 5336a7d01b7e..2d0f6c485fcb 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -1,8 +1,6 @@
-DIST signify-20.tar.gz 97765 BLAKE2B c2b086b59310cd364d28ee7f8802daa7f170eb2a19a5d6722d0b59202b7ee302f4b810a2809f8badfab38ae4d8402dec82141207be3d1b64f747c2e27b2c54f7 SHA512 993f02b10ef9c74a98455e2c93e094de40a40710c38ff35752decb87430895bd276cb5e6a46b5f7cf3f098d66562f1f0e134158d221a87fb33cfff09199a8773
 DIST signify-23.tar.gz 95335 BLAKE2B 4cdbee5dae7f217644a5df41d4253938c5cb8fb1f621f945addfceb64090234199e8dd81d7ef42c41aae13e9e5158541f40062296ca07562977473e39f68cd0b SHA512 f0330994f3d308e9ad7c7bf4b6d6f8e8bef914d6d10d83507002ad97f853b4e0a829997a0225373e2c34829a611b70980d7d3674247d4b5b447204ad7f039608
 DIST signify-24.tar.gz 92038 BLAKE2B 4d9413a423534fb4f9adfb50494802b737e6099b47933eed9686ba751f7ffb6999b084c5a5431652a33baab11d7384e762c4709bab52bb0de4694a885c8eb570 SHA512 d612aca617f44ea7bf32a31d65da7e265dfdbe67f7983fc095b1f2d5c83cfa27f4c857279d98f6928199d15193c706cf3c77022fec70529a7b5d38b16ce64df5
 DIST signify-29.tar.gz 94553 BLAKE2B eba286618c5ea9fb9515c44330297276504009078a09d7b36c208225e4fd33e014623829dd582ededc2f35f207058ad2c93412ad006852966c37466ed87e7b9a SHA512 a0fc07c176f3e0e6ea32d059fb6cc27849159dcc3975c47b2b0a54f7047cb1f1dc0e032f2c55eaf84096b0a84288193afec0777e669851a7c7f97a880fb0f0ab
-EBUILD signify-20.ebuild 482 BLAKE2B cbefdf140048582568c52addd3d501bf27838b0a180376cd79d869e8eb2f8f4346419be53845a7e94e57b7eacec85debb0949a52d370ec370716adca3e365d79 SHA512 6972914c088bbf669a89c9f292ec3d3f84624c3c18b347c24147a2630e77c21713300d0a8cffb2a26106a6c480052aa1e651f0ec73f2e53635d623de5e59d223
 EBUILD signify-23.ebuild 543 BLAKE2B 4af7771a8feba476774c635481a7458ff74066d60dc1d51d034892e574ffec1349791d51e028e3b7d4bcccc58c7f067eeaa0a238822a9d7c727618826ee928bd SHA512 081dc53f0b48bd58f4b59101e59ec9f64fe641824142f056820e61107937c39283a5e33f2ce32d711fc46c802557f142f627f754d5b6823f2d0e16fd4ba1c5e2
 EBUILD signify-24.ebuild 540 BLAKE2B c9ad33a60f4d8e2d5ef7a3f8945e722eb06d1c29f9947d24a93433ad54249860ff8a1f960eef2e31c618c1af9d6f7dd92ea6bf8099694ccc7c92aafa097ca46b SHA512 3792038e4d522c6ef7d30d3c6569f57902524f04e5c8cfa5f3868f491eff6094d163294f0fccbc5338acf1e398dabac3140f6ebd68395f142ff172a649a9eca6
 EBUILD signify-29.ebuild 551 BLAKE2B b91d56242ee6a5f33993e236bc405dd1ca92cf3cef64367aa4fe6d15de963c5dd6a71f6155777d0f1b7a50d2d243f46e54d876decfae931d51514d3e020e22b0 SHA512 f446097bcfd19cfb28450c98aa46b850d036e9ef68518912193f0cdedd08e0c5647232740f464c4f51bb13c712ea1814bddf393575712cbddb905cb079188825
diff --git a/app-crypt/signify/signify-20.ebuild b/app-crypt/signify/signify-20.ebuild
deleted file mode 100644
index c42b3262662e..000000000000
--- a/app-crypt/signify/signify-20.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Cryptographically sign and verify files"
-HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify"
-SRC_URI="https://github.com/aperezdc/signify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-libs/libbsd-0.7"
-DEPEND=""
-
-src_install() {
-	DESTDIR="${D}" PREFIX="/usr" emake install
-}
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 4e0571909dee..4188f80dd95d 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -3,6 +3,8 @@ AUX veracrypt-1.24_p2-revert-wxwidgets-breakage.patch 3475 BLAKE2B 2401f507277a1
 AUX veracrypt.init 387 BLAKE2B 7f16dee40bceed81ca092a3be6a2cd71f24f5cc8b4e4b143bd6ddde046e1ecce0cd674f52e7adb406893ef57c5b73462157832ff279114a2079c0ff84839e0dc SHA512 986b52c454abd9a64a6e8eb93247983c48d9524c396f253bc16f68894fed0abe87614343ce9c9127f8fb180f12912b21f57063f8f3b43bdca5344c130eb6c72d
 DIST veracrypt-1.24_p2.tar.gz 25208374 BLAKE2B 2667fb93e6884d97a673fe793b5f83f73961c2362e7704199b5ed0163c03f19313843583f7f2a15e05ee71516e45db97752350d2c27d22f1f278668b7c07aff9 SHA512 f778b8f6288f6f9886a15fa582f6c7126d9eaea319e854ad11bd5d44105ad5a3cb8b750d410ed8fd531ec3b23f9bad83934e6cefedd1352603d4882d2ca0ad84
 DIST veracrypt-1.24_p4.tar.gz 25212608 BLAKE2B 12d124cc5c869b8112e29624fcc5af3dd96d3c5e0179c643bf16cd361cc01677c09710faa192e7c9fe5f2ca78fbd826bc9df99f34e83ce4534f26dec01185761 SHA512 e077d6fe6a35234737387c4a6997399a251e238ab75524f53efe8ed742a35164fa4d5fcb0f15816dcb29d31fb8a4bb175d45b9aefb912c4747194fb320fa408d
+DIST veracrypt-1.24_p7.tar.gz 25113248 BLAKE2B 8ead3325ce6fadf4ca8211ea45daaa82a655f29006f224235f44200839289d42fabe84da2e731fc6a169a7d157535c719b2cd9294524e68532c0065e41ed733c SHA512 d149736d4d6740a89bfce892f44757600c6411776b471a208a75b4573bbc6125535ef1b68c2f55903ff82f4d0fff13b8b07d3cf15c7a301c39158aefffc29e17
 EBUILD veracrypt-1.24_p2.ebuild 3122 BLAKE2B 1fee5173e4c599692ccaa0737c3103405478cdba846055002a0c7c803e90c4886da8aa8c18d37a669b5964fda4e5ee022311239b8edb3caff000dde40cda51d8 SHA512 b908d997ceec7ecbbd1fdca1ccc92a205b40879d29730cd5148a57734d4038386a656ac6ed5afc29b8f369764a8e4032e2ca382eda4c59089fffe6282126d171
 EBUILD veracrypt-1.24_p4.ebuild 2538 BLAKE2B 5860c80d59157f5eb10a6017d837a7eaaf746aba035760b3d4a03bfa00f53fed9b62e83c706ff729a7c873c71cf80ef32eba7269b75c9a9ea5d4d3eb14e20094 SHA512 ecb74dbd33d71828558fab05e246cd7d2bda552f3b9998ecd97b5259a3cee54fb8fb3fcf1b75399fbd41c3d308e91d3f188795baffb7f5284561e9bd3a0856e4
+EBUILD veracrypt-1.24_p7.ebuild 2539 BLAKE2B de8b817eccd3c079c59c09272b7ccdc8c4d354694eec1e8533af94fbe91923024ff16e2e9055d923cf431905ad56e20bed23cd6a25c90694c09e9bb9caba7a20 SHA512 6b9b71177d6e67d211af262b98317db801b2cd4fc3408b404dc512eaf698e0725b45b9bd10d58929ba09e7e0ea219736c3588f4a8a0c79f79ba05b42ac70d516
 MISC metadata.xml 399 BLAKE2B a7d22abada8009869e82b80f8b2274e1acc2fb1488d584c9d730f231057519404445a0d048ad70a47f7d946bc987f836fdfd87da296537a307e234175e521acc SHA512 ac0676510d8d2ac2430dd244ed5e4d18de1cbb7050563fcdd46fc8511c9813dc3609565a6c071f75d9cd26e73c1f453cc8cf9b9b47e0822bd93548a8baaf62ca
diff --git a/app-crypt/veracrypt/veracrypt-1.24_p7.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p7.ebuild
new file mode 100644
index 000000000000..120e43f27ad2
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.24_p7.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop eapi7-ver linux-info pax-utils toolchain-funcs wxwidgets
+
+MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)"
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+# The modules not linked against in Linux include (but not limited to):
+#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
+# Tested by actually removing the source files and performing a build
+# For this reason, we don't have to worry about their licenses
+LICENSE="Apache-2.0 BSD truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
+RESTRICT="bindist mirror"
+
+WX_GTK_VER="3.0-gtk3"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${MY_PV}/src"
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+	linux-info_pkg_setup
+
+	setup-wxwidgets
+}
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+		$(usex X "" "NOGUI=1")
+		$(usex asm "" "NOASM=1")
+		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
+		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	local DOCS=( Readme.txt )
+	local HTML_DOCS=( )
+
+	dobin Main/veracrypt
+	if use doc; then
+		DOCS+=( "${S}"/../doc/EFI-DCS )
+		docompress -x "/usr/share/doc/${PF}/EFI-DCS"
+		HTML_DOCS+=( "${S}"/../doc/html/. )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	if use X; then
+		local s
+		for s in 16 48 128 256; do
+			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+		done
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security"
+	fi
+
+	pax-mark -m "${D%/}/usr/bin/veracrypt"
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index c360e6dcb50e..9ba015fb7b5c 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/verbiste/Manifest b/app-dicts/verbiste/Manifest
index c4a00b5055fc..ab44e4928050 100644
--- a/app-dicts/verbiste/Manifest
+++ b/app-dicts/verbiste/Manifest
@@ -1,7 +1,3 @@
-DIST verbiste-0.1.38.tar.gz 706222 BLAKE2B 2ec6f5da9ae410faf422afc7717db5c77d288c6994ec4076c9ace1f3589ee98cbe624a82601415e2c736e127a96225da5afda8ada6a26b2b926a501316b723df SHA512 b5d99d08a9d1a7c91c1dbb86e0d4465a46403db881cd28d2abaf8d376adef6b4d4f5ac93e528d45beb639b77aff7e1730dbb436624674ff21c1f5781173db787
-DIST verbiste-0.1.41.tar.gz 751059 BLAKE2B 503411520a2b76463d20cae09af33f28255db5450a6721da248a87f4df102b64084e224261416bff9fba62cf6e1605363c4aae1090e91da06b65892c37ee9e5b SHA512 f89bb1074cd8c65f8516004c89aae50c65b5bd426d78a01b5e6b7418d86b5c348d2c554ab202c9f34cc9c5586a54518160fc225afa237cdb140ff99f78563702
 DIST verbiste-0.1.44.tar.gz 780465 BLAKE2B 692fd3bdf00323b08d4c8a66baaf9f6800c4593428d36efb4cd4bfc51eea912297154e4b0610b94b66d1354317ac7cf24d6dca083d521c648338a0974f6d0899 SHA512 36c8a2af31f948dc3970bef260d5cd7f9d230f4966f846bcc823f006cd98ab98229544b7470466529344ac5735d1189c859c539f526cd58410d9a521510db5e5
-EBUILD verbiste-0.1.38-r1.ebuild 1241 BLAKE2B 91959ec74a90633023510224c8a032310c53c2f09e78a83b18a9066a5ef016fb2a4ec678714b1b24610327b4f76e065017fff3e1a660a5ef213495866b56f4e3 SHA512 07b96917a7d52902c9e04abddbe04a7991c685aba2dd5fb5be01eae189ca61fdc7661b48b0e69b127701882563a87360c1c419b381c406b4be47a0832ae46e08
-EBUILD verbiste-0.1.41.ebuild 1171 BLAKE2B e570299ec4b17525520e3b87555b9051b8728ac2df12b61f6cd3f189daf7cf1b933c203a49b61758df1fda85e2ee18ff6043b0363820c37fce862c723881689f SHA512 ead4f763affca7482b3081396de7bde6027fe7f55a8fbf74c1c63d6b99c5d73967f2421985ab4a01e332eda55ac4071aad2f9d6f05c6efc8a0e266341826535b
 EBUILD verbiste-0.1.44.ebuild 1168 BLAKE2B a45c768729754e532c5a8ed9b5b3729474587fb5ad422daaaf14078475f85d978da4fc8629fabacef62819746e647bc1ab8b79e5463c1edb36cd1f7df509a6f1 SHA512 ff09897280d66f45da4a1a4bf3bd74cda8177ef95d82c8a68e822e0cb5fa6f00cee245276f562caf2fc30dac998d7d3e5a0d133a1e12712d9146a00fa2df8369
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-dicts/verbiste/verbiste-0.1.38-r1.ebuild b/app-dicts/verbiste/verbiste-0.1.38-r1.ebuild
deleted file mode 100644
index 3d3ccc0033df..000000000000
--- a/app-dicts/verbiste/verbiste-0.1.38-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils gnome2-utils fdo-mime ltprune
-
-DESCRIPTION="French conjugation system"
-HOMEPAGE="http://sarrazip.com/dev/verbiste.html"
-SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.4.0:2
-	gtk? ( >=x11-libs/gtk+-2.6:2 )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		--with-console-app \
-		--without-gnome-app \
-		--without-gnome-applet \
-		$(use_with gtk gtk-app)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	dodoc HACKING LISEZMOI
-	# file is only installed with USE=gnome
-	if use gtk; then
-		sed -e 's/Exec=.*/Exec=verbiste-gtk/' \
-			-i src/gnome/verbiste.desktop || die
-		insinto usr/share/applications
-		doins src/gnome/verbiste.desktop
-	fi
-}
-
-pkg_preinst() {
-	if use gtk; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gtk; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-dicts/verbiste/verbiste-0.1.41.ebuild b/app-dicts/verbiste/verbiste-0.1.41.ebuild
deleted file mode 100644
index 4648b20ec985..000000000000
--- a/app-dicts/verbiste/verbiste-0.1.41.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils gnome2-utils ltprune xdg-utils
-
-DESCRIPTION="French conjugation system"
-HOMEPAGE="http://sarrazip.com/dev/verbiste.html"
-SRC_URI="http://sarrazip.com/dev/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.4.0:2
-	gtk? ( >=x11-libs/gtk+-2.6:2 )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		--with-console-app \
-		--without-gnome-app \
-		--without-gnome-applet \
-		$(use_with gtk gtk-app)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	dodoc HACKING LISEZMOI
-	# file is only installed with USE=gnome
-	if use gtk; then
-		sed -e 's/Exec=.*/Exec=verbiste-gtk/' \
-			-i src/gnome/verbiste.desktop || die
-		insinto usr/share/applications
-		doins src/gnome/verbiste.desktop
-	fi
-}
-
-pkg_preinst() {
-	if use gtk; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use gtk; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gtk; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 2e15cb9d2e38..098ebf7a3769 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 05235b9a3607..ba7cf9ac39ee 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,17 +1,9 @@
 AUX doxygen-1.8.12-link_with_pthread.patch 1078 BLAKE2B bcf05d8e2c56e4c5a026ea8e8662e247aa48fb4c3ffeb2a26799ae98f1bbd1a9f9cfc55bcad4b9d254d6067fce8e51990ab9cecfcfa6fa9b1a9861c085525966 SHA512 01173974a66a4b6214f6506f9f9009da2ae3ee1b6f424763dfc2b1ce96293e71b463b1afb4c6ccdeac299c66132bbf6d3ee7fe543f1251ff429107f8b4017831
-AUX doxygen-1.8.14-xml-c++.patch 1064 BLAKE2B f75ead2f58b1dee3854061cb2554a5e9387b6f2d205bd2f8b231124281dd3b91b0f79cfb3059a02a56a579ebc68e4b8194755187c4a4ff7a582b2d11d72cadb7 SHA512 08f2e27a689fed08221ff3c4897be1054f5cf9be50cd131e48d6c05d4b3e87d1ffe2233193dba0667108977bb50ccd76694e6e66b92c625c286f1e34e5d3322a
-AUX doxygen-1.8.15-link_with_pthread.patch 1119 BLAKE2B 3c4dbb0440134d96e7879f4d18869eeffb06a43726dd6ce0441fc1f4bc4664088ebc185f38c1685adf3ddcff1de45a9a0b11e38206c9592c42cb7d45c2ba3f60 SHA512 fc7623892cdfc0fd93a9470ed7c29723b53f690618d86bdb9d4afd387af7dccd36c8b6a54b86d46c464a7960aa557570589e874cbd0ad825a379493143610e77
 AUX doxygen-1.8.15-llvm7.patch 495 BLAKE2B 937de77966f8f7239469d02a442b7438c4de759b8f162d1ff2b6cee2c3b5097894c7ed2d14454e0051cfe707aa26605a0551da7ff1e69a608e171ce22adb5b7c SHA512 9dced7f1399a12a4e943f3d3353c771033e66eec11d102483909f16ffe2fded2e766362059a20198e325755f01751d419c5dccdb2f5a5c807bb7b4d3b73cd0bf
-AUX doxygen-1.8.16-fix-external-tag-files-with-TOC.patch 1968 BLAKE2B 739a9ace2ca96be8b696e7ac24f5ec1303e26f6f02250d5cb8eb26bbf41931905c976ceafd732daedf8260d1e19b4a056a779d984712bcc966c45d8a942ca151 SHA512 a0055694b216a89ccccdc763d02be92fd582f2230bd600062c8043afaca199502a2764eb19570ca0af4db4d43040d4f77e1ed5d5ff006d45747941c654f734ea
-AUX doxygen-1.8.16-ghostscript-compatilibility.patch 2046 BLAKE2B 5d2016db1ff06329347ad653537f00c9e5d0de74cbf07c9b1b988b24f140f7a5db136a6dde2fd1ee4cfa935d99cfc81196bc4ede8d32ae6a0b9b37c87b04c547 SHA512 398db683a53059a051b1a123567e870d9f46fb637716b3665af2fadfbd69de3297f4df5beeb7ed4faa38ef762775b7de0aea91fc00abb938059af693ff8cf75a
 AUX doxygen-1.8.16-link_with_pthread.patch 691 BLAKE2B c6ced2c6aeb199d7f8ad39f39a90747d886e0841103a27d105fc40242fbb5dd289a3ff640203fe1d97bb51fdd559bb94dfddf4e2364d4bc630d861c75ff079f0 SHA512 5b23cc35faf571229b9ff7f1dd4745ade10d5ef0935d1ac9455e0036517ec3e038aacd1a565604f1621aa2c42584240939269777321993b02645334ca7dd18fa
 AUX doxygen-1.8.17-ensure_static_support_libraries.patch 817 BLAKE2B 085e2c853e10b22f1be38bd85abb3f33b3cefd4fdb565b244626785d6e54972404638c956c9f03b06022184e8308c1b1b4715f5ef83a8cf34b9a7b938e951152 SHA512 bc076b02f5f9d2886d25ac2f1800475990542e956b59afedea2dfadb262bdb317a44f91b47fbd8cd27f77476e215629aeaf1d03a9cbf24f1aafa822a382bb05c
 AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
-DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079
-DIST doxygen-1.8.16.src.tar.gz 5497317 BLAKE2B ec1ba4242bd3ef669f92101044049f10a6e5c2d69f5a7c8eb47915fdc0846ce4758eb8c1ab28ec61635bf36f83049f603f3b70033f7e22be18685cb1d9826462 SHA512 46a0189aa82d5a687bdd99a904f0c061fccca407d15867d14c8c4d13e8b21a8989e7ccd6af30840803b589ed20dd86084a4db880fba0d3bfa1fdcdd8d23e12de
 DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75
-EBUILD doxygen-1.8.15.ebuild 3233 BLAKE2B a93bd53bf77ef393c5bc970d20d381f332011a7372337d1d82d08e6b979924e89d03a23ff79a94d869aeb36591255bcc0e064a497dabe47a247affaefa9b3a1e SHA512 81db790474ec2f7d5ca3402aa2d0d63d1db555ea7d667602651bd2b770b6ff9dc737e71c9551bd97f7a84b2cbf4ef4cb413ff789fb9d845a401df49f5b6265ab
-EBUILD doxygen-1.8.16-r1.ebuild 3339 BLAKE2B e1961eb2643f4d171593a854da3360eba8029617100e879b93fbbee3a666edc209b60b4ab0b997f93188ce838a407e78b360e5a7d09b6c6e12e546b5dccefa0a SHA512 722ea09c9a797dc5ed60b4b198764202ec114357155ed4f30ae89a32506019df3b2f7db95da04f16044ce9c256a30ad9161d86dbf653886d8ef58012fcc5351d
 EBUILD doxygen-1.8.17.ebuild 3229 BLAKE2B bbefd6742c5dc0d21eca4636aa57f189c4cc150cb50211d0e7a80137348a811697dd89622dfe7b281417ebd9ed0397d8a03fb284e6ff92c7b29ad8216c6ca483 SHA512 b15e9ff7a4730d34dfc94bbc25a667d58a2a8db91434b3989b08393b896a1473f1c4cfbf1309253adf794c50515a2553ddf2ae593553536b130727f165d6f705
 EBUILD doxygen-9999.ebuild 2892 BLAKE2B d9fa09ab0c9ea4d8771ec6e6a4f290aab7ca37ded9281469a1035e3d3fda477d60f7241f0ac8f40ada6ca643b308b2048c11477d5bfd737f20983bb4031bef00 SHA512 6781ed49e6a4020ab732b7ff69aead2127660d51f37150eec6c97a4231d3c266c7dc51f66918f52ed35f5b37e9d1ec376dab75a046872efb206fb1ef5661f7ad
 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
deleted file mode 100644
index a2b7e8c08367..000000000000
--- a/app-doc/doxygen/doxygen-1.8.15.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils eutils llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
-else
-	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( <sys-devel/clang-10:= )
-	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 )"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	doc? ( ${PYTHON_DEPS} )
-	${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${PN}-1.8.15-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692
-	"${FILESDIR}/${PN}-1.8.14-xml-c++.patch" #doxygen/doxygen#6892
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-
-LLVM_MAX_SLOT=9
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
-		local pro
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}" || die
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		)
-	use doc && mycmakeargs+=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-		cmake-utils_src_make -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
deleted file mode 100644
index 5ad7097b6d4f..000000000000
--- a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake-utils eutils llvm python-any-r1
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
-	SRC_URI=""
-else
-	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU"
-
-RDEPEND="app-text/ghostscript-gpl
-	dev-lang/perl
-	media-libs/libpng:0=
-	virtual/libiconv
-	clang? ( <sys-devel/clang-10:= )
-	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 )"
-
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	doc? ( ${PYTHON_DEPS} )
-	${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
-	"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
-	"${FILESDIR}/${PN}-1.8.15-llvm7.patch" #666692
-	"${FILESDIR}/${PN}-1.8.16-ghostscript-compatilibility.patch" #695710
-	"${FILESDIR}/${PN}-1.8.16-fix-external-tag-files-with-TOC.patch" #701930
-)
-
-DOCS=( LANGUAGE.HOWTO README.md )
-LLVM_MAX_SLOT=9
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
-		local pro
-		for pro in */*.pro.in */*/*.pro.in; do
-			echo "unix:LIBS += -liconv" >> "${pro}" || die
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	if is-flagq "-O3" ; then
-		ewarn
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		ewarn
-		elog
-		elog "Continuing with -O2 instead ..."
-		elog
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Duse_libclang=$(usex clang)
-		-Dbuild_doc=$(usex doc)
-		-Dbuild_search=$(usex doxysearch)
-		-Dbuild_wizard=$(usex qt5)
-		-Duse_sqlite3=$(usex sqlite)
-		-DGIT_EXECUTABLE="false"
-		)
-	use doc && mycmakeargs+=(
-		-DDOC_INSTALL_DIR="share/doc/${P}"
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts" # bug #564944
-
-		if ! use dot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| die "disabling dot failed"
-		fi
-		cmake-utils_src_make -C "${BUILD_DIR}" docs
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch b/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch
deleted file mode 100644
index 8680d19dd46f..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.14-xml-c++.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f217b5c36b39a294b920437ff66055ee1a3fa5b7 Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Tue, 19 Mar 2019 10:42:24 +0100
-Subject: [PATCH] issue #6892 xml not well-formed (invalid token) for c++
-
-the `declname` and `defname` should  also be converted (compare as well the routine `generateXMLForMember`)
----
- src/xmlgen.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
-index 420a653fc..568e48886 100644
---- a/src/xmlgen.cpp
-+++ b/src/xmlgen.cpp
-@@ -360,8 +360,8 @@ static void writeTemplateArgumentList(ArgumentList *al,
-       }
-       if (!a->name.isEmpty())
-       {
--        t << indentStr <<  "    <declname>" << a->name << "</declname>" << endl;
--        t << indentStr <<  "    <defname>" << a->name << "</defname>" << endl;
-+        t << indentStr <<  "    <declname>" << convertToXML(a->name) << "</declname>" << endl;
-+        t << indentStr <<  "    <defname>" << convertToXML(a->name) << "</defname>" << endl;
-       }
-       if (!a->defval.isEmpty())
-       {
diff --git a/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch
deleted file mode 100644
index 54c0a96e5e1a..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.15-link_with_pthread.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/addon/doxysearch/CMakeLists.txt	2019-04-03 18:43:47.995610511 +0200
-+++ b/addon/doxysearch/CMakeLists.txt	2019-04-03 18:45:27.730609191 +0200
-@@ -18,6 +18,7 @@
-                       ${ZLIB_LIBRARIES}
- 		      ${WIN_EXTRA_LIBS}
-                       qtools
-+                      pthread
- )
- 
- add_executable(doxysearch.cgi
-@@ -27,6 +28,7 @@
-                       ${XAPIAN_LIBRARIES}
-                       ${ZLIB_LIBRARIES}
- 		      ${WIN_EXTRA_LIBS}
-+		      pthread
- )
- 
- install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin)
---- a/addon/doxywizard/CMakeLists.txt	2019-04-03 18:43:59.139610364 +0200
-+++ b/addon/doxywizard/CMakeLists.txt	2019-04-03 18:45:14.151609371 +0200
-@@ -102,9 +102,9 @@
- )
- 
- if(Qt5Core_FOUND)
--  target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml)
-+  target_link_libraries(doxywizard Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml pthread)
- else()
--  target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY})
-+  target_link_libraries(doxywizard ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} pthread)
- endif()
- 
- install(TARGETS doxywizard DESTINATION bin)
diff --git a/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch b/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch
deleted file mode 100644
index cc0704b440f6..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.16-fix-external-tag-files-with-TOC.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4a72a9b07e805b4ba27560e8e921bcee0002ef4c Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Mon, 9 Sep 2019 13:28:28 +0200
-Subject: [PATCH] issue #7248: Including external tag files with TOC produces a
- broken index.qhp
-
-Ignore automatically generated anchor names when importing a tag file.
-
-Upstream: https://github.com/doxygen/doxygen/pull/7250
----
- src/tagreader.cpp | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/src/tagreader.cpp b/src/tagreader.cpp
-index 56dbe7df9..d79d9b5c5 100644
---- a/src/tagreader.cpp
-+++ b/src/tagreader.cpp
-@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefaultHandler
- 
-     void endDocAnchor()
-     {
-+      // Check whether or not the tag is automatically generate, in that case ignore the tag.
-+      switch(m_state)
-+      {
-+        case InClass:
-+        case InFile:
-+        case InNamespace:
-+        case InGroup:
-+        case InPage:
-+        case InMember:
-+        case InPackage:
-+        case InDir:
-+          if (QString(m_curString).startsWith("autotoc_md")) return;
-+          break;
-+        default:
-+          warn("Unexpected tag 'docanchor' found");
-+          return;
-+      }
-       switch(m_state)
-       {
-         case InClass:     m_curClass->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-@@ -504,7 +521,7 @@ class TagFileParser : public QXmlDefaultHandler
-         case InMember:    m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-         case InPackage:   m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-         case InDir:       m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
--        default:   warn("Unexpected tag 'docanchor' found"); break; 
-+        default:   warn("Unexpected tag 'docanchor' found"); break;  // Not really necessary anymore
-       }
-     }
- 
diff --git a/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch b/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch
deleted file mode 100644
index 55445fa19dc4..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.16-ghostscript-compatilibility.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f08e87623368134c6541af12995b811ef9aff069 Mon Sep 17 00:00:00 2001
-From: albert-github <albert.tests@gmail.com>
-Date: Tue, 12 Nov 2019 11:42:22 +0100
-Subject: [PATCH] issue #7290 error: Problem running ghostscript gs -q -g562x56
- -r384x384x -sDEVICE=ppmraw -sOutputFile=_form0.pnm -dNOPAUSE -dBATCH --
- _form0.ps. Check your installation!
-
-@maehr had a talk with Robin Watts and Ken Sharp at IRC and there seem to be basically 3 different problems:
-* `-r%dx%d` (the dimension for `r` shouldn't be `-r384x384x`, but `-r384x384`),
-* misuse / unnecessary use of `--` and
-* since 9.50 the command needs more control access (that might be worked around by either whitelisting the file via `--permit-file-read=_form0.eps` (only works from 9.50 and upwards) or generally accepting any file with `-dNOSAFER` (works since quite some time). The second option is considered to be unsafe if we would process any file, but in this case we process self produced / controlled files. I don't know if doxygen has any threat model that it assumes. ).
-
-> Ken Sharp: Yeah the %dx is wrong, as Robin says its sheer luck that works
-the -- isn't needed and is what's causing the first problem
-and file control is the new bugbear
-
-The suggestions have been implemented and test / docs works now with old and new version.
----
- src/formula.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/formula.cpp b/src/formula.cpp
-index 534f56ac..3d8e6ce1 100644
---- a/src/formula.cpp
-+++ b/src/formula.cpp
-@@ -193,8 +193,8 @@ void FormulaList::generateBitmaps(const char *path)
-       // used.  
- 
-       char gsArgs[4096];
--      sprintf(gsArgs,"-q -g%dx%d -r%dx%dx -sDEVICE=ppmraw "
--                    "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -- %s.ps",
-+      sprintf(gsArgs,"-q -g%dx%d -r%dx%d -sDEVICE=ppmraw "
-+                    "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -dNOSAFER %s.ps",
-                     gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72),
-                     formBase.data(),formBase.data()
-              );
--- 
-2.24.1
-
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index ac514cb0a34e..2f1ca158e1fa 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,7 +1,9 @@
 DIST gnucash-docs-3.8b.tar.gz 71058053 BLAKE2B 0a69db02faf6487f2ecc1b5f9a788fb50cec65ff7db53ca9ec6048510156f094c0ce457d1abb4a9a6694060f68780c0336de41dbd0736ad93055cce81b3a66ab SHA512 3c30e88412e17960006517fb7c341220159c45760ca28c79c27c66551451c8ec14e000757f4d9a78c923e10d437351e38dbedaf0a1f3b11bbf5b87d80cb230fe
 DIST gnucash-docs-4.0.tar.gz 62498230 BLAKE2B 39d711267a7ec0d45915659db8557fd2871c295aba82601c34878f56c5a24b0f56ffa68a4597e464050e3e59f62411ae6f5efc0870bea2fa46f313f58ed3826b SHA512 4aa4510b86a6bf3a217c9809b73166c0ce777b9f5a506c15f51ca80a0aa45b93e774e1b7c07571ceb0aad6b6df67a4f268d5498874d23653cb0c94620f491d1d
 DIST gnucash-docs-4.1.tar.gz 62496616 BLAKE2B c1868c5a639c12fbc77dd8c46d504d9aa66574d577068c781f5c652ac3b385bffb61aede88953f0c9e89369b71d92ee94c7aa553b91e0adcfbb99b43244ce8b4 SHA512 dc63650ed989eec273ab720f802bdcbfdd3041bc4f6bedd02a4575cbc337eb2f264aa05986ecc99e4c7d3007827b213a0f306e3ae38821950dee17bb21b10615
+DIST gnucash-docs-4.2.tar.gz 62497632 BLAKE2B 764387cbbc1d072ac3e245a86b78eb484cfa05371dcf4c17d0441bf08e00f85523975c50a88ecde24e9d949572228a723d53fcce7df397553b0e50145be28686 SHA512 e54082dcd7f92d7ca3f31cea5968ecd4167dc9e1e12f23d8684af3e2af4c696d8afed3cf477df771bb11da125ee5887d09ead1edff961ca4bedfb58fd61efdf2
 EBUILD gnucash-docs-3.8b.ebuild 1358 BLAKE2B 4abd2b5b72ac0e1caa7a6191c49d08a7390dd348d21c5bcc5716deb77e94d1fe361a9a7f1edb1f4ab2efa0f5632706de1cad47d721d257fb1732566a31ebcf96 SHA512 8b14c904744631998045641d2b429a61444ae7510feadd629da206ef73dc9e9e1d04234af3e92caeca6e510f58bb52eadd5f39e0cbece050210dfc09198b6afa
 EBUILD gnucash-docs-4.0.ebuild 1360 BLAKE2B 9b1ad2c3c66b80aeea946c6ab8fdd0d7434ae68f4d98eb38b28269442917d51838c571634774c36a2a0c5fc4a5010916f580d416a8f1a2d3f6d7e59d649958cd SHA512 b96c389704240d71671d0405f7d9c9958ae7b59005188a6992b1b5d45bc1e6a61be692743b233ad10869a6c1580105af0c0da40dc6e6f007870271612fd1b194
 EBUILD gnucash-docs-4.1.ebuild 1367 BLAKE2B 0e0bb4ed0af46a1e10e7365ba5dbf9a33cf91fbc65e93fc7c438e03f54c04530ebf8ac6e283ce38b48c46c6bbda798903cd0f5ccd303ceb8301144db1c40e597 SHA512 c397fc4a1c18451afc82f46bc473891f34c4ec7b88cb13963f89468999a97777ae91aebdd2a56a37049bbb5605ddbec34d3628265dc69d24bd2dfc2cab0b403d
+EBUILD gnucash-docs-4.2.ebuild 1343 BLAKE2B c46ac8fa92d1ec0de53af5d87e7a3933a0dfb9b98dd5e3bf9679866b9cb84019c04116a4e512711124099c82d33dc2ae2c715ea0a456eb99b3a9e3b5bbac447a SHA512 d9a6f39428961e0926016f467f4c9b4ce59a8f2cb4c42aa834cd398c6e01a98b0de6255b3fd7135f16dc77e1376380f34ee12ce51ee497be18f029973be8cf58
 MISC metadata.xml 330 BLAKE2B 17393892e962f0d868534c6908a6f6f09c4237cfdf81530b81e572f0fdac64495378d545ca214afc451a6323b97c71328aa1c6a8eda81773cb1d77c358e11bd1 SHA512 fa496247f2026343323b8ff8664fb8018316ebcbf14b88b1c99a649805cefe962d773c4d2aa35b266db2942b78d1fc450f200dc065fac48ebfb2113b5d6e8a98
diff --git a/app-doc/gnucash-docs/gnucash-docs-4.2.ebuild b/app-doc/gnucash-docs/gnucash-docs-4.2.ebuild
new file mode 100644
index 000000000000..c9d4be30803b
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-4.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools optfeature
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+LOCALES=( de it ja pt ru )
+IUSE="${LOCALES[*]/#/l10n_}"
+
+DEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	app-text/rarian
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local doc_type my_lang
+
+	for doc_type in help guide; do
+		for my_lang in C ${L10N}; do
+			case $my_lang in
+				# Both help and guides translated
+				C|de|it|pt) ;;
+				ru|ja) # Only guides translated
+					if [[ ${doc_type} = "help" ]] ; then
+						elog "Help documentation hasn't been translated for $my_lang"
+						elog "Will do English instead."
+						continue
+					fi
+					;;
+				*)
+					die "Invalid locale: $my_lang"
+					;;
+			esac
+
+			emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
+		done
+	done
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
+	optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
+}
diff --git a/app-doc/halibut/Manifest b/app-doc/halibut/Manifest
index c147661528b3..0aaf11f90040 100644
--- a/app-doc/halibut/Manifest
+++ b/app-doc/halibut/Manifest
@@ -1,5 +1,3 @@
-DIST halibut-1.1.tar.gz 956743 BLAKE2B ba96e2847d57fd6736e7d3a3245527045fe0765c6fbcc857d3af1daf4d249ac81b5442d0ff1c9a00a153b970d83dbab59ab9430ff6cd53d7164cd7aeb4441c22 SHA512 01b0563ebb3678dc1ff1cef1d752d5ebffed70ef73a10d8266d84da3b4401006b686104bbe3e1984ebd3a54254f16d008011b3be8c29a3b9f1e3a033d61cdb15
 DIST halibut-1.2.tar.gz 991975 BLAKE2B e5751d2f90968240825e3ddadbc070de856f6a340e832bcf0977fb8d31f7b7c8eefa776f3bba4df58641d22cca7e9ac562eef236069e1d9a8e9cdb41324a7376 SHA512 b04cc5c52f2d7cd2bb9a36a1aa896c6a4fd11bcfc5fad3d9c74576bf2576ce237cd7ac3ceeff3bd10dfd5a229614d06d23323509d3a83ff74b4a1965e1d726fc
-EBUILD halibut-1.1.ebuild 665 BLAKE2B 8507499b6f4279423a56b4947d15fc4f3ff2980cc27627a05fbb3c16b172ea0926f0716f308ba152367d39e1f1dd473cbfca1e549a451e4d058d30fa132d4459 SHA512 65d94c72c620267775fd55ce0d17652c1eccc83501df919b8591cd5b7a36e182f124b2332f075afddc3128b3f3fe40c80ee0af6a4dbea98f5293a2a363cf7739
 EBUILD halibut-1.2.ebuild 850 BLAKE2B 7b224fda43aef3ced94758cc7cb7262925b19d19e109fe51c72f629401bd8aa518f42fe8279f12048fba57197503503898d6cb6dc7d116bf6e5e050d85e63898 SHA512 d1e38ef45fc876a9484b8cc005f77c98a72db671b4c35aebd5392268817e0d7f4f798f321f4a5113273a6763beb262d2fdde4e11739ce05f6d86c2874ee5d4f4
 MISC metadata.xml 248 BLAKE2B 098d4976304542e71e494b46eb846b1ddc3f761a0e1eb4477c68fb0270bfd195de3fa8da7de3cf5a86d33442d7f1fc30fded9f56346e784edfbb969387d62eb5 SHA512 5a0cba98b94cc06306b0e352d40ff113de69408752b14e1ba9efdce3f564c9bd11f8f65e89fc24d2e2056056edef5b77ab1ca8aa33e7faad5d0eaef40b895c85
diff --git a/app-doc/halibut/halibut-1.1.ebuild b/app-doc/halibut/halibut-1.1.ebuild
deleted file mode 100644
index e5cc35e2aa70..000000000000
--- a/app-doc/halibut/halibut-1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="yet another free document preparation system"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/halibut/"
-SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_compile() {
-	tc-export CC
-	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-	LFLAGS="${LDFLAGS}" \
-	emake -j1 \
-		BUILDDIR="${S}/build" \
-		VERSION="${PV}"
-
-	emake -C doc
-}
-
-src_install() {
-	dobin build/halibut
-	doman doc/halibut.1
-	dodoc doc/halibut.txt
-	dohtml doc/*.html
-}
diff --git a/app-doc/php-docs/Manifest b/app-doc/php-docs/Manifest
index ee9ef710228c..b8c1b47a2a7a 100644
--- a/app-doc/php-docs/Manifest
+++ b/app-doc/php-docs/Manifest
@@ -1,22 +1,11 @@
-DIST php_manual_de-20101029.tar.gz 6041947 BLAKE2B 9ae8dcc78048854ba75362bc6df7c728b6ae3d373e71e679e4993e38b74ae3b23dcb572196de6fa159305803ddef316f279c89fa49954391f4f9c83c23ed805a SHA512 8952ea2d9abce15b23a9e045003caf4101b991439e088d3fb8cc7318e5a46d85d0e76be944d3e73124ff759f9b69fe52ea6f7b566eafbce16b0ca400968a95bf
 DIST php_manual_de-20190203.tar.gz 13299458 BLAKE2B e652510e09d0c19e42aa4726099ef6e7c2abd49f12224599ca0e03727ee85f83bb8dfd51228c594de53a36fdf205074165325502f429d79c02f122744e034960 SHA512 ad41113cdd2bd81f3646b6ba66eaf2b7453ab4adda69c981e12e24f35cb06fefb6654e393e243c752e93fb7000704514fb7c2091220de2137c6beeaa16701157
-DIST php_manual_en-20101029.tar.gz 5973968 BLAKE2B b522a91f11e063062d0f286864fe6fc29d01b251a1f5fb10ceb59e9de22fa50a3ef7ccf26083ccc5afdb9caacfdf7c201ab05dcd13ab1a3f262125d588b28fb1 SHA512 548e279a1da43d9560f207aa5dfa756e304f1ce03da867c017e3cd20b6af7706cdea7d1337450294d14b676ce6d8adf84e1fbbf41c60e936d1b95c2d8a4d43db
 DIST php_manual_en-20190203.tar.gz 12680692 BLAKE2B f0257b0abf587384be484a51a8c2963aa6ee8dd9a6c4ebcdb01a601b962a85bee3305f4880a2ce3e42d3ed75a50d85e8cd1e3363eb1d5a8888737e1fe56810cc SHA512 cbb57dd10362739a5677540d7a92c4c7210abb90a8356a52d2080100beceb2fdcaadd554e2aa7b71be17221f9a40d0881db2308900b05542578d540ff6933fad
-DIST php_manual_es-20101029.tar.gz 6205922 BLAKE2B bc553e853d5e71a1dd2630d49c9c7e1c652b6d39a4cde597090693cea8c8b44e19a020282d03cd1c1cd416feb52f29ad9b790845e5ad6df9259bfe695e9c13a6 SHA512 5af13dad3b3a9a42404227e04b1912276b68c3021b20f0efe3b4ef16d06f1b669b0c392e3ce697b7796a54bca94b2a6ea73872751bb540c5be722faa1ba19c6f
 DIST php_manual_es-20190203.tar.gz 13014398 BLAKE2B 61c66758b1a67e2edc6ba1b8485ebd273c5dcc3739b2e1536f695ec062f50faa7e2c82a1f033af8e39853f398a03ead0c8982493d2647c9c101bba2b2a439594 SHA512 55e7866ca091c1413a1da70e8a089e850821c9965d4be25311e17aa5ba66bd7df49f73f9ce7c0cf470344e5065525e18a5e89968256c6cecd60c53d952570eb4
-DIST php_manual_fa-20101029.tar.gz 6074998 BLAKE2B de3c8a2dd220d52399e96e626e25b4d111e42598f8dc813970dbbc2e4b28d05de7134f97d4a2e67064461df378d7c14ff9ef7b901c4939e8c61eb2bcf05d8ed3 SHA512 68b39bdccf7d8ef852022a1985a66ca50585299bed0278fd4156ec06000ce3035324b533f1ca7d8fe7936893359895b3faf422c5c53c9f91a062fc541c88abf9
-DIST php_manual_fr-20101029.tar.gz 6020868 BLAKE2B e4c8604f246c1b2e7526012ecfaa0d6e35b5770308ac2a02b2523cf04afae0ff87d62f6bd8abcd97f3e1194a56eaaed33f0b26f33a97ba87b68226d430c27114 SHA512 fea86a4694145d1740e9b0a49cc0b68e845f6c7bb261a3a9b9a92e088fce6d1c05dbab89381865b54af899122463052c83afc906db639c0cfd10b9640a3f58cd
 DIST php_manual_fr-20190203.tar.gz 13342232 BLAKE2B cda7de6c46ae6cc91d18237f75c5a27aa314f2b22deca23a31d60bae4b2cb1ab33dc64a9ac79e40d530ca3ae138c79c94e4504b0cb42579b79817280695fd1a9 SHA512 53f4efa55760cebf667e1349f5ee36133e0fbb10408478b2b5c2e7bdd06a922e5cc82d4fac5664c76967060be1b9b26d595a0377e7bc63dd44558972c9a70e8d
-DIST php_manual_ja-20101029.tar.gz 6363287 BLAKE2B 2d2f63635d53784101ca11769bb17c05af3e07ca0e51db4dca706af8d0c31ad553124f79ce889066ba06711e2e90a87307934a90f91fe4329ad555a988da6577 SHA512 7ed2f6096db23392ffae2ea050d9f6770174c733631c5c684a0f2199f40984a7f7333ee74295fbfebee2202666cf2a017a8a1ed89201245b3cef4edcb468097f
 DIST php_manual_ja-20190203.tar.gz 13651500 BLAKE2B 1bdc64ed3ddb28d26d8b6bdfc4fcfe422fd093ccf430fdee9cd30fd12d686b20c52c6ae59b7c3ad9cf55615d7f19b107422b1ba5d8204dd3225660cca740be91 SHA512 7b5b2e639d735edd090540bceb515997924a632b5e499787d340931d972b960495c3f501550e26f5746dc378424369dd5e8b6bef24bd0198e1aefaecd695cb21
-DIST php_manual_pl-20101029.tar.gz 6049947 BLAKE2B f037e98866e770f6843c018a14b8a46e61d3142580838621ab1b621c39b1262482f494c35fb4559222559bc2f1b2232c3d9e1ecbbae19cba20e3df45f83e6d1a SHA512 093c3e5707ae9ce6afc06f40b753d012d74640f76d85b1f3c24009b423f5a29a3a67d62cfd7cb1af1389f002d71312f1f735cdd31792074b673989b0efdd6b1f
 DIST php_manual_pl-20190203.tar.gz 7753987 BLAKE2B e3cb6c4e47a7a9a48de802db7dbba078853c66fa479ae439de2691580968cf9b5f5ab2f53847b405c41ded1f28cc2ede018fffeaa77f4b58a9a0a3a20723b16a SHA512 211c41be210437215337592fecefa18e63fae4f97dc5fd3276bb76c0314a7f3a6d536283d4bbe3ce22d62c12c9476eec7b13fbec739dc2fbe5e43834f8a1a5b3
-DIST php_manual_pt_BR-20101029.tar.gz 5460583 BLAKE2B 8424deb291898420cb6616caeed530e4c326a00bda1f205267ddb11db7adf2e5d2bf2d0f2f81110f18ff6bcecb2ddde2a11fee25e248a25c9d028e7f9de350df SHA512 c31c3b2f67865cb23bf4364a48c23c19ef82a6bd96d65b8fa0b718bc9e0e13e8b8444d5ff9b0d74a92d0be97b58f5757a7a4127b979f194849eb6ff31624ad51
 DIST php_manual_pt_BR-20190203.tar.gz 12165474 BLAKE2B 33216276fb42933fab079d08038465d00efce47f1018ab355fac8f7be95dbc190ce31bfb6d7c0c0edf0b06f067df54dbe213f4413bbdb4786e31bc2984c94f9e SHA512 00d1182362259ef1e0656ad7e8c042d63660237d6fee7381f73a359b7d92d7f7d5bbdd64fddb2a4b4d586d9f8ab29b5bd98acbade6bec27bdbd7a018c30d0174
-DIST php_manual_ro-20101029.tar.gz 6073830 BLAKE2B afb5996faa33106b626e1926a3f1b4c4981af80f97ca4ae30f4feb5ead2d19980e1e2c6d5cfd5779fa3bec1b2956e9bdf8c385c04bed4a6a08feb6124837674d SHA512 5ad32026dd2369479dcb324e4fc02da9199b2d977f4fde22ffbb08830cc7f91066fd45d7fbdfbf2df758e07c838aad4f6c9cf7193474a613e6461b30290e75af
 DIST php_manual_ro-20190203.tar.gz 12964568 BLAKE2B 3426d209332eb3d37084c86b0c5e94b78e2866c01d3a4c8567df47d00881184f60a93c2d96779fe814e8ddda0657f67c57b14e14a064ef81d1597ac40a35880c SHA512 3a55136311184c74f001f85bff7a79d8e268dc851d86ad07ddda9c83d8c9de5c3470feccde6a0d2cd4141f11902e68c80c3164ff96a18316d3a3ddcc983b0d50
-DIST php_manual_tr-20101029.tar.gz 6089215 BLAKE2B 0d162bf3213caa82be98e812bb7487ca1121aa33a94c4bb0131e7ed462f3b2032ff6415e9df90f2716dd6326bdb8a405e556186b296de897d316cf8417131cf5 SHA512 181f8f79be6a1e9d510b935b27f8ed88f410044ddfd7ac80e1ff69bc48f79c3b4d78457e5bf009962f9e68e38605a614a161ae3c46c836ef6aa360cefc08626a
 DIST php_manual_tr-20190203.tar.gz 12617835 BLAKE2B 413586ed07b331251106f75773cc75be5eda338d436d87254d0e373bd708620bd78280b8f97ca56784805385d2eddf85ccfc6c67a14eec336873c76bdb072986 SHA512 02d045a59cd426d963668841660c9a5a08814cb8c72dc3a39be2add9da6107bab9897c968520f6dad036ec78d8b0e3f85b9df1f2cdc5a1cafc223c9fdd717551
-EBUILD php-docs-20101029-r1.ebuild 1431 BLAKE2B a56d3f21a19b03294421be08d67c52f11fae9c2d6602d68802a5cf717a9fd39d3962ff0e8bbad770dda3d91721d3b70f242f99237946e7b7b4eb2c5a2f071903 SHA512 782dab07406e570c6959b8fadce3382b4c3fe44330f0eb5d5e941c93eed158965ed453528e90a310174c9fb38d20e1af21179dddf040c1dc422af40b5c39e597
 EBUILD php-docs-20190203.ebuild 1434 BLAKE2B 80a76ef83b26fa43825e31d2ebb92e588d72b6a5954781ed66d18ab1f394f16a49c9eefaf9e14bbdc0e25b012c3111ede8752861ef05136936df6e56dbc635fe SHA512 e32d25689b698c7f4421beeeace4d3960ab7fe320cd3f053f80ac0a28b4e35e709c3f1d9b767eab6c64b37e3a64f6045d4d39b0f20141d9ee41eb95fadb15541
 MISC metadata.xml 257 BLAKE2B e3c820c3fca86ae3d3882be99d1ab7a1da63f4f22c6ccd7e00717a3ec941459cbe5720ee2f28ee5731318ac081f6777cd64480de8b5c3953fc11c9193c0deb3f SHA512 ee4118f53c1fd95c499caa6eb3a0c523ae216df68698b601e96cd812be4483540b05eca8bb23b7377a54ab5ecb05a049ecc3027d89651bfef009f0015cfdc7e6
diff --git a/app-doc/php-docs/php-docs-20101029-r1.ebuild b/app-doc/php-docs/php-docs-20101029-r1.ebuild
deleted file mode 100644
index 1b0750078565..000000000000
--- a/app-doc/php-docs/php-docs-20101029-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="HTML documentation for PHP"
-HOMEPAGE="http://www.php.net/download-docs.php"
-
-MY_PN="php_manual"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RESTRICT="strip binchecks"
-
-LANGS="en de es fa fr ja pl pt-BR ro tr"
-for lang in ${LANGS} ; do
-	IUSE+=" l10n_${lang}"
-	SRC_URI+=" l10n_${lang}? ( http://olemarkus.org/~olemarkus/gentoo/${MY_PN}_${lang/-/_}-${PV}.tar.gz )"
-done
-
-REQUIRED_USE="|| ( ${IUSE} )"
-
-# Set English to default
-IUSE="${IUSE/l10n_en/+l10n_en}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	for lang in ${LANGS} ; do
-		if use l10n_${lang} ; then
-			mkdir ${lang/-/_}
-			pushd ${lang/-/_} >/dev/null
-			unpack ${MY_PN}_${lang/-/_}-${PV}.tar.gz \
-				|| die "unpack failed on ${lang}"
-			popd >/dev/null
-		fi
-	done
-}
-
-pkg_preinst() {
-	# remove broken/stale symlink created by previous ebuilds
-	[[ -L ${EROOT}/usr/share/php-docs ]] && rm -f "${EROOT}"/usr/share/php-docs
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}
-
-	for lang in ${LANGS} ; do
-		if use l10n_${lang} ; then
-			ebegin "Installing ${lang} manual, will take a while"
-			cp -R "${WORKDIR}"/${lang/-/_} "${ED}"/usr/share/doc/${PF} \
-				|| die "cp failed on ${lang}"
-			eend $?
-		fi
-	done
-
-	einfo "Creating symlink to PHP manual at /usr/share/php-docs"
-	dosym doc/${PF} /usr/share/php-docs
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index b6d6c6fb92a4..4e71302a8eaf 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/le/Manifest b/app-editors/le/Manifest
index 1945cab5cb9b..79be705ef07d 100644
--- a/app-editors/le/Manifest
+++ b/app-editors/le/Manifest
@@ -1,8 +1,6 @@
-DIST le-1.14.3.tar.lzma 392205 BLAKE2B 81dca0bbfa2b23a7bc66103dae3aaecdb50651ab9305d812ad3e838953a60494b4b562219d2fb4a03c9737f96f5f75277c8d0e96ff01448b739c12e44e62a0e8 SHA512 5f09680ba365d80a71dcb09975d2347c0dcb725b8db6c08588fadd82a3a844bd370c3de597b644c57ecfed1c4557d22544a6e9aee6323b1e43f6d8c423843339
 DIST le-1.16.1.tar.gz 977143 BLAKE2B 4dcba27bd3c0add2ced4209da618070e201bedfe333fa99951720144048c5a26d3d691ff244b64d3e8dfa4f42a598767b78ff601a7f2f0ce0e069a316d6ee0e0 SHA512 77dda0a3c9cf98d9775937373eed2489f22b641ed870f3152cd59dacff373844f5d8d85f4df864c396b812995625bcdb8f5444de93336495ecb1ea7df27e464e
 DIST le-1.16.3.tar.gz 985541 BLAKE2B 9b205f14fae619a7ef355eeacd91a3fd3e093f2f53db607b0b71b16805536780fce4f932173987332924c1e392eba6e5e338d986459502c7eaa0223a70a63db3 SHA512 b1ee5440fb71f4214170bc0a1654b68671bac5f08b38e62fdeeaeab2710365aff7cb7c3d13aecbc052b8596c95d7caadd6b3347f9bcb8cc5272a4639856ae46d
 DIST le-1.16.5.tar.gz 1012934 BLAKE2B c3e037f701e5e8916258fd55a02550f0bae42f56a0a464c7e45e5365e89475bd76ee74aae48cbdb7f5c8d7a665279a63a885007a88a556e86bec875584438f0a SHA512 2c74267f9d02944e0c72f109d9be024d1ec1de84dd6f381f7f8667be1d68b8ebd107ac970f1901f2c77e3150897562d42b9b10ec321356ca1e1ee45728941660
-EBUILD le-1.14.3.ebuild 523 BLAKE2B f57bd51998eaea4f15b420f69f12c3fa3260db82e92387aa94a81eabe84a712cf2423aac325c437f0fe9068d8e6e0bb7b6f3fc13ef45894cf025b2afcb3cfa8f SHA512 9d04c3765306fd5e1b021b57943d58a998909f7858c3f270b5dfe9e6c83d5e51b9527b41c90fcb309c3ed60c6337dca2f59ba8049b42798e9eeb1c110752877b
 EBUILD le-1.16.1.ebuild 482 BLAKE2B 83482fbf242c9301f48e26895be69296bdef286db5c52f661864c68539291deb87d404b3b45cd563aa2a7cba8717a7af59165011750b954573156410629fc20a SHA512 6de4d2214385b6d7cb42ff8c6ce6dbb1a976be5d211125d75ee2f758f546b3c14a206ff70925cc1e214797ebece6f6911a8a484276ad8c2a17b83222be44fbf0
 EBUILD le-1.16.3.ebuild 460 BLAKE2B fba82f3d371ef0005574250a1f4c0682b1301f766c507f1daeda45a078e3c248b0552beac2e2ccaea75b241f2e3232b8e3ea294963fd5157324d99254d2d777a SHA512 7c7acc1c43316f8d139ecc7dfa6894fba025e3627df71682b005e7764577e8fd5bcfeabeedac3982c190eb0002beaae05c6749e026c3beec24874e9a75d4a7c6
 EBUILD le-1.16.5.ebuild 487 BLAKE2B d74dbb00f183b185ad355feb03b90194688f99b29343ba6f2455586854f932921659fe59c7fad329510abbf1b778eee222022087c678c1d250071c67a51ebc94 SHA512 ab0971f255f42d9f58fa5167c43d626bdf1ad38273aa1fcb953ef08384e10df9d00bbc1b14cfbc7b614a06dce8540a62fd3af59e0e1f075b33067ee495b08dac
diff --git a/app-editors/le/le-1.14.3.ebuild b/app-editors/le/le-1.14.3.ebuild
deleted file mode 100644
index 534fd98f98f9..000000000000
--- a/app-editors/le/le-1.14.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=5
-
-DESCRIPTION="Terminal text editor"
-HOMEPAGE="https://www.gnu.org/directory/text/editors/le-editor.html"
-SRC_URI="ftp://ftp.yars.free.net/pub/source/le/le-${PV}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog FEATURES HISTORY INSTALL NEWS README TODO
-}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index d3c3c2d1d381..91afaca295a3 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,5 +1,8 @@
+AUX neovim-0.4.3-gcc-10-fix.patch 7417 BLAKE2B 5632a2427337e7b4d1b793381a074d2d7f0822aecb99a83123e8ec4fa4a35a975816a4854d2b596ae1aa63ecb876399c843454b6bd12b759889384d49fb8f0bf SHA512 e29c65e8075972e44ab056fd721208c62d77591a91cc12987bc07339bb2f6373cbf308719d9fa3f7919ec064112475993af64572fad851152da2fc8f0f39d2a4
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
 DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae5759d13af9f320e0fa351fa155413a5be580f010f2c7ab43ca7bc10c569ccf6e3ba29efc7f5a035576b030b216d SHA512 e13853fa296eda8618f389c71b6cbbd6f01d561615e80cc92959131dd10e395b1c6732a7d9ef6dbb9fe3ea9da4c11485b464547e2d46b22e59b8a20214e861f5
-EBUILD neovim-0.4.3.ebuild 1848 BLAKE2B 5d34e6c00564c40ebbf638d94e4cecc79ec7f5d715b8e1509fbecc6b93abd3dfd9dd3b84f76b18cee7ecd61c45e0ac4a43b1bc3121b6ddf67770c63aaeb2f8c6 SHA512 fa4c6705036b50d096fb61ad685c5fe5fd8d6f74ff56887f1bfc94bebc5015fff4736232770ee973723b7f49434635335d3b1ca0839d0309f0ead800b4866c9f
-EBUILD neovim-9999.ebuild 1865 BLAKE2B 7a179dcb2aada0a8e059c4db391b15c3b23ef177506bfcb7d8ec42524100a33087e79895d6ff9eef2fba9e28df32245eb4b5309b2a753db89ecea21cae796b9a SHA512 8e782617caa8d3ee930eb2580e14317c30121967a83ade08b102a2be809dffdc016513a3fc0421d7c5759c2341e95b5be594cd1fb2edf9701ae9a38dd2c40d9c
-MISC metadata.xml 469 BLAKE2B d0ddf9873870f4578e59c5473cb4cbd1a1aa105d704dabe52f29ff4db51eb988174a3d258b9575a876669716de46f217fb23978a9c4bbe1adfd8a84d4e082399 SHA512 11ee9fc96bcbc2cf131737a4f274d4dae5620d8ff9a27cf9fc6765b7dada8750e220e79ac305161313496c3d1cd499c34d28aaa5f63d6b4776cb8aa4f8af8c1a
+DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183
+EBUILD neovim-0.4.3.ebuild 1895 BLAKE2B ceb2d111b6d52d10592ab2da6dd507ac5050420b56443a57356d18e5220a081204d5a0331ce788187bb2494ad8f68cae95fc24e36eb57bdf7a892ab93e64d195 SHA512 074b04fa5ae321a293382f1ba21677374352788cb2b166fea99dd9369d07a3af62ded6b7b6f9bb735d9573d95e2bf870d15c9a4acaaba750fe3c1f37f8d99c6a
+EBUILD neovim-0.4.4.ebuild 2348 BLAKE2B 58b011421a7cae8fd3c09d214a4bba0acd3eda43d5a08353170bc3c7268da080ae6fd8f891b36be77cadc1430506282e13d3e50dd4d6119014c0d1b43265f6ef SHA512 8106a227003985d3c35eca795abf2b587cd8e27b115e2e50c064a45e406605c6fa21eaee35eb85e3de5422ddd91a62745f6907f6b92904788c3c24b742890955
+EBUILD neovim-9999.ebuild 2372 BLAKE2B eefb333a5041d8bd4cc131c92aad6292a3928ecccb6c1afae5ac67608697085016af5c7928944d877a73fc26fdce5ac2fe14cbde397611a3e7e8b94f6e728a99 SHA512 109c49c8b12258d7e4cb7cde1b4ece99c8fb0faf362fab0df719609f9693c250241f30cf54764a7406ad6f5df2f0c471a13332447f6a6b1ee2659a52eaf535f3
+MISC metadata.xml 535 BLAKE2B 7cebdc1b7adafafdcc2fe266f8696ad0dff927e8a9383ee34ac66e2c8910d3863d1f7603f2a82dec75f586ab22814d7268475ae3ce02fc3dca12a665e1e8ce5e SHA512 71fcf593a1b9587e6af0e30e851fb17e8552568a4e8bd38341c150ada7dbf72f962250f3306403c0be2d334932f63fe183850efe1c67d515ba79577cdf7aa561
diff --git a/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch b/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch
new file mode 100644
index 000000000000..5826d62ce6c1
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch
@@ -0,0 +1,225 @@
+From ebcde1de42588e697e0f4eaed9f6f0ea6a77a2cd Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Mon, 17 Feb 2020 16:33:55 +0100
+Subject: [PATCH 1/6] nvim:eval: Fix enum declaration for ListLenSpecials
+
+Instead of declaring an enum, this creates a global variable. As gcc10
+uses -fno-common by default, global variables declared with the same
+name more than once is not allowed anymore revealing this issue.
+
+Each time this header is included, we define the enum name as a global
+variable.
+
+See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
+---
+ src/nvim/eval/typval.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/nvim/eval/typval.h b/src/nvim/eval/typval.h
+index 008453b87f2f..5afdedff751b 100644
+--- a/src/nvim/eval/typval.h
++++ b/src/nvim/eval/typval.h
+@@ -33,7 +33,7 @@ typedef double float_T;
+ enum { DO_NOT_FREE_CNT = (INT_MAX / 2) };
+ 
+ /// Additional values for tv_list_alloc() len argument
+-enum {
++enum ListLenSpecials {
+   /// List length is not known in advance
+   ///
+   /// To be used when there is neither a way to know how many elements will be
+@@ -49,7 +49,7 @@ enum {
+   ///
+   /// To be used when it looks impractical to determine list length.
+   kListLenMayKnow = -3,
+-} ListLenSpecials;
++};
+ 
+ /// Maximal possible value of varnumber_T variable
+ #define VARNUMBER_MAX INT64_MAX
+
+From b87b4a61476bb65e9200bd2ee93b8a98ca4db84e Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Mon, 17 Feb 2020 17:17:37 +0100
+Subject: [PATCH 2/6] nvim:viml: Fix enum declaration of ExprParserFlags
+
+Instead of declaring an enum, this creates a global variable. As gcc10
+uses -fno-common by default, global variables declared with the same
+name more than once is not allowed anymore revealing this issue.
+
+Each time this header is included, we define the enum name as a global
+variable.
+
+See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
+---
+ src/nvim/viml/parser/expressions.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/nvim/viml/parser/expressions.h b/src/nvim/viml/parser/expressions.h
+index 23e172da75b2..838a74227182 100644
+--- a/src/nvim/viml/parser/expressions.h
++++ b/src/nvim/viml/parser/expressions.h
+@@ -326,7 +326,7 @@ struct expr_ast_node {
+   } data;
+ };
+ 
+-enum {
++enum ExprParserFlags {
+   /// Allow multiple expressions in a row: e.g. for :echo
+   ///
+   /// Parser will still parse only one of them though.
+@@ -345,7 +345,7 @@ enum {
+   //     viml_expressions_parser.c, nvim_parse_expression() flags parsing
+   //     alongside with its documentation and flag sets in check_parsing()
+   //     function in expressions parser functional and unit tests.
+-} ExprParserFlags;
++};
+ 
+ /// AST error definition
+ typedef struct {
+
+From 986db1adb491b5cb5936d2369816236847af26da Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Mon, 17 Feb 2020 16:36:21 +0100
+Subject: [PATCH 3/6] nvim: Fix enum declaration of RemapValues
+
+Instead of declaring an enum, this creates a global variable. As gcc10
+uses -fno-common by default, global variables declared with the same
+name more than once is not allowed anymore revealing this issue.
+
+Each time this header is included, we define the enum name as a global
+variable.
+
+See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
+---
+ src/nvim/getchar.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/nvim/getchar.h b/src/nvim/getchar.h
+index 01f60ccf4945..f0b52079aad1 100644
+--- a/src/nvim/getchar.h
++++ b/src/nvim/getchar.h
+@@ -10,12 +10,12 @@
+ /// Values for "noremap" argument of ins_typebuf()
+ ///
+ /// Also used for map->m_noremap and menu->noremap[].
+-enum {
++enum RemapValues {
+   REMAP_YES = 0,  ///< Allow remapping.
+   REMAP_NONE = -1,  ///< No remapping.
+   REMAP_SCRIPT = -2,  ///< Remap script-local mappings only.
+   REMAP_SKIP = -3,  ///< No remapping for first char.
+-} RemapValues;
++};
+ 
+ // Argument for flush_buffers().
+ typedef enum {
+
+From 517bf15603aba37014b62553eb008e26f2a1db48 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Mon, 17 Feb 2020 16:40:37 +0100
+Subject: [PATCH 4/6] nvim:msgpack: Correctly set up global
+ ch_before_blocking_events
+
+gcc10 builds with -fno-common by default. This mean you can't define
+a global variable with the same name twice.
+
+See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
+---
+ src/nvim/msgpack_rpc/channel.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nvim/msgpack_rpc/channel.h b/src/nvim/msgpack_rpc/channel.h
+index 9ff5abdc5f55..90e1c7d48b4c 100644
+--- a/src/nvim/msgpack_rpc/channel.h
++++ b/src/nvim/msgpack_rpc/channel.h
+@@ -15,7 +15,7 @@
+ /// HACK: os/input.c drains this queue immediately before blocking for input.
+ ///       Events on this queue are async-safe, but they need the resolved state
+ ///       of os_inchar(), so they are processed "just-in-time".
+-MultiQueue *ch_before_blocking_events;
++EXTERN MultiQueue *ch_before_blocking_events INIT(= NULL);
+ 
+ 
+ #ifdef INCLUDE_GENERATED_DECLARATIONS
+
+From 823b2104c3e579e8c3db8baab263dca0aa9d48bc Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Mon, 17 Feb 2020 17:29:12 +0100
+Subject: [PATCH 5/6] nvim: Correctly setup global channels
+
+As gcc10 uses -fno-common by default, global variables declared with the
+same name more than once is not allowed anymore revealing this issue.
+
+We need to define it as extern to access it.
+
+See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680
+---
+ src/nvim/channel.c | 1 -
+ src/nvim/channel.h | 2 +-
+ src/nvim/main.c    | 1 +
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/nvim/channel.c b/src/nvim/channel.c
+index c66a0682e351..5eb29a7290c2 100644
+--- a/src/nvim/channel.c
++++ b/src/nvim/channel.c
+@@ -19,7 +19,6 @@
+ #include "nvim/ascii.h"
+ 
+ static bool did_stdio = false;
+-PMap(uint64_t) *channels = NULL;
+ 
+ /// next free id for a job or rpc channel
+ /// 1 is reserved for stdio channel
+diff --git a/src/nvim/channel.h b/src/nvim/channel.h
+index c733e276bef2..9d26852ce532 100644
+--- a/src/nvim/channel.h
++++ b/src/nvim/channel.h
+@@ -85,7 +85,7 @@ struct Channel {
+   bool callback_scheduled;
+ };
+ 
+-EXTERN PMap(uint64_t) *channels;
++EXTERN PMap(uint64_t) *channels INIT(= NULL);
+ 
+ #ifdef INCLUDE_GENERATED_DECLARATIONS
+ # include "channel.h.generated.h"
+diff --git a/src/nvim/main.c b/src/nvim/main.c
+index 56d9030a7f42..4a9f2371a298 100644
+--- a/src/nvim/main.c
++++ b/src/nvim/main.c
+@@ -10,6 +10,7 @@
+ #include <msgpack.h>
+ 
+ #include "nvim/ascii.h"
++#include "nvim/channel.h"
+ #include "nvim/vim.h"
+ #include "nvim/main.h"
+ #include "nvim/aucmd.h"
+
+From 0504f2f88dac9a4cf1fe1052a1e00ab203e9cf8e Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Mon, 17 Feb 2020 18:04:01 +0100
+Subject: [PATCH 6/6] cmake: Check for -fno-common and use it if available
+
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index de530bb4f7da..74e161d98907 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -308,6 +308,11 @@ if(UNIX)
+   endif()
+ endif()
+ 
++check_c_compiler_flag(-fno-common HAVE_FNO_COMMON)
++if (HAVE_FNO_COMMON)
++  add_compile_options(-fno-common)
++endif()
++
+ check_c_compiler_flag(-fdiagnostics-color=auto HAS_DIAG_COLOR_FLAG)
+ if(HAS_DIAG_COLOR_FLAG)
+   if(CMAKE_GENERATOR MATCHES "Ninja")
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index 73806d95e8a1..b263ac237703 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Vim Project</name>
 	</maintainer>
 	<use>
+		<flag name="lto">Build with Link Time Optimization (LTO)</flag>
 		<flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag>
 		<flag name="tui">Build the neovim unix tui</flag>
 	</use>
diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.3.ebuild
index 34583324d168..b6a404f65c14 100644
--- a/app-editors/neovim/neovim-0.4.3.ebuild
+++ b/app-editors/neovim/neovim-0.4.3.ebuild
@@ -26,7 +26,6 @@ BDEPEND="
 	virtual/libintl
 	virtual/pkgconfig
 "
-
 DEPEND="
 	dev-libs/libuv:0=
 	>=dev-libs/libvterm-0.1.2
@@ -45,7 +44,6 @@ DEPEND="
 		>=dev-libs/unibilium-2.0.0:0=
 	)
 "
-
 RDEPEND="
 	${DEPEND}
 	app-eselect/eselect-vi
@@ -53,6 +51,8 @@ RDEPEND="
 
 CMAKE_BUILD_TYPE=Release
 
+PATCHES=( "${FILESDIR}"/${P}-gcc-10-fix.patch )
+
 src_prepare() {
 	# use our system vim dir
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
diff --git a/app-editors/neovim/neovim-0.4.4.ebuild b/app-editors/neovim/neovim-0.4.4.ebuild
new file mode 100644
index 000000000000..d10522f3c6b7
--- /dev/null
+++ b/app-editors/neovim/neovim-0.4.4.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake optfeature xdg
+
+DESCRIPTION="Vim-fork focused on extensibility and agility."
+HOMEPAGE="https://neovim.io"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+lto +luajit +nvimpager +tui"
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+#REQUIRED_USE="test? ( luajit )"
+#RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/gperf
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+"
+# Once dev-lua/busted has luajit support, we can add tests.
+# bug #584694
+DEPEND="
+	dev-libs/libuv:0=
+	>=dev-libs/libvterm-0.1.2
+	dev-libs/msgpack:0=
+	dev-lua/lpeg[luajit=]
+	dev-lua/luv[luajit=]
+	dev-lua/mpack[luajit=]
+	net-libs/libnsl
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? (
+		dev-lang/lua:=
+		dev-lua/LuaBitOp
+	)
+	tui? (
+		dev-libs/libtermkey
+		>=dev-libs/unibilium-2.0.0:0=
+	)
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-vi
+"
+
+src_prepare() {
+	# use our system vim dir
+	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
+		-i src/nvim/globals.h || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Upstream default to LTO on non-debug builds
+	# Let's expose it as a USE flag because upstream
+	# have preferences for how we should use LTO
+	# if we want it on (not just -flto)
+	# ... but allow turning it off.
+	local mycmakeargs=(
+		-DENABLE_LTO=$(usex lto)
+		-DFEAT_TUI=$(usex tui)
+		-DPREFER_LUA=$(usex luajit no yes)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
+	optfeature "Python plugin support" dev-python/pynvim
+	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
+	optfeature "remote/nvr support" dev-python/neovim-remote
+}
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 6944c0791a40..ae758e6e27bd 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -13,12 +13,16 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="Apache-2.0 vim"
 SLOT="0"
-IUSE="+luajit +nvimpager +tui"
+IUSE="+lto +luajit +nvimpager +tui"
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+#REQUIRED_USE="test? ( luajit )"
+#RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-util/gperf
@@ -26,11 +30,12 @@ BDEPEND="
 	virtual/libintl
 	virtual/pkgconfig
 "
-
+# Once dev-lua/busted has luajit support, we can add tests.
+# bug #584694
 DEPEND="
 	dev-libs/libutf8proc:=
 	dev-libs/libuv:0=
-	>=dev-libs/libvterm-0.1
+	>=dev-libs/libvterm-0.1.2
 	dev-libs/msgpack:0=
 	dev-lua/lpeg[luajit=]
 	dev-lua/luv[luajit=]
@@ -46,14 +51,11 @@ DEPEND="
 		>=dev-libs/unibilium-2.0.0:0=
 	)
 "
-
 RDEPEND="
 	${DEPEND}
 	app-eselect/eselect-vi
 "
 
-CMAKE_BUILD_TYPE=Release
-
 src_prepare() {
 	# use our system vim dir
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
@@ -63,7 +65,13 @@ src_prepare() {
 }
 
 src_configure() {
+	# Upstream default to LTO on non-debug builds
+	# Let's expose it as a USE flag because upstream
+	# have preferences for how we should use LTO
+	# if we want it on (not just -flto)
+	# ... but allow turning it off.
 	local mycmakeargs=(
+		-DENABLE_LTO=$(usex lto)
 		-DFEAT_TUI=$(usex tui)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 1c6d3e6fa9b5..912b4205f7cc 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,3 +1,5 @@
 DIST pluma-1.24.0.tar.xz 3717544 BLAKE2B fd9375fd05566c11c24d5bdf55ab0d4619143127a5e48c4e91d18421f50340775d58c3e2264382aa3bbd8aad0569c559e87381a9ece07ce1592d1bc1a5315db1 SHA512 390bf2949549baa0e3dc706526217fbc1513e2f9778917710da806e58cdfb0b7a36e95ed2186442490996cf76783acd4e0f4b8f1fedacee9ba356c0d466510be
+DIST pluma-1.24.1.tar.xz 3679636 BLAKE2B e792433b93862c8b0c47145255311c3a3386c1b99ec1ac87ed91608d839ece4430205f83fcc3c0f5145f986105d4c5d8803393035fcaaea08155197bbcf15d03 SHA512 0cfd6a035fc95993dce3e556c49641e799888f20159b29f2c0712c54ee772aa6df1ce755f329414c94efdb2cb3819ce633b92e6559b0c8cb064dab3c74729ab3
 EBUILD pluma-1.24.0.ebuild 1780 BLAKE2B d845bbd202c228b0b8f11c1a74b6791081fabe9fdfe80e08e4e62b40e3e3e27b626caa9263f906b7c4eb9ad056412b0f18305a4a107d85ec14d7a39149d73e77 SHA512 1f81f212c6ad19b923e4f8a8aa5b935bb4ca05bba3059553583ecb178bc65bc562e939f690033d62e4737ba76e0d5b008076649dbabb06e87f632120fdfaabe2
+EBUILD pluma-1.24.1.ebuild 1786 BLAKE2B b857ee4a4f1d10b7867958238bcd8cf96cd1ad8cb2f710b9da51c01f1d175bc8dd98c41d82b05fc417f4af7fef597abfba30df96dd123358b08f8ef1c6e21b2f SHA512 96e61cac21d4f94b3efbea4c502e86a3b7c408b54bc79559acfdf599f4eebf6793413df33cf036770593c8bdf5a5390b5ae5bf8220c4cab8a9bd1e1e2d5fc39d
 MISC metadata.xml 334 BLAKE2B 2d5ac79ba6879f5486724c826a89ed81cf393bc3fedbdea40764b1fb23962672e7c2a625137080a16ccd8e67a55097a4f497269f89ccd8b256490ef99e15b9cb SHA512 fe30c9986ed7086a894a0835847351d92938c424af5b7da51211a23fc197eebbce53cc205014cdd2c3bcc951a5a449c5d5726bede7991716d81fb7bbfe8a3fca
diff --git a/app-editors/pluma/pluma-1.24.1.ebuild b/app-editors/pluma/pluma-1.24.1.ebuild
new file mode 100644
index 000000000000..9d5382fbcd64
--- /dev/null
+++ b/app-editors/pluma/pluma-1.24.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit mate python-single-r1 virtualx
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Pluma text editor for the MATE desktop"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="+introspection spell test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
+# https://github.com/mate-desktop/mate-text-editor/issues/33
+RESTRICT="test"
+
+COMMON_DEPEND="dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libpeas-1.2.0[gtk]
+	>=dev-libs/libxml2-2.5:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/gtksourceview-3.0.0:3.0
+	x11-libs/libICE
+	x11-libs/libX11
+	>=x11-libs/libSM-1.0
+	x11-libs/pango
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	spell? (
+		>=app-text/enchant-1.6:=
+		>=app-text/iso-codes-0.35
+	)
+	!!app-editors/mate-text-editor
+"
+
+RDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}
+	>=mate-base/mate-desktop-1.9[introspection?]
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/libtool-2.2.6:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		$(use_enable introspection) \
+		$(use_enable spell) \
+		$(use_enable test tests)
+}
+
+src_test() {
+	# FIXME: This should be handled at eclass level.
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
diff --git a/app-editors/sandy/Manifest b/app-editors/sandy/Manifest
index 89d1cfe75ccc..f48cfca12517 100644
--- a/app-editors/sandy/Manifest
+++ b/app-editors/sandy/Manifest
@@ -1,5 +1,4 @@
 AUX sandy-0.4-gentoo.patch 1019 BLAKE2B 8aafad7b55d55fee1e48105f77b321929e306341cb318a89cc500089249988de33fba50a67a24a7868f1d6737a3130717cd38b40a132a28f36da1e1248da4053 SHA512 06e3e4dd2979e3589f9f1205eee13c56006ea4f2d8d8ead61faadebcdc9b590c82b645dc93b6ed6693cd15cd8d7e45491812fa3fb0819cfd088e5e231da7f7ab
 DIST sandy-0.4.tar.bz2 18409 BLAKE2B bb10bc7def440d436ffa0304c8f009d722b23159fdd8f2b559f768476391ba2ddda9083ef6fd7e0cec32b231d3c6fa9578214e5027b8a4cd490d338b384ea83a SHA512 6f28588e15ccdc467dd9d0de8b221508333defefe5866005d82292583db9f296284f233271af5e85b648c194dff117f94752cc364ed6c1409dae5c3af755b530
 EBUILD sandy-0.4-r1.ebuild 749 BLAKE2B c7b400388121ba9e0fe189c77acda73b56f6fae519a39ae39f494bc6082c37bad46b2c10e240e7ee4d4e4967e1a50cfb03c87ece7e7240b9456040f0de17e8f5 SHA512 950c9417523e97699628ed114d8273e8ff52517f760dc4eefe920f52165dbfd61b99f5d5e38877aa236797353ed3276b4517c0727291d2a73aaf2076217af7af
-EBUILD sandy-0.4.ebuild 680 BLAKE2B d7133d25632aa6f321dbf51970b2bb8c629e9be3b0fbeedacf7e11d93e065b1b11f2896251676d34e31acfc334e7577236036297a76cdf8621581f50693a8056 SHA512 1bd2f870bca21d66e7d53ede12c92bea99fcec61c970b7ba885f438f9e43584bbe340ee780e0e0410d2c9e5701088db9db06331e65156bc925c8a680ef709695
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/app-editors/sandy/sandy-0.4.ebuild b/app-editors/sandy/sandy-0.4.ebuild
deleted file mode 100644
index d401639ce641..000000000000
--- a/app-editors/sandy/sandy-0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="an ncurses text editor with an easy-to-read, hackable C source"
-HOMEPAGE="https://tools.suckless.org/sandy"
-SRC_URI="https://git.suckless.org/${PN}/snapshot/${P}.tar.bz2"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.4-gentoo.patch
-}
-
-src_compile() {
-	tc-export CC PKG_CONFIG
-	append-cflags -D_DEFAULT_SOURCE
-	emake PREFIX=/usr ${PN}
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-}
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index c1f8751b01b8..c008355475a3 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -15,9 +15,7 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
-EBUILD xemacs-21.4.24-r1.ebuild 6739 BLAKE2B 2008106ac11ca5535f39f7616f76027e3a0fed4b7fbba798b1746e177a727f5f82b69b897971995ed5fd40665224597f373ac244ad3f24e79966575464e65ca3 SHA512 0b66741feed43ec4d01f33fb557b5fb5e8d20a6b06d7be28271dd2492731c71ae54029929271dcdd26eea733db6420b843283dbf279c9433734c6688d2200f88
 EBUILD xemacs-21.4.24-r2.ebuild 7132 BLAKE2B 9be4cd45796c4a902cc0af0c42a9b1b63b8de00f7f25534b9e8fe0fe5dc1f81710eba92cece392c9f3dc63d65c6bee55c18e7b6b921f1f429856e2dae41198b3 SHA512 f45f7723262cc308d8caaff4c62edc436f008b0f0f11f5e107cab849d99cd868a9f88d1193d38b975fab597d01d2a4a9406078442872e1f93a334707946908ba
-EBUILD xemacs-21.4.24.ebuild 6781 BLAKE2B 69cd6a5b314a8a578e20ca7e4e7128d2f6077187594508b29de679d6f47087b8b01a83d3665f64cf56a8c6bb5eded514a6cd7acf14ed97e3794f005a6a3ce5d1 SHA512 fb58d55a58c80135465835e10937bfb618b6f1e6fd57eb4673608cbe186840577f02e746369ee7723bb17f3117aff8d87aa3b94f213635fb3cbf1b6a7671d186
 EBUILD xemacs-21.5.34-r4.ebuild 7214 BLAKE2B 80d3dc85284f4d5da88cbcf6b1ca3a9b1eca2a062398992a5354d479a3ab9115ef20b6134bbfefcbc1d178c645738ec257e9c90caf2213baea64b4e2a7eb482d SHA512 cce030edc1eeedd97a2da7eb91f59aa0d23d8145f69082170f2743dc29d77ec11f0138341dd274615a854d42e75dae08d2c8e12235d8c9ce0395d38a1b761d44
 EBUILD xemacs-21.5.34-r5.ebuild 7390 BLAKE2B 89344346e872dc22a2888e39dc5bab80b5a216600914ce13d3567508b4a8f6ae6ae7f8ea520e5731777d0817f96a12acd0aca22f20d3295102e3a6f2625824c9 SHA512 a0600d8b93ada5f905341295b9f23f212312ec8c3998cc2e4cb676184f7140b8d10cce4b9e2e08e323fd94996283f84cc2e5cc50a625659126e044231d25df4d
 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
deleted file mode 100644
index 032b668af1e9..000000000000
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI="5"
-
-WANT_AUTOCONF="2.1"
-inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 sparc ~x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:0 )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( virtual/jpeg:0 )
-	canna? ( app-i18n/canna )
-	!amd64? ( freewnn? ( app-i18n/freewnn ) )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-5"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
-	# see bug 58350, 102540 and 143580
-	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
-	# see bug 576512
-	epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
-	epatch "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
-	# see bug 615544
-	epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-
-	# Run autoconf. XEmacs tries to be smart by providing a stub
-	# configure.ac file for autoconf 2.59 but this throws our
-	# autotools eclass so it must be removed first.
-	rm "${S}"/configure.ac || die
-	eautoconf
-
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_configure() {
-	local myconf=""
-
-	# Can't build with pie. See bug #75028
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		myconf="${myconf} $(use_with tiff ) $(use_with png )"
-		myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm && mydb="gdbm"
-
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	# Enabling modules will cause segfaults outside the XEmacs build directory
-	use ia64  && myconf="${myconf} --without-modules"
-
-	einfo "${myconf}"
-
-	# see bug 576512
-	append-cflags -fgnu89-inline
-
-	# Don't use econf because it uses options which this configure
-	# script does not understand (like --host).
-	./configure ${myconf} ${EXTRA_ECONF} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--compiler=$(tc-getCC) \
-		--prefix=/usr \
-		--with-ncurses \
-		--with-system-malloc \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die "The configure script failed to run properly"
-}
-
-src_install() {
-	emake prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die "emake install failed"
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild
deleted file mode 100644
index 7b39f0f4f265..000000000000
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with position independent code
-# so the build forces the use of the -no-pie option
-
-EAPI="5"
-
-WANT_AUTOCONF="2.1"
-inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:0 )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( virtual/jpeg:0 )
-	canna? ( app-i18n/canna )
-	!amd64? ( freewnn? ( app-i18n/freewnn ) )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-5"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
-	# see bug 58350, 102540 and 143580
-	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
-	# see bug 576512
-	epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
-	# see bug 615544
-	epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-
-	# Run autoconf. XEmacs tries to be smart by providing a stub
-	# configure.ac file for autoconf 2.59 but this throws our
-	# autotools eclass so it must be removed first.
-	rm "${S}"/configure.ac || die
-	eautoconf
-
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_configure() {
-	local myconf=""
-
-	# Can't build with pie. See bug #75028
-	test-flags -no-pie >/dev/null && append-flags -no-pie
-	filter-flags -pie
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		myconf="${myconf} $(use_with tiff ) $(use_with png )"
-		myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm && mydb="gdbm"
-
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	# Enabling modules will cause segfaults outside the XEmacs build directory
-	use ia64  && myconf="${myconf} --without-modules"
-
-	# fixes #552044, deprecation warnings fools header detection in configure
-	myconf="${myconf} --cppflags=-Wno-cpp"
-
-	einfo "${myconf}"
-
-	# see bug 576512
-	append-cflags -std=gnu89
-
-	# Don't use econf because it uses options which this configure
-	# script does not understand (like --host).
-	./configure ${myconf} ${EXTRA_ECONF} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--compiler=$(tc-getCC) \
-		--prefix=/usr \
-		--with-ncurses \
-		--with-system-malloc \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die "The configure script failed to run properly"
-}
-
-src_install() {
-	emake prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die "emake install failed"
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-	xdg_desktop_database_update
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 89ea6f26f8a8..8993d22232a0 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index 2fd9ad933890..c9016eb213cf 100644
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@@ -1,4 +1,4 @@
 AUX 50pymacs-gentoo.el 183 BLAKE2B f1a4b874bb339b653c4fb6fb186bd7e531151c34d1df58be6963288d4443438fcae0f82c92a1667b4e7cb739bc2f7c6fd8d8d5f6d4e91413ee5bec47a609cc2e SHA512 f59fed86f859b796c901088b38fb570a5e5527d774a15456105ce75598c31fd20d0afaa62ad9cbf12063810fa592dbbd7c33aaece5871b36b488e5af6de0fac2
 DIST pymacs-0.26.tar.gz 123373 BLAKE2B 0c467435d18ebcbe7b263e90096363e201dd84ba770fa702beefac4318a713954c316f335ee005ea88370be29c3710a7df04fb05b6efd3816beedbb88e38126d SHA512 ae245de130f435d947788c5ac11d8ce6534df80f70a4e35fff903f22d2b79b0f66925059ebaf53bde45cd6660ac0a8a224490f4f9e256a84e3a08f6468c14dd2
-EBUILD pymacs-0.26-r1.ebuild 1158 BLAKE2B 6ca62b7ab5fd8fd2be73086a08b4150dff32c743bb6253504b340d75a1e3dfd3f8927ac90af6c32803e063912e650765352ffdb3f9602aff0180fd05dbba9f78 SHA512 59cb8958affbd27ef5d93f2775e434c0f3e5beec48b56755b859f03b92fe01d203b0e9b46671f27bccf588baa899febf5fc3567936f2561d2e2603b1695cdc2f
+EBUILD pymacs-0.26-r2.ebuild 1148 BLAKE2B de24d5118932eb0120d7ccbe6d277a4e121a484233664ab67974e09d4f9b72604a2944e9e6fe7e589969793d20ef4e36602dc2277efd77e2418eb25c8066013d SHA512 f0ad2c1cefb55ce595703342bcd945af01cc856f66055488563b907f3319ff89f8988adaeee8287a30dce80c814a7c3f7ac4264278c9d8e4ad1c696f1b9510bd
 MISC metadata.xml 435 BLAKE2B 10ae4a8b61dfb10339404f38e37cafa1b66737a8f593bc4ba1c626b9d884ebb19dca555dbdf24b1418fec711f6b73865046cf50d58990980ab5115b1755ddd24 SHA512 bb1bdeb6695093fb0788f956059a6e081b98d8b769e2d336057954e85006dac277b756206f83565d52c2473dc45f3afb1087850e38843103f0ef7581a634eec0
diff --git a/app-emacs/pymacs/pymacs-0.26-r1.ebuild b/app-emacs/pymacs/pymacs-0.26-r1.ebuild
deleted file mode 100644
index e2c7ce61bb1a..000000000000
--- a/app-emacs/pymacs/pymacs-0.26-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-
-inherit elisp distutils-r1
-
-DESCRIPTION="A tool that allows both-side communication beetween Python and Emacs Lisp"
-HOMEPAGE="https://www.emacswiki.org/emacs/PyMacs"
-SRC_URI="https://github.com/dgentry/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc"
-
-BDEPEND="doc? (
-		>=dev-python/docutils-0.7
-		virtual/latex-base
-	)"
-
-S="${WORKDIR}/${P^}"
-DISTUTILS_IN_SOURCE_BUILD=1
-DISTUTILS_USE_SETUPTOOLS="no"
-SITEFILE="50${PN}-gentoo.el"
-
-# called by distutils-r1 for every python implementation
-python_configure() {
-	# pre-process the files but don't run distutils
-	emake PYSETUP=: PYTHON=${EPYTHON}
-}
-
-# called once
-python_compile_all() {
-	elisp_src_compile
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts emake RST2LATEX=rst2latex.py pymacs.pdf
-	fi
-}
-
-python_install_all() {
-	elisp_src_install
-	distutils-r1_python_install_all
-	dodoc pymacs.rst
-	use doc && dodoc pymacs.pdf
-}
diff --git a/app-emacs/pymacs/pymacs-0.26-r2.ebuild b/app-emacs/pymacs/pymacs-0.26-r2.ebuild
new file mode 100644
index 000000000000..9d7f7be117f8
--- /dev/null
+++ b/app-emacs/pymacs/pymacs-0.26-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit elisp distutils-r1
+
+DESCRIPTION="A tool that allows both-side communication beetween Python and Emacs Lisp"
+HOMEPAGE="https://www.emacswiki.org/emacs/PyMacs"
+SRC_URI="https://github.com/dgentry/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc"
+
+BDEPEND="doc? (
+		>=dev-python/docutils-0.7
+		virtual/latex-base
+	)"
+
+S="${WORKDIR}/${P^}"
+DISTUTILS_IN_SOURCE_BUILD=1
+DISTUTILS_USE_SETUPTOOLS="no"
+SITEFILE="50${PN}-gentoo.el"
+
+# called by distutils-r1 for every python implementation
+python_configure() {
+	# pre-process the files but don't run distutils
+	emake PYSETUP=: PYTHON=${EPYTHON}
+}
+
+# called once
+python_compile_all() {
+	elisp_src_compile
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts emake RST2LATEX=rst2latex.py pymacs.pdf
+	fi
+}
+
+python_install_all() {
+	elisp_src_install
+	distutils-r1_python_install_all
+	dodoc pymacs.rst
+	use doc && dodoc pymacs.pdf
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 073090db9e7c..f36115adf644 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 2b97f17e7b6e..8e516f68baaf 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -9,7 +9,7 @@ DIST containerd-1.3.0.tar.gz 5697153 BLAKE2B c334cfd2aa11dd430c74bc9f3fe6f31d83f
 DIST containerd-1.3.1.tar.gz 5703741 BLAKE2B 6eae3fe9714128e7a5378484115378629baf6c4f7ef4b795e625cc1fbc05323a123c2337c5b203a2c3c3b34486c81f7e5b3ad200c000c961931fc99347ef4513 SHA512 4991286d1a8a221dad24121c5e6cd31a00685d91e652546d0d97745624486450bc05ff4f889f2975c178c4c175fedd7b15f89121a7ce4e6687919aabd04501b4
 DIST containerd-1.3.2.tar.gz 5704320 BLAKE2B 32ea22ff445cc66f4c8db8abdbaaa7fa0c8c620b294bda54f2319045af1925398057ba1a5cb5c265cfc73bcff5b49943013b517ecb3bd05f4504920c4a8d6f29 SHA512 768a19eb0829e196a61ddedaa11b0d6691caf8f9cc590a3e47ac77c1acad62e64b7a55017a1a6cccfcb87785a083d5ce131048b0e39e48c65e6cd5922382fc3c
 DIST containerd-1.3.4.tar.gz 5700890 BLAKE2B 9d5642399eafbf3df25d2bdb6ffeb8e98362e9f2c6cdcd7a64fff12bad40f58fa97451228a607def408cc8a8cfbfce67c47fcfdf86865d8086d0b7aad7595d5a SHA512 b186d5aef3e5a0d35c12dcc3cfa5d48a9602f6278c4650942859a1ab6abd1299d33a1bc623376955a834a2626491196b604591d92a05d39745dfc33ff51ad5aa
-DIST containerd-1.4.1.tar.gz 6168048 BLAKE2B f050808d77c66caead8acba595b1cf91d7f386a77aae84d08840f458ba8141bb0e8763222f37b4295d2afedd5eb2fc311e8a69f6c01a08740ad27d2e7380b61f SHA512 e16196db59ba71cfd7e5515b8d2bc6336503e996419182274dfc5ac9caca901cf712f465698e9ff667747959faf93cdf66fe652c47a83a6ead6f6a3a22add43b
+DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
 EBUILD containerd-1.2.10.ebuild 1435 BLAKE2B 4b55020f19d1349c90c2faa063c59f161a9ce1c7f9a02aef795de49f8b6ec3229964c2726547b3ad803ea84c7d2ab12c6b7f7b8afd53181a6e2f06e3e4df41ae SHA512 138989a2beb954c4e2d1be54fab432f3e38838cbd18c6341b297afae0c896f7fc9f4d234d96c70af3faee5b9d53bc095a0637c1e8b44b682c6359078bc8b69b4
 EBUILD containerd-1.2.12.ebuild 1434 BLAKE2B b1f6f907d6502dc829780b2e6150dc0e523ea9138840e31e0c88862aa0d07f489966a78d081c208e51e57ee5383ecf5b02cae19f2dda542ab8a6616ea0aaddd6 SHA512 2c9d32a48c78e7dbbf7837dcef9ffaff7d2e5c8fec67da47aff3985a6f898134317e7a13e4f370eb681013238eb085ed7c49d35ba240729cc605731bb5bfa301
 EBUILD containerd-1.2.13.ebuild 1438 BLAKE2B f4fd763e2ce0a731cfd1f66c001365a55a660c070a828d4e0a0d23b308d7956ebfd4b17b71bdf9c6892f6fc40107fb3481cef97226db95ba7797854462dd2c6c SHA512 07dcffcc0c3c946a83fdf04db6b6b8148996b3bba682e53d33ba8e968e316c0e1cb9babc6502e07d8508d89a17dc98c1f19d973d1f04219432ae892f998ccfd6
@@ -19,5 +19,5 @@ EBUILD containerd-1.3.0.ebuild 1436 BLAKE2B 221c0f5bf08fcaa1c1956859fc59b8b69830
 EBUILD containerd-1.3.1.ebuild 1403 BLAKE2B 27f63eea492f0b4069edbd19692ef501cb79d227ac02623684c408fc33da1d974ca2f2dbd78cdc1c6af9269f146b77c37ff427aea47c5b578eafc3c8d0f81550 SHA512 829b2b8943714ffe79759acf7b40d279e24047a9e77858910f7f820a89331fba8b91a8968cf4a4469a7395c1bec990d27702d583a15d074bd765104942505bca
 EBUILD containerd-1.3.2.ebuild 1407 BLAKE2B 82b111b3749b2f67729854cb50367139a7ac0ca25bc552713f875c5a7d9f7daad9c80c4e6071c01d7e3145d41bd608d08b28b6fd32b1508a2ec8b2324ad3c8fb SHA512 85cb4c29b6d2a77b0c278882ceac51315e34f103491bb7f5c209667572917facfb4debfc4b822728d8316a9ec0f771c3f6cb75d4b5c1b4c1e35ef6ff69837d99
 EBUILD containerd-1.3.4.ebuild 1407 BLAKE2B 559bed738625533707473147c978b4ea26e7df2cf952e2e5c0dffa1499caefc8a7b956b40867e9c38516822e72dbc214327347e10a33c3acbe3fef7843cb083b SHA512 8529ff278c6a01393ce70a7f8ffb124323c6214a6d509571f479bd8c309f6f3537721c6fe9ac1b0c6898c5a69aa4539af2653ea49752875e567acacb16094a4f
-EBUILD containerd-1.4.1.ebuild 1865 BLAKE2B de2e9a93a7cb506f42dfbb84f50afd27cdab96aa431a1e59aa08dae6974b42a31829c5c4081ade8aa3548cb1796bc9ebc972d38540d8afe0a60ab6b307a8b9f3 SHA512 474fa3181fb40b0169dfad83c11db000da92337f7940d5c3b75f81ccd2d33f14fb7aa0eaccd3715501b3fe6bdbee5a0e64ddc9376efd9ac32bde217da1fd1cb4
+EBUILD containerd-1.3.7.ebuild 1980 BLAKE2B 18a5668b632031753d3424b531d246210f3f5edb864b7a641a58ec2011d83af24b8b4409d6d842fe3574cba5196cd02621f05bd8c3b27db91e13fac0fe7b4075 SHA512 3076c05d721347f1fc15866a73451c99e877e8ecffc66d8b491642e3d44bc723255d6c87d1b419e0adf43a55c82645cd9ea28513301717f01ad8c4de84850187
 MISC metadata.xml 1063 BLAKE2B 17fdb23d44430d8a8f87218b2c6d75a617487a6f204e2b77dd4139c972626ad503a8379e1455f55a644db6219779dc37501d66e75a3f8e90bdf89d095223c449 SHA512 05f28554ebddf8e7e6f8911a39ca744ae13e4802a90b24f2edd438aaa591c0f73d39fb186da546cb4834c312c66dc5e7f96f9cf36216d8d7d0b910ae7e422323
diff --git a/app-emulation/containerd/containerd-1.3.7.ebuild b/app-emulation/containerd/containerd-1.3.7.ebuild
new file mode 100644
index 000000000000..9a7b8db286a6
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# update on bump, look for https://github.com/docker\
+# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/containerd.installer
+CONTAINERD_COMMIT="8fba4e9a7d01810a393d5d25a3621dc101981175"
+EGO_PN="github.com/containerd/${PN}"
+
+inherit golang-vcs-snapshot toolchain-funcs
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )
+"
+
+RDEPEND="
+	${DEPEND}
+	~app-emulation/runc-1.0.0_rc10
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+	test? ( "${RDEPEND}" )
+"
+
+# tests require root or docker
+# upstream does not recommend stripping binary
+RESTRICT+=" strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+		-e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
+		-e "s/-s -w//" \
+		Makefile || die
+}
+
+src_compile() {
+	local options=(
+		$(usev apparmor)
+		$(usex btrfs "" "no_btrfs")
+		$(usex cri "" "no_cri")
+		$(usex device-mapper "" "no_devmapper")
+		$(usev seccomp)
+		$(usev selinux)
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		DESTDIR="${ED}"
+		LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '')
+	)
+
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	export GOFLAGS="-v -x -mod=vendor"
+	emake "${myemakeargs[@]}" all man
+}
+
+src_install() {
+	dobin bin/*
+	doman man/*
+	newinitd "${FILESDIR}"/${PN}.initd-r1 "${PN}"
+	keepdir /var/lib/containerd
+
+	# we already installed manpages, remove markdown source
+	# before installing docs directory
+	rm -rf docs/man || die
+	local DOCS=( README.md PLUGINS.md docs/. )
+	einstalldocs
+}
diff --git a/app-emulation/containerd/containerd-1.4.1.ebuild b/app-emulation/containerd/containerd-1.4.1.ebuild
deleted file mode 100644
index b1eae77465c4..000000000000
--- a/app-emulation/containerd/containerd-1.4.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# update on bump
-CONTAINERD_COMMIT="c623d1b"
-EGO_PN="github.com/containerd/${PN}"
-MY_PV="${PV/_rc/-rc.}"
-
-inherit golang-vcs-snapshot toolchain-funcs
-
-DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
-
-# ~pinned dependencies described in vendor.conf
-DEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-RDEPEND="
-	${DEPEND}
-	~app-emulation/runc-1.0.0_rc92
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	virtual/pkgconfig
-	test? ( "${RDEPEND}" )
-"
-
-# tests require root or docker
-# upstream does not recommend stripping binary
-RESTRICT="strip test"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-	default
-	sed -i -e "s/git describe --match.*$/echo ${PV})/"\
-		-e "s/git rev-parse HEAD.*$/echo ${CONTAINERD_COMMIT})/"\
-		-e "s/-s -w//" \
-		Makefile || die
-}
-
-src_compile() {
-	local options=(
-		$(usev apparmor)
-		$(usex btrfs "" "no_btrfs")
-		$(usex cri "" "no_cri")
-		$(usex device-mapper "" "no_devmapper")
-		$(usev seccomp)
-		$(usev selinux)
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		DESTDIR="${ED}"
-		LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '')
-	)
-
-	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	export GOFLAGS="-v -x -mod=vendor"
-	emake "${myemakeargs[@]}" all man
-}
-
-src_install() {
-	dobin bin/*
-	doman man/*
-	newinitd "${FILESDIR}"/${PN}.initd-r1 "${PN}"
-	keepdir /var/lib/containerd
-
-	# we already installed manpages, remove markdown source
-	# before installing docs directory
-	rm -rf docs/man || die
-	local DOCS=( README.md PLUGINS.md docs/. )
-	einstalldocs
-}
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 89fd448f498e..f0778035aa66 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -5,8 +5,10 @@ DIST docker-compose-1.25.5.tar.gz 308569 BLAKE2B 5d5d1fd60f9bcb87f7e9628dbe10b27
 DIST docker-compose-1.26.2.tar.gz 313494 BLAKE2B 656bac181547a3484c45d0ede7111384007db8109aaf3673a06b848bb9b27059cfb8b2cd583e6bc7acd0ebbd90d40e485251d473eefe56a6493abe187132e520 SHA512 4cb8a2f5e25f17eb842e36dea96fae8862df099d706ec590e6fc0790c7a814bed3bb60ec00207e4afc15bf8ad4ca37075320fd28ee0bea5bbec1646f3aed681f
 DIST docker-compose-1.27.2.tar.gz 309004 BLAKE2B 1017016989b25afa812d2e7251c6dbf45922867d66ef0c69292889a5de8f31908c8d2f418b2c29c319fbd7d0ba4e213d932665e7128b61164295105f35b23579 SHA512 2156a2b283d0ace6a8bfb0d6bbe93bfca7cd651c30fdeea4e1fa2acc6a85790d34a869d4625ef83ad11e9ecc1fbc1e9acac6f40eb8ef5225ccc36bab2ddcf847
 DIST docker-compose-1.27.3.tar.gz 309220 BLAKE2B eaf066f24bfff893e515a460be9abba79a59e5112a3a34a9002870babefd93950cf92ef66db469102c37e781d7fb986de069eef3fa09e4041b3a43d8bf1a3d30 SHA512 43e34760574d1ec009faa7a1fa09d621a2708f01f05819b46c67fe7ebf280807f97d9a5867cbfe75e9af6f097cd3f7c8c8fee66aa5392a4c62cdf44c7fb38075
+DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80
 EBUILD docker-compose-1.25.5.ebuild 1935 BLAKE2B 1290c12b6cad7e41f6450c68a5284f17acfa505fa3d0dbc1a7489a0d07d960fd1624c273f3fe57ded1c8098b1f69020d8eb3f1c2babff8f63f2b9ba008600579 SHA512 9ceb962c7acb6beaf2a2c5005380be0b2685c6a802cd00795f734034b5a8a43e9272ed665c7d11184ad5247f4d9d76a20f49fe724e901f4d735524c0f1938930
 EBUILD docker-compose-1.26.2.ebuild 2075 BLAKE2B c8e6bcdd6a79366828d9c4a0993398b56c95681ad61e5114d31065a222005ec53bb2d8afa00ccca215d9e1e46c3ac3e728719f2867dfd5c907913c68aa577a1d SHA512 56c3ef2e46b5b48d691989a424e91cb16d6ba2397254da61e358faa6173c1572bb72c83b2fae78c14c9a5e81672819f09b07551b32d39f59ef4cf06ea0c0a8be
 EBUILD docker-compose-1.27.2.ebuild 2112 BLAKE2B 3a483383fd0b410fc4f2675a8df27ca2e5f1e61363abffc5cb180e8744973c40265027776c02e76063e7422e8c92131f5817f6898aec0ef72bbd552668de06ce SHA512 2ecef6032c24a4c7dc226dee463a3d0d1651a8f3f6f261f4c8aef682a6e4c217608def560055bfb88287eb9ccec6784944e56e72c701f98cfaf999e3a7a74425
 EBUILD docker-compose-1.27.3.ebuild 2112 BLAKE2B 3a483383fd0b410fc4f2675a8df27ca2e5f1e61363abffc5cb180e8744973c40265027776c02e76063e7422e8c92131f5817f6898aec0ef72bbd552668de06ce SHA512 2ecef6032c24a4c7dc226dee463a3d0d1651a8f3f6f261f4c8aef682a6e4c217608def560055bfb88287eb9ccec6784944e56e72c701f98cfaf999e3a7a74425
+EBUILD docker-compose-1.27.4.ebuild 2112 BLAKE2B 3a483383fd0b410fc4f2675a8df27ca2e5f1e61363abffc5cb180e8744973c40265027776c02e76063e7422e8c92131f5817f6898aec0ef72bbd552668de06ce SHA512 2ecef6032c24a4c7dc226dee463a3d0d1651a8f3f6f261f4c8aef682a6e4c217608def560055bfb88287eb9ccec6784944e56e72c701f98cfaf999e3a7a74425
 MISC metadata.xml 326 BLAKE2B 264e99e7fdc551ca2a29d4295d21fb587cb1eeb0bf995b9df63e63015b01b22a51db9254b3a6cb3eb76b8a4eb9e8bf3a1a4c6a936212690fa996e7edf20167dd SHA512 0c50efc71462eb8b312b5bab5b5de85450478f3b7a548c7f3725a4be5514078fb125305f277d14b5fa082027c805171e640367b6094668c05660d426c65043fc
diff --git a/app-emulation/docker-compose/docker-compose-1.27.4.ebuild b/app-emulation/docker-compose/docker-compose-1.27.4.ebuild
new file mode 100644
index 000000000000..21b5b42471fc
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.27.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-5[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+PATCHES=(
+	# Bug #679968 -- https://bugs.gentoo.org/679968
+	# Bug #681002 -- https://bugs.gentoo.org/681002
+	"${FILESDIR}"/${PN}-1.27.0_rc3-setup-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+}
+
+python_test() {
+	distutils_install_for_testing
+	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index aeb657906fcc..886ec811ec6b 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -2,8 +2,10 @@ DIST docker-proxy-0.8.0_p20190513.tar.gz 2705298 BLAKE2B ff897b18b8265b3d718caf7
 DIST docker-proxy-0.8.0_p20190604.tar.gz 2721379 BLAKE2B edc36302ca4b2be297505a5bfd8acd45f17bc752e88bcaa72f34e2d972230d92b9bfe3d0dccbb2f1e04718fb1adc95631fc0f533ca5572bdcfc468d843ce480e SHA512 dea31fd82ab2d445fbd39fe15550a91f7e489a06f6dedd32ea1925f7e9a7971952d26b874f9687249609a0d204ea35da357e0a957b819df2026a0cf8109cb354
 DIST docker-proxy-0.8.0_p20190807.tar.gz 3377742 BLAKE2B c1ccc76dd9157c715d09db27b6800a86b0dc7532089d87eb78a6e656f3b42d4c4824c34e972196038f915e3b08b12197f305fd1a86e3fe75fec621ed49e5e71a SHA512 ffe18805dc6b85f8b058e342cde2baedf2497465298daa444fecba8222885606c85242ca59016bc32a5c2c0164c1c980b92ed3d5f82e011a7e9871a67d67b947
 DIST docker-proxy-0.8.0_p20191011.tar.gz 3377526 BLAKE2B 10dd1817ffa65dc75855daba5efbe6dc7c8a048e8868354d2ad7c2cc4e99dcedb95ba4c5e37a54d60e4bd89c5f5bcac5fde4db8d21b7cc903fd42e4224a084e0 SHA512 a21b9b5883056cf75dda9f229ff199e6daad63d94dcf75ebe3e21204bdeef89c41ddd5730bb6bb4387af9a84a8a81e7adfaf726b2fdd299d8aa9d6d35a096ce2
+DIST docker-proxy-0.8.0_p20200617.tar.gz 3386043 BLAKE2B b32c3b6ef97f656414fdf026307f4054d4dd11cc91dc44a235eb5e5dc9f5f3da0cc4b001eaa28387b79f8f79f0124e6c01b8aab56d5c9e37d777e21cc186cb9c SHA512 fe8644611e975c051ee6e7ad4871624fb45862d9b4a2fd62ea4283e76ad9804d91d585e2165915b09356f11f9dfb31c40dd9ce6a66d63c5032c8c62354960538
 EBUILD docker-proxy-0.8.0_p20190513.ebuild 780 BLAKE2B 46a02fb28634760b3fb4b048eee895b152f53fde4f501df7896966bf7e8290d2438c61a0545a2c9782fb2b7bb308a1040c493b8f180991b05a581eda747d7d02 SHA512 bd52763fab7f7b59361e6acdd2249209e72bae8cc50542f0dfa3ea8010a65cc8ebee33c4bb5891a59840d35988048c6a8a3bafc82f6c735f01860a66c066ed95
 EBUILD docker-proxy-0.8.0_p20190604.ebuild 770 BLAKE2B b89a0056ae26fa7e122bbf72b9a6b7688e44de38f1c6173d4c80641e4c1a98bb403349863fa16f05aedc30b658836748e85b28018a79f6345baa76dc5ea6536c SHA512 77d3f27c7beb8c2208774d81954f5b699ab685a0e6aa5d39d973be74050128fda2c753790c06976aebc2aa4e8f842d7df2bcebba897424d6b09ef3841fc93257
 EBUILD docker-proxy-0.8.0_p20190807.ebuild 770 BLAKE2B 8a90022b2b412cc1e0d389b55e84bfac47c3d3965c5b0a1817b0b68acd9f2e446fe458e8c69aa1136f5c965f9b586b33251213aaca6fee5a1d3af64d3f374f39 SHA512 6b634b77da647e181ed5ba4d546919cc8dc068ddc6055fd7ebddba099b3f938b47aa862af3c2946c9221f20befadc626b05e86bb6417904c986e9fc61893b03e
 EBUILD docker-proxy-0.8.0_p20191011.ebuild 774 BLAKE2B 3d98c5a5dc92ca6be8c0ce434e9698eca75c47cf82a8467d24007a96c3cf57b99c2ca7187b0b1dd227f56ebd55a1e318cb562b54ffe96ec678fc6127e048dcd8 SHA512 b72ffd1c62d2c6a03ddd04d3353d3bad54b63cf9afb10dcc779610b289b9ac809bfda8c426d6fa83cc7d43368dce54f67a5f898736dd97e294e3f9c879eaac9f
+EBUILD docker-proxy-0.8.0_p20200617.ebuild 775 BLAKE2B a8496e32d965dbc60747594e26e31bbac867dfa204ff93d02552b2a31a651df47c6c93169449ca40782fa367b87c5085027edd3dd12bc4c0cb0b03a2cfeab080 SHA512 746b958a06bd4527d2efba88b197161858fd5c5fc3c96e29a2dbf1d779c16a001a0e5e8645ee1b68cfdd088af81a3aedda71807437cc967d50d756a1f98ed5bd
 MISC metadata.xml 437 BLAKE2B e1e8e4680a6932366f93a597fbaa002026990819ee646be0c2590c7fb2bbf3975a4a828271ba0281c43815354de1b371b29cc7fd691d7dcd0838539f1e02fa45 SHA512 c1f8a89b90f7fa05cf838a6aaafbbd12a3193e3e91f7802ed9c24b177cb7fea4a067892821ce50d2efd4af0369a3196f329978f2c37608f6140b29f662ca74ce
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20200617.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20200617.ebuild
new file mode 100644
index 000000000000..20556e5fc46e
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20200617.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="026aabaa659832804b01754aaadd2c0f420c68b6"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+# needs dockerd
+RESTRICT="test"
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}" go build -o "bin/docker-proxy" ./cmd/proxy || die
+}
+
+src_install() {
+	dodoc README.md CHANGELOG.md
+	dobin bin/docker-proxy
+}
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 3878adaf7a12..b4965971adcd 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,5 +1,5 @@
 DIST docker-19.03.12.tar.gz 18218138 BLAKE2B a018a1677d36c01a9eb8d9c597e6b264304a742929bf7f8bb3c12b03c75748bc6f3313f8e7c293323bc3ae013b5555044f7cf1ad7a8750a5794418bee05e405a SHA512 6ede7e0c5494882d88dae5b4ae45049937dfc65b9d655988ae4c0d6f9759bcac8799251f37a3e4ce49cdfbb04e31f9a6a05d131fb5005b382d2306ca0d5fcfa3
 DIST docker-19.03.13.tar.gz 18242693 BLAKE2B c19afed62694274298b42fc9af3b36c4cc6429b40f7e5447a996b87636a0d2e916476875652e20abd7aeab4e5e0e1cf887a04dcade1de03ded549fc36d911ac4 SHA512 5f34a14ef0b36a309d4a08926ac482ca82d24cdd873aa359c5ba7c65473cbb2e987fe615c38c1bc1c50135284da78a7eb98a8a0106d7d073aeda0cd8f1c31873
 EBUILD docker-19.03.12.ebuild 8466 BLAKE2B 6537d7d5adba8122814efc90943f6497e84f5f6da9e4345eddfba5e53f72684879b9ace45046402c2d3efaa5cd5baa46fabebc99c3bba37a4a8faacbc5ce2c9c SHA512 9b8cf5724a855998eeecc453b412e010e08c0614972024ea842d9b842a3593680f2e4d65396c83e32a50f511deab307e6aaaa6c00b967fbd542124223f41fdb0
-EBUILD docker-19.03.13-r1.ebuild 8658 BLAKE2B 3803c3058a3e8796bb5f8efa3b5983c254336d4e207bb58d2e9a208593f0d0094793f98cf42cf27ed8fd918b4dea5ea7a098dfdb7531f5256815e3deaae7ac65 SHA512 4464964f106e14e161de06c1c96a19903d1c5463ea1ba757a0be18174f24c6bb1595a7d906acbfbfa3bea9abd7c2bbe546022791cdfc8ec400c152883e75bdf7
+EBUILD docker-19.03.13-r2.ebuild 8792 BLAKE2B aaca56e033bd5bb424212e0265dec1ebfa961c6fe7a46cda140694a41b26199e729face3834da2f5eac2994a35d8798d56ea8b5f2d6b8e532ffe33c918c713bd SHA512 f3f574dcd1e0bc8223056bd0b4a28c3133bc035fd32f1460d086af17e2a98c6dcf265ec3ed0ffe9956770d3485c192b72511b5d5f9f04ae6f9b8a91608bb452c
 MISC metadata.xml 1480 BLAKE2B d55259087f20646d81686efc1def000be31b841eb450b16b41de984955688282c541dbf127d3638cabc1219f22d2dad77c6c0431a374148329f73f0ab91f8ca7 SHA512 2ca140b93f15f63d3e07989f4ff1e702b61e4ef62d199564e1fd91f995750740c08f28aafe35f0a0945fa588bc6240e3f02aa84aa06c6be7944ad5f5d2764bfa
diff --git a/app-emulation/docker/docker-19.03.13-r1.ebuild b/app-emulation/docker/docker-19.03.13-r1.ebuild
deleted file mode 100644
index f00a011e8547..000000000000
--- a/app-emulation/docker/docker-19.03.13-r1.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
-	# Docker cannot be fetched via "go get", thanks to autogenerated code
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	inherit git-r3
-else
-	DOCKER_GITCOMMIT=4484c46d9d
-	MY_PV=${PV/_/-}
-	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
-	inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://www.docker.com/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-BDEPEND="
-	>=dev-lang/go-1.13.12
-	dev-go/go-md2man
-	virtual/pkgconfig
-"
-
-DEPEND="
-	acct-group/docker
-	>=dev-db/sqlite-3.7.9:3
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
-	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-# also look at components/*/vendor.conf for exact version of ~pinned dependencies
-RDEPEND="
-	${DEPEND}
-	!sys-apps/systemd[-cgroup-hybrid(+)]
-	>=net-firewall/iptables-1.4
-	sys-process/procps
-	>=dev-vcs/git-1.7
-	>=app-arch/xz-utils-4.9
-	dev-libs/libltdl
-	~app-emulation/containerd-1.4.1[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?]
-	~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?,selinux?]
-	~app-emulation/docker-proxy-0.8.0_p20191011
-	container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
-	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
-	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
-	~KEYS
-	~VETH ~BRIDGE ~BRIDGE_NETFILTER
-	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
-	~IP_NF_NAT ~NF_NAT
-	~POSIX_MQUEUE
-
-	~USER_NS
-	~SECCOMP
-	~CGROUP_PIDS
-	~MEMCG_SWAP
-
-	~BLK_CGROUP ~BLK_DEV_THROTTLING
-	~CGROUP_PERF
-	~CGROUP_HUGETLB
-	~NET_CLS_CGROUP
-	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
-	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
-	~VXLAN
-	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
-	~IPVLAN
-	~MACVLAN ~DUMMY
-
-	~OVERLAY_FS
-	~EXT4_FS_SECURITY
-	~EXT4_FS_POSIX_ACL
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
-	if kernel_is lt 3 10; then
-		ewarn ""
-		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
-		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
-	fi
-
-	if kernel_is le 3 18; then
-		CONFIG_CHECK+="
-			~RESOURCE_COUNTERS
-		"
-	fi
-
-	if kernel_is le 3 13; then
-		CONFIG_CHECK+="
-			~NETPRIO_CGROUP
-		"
-	else
-		CONFIG_CHECK+="
-			~CGROUP_NET_PRIO
-		"
-	fi
-
-	if kernel_is lt 4 5; then
-		CONFIG_CHECK+="
-			~MEMCG_KMEM
-		"
-		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
-	fi
-
-	if kernel_is lt 4 7; then
-		CONFIG_CHECK+="
-			~DEVPTS_MULTIPLE_INSTANCES
-		"
-	fi
-
-	if kernel_is lt 5 1; then
-		CONFIG_CHECK+="
-			~NF_NAT_IPV4
-			~IOSCHED_CFQ
-			~CFQ_GROUP_IOSCHED
-		"
-	fi
-
-	if kernel_is lt 5 2; then
-		CONFIG_CHECK+="
-			~NF_NAT_NEEDED
-		"
-	fi
-
-	if kernel_is lt 5 8; then
-		CONFIG_CHECK+="
-			~MEMCG_SWAP_ENABLED
-		"
-	fi
-
-	if use aufs; then
-		CONFIG_CHECK+="
-			~AUFS_FS
-			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
-	fi
-
-	if use btrfs; then
-		CONFIG_CHECK+="
-			~BTRFS_FS
-			~BTRFS_FS_POSIX_ACL
-		"
-	fi
-
-	if use device-mapper; then
-		CONFIG_CHECK+="
-			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
-		"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	export GOPATH="${WORKDIR}/${P}"
-
-	# setup CFLAGS and LDFLAGS for separate build target
-	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# if we're building from a tarball, we need the GITCOMMIT value
-	[[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT
-
-	# fake golang layout
-	ln -s docker-ce/components/engine ../docker || die
-	ln -s docker-ce/components/cli ../cli || die
-
-	# let's set up some optional features :)
-	export DOCKER_BUILDTAGS=''
-	for gd in aufs btrfs device-mapper overlay; do
-		if ! use $gd; then
-			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
-		fi
-	done
-
-	for tag in apparmor seccomp selinux; do
-		if use $tag; then
-			DOCKER_BUILDTAGS+=" $tag"
-		fi
-	done
-
-	pushd components/engine || die
-
-	if use hardened; then
-		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
-		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
-		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-			-i hack/make/dynbinary-daemon || die
-		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
-	fi
-
-	# build daemon
-	VERSION="$(cat ../../VERSION)" \
-	./hack/make.sh dynbinary || die 'dynbinary failed'
-
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	# build cli
-	DISABLE_WARN_OUTSIDE_CONTAINER=1 emake \
-		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
-		VERSION="$(cat ../../VERSION)" \
-		GITCOMMIT="${DOCKER_GITCOMMIT}" \
-		dynbinary
-
-	# build man pages
-	go build -o gen-manpages github.com/docker/cli/man || die
-	./gen-manpages --root . --target ./man/man1 || die
-	./man/md2man-all.sh -q || die
-	rm gen-manpages || die
-	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-
-	popd || die # components/cli
-}
-
-src_install() {
-	dosym containerd /usr/bin/docker-containerd
-	dosym containerd-shim /usr/bin/docker-containerd-shim
-	dosym ../sbin/runc /usr/bin/docker-runc
-	use container-init && dosym tini /usr/bin/docker-init
-
-	pushd components/engine || die
-	newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd
-
-	newinitd contrib/init/openrc/docker.initd docker
-	newconfd contrib/init/openrc/docker.confd docker
-
-	systemd_dounit contrib/init/systemd/docker.{service,socket}
-
-	udev_dorules contrib/udev/*.rules
-
-	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
-	dodoc -r docs/*
-
-	insinto /usr/share/vim/vimfiles
-	doins -r contrib/syntax/vim/ftdetect
-	doins -r contrib/syntax/vim/syntax
-
-	# note: intentionally not using "doins" so that we preserve +x bits
-	dodir /usr/share/${PN}/contrib
-	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
-	popd || die # components/engine
-
-	pushd components/cli || die
-
-	newbin build/docker-* docker
-
-	doman man/man*/*
-
-	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
-	dobashcomp contrib/completion/bash/*
-	bashcomp_alias docker dockerd
-	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completion/fish/docker.fish
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/_*
-	popd || die # components/cli
-}
-
-pkg_postinst() {
-	udev_reload
-
-	elog
-	elog "To use Docker, the Docker daemon must be running as root. To automatically"
-	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
-	elog "  rc-update add docker default"
-	elog "Similarly for systemd:"
-	elog "  systemctl enable docker.service"
-	elog
-	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
-	elog "  usermod -aG docker youruser"
-	elog
-
-	elog " Devicemapper storage driver has been deprecated"
-	elog " It will be removed in a future release"
-}
diff --git a/app-emulation/docker/docker-19.03.13-r2.ebuild b/app-emulation/docker/docker-19.03.13-r2.ebuild
new file mode 100644
index 000000000000..466ac242d032
--- /dev/null
+++ b/app-emulation/docker/docker-19.03.13-r2.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	DOCKER_GITCOMMIT=4484c46d9d
+	MY_PV=${PV/_/-}
+	SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+	>=dev-lang/go-1.13.12
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+# https://github.com/docker/docker-ce/tree/master/components/engine/hack/dockerfile/install
+# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^,
+# for appropriate brachch/version of course
+RDEPEND="
+	${DEPEND}
+	!sys-apps/systemd[-cgroup-hybrid(+)]
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	~app-emulation/containerd-1.3.7[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?]
+	~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?,selinux(-)?]
+	~app-emulation/docker-proxy-0.8.0_p20200617
+	container-init? ( >=sys-process/tini-0.18.0[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+
+	~OVERLAY_FS
+	~EXT4_FS_SECURITY
+	~EXT4_FS_POSIX_ACL
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is lt 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+			~IOSCHED_CFQ
+			~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	if kernel_is lt 5 2; then
+		CONFIG_CHECK+="
+			~NF_NAT_NEEDED
+		"
+	fi
+
+	if kernel_is lt 5 8; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP_ENABLED
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a tarball, we need the GITCOMMIT value
+	[[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT
+
+	# fake golang layout
+	ln -s docker-ce/components/engine ../docker || die
+	ln -s docker-ce/components/cli ../cli || die
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp selinux; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	pushd components/engine || die
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	VERSION="$(cat ../../VERSION)" \
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	# build cli
+	DISABLE_WARN_OUTSIDE_CONTAINER=1 emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		dynbinary
+
+	# build man pages
+	go build -o gen-manpages github.com/docker/cli/man || die
+	./gen-manpages --root . --target ./man/man1 || die
+	./man/md2man-all.sh -q || die
+	rm gen-manpages || die
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+	popd || die # components/cli
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+
+	pushd components/engine || die
+	newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	newbin build/docker-* docker
+
+	doman man/man*/*
+
+	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
+	dobashcomp contrib/completion/bash/*
+	bashcomp_alias docker dockerd
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+	popd || die # components/cli
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+
+	elog " Devicemapper storage driver has been deprecated"
+	elog " It will be removed in a future release"
+}
diff --git a/app-emulation/edumips64/Manifest b/app-emulation/edumips64/Manifest
index a7b978c5dc78..b358ea9f02ba 100644
--- a/app-emulation/edumips64/Manifest
+++ b/app-emulation/edumips64/Manifest
@@ -1,7 +1,5 @@
 AUX edumips64-1.2-javadoc-cp.patch 483 BLAKE2B a419aaafa7839115cfdcb911c501b973ac3159d89d570172834cf94ed3600c1ae9cf11233832d6afc7c2a19901336d7fa604f10d334d8f739d91da77d6b28bc6 SHA512 f46c16f88e0624dd587a8e8d4f243f8e435344809406af91e7fa3ba63593da373ec93b815681e8a5660ffa0fc80c66b9e89b1b9fd5c80dc236cd626474e43549
 AUX edumips64-javadoc-cp.patch 530 BLAKE2B ac98978ce391c3af6486b327d90bc0364d42afa0c72dcdc0681e84ce99974d4f8d94c2c177781f115c28b89a36961989a33d081615e5e9996ec397941c259921 SHA512 5a0d51507542a484cda3c812a536bef7c58f8d7cff68a07d5c6ead2d4c3bc73ea9b20a550404fac3682d129f8b3f95a8819760420170d08dfe7360657181730f
-DIST edumips64-1.1.tar.bz2 551083 BLAKE2B c76b29d1fbcfe6b03afae11e5c99717db2ef2c3046b66411b0d98ffc3bb119aac147d2283c938ef9947d4737fde141bfd89cee6f46d5db72f75a949a25b74cff SHA512 ca4884bbdb5bb41fe96abca566500af7dc31b330390f352bc6413aacb0561f58b5e95a90e22f58d18065324c155c97bd4d79beb7769efdafc3541cc37145579c
 DIST edumips64-1.2.tar.bz2 551455 BLAKE2B 614bf851964ea32d6954fb5345f6b07b6292bf90e24dca5d3ea8d86c1b910e1e9ade6ebfece054922ad3506586e9f32c1f6570a7248023e6a867a8b5c09b1203 SHA512 93a5bcae3ab96c35688de7589b9ecb465fe841b007a50e1b04f8194d12a45a4e7134951584f4fbfad5cee51925d1d21b0f425f182999f66fe57a31adbd3f6602
-EBUILD edumips64-1.1.ebuild 1055 BLAKE2B 57dfaa0cd8a3a0c929e5f719830181ad0075a2ee496054a194d1a7ae2abdd911dab64c8d1dc318ccb7eb0023b446d87216c974285af0265b58091f943740f73b SHA512 4d6411ac753d68c7887b1f40d3f006ae7fa78831bda5898ef546c21d3331b3830775ad5ce638b4ac9ace901b447d49b509e61bdaf04ceaf6ccd6c515827540db
 EBUILD edumips64-1.2.ebuild 1076 BLAKE2B b0fd1593dc9915b86f1424b804ccb292a36b21df434ca8494b424249e46613f49cccacdda0bd480e908a6468df6acc521caa6600bcb37821cf4ecbfb377da356 SHA512 bd3ab8afa73b8a4fb2624669f61ab92c1aa7ac8cec9b0e282fb3ca13e84aa462bf44ef8e6a01aa7624913e681a204f73d705dca5f2e42c4da7e11237f96461b3
 MISC metadata.xml 325 BLAKE2B fa644dd786234b486da85e620556900d3ddf69fdaad914f35e888780c2c5a3e17b5ee62fde9919a725e07f9203092741d8e68af7c3418416d182078751ffacce SHA512 e6541353f8d7f6c508bfa2996a938b41c5f98f163f03119c5885e60cf447f1820bc8ab17aa57d45241189e4c1528ec6667048a019042b70df2ecbf95505d2882
diff --git a/app-emulation/edumips64/edumips64-1.1.ebuild b/app-emulation/edumips64/edumips64-1.1.ebuild
deleted file mode 100644
index 9a2d22592836..000000000000
--- a/app-emulation/edumips64/edumips64-1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A visual and cross-platform MIPS64 CPU Simulator"
-HOMEPAGE="https://www.edumips.org"
-SLOT="0"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/sphinx
-	dev-java/javahelp:0
-	>=virtual/jdk-1.6
-	doc? ( sys-devel/make )
-	test? (
-		dev-java/junit:4
-		dev-java/ant-junit4
-	)"
-RDEPEND=">=virtual/jre-1.6"
-
-EANT_BUILD_TARGET="slim-jar"
-EANT_DOC_TARGET="htmldoc"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-javadoc-cp.patch"
-	java-pkg_jar-from --build-only --into libs javahelp jhall.jar
-	use test && java-pkg_jar-from --build-only --into libs junit-4 junit.jar junit-4.10.jar
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_newjar ${PN}-${PV}-nodeps.jar ${PN}.jar
-	dodoc RELEASE_NOTES authors
-	use doc && java-pkg_dojavadoc docs/en/output/html
-}
-
-src_test() {
-	ANT_TASKS="ant-junit4" eant test
-}
diff --git a/app-emulation/libguestfs-appliance/Manifest b/app-emulation/libguestfs-appliance/Manifest
index d29f751f2e5b..ee516f61a20f 100644
--- a/app-emulation/libguestfs-appliance/Manifest
+++ b/app-emulation/libguestfs-appliance/Manifest
@@ -1,6 +1,4 @@
 AUX env.file 47 BLAKE2B 2b9034e60acea9f2300ec234a7ccdd6b438d2370808f8c30c8470c735287d1ed5ee6f75f0c1fa05423a39e558ca5daa258de44b1125999ac47e289c7c4df332d SHA512 74b5c63ab4421238b4e2c54dfc9579dea719101c0b9066341ddf3aa64ff1ed739e6d38e837b388ded1f741bc57c47a52772bf22ee52318acc5cb34908f1df1fd
-DIST appliance-1.36.1.tar.xz 91514476 BLAKE2B 4cb328178e93b2430c85d1eb23450633220cabfa16e4dbbb11e0e5b75f7fc4c33daabc171dd19aee46ce385ec06665010e52d8dafac7581695cf40ff5d194dcb SHA512 2af550078a0e6b37e97988018f579df0e19072d06cbb53eccd85c2873850b472cabf34bbfb4e0ef5f43b5a1af4155f014eeefb85a1b05035d7916c7b1187d722
 DIST appliance-1.38.0.tar.xz 96537604 BLAKE2B 8b425b624dec274f2913ab9ff89cc02fea6c9244d6e3ee64f054d2a91f7959d9dbc03d55e9f5b4f5df835007581a18914b5c790f55b01c3398412ce5a7e9309d SHA512 a423fd54627ffb9c2ae05b26ad60b9089f8119a99d30612a33921a2662ba42332ad0a7a7ad6c33b7042fc02a5c4dc9b563158650c6cb4a3eaaae6b764f7d7082
-EBUILD libguestfs-appliance-1.36.1.ebuild 1062 BLAKE2B 4279472548f0bbafdc592974217c8267ece2304838d21344035fcff6d1a15292699607c7f9454f2cdbf95f55ada9cadde4ec10a7e74e64a02da6e449c48299f1 SHA512 12f8ffa19b7d8a318e3b1234a4fa42f9a97b9b849e78a978b0b663b76568921ef5675f87698e18c4638c5e473acc1a3ddba2402e67ddd6dfbe2064e9510f3335
 EBUILD libguestfs-appliance-1.38.0.ebuild 1059 BLAKE2B f1d9fc8b2aa64d04fb9d16533dbee9cd157b41cb514c8ffbae7e50b3b035c7ef91b2bcb4f55b95ba225e56b20e14f6f17adeaa620c168f80b24e911d7ec0b1bf SHA512 840969c47f6b36051a41d850a294ccee2c9c322a3907f911dd1d2b0dc8a0c481878ae9f3ce08db879c1f1a5399f0657200aa4209a82a96c568db770fc1bdf7f1
 MISC metadata.xml 427 BLAKE2B 2763fa9795cb6e147d2675776259d7387d86b182b80ec5fdf8727bdc3f2cb64eea725e467d783a9900e8c64d25e06bbe1f868ccf076c06da731026ddaad47482 SHA512 a092635a5738a6cdc8ae88d69016a34fa027a4037ac5b87165f04bdaaa9ae80af65f6cf0e5ae458c688d04f9acea8e9be745e44d62e6733ad8ed95f1d904f9b7
diff --git a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.36.1.ebuild b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.36.1.ebuild
deleted file mode 100644
index 7f91b08c3f97..000000000000
--- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.36.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CHECKREQS_DISK_USR=500M
-CHECKREQS_DISK_BUILD=500M
-
-inherit check-reqs
-
-DESCRIPTION="VM appliance disk image used in libguestfs package"
-HOMEPAGE="http://libguestfs.org/"
-SRC_URI="http://libguestfs.org/download/binaries/appliance/appliance-${PV}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-# Mixing libguestfs versions causes weird problems. #501588
-RDEPEND="!<app-emulation/libguestfs-${PV}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	# We'll unpack the tarball directly into ${D} to speed up install.
-	# Otherwise we need to duplicate hundreds of data.
-	:
-}
-
-src_install() {
-	dodir /usr/share/guestfs
-	cd "${ED}"/usr/share/guestfs
-	unpack ${A}
-	cd appliance || die
-	dodoc README*
-	# Don't rm README.* here, at least README.fixed is needed for libguestfs, see
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1183780
-	chmod 755 . || die
-	chmod 644 * || die
-
-	newenvd "${FILESDIR}"/env.file 99"${PN}"
-}
diff --git a/app-emulation/qemu-init-scripts/Manifest b/app-emulation/qemu-init-scripts/Manifest
index 611783d0e234..52bbde3da98a 100644
--- a/app-emulation/qemu-init-scripts/Manifest
+++ b/app-emulation/qemu-init-scripts/Manifest
@@ -1,5 +1,4 @@
 AUX openrc-run.patch 291 BLAKE2B 68ad9f3a95a97131bb8699c0034c1c56d910ce9fc90fd89947b6612e3ae176904637eabb173c12b30d0c5dcfda40fbb29f5901e0a09de72f989059d64b1d6df4 SHA512 313e201b4040d2550b75c9155871152d6d82c9d20a04bc49e31fb74864ad454b86024b951e8c4ff0776247c4243705d65de0f82d1cef85ddd733cc1ea77c6d4f
 DIST qemu-init-scripts-0.3.0.tar.xz 4584 BLAKE2B 836cdf49b5c85333a18fb9c18efb012598474617ffa35d2ff2eea717546da0f1f0374b98b315ad67a1fedc32bd65f3879f6553915aec2f3e230644a93862909b SHA512 49427572ce0636400ad3e389ed143fa9b1d637a7a89649cd5e265e409d3d745babe28f6af8cac3d9a249a8d5cc6554b321c0613f35824d604dcd814a44033c51
 EBUILD qemu-init-scripts-0.3.0-r1.ebuild 896 BLAKE2B fb57e8c0cad605764e74d51e09c48437d288269e9d83a9f8f922e9e96270f9708a1e4fe658c4c7238cd164cc019bdadeed831359b37b6c4d391d36687b3b84b8 SHA512 c5ccf949ec17f6a5a3d445ef696e67cdb4c09d25314f4f5ec53e6c94897ccdfd47a6f0b359d6561b4311e21b06b6237f8a3e894ecd2810b95491480c214adc12
-EBUILD qemu-init-scripts-0.3.0.ebuild 899 BLAKE2B 87d9829842fd19720de1039a1bd02a6c0102197a16ed788f856c768e38ed50db6e72ebac194c36bdfec266dafecc79b3b4b9c98bca5eaff7e26aa2d3170300a4 SHA512 8b525350d3725cf6806c5ab45db1093a0a87c1e44cde78cb5177a9658ada754b2c13a020c84aa32342c4d0bbb00d1a6f1c9fac4270f0c6e07492b754a11b43ca
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild b/app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild
deleted file mode 100644
index 5acdcacb0a9e..000000000000
--- a/app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.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=5
-
-DESCRIPTION="Kvm and qemu init scripts"
-HOMEPAGE="https://gitweb.gentoo.org/proj/kvm-tools.git/"
-
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT=0
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-emulation/qemu
-	net-misc/socat"
-
-S="${PORTAGE_BUILDDIR}/work/${PN}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_install() {
-	newinitd "${S}/"qemu-init-script qemu
-	newconfd "${S}/"qemu-conf.example qemu.conf.example
-	newsbin "${S}/"qtap-manipulate qtap-manipulate
-	dosym qemu /etc/init.d/kvm
-}
-
-pkg_postinst() {
-	elog "For bridging networking systems, you need these run time utilities:"
-	elog "    net-misc/bridge-utils"
-	elog "    sys-apps/usermode-utilities"
-	elog ""
-	elog "We will be updating these scripts to use"
-	elog "iptables exclusively in the future"
-}
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index dd3ab2236197..630128ff3125 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,5 +1,4 @@
 DIST runc-1.0.0_rc10.tar.gz 1929802 BLAKE2B 8399c3d62726bbb6256efef7e15b7496a7172bf25170b12beb60be498967dec4fde2aebd073de4265e132ff864bafc4d2499ab677390a4f7c0a1605d83ae55e5 SHA512 598221071ef07d18bf34bf5d5c68b8ad78ee71716177fc3ce5b6909cd841d5aed93f17ebf1f3d134707d29eef1f54a4ddc21e79621a9bd957df28a8d2e028ab7
-DIST runc-1.0.0_rc92.tar.gz 2061469 BLAKE2B 06444eaf7602fe9ddaf7728c7f55bd718d1fe8f5f0ce6b21abc49a1d84eaa2fc3550d0d275ba5548ee9ebb6948a8ed415de8562a990d6085d1da8fb37e46afb9 SHA512 770a31736f5ab4ba359d91bd236750511f90b29af0af2bad5c238b611f465d7302e78b57ce8a702068440fda2d74588b92fd4d24c6d34e6fc1bd649ea3d8ee40
+EBUILD runc-1.0.0_rc10-r1.ebuild 1840 BLAKE2B 16f2f16898eef7fc8db2063e4256eb176ea4e62aaa909c98dd2f93a409598d858b8a36df811457d878111101922fd5cfa1d601e8f1986fd991222cb6f09af38c SHA512 1e11442f8aabb8484996cbd04bff23ff9aa62038bf62f4ec9cccafa652c84e6fa5fb50df5cdcefd5c2b95fe4b1170ff6f1004d36761b1d919955f58fc1e67376
 EBUILD runc-1.0.0_rc10.ebuild 1367 BLAKE2B 0f15ea756bb1a152e18ceb08cd4042a0fe1576d1e2e808858c47f0455f5a3620152922963c86faf8a1908baa4dd3962e572f0f1d3fba19f613512eae8f2d555c SHA512 1bee2f58c2438877dfc9119eaa739ead5d316ce86cc61ef7635bd44cf4f9780fcdd414e6a9b27c84f364199f9d7fdf078b72816af96dd0892ad3302b2e915e93
-EBUILD runc-1.0.0_rc92.ebuild 1713 BLAKE2B c6f361bae8e3e3917c3140da7b16a26101dd7b5eb516f382b5a8209afde8a00365592206b5c49ab8d9c474143cc49118e1cdf6667f6cfeaf9911ccc7849da1ef SHA512 0d8ae6bf72bb230a27d569de55b76f375bed78d0b1d0bf0aa942ac119573e4794d6a1982a0c54e5ffc0092709b0a1e2769e315622f48dd632b8921eb871ed017
 MISC metadata.xml 764 BLAKE2B a3132f8c72aaaac64caf15319068c94a3a849092ddf4d8ed83ef2b964ce714a12fc8f7c35ec85072fab02dbe5b650c23ba185372d7eb835d5a4bb30e1a88c784 SHA512 980f2d052132f8a72f218d6f0538fafac32e2af3b72e2aa4db0d3bd6ea120ec426ca16e5eeac721682a24200c5ea6f4d91f574926849d549fcff478872ff038b
diff --git a/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
new file mode 100644
index 000000000000..71ec6fbe3a47
--- /dev/null
+++ b/app-emulation/runc/runc-1.0.0_rc10-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-vcs-snapshot linux-info
+
+# update on bump, look for https://github.com/docker\
+# docker-ce/blob/<docker ver OR branch>/components/engine/hack/dockerfile/install/runc.installer
+RUNC_COMMIT="dc9208a3303feef5b3839f4323d9beb36df0a9dd"
+CONFIG_CHECK="~USER_NS"
+EGO_PN="github.com/opencontainers/${PN}"
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://runc.io"
+SRC_URI="https://github.com/opencontainers/${PN}/archive/v${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="apparmor +ambient hardened +kmem +seccomp selinux test"
+
+DEPEND="seccomp? ( sys-libs/libseccomp )"
+
+RDEPEND="
+	${DEPEND}
+	!app-emulation/docker-runc
+	apparmor? ( sys-libs/libapparmor )
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	test? ( "${RDEPEND}" )
+"
+
+# tests need busybox binary, and portage namespace
+# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
+# majority of tests pass
+RESTRICT+=" test"
+
+src_compile() {
+	# Taken from app-emulation/docker-1.7.0-r1
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
+		-L${ROOT}/usr/$(get_libdir)"
+
+	# build up optional flags
+	local options=(
+		$(usev ambient)
+		$(usev apparmor)
+		$(usev seccomp)
+		$(usev selinux)
+		$(usex kmem '' 'nokmem')
+	)
+
+	myemakeargs=(
+		BINDIR="${ED}/usr/bin"
+		BUILDTAGS="${options[*]}"
+		COMMIT=${RUNC_COMMIT}
+		DESTDIR="${ED}"
+		PREFIX="${ED}/usr"
+		GOPATH="${S}"
+		-C "src/${EGO_PN}"
+	)
+
+	emake "${myemakeargs[@]}" runc man
+}
+
+src_install() {
+	emake "${myemakeargs[@]}" install install-man install-bash
+
+	local DOCS=( src/"${EGO_PN}"/{README.md,PRINCIPLES.md,docs/.} )
+	einstalldocs
+}
+
+src_test() {
+	emake "${myemakeargs[@]}" localunittest
+}
diff --git a/app-emulation/runc/runc-1.0.0_rc92.ebuild b/app-emulation/runc/runc-1.0.0_rc92.ebuild
deleted file mode 100644
index 0f6763825b49..000000000000
--- a/app-emulation/runc/runc-1.0.0_rc92.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Change this when you update the ebuild
-RUNC_COMMIT=dc9208a3303feef5b3839f4323d9beb36df0a9dd
-
-inherit go-module linux-info
-
-CONFIG_CHECK="~USER_NS"
-
-MY_PV="${PV/_/-}"
-SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://runc.io"
-
-LICENSE="Apache-2.0 BSD-2 BSD MIT"
-SLOT="0"
-IUSE="apparmor hardened +kmem +seccomp selinux test"
-
-DEPEND="seccomp? ( sys-libs/libseccomp )"
-
-RDEPEND="
-	${DEPEND}
-	!app-emulation/docker-runc
-	apparmor? ( sys-libs/libapparmor )
-"
-
-BDEPEND="
-	dev-go/go-md2man
-	test? ( "${RDEPEND}" )
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# tests need busybox binary, and portage namespace
-# sandboxing disabled: mount-sandbox pid-sandbox ipc-sandbox
-# majority of tests pass
-RESTRICT+=" test"
-
-src_compile() {
-	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
-		-L${ROOT}/usr/$(get_libdir)"
-
-	# build up optional flags
-	local options=(
-		$(usev apparmor)
-		$(usev seccomp)
-		$(usev selinux)
-		$(usex kmem '' 'nokmem')
-	)
-
-	myemakeargs=(
-		BUILDTAGS="${options[*]}"
-		COMMIT=${RUNC_COMMIT}
-		DESTDIR="${ED}"
-		PREFIX="${ED}/usr"
-	)
-
-	# prevent double manpage generation
-	sed -i 's/^install-man: man/install-man:/' Makefile || die
-
-	emake "${myemakeargs[@]}" runc man
-}
-
-src_install() {
-	emake "${myemakeargs[@]}" install install-man install-bash
-
-	local DOCS=( README.md PRINCIPLES.md docs/. )
-	einstalldocs
-}
-
-src_test() {
-	emake "${myemakeargs[@]}" localunittest
-}
diff --git a/app-emulation/ski/Manifest b/app-emulation/ski/Manifest
index 14e4885f7b87..911a943f0caf 100644
--- a/app-emulation/ski/Manifest
+++ b/app-emulation/ski/Manifest
@@ -4,6 +4,7 @@ AUX ski-1.3.2-binutils.patch 1039 BLAKE2B 72a03fc70b3473ba760297f97cd8722c6f3b9a
 AUX ski-1.3.2-configure-withval.patch 634 BLAKE2B 3a32acdfd37d7b2622f6add89ebdb5ca0d55a9ef6bb13f78bc4b6d82638ba63c2473bf12f1971a1aaca83f10ad0061a2d16a031bee50f9dcba5cc2c01efcd86f SHA512 38e612baf0a3fee74c3d3fa0f106b6169eb5d5594b5cfd437ab65f888dfaf151863a0d5b312ebe0b4ff882937fa4a5c2a3b6b0064fc0dabe6fd57990de4eb9ec
 AUX ski-1.3.2-gcc-10.patch 538 BLAKE2B aed07964852d344b9d2888dd4c86a31fd7b2b0c89067fb01cf2c513289faccee1f4bfffafda98298e7a2268d5b4a4c8abdc54c089408b94df0dd7dba0275e25b SHA512 9e4e4c852fce92c6566df35d95e9b35d9c655ab8fe0eb3fb8eef6a76a8241a6b882b2587ec99510368a905e2ddb5d29ffa8aef19316cd7078d94ca87ed258844
 AUX ski-1.3.2-glibc-2.28.patch 240 BLAKE2B 279fe68c7ddb734554fbe7e098eb049d710439c9f3cc63dda231c5f8f1e9551909017bd9945f390a4fe1acd82d8bb9f7ead5ac75bfea4103b4af908397df8d40 SHA512 84913716d3b6ed9ccdfac4bb15ddece97013967c5ae4e22dd6ddc7235e013832131e3f21bcba76bc07cbce4d949e149c8b8df6a59ff2141308f7a550eedbfcdc
+AUX ski-1.3.2-lex-deps.patch 358 BLAKE2B fbb49379ae9608cd23bfc30a6182b2d63782474a3b2fe660c300fef6fd89b3e1e840733ef4932e09d392d4ddcc01ffe1efb1d69addc1d31efa937f6171b2dcf2 SHA512 a987ba9bd4c3de6d5a2d095118e594d70b28ede82b9e8e34f1eed50c7d43033c0887b0546b9cffc54b1f4e3608a1e38f4df04d4fc86e02aac00f9a59ff0dedf2
 AUX ski-1.3.2-ncurses-config.patch 584 BLAKE2B a6876394e368f1f793bce339618c668e9d117c9206455e7d3cf74372b3214c9984fde52753fb453e73d390a3f57011c7a3406a40daaaee04fc8231fbb40d34d1 SHA512 64bd0b4ee7d7e9117f9907eaf71f92b0b74dc4d1c4724845de31820a9853199f8834d3d01afdfb725c389d45f353e2d8b99264aa5ddff5c3067c22e990cd967e
 AUX ski-1.3.2-no-local-ltdl.patch 366 BLAKE2B 1d4de13c62a474c41aa77ec91db2c6c0da51d65992d2d1dcc15518dd34fbdcd101c9df2a50585ef6cc54b71197d9354ad1f4092b80de2e1714986e7744ae83c6 SHA512 70ecc14b4449065ade95b00b18b79cd6106f3efc1553310b2ae3b6df10f1f31886c9d7c3832e727daf51bd0ce22d53f818fb30b9e8c11dea597315bbeb442f81
 AUX ski-1.3.2-prototypes.patch 656 BLAKE2B 6f85c3acd7eff720f7f25fbad77389c16c203a31d3cc00494b0624e38b333fd694912ad5882abc61efefaa033042e9bbb28c932870e29bc7336565345428aba3 SHA512 d1f37e57a0aaea4621a749b94453121f16cd3ce6c51cae4cdde8b6258f5a4a7a63c5b35e8bc50cf43d5462ab8be9abfc4196443e329641622ab848f56e27616d
@@ -11,5 +12,5 @@ AUX ski-1.3.2-remove-hayes.patch 682 BLAKE2B 5a304115ac6353b1c61ae4ddeeebc821ced
 AUX ski-1.3.2-syscall-linux-includes.patch 397 BLAKE2B dfb72fef3be8110ab5acacb8fa0f33e8c68fc5de873b92398dd4a048307f3d4db47eb2d04a8323ce3748e893e190d42ca5168de442c892edff92834544edad52 SHA512 f0784af8eb8ecc8df92f96f1ce2f714f4cb1a9e60409a06c02cf300316a9680b01be6b6d1f83854b1fb3bd364cf0b08262a99a63190695fd9722691ef1fa3d6f
 AUX ski-1.3.2-uselib.patch 582 BLAKE2B b0d91fed1a01c6d4c2db464a1dbe6c4855a0302eacb21367865a3510b081a95756f1b09f79a015a1e20b3cb87d31e08785a5abed4a661203aec82a4a311538bf SHA512 f119e1a18ef08f40758fa1ddde61a88533b432c75111bba38ffc134edfee66f28ee01336509ed106461bddfc438d1eac48213ab4940e82f5128b924e584b974e
 DIST ski-1.3.2.tar.gz 2715791 BLAKE2B 5e6b237ea21bf410e44dbaa88150d980f2af66728effeab4e8bcef02f27c24069c4bcaf42d3814ad15c3bd759819d468f163b6c64a89408c09d1ffbdc9302c0f SHA512 21f2e1dd87cb517602d4d6ef62707ec6042c1b6ec5dfd063db7315d13bbc3fb47b491c15b7efb0433fc82f27c7924e2d50b2f57fe24e49aeb864ce2c3c2c8bd0
-EBUILD ski-1.3.2-r4.ebuild 1515 BLAKE2B 2c9a19e5b8e07d9d2eabb4c94b5aaabea02f93bfb55c14b76069e2147d67cd8b3397a05413cb1e250c1497a2ecadff8c73b06aa989945bb14324fab7a176ed85 SHA512 08e667d9a77ce117493f33298b4b1e956e79448654db4293bdda4644e2272296d2f7690128c32038af04202c792bf10c55f2c2fd8e6634d9024371e96424f5a9
-MISC metadata.xml 568 BLAKE2B c632e41082b9077bfd5506b8f6b83708a0b240ceac97b41b70f73dd15c79767e5d61b0830b0e17136939d2815a6a5d52afa0537fa30a198fe70f26496ca46dbe SHA512 0c4da2abeb032d48f3cc26dec9d4b95fe9f32c014461f2d0c3e3f599780e701df593e9f7873df1be5859ef2fdd12c9004d973c1b43be9b997736df6c73331c50
+EBUILD ski-1.3.2-r4.ebuild 1558 BLAKE2B cc28e4ba990db883074b505a50ad823d9104e7fb6f8746fa14e4de1f707556a6bd1bf7ab5c0b33f99b3e2b949c5c4220ed72258c2aca1ad282332842cc357a02 SHA512 cc7eccadc7ddd10c247afc8b5ff840fcf93d9452396c553cc3401040a58b2c6e03ab8692a0cf99fd33d92c0f0b2b937e5ddd11bc42008531f37ec301e72a6ed9
+MISC metadata.xml 445 BLAKE2B c044a6cef20657adc98ec1e0d38b14393b04cbba0b71ec4efae3763c8de2a676bfc17569cf9f92d67306dbaf0cc058ef042cb3b0b54631f0f21458d3afacc6e9 SHA512 bfde8716ac8ae245b21561f97a6e4ad69617d9ddc994ec89e032b9a2d512be61f05c8aa94e2ada7dfb93cd24d45f49fb7ea6d0b934367bb9e256fb3f18f1e0c2
diff --git a/app-emulation/ski/files/ski-1.3.2-lex-deps.patch b/app-emulation/ski/files/ski-1.3.2-lex-deps.patch
new file mode 100644
index 000000000000..1dc8470864e2
--- /dev/null
+++ b/app-emulation/ski/files/ski-1.3.2-lex-deps.patch
@@ -0,0 +1,17 @@
+escan.l depends on generated eparse.h.
+If eparse.h is not present yet escan.o
+could be built before ${YACC) is ran.
+
+https://bugs.gentoo.org/744676
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -113,7 +113,8 @@ BUILT_SOURCES= \
+ 	$(DAS_INSTR_DERIVED) \
+ 	$(ASM_HASH_DERIVED) \
+ 	$(ICNT_DERIVED) \
+-	instr.c
++	instr.c \
++	eparse.h
+ 
+ ski_SOURCES= \
+ 	main.c
diff --git a/app-emulation/ski/metadata.xml b/app-emulation/ski/metadata.xml
index b37238378ea2..ab1c2fb53a4b 100644
--- a/app-emulation/ski/metadata.xml
+++ b/app-emulation/ski/metadata.xml
@@ -5,10 +5,6 @@
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>ia64@gentoo.org</email>
-		<name>Gentoo Linux IA-64 Development</name>
-	</maintainer>
 	<use>
 		<flag name='debug'>enable extra binary emulation debugging via <pkg>sys-libs/binutils-libs</pkg></flag>
 	</use>
diff --git a/app-emulation/ski/ski-1.3.2-r4.ebuild b/app-emulation/ski/ski-1.3.2-r4.ebuild
index 3d904abf6d44..ed996625c01d 100644
--- a/app-emulation/ski/ski-1.3.2-r4.ebuild
+++ b/app-emulation/ski/ski-1.3.2-r4.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-prototypes.patch
 	"${FILESDIR}"/${P}-glibc-2.28.patch
 	"${FILESDIR}"/${P}-gcc-10.patch #707144
+	"${FILESDIR}"/${P}-lex-deps.patch #744676
 )
 
 src_prepare() {
diff --git a/app-emulation/uade/Manifest b/app-emulation/uade/Manifest
index 208d7f31b79e..7aabe2d84d77 100644
--- a/app-emulation/uade/Manifest
+++ b/app-emulation/uade/Manifest
@@ -1,5 +1,4 @@
 AUX uade-2.13-configure.patch 620 BLAKE2B 4266246e968f5bcbfee755896047c5c0587a5199d8fc7882b4f9665175865a94491d6bfceaf3549b6f825e46688ab2f6164f6b4111101212f907d9bdec3f2b28 SHA512 08d5caa315054553414961cd44149f949099341f9c91b4dd7ee957649fa029b9c1927f583bd581e6b213f381b3eb43fe5097a87747ce7e36e94487fafdc96c76
 DIST uade-2.13.tar.bz2 2897931 BLAKE2B 7d5ba128fc53bb683a6a21616e3c9c2a7376361086f3d91a59026ac89eb48d9520f89342914078ccb4614a16826a8c90f86a6052caffc9d5cc4e1e0ab6b092f0 SHA512 675c3369ed55a314cab81ae7ba8a09b277ab1cfe2354eac92194f746803ec2464b7603d665cf30da41caef5997c21515e69f0313d8d2b079c242a08fef786183
-EBUILD uade-2.13-r1.ebuild 824 BLAKE2B 383a094b4634f1f733832b2c3d66d71d7f4f28ff2d85c0e41f20652c2c9da5d320868b077f49dc558fade5c82548fac5e81f53f433cace622b91eb382f0489b7 SHA512 c61726e48b585d2ec2b96e4c765793e601c036855f2b5e29fcea888d51e704550c90efdf49a6297edb77f1b408ee0cb5ba6e5f2425541e1f3cd97cdb4bb693f0
-EBUILD uade-2.13.ebuild 703 BLAKE2B f70f7552702e66e71bb5762cc98675dafaf6009f7d5b8dce66d0be26dc8aafffbfe50bfa68a9cf3fed562900bd0b13b886706514d9c298726f08cedee8c8af41 SHA512 51aa80ca564ec7baa6c89a36be7f4ac36c5e6884cc936099b4cfb426f0de154f6239183de22b26767b3310a627865060194aa73217bd5e1ec2eac08910d8a531
+EBUILD uade-2.13-r1.ebuild 821 BLAKE2B 56bbaf3dc9be81d371389e55a72a7affdd2d22bb92459a2cd57ce7e3a7df265febcd173a5ce7a0ef33b5ef0536d86890b0413cc003fe3de986ba0412eed731f1 SHA512 7947a265d8589cc2e7d4d57bf0139f3344235ab8764f0e2eff329ac1b04cd2d6948f8c63ee2f70a1ed249465b1ca03f5f9ac9072303a9ed12c43b7eb5dd92e6b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/app-emulation/uade/uade-2.13-r1.ebuild b/app-emulation/uade/uade-2.13-r1.ebuild
index c98dd0660e1a..28ceda581e45 100644
--- a/app-emulation/uade/uade-2.13-r1.ebuild
+++ b/app-emulation/uade/uade-2.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://zakalwe.fi/uade/uade2/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="media-libs/libao"
 DEPEND="${RDEPEND}"
diff --git a/app-emulation/uade/uade-2.13.ebuild b/app-emulation/uade/uade-2.13.ebuild
deleted file mode 100644
index c11c43b58d14..000000000000
--- a/app-emulation/uade/uade-2.13.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 eutils
-
-DESCRIPTION="Unix Amiga Delitracker Emulator - plays old Amiga tunes through UAE emulation"
-HOMEPAGE="http://zakalwe.fi/uade"
-SRC_URI="http://zakalwe.fi/uade/uade2/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/libao"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		--package-prefix="${D}" \
-		--with-uade123 \
-		--with-text-scope \
-		--without-xmms \
-		--without-audacious || die
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog doc/BUGS doc/PLANS" \
-		default
-	doman doc/uade123.1
-}
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index ec5874d91de3..38bf1da34256 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -2,5 +2,5 @@ AUX vice-pkg-config-3.4_p38553.patch 816 BLAKE2B 58fdde3647c520b12434b221197b91d
 DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb SHA512 5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
 DIST vice-emu-code-r38553-trunk-vice.zip 27146846 BLAKE2B 5139e4b1e9269c3885313889dffc055298c52152da77e5a824270feb0af6ba61a1726160a6d259e9f8840fefe486cc184f5bfda3ba1797e0359159ccf1e9824f SHA512 c4d3f132bae2980163e74695126e979bd68dddecb17c2eea8227edbb675985d1f04ade665b946a5e3c707bc17e260efb61f57aa141b6ef712385d4d85a68ef86
 EBUILD vice-3.4_p37498.ebuild 4112 BLAKE2B 3e30d925e86759e7d35a05617102975e95ee15cda966645c724b30e72df7ba9233e84fb104e42c527038ccbca03ea9a959aef186d4cec9c5c514fd87a737a88f SHA512 65f9367778d826d487d0f6fea6f6faa3b09e86d6e1e82f526b4fc77739944c64ff1343c4afaceade3ca0f242084dc6d071c872909b060511352dfe6576397001
-EBUILD vice-3.4_p38553.ebuild 4383 BLAKE2B 1c9a80163086c51601a9bdbb9cee04dfdb3311b2f4bd9430a6ace4a9223bb74daca0aac0d8c08fbe9b782d5b88356142bfda877778010f3372c08f51315ab8da SHA512 3a493f086914381019789e035caa6698f9cf1cd47c86d481502dcbadc6c9bfa1fdca7e77dc0381ca8b1085cc6d390ee43b968b1f2c7b62dcf73aa1ca1db3236a
+EBUILD vice-3.4_p38553.ebuild 4412 BLAKE2B d8c7c9b01a5189916dc555bae8e44a318a090288b8ef5382f59f3feb5693e5217f13a4a5239f8d44f89e04ffe6d9befca9e3d32a610b34dcb95199d8f340cb9b SHA512 3564aa2fe0552fc2d07a59bc3956e4e5545668ba1a35bc0e2d565d463b45f9900cee16d6457800b23b1238f0950b6edab7d0de3b6df7c90dd5cd213ee94d1505
 MISC metadata.xml 692 BLAKE2B d9f0e48aab3fb0ed8ccc7b044f561a96cd563eeeabfae63371cf4b3772a8068c2b4191c09d89465402a202496a2aac7234ffab8adbcc4c17be54ab0e0c9d307c SHA512 f7be3c1e6a6394452d3f7aac52b25ba0eeb098841ecac32bbcc92257a7f09430f9a18927234ba166014523eb7b930c66d803d9105025b79ac1dbebed781fec96
diff --git a/app-emulation/vice/vice-3.4_p38553.ebuild b/app-emulation/vice/vice-3.4_p38553.ebuild
index 0c04ce33e086..6035ab43a443 100644
--- a/app-emulation/vice/vice-3.4_p38553.ebuild
+++ b/app-emulation/vice/vice-3.4_p38553.ebuild
@@ -72,6 +72,7 @@ BDEPEND="
 	virtual/pkgconfig
 	virtual/yacc
 	doc? ( virtual/texi2dvi )
+	gtk? ( x11-misc/xdg-utils )
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index f885c9d1734a..d1f995d12a3e 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -1,8 +1,10 @@
 AUX vkd3d-1.1-Fix-build.patch 707 BLAKE2B 6d9ae111c19c61bbb63115bbd960d32a1c28c37aec8bb49fb631d1931b8f2987ccc6dbe2ff5d293480bda96da406e8045e05c7fc502e865da31beed28d70b54c SHA512 1d5316b4efb48fa8e8af99db675f02a4225a82b5095a6799c060a648977da83f8c3fd54ac3d6a86bfcdb6e05c1f455db68aaea7b7fc636b92f1274ba0fefd63b
 DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c96c97acf1e4b4cdb5b7e30c77235e8b8fa57f7db3196caf30c55c3b0c07e2981629dd6177436a3cd117d33 SHA512 55712528688cdedc63049e168b371b470dbb8e31ddc36d8b23b0655f4a061726eb8556b9abf3cb887f6bd21379959aed9fab93ba0fd53813aec413ebec71d615
 DIST vkd3d-1.1.tar.xz 487452 BLAKE2B 834ca06d2159a5857dde457f27e541f06624e87633af6aca7445867abc38c56a1da1fe34b6795ffbd6aa73e983ac0e4301402ae35ef8358fa8cc79c12972b11d SHA512 e107612bdca95e998f9d819bdf74e4ffe1b4d400d250ab855c4ebf94b7d3f088b3221591fef03b1c6b8ecb030feb1673f74831bd8bd8edda2989d09a8846b0f7
+DIST vkd3d-1.2.tar.xz 611240 BLAKE2B e7ea3f7120ad1092be0239bdc2e6d0dfdfecc3b1c2e7c359c4bfbd8c259f092e041a75a0e896da9a1c6370d5716590711128d31c9e552897b177b300b9a15107 SHA512 ca9d5b11e7770747b78b61f43196b45b7bda8d2dd4f1d76da915f895a04dc28c20499e1e433f5ce17416964fe0f37cdc907e7aa540ec9105afbc8a100094f3e7
 EBUILD vkd3d-1.0.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466
 EBUILD vkd3d-1.1-r1.ebuild 985 BLAKE2B dfaef748ee70113d4f0abf98365f05e625cbf97f9e18268df53e5f8e2cf420b97f56c2add1c4fee960ca9f2130e34437f6855a2eb57899a4da0ac97020c5ab1a SHA512 82a8db41ab48684612840bf9e4ce84480da3ac5193778e543ac912327cbc53ccc614cd3452b509cc1ca82ae9a9a9fe8853289d321a9f30d69766c2e84cdcdb7f
 EBUILD vkd3d-1.1.ebuild 929 BLAKE2B 3b1a8b289d47ab301fec2a45d5bde71759a0c23a36c6f9009ea7626860436a77f3bb3ff45184ed94f1b26cb859b5a6ae874cb66258edb0a52b8bf78b0ae9dfaf SHA512 db1e44ca23bcc636a61f9019a02558efc948bf7347e6ba11034ac0bae7cd0562555788b69dc98f0ccf67f4760b4c02338e81c54d5ccd8ee8d3ccd004bbbf66a4
-EBUILD vkd3d-9999.ebuild 1013 BLAKE2B d69666c130b15fa5dea83b104a953b6ac0c79f3854a9b11b09079b64d20c08557e0cc37f87aba29ed7166136b7d14d1fd4599ca258a64819065dc2f1ee552394 SHA512 b6a8fd7302f21d1e5278ab521e8d01769214ba860c413b4981a7c933c457d75f4d2172ae296f8e4a951350632df411674434c8994ea50fdc33bea61695ce8b8b
+EBUILD vkd3d-1.2.ebuild 955 BLAKE2B 162af813760b507b720587dc289a6b918526de090bb75b0b1b4c7bdb8b3c80f890c8e20d7125377c052f1f35069fa608e4feb13ded93e0b5d43392af523d38ae SHA512 91ca964bdab48060eed0173490ab62249995248600791d05d87b25aea199062fa0ab965f11f475ce5a7ed3eed87fac44e96f6bf6029d5f30bba87dc9a46a72c2
+EBUILD vkd3d-9999.ebuild 1037 BLAKE2B 41cbb9344a3bac1cd1a69f9b4439d020754bb2e5363f416393209c52c0e0c32dbc948065df09a1fd0b75d0d47fddb22e383f1bb3bac16c0652ae699f49c5a0d9 SHA512 ebd0d6514789760d0dedb7f4fd95fc435c0b9feeb39e9e1e86f501b3dc75d1e75a290451761bf631e50a48665ca7c34ceb537c825237b0d2bd13dfc3db906afa
 MISC metadata.xml 562 BLAKE2B 2409531d0bc65f547844ae83bfd7aaea4d996f2cdf11ebbf7e95775465d4bed916a39a38a0aae0c6df91a417df484ecaf63b29ea4286fdcfd11b07c8177e3496 SHA512 2150c80fd4315d922521b43c650012008864b3ed1ff7d80e43622ad916e52411c6ef855b46693f96165e9d89fd6a6f18cdc88baab13bec9f7053c0c1795bcd71
diff --git a/app-emulation/vkd3d/vkd3d-1.2.ebuild b/app-emulation/vkd3d/vkd3d-1.2.ebuild
new file mode 100644
index 000000000000..90e8035e37ba
--- /dev/null
+++ b/app-emulation/vkd3d/vkd3d-1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz"
+fi
+
+IUSE="spirv-tools"
+RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] )
+		media-libs/vulkan-loader[${MULTILIB_USEDEP},X]
+		x11-libs/xcb-util:=[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util-keysyms:=[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util-wm:=[${MULTILIB_USEDEP}]"
+
+DEPEND="${RDEPEND}
+		dev-util/spirv-headers
+		dev-util/vulkan-headers"
+
+DESCRIPTION="D3D12 to Vulkan translation library"
+HOMEPAGE="https://source.winehq.org/git/vkd3d.git/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_with spirv-tools)
+		--disable-doxygen-pdf
+	)
+
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
diff --git a/app-emulation/vkd3d/vkd3d-9999.ebuild b/app-emulation/vkd3d/vkd3d-9999.ebuild
index 8f9fdffa3c6b..0e542af46662 100644
--- a/app-emulation/vkd3d/vkd3d-9999.ebuild
+++ b/app-emulation/vkd3d/vkd3d-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,6 +40,7 @@ src_prepare() {
 multilib_src_configure() {
 	local myconf=(
 		$(use_with spirv-tools)
+		--disable-doxygen-pdf
 	)
 
 	ECONF_SOURCE=${S} econf "${myconf[@]}"
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index d9e3f51571da..459d0861d1d5 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
-DIST wine-5.14.tar.xz 23975804 BLAKE2B bc14b84f4044323cd65c8c0a715a09b296bb8ecad043062513c1a584a7b542bba9934e7563bec8e2d798c27f54683db37ffc227dd4cbf8e58f6ef1931b884c14 SHA512 21240d832497ba9a4313613ae27c21316ef383290dfcce81aebfbbf45edb7db6981739fe2ad42138b6df0a75a434d5aa8e4d87f9745f98c5f14000e1949ec342
 DIST wine-5.15.tar.xz 23999688 BLAKE2B af462d9e4c9fe5e364fd474bc17b6ea61b3390428762845291271811feab13cf6ccd39c8c5847b0cc922bd273d42227d95b871dfa04cf055560a3cff65349275 SHA512 90baf7df915cf1ce88022a4aebe4a6975b4b0defcc043a0c6738fefb9b853e0bfbcc645c39e33cdbb20673fab5df7561ab5b55e38a4e0a68907912a80e556ae3
 DIST wine-5.16.tar.xz 24025256 BLAKE2B 2008b428b16870ec6fa6a38866152d6b94a8a83b3d673557bab9c0c435897900bd0b4b7b73e685698cf7445a6c3eda12f88132d4f43e7b2108213ea947a76c09 SHA512 e198478bcf91106af82b37c87f42961a6c37aa80ea5cf05c268a36ba2ba73c23ac6864b183b927cf3c10d666d60b9f6877edccf7746eafe8968a36b5ce3740be
 DIST wine-5.17.tar.xz 24064512 BLAKE2B a84433ff7bb93a1f43c41f3106ff3f9c648631665100e8140340ab7d347daf6f2c3b54ea8177e1a2c2222574aa67264f5b576d99f6ef461548c74af48c62eb62 SHA512 05338036fa9b195d9cf8a84a1bcc03f35422d5f07744ec4430f20874601829be5904be10060353599cb0187728123f959ccc75e79f1ce1c47178ae9cd55ef696
+DIST wine-5.18.tar.xz 24160316 BLAKE2B 4f359b6e869707a514d2198d2b8ba810b8552ea53ff3f37cbc7c23b732152db0fa5c0c909d2c16a03f6b0ff122435c92f8a9b8b462577aa50a39b2dcfa7bcd05 SHA512 70565fbea61b78580ca86443fcb4c10c7814c1dffcfa49ee38746fef21a52a00f2e040d9d2515892fed4021e7868720cc22b650d18872656838e4610d4d4e823
 DIST wine-staging-150ce22fa21ffa040816e725ead34ed1de516bd8.tar.gz 9840427 BLAKE2B e263d6563a5438973309346ba820acdb5079ef236c5c55694bdfa16c54f3f4fe76750ab324d6c5e1f0b429df634b917f138f4a1db38417ac2b49ce41ee36a211 SHA512 37f05909ca6cb28a3527f31882562146d3971f47345312b96783b5e62bc95ee61779f12f4c13e3d05ec5f331463a7600c16d5bc428d13c42bf3e3568f4d3923e
-DIST wine-staging-5.14.tar.gz 9780843 BLAKE2B 03b964fd8b71a8a9e54f53074e4be82dd633a6489cdc30bade6e844e458ca43437bbd34c1a629fd0c1090173e37379a048be45561172bfff8e003daaf4104583 SHA512 da81b572480a6fc12aa39a93070e2b88593bba1463d5b0545083dbd6eaa306ec57fe39e77f24544d2a1a396a3e64c1687c12b69e0643e11a909e4e31a3e46014
 DIST wine-staging-5.16.tar.gz 9830408 BLAKE2B 0c4fd5e9942f4b5a666b21cb2ab3fdb059bca5762fd622b69358fd5df7f5c770681a3cbe6f9a0433e83f3be95b69808d95ed5f76df86b9713dcedb72a398966e SHA512 62e103dd5b591bc1066b91299a95c318bf1588f273f8380c1ac43d5367b695055a1684b8cc6473255a0b449b21a483ff4e87adc3ae332d0fb520023340fff79f
 DIST wine-staging-5.17.tar.gz 10342408 BLAKE2B aa8f864560eb476a4c2011e588df9b24410e4e4a8d6c8d81b5ff63208b3b4474870ae8bd718ba22cdb14b920b52aeac54274710bdb1b4dd427b7c7b0e8e9d14b SHA512 38c9860c8109e29026dd773a6448c9ac6faa373c0dfc04011a5f0b22be69c66dd6bdba95cb28bfb8e3656a53d726f2ffc0bae74bce4d437c4fe5a532e75a19ec
-EBUILD wine-staging-5.14.ebuild 20430 BLAKE2B 3a6112683291ed2e3856e1dc4317384e38335d0c79ecff56c9e2281c10c2dbb4584a75cfe711bf27a818b8009f94b86f3880bbae99d4f0b1dabc8467ed1bc64a SHA512 bb27944dd8c5a5572b0cc3dd40320e238c81ea0e583d30b20beb7bef88c6013ef27f2d941ddd38aaa65c617549e6eb44b09a03d6a8250258d0e6bba7d31092d2
+DIST wine-staging-5.18.tar.gz 10357038 BLAKE2B 07df0de55d1bfa36d3492498a48d8f1402dffa161f3b02f3326185d524bea9a2f0893b85a70650797bf1b74c06f5814ddc09cb184a5977cfacb968921020aee1 SHA512 75911ac4d5aaf6cfef41aa487290369d714f153b1fba2279daca75d6c5cbc7e7de9d3f8ef55eb7c311a05b86a212163e2b81ff685c1527fb0e90f223ec23dcab
 EBUILD wine-staging-5.15.ebuild 20510 BLAKE2B 3af262cc7b538088e2ff34679e1f3acbb72569f5f2bc0a2dd7d77f6102c9c4bf6560092a9bc52e78fc9b8e73d4589afe37d1945a4d83f20e160710d9e5d0807d SHA512 7f6f53332e0e91107f77fb0271a3b2381b28f37eb40eb8bda0acdb3f74f08c31fcf1846c534e38b648d6be8d8fe61935cce23e4da1a6dc6f346922d9235b0887
 EBUILD wine-staging-5.16.ebuild 20430 BLAKE2B 3a6112683291ed2e3856e1dc4317384e38335d0c79ecff56c9e2281c10c2dbb4584a75cfe711bf27a818b8009f94b86f3880bbae99d4f0b1dabc8467ed1bc64a SHA512 bb27944dd8c5a5572b0cc3dd40320e238c81ea0e583d30b20beb7bef88c6013ef27f2d941ddd38aaa65c617549e6eb44b09a03d6a8250258d0e6bba7d31092d2
 EBUILD wine-staging-5.17.ebuild 20430 BLAKE2B 3a6112683291ed2e3856e1dc4317384e38335d0c79ecff56c9e2281c10c2dbb4584a75cfe711bf27a818b8009f94b86f3880bbae99d4f0b1dabc8467ed1bc64a SHA512 bb27944dd8c5a5572b0cc3dd40320e238c81ea0e583d30b20beb7bef88c6013ef27f2d941ddd38aaa65c617549e6eb44b09a03d6a8250258d0e6bba7d31092d2
-EBUILD wine-staging-9999.ebuild 20355 BLAKE2B 1cff1a2621de3a421e1f8d96cc0c19fe4d8575987847092dad676bda6fdfd95ddddd4cafd0b84529632cc99f7329282a18b781d58e24cb26bf6b29394f0cddb3 SHA512 9d18cb888cecdc39d3ee78fbed3c653ee6fc06a2a4022bfad425888ca86b4e153c3f880fa275226b3b2ebbe29f2faadd86c4b2c6865328c696c06ba90df16bf2
+EBUILD wine-staging-5.18.ebuild 20436 BLAKE2B 522ef18a86d633267119e239986bd2fba09eedad6358fb5f441dde3d05ad95af673bb29940e45b17b90415650f7b6e6da6d6c66fa4a1a746c48ef5373b18723f SHA512 37e945cdd14814105bf8d395ea2a36c0e845352bfa11deda2226db61c42706113ca849c11f230b5607dc81cf694be583542026b9b5c9d23463c5dc009bd2b92f
+EBUILD wine-staging-9999.ebuild 20361 BLAKE2B 456f7127858924ffaebe4039771b105d44538030f43275e6aa74605a858a57640fcb24a8932d218db2a1d27fc62071608203ff2239832ee806efc07113c9aff4 SHA512 68cafcfb0a7a52e0a19049bef1e1740012d9ea84e7c4d9a9b53653312bb8257c4d71bafbeafd9ee7051799f266d0b8a8830214aa89945e3c025c75be74a32c28
 MISC metadata.xml 3813 BLAKE2B de077c2b962c962401ae0922aa8a244f08db7a5f0773d8d1466497dd3d2cd6e8b60186c5025f0806b49238266117035986df25c9c939fb9d9ec98ac7af5ebbf4 SHA512 edac5258e3d47f8c0285eb382cb5209996630bd65722c864a2b548dad09d72073d1c3e797fdda0f0cbf46bb87abbc5cbf1020fec2984b08c164d019a90fc4902
diff --git a/app-emulation/wine-staging/wine-staging-5.14.ebuild b/app-emulation/wine-staging/wine-staging-5.14.ebuild
deleted file mode 100644
index 674958ea886a..000000000000
--- a/app-emulation/wine-staging/wine-staging-5.14.ebuild
+++ /dev/null
@@ -1,621 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
-else
-	SRC_URI="${SRC_URI}
-	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	pipelight? ( staging )
-	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:5.1.0 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	staging? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${pn_live_val} ]]; then
-		if use staging; then
-			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
-			eerror "cannot be used to set the commit. Instead, you may use the"
-			eerror "environment variables:"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-			eerror
-			return 1
-		fi
-	fi
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environment variables:"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
-		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-		if use staging; then
-			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
-
-			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
-			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
-			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
-				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
-				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
-				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
-			fi
-		fi
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	if use staging; then
-		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
-		ewarn "Wine bugzilla should explicitly state that staging was used."
-
-		local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
-		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
-
-		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
-		ebegin "Running Wine-Staging patch installer"
-		(
-			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
-			cd "${STAGING_DIR}/patches"
-			source "${STAGING_DIR}/patches/patchinstall.sh"
-		)
-		eend $? || die "Failed to apply Wine-Staging patches"
-	fi
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gcrypt)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	use staging && myconf+=(
-		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
-	)
-
-	local PKG_CONFIG AR RANLIB
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	# set AR and RANLIB to make QA scripts happy; #483342
-	tc-export PKG_CONFIG AR RANLIB
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine register --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	else
-		if use staging; then
-			eselect wine deregister --staging ${P} || die
-		fi
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-staging/wine-staging-5.18.ebuild b/app-emulation/wine-staging/wine-staging-5.18.ebuild
new file mode 100644
index 000000000000..5b6a507ddc06
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-5.18.ebuild
@@ -0,0 +1,621 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+GWP_V="20200523"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	pipelight? ( staging )
+	test? ( abi_x86_32 )
+	themes? ( staging )
+	vaapi? ( staging )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	themes? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	)
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:5.1.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	staging? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${pn_live_val} ]]; then
+		if use staging; then
+			eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+			eerror "cannot be used to set the commit. Instead, you may use the"
+			eerror "environment variables:"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+			eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+			eerror
+			return 1
+		fi
+	fi
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environment variables:"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE"
+		eerror "  EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+		if use staging; then
+			local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+			EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
+
+			local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+				einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine"
+			fi
+		fi
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $? || die "Failed to apply Wine-Staging patches"
+	fi
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/etc/wine"
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gcrypt)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with unwind)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with themes gtk3)
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine register --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	else
+		if use staging; then
+			eselect wine deregister --staging ${P} || die
+		fi
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 2b9e5595802a..19d8082c2129 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -115,7 +115,7 @@ COMMON_DEPEND="
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
 	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
 	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 7fd2d04cafea..fb56879f1a22 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -4,16 +4,16 @@ DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c809562
 DIST wine-4.0.3.tar.xz 21680420 BLAKE2B a7caf4b82fa2594f77e31f29b2a3da59c08bb58f213268d61bdf48998345162bc36fbfc24db94d11cb07b6da347b3471e9d8976d9abfa0f76c183c0a519aa73e SHA512 a8fde0bcf600eaec56c3ce58c9aa992386784c85cf1c93aa84d50aff4c842b12a6b099c23391d3ad9a0059f3dc9069c0f8e00fad293305ba8a33afc70bf26e14
 DIST wine-5.0.1.tar.xz 22476496 BLAKE2B 8fd7729812c0144b6c9ec7f28ecc25bca5bc7801d9927346928f43fc46ca0be89ecb4caefb7a93cf2f3365e088d11e6bd53a028ea8cc9e170ef864ff63f21a5a SHA512 d9756f0a74417ea9e05d08a94ff29b83ebff3db3a3cbaa90979d5312754371ddfcab6bded73a246ef980252b908d8a26e93de2779b766c4bff92c91f8c315d98
 DIST wine-5.0.2.tar.xz 22484932 BLAKE2B 93253a86605b32dc8f7c79a16336643e6f84937094f8c96ea336289c2076a4d9f759fc1ad128f7b1a009da5eb2ed25cdc893da99e338093608bf5fc0ef1a85fc SHA512 9ff902ff929d9ac8c81843eea141c96446d26b14f70781a40a3ea1fdef5f412ca4c87374a5a3af9b42b52236159645e55d6e54f8b06178a4d210a72fb1d5358e
-DIST wine-5.14.tar.xz 23975804 BLAKE2B bc14b84f4044323cd65c8c0a715a09b296bb8ecad043062513c1a584a7b542bba9934e7563bec8e2d798c27f54683db37ffc227dd4cbf8e58f6ef1931b884c14 SHA512 21240d832497ba9a4313613ae27c21316ef383290dfcce81aebfbbf45edb7db6981739fe2ad42138b6df0a75a434d5aa8e4d87f9745f98c5f14000e1949ec342
 DIST wine-5.15.tar.xz 23999688 BLAKE2B af462d9e4c9fe5e364fd474bc17b6ea61b3390428762845291271811feab13cf6ccd39c8c5847b0cc922bd273d42227d95b871dfa04cf055560a3cff65349275 SHA512 90baf7df915cf1ce88022a4aebe4a6975b4b0defcc043a0c6738fefb9b853e0bfbcc645c39e33cdbb20673fab5df7561ab5b55e38a4e0a68907912a80e556ae3
 DIST wine-5.16.tar.xz 24025256 BLAKE2B 2008b428b16870ec6fa6a38866152d6b94a8a83b3d673557bab9c0c435897900bd0b4b7b73e685698cf7445a6c3eda12f88132d4f43e7b2108213ea947a76c09 SHA512 e198478bcf91106af82b37c87f42961a6c37aa80ea5cf05c268a36ba2ba73c23ac6864b183b927cf3c10d666d60b9f6877edccf7746eafe8968a36b5ce3740be
 DIST wine-5.17.tar.xz 24064512 BLAKE2B a84433ff7bb93a1f43c41f3106ff3f9c648631665100e8140340ab7d347daf6f2c3b54ea8177e1a2c2222574aa67264f5b576d99f6ef461548c74af48c62eb62 SHA512 05338036fa9b195d9cf8a84a1bcc03f35422d5f07744ec4430f20874601829be5904be10060353599cb0187728123f959ccc75e79f1ce1c47178ae9cd55ef696
+DIST wine-5.18.tar.xz 24160316 BLAKE2B 4f359b6e869707a514d2198d2b8ba810b8552ea53ff3f37cbc7c23b732152db0fa5c0c909d2c16a03f6b0ff122435c92f8a9b8b462577aa50a39b2dcfa7bcd05 SHA512 70565fbea61b78580ca86443fcb4c10c7814c1dffcfa49ee38746fef21a52a00f2e040d9d2515892fed4021e7868720cc22b650d18872656838e4610d4d4e823
 EBUILD wine-vanilla-4.0.3.ebuild 17273 BLAKE2B 31f49631a2eb96a0d20c98891c3ace1874bab916e8c75d6b6a003b7cf35b84f2014891c99defb1da6a77d2ce56353566e212282c4c4f607312245c6ec7e66803 SHA512 341f4e04041395f2b4a46dde9e46854e783936a4dbf0859946d4f7cb4b25072fb28f397b61c1916bb3aa9708d2e6a7a1e04ac157bd36f03be63b4d6180b9fb05
 EBUILD wine-vanilla-5.0.1.ebuild 17552 BLAKE2B 45440982bf2bfd3f6a2788af10b3a1712f4a4d82a0d4d0d139e9b9eb8f6c4af2b4a516e23a17ace87a6c6cf0e4cf9f3d1a0738b380203a77798b3fae437f1ed9 SHA512 2a92a7f78ac86289439a6bc507ec48a6f6a44a1d666f8a2b0705c4bb6fbd6b5d1f667347db96ea98ead1b5473b1cb7b0cb396446c84182165145842648795d5a
 EBUILD wine-vanilla-5.0.2.ebuild 17554 BLAKE2B 4fb5c237a16645195516f980e6a0bb96a9a263423b7489b8f425326a65ab5b06a75fc705862940220bc762dbaba5816eb340ef9f8427f08a2a6678fdb05b9429 SHA512 33011fd9ba031978b4351f8ff5b8eeffa692062df4a511fb105231e493742d55c0430a256551cc08cc8caf9c546de38eb0a4e1fe1ee98db0a391233b231a5d1c
-EBUILD wine-vanilla-5.14.ebuild 17595 BLAKE2B 2a15c7d11e0f43e08a947fd13c85754551f14186731f2236d82b73077c34b85cc03777eae2ac4d5343b624cf90c9dca2755025461ec6a6a7794e821184aa7e04 SHA512 47ec787a79a960d84d8439d0a2077dcbac4e5d8050aa95aef254646877596a041afe8f611aeb6d277c0cf8ade047538e20650f5a0d66c8e1c3fb4bdb38cc5655
 EBUILD wine-vanilla-5.15.ebuild 17595 BLAKE2B 2a15c7d11e0f43e08a947fd13c85754551f14186731f2236d82b73077c34b85cc03777eae2ac4d5343b624cf90c9dca2755025461ec6a6a7794e821184aa7e04 SHA512 47ec787a79a960d84d8439d0a2077dcbac4e5d8050aa95aef254646877596a041afe8f611aeb6d277c0cf8ade047538e20650f5a0d66c8e1c3fb4bdb38cc5655
 EBUILD wine-vanilla-5.16.ebuild 17595 BLAKE2B 2a15c7d11e0f43e08a947fd13c85754551f14186731f2236d82b73077c34b85cc03777eae2ac4d5343b624cf90c9dca2755025461ec6a6a7794e821184aa7e04 SHA512 47ec787a79a960d84d8439d0a2077dcbac4e5d8050aa95aef254646877596a041afe8f611aeb6d277c0cf8ade047538e20650f5a0d66c8e1c3fb4bdb38cc5655
 EBUILD wine-vanilla-5.17.ebuild 17595 BLAKE2B 2a15c7d11e0f43e08a947fd13c85754551f14186731f2236d82b73077c34b85cc03777eae2ac4d5343b624cf90c9dca2755025461ec6a6a7794e821184aa7e04 SHA512 47ec787a79a960d84d8439d0a2077dcbac4e5d8050aa95aef254646877596a041afe8f611aeb6d277c0cf8ade047538e20650f5a0d66c8e1c3fb4bdb38cc5655
-EBUILD wine-vanilla-9999.ebuild 17595 BLAKE2B 2a15c7d11e0f43e08a947fd13c85754551f14186731f2236d82b73077c34b85cc03777eae2ac4d5343b624cf90c9dca2755025461ec6a6a7794e821184aa7e04 SHA512 47ec787a79a960d84d8439d0a2077dcbac4e5d8050aa95aef254646877596a041afe8f611aeb6d277c0cf8ade047538e20650f5a0d66c8e1c3fb4bdb38cc5655
+EBUILD wine-vanilla-5.18.ebuild 17601 BLAKE2B efd932ad64172c60f13c39edb835e50f9ab3f1df117099292746b58830c5f55dd286f1ec461f2884ddb6ae247071590bdcc3a5e0e288af2384c02a41081ae643 SHA512 dd8c204bf708d837979d16ae85496494e01bc788f3194e7ca38c2e649a3c0c8d4062feca86deef942ef03ca614b4cb5af33527593af9873a702d221bce01af7b
+EBUILD wine-vanilla-9999.ebuild 17601 BLAKE2B efd932ad64172c60f13c39edb835e50f9ab3f1df117099292746b58830c5f55dd286f1ec461f2884ddb6ae247071590bdcc3a5e0e288af2384c02a41081ae643 SHA512 dd8c204bf708d837979d16ae85496494e01bc788f3194e7ca38c2e649a3c0c8d4062feca86deef942ef03ca614b4cb5af33527593af9873a702d221bce01af7b
 MISC metadata.xml 3141 BLAKE2B 07e1e174d2acc8cb6e5b2767daa8b70490f75102e95f17d8b55e416aa50c4cc47c163cf7b0d95140bab074213b490fdd0f1297703369d413d7c00486800b8232 SHA512 d5eec710aebe9ae4eab2bb4e9c14079884c60882f1cec1b3e42bcb95008acb29e26ce633b55518bd5bab4c581e1194bdb104f0e630c683360994bfd666b059e4
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.14.ebuild
deleted file mode 100644
index fed13ca5bb03..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-5.14.ebuild
+++ /dev/null
@@ -1,539 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20200523"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
-	X? ( truetype )
-	elibc_glibc? ( threads )
-	osmesa? ( opengl )
-	test? ( abi_x86_32 )
-	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	X? (
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	)
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
-	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
-	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
-	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
-	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
-	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/glu[${MULTILIB_USEDEP}]
-		virtual/opengl[${MULTILIB_USEDEP}]
-	)
-	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
-	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
-	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
-	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
-	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/wine-desktop-common
-	>app-eselect/eselect-wine-0.3
-	!app-emulation/wine:0
-	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
-	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:5.1.0 )
-	perl? (
-		dev-lang/perl
-		dev-perl/XML-Simple
-	)
-	pulseaudio? (
-		realtime? ( sys-auth/rtkit )
-	)
-	samba? ( >=net-fs/samba-3.0.25[winbind] )
-	selinux? ( sec-policy/selinux-wine )
-	udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6
-	virtual/pkgconfig
-	virtual/yacc
-	X? ( x11-base/xorg-proto )
-	prelink? ( sys-devel/prelink )
-	xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
-	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
-	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
-	DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	# GCC-specific bugs
-	if tc-is-gcc; then
-		# bug #549768
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
-			ebegin "Checking for gcc-5 ms_abi compiler bug"
-			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
-			# Run in subshell to prevent "Aborted" message
-			( "${T}"/pr66838 || false ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/549768"
-				eerror
-				return 1
-			fi
-		fi
-		# bug #574044
-		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
-			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
-			# Compile in subshell to prevent "Aborted" message
-			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
-			if ! eend $?; then
-				eerror "Wine cannot be built with this version of gcc-5.3"
-				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
-				eerror "or use gcc-config to select a different compiler version."
-				eerror "See https://bugs.gentoo.org/574044"
-				eerror
-				return 1
-			fi
-		fi
-	fi
-
-	# Ensure compiler support
-	if use abi_x86_64; then
-		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
-		# Compile in subshell to prevent "Aborted" message
-		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
-		if ! eend $?; then
-			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
-			eerror
-			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
-			eerror
-			return 1
-		fi
-	fi
-}
-
-wine_build_environment_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
-	if use abi_x86_64; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
-			eerror "You need gcc-4.4+ to compile 64-bit wine"
-			die
-		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
-			eerror "You need clang-3.8+ to compile 64-bit wine"
-			die
-		fi
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
-		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
-		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
-		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
-	fi
-	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
-		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
-			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
-			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
-			ewarn "See package.env in man 5 portage for more information on how to do this."
-			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
-		fi
-	fi
-
-	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
-		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
-		eerror "See https://bugs.gentoo.org/487864 for more details."
-		eerror
-		return 1
-	fi
-}
-
-wine_env_vcs_vars() {
-	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
-	local pn_live_val="${pn_live_var}"
-	eval pn_live_val='$'${pn_live_val}
-	if [[ ! -z ${EGIT_COMMIT} ]]; then
-		eerror "Commits must now be specified using the environmental variables"
-		eerror "EGIT_OVERRIDE_COMMIT_WINE"
-		eerror
-		return 1
-	fi
-}
-
-pkg_pretend() {
-	wine_build_environment_check || die
-
-	# Verify OSS support
-	if use oss && ! use kernel_FreeBSD; then
-		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from a"
-			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
-			eerror
-			die
-		fi
-	fi
-}
-
-pkg_setup() {
-	wine_build_environment_check || die
-	wine_env_vcs_vars || die
-
-	WINE_VARIANT="${PN#wine}-${PV}"
-	WINE_VARIANT="${WINE_VARIANT#-}"
-
-	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
-	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
-	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
-	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
-	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
-	MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
-	fi
-
-	default
-
-	l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
-	eapply_bin(){
-		local patch
-		for patch in ${PATCHES_BIN[@]}; do
-			patchbin --nogit < "${patch}" || die
-		done
-	}
-
-	local md5="$(md5sum server/protocol.def)"
-
-	default
-	eapply_bin
-	eautoreconf
-
-	# Modification of the server protocol requires regenerating the server requests
-	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
-		einfo "server/protocol.def was patched; running tools/make_requests"
-		tools/make_requests || die #432348
-	fi
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
-	if ! use run-exes; then
-		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
-	fi
-
-	# Edit wine.desktop to work for specific variant
-	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
-	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
-	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
-	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
-	# Duplicate manpages input files for wine64
-	local f
-	for f in loader/*.man.in; do
-		cp ${f} ${f/wine/wine64} || die
-	done
-	# Add wine64 manpages to Makefile
-	if use abi_x86_64; then
-		sed -i "/wine.man.in/i \
-			\\\twine64.man.in \\\\" loader/Makefile.in || die
-		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
-	fi
-
-	rm_man_file(){
-		local file="${1}"
-		loc=${2}
-		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
-	}
-
-	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
-	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
-	wine_compiler_check || die
-
-	export LDCONFIG=/bin/true
-	use custom-cflags || strip-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--prefix="${MY_PREFIX}"
-		--datarootdir="${MY_DATAROOTDIR}"
-		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
-		--includedir="${MY_INCLUDEDIR}"
-		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
-		--libexecdir="${MY_LIBEXECDIR}"
-		--localstatedir="${MY_LOCALSTATEDIR}"
-		--mandir="${MY_MANDIR}"
-		--sysconfdir="${EPREFIX}/etc/wine"
-		$(use_with alsa)
-		$(use_with capi)
-		$(use_with lcms cms)
-		$(use_with cups)
-		$(use_with ncurses curses)
-		$(use_with udisks dbus)
-		$(use_with faudio)
-		$(use_with fontconfig)
-		$(use_with ssl gnutls)
-		$(use_enable gecko mshtml)
-		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
-		$(use_with gssapi)
-		$(use_with gstreamer)
-		--without-hal
-		$(use_with jpeg)
-		$(use_with kerberos krb5)
-		$(use_with ldap)
-		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
-		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
-		$(use_with netapi)
-		$(use_with nls gettext)
-		$(use_with openal)
-		$(use_with opencl)
-		$(use_with opengl)
-		$(use_with osmesa)
-		$(use_with oss)
-		$(use_with pcap)
-		$(use_with png)
-		$(use_with pulseaudio pulse)
-		$(use_with threads pthread)
-		$(use_with scanner sane)
-		$(use_with sdl)
-		$(use_enable test tests)
-		$(use_with truetype freetype)
-		$(use_with udev)
-		$(use_with unwind)
-		$(use_with v4l v4l2)
-		$(use_with vkd3d)
-		$(use_with vulkan)
-		$(use_with X x)
-		$(use_with X xfixes)
-		$(use_with xcomposite)
-		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
-	)
-
-	local PKG_CONFIG
-	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
-	tc-export PKG_CONFIG
-
-	if use amd64; then
-		if [[ ${ABI} == amd64 ]]; then
-			myconf+=( --enable-win64 )
-		else
-			myconf+=( --disable-win64 )
-		fi
-
-		# Note: using --with-wine64 results in problems with multilib.eclass
-		# CC/LD hackery. We're using separate tools instead.
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-	emake depend
-}
-
-multilib_src_test() {
-	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
-	if [[ ${ABI} == x86 ]]; then
-		if [[ $(id -u) == 0 ]]; then
-			ewarn "Skipping tests since they cannot be run under the root user."
-			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
-			return
-		fi
-
-		WINEPREFIX="${T}/.wine-${ABI}" \
-		Xemake test
-	fi
-}
-
-multilib_src_install_all() {
-	local DOCS=( ANNOUNCE AUTHORS README )
-	add_locale_docs() {
-		local locale_doc="documentation/README.$1"
-		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
-	}
-	l10n_for_each_locale_do add_locale_docs
-
-	einstalldocs
-	prune_libtool_files --all
-
-	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
-		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
-			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
-	fi
-
-	# Remove wineconsole if neither backend is installed #551124
-	if ! use X && ! use ncurses; then
-		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
-		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
-		rm_wineconsole() {
-			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
-		}
-		multilib_foreach_abi rm_wineconsole
-	fi
-
-	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
-	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
-	# Avoid double prefix from dosym and make_wrapper
-	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
-	if use abi_x86_64 && ! use abi_x86_32; then
-		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
-		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
-	fi
-
-	# Failglob for binloops, shouldn't be necessary, but including to stay safe
-	eshopts_push -s failglob #615218
-	# Make wrappers for binaries for handling multiple variants
-	# Note: wrappers instead of symlinks because some are shell which use basename
-	local b
-	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
-		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
-	done
-	eshopts_pop
-}
-
-pkg_postinst() {
-	eselect wine register ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine register --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-
-	xdg_desktop_database_update
-
-	if ! use gecko; then
-		ewarn "Without Wine Gecko, wine prefixes will not have a default"
-		ewarn "implementation of iexplore.  Many older windows applications"
-		ewarn "rely upon the existence of an iexplore implementation, so"
-		ewarn "you will likely need to install an external one, like via winetricks"
-	fi
-	if ! use mono; then
-		ewarn "Without Wine Mono, wine prefixes will not have a default"
-		ewarn "implementation of .NET.  Many windows applications rely upon"
-		ewarn "the existence of a .NET implementation, so you will likely need"
-		ewarn "to install an external one, like via winetricks"
-	fi
-}
-
-pkg_prerm() {
-	eselect wine deregister ${P}
-	if [[ ${PN} == "wine-vanilla" ]]; then
-		eselect wine deregister --vanilla ${P} || die
-	fi
-
-	eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.18.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.18.ebuild
new file mode 100644
index 000000000000..f411a705130e
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.18.ebuild
@@ -0,0 +1,539 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(ver_cut 1)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
+
+GWP_V="20200523"
+PATCHDIR="${WORKDIR}/gentoo-wine-patches"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	X? ( truetype )
+	elibc_glibc? ( threads )
+	osmesa? ( opengl )
+	test? ( abi_x86_32 )
+	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	>app-eselect/eselect-wine-0.3
+	!app-emulation/wine:0
+	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+	gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
+	mono? ( app-emulation/wine-mono:5.1.0 )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-Simple
+	)
+	pulseaudio? (
+		realtime? ( sys-auth/rtkit )
+	)
+	samba? ( >=net-fs/samba-3.0.25[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	X? ( x11-base/xorg-proto )
+	prelink? ( sys-devel/prelink )
+	xinerama? ( x11-base/xorg-proto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+PATCHES=(
+	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
+	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
+)
+PATCHES_BIN=()
+
+# https://bugs.gentoo.org/show_bug.cgi?id=635222
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-util/patchbin"
+fi
+
+wine_compiler_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# GCC-specific bugs
+	if tc-is-gcc; then
+		# bug #549768
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+			ebegin "Checking for gcc-5 ms_abi compiler bug"
+			$(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
+			# Run in subshell to prevent "Aborted" message
+			( "${T}"/pr66838 || false ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/549768"
+				eerror
+				return 1
+			fi
+		fi
+		# bug #574044
+		if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+			ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+			# Compile in subshell to prevent "Aborted" message
+			( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
+			if ! eend $?; then
+				eerror "Wine cannot be built with this version of gcc-5.3"
+				eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+				eerror "or use gcc-config to select a different compiler version."
+				eerror "See https://bugs.gentoo.org/574044"
+				eerror
+				return 1
+			fi
+		fi
+	fi
+
+	# Ensure compiler support
+	if use abi_x86_64; then
+		ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+		# Compile in subshell to prevent "Aborted" message
+		( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+		if ! eend $?; then
+			eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+			eerror
+			eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+			eerror
+			return 1
+		fi
+	fi
+}
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	if use abi_x86_64; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+			eerror "You need gcc-4.4+ to compile 64-bit wine"
+			die
+		elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+			eerror "You need clang-3.8+ to compile 64-bit wine"
+			die
+		fi
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+		ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+		ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+		ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+	fi
+	if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+		if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+			ewarn "Compilation can hang with CFLAGS=\"-march=i686\".  You can temporarily work"
+			ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+			ewarn "See package.env in man 5 portage for more information on how to do this."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+		fi
+	fi
+
+	if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+wine_env_vcs_vars() {
+	local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+	local pn_live_val="${pn_live_var}"
+	eval pn_live_val='$'${pn_live_val}
+	if [[ ! -z ${EGIT_COMMIT} ]]; then
+		eerror "Commits must now be specified using the environmental variables"
+		eerror "EGIT_OVERRIDE_COMMIT_WINE"
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+
+	# Verify OSS support
+	if use oss && ! use kernel_FreeBSD; then
+		if ! has_version ">=media-sound/oss-4"; then
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+			eerror
+			die
+		fi
+	fi
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+	wine_env_vcs_vars || die
+
+	WINE_VARIANT="${PN#wine}-${PV}"
+	WINE_VARIANT="${WINE_VARIANT#-}"
+
+	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+	MY_DATADIR="${MY_DATAROOTDIR}"
+	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+	MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
+	fi
+
+	default
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+
+	eapply_bin(){
+		local patch
+		for patch in ${PATCHES_BIN[@]}; do
+			patchbin --nogit < "${patch}" || die
+		done
+	}
+
+	local md5="$(md5sum server/protocol.def)"
+
+	default
+	eapply_bin
+	eautoreconf
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# Edit wine.desktop to work for specific variant
+	sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+
+	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
+
+	# Duplicate manpages input files for wine64
+	local f
+	for f in loader/*.man.in; do
+		cp ${f} ${f/wine/wine64} || die
+	done
+	# Add wine64 manpages to Makefile
+	if use abi_x86_64; then
+		sed -i "/wine.man.in/i \
+			\\\twine64.man.in \\\\" loader/Makefile.in || die
+		sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
+\164\2/' loader/Makefile.in || die
+	fi
+
+	rm_man_file(){
+		local file="${1}"
+		loc=${2}
+		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
+	}
+
+	while read f; do
+		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
+}
+
+src_configure() {
+	wine_compiler_check || die
+
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--prefix="${MY_PREFIX}"
+		--datarootdir="${MY_DATAROOTDIR}"
+		--datadir="${MY_DATADIR}"
+		--docdir="${MY_DOCDIR}"
+		--includedir="${MY_INCLUDEDIR}"
+		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+		--libexecdir="${MY_LIBEXECDIR}"
+		--localstatedir="${MY_LOCALSTATEDIR}"
+		--mandir="${MY_MANDIR}"
+		--sysconfdir="${EPREFIX}/etc/wine"
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with faudio)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gssapi)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with kerberos krb5)
+		$(use_with ldap)
+		--without-mingw # linux LDFLAGS leak in mingw32: bug #685172
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with unwind)
+		$(use_with v4l v4l2)
+		$(use_with vkd3d)
+		$(use_with vulkan)
+		$(use_with X x)
+		$(use_with X xfixes)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	local PKG_CONFIG
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	tc-export PKG_CONFIG
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+			"${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+	fi
+
+	# Remove wineconsole if neither backend is installed #551124
+	if ! use X && ! use ncurses; then
+		rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+		rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+		rm_wineconsole() {
+			rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+		}
+		multilib_foreach_abi rm_wineconsole
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+	# Avoid double prefix from dosym and make_wrapper
+	MY_PREFIX=${MY_PREFIX#${EPREFIX}}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+		dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+	fi
+
+	# Failglob for binloops, shouldn't be necessary, but including to stay safe
+	eshopts_push -s failglob #615218
+	# Make wrappers for binaries for handling multiple variants
+	# Note: wrappers instead of symlinks because some are shell which use basename
+	local b
+	for b in "${ED%/}${MY_PREFIX}"/bin/*; do
+		make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+	done
+	eshopts_pop
+}
+
+pkg_postinst() {
+	eselect wine register ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine register --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+
+	xdg_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_prerm() {
+	eselect wine deregister ${P}
+	if [[ ${PN} == "wine-vanilla" ]]; then
+		eselect wine deregister --vanilla ${P} || die
+	fi
+
+	eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index fed13ca5bb03..f411a705130e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -95,7 +95,7 @@ COMMON_DEPEND="
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
+	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
 	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
 	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/xe-guest-utilities/Manifest b/app-emulation/xe-guest-utilities/Manifest
index 5282b08ba7f0..143238eb6c41 100644
--- a/app-emulation/xe-guest-utilities/Manifest
+++ b/app-emulation/xe-guest-utilities/Manifest
@@ -3,10 +3,6 @@ AUX xe-guest-utilities-5.6.100_p651-gentoo.patch 1004 BLAKE2B 03762683b5f0d8fa7a
 AUX xe-guest-utilities-5.6.100_p651-update-guest-attrs.patch 558 BLAKE2B 672698b5408aa6f07f0216afdd58aa6421fa3dad46d11e9d1699f90c0a9adceb36fd692ec55fa730bf4bc574850fcb74b73b713335719d7b5f9bda1855c1fb95 SHA512 84fb3d8f231e9597616770960e6c0bae8a4bed2d165dd185cccbd6b64d72836f2271d17574f8cbf524e39c0090a7d5a6f646959d214c38d3074e930fde2e9852
 AUX xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch 4599 BLAKE2B 6bcbd37c9386ed91635d23cbe43ea07ea321063d4c859688735303f14734b08b7895886f49791c000d64eff0e9b458f266a2c921e7c4fd202cd6d10fafcf1b76 SHA512 c9147d9a93b45d7300441b6c398c27bf3c38d39c0a6908f80a2708b8c26329c9b138522ca3b7ae7b4af2ace3b43ededda03dd39b9c8cafd31dbe32beae739690
 AUX xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch 2146 BLAKE2B 6875bf6ff48acd48cee2e590402cc546dd53df8a0861a6941b2de0d8c8caeb509f107d2b24c4e5c5d665890c15972c84c80c299eab718ec81131dc0594b6a5ec SHA512 93f5c1445b7ee449fedaed3c73a3f21b6adc0fad67d90e3bb35213749ae659ffae85dec3ddf43d4b5df21500e8b651651dd7496a2ffb8fa2d9091dd246c839de
-DIST xe-guest-utilities-5.6.0-595.src.rpm 454569 BLAKE2B ded5b93d74f268d069ddeebbf36aad7c098a8009e7f19e538343d71a5fe07e6a25e1089aba90540ae82511c2807dd792d3c3e59a40c1a55c9ef02ba1fe160154 SHA512 967f7708f074f4382c95a823e24dcf07c677e44d75a97e57078d63284584c85d2acf24e0a4b58ec2f26ba034ccaa1baad5793391f736fa4d72c04f7511bd78aa
-DIST xe-guest-utilities-6.1.0-1033.src.rpm 554621 BLAKE2B c76db0e9ab163f18c59687f33af3a91a75c602b3ff90a5e2a4405dd4797c31be215b599e01829d874c4f69e2bb1a675d8d017c09cdfa8818add167d886c3fbf1 SHA512 65ab85974fb5e73619aa3bac22c861cf989d6256e4f856da3c14767a0e8fe8f1c34713db32166c6f901c589e61f2fcc3c285bd8eded4925daa829e4adb07e9e2
 DIST xe-guest-utilities-6.2.0-1120.src.rpm 566881 BLAKE2B b2c727c551996f218c021d509ba1841baa07c70cbaf7660c0ec9cbeae696c4e77921d8ca12e8dfdf934a6894058c62ee6bf4e86bd1918e304cc76ee28d396fad SHA512 b945b3bf8175816b41b3a07a7dd8f0d9d2fdb1a7144448a5bb7fb4b6729736c67cea88fd45031df41abdd99416addb17fa1ee9cfe1fc76acf610cde3b3213880
-EBUILD xe-guest-utilities-5.6.0_p595.ebuild 1490 BLAKE2B 807f9be5ceac0345e4f7e92732537a12231cb6f9dbd22a2116c47738b7e130df8bfb69412ef2c512ecb1038d8f778a9f9499bf98ba2fcdc885c726bb8d37ff9b SHA512 1a95d5c3ba95b6006b8198442570b10673d47ea87073593ab79b096f9b8d89328bc9aee80d2e16ce595b01c571d12aad723d4b0d85a8003d128995a456dab952
-EBUILD xe-guest-utilities-6.1.0_p1033.ebuild 1498 BLAKE2B ed8304c90962627d9c078d9d00a7b5b6f08c17efb4a8da9f3fa12d70985fb1e8807ae59c310d616347fac7be6bfeb8c105a3996ac1d9d7f3f9454ce2eab7e62f SHA512 7445f259f022a37e8a44989f51a4c78214f6909ffb2eb70cbf0b35cc0ccab363227c10736915c0d56884d5ec4b22201cc824f8de7dd8877c914e7b5f1d68cddd
 EBUILD xe-guest-utilities-6.2.0_p1120.ebuild 1503 BLAKE2B ad1bfc862229957baa6f3253cc534bfcea7e98b84c11af707445691d59070ecec3ed64323ef198353f21cb30065a7b471844537f04e65b63e0e61387aeca1489 SHA512 dfeffca4ae4c29234163d461efd1c1d20c20f9ff1545283e6966878f2a4edeaffabde845b7f040be0b535f200bfab05fadd51a89115a6dfdb72d77aa4201ca59
 MISC metadata.xml 776 BLAKE2B 549a89776c54711d874588740a6f6e425ee80f53aab06143337acfe1627b012aa6090b798875ea16c17f312596b01a6a6129e914b28de7b0cfcc23b032099e9f SHA512 de26a707e9e20f25c2a4115f6c1b960bf9c7a228ceec45ce112d06b622c5bcbf6cd84599357e836b5daa91156e10a6af24f2fb93ced24c25c89f9ad7a4579b60
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild
deleted file mode 100644
index 9a057370c6ba..000000000000
--- a/app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils rpm linux-info
-DESCRIPTION="XenServer Virtual Machine Tools"
-HOMEPAGE="https://www.citrix.com/"
-PV_BASE=${PV/_*}
-PV_FULL=${PV/_p/-}
-SRC_URI="http://updates.vmd.citrix.com/XenServer/${PV_BASE}/rhel4x/SRPMS/xe-guest-utilities-${PV_FULL}.src.rpm"
-LICENSE="LGPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="xenstore"
-DEPEND="app-arch/rpm2targz"
-RDEPEND="
-	!xenstore? ( app-emulation/xen-tools )
-	xenstore? ( !app-emulation/xen-tools )"
-S=${WORKDIR}
-CONFIG_CHECK="~XEN_COMPAT_XENFS ~XENFS"
-QA_PREBUILT="usr/bin/xenstore* usr/bin/xeninfo"
-
-src_unpack() {
-	rpm_src_unpack ${A}
-	# Upstream includes xenstore-sources.tar.bz2
-	# but it is NOT the complete source :-(
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.6.100_p651-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-5.6.100_p651-update-guest-attrs.patch
-}
-
-src_install() {
-	newinitd "${FILESDIR}/xe-daemon.initd" xe-daemon
-	dosbin xe-daemon
-	dosbin xe-linux-distribution
-	dosbin xe-update-guest-attrs
-	insinto /lib/udev/rules.d
-	newins xen-vcpu-hotplug.rules 10-xen-vcpu-hotplug.rules
-
-	if use xenstore; then
-		dobin usr/bin/xeninfo
-		dobin usr/bin/xenstore
-		dobin usr/bin/xenstore-*
-	fi
-}
-
-pkg_postinst() {
-	if [ ! -e /etc/runlevels/boot/xe-daemon ]; then
-		elog "To start the xe-daemon automatically by default"
-		elog "you should add it to the boot runlevel :"
-		elog "'rc-update add xe-daemon boot'"
-		elog
-	fi
-}
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild
deleted file mode 100644
index c8993996dc9b..000000000000
--- a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils rpm linux-info
-DESCRIPTION="XenServer Virtual Machine Tools"
-HOMEPAGE="https://www.citrix.com/"
-PV_BASE=${PV/_*}
-PV_FULL=${PV/_p/-}
-SRC_URI="http://updates.vmd.citrix.com/XenServer/${PV_BASE}/rhel4x/SRPMS/xe-guest-utilities-${PV_FULL}.src.rpm"
-LICENSE="LGPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="xenstore"
-DEPEND="app-arch/rpm2targz"
-RDEPEND="
-	!xenstore? ( app-emulation/xen-tools )
-	xenstore? ( !app-emulation/xen-tools )"
-S=${WORKDIR}
-CONFIG_CHECK="~XEN_COMPAT_XENFS ~XENFS"
-QA_PREBUILT="usr/bin/xenstore* usr/bin/xeninfo"
-
-src_unpack() {
-	rpm_src_unpack ${A}
-	# Upstream includes xenstore-sources.tar.bz2
-	# but it is NOT the complete source :-(
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Guest-Attributes.patch
-	epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Linux-Distribution.patch
-}
-
-src_install() {
-	newinitd "${FILESDIR}/xe-daemon.initd" xe-daemon
-	dosbin xe-daemon
-	dosbin xe-linux-distribution
-	dosbin xe-update-guest-attrs
-	insinto /lib/udev/rules.d
-	newins xen-vcpu-hotplug.rules 10-xen-vcpu-hotplug.rules
-
-	if use xenstore; then
-		dobin usr/bin/xeninfo
-		dobin usr/bin/xenstore
-		dobin usr/bin/xenstore-*
-	fi
-}
-
-pkg_postinst() {
-	if [ ! -e /etc/runlevels/boot/xe-daemon ]; then
-		elog "To start the xe-daemon automatically by default"
-		elog "you should add it to the boot runlevel :"
-		elog "'rc-update add xe-daemon boot'"
-		elog
-	fi
-}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index e6e70fe028ad..65b85da91c5f 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -20,12 +20,14 @@ DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b9
 DIST seabios-1.12.1.tar.gz 613450 BLAKE2B cb926b650c41a9962db407945cb5b6558079b061bd61f32ea56aedf0d37a00d10ad4434acbe717ffbc0dd1d1c0767304af8e640a53b0fc3784969dfa1590f681 SHA512 58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0
 DIST seabios-1.13.0.tar.gz 620952 BLAKE2B 460a7dd2b2775b981bbd890ed0a50fe905794c68b0b895799667dd1378bb84125712330c2f6945112709d42cfb7b01196c7fff99051e44b6211d47d19531cfae SHA512 7f158badf7deecc2998eab2a08f3615dfe5a7c0a51323f7b4568a4d1280935bc32bb466c8226d87d2ca7e13f9f117ff0092befcc0699bc31c5018e84754e8393
 DIST xen-4.13.1-upstream-patches-2.tar.xz 53744 BLAKE2B 769b5b8022f7db66f677d8107c6473606376718bffeac7eba09c4270f4005811f472fb9ed2a2804260e0486228edbadfcf8f81bf1dae6d68df37da213d281390 SHA512 b07c865b96c6f48b9d0b4e4c2f3ec19f4dc44884f4024e440a3e537f594f9f5edd6edf805bdefc82e5f1f2520f35f940b64c158972cbf5bfdc8fb2ca7a1b0ac1
+DIST xen-4.13.1-upstream-patches-3.tar.xz 87056 BLAKE2B 01d7133b8f7e3c9a42b9771dcb7739777f79f229941114cce70ba2897dd52bf53f08de35602a0b40a120fc155c274dbf91e107856f4afdae2c4f7b4bc0a67cdd SHA512 d67e9ddfbf27dc5a23a77679b1b2524a49c2aec3ff9eb3472f9e075893d87401f8e99707b0652744eb4af7a3ed9a815c3925de49995bcd7c82d97c13a69b5309
 DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
-DIST xen-4.14.0-upstream-patches-0.tar.xz 6872 BLAKE2B 958ad668362c9c02af39f2a02cde2baa9b9fc8853116c390f43a77bb17c649bfc6a4b51db5cbe564a8c3c440ce736603e44b97f45c50a7836c9a43bfb0d2255a SHA512 a30d9708e64e1405f837b14c1e5a0e28fcb9e7a177c822570e25d0ed118a9c58c380f4ed64a40bf970a9389baf9848e52f7d161efe922b883ee990c8029e7e1f
+DIST xen-4.14.0-upstream-patches-1.tar.xz 45360 BLAKE2B 0f72a2cc3d18557b86a2a83f97e4141be46a20e3ba59ccc881a34a4408988eba9827e3b927bc07aba9678123d783303e7d47d789e57323a7f6691d718c019dc8 SHA512 3d5093e4367d27e7f6e8d4cc31841a5c80cc3fb870d6cb32131d064e16cbb559e9a783c70eec1ce13c960b3e2a8d5e23e18d26b936bc418b434df3bb801d3e4f
 DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0
 DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d
 DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B e0da49b39fbc6b689db47e40a4fbb4f6568644fe192b114cce01b0406cba4bf23339ad1bf39b972f895df004916827b6e774f97fc079aeb8ac436763efda5fc3 SHA512 5b7959af4ed30edd2526698ab60a86353e35d9dc48dc941b6df7659a7c4904260461e0decbd8d788542bd69384736f2175861d4943c3738618d20788b19ea9b1
 DIST xen-security-patches-28.tar.xz 1580 BLAKE2B c304894801b37259508582fc6947e26c0b8665e982d91de86c16efd5eaecd6c9bb19570534642d39e81175fe58baccf576990a481f40f8848692d3465ad17a85 SHA512 b442b5568e76e0f2a5cfc91063515b96347f8b30f6101a81536b78edecc400861fd99281e1994bc6626bff28ece3df8f8306575c8abbb2cddaf3a6d3542c0b2f
 EBUILD xen-tools-4.13.1-r3.ebuild 15978 BLAKE2B ce60f87f9e7aa7f200f0f3d0de0f5fe21f3548d60706386fce233eb76fd451d76820b1f9275768efe6845bb6cc94d528050adcf345aed82129b69a403ad665d9 SHA512 cf081bf356145d7e7d0dbbe773b2f3eeb1ebc4e3d81c7682a7f19db98384312aa13bade6c9f676e5be1ef46b6746b5af4d27b2418ae027ec1070150fc2154aac
-EBUILD xen-tools-4.14.0-r1.ebuild 16144 BLAKE2B f777ef83bc507aef362df2b13047777570368ca3e3524c228bf8efde53d1bc0e45ba0f7bb1cacb8f25029938312e7214a25836d2b37747b781747df850330eb5 SHA512 cf6b9ee685bd97554ee6dc3ae99fda02fabfef6520004495d8d5e3ed00b4ad66cc95b0ae859a433ab1566d91fa7806aacca75a4907e08cd0df61cef53a769da4
+EBUILD xen-tools-4.13.1-r4.ebuild 15980 BLAKE2B ff890853a05e02081c95fdaca2b4db15f84c2f63ded48f48c2abf1c1c5afb5a6a1d48a9b6e01b3bef4384ad0c4d821e8daff09248086ee0c531faf51ec05d299 SHA512 17a73d584c5096b78fe996c3340cf6b579cf95960be6ad1b59017d6611ea2232d7a4738a3ee9900557f70fed123369da5050fd3a08a1f3a04531e568a16beff4
+EBUILD xen-tools-4.14.0-r2.ebuild 16144 BLAKE2B 91debac0bc70fed709ddba0d3791c2685fff2e362fa36e345ace02cf566c34b2ac41d2a995a0e29fc3d1af755aacb93abdbc937b2a3b6e8423f58515bdb357d6 SHA512 98e6cc7ea5c7f0652504affedf2f5e65599e2528e8a1a45f98edeab06568c61e3178a7de04e3c92cc3b61c68c4417c9f6b567b892c87215a25f57cfb05b0dc76
 MISC metadata.xml 1662 BLAKE2B 1b243436df5eb36e30f73b36db45d859aa03f7e9d3360fcdb91c35e3a1c00f1217e5e7cd1461b65d9da2883f5e8ca969b958f9b2160def4c1f15347c1887b2cd SHA512 d6cdf124c7767727f7c8d16a2dc0f85a7213db21f8d1595f7d8899c7cb81d47849fd05759ccfc460630c32917e64ea31ef6384dc050ab0eb392f571b12db68ed
diff --git a/app-emulation/xen-tools/xen-tools-4.13.1-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.13.1-r4.ebuild
new file mode 100644
index 000000000000..75da75730f98
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.13.1-r4.ebuild
@@ -0,0 +1,506 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=3
+	SECURITY_VER=28
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=21
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=
+
+	SEABIOS_VER="1.12.1"
+	EDK2_COMMIT="20d2e5a125e34fc8501026613a71549b2a1a3e54"
+	EDK2_OPENSSL_VERSION="1_1_1b"
+	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+	IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6"
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ipxe? ( rombios )
+	ovmf? ( hvm )
+	pygrub? ( python )
+	rombios? ( hvm )
+	system-ipxe? ( rombios )
+	?? ( ipxe system-ipxe )
+	?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.11
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
+	x86? ( sys-devel/dev86
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		sys-power/iasl )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-power/iasl
+		system-seabios? ( sys-firmware/seabios )
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		x11-libs/pixman
+		sdl? (
+			media-libs/libsdl[X]
+			media-libs/libsdl2[X]
+		)
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )
+	python? ( >=dev-lang/swig-4.0.0 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/elf2dmp
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-edid
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/edk2-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+	fi
+
+	# ipxe
+	if use ipxe; then
+		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+
+		# gcc 10
+		cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die
+		echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		-i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable api xenapi) \
+		$(use_enable ipxe) \
+		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
+		$(use_enable ocaml ocamltools) \
+		$(use_enable ovmf) \
+		$(use_enable pam) \
+		$(use_enable rombios) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	tc-ld-disable-gold # Bug 669570
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"/tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+
+	if use python; then
+		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
+		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
+	fi
+
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config system at boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.14.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.14.0-r1.ebuild
deleted file mode 100644
index 7cf7cb407e7c..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.14.0-r1.ebuild
+++ /dev/null
@@ -1,511 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE='ncurses,xml,threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=28
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=22
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=
-
-	SEABIOS_VER="1.13.0"
-	EDK2_COMMIT="20d2e5a125e34fc8501026613a71549b2a1a3e54"
-	EDK2_OPENSSL_VERSION="1_1_1b"
-	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6"
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	[[ -n ${OVMF_VER} ]] && \
-		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
-	https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
-		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
-		${OVMF_PATCHSET_URI} )
-	${UPSTREAM_PATCHSET_URI}
-	${SECURITY_PATCHSET_URI}
-	${GENTOO_PATCHSET_URI}"
-
-	S="${WORKDIR}/xen-${MY_PV}"
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://www.xenproject.org"
-DOCS=( README )
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	sys-apps/pciutils
-	dev-libs/lzo:2
-	dev-libs/glib:2
-	dev-libs/yajl
-	dev-libs/libaio
-	dev-libs/libgcrypt:0
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.11
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
-	')
-	x86? ( sys-devel/dev86
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		sys-power/iasl )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-power/iasl
-		system-seabios? ( sys-firmware/seabios )
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	dev-lang/perl
-	app-misc/pax-utils
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/pandoc
-		$(python_gen_cond_dep '
-			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
-		')
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-	)
-	hvm? ( x11-base/xorg-proto )
-	qemu? (
-		app-arch/snappy:=
-		x11-libs/pixman
-		sdl? (
-			media-libs/libsdl[X]
-			media-libs/libsdl2[X]
-		)
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		>=dev-lang/ocaml-4 )
-	python? ( >=dev-lang/swig-4.0.0 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/elf2dmp
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-edid
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	local i
-
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply Xen Upstream patch set"
-		eapply "${WORKDIR}"/patches-upstream
-	fi
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		EPATCH_SUFFIX="patch"
-		EPATCH_FORCE="yes"
-
-		source "${WORKDIR}"/patches-security/${PV}.conf || die
-
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-
-		# apply qemu-xen/upstream patches
-		pushd "${S}"/tools/qemu-xen/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUU}; do
-			eapply "${WORKDIR}"/patches-security/qemuu/$i
-		done
-		popd > /dev/null
-
-		# apply qemu-traditional patches
-		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
-		for i in ${XEN_SECURITY_QEMUT}; do
-			eapply "${WORKDIR}"/patches-security/qemut/$i
-		done
-		popd > /dev/null
-	fi
-
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	# Gentoo's patchset
-	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
-		einfo "Try to apply Gentoo specific patch set"
-		source "${FILESDIR}"/gentoo-patches.conf || die
-		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
-		for i in ${!_gpv}; do
-			eapply "${WORKDIR}"/patches-gentoo/$i
-		done
-	fi
-
-	# Ovmf's patchset
-	if use ovmf; then
-		if [[ -n ${OVMF_VER} ]];then
-			einfo "Try to apply Ovmf patch set"
-			pushd "${WORKDIR}"/edk2-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-	fi
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
-
-		# gcc 10
-		cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die
-		echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die
-	fi
-
-	# gcc 10
-	# libxlu_pci.c:32:18: error: 'func' may be used uninitialized in this function
-	sed -e '/CFLAGS/s/Werror/Wno-error/g' \
-		-i tools/libxl/Makefile || die
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
-	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-		-i tools/firmware/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || die
-
-	default
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--localstatedir=${EPREFIX}/var \
-		--disable-werror \
-		--disable-xen \
-		--enable-tools \
-		--enable-docs \
-		$(use_enable api xenapi) \
-		$(use_enable ipxe) \
-		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
-		$(use_enable ocaml ocamltools) \
-		$(use_enable ovmf) \
-		$(use_enable pam) \
-		$(use_enable rombios) \
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
-		"
-
-	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
-	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
-	use amd64 && myconf+=" $(use_enable qemu-traditional)"
-	tc-ld-disable-gold # Bug 669570
-	econf ${myconf}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"/tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-
-	if use python; then
-		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
-		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
-	fi
-
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config system at boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.14.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.14.0-r2.ebuild
new file mode 100644
index 000000000000..6e50b8d46e37
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.14.0-r2.ebuild
@@ -0,0 +1,511 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=1
+	SECURITY_VER=28
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=22
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=
+
+	SEABIOS_VER="1.13.0"
+	EDK2_COMMIT="20d2e5a125e34fc8501026613a71549b2a1a3e54"
+	EDK2_OPENSSL_VERSION="1_1_1b"
+	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+	IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6"
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ipxe? ( rombios )
+	ovmf? ( hvm )
+	pygrub? ( python )
+	rombios? ( hvm )
+	system-ipxe? ( rombios )
+	?? ( ipxe system-ipxe )
+	?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.11
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
+	x86? ( sys-devel/dev86
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		sys-power/iasl )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-power/iasl
+		system-seabios? ( sys-firmware/seabios )
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-base/xorg-proto )
+	qemu? (
+		app-arch/snappy:=
+		x11-libs/pixman
+		sdl? (
+			media-libs/libsdl[X]
+			media-libs/libsdl2[X]
+		)
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )
+	python? ( >=dev-lang/swig-4.0.0 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/hppa-firmware.img
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/elf2dmp
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-edid
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-keymap
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-pr-helper
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/s390-netboot.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			eapply "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			eapply "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			eapply "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/edk2-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+	fi
+
+	# ipxe
+	if use ipxe; then
+		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+
+		# gcc 10
+		cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die
+		echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die
+	fi
+
+	# gcc 10
+	# libxlu_pci.c:32:18: error: 'func' may be used uninitialized in this function
+	sed -e '/CFLAGS/s/Werror/Wno-error/g' \
+		-i tools/libxl/Makefile || die
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		-i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable api xenapi) \
+		$(use_enable ipxe) \
+		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
+		$(use_enable ocaml ocamltools) \
+		$(use_enable ovmf) \
+		$(use_enable pam) \
+		$(use_enable rombios) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	tc-ld-disable-gold # Bug 669570
+	econf ${myconf}
+}
+
+src_compile() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"/tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+
+	if use python; then
+		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
+		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
+	fi
+
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config system at boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 7bc05c5b22b5..76ab23eabc43 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,9 +1,11 @@
 AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3f1c0d4bf9733189808f5e1c47f1d90d1784f17fa52ca1626972c81d20c5e1ee3d42d082cdefcf67eb8dc SHA512 17208dc107f4ae4c5ec226c2ac05126817134fb6084cd8923204dc1b014e645e12c34cd11296319127e595ccbf17747931e9df78218bf49814f66e3cc6a789fd
 AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0
 DIST xen-4.13.1-upstream-patches-2.tar.xz 53744 BLAKE2B 769b5b8022f7db66f677d8107c6473606376718bffeac7eba09c4270f4005811f472fb9ed2a2804260e0486228edbadfcf8f81bf1dae6d68df37da213d281390 SHA512 b07c865b96c6f48b9d0b4e4c2f3ec19f4dc44884f4024e440a3e537f594f9f5edd6edf805bdefc82e5f1f2520f35f940b64c158972cbf5bfdc8fb2ca7a1b0ac1
+DIST xen-4.13.1-upstream-patches-3.tar.xz 87056 BLAKE2B 01d7133b8f7e3c9a42b9771dcb7739777f79f229941114cce70ba2897dd52bf53f08de35602a0b40a120fc155c274dbf91e107856f4afdae2c4f7b4bc0a67cdd SHA512 d67e9ddfbf27dc5a23a77679b1b2524a49c2aec3ff9eb3472f9e075893d87401f8e99707b0652744eb4af7a3ed9a815c3925de49995bcd7c82d97c13a69b5309
 DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
-DIST xen-4.14.0-upstream-patches-0.tar.xz 6872 BLAKE2B 958ad668362c9c02af39f2a02cde2baa9b9fc8853116c390f43a77bb17c649bfc6a4b51db5cbe564a8c3c440ce736603e44b97f45c50a7836c9a43bfb0d2255a SHA512 a30d9708e64e1405f837b14c1e5a0e28fcb9e7a177c822570e25d0ed118a9c58c380f4ed64a40bf970a9389baf9848e52f7d161efe922b883ee990c8029e7e1f
+DIST xen-4.14.0-upstream-patches-1.tar.xz 45360 BLAKE2B 0f72a2cc3d18557b86a2a83f97e4141be46a20e3ba59ccc881a34a4408988eba9827e3b927bc07aba9678123d783303e7d47d789e57323a7f6691d718c019dc8 SHA512 3d5093e4367d27e7f6e8d4cc31841a5c80cc3fb870d6cb32131d064e16cbb559e9a783c70eec1ce13c960b3e2a8d5e23e18d26b936bc418b434df3bb801d3e4f
 DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0
 EBUILD xen-4.13.1-r3.ebuild 4444 BLAKE2B a03adf601033f94e9c6169aa8a109465d8bd1daa4945280a0defdf41b90411123598c626a3cd4b0c6ab22a539c26389f389f1483a1606d8fc8dc35a9cdac929d SHA512 ea5915fe2d39b3d471e0de1b29d0e6a41b1a63a1858be7122db5fc8bc71c310ff13a91b63969d009d33bbbe3d85146df22c151b251bedbbe6971bf08ae3fcfe5
-EBUILD xen-4.14.0-r1.ebuild 4444 BLAKE2B 3d1205af68af583189ba0c790d6fb05875f8a842b1d38845a9f5713e971e5507d3fd4e2f2452eaa043d13f26cb87c3825aea3bdf1c430f8a550d9d45b143c78a SHA512 e616c8f5d90c8c441a909f0b33e1d438dbf52cf298a69b91b34ea9c963f4f2bb7c397cd4168ef487d24bb2beea883b4ff4eacf7f65fd0ae96576be5128befbed
+EBUILD xen-4.13.1-r4.ebuild 4445 BLAKE2B 309a956271494090acd7f1d687fe1056f95c34a50ada3dfbee165fe1f3a935aa3a7c92e13d778a425bd587497879170efa73b65c8029ab08cb4716da13cf641b SHA512 f2efcbd096cdd92246a5d8c4d877b7ec17c84ae27f6822c3f62ba43087cb975a395a30753eeb920f6339bd5c1c9c64d2d50e254f9cb10d8db898df87c43c275d
+EBUILD xen-4.14.0-r2.ebuild 4444 BLAKE2B 297aa1e2c31336165a71043ac7537a640a2233606b0f725d889548f32fc305f3a335230d8a52fabd841ebb2ef404565983f21855b05ba0f9d2136d3da7647a6b SHA512 d9e933fbaed725d038a23409470e28a606162797bec6708089f0d34347396e3b4003214052c863de3754c586734823e99302885698258b23279163bd1f1cdac7
 MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
diff --git a/app-emulation/xen/xen-4.13.1-r4.ebuild b/app-emulation/xen/xen-4.13.1-r4.ebuild
new file mode 100644
index 000000000000..5bde79cb7c82
--- /dev/null
+++ b/app-emulation/xen/xen-4.13.1-r4.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=3
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.11-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	# remove flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+	ewarn
+	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+	ewarn "to work fine."
+	ewarn
+	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+	ewarn
+	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-emulation/xen/xen-4.14.0-r1.ebuild b/app-emulation/xen/xen-4.14.0-r1.ebuild
deleted file mode 100644
index 34ea5e60db56..000000000000
--- a/app-emulation/xen/xen-4.14.0-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ $PV == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=0
-	SECURITY_VER=
-	GENTOO_VER=
-
-	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
-		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-	[[ -n ${SECURITY_VER} ]] && \
-		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
-	[[ -n ${GENTOO_VER} ]] && \
-		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
-	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
-		${SECURITY_PATCHSET_URI}
-		${GENTOO_PATCHSET_URI}"
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://www.xenproject.org"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug efi flask"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-REQUIRED_USE="arm? ( debug )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-
-	if use flask ; then
-		export "XSM_ENABLE=y"
-		export "FLASK_ENABLE=y"
-	fi
-}
-
-src_prepare() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
-
-	# Security patchset
-	if [[ -n ${SECURITY_VER} ]]; then
-	einfo "Try to apply Xen Security patch set"
-		# apply main xen patches
-		# Two parallel systems, both work side by side
-		# Over time they may concdense into one. This will suffice for now
-		source "${WORKDIR}"/patches-security/${PV}.conf
-
-		local i
-		for i in ${XEN_SECURITY_MAIN}; do
-			eapply "${WORKDIR}"/patches-security/xen/$i
-		done
-	fi
-
-	# Gentoo's patchset
-	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
-
-	eapply "${FILESDIR}"/${PN}-4.14-efi.patch
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="/boot"
-	fi
-
-	default
-}
-
-src_configure() {
-	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
-
-	use debug && myopt="${myopt} debug=y"
-
-	# remove flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-
-	tc-ld-disable-gold # Bug 700374
-}
-
-src_compile() {
-	# Send raw LDFLAGS so that --as-needed works
-	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
-}
-
-src_install() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-
-	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
-
-	elog "You can optionally block the installation of /boot/xen-syms by an entry"
-	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
-	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
-
-	ewarn
-	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
-	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
-	ewarn "to work fine."
-	ewarn
-	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
-	ewarn
-	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
-}
diff --git a/app-emulation/xen/xen-4.14.0-r2.ebuild b/app-emulation/xen/xen-4.14.0-r2.ebuild
new file mode 100644
index 000000000000..2738d77fd9d3
--- /dev/null
+++ b/app-emulation/xen/xen-4.14.0-r2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=1
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	[[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			eapply "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+	eapply "${FILESDIR}"/${PN}-4.14-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	# remove flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+	ewarn
+	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+	ewarn "to work fine."
+	ewarn
+	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+	ewarn
+	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 62573172d07c..6be7b37c5334 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 10b056559f68..bca4d1c7395c 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1,5 +1,5 @@
 DIST eselect-repository-7.tar.gz 6768 BLAKE2B f648b880ab188b5beb21161dd011d8cea0bc9dd124d524d747a1867a37f334667363be9c0ad9f04275aa1534b904a519d7551c25ea547ae2acff625382c35dbd SHA512 87569158dce3acfdd81a469387fe1a7a7c268cae2e15cfdb12d8377984be5feb674c9b385f0171d27dbe8c2066ae98b2c9a74214340e85380cba173ba26d6f0f
 DIST eselect-repository-8.tar.gz 6774 BLAKE2B d22c2befc744e21b7619a490e9c41f1052c4077135ba5247ea9558f15f7dc5c06642dd934c41ad8cb3bedb40398876ea9d508276bde6f214fe06d5f80b19911b SHA512 b1fd13e3bfa323dea7fec53a33865352545a070df472c9db0b2901945a795833eb8a2b7b264005d94fe6e92dce57414a7e995157d28c8d26048bedcbf42adf96
-EBUILD eselect-repository-7.ebuild 990 BLAKE2B f1c0d89f71b66b999704bd09ef61d5bb63a0ebfcfa62ef2855b7b5228e8f9538cfcd6a208fa532fa167fc1ea86c69bbc544228364f5c8b5805508df3be8c21b4 SHA512 f69f5704b42ad027996f1b3468a1883331f0f1c287af39e7023dc2985c956e98cb185eebcb52d5942a5f9330049de870db7eca1025c801bd5e0be2dcba8eef87
+EBUILD eselect-repository-7.ebuild 989 BLAKE2B f36d97d72eac56bf47369477b618bcd9d0b9e2a65b3ceba0dc72ffcb4ced58f9f02eca7b900c7495cb58e961328657b1fcb6620228ac60091d02bc7eff80f01d SHA512 780e12566c8b1454330a229f63665ff45bf28d04f4fda62392c2d5a7ad77b89c9beda0f2513032cf9b62fa0e564c350f801b6a0572d4484d806e4274f61ff624
 EBUILD eselect-repository-8.ebuild 993 BLAKE2B 9756d93308ccbc15958460218cbd8d11f301826cf0b729765e2cebef79a3dc2dff25de05c4093b42ccabfee092832ad011d30d983f3e2433a689bf9a6626ae31 SHA512 667d0473b210a6459c50db305e32b562938e51dec09e3a1f2517d4f9ee0ce239d9fab6f2ae82c0904025ef50b7616f585dd51b437fbb47845d8bff92c9d20f6d
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-7.ebuild b/app-eselect/eselect-repository/eselect-repository-7.ebuild
index b2093824acb7..33798b53e492 100644
--- a/app-eselect/eselect-repository/eselect-repository-7.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index b9cbf3abdcd7..1eb5756990bf 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/libewf/Manifest b/app-forensics/libewf/Manifest
index 4d8a1c2463e1..d36c95c6e04f 100644
--- a/app-forensics/libewf/Manifest
+++ b/app-forensics/libewf/Manifest
@@ -1,3 +1,3 @@
 DIST libewf-experimental-20171104.tar.gz 2243405 BLAKE2B 86e69eba5313dadbfe2cc63639e96cf964b5d72e3c98299c0262547b2d900b7a8a4a5938435bdafac3890ee05ea0079ef68809086234ff486c985d557d2c4897 SHA512 610174971b8e09385f1f51c02e7be36e7a18d21f8b22ddeb7ba7d5c20e7df97591a70de3523b2d63bed8deb5a2a170a14e825f6a80aeb0937553ecae5925ee0b
-EBUILD libewf-20171104.ebuild 1367 BLAKE2B d849ef913c8594c57fe261ea98f83253a838ab4cecf9624d392c07188777b8cd96b83217dbf200b26f8780ed7e1d53910efc05c62c2a5a3a7b95d04d60c42896 SHA512 549cfb058b25cb55101e7be225c8bd5a0fe2b7411342f845c7ae6ec052b81544e68a61c758b67f1dbc0fd34cce41d9f918aa578460d64f01bd7c985954f37ee2
+EBUILD libewf-20171104-r1.ebuild 1394 BLAKE2B 61deaf0307d4ff0a4c2388d46fd4ec1cf805f4c538c6d9590601019ede28d336d384e2b63d330cde8b4b2b5777c9fb14fd1d7032a9a54fbbb29f23331e7910c4 SHA512 a19565af8ad7ab8dee412bd39fda1ceb4187e00a00d8d3c8a4042be2a1412ac2c6463239441883a65777f845bb8d9b6ce63b10f72115295cb5936128d229a82d
 MISC metadata.xml 461 BLAKE2B c63abb2e8246f2964c3034ec66790a3637202255b82e2a903db9a5620eb89c87fdbdf4404b7623842c57f9678e636f72ded24b96f43f8142ac602dafbec1666a SHA512 bf030256b8149f8d61b99e74a6df0a54dd99d81f03a6012c3d050255251657fd9f7d6d9fe36b8e6e5559ab370b6aa9181c9c9702a77bf973e7e60fd6321868ac
diff --git a/app-forensics/libewf/libewf-20171104-r1.ebuild b/app-forensics/libewf/libewf-20171104-r1.ebuild
new file mode 100644
index 000000000000..47d43b87427d
--- /dev/null
+++ b/app-forensics/libewf/libewf-20171104-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Implementation of the EWF (SMART and EnCase) image format"
+HOMEPAGE="https://github.com/libyal/libewf"
+SRC_URI="https://github.com/libyal/libewf/releases/download/${PV}/${PN}-experimental-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86"
+# upstream bug #2597171, pyewf has implicit declarations
+#IUSE="debug python unicode"
+IUSE="bfio bzip2 debug +fuse nls +ssl static-libs +uuid unicode zlib"
+
+# uses bundled libbfio until tree version is bumped
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	fuse? ( sys-fs/fuse:0= )
+	nls? (
+		virtual/libintl
+		virtual/libiconv
+	)
+	uuid? ( sys-apps/util-linux )
+	ssl? ( dev-libs/openssl:0= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+# issues finding test executables
+RESTRICT="test"
+
+src_configure() {
+	local econfargs=(
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		$(use_enable debug verbose-output)
+		$(use_enable debug debug-output)
+		$(use_enable unicode wide-character-type)
+		$(use_with bfio libbfio)
+		$(use_with zlib)
+		$(use_with bzip2)
+		$(use_with ssl openssl)
+		$(use_with uuid libuuid)
+		$(use_with fuse libfuse)
+	)
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/app-forensics/libewf/libewf-20171104.ebuild b/app-forensics/libewf/libewf-20171104.ebuild
deleted file mode 100644
index d9ec629f937c..000000000000
--- a/app-forensics/libewf/libewf-20171104.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
-
-DESCRIPTION="Implementation of the EWF (SMART and EnCase) image format"
-HOMEPAGE="https://github.com/libyal/libewf"
-SRC_URI="https://github.com/libyal/libewf/releases/download/${PV}/${PN}-experimental-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86"
-# upstream bug #2597171, pyewf has implicit declarations
-#IUSE="debug python unicode"
-IUSE="bfio bzip2 debug +fuse nls +ssl static-libs +uuid unicode zlib"
-
-# uses bundled libbfio until tree version is bumped
-RDEPEND="
-	fuse? ( sys-fs/fuse:0= )
-	nls? (
-		virtual/libintl
-		virtual/libiconv
-	)
-	uuid? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl:0= )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-# issues finding test executables
-RESTRICT="test"
-
-src_configure() {
-	local econfargs=(
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		$(use_enable debug verbose-output)
-		$(use_enable debug debug-output)
-		$(use_enable unicode wide-character-type)
-		$(use_with bfio libbfio)
-		$(use_with zlib)
-		$(use_with bzip2)
-		$(use_with ssl openssl)
-		$(use_with uuid libuuid)
-		$(use_with fuse libfuse)
-	)
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 5a1205d50d59..11f14b861808 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index 956e32113a7e..37cdf526f48c 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc71c789dfa291efe4c551596eebc8a04f13f9fe698cc25d8349a174399044d15ddca2aeab952ac2bc7f0f4e9e47d453329ca SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f
-EBUILD fcitx-configtool-0.4.10.ebuild 832 BLAKE2B f88443fd41ed77cb6b142a484cd124bf84e1cfff6dd0fce7be9d0827b3d8067160218ef6b536072469f64b92e80c32a0cca762a33c566f4d3e79f3fda91422b2 SHA512 34ff11c0cbf108c7bdda5c5d1a8b626bcab76f5dd08599bd3ad04f12b28287a9073635042a6451fc9f426246afb4350e04e231dc81083d64684aff7d8e557a20
-EBUILD fcitx-configtool-4.9999.ebuild 813 BLAKE2B 6977ef3e492a4fb17f49089e107877dc2c0975d01f471e77f9403c0b44c3eec9c3981f53365ba43a5444c2e07b21b359b0394ea4fb443712786dc049423c12ea SHA512 121ef2f1b2dd26677c00c189fe74b1a133b59cb245a006cd23e273bc6d82eb591213929dd5267428e84cffa0bbeb534b4a6da9b998a70001c81da685f6ce7ac0
+EBUILD fcitx-configtool-0.4.10.ebuild 849 BLAKE2B e38e94e63fd89abca4bb81bc4a8416487c8149b831b1702e3393a8e9a092a54f15c35917c1ac9b36be13542d0a3c8ac60133d32502b6a89837fc51d4c9b63c81 SHA512 5f98ca5c3209f676d72c2ee651c1a1882305d58288051d899ec5987b2652c1d4b31b8d9cb1548f5af96f9ba7f32a5a15b936115cd0d629e0bc070d1998bfd022
+EBUILD fcitx-configtool-4.9999.ebuild 830 BLAKE2B 3d4386bd8005064eb82234f9fbb63e2b05021979e894c67ac5b37b4a95d1d1ae9103152e00e1640d385f08131b4426cf0e5b0e94ee8071046eaaae966679f706 SHA512 479f25c0976da7779e12a973b2473001c053191cced668ad9cefc7dd6050adaa778780263d639874c3a47f4360d6c2ec4f8e3f5c3747be6d740ed2fe4c5bc89d
 MISC metadata.xml 455 BLAKE2B 89268d866dde8861e25a631d76d7053a6e847134d02195aa883952b79a0f81742c4cad0f8938b0eb180240d5e95ff1c73b7c673d9a3b2dafd0b28f20e186589c SHA512 5fb4ff1f8fe55ba75d4609791f0f41cfe8728000cd0d5bf07d3f4df99bf375ab23f15cfd0754b032b333d67c7cfef6a13daa007d81a67b8be0b27454b7e7548e
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
index 9fe46f55f860..1f5e7d08ada6 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@@ -24,7 +24,8 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/glib:2
+	virtual/pkgconfig"
 DEPEND=">=app-i18n/fcitx-4.2.9:4
 	app-text/iso-codes
 	dev-libs/glib:2
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
index 19655e98c974..9ef906f089f5 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
@@ -24,7 +24,8 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/glib:2
+	virtual/pkgconfig"
 DEPEND=">=app-i18n/fcitx-4.2.9:4
 	app-text/iso-codes
 	dev-libs/glib:2
diff --git a/app-i18n/fcitx-libpinyin/Manifest b/app-i18n/fcitx-libpinyin/Manifest
index 9567136d9ca1..7f834d075636 100644
--- a/app-i18n/fcitx-libpinyin/Manifest
+++ b/app-i18n/fcitx-libpinyin/Manifest
@@ -1,5 +1,5 @@
 DIST fcitx-data-model.text.20161206.tar.gz 15099931 BLAKE2B 80e6a6fe5109011d6ea8683658d3fa89fc00e9dacfd140da3e993afc7db088c445da636797fbdac416e70119d37d47bdb0cb18d3865cebb397dbaa8a3055d703 SHA512 26450e347b7a211e5abd94acbb9befc8cee7d8fc20e5161ef11b8b9b1ad47cde4f1add5c41484d9af04e4dde2aa748090e297e799ee7f6d2f9fcec3873eee429
 DIST fcitx-libpinyin-0.5.3_dict.tar.xz 15149856 BLAKE2B 35297477b3a4df9152162b8ad57d536333c5007510f387323d03e862901f17bb337504f20e6edc8d48e338916a6c4543900974027b60f7e87b0005f836677d29 SHA512 d132e0c007bd62286cfa89f6605a5315b6f5ae94a75bdd389fff1061e1547ad64c615fb0b75189d8cf35fa289a53e5d485911e06e368b2bf3af7b5a996fcd08a
-EBUILD fcitx-libpinyin-0.5.3.ebuild 1489 BLAKE2B b6ea741875c1056c4730c5e3655f3c71fb3528e0c885e0600c446d565ce328250c6a2a9b99775e0c152ebb06ea7af7890fa3241ba66c335a8708e631cd3655cd SHA512 d49283d99de260318b30a4cb2e7a2ba17984d2db1f7aae0dcd4d640731c4264c7e4c4813a80156ccaac2ece780c1cb7fbcf9bad016ff1e3fe3dd6427d42b96f6
-EBUILD fcitx-libpinyin-4.9999.ebuild 1470 BLAKE2B 8da13daf9d233f8a88e67070f92d6b2be1c85e4bf4f140192e41a85b52b3855f04b19329459969e370dcc00543a49110fce336a0a3a5d9e1c86ad8a777410079 SHA512 d889ac88764e9fce9a42ae03610ea9fe250542117b05e484b202ef9f021866aa4eb9c10ebb00a9a1d3dfd2a56e5df25c1e3279f0d4a0650be7e2c90f111d22a9
+EBUILD fcitx-libpinyin-0.5.3.ebuild 1480 BLAKE2B 36b80c0fbf07be52c61652e5905fbe219aeaff0852c9137359f05ea1b8c192f3d374e4743727a02ac184397b9d50a5c6c634853b7252a47ce4a5768151d6ea3f SHA512 771b7b52c95a34c453bb8146abec4796e173922c80e855ad0047063a872d85f05fe0993a022a30c741d68dad364383f8d3109f121fefa91a25ffda109f3064cb
+EBUILD fcitx-libpinyin-4.9999.ebuild 1461 BLAKE2B 1c31d1702c7616db8ff6f5594c772a1c704db81b9c9e3fed40642ae73992357eace8acd1e24e49a905b8a1d9edef4c6fc39fbe2369869a964f9b9b69901fb309 SHA512 7b2da078b268aee69e6d693ef7ca26ddcf39f638f4da05c6a6eb18cc40f6b7740d503446e18eaf963f133f0110ccb1f3b6a50b4789c2c313adc1d33b14992483
 MISC metadata.xml 537 BLAKE2B d60daacfeb2a33824bd399d144ea7bd9a99a6a96062df226d4de0b674387df563a1294366b0cb2e216c33b321680f00adc88905167508898f6c3a37d6f0c1bfe SHA512 32e4b2319df016e83055699ada867d1e1aba7b09d26308f03143df986e6aaadf77243da97894d33282ad7d1a7ee881723a4eadcac6f4573fce05ba3700a10609
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
index 941ab64d0264..079c6e3c5fa3 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -60,9 +60,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
index 66cc6ae0ed8d..af2da3f65dcd 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -60,9 +60,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-rime/Manifest b/app-i18n/fcitx-rime/Manifest
index ac1c87cc3042..54bab80ed513 100644
--- a/app-i18n/fcitx-rime/Manifest
+++ b/app-i18n/fcitx-rime/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-rime-0.3.2.tar.xz 40960 BLAKE2B 1c9185dd9d2912e74b9916916fed09a01c30e0867d93fe94e04d5324883783dddbdca0f553d80aa19e2e59d2ec8fd2a50a7f89118c22cb09310296292a566760 SHA512 8c6d845b0899d9b8b9b41b895abd5c1b8916856b71f529aabd08d1c27a2b09bb5a9343912d088da460c2e22da0a3ce759a34fd13099a149bb8cd1ff4eafe29f1
-EBUILD fcitx-rime-0.3.2.ebuild 926 BLAKE2B 6ce396b63205e0288f904c8b3b4f5bf035e4a9d6df9928e1c5d79a8e325838986d9c371a485ebd93b8eb4e7b136571a8fe040d75b870a244842f02ae0df7eb02 SHA512 c6c0d63a8c0caf0fd2acafb4f2917eec1418985fdd4028088959f324968268f1a6570fc35ffcd24d7c3af2627c4710f281386ea801dd87b06ea72618778e2d8e
-EBUILD fcitx-rime-4.9999.ebuild 1129 BLAKE2B de07cfda170020c2edfb3e03908d0504fa937bba7ce122f39c468b643ca8ec4714e02830d5851e1fa65cae19594ba76ac9bcf26cde77ecd7a8869af6b0a9a16c SHA512 6d43703e4cf1b6208d07ec88a3c805e01925139e8107d53c920717cc19f389602f71be54bbc66f70c466d11d20e4026a078d8ab4df9d6ce3a87157a4e0397af3
+EBUILD fcitx-rime-0.3.2.ebuild 917 BLAKE2B f0acef45c38348b0c35476d1322e3459e48ff00c3cd58759bce84c3acbf25545978a89d334e44f15c9da49231726adef445e72e7a8dd206b9991a23da091cc26 SHA512 4d6b54142f8531afccb2b8236dd2c7d469c2aecf703cb562459066de5803b79024adb8c164e0d45aae6259aadf5120764f079a64df020e71adb5d72010e60d1d
+EBUILD fcitx-rime-4.9999.ebuild 1120 BLAKE2B 0599154f7bbc8b19527f7af86a15a109a60f49f6175b50da5ce86815f8c7249d322331c891054ed95d50fa0ef8e6f2db5bcb99b72d54fecb04493f9bd0e16eec SHA512 7c4de0eea31be6c94d45d66b6077185024dbacfe46419286de6361e92b5b1d6d167646f48662b67788aac3f1c04d9e53f73510c4cf6cf076ed967b5cd34c24d0
 MISC metadata.xml 633 BLAKE2B ef743e2803b410627255e712b1f0c759c9605eaadf4cc980382acae3a657cfad935b45cdaa6f0bbf697bc1eaf8e2963e8de4a0dc5afe62ffa9f3c6a8bd6ba361 SHA512 91e6413d4cdc60e3d4f989ea06fd5b65acff6684d09fdfe4253f812678bf1e9aa0a4f191ef7ff88e6c394e9d1a8ed252b57ac48262483e52dfa4615c785ff4eb
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
index a028f7f8ff9e..273db4b0c27a 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -42,9 +42,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
index 5b17c2b01487..382c68ff7502 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -50,9 +50,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-table-extra/Manifest b/app-i18n/fcitx-table-extra/Manifest
index 4f9e95fa4524..dffe9e40496a 100644
--- a/app-i18n/fcitx-table-extra/Manifest
+++ b/app-i18n/fcitx-table-extra/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-table-extra-0.3.8.tar.xz 3700736 BLAKE2B b8ce4b3aa04eba8b594b86958bb83e348758c30688828a4834643cf7bdd62852c2ca89bc4f75f0cb1b16ce969b0454c58e3abadff9c78318dc0953e0905c75fa SHA512 454798e9bd25c630ce98e2daf7296e82ba5fbc98027171038a5a7b9ac3169c153302a6703d9416718ec3a0b76db6d732caf3f03c6e6005841c9d7798702542df
-EBUILD fcitx-table-extra-0.3.8.ebuild 773 BLAKE2B 2aa86ed2f196624c532ea5be21b583e55eff7d262532d6f37ae00733de1e7e466da8e20787c653b1868d599057981f98394675c7faa8d205f85106200c8c14d9 SHA512 9fd4679713cda7ab85d695fa0820a4eceb8932adf50c2fed717bf9b6d31803f112c03d4a3d3c1056dec09f3b08038b169c42a7fdd1be1f6deab90050968cf7cb
-EBUILD fcitx-table-extra-4.9999.ebuild 754 BLAKE2B 479656e8f963b3afef4f97d9e35e4ba8e7dc16b8896b643d85fdc2ec9f5b7ec2a3fee5873cd4346daeec95d5ea753a6c710d009a4f55c160044ad796e40e163b SHA512 4ae1b85b47a4f0b611b449dea691a9abe547130b82ae896c87fb4bd17d325aecab428df109a6c8319f076b7854095434e0e7cf3979c207760489f36835147f21
+EBUILD fcitx-table-extra-0.3.8.ebuild 792 BLAKE2B 9b55a05194b7103a97629ca7782093d95fd512ea840b0bd8c38d2ab179d10827879d5088e275226cd4f55e9653bbc164ba676dddc4c6601d32cbc14e25ac0348 SHA512 1f12e525ed4d17dadc020fa133f3abe8015389af6e5ae1f98d71355501437d5e4ef9902e09a8c7b4a388364368528793252725abe5d6653d27352ce047ae954d
+EBUILD fcitx-table-extra-4.9999.ebuild 773 BLAKE2B 1debb5da1822ed6e17c62a3a37f2f80e079166b9434cd2f9840f8d0a9f747affbd556040bf7088951fd1a5851e7dbacc62d4f98c3d9961a7f28488b41d65d5c6 SHA512 fd3b5d55e45e0712211cf7ebb8808fde09ba373d7f3ae13a9c43b871fb5287133fc4bb26429f2916d0ca1883406a49003f7b3b400d1e2c2a85dccc281034ac26
 MISC metadata.xml 456 BLAKE2B cb14969ef6882db359489ce3eb5700179d3eda829e0e1b59bef1227e5083723ff2f5ee5b82ed075250673fbe89b6c97aa2f3ce694a4fc0d89c6a600f5ca9346a SHA512 543a24a29523fc93626c2783c3035e3ffd1f7e850a62d80920c5b62b32cb54ff9e811f5d3c15fe785c967daa78e5da56eb38ef6b773a1cdaa4ab3e8e2a3b3235
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
index 24bb5f73b8b4..473763dfd10b 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2012-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,16 +24,17 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
-DEPEND="${RDEPEND}
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
+RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS)
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
index ac818b0f0b30..19721f5620a3 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2012-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,16 +24,17 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
-DEPEND="${RDEPEND}
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
+RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS)
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-unikey/Manifest b/app-i18n/fcitx-unikey/Manifest
index 1782dc60d96c..67f37fc652f9 100644
--- a/app-i18n/fcitx-unikey/Manifest
+++ b/app-i18n/fcitx-unikey/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-unikey-0.2.7.tar.xz 75204 BLAKE2B a0d70747a560b2493a3b7f7e06ff35f7e465bb4c4c8d22cb4db02f70a6298c49780fd0045874faeba1f20ad188a01a81fefc67a4f6ac9d6946d959f731a376a4 SHA512 1bb78e4f27f0cda1e3aa5a633be45e0a26d121d5b472b1325b0c028ff65ca156d23e7ffee0367badeac1dd21ba1743ee8a2c9c27c629ae0996e84e0062b67ad2
-EBUILD fcitx-unikey-0.2.7.ebuild 1042 BLAKE2B b0f0aa590c8a9298390f02e0e3000198322842624bfd525cb6e44401dc532047718f6b17fd56da04f254ebac2603edf10384c3560c856ddc0732618fde1534f3 SHA512 6de0a7aa577e51c87b7caf0e9e87b884a139511136046c876e38ac00eb22984c14a4b0ae426720e3b8702098fbd7c7379e4e4a94f68b8d3e594f594c1709ef68
-EBUILD fcitx-unikey-4.9999.ebuild 1023 BLAKE2B a9ac963a81379dfb14ae66fc51f28c3395a7f4b9d94e4ec9515d03dddfd7ee49ea9bb04de8c051f791083087521e7851e6db76c4e2af97d30c177a0a68ba409d SHA512 d02774c894c21ab00b22f4865473b21f4f51c01c807536658fa8b85921f2b5f9056b9e8ff8afe719e156524944435126f657da6475ff2ae521c34a29c36f2a8c
+EBUILD fcitx-unikey-0.2.7.ebuild 1099 BLAKE2B eb051e22a3184c0f4d4dff9c0ac742a7272ef8f6011a1631fdb9868b9812d581f8d3cb54efd3f59a299b3bbfb5fb443a566f5018229e61dfe86492e1fea3405b SHA512 95b1eb66170bcb1aa997e374ae860117ab2afc4cb55940c0755382fef360c5fbe81cf82da09fc0ff5714a821c46eea8feaf1028702df7dc3889c409d1cb255f9
+EBUILD fcitx-unikey-4.9999.ebuild 1080 BLAKE2B d0294f4b5b7d75792462a72743b7e6697d0c7e9802cb53d38587a957f3666dd99f6fb319f417f7b5202bf68f91a657d03f4fc6f22647a5c0127583edd7b2fde1 SHA512 a1b852387046602883c45c2e98a8b6441a4bbc40b2a7370d8410f33054879a1ea45bc311ae042bc53a0f535a16a6c2724309499bd628e4879f8706358e70bdf8
 MISC metadata.xml 522 BLAKE2B 8d69748cb9296020466c42b0277d8618dccb9c787f35e920d5a0d5e9447c723d7ba1e5c0a7c508053fa33b7c989d7a5c0542a144958083a6214f23399440e83e SHA512 c08e14d4e9268a0c0608148117d50b77754f1f9d96433a28f243fd0643d7021a9e2b85ca57de9f4196bcee54eb05b3c5bee497a3dbf77ef9b279c1bff7814694
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
index 05e9166a8900..778af9552b8b 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2013-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,7 +24,11 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+macro-editor"
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+	sys-devel/gettext
+	virtual/pkgconfig
+	macro-editor? ( >=dev-qt/qtwidgets-5.7:5 )"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/libintl
 	macro-editor? (
 		>=app-i18n/fcitx-qt5-1.1:4
@@ -32,9 +36,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
 		>=dev-qt/qtgui-5.7:5
 		>=dev-qt/qtwidgets-5.7:5
 	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=()
 
@@ -43,13 +45,13 @@ src_configure() {
 		-DENABLE_QT=$(usex macro-editor)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
index c20cc8cad7a2..23a3d96150a7 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2013-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,7 +24,11 @@ SLOT="4"
 KEYWORDS=""
 IUSE="+macro-editor"
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+	sys-devel/gettext
+	virtual/pkgconfig
+	macro-editor? ( >=dev-qt/qtwidgets-5.7:5 )"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/libintl
 	macro-editor? (
 		>=app-i18n/fcitx-qt5-1.1:4
@@ -32,9 +36,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
 		>=dev-qt/qtgui-5.7:5
 		>=dev-qt/qtwidgets-5.7:5
 	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=()
 
@@ -43,13 +45,13 @@ src_configure() {
 		-DENABLE_QT=$(usex macro-editor)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 4de5f85a0208..cb579525d901 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/tpacpi-bat/Manifest b/app-laptop/tpacpi-bat/Manifest
index d854e95f84b0..563daea132fa 100644
--- a/app-laptop/tpacpi-bat/Manifest
+++ b/app-laptop/tpacpi-bat/Manifest
@@ -2,14 +2,9 @@ AUX tpacpi-bat.confd.0 587 BLAKE2B 642637e9dfa6473e78cf9426d89132b1ec77cac9e02cf
 AUX tpacpi-bat.confd.1 668 BLAKE2B 88ebd00838e2ed0febbd1321e2ab13dfc4bea292f3f7f665b045370b960d5c462e1d4c139dfbf1061d1692d7acf79b8b794f3c51d4c3e626c9ca7ef515fc6c78 SHA512 570824184f85e9f4b687e67131165671389b836d94f15edbd4bd14c77b0c6546c2991da25bc0172ccdee03cc8c0ad82c378e982e147334e9cb83334d0382038b
 AUX tpacpi-bat.initd.1 1498 BLAKE2B 31af866602be78366e7ff967424929f630e9b28fd7c313b707f36c77b86010781203b95c2cc7977fda41378b34f12c80f150b3126774ec0499d148643c35f850 SHA512 1e06d2f4c4356f97c40752d532ea448db9ca39186028bddbe58125fce0e236ed3abd262621c16152b8c44ff24a160c62a51097a37c02dba191403ec71ee005ac
 AUX tpacpi-bat.initd.2 1488 BLAKE2B 43e196ae490ba367edc15b1b9a0ef81cc7f56fec33b7ee8e91251f66705d1c5e38caa65a803e8872344149e384ae0b162c6b30e540c38aeceb12958fa0386b86 SHA512 ccd84bc4cd44ed8a3b2c101501ae220d8add3b189f172e4ba5fe9532ba5a64a188b90054696cc60b7bc1b3d72f636649e4678c020c789933d0b4d25f6ffd386d
-DIST tpacpi-bat-1.1.tar.gz 17781 BLAKE2B 73e9cef77f5eb889e653dab05b3f9502795833221d007319abad0017b70dc3c60d1a2e7649f1003e9eb16da94efa185b195e42789b528b5c5b62738abaff9e3a SHA512 7b8838e6db7f98cd5bb674a99dbb880ba6574529de68d97ce704bf225ba416183971aae3c2dd623bc8750767c54a2a52cd0b525bce70640ecf0b307fdba03821
-DIST tpacpi-bat-2.1.tar.gz 17753 BLAKE2B c470cfdb98c2873ca44dad9cb0fc31e6bc97c8832735003b707ee191c65dba3cd9c0422513b4a93aae26692a154675cb94e02d30b721d498610bf21711bcf1e6 SHA512 7ed4974d84c3f1ddc9fd5cd6d7f103a11e2f808a223692749e3ae0ec2e888b62083d577214e27634cd76e9b616a6b8d5cb5474ddb64f73972d08641051c5c6f8
 DIST tpacpi-bat-3.0.tar.gz 18137 BLAKE2B db0db2c06d5bc78eb028cb0db2532e5500cce2370c23ab3bf1e49433b83ed2be7cfffe080e46c3699838ff00025d516dd37e071081f79c7d5d6293f4f49730d4 SHA512 2beab3e5495f028b53d673a4243a2128f4ff85e19e18ac7d53663a1d62e20b271442d6c2c8f19cb41d618ddf7ebb4d9b8390f7f185f77bdca33c69bb19463128
 DIST tpacpi-bat-3.1.tar.gz 18584 BLAKE2B 5f1e890f33be4e0d176bda486d9e4363d56a7a933677eb69bedca9ec42e8af5a0e5494f8447702d33ffecda3d1d4a447a56f7aeb9480a3b855a24bce45028d38 SHA512 cdc9e0c0ded96281678199783b4c48ff85a497c90b244a7ce2276b54d7ae4bfa7eb430214bcdb6fabd7478796507b0fbe7fed4b1ab4bc4cdd7bd5ae25f943a77
-EBUILD tpacpi-bat-1.1-r1.ebuild 796 BLAKE2B 7081b9758755b266fe03371c901ceeb731c6fccfe4e663e45967697d84111b259e77284656ef58e24c7e702b771e383b469749d8c740ad6a979096cc2d60aebb SHA512 25911886dedb8a5ba2820d456245e4bf6647b55280bea2201ea17eadf9450a4169c971bf1aa386be5340b340deb7b0ff20b0d7b50ff7d3dd602b5f53120d3d88
-EBUILD tpacpi-bat-2.1.ebuild 796 BLAKE2B 7081b9758755b266fe03371c901ceeb731c6fccfe4e663e45967697d84111b259e77284656ef58e24c7e702b771e383b469749d8c740ad6a979096cc2d60aebb SHA512 25911886dedb8a5ba2820d456245e4bf6647b55280bea2201ea17eadf9450a4169c971bf1aa386be5340b340deb7b0ff20b0d7b50ff7d3dd602b5f53120d3d88
 EBUILD tpacpi-bat-3.0-r1.ebuild 789 BLAKE2B e29bb0916b2d4f43ecdc97b366c07e48fc54fde2fbace42d01b27c91f8a0e6b7ccbced748477c3c83f0140f0ebe0b172add09c0ec6fac8277e7ba7c8f87751b3 SHA512 21e9be8dd04c70e67b68e82ac9c416e7589c5b074e0cd0b1974592e56ab98f1669b0c59085678a3b45df0d3dd02c68d5d288634a60f7ea9e5300b3d3e0123aa1
-EBUILD tpacpi-bat-3.0.ebuild 796 BLAKE2B 7081b9758755b266fe03371c901ceeb731c6fccfe4e663e45967697d84111b259e77284656ef58e24c7e702b771e383b469749d8c740ad6a979096cc2d60aebb SHA512 25911886dedb8a5ba2820d456245e4bf6647b55280bea2201ea17eadf9450a4169c971bf1aa386be5340b340deb7b0ff20b0d7b50ff7d3dd602b5f53120d3d88
 EBUILD tpacpi-bat-3.1.ebuild 829 BLAKE2B e6a07ad049035d1d1a89a01a7c77c0481bfbd7ae6528ed4b8a83df704cca53b6c4f0b05a95ce917555b7e3c21a56e04d6f002dcc492e9345071fc82d35061b4f SHA512 de3f25f6c612b61db7951eee048a757b107d8f2486f5f5c101a30e33b844d57106f379764bc407c1a65de1ed7362a66a401de74a9eb5e031b455b0a838b5fc75
 EBUILD tpacpi-bat-9999.ebuild 829 BLAKE2B e6a07ad049035d1d1a89a01a7c77c0481bfbd7ae6528ed4b8a83df704cca53b6c4f0b05a95ce917555b7e3c21a56e04d6f002dcc492e9345071fc82d35061b4f SHA512 de3f25f6c612b61db7951eee048a757b107d8f2486f5f5c101a30e33b844d57106f379764bc407c1a65de1ed7362a66a401de74a9eb5e031b455b0a838b5fc75
 MISC metadata.xml 338 BLAKE2B 612018ee773059fbd8492aa11f53aa5c99190b9189b864365d06bc309950c11747fae5c0b4b0e2e2915981a4642523ac439988bcaa8003c1394eb58af5ebdcad SHA512 e6cb10546e9a71a1c5fbcea24b4ca97c5eed95e4553d3cd4bbedbf1180da9533a0e570fa674ccf12574825cb369d6197e51969361945958f4322d6cb91e25714
diff --git a/app-laptop/tpacpi-bat/tpacpi-bat-1.1-r1.ebuild b/app-laptop/tpacpi-bat/tpacpi-bat-1.1-r1.ebuild
deleted file mode 100644
index e23197335543..000000000000
--- a/app-laptop/tpacpi-bat/tpacpi-bat-1.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/teleshoes/tpacpi-bat.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-DESCRIPTION="Control battery thresholds of recent ThinkPads, not supported by tp_smapi"
-HOMEPAGE="https://github.com/teleshoes/tpacpi-bat"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="sys-power/acpi_call
-	dev-lang/perl"
-
-src_install() {
-	dodoc README battery_asl
-	dobin tpacpi-bat
-	newinitd "${FILESDIR}"/${PN}.initd.1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd.0 ${PN}
-	systemd_newunit tpacpi.service ${PN}.service
-}
diff --git a/app-laptop/tpacpi-bat/tpacpi-bat-2.1.ebuild b/app-laptop/tpacpi-bat/tpacpi-bat-2.1.ebuild
deleted file mode 100644
index e23197335543..000000000000
--- a/app-laptop/tpacpi-bat/tpacpi-bat-2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/teleshoes/tpacpi-bat.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-DESCRIPTION="Control battery thresholds of recent ThinkPads, not supported by tp_smapi"
-HOMEPAGE="https://github.com/teleshoes/tpacpi-bat"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="sys-power/acpi_call
-	dev-lang/perl"
-
-src_install() {
-	dodoc README battery_asl
-	dobin tpacpi-bat
-	newinitd "${FILESDIR}"/${PN}.initd.1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd.0 ${PN}
-	systemd_newunit tpacpi.service ${PN}.service
-}
diff --git a/app-laptop/tpacpi-bat/tpacpi-bat-3.0.ebuild b/app-laptop/tpacpi-bat/tpacpi-bat-3.0.ebuild
deleted file mode 100644
index e23197335543..000000000000
--- a/app-laptop/tpacpi-bat/tpacpi-bat-3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/teleshoes/tpacpi-bat.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-DESCRIPTION="Control battery thresholds of recent ThinkPads, not supported by tp_smapi"
-HOMEPAGE="https://github.com/teleshoes/tpacpi-bat"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="sys-power/acpi_call
-	dev-lang/perl"
-
-src_install() {
-	dodoc README battery_asl
-	dobin tpacpi-bat
-	newinitd "${FILESDIR}"/${PN}.initd.1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd.0 ${PN}
-	systemd_newunit tpacpi.service ${PN}.service
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index c74b772ea12c..2a18fd5275d7 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/abduco/Manifest b/app-misc/abduco/Manifest
index b9c015898833..aed1687f90f7 100644
--- a/app-misc/abduco/Manifest
+++ b/app-misc/abduco/Manifest
@@ -1,5 +1,3 @@
-DIST abduco-0.5.tar.gz 15790 BLAKE2B 6541c758aa5b2ece2f4eae744e9d9da7f8b4cf0d1e39546708e73631688d31c71c74af31e65cdb26bb046b6bf7f595409c0a71027c681fba1d4b3997020b1428 SHA512 e0772b8eecc1fb6f16c7516a6956825b9bda4149f00f56b34e68ec3544f74c2270ba8cc2642599de26ae34d11ed78b8bba70497bfc9a79f3008f50de02ce49d8
 DIST abduco-0.6.tar.gz 15829 BLAKE2B fd6c1670e0a4cf95bfaa00734b981c23877b79ffc14dadae8c84fb198cb4f585cdacf874e127190b6f8c8b784cdfa403a8be0f4cae8bc442d43723967f4525d7 SHA512 3b70a5cc10f0a2743dcbdf6eebdcfcee0e4f4ff8c6ce0bf0aa9f55c3fa85ab43aa659997735e063eab36aba69f91be7bb5519f3f632bff1b9098f5179165c1f2
-EBUILD abduco-0.5.ebuild 849 BLAKE2B c603251f7d29c92f882c7f8f98a1550b5abb02243c5c23da97fb865e40aa146bdf42621d5854e426952d1bcd832b47ae5d102d49186a49ed237ba1d227af48ef SHA512 3d34be8f90ab6f3016cb5431466821c5b122d1ca6f9989c9f19f95aef368092b9281c0bf3c5ce25a0cf97bc2f7c67ff676d45b3867d787f73b87ccbfc86b08c0
 EBUILD abduco-0.6.ebuild 839 BLAKE2B 0af65b0c9f0bd05b80511574bf67706a1eb6ddc33f35fd541d102847041d196356220a285c52ee8855aaa022388ce5d082f02bcf3d7a0fcc76e8fd0c18027611 SHA512 cdcdc9017752b118c7f38643048e3d73c28ceac9dd95c89a25530524fe3211c620af7e891fc0c3e07bb5481acf56b86313f8f4b302052ee69c285418106e84b1
 MISC metadata.xml 522 BLAKE2B 46bbeb1dd0a4ed305a71aad81f6cc505ab1994ed6f1f4d04f608523f1570cee1efc69394dd50c3e3e77409a90dfd29ecc5a60488a319074bb40a5ce7edcfa1bc SHA512 419afcca69423826de2226f6d577d610a1565d499e001531563e3f4c7952da0b5c8d7824a7d35359de153e68434de9c8326f9406d9833387423d66c7c111426c
diff --git a/app-misc/abduco/abduco-0.5.ebuild b/app-misc/abduco/abduco-0.5.ebuild
deleted file mode 100644
index 6c804288e637..000000000000
--- a/app-misc/abduco/abduco-0.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils savedconfig toolchain-funcs
-
-DESCRIPTION="lightweight session manager with {de,at}tach support"
-HOMEPAGE="https://www.brain-dump.org/projects/abduco/"
-SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	sed -e 's:^PREFIX.*:PREFIX = /usr:' \
-		-e 's/-Os//' \
-		-e '/^CC/d' \
-		-i config.mk || die
-
-	sed -e "s/VERSION/${PV}/g" \
-		-i ${PN}.1 || die
-
-	sed -e '/@echo CC/d' \
-		-e 's|@${CC}|$(CC)|g' \
-		-i Makefile || die
-
-	restore_config config.def.h
-	epatch_user
-
-	tc-export CC
-}
-
-src_test() {
-	./testsuite.sh || die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README.md
-	doman ${PN}.1
-
-	save_config config.def.h
-}
diff --git a/app-misc/bfr/Manifest b/app-misc/bfr/Manifest
index 2b9c0959364e..23b45d0d86d8 100644
--- a/app-misc/bfr/Manifest
+++ b/app-misc/bfr/Manifest
@@ -1,5 +1,4 @@
 AUX bfr-1.6-perl.patch 326 BLAKE2B b5e5273b8cd5e198d5c3dd76740d7d3e8588571e29822095ffe3b0eb50a85d6422163aca0774d8de955c64bf066ffc445d3e140eb5dcb4d06e39274c07e8e6fe SHA512 8f65f5113b60a6cbe692b9b2cbf02a7a7b3f046a6a5203cc05cae7a08e1344afd5ababa41608d334d5d1f04afb0eb2bf705622056c5620626805eec41351ffc3
 DIST bfr-1.6.tar.bz2 81002 BLAKE2B 24339eb7e882ca319b29a2a5e033ccfd6a0abe920572d4f023b4ad0321e2e9ce3096c3aba317bada297f9d17bbe368edf08cddd903377e99f5cc2a1dda7261ea SHA512 19939218029219cc328e3efb8e799bb8c755ccff7b8cb81ba0c735d499a48f581aa42322045fdbd153dcfdb8792e84d9fddbfba9e9c5d94675e2830163936762
-EBUILD bfr-1.6-r2.ebuild 460 BLAKE2B 5f469a0545ca5b2990afc8875415ca628fe39a24881d7761ef43525937ce5209f70b1a140c66d73bd5b33778075213104b77245ace7efcc1f371f930de56ddab SHA512 7a1863a503b5c7c0c8cb644cfdc6082bf3cd971b33e3e9d2f7dce6d7a37c07d9a09bb4e87d9b7388d75bdca7f1fb2dc7ba89777e6062d6d5b27f6cbb91c864fc
-EBUILD bfr-1.6-r3.ebuild 486 BLAKE2B fab912d6aeb9c8ca3cbf22b0f781f3fb92692e008780ec53219c794ce7fed5c3288349cef8750271e420170474b17b764ca6d030c4c12ea842437f1c70943986 SHA512 e85a1a75106c0e7ae1fdcd0777bfc9ffc5bf8e97f21ee609f937f17fdaf1450a43204902ceeac246c710cf777dc6b08f49e0108a5c76f55ce92b2524757eb362
+EBUILD bfr-1.6-r3.ebuild 482 BLAKE2B edf341b5d4625ce3dd6680d708b0002fb9fc8ccab0449e450c25ff5e2961cd410c6205d7c73293b311f0b6f274ebefc5096a59e415bcb23c205d8d73843c0bc4 SHA512 4162532066eb59e3fa83a4a6ed0d297aaad2b717dbe6e147dd12082ab8b3235fd1d994d399d565123418b4f8b22d04831b61aa2a1936bac1b56fe85f39e1d14a
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/bfr/bfr-1.6-r2.ebuild b/app-misc/bfr/bfr-1.6-r2.ebuild
deleted file mode 100644
index 891d67b0da5f..000000000000
--- a/app-misc/bfr/bfr-1.6-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="General-purpose command-line pipe buffer"
-HOMEPAGE="http://www.glines.org/software/bfr"
-SRC_URI="http://www.glines.org/bin/pk/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-
-DEPEND="dev-lang/perl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-perl.patch
-	tc-export CC
-}
diff --git a/app-misc/bfr/bfr-1.6-r3.ebuild b/app-misc/bfr/bfr-1.6-r3.ebuild
index 8a27acb19cf6..36da22707188 100644
--- a/app-misc/bfr/bfr-1.6-r3.ebuild
+++ b/app-misc/bfr/bfr-1.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.glines.org/bin/pk/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 
 DEPEND="dev-lang/perl"
 
diff --git a/app-misc/boxes/Manifest b/app-misc/boxes/Manifest
index eca335aae05a..d4f9dbb47891 100644
--- a/app-misc/boxes/Manifest
+++ b/app-misc/boxes/Manifest
@@ -1,5 +1,3 @@
 DIST boxes-1.1.2.tar.gz 101658 BLAKE2B 002cd1a458d39069cf0955fc37c05e60590003ac987619d89851b3943cdaca986b57e631081a196e7c9a2a245397e72f8c882fb6e190c0127289602ead223a7b SHA512 10efb5f62d94003532e2f32d6a0f7c76dd86c7cfaf150f35c24516dc6684f5e3909ecd5fd48c1c64f25f874cb1364bdf3d959a2fb837bfe74c2d879a35f443dd
-EBUILD boxes-1.1.2-r1.ebuild 861 BLAKE2B 8bbae020d108173d6f2647ad71c8889ba8d027b39da246a85d9b20709eb65b78aace22ee8cde7e866b0e4abe6b939016bd2bce880c081f2305e96c42a2836b71 SHA512 95fd83afc6177d02a4a9f87470d1b92c6dbf68ab7017c5b2ed5c178c05844143d415e6aa688b53fcc77d96b605699c74dc0978f7bc2b1169e8e6a2dcb5d2e7c8
-EBUILD boxes-1.1.2-r2.ebuild 867 BLAKE2B cd8dc17ee0c7132043c903d39b6ddc0cd29e730b69a048ba530ad0a96e22d3ea06c6f4c6e439235e28868168b73ca5d40c39c6b468e56b8bf957a2150905a156 SHA512 269734ff1c748fb9322a541960c62a4c5a9945085e31927384bad4b57290ca4d9a5b1b26afe1c2f98152c4160fa084e822e38353840490f371528d6199b570bf
-EBUILD boxes-1.1.2-r3.ebuild 863 BLAKE2B cca9b6d5751095d09b6fcc5af8a0c3e59f2e3960b7e75a5c70593ccd8dae67860634f7a2d5766fd6013ef39efb49f3cc6d7b3c0e39bee69de9832d7695176a08 SHA512 84fe3f1561f764b0979b0ea95e1d914fd7e78f806e98a96bed01ef2e7febb48e8da8e0acb9ca0e30a1be1d31ca55056d82a07fd153b515817d07bcf1be634c12
+EBUILD boxes-1.1.2-r3.ebuild 858 BLAKE2B 6d6c97b11914495c628bb8553c665d890ff6d866e76d041c22364b17b078226d7b8e8f190a480a58be4e7ee66ea70cf724bfbe74798b535be373b28db199bacf SHA512 b67bf1174118b6fc9c545ce3949988e517db42f19a31de49a3cd67a46aa879005e4cf7f88a5156c7893371bf369b572bf70ba11a5bf11f3d7e34ce59559ec14e
 MISC metadata.xml 357 BLAKE2B ce56f6092cc7e6a1509a1be7627f92c543e64274915bdfaab74a03bb64c230b586c939a1fee654a1d81774076e35c9651e90b73d262330fae7b4320a31693af2 SHA512 37d5831d4633bd9f5d3d113841f6300adb8945827fd113bb9366181e11bd0234f7804f7bbb1b930e40a5a0a55e402b4561c8765d9d747100021c2e4ec5ba2074
diff --git a/app-misc/boxes/boxes-1.1.2-r1.ebuild b/app-misc/boxes/boxes-1.1.2-r1.ebuild
deleted file mode 100644
index 93e8b104e3ef..000000000000
--- a/app-misc/boxes/boxes-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Draw any kind of boxes around your text"
-HOMEPAGE="https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
-SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	"
-
-src_prepare() {
-	append-cflags -Iregexp -I. -ansi -std=c99
-	append-ldflags -Lregexp
-	sed \
-		-e 's:STRIP=true:STRIP=false:g' \
-		-i src/Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin src/boxes
-	doman doc/boxes.1
-	dodoc README.md
-	insinto /usr/share/boxes
-	doins boxes-config
-}
diff --git a/app-misc/boxes/boxes-1.1.2-r2.ebuild b/app-misc/boxes/boxes-1.1.2-r2.ebuild
deleted file mode 100644
index e09f30d48d46..000000000000
--- a/app-misc/boxes/boxes-1.1.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Draw any kind of boxes around your text"
-HOMEPAGE="https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
-SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	"
-
-src_prepare() {
-	append-cflags -Iregexp -I. -ansi -std=c99
-	append-ldflags -Lregexp
-	sed \
-		-e 's:STRIP=true:STRIP=false:g' \
-		-i src/Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin src/boxes
-	doman doc/boxes.1
-	dodoc README.md
-	insinto /usr/share
-	newins boxes-config boxes
-}
diff --git a/app-misc/boxes/boxes-1.1.2-r3.ebuild b/app-misc/boxes/boxes-1.1.2-r3.ebuild
index 517e51b3f2d0..6e49f9931d9f 100644
--- a/app-misc/boxes/boxes-1.1.2-r3.ebuild
+++ b/app-misc/boxes/boxes-1.1.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
 
 DEPEND="
 	sys-devel/flex
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
index a6f7501d9be5..240101a9afba 100644
--- a/app-misc/c_rehash/Manifest
+++ b/app-misc/c_rehash/Manifest
@@ -1,5 +1,3 @@
-DIST openssl-1.0.2g-8.tar.gz 21497 BLAKE2B 77f0361d338b203dde230817b5ae405ef929c6f8b92192884b1549e152c72aaab2bc280e3a8da427cd478c432acba587bf652d1bf6abfccab51df5a445fc399b SHA512 1b8c0cf8d21f2c9f2f32b4442e02a0832ab9cf9d4ec9943b20ec8363df916bfb218da26b9cbc79783090dea01a9b04accd797c3dada893ac767565ab32047eeb
 DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da
-EBUILD c_rehash-1.0.2g_p8.ebuild 985 BLAKE2B 7e68fe19402a98cdb46ce550317c1bdf228ef4ffc617aa9d3231b45a1f38dd18756614288275f662662199a9f1c70c1a8b1fa312cd8e5b31c2e2f0c85313516f SHA512 e4bc03edaa4c75cc2086e345dce05195e6ca7edf71db854c5143d43ac9b5a8ff4ef38257dacba1860aa0d5a3a9d4085c40e3380b388efb0c71efb522df78da5a
 EBUILD c_rehash-1.7-r1.ebuild 999 BLAKE2B 31290f6f00b80048fc76e3d6b4a9b5e16b5e867f145c019e82f7a6c5a9c3d32b6bf22fc966c2d7ac56394fb7a68cfdcc90ce874172c0005bdbeafe261595fcd8 SHA512 a6179384d7b37ceb32f89ae4cbf0ce967ce48600934a2822077517390280591585177948b979245a759e6ecbcbda662f899a7b8a79c12d0da0d58e7533a5988a
 MISC metadata.xml 339 BLAKE2B d4fe9d24a3b12ddea1d503e6998c510bdbce33677cb45c3deab9c4de28a0c88d592d1357e9e7b029ad46d043095cdfe00e747dc63c1feccb5fab6c14d4459710 SHA512 611bcd575733b05ac99027ea49a79c29fa969eeccf75b12cfda6e77a42b2241e414951b25b089eeac7fd2255d42872b38c68fc5d004880b5dfe7a89c73e8f64c
diff --git a/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild b/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
deleted file mode 100644
index 9565baaf5d84..000000000000
--- a/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P="openssl-${PV/_p/-}"
-
-DESCRIPTION="c_rehash script written in POSIX shell for OpenSSL"
-HOMEPAGE="https://www.openssl.org/ https://github.com/pld-linux/openssl/"
-SRC_URI="https://github.com/pld-linux/openssl/archive/auto/th/${MY_P}.tar.gz"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="libressl"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
-"
-
-S="${WORKDIR}/openssl-auto-th-${MY_P}"
-
-src_prepare() {
-	SSL_CNF_DIR="/etc/ssl"
-	sed -i \
-		-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
-		-e '1iOPENSSL=openssl' \
-		openssl-c_rehash.sh || die #416717
-}
-
-src_install() {
-	newbin openssl-c_rehash.sh c_rehash
-}
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index aa716b2f9048..1233e79fcc4f 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -1,9 +1,3 @@
-DIST ddccontrol-0.4.2_p20140105.tar.gz 177771 BLAKE2B eaaef394a6e9240d1742cc7fbd4ed80ff58315713d3977f8bd1c64f09465fb6a6f9cfb6ccb49e3190291256b6c816512128b95e2dfa16f31e8fadc2aa9367457 SHA512 7a28e9b81ee14e0431c57d372c8d43f861f61c35b441111e1f42d1aa62c333b0cc6a101dcb39d30e9661aaa85a02d755e4adef3a9b20a6952e1599e3ac12c72f
-DIST ddccontrol-0.4.4.tar.gz 164389 BLAKE2B 480b712fc5911fde35a55ff8602866888850edfd6366bf0fb78ac3c726afed7745975b70c3359ae81c2583506ec1b2a2fc3c8a7aab9e8032f16bf27612430084 SHA512 6bc5587bc790492f13c677bd7a48f5ddbaa42f680c56c2fa18488ba5d322b853f6fb520c1317415a20a5df03c24c06edddb5e777d6fb34a34ee459170ae92119
-DIST ddccontrol-0.4.4_p20180123.tar.gz 165833 BLAKE2B d1af2e5f2d78bb9d8cb817e8f2666f70c5fc431a3a535931ea91fef5a2e9500e20e989d24d4cdea4a1c83631df120071bfbf845d342b1e826760f622c9dc5844 SHA512 c49a37e6231f0002a1dd387e2f2f0e1e4f989406bc84320011a55f596c8d1d7e0f094c8ed574db30fd0546fde64c8bd16350412cd4f64cc83b8d44a5469afe1d
 DIST ddccontrol-0.4.4_p20200630.tar.gz 173792 BLAKE2B 7a7ef330eb471f1cbddbfd90745e212a8a66f4be6cc6a4ccb8014c41498a86a09e4bc0226a300201102c202da37c0f4b8020aa88f08b5e2acaa92ac0dc2971b6 SHA512 7aaadf98eaf24d4b040073dce6f469e6e4aaae1efde0e8f988fb9c5fb99b776b1836573c069b9d8f12eaa724d3b39df5d4f247aa47ca2b7911dc9a9df727a50a
-EBUILD ddccontrol-0.4.2_p20140105-r2.ebuild 1895 BLAKE2B 6e51dc2d5ee49dfd3c77b680c285fc306edb2700019f51feff8892ed2b61310e4004190648fafda4fd5e5dab50c13b9e2ffe02b66372366bd709875ccba242fa SHA512 d4935772dfef9bd11a3f31609d8d160c18075f04f89274086716e493d796f6f14fc766fecbc89310de106789c2cc28e839a4d06b302c724e0b3f99b17fee28d2
-EBUILD ddccontrol-0.4.4.ebuild 1852 BLAKE2B e49447cfc9cd88e3ef4fb631aed4c703bab2a8e6da52abefb844cc0e6cde41a573e9bae0a19b606e79789d563f5b2cadffc2914e6d5036e9754f55750cecfee5 SHA512 a14e0f9bbfce45fa217fe07604d7b6e4c44624a6f379e2c533246f77fb9167839d4adce2344cbfa3af624bc5bd07977082558d809b716a65ab51886e66ac26e0
-EBUILD ddccontrol-0.4.4_p20180123.ebuild 1933 BLAKE2B 616f437d655df0d13573d4b6952ba974556c5a106356e355be8809064d2770fae9820191be4a89a7167e35863a2bb8f8333f366e25bdcaa31df80dc51cd12f7c SHA512 42ec9661a22ee8792f074cc2f3ca206bc833ca6994aa6131e4937188b8b2dabd29711cc5ac469ac33ee0b39ed5b9779e756c830873e6a9243b7e75e993d133cd
 EBUILD ddccontrol-0.4.4_p20200630.ebuild 1947 BLAKE2B 18fdaf726bf8c96a5348d19a9db8c04254448e7d390e466886a037208ce139a43fae45ecad16427d4ae5cdb9e8b1e3ca3f3e886b587826ad599b6783c9162874 SHA512 ba41e167774ea1048efb12e519b97634479e323ad866a7289f4f797ed6d1dbe8edc44a76cf7df7c33820bbc709e3daa71ae42350813c4513f73509536ae803cf
 MISC metadata.xml 417 BLAKE2B 8bd8767a184790aea7b6a63383a56d25de54c68a044a6549683a979910bc6d6d8d518bcd71acd14b393f12a8c43cd8c7ba6bac1775f7ed28314bf56d4a97f9fd SHA512 8e2d095bfa5e56a10f9187894c34d1b8a4e6b3562c10c29ce374f5efde918f1d097e2678f044a838b31778bd7f9333c7fa7c41d2f9fc2011d263d4ea0831bf04
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.2_p20140105-r2.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.2_p20140105-r2.ebuild
deleted file mode 100644
index 6744bc439b0b..000000000000
--- a/app-misc/ddccontrol/ddccontrol-0.4.2_p20140105-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
-HOMEPAGE="http://ddccontrol.sourceforge.net/"
-COMMIT_ID="9d89d8c0b959a4da62ecc50fb2aeb23142d4bfb4"
-SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gtk nls +pci static-libs"
-S=${WORKDIR}/${PN}-${COMMIT_ID}
-
-RDEPEND="app-misc/ddccontrol-db
-	dev-libs/libxml2:2
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( sys-devel/gettext )
-	pci? ( sys-apps/pciutils )"
-DEPEND="${RDEPEND}
-	dev-perl/XML-Parser
-	dev-util/intltool
-	sys-kernel/linux-headers
-	doc? (
-		>=app-text/docbook-xsl-stylesheets-1.65.1
-		>=dev-libs/libxslt-1.1.6
-		app-text/htmltidy
-	)"
-
-src_prepare() {
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467574
-	sed -i '/;Application/d' src/gddccontrol/gddccontrol.desktop.in || die
-
-	# ppc/ppc64 do not have inb/outb/ioperm
-	# they also do not have (sys|asm)/io.h
-	if ! use amd64 && ! use x86 ; then
-		local card
-		for card in sis intel810 ; do
-			sed -r -i \
-				-e "/${card}.Po/d" \
-				-e "s~${card}[^[:space:]]*~ ~g" \
-				src/ddcpci/Makefile.{am,ini} || die
-		done
-		sed -i \
-			-e '/sis_/d' \
-			-e '/i810_/d' \
-			src/ddcpci/main.c || die
-	fi
-
-	## Save for a rainy day or future patching
-	touch config.rpath ABOUT-NLS
-	eautoreconf
-	intltoolize --force || die "intltoolize failed"
-}
-
-src_configure() {
-	# amdadl broken, bug #527268
-	econf \
-		--htmldir='$(datarootdir)'/doc/${PF}/html \
-		--disable-gnome-applet \
-		--disable-amdadl \
-		$(use_enable doc) \
-		$(use_enable gtk gnome) \
-		$(use_enable nls) \
-		$(use_enable pci ddcpci) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.4.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.4.ebuild
deleted file mode 100644
index 5421c981fa01..000000000000
--- a/app-misc/ddccontrol/ddccontrol-0.4.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
-HOMEPAGE="http://ddccontrol.sourceforge.net/"
-SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gtk nls +pci static-libs"
-#S=${WORKDIR}/${PN}-${COMMIT_ID}
-
-RDEPEND="app-misc/ddccontrol-db
-	dev-libs/libxml2:2
-	app-arch/xz-utils
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( sys-devel/gettext )
-	pci? ( sys-apps/pciutils )"
-DEPEND="${RDEPEND}
-	dev-perl/XML-Parser
-	dev-util/intltool
-	sys-kernel/linux-headers
-	doc? (
-		>=app-text/docbook-xsl-stylesheets-1.65.1
-		>=dev-libs/libxslt-1.1.6
-		app-text/htmltidy
-	)"
-
-src_prepare() {
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467574
-	sed -i '/;Application/d' src/gddccontrol/gddccontrol.desktop.in || die
-
-	# ppc/ppc64 do not have inb/outb/ioperm
-	# they also do not have (sys|asm)/io.h
-	if ! use amd64 && ! use x86 ; then
-		local card
-		for card in sis intel810 ; do
-			sed -r -i \
-				-e "/${card}.Po/d" \
-				-e "s~${card}[^[:space:]]*~ ~g" \
-				src/ddcpci/Makefile.{am,ini} || die
-		done
-		sed -i \
-			-e '/sis_/d' \
-			-e '/i810_/d' \
-			src/ddcpci/main.c || die
-	fi
-
-	## Save for a rainy day or future patching
-	touch config.rpath ABOUT-NLS
-	eautoreconf
-	intltoolize --force || die "intltoolize failed"
-}
-
-src_configure() {
-	# amdadl broken, bug #527268
-	econf \
-		--htmldir='$(datarootdir)'/doc/${PF}/html \
-		--disable-gnome-applet \
-		--disable-amdadl \
-		$(use_enable doc) \
-		$(use_enable gtk gnome) \
-		$(use_enable nls) \
-		$(use_enable pci ddcpci) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.4_p20180123.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.4_p20180123.ebuild
deleted file mode 100644
index ef19bb42b26a..000000000000
--- a/app-misc/ddccontrol/ddccontrol-0.4.4_p20180123.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
-HOMEPAGE="http://ddccontrol.sourceforge.net/"
-COMMIT_ID="7c74181ed03839fb91e36c6012784cfce2ebe1a5"
-MY_PV=${COMMIT_ID:-${PV}}
-SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gtk nls +pci static-libs"
-S=${WORKDIR}/${PN}-${COMMIT_ID}
-
-RDEPEND="app-misc/ddccontrol-db
-	dev-libs/libxml2:2
-	app-arch/xz-utils
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( sys-devel/gettext )
-	pci? ( sys-apps/pciutils )"
-DEPEND="${RDEPEND}
-	dev-perl/XML-Parser
-	dev-util/intltool
-	sys-kernel/linux-headers
-	doc? (
-		>=app-text/docbook-xsl-stylesheets-1.65.1
-		>=dev-libs/libxslt-1.1.6
-		app-text/htmltidy
-	)"
-
-src_prepare() {
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467574
-	sed -i '/;Application/d' src/gddccontrol/gddccontrol.desktop.in || die
-
-	# ppc/ppc64 do not have inb/outb/ioperm
-	# they also do not have (sys|asm)/io.h
-	if ! use amd64 && ! use x86 ; then
-		local card
-		for card in sis intel810 ; do
-			sed -r -i \
-				-e "/${card}.Po/d" \
-				-e "s~${card}[^[:space:]]*~ ~g" \
-				src/ddcpci/Makefile.{am,ini} || die
-		done
-		sed -i \
-			-e '/sis_/d' \
-			-e '/i810_/d' \
-			src/ddcpci/main.c || die
-	fi
-
-	## Save for a rainy day or future patching
-	touch config.rpath ABOUT-NLS
-	eautoreconf
-	intltoolize --force || die "intltoolize failed"
-}
-
-src_configure() {
-	# amdadl broken, bug #527268
-	econf \
-		--htmldir='$(datarootdir)'/doc/${PF}/html \
-		--disable-gnome-applet \
-		--disable-amdadl \
-		$(use_enable doc) \
-		$(use_enable gtk gnome) \
-		$(use_enable nls) \
-		$(use_enable pci ddcpci) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index b8b21c4dcade..1d6577852762 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -1,9 +1,7 @@
 AUX dvtm-0.15-gentoo.patch 961 BLAKE2B 611e19b936957c80eb234186a4199f32e83aefc7a3be90b6b896e9655dd7b1aa0b6528bb7f2fc92f40d448823990f60f5d58726e7358f6ce8304875ae2dc8903 SHA512 dd660b77457326949d41e80527fc81738c3a54f957f47d2bff94c9ee84dbbc5d2f31d43db9e85311826398c50927d18711816dfabba3ce9cddde0da66e15fe09
 AUX dvtm-0.15-stop-installing-terminfo.patch 474 BLAKE2B a2a1552592b51bc21d817039b3f09e8108c36e3cdb77c9b6f43f12ebc3f856e9a0d21e9ec8fc82f843166ad16ebf9644ccbd9fc8a80746ce9670d9b7ce191653 SHA512 cea8b8e6974ffc6d891fa176c1d7ef67dfb994bea779b3e7485094f4cd414b8be928ecb0db14e16ce5508b0454465084cde37ee4d09de21f91e18a5a2958931b
 AUX dvtm-9999-gentoo.patch 426 BLAKE2B b5cd8066a16005b240c5725374ea31fa42394076ea477f9ed35576b57a2d816123fbd4adfd877a092b56ecd42f321d4a092a20b20a7848a16df8fdb93fcfb7d3 SHA512 ee3d94108e8d74ef4777c2bdbb2887af9a4f62832311524cde7a69b0307a71edd89616e475c486745b2f5461932cb13cb46dbb2a6ab4af0a8ad8caae92e10275
-DIST dvtm-0.14.tar.gz 35893 BLAKE2B 3fc98614f4a8d3013a98a0e2766c2827a5d9f1046fb32a38b9e26de8c34d6ae03ef16294c5e80aab277e8abc529110560eb1d2b987007a9ffe990b1cbe362483 SHA512 d47f55b4ce47582f665ac5b5d86bb9137722f65b157bdd80aaaf45a2cd8d783a3b0718886c7a7ea1d900762359316c2d76816460dac03484e122d43c64f57dd6
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
-EBUILD dvtm-0.14-r1.ebuild 1498 BLAKE2B 6c302340c26178aac39dd6faef7071c2c325998470dacf015504c31fb1146151259b556742b2d70e60f1da4762654c8e281da70d7bb57ffcc2ad4a9b0b9dbefd SHA512 4b3df60690e4468269eb614d04166ab953159da9bcb807767c3afb4f153091e17cc6722f80d30c7028cdcd936748a7bde1fc6253c209c6fad2ff00079bd3b298
 EBUILD dvtm-0.15-r2.ebuild 1251 BLAKE2B ca2566bbfce7e9ece7adf4b02b02ebee3d381b23c02219970837f286f6e6d9c15c2dac78a6f51cfc39bc2454920e5fe19fc47aa623df7aeff3d53c9ba2489550 SHA512 0265a5d734176a3c23ea3cd609a13ba202bf4b199471c37ef9e652eb5a78cb58a1cb5d6367c9e66b18202519b826583160993fb202900da43a3fc0b32300815b
 EBUILD dvtm-0.15-r3.ebuild 1246 BLAKE2B 930eea360ee8e5a801e6f4ff3f890c57bffe069f70b22bbb746297ab1fb42e1da23a53642ecadb939c10abddbcc880ef47606767f91334a25ccc4f194fe5f38b SHA512 30122399a8a54a7b3fad309ad8f20f2c8ffd5252f0b5c7a4540b4c8ba7fdf23aa5336d7374b204855d40d82387610a95c5335f21694b5f5729a59697b57cb3fe
 EBUILD dvtm-9999.ebuild 1250 BLAKE2B d4d4479d93a67b41de5ac9b514e4241479a34ffe981e1a6264e36ea05ba8eaf3f788d314f3488dc089f0b046563294eaefbd4f9c5d9ee24a1412ff8ec43ffd58 SHA512 66a0ef9a78ab35d0f40ca41b6d1a1bd66beb4e1df54d3961905421ddd0f923a6accf2672fb2927b3cfb3062f006cad617ce0defd7bf3ebf78361b613b08e3b2e
diff --git a/app-misc/dvtm/dvtm-0.14-r1.ebuild b/app-misc/dvtm/dvtm-0.14-r1.ebuild
deleted file mode 100644
index c9a8065da403..000000000000
--- a/app-misc/dvtm/dvtm-0.14-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit savedconfig toolchain-funcs
-
-DESCRIPTION="Dynamic virtual terminal manager"
-HOMEPAGE="https://www.brain-dump.org/projects/dvtm/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
-else
-	SRC_URI="https://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="unicode"
-
-DEPEND="sys-libs/ncurses:0=[unicode?]"
-RDEPEND="${DEPEND}
-	!>=sys-libs/ncurses-6.1"
-
-src_prepare() {
-	sed -i \
-		-e 's|FLAGS =|FLAGS +=|' \
-		-e 's|-I/usr/local/include||' \
-		-e 's|-L/usr/local/lib||' \
-		-e 's|-Os||' \
-		config.mk || die "sed config.mk failed"
-	use unicode || {
-		sed -i \
-			-e 's|-lncursesw|-lncurses|' \
-			config.mk || die "sed config.mk failed"
-	}
-	sed -i \
-		-e '/strip/d' \
-		-e 's:@tic :@tic -o ${DESTDIR}${PREFIX}/share/terminfo :g' \
-		Makefile || die "sed Makefile failed"
-
-	restore_config config.h
-}
-
-src_compile() {
-	local msg=""
-	use savedconfig && msg=", please check the configfile"
-	emake CC=$(tc-getCC) ${PN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-
-	insinto /usr/share/${PN}
-	newins config.h ${PF}.config.h
-
-	dodoc README
-
-	save_config config.h
-}
-
-pkg_postinst() {
-	elog "This ebuild has support for user defined configs"
-	elog "Please read this ebuild for more details and re-emerge as needed"
-	elog "if you want to add or remove functionality for ${PN}"
-}
diff --git a/app-misc/emelfm2/Manifest b/app-misc/emelfm2/Manifest
index dd5c51c29101..c895f89ce3c3 100644
--- a/app-misc/emelfm2/Manifest
+++ b/app-misc/emelfm2/Manifest
@@ -1,5 +1,4 @@
 DIST emelfm2-0.9.1.tar.bz2 1217126 BLAKE2B 994fb55f9aed452cf0b01b7a26d0b94b8a02dace54eb34f764fe6d9a8c6ea3820d4fce3242daa452e972fd6e630d564ee3781af6480c3a812d4f4bbc66caae68 SHA512 bd3a1ad2338c80d6824a2a84736470ecfa7e93f455cc8e3243944833807fe9b3544e2fea6bd6ccbddaf0188ad89ce616ed146271f6ffabec80f5dfb2f1ad6f57
 EBUILD emelfm2-0.9.1-r1.ebuild 1988 BLAKE2B ac7a1ad1c066a94c8570461ff7e9c8c4e8e35ea265de56777a64144116ba179d83963b2d89ca9425fc6e3d04343ed78035f1dd7f57e4efc55d9d77fd77fcc4b3 SHA512 9a1375896d3f337eb332c1456d54a259e35f91ee5a8b56cd8e3a6a41fd7c15acfac6c3bc9984dbddc85b01657a9707892b5e5e69a9a1deae63d1dc8e02b9cf83
-EBUILD emelfm2-0.9.1-r2.ebuild 2036 BLAKE2B 938c964ce1522a4a830cf754ed94578d228d8aa65be953f1cb7b1600412ac2f36c9ba102cfdb67e52213637af2d9bd8f51984cd66036d661ad66985a3e938436 SHA512 ce9d208a29415e801167cc97f638e73ad4d0ef3a4a7ab0e56e28873b893e602ccda5125a042179a4a837d898d14e235b3a3ce3341656a42ca384c4b5a97e2f97
 EBUILD emelfm2-0.9.1-r3.ebuild 2348 BLAKE2B e6d7c6d3ebd55131e4b8052552b417f249aace60d08158ad7357881594a56eb003d12f97d18d666a20901f3375b1eedb161e7ab801e02bace351f059dbb5d4bf SHA512 f2c1cae27cedfe51165644eb017fe3b4516914c8869c66672395bc97aa2e40aefaa8e5d8638bf3454dcc36d2f67af3f54b0ccff6f620e09e3fa34d4e5dacaab8
 MISC metadata.xml 452 BLAKE2B 21a44f257e58a0a62663b759bdbabfe22c548d2be874365eb4584ce196846890f3342a20ed4be0d4515e1350a5c795b051769003602cfdbdeb35e485d77a4282 SHA512 a42d336a0ee1d8949d2b35e98ff372ac8ddd3bdc5d4733b6195abd1c5e5cfa766bab721a9dc63cfa6ae34fb861a9621da5ea041889638d4bcb6ac2ac9b17fbc5
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild
deleted file mode 100644
index 1679c68b7eb3..000000000000
--- a/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A file manager that implements the popular two-pane design"
-HOMEPAGE="https://github.com/tom2tom/emelfm2"
-SRC_URI="http://emelfm2.net/rel/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl ansi gimp gtk3 kernel_linux nls policykit spell udisks"
-
-EMELFM2_LINGUAS=( de fr ja pl ru zh_CN )
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	!gtk3? ( >=x11-libs/gtk+-2.12:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	acl? ( sys-apps/acl )
-	gimp? ( media-gfx/gimp )
-	policykit? ( sys-auth/polkit )
-	spell? ( >=app-text/gtkspell-2.0.14:2 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-REQUIRED_USE="
-	spell? ( !gtk3 )
-"
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e 's:@$(BIN_MSGFMT):$(BIN_MSGFMT):g' \
-		-e 's:@$(CC):$(CC):g' \
-		-e 's:dbus-glib-1::' \
-		Makefile || die
-
-	local lingua
-	for lingua in ${EMELFM2_LINGUAS[@]}; do
-		has ${lingua} ${LINGUAS-${lingua}} || mv po/${lingua}.po{,.unwanted}
-	done
-}
-
-src_configure() {
-	myemelconf=(
-		$(usex acl WITH_ACL=1 WITH_ACL=0)
-		$(usex ansi WITH_OUTPUTSTYLES=1 WITH_OUTPUTSTYLES=0)
-		$(usex gimp WITH_THUMBS=1 WITH_THUMBS=0)
-		$(usex gtk3 'GTK3=1 GTK2=0' 'GTK3=0 GTK2=1')
-		$(usex kernel_linux WITH_KERNELFAM=1 WITH_KERNELFAM=0)
-		$(usex nls I18N=1 I18N=0)
-		$(usex policykit WITH_POLKIT=1 WITH_POLKIT=0)
-		$(usex spell EDITOR_SPELLCHECK=1 EDITOR_SPELLCHECK=0)
-		$(usex udisks WITH_UDISKS=1 WITH_UDISKS=0)
-		DOCS_VERSION=1
-		STRIP=0
-		WITH_TRANSPARENCY=1
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake \
-		LIB_DIR="/usr/$(get_libdir)" \
-		PREFIX="/usr" \
-		${myemelconf[@]}
-}
-
-src_install() {
-	emake \
-		LIB_DIR="${D}/usr/$(get_libdir)" \
-		PREFIX="${D}/usr" \
-		XDG_DESKTOP_DIR="${D}/usr/share/applications" \
-		${myemelconf[@]} \
-		install $(usex nls install_i18n '')
-
-	newicon icons/${PN}_48.png ${PN}.png
-}
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index e9b9975dd586..dbb5ba84b2cf 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -7,6 +7,5 @@ DIST fdupes-1.51.tar.gz 48942 BLAKE2B b2673a5601d0bc1d7bb0d312c3d4fbf67494916e94
 DIST fdupes-1.6.1.tar.gz 20869 BLAKE2B 683b75b44ea4662e555a81405d6c9c291c7980b579c866ad953e18ad8c92beb37c2b6f7ca29ea4e40269ef751851dd8afbb77b0bffb5139bbfbcc0d41ab23a5a SHA512 6c6662b70068c2f48f4be64a6830c81a66852d650391d0756f20b9ac0df7d70c1a32918bd7cbd50e19de524d9ebc09ea338c19636e1807b071eb96b325e641db
 EBUILD fdupes-1.5.1.ebuild 966 BLAKE2B e68e295be16aa80d712fca947b259144d2a53bfb26629341b54699d9c1fa3547d4caae7713d15da3c2e75b21c3e241b10cc27cec6860d49ffea3a278d121eb78 SHA512 4d3eff880cbac6a6bbd94c5ad59ce229d8200deb2c8bae84bd9a89f5c346c49dd0f5787417f03d706271041d8752b4156a508cd977ed510c18f64820ae88ab07
 EBUILD fdupes-1.6.1-r1.ebuild 781 BLAKE2B 5a06c5e3e377a4ff287b037b909badb8c796b0b903b88312202a1f153c35b185fd3fda4833f7e2b7807b424442fa4185a512c9a3c226abda55424b0bb1a9ea88 SHA512 94926bdd838eb754e4f59ab049f45e377ef9485c17970a67d8e52cc3ce9713e64a97261a0f93ddaa7e09b4a507b380c8af4566ed1c26bae0b99ef09c2f5895ab
-EBUILD fdupes-1.6.1.ebuild 707 BLAKE2B 6c1f60031766bb4d10490242dfcca71afd27875802e742a3bddfae3e976610dc5252ba4ccfe71e036efee845f014a83818b493bf6202271743970537d6846845 SHA512 0be0c0134f22a83e3e862b828d151fc20ef76635e33a77a4c6c0e93eb2a4197951be64c64a698466e61b3238aa06edac4593bcf727fc7d54c50597b22c3a5278
 EBUILD fdupes-9999.ebuild 676 BLAKE2B 061f5b9146f1a815ae16a056ddc95bf0f8bbcdda0b22e704986018df8d178582cfba854205814d41a7587433200eef4e326edc21b27f2715d1f641366e568077 SHA512 f04df62de8ddd45ad72015f8d346f15f4b81c066be0ff53e0f301ff5eb370ecc74192e2e03265f3fe729059cd1d330623eacca57177b1d8b9e777f8a090608d5
 MISC metadata.xml 353 BLAKE2B 39808fa78e13623faaeb1acf023d3bba06fb38635f315144fe9f0713b209e5c31ba36073f03102bf55fbc216c00347cef077f4ddd9e5fe585104bbeac954ac46 SHA512 a918f701cfd176d6281ce0703be9ced24bba96090d0c6ed0647e20909cc420336506c943cd5e82050ebba4618dba28b8543afc9baa394c35e5bcdd3d7ffebb8c
diff --git a/app-misc/fdupes/fdupes-1.6.1.ebuild b/app-misc/fdupes/fdupes-1.6.1.ebuild
deleted file mode 100644
index 2858047c4d5b..000000000000
--- a/app-misc/fdupes/fdupes-1.6.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Identify/delete duplicate files residing within specified directories"
-HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
-SRC_URI="https://github.com/adrianlopezroche/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-src_prepare() {
-	append-lfs-flags
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	dobin fdupes
-	doman fdupes.1
-	dodoc CHANGES CONTRIBUTORS README TODO
-}
diff --git a/app-misc/go-jira/Manifest b/app-misc/go-jira/Manifest
index b6c0cfa3304a..737dfc720a2e 100644
--- a/app-misc/go-jira/Manifest
+++ b/app-misc/go-jira/Manifest
@@ -24,6 +24,8 @@ DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip 60546 BLAKE2B e775860f49c6ee09a6c48902d38fdf5d2d77af4cd405d8d303902170e46493301d4aa873a48b4d12a16d92dafaa65290de1fd3a42545025fbfc82f15a3881e8d SHA512 53dc5484f488ae1f8d0eb672c3431bbf9fce33dfcee83dda7929103e3650559cf703f601716984a640422f01cc640860dba0b47e16aef04d0d2452a266fefbf9
 DIST github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod 34 BLAKE2B 85d050ce327c96665aac0e7954761b42f6d30256c4620a15a171ae3a92abf4ed45d026973d9d74fc07b90617885d2c002e45cac9a38f03f12018d86c091981fd SHA512 547267e05f39979e80906176e520bc4e74e48f9f96ffcd9d862f974972eb8238b28ed0a0ac891e3e0ebd6d635de98192a38534155fed9eaf44ba0b94c5ff1d9d
 DIST github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip 4266 BLAKE2B 962bac7897b7df9172d558894454576e60a8f0baf852e19ab80e658066daa611cf59296d715deaa4bccd4494ebc81e5da32d9d723490834c4a764c6cc39e5ec5 SHA512 e7e9551abfed9a626f8054630faa16cf7ce23122e810f0ac36c3dc63131b142d8c23b615164f54f2a6669721d0bc5ce0a03973f5e547b86fa79c0cd94e2197d4
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip 127156 BLAKE2B 1d06924d2e9fadaefa1a506c16830c88e983c3d14b3bb9a82c216879531ffb664dc90de8fbf3b6025ae8b5e7cee1a9ecb900a7eabb85f6144d304fab7cacf21f SHA512 365bb5271fded39749a69bdfaee6e29740b26b84e0a737fedab3e50cc0416a098f0ed0a14704dc1ec9bc1eb81b8827de4a151024f5ea3e6c75a9fb9abfc14d62
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
 DIST github.com%2Fguelfey%2Fgo.dbus%2F@v%2Fv0.0.0-20131113121618-f6a3a2366cc3.mod 34 BLAKE2B 5572dbfdd37d7afbeb92db22e8bc3d56290a94f75da52dc19529dd78c1cc7d837299320a2a3b39c7a611a8d85a8e6bcba6955ba5d68fb3f43303b5db162ef122 SHA512 f6e8c3d792032a50394f49a5ecf9470cfa3ead5b3a044a8a079345757cb2e4dea08a54876f79555b3a6c5618ba4674301b454cf47d0f046b68018f269960d7b1
@@ -72,12 +74,14 @@ DIST github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.0.zip 5001 BLAKE2B 47d77672105ed21
 DIST github.com%2Ftmc%2Fkeyring%2F@v%2Fv0.0.0-20171121202319-839169085ae1.mod 30 BLAKE2B 05ce47a24391f36a8b83c6e3eb435b0487d76e94bb446511e448b761d201d0078d48704d6bb7f97f9b11117889e1c27056af5bf805db4766036b12ee4112612f SHA512 e05888b5a0b36d73c131f3522633311e919067dc751af9892b4b784b576ef4c76f816d2204c59e74c615e2f6c4f5fdfa8ca0d38d61fcab14c68dd100609f897c
 DIST github.com%2Ftmc%2Fkeyring%2F@v%2Fv0.0.0-20171121202319-839169085ae1.zip 7686 BLAKE2B b09bc829a9ff39c0985d8a02e7400e35dbd33a3c48ea22e8a07872fb120b10129f4c230b3ea87cafd56c7b1fdb7cf73c1919af0679e8607690a1122d6421b50d SHA512 33439b0b3e31496917695c9fcfff87b8206a66a77362ee54356d0272bdedb95d7b51e031ce44cb6e1ae105ba6bf2dd17033c544553613311c8e5b4f757955aa5
 DIST go-jira-1.0.23.tar.gz 115977 BLAKE2B 0b5ff8bbe2b2faeedd729daadd0646a89e5a68e26c9acf8e22750f490c7bcbd592485c2b86378036a1bb199a73a0000775b56355731d42460f8d89339b49b820 SHA512 d3fcc223c96cfc1885c7ee54e50518c6d5826b8b2231afa280b8c90c01e6413ddb0569b308ee9eae6d26bf87e59fb0913425481e6aecb78cb339f14e01194f9c
+DIST go-jira-1.0.26.tar.gz 129521 BLAKE2B 9ab96e8c6838d6906050a0ad6d8b96a97b2ea08030910c4e25b7dad2cefa777667107ec1a677fb7c2aa0835f0bbc885a75da057d8030199d1225d66e3bba3d67 SHA512 04b22cdbf95331784177816a60ee6c915a21513d13185062b495c2fe98f5077f9b8e4847ed05f07f69f8dba27c7de8873e9cd1cc51532dc47e6f52d4513a3857
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.zip 1744314 BLAKE2B 2c41a3aa7252043bb516dc4933165a1f4340d1bf215c7738dc6b06c80f4fd07dfa69b4a28c19753c86270237dc81dddf216eb02e60276b37d2f09986b4256366 SHA512 f565387ef2ef70d453910177afc66dee6fdf079e03946837f92108e19d29c510de26a647ee12c70f9bbb9d04c4b86007f0d41ca774caec85e597691eb698cd0c
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20171102191033-01c190206fbd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20171102191033-01c190206fbd.zip 1278070 BLAKE2B ffb4bc459bac06ea80c224db708dfce7e3c8573eee949aa7d91317b659535d21e9130c98a4ad45619ae5d71c4cb88a1593e01aaa37a62f515187995cf0ef5feb SHA512 bd82bcc2f624c2b2e206d255cb54b4827f4015b4391ee9d69fed44cf896d7c2b81e5a2b03da21dc6d925e1738ca237613c62b650580b4b41b9844ea22cb9ec2f
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180727230415-bd9dbc187b6e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180727230415-bd9dbc187b6e.zip 1279118 BLAKE2B afd7d6c0300d764d5e681c3f30e6eb62c05f339cdf30d7799f2efc9292eb3707375bc750b1a82b86f64ae9d9a6cc3718dc8cce1668ea1483f475ba2dd4b2a0c9 SHA512 457f46d354bf9c8ac154376a149a40282df7435786f0616f405dd6b9b364fc7cd3aadbe1dce5e3309603631ffd80d80b4c9cc7c15aa797db59dc435f05fffcf7
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST gopkg.in%2F!alec!aivazis%2Fsurvey.v1%2F@v%2Fv1.6.1.mod 38 BLAKE2B 6092091538094feef5cb4ea7245205c239512d229fed4b84f766f9a1a97148d81885f03524b334f67cc500f43f9806b38f62e377e3c3de119eaa78f0a0fb6c75 SHA512 6a6205d757eed7f38f37ecb1187580a26a5a68bdcc822d9bc280cf4be8c02557606545e66de4dac1e799b7d4f2ecc8c88b7f1aeee8b67ef438a636b6323fff85
 DIST gopkg.in%2F!alec!aivazis%2Fsurvey.v1%2F@v%2Fv1.6.1.zip 74709 BLAKE2B 64a15a1a4fd4be1e191a38bdf53c979b99ecb0531354a6da0eec4f52feda417da814a3ee75efeb36d5ed66fb1b87674728ca38bea77bc5a5d2eef614ed42971e SHA512 4dc301ecb78cd172287dc833e9f0310e2161ee07616e37f341e6b54a9b56f5fe526c9dfedd6de89220cbb397aab325db00500dfbb99c3c006e4ef71703319207
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
@@ -92,4 +96,5 @@ DIST gopkg.in%2Fop%2Fgo-logging.v1%2F@v%2Fv1.0.0-20160211212156-b2cb9fa56473.zip
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 EBUILD go-jira-1.0.23.ebuild 5797 BLAKE2B 41a59afd665f8df634a26e09909c5ec46bbc745c7107732ba838288002119fcd8b79a4ac6dabefb9240afd6a92c565e152a7596f21d109709844fbc242e1f1d4 SHA512 fbcd3e5f71753ef4aaa19403911fbc4ab83374f20d45ce9c47b77d5299b3815323ec257987f6f2416b3f98b93743daf5efaedcee659423bc80e5d2c68587f3f6
+EBUILD go-jira-1.0.26.ebuild 5941 BLAKE2B aa0395fc7138d13b9265406bb3080b12ecacd02a2651565720e9b2c95aea0700c06ad54fe8d15bb6e4939b5239c79f6dc279162437848f2deb2d0b1d3ea426c8 SHA512 bb5db222659e28b6f29e4c1c3c0d781a8348985257e6cac199b60d5f8ebdba76d684c4d5bb622258d574f11eece69611dac18b2ee7feb1909b82662ed467fd28
 MISC metadata.xml 339 BLAKE2B 2b1e03ce70c1b7ff8244dc3673ce59305a6c9eabd2fc9d52209f3c85db21da04490378c95fbe647c21a0d26533d078a5b3842b4a41703a46aa670dc8dc569913 SHA512 f05c51962c3d381861ca4486baf4c1e4207c19ba87fb8113c4fd66c3a6b526ee5d9a74c98395631a7fca007fcbe2902464b02fb927dcc45b9f5ea0d4fcd96ef0
diff --git a/app-misc/go-jira/go-jira-1.0.26.ebuild b/app-misc/go-jira/go-jira-1.0.26.ebuild
new file mode 100644
index 000000000000..b09bfea919e7
--- /dev/null
+++ b/app-misc/go-jira/go-jira-1.0.26.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# bash-completion-r1 can be added once we can generate completion scripts
+inherit go-module
+
+DESCRIPTION="A simple JIRA commandline client in Go"
+HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
+
+EGO_SUM=(
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver v1.5.0"
+	"github.com/Masterminds/semver v1.5.0/go.mod"
+	"github.com/Masterminds/sprig v2.21.0+incompatible"
+	"github.com/Masterminds/sprig v2.21.0+incompatible/go.mod"
+	"github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b"
+	"github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/cheekybits/genny v1.0.0/go.mod"
+	"github.com/coryb/figtree v0.0.0-20180728224503-071d1ef303df"
+	"github.com/coryb/figtree v0.0.0-20180728224503-071d1ef303df/go.mod"
+	"github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d"
+	"github.com/coryb/figtree v1.0.1-0.20190907170512-58176d03ef0d/go.mod"
+	"github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e"
+	"github.com/coryb/kingpeon v0.0.0-20180107011214-9a669f143f2e/go.mod"
+	"github.com/coryb/oreo v0.0.0-20180804211640-3e1b88fc08f1"
+	"github.com/coryb/oreo v0.0.0-20180804211640-3e1b88fc08f1/go.mod"
+	"github.com/davecgh/go-spew v1.1.0"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/fatih/camelcase v1.0.0"
+	"github.com/fatih/camelcase v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.5.2"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3"
+	"github.com/guelfey/go.dbus v0.0.0-20131113121618-f6a3a2366cc3/go.mod"
+	"github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c"
+	"github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c/go.mod"
+	"github.com/huandu/xstrings v1.2.0"
+	"github.com/huandu/xstrings v1.2.0/go.mod"
+	"github.com/imdario/mergo v0.3.7"
+	"github.com/imdario/mergo v0.3.7/go.mod"
+	"github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3"
+	"github.com/jinzhu/copier v0.0.0-20180308034124-7e38e58719c3/go.mod"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.4"
+	"github.com/kr/pty v1.1.4/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.3"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-runewidth v0.0.6"
+	"github.com/mattn/go-runewidth v0.0.6/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.3"
+	"github.com/olekukonko/tablewriter v0.0.3/go.mod"
+	"github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15"
+	"github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15/go.mod"
+	"github.com/pkg/errors v0.8.0"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/stretchr/testify v1.2.2"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/theckman/go-flock v0.4.0"
+	"github.com/theckman/go-flock v0.4.0/go.mod"
+	"github.com/tidwall/gjson v0.0.0-20180711011033-ba784d767ac7"
+	"github.com/tidwall/gjson v0.0.0-20180711011033-ba784d767ac7/go.mod"
+	"github.com/tidwall/match v1.0.0"
+	"github.com/tidwall/match v1.0.0/go.mod"
+	"github.com/tmc/keyring v0.0.0-20171121202319-839169085ae1"
+	"github.com/tmc/keyring v0.0.0-20171121202319-839169085ae1/go.mod"
+	"golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb"
+	"golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod"
+	"golang.org/x/net v0.0.0-20171102191033-01c190206fbd"
+	"golang.org/x/net v0.0.0-20171102191033-01c190206fbd/go.mod"
+	"golang.org/x/sys v0.0.0-20180727230415-bd9dbc187b6e"
+	"golang.org/x/sys v0.0.0-20180727230415-bd9dbc187b6e/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"gopkg.in/AlecAivazis/survey.v1 v1.6.1"
+	"gopkg.in/AlecAivazis/survey.v1 v1.6.1/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/coryb/yaml.v2 v2.0.0-20180616071044-0e40e46f7153"
+	"gopkg.in/coryb/yaml.v2 v2.0.0-20180616071044-0e40e46f7153/go.mod"
+	"gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473"
+	"gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/go-jira/jira/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/jira-${PV}"
+
+src_compile() {
+	go build -o jira  cmd/jira/main.go || die
+	# these cause failures.
+#	./jira --completion-script-bash > jira.bash || die
+#	./jira --completion-script-zsh > jira.zsh || die
+}
+
+src_install() {
+	dobin jira
+	dodoc {CHANGELOG,README}.md
+	# This can be uncommented once we can generate completion scripts
+#	newbashcomp jira.bash jira
+#	insinto /usr/share/zsh/site-functions
+#	newins jira.zsh _jira
+}
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 35412ecd0ec5..da8677d2f709 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,6 +1,6 @@
 AUX graphlcd-base-2.0.0-musl.patch 334 BLAKE2B 4930f69284c65ac852c54ce921fc3860bfbb34b2402daad3c58c0bc1aed704065db6b8698bd004b0eda95d8bc23b7a39ebdef42a529c40ca766fc685d21efbb4 SHA512 02f5628e59d0d0144ab51d8eba5abc914d7fbb10997d0ed90fddaad4f359b7cf390154bf70743a7edda9ab14fd56d4af37f9f1761385fa7965013be7623cdfaf
 DIST graphlcd-base-1.0.2.tar.bz2 522753 BLAKE2B 68612f197d340a7baba4f88b5f7ac4e96de1882d132a0a680fa4b81233094cc67d900cb05d855d74dd5dd777440d3be92faf74b4098e1c8027e09b50e602a40b SHA512 625fe6d0c3dcc698522aa1653ba8d22bdb377cbd187de8c26ab3005de4990c8c02f4c0ee477d27ed3930f5d69ea78eb3cd40a79c6272820c67f587e7fabd30ca
 DIST graphlcd-base-2.0.0.tar.bz2 522921 BLAKE2B 34223a84b11fef03d6dbd3f9d5f17362206823a5df0828b7494e88809f313ccd82ccc3ef62df129e6ccd6912a4152829a49c56024976aaf58fbf127d98b0903c SHA512 7fd0d558df16b845b4cd788f597552be85563b00d26d37181b3e0cc7cdc1a9eb00f2437b1c0dc6e9bb7851c6c9168dcc2d952898c1a371aeb8684b6c6aa8d995
-EBUILD graphlcd-base-1.0.2-r1.ebuild 2255 BLAKE2B d8f8b90faaf5e86fd14353f48ae9b20057dc4d966f78c49ef2db08f0574c58566b273718005d7b9b7a4ea68b2647e120eac63c2b49a3101b67e2db025289f525 SHA512 491e01907f5b0daa3d6104e2b67967266534095839e7d830e3bdfed9a36c57dc2948ca8bd3fc4a1d35668fe8fbeb6fd541b5ed1598c0aaaf36534f5a362b6aae
-EBUILD graphlcd-base-2.0.0.ebuild 2250 BLAKE2B 7b856460d8763263eb0a85d3c8eddafba126a81fb24a9adfaaabb16222e5b7c90bd0f0cb8eb6c7e4249f3aa153ac018eea7238efb3916d434520d8af44988f92 SHA512 420ddf7cf5b68158c5ce7e3f936b6d0d0f970bf9e890a0f489fb3cad7e7d47fc751c7362f7fb9af9bf94754700e85040fa099b126cabecaed7b36ea22e0440c4
+EBUILD graphlcd-base-1.0.2-r2.ebuild 2260 BLAKE2B 7a960a69fa4e1156fe07487207a1ab91fc8b6f324bd5d7803906d6eede089dae5bc22cabef9352ccc44a70319897f7008901cb86c261e9fad3c099ed00e66acf SHA512 dcc3c86ebca122bb90743961e4c8cca049124520b98b2511e37858e008fd5ab7dd34da76d9797763d76242f2a6cdf8ba8d6563fe41eccbdffeb03ce8a01140ea
+EBUILD graphlcd-base-2.0.0-r1.ebuild 2255 BLAKE2B 6ce25c403b1602079a59b5687d505d6d3fecf443bba119b4cee035f064c49ba6d60d5a2da17faa99fb83afcecc572ecec5d064d2dbcc52e4083ea7c3c1de0247 SHA512 0928035a4eda13629dd55bd4d7d14dec10945582014c50f6d865fb7648eb3d43b880619d90d32ec5dc17ce6666f53dda7e8bd66ce8b5af8f17a9a0213a5dce02
 MISC metadata.xml 1009 BLAKE2B a227fe76bfafa6f3aa6977ec5bd56959187999926e4c95436411e255db079d919fb174970b198bc8a26cb488f82e8466512342e00cca4f7a367e6d5730dc8f6b SHA512 8bccbe3bf3457e280fcbe9bded2cf5bb78f64ce528b5bed27249e33392f9fef6d2716744c08385df915e0839d9146b1e0fa2db7b46d574e9a7cedf4a8079240a
diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
deleted file mode 100644
index 3c1a30caae96..000000000000
--- a/app-misc/graphlcd-base/graphlcd-base-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature toolchain-funcs udev
-
-DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
-HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
-SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
-
-RDEPEND="
-	dev-libs/libhid
-	net-libs/libvncserver
-	freetype? ( media-libs/freetype:2= )
-	fontconfig? ( media-libs/fontconfig:1.0= )
-	graphicsmagick? ( media-gfx/graphicsmagick:0/1.3 )
-	imagemagick? ( <media-gfx/imagemagick-7 )
-	lcd_devices_ax206dpf? ( virtual/libusb:0 )
-	lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "HISTORY" "README" "TODO" "docs/." )
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.0-musl.patch" )
-
-src_prepare() {
-	default
-
-	# Change '/usr/local/' to '/usr'
-	# Change '/usr/lib' to '/usr/$(get_libdir)'
-	sed -e "34s:/usr/local:/usr:" -e "37s:/lib:/$(get_libdir):" -i Make.config || die
-
-	# Fix newer GCC version with the Futaba MDM166A lcd driver
-	sed -e "s:0xff7f0004:(int) 0xff7f0004:" -i glcddrivers/futabaMDM166A.c || die
-
-	tc-export CC CXX
-}
-
-src_configure() {
-	# Build optional drivers
-	if use lcd_devices_ax206dpf; then
-		sed -e "78s:#::" -i Make.config || die
-	fi
-	if use lcd_devices_picolcd_256x64; then
-		sed -e "81s:#::" -i Make.config || die
-	fi
-	if use lcd_devices_vnc; then
-		sed -e "72s:1:0:" -i Make.config || die
-	fi
-
-	# Build optional features
-	if ! use freetype; then
-		sed -e "59s:HAVE:#HAVE:" -i Make.config || die
-	fi
-	if ! use fontconfig; then
-		sed -e "62s:HAVE:#HAVE:" -i Make.config || die
-	fi
-	if use graphicsmagick; then
-		sed -e "69s:#::" -i Make.config || die
-	fi
-	if use imagemagick; then
-		sed -e "68s:#::" -i Make.config || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" UDEVRULESDIR="/lib/udev/rules.d" install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	udev_reload
-
-	optfeature "supporting the logitech g15 keyboard lcd." app-misc/g15daemon
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.2-r2.ebuild b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..8dab507a5d16
--- /dev/null
+++ b/app-misc/graphlcd-base/graphlcd-base-1.0.2-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature toolchain-funcs udev
+
+DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
+HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
+SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
+
+KEYWORDS="amd64 x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
+REQUIRED_USE="?? ( graphicsmagick imagemagick )"
+
+RDEPEND="
+	dev-libs/libhid
+	net-libs/libvncserver
+	freetype? ( media-libs/freetype:2= )
+	fontconfig? ( media-libs/fontconfig:1.0= )
+	graphicsmagick? ( media-gfx/graphicsmagick:0/1.3[cxx] )
+	imagemagick? ( <media-gfx/imagemagick-7 )
+	lcd_devices_ax206dpf? ( virtual/libusb:0 )
+	lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "HISTORY" "README" "TODO" "docs/." )
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.0-musl.patch" )
+
+src_prepare() {
+	default
+
+	# Change '/usr/local/' to '/usr'
+	# Change '/usr/lib' to '/usr/$(get_libdir)'
+	sed -e "34s:/usr/local:/usr:" -e "37s:/lib:/$(get_libdir):" -i Make.config || die
+
+	# Fix newer GCC version with the Futaba MDM166A lcd driver
+	sed -e "s:0xff7f0004:(int) 0xff7f0004:" -i glcddrivers/futabaMDM166A.c || die
+
+	tc-export CC CXX
+}
+
+src_configure() {
+	# Build optional drivers
+	if use lcd_devices_ax206dpf; then
+		sed -e "78s:#::" -i Make.config || die
+	fi
+	if use lcd_devices_picolcd_256x64; then
+		sed -e "81s:#::" -i Make.config || die
+	fi
+	if use lcd_devices_vnc; then
+		sed -e "72s:1:0:" -i Make.config || die
+	fi
+
+	# Build optional features
+	if ! use freetype; then
+		sed -e "59s:HAVE:#HAVE:" -i Make.config || die
+	fi
+	if ! use fontconfig; then
+		sed -e "62s:HAVE:#HAVE:" -i Make.config || die
+	fi
+	if use graphicsmagick; then
+		sed -e "69s:#::" -i Make.config || die
+	fi
+	if use imagemagick; then
+		sed -e "68s:#::" -i Make.config || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" UDEVRULESDIR="/lib/udev/rules.d" install
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	udev_reload
+
+	optfeature "supporting the logitech g15 keyboard lcd." app-misc/g15daemon
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.0-r1.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..07ed81f3ce63
--- /dev/null
+++ b/app-misc/graphlcd-base/graphlcd-base-2.0.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature toolchain-funcs udev
+
+DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
+HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
+SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
+REQUIRED_USE="?? ( graphicsmagick imagemagick )"
+
+RDEPEND="
+	dev-libs/libhid
+	net-libs/libvncserver
+	freetype? ( media-libs/freetype:2= )
+	fontconfig? ( media-libs/fontconfig:1.0= )
+	graphicsmagick? ( media-gfx/graphicsmagick:0/1.3[cxx] )
+	imagemagick? ( <media-gfx/imagemagick-7 )
+	lcd_devices_ax206dpf? ( virtual/libusb:0 )
+	lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "HISTORY" "README" "TODO" "docs/." )
+
+PATCHES=( "${FILESDIR}/${P}-musl.patch" )
+
+src_prepare() {
+	default
+
+	# Change '/usr/local/' to '/usr'
+	# Change '/usr/lib' to '/usr/$(get_libdir)'
+	sed -e "34s:/usr/local:/usr:" -e "37s:/lib:/$(get_libdir):" -i Make.config || die
+
+	# Fix newer GCC version with the Futaba MDM166A lcd driver
+	sed -e "s:0xff7f0004:(int) 0xff7f0004:" -i glcddrivers/futabaMDM166A.c || die
+
+	tc-export CC CXX
+}
+
+src_configure() {
+	# Build optional drivers
+	if use lcd_devices_ax206dpf; then
+		sed -e "78s:#::" -i Make.config || die
+	fi
+	if use lcd_devices_picolcd_256x64; then
+		sed -e "81s:#::" -i Make.config || die
+	fi
+	if use lcd_devices_vnc; then
+		sed -e "72s:1:0:" -i Make.config || die
+	fi
+
+	# Build optional features
+	if ! use freetype; then
+		sed -e "59s:HAVE:#HAVE:" -i Make.config || die
+	fi
+	if ! use fontconfig; then
+		sed -e "62s:HAVE:#HAVE:" -i Make.config || die
+	fi
+	if use graphicsmagick; then
+		sed -e "69s:#::" -i Make.config || die
+	fi
+	if use imagemagick; then
+		sed -e "68s:#::" -i Make.config || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" UDEVRULESDIR="/lib/udev/rules.d" install
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	udev_reload
+
+	optfeature "supporting the logitech g15 keyboard lcd." app-misc/g15daemon
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
deleted file mode 100644
index 14554e36bfde..000000000000
--- a/app-misc/graphlcd-base/graphlcd-base-2.0.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature toolchain-funcs udev
-
-DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
-HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
-SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
-
-RDEPEND="
-	dev-libs/libhid
-	net-libs/libvncserver
-	freetype? ( media-libs/freetype:2= )
-	fontconfig? ( media-libs/fontconfig:1.0= )
-	graphicsmagick? ( media-gfx/graphicsmagick:0/1.3 )
-	imagemagick? ( <media-gfx/imagemagick-7 )
-	lcd_devices_ax206dpf? ( virtual/libusb:0 )
-	lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "HISTORY" "README" "TODO" "docs/." )
-
-PATCHES=( "${FILESDIR}/${P}-musl.patch" )
-
-src_prepare() {
-	default
-
-	# Change '/usr/local/' to '/usr'
-	# Change '/usr/lib' to '/usr/$(get_libdir)'
-	sed -e "34s:/usr/local:/usr:" -e "37s:/lib:/$(get_libdir):" -i Make.config || die
-
-	# Fix newer GCC version with the Futaba MDM166A lcd driver
-	sed -e "s:0xff7f0004:(int) 0xff7f0004:" -i glcddrivers/futabaMDM166A.c || die
-
-	tc-export CC CXX
-}
-
-src_configure() {
-	# Build optional drivers
-	if use lcd_devices_ax206dpf; then
-		sed -e "78s:#::" -i Make.config || die
-	fi
-	if use lcd_devices_picolcd_256x64; then
-		sed -e "81s:#::" -i Make.config || die
-	fi
-	if use lcd_devices_vnc; then
-		sed -e "72s:1:0:" -i Make.config || die
-	fi
-
-	# Build optional features
-	if ! use freetype; then
-		sed -e "59s:HAVE:#HAVE:" -i Make.config || die
-	fi
-	if ! use fontconfig; then
-		sed -e "62s:HAVE:#HAVE:" -i Make.config || die
-	fi
-	if use graphicsmagick; then
-		sed -e "69s:#::" -i Make.config || die
-	fi
-	if use imagemagick; then
-		sed -e "68s:#::" -i Make.config || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" UDEVRULESDIR="/lib/udev/rules.d" install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	udev_reload
-
-	optfeature "supporting the logitech g15 keyboard lcd." app-misc/g15daemon
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/app-misc/irtrans-irserver/Manifest b/app-misc/irtrans-irserver/Manifest
index 5c672fbef7f8..0fb6eee605c1 100644
--- a/app-misc/irtrans-irserver/Manifest
+++ b/app-misc/irtrans-irserver/Manifest
@@ -3,5 +3,4 @@ AUX irtrans-server.initd 564 BLAKE2B 1ef6433ab6866ca5c3947737ec55a1a5bd129456aa3
 DIST irserver-6.09.04.tar.gz 665809 BLAKE2B 1f336e34a3a79490266a762520083c74f79d34b2b8603a9d4b8e29347346c658c1723608627590d39ebb66bebe9886a4052376ade81704db3b2c1cccf229b87e SHA512 d63f8bc79c2a5a8050c5ac21b086be3826f66102dc2f111bf8084b57756c6bcd84615d1675781b26520c34f7a3e08726dbc4ae94dd4f4afc446383597c433399
 DIST irserver-src-6.09.04.tar.gz 200481 BLAKE2B 7eaffd5bb335dfcbe6f0716af57aa898d2cce1a984a2f050081bd71a9c63d5d1e5949fdebdcbbbee05c337141d0efe5c6ebcb937726ff9506a766f69ed8d2f58 SHA512 09c38066e64404808856a89a8451e41a6eb8a51b98635b1515fc07050f25b4552b9cc912bd9612c6746ba67cd9b1bb45f3d4871dfa820c9e9bd810ede20f28d6
 EBUILD irtrans-irserver-6.09.04-r1.ebuild 1883 BLAKE2B 2381429568f1592a4dd2efd8426da328a0e1a202d9a6682c37f4adab0b76d7619643ec16fea38571c7b89eda6e1a5d7bff8092d4edb87b7de0b507b36c4e76cf SHA512 d1fde7eeabb728cb9cec417896a61a817523000dd7f7ce1eeff3958d721d9d1657603178e3ee9fafc7bf741436e4d41cba56490a62f9ccd8dc48d5085a078e01
-EBUILD irtrans-irserver-6.09.04.ebuild 2003 BLAKE2B 87a88bc13931589f4d09c88dc2670884278225562fa419f7552d5219a4bd8a1ad4ec4ad592dd094aaf143a9375b9bb562d85a48e4a7e4e1003a3eeecededeeb1 SHA512 e21da7b0e7bca442283282a7396a2c10ec61a20cb5f13083b1536be5c41cb6b0b1be3f0f42cbc6f44341055639576aab4004b406b56c47ee3b39e490019cbe11
 MISC metadata.xml 427 BLAKE2B c4da795721c8a36a5b9817e71589757731b6ae9c903192f6e0ad041b9f887cbd861d071b30f1337df6d6bb3fddac4a572010b731b0ceebec3a5e5c6db9387d3d SHA512 f2323a83f13bdb99de53f94a7052ed0b601dd21e600e78cd452d05965695053b4ed87b0d1e74ac44a5ae3413041165963e6217b1137793b2cb3de2af1f467b40
diff --git a/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild
deleted file mode 100644
index 50d29ff2a79e..000000000000
--- a/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs mono-env multilib
-
-RESTRICT="strip"
-
-DESCRIPTION="IRTrans Server"
-HOMEPAGE="http://www.irtrans.de"
-SRC_URI="http://ftp.disconnected-by-peer.at/irtrans/irserver-src-${PV}.tar.gz
-	 http://ftp.disconnected-by-peer.at/irtrans/irserver-${PV}.tar.gz
-	http://www.irtrans.de/download/Server/Linux/irserver-src.tar.gz -> irserver-src-${PV}.tar.gz
-	http://www.irtrans.de/download/Server/Linux/irserver.tar.gz -> irserver-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="mono"
-
-RDEPEND="mono? ( >=dev-lang/mono-2.10.5 )"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	sed -e 's!^ODIRARM = .*!ODIRARM = n800!' -i makefile
-}
-
-src_compile() {
-	append-flags -DLINUX -DMEDIACENTER
-	append-ldflags --static
-
-	# Set sane defaults (arm target has no -D flags added)
-	irbuild=irserver_arm_noccf
-	irserver=irserver
-
-	# change variable by need
-	if use x86 ; then
-		irbuild=irserver
-	elif use amd64 ; then
-		irbuild=irserver64
-		irserver=irserver64
-	elif use arm ; then
-		irbuild=irserver_arm
-	fi
-
-	# Some output for bugreport
-	einfo "CFLAGS=\"${CFLAGS}\""
-	einfo "Build Target=\"${irbuild}\""
-	einfo "Build Binary=\"${irserver}\""
-
-	# Build
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" "${irbuild}"
-}
-
-src_install() {
-	newbin "${WORKDIR}/${irserver}" irserver
-
-	keepdir /etc/irserver/remotes
-
-	docinto remotes
-	dodoc remotes/*
-
-	newinitd "${FILESDIR}"/irtrans-server.initd irtrans-server
-	newconfd "${FILESDIR}"/irtrans-server.confd irtrans-server
-
-	if use mono ; then
-		# Wrapper script to launch mono
-		make_wrapper irguiclient "mono /usr/$(get_libdir)/${PN}/GUIClient.exe"
-
-		insinto /usr/$(get_libdir)/${PN}/
-		exeinto /usr/$(get_libdir)/${PN}/
-
-		# The Libs and Translations
-		doins GUIClient/*.tra
-		doexe GUIClient/*.dll
-
-		# The actual executable
-		doexe GUIClient/*.exe
-	fi
-}
diff --git a/app-misc/joymouse/Manifest b/app-misc/joymouse/Manifest
index 3098d58fb4a4..18a4e2c2c2ad 100644
--- a/app-misc/joymouse/Manifest
+++ b/app-misc/joymouse/Manifest
@@ -1,4 +1,3 @@
 DIST joymouse-0.5.tar.gz 92464 BLAKE2B 9051107bb11445011f4d9cd5a546ef7652c857dc48d307a168af948de6bb2dc18a5894598ce0b6940a50cc8afca7eefbde9f1301bb620210bce887955dbc470e SHA512 85831ee72bf518dd8337b6d5cc7fac48bfbe9f4e038d3b05e42279e2aef58c6aa191e4027f9a06cd0e4713ac1d3f692cd5d58d1a263cbe234f590011eb8a6c2b
-EBUILD joymouse-0.5-r1.ebuild 555 BLAKE2B 3c3d55809577070514fced93d24f7fada87167ec994e0d637d7731d304cb4ea6bee9d56110f0b416a29912fedc6006a39dda7f07c0ddecef9b20f2d34bba47ca SHA512 3913e3885aa26911a7a5e282c6965f66803c8ba6ee75314edd13253c1f89c1751c7d19fac7935cc8d6c5d0b27b38e7b9cd56c3ddf885bb5aa176d27bd16849e3
-EBUILD joymouse-0.5.ebuild 581 BLAKE2B 8ab7b839a8337edc617c6986f7dd23f2ab34e0cb3bc07725307fd6cd5f5dae254ef4a2777ee2746a34224b655b6f3c89de92420a98fcb08eac8d99e35a345840 SHA512 aa27ab89637b9f09c6dbb6f57f371bd0fd1fcaa087448ca55a3964d7801928484672085ece5eec72a063c36a26169715dc39674ae2879222d1faaabc4d10005a
+EBUILD joymouse-0.5-r1.ebuild 553 BLAKE2B 31168494f0be60f3498a4f7d60f10d8674fb9ca9e2ae66100e8bb47e9d055c8a567742e5e6c667a3a588da79705854936b89edbb40a7f57716b597d515551f4c SHA512 8a4ccdedebd8a86637a3556b322f374b82024454a70b05a98be826c3e8459f3925c09c1c01146060bab184047a546a999b22fc63c61c80237da00d021aceccd4
 MISC metadata.xml 337 BLAKE2B 966b79dfb4d85c9c7955fd8555421a9e284de99a2a1ae26b428ad9fd4087e537d862426002c6d67e7d39277ae7a1ef2f33dc3174e292c110e985a770788f5ece SHA512 8591ff3f582a6b43725bab8eb4c76c391af184a8845c11d135f2fd029f7e2097f16aef1e76a2794c9305d9f002b33f50b210b58221f4176811f6e8180062d209
diff --git a/app-misc/joymouse/joymouse-0.5-r1.ebuild b/app-misc/joymouse/joymouse-0.5-r1.ebuild
index 1d3764620503..4606544b0afb 100644
--- a/app-misc/joymouse/joymouse-0.5-r1.ebuild
+++ b/app-misc/joymouse/joymouse-0.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/joymouse-linux/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ~ppc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXtst"
diff --git a/app-misc/joymouse/joymouse-0.5.ebuild b/app-misc/joymouse/joymouse-0.5.ebuild
deleted file mode 100644
index a34fee3f186c..000000000000
--- a/app-misc/joymouse/joymouse-0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="An application that translates joystick events to mouse events"
-HOMEPAGE="https://sourceforge.net/projects/joymouse-linux"
-SRC_URI="mirror://sourceforge/joymouse-linux/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	sed -i 's/printf(message/fputs(message, stdout/g' src/joymouse.c || die
-}
-
-src_install() {
-	default
-}
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index ffede8fe7c33..341e70dfb345 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -12,5 +12,5 @@ DIST lcdproc-0.5.9.tar.gz 1091292 BLAKE2B 10b26fc803cf14bf301177336bd14497131440
 DIST lcdproc-0.5.9_p20200721.tar.gz 936215 BLAKE2B d861346c9b0bd66a181cd80d98624b453f84944842a80fed8afab436539a617ed195481f0fb244839c8978b2c3eb587f521b5f185c324151273ec739753f6c45 SHA512 11895caedc66e337a3f6c9a57ef50e6f690982078f682ad3d4d0fadec771c6073727238e7347e7461dca32e735110162d44d0d25c76026775159e4a65cd758cd
 DIST linux_input.docbook 1764 BLAKE2B 8e82173d0169e2e79f2625b7bd572409b10fff1ac1a6ebd59527887e3568aad2aa459bb225d95af5e7b2a24b23671d8e7b3a78fdadc7a70e2fe33a36129bed32 SHA512 9b0579713c6d084fa9e0adee6c04387a3f91375f2cbcf2c7e47c01238df07e355330ebeb98081fd296279980fa808e4943c958772891559731465a9e75436ec0
 EBUILD lcdproc-0.5.9-r1.ebuild 6563 BLAKE2B c583192d2e154aa3dfe75e022214bf514f46eb531b3173a91a7749b252ec3de3bae65a26c12057e7e615eed4f33580c2b11d433c8d83beb971cab21b46df1a1c SHA512 1a9917a1179d9fb5713e299ab17dcf0caeb89d823e06d3ec7718fffd83f9297927452ae8dc91b521edf5bba00767998a216b43a1814e8afc5857343da060d3f2
-EBUILD lcdproc-0.5.9_p20200721.ebuild 6219 BLAKE2B c6a32455fccd11f7769c39b3db5210ff75355168bcff76245f19dadb2aac7cca71eacc829f81606a9f5d427bfe0910c16a33f24a79bb6915a907187ef6c9c706 SHA512 fad279e417bb3080a190f3ff465043128edc3c6cbc27ccca148ebe82b23b2f4d42313f6fdeaa898efd0784783b19c02380f27f872d3b1aecc62d518becb50d51
+EBUILD lcdproc-0.5.9_p20200721.ebuild 6217 BLAKE2B 747c93e3afb5287b089ca2e1ea0ef64d29ee002346a4c426b1c23733084b87d5a43d53caf16b2354a6a24a9f625c3033c32daee77f80d8362b0197414983679f SHA512 8e3a0c4c36d7c9e07fecd728763c7c8ca29fd61befd3916246248d24f7c787f12258c2f72a40a0bf8de504f5f01ac6c8255b40c58031c332c562999d1e7a3d9d
 MISC metadata.xml 1538 BLAKE2B 33c2755d4bae3208e9fb175f57b8e241d62cde6c63ac509d6443722bc8617cd48f566ec6300fbad08bb0b3ab04c5aee652e1b67340f5d82e61423c02ae948aab SHA512 52c3e7e8e0dbfdd2b06cbda0e6bd7b538a4f0a2ddb396940cb3345920ed2e7917f22e2620ac9de1e0a4acb3e9144848f13916ce91f54252632eccdc8974dbfd3
diff --git a/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild b/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
index e686d591c39c..4d597162ee55 100644
--- a/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.9_p20200721.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Displays real-time system information from your Linux/*BSD box on a
 HOMEPAGE="http://www.lcdproc.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu"
diff --git a/app-misc/mmv/Manifest b/app-misc/mmv/Manifest
index abe3c9919ba7..655fd35e4550 100644
--- a/app-misc/mmv/Manifest
+++ b/app-misc/mmv/Manifest
@@ -1,5 +1,4 @@
 DIST mmv_1.01b-18.debian.tar.gz 13463 BLAKE2B db67247bddd38580401d8b1a18aa9ce82af42a994bfe60141066aa08e19a01f35903cc1d8184cb4271ebe2a4a187607a7c5a6a750c121caafdf71fdc0ccb8896 SHA512 3543aff53c67cab00689d4c8b778447c976a7860a569bd51f74534bec8bd3b67b9e12743bd03bc6fda930748abddd12e16f1965686cbce04bd48bf191fc4127b
 DIST mmv_1.01b.orig.tar.gz 25656 BLAKE2B 4e3c7c27831fb5aeeb09461116330a993998da510b32a7ba3b1151c0d14a336eab7cf37bc3ac91720f38fb41258a60488e5d066b152d0c717f5413f8514d9026 SHA512 4bf4e096b930bdde225ba5de761e968af3aed33dc13194b1a1a79078cd27e158b04aae131b5167cf5f844e35355d67359443cd598db22da15a5af06752438917
-EBUILD mmv-1.01b_p18-r1.ebuild 1317 BLAKE2B e301b27642601d38e53f495cd4994ad2a40df099b3941f172cfafe6871f94b63876031e0e2c15fa69f6aa6ab56a30704bfe6082f291e7dc043f48b33f05c7d90 SHA512 e4f89838e706e2509e104fdf6c0ab5066effc734c4b96c869d936314c40a68e14ec147ac380c0febff82df326f1380e29f4e7f087bc4265a3512e0cfe807b217
-EBUILD mmv-1.01b_p18.ebuild 1269 BLAKE2B 2c4faa9de91736679bcd6279ae8e1364733ba8da187ac5a3c16c622aebb7f3bdc91dcada98d6eaffc3aace7873f9b838b640ed39fb10a24ad60f7fe9e367da88 SHA512 11931b007cdfc09e01a5ca4478564c36ed2b73e83c267e29db2d788cefc63fd27e8f74dedf2d36aac882791a02b914533bde28748a7d58e7c7ce089912ca4625
+EBUILD mmv-1.01b_p18-r1.ebuild 1314 BLAKE2B acc87ec5a225f2f1a8553878eb4d903b25a3c23286132ab061c37be58e7bda7901bd14ecc1b6f992f3855d7a17021ac71012a7c6f012e1af586a2a7976034407 SHA512 ee300d3357760d7b6178deabf6c0fc0bb6ef13876ff92fb868bc4c82423b1fb411b7f702eaffeb0d4c596e30ff097e08612d11f864be9b761e536fc8220d304e
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/mmv/mmv-1.01b_p18-r1.ebuild b/app-misc/mmv/mmv-1.01b_p18-r1.ebuild
index ec1e1c46b141..8000ceab4eac 100644
--- a/app-misc/mmv/mmv-1.01b_p18-r1.ebuild
+++ b/app-misc/mmv/mmv-1.01b_p18-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_VER}.orig"
 
diff --git a/app-misc/mmv/mmv-1.01b_p18.ebuild b/app-misc/mmv/mmv-1.01b_p18.ebuild
deleted file mode 100644
index b494b21028bb..000000000000
--- a/app-misc/mmv/mmv-1.01b_p18.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 eutils flag-o-matic toolchain-funcs
-
-DEB_PATCH_VER=${PV#*_p}
-MY_VER=${PV%_p*}
-
-DESCRIPTION="Move/copy/append/link multiple files according to a set of wildcard patterns"
-HOMEPAGE="http://packages.debian.org/unstable/utils/mmv"
-SRC_URI="
-	mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}.orig.tar.gz
-	mirror://debian/pool/main/m/mmv/${PN}_${MY_VER}-${DEB_PATCH_VER}.debian.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-S="${WORKDIR}"/${PN}-${MY_VER}.orig
-
-src_prepare() {
-	epatch "${WORKDIR}"/debian/patches/*.diff
-}
-
-src_compile() {
-	# i wonder how this works on other platforms if CFLAGS from makefile are
-	# overridden, see bug #218082
-	[[ ${CHOST} == *-interix* ]] && append-flags -DIS_SYSV -DHAS_RENAME -DHAS_DIRENT
-	[[ ${CHOST} == *-interix* ]] || append-lfs-flags
-
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin mmv
-	dosym mmv /usr/bin/mcp
-	dosym mmv /usr/bin/mln
-	dosym mmv /usr/bin/mad
-
-	doman mmv.1
-	newman mmv.1 mcp.1
-	newman mmv.1 mln.1
-	newman mmv.1 mad.1
-
-	dodoc ANNOUNCE "${WORKDIR}"/debian/{changelog,control}
-}
diff --git a/app-misc/reptyr/Manifest b/app-misc/reptyr/Manifest
index 2fa4a8ac59e9..4cecd475e63f 100644
--- a/app-misc/reptyr/Manifest
+++ b/app-misc/reptyr/Manifest
@@ -1,6 +1,8 @@
 DIST reptyr-0.6.2-sysmacros.patch 598 BLAKE2B 12e024efd3a7c2e07f1930545f2c5ee78212ac0f30095208c7cd2678c66f48038576d32b1f969cf9018db12b8fcd27f900257701bc66873326cd820c2ee57c14 SHA512 2d6c711a1d1268557925d15cf5d8154bc4ce47b5475ad05a5d358fd94a882991f33a8d99608e511d15dea6c08dcac615467f52bedb46330868540b03302e0cc9
 DIST reptyr-0.6.2.tar.gz 28533 BLAKE2B 305aeb5619c1780bbc189a64786ba1148c730e518ea8fe3c5daf715fcbe0de3ad7bd107008fb2471b8a3b61e75406ebb32d99b2eb5323badbb9e5f10ed1e65dc SHA512 ad0b378d3c30bbfaa30dfcc06c405c375c7e9bcc3bae2e7fb97b8c3f88f482f461c9c846df0064cc842149b07b8a6b616d95f74cdf38f1b2a5011f6b9328c327
 DIST reptyr-0.7.0.tar.gz 30718 BLAKE2B 7cdb3c95deeab82898d41dd5047cd15ff288229145b64fce8efc5360d205a575a4f421ed52885c6491d56858fb7d1f09f0e8588a3be62d021bd26e554bb1ed25 SHA512 d95a05634f7e4e55f487577baee50fc773f0d9957be5ac1a678bd0434baffd994c08a884496f6400ee101333c310eaaf2150f9053d3b4b6e525820a7ed24a8e6
+DIST reptyr-0.8.0.tar.gz 32239 BLAKE2B eb3d966c06df710ea27a421bceaca0c91e342cb981567eedc9125e5dd2dc937be294dc212ed9b3021d5e5d75e1011fa4a39eaf93c152c24ef7c5098f8edd9018 SHA512 880d899a2b6df3c33909dc70ce0a58f413b2e2eec2e212abc709348345d48294cf2e39f5891ab4b1fa24e69b54effe99c1b8ab03b448bfd7097e20498e7e85dc
 EBUILD reptyr-0.6.2.ebuild 952 BLAKE2B d3b5e34cc1989043a47e8d13eb066fb588688a588c256efc29991f625c01409a3e01178342a4373f2996467643395031ea30187cf1efbf80366b095677fc884d SHA512 6b70da39e56db290e52af8589437452214f458e8d28487f796000ddb4036427a798f0b38f4766860e3fc0cabdc26248823d18deb78ce80ac9a073a0b4d0cb57d
 EBUILD reptyr-0.7.0.ebuild 778 BLAKE2B f91b1ecddaf2c744a7e62aee5fd3c52aed826588260fa5fa781334fb010321bcf1a222646eab5b8381fed9f2e26e339f0fb17505d9825907da312db49adccaba SHA512 771bcf91f3b194d9a384aa487bc5021871d767b689ba78b29f3c55f50ad0f46a243276614cfe6e8898d82dd83eb5204c504fc12918146a1fb53b27372e39d301
+EBUILD reptyr-0.8.0.ebuild 778 BLAKE2B c9e2334a8f934ccbcf4e2aea9c317fc65ddfd82471f957cb59148a14cadc6beda1b8bd517f51fd3dc647e5c510cdd064a93b83ea0f59b4cb1d5fd8def9d4aab2 SHA512 fa5b752420a3d527c5ec19ca0902fa643775b1880720d20ebcf6d319f1206d784afe0eaa97d413e6b577f2f9c891213c5fdc124b4412bdeaf8e7bf29d8fa79f4
 MISC metadata.xml 472 BLAKE2B 60fe70a0a1d8761764b853a0b6a05656019e3e4c9d04a7b79b884d35b9bb112a0aa66ae4b7096d91c25fafc34dd6ea248119887eb0a44c132b7b38c6fe993d87 SHA512 6b0c72aca4cc7c33cc37aa366292889fb6907d10c6e31bb140c98b30b1bde79a81dd188d5b2b5a1eb338ca8ebb41d05c2fe9d5158d780fa4cf3ea772476166ff
diff --git a/app-misc/reptyr/reptyr-0.8.0.ebuild b/app-misc/reptyr/reptyr-0.8.0.ebuild
new file mode 100644
index 000000000000..a6b71060f53d
--- /dev/null
+++ b/app-misc/reptyr/reptyr-0.8.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs flag-o-matic vcs-snapshot
+
+DESCRIPTION="A utility to attach a running program to a new terminal"
+HOMEPAGE="https://github.com/nelhage/reptyr"
+SRC_URI="https://github.com/nelhage/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# respect CFLAGS
+	sed -i '/^override/d' Makefile || die
+}
+
+src_compile() {
+	append-cppflags -D_GNU_SOURCE
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	dodoc ChangeLog NOTES README.md
+	newbashcomp reptyr{.bash,}
+}
diff --git a/app-misc/resolve-march-native/Manifest b/app-misc/resolve-march-native/Manifest
index dbc7cb4ef3bc..46a1882d2c8d 100644
--- a/app-misc/resolve-march-native/Manifest
+++ b/app-misc/resolve-march-native/Manifest
@@ -1,3 +1,3 @@
 DIST resolve-march-native-0.9.4.tar.gz 7829 BLAKE2B 16c3492185c89c7a4dac48c4f9d9ce4ff6ca6ed794cf826cb141cd83936c2762db43d1d7b64fa6f39e1216b4738a58c35a07d9df7a78dbd061de636b7b181fed SHA512 b73e34c9f957dd3f8941b7db25af88b32cc1f67e4384c97034a310b98e6f6e6645a583ec567f8b1547bea41e072fcc20189017930a172781061d741839c5a9b2
-EBUILD resolve-march-native-0.9.4.ebuild 522 BLAKE2B 4f05fda4d58714db1b7dd03ab4b88e18cb457f422e34b806312ec67f7d5dfea6c58ddcfc411f06fbd4e7996ccbec377928e38b8ee715743a4cb18343fe6b6892 SHA512 5b588305e313de2f87125b155e4835518bb7be7ea357059ee12c559e1cffa579694c709f05ce519ba774c99ea0d937a907ad1614c2f6f4a8ad4c97aaa0862a83
+EBUILD resolve-march-native-0.9.4.ebuild 529 BLAKE2B 44a444187fd2580762d391d32a6feaf2c5b8ea455294f15b140e5e0d2cacd3a0267b4268ddf46bc6951a13f31c48b2d01f7c2ad8f3dcf845d70a5f8c32258fcb SHA512 e61568b3c8ead08b5be760419866dafa9bd63de771f1d8ccc851b1fe5cde834cad2832dda0961c7dc5272e33050ac7d2b331ad1095fb57e925979652b3a2cea6
 MISC metadata.xml 343 BLAKE2B c2ce3c2f5c54a08cede40b51e58afb974f563d9729da5f9e33ea9650615bdd7c206661d8ca5511ee6a039b59b50d942d82334e86275e80cf5e502e0235c865e9 SHA512 46c1ae61e1cadebfbca360b2729a957c9b2830f502ecc559cee6de1e46de3526788eb5d53cdcfab173a55a575ba3f1b8d0da58baae2027d7815d53f4ba67b813
diff --git a/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild b/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
index 9382c86c9d7c..c4187cb9b93f 100644
--- a/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
+++ b/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-misc/rundeck-cli-bin/Manifest b/app-misc/rundeck-cli-bin/Manifest
index d775b0ded566..ddb71e365982 100644
--- a/app-misc/rundeck-cli-bin/Manifest
+++ b/app-misc/rundeck-cli-bin/Manifest
@@ -1,5 +1,3 @@
 DIST rundeck-cli-0.1.11-all.jar 3447560 BLAKE2B e840d3b27dd173244781d1c37a6c3348d89896d3e81dd8fd36e7c3a33911228e46fff460d838d6c8d9bd79c254c9e469dd8b8e26bb645bd7334d38e04e257512 SHA512 3390d5b6ece391a9cf7754cc4c6d79a7720ac1db2f7a555d0b8216eea23feecc7e4cc947fb4c894362ece3bfaddcb383b7b10558d2e499e364e023c65636aa33
-DIST rundeck-cli-0.1.8-all.jar 3420534 BLAKE2B ea1ea74094fc0bbb84c0d8b052263d5e747a4407a8139124525b7d026d5ea3d9bf9c5db6dd2f0b00fd13a7d16f4c67133342da85f6872230a69fe44d6088eae1 SHA512 c7fff34c1a1091daf54e0ab89a832ab16e775704a6543af31745541419e3fc49d8b5fd47b404bda46dc1434945e652221825af553aff87b764623da4fe3bfdb6
 EBUILD rundeck-cli-bin-0.1.11.ebuild 539 BLAKE2B b8baa97a972f404a5d097aa8e79deb215ef13000d70175b5aacb8bf6a52f8017ce99ea8eadffdd167cf56ec05d77974a6c64085188eb5c4a7aad751cc7b6c6cf SHA512 098f2af034357d16c5397451189082a6d905fb4230b97569b29b06bb9613385aa4d62b3052a12d5474dfe650ccd9623a26968585f5c9eef99f9bd6131103c4b7
-EBUILD rundeck-cli-bin-0.1.8.ebuild 539 BLAKE2B b8baa97a972f404a5d097aa8e79deb215ef13000d70175b5aacb8bf6a52f8017ce99ea8eadffdd167cf56ec05d77974a6c64085188eb5c4a7aad751cc7b6c6cf SHA512 098f2af034357d16c5397451189082a6d905fb4230b97569b29b06bb9613385aa4d62b3052a12d5474dfe650ccd9623a26968585f5c9eef99f9bd6131103c4b7
 MISC metadata.xml 441 BLAKE2B 63748c0f151f93be0e85a5bde27cc9715a834df86b317c01ba2fec414d89af69f1f944aa6935b159e1214c9cd992e0e3494ba45b1d853078d51266ed1ea04cc0 SHA512 d6c2f911e5280f428bda1b36b088fc363ed49a5f43ea739a7bb0b3ce79fa044a7850304ded546fdca351f87f9b250f8dc8a5006fb47119b40aa41ea5bd234c76
diff --git a/app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.8.ebuild b/app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.8.ebuild
deleted file mode 100644
index d7bc4231484f..000000000000
--- a/app-misc/rundeck-cli-bin/rundeck-cli-bin-0.1.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="rundeck-cli"
-MY_P="rundeck-cli-${PV}"
-
-inherit java-pkg-2
-
-DESCRIPTION="Command line tool for rundeck"
-HOMEPAGE="http://rundeck.org"
-SRC_URI="https://github.com/rundeck/${MY_PN}/releases/download/v${PV}/${MY_P}-all.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}"
-
-src_install() {
-	java-pkg_newjar "${DISTDIR}"/${MY_P}-all.jar ${MY_PN}.jar
-	java-pkg_dolauncher rd
-}
diff --git a/app-misc/todo/Manifest b/app-misc/todo/Manifest
index 833014ab1c8c..db96de40ccce 100644
--- a/app-misc/todo/Manifest
+++ b/app-misc/todo/Manifest
@@ -3,4 +3,4 @@ DIST todo-2.11.0.tar.gz 712455 BLAKE2B f9d0fa53712a49c2f6ee94c02a62c16b8184734f7
 DIST todo-2.12.0.tar.gz 716524 BLAKE2B 168951c50670228ba2e1438ec04f5907181073668f1e260874e48959f2e37d11ee7ba4f2b0e5e5c55c9375a31921eca258f720afe98d2a4841529ef6acbb1510 SHA512 3b30d5e395f878811831f57e8e1a040c990e1f042f57050b6381d83ffc8b92b1ce20bfd3c5aa8b5e028b4810a5b289599603b2e16efff8badac559d200ed79f5
 EBUILD todo-2.11.0.ebuild 1739 BLAKE2B d4470876d6533fe1fff3ed60fed423730b4c894262e15b78d4192d34cca6babfd506ae125c32b7b28a1608568b91144e8ba42083dd95b80c2f83a1136153df03 SHA512 7244f131a1dbff7d77dc873647cc7cca1fe22873a10af853a6c4169e8757b68ebcf602430ee411bdc0f20bba19f7fbb342bfb9e60108bafe46838704e529da62
 EBUILD todo-2.12.0.ebuild 1665 BLAKE2B 4a1100a2be6fb645c213dd2d5883a32797fbc235588f77dec8b491f12e4ba5de615599fedcde92c75ff22840a4cd13b99f3f363af78e43a9dfdf166f131c915a SHA512 84c4459b7628ccddf0c087d8fc8a7d482fda5a4afd1aaf79c50da386ae80b06fa3b2814a7681dcfc55b92f9253dc1f44353e179082f8b2e282e8ae9e392790e7
-MISC metadata.xml 565 BLAKE2B 854d88ec5a9d76fba34d2feb01a36d5a9513433f1dd3301883e3213eeb1e24e1e4db0876c0b26d4e0ba68acee07177eed06912c3ce285e163f8d287510338825 SHA512 052553ce06e888905ddd230bb40e59039a42bf9e9f6684812231cc9f21d478d0e7e44d7e4ee44896258852a6778bbb507b4824a6b70150c7314b507a652e9dc7
+MISC metadata.xml 561 BLAKE2B 3c375b971f13ae4f52cdb0da0d34a24e95e26f6613ee275763b8e42e08d75aafeed918fbba943046933995596fd7c623fe18699cd05935f56d027f3df2903f0b SHA512 fb34968423ced5a3be1d8f0f4d6ad85ab1c971ce3bbd1251e54c2a839ef9a16c95805f30ff090a2483d93f7d2f48a2ce98d4a99d76ccc3f72004a634597ebf23
diff --git a/app-misc/todo/metadata.xml b/app-misc/todo/metadata.xml
index 7c2302dd216d..cf82b8681220 100644
--- a/app-misc/todo/metadata.xml
+++ b/app-misc/todo/metadata.xml
@@ -14,6 +14,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ginatrapani/todo.txt-cli</remote-id>
+		<remote-id type="github">todotxt/todo.txt-cli</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 937a63971155..6ffc9a272d21 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/smstools/Manifest b/app-mobilephone/smstools/Manifest
index a70207f34089..15f6b24139a3 100644
--- a/app-mobilephone/smstools/Manifest
+++ b/app-mobilephone/smstools/Manifest
@@ -4,8 +4,6 @@ AUX smsd.initd3 656 BLAKE2B 51723d4bffe650d5756677a328797d9d634687a0e009553d2a7c
 AUX smsd.initd4 544 BLAKE2B 7e8ea8dfa369d65beda7b6262c8c5bbf75dccc3a9dd1530c986e26212a51ee2fd5396f559414fdf6bf6c2c116ba0d06e2dbf588619962bfd3e5fb126c4d2e280 SHA512 4060e8ca95ccd7b237f2d32be35e30de532dd03a1b2e88e9c516e7f94383a790bdbac9ed20b482103f425f3b84097bc02308588b313a3651c5d251d92d5f61e2
 AUX smsd.service 232 BLAKE2B e02904692d7d397618e03a759a5d515c95b6c3d7e34f6e8a68642518a412c93738bb9ee3afc9604dc93ea96787dfefc9727e84fa848a647e49d4be67c80d5a28 SHA512 60b2d56b4fb5f174c9a9111891633a1eca6e831a0abad7d348c04d63776af832256a1bf0ed300196c429056106226e98178e60215c867e6ec9f998a7029295d1
 AUX smsd.tmpfiles 28 BLAKE2B 1f7dc406901d08d362ad2ca8ad236c8d5c45166c97501d0b314a644f2fb9994e2d3f9071f61dc8d42f1d1b7aa272b1741aa97bcdffce457a385d0c3f6ec4ad1a SHA512 e8169ac96bff820996b13971f47e40550cbfa87a46f74304c4a42afe5a0fb779e65244dda5c7b3fae40d3eb0a669f2b4d5f5bfeeb576e88e04ddda812da9234a
-DIST smstools3-3.1.15.tar.gz 300088 BLAKE2B 4dcafad43979fff642a26da2ce7850ff09d66678525171643f1fec6bb1358cc48705d73de7b22f77b267a741f740a408ddea5062d75d98561e2381010e56a37b SHA512 6a4cc852327fac27b00fc58def4bbc8caa395552586fe1b84f0f4a9f7f6b00008943b85c86de0821036629c58cf04840a189d711b4ac96f7ddaafd6b340b11fa
 DIST smstools3-3.1.21.tar.gz 356548 BLAKE2B 8bbb65761128a86200a6d47e90456fef076be10cd4081b4e3cdc9456c0176996ee6ee9afbe3d9f2a989d93db706bf5461ddf7f739bc8d70337a842b96eb27a5c SHA512 0587e5020a0318351ca99b68baa1c19411824279055857a5b5aa4e346cae373fe94a811eaca6767bcf991cf849eaaa66ec120f046420531a6088cdde9373db31
-EBUILD smstools-3.1.15-r2.ebuild 1705 BLAKE2B f66f24b406e7e6a54677b72072c0233a4ac89289347e2dfc73f177c69a12288b5feb0e44e26bbe413fb5eea1b58935125b6218b15c346ab486634a7747ff51fe SHA512 6c00b3592f0f6b5b10646f4620bf241a9a4da9922558ef2fca790623cf9b8b4fc5e462eb4f2c0ccb188ccb7330cd2754c24e3c2265b0c1558e27ee3322db1693
 EBUILD smstools-3.1.21-r1.ebuild 1707 BLAKE2B 426053dd73de6533ed4067a5443c2569beb28f347b31b15d28622b22414db05f87f269668cbd789720f8f135f819b142a0664982034abb22668eb1f1f9c57c7b SHA512 7893129b52974d6b0948c9a840b7099a99c007c4a8b414b2d0fe704db21b09765343b47c164a17e902d4a92706c792e757f7e28b8383c42fe87fb5b4afef190d
 MISC metadata.xml 311 BLAKE2B 7f50942d5ff32e7025c5f0289555117e7c3b22d22ba9a2589ceae11c80d98d8ca00658ab0540a79576ba2b9f807c4a59f4539d253645d4c336079f4db4a5c7f0 SHA512 0ff7191917f66832a0c60952bc0e187f5c82656f6e422d81d4bf4d4d38c9edef5519d696976a3668682c40feb932b510fd96591ea698d7f08d9e4d84d12f641d
diff --git a/app-mobilephone/smstools/smstools-3.1.15-r2.ebuild b/app-mobilephone/smstools/smstools-3.1.15-r2.ebuild
deleted file mode 100644
index 2b8943a36fc2..000000000000
--- a/app-mobilephone/smstools/smstools-3.1.15-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit systemd toolchain-funcs user eutils
-
-DESCRIPTION="Send and receive short messages through GSM modems"
-HOMEPAGE="http://smstools3.kekekasvi.com/"
-SRC_URI="http://smstools3.kekekasvi.com/packages/smstools3-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="stats"
-
-DEPEND=""
-RDEPEND="sys-process/procps
-	stats? ( >=dev-libs/mm-1.4.0 )"
-
-S="${WORKDIR}/${PN}3"
-
-pkg_setup() {
-	enewgroup sms
-	enewuser smsd -1 -1 /var/spool/sms sms
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-makefile-whitespace.patch"
-	if use stats; then
-		sed -i -e "s:CFLAGS += -D NOSTATS:#CFLAGS += -D NOSTATS:" \
-			"${S}/src/Makefile" || die
-	fi
-	echo "CFLAGS += ${CFLAGS}" >> src/Makefile || die
-}
-
-src_compile() {
-	cd src || die
-	emake \
-		CC="$(tc-getCC)" \
-		LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin src/smsd
-	cd scripts || die
-	dobin sendsms sms2html sms2unicode unicode2sms
-	dobin hex2bin hex2dec email2sms
-	dodoc mysmsd smsevent smsresend sms2xml sql_demo \
-		smstest.php checkhandler-utf-8 eventhandler-utf-8 \
-		forwardsms regular_run
-	cd .. || die
-
-	keepdir /var/spool/sms/incoming
-	keepdir /var/spool/sms/outgoing
-	keepdir /var/spool/sms/checked
-	fowners -R smsd:sms /var/spool/sms
-	fperms g+s /var/spool/sms/incoming
-
-	newinitd "${FILESDIR}"/smsd.initd3 smsd
-	insopts -o smsd -g sms -m0644
-	insinto /etc
-	newins examples/smsd.conf.easy smsd.conf
-	dohtml -r doc
-
-	systemd_dounit "${FILESDIR}"/smsd.service
-	systemd_newtmpfilesd "${FILESDIR}"/smsd.tmpfiles smsd.conf
-}
-
-pkg_postinst() {
-	touch "${ROOT}"/var/log/smsd.log || die
-	chown -f smsd:sms "${ROOT}"/var/log/smsd.log
-}
diff --git a/app-mobilephone/sobexsrv/Manifest b/app-mobilephone/sobexsrv/Manifest
index 697c6d82f11b..8d655024196c 100644
--- a/app-mobilephone/sobexsrv/Manifest
+++ b/app-mobilephone/sobexsrv/Manifest
@@ -4,5 +4,5 @@ AUX sobexsrv-1.0.1-openobex16.patch 1346 BLAKE2B ec63105eb6db6fd959044134fd66b8b
 DIST sobexsrv-1.0.1-fix64.patch 25040 BLAKE2B 9796779fdde39c79371a978d4bdb9d6761f9467ecc353096c3d1b13fe1d5aa4f7ceef137d07c52467a175b7bc756e6c747a2800a2dbb2dcd281be463499106c9 SHA512 9d555bee8d03c13061bbe132df6442daa4d8817ef713e92e5150b1994af110c5b01b34f8bcc1c3ae734529e36bb70f56976ab261f860e95e3de3ffe440a7b393
 DIST sobexsrv-1.0.1.tar.gz 27683 BLAKE2B f1aa103aa8a70ea7408ced7b0a3944d0ba61dc9750425160ee95bb69e1f1cf4479fbecef7be3ba4b6cbec2a7f518bed18318ca694545a4606888e7663adb0d38 SHA512 52fe5eff812596caa1f4b8579740ce8b2591db17950d68c093cfdb33ca5b899bfc5c142594843948a29ae0b1bdbe4499a1e24c270c92e61d02fd07a02d9d40cd
 EBUILD sobexsrv-1.0.1-r2.ebuild 2005 BLAKE2B 28fedfe5d4f64bc696d1f481a9855c57bbeb0ae8e6ca0fa9cd493b718051089abb3f17ee96c526f07600d33050bd57c6940d1b7d9178310d2c6735a6dde51071 SHA512 1a60a31ea11f4b21039fcd5e4694fa0d5c5b91c11fccb09d362a8d7862885f2c628f6f52b736db4347fd29a3e6a63b2375868d5771363c2dde272eac2e692637
-EBUILD sobexsrv-1.0.1-r3.ebuild 1514 BLAKE2B d725878b11c482cb4fde7c6825ee115f00e176a0f01dd10155e5df1f8ed001b792aef39e839d86c11f9a5b2cb1d972c92248a924690b18cefe0a072348c8a9ef SHA512 fa0d58acdafc3ea0f517f5d3a05b031393aa46ee69bcc0116d7b02428fc3aeefaaaed847c084f4e23f651200394a69562d836f375be50e44a6f9959c821fa99f
+EBUILD sobexsrv-1.0.1-r3.ebuild 1512 BLAKE2B 189f9c6e408476e55c7d2b5134dbb0bd480cd88098006c8baa4e9f5a84e7fca281e7ec2c1bb8ebdfa619f0f42bb9eae752d294436aee513c8fd42db0d5496ce6 SHA512 bd7f5443552b5d05f9073a5574cfb91e8025a5003357f242e646286f168f7c74256ec284793420b2c4b55e1cff55715b294c2f339f01be28975798425a008ccf
 MISC metadata.xml 920 BLAKE2B ac1ea1fc1f85d7dd43c548d89ef3473bb5b78f2e3ab4275c28db702865e492261db1ab908496661ebda406771d7d8080e9057bed865b703b9920ee86b48c8b34 SHA512 30b149f3e197dc0a45cd27a618a0dcc6c9968dae44576c47dd6ebdedda06d5fed8b03ae1e0f94133804551366a90a97614d5d5eca334dbdabd4398278645aab9
diff --git a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild
index 2002679628cc..44078281901f 100644
--- a/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild
+++ b/app-mobilephone/sobexsrv/sobexsrv-1.0.1-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.mulliner.org/bluetooth/sobexsrv.php"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="
 	>=dev-libs/openobex-1.7.2-r1
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index f78f29f2b705..ab30c450e669 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 1401a5f063cf..3f48b51e35d6 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -4,8 +4,10 @@ AUX gnucash-3.8-exclude-license.patch 634 BLAKE2B d6b86102a4ced983684e75f4f4801b
 DIST gnucash-3.8b.tar.bz2 14285584 BLAKE2B 304d73b04883b61b8a4e174f458206769483ca0f6d28d284c760397e0bc4061dbdb379ff3cca35e80d6736516549a8733bf36895a11c2202fb9f8f25e591e1d9 SHA512 e0529934e9ccafbef2b724f5fca9a0e300c78cf21596f0dcd4b5c11ff300c06a963b68eff1efe00834dc488ced604b86011075bb22480488ddf31d2d4c94ddca
 DIST gnucash-4.0.tar.bz2 13978744 BLAKE2B 9718e365e1a3939357fabb98f43a95ed22d4d4ee13bb17a7dda5da8ed2c4fe6c4ec4951eb1b5a66bd71feb3f26a4e896d5cb7a177cd7d1b773ac26e643a24f0a SHA512 29fd61352932ff0962e5c634711bc1ae09020e457bace5d2954b743976b607ad3632ddf6a7024148e989dc8e69769400cb7795eee097f8d88dea3ac8d6b7c7ee
 DIST gnucash-4.1.tar.bz2 13994973 BLAKE2B 875ec0d9b2b6b8ec7144ad52f172f6727078746884d8d1d369a4b7535ebe5bcc0c70b4a25f1ba8e3f97d0603a8d511c9911e343f2610b557511b56eafbea8f39 SHA512 caf25d4ca0a950b1aa0c236c801938ff2235dc7c7710065a5b78fd3745904dd5e5103c6ed8abebfe3a4a68c8048372802f856c63cdde8aeaf71840daf2e9ec07
+DIST gnucash-4.2.tar.bz2 14225695 BLAKE2B be77c5876cd1720e9b7422c6afbb05f0144a20cf45d7dac0e8bd3362139f4b4d18f47f0edcb6db9db7a2485263d6bff5e0546f5691fe097fe1d4912852bc0ce4 SHA512 f730d2ba5d6b310e0c467767aa4c4e6a153b441b6b9aed948344b9a9b9dee351f3cba9fac1d655385136f5ce4313f8f37ef305e9b93b0ea32c40525d9293b070
 EBUILD gnucash-3.8b-r1.ebuild 5017 BLAKE2B 5c573c4b0b5c2de0ca51a127252731c3dbcad7fa204ef3f9dababa289fc451c6de459aa027b3f034840c17718115368e6c7236343d7b9e8f7d07b43eca398fb8 SHA512 226fb6dad314e5f3a417820b24c4519786381c0c3e0a916045228fae88949aa93c9522e1663f611cea50a7bee880b05730580ea3cff8b028467fbf6f306621cb
 EBUILD gnucash-3.8b.ebuild 4912 BLAKE2B 9e59c3ad4260c15f540a51576a4d8c9650d06756127d8bdd49e0ca6d1c2d866e123e7babd3546466ad745ff76fbf40aa082b97cbc02de4f25805b62cd024f517 SHA512 b22bbff4733ee96076f3c029542918ce183a482d2e38c911fd71ad05d80744c596aa2a1813b0ecb2b3ac3b447944768e0678f44276896f8f0d28871ab74123d8
 EBUILD gnucash-4.0.ebuild 5548 BLAKE2B 6cd515f53187ac4520f152540db46e50f66010abfd58bfc60347140ab80b587abcf872a30537fd137e9bb63ab838c958f0beb7e55aced7b8be312a4a9c69bfab SHA512 a0ca0287d1a20516639856650c0cca416b8df953c8746012a529b996caaf45cc2cc771f0e5e145a68c35dcb0091951d17008bdbd62ed7c977de453261d863de5
 EBUILD gnucash-4.1.ebuild 5483 BLAKE2B 5679505056573c5fcf9e4ff0d708a5db15930a691f5fab9873b3b6bda4ccec8646230b617a60364b5d1c72837beafc154f17951ba72d311082bf508ff45b445f SHA512 e201528965806827c439330ef16c4d7f6765fe4858b708537f1875e1a0f8a9bafb2f52d88c9d83a612bc8341605a9c77c397ddc0e368b19091b7ef81671133b0
+EBUILD gnucash-4.2.ebuild 5485 BLAKE2B 01d95bf459933da944047f878967d6dfe35cd6d467eeeb3b0d9123f5f2118675e5ac5996101f08d0d94ea392f4cb952682bbb6f9d0b7b3833717e9ec70ca6eca SHA512 5aa28f75c2bb34ad434c8e5cd7a939f5e7af41ede3ba4bf431c92716cf4aecc7a493cbe4446e8d652aee4618acf9d30298e7a8cde4cffd097d286784e07b7943
 MISC metadata.xml 562 BLAKE2B 07fb70bae76794f49e852dc2840b13b811e3e8b28cd1f504d693662e6530591d337f993248fd80868c08b2c1cb9a648c7fcf8f964e74eeef70c5815946edad64 SHA512 659ded7048ced517f06d94952df08694ae5d2775aec8bb9adaf658d5151048ec1b612d6bf54af664a44b5510406b4ed02809ee0c150159eb6c2652186589c4a2
diff --git a/app-office/gnucash/gnucash-4.2.ebuild b/app-office/gnucash/gnucash-4.2.ebuild
new file mode 100644
index 000000000000..5aba7f54f2af
--- /dev/null
+++ b/app-office/gnucash/gnucash-4.2.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit cmake gnome2-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
+	  python quotes -register2 smartcard sqlite test"
+RESTRICT="!test? ( test )"
+
+# Examples doesn't build unless GUI is also built
+REQUIRED_USE="
+	examples? ( gui )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	smartcard? ( aqbanking )"
+
+# dev-libs/boost must always be built with nls enabled.
+# net-libs/aqbanking dropped gtk with v6. So, to simplify the
+#   dependency, we just rely on that.
+RDEPEND="
+	>=dev-libs/glib-2.56.1:2
+	>=dev-scheme/guile-2.2.0:=[regex]
+	>=sys-libs/zlib-1.1.4
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	aqbanking? (
+		>=net-libs/aqbanking-6[ofx?]
+		sys-libs/gwenhywfar
+		smartcard? ( sys-libs/libchipcard )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gui? (
+		>=x11-libs/gtk+-3.22.30:3
+		gnome-base/dconf
+		net-libs/webkit-gtk:4=
+		aqbanking? ( sys-libs/gwenhywfar[gtk] )
+	)
+	mysql? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[mysql]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.1:= )
+	postgres? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[postgres]
+	)
+	python? ( ${PYTHON_DEPS} )
+	quotes? (
+		>=dev-perl/Finance-Quote-1.11
+		dev-perl/Date-Manip
+		dev-perl/HTML-TableExtract
+	)
+	sqlite? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[sqlite]
+	)
+"
+
+DEPEND="${RDEPEND}
+	>=dev-cpp/gtest-1.8.0
+	>=sys-devel/gettext-0.20
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/libtool
+"
+
+BDEPEND="
+	dev-lang/swig
+	dev-util/cmake
+	virtual/pkgconfig
+	|| (
+		>=sys-devel/gcc-8:*
+		>=sys-devel/clang-6:*
+	)
+"
+
+PDEPEND="doc? (
+	~app-doc/gnucash-docs-${PV}
+	gnome-extra/yelp
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2-no-gui.patch
+	"${FILESDIR}"/${PN}-3.8-examples-subdir.patch
+	"${FILESDIR}"/${PN}-3.8-exclude-license.patch
+)
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
+
+pkg_pretend() {
+	if tc-is-gcc; then
+		if [[ $(gcc-major-version) -lt 8 ]]; then
+			die "GnuCash needs at least GCC version 8."
+		fi
+	elif tc-is-clang; then
+		if [[ $(clang-major-version) -lt 6 ]]; then
+			die "GnuCash needs at least clang version 6."
+		fi
+	fi
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	xdg_environment_reset
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Fix tests writing to /tmp
+	local fixtestfiles=(
+		gnucash/report/test/test-report-html.scm
+		gnucash/report/reports/standard/test/test-invoice.scm
+		gnucash/report/reports/standard/test/test-new-owner-report.scm
+		gnucash/report/reports/standard/test/test-owner-report.scm
+		gnucash/report/reports/standard/test/test-transaction.scm
+		gnucash/report/reports/standard/test/test-portfolios.scm
+		gnucash/report/reports/standard/test/test-charts.scm
+		gnucash/report/test/test-report.scm
+		gnucash/report/test/test-commodity-utils.scm
+		gnucash/report/test/test-report-extras.scm
+		libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
+		libgnucash/backend/xml/test/test-xml-pricedb.cpp
+	)
+	for x in "${fixtestfiles[@]}"; do
+		sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of "${S}/${x}" failed"
+	done
+}
+
+src_configure() {
+	export GUILE_AUTO_COMPILE=0
+
+	local sql_on_off="OFF"
+	if use mysql || use postgres || use sqlite ; then
+		sql_on_off="ON"
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILE_GSCHEMAS=OFF
+		-DDISABLE_NLS=$(usex !nls)
+		-DENABLE_REGISTER2=$(usex register2)
+		-DWITH_AQBANKING=$(usex aqbanking)
+		-DWITH_OFX=$(usex ofx)
+		-DWITH_PYTHON=$(usex python)
+		-DWITH_SQL=${sql_on_off}
+		-DWITH_GNUCASH=$(usex gui)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	if use python ; then
+		cp common/test-core/unittest_support.py \
+		   "${BUILD_DIR}"/common/test-core/ || die
+	fi
+
+	LOCALE_TESTS=
+	if type locale >/dev/null 2>&1; then
+		MY_LOCALES="$(locale -a)"
+		if [[ "${MY_LOCALES}" != *en_US* ||
+				"${MY_LOCALES}" != *en_GB* ||
+				"${MY_LOCALES}" != *fr_FR* ]] ; then
+			ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
+		else
+			LOCALE_TESTS=true
+		fi
+	else
+		ewarn "'locale' not found."
+	fi
+
+	if [[ ! ${LOCALE_TESTS} ]]; then
+		ewarn "Disabling test-qof and test-gnc-numeric."
+		echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
+			> "${BUILD_DIR}"/CTestCustom.cmake || die
+	fi
+
+	cd "${BUILD_DIR}" || die
+	XDG_DATA_HOME="${T}/$(whoami)" eninja check
+}
+
+src_install() {
+	cmake_src_install
+
+	# strip is unable to recognise the format of the input files (*.go)
+	dostrip -x /usr/$(get_libdir)/guile
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/examples
+	fi
+
+	if use python ; then
+		python_optimize
+		python_optimize "${ED}"/usr/share/gnucash/python
+	fi
+}
+
+pkg_postinst() {
+	if use gui ; then
+		xdg_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
+	ewarn
+	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
+	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
+}
+
+pkg_postrm() {
+	if use gui ; then
+		xdg_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/kraft/Manifest b/app-office/kraft/Manifest
index db161df21725..d7b722df03fb 100644
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@@ -1,3 +1,4 @@
-DIST kraft-0.90.tar.gz 705767 BLAKE2B 63f048be32e794e3c13d59ebbac90558e661eabe8b08270ea684adc338e2ae45b59cfbb3a746d1248ff8c0026308209f2821cac7c2feaf67af04903125be34c7 SHA512 1ca87a828e74b508b229787459f32e8ab5ad0ca4bf2630e236d65beaaa7503dc61af42d3b13106aeb6e43fcf3c419133958c5492a2c25c7233c9ac0205b3800c
-EBUILD kraft-0.90.ebuild 967 BLAKE2B f0be1cbdf09b2071b6838f14aaea4353ee02c7c9501bc1bbcb673d2517775f0cdc65ed962e82fa7ed54b59dc9b912078790a2c888e7144f44c59349746e2a22b SHA512 c6f27c8c46176f497481221a486ce047cd62d5c715718cdbc1fb99983c45a3e6e6f081bb3bfe94bfe44b17eb33c1fbff45adf250e15dec2330bd90118ee38a2b
+AUX kraft-0.95-i18n-warning.patch 1782 BLAKE2B ab0264bc3d07642d6e4b9bff6f3c23dc9726f959d279bf5f6ddf6b672d11c02583c5b75a2412292665e6722eac7af38a8afec13aa4811620cac687de96f3addb SHA512 52741ce146df9c577e3397acda94acac470eb1e3d36b74617148a5890d3aad27416f8c9e3bdc4afcce9af5b5947c0d6d19f529d2c416bb7609ce17f5a106065e
+DIST kraft-0.95.tar.gz 877790 BLAKE2B 4099845816191c5760f81a5512dc5d5afab1a76eb79c5d3fdead58d7a25342c4f461a6bf4d65313837d6bce32e80c1c8348f674b62358bb08cfdfd3ecf845bad SHA512 8070827a491b2a923b4608752ee2202377aeb2c472a3ee81feaad3b853d13bafe9f9c70719e1dfffeceb1492df80608327a56541453456be87a97bb3d5457f42
+EBUILD kraft-0.95.ebuild 1129 BLAKE2B 91b0ed6840cfae08dd1bd7a7d3779761bd8b5c728a7bd4a548d817fa37045ef6e23dabc2304cf7cebdafe46ec0c9d9b6f632d34d63a3a8c0e9e54dbce19d7a1c SHA512 01877c5fbda18e3a6b78cd7d12be5626c089560c8a8da8e268297cbd34e71695f266b31120075908fdf795ab06fee8b4e871b5e895dd4fa90bb4888f0fc4d742
 MISC metadata.xml 418 BLAKE2B b99b3d436a90af1cd1a791e8cd1aeaed2c654a659a45f5e88b5c5b0cd02d57bc15df8e225cd93e9041732dfbf45792721d29df8c2187d409ecf3a4202855266e SHA512 eb8a053a7375546c713741d2bcacdb4604c725322c6680d76eade40ea4166cf20d8ecef4c4f0a7ef4304961bf2740b8277f5372137e04d32a52bc254daf65232
diff --git a/app-office/kraft/files/kraft-0.95-i18n-warning.patch b/app-office/kraft/files/kraft-0.95-i18n-warning.patch
new file mode 100644
index 000000000000..2e189a233caf
--- /dev/null
+++ b/app-office/kraft/files/kraft-0.95-i18n-warning.patch
@@ -0,0 +1,35 @@
+From 1e8f15a6c54c0c29cb463deacefd1fe8b32ad41d Mon Sep 17 00:00:00 2001
+From: Klaas Freitag <kraft@freisturz.de>
+Date: Wed, 2 Sep 2020 18:32:14 +0200
+Subject: [PATCH] Fix call to i18n - same problem as before....
+
+Fixes #85
+---
+ src/prefsdialog.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/prefsdialog.cpp b/src/prefsdialog.cpp
+index 13b4bcb..ddce27d 100644
+--- a/src/prefsdialog.cpp
++++ b/src/prefsdialog.cpp
+@@ -335,15 +335,15 @@ QWidget* PrefsDialog::docTab()
+   const QDate d = QDate::currentDate();
+   mCbDateFormats->setToolTip( i18n( "The default date format for documents." ) );
+   QString formattedDate = d.toString(Qt::ISODate);
+-  mCbDateFormats->insertItem( 0, i18n("ISO-Format: %1").arg(formattedDate));
++  mCbDateFormats->insertItem( 0, i18n("ISO-Format: %1", formattedDate));
+   formattedDate = d.toString(Qt::DefaultLocaleShortDate);
+-  mCbDateFormats->insertItem( 1, i18n("Short-Date: %1").arg(formattedDate));
++  mCbDateFormats->insertItem( 1, i18n("Short-Date: %1", formattedDate));
+   formattedDate = d.toString(Qt::DefaultLocaleLongDate);
+-  mCbDateFormats->insertItem( 2, i18n("Long-Date: %1").arg(formattedDate));
++  mCbDateFormats->insertItem( 2, i18n("Long-Date: %1", formattedDate));
+   formattedDate = d.toString(Qt::RFC2822Date);
+-  mCbDateFormats->insertItem( 3, i18n("RFC 2822-Format: %1").arg(formattedDate));
++  mCbDateFormats->insertItem( 3, i18n("RFC 2822-Format: %1", formattedDate));
+   formattedDate = d.toString("dd.MM.yyyy");
+-  mCbDateFormats->insertItem( 4, i18n("\"German Format\": %1").arg(formattedDate));
++  mCbDateFormats->insertItem( 4, i18n("\"German Format\": %1", formattedDate));
+   mCbDateFormats->insertItem( 5, i18n("Custom Setting in Settingsfile"));
+   vboxLay->addLayout( butLay );
+ 
diff --git a/app-office/kraft/kraft-0.90.ebuild b/app-office/kraft/kraft-0.90.ebuild
deleted file mode 100644
index 989b08315cdb..000000000000
--- a/app-office/kraft/kraft-0.90.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-inherit ecm
-
-DESCRIPTION="Software to manage quotes and invoices in small enterprises"
-HOMEPAGE="https://www.volle-kraft-voraus.de/"
-SRC_URI="https://github.com/dragotin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="pim"
-
-DEPEND="
-	dev-cpp/ctemplate
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kcontacts:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/ki18n:5
-	pim? (
-		kde-apps/akonadi:5
-		kde-apps/akonadi-contacts:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS Changes.txt README.md Releasenotes.txt TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package pim KF5Akonadi)
-		$(cmake_use_find_package pim KF5AkonadiContact)
-	)
-
-	ecm_src_configure
-}
diff --git a/app-office/kraft/kraft-0.95.ebuild b/app-office/kraft/kraft-0.95.ebuild
new file mode 100644
index 000000000000..e601fabc76db
--- /dev/null
+++ b/app-office/kraft/kraft-0.95.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VIRTUALX_REQUIRED="test"
+inherit ecm
+
+DESCRIPTION="Software to manage quotes and invoices in small enterprises"
+HOMEPAGE="https://www.volle-kraft-voraus.de/"
+SRC_URI="https://github.com/dragotin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="pim"
+
+RESTRICT+=" test" # requires package installed, bug 745408
+
+DEPEND="
+	dev-cpp/ctemplate
+	dev-libs/grantlee:5
+	dev-qt/qtgui:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kcontacts:5
+	kde-frameworks/ki18n:5
+	pim? (
+		>=kde-apps/akonadi-19.04.3:5
+		>=kde-apps/akonadi-contacts-19.04.3:5
+		kde-frameworks/kcoreaddons:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS Changes.txt README.md Releasenotes.txt TODO )
+
+PATCHES=( "${FILESDIR}/${P}-i18n-warning.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Asciidoctor=ON
+		$(cmake_use_find_package pim KF5Akonadi)
+		$(cmake_use_find_package pim KF5AkonadiContact)
+	)
+
+	ecm_src_configure
+}
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 280548c2bbfc..d1cfe639fec8 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,27 +1,40 @@
 DIST amd64-debug-libreoffice-6.4.3.2.tar.xz 1575837176 BLAKE2B ee243e729bbe5747a5bbdade14c95324f127db92f426a5814b2b4d3a93c373c13b75b6a229b643cb05225ff8a44425516c4450650afaae556e053ee8217a563d SHA512 429c7d0c6a8205daa2025f9ff0b40d8c40748586d8f2099327ca17f45fc3ed797716cc9c3ec6d1568ff8b36721c5ca30fe7b4f8d8df4d5fadb046162d3befc16
 DIST amd64-debug-libreoffice-6.4.6.2-r1.tar.xz 1533904268 BLAKE2B d5b4c718111a7771f1787d6151e22b3e82f4a08c8c2dd4f244a514f4d3a7204bf0cf7a415d42f8f88e806a6eec478e09328a89c91452163a32766dd40907ae6e SHA512 aedbdf669f7c390c8c1e3c675d486b87d463404cdc718ea2d3a1667348a6ee693814ac2f543246310fc10e41c7a490b7da23b3e71208768b7b7a65f06431e853
+DIST amd64-debug-libreoffice-6.4.6.2-r2.tar.xz 1533877704 BLAKE2B d0f95c497e94216c934c4c460b19dd8716e8722152586bfdf1a4231cdbc16028de84cfa73ca71e09e94978d45224cdc59b3fd4b9bcc4849abeff1b2886e4bf71 SHA512 46b3048f55f0e47b979572f48381aff9b97f0dcf8267d93533664ea91a45c749f402aeecc9eb2a9390972aa15ba22944e198895f4c5b121b23a1f473e2ad797f
 DIST amd64-debug-libreoffice-gnome-6.4.3.2.xd3 1650286 BLAKE2B 8db44dc00dee6d592109b2701168ace2433e1eae391a25ba991af247f2786000436144b554a924d2a0e65763dec90938e872c04f982a5e98ee8cdfd1aa4c7152 SHA512 b5ee4c747f083365c62f1cc606739e8d5c6724f7094c873f4cd7ce2e28ab0c72b4518d4fc19c1b2b54bba78dad85fc35be4c004bbba6d76084ea33ad5c4bb782
 DIST amd64-debug-libreoffice-gnome-6.4.6.2-r1.xd3 1567104 BLAKE2B 0d36f2d95586ad73f56bf456fb306e79964f3d1f3b6a06782e56b43af64e521855a988573862f0bdaf337fc846e30d351ae7704930356b78b0e3a2ec5fe934f7 SHA512 d02eb67080a86a35d248485deda98c10cc6c15c67a819773a8bbc934be584d706c463c9d856ee50a601f954fd68efff9e67b74f546a7a15a33afe7642d217906
+DIST amd64-debug-libreoffice-gnome-6.4.6.2-r2.xd3 1567465 BLAKE2B 7239068e9c32d58685dff3456d1c74d11092b0a5176ba5dbeba59a9bec54eee5584ee4ffb22266bc1e2854baf10057d60f73755a5e41df530b5f4cae69ff0597 SHA512 5c983a03a154a2ef3e48b65bdcd478f7f83345e9c3d4248811c0b2b98f2f4ed2d6fcb840a1862ee33911fa954371516649144e8e8e2c718f7ec1f6659ccf6b21
 DIST amd64-debug-libreoffice-gnome-java-6.4.3.2.xd3 776124041 BLAKE2B ee631608b5fa67d45320ee715b0209e1fb1aef9329a56c0258013fb5159fc8334eaddf81e8c41dce9af406f15ea2fbd806d2c7acf0b29839b713394c309804ac SHA512 81eebbe43ce848637deff115f7367e1da2136435393d98bc6583e2eba998c7e2894b555ef7db8e420aa2fb353f1dfeba54fddcac55c81de216a3721c4b524559
 DIST amd64-debug-libreoffice-gnome-java-6.4.6.2-r1.xd3 747096532 BLAKE2B 2a995d680e31169f6e56f0544210aa5320b63b845c8c718c998fa638c7b08c968ee3f67e78aa9f1775b30bd7a7d297865ebbeb6bdc42683b31e621a5b97e0726 SHA512 da65f9aea4f9d58c993a8dd734641a48af5abdf925fdfd7882986cdb31348fa511ff9c3c01c82ccf1b6a6eed7a816eb9e1bc15cfa8baff4378da1a91c9791664
+DIST amd64-debug-libreoffice-gnome-java-6.4.6.2-r2.xd3 747959737 BLAKE2B 0151ef5d689d95a3444b78f8123023508951ad106a051530b8d91efd3fa4afc3f541d97e2e50afa483725d100fe9e3efbe234990ef161f7d1821977e9491a646 SHA512 d6e4e70e00c36b473fae6718bc2687c5af3a529e21fb98de348379203d7a1c0eccee6b168e7165bc4db302a58945256c45c1fed7424f681ca524ae58683f4770
 DIST amd64-debug-libreoffice-java-6.4.3.2.xd3 774470299 BLAKE2B 5d2db389270288ad469539b8ce2ec76af2cfb2da13211b7a2a42eea49fd8eaa9aa0627a517c81a78a017ee8b0bdaa41a05cf90ab26ab4b9d4dad93cc2ad90013 SHA512 4c97eba50625489453e92c96e5efe347cb15d396fe97981bf25d97e75d6dfba6943c31663e239484f0291b65bc5c7da195de1c8620488195f0246cf69a40591a
 DIST amd64-debug-libreoffice-java-6.4.6.2-r1.xd3 745510589 BLAKE2B eca91df7afffefdac91c7222ed5b6ea2d4b5eeff0a0d35da43b34986035180267812a3ec893ff67db74d97e8708079eb33f2694f20945f2dfbbe7a94818ef646 SHA512 02eea31554031d3c50261371fb7847b5975191acdfe7fd36189a29e83675407bd465dc57dee5400a5970bb5470bddfb439a996ee17e4bb22746e009fdefc2462
+DIST amd64-debug-libreoffice-java-6.4.6.2-r2.xd3 746377573 BLAKE2B a2ee1b1f6b25e3f183948e9afb4a7ef07c7bfac003f64408c8de5607ffc61b0e4518c9b029e5732a98ad1d6840eeff4623e901825cc5a18bb95bd83bb8cc7944 SHA512 bfd37700646bb26fb8b59620edcff8152b85a97c323225899ceec0937326276eeb568be13c5264243ca79c486ee039da1476bba501957aa5885a2a2eb3ea0e20
 DIST amd64-debug-libreoffice-kde-6.4.3.2.xd3 480378879 BLAKE2B c17f97544fedd20b1e29405c592681acbd800c144ae7b2939be70b505811267981a31ad2bdb9faea0958229a6e757e7537b48757c58ec405265b8151fb6bb2d1 SHA512 16c7e0093ae26e6d7a8a1da7bd907ad12e591943c1f3fb3297057ae224b05ffc982884c29366e700e68cd84a802cf3e242d2919bde673c49b361f0df4104ffbb
 DIST amd64-debug-libreoffice-kde-6.4.6.2-r1.xd3 461579472 BLAKE2B c6d8ee75135a78f450ea5c18092313eb1e29a011eb31556c83ffb9dd162b8b08d26486ec5b259af144503a0762436ff551848731a70b4e4ae05686f5a766c081 SHA512 c9264596607d882a850375f53000549d9ea69715a729f9a842bb3a38590d0c71226c0e80a547931e25befc9c661c46bda19dcdfa713a354fee56bd6db6c9c5a8
+DIST amd64-debug-libreoffice-kde-6.4.6.2-r2.xd3 461475494 BLAKE2B c59addb14cc79422b91c0a051cf06df4fdd33279fdaeeee512db76cb8fd6224e80b485d20320b209404d8d14f679053665f23218ce7b620d8da3b20c74c72671 SHA512 dea493fae319faf8cde12c192084548bfbf55b4017d2d3d96938f5705156a5b19e8204629fe98f205488a2ff6cfd29927cbe2fbfbd27eb37adbd6b2a8a477b5c
 DIST amd64-debug-libreoffice-kde-java-6.4.3.2.xd3 783683127 BLAKE2B c0c87c05ad781507fd740e37f6f685c37daa453519d8bfe969807ff50f277eb7b5d8720ee6bb8638264313de58dc072adbbaa715549a56812d6d758203c7251c SHA512 7117a0e536a2303595d652ea41e1f5ec5d92e4ea70fadc5dd5116e2b320e156d0ac467bbf3e44e71fe89a329b6094f4776170e7cb2ebc17b9131dd6b6eac917e
 DIST amd64-debug-libreoffice-kde-java-6.4.6.2-r1.xd3 754606886 BLAKE2B 780f8844da4fbcafc32154aadf639941b8f90b7b4e7a3cacae9ff9390e818de64ff1b4f224c9ab6613ae961d033a067a3c495af53f63ae78ff26d535d7b7ee8d SHA512 71256405bb437eca0cf97d1059b5f38e4d97cc4249cc78076ea5a52429c689daeecbd1dfeb5dd64faf3458b6b9277cca6ba0c37af8f8a3048aece8bc045693cc
+DIST amd64-debug-libreoffice-kde-java-6.4.6.2-r2.xd3 755546076 BLAKE2B 4d0c2bc849793a8483d3a3a7156812f30f9b97e1add1d2d2676cf69974db88e27cf073e0844e1e05cf337d6e109d134dc1d4c6b84c7c12aa3e36cdc6184b87b4 SHA512 dfddae1f600780d088c429e6951047960036e6f31e908cdb18cc552645230b00ed0e2f6ed6be46fef815d8ff49fccf5450bc3f23b9025c8720ed30eeb78f3a57
 DIST x86-debug-libreoffice-6.4.3.2.tar.xz 1540005828 BLAKE2B 0a688eea8362ebe95adaa0d8581676fa3867e27f928e55b435046c1b498dc0c62e6d11ec82ce5cb537ac9f1154632d610d021e44c0a1ba34de67a7e4f64b2033 SHA512 e781bf4815392f11bfa0375733d285d1276e9819813e9653c2eb2610fc423b4e75af9d7887d22d029452b1146dcbed615d0767ac6bb57c26af8d0d8c5291e26e
 DIST x86-debug-libreoffice-6.4.6.2-r1.tar.xz 1497798064 BLAKE2B 3a83283ce7c1e83f99704ee07cb3489ecf03813cd6edb79fecb214da0f2e89260f018684f0397fd712d9fdca01afb46204c0171d3c928f3075ea2982796c3914 SHA512 28771a55b2f909ea1b9278b4ad48b4ee994a50eac96f9ed2227bfd77f3abc9dbbd6b993a4d01e92fb6c68b6f109f79e03d0863bb5487d7def526d7ccb8c78a36
+DIST x86-debug-libreoffice-6.4.6.2-r2.tar.xz 1497855216 BLAKE2B 3c87f75f3f3c2201b20e08a8bae5162d5d4f7a5a3a315ccb185b4cc98d3f15b13a896757a01db56855b8f384a601bbe2b8802794d83fb964b6775e7164aad627 SHA512 645e9448f419a59e7d20d6450821d72e56005a94aabe51ff3407a7a910fc648d34ae6e790e77b1e236b4f00fc404707566a46825992e4985707d4b29616707d4
 DIST x86-debug-libreoffice-gnome-6.4.3.2.xd3 1604587 BLAKE2B b08806ff2131b3fdca314d9cf994f4728a73acc92fa3e0bf36f85030907a65b9fe19ef4d4418a13ad1d97f6b07b1782bf7f104856d0f51b938f27d0e694ada44 SHA512 6e51203533eacffaf43192d69059840c00ddaa1aaa9388ed72aa233ddfb1c0898f44105a09bcc7dbf4be484c294eb8dc076f1700dddf4effcd1ac0ec7ba32f00
 DIST x86-debug-libreoffice-gnome-6.4.6.2-r1.xd3 1521155 BLAKE2B 5c00d405401d0ac5a3e2fc2e773dd46aa230fbaf43cb4037d9698681eb89bb28b712cf61963dedb5479bc1f76b520c8a7de952affb061b4bf7b8d4aec3c8109c SHA512 1a321ba047a211b66636a28fe94e6ee9adce2a4a252cb1d474095df25cb70ccdaa493a815d139d606d313a1f9d4249cbf89bc44adc0360579ff9e159079260f7
+DIST x86-debug-libreoffice-gnome-6.4.6.2-r2.xd3 1521667 BLAKE2B de0026bb04bc48122cf7dd1a2bda45cf3a744a32a665e7f8a4659a16771ffdcd1e86103633c390c9ae03bec59db89b3b38cdec420d1a214b15948e3c06cfb416 SHA512 b9af148a94e9cc988667bc6015b6b11342dfcefde30a085cfae0269e4528c6714291ddadcd8373320784fb12698504247e5d3959690613d024e422c04709410b
 DIST x86-debug-libreoffice-gnome-java-6.4.3.2.xd3 739065723 BLAKE2B f954ff41ae88631201e9a840fb503c6ea6cb0295bc6220e795b631361b3e528639a576fb5a43202a32189dd537f62877cf24a4e35fd52a30fb9579be824e8cba SHA512 50294507c95ee8d9b5887cb60b4ff32db7764cd2d858af5f4dd35bbcf38a7943a1eb8f10fe8fd6edd370a128013fb3a1ebddbd2d64d3a418b1325cf133506e2a
 DIST x86-debug-libreoffice-gnome-java-6.4.6.2-r1.xd3 722959412 BLAKE2B 7b8d1040aede095212a8bec0e4ec852cc56615f81a25cd281f343c1f294c88ef53e54fecc0f5c27421cd9ff5a791db8a563b046743b2f86454ec360308bed87b SHA512 bf59aa4d50e11f02f24fe316d77e394a2b3a9292a045c4da0eb64d22f37a44cb92e88c51de4f21ff0d81da22bbeaeecde0b0a0ffaf07ef5b25ad9d5053409fa5
+DIST x86-debug-libreoffice-gnome-java-6.4.6.2-r2.xd3 722465261 BLAKE2B 682e741bb10fb54fc50cf04530af5c3e3049f5bd1b4c5667bc9f24f85552aac47f5d6825d5d1412b8557cdf0a33612b45f5d3868b74f60586c593443253f02db SHA512 e4fe34f140aa6aea94cb7e7def6463d88f6c3ddded4af19627cee84645aa72a2f810d0474364faa3409b5e7f1a8a1394dbd3728d747b8b46e4e9d26dc902006e
 DIST x86-debug-libreoffice-java-6.4.3.2.xd3 737453940 BLAKE2B dc658db476b80d268f97307009939a3663e52038ff262dfd23805532f4b1f7c5e370e31b246a33c86269a2f121ea052f5847fa3debc7f861acf652225b14a250 SHA512 90c33969bbc078d654b8775d0048647f32091ad27afa68a3ce41777b98051c86df382758554c94f0dcee5dd024ceb177da214b0c238629a28c88ccff0bbb0a82
 DIST x86-debug-libreoffice-java-6.4.6.2-r1.xd3 721420736 BLAKE2B 5de46b0944228f98b142335ddaabcce1f2fcb67da576748382ae7b8524c0259eb026fe60b405819211ec05f9feb9b936985bb3992fe5b7c0779491e0105c72b2 SHA512 8e25d2c0b948ed09544e9e5bedbeafa0de8155423871e67eab7d01f5dc71ea85c2fa1ea684142142c2fa97b2aa37a62a8f9066cd5ffbdcc83522cc7f40ef2949
+DIST x86-debug-libreoffice-java-6.4.6.2-r2.xd3 720927677 BLAKE2B 2427221039c273774fbab8f2a697366163afb69c2699b80354cea559d82e9e28805da0c248e3e851e64792af47763700783deda6b8088e5a230e06a49038a60c SHA512 fb7e2ee5164d143ddfc7c1a45e0b61047810f4f20149705bc6a4e58babec35200803de970062ce8bebe9971a476f99a82cecc2a643cdc7dc2cc86b76905fb4c0
 DIST x86-debug-libreoffice-kde-6.4.3.2.xd3 457748753 BLAKE2B 1d0c3a4ad240a80a997db83d90ae20d70f9a4439c5a962db656fc72005a7c8e20bc129626ff040af5542cf36f22f872a6672796b9a7c7d493457b976005ac7eb SHA512 31880b33b8e056cc20eec5aa81a18b08223183a0d59590f2914eb371984e19d660df8502d3ae88b03ba11bb65e91015eabd1d6e008cc35c83e7a7124e742c211
 DIST x86-debug-libreoffice-kde-6.4.6.2-r1.xd3 441958002 BLAKE2B 38c6b052d2b71fb013217b723dde83722a3af499f2df09a959a52db4009fc111298e733c891fd015dac2f046b46ec405b6347d80eea0120a52957a84660eb8a4 SHA512 bb7ed3179763605e07f953dfaf1fddad4215f9f95d28d7492d37450a892473cb0250389eac4142f2ce5dfc778679a26aefff01cbf0f2aa0dc83095e29fa18eb7
+DIST x86-debug-libreoffice-kde-6.4.6.2-r2.xd3 442030408 BLAKE2B 414eb20169ea42e4b4ff73a502987433911fe1332e9ce26e1618791d74dd31f2f0c9b2ae27cab427ed8f959aef546eb2e63041c7c890937e0ffdc0fee650f27f SHA512 8d857d3567b50a109f13b120f2ffd6089193d78cb63c480985a3d0cc8068ff08bc7bcdd8b9255a53a808715085cda1f19d8c0b32910556106967533e92f7a974
 DIST x86-debug-libreoffice-kde-java-6.4.3.2.xd3 737345990 BLAKE2B 00c365c8e8c8b0444198bb30a5ac12e9381471ae7e90a0a9f1a26aa3fc4d34074243a69a64da94ba0cc89dd4238ce54e6b8bfb6334d2983db24fc44c26722ac1 SHA512 c787d6d6c9872dfc0b409226240270a9687205f5892a820621d019c13109048c2d01c4afb23bbbc3b4aa9c5c47fcd07a4f50f1e995f6b1536fbe0540fc2f5c5a
 DIST x86-debug-libreoffice-kde-java-6.4.6.2-r1.xd3 721203512 BLAKE2B 0c1694c4d2d2ba9bb82ba279585efcb1a4fc47c99f3d070c15b3b314e3759beba788acb4c410c5ea528f3fa4a5c5ea4beea22fb7b8b68f5a1c082088e3fa0beb SHA512 1a10f4bbb05d8f35fb78c470eac32df9c3eb5bdfb324d6f7b1a17554ab073955724371d2a14fae582ba98a562ed92b8ae4f0f68bf49638a32abafcc3b2593a91
+DIST x86-debug-libreoffice-kde-java-6.4.6.2-r2.xd3 720717402 BLAKE2B fd9c28894f274dc1be028085c3382040e4f36a49262e79d623f4c818e7c8b9dd2bf25b65f8d49914f02b93d3e61ea8758129a7f57850d559ce437d94f48dbfbc SHA512 a1e0622d6a4ff0dc05b835569c03626adee6114e8d0b25dc3739d90e0d951976df8527751c57ab65d2e79991086fc304266939f0d0d0f959a3ed5016166678f9
 EBUILD libreoffice-bin-debug-6.4.3.2.ebuild 2628 BLAKE2B 9e719a7f3f6caa1f9ab77c2c1de8275d6816bdaddf5a54470458028c145ca218430946107933c8f2fd9f32686ec3b7331b7104a083655a88f321d6c32361c09d SHA512 b98cb8cac96a2d50ee38e7520960d62d98cd4edbd118a4a9edac2c4ed5d3e8f34aac491e1db1aad20c10bd712b17b5d4535203b5624cbc4dfd4303f2ab81aba4
 EBUILD libreoffice-bin-debug-6.4.6.2-r1.ebuild 2630 BLAKE2B 33f24bbba29f6cf3854ec3e81ba25a39747e6f7e54bfeb3e15453ae868e737c773e0c2530467afb79141ddefd4e92248ef01f36181c650858271ec82225e88ab SHA512 d8e0344ec13e69102f3678b8eddb88d23df19e3ef8c7edd1351dec29b0f1e70adcc7c61fdbc9de0b10f6856de88f346fc671d35116c9c1ffea38877bd79e7ee2
+EBUILD libreoffice-bin-debug-6.4.6.2-r2.ebuild 2630 BLAKE2B 33f24bbba29f6cf3854ec3e81ba25a39747e6f7e54bfeb3e15453ae868e737c773e0c2530467afb79141ddefd4e92248ef01f36181c650858271ec82225e88ab SHA512 d8e0344ec13e69102f3678b8eddb88d23df19e3ef8c7edd1351dec29b0f1e70adcc7c61fdbc9de0b10f6856de88f346fc671d35116c9c1ffea38877bd79e7ee2
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.6.2-r2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.6.2-r2.ebuild
new file mode 100644
index 000000000000..24cb2437d07d
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.6.2-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="https://tamiko.kyomu.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.kyomu.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 333675dc78b7..a6a635b9379c 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,28 +1,41 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
 DIST amd64-bin-libreoffice-6.4.3.2.tar.xz 113273468 BLAKE2B b32633570226dcc79afef682bc9cd99e7e6fc7c29361d2ed42b177444318a3a1ef53e6f001515e9602304569e6d164644f74e69095e4050281eedb7106e02576 SHA512 94c597f096053dd5340e63e21778a36892c10545779f63cd9123e2d8b50ef27979b6cfe68c0954de17c706b8adade834b7361a370b6b0df367b2971b9d604770
 DIST amd64-bin-libreoffice-6.4.6.2-r1.tar.xz 131243800 BLAKE2B 3f516c4897fd52405a4a74ff7f70b6ecf0a81ba9cb275155ea5f7db2e7c4905c00b5688bf21a7390f8f8f38090515e83d3f7b1d7e3e9bfebf5804de6a60dce81 SHA512 67f1ea0b815b85d9dc524f35dc4de1f9e4354e6258eb4d8de8e7419c4870052edf64cfd7e2f27c9edd1e325e5ebca384bd0de18235ef87232522b9154e62ec9c
+DIST amd64-bin-libreoffice-6.4.6.2-r2.tar.xz 131250704 BLAKE2B 3cb2126b88658cddbc42e982c2d25dc3592955c594aa60f731b8082f4173e9cd96f6663c64fbb345ad7b1b99a7981c2364c7382397ccf3ad9be25e176bf4fd1e SHA512 f40b66f6261a35a421817b4d686cedf3361823e0284bf3a40255c9cde85620ef20c5d8fae88ff60c16bfef0cb96b9e8a1bc55c510a132fdeee54b9587ca6b37c
 DIST amd64-bin-libreoffice-gnome-6.4.3.2.xd3 1223025 BLAKE2B 60a826223df7190e23dad0cad2a5f46acc80590dc53ddbbb44725e8b2011ecd687c3d05db112c5e769f0f7962f68c8281cc25822f3b806e593cc640670101e85 SHA512 9a087dea29278eb14c6d121370b9803b9232b6ed6ce10d236fa7c5d6a326a0ac3eacf52f1dd488198449fd7ba7728e7e92627cfb67924406d3ec557ac0268522
 DIST amd64-bin-libreoffice-gnome-6.4.6.2-r1.xd3 1886401 BLAKE2B 01462ba52489cbcb4e8f265ab4d8f07e413a06014aaa5e46e8a1df9d8c4b77bf46a6917e090a938adc5031997ff7c04f1c1435591c3932e1e96fb482667a927f SHA512 66e921d4288801d53cd215fc1334389fb23358c922c59e3fbd3602680415ce94454427838d16eea9af1e7f1e027da252455bb6a0d80264eeac51cb549eee6ae4
+DIST amd64-bin-libreoffice-gnome-6.4.6.2-r2.xd3 1886188 BLAKE2B 4f0cf34b16b1a9c753deee20200670017395a092134683f43d67a5dad3896cc0be72e3ca7ac099af33a0d81fc82e723bd9139285cfe1a0019a872c54103f6b68 SHA512 510000f14073c21dba8a134f7ee5b3889e83aef19abd4443d2ff5ab624ea80f2e220950cd00b0b9b305e857fb875b81758b3d64fa94474392ad87ccac0cb5bf9
 DIST amd64-bin-libreoffice-gnome-java-6.4.3.2.xd3 27598984 BLAKE2B e6f20918bb3e7355df26d4f212d1e1e90f73fd79e5aad1308403bdd11a9ef3318d244c2a78216a22eba619ed2f4c6b42273bfe064b14045d5ba6cbd0fecf44ba SHA512 377e27ee97ed15ad7963d3f4ae6c22bad24dca52f3552e8a557d30bb81099e9487b0a803fedf41a5254a998d17f401f723774f3e5a0d3fe0b386f76296d582e8
 DIST amd64-bin-libreoffice-gnome-java-6.4.6.2-r1.xd3 28378971 BLAKE2B 7cc0fa5f71441a0c8a3fe197fed0c9c2699e1f1c572f1d6754fb7596125e938771e4b407f078f8f65596346ad6609cbde15e2507114df7d3805628512a054a9e SHA512 6449765c5000314b4eb676faca46ece42e642d44ec58b9e425e483a71641b0bcfca46b77b12b847afb91dda6dc3fcd83f49b6ced37f1b6e0afe0576327fa1797
+DIST amd64-bin-libreoffice-gnome-java-6.4.6.2-r2.xd3 28380619 BLAKE2B d844e396cb4da470ab27c7c566cae91c559d2502f5bf4e0c5796806f6ab860b1e92757e39fe61922c43a34a26b01828fe4d8a59bb4f70d7bdbef0cbf4d0dc276 SHA512 5f7bdc21dbfe17afdeb0460fc7df1d38b411bcc46ea1dbb749c2255d65a9b94d0cd49b1cb3af14cb4b0f89d9ed58a36d857d15a0415e256b9320f0304a379920
 DIST amd64-bin-libreoffice-java-6.4.3.2.xd3 27479788 BLAKE2B 2d4c33e39eb99a43c1aee46d1e78739918228833d3868457c5e64211fb4cba21fe3c2432fb9cf6f164bf060141f68c8cb986dfe1f1093de6a6b429a63e5425b0 SHA512 f991e5125efe64500dfeb30cf145f85e61460cfb133990f7b7662d5bb281e9b152b7a62a04a2671240b015cd61064f7c537260ad69cd386bc832e02235890098
 DIST amd64-bin-libreoffice-java-6.4.6.2-r1.xd3 28248132 BLAKE2B 0915b7abc7bc0faa1d9421be6a65a25eae0a5eed77780076befbae15e5fd9538458c1b75e3f4f10a6bd459a30bce643c9611bab9069cd53bad8eab38304b6d67 SHA512 0e57a0a0987ce3087bbbd9b9197a0ce829da63e7f66ec8a063aada0c5fca2f710a31f0a3bebafc8e8f8e1b7f633d7283a2e5fe106dff152d1cd7cc97c6973bb2
+DIST amd64-bin-libreoffice-java-6.4.6.2-r2.xd3 28215336 BLAKE2B a6524b72e6d27620e939d1ec7bfd57edc0bf5ed63152e80f3eba4eea8bf18e95eeedbf850e615a8c5f365808b6b83fb538a6679e3950bbc382818d89e2b70c69 SHA512 022da7edea982c03dd9ac96d6fb8719bda51d750722146ce857e781e6e4fe3f7bdddbc8e14cd7cf22edad84a9e955ad903107eb097e7642025e42d6d9056974e
 DIST amd64-bin-libreoffice-kde-6.4.3.2.xd3 17773121 BLAKE2B b606a90277eacfc8a7683edad75027142ae9348292cb72e82836ce0686c4ddabb78752e3e93eb994d1967fde77d7f7dc0c73a6b6199b8abc230d7ca39fd5a4d9 SHA512 ae29d2975d88fe14e0518989218c3e05ca722073ed3de8f8d2ee18d30c6a49ea8f9aaf58d2f5ffdb52a175361108b62ad543e4e1a283bfc968b518cdd191c628
 DIST amd64-bin-libreoffice-kde-6.4.6.2-r1.xd3 18443074 BLAKE2B 4ad1951e418080ed0663aab620f6a0b180d1c9db228f23b276f2fa54828f9b0ba66aeb7f0823ee5678cfda286b459fe96719f76135c5329027732393e66e0b3f SHA512 b869664e74337994dcf54506c0c548618fb9f1da1d0cbec367e2b87df8acfdd5b743f7d9697415d408ceeea743450b1c561527b311124479b2b352bb5c60e686
+DIST amd64-bin-libreoffice-kde-6.4.6.2-r2.xd3 18424710 BLAKE2B 6153f778a10cc51564a2718de27bd9cea4c55f22bed3f27564079cd8887ae99cec1ab3ca20c859a054ba2531464883a40602447daf348058570f2cff44595f1a SHA512 2b67b2b4a4f1eff704bf6e807b24b82ca8ef51c63a480395256c3bcd89667b860ca9b5d7261c3df5950f75cda67a5c3621947596e826882efb173ccac238a673
 DIST amd64-bin-libreoffice-kde-java-6.4.3.2.xd3 27844140 BLAKE2B 4ecb445fab0600a56927001d5994584c230ff3c4c467301e235e1905ed29661b0467459af70384e063873c8a824565d902fb07282a53894be115d90d68c68bdf SHA512 9e459cee94554aad8898042c0f14465889aee83a11e100e7b3f233c2d6d9d5a201f52e825d8fe1ecbadbd0c8f0155c28870aa6e517d543d3ba3d3c4185c95704
 DIST amd64-bin-libreoffice-kde-java-6.4.6.2-r1.xd3 28697445 BLAKE2B c57782cd234bfe22a296e92ebfd4ef9609d109b0c1739e090dfc6f6a38113c3ad348272bbeab1f25594122a22edb88476d35559b00a43649fdacb63732a5da97 SHA512 090b3c60f26d4689548b8f745b95606c678925bde217b2618b5c45292e2ac2768ed9aed5f119c0956e8cdbe46fe22a9c42e40334d692a284e0328b5614dba7d2
+DIST amd64-bin-libreoffice-kde-java-6.4.6.2-r2.xd3 28690924 BLAKE2B 2bf8712408e5c993a4c346dc86be3c4ebcf4a24c791ddcfdcf26fa526d4a58404bbd42d2476520fe809b61cafdacaf0591cc598d3730e21e0a4c4a001b3fd0a8 SHA512 db31c45d802664a83dc27fb73b207b38fc465cd563524f4f31be5bdf1cee213219243525d316ccf203b02afb4e7ed562cb5ab9d54ca7e2426f0554280814846f
 DIST x86-bin-libreoffice-6.4.3.2.tar.xz 115234220 BLAKE2B 88eba1138e1cbc6fbf4ec63d5b47215aad89ffa72318633c770e5adbf4c2c2d6e36d4868bec0789795dfc23eb2ee140dbc7224f2c1bd22bd82e22be89c44375a SHA512 1526c94a8d9c49639b6d888f283624c87a43d9c66add0d7971eebfa92e9c922dc4c752a49af7c0c3a7ec7e6b96bc38eadd7a29a4eda24fd3c7b617b27dcb609b
 DIST x86-bin-libreoffice-6.4.6.2-r1.tar.xz 133216996 BLAKE2B 1d3bc3b4ad941616108519c900ceb6f55c2ec0f92dfef423d83e6b89caa41310e8d99a746fad0b1d780bde208fdd7f11df67387459d099b530c1e400065f944d SHA512 e47bc506ebe5792e0b2eaee6dee8a7bac86b44a04d05ca858fe5a07b478ec239cf4abbd3cfa980ca93b479d96abae10fec0ee0387dd81c853666ee565d881346
+DIST x86-bin-libreoffice-6.4.6.2-r2.tar.xz 133202572 BLAKE2B 235a1457025f70c16c2f71e80ae784df8d1d8555b8b47ff3028ad0841598199592e371e71d7f99504806ceba9d59387ec11fbcfdd871466f614d3257522dba8e SHA512 e82c10d2dff99b5572cf80ec53a36ead86b5d0291a734fac6523d3c9da5bba1f3c266f81405a5c205015ed54fc9e60520b05324526c8745fee1393ef7340698d
 DIST x86-bin-libreoffice-gnome-6.4.3.2.xd3 1225517 BLAKE2B b61fa6a5b51eba1f260d16c9bf2cf0d08d3734dc20a11e44e2730dfb8d62b42d59ba4d8708ffdaea8005fd94a852b3c2e7391d859e2c706275e5a7a067f982b9 SHA512 b94ca1f1038285bb8604f685433904f3c186dd6e1c707be9b806153c68fd29aa87601cda0a5d0e77911f67a344815a7e7d255091466620ca9a21a1d606d8c0eb
 DIST x86-bin-libreoffice-gnome-6.4.6.2-r1.xd3 1891271 BLAKE2B 7e0039481d13e4f9229b9f459b7786ec5a278233f569c3a2405fc2cf29402c2f734c1bde675de23f3989c1828eaabbcfcd0edb4d5854b52d024f2437cd1084d2 SHA512 e97c0d7638bdfab6c857c309ee2964d9b88e7772095dfd8ab9f1473ce770ebf0fc7e9df404f5a14d0edfef0deca7fe598dfa26c6e3ec4f6d8eca0e938f7946a5
+DIST x86-bin-libreoffice-gnome-6.4.6.2-r2.xd3 1905204 BLAKE2B 4976906069cbbd1a2f32269f9517afb627d59603301a99996bdea5a827bbfcaa602f14134f0d3b7f660b5778547322fb33e5183d410d4bb813220fcebca4f13c SHA512 ae21a2ac49ded6b583ad0854ae20ddddf5fde9ebb17fbd1bc687b44b2c764ddbf08ddd199812d1bcb06bed5b41aa928c8faa9549418549f439b30c6544072643
 DIST x86-bin-libreoffice-gnome-java-6.4.3.2.xd3 25224776 BLAKE2B 5fa64d26595a69ec514517f4f9429d697319f99a5b3765908a5ef53969023b70fa76c42401e3abfb0229e233f81a111751bdf774629a2eb43054c89b071d29e8 SHA512 9cd1fb2a0b433ff98b515989bfa9fc0f5d8d502c2f3ddab8bf3e9e22ae7833bed37497302cf8f27269e7eafd78bb26bf34dd8a2ff458a4a876bfd90804d6952e
 DIST x86-bin-libreoffice-gnome-java-6.4.6.2-r1.xd3 25843714 BLAKE2B 2b08e1bab43d0c4bb8dbe1ec9897f9ec4c58711f0b803b567a363814aa68bf70bde534df488bc3b9633e3c23417261f81fc505f4b552575d6cb7f3b53a64d161 SHA512 1c6dee450208115f0ecab9437b244cc0a90ffb41c2001001ed6bffe53e7e2b6391bf18c1a13c7256a5070adff0b6cc4e0e8a12a743aeba620854403c9a0bbceb
+DIST x86-bin-libreoffice-gnome-java-6.4.6.2-r2.xd3 25844744 BLAKE2B 143403983b1c918f3ff82ad934aefb60a2deae830407659f0d72bbebe87a31f13002ebd8ab879ae5469dde5b966f91e9081c716fb82c838182174759e1368bac SHA512 ce8646f82049f38f044fd5c7a330501dddab07e48df9e82bf0114bffd27ca7d9d82c3e55863c57017e7c1aac2d33d8824179646d19fe6afdd3767e225775cb6d
 DIST x86-bin-libreoffice-java-6.4.3.2.xd3 24828153 BLAKE2B da19912f611914e4de44526cdf81cc3cd029554ebfe1ea1d850c79f95877e686fc1d372804ea9e0f20355c898f00b66e471b8a8f06ad69451686f2f04242d899 SHA512 86ad918ad2a5352d771fff149a80f0d01fb877c91b1dcaee8a4429eade5bee3f64ac389146831b26091fff3a0670e885b675e56b21f9e4beb48af91b895ddb11
 DIST x86-bin-libreoffice-java-6.4.6.2-r1.xd3 25715907 BLAKE2B 067d649a2e5c3feba22cfe0e1ec12451f766ab5d81ba94617e15bae6c42179b1f9f8410a217e2fbdf2425c335dcd42d70a9a2b2f7552fd627a5f2c3d4349b739 SHA512 75c756780b10c8bac1858cca72a240280b37134e169ed91457f4d5bbe3306d27594dd4abd283d8427773c353f17c453de4ddb48070c97cef095ed9e59024acf5
+DIST x86-bin-libreoffice-java-6.4.6.2-r2.xd3 25972754 BLAKE2B ce1a7f4557972754f6ba3857bdc0244ab507d984486497a3c6715162db6aeadf58cbe3061a078d91fa8fcc19d8ee266d4650d01ee585c34eef1fb264132230a8 SHA512 52472ae87d0a9af4d9e68591188baf008eaa195ae73a7312b4ee4253a41bbae93aa14236a9042a6019d13d42de347e95a96170eb1f427c145e20f7e278894749
 DIST x86-bin-libreoffice-kde-6.4.3.2.xd3 16007423 BLAKE2B 6fd735641dfa0a3340a27c7f5ec76495559905f0dda02d4d71a40fd2619e4331b47cf4c34329927d97f29ad96450f9ef91456563384c7f375e1bba3855892012 SHA512 e448d6cb693a92a26690f8c8604f2bb9a43883d862678e0c071b8a3289e06397ddacf45adecea2ac456f924693787879828dc0d9d210e5700edc73b1bafde6c3
 DIST x86-bin-libreoffice-kde-6.4.6.2-r1.xd3 17307815 BLAKE2B 13c55f284516c3c1628808798d9e9ea7eddaa6d933fcdcfc589dfbcb5d5a99356d0458ce9299078c31cd58656c42c7c3fa543fcc8335dc2903dee2ec6a0ac741 SHA512 9979ce0eef8c7f80a0739826fce37849e313118525c87fe9210083810195c01411d1ea4afb61eb15b4f36d5d75a1308ae16e0f2a810cc7ce184cc0c4c2e0228e
+DIST x86-bin-libreoffice-kde-6.4.6.2-r2.xd3 16601007 BLAKE2B 8006626e82d0423449b0407e32ecb6a345cae46cd4006d545bcb4727873c90a1984c3d811c2b3e83bde7d5b02ea5b81390e7b782473f12564efb536c57d40ba4 SHA512 e6cff3950450bd6d4a026321a69898c29eea4eeb66b34022dddc2447780712fc221e17b8fe2f267d506d4db7c63133bc2bbca78fb3e769a451337abd354d926d
 DIST x86-bin-libreoffice-kde-java-6.4.3.2.xd3 25368218 BLAKE2B 9070e9428a52699fdae67ce85502c69171a7e09d45b3cd51c1d783d677de971d3db5aeabf056a4f6b774c0988d7f3f405279f4ae24352c3e9904a385ff93c25a SHA512 e705d70a7a6841309cc0c0f6e1ecef9d2280299a3650558d8d3fe11a07f01d0a10e61046629989b8c7a949f639fa288a79c0116c1edaec4b5a5e6e1b9bf45f0b
 DIST x86-bin-libreoffice-kde-java-6.4.6.2-r1.xd3 27489312 BLAKE2B 9a43709bc46b84d2d6383bc1720a3d2b80512974a29a9880ecc87c71ed1c0c33cc135b38e3af3c160ab462bcac035f598d3e4b876c0d4e0dfb2efa83265190da SHA512 dde89f6eea3d186777e1900dca941529b813128d7e776b7e8e820e0a4f6ca97760fcb3c759cec7b994603dfa1f78abe934291433669b1dbf1bab09634f7480c8
+DIST x86-bin-libreoffice-kde-java-6.4.6.2-r2.xd3 27515503 BLAKE2B 3044048d4f7ec8e984ff9e07a3916f5db8f49fd9e10949a31d063ac9daafe916c109a6367959ce5156d14b894ee6ca31be288850e6107c2b83078b59063d4b6c SHA512 98fe91afa0928f7dded76f0088a04cfecf05bf41c5d5b4bddfeac3a37af6fd8e763e21dafe6da234f28e18cd4e51d8b3582ba4c2c2c9d9c72048626e17cb3004
 EBUILD libreoffice-bin-6.4.3.2.ebuild 6202 BLAKE2B fae5988722a8b4079cc099982cebb43416a445cb667872cf1e0b62d6d4394119560067d43e82dd528c484c69a16377cf2c1911cb5775156fbd2d8d50367c4173 SHA512 5a0b0fc5d3fc76519d699cb4657bfce11a5adecc8f3a4057e9ca53c31a460ffe71a8f4da87578a761e806bf850478287f35fbf4a1e448b77fb4f98ea7bbc85d5
 EBUILD libreoffice-bin-6.4.6.2-r1.ebuild 6182 BLAKE2B 49923923a71ec046d25b749db7b890e746b2222ab2cc0ad82c34f87cf0d98aedc134519b289b117fa0ac4d410130d815d8706f340a255d8faf87ab2a9ff25519 SHA512 69e8f78d2ea49349ef113ee1e9c7b5472519c1dd007e50b04830e535de2c3936dccea1c19889feedb4ecbd8d449bba7cd1a6c58de022b4d289e0857990ca9700
+EBUILD libreoffice-bin-6.4.6.2-r2.ebuild 6182 BLAKE2B 49923923a71ec046d25b749db7b890e746b2222ab2cc0ad82c34f87cf0d98aedc134519b289b117fa0ac4d410130d815d8706f340a255d8faf87ab2a9ff25519 SHA512 69e8f78d2ea49349ef113ee1e9c7b5472519c1dd007e50b04830e535de2c3936dccea1c19889feedb4ecbd8d449bba7cd1a6c58de022b4d289e0857990ca9700
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.4.6.2-r2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.4.6.2-r2.ebuild
new file mode 100644
index 000000000000..87795ad6429c
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.4.6.2-r2.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="https://tamiko.kyomu.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.kyomu.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_7 )
+PYTHON_REQ_USE="xml"
+
+inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+	app-text/hunspell:0/1.7
+	=app-text/libexttextcat-3.4*
+	=app-text/libmwaw-0.3*
+	dev-libs/boost:0/1.72.0
+	dev-libs/icu:0/67.1
+	=dev-libs/liborcus-0.15*
+	>=media-gfx/graphite2-1.3.10
+	media-libs/harfbuzz:0/0.9.18[icu]
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-9.3.0
+	>=sys-libs/glibc-2.31
+	virtual/jpeg-compat:62
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+	${BIN_COMMON_DEPEND}
+	${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	app-text/libnumbertext
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.5.2
+	dev-db/unixODBC
+	dev-lang/perl
+	>=dev-libs/boost-1.72.0:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	>=dev-libs/liborcus-0.15.0
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.28[nss]
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	net-libs/neon
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	net-print/cups
+	sys-apps/dbus[X]
+	gnome? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	!kde? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	dev-db/mariadb-connector-c
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.8 )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-${PV}*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/50-${PN} "${T}"
+	eprefixify "${T}"/50-${PN}
+	default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 79ad5750b8b1..9950421c41f2 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -31,7 +31,7 @@ DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f370
 DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba SHA512 8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501
 DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
 EBUILD libreoffice-6.4.3.2.ebuild 15773 BLAKE2B 58373db2eb7ec7afe91cdb5cfa9632cedb8ff375ff07474aaffcbbe3c6ce150644d7d49639bfff3c2c8aa1eaa689e1ee3ac5348d8e1272bc0232d8a0a92eaf2a SHA512 15b27b4dbf1e4ba5938e506eca8265a717dd660046be6bdee4e06f8188fb9d51a9483b3b4149734419b9c6528405b47acf5f9c86e0ddec457ddad15e653adeee
-EBUILD libreoffice-6.4.6.2-r1.ebuild 17758 BLAKE2B f4aa064c267ad75951a68cb447d7fa9418b13ff4f55e6de29d096df46fc19c02cb7e6128efd04e55073ffe64348ab99e2fbd9848c5d7970b32f6beb69dff6ab0 SHA512 ccd159f2624c7c0ec36c8e70b09ca3aabcd70fcdea8a680246c61c55490dde8eaf01c95f5627a48e7a144b5b205bf42ca67124093b3d3f690b037a7597cae4dd
-EBUILD libreoffice-6.4.9999.ebuild 16701 BLAKE2B f75ca84ea20c010607f1c5f3ea2291130bfa68d5ff7e3fd573fe2f18cbe47d6cc57c78713f1dfd52fd456804cdf2aa0db4e9c933dc7520c6fe7b1b148a66c6db SHA512 f268ebc8da5246c6295904b05d6810bf4be24c62636a8bc106e848ce0e41d9c3ddcf3deb403e014f3b796b147630de7b3d58b787c496387faebb601fd2a4c2da
-EBUILD libreoffice-9999.ebuild 16785 BLAKE2B 11148bcd232c3adfdfbf8ea1e6aac3fede40916040ddec13bf89c31c2eebb29b0f27b73c829f62faeed458c8f8e4996059e4ea81731a35d50256d534a3098478 SHA512 8b7c261d4e72029bed1b7e7a6c6e7a3b60082f99441c03b8b165a7ebecd0c3047640531786b7fc015677dc85912412ddb2ec6c4b24759b42a74a34d81f12ccc2
+EBUILD libreoffice-6.4.6.2-r2.ebuild 17746 BLAKE2B 1fbd12e4034b2fc079e0b5b31165653e6fdd33f46d5792a816c06e5b181bca94711324086b9e880b7dfffddb3ce2e83df378f06938b33f6cffe952a13679a5f3 SHA512 b7d207ec9bcb96705ea1bd512ddb1dd81e68b87bf56db20b68418f4c74b6e6d7b8cb07acc483db316949b1bcd4626ff6b82af53ad80385f33c90cea69cc00392
+EBUILD libreoffice-6.4.9999.ebuild 17657 BLAKE2B 6609621bd724716dbb53d09b3d0e155834f49d1eea313de67dc9f0218c137d10f93f9e71bea36083fd2ecec03b0ffdb9e5f1a31ab94740ec11c9a476744f55ed SHA512 19073f7c452c6f257e4ceb0fce78b0a9b2790e004e86bd5e5686bfb2a275b3a0da6158a42fe8acf669c68bcebfe640c08223a846ec2eb802328b193fea6f4f30
+EBUILD libreoffice-9999.ebuild 17741 BLAKE2B c51e47cef4ffedfc7ada1a8cc8f97f6797cbfa62ab13877f199f154118a7e096a60afbc0e1f7e547750476dd0d8332f3bce463d9b5b35a169052c55e768f35a1 SHA512 8f7baa12b2a1ad5c929e5729b0ba367dfd54336327fee9001d9c1af8271be4ec9a748bf0a2968ad6e7be81bbd989acb2ef99112feb7ff2fded05664bf74d2978
 MISC metadata.xml 1065 BLAKE2B 3ff11b03c5ab432a25d91b6e727f964c82fb31f23663669dbe5f85e2b425bb99ee3d7dd2f2fe3fe95063e0403bb4561487566e213125e861711ef79912747980 SHA512 da4cf59feab680dbcfa9a3e4f7760315c9f99aaff105b9712304c64e2ae3b7c2535f96c3cfb8e9b08124b59e55b460c831a0e116d6ec5bd670cecdfc85323b18
diff --git a/app-office/libreoffice/libreoffice-6.4.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.4.6.2-r1.ebuild
deleted file mode 100644
index 7f884a56cefa..000000000000
--- a/app-office/libreoffice/libreoffice-6.4.6.2-r1.ebuild
+++ /dev/null
@@ -1,593 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
-	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	# QR code generating library for >=libreoffice-6.4
-	"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
-	"base? (
-		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
-		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	)"
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	base? ( firebird java )
-	bluetooth? ( dbus )
-	gtk? ( dbus )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	app-text/libnumbertext
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	>=dev-cpp/libcmis-0.5.2
-	dev-db/unixODBC
-	dev-lang/perl
-	>=dev-libs/boost-1.72.0:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-libs/liborcus-0.15.0
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.28[nss]
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	accessibility? (
-		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
-	)
-	bluetooth? (
-		dev-libs/glib:2
-		net-wireless/bluez
-	)
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( sys-apps/dbus[X] )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl]
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	ldap? ( net-nds/openldap )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mariadb? ( dev-db/mariadb-connector-c )
-	!mariadb? ( dev-db/mysql-connector-c )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-#        tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3.1
-	dev-util/mdds:1/1.5
-	media-libs/glm
-	sys-devel/ucpp
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.8
-	)
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-		media-fonts/liberation-fonts
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.8 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
-	# 6.4 branch (in 6.4.7)
-	"${FILESDIR}/${P}-qaccessiblecache-assert.patch" # bug 680186
-
-	# git master
-	"${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
-	"${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
-	CHECKREQS_MEMORY="512M"
-	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		CHECKREQS_DISK_BUILD="22G"
-	else
-		CHECKREQS_DISK_BUILD="6G"
-	fi
-	check-reqs_$1
-}
-
-pkg_pretend() {
-	use base ||
-		ewarn "If you plan to use Base application you must enable USE base."
-	use java ||
-		ewarn "Without USE java, several wizards are not going to be available."
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${MY_PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${MY_PV/.9999}
-		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-		LOCOREGIT_VERSION=${EGIT_VERSION}
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	default
-
-	# sandbox violations on many systems, we don't need it. Bug #646406
-	sed -i \
-		-e "/KF5_CONFIG/s/kf5-config/no/" \
-		configure.ac || die "Failed to disable kf5-config"
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://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_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use kde; then
-		export QT_SELECT=5 # bug 639620 needs proper fix though
-		export QT5DIR="$(qt5_get_bindir)/../"
-		export MOC5="$(qt5_get_bindir)/moc"
-	fi
-
-	local gentoo_buildid="Gentoo official package"
-	if [[ -n ${LOCOREGIT_VERSION} ]]; then
-		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	# --without-system-qrencode: has no real build system and LO is the only user
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-build-opensymbol
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-bundle-mariadb
-		--disable-ccache
-		--disable-epm
-		--disable-fetch-external
-		--disable-gtk3-kde5
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--disable-vlc
-		--with-build-version="${gentoo_buildid}"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-ucpp
-		--with-tls=nss
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--with-help="html"
-		--without-helppack-integration
-		--with-system-gpgmepp
-		--without-system-jfreereport
-		--without-system_apache_commons
-		--without-system-sane
-		--without-system-qrcodegen
-		$(use_enable base report-builder)
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable cups)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk gtk3)
-		$(use_enable kde kf5)
-		$(use_enable kde qt5)
-		$(use_enable ldap)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_with accessibility lxml)
-		$(use_with coinmp system-coinmp)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with odk doxygen)
-	)
-
-	if use eds || use gtk; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
-		)
-
-		use libreoffice_extensions_scripting-beanshell && \
-			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
-	fi
-
-	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
-	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	emake DESTDIR="${D}" distro-pack-install -o build -o check
-
-	# bug 593514
-	if use gtk; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
-	fi
-
-	# bug 703474
-	insinto /usr/include
-	doins -r include/LibreOfficeKit
-
-	local lodir=/usr/$(get_libdir)/libreoffice
-	# patching this would break tests
-	cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/libreoffice/program/fundamentalrc')
-EOF
-	sed -e "/^import sys/d" -e "/^import os/d" \
-		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
-	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
-	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
-	# more system pyuno mess
-	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
-		-i "${D}"${lodir}/program/officehelper.py || die
-
-	python_optimize "${D}"${lodir}/program
-	# link python bridge in site-packages, bug 667802
-	local py pyc loprogdir=$(get_libdir)/libreoffice/program
-	for py in uno.py unohelper.py officehelper.py; do
-		dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
-		while IFS="" read -d $'\0' -r pyc; do
-			pyc=${pyc//*\/}
-			dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
-		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild b/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild
new file mode 100644
index 000000000000..598c67302cc9
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild
@@ -0,0 +1,593 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	# QR code generating library for >=libreoffice-6.4
+	"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+	"base? (
+		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	)"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	base? ( firebird java )
+	bluetooth? ( dbus )
+	gtk? ( dbus )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	app-text/libnumbertext
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.5.2
+	dev-db/unixODBC
+	dev-lang/perl
+	>=dev-libs/boost-1.72.0:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	>=dev-libs/liborcus-0.15.0
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.28[nss]
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	net-libs/neon
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	accessibility? (
+		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+	)
+	bluetooth? (
+		dev-libs/glib:2
+		net-wireless/bluez
+	)
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( sys-apps/dbus[X] )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	ldap? ( net-nds/openldap )
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mariadb? ( dev-db/mariadb-connector-c )
+	!mariadb? ( dev-db/mysql-connector-c )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3.1
+	dev-util/mdds:1/1.5
+	media-libs/glm
+	sys-devel/ucpp
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.8
+	)
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+		media-fonts/liberation-fonts
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.8 )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+	# 6.4 branch (in 6.4.7)
+	"${FILESDIR}/${P}-qaccessiblecache-assert.patch" # bug 680186
+
+	# git master
+	"${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
+	"${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	use base ||
+		ewarn "If you plan to use Base application you must enable USE base."
+	use java ||
+		ewarn "Without USE java, several wizards are not going to be available."
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+		LOCOREGIT_VERSION=${EGIT_VERSION}
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	default
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://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_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use kde; then
+		export QT_SELECT=5 # bug 639620 needs proper fix though
+		export QT5DIR="$(qt5_get_bindir)/../"
+		export MOC5="$(qt5_get_bindir)/moc"
+	fi
+
+	local gentoo_buildid="Gentoo official package"
+	if [[ -n ${LOCOREGIT_VERSION} ]]; then
+		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	# --without-system-qrencode: has no real build system and LO is the only user
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-build-opensymbol
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-bundle-mariadb
+		--disable-ccache
+		--disable-epm
+		--disable-fetch-external
+		--disable-gtk3-kde5
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-vlc
+		--with-build-version="${gentoo_buildid}"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-ucpp
+		--with-tls=nss
+		--with-vendor="Gentoo Foundation"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--with-help="html"
+		--without-helppack-integration
+		--with-system-gpgmepp
+		--without-system-jfreereport
+		--without-system_apache_commons
+		--without-system-sane
+		--without-system-qrcodegen
+		$(use_enable base report-builder)
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk gtk3)
+		$(use_enable kde kf5)
+		$(use_enable kde qt5)
+		$(use_enable ldap)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_with accessibility lxml)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with odk doxygen)
+	)
+
+	if use eds || use gtk; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		)
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+	# bug 593514
+	if use gtk; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+	fi
+
+	# bug 703474
+	insinto /usr/include
+	doins -r include/LibreOfficeKit
+
+	local lodir=/usr/$(get_libdir)/libreoffice
+	# patching this would break tests
+	cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+	sed -e "/^import sys/d" -e "/^import os/d" \
+		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+	# more system pyuno mess
+	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+		-i "${D}"${lodir}/program/officehelper.py || die
+
+	python_optimize "${D}"${lodir}/program
+	# link python bridge in site-packages, bug 667802
+	local py pyc loprogdir=$(get_libdir)/libreoffice/program
+	for py in uno.py unohelper.py officehelper.py; do
+		dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+		while IFS="" read -d $'\0' -r pyc; do
+			pyc=${pyc//*\/}
+			dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+	done
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index 6f4a72b4e475..52876b5d2f11 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -265,7 +265,6 @@ PATCHES=(
 	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
 
 	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 
@@ -333,12 +332,6 @@ src_prepare() {
 	# hack in the autogen.sh
 	touch autogen.lastrun
 
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/officehelper.py || die
 	# sed in the tests
 	sed -i \
 		-e "s#all : build unitcheck#all : build#g" \
@@ -555,6 +548,33 @@ src_install() {
 	# bug 703474
 	insinto /usr/include
 	doins -r include/LibreOfficeKit
+
+	local lodir=/usr/$(get_libdir)/libreoffice
+	# patching this would break tests
+	cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+	sed -e "/^import sys/d" -e "/^import os/d" \
+		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+	# more system pyuno mess
+	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+		-i "${D}"${lodir}/program/officehelper.py || die
+
+	python_optimize "${D}"${lodir}/program
+	# link python bridge in site-packages, bug 667802
+	local py pyc loprogdir=$(get_libdir)/libreoffice/program
+	for py in uno.py unohelper.py officehelper.py; do
+		dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+		while IFS="" read -d $'\0' -r pyc; do
+			pyc=${pyc//*\/}
+			dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+	done
 }
 
 pkg_postinst() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3cd82d82602e..a4e55bc75952 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -269,7 +269,6 @@ PATCHES=(
 	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
 
 	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 )
@@ -333,12 +332,6 @@ src_prepare() {
 	# hack in the autogen.sh
 	touch autogen.lastrun
 
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/officehelper.py || die
 	# sed in the tests
 	sed -i \
 		-e "s#all : build unitcheck#all : build#g" \
@@ -555,6 +548,33 @@ src_install() {
 	# bug 703474
 	insinto /usr/include
 	doins -r include/LibreOfficeKit
+
+	local lodir=/usr/$(get_libdir)/libreoffice
+	# patching this would break tests
+	cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+	sed -e "/^import sys/d" -e "/^import os/d" \
+		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+	# more system pyuno mess
+	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+		-i "${D}"${lodir}/program/officehelper.py || die
+
+	python_optimize "${D}"${lodir}/program
+	# link python bridge in site-packages, bug 667802
+	local py pyc loprogdir=$(get_libdir)/libreoffice/program
+	for py in uno.py unohelper.py officehelper.py; do
+		dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+		while IFS="" read -d $'\0' -r pyc; do
+			pyc=${pyc//*\/}
+			dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+	done
 }
 
 pkg_postinst() {
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index c5f0f953f3c2..1bb2efa96383 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -5,4 +5,4 @@ AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e
 DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
 EBUILD scribus-1.5.5_p20200626.ebuild 4078 BLAKE2B 28b48945c2f0cfbe409a1b390c42eeaed0db28a0592284c67c62855c11f52415ded2b0eeb2f65d359c6af6535ebc74928d7786a4abcde191ffdeb02b5870b661 SHA512 ff283fe98f0ce8929a7456316ced12d97d0e8df373af0fde09e49af37ccf5f29a0569ceb65ef21a03ea3444ccaa4c65d33d3753a5ba6390fa1f6f87d47ce273a
 EBUILD scribus-9999.ebuild 3986 BLAKE2B f856409e29e5d57bb527f463ddada1e7461f48d16c872fec92328e781ef5a9e130b1c8fc0d06ffac59262ad28f22f7a9fb4cd387b96c0172b4cf6eeed72b205b SHA512 31fa1efd6797d803f6e5db8703fe3d40f2978f87dc9229872f5313b01ebeb6febb98d4f15ebf5c5a9afaf60d4e7de90b80b0d48e91c7e55915e66a703dd6f186
-MISC metadata.xml 881 BLAKE2B 3cbd9331bb4a2a5c04529c21f9fbe08fc02ad12317b93867cc57e3b4a9d11ccd37f2842b63f6a609d093cf9f4e395a4ab412250d422c61f282339f4af78c33dd SHA512 571c8e45e1bd4cb783e635db4bf6e870dfc1efd593df275c61820ed9f9135659e5486d5c702d0f283323a8944390fe9f1b49b8929e92cd37b02a66b6b6a67ed9
+MISC metadata.xml 882 BLAKE2B 87f52990c93874472eeb73cbf7b46b4c1fa41d25e17d179f5cb9f5067d21aea18ac4ac323e5878c2bf49d075f67230353860cd6b45b9458435ca7b0fae9854b0 SHA512 403eb2874bccc2929284f1e44042e1fa84c2ad9d6abcb1b9600f327060e1b476366ab40cf6f8876aa18bf8195c21f82e2deaecfa7e1868b2fcfeba42c72e9d58
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index ab1b2fa6c137..de419b7e9f38 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -9,9 +9,9 @@
     <flag name="boost">Enable support for Boost based enhancement</flag>
     <flag name="hunspell">Enable support for spell checking with <pkg>app-text/hunspell</pkg></flag>
     <flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag>
-    <flag name="osg">3D redering via <pkg>dev-games/openscenegraph</pkg></flag>
+    <flag name="osg">3D rendering via <pkg>dev-games/openscenegraph</pkg></flag>
     <flag name="scripts">Install the scripts</flag>
-    <flag name="templates">Document tamplates</flag>
+    <flag name="templates">Document templates</flag>
     <flag name="tk">Install tk based scripts e.g. FontSample.py</flag>
   </use>
   <upstream>
diff --git a/app-office/upwork/Manifest b/app-office/upwork/Manifest
index 00b760525d94..974ffd195368 100644
--- a/app-office/upwork/Manifest
+++ b/app-office/upwork/Manifest
@@ -1,9 +1,6 @@
 AUX upwork-desktop-r1.patch 480 BLAKE2B a296b0c5274adf65e3c1f1e65a30dea48d147632b1afc39e4688e4b0d23a4735c957ce4d451f040d34ae2996670350bf467bc87008e5814a3c5e9bfc5e717398 SHA512 dce08bf79e672c07fa8c11e00b68e5b4bd2176a606a1192fd6a0dbf9343e99c2aa70909506d71b35b04a3eaf6be0a61f62e65f6a3802a0e17967bfe4dbbd4aef
 AUX upwork-desktop-r2.patch 315 BLAKE2B df27130999a74eaad5a49104434977a8cd898d2d684b37aea3a3e1e19a2d50a4d8aadc842aba6398a2893c024e937bf461273d091c1883249fd99e6b9fad93ca SHA512 bdce0d3f45eabb1c5e13586321bfc30bfda17645b2e785e4a5f809b55db5e1b2040a29b9d8f93c8869180106dbfae9d4afbc9cf1c9943861e6def26ff7491be9
-DIST upwork-5.3.3.860_i386.rpm 74067471 BLAKE2B 6b2092a851e1f35dfa0dc180f225d26aeb5a04edd30eeaca3125480b94fb8504d2005c42a0b86c293c7367c538ef9103bce2a2bb45f5257cb003fd7cd25eb851 SHA512 7dbbbbf7a4254d1213942d836cf944c94b5b6dd7905435c75b1f0225dd362f4bdb3c7ea0716b2fd04fb926d965fd56d21c41f713cf26f2ad6cb240e5f2643394
-DIST upwork-5.3.3.860_x86_64.rpm 72487294 BLAKE2B 56dfedc12b5d0661f01d34238256a372b9e6d760c33ba13474996e4c24050cc9931e592cba91df0719c33c6785e6fe8d63add54986bc86cafad55379a35d9358 SHA512 a3d1c6b36a23743a1b953b7cb956107baacd39984bc9289eff349539235a7e95d0aa80880985522b985dd37de68e284a17b750561ce091166b4186d01c437aba
-DIST upwork-5.4.2.8_i386.rpm 52586152 BLAKE2B 61e1dc1652a4aee6c91b8206d32f6e05e2dcbfa0bbb1af529c1b9b33e2a6bd4226c77707667662ee79c3151dade89c33b3c3a74df18aa14f4ccb0683f41612bb SHA512 69925d3afadfd4944ff813241d5dab27d6bd1e8f0622c7b8c2d686b8024b998a4ee4a8647c3361043dc8a38114e149aae5965bac203480bd85046ec738a1fe8a
-DIST upwork-5.4.2.8_x86_64.rpm 50903574 BLAKE2B 35ebf317157e4f33eca0b957c0fd4040d28338cd09e93c86bb234faf56f61b173e98a8c869c2da79b067b9936f6d5a95d435220dd66f4c057310987e3ab6db10 SHA512 79a91aba88002020f99822e44540f1d98bf06811856a4a4e5cb10a1d9f68cbc78d3c7d6f09035c705a97634e65e81ff72d13d169e6005371717c0455d87e5199
-EBUILD upwork-5.3.3.860.ebuild 1144 BLAKE2B 96badc2df6cce06bd2dfb0981763539c8c773bebd98c06e55598c4b37a0b9cde4f8662d2e8c187fc589ef9417fed0789541ed5332dc72e0b5b94150aa6c50a6f SHA512 e1e097c5a1249f05e71780b22394bd03ada3e5ffd59fd3e8755dbf47af6d85c67656583384ce3be5effafcfc1c953e6df6df22384b708b6b4007b2683df15666
-EBUILD upwork-5.4.2.8.ebuild 1153 BLAKE2B dddd45f474fafadc93c6389d4a15097899584904d0bb741cfdac13b24e4bddb9be6935f3feee86935cfbc5a64214a3e64c9868ab701108255920a2f0dbc96e61 SHA512 19e1c436e45a4194589975155fd39c41b5e75b702f43380cc327a21a5a2baa145acce3e1e51467fd477d5ca71a1ea72acf48fc68346e31669c013099756fef5b
+DIST upwork-5.4.5.1_i386.rpm 52638856 BLAKE2B 95e598f96a9a8165875cc0f94bcddf80138ef1f9281434d33e3eec997e6df6b96c6bffc3de57163b6c4dcf6261b74e593dd801dfc38706d6644d3bd87f4141d5 SHA512 bf2a18cdb563aca8155ddd1f5844e6726d38df8207999d6f64be47e9c0a636e64cf5012eb6b31682c272d3584c1a067aebdf1ce4b11f8927cc58a569168b2449
+DIST upwork-5.4.5.1_x86_64.rpm 50954566 BLAKE2B 1547cc49a9029f65942398088786e9261812ce7a9a32e212199f5e0c56ebef5188988715f2f1a88d1ad2b426b78dc299ad5921d8df729666d5a8ab295b20456c SHA512 dd000abd53c79d5655c71aad3e566d4baf09cfb5e4f3a5c83806c61bc7e9a5ef8513b8553cf04049e8b7bbbeffc90ef388f09b620f85113efc4586aadf23555a
+EBUILD upwork-5.4.5.1.ebuild 1294 BLAKE2B 4761e383bacd85b8db9157efbbf47b0a212a54d4f12fad00233cfb13aef9eedf7f678b329bd2de8402be67c118f400e93a19d067b8420d506ffb3b5be0c7df5a SHA512 e3de98dad5c0c9f1a3912e446a6d292b7510db4a95097d755c897f73f617fc93df0a9ed72d5fce0b7698e02a5362c370e71fb81f28674e0c7047bdbc24720103
 MISC metadata.xml 601 BLAKE2B d6bb0d933480847c8d5e0ea53b25b009260f8bbc02aafcb2d89525ffe3688c2f2a3d8e0147ace8e51dab5d37b6c25758ecaa9569ffae95d14b3075e57a4d3480 SHA512 4695a6e61e42e30295a1d5c4a676ddc164acf0b8c8642bf825b1376b501527b47039d7bc99b57697ee23364a11cd9c339fa47184c904904d5732d1b6aaf8f153
diff --git a/app-office/upwork/upwork-5.3.3.860.ebuild b/app-office/upwork/upwork-5.3.3.860.ebuild
deleted file mode 100644
index 3425689d329c..000000000000
--- a/app-office/upwork/upwork-5.3.3.860.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils rpm
-
-DESCRIPTION="Project collaboration and tracking software for upwork.com"
-HOMEPAGE="https://www.upwork.com/"
-SRC_URI="
-	amd64? ( https://updates-desktopapp.upwork.com/binaries/v$(ver_rs 1- _)_wub7hae1mtgzk09u/upwork-${PV}-1fc24.x86_64.rpm -> ${P}_x86_64.rpm )
-	x86? ( https://updates-desktopapp.upwork.com/binaries/v$(ver_rs 1- _)_wub7hae1mtgzk09u/upwork-${PV}-1fc24.i386.rpm -> ${P}_i386.rpm )"
-
-LICENSE="ODESK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf
-	media-libs/alsa-lib
-	media-libs/freetype
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/gtk+:3[cups]"
-
-S="${WORKDIR}"
-
-PATCHES=( "${FILESDIR}"/${PN}-desktop-r1.patch )
-
-# Binary only distribution
-QA_PREBUILT="*"
-
-src_install() {
-	pax-mark m usr/share/upwork/upwork
-
-	dobin usr/bin/upwork
-
-	insinto /usr/share
-	doins -r usr/share/upwork
-	fperms 0755 /usr/share/upwork/upwork
-
-	domenu usr/share/applications/upwork.desktop
-	doicon usr/share/pixmaps/upwork.png
-}
diff --git a/app-office/upwork/upwork-5.4.2.8.ebuild b/app-office/upwork/upwork-5.4.2.8.ebuild
deleted file mode 100644
index 48ab98c73786..000000000000
--- a/app-office/upwork/upwork-5.4.2.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils rpm
-
-DESCRIPTION="Project collaboration and tracking software for upwork.com"
-HOMEPAGE="https://www.upwork.com/"
-SRC_URI="
-	amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_4_2_8_17caa201e7ae4660/upwork-5.4.2.8-1fc24.x86_64.rpm -> ${P}_x86_64.rpm )
-	x86? ( https://updates-desktopapp.upwork.com/binaries/v5_4_2_8_17caa201e7ae4660/upwork-5.4.2.8-1fc24.i386.rpm -> ${P}_i386.rpm )"
-
-LICENSE="ODESK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf
-	media-libs/alsa-lib
-	media-libs/freetype
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/gtk+:3[cups]"
-
-S="${WORKDIR}"
-
-PATCHES=( "${FILESDIR}/${PN}-desktop-r2.patch" )
-
-# Binary only distribution
-QA_PREBUILT="*"
-
-src_install() {
-	pax-mark m opt/Upwork/upwork
-
-	insinto /opt
-	doins -r opt/Upwork
-	fperms 0755 /opt/Upwork/upwork
-
-	insinto /usr/share
-	doins -r usr/share/icons
-
-	domenu usr/share/applications/upwork.desktop
-	doicon usr/share/icons/hicolor/128x128/apps/upwork.png
-}
diff --git a/app-office/upwork/upwork-5.4.5.1.ebuild b/app-office/upwork/upwork-5.4.5.1.ebuild
new file mode 100644
index 000000000000..809b4cdce15f
--- /dev/null
+++ b/app-office/upwork/upwork-5.4.5.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils rpm xdg-utils
+
+DESCRIPTION="Project collaboration and tracking software for upwork.com"
+HOMEPAGE="https://www.upwork.com/"
+SRC_URI="
+	amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_4_5_1_941af939eff74e21/upwork-5.4.5.1-1fc24.x86_64.rpm -> ${P}_x86_64.rpm )
+	x86? ( https://updates-desktopapp.upwork.com/binaries/v5_4_5_1_941af939eff74e21/upwork-5.4.5.1-1fc24.i386.rpm -> ${P}_i386.rpm )"
+
+LICENSE="ODESK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf
+	media-libs/alsa-lib
+	media-libs/freetype
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/gtk+:3[cups]
+	x11-libs/libXinerama
+	x11-libs/libXScrnSaver
+"
+
+S="${WORKDIR}"
+
+PATCHES=( "${FILESDIR}/${PN}-desktop-r2.patch" )
+
+# Binary only distribution
+QA_PREBUILT="*"
+
+src_install() {
+	pax-mark m opt/Upwork/upwork
+
+	insinto /opt
+	doins -r opt/Upwork
+	fperms 0755 /opt/Upwork/upwork
+
+	insinto /usr/share
+	doins -r usr/share/icons
+
+	domenu usr/share/applications/upwork.desktop
+	doicon usr/share/icons/hicolor/128x128/apps/upwork.png
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 32ee4addad5b..5808f998f0dc 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index 8cbc1a31b018..e1836a43300a 100644
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@@ -1,7 +1,5 @@
-DIST usbmuxd-1.1.0.tar.bz2 321897 BLAKE2B 3ca5d1da222e457ac01f3e87fb7573c6405e51fd5d270a2b3dab7601118f21be22232d5100b4d027273fc837e6a57f7a7d17d2c41ae59d7c5aa41f76bef5a03d SHA512 66aa0c40e912bf596b819098b87d88e9cf30b2e6352e607eeb778bd4f23bf9bb123fb6a6ecca2d4e4be3171e35d66200d632d2c9c80b1f2462bb45be8aa6912d
 DIST usbmuxd-1.1.1.tar.bz2 345290 BLAKE2B 580dd4e2fb05d6c4803d774f7d43c8399219d8f0ce4191428cb4fccffcc941894d0381d5f0746997570dd24e395af3dda340b1910827f9c5ace7e2d9cc176c6a SHA512 0e8829c93aac147a6b949fe95592d6ad9ea36e1c04676cb85accb4670a65b31065706fc438556def17b55850081d6c07deb325ca02b9853335b6e0b1049ba1da
 DIST usbmuxd-1.1.1_pre20200121.tar.bz2 51859 BLAKE2B 339d53904f7484bebb6d7524313ee065bf5a244efab16c77b30b8932071012105f21aa56083d82667b06088af83464ea8c86e3c28c5a45cb9abbe574a634533e SHA512 cc113b054e8e04d228af740ec43d2dbf29c015dc9d8e1cdd0eaf84bfcaa9838d5b1bf6db2efed30ffb84c35c88db5469983a115ffdbddbb6acd0df9fd2a5182f
-EBUILD usbmuxd-1.1.0.ebuild 854 BLAKE2B aff005e1ff9c9ea91d8965bc28662f579562b0ecbdb8bf7d4b728da685cdb1c9567ce79a060aabe202c5e3b7d272bdddbf32be00a6f2ed69e8ca10ff20c5f563 SHA512 779d1bfec159db90b531400dd6d505145673b5f6db6a0afdb00a598d66036bf240e2115155bcb0e27499625929a9a8b278b98832506dee8a9a56a239a40ee7fd
 EBUILD usbmuxd-1.1.1.ebuild 894 BLAKE2B a5b8146af410fa067ec7bf4e285c1dd89c4a774d3c0dc925ca889fef9cb8ac08065be760566f704bf49c1be92caeb31eb548f50f55fc91704f9fe4a18ecb6cbc SHA512 41756f1a50f53ff306ed91834e22823d3604d70d3ac3035e64613456553dcc53f566b28fb6a48dab51c4d6a7b24e541f543cc44b1754b72b03c48f6e91d6de66
 EBUILD usbmuxd-1.1.1_pre20200121.ebuild 999 BLAKE2B 2ee05606bfec58b686d5c9391b0374e2a525614bb94ba239b04517032da709c58f3eb51b5fd906db68d059c56f6604d8a91fed43aeda88984ff5d754ca2c7848 SHA512 d7149fa395b79a097eaeb8db5cd68cdbbb42a792b6be2e1ec513232aee7be2eac1ac426b9db10eaed66b6a7360c27c04f52e8d370474eb3279d8cc7c95f9c18f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
deleted file mode 100644
index 4220c366a73c..000000000000
--- a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils udev user
-
-DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
-HOMEPAGE="http://www.libimobiledevice.org/"
-SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
-
-# src/utils.h is LGPL-2.1+, rest is found in COPYING*
-LICENSE="GPL-2 GPL-3 LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	acct-group/plugdev
-	>=app-pda/libimobiledevice-1.1.6:=
-	<app-pda/libimobiledevice-1.2.1_pre0
-	>=app-pda/libplist-1.11:=
-	virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig"
-
-pkg_setup() {
-	enewuser usbmux -1 -1 -1 "usb,plugdev"
-}
-
-src_install() {
-	autotools-utils_src_install udevrulesdir="$(get_udevdir)"/rules.d
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index dad4f306d120..7714c5ca4868 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/diffmask/Manifest b/app-portage/diffmask/Manifest
index c2fb3a3eff71..6f96c9d24a9f 100644
--- a/app-portage/diffmask/Manifest
+++ b/app-portage/diffmask/Manifest
@@ -1,4 +1,4 @@
 DIST diffmask-0.3.3.tar.bz2 8605 BLAKE2B a7699dba6b619ff2e64a8148057e06be8d477605fba100b45f056957eb1b55cc50634b698250f68023137bcf01932635c7de798f42edfa1297cc38097e764f44 SHA512 5f28f68dc1adba2fb7b0db5e2a329e46017298de9c44765d521a0f338223eef2a77573636987e942595db9b89b72db93b68cf5b805091b0ebb1e91a18bfcd48b
-EBUILD diffmask-0.3.3-r4.ebuild 538 BLAKE2B 9ce4e660285c36b6f7b9b814daa3422f8c585af71af10100963c58cbc7e4204ceb4ef7864d8ecd0c2ccd8996c98c5b848031a256fb82099a2dc64cb9e409b43a SHA512 2ab0504e85f4bf50ff976468671afdc9232421f62265677a3fee266c4172e91cb3ee6eed66cd75c31088c4eebf0b06de94484a644973a322a5e2fbb13c6ab8e5
+EBUILD diffmask-0.3.3-r4.ebuild 545 BLAKE2B e507c0889f72b6c3294f0c283b7c2e991766cf7df36e9ba1504c7c8a1973cdf21d4a99c1cc1dba0ef2dbc09b66307cd1c7321282b978c787de33f9b2323dcbc0 SHA512 8ac91a2482462504c9bd2ab731e3d2c2eaccdcc50f64408dc1029ac2f12e54ac2293e79388dd4fce6e22e6cec7af0da91141b483050917b126454a4b80429a38
 EBUILD diffmask-9999.ebuild 486 BLAKE2B ae3abd6d6f834353d9acc93da10b8bbee8b4903379c9d653800ae1c8d5899bf4822899defada6769b1aaea51f2c0c94b4c9a31d93d5bb9229863d7c7dc7c71c4 SHA512 d63d660e6e0d44b752f1732a12cc14e6b3014834be4881d3a00a5efeb5bc45ac2d54d3d2ae2856f55048994b47e04d1d0494dae7ffbf953f0f9ae90fec2b5a9d
 MISC metadata.xml 865 BLAKE2B c9fac77bca18c860782a29fbbd18bcf32013f03d35a4caf12a720b9ccd8cf93becdf5a775e6673717da25d08b11c4b871150dd878241c8fea364e383fe1d1094 SHA512 e5f89a3756c6ad777fac8961bbf74f2a62d2b555ff9d7d5ebcba0533173ef6086d3e364460ae84932099d45f7bd9640acfa831d45e0d8317a47eceb1ddba314b
diff --git a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
index 24c622a843e3..f5a119c2412e 100644
--- a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
+++ b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/diffmask/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest
index 3aa5eb9e72f0..a783fec9c168 100644
--- a/app-portage/flaggie/Manifest
+++ b/app-portage/flaggie/Manifest
@@ -1,4 +1,4 @@
 DIST flaggie-0.2.1.tar.bz2 16767 BLAKE2B fea0fbc505bfa97e7bee2c05f0cc19077b9b23a021b01aafa2c4b064466677f9dd4ae95c36f6de65b4ad07c5046d539ceb0cb667dcb791b60410d7a5e688813f SHA512 3f273ebeceaaedce7a3807126fb3f450e420338a883440066d06a4d6a95b63bd538bb5da882fea23e0d390b28a83f50375dbda2624f656327775b2b700f2b2e4
-EBUILD flaggie-0.2.1-r1.ebuild 1122 BLAKE2B 238cb7fa2c85aaf2f7876ba349c281f8446736d8088d8a4997323e2aa01ce64a60ed56ff6b48d67a3a8ff7cbb20fb082780ee06d9d8adb9f49708bd5ce706f36 SHA512 be29f60c5d65f6ddc188b7af13d730a51eec83503629222759ecd760024561cdb2bed850e35b4a50e14fca23fc98ee9974bb15945cbcaca0bb1fed8f89531c4d
+EBUILD flaggie-0.2.1-r1.ebuild 1129 BLAKE2B 90d4287bdaa6fb436f18f0bc1b0df21b9754914f54a9487c5210bfcd1e52ede8a00704d50b3e10027dcabaa20730634cacca67d778ee77bf529cb71d4ccd1955 SHA512 b99325d132370824c4d78fc98a4303eca0cd1e38d71f02e8fe90125ec78d216aa883fb5695fa44999d7e42c7d7cf5acf6af1ee7ae8a930694f7f038cc567c4b8
 EBUILD flaggie-9999.ebuild 1058 BLAKE2B a320ebac25851974f26bac195608bb84b5cb5caa44a888d0c3d7d63645749cbd8cd672fca532b1812dced97df9ce1bf25447cbe7b6b02b52b2ad2545a1c58305 SHA512 6f72e5943b6ed0e282c81add1e5d4fbb2b7425977eb388a9fb551b3badd414937a624c748660ccca91886f8b63c41584cd90945f28dd08a5c92aff0e32d7d016
 MISC metadata.xml 503 BLAKE2B f86cc20c12e1bf2bfb8d04b6ec0ae1cb66fd4a239cfe41885b1277abc2590fbed0a27dcdad6c0290227f140e4b783ffcbeb8c4556fa4874f0cb4e1d77e691165 SHA512 d406c0b2397c2d40c1aab0db4d4a54c2b928075558c823da63fe21762ed618da5aa20fcfc86c4b3066d8a7bbbc4dcc55d6037025db27a7873de274282dc0a88f
diff --git a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild b/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
index b83500f62a8b..10823576b0a9 100644
--- a/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
+++ b/app-portage/flaggie/flaggie-0.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/flaggie/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~mips ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 65da66598f0d..92e406385fa4 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,10 +1,6 @@
-DIST gemato-14.4.tar.gz 72630 BLAKE2B c8956b979d7c8629e245ba339e8ee707cd51ffe545a85c712c31b97ee2aaabef7a4964cac46c9cd8c4954c33529623293a94a26ae40b578a6b640aab15d47835 SHA512 0b514e4ff7773eefd2d9adc063a4fbc6a1e7d9ea3dfa783b1d5a8e6ec1e482533a8c70cd5e200a8b9671161d77e14254ad14aee6659e3c96eb9be3bbedcf11af
-DIST gemato-14.5.tar.gz 72752 BLAKE2B 61ca43c92556850afdc8ab1d027aa719d13e77727caf9660d1861b1cb07ab40c05bd0fab23f99eaa47252e09465813685c59d1ebb5cc89c2c3381e1571256836 SHA512 0979de8cb4fc51c79d5af485092e0b376094238d6bb67d44db96c66b1d5ee945f0ba82dc6f72bea1042b935029cb790c5cd87bc419ba82da21a972141f3690bb
 DIST gemato-15.2.tar.gz 72679 BLAKE2B 83e28fa3bc83976538610fec87c3a31e91a18847c107dc7793e16b5421eba69f7b60f8f05195f345ef6f4f8486203e4acbc01bad706b55c20a11480e85a3420c SHA512 5a98040dab0beac64e5e54bd54c6565cd301399709beda9e030ae9206111caf9e792260aa3c6586040060d4be71df3f1368e7554dff6affaa899c4157116faf3
 DIST gemato-16.1.tar.gz 79946 BLAKE2B 54452ae113cee98f5c8f9ebc880b4ae424510766eb7cd8bc2775c85573388005343061aa9de8f505a72ee92801756f3cb7b67dfd39d9923d0030a4da301f7ce2 SHA512 df21eb8784cc6724874e38ba0192e1e5657483aa031656855fc0c2396179f7352f9450df6b41205425214cf70f2c812a7ee6f55a25334f0fd012b7e710c1de2c
-EBUILD gemato-14.4-r1.ebuild 787 BLAKE2B d4d4b1c7011ac007f52e1c2a54825bb479427b29b435516c93219cbef62413810dec626ef452e30a3ea39c1b8737701c86c83e928b324d7012a625e28ae6fca9 SHA512 8840b697663b8e1b38d49f9e9ed94a4e1851f256cd7d130eaeeee86f4b61c04eb320829f530a48b2f0a8da82bf24110add5e217f0a9104ba4fd228f52bef7636
-EBUILD gemato-14.5.ebuild 796 BLAKE2B f57c8485072e46ab7a35d1ed15d4d56fa73326073c5f6dc2ee892cc5b4da14ed965abfd64fe90ac6db13e0c994cde491c1e43f3100e2ed3fba0862b05008255d SHA512 2e0841d93405d2f42c4163cbbeea8bef31a6d3048d80cbbd4931d77c794d6f0643a37656b8bd0e7c1ac110df5a549f129da57955e06708160d2b6d85d6c2544e
-EBUILD gemato-15.2.ebuild 992 BLAKE2B c790af1b29c2a16400b90de18601065dcd945ac8f6c5844dc775fbab8cd58b992f2150c5ef8af4af7ee4d681ae962367025478fa79162dd839b0750644d38f34 SHA512 74d537c7c139d11f25d68058077ef36632ba85a9587b2fe8705fcdf3731cb2b3a985467a4d0f0c08fe28f4dedc8b1ea380128f33557ec8ab1a544434f9a4633d
-EBUILD gemato-16.1.ebuild 999 BLAKE2B ccc88123c6601945bf7db04e4d3950903ed1fc6aca240fc4e17be19b806ee008e0df862d8569255ab1daad60ab4dce19572cafb0fd966da0a86fce4e5d46bd80 SHA512 043039314c1d652b389d05de2beb852d4652c70894f4f3816b9a19d8cc8c19025c3a5009a02f2b01c27b5767a1ed29ef254fe79685b88eea2ec58be2785e7eb4
+EBUILD gemato-15.2.ebuild 991 BLAKE2B a9a6078ca09a5ed9cde303bce936e240cef5b1d8eaca849b432b087822a333036ad93ffe29937c908c3d6db2394c0f348f7fcedc9e863df74c724932b6fd371a SHA512 c165869579ff7b5605a52793acf3b8026d3cbfc49eda90bc7840143ce23e430b005ad94132beaa5cb85b1c9015a12ebca60196023e5c5f0eef6362429673a409
+EBUILD gemato-16.1.ebuild 1013 BLAKE2B 8408686901869e732817b6cfbba8d3fe72bf2f5155a4dfb514e1f2fce49a3ffba6de8f15947b77c1bd390d59c354fa0a43ff7c2f6bac8a83a3c4660d2e313c1f SHA512 cc65d8c9e547ecc92ff9a4c8aaf844c72fe097627db3e34f59bbc74d12c52218942d3576dcf1590b4b8e2bcda3239941061f9c68eb5636a7f27a70da4f8a5d22
 EBUILD gemato-9999.ebuild 911 BLAKE2B 842be0a9be8c293c514a37bd3342f2cc75bdcaf053a1115e069f463460619dc6688a25c45db327e5917c68f6683f08b75094ab07a3995605bf118c937dab5066 SHA512 ed4b3eb1d7f0876e4605fa2694bccabc5dc38cee75d0de663d77e901a6f1e1f24bc5fa66e5689c6b8c1e94a2d9961ada6e7f130583a538e75c3254d381222237
 MISC metadata.xml 670 BLAKE2B 227576c022fb4b2011152a3c423ecab3b8f7524e4e2ec07bb7e963c573fbc17d8b99c4123af93ab665f0e24690c1dd6394e2683bec3999112e1e2204293e91a4 SHA512 c45044a72c71f1e98245019db989a2222e9487cbfad87e7583c57964bb724b1947700497718035a726e4dfa4563dcd154c8ac9eeb43173b6a690037349e905d6
diff --git a/app-portage/gemato/gemato-14.4-r1.ebuild b/app-portage/gemato/gemato-14.4-r1.ebuild
deleted file mode 100644
index 988fd3f61f4f..000000000000
--- a/app-portage/gemato/gemato-14.4-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+gpg tools"
-
-RDEPEND="
-	gpg? ( >=app-crypt/gnupg-2.2.20-r1 )"
-
-distutils_enable_tests setup.py
-
-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.5.ebuild b/app-portage/gemato/gemato-14.5.ebuild
deleted file mode 100644
index a3227bbf179d..000000000000
--- a/app-portage/gemato/gemato-14.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE="+gpg tools"
-
-RDEPEND="
-	gpg? ( >=app-crypt/gnupg-2.2.20-r1 )"
-
-distutils_enable_tests setup.py
-
-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-15.2.ebuild b/app-portage/gemato/gemato-15.2.ebuild
index 1ab542e69972..80a7515050e6 100644
--- a/app-portage/gemato/gemato-15.2.ebuild
+++ b/app-portage/gemato/gemato-15.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="+gpg tools"
 
 RDEPEND="
diff --git a/app-portage/gemato/gemato-16.1.ebuild b/app-portage/gemato/gemato-16.1.ebuild
index fdff5ec75554..4f34edba07fc 100644
--- a/app-portage/gemato/gemato-16.1.ebuild
+++ b/app-portage/gemato/gemato-16.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="+gpg tools"
 
 RDEPEND="
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 0efd48fc80d8..8590c73d4001 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,6 +1,6 @@
 DIST gentoopm-0.3.1.tar.gz 37897 BLAKE2B dd5499787bcc5c46ae3b559f3af4a5af5b4ca81a312e926149c587cac0391c51dbe61ac42d2bc19eb83cedc168486e9c30ddd6fbf4ae10ffd9719aefa2f54cd3 SHA512 e1a3a7929ae83d813dd0b03f0548f033e8e51b766aaddb653027398fb618819de6237e2ba1c0542defc9d62e71e8495aa10152cbc47a4e521f7cbaeda3ea4354
 DIST gentoopm-0.3.2.tar.gz 38430 BLAKE2B df8536b384cdad754894d65b605ab688cedc09430bcc3cd0821ed1ae9a93d0cb5e7b076715edf6eaed6bbf5ffc9088fb14d8bd5a04c3809c38ce05c6ed106bb9 SHA512 d99034af2efada3647117c75d5602bc5878a8f0e79d1c6b502fdb0fa272f7b9148afbbe4d379a2957a7db6694b4001158e2dfce8e3a4f97692e20a803417f571
 EBUILD gentoopm-0.3.1.ebuild 645 BLAKE2B 273340ee2ad51a1ff16cefd80659ff40bf824ad37c115a0f4089d05f28100c417ab440ae9e6b6e0f094fe7c536ae39d8e0fdc03712e67da52f4de1072426d53b SHA512 8b5e849fc5ece7c9c14a0ea9aba599bf07d00f1ddd3d8b39be2e745854ece327645d1465104b33b58726e19d073eb816839de5adc3c265fb0db24bff5d728278
-EBUILD gentoopm-0.3.2.ebuild 648 BLAKE2B 34cf1c517003981aa2e61c3808ce15a99a93f2cea48cd767be6d6985de6fb23dabf92493ed96d4e67c90d758de891d3f055cf449f495771aa13dc36eb7a554db SHA512 c51a3cf64d89b8d19ad4e0c88a82b0fe1c927a1687c50cd66a67d5809988e3e6b388397e3b545aa5c6636341bacdeed50a8ca93885cd0db15bdaa0ca46578964
+EBUILD gentoopm-0.3.2.ebuild 655 BLAKE2B c14a4b9b0c02667e35301c052f95c8494498a159bb4ed75dd5b2b49e6fb3180905388a9e2a92237047a5f05e3b8022929d159b0ee0eca711ce206994158a7ac3 SHA512 b2b9e5c1f032887317e9d0ce445c71635cf1779fac7be741d600e6bcdac1c41efbe9a20b9c8b06f3e0354b92d3fbea494303eaba8c2a147fa8442d8cbaf84f25
 EBUILD gentoopm-9999.ebuild 617 BLAKE2B cd8cd7946383e5b04e32cfb1bbc3531cb0ccee2c434b49c41fb5927e499a8e184fd9fa311c4507df9b150707c3bf16a5a98a9e1a14a0d9ae5f7c8ab18eb97dcf SHA512 aa1fc2c225e10b52e03561dff3ab128d3c1eb1c3ee82b2448c20e4577a79fc6ac710f537e05e6a44fb524f02bb466b0bb0ba629f3a9c8cd2f3e3189409cc078d
 MISC metadata.xml 552 BLAKE2B 5298db30d81cc45ccec8b1320c204be68592246d280969045924d3142eec58cc6d050cfc919e4f30caf427e255ec968ff551e7338c97bb8ab77434a4d4a7aa68 SHA512 dc85516038135bda516f32d321375d814ce7f735d5169365beecc994b4d8936f646a580f1ea88dacff323a54e146423c99a0b6280af41aeb39f08cd9303ce677
diff --git a/app-portage/gentoopm/gentoopm-0.3.2.ebuild b/app-portage/gentoopm/gentoopm-0.3.2.ebuild
index 5582cd45b7ef..2288dc790c48 100644
--- a/app-portage/gentoopm/gentoopm-0.3.2.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 9ebd6d3d12f8..62beae43d9b8 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,11 +1,7 @@
 AUX implementations.txt 830 BLAKE2B e10d79ca8ea5091166a29b1547e9db03ded897d66391a5ec7deefed5dc1cb4b7546409b585d6185368a9c9ca5e82c01b191a8edca964475c206d09d935246a6c SHA512 43b446e24080076f5351ffb153e6bfb9aa2d1d03632d397c0dc1ffc445d842255a89e5561a939a4bf4a9c8c1b63c961a91b56e8bd18160c1056e8d39c0c8310c
-DIST gpyutils-0.4.2.tar.gz 19771 BLAKE2B a5b58efcaad803a3eeb4a04b51811c2832f5a61154ac60b67c31e1962efd5f1a801e06fd3245c2336e6440b03fae2c30642e99c7588af89b7a3d0173b93f0c87 SHA512 699132833ddbaffe26bec8b3cb8914a609cc98ee2d8b852b59162265ee3daf6a0a0bd8ccc4d693e319d4e413c441ca94bd6837f07f1a132bda383350593792c4
 DIST gpyutils-0.4.3.tar.gz 19951 BLAKE2B 2d15c6c714a7f75be4a5398b7287d6281a201f1b5806c6cac34093cd74ae3449fcd103d023edc54ab088807e8a7b24e08bb223ae9f40d156ade97706cf4b9355 SHA512 02067d6d075afc6670eea75a0e9ed12bf02eecb623accd010701c45d4176bb23b1dd0fb9eda3a4e899d3fb90581c5f3fc46b5fc8760b491c31fddf592aa7a291
-DIST gpyutils-0.4.4.tar.gz 20030 BLAKE2B e94e8472b92835400c6d4b1ec07ec810eec88b0ae8160621fe329b4c7c4981f4c4cad45c4f2e7f70bd80a4031d5bbf8ffefe9614b94f255fbc39ce87411ab8fb SHA512 94b941220e431ea4f45b2824e3d58cc2d7571ab87c15a77217293afa68e2b9a7f833d5ed47f28cc5eb35a62415ae03618dcc2b96ee015a685314ef6be6350eaf
 DIST gpyutils-0.4.5.tar.gz 20037 BLAKE2B f628c11e0ae2c9bb02a024e1b7dcab7092e7b01c14078683c47a8ca00d71021b988c51d80ab8b322891f9ecd4bb11c7bfe7d300f3bcbe489a977b18244ead085 SHA512 f68c87b5a35aece182bf2f9f93fe89f061dd49b4b75fabb7637038aee1e5301797af1d889a75829048eeb05dda0233461a2f2600e185214600a282cea50d1d3c
-EBUILD gpyutils-0.4.2.ebuild 528 BLAKE2B 4fd3e00f22c182ee0cae2d64eabc42c4b211001122b6bcb71a86b764969139434f873706615178cf08c559d78d6d578deacb7d248b4198f9737f54a96d0d4782 SHA512 50044413bf71f9ccf37d762c7e3edbe748dcd3204c4a41cb3d5cf735dc2159f54604627434f6491f208188256d8d2408130da419d4e3276cc611e7ab11aa25d0
-EBUILD gpyutils-0.4.3.ebuild 530 BLAKE2B ad0dd68af616c72e6ea6ffd478a7ceea20c5fa84c093663e6001e950bcc1034360b1ee2490fb017e9b847225e8c24d4faaf74e1e824ff6460d2aa0b96786a859 SHA512 b678c80698024a1e50e6fc093c1d10adefc6c48e524be7bbe51d4eb0ea4321538cdc98a8a12458a3482a3778dab45645600fe4102575b05dd0b7965584a04c72
-EBUILD gpyutils-0.4.4.ebuild 534 BLAKE2B 421744cef93f1e1b7a34b1c4f1c84f8be4efe6025987e9b0f223c58f4f32229a5f292a34dba732f1b2e576b3fb85f98584346d1a46f84dc63f5afe6d84b8b507 SHA512 7bae4b1634cedd42bef9c3917e2393721ecc21c6e387416ce8123b5852f600a6e693eb950cdbf8d63872eb96844046f8f4b18ac2624bc8c9d9a56b3dde17ce78
+EBUILD gpyutils-0.4.3.ebuild 528 BLAKE2B 4fd3e00f22c182ee0cae2d64eabc42c4b211001122b6bcb71a86b764969139434f873706615178cf08c559d78d6d578deacb7d248b4198f9737f54a96d0d4782 SHA512 50044413bf71f9ccf37d762c7e3edbe748dcd3204c4a41cb3d5cf735dc2159f54604627434f6491f208188256d8d2408130da419d4e3276cc611e7ab11aa25d0
 EBUILD gpyutils-0.4.5.ebuild 534 BLAKE2B 421744cef93f1e1b7a34b1c4f1c84f8be4efe6025987e9b0f223c58f4f32229a5f292a34dba732f1b2e576b3fb85f98584346d1a46f84dc63f5afe6d84b8b507 SHA512 7bae4b1634cedd42bef9c3917e2393721ecc21c6e387416ce8123b5852f600a6e693eb950cdbf8d63872eb96844046f8f4b18ac2624bc8c9d9a56b3dde17ce78
 EBUILD gpyutils-9999.ebuild 510 BLAKE2B ee67e58eba05af164ce97e357aa8f53ec680b2a7ce4a00f4c5183755b3580bc0d98d10ee4624742239bced94629946761d4e596a2b61c442d58005ece5162fef SHA512 16c9139b8bfacecac83e0aa5e2a1bd49d3d481eb417746f98018e38eab7b76b2237459e0cf6d7ae698cf979592ac45a9652af8ef53f894c59cad32faf975e107
 MISC metadata.xml 552 BLAKE2B 1f0cbee3cc1240b53c9c60122f488628643742b1afc4f68e9780bccbd959f0d45fb612ffbe9a8f9ac0cb8b5b6586af133c3a5d43884d42b09c8f3a8e2d44076a SHA512 f6788974678b69e9f38f9813333b62bd53c0e41beb5aee3f1d962ab6a739e8a2e2d3b2e1e03e6200172641b73df5ae0eb2cd74ee664ad20ea665ed63686ac7d1
diff --git a/app-portage/gpyutils/gpyutils-0.4.2.ebuild b/app-portage/gpyutils/gpyutils-0.4.2.ebuild
deleted file mode 100644
index ac5c7dac4d64..000000000000
--- a/app-portage/gpyutils/gpyutils-0.4.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/gpyutils/gpyutils-0.4.3.ebuild b/app-portage/gpyutils/gpyutils-0.4.3.ebuild
index a519e2a5c0f2..ac5c7dac4d64 100644
--- a/app-portage/gpyutils/gpyutils-0.4.3.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"
diff --git a/app-portage/gpyutils/gpyutils-0.4.4.ebuild b/app-portage/gpyutils/gpyutils-0.4.4.ebuild
deleted file mode 100644
index fa25bd96a86c..000000000000
--- a/app-portage/gpyutils/gpyutils-0.4.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI="
-	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index b8fdbbde0092..61e17132a5f9 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,6 +1,6 @@
 DIST nattka-0.2.10.tar.gz 90745 BLAKE2B 8553b0871fd96e64af97e68cb6164dd71dad17c542191d98b6e61039707b39a98bd8e2ff7e24da4aa167b61c9b8b4d01260df90a28d05809c1fdc61d9c06b8a0 SHA512 31d4ef6162e42f25c807728fa4ec580ac048138a26a97216976d1ddc2901bcf9674f75bcce2da81f350c4f3da863c9cc45d5cbeeb4dae42e7e5da24b190c58b8
 DIST nattka-0.2.9.tar.gz 90735 BLAKE2B f10d3af19785d835e059647e758541c3df5141efbee908fafaeea0492537d10d308020d1badb8fedb6f1baa327d26ad1126f26090b6cab9c75358247cdd47ffa SHA512 73208b15c2787965acd5cd2b14614ee8390da65924d7e3fae66c64a47d697f638df710f7053762e1f77d861e3b84bb18dae454446da698e5b52c1a0b1591bbd4
-EBUILD nattka-0.2.10.ebuild 927 BLAKE2B 6e5b6533128c694166d6eb1f8bfd0fe2eecfe8a3af14f167d0294abb65ccfdb656b6a3598939a8b2e86a1a2ae537581c8bc01bb42ba992f7c233c8ee7c7b2e9f SHA512 1643baee9ce48e80cb02a6d9607827c1d175ced75eba7ac414cfb8e398e8647772b96c7b0ae544b2e8a384c8c1967e260b2d46a09137f0fc57a69ffba0f2a292
+EBUILD nattka-0.2.10.ebuild 926 BLAKE2B 031243777104451b9f74422abbd289e2ad8f45a8ab0483c21140bd11e7cb307fac1a6f87c9d11e0f42d2f4805936fedffdedf81a1dba21af060dea1d8d6ac808 SHA512 6aaf0cc3f6f43c70f957d57d9306fdd6e43ac954198ff7f38488dd73c8a4e0256b05c04ffb758c87cf0e28a6b740774ff586b9e01c1d4240bccb968f9f2b9ed1
 EBUILD nattka-0.2.9.ebuild 926 BLAKE2B 031243777104451b9f74422abbd289e2ad8f45a8ab0483c21140bd11e7cb307fac1a6f87c9d11e0f42d2f4805936fedffdedf81a1dba21af060dea1d8d6ac808 SHA512 6aaf0cc3f6f43c70f957d57d9306fdd6e43ac954198ff7f38488dd73c8a4e0256b05c04ffb758c87cf0e28a6b740774ff586b9e01c1d4240bccb968f9f2b9ed1
 EBUILD nattka-9999.ebuild 887 BLAKE2B 79540de21b995147dc8b7c7d43e3ff14a685bdaca82b667b8a1ecc61643341f34e422d7f710a098854faa445242f2a0f8161df58371b9a4412dd9a27c8073644 SHA512 6ebd99d4f683bd6e217b076303d4e3cc46bba3d09e3265b8a9f7a42ae7d8456c37699e405ae3fc60c0adcc9340881ff6beb7ac1bc8757fdb1c32e842f620e33a
 MISC metadata.xml 360 BLAKE2B 81f9162a3ddac3a0f333ee1e33f3012305054a7039b3bab7dedc68caa08d44c355aa40a2e9f61e789ba28fc0c28829a74024fa72476281dc492ef5d39ec62eed SHA512 674f911e11525336a229d3fe80baafa37963479e582ab847d74f70c817b126a10a602ef3f6bf67529b6b2b3d3e576afdc92ab3d2c1e8d1e75407db7a2007f01b
diff --git a/app-portage/nattka/nattka-0.2.10.ebuild b/app-portage/nattka/nattka-0.2.10.ebuild
index 86c9d5d1a714..57a65e264ac8 100644
--- a/app-portage/nattka/nattka-0.2.10.ebuild
+++ b/app-portage/nattka/nattka-0.2.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="depgraph-order"
 
 RDEPEND="
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index 99cceddbccf1..27c6ce61d35a 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -1,3 +1,4 @@
 DIST pfl-3.1.tar.gz 5521 BLAKE2B fdc6e82c5d61d694a188c479b0566aafc507bcc2bbd1f176cd2771586b13de86a43a5d2e156beb4c9b5d10cd718046a05fce099894430c8f3d04c0922078e988 SHA512 b2bf79445a5b15caf339106f376d64accf5aad2c60038ba88180d64ce49e23dc3015efa2fcbeec886ba591cada053dfdc96873bda71b092be4622608062b6dcc
+EBUILD pfl-3.1-r1.ebuild 1239 BLAKE2B 8e334d17f84d34fdd8ee8bd7f2039894b5abb9c6a77c041abc11abc7b1a7056b11e56b3368c9b7187a6c476abd92b1e7fe5faeeb5ea85432becd723e9a850f4e SHA512 5f43b2831292f6b6a2788d3d12f68050d721393938aaf5457981d06d2244de13563598deb4cbde2824b8d2f52c17e1e26740544a84c6f4f94e79f35681c9796e
 EBUILD pfl-3.1.ebuild 1230 BLAKE2B b8944a8d97a6639678432f31b7378c679d9cc51b31e797aaeef21a47a3b662ec78dd73120a019bf74ee669cd6eac857a5a8adc252baf0559c079c8a5040c15b3 SHA512 e310428a00cc34c438584e0bce74789cc9fc77ecc6b575b2c9f029190772a8d5bb88689398ce73e340e1cba68995f8de688596d74011f3e0d8c6c39994964360
 MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b
diff --git a/app-portage/pfl/pfl-3.1-r1.ebuild b/app-portage/pfl/pfl-3.1-r1.ebuild
new file mode 100644
index 000000000000..bff47df54d94
--- /dev/null
+++ b/app-portage/pfl/pfl-3.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Searchable online file/package database for Gentoo"
+HOMEPAGE="http://www.portagefilelist.de https://github.com/portagefilelist/client"
+SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+network-cron"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	dev-python/requests[${PYTHON_USEDEP}]
+	net-misc/curl
+	sys-apps/portage[${PYTHON_USEDEP}]
+	network-cron? ( sys-apps/util-linux[caps] )
+"
+
+S="${WORKDIR}/client-${PV}"
+
+python_install_all() {
+	if use network-cron ; then
+		exeinto /etc/cron.weekly
+		doexe cron/pfl
+	fi
+
+	systemd_dounit systemd/pfl.{service,timer}
+
+	keepdir /var/lib/${PN}
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}/var/lib/${PN}/pfl.info" ]]; then
+		touch "${EROOT}/var/lib/${PN}/pfl.info" || die
+	fi
+	chown -R portage:portage "${EROOT}/var/lib/${PN}" || die
+	chmod 775 "${EROOT}/var/lib/${PN}" || die
+}
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index b20197a0d13e..05007c900357 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,4 +1,4 @@
 DIST smart-live-rebuild-1.3.6.tar.gz 17194 BLAKE2B a1c4f07e66ce3328ae70f88d086c33875bed68aea645a180e68fbd997051c6d398c1133d8e9c72378741fe41c519e941e76dc25d9c3f9c61c36531fe6fbe8e79 SHA512 f9fe57269654d69c3b21d0b6e378dfa3d2c00e67dae44278b2b81d631e4645346ecaeb5c9f43b77d39312b97edee247ba8b05303be903d6a3573bc226159c40f
-EBUILD smart-live-rebuild-1.3.6.ebuild 834 BLAKE2B f3940fd9523cbb5cf435efade947186a53746cdbcafac1e4456165d471471ab7958c08fa62efd2dce3efa9e3c80784988e10c2adadcb8e49cd73902b55fd86cf SHA512 e226174bcc63cc5be09812bb8b2727f116442716fe7c6f5d332654cc9b1f45ed3848d617d719451e077dbd773c5ca3ba0908dc88337e9bda5593fb5b0fed8b9c
+EBUILD smart-live-rebuild-1.3.6.ebuild 841 BLAKE2B fdcb8e95731207501cbb9c77fd4723703f6c7ae9c77f2dc5a05a98021d2b0e782959ca9debb9a4c23e9866b138a16e21310928fc1e798cc0d4ac65b73edf458a SHA512 7148ac3d87795a218e302f855c6cf7e06c1e3ba55233f7aac7b3203034d93ede9ba2a526d5f036c4320456332061a99d51346e3cebaf99b41504e1213b432062
 EBUILD smart-live-rebuild-9999.ebuild 753 BLAKE2B 588296dcb808c927331821d7473fcff22587c71a20adbe903ff7a1fd49453837e486059154b0659457e088cfba7ed8e6ebc873e8b42e153c3e9701cffe77c182 SHA512 a894151cfd2e9e81899f9ec6762b095b9e605e06cb1dc4bb21968995565afc7fb292d03442ea71ed1eeb263082ba9584cd9c1e5066d47537f64604d891420792
 MISC metadata.xml 769 BLAKE2B 5aaad83253d55d1096c19aeb6a980e31456ca20a1ecfdb45e93dfd2f72cff7cce61124bf546932266d24d0c9fd0493ae4c61089ab291028360834c2f6d237e5a SHA512 d11c942868f0166c646922088dfecf3047f8ca017b85965382bec8fc794e11d6ffdea27a9156a41faec10a79a13836b13d8b9213a44e57672e1355fbd6bfd0da
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
index 0520c1b1ae4c..6b1123488361 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/smart-live-rebuild/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips x86"
+KEYWORDS="amd64 arm ~arm64 ~mips x86"
 IUSE=""
 
 RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 471f24270365..f0dbd1e23db0 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index e04232a0f5e6..7c6ce1fce675 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,5 +1,5 @@
 AUX autoconf-mktime-2.53.patch 4812 BLAKE2B 153e7d9d2b57a0946c759545327ba95d64b79ac955fd4da2664b267ffee4766280ed3faf5d4bd3ce916c71ab56eb388b018ad0ddbc3374cbab7eb034ba91d4cc SHA512 52fd04b9ba576ef28a66647307b550e9da074867c2cfd9d517948f3029521d94ca01f3e43b49544ecf6ed1139f8ac4f8beb36470e7e225a65557a6b5fb5348ec
-AUX autoconf-mktime-2.59.patch 4686 BLAKE2B b911b5f7eafabb8e930bc997a25b1fdcfb4a8f223c21a6034e80a635bb0a5d58dc2d1e6cfb3dee09c67a67990a3cf36c998a3b407f390dde6abcb9621bc8be5c SHA512 4ac3951b72fcc50bc90d4fdd6286fc0ce01100d928b51f41043cf7c6f6adaddd7b19bb346bf21f306ce6cbe619750dfe18755c122e3f1a237fb07c02b25594a8
+AUX autoconf-mktime-2.59.patch 4690 BLAKE2B ad0c681d0139c7cdf08c7104621106d84cbdfa5d4e65867e4289088cbcfab5153fbcc30332956f54c876a0b61c841e5da73556039d2cacde00e89280731654e3 SHA512 5d903e598577e4227749580e7aa2d598e58f5aa7ae7cb232c370971da59ce8022b3acd825559a6dbddb44f640d3172d061bf157e424a4942a300d5563eb7d245
 AUX bash-2.05b-destdir.patch 598 BLAKE2B eaf7581e28c74548e4ea421b7ada2e725ea6e835b3ff4badd4b4430dbdd554af7660af3a2a3419513eca7996f95eb886f81b055a168f009ca7960f35c7eed2d2 SHA512 d453ff834c7a4b5b74e395e496493d77f98ec0e1aa1d7cf8ff0d8260b2a0602067da65a18d5dc9dbedc1d79c8b50395dd97f7091a6d55ff0bae52ed1b2b007bd
 AUX bash-2.05b-empty-herestring.patch 667 BLAKE2B d21552652550bfffd50221c074778c5fc54a46385f701654db7714fdedd7aed78a094eca5a7764401c276fa195b6c1bb45002c90fcb661b55ab80a2957bcc2d4 SHA512 311626129c33546b42a16788a566958f15b48aec40989828498ce45c50ffc450c1b3d3413cc7cbaeef44699d64962c968d38dda0ed810cce389b572228221be4
 AUX bash-2.05b-fix-job-warning.patch 341 BLAKE2B 98859dc6cc61f35f05e1446b343a2df727a823c2cc6eb843d135473ca8c250a77660d7d3c4849de4a9e78f56ecf37381897ce091fa9055fec210aecbb0eed8c8 SHA512 5ede03f96f8061d6ea99c473cd8625aedd745b9545a5af4bfa371907a4446e57d8d4d75e934ee38ae6654a0521f203d7e54d7b111e594bd4efff2ab0491b0a20
@@ -8,43 +8,43 @@ AUX bash-2.05b-parallel-build.patch 426 BLAKE2B 621b7a0fc43e4dbcabbdd052e0dc4a79
 AUX bash-2.05b-protos.patch 692 BLAKE2B 2b6d4290a6b94d98d2579eaf3f1fac4229321e7032ef34915128d879c2e4bfdaca57e37702cd8665ffac28bc51e4b2eb3d713a77ca600a833269f26fe44e1551 SHA512 77a5d48d629cd127db6f7163fd9ee4e67c22b92007cb5e9fc9f51c83427f809dd74f176a521a7d8e342127419c872c01e29b921f48cea5cb8e788ff5f51faaa1
 AUX bash-2.05b-rbash.patch 616 BLAKE2B 9c943a1987a3558735aa9d7edfb74a5a0cf6bc8be956194d6457f9e0dae8ff4050e916eabda834a2f418c03327bec2039e11837229815c1bf200dd3ded1b62f2 SHA512 bc4a6132a36b65794843930e34abd199d9c5df7838c49ec3edf47f92e0f09877a31df051689a8267eaadfbb743934c2f4f25ab8a2ca07d1561dd6ec8c337a53f
 AUX bash-3.0-afs.patch 633 BLAKE2B 078765894c95e242feaa2d86f0613989a20b9550f6c29081445107834e60a17be4bd9b048a638bba627763ca0dd239956daef1d167b54193a5e0675b473203d6 SHA512 833515f5b4040ffb7e65b410aa860da73a2bf1d9b4da7ea74ec41581fcb27b0ebafdcbb041abf4c1cebaa3d7b43ee6ea11f7c7ecec5759530ce0184ac6029f3f
-AUX bash-3.0-crash.patch 1191 BLAKE2B 32fcfcc8cea44ecbdc3d574a80ec38eba3886ef45983e64529e6be575a63d4f57c5cf6a6c84754b741b7af190f083b5a326c1afc4025e140bd1fd52133bf22bd SHA512 e9fa172d76e1a3924c4795b7bb26a0487ab50f2d0714178076b6b9f85d7712ffeb4165bd591cac97c4c2288e39fa2bdf3794f29a7f2fd28e2d971041d16ff0a5
+AUX bash-3.0-crash.patch 1144 BLAKE2B ef90dd624da0cadb3cf75ee1d632187e17d845a1bd25d1756142f21b8c4a3fb0706b7a3a18d32e34c25c9bc950c92993bd9193981628e4181a942eb735d57770 SHA512 de2e982af985e07b7425a09afbdf4b70b6f0fa47f9126c5da35636bd1748f28803664ec71c52d15be19e84410e147c8128888a109faeba4d60eb531ecff7890e
 AUX bash-3.0-darwin-conn.patch 969 BLAKE2B 0a2dd39b1a1df5888cf03bc1cf59e17a7b0fc09334a13125ec385849ba21be45638e25c9d375e48db7aff3bba3c1844eae54925e75c937789e88128c39c0fc7a SHA512 cc85dbf39df3289e40ba33626d2a0ad511145ea3cc8dcbed136ad128181022bd70c3a4f7f8e3146bcd027d7999deefefe8496d5eb70ff1a70235950a01f9376f
 AUX bash-3.0-histtimeformat.patch 1784 BLAKE2B 10c9bae29f06832474dbfe038bae5e4b99dce795c7c04360a2813cba2962d86f44af53599d7b4ab3687c0378c9f9d910f4659444caea828c063a368caa9e4a29 SHA512 36ce1afa92707a4c43f212119fb2562fee0f1283bee94d892869611de1f34869b1dcf737746ac1887c1ee8165079bdb4ae6cb353a3cbefdf1cbbffb8b43a23e6
 AUX bash-3.0-jobs.patch 1438 BLAKE2B 1107d79b268df413c6ae03e4522f804f32bda4b9c98199e47eb45a1a4af69e1d31fd043b686cb048b310a3e9e36db46db5eee1574fbb649fe06b9395409f19c0 SHA512 d52b64f989e82f45c0305233333d2b004afb3ceda232a2144a56a21310b91749009d89639e323b4b63dcf92aff27c29d425af7e62ff9de9b164072669693ded0
 AUX bash-3.0-locale.patch 3492 BLAKE2B cec73c4f807172da52406a21cbdbd630449709aab4d51ea5a969065595eb339576cbb456dc62b6c0aae92a888498810c349e88c4abbeebfa355b401c397eeb7a SHA512 c216b5877eb87660f5f3309280b9852917dad50936261d22611fa7a0f5e26a2efb7383fc13884105fd0798c6576f203396f185e8441a14f03067d5aed6e3f6b3
 AUX bash-3.0-manpage.patch 498 BLAKE2B 6e1d4b03fc3f62e6021b0a79ed0955ea268d8fdf384a7211869f6806b891e5516bceabb13f3c044edaf182141bcbaccbdd3e3717bc0ca961023e8b7fa4ef937c SHA512 2492344828ad51d52dc4591b0df9e45e38904f5fc1bc6408b14815cf8809641b218c030cca0d830ddf3b18776bbc99e76aa0035b15e6e966ff1aa0a7914121fd
 AUX bash-3.0-multibyteifs.patch 6099 BLAKE2B 377cfffa517f316ba866e7adcf986dd92b8ef859a6f46a622b97f92694b3e1d5061bf2039c061c0878555f10144fb6e4c81e06b9045697c1587d1e3e5fe2f5ce SHA512 3c0a5e565dc1f0b38172d6417eded435b1d5482eb8d33beb850b53178130e7d08e1cd6051a08aa93c845902c0ad5d688f8a74671222eb269cae6bddf33a99342
-AUX bash-3.0-pgrp-pipe-fix.patch 462 BLAKE2B f9c13a14cbd5d34ca2bfc7838d64df21757527569088c419ee9d123e9338f4f0564d63810d224b133a15e2bddf48709297324fb728e9b0c08d4b694238d1c026 SHA512 9d5e647407fd66a8c285568d6af8a171a8cc327b22c08ed903eb783b8a3978e5117ff1a0f4798550a0e4d519347d7068b548377fb60bcf5eff16dfb92aa11d67
+AUX bash-3.0-pgrp-pipe-fix.patch 410 BLAKE2B f1ce60171c4495aa3c8ff7843b484adecb12962015f17a0a7cceaefccf0494f45691cdd85ee50de145e37ccf9b91bee8134098b7f6e01087d7c96d9f040bda24 SHA512 ee7061bba01c38ebeb8d03828a915e6f21548316dd38af04f33175d1fa464f89526052f849d1e5ed3235924999d6c6e7be89cda69bbfa1cb9c1718d0a6833296
 AUX bash-3.0-protos.patch 1618 BLAKE2B a11aea928e0ec54e239834959714c96c0e3746ad9d8a2941f42bc12b7e257e8077be22e42ed744253871e19a21b2cd4e5ec8008b4e0599f19b2300142f2cd672 SHA512 b129beb6d0e8df83bcd1a2f8a4e56f60fa1d7566355a7ba73cbb4c267f074ce5aa8f5abd5da8bc45529b6101dd3111e3b427d49abe6d64b370704e9608ace099
 AUX bash-3.0-pwd.patch 717 BLAKE2B a834beb35b89f7b058d80fa06710ceb78bdf64214ea5a2a903e7afb6d05cfcd5b4b71f0cc3f3e4e2b9a1b13d10511bf6fd9eb1eaa1c45d224dbe9766dd3598ba SHA512 3766c9efab53754292227c21074e0fa176924956664eaa5d33ef562d14e864ac0c06fe0f03a565b0ade0bcbc0c97ec8a532ee7a31567dcca34cf84978f7ab805
 AUX bash-3.0-rbash.patch 405 BLAKE2B 0e35d1aa7a674c4def64c6dedecfb402fe6842c742f4df77312d4057959b7864e3c79f242bbc15108908e99077c34ed1e3cd63509a814e8f1ddcd31d306d473d SHA512 b247afab23cef742ec48c19012b79da52c1f1386cdc256a237742cc04f9ce64835a42f833b67ac5ed60424672484e6ffb262d5c80e253290062e21ce39357348
-AUX bash-3.0-read-builtin-pipe.patch 689 BLAKE2B 2189d76b5470feb845482e6598b78e78f23f2212f33286ad6dd27d00d687828702b2290bc3941294a1bb312aaab6d409b317064ce7e319ece5f6c529fc7766dc SHA512 f89717f0b33311a491c3e2e80ac75000a7b92f78febf986324a351107b71dafdeda8bdd3d5c292fb82798355fc21d5d562305ea759815a32bc0e7b1772f8c4d3
+AUX bash-3.0-read-builtin-pipe.patch 693 BLAKE2B 1f95af33371236119118d9cc92e0ae86264ca6af110483f619817996b5eb0333e8295ad8a2d09366854ede7ac163bf877cab9eeee1139ced131282f436983559 SHA512 0b06841acc959a9141f2e3072906703ee455501902db91946c1da8c9142dbe4d6d8b1cd06a2ba9eceb840a8229f82d33b61b125167c0e23c5af2a1bddce375fe
 AUX bash-3.0-read-memleak.patch 416 BLAKE2B 4fc13e44b5dcc7a3a76dcdfcc3e2d17904ce9ebc46c88a21b3b7142b1301bdf9518582a81256e582adf468caf0c4d68aa77d5e6e6d66d39b3d152a34512fa1cf SHA512 97361f9e14e2547a67da475a0bfd20c1be70534d745845d4918e98665d4182da231923c8365f881561db63b90d5e40def1f1b7f0bc98016c8d8c2e8aeb4e4407
 AUX bash-3.0-strnlen.patch 4976 BLAKE2B 9cde9d95df2b815071ea7aaafc9f59a98577b1302c76bc643a56d23bcae75e3f75083acfa043bbbd8abbce97b08ed6ae00f7f069c4ec495a966369388984f407 SHA512 390845441ad608d0938ca8ed5f9f06f28e6fe45462864072c19b3af302cc6cdb0a7f4fa9f0ee4dadc3ed19a73e06457044be47ad9c327a81f3de4ed7bb70aaf3
 AUX bash-3.0-subshell.patch 1219 BLAKE2B 2171bb8885dc2a5070cc7138e0999e615fd4982f0fa4a390acc8ef6877cd3ab896d676dfe0c2fc78d0436fa41b6765e159baa2953874257b01523b50d300e8ac SHA512 ede172d08b8220f44ba12f803285192b82a505d4d2549914ef563c66d6f19c3a14acd5af3f30fe096dc6c360e9aef71b89f23c468e55c06e61be19d6ce17a68f
-AUX bash-3.0-trap-fg-signals.patch 641 BLAKE2B d713ee86241c8c2ddd5eb704f6ecbb2dbb0bd43e3eee3520e4749aebf1507438866507f5d68864d30117ed2ccc5e6b42f673e7e0b35f267e4f43f69536c1a9df SHA512 5644591aaaf6a2f5e5fa4d41aa4e26c5d53e2efe6ad5838729a2da709e04c539a4a83325f707269d59b5aa0609130dc888ada0b9ec96fe85536800218de8ad6d
+AUX bash-3.0-trap-fg-signals.patch 645 BLAKE2B 7a317c624463ad226367756ce4a23793e08a287dd6dbaa61bf64dd6ed945c7cbdfbf53732904eb785952a7ee707b45a5baaf631bb4c60a2c4b263420d0dba86f SHA512 ba3677afcf72a9830d1ee2a9d5167204e9881f0002f31cc557be6d0d6b4aa4631e47e98a39620d46118725c27811a79f0bc9dc10adb82c82f2051859fce3cc10
 AUX bash-3.0-ulimit.patch 5226 BLAKE2B 23ce5aee0854df8b19d885d8b51df828dd7d40ba6f67956ada76de6abb590d166e79977f0ce1bdda32937358a0626b21dd37df7c96ef95b064b866829fa8ccca SHA512 1cbf210ceb840a959530506777dc4ffb34862ec6f1bc4b65a68c77c8b1b3ce02168d7283dad8d64e218169125d041a25c4e604c3a4327ceee53f806d77067011
-AUX bash-3.0-volatile-command.patch 512 BLAKE2B 6817f943f165a40c032a31aa3e57b40f3db250baf00349376c9238a252908c86976beea9841e3d5dd09839e5881cbf2d164fba9a2b3365f825560e388f2aad2c SHA512 55511691ed6880d58b54e2ce24d5fe14be2dc1ab8cc3d8ed25068dd8f831202958b7f470b361a294a05c3f202e5df6304cf54978c04dc71e915a959fad218223
+AUX bash-3.0-volatile-command.patch 442 BLAKE2B ade700db1a17f79c029d5d97cf1108c8388f234993465060086a1d53d960ee9450f30376a64547593aa6a787dfd37d5819893cc16e7d1de6345e622ab51d1e8d SHA512 0ffb1a276d83f74c5bf1fbee14d535569e75c3584e1977adc3d92b45123c735b7c5b677c4ff6a6ce5a5faece628eadc66438f3c2ba6e2edbf9d20eac5f6a4154
 AUX bash-3.1-dev-fd-buffer-overflow.patch 557 BLAKE2B ef7874e23012e051673b695a96f8be714834e43f2e282f5591e1b6b50e99edaebce585e784623a8b74a018301fdee3a5bcf425c4c480767d550b2c793c3388fb SHA512 3db03dc6e8c5fd9542788cb84854a0849a0f87ff07e95adf57aaee21c7edcb1293ae47ad8b83e0e0513431ba9826fcb45b847ccd9d87efb32b91ac7fc0cb415e
 AUX bash-3.1-dev-fd-test-as-user.patch 437 BLAKE2B 1a235dc6192e3f9de5779768151b6dba34e57d0eb0875db36001943023d7813facb4cf46916105fca2d64bcba3c3ef325fc265771aad5093b2f048563d03bca5 SHA512 eb9907741b68513c53128221c240a1325735c1ceec2a4ac0df74ed85126404c3347a3d97181ada5b28686e17600653de9dfadfa9985812049de45741c81876b7
 AUX bash-3.1-fix-dash-login-shell.patch 1749 BLAKE2B ae26669a67196265fc301f0372b050bf74386288a128469647c31731aded2e7607c20dc41c1dbe404b423b1f464e646756d770ff7f9bd5974dca75d5f288e29c SHA512 f1ec4e9e6c119cba8d7df35d3cdb53b8bcf990b8577d0488a750dfdbd6781413981d2939ff3995977706ed927284aa0049ce36f64a126d6375fbed1210affb7d
 AUX bash-3.1-protos.patch 1580 BLAKE2B 99a5ed84fc5d3b90a69202e5c7bbeacf96fe15fb202ca0f30d1f8d0b2ab6f511bbc8cb30d94756e7b4b7d9fc764aa61b07b523ba356f4b99ecba6853b0816d7d SHA512 19a17cd5a1f245a46047575670b3f7d2d37d6beb445a9ae3df373d5bc70b19386811fd7c9119a3051b1a39534e60a8b144151c5e95c44eeddf2c899d9e932536
-AUX bash-3.1-ulimit.patch 3736 BLAKE2B 88dff11a0f39cab66801a87831934310863a9f73109e5dec73ae11c20e58173a40039d97123f830d8b44891ac05f583e9c4a7c38eb6266bde03363f30891f521 SHA512 ce92df5cd0b0d98d1c09ad061e56fda0498cc64ee580604a2dab6408347c2a0a6758038f2f6c37092312dd6c82eb99da99119758170d817b913e96b4c24f5d34
+AUX bash-3.1-ulimit.patch 3748 BLAKE2B d5db6fcb27b3618444f968a0a54afcca39f35d990a0c1961cff6666fdbce3ae697fd961eebd3ee2bb540cb9889548f7f5e231e6108e01416cfa03e0d1b500395 SHA512 85cfcc2bbb57b5f13b933a6fcdd8d31b94f9bbcdf6750792297eb72f719f98f69d561a0a7b696ec440a123b762ff5a67e7c4d994d69d93b460219e873155d3c8
 AUX bash-3.2-dev-fd-test-as-user.patch 1104 BLAKE2B bd6c70942fa0f02f02d723c4897b8bf26894e6809d54edface87621dff96b1762e3fb16f81a56a9fe04dc7fe29e982b9762de69db0f5e3af016eb559ba87e775 SHA512 fe4478d4423f7a9cce4af46207e2adcea2de17591c8cbc888695177a0b5efb9ab060d7980f6679ca66f6e99f1fa7b632fea6f002364c588996a4287cc5313689
 AUX bash-3.2-ldflags-for-build.patch 1172 BLAKE2B 8fb65436f504e46639ba959ddb7d7549fca6cfc4aefda0d4e871fcd7575e20dcb36ee3e4f318e20c9106b0b19dd6b2d6d2f3d6cac2b4e04c50d5807287c04906 SHA512 5ee27f6e2f3665ee4de4d47114ae03dc20d8050f1e4496d29796d892f9c96019a5dac8ec5672ba1818c0326d1151969bd03f9466089d6432468bc2cf56a1dd09
 AUX bash-3.2-loadables.patch 5355 BLAKE2B 55f280075d220ea3cff2763951b940ffb1277ddb870eec62f61f4140c8faf3317d5aaa7d4925b11eeadd4df8eace2a39e3f02d12aae5360f68cb6422db7543ad SHA512 8255659ea5737a6edc97c29a772c3b40c634190d869c67ed585e9169d18bba08d625b6a56b8e3abf200fa4798c4ee5d9411807fabed8c123b4afa1fd3d7be50d
-AUX bash-3.2-process-subst.patch 272 BLAKE2B f497396cd0b6c345b0603933579b4c13d5093f50b9b8e6df1f4ef9f3c93e13f9904a67fbdf7d61503e897dfaab12b581e2cb76c75313ce0eaac8004385b96ad9 SHA512 609b093f8f56beaaa1e41a3fc6a2261d302a938df911e2765e819bf71ad3c7da14444ca01f7e655b9bd7b9f08297520e18320c85f16f16425cb2e583e422c6ab
+AUX bash-3.2-process-subst.patch 276 BLAKE2B 1f1656e70542a26944546e10c56395ef16400721f4c105b303795eea5aed7c66bd89d4349b81fac82c3e9c552cc6c452b84e92c32887641a71196de7655ad297 SHA512 f509c469e0cf4da3cc01771af1392cf1f2ad3badfb24df8b6be69d8798013c67ec158be3239bbf31b37c16dbf7dab08b6fc44c47a9d70c90e44e797a8a99c96f
 AUX bash-3.2-protos.patch 1376 BLAKE2B f5205d8d02aafc39fc8834f5fd98c609e14cec54bad3501e492499df1d56f0aad23ef1597e6e90720f420720e6c6d69653f64855724e9ca41b8480f5a835fbad SHA512 38fda9326bc92cdd10b9f4fac91d1ae8b37aca303376f9cbb59376f06136ed6d765421626d253931350e6ce5f6a34de9016eaab862de1deaee20c62d53d017a5
-AUX bash-3.2-session-leader.patch 2098 BLAKE2B d9418c37870dcc8900fbf9110e7e21e676aba2742c01feb36971a8f71925dc68555f4ce62e31f38a68079c1d2d37ef04671684dfb0e34826065af53dab0f327b SHA512 5b2cc930adbb49531971548b57a56cc4a6ba5850ef68f968b566e854e9e419767b1ba95d2186b26d9fe14e06e289f9bb471d39eb7a5f1a04874b0ca98c3e48cb
-AUX bash-3.2-ulimit.patch 449 BLAKE2B f3661f3cb7e198d212dbe7be34c82712a0ca022ef2febfd5af4d0edc59a4339e54abb59ab04e5013f8123729c121c69d630ff49884c2ec363a0d6ca6488c46a0 SHA512 a03a59691c14d16f2b6eb48836c4f292369c7dbc61df3e13c1dcd023fd69618c6a8e4230dc9997701b3c12b208318b0ecaebf3fbeb7d601e0f94a2840a1cd88e
+AUX bash-3.2-session-leader.patch 2021 BLAKE2B c3c92e4c00227329624b31c6f8b6c1b239731069c54d10640120c515c7af10bd90bddc61b8a483943e334a11dbefcaa7fd1574223d35d8f2093ea7c3b223e04e SHA512 ad2a8580ab9895d9be36820c872b97d005167b0424ee1816587155ffdfc3dc43717bbff9a611e3e307fad7529fa351aa40bbd14fa3bf6bb4b3335a8a22df2690
+AUX bash-3.2-ulimit.patch 453 BLAKE2B c8c617e3f0f130aa33d28c859f6c71310695b46aea8e0cdf51cada012f898a903d39571ba4cccdb2c8449cbe0be66ab28efd0a572ad84b17e8295765ab2b5ff9 SHA512 c3c1f9d682e4374f57d1051d17d7342b6fb03844db5240c27a6e4176575f021b56df88556359ae8abd1077373d98f4d1d6cb9ef2536be69b6a6f5b0b06d7d652
 AUX bash-4.0-configure.patch 749 BLAKE2B 4d97e6c343537859068702082dd5ebe8a7abb4ee3de1330b200b04563b84265184f938b8f9bba454b46698b146f44e69c617b0a579c601c392f290bce36722a9 SHA512 b7df205a424c8b345e7ddac0c112b59b473cb1a76350f0b22e002e3e5f2f3594d8350573f8c624835582591a97a518fe62028ec8e3c2ea73a3eeb94872ee7a95
 AUX bash-4.0-ldflags-for-build.patch 512 BLAKE2B 09e617a76b541067b6733dee05b40b023df34ec0610537320e394964b40eb2f6fd47c8e821d333e5f7ae0b5c0e6d4aafdeba8abd330bfb8ccbad19b8d9b0282b SHA512 58298b4f76fdbbcce0c22a90ecd554fd5c5e485260ac8aeedadebfa6b2347c41fe99a1d4d8487e70cfbd7bed075e3efb12736e57516a45e0431821f6f243cd46
 AUX bash-4.0-negative-return.patch 748 BLAKE2B b582bab3822eb5175180e9f5495cd7fe4cdb45b78cb27f9ccadbd0c932808e118b658c0fbe356a2b209ceb4ab4804987449bfc337291b2a82bb1b1ff7fdab1ab SHA512 08bf99a64fafaa5d31c68337c6943c24353dc28b478a0678749dbcd21777c95e911d416f379f03499bbe5bf25edb7a36d35b51ae6b6cdf17f8c767d2cc620092
 AUX bash-4.0-parallel-build.patch 2237 BLAKE2B 883426410c469687cd592a10acc2aaab97dc3a78ad4589bdb06061a1de6a18c65aa50ed032180aa0de8cb9498888e4dc511eb256e1b228a65bd9ec5a80c77b0c SHA512 007ae35eb0f5027fc8f490df0270c52cc36648020aa9be717e548be68c85bf532492ddb6b34df169be4a2b4f788dd89b81d4b2872a26428683b421a9360af2b4
-AUX bash-4.1-fbsd-eaccess.patch 843 BLAKE2B 4cce932e14d37ebc62212a8e6ac7543cf3ce72b31734b51777b785c4af82c32a118282a89208ea441c4e7753ac6fdab54eed4f7a465d09ef52f2ea3b94e363c1 SHA512 9616f7d8461302b1544b7eabc0fa1dc8dd682497b9512b67cb343046ee2baa0598efe7013d6730dc77824179073bd4bb1b4c14da721a72a03e7d9a1b1f2c9dd9
+AUX bash-4.1-fbsd-eaccess.patch 847 BLAKE2B a2a35f4b2563e00e82743057ae45762d480d315662130d9fc386b8922cbc21ccc9d2079a2fd0a880866879be8983e90aea0fcd1a1d1ac918ddeae31ee18301d5 SHA512 336bbd91c7badb6d3a0004224be508f9f98765dd2fb523084330da6e272bd1a88f871e074312b043ea4dc11b1582b75ebf33fa5ec0f1e32ae6b7e37e1ad55a55
 AUX bash-4.1-parallel-build.patch 829 BLAKE2B 9a2b41f426fca028e7ff231b1858f0908f0579db94c8e0bac2fefe2cbbc0c8574d294635e343c16bdc3e3ee9d6e03d6c52f9c107c358e821cee9199507bbe2c8 SHA512 4378b430b5238bccee1d9d368e094bb567481ff551bc1ee3331fb29f9a37e13d833daf56524b9d7a2649549c9ff372a73ba659ac4b5fee93dd584d03149a4db5
-AUX bash-4.2-dev-fd-buffer-overflow.patch 1329 BLAKE2B 884e7632019b8699023487b95e885f4d5387e224c2ef8e82855aaa97d3fb2c7c2344297d5f0062353cb3c46c43cd7065c337d3c9ca489ad0c261339ce5641215 SHA512 677ca63179f208c7fb00803dee407be34e2e5e275d12a355f7fa2c6d80e6fabe28499f657d1c927070dd9e291a0eb7b5c737527c2660eedfdf5109e59636635c
+AUX bash-4.2-dev-fd-buffer-overflow.patch 1255 BLAKE2B 61df074a224f6244d0821b06035040cef7e262bc1f77a7b64476048c9639a32ca471606a49ae2cf8e9d819ec5bc8cc4953be270301654f1e0541d771aec394e5 SHA512 c05a73f96d0c8c6e65d2bda1818bb28d6561f6004f7e1dadbce92a6a475d81169449a891a1d84b264df777253f354b984ffbae63af0e4e7948c04fe5b1c21832
 AUX bash-4.2-execute-job-control.patch 865 BLAKE2B c115ed8a46542b246c4526ecadda73389e95d9e5c1aec51bc43bc6e3d06c1b6196efd00689c3fb279268671aeff8a9039ed09a6f8c860ed408595db41020b4f2 SHA512 c2d45f5e9668a8717137c533ced119315cf03c63fb373e5636c65383a399227e1d2aaef846452a0d3316db20b0b4cc41bde55c9aba2a9a02c1c31462d2273577
 AUX bash-4.2-no-readline.patch 287 BLAKE2B 24d5c367440cdefc0a2e709e32867535e5dc3a617fd1f7b4703f572608385fa864a215aa690e1948db7bd1fdc33b00593ea56d289f98519b95980107194018d3 SHA512 558b6bc3a7588ca83190264c842a0eb79d838ebe8002f3aecf8a4dbbbbfa770a3568e2f35496ab80683c0317f15afbeb5748bd0c0027c7afbcb0419217dd5847
 AUX bash-4.2-parallel-build.patch 4448 BLAKE2B daf719a2fac8e18403401f68f7192a595fc31ab12f968e60d690c7453559b604b6c8d9d18c6973cf12c2f66b347739eeeda36dc611a1a5f420b7f6108a2e5a2a SHA512 44690ed868ed95b7949b21a308f402af64d46873a8eb023f44e3f12381719e66b5c123c75d496ccb3d51b10b7102ae041dc41d55131ff9835757731afb9f7711
@@ -54,9 +54,9 @@ AUX bash-4.3-arrayfunc.patch 439 BLAKE2B 8fd293185d6ebed88788999a671aae6d490ecff
 AUX bash-4.3-mapfile-improper-array-name-validation.patch 407 BLAKE2B 34644cc552d50cfd1db1904164fa69c84a315a8e0b0660bd0377669db532cca6af8f02f8e32d57ea117696f3caaf7a00e765773cf19c840a9aec57b3fd72f99a SHA512 214935a751c3275593654c36b471cbb47ca4f5bb6f2a19e0a7ff73b646e5318a861538bf923ebb5f84abafa6d0d6eeece7b2f36ef77ab8c582223e098b4eb356
 AUX bash-4.3-protos.patch 174 BLAKE2B 02d65bba8a12ab7d280a66d7e292e2ba6eea026fc252d302ee8a167e14bbccb9d3906a75728c9fe617b202ef63649fed13d82ff7407a71ee36baee6e1ad1c944 SHA512 4af0540467bbcf7cf041de6fe6ed080b149a2ff309e5dbe5e7b76bb30459aaeead813be678384feb01a7b64d3a649372f8a8aaf686f69ac7958baa87b25340b0
 AUX bash-4.4-jobs_overflow.patch 331 BLAKE2B 6897770ef49b5f3def669abaec3d18fd8c799fc54192c4a21a25da6a63390e0ae980cff88e0e8e74987a70c997a4205aa740bb6c7b60aad2dfbe4bcf595d958e SHA512 4b5d5c053b8bdad203a3440c084631fba2df79ccdb9cb0c0c41ece2af749382f4a8b2e9750cf0abff6558c91a5afed477cc1d49fd0911c913fe3d517da9faf42
-AUX bash-4.4-popd-offset-overflow.patch 1069 BLAKE2B b23ce9f427cdf252aebdf7330828074230f9b22b5bb59b712d1b148ecbf73aea78ce4e29d353198235b25fa19c4046405c8ae6eeb7fd1cf299d05b732f7cc37b SHA512 535f61b2e0c6423031520700be423750e9177ec96055be781aee5dbdd01c720c1dbc30fffa73b88464527981193c1c6a74ec4139753ef4f40a5bb0f55c4de61c
+AUX bash-4.4-popd-offset-overflow.patch 995 BLAKE2B b44284ae2fe99126d6866945dab8a229d330980786ca6322f288ac2e0b4f3be92bf36ca0e8b42d712e97be67474a9c83509dbf1d4754dd55d385d752311565cb SHA512 8ee83abda21420e2092e447abc03a6255e1386bc6cf52bf806c02c639407f79291b925923a8a4d54fb0500c521cda674861649224110d5b031dbb8cb2c1a827f
 AUX bash-4.4-set-SHOBJ_STATUS.patch 410 BLAKE2B beddcd4ea00cf6814615896e9842a607280d56086165c38338bfdc8e92922f92219f30419f47dd1bd65939f2a3e48fced612db1332a9ee357465816b4939c678 SHA512 9a723b712279e640396bdaa18f4b5ec48fcbbf253573b0aa1e2e6e2cd9200d8d8a082fb3816154aaff0dd81de2e7a66babbdd682e50e4fc2e93dfaa1af17f04d
-AUX bash-4.x-deferred-heredocs.patch 1255 BLAKE2B 944c8d5feaba6a6818fe7e20300fdd44d1e162511c1aaf272bdb4d4c382e100908c16a17e4bef622134116e153f96f61fae4d7985e58cb881012058250a2e7f5 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0
+AUX bash-4.x-deferred-heredocs.patch 1181 BLAKE2B 3afb0e6d6e9b1220133a862bc44c13a5989c4d21ab456098ee19f8dc8adfd0dfff6c83e3c42fc622487b05a33d614c08e69f400796ff6f1ee9c56c74a94f6867 SHA512 167d6344cef96f2c0e732450c3174c5cd74df822f71c415d145d531fb192fc9c684dcdff1a982b87824becd2bdbdf3fb5ab47dcaa4c7a35905b42d25ad0710aa
 AUX bash-5.0-history-append.patch 1150 BLAKE2B cc3d4c2303b37b14da2cbb3130db0c2fa65cdc7f7f8d0a4413042a898c4c48afbedcca03c9dbfc525ab191ddc2b4258fb976a28830e03490011f89a1361974b4 SHA512 9c2fb93c67a5da1e97b293db4b26469fd6813e2cfc8ffd776042529878b96312644d8dc247887d6171c89c0853d552e9f7d5d2c0b2f3d05c25c15e17e6706999
 AUX bash-5.0-syslog-history-extern.patch 376 BLAKE2B d883d3c3adbf8f4d19ecc3c2790754a7f6972682d1679b07d5bc599bdbfc019ba8ad4d1271ec550b59447db0a02f1219c9e6057a0b1c1c6c52f7750a746a07bf SHA512 c8dd17bdd8ccbd73061a7cbcb7351195e703a2c5fc6faf288ec3721fc6e526d88dd4b2201f87078a92ca134b98214ccfa935f82f585322f72e9a41fd51842b6a
 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
@@ -392,15 +392,14 @@ DIST bash50-015 2565 BLAKE2B 7df76369726332299c089db156c1e9bc6619fe2e925732da46c
 DIST bash50-016 1534 BLAKE2B 8c9bb752a441b70b11655a9bd48e48ec9756a34d0513837faa94c64675c11d57ba1fb0bfc43a033040539f9c475a0efd00f375cf8ffe04a6d9d1d1c19575572e SHA512 dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
 DIST bash50-017 6517 BLAKE2B d8ec55e796fa2b17774fdf846c7b24ab1428a1dd94210e0d6b3174f99afe7f9c7f33448e1116c81f43407cb8d95390dd634cb8bd543046699898f471ffd68433 SHA512 d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65
 DIST bash50-018 1242 BLAKE2B e5f811ede6938e3b09d2ca658dc2ff2b30d6debed4334369ddf7755992cd1c591188595465552f4b5d0ab7d2d62759ff0b4f14a07466650cde0d25778b26df7c SHA512 cfbad36b1805ad76cb21d9136843171d794e57383318a014522e2d35905cf262d6721615f0a79972cacc45152de636977c957cbbad08ccb52f96de40b09bba5c
-EBUILD bash-2.05b_p13.ebuild 4600 BLAKE2B 6bf0599ce8ce0885c9e873a512fdd5f6d6afb94ab11098adc72df89946ddb7e291597923dc1dd82ac74d2967e41a05b58caeae34f2e93db1863da30c77954b5d SHA512 a20d87b518ec64acfcebd921a433214755f4a9b278d030deaf7b1c3038013a2daab47b475f560f18c1280a41857e4f84b6d4c813b6cd7f5ced072f3d62b54a69
-EBUILD bash-3.0_p22.ebuild 4733 BLAKE2B debacfdaee9f129e5135f994473e0e135d19360ee085ab15d09e48a560713fc00e7d607af0bdb577c6b870f9c9906bab41ce2361f5c0ab940ac35b7b35a31df7 SHA512 35ce9ba9085fa6eb72f7c9aba4caf32ea95a4d337b0949efb29be4d611d34e0703d33a8b3c1872882f12ca1971cdaef0e63b6d62da3f01cc7804edd1c5cc0c4b
-EBUILD bash-3.1_p23.ebuild 4414 BLAKE2B 54f79841105ae9f31025de47be4eed9a5c823f168a0cbda35a9984231664f9a44141240825b20cbf83b13f55e4ce08febd16a1c6ad4c07268ea7a8156d87169d SHA512 b91f3cb231850c331ba22e8d68df1a235b00799dda1c0579f1bf33192dc3387b3e96e1a0ebb3f73be606748022ee8c77342707184259d0642985d565d21918ba
-EBUILD bash-3.2_p57.ebuild 4521 BLAKE2B 2d33e812093e18fb63ada4a8fe5bc287ee6a99b54d71678e9d88b0b2e8549332c80361e1f5788e644e3aa4e7eb4da71f06453fa14241f86e3bb3d38533cf008e SHA512 5c5c91352b705b340e4e5eeb506f1cd331beb001786b6a4a49c802a30f513480e9b122dcd5842d3a4141e5ce5e75ff01c30bdcb6804ae4f2b13d00cc4ad52b77
-EBUILD bash-4.0_p44.ebuild 4395 BLAKE2B 0d9d0f3ec78ebcdb3de84b35821f32706b422665d18dabd60f56ec3a2f79305a29d83198a6988b2b8ff55d0aff8f4bf6d3a3cfdb2cf769b90d09a4dd83212865 SHA512 3a6b71a0b9994feea21e680b34f1e39332f19753d7e1f158844697f98ec12456adadb8e8646555c327690785e3c9f1333593e98b37b8b1a73155e3f8a95e500e
-EBUILD bash-4.1_p17.ebuild 4129 BLAKE2B 45cdcbdb040da11e2299730d3efbca1d6321f9059589e97131f9f192e6de40cdc4ee6a55857c0763732e25be60a2b1d8361d0e4da637440231180e8729b2d1d4 SHA512 2b2a7e816906f9f09d4b7bb94b215fb8dc7d0fb911a3136fad54c2ebf9a285a31101923721ac835d43a75458e08b2d479bd9cd82cf2e1106f2b6f662804186b0
-EBUILD bash-4.2_p53.ebuild 4319 BLAKE2B 38bbc2970101a2828ed508e7e0ad4574389eeac1867dc963b8a14ddfb74f6f7395ade37b2604391c7745416f99913dec6f663ba95adc623a85157163f265522e SHA512 d11094b1734e9fd63b1bbd174c771fe3a7a48bc1c550fb2283fe4d49d490d63db173216a275840feb4dff229a874d7a80939a8af22b4780feb9e1bc8aa244a31
-EBUILD bash-4.3_p48-r2.ebuild 5617 BLAKE2B 5febb079acc827cab20644f938f9b2526fb6f478c0bbb8d9868db7bf8378fecca1216cb539f857400bcdabde08d34c159f2f32fdcb05e6c059574ca8a366ee3d SHA512 e4ade3179cbffd11e928be37b721d9d42aa29287035efbdae230ac5340173988712aeff3beca1c5a937270f9092b9ceb71589e5e41199b8608503e739c7111f9
-EBUILD bash-4.4_p23-r2.ebuild 5678 BLAKE2B 9d8b60a26838050aa18131b6967c6a196559b9521789d1a82f1ebf8dd42eb6a1ad0c4a0022c4046021aa120b7b3b9dff15c91f0b2ebd601a01d7878cc82bfa31 SHA512 608c289575ba3eeb3417c69557888b317da4b9189551db87a5e3484274201b3a4ceb5c61cec01fdfdd0374d6eb46420eec4471ef46430dfdf56475ac43ea3d35
-EBUILD bash-5.0_p17.ebuild 7303 BLAKE2B b2444276a28b999222cd9010dd59969a0f0d82b688813c93a122fed323653e5e816ca9d5b59e064f25b089732c41fa00d075f80e0b423147c08f93f736e4e75c SHA512 5c8280ff54b2c1ae1b0b16e56c898ea41bdb49cd8d2dc89806c6b878d9f43cb7a4c7d40d2793713fe21f90f0afc9613f28a0dd767824963c9893879db438e722
-EBUILD bash-5.0_p18.ebuild 7303 BLAKE2B b2444276a28b999222cd9010dd59969a0f0d82b688813c93a122fed323653e5e816ca9d5b59e064f25b089732c41fa00d075f80e0b423147c08f93f736e4e75c SHA512 5c8280ff54b2c1ae1b0b16e56c898ea41bdb49cd8d2dc89806c6b878d9f43cb7a4c7d40d2793713fe21f90f0afc9613f28a0dd767824963c9893879db438e722
+EBUILD bash-2.05b_p13.ebuild 4543 BLAKE2B 3b70f93aa3e5f59b52bab0568923a077d6fc4ec5abef0ea282a18386e2b2d85af29654060d041b8ba9cc2b568641828c81da0ea4f0455dc92f0748c4901e52ac SHA512 51baa538e499d80534cd0f91df750a21dd0c3350b69ec4903b8224fdb95c980086afb7083577cccbc91fd8695d3ba1dd4a2c556f70dafd98ab6812a3cf13b231
+EBUILD bash-3.0_p22.ebuild 4617 BLAKE2B d04481c86ae777b3bb13668fa2405aa572328a123448fc66145a6175684d1fc78c2bf9b61edcd30e041983c35d16d7c89fc1fb53489b3e2e673610be2ea5e7a2 SHA512 4e5a298caf873b57c73eb246f5ff5060a953618476fa8ad1511890140314b9462402bac42c2fd8f92ad7988d88189a36eb9ca5b368d02eed1484ef9d6c22d9dc
+EBUILD bash-3.1_p23.ebuild 4360 BLAKE2B 96ca1523842d6d754c8a488ba097090e1e98e625edf4959858aab84cac4d2a9bd9f9da1a9d427d8faa1c9fdc1e1747e78b9d8b49e1cae55824ee207423ba366f SHA512 a37842aeb9a612fc61709b8a5a7865129f5e90c4280d3f978995e2e427ac060179ece6db51dfb3363a9e02960e0ea9b0a3b1858adc92f313741879f37ca4e98f
+EBUILD bash-3.2_p57.ebuild 4453 BLAKE2B 386e7e9ce25c91baef153b1cb1d91fcfea2e17f7c6e83a12f2067bd7016efe9eb9a96cf47969326d5ab37f223da53d81c3e9d0193132db6172ddf41aa69447b7 SHA512 7b39f55c82daaa4cb88a047a6bf5ad01052e562e0f1530c64fa20371ef4ffd029cc7fea18e4b00e34685a1804ff07f1dbc1ad904c973007e8508fb7df2d194ed
+EBUILD bash-4.0_p44.ebuild 4369 BLAKE2B c9557ce8780b6f47f47ddf139345a7f9d062ff00dc71a4fec46d4d021a8d95897592dc24d4eae38c0773373353da5d5573fba04f30d67f457b56fad5d0580bb6 SHA512 90d80a8e29b87f6c94aad029297110e7e4a96e2e1698842b4ee366c3249b71db7229f2b414f8b69f93fbe8890ab03b2c0f63308c0ef04cf0fa63a79f7c07be28
+EBUILD bash-4.1_p17.ebuild 4124 BLAKE2B d17c74fda8b0a75402c8271d9e32ae05e7bca330c3bbad340b3945d6dbbcc88eb71d998efc9646e843e24cba2e1f5e04e3e5fa4000d7621dcda29c62c241d650 SHA512 fad7de090214845eb1449b1c79cb14bda73c1e1dad86d6d12d49aa437748015faa45b55438afe2bcd8a6414a04bd4cd30d9c73fb9c97acd51b4b05f9f1192940
+EBUILD bash-4.2_p53.ebuild 4307 BLAKE2B 25b0d8fedf6e27496188b6a9f6ec9a5c07777c2e2578339fbe88c6f992e29c9d35ba9d68b1cd9bbd76b7efc50c5b3e62bc541d5a29736acdd99944a7b811e506 SHA512 84b05e0ca648b0aada8bb8b0ff17f65ee95dd56651d8be9c282280bda304ac8ec40a4057e957df746a8c187cf7f4a93c6fe8dd09e7bdc1b9fee9b6f4f64f4fb8
+EBUILD bash-4.3_p48-r2.ebuild 5591 BLAKE2B b4bce2b54f7bf77f4c1a3d7590cd3935b1b8ce0d27412edb4e4a27157fee436da2370b3d5e470d6e95687db88e2e07d8be1a9b320dbdd87ac0ca9e73ab2eca0e SHA512 d290cf92a469b5d6d8b2f92822598c28233a190e78a8fb6e315b9937e0da87d2ce98c9e258aa16c6d5b663983861554391e1d56a4eafc565dd9a38053402d4ca
+EBUILD bash-4.4_p23-r2.ebuild 5701 BLAKE2B 260e42ee211a70c51beed56ba3d35b087bc9017e03a9a9dbd3440a9c4bd8edbc1147c9e9e917f7ecaef81b02486641312441aa14908aa538923781233771ca9d SHA512 81d05faecefa75068c0f6a870a1be657395090f94210ac4b3328823092cc4bb582b2fe005282e5fa0c008206b42ffefeb8ddde4ae05a436c6161a89fb42c65dc
+EBUILD bash-5.0_p18.ebuild 7326 BLAKE2B 11b8ec26218f4437c8374b38fbc9c298ddb1e89aafa63d62033168c0deae14e0dab52e9fd0744f4332d640effff1ef66629ff161037ca4cb2284b4dd9290adfd SHA512 0021573137611e44aded1226e00a492786fe26a7e0131bcc57f4be3a3ad554b660468944709a75a15a431fa9625f989430c9eeda504706f640abe8c8782f8305
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-2.05b_p13.ebuild b/app-shells/bash/bash-2.05b_p13.ebuild
index f5a44266db77..9c9eb79db32a 100644
--- a/app-shells/bash/bash-2.05b_p13.ebuild
+++ b/app-shells/bash/bash-2.05b_p13.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
 	[[ ${plevel} -eq 0 ]] && return 1
 	eval set -- {1..${plevel}}
 	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -43,7 +43,19 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.05b-destdir.patch
+	"${FILESDIR}"/autoconf-mktime-2.53.patch #220040
+	"${FILESDIR}"/${PN}-2.05b-protos.patch
+	"${FILESDIR}"/${PN}-2.05b-empty-herestring.patch
+	"${FILESDIR}"/${PN}-2.05b-rbash.patch #26854
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	"${FILESDIR}"/${PN}-2.05b-jobs.patch
+	"${FILESDIR}"/${PN}-2.05b-fix-job-warning.patch
+	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -59,28 +71,28 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 
 	# Clean out local libs so we know we use system ones
-	rm -rf lib/{readline,termcap}/*
-	touch lib/{readline,termcap}/Makefile.in # for config.status
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 
-	epatch "${FILESDIR}"/${PN}-2.05b-destdir.patch
-	epatch "${FILESDIR}"/autoconf-mktime-2.53.patch #220040
-	epatch "${FILESDIR}"/${PN}-2.05b-protos.patch
-	epatch "${FILESDIR}"/${PN}-2.05b-empty-herestring.patch
-	epatch "${FILESDIR}"/${PN}-2.05b-rbash.patch #26854
-	epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
-	epatch "${FILESDIR}"/${PN}-2.05b-jobs.patch
-	epatch "${FILESDIR}"/${PN}-2.05b-fix-job-warning.patch
-	epatch "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
-
-	epatch_user
+	default
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--with-installed-readline=.
+		--with-curses
+		$(use_with afs)
+		$(use_enable net net-redirections)
+		--disable-profiling
+		--without-gnu-malloc
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# Force pgrp synchronization
 	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
@@ -118,18 +130,7 @@ src_configure() {
 	# This old autoconf script does not re-exec itself properly and fails when
 	# /bin/sh is not bash.  Rather than try to regen everything, just force the
 	# use of bash directly.
-	CONFIG_SHELL="/bin/bash" \
-	econf \
-		--with-installed-readline=. \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		--without-gnu-malloc \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	CONFIG_SHELL="/bin/bash" econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index cfd3e4195cb0..6437d45fb536 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
 	[[ ${plevel} -eq 0 ]] && return 1
 	eval set -- {1..${plevel}}
 	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -43,7 +43,22 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/autoconf-mktime-2.53.patch #220040
+	"${FILESDIR}"/${PN}-3.0-protos.patch
+	"${FILESDIR}"/${PN}-3.0-rbash.patch #26854
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	"${FILESDIR}"/${PN}-3.0-darwin-conn.patch #79124
+	# read patch headers for more info ... many ripped from Fedora/Debian[17]/SuSe/upstream
+	"${FILESDIR}"/${PN}-3.0-{afs,crash,jobs,manpage,pwd,ulimit,histtimeformat,locale,multibyteifs,subshell,volatile-command}.patch
+	"${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch #87093
+	"${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
+	"${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch #92349
+	"${FILESDIR}"/${PN}-3.0-strnlen.patch
+	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -59,36 +74,28 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 
 	# Clean out local libs so we know we use system ones
-	rm -rf lib/{readline,termcap}/*
-	touch lib/{readline,termcap}/Makefile.in # for config.status
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 
-	epatch "${FILESDIR}"/autoconf-mktime-2.53.patch #220040
-	epatch "${FILESDIR}"/${PN}-3.0-protos.patch
-	epatch "${FILESDIR}"/${PN}-3.0-rbash.patch #26854
-	epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
-	epatch "${FILESDIR}"/${PN}-3.0-darwin-conn.patch #79124
-	# read patch headers for more info ... many ripped from Fedora/Debian[17]/SuSe/upstream
-	for i in afs crash jobs manpage pwd ulimit histtimeformat \
-	         locale multibyteifs subshell \
-	         volatile-command
-	do
-		epatch "${FILESDIR}"/${PN}-3.0-${i}.patch
-	done
-	epatch "${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch #87093
-	epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-	epatch "${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch #92349
-	epatch "${FILESDIR}"/${PN}-3.0-strnlen.patch
-	epatch "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
-
-	epatch_user
+	default
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--with-installed-readline=.
+		--with-curses
+		$(use_with afs)
+		$(use_enable net net-redirections)
+		--disable-profiling
+		--without-gnu-malloc
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# Force pgrp synchronization
 	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
@@ -123,17 +130,7 @@ src_configure() {
 	# ncurses in one or two small places :(.
 
 	tc-export AR #444070
-	econf \
-		--with-installed-readline=. \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		--without-gnu-malloc \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-3.1_p23.ebuild b/app-shells/bash/bash-3.1_p23.ebuild
index 05a7f9dd6087..ad1a7e46c428 100644
--- a/app-shells/bash/bash-3.1_p23.ebuild
+++ b/app-shells/bash/bash-3.1_p23.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
 	[[ ${plevel} -eq 0 ]] && return 1
 	eval set -- {1..${plevel}}
 	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -43,7 +43,19 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/autoconf-mktime-2.53.patch #220040
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	"${FILESDIR}"/${PN}-3.1-protos.patch
+	"${FILESDIR}"/${PN}-3.1-ulimit.patch
+	"${FILESDIR}"/${PN}-3.0-read-memleak.patch
+	"${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
+	"${FILESDIR}"/${PN}-3.1-fix-dash-login-shell.patch #118257
+	"${FILESDIR}"/${PN}-3.1-dev-fd-test-as-user.patch #131875
+	"${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -59,28 +71,28 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 
 	# Clean out local libs so we know we use system ones
-	rm -rf lib/{readline,termcap}/*
-	touch lib/{readline,termcap}/Makefile.in # for config.status
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 
-	epatch "${FILESDIR}"/autoconf-mktime-2.53.patch #220040
-	epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
-	epatch "${FILESDIR}"/${PN}-3.1-protos.patch
-	epatch "${FILESDIR}"/${PN}-3.1-ulimit.patch
-	epatch "${FILESDIR}"/${PN}-3.0-read-memleak.patch
-	epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-	epatch "${FILESDIR}"/${PN}-3.1-fix-dash-login-shell.patch #118257
-	epatch "${FILESDIR}"/${PN}-3.1-dev-fd-test-as-user.patch #131875
-	epatch "${FILESDIR}"/${PN}-3.1-dev-fd-buffer-overflow.patch #431850
-
-	epatch_user
+	default
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--with-installed-readline=.
+		--with-curses
+		$(use_with afs)
+		$(use_enable net net-redirections)
+		--disable-profiling
+		--without-gnu-malloc
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# Force pgrp synchronization
 	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
@@ -115,17 +127,7 @@ src_configure() {
 	# ncurses in one or two small places :(.
 
 	tc-export AR #444070
-	econf \
-		--with-installed-readline=. \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		--without-gnu-malloc \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-3.2_p57.ebuild b/app-shells/bash/bash-3.2_p57.ebuild
index 1c31b22879b6..f555e3f03de1 100644
--- a/app-shells/bash/bash-3.2_p57.ebuild
+++ b/app-shells/bash/bash-3.2_p57.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
 	[[ ${plevel} -eq 0 ]] && return 1
 	eval set -- {1..${plevel}}
 	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -43,7 +43,21 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/autoconf-mktime-2.59.patch #220040
+	"${FILESDIR}"/${PN}-3.2-loadables.patch
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	"${FILESDIR}"/${PN}-3.2-protos.patch
+	"${FILESDIR}"/${PN}-3.2-session-leader.patch #231775
+	"${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch #211947
+	"${FILESDIR}"/${PN}-3.2-process-subst.patch
+	"${FILESDIR}"/${PN}-3.2-ulimit.patch
+	"${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
+	"${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875
+	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -59,30 +73,28 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 
 	# Clean out local libs so we know we use system ones
-	rm -rf lib/{readline,termcap}/*
-	touch lib/{readline,termcap}/Makefile.in # for config.status
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 
-	epatch "${FILESDIR}"/autoconf-mktime-2.59.patch #220040
-	epatch "${FILESDIR}"/${PN}-3.2-loadables.patch
-	epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
-	epatch "${FILESDIR}"/${PN}-3.2-protos.patch
-	epatch "${FILESDIR}"/${PN}-3.2-session-leader.patch #231775
-	epatch "${FILESDIR}"/${PN}-3.2-ldflags-for-build.patch #211947
-	epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch
-	epatch "${FILESDIR}"/${PN}-3.2-ulimit.patch
-	epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-	epatch "${FILESDIR}"/${PN}-3.2-dev-fd-test-as-user.patch #131875
-	epatch "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
-
-	epatch_user
+	default
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--with-installed-readline=.
+		--with-curses
+		$(use_with afs)
+		$(use_enable net net-redirections)
+		--disable-profiling
+		--without-gnu-malloc
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# Force pgrp synchronization
 	# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=81653
@@ -117,17 +129,7 @@ src_configure() {
 	# ncurses in one or two small places :(.
 
 	tc-export AR #444070
-	econf \
-		--with-installed-readline=. \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		--without-gnu-malloc \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
index a3dd97b7f88c..560929519b51 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
 	[[ ${plevel} -eq 0 ]] && return 1
 	eval set -- {1..${plevel}}
 	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -43,7 +43,18 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-configure.patch #304901
+	"${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch
+
+	"${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
+	"${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
+	"${FILESDIR}"/${PN}-4.0-negative-return.patch
+	"${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613
+	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -59,28 +70,32 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 
 	# Clean out local libs so we know we use system ones
-	rm -rf lib/{readline,termcap}/*
-	touch lib/{readline,termcap}/Makefile.in # for config.status
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 
-	epatch "${FILESDIR}"/${PN}-4.0-configure.patch #304901
-	epatch "${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch
-	sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
-	epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
-	epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
-	epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch
-	epatch "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613
-	epatch "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
-	sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in #267613
-
-	epatch_user
+	default
+
+	sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c || die # needs fpurge() decl
+	sed -i '/\.o: .*shell\.h/s:$: pathnames.h:' Makefile.in || die #267613
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--with-installed-readline=.
+		--with-curses
+		$(use_with afs)
+		$(use_enable net net-redirections)
+		--disable-profiling
+		$(use_enable mem-scramble)
+		$(use_with mem-scramble bash-malloc)
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# For descriptions of these, see config-top.h
 	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
@@ -111,18 +126,7 @@ src_configure() {
 	# ncurses in one or two small places :(.
 
 	tc-export AR #444070
-	econf \
-		--with-installed-readline=. \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-4.1_p17.ebuild b/app-shells/bash/bash-4.1_p17.ebuild
index bf95280c8391..9c68ac62d283 100644
--- a/app-shells/bash/bash-4.1_p17.ebuild
+++ b/app-shells/bash/bash-4.1_p17.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
 	[[ ${plevel} -eq 0 ]] && return 1
 	eval set -- {1..${plevel}}
 	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -43,7 +43,14 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411
+
+	"${FILESDIR}"/${PN}-4.1-parallel-build.patch
+	"${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -59,23 +66,31 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 
 	# Clean out local libs so we know we use system ones
-	rm -rf lib/{readline,termcap}/*
-	touch lib/{readline,termcap}/Makefile.in # for config.status
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 
-	epatch "${FILESDIR}"/${PN}-4.1-fbsd-eaccess.patch #303411
-	sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
-	epatch "${FILESDIR}"/${PN}-4.1-parallel-build.patch
-	epatch "${FILESDIR}"/${PN}-4.2-dev-fd-buffer-overflow.patch #431850
+	default
 
-	epatch_user
+	sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c || die # needs fpurge() decl
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--with-installed-readline=.
+		--with-curses
+		$(use_with afs)
+		$(use_enable net net-redirections)
+		--disable-profiling
+		$(use_enable mem-scramble)
+		$(use_with mem-scramble bash-malloc)
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	myconf+=( --without-lispdir ) #335896
 
@@ -108,18 +123,7 @@ src_configure() {
 	# ncurses in one or two small places :(.
 
 	tc-export AR #444070
-	econf \
-		--with-installed-readline=. \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-4.2_p53.ebuild b/app-shells/bash/bash-4.2_p53.ebuild
index 000f5397f9cd..1e566e163edc 100644
--- a/app-shells/bash/bash-4.2_p53.ebuild
+++ b/app-shells/bash/bash-4.2_p53.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
 	[[ ${plevel} -eq 0 ]] && return 1
 	eval set -- {1..${plevel}}
 	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -40,12 +40,20 @@ LIB_DEPEND=">=sys-libs/ncurses-5.2-r2[static-libs(+)]
 	nls? ( virtual/libintl )
 	readline? ( >=sys-libs/readline-6.2[static-libs(+)] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-# we only need yacc when the .y files get patched (bash42-005)
 DEPEND="${RDEPEND}
-	virtual/yacc
 	static? ( ${LIB_DEPEND} )"
+# we only need yacc when the .y files get patched (bash42-005)
+BDEPEND="virtual/yacc"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
+	"${FILESDIR}"/${PN}-4.2-parallel-build.patch
+	"${FILESDIR}"/${PN}-4.2-no-readline.patch
+	"${FILESDIR}"/${PN}-4.2-read-retry.patch #447810
+	"${FILESDIR}"/${PN}-4.2-speed-up-read-N.patch
+)
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -61,28 +69,33 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 
 	# Clean out local libs so we know we use system ones
-	rm -rf lib/{readline,termcap}/*
-	touch lib/{readline,termcap}/Makefile.in # for config.status
+	rm -rf lib/{readline,termcap}/* || die
+	touch lib/{readline,termcap}/Makefile.in || die # for config.status
 	sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 
 	# Avoid regenerating docs after patches #407985
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
-	epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch
-	epatch "${FILESDIR}"/${PN}-4.2-no-readline.patch
-	epatch "${FILESDIR}"/${PN}-4.2-read-retry.patch #447810
-	epatch "${FILESDIR}"/${PN}-4.2-speed-up-read-N.patch
+	touch -r . doc/* || die
 
-	epatch_user
+	default
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--with-installed-readline=.
+		--with-curses
+		$(use_with afs)
+		$(use_enable net net-redirections)
+		--disable-profiling
+		$(use_enable mem-scramble)
+		$(use_with mem-scramble bash-malloc)
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# For descriptions of these, see config-top.h
 	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
@@ -113,18 +126,7 @@ src_configure() {
 	# ncurses in one or two small places :(.
 
 	tc-export AR #444070
-	econf \
-		--with-installed-readline=. \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
diff --git a/app-shells/bash/bash-4.3_p48-r2.ebuild b/app-shells/bash/bash-4.3_p48-r2.ebuild
index 97bf26b8e8fc..d535737ea7ee 100644
--- a/app-shells/bash/bash-4.3_p48-r2.ebuild
+++ b/app-shells/bash/bash-4.3_p48-r2.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit flag-o-matic toolchain-funcs multilib
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
 	[[ ${plevel} -eq 0 ]] && return 1
 	eval set -- {1..${plevel}}
 	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -46,7 +46,7 @@ DEPEND=">=sys-libs/ncurses-5.2-r2:0=
 RDEPEND="${DEPEND}
 	!<sys-apps/portage-2.1.6.7_p1"
 # we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
+BDEPEND="virtual/yacc"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
@@ -55,7 +55,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.4-popd-offset-overflow.patch #600174
 )
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
@@ -75,26 +75,36 @@ src_unpack() {
 
 src_prepare() {
 	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 
 	# Clean out local libs so we know we use system ones w/releases.
 	if [[ ${PV} != *_rc* ]] ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
 		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 	fi
 
 	# Avoid regenerating docs after patches #407985
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
+	touch -r . doc/* || die
 
-	epatch "${PATCHES[@]}"
-
-	epatch_user
+	default
 }
 
 src_configure() {
-	local myconf=()
+	local myconf=(
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-curses
+		$(use_with afs)
+		$(use_enable net net-redirections)
+		--disable-profiling
+		$(use_enable mem-scramble)
+		$(use_with mem-scramble bash-malloc)
+		$(use_enable readline)
+		$(use_enable readline history)
+		$(use_enable readline bang-history)
+	)
 
 	# For descriptions of these, see config-top.h
 	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
@@ -145,19 +155,7 @@ src_configure() {
 			configure || die
 	fi
 	tc-export AR #444070
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--htmldir='$(docdir)/html' \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_compile() {
diff --git a/app-shells/bash/bash-4.4_p23-r2.ebuild b/app-shells/bash/bash-4.4_p23-r2.ebuild
index 645851b12aff..518e64ef49f9 100644
--- a/app-shells/bash/bash-4.4_p23-r2.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r2.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
+inherit flag-o-matic toolchain-funcs multilib prefix
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 is_release() {
 	case ${PV} in
 	*_alpha*|*_beta*|*_rc*) return 1 ;;
@@ -19,7 +19,7 @@ is_release() {
 }
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
 	[[ ${plevel} -eq 0 ]] && return 1
 	eval set -- {1..${plevel}}
 	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -58,7 +58,7 @@ RDEPEND="
 	${DEPEND}
 "
 # we only need yacc when the .y files get patched (bash42-005)
-#DEPEND+=" virtual/yacc"
+#BDEPEND="virtual/yacc"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -87,8 +87,8 @@ src_prepare() {
 
 	# Clean out local libs so we know we use system ones w/releases.
 	if is_release ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
 		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 	fi
 
@@ -97,7 +97,7 @@ src_prepare() {
 
 	# Avoid regenerating docs after patches #407985
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
+	touch -r . doc/* || die
 
 	eapply_user
 }
diff --git a/app-shells/bash/bash-5.0_p17.ebuild b/app-shells/bash/bash-5.0_p17.ebuild
deleted file mode 100644
index c40437fdc3a0..000000000000
--- a/app-shells/bash/bash-5.0_p17.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-is_release() {
-	case ${PV} in
-	*_alpha*|*_beta*|*_rc*) return 1 ;;
-	*) return 0 ;;
-	esac
-}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="8.0"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-if is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-else
-	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-"
-RDEPEND="
-	${DEPEND}
-"
-# we only need yacc when the .y files get patched (bash42-005)
-#DEPEND+=" virtual/yacc"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Patches from Chet sent to bashbug ml
-	"${FILESDIR}"/${PN}-5.0-history-append.patch
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-)
-
-pkg_setup() {
-	if is-flag -malign-double ; then #7332
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if is_release ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
-		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-	fi
-
-	# Prefixify hardcoded path names. No-op for non-prefix.
-	hprefixify pathnames.h.in
-
-	# Avoid regenerating docs after patches #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--disable-profiling
-		--with-curses
-		$(use_enable mem-scramble)
-		$(use_enable net net-redirections)
-		$(use_enable readline)
-		$(use_enable readline bang-history)
-		$(use_enable readline history)
-		$(use_with afs)
-		$(use_with mem-scramble bash-malloc)
-	)
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=${READLINE_VER%%_*}
-
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses.  For the most part, ncurses
-	# is here because readline needs it.  But bash itself calls
-	# ncurses in one or two small places :(.
-
-	if is_release ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-	tc-export AR #444070
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
-	keepdir /etc/bash/bashrc.d
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-	if ! use readline ; then
-		sed_args+=( #432338
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			docinto ${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					dodoc ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp=$(emktemp "${EROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild
index c40437fdc3a0..37017ab29296 100644
--- a/app-shells/bash/bash-5.0_p18.ebuild
+++ b/app-shells/bash/bash-5.0_p18.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs multilib prefix
+inherit flag-o-matic toolchain-funcs multilib prefix
 
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
 is_release() {
 	case ${PV} in
 	*_alpha*|*_beta*|*_rc*) return 1 ;;
@@ -19,7 +19,7 @@ is_release() {
 }
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	local opt=${1} plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
 	[[ ${plevel} -eq 0 ]] && return 1
 	eval set -- {1..${plevel}}
 	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
@@ -58,7 +58,7 @@ RDEPEND="
 	${DEPEND}
 "
 # we only need yacc when the .y files get patched (bash42-005)
-#DEPEND+=" virtual/yacc"
+#BDEPEND="virtual/yacc"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -90,8 +90,8 @@ src_prepare() {
 
 	# Clean out local libs so we know we use system ones w/releases.
 	if is_release ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
 		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 	fi
 
@@ -100,7 +100,7 @@ src_prepare() {
 
 	# Avoid regenerating docs after patches #407985
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
+	touch -r . doc/* || die
 
 	eapply -p0 "${PATCHES[@]}"
 	eapply_user
diff --git a/app-shells/bash/files/autoconf-mktime-2.59.patch b/app-shells/bash/files/autoconf-mktime-2.59.patch
index 3ac3ad1da867..33055a7be61a 100644
--- a/app-shells/bash/files/autoconf-mktime-2.59.patch
+++ b/app-shells/bash/files/autoconf-mktime-2.59.patch
@@ -1,6 +1,6 @@
 http://bugs.gentoo.org/220040
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -5299,26 +6059,25 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
diff --git a/app-shells/bash/files/bash-3.0-crash.patch b/app-shells/bash/files/bash-3.0-crash.patch
index 984e85d82ed3..38577e2a67ea 100644
--- a/app-shells/bash/files/bash-3.0-crash.patch
+++ b/app-shells/bash/files/bash-3.0-crash.patch
@@ -14,8 +14,8 @@
 
 Thanks for the report.  Here's a quick fix:
 
-*** arrayfunc.c~	Sat Nov  6 15:08:29 2004
---- arrayfunc.c	Mon Jan 31 11:56:21 2005
+*** a/arrayfunc.c
+--- b/arrayfunc.c
 ***************
 *** 709,713 ****
   	  return ((char *)NULL);
diff --git a/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch b/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
index 35b0b7d05924..46df6213b7a4 100644
--- a/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
+++ b/app-shells/bash/files/bash-3.0-pgrp-pipe-fix.patch
@@ -6,8 +6,8 @@ http://bugs.gentoo.org/92349
 
 Patch from upstream
 
-*** jobs.c  Wed Sep  8 11:08:16 2004
---- jobs.c      Thu Jun 30 17:21:26 2005
+*** a/jobs.c
+--- b/jobs.c
 ***************
 *** 3456,3459 ****
 --- 3901,3907 ----
diff --git a/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch b/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
index 466e45ae3004..0b90cc3dc2b2 100644
--- a/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
+++ b/app-shells/bash/files/bash-3.0-read-builtin-pipe.patch
@@ -7,8 +7,8 @@ http://lists.gnu.org/archive/html/bug-bash/2005-03/msg00168.html
 http://lists.gnu.org/archive/html/bug-bash/2005-03/msg00173.html
 http://bugs.gentoo.org/show_bug.cgi?id=87093
 
---- builtins/read.def
-+++ builtins/read.def
+--- a/builtins/read.def
++++ b/builtins/read.def
 @@ -276,7 +276,7 @@
    input_is_tty = isatty (fd);
    if (input_is_tty == 0)
diff --git a/app-shells/bash/files/bash-3.0-trap-fg-signals.patch b/app-shells/bash/files/bash-3.0-trap-fg-signals.patch
index cde18326ed2d..c7010511853f 100644
--- a/app-shells/bash/files/bash-3.0-trap-fg-signals.patch
+++ b/app-shells/bash/files/bash-3.0-trap-fg-signals.patch
@@ -2,8 +2,8 @@ Don't barf on handled signals inside of scripts.  Makes for nicer output.
 
 patch by Martin Schlemmer <azarah@gentoo.org>
 
---- jobs.c
-+++ jobs.c
+--- a/jobs.c
++++ b/jobs.c
 @@ -2893,11 +2893,11 @@
  		}
  	      else if (IS_FOREGROUND (job))
diff --git a/app-shells/bash/files/bash-3.0-volatile-command.patch b/app-shells/bash/files/bash-3.0-volatile-command.patch
index 8b89b35914b1..87b9f25ffc21 100644
--- a/app-shells/bash/files/bash-3.0-volatile-command.patch
+++ b/app-shells/bash/files/bash-3.0-volatile-command.patch
@@ -4,8 +4,8 @@ Ripped from Debian
 #     being optimized away as dead code.  In reality, the use of setjmp/longjmp
 #     makes it not dead code at all.
 
---- eval.old	2003-12-18 23:44:15.000000000 -0500
-+++ eval.c	2005-10-03 01:59:31.000000000 -0400
+--- a/eval.c
++++ b/eval.c
 @@ -63,7 +63,7 @@
  reader_loop ()
  {
diff --git a/app-shells/bash/files/bash-3.1-ulimit.patch b/app-shells/bash/files/bash-3.1-ulimit.patch
index 432fb54966b8..8c2474825cf1 100644
--- a/app-shells/bash/files/bash-3.1-ulimit.patch
+++ b/app-shells/bash/files/bash-3.1-ulimit.patch
@@ -3,8 +3,8 @@ Ripped from Fedora
 Add support for RLIMIT_NICE/RLIMIT_RTPRIO and add missing documentation
 for many other options
 
---- builtins/ulimit.def
-+++ builtins/ulimit.def
+--- a/builtins/ulimit.def
++++ b/builtins/ulimit.def
 @@ -24,7 +24,7 @@
  $BUILTIN ulimit
  $FUNCTION ulimit_builtin
@@ -58,8 +58,8 @@ for many other options
  #ifdef RLIMIT_STACK
    { 's',	RLIMIT_STACK, 1024,	"stack size",		"kbytes" },
  #endif
---- doc/bashref.texi
-+++ doc/bashref.texi
+--- a/doc/bashref.texi
++++ b/doc/bashref.texi
 @@ -3833,7 +3833,7 @@
  @item ulimit
  @btindex ulimit
@@ -89,8 +89,8 @@ for many other options
  @item -s
  The maximum stack size.
  
---- doc/bash.1
-+++ doc/bash.1
+--- a/doc/bash.1
++++ b/doc/bash.1
 @@ -8490,7 +8490,7 @@
  returns true if any of the arguments are found, false if
  none are found.
diff --git a/app-shells/bash/files/bash-3.2-process-subst.patch b/app-shells/bash/files/bash-3.2-process-subst.patch
index bd0b3f4e1792..94877c62b316 100644
--- a/app-shells/bash/files/bash-3.2-process-subst.patch
+++ b/app-shells/bash/files/bash-3.2-process-subst.patch
@@ -1,7 +1,7 @@
 Fix process substitution on BSD
 
---- execute_cmd.c
-+++ execute_cmd.c
+--- a/execute_cmd.c
++++ b/execute_cmd.c
 @@ -2672,6 +2672,7 @@
  
  	  do_piping (pipe_in, pipe_out);
diff --git a/app-shells/bash/files/bash-3.2-session-leader.patch b/app-shells/bash/files/bash-3.2-session-leader.patch
index 82f7d9806333..2e9286f34d40 100644
--- a/app-shells/bash/files/bash-3.2-session-leader.patch
+++ b/app-shells/bash/files/bash-3.2-session-leader.patch
@@ -7,8 +7,8 @@ condition.  A result is that the child can then not then execute some commands
 (like stty) from its init script (e.g. .bashrc).  The result I (and others)
 have seen is that the bash shell will hang while reading the init script.
 
-*** jobs.c.20080704	2008-07-10 15:14:13.000000000 -0400
---- jobs.c	2008-07-10 15:17:59.000000000 -0400
+*** a/jobs.c
+--- b/jobs.c
 ***************
 *** 266,269 ****
 --- 266,270 ----
diff --git a/app-shells/bash/files/bash-3.2-ulimit.patch b/app-shells/bash/files/bash-3.2-ulimit.patch
index a0975cb6e9a8..19ea7e6e5e33 100644
--- a/app-shells/bash/files/bash-3.2-ulimit.patch
+++ b/app-shells/bash/files/bash-3.2-ulimit.patch
@@ -1,7 +1,7 @@
 add missing docs for -e and -r options
 
---- builtins/ulimit.def
-+++ builtins/ulimit.def
+--- a/builtins/ulimit.def
++++ b/builtins/ulimit.def
 @@ -24,7 +24,7 @@
  $BUILTIN ulimit
  $FUNCTION ulimit_builtin
diff --git a/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch b/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
index 576a8a47a619..3c5b5dd98d9b 100644
--- a/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
+++ b/app-shells/bash/files/bash-4.1-fbsd-eaccess.patch
@@ -4,8 +4,8 @@ executable files when run by root on FreeBSD.
 See http://bugs.gentoo.org/303411
 
 Patch from Johan Hattne <johan.hattne@utsuthwestern.edu>
---- lib/sh/eaccess.c.orig
-+++ lib/sh/eaccess.c
+--- a/lib/sh/eaccess.c.orig
++++ b/lib/sh/eaccess.c
 @@ -198,11 +198,19 @@
       char *path;
       int mode;
diff --git a/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch b/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch
index bef960ab980c..d50c269b7e71 100644
--- a/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch
+++ b/app-shells/bash/files/bash-4.2-dev-fd-buffer-overflow.patch
@@ -20,8 +20,8 @@ buffer to avoid buffer overflow.
 
 Patch (apply with `patch -p0'):
 
-*** ../bash-4.2-patched/lib/sh/eaccess.c	2011-01-08 20:50:10.000000000 -0500
---- lib/sh/eaccess.c	2012-06-04 21:06:43.000000000 -0400
+*** bash-4.2/lib/sh/eaccess.c
+--- bash-4.2/lib/sh/eaccess.c
 ***************
 *** 83,86 ****
 --- 83,88 ----
diff --git a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch b/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
index c6ef19d03f5a..cc6b622eca34 100644
--- a/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
+++ b/app-shells/bash/files/bash-4.4-popd-offset-overflow.patch
@@ -1,8 +1,8 @@
 https://bugs.gentoo.org/600174
 https://lists.gnu.org/archive/html/bug-bash/2016-11/msg00099.html
 
-*** ../bash-4.4-patched/builtins/pushd.def	2016-01-25 13:31:49.000000000 -0500
---- builtins/pushd.def	2016-10-28 10:46:49.000000000 -0400
+*** bash-4.4/builtins/pushd.def
+--- bash-4.4/builtins/pushd.def
 ***************
 *** 366,370 ****
       }
diff --git a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch b/app-shells/bash/files/bash-4.x-deferred-heredocs.patch
index 698d277a3db5..c6a6de44d36d 100644
--- a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch
+++ b/app-shells/bash/files/bash-4.x-deferred-heredocs.patch
@@ -3,8 +3,8 @@ http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html
 
 fix heredocs handling in `set` output
 
-*** ../bash-4.1-patched/print_cmd.c	2009-09-16 15:32:26.000000000 -0400
---- print_cmd.c	2010-03-22 21:15:30.000000000 -0400
+*** bash-4.1/print_cmd.c
+--- bash-4.1/print_cmd.c
 ***************
 *** 114,117 ****
 --- 114,123 ----
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index c10e4582fb8e..a14ddc199dc5 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,5 +1,5 @@
 DIST dash-0.5.11.1.tar.gz 244439 BLAKE2B 88f877954aca739621133fadd32cf8bf1ca5d334ef212da622501b1235caee3a91e9b8b481c7a45f3fb6d6eee1036c2e0f1fd387638c910eff90e8e0a1eaa419 SHA512 6403ac793c87c9101bd5f3b2df74200ce1a992d0c432aa79375d4479b87c83279f303239af5080728c8a64ef4520e39fe8f0f1e037a0a38ffce1e4dd057d9c72
 DIST dash-0.5.11.2.tar.gz 244475 BLAKE2B 4edc85a70af62684b29fec7fd9c599aaade38ffcfb62b873dd149c4ada9e750f24cddf9a390c512313bc7dde67cab3d7b57776c92fe5f8e08bf8bdc164a4e5ec SHA512 2f846c26f3722ea3315aae73461f9c21a0a8a9ac712e1caf8dd9993e34729227c7648bf6f72fad8488247986e560298f95aa2411bd4e395410565c0b527b9db4
 EBUILD dash-0.5.11.1.ebuild 1521 BLAKE2B 4c5f48602cf369d52316295260aee45ae5a7fcfcc83d4323db37b97dc1c040601a8cd5a52b9bae1c60f4f6f89d8294a56c73344d18a6b09a16db4e2dd7867863 SHA512 dca19866abb5ecee64b869e36a588b9b96a5304753fc8cffe556559b4823549b4816fd6a59d019829a187b4a1c9ea5108b970a503a8cf304a09d081b8c1f3abe
-EBUILD dash-0.5.11.2.ebuild 1529 BLAKE2B 024ab6c9362510e03778238a95f3ec21d3d19211258aff8f14d9d6bf15436689b39cc73543e068e687fd0ff9f4390611c4e6b01de497a31d8ff6b42ea80297e9 SHA512 74cc3b72b2d6179d20caa9d8a2bc0341a9428944caaafb366ccd770946555b9f9a746831212a3a35a99166e6e6af9b5f7315b29861e0ed0334fb80d57510120c
+EBUILD dash-0.5.11.2.ebuild 1581 BLAKE2B 243f8799b9d9880dc5c509c7e6cb46118dda935ca3de82ff1719df58bd543a1a8c568984e60e6a5ff7fcc90913e7bc65ced4a8fc4eb2af689c8a1c431ec21c14 SHA512 0aea111fb42467fdd55f154901ffa0e6de882c636922f6dd5f0a4ce88b0bfdb538be1657f2bc3f6080fe1f681003427aa7d262bbc09340e7228c4d306fec3278
 MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd
diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild
index 9482c8379d58..1d6d3b324589 100644
--- a/app-shells/dash/dash-0.5.11.2.ebuild
+++ b/app-shells/dash/dash-0.5.11.2.ebuild
@@ -32,9 +32,10 @@ src_prepare() {
 }
 
 src_configure() {
-	# don't redefine stat on Solaris
 	if [[ ${CHOST} == *-solaris* ]] ; then
+		# don't redefine stat, open, dirent, etc. on Solaris
 		export ac_cv_func_stat64=yes
+		export ac_cv_func_open64=yes
 
 		# if your headers strictly adhere to POSIX, you'll need this too
 		[[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
diff --git a/app-shells/powerline/Manifest b/app-shells/powerline/Manifest
index 374971973787..ba920f4cadd7 100644
--- a/app-shells/powerline/Manifest
+++ b/app-shells/powerline/Manifest
@@ -1,5 +1,6 @@
 AUX 2.7-ldflags.patch 837 BLAKE2B a1a873a898f3090dab586b968a755e1920ab20158237b9f375a9da2df18d87ba0b3cdf2f671a02ec3163f1ee95436a0c0537b2f7fccc0f8326f1fe25fdcc73c3 SHA512 85872900eeb44e46685b9a229bddd569d06d131ba4c187b44ee916a8ae1e705e10a47b87432c36d855021a0e0e3880c5fe80279a9694ac42f473a06ef3a33565
 DIST powerline-status-2.7.tar.gz 233726 BLAKE2B fc7b7d6aa5d8e050af07aeee0aa0b7f6f01b7483ea910b87a7027cd55f726d42e41a008feb07429b21ebbd890b12eb56581b8e47fc30a58de6b902bf14d999cb SHA512 053ab74d250b7d835a5f8ec9cb7da4e890f0f50d31be9bab4b393a85e087a6fc010e58d6b3fa530cf39c10671345d032ca1fa9c0f7887a89fea8a4e69b7f1517
 EBUILD powerline-2.7-r1.ebuild 743 BLAKE2B bd93e5352b00bd1bd73db6e5dc7d6ee85e0f4d30ec05e7b62d54ef79d7ba368a8d560b2d008cb6476716f19133614aea9a6eaf52ec3cd6aa126462c87d4a5bbd SHA512 c967665b40de94391df7a9e33cc20371fc7d2146865d63ec6c9bbb4a6ca0441e8bf16fd09aed8ff28451821471df7853aa8f3a21c3aaf6e4fd74a6abe49757a4
+EBUILD powerline-2.7-r2.ebuild 745 BLAKE2B 1bbe903317cd5777cf3fd949d996e1d5c91fadf4162df2bdd500330ae30a78363a066dd434fdd3e1286723d967128e5d9fc96d7f4c578daea6cbded150d7c871 SHA512 a94f981b1459f581a012cb4fa707a60ac17dd230ed39368fa1387cc91b9227042523c21f39adc5bd560e173ab3765e0ade11677f7a92706e5a4fe7440e0be7da
 EBUILD powerline-9999.ebuild 730 BLAKE2B 5d75497b2323d373e00df5deabaa205d6286363f4181f409e8cecaf614b0bb7ed4c3b624b61fe54f5d94c27307cdf97bd69109e8ba508b62e76a1c9693428bdf SHA512 c08cdb58cc2b88a88860eefdcc03a7894b4bf2765ff0ed23cf257c36c4436e8153ed336838c13035e21334c7571452bb48f4d098b60047100a4add9fd88b1a34
 MISC metadata.xml 620 BLAKE2B 3c392d83a62425429cc89d0ac8dff925d98a392aa1d84bc0c7e84dd2871ded1566b0b66afe34b201672a51b23650cc2e18320c5e4e98b4b5042099340cae4b56 SHA512 10f3ce6affeed34d2b48a922a64eb2b1b1a628ed9d5e9a78f92eec3b264d633ce75b09e83e2cc3deae074ac27cd9f1bd2adcdb5f77e8deacdcd876d849977f60
diff --git a/app-shells/powerline/powerline-2.7-r2.ebuild b/app-shells/powerline/powerline-2.7-r2.ebuild
new file mode 100644
index 000000000000..27ced1c237a2
--- /dev/null
+++ b/app-shells/powerline/powerline-2.7-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="The ultimate statusline/prompt utility."
+HOMEPAGE="https://github.com/powerline/powerline"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/powerline/powerline"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}-status/${PN}-status-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+S="${WORKDIR}/${PN}-status-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/2.7-ldflags.patch
+)
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
index d0bb576cfd97..09e9aaaa1006 100644
--- a/app-shells/quoter/Manifest
+++ b/app-shells/quoter/Manifest
@@ -1,5 +1,5 @@
 DIST quoter-3.0_p2.tar.gz 10691 BLAKE2B 2fb196977c5c16654813e6077c148577e4629da25fb1aaf2131c19e33fbfbc670ad4d9af87611405f0b45a1365bc7b4b3f1b8cad47573ffae4939cc0329d50a4 SHA512 23d77105fa05d79a7d0bcaa3f6aead25b7cb3b6f459d2740314616da587e03cd3e6b0b1e8af8f79904309bbe76603db848d42996ed7ae5ef779e27184a434fb5
 DIST quoter-4.2.tar.gz 11128 BLAKE2B 6b13a8eabae57c50c12dcbf9a65e28990ee6d74ee2c45c4a6127f5ed98c2ae029fd5d00f82444c46ab6a21057c6279e9f3d19c432f921d04ca3bf3eaa9507cb0 SHA512 0080ae6d5f5308b9e2f9e414619049f10246c221a9524f9f0dc0d329af3592694ae9d6ef6a086615b895c5f6598fbed7ec7164b5a847d11108fbe3687316c02d
 EBUILD quoter-3.0_p2-r1.ebuild 759 BLAKE2B 834746ed908c95f45f09c08e4a93a1e0a054b606628f79a10a48be823660cc73ff2f4157d51438ffb2ac92f6e0fb48559db69025832a994029448b6e6816973d SHA512 8da8ce840b416bfa2ce03e653e33d0ca06dec49b6a43016ef69a164c95b1ac54650e6e4b88432e888536b8e2a2b27c2620dd4dfd5219f028460e7b979051c447
-EBUILD quoter-4.2.ebuild 768 BLAKE2B d8824eb44ad83bdcc0630f983f7b2db41af9769c950effd75544dfa492782abe4f3ed02e8ccf7acf5cff69ca4b506c531bcf0391d399fd3fbcba73c7aa8306cb SHA512 0d71a65f004e0de0f8d4d7d614417d80eb9daae4c3fbcdd6fca78dc19a8cd75ef73e915de5dd5c41670accbe7d74fe299b5d5b57096ec237d0a076d1c050ee13
+EBUILD quoter-4.2.ebuild 760 BLAKE2B f42451c8e5f1bf953ef42d36a75c383d04b2286917568677664233471e79b11c57a3fd8752b5e33576ec1d743ea3a86c6bf6ae0ae8fae5c9d424af2a28f2cc1b SHA512 4115e6b4d9b2a2ea6eb0966cdc8d6639dc9ae9b7d861547d29ff91e62f9d63c8d7c76f4d49e410ea5a796ace7e9035538d563b22f36afaf1c8cfc6ec3787589b
 MISC metadata.xml 700 BLAKE2B 6dc4829d807dbc1ed2a511689c3fbe3ceb322236525770a55c86ddb3956bf974a58dedc1c0a7ff74b936e76c8729e1e2463ee0a51ac9e51ac89472a28dcee63f SHA512 c3cda33bc2aedb177d4734ad02cb2dbe0b2d52bc73406ee5277b7db57ff73c047cc174514c516ba3486c1ad5d93d414f77d2655c9cbff9de1820effac312a284
diff --git a/app-shells/quoter/quoter-4.2.ebuild b/app-shells/quoter/quoter-4.2.ebuild
index 71913b702e01..88f395fbbcf9 100644
--- a/app-shells/quoter/quoter-4.2.ebuild
+++ b/app-shells/quoter/quoter-4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 
 src_configure() {
 	tc-export CC
diff --git a/app-shells/squirrelsh/Manifest b/app-shells/squirrelsh/Manifest
index 6824db201d24..6f636fdea837 100644
--- a/app-shells/squirrelsh/Manifest
+++ b/app-shells/squirrelsh/Manifest
@@ -5,5 +5,5 @@ AUX squirrelsh-no-strip.patch 903 BLAKE2B cefa3bb32d03e26f9aba808fcdfd9d8c7a7d2c
 AUX squirrelsh-remove-forced-abi.patch 653 BLAKE2B 92710dce7c0375d8a2a5a9cde5300f9d7630a9296e82a2c7b15311f1298615e85a974af9fa77def60ef2a0e966e00decc5e4ac236f6c1e4257f1e4241277c85f SHA512 6e2b43c7ecff32fda8e2655722f97f48a0a92f6fe5e1e3aeb28bc3b5459fccefa3aa4c04aca016001661af229c59982caf7b09209d7004c2dd397493c873cd50
 AUX squirrelsh-rename-LDFLAGS.patch 4981 BLAKE2B 405bf56a8dec4ac1c0e62d3cbdc4c3b6fbcd38b443304607b42f85132e22ebb79211939fa651271db56702b7de5b0f46515f38ea57ed43b048fad14aeee6bb6b SHA512 eb8058878bd23332dd58970caac5121838bd52b7a63249013b305b09a95a1ca5914a526e4d0d052772f32086d1e2237feae56bfc4549987e71a6db60ffff6cd3
 DIST squirrelsh-1.2.7-src.tar.bz2 673462 BLAKE2B a2e6a1e0c3e3c5eeb329ec33596514e09657439723d34069b66b744f525318d237d15e951bf4c8fe364d50091cd8dcb2d25cae837ebdfd5a219c0bab20d1adce SHA512 7db82cad969ba209cae6b2d1c4cf76ba10acbf79c051f4340556ae81dc98d36dfb6f1f6993e9198e5a5254eaaab3fbaca3d01fc547c2f303572060b2093af78a
-EBUILD squirrelsh-1.2.7.ebuild 1236 BLAKE2B 50b41fd9d2258fe2672e337fece7f91ace21268f9bc6e153103a921ca1f37e286f192d5937aeadadc01e959a2db7de265774d43bbf2805acef6eb81ca808968f SHA512 9896f2d4d7c3c0a3af6e65c86173a242064e96612dcd67b615ef5d60af5fe6b519ceedf0ee6fd509aa6b2a95245df12e7b907616541713731bbd4b2bc5d62e6f
+EBUILD squirrelsh-1.2.7.ebuild 1167 BLAKE2B ba7db136e263b1bfb66376490a8202f35ee61284d1600f4c7b2cb60a3f4fc8e927402ec11622f4e8d08f8b731720a51b0f1083d7bc409b0260941ab0e64cba90 SHA512 58aece63e60420b1561ca26e154a09ebdeb745eb83d7ec48ba3beb67097d9edc3f917b4bcdd3e49645a8b63a8eaeaa84dc8a82cc4539d2724cd56b38dbf3c0d0
 MISC metadata.xml 332 BLAKE2B 6464cdd0e8725292d93f94ecb29a117c1f8e142d12cc1b12c41b2b3677dd1a124fad1131f5827b26af08b67179df50f515bfc4f18ccb9aac15dfe3f801d7ba06 SHA512 31dc8fbee7db81a55b9a4256dfa391404218cc076c63b72e7a980649207cc2d2716b5652f90c639270b8f1ce634724dfd3103bb7a08698b6c089f2d98100fcdb
diff --git a/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild b/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild
index 9e5aaceff7b0..fd133167dcdd 100644
--- a/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild
+++ b/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Cross-platform object-oriented scripting shell using the squirrel language"
 HOMEPAGE="http://squirrelsh.sourceforge.net/"
@@ -18,14 +18,14 @@ RDEPEND="dev-libs/libpcre"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-rename-LDFLAGS.patch
-	epatch "${FILESDIR}"/${PN}-no-strip.patch
-	epatch "${FILESDIR}"/${PN}-fix-in_LDFLAGS.patch
-	epatch "${FILESDIR}"/${PN}-remove-forced-abi.patch
-	epatch "${FILESDIR}"/${PN}-no-docs.patch
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-rename-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-no-strip.patch
+	"${FILESDIR}"/${PN}-fix-in_LDFLAGS.patch
+	"${FILESDIR}"/${PN}-remove-forced-abi.patch
+	"${FILESDIR}"/${PN}-no-docs.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
 
 src_configure() {
 	#This package uses a custom written configure script
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 1cd64ae57454..eb441b62ad95 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 01d1945bea97..54e21b83c684 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,3 +1,5 @@
+AUX atril-1.24.0-make-synctex-optional.patch 16815 BLAKE2B 13c65b9dbf1afa43aa32d147462c90dbad94366b1795b1409746cde2991180a3b2a3266908469b2ff5a4b3107b457ae86a3cb3bc058384877f885a512fabab2d SHA512 cb4493eca4e0bc1bd4a9bdd4540033aad3318023f6101f5548c14c7c7134ce6a4618849df44573af39af7d561ebca4b9b549668e81c50c7432a525db7d0f620b
 DIST atril-1.24.0.tar.xz 2062468 BLAKE2B 374c7769f5c9753b1d9a6143c796a317914aebbb638b6f0a85b732b43b0e9ad2fff1374a5f3f4dc1abc8c265ce003bfef2cddc47cdb18ddc7f24c4905ef5232c SHA512 dfdd5ed82ba76c4f0a446a95b0a6201bedf8b4d00ff46ce697a5b937251f6d7a1888ca76eef623eb84dcddb425c7ad662e179f593686bba064b7491d4d940293
 EBUILD atril-1.24.0-r1.ebuild 2253 BLAKE2B ae262b9f622fbbd916898c936e83d5411501596bd4b1c36ddf057ae4a25aca707f6f4eb7ea8a56ffd3662e9db0b46aaafde49e879ddbd32b67eaeee5871b4de0 SHA512 c76e3f3ebcb797648ee2290e6adcd5920c5a55e01b8f529ca3c58a9b4132baa388bb4aceaadd8e2322821b0cf0f135e1950de096f6b6681299c65cf4a145440f
-MISC metadata.xml 782 BLAKE2B f87378442b88dfae4c1b06d6bfc3f3d13770271bb0c589ad37965325bdc0ac13cdbea3dc18fb41d48339a078c2d11c0adfa78a88da9216356c79fece0f5f39d9 SHA512 d3c0b43a5957c49d606b8eafd71ec8a0ef3e428e1953a0e8172c633bede7c9e1d468cf61eecb2f6cd980ff64ab02faf16c9501351ccebbc64175af9fb9b32477
+EBUILD atril-1.24.0-r2.ebuild 2933 BLAKE2B 3a0b1a54743998e9f881227a83350cd4f8e01e4d8295dbcd10f812e83c60e2d4dbd330353fd17c8e2cb082d5006f9a441ee9ce5b98d3329ac10ac5f5e6961a04 SHA512 2d86e498774025b1b9949069808c1dab18d3d0845723e4ba5488fda6e48be22a39c9d438c0559a2513ee8a4db72ca910bae846985641c26dce2855dc63157c43
+MISC metadata.xml 887 BLAKE2B 38b14cf53af3c9728f59bc846fe8664092c545703fe542b9264f20aa867e26186c2a0ade2910c8f9040d33f1f882af5b00fb85b181e9a5ddcae92aa0732f385d SHA512 dbf93874246a0f8da95bf6b80968211b58e15c9d14ceddf7bafcee7f073be9d1eedbf0203c796411b2be38d651b110903501dda4a0ee7a1fb6429d1b3d926934
diff --git a/app-text/atril/atril-1.24.0-r2.ebuild b/app-text/atril/atril-1.24.0-r2.ebuild
new file mode 100644
index 000000000000..6947e34b8f30
--- /dev/null
+++ b/app-text/atril/atril-1.24.0-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit mate python-any-r1 virtualx
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript synctex t1lib test tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.22[cairo]
+	dev-libs/atk
+	>=dev-libs/glib-2.62:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libICE
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11
+	>=x11-libs/cairo-1.14
+	x11-libs/pango
+	caja? ( >=mate-base/caja-1.17.1[introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? (
+		dev-libs/mathjax
+		>=net-libs/webkit-gtk-2.6.0:4
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2 )
+	synctex? ( virtual/tex-base )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.1 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!!app-text/mate-document-viewer
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian
+	app-text/yelp-tools
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+#RESTRICT="!test? ( test )"
+# Tests use dogtail and require using accessibility services.
+# Until we figure out how to run successfully, don't run tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-1.24.0-make-synctex-optional.patch" )
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	mate_src_configure \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable synctex) \
+		$(use_enable t1lib) \
+		$(use_enable test tests) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
+
+src_test() {
+	export GSETTINGS_BACKEND=keyfile
+	gsettings set org.gnome.desktop.interface toolkit-accessibility true || die
+	gsettings set org.mate.interface accessibility true || die
+	virtx emake check
+}
diff --git a/app-text/atril/files/atril-1.24.0-make-synctex-optional.patch b/app-text/atril/files/atril-1.24.0-make-synctex-optional.patch
new file mode 100644
index 000000000000..7b2d3a9c372e
--- /dev/null
+++ b/app-text/atril/files/atril-1.24.0-make-synctex-optional.patch
@@ -0,0 +1,526 @@
+From ed650322792514d69ae54eef4cb105cac1dcb4b8 Mon Sep 17 00:00:00 2001
+From: Oz Tiram <oz.tiram@gmail.com>
+Date: Fri, 7 Feb 2020 21:57:10 +0100
+Subject: [PATCH 1/5] Make synctex optional
+
+Not everyone who reads PDF's is necessarily a LaTeX user.
+These changes allow users to install atril without the huge bagage
+of tex-live on systems where synctex isn't provided as a stand alone
+library.
+---
+ configure.ac              | 25 +++++++++++++++++--------
+ libdocument/ev-document.c | 16 ++++++++++++----
+ libview/ev-view.c         |  9 ++++++++-
+ shell/ev-window.c         |  5 +++++
+ 4 files changed, 42 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6fee0ff6e..e7a63feed 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -361,15 +361,25 @@ AC_SUBST([GIRTYPELIBDIR])
+ AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
+ 
+ dnl ================== libsynctex ===========================================
++AC_ARG_ENABLE([synctex],
++  [AS_HELP_STRING([--disable-synctex], [Disable support for synctex])],
++  [],
++  [enable_synctex=yes])
+ 
+-PKG_CHECK_MODULES(SYNCTEX, [synctex >= $SYNCTEX_REQUIRED], has_synctex=yes, has_synctex=no)
+ 
+-dnl not found? use internal code copy.
+-if test "x$has_synctex" = "xno"; then
+-        AC_MSG_ERROR("SyncTeX support is disabled since library version $SYNCTEX_REQUIRED or newer not found")
++if test "$enable_synctex" = "yes"; then
++  AC_DEFINE([ENABLE_SYNCTEX],[1],[Define if synctex support is enabled])
++  PKG_CHECK_MODULES(SYNCTEX, [synctex >= $SYNCTEX_REQUIRED], has_synctex=yes, has_synctex=no)
++  dnl not found? use internal code copy.
++  if test "x$has_synctex" = "xno"; then
++          AC_MSG_ERROR("SyncTeX support is disabled since library version $SYNCTEX_REQUIRED or newer not found")
++  fi
++  AC_SUBST(SYNCTEX_LIBS)
++  AC_SUBST(SYNCTEX_CFLAGS)
+ fi
+-AC_SUBST(SYNCTEX_LIBS)
+-AC_SUBST(SYNCTEX_CFLAGS)
++
++AM_CONDITIONAL([ENABLE_SYNCTEX], [test "$enable_synctex" = "yes"])
++
+ 
+ dnl ================== portability checks ===========================================
+ 
+@@ -776,6 +786,7 @@ Configure summary:
+     Tests...............:    $enable_tests
+ 
+     PDF Backend.........:    $enable_pdf
++    Synctex enabled.....:    $enable_synctex
+     PostScript Backend..:    $enable_ps
+     TIFF Backend........:    $enable_tiff
+     DJVU Backend........:    $enable_djvu
+@@ -784,6 +795,4 @@ Configure summary:
+     Comics Backend......:    $enable_comics
+     XPS Backend.........:    $enable_xps
+     ePub Backend........:    $have_webkit
+-
+-    SyncTeX.............:    $has_synctex
+ "
+diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c
+index b713a6717..be082aebb 100644
+--- a/libdocument/ev-document.c
++++ b/libdocument/ev-document.c
+@@ -25,7 +25,9 @@
+ #include <string.h>
+ 
+ #include "ev-document.h"
++#ifdef ENABLE_SYNCTEX
+ #include "synctex_parser.h"
++#endif
+ #include "ev-file-helpers.h"
+ 
+ typedef struct _EvPageSize
+@@ -53,8 +55,9 @@ struct _EvDocumentPrivate
+ 	gchar         **page_labels;
+ 	EvPageSize     *page_sizes;
+ 	EvDocumentInfo *info;
+-
++#ifdef ENABLE_SYNCTEX
+ 	synctex_scanner_p synctex_scanner;
++#endif
+ };
+ 
+ static gint            _ev_document_get_n_pages     (EvDocument *document);
+@@ -124,12 +127,12 @@ ev_document_finalize (GObject *object)
+ 		ev_document_info_free (document->priv->info);
+ 		document->priv->info = NULL;
+ 	}
+-
++#ifdef ENABLE_SYNCTEX
+ 	if (document->priv->synctex_scanner) {
+ 		synctex_scanner_free (document->priv->synctex_scanner);
+ 		document->priv->synctex_scanner = NULL;
+ 	}
+-
++#endif
+ 	G_OBJECT_CLASS (ev_document_parent_class)->finalize (object);
+ }
+ 
+@@ -137,8 +140,9 @@ static void
+ ev_document_init (EvDocument *document)
+ {
+ 	document->priv = ev_document_get_instance_private (document);
++#ifdef ENABLE_SYNCTEX
+ 	document->synctex_version = SYNCTEX_VERSION_STRING;
+-
++#endif
+ 	/* Assume all pages are the same size until proven otherwise */
+ 	document->priv->uniform = TRUE;
+ 	/* Assume that the document is not a web document*/
+@@ -336,6 +340,7 @@ ev_document_load (EvDocument  *document,
+ 		}
+ 
+ 		priv->info = _ev_document_get_info (document);
++#ifdef ENABLE_SYNCTEX
+ 		if (_ev_document_support_synctex (document)) {
+ 			gchar *filename;
+ 
+@@ -346,6 +351,7 @@ ev_document_load (EvDocument  *document,
+ 				g_free (filename);
+ 			}
+ 		}
++#endif
+ 	}
+ 
+ 	return retval;
+@@ -388,6 +394,7 @@ _ev_document_support_synctex (EvDocument *document)
+ 	return klass->support_synctex ? klass->support_synctex (document) : FALSE;
+ }
+ 
++#ifdef ENABLE_SYNCTEX
+ gboolean
+ ev_document_has_synctex (EvDocument *document)
+ {
+@@ -492,6 +499,7 @@ ev_document_synctex_forward_search (EvDocument   *document,
+ 
+         return result;
+ }
++#endif /* ENABLE_SYNCTEX */
+ 
+ static gint
+ _ev_document_get_n_pages (EvDocument  *document)
+diff --git a/libview/ev-view.c b/libview/ev-view.c
+index a195ba21f..e98582d34 100644
+--- a/libview/ev-view.c
++++ b/libview/ev-view.c
+@@ -3210,6 +3210,7 @@ ev_view_remove_annotation (EvView       *view,
+         g_object_unref (annot);
+ }
+ 
++#ifdef ENABLE_SYNCTEX
+ static gboolean
+ ev_view_synctex_backward_search (EvView *view,
+ 				 gdouble x,
+@@ -3235,6 +3236,7 @@ ev_view_synctex_backward_search (EvView *view,
+ 
+ 	return FALSE;
+ }
++#endif
+ 
+ /* Caret navigation */
+ #define CURSOR_ON_MULTIPLIER 2
+@@ -4078,8 +4080,10 @@ ev_view_draw (GtkWidget      *widget,
+ 			show_annotation_windows (view, i);
+ 		if (page_ready && view->focused_element)
+ 			draw_focus (view, cr, i, &clip_rect);
++#ifdef ENABLE_SYNCTEX
+ 		if (page_ready && view->synctex_result)
+ 			highlight_forward_search_results (view, cr, i);
++#endif
+ 	}
+ 
+ 	if (GTK_WIDGET_CLASS (ev_view_parent_class)->draw)
+@@ -4472,9 +4476,10 @@ ev_view_button_press_event (GtkWidget      *widget,
+ 			EvFormField *field;
+ 			EvMapping *link;
+ 			gint page;
+-
++#ifdef ENABLE_SYNCTEX
+ 			if (event->state & GDK_CONTROL_MASK)
+ 				return ev_view_synctex_backward_search (view, event->x , event->y);
++#endif
+ 
+ 			if (EV_IS_SELECTION (view->document) && view->selection_info.selections) {
+ 				if (event->type == GDK_3BUTTON_PRESS) {
+@@ -7522,6 +7527,7 @@ ev_view_find_cancel (EvView *view)
+ 	view->find_pages = NULL;
+ }
+ 
++#ifdef ENABLE_SYNCTEX
+ /*** Synctex ***/
+ void
+ ev_view_highlight_forward_search (EvView       *view,
+@@ -7549,6 +7555,7 @@ ev_view_highlight_forward_search (EvView       *view,
+ 	ensure_rectangle_is_visible (view, &view_rect);
+ 	gtk_widget_queue_draw (GTK_WIDGET (view));
+ }
++#endif /* ENABLE_SYNCTEX */
+ 
+ /*** Selections ***/
+ static gboolean
+diff --git a/shell/ev-window.c b/shell/ev-window.c
+index e2dfbf727..bffc9a7f9 100644
+--- a/shell/ev-window.c
++++ b/shell/ev-window.c
+@@ -7736,6 +7736,8 @@ ev_window_emit_doc_loaded (EvWindow *window)
+         ev_atril_window_emit_document_loaded (window->priv->skeleton, window->priv->uri);
+ }
+ 
++
++#ifdef ENABLE_SYNCTEX
+ static gboolean
+ handle_sync_view_cb (EvAtrilWindow        *object,
+                      GDBusMethodInvocation *invocation,
+@@ -7756,6 +7758,7 @@ handle_sync_view_cb (EvAtrilWindow        *object,
+ 
+ 	return TRUE;
+ }
++#endif
+ #endif /* ENABLE_DBUS */
+ 
+ static gboolean
+@@ -7816,9 +7819,11 @@ ev_window_init (EvWindow *ev_window)
+                                                       ev_window->priv->dbus_object_path,
+                                                       &error)) {
+                         ev_window->priv->skeleton = skeleton;
++#ifdef ENABLE_SYNCTEX
+                         g_signal_connect (skeleton, "handle-sync-view",
+                                           G_CALLBACK (handle_sync_view_cb),
+                                           ev_window);
++#endif
+                 } else {
+                         g_printerr ("Failed to register bus object %s: %s\n",
+ 			            ev_window->priv->dbus_object_path, error->message);
+
+From c141d2c6ae0b4ce5824817f9aa2f98d5edbf7756 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram <oz.tiram@gmail.com>
+Date: Thu, 11 Jun 2020 09:15:28 +0200
+Subject: [PATCH 2/5] Fix -Wunused-function warnings caused by
+ --enable-synctex=no
+
+---
+ libdocument/ev-document.c |  5 ++++-
+ libview/ev-view-private.h |  3 ++-
+ libview/ev-view.c         | 10 ++++++++++
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c
+index be082aebb..f7c878956 100644
+--- a/libdocument/ev-document.c
++++ b/libdocument/ev-document.c
+@@ -68,7 +68,9 @@ static void            _ev_document_get_page_size   (EvDocument *document,
+ static gchar          *_ev_document_get_page_label  (EvDocument *document,
+ 						     EvPage     *page);
+ static EvDocumentInfo *_ev_document_get_info        (EvDocument *document);
++#ifdef ENABLE_SYNCTEX
+ static gboolean        _ev_document_support_synctex (EvDocument *document);
++#endif
+ 
+ static GMutex ev_doc_mutex;
+ static GMutex ev_fc_mutex;
+@@ -386,6 +388,8 @@ ev_document_get_page (EvDocument *document,
+ 	return klass->get_page (document, index);
+ }
+ 
++
++#ifdef ENABLE_SYNCTEX
+ static gboolean
+ _ev_document_support_synctex (EvDocument *document)
+ {
+@@ -394,7 +398,6 @@ _ev_document_support_synctex (EvDocument *document)
+ 	return klass->support_synctex ? klass->support_synctex (document) : FALSE;
+ }
+ 
+-#ifdef ENABLE_SYNCTEX
+ gboolean
+ ev_document_has_synctex (EvDocument *document)
+ {
+diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h
+index f10593953..4f6179e4a 100644
+--- a/libview/ev-view-private.h
++++ b/libview/ev-view-private.h
+@@ -125,8 +125,9 @@ struct _EvView {
+ 	GList **find_pages;
+ 	gint find_result;
+ 	gboolean jump_to_find_result;
++#ifdef ENABLE_SYNCTEX
+ 	gboolean highlight_find_results;
+-
++#endif
+ 	EvDocumentModel *model;
+ 	EvPixbufCache *pixbuf_cache;
+ 	gsize pixbuf_cache_size;
+diff --git a/libview/ev-view.c b/libview/ev-view.c
+index e98582d34..7c9281cef 100644
+--- a/libview/ev-view.c
++++ b/libview/ev-view.c
+@@ -177,12 +177,14 @@ static void       ev_view_remove_all                         (EvView
+ static AtkObject *ev_view_get_accessible                     (GtkWidget *widget);
+ 
+ /*** Drawing ***/
++#if ENABLE_SYNCTEX
+ static void       highlight_find_results                     (EvView             *view,
+ 							      cairo_t            *cr,
+ 							      int                 page);
+ static void       highlight_forward_search_results           (EvView             *view,
+ 							      cairo_t            *cr,
+ 							      int                 page);
++#endif
+ static void       draw_one_page                              (EvView             *view,
+ 							      gint                page,
+ 							      cairo_t            *cr,
+@@ -4074,8 +4076,10 @@ ev_view_draw (GtkWidget      *widget,
+ 
+ 		if (page_ready && should_draw_caret_cursor (view, i))
+ 			draw_caret_cursor (view, cr);
++#ifdef ENABLE_SYNCTEX
+ 		if (page_ready && view->find_pages && view->highlight_find_results)
+ 			highlight_find_results (view, cr, i);
++#endif
+ 		if (page_ready && EV_IS_DOCUMENT_ANNOTATIONS (view->document))
+ 			show_annotation_windows (view, i);
+ 		if (page_ready && view->focused_element)
+@@ -5654,6 +5658,7 @@ draw_rubberband (EvView             *view,
+ }
+ 
+ 
++#ifdef ENABLE_SYNCTEX
+ static void
+ highlight_find_results (EvView *view, cairo_t *cr, int page)
+ {
+@@ -5698,6 +5703,7 @@ highlight_forward_search_results (EvView *view, cairo_t *cr, int page)
+ 	cairo_stroke (cr);
+ 	cairo_restore (cr);
+ }
++#endif
+ 
+ static void
+ draw_surface (cairo_t 	      *cr,
+@@ -6497,7 +6503,9 @@ ev_view_init (EvView *view)
+ 	view->page_layout = EV_PAGE_LAYOUT_SINGLE;
+ 	view->pending_scroll = SCROLL_TO_KEEP_POSITION;
+ 	view->jump_to_find_result = TRUE;
++#ifdef ENABLE_SYNCTEX
+ 	view->highlight_find_results = FALSE;
++#endif
+ 	view->caret_enabled = FALSE;
+ 	view->cursor_page = 0;
+ 	view->zoom_center_x = -1;
+@@ -7517,7 +7525,9 @@ ev_view_find_search_changed (EvView *view)
+ void
+ ev_view_find_set_highlight_search (EvView *view, gboolean value)
+ {
++#ifdef ENABLE_SYNCTEX
+ 	view->highlight_find_results = value;
++#endif
+ 	gtk_widget_queue_draw (GTK_WIDGET (view));
+ }
+ 
+
+From f0054e7011c5cf6ac814ce1c6b42ce1713b25dba Mon Sep 17 00:00:00 2001
+From: Oz N Tiram <oz.tiram@gmail.com>
+Date: Thu, 11 Jun 2020 10:21:00 +0200
+Subject: [PATCH 3/5] Improved detection of --enable/disable synctex option
+
+---
+ configure.ac | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e7a63feed..ee33f27d9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -362,9 +362,12 @@ AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
+ 
+ dnl ================== libsynctex ===========================================
+ AC_ARG_ENABLE([synctex],
+-  [AS_HELP_STRING([--disable-synctex], [Disable support for synctex])],
+-  [],
+-  [enable_synctex=yes])
++  [--enable-synctex  enable support for synctex)],
++  [case "${enableval}" in
++    yes) synctex=true ;;
++    no)  synctex=false;;
++    *) AC_MSG_ERROR([bad value ${enableval} for --enable-synctex]) ;;
++  esac],[enable_synctex=yes])
+ 
+ 
+ if test "$enable_synctex" = "yes"; then
+
+From 37d80d4c862cbd03525fe4393f09b92d1dff8f56 Mon Sep 17 00:00:00 2001
+From: Oz N Tiram <oz.tiram@gmail.com>
+Date: Thu, 11 Jun 2020 10:23:15 +0200
+Subject: [PATCH 4/5] Use ENABLE_SYNCTEX in libdocument/Makefile.am
+
+---
+ libdocument/Makefile.am | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
+index f527f0a4a..d1db419c0 100644
+--- a/libdocument/Makefile.am
++++ b/libdocument/Makefile.am
+@@ -102,11 +102,14 @@ libatrildocument_la_CPPFLAGS = \
+ 
+ libatrildocument_la_CFLAGS = \
+ 	$(LIBDOCUMENT_CFLAGS)			\
+-	$(SYNCTEX_CFLAGS)			\
+ 	$(WARN_CFLAGS)				\
+ 	$(DISABLE_DEPRECATED)			\
+ 	$(AM_CFLAGS)
+ 
++if ENABLE_SYNCTEX
++libatrildocument_la_CFLAGS += $(SYNCTEX_CFLAGS)
++endif
++
+ libatrildocument_la_LDFLAGS = \
+ 	-version-info $(EV_DOCUMENT_LT_VERSION_INFO)	\
+ 	-no-undefined	\
+@@ -116,9 +119,11 @@ libatrildocument_la_LDFLAGS = \
+ libatrildocument_la_LIBADD = \
+ 	$(LIBDOCUMENT_LIBS)	\
+ 	$(GMODULE_LIBS)		\
+-	$(SYNCTEX_LIBS)		\
+ 	$(ZLIB_LIBS)
+ 
++if ENABLE_SYNCTEX
++libatrildocument_la_LIBADD += $(SYNCTEX_LIBS)
++endif
+ 
+ BUILT_SOURCES = 			\
+ 	ev-document-type-builtins.c	\
+
+From 87c8ee575d3ec50a278c5e428d066341ffd3295d Mon Sep 17 00:00:00 2001
+From: Oz N Tiram <oz.tiram@gmail.com>
+Date: Sun, 14 Jun 2020 17:09:56 +0200
+Subject: [PATCH 5/5] Re-enable highlight_find_results
+
+---
+ libview/ev-view-private.h | 2 --
+ libview/ev-view.c         | 9 +++------
+ 2 files changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h
+index 4f6179e4a..e95157234 100644
+--- a/libview/ev-view-private.h
++++ b/libview/ev-view-private.h
+@@ -125,9 +125,7 @@ struct _EvView {
+ 	GList **find_pages;
+ 	gint find_result;
+ 	gboolean jump_to_find_result;
+-#ifdef ENABLE_SYNCTEX
+ 	gboolean highlight_find_results;
+-#endif
+ 	EvDocumentModel *model;
+ 	EvPixbufCache *pixbuf_cache;
+ 	gsize pixbuf_cache_size;
+diff --git a/libview/ev-view.c b/libview/ev-view.c
+index 7c9281cef..29b06fbef 100644
+--- a/libview/ev-view.c
++++ b/libview/ev-view.c
+@@ -177,10 +177,10 @@ static void       ev_view_remove_all                         (EvView
+ static AtkObject *ev_view_get_accessible                     (GtkWidget *widget);
+ 
+ /*** Drawing ***/
+-#if ENABLE_SYNCTEX
+ static void       highlight_find_results                     (EvView             *view,
+ 							      cairo_t            *cr,
+ 							      int                 page);
++#if ENABLE_SYNCTEX
+ static void       highlight_forward_search_results           (EvView             *view,
+ 							      cairo_t            *cr,
+ 							      int                 page);
+@@ -4076,10 +4076,8 @@ ev_view_draw (GtkWidget      *widget,
+ 
+ 		if (page_ready && should_draw_caret_cursor (view, i))
+ 			draw_caret_cursor (view, cr);
+-#ifdef ENABLE_SYNCTEX
+ 		if (page_ready && view->find_pages && view->highlight_find_results)
+ 			highlight_find_results (view, cr, i);
+-#endif
+ 		if (page_ready && EV_IS_DOCUMENT_ANNOTATIONS (view->document))
+ 			show_annotation_windows (view, i);
+ 		if (page_ready && view->focused_element)
+@@ -5627,6 +5625,7 @@ ev_view_style_updated (GtkWidget *widget)
+ 
+ /*** Drawing ***/
+ 
++
+ static void
+ draw_rubberband (EvView             *view,
+ 		 cairo_t            *cr,
+@@ -5658,7 +5657,6 @@ draw_rubberband (EvView             *view,
+ }
+ 
+ 
+-#ifdef ENABLE_SYNCTEX
+ static void
+ highlight_find_results (EvView *view, cairo_t *cr, int page)
+ {
+@@ -5683,6 +5681,7 @@ highlight_find_results (EvView *view, cairo_t *cr, int page)
+         }
+ }
+ 
++#ifdef ENABLE_SYNCTEX
+ static void
+ highlight_forward_search_results (EvView *view, cairo_t *cr, int page)
+ {
+@@ -7525,9 +7524,7 @@ ev_view_find_search_changed (EvView *view)
+ void
+ ev_view_find_set_highlight_search (EvView *view, gboolean value)
+ {
+-#ifdef ENABLE_SYNCTEX
+ 	view->highlight_find_results = value;
+-#endif
+ 	gtk_widget_queue_draw (GTK_WIDGET (view));
+ }
+ 
diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml
index 0b999715ba8c..57f8c6d47b41 100644
--- a/app-text/atril/metadata.xml
+++ b/app-text/atril/metadata.xml
@@ -11,6 +11,8 @@
 		<flag name="dvi">Enable build-in DVI viewer</flag>
 		<flag name="epub">Enable build-in DVI viewer using
 			<pkg>net-libs/webkit-gtk</pkg></flag>
+		<flag name="synctex">Enable search highlighting through synctex
+		(<pkg>virtual/tex-base</pkg>)</flag>
 		<flag name="t1lib">Enable the Type-1 fonts for the build-in DVI viewer
 			(<pkg>media-libs/t1lib</pkg>)</flag>
 		<flag name="xps">Enable XPS viewer using 
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 1ffba96098d7..4527f03d56e2 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,3 +1,3 @@
 DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
-EBUILD cmark-0.29.0.ebuild 731 BLAKE2B 9cf4db73d57e077dfcf941a7fef74ca55afcb39b8a8e4e9241ed882a260d476b21c171d829eac90cf5696471bf553e23e50856fe2b177a2221b7c13d987223ec SHA512 746e152b0f048556a4e49b62db055e8b5d3d53fe3dd48fc4b914a8e50cae25b6717fb0e25eee7d550d8ceffeaaf4bd094be8415be54deeab7a9364e37af448dc
+EBUILD cmark-0.29.0.ebuild 735 BLAKE2B 7550a714e33648a6510be6286a2d1e4a2b67f26fb3353dcb301b2fcdb569916d0e42577eb282e1bcaa55b77667e0de0d5f450081b4bddd50a7470b88aa582b9e SHA512 4860930cfa25a4c8c0551516fe93f2d543dee90468ee105fc16135fa1d4fe7f9e06bdeb6548719f273da781796bc0e8ad5418041c8a2003e2327a11d75c3039f
 MISC metadata.xml 473 BLAKE2B 770f8d92e6aa0ff167733de2877fe1b244cd153875dce9116b361cdb4ee529e54de01f0841af1d1a23b54826786e784097afa993f791515a79c4a1af61b4349a SHA512 a0f0f24ee085d6d49311c08a1cb72f492cb88659a840ffdc2d01576c97b9a56b63beab6fe46a23df5331ce2fc100341283b2cf0bdb18a3861f0953f8c1331c72
diff --git a/app-text/cmark/cmark-0.29.0.ebuild b/app-text/cmark/cmark-0.29.0.ebuild
index 975cfc4fe12b..2084c1803213 100644
--- a/app-text/cmark/cmark-0.29.0.ebuild
+++ b/app-text/cmark/cmark-0.29.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit cmake python-any-r1
 
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 9fed0172cac1..b7d8ec6a2408 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,7 +1,9 @@
 DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
 DIST coolreader-3.2.39.tar.gz 17679570 BLAKE2B e84fb7d8032ae62fec24a74a9cebab086664a2ed3827f0664e667a4ab3b8d76b722790958f71f5fcd79729238e897c6592059f9b45eb4069c9ad483883bc0600 SHA512 1b92b35750174a8ef4df4b7c4f33bb9fcc94b36008c08a7f9d1f8e85c6b642c5b037e0673a783cde1aa98296887bb286c4a2da186911b26f298f689605e1eb4b
 DIST coolreader-3.2.45.tar.gz 20290340 BLAKE2B a4e6218965618a1b0938606ca323534112a5d7b64a1d56e06f56ba8b2e5591d380d7fb2aeb9c37d007fb834963a42e684e2af939720272c3a7494e5afc65501e SHA512 d7dc9921b74d1da236aeb02edcb39d44dfcfb9da5d6d3b1bf428157f67415c19af218c2454a602828d12d0c6d8c80d1335e92101acda1af8abd6bd312900c33c
+DIST coolreader-3.2.49.tar.gz 21398327 BLAKE2B 9a63f34d661f7c12d55e08788edb0c348d33c67708890e89a857975ce3a6fc82d8788dc0a15ad18e025d68254293b1b34977b2ffe24ea19ab4865727d5afbdcb SHA512 06c8416c33ccf939c0292b573352c097c4b2a0b1390181428e5f1bf08e145f1fa1f8ebdcf658bb0f9e8846c1fd5a57a67fb075b8e7285e1e7602e26aba6790b0
 EBUILD coolreader-3.2.2.1-r2.ebuild 2479 BLAKE2B 63c86c1dee137edc9f8937c72cb80c77c0f890347aa1d385b2be771a3fdfc11a1d895ee87b4bd295a52392dc72f9abcd34f019c5f350943d4a9ce45e3971f5b0 SHA512 8df9d4a6337416a8d394cbab4be7f9d166d7ca9febe6e4dc5054d842de4f006adb535342c24a1b80370988edad4c71f9a0e7f50a0aeb832ebcd251fa38f0d8b0
 EBUILD coolreader-3.2.39.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
 EBUILD coolreader-3.2.45.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
+EBUILD coolreader-3.2.49.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.49.ebuild b/app-text/coolreader/coolreader-3.2.49.ebuild
new file mode 100644
index 000000000000..0b26482993e9
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.49.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
+
+CR_PV=$(ver_rs 3 '-')
+
+if [ "${PV}" != 9999 ]
+then
+	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-cr${CR_PV}"
+else
+	inherit git-r3
+	# github mirror has some new commits to fix page margins settings
+	# sourceforge mirror saved as backup
+	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
+	EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
+	SRC_URI=""
+fi
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://github.com/buggins/coolreader/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+CDEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+DEPEND="${CDEPEND}
+	!wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+for lang in ${PLOCALES}; do
+	IUSE="${IUSE} l10n_${lang}"
+done
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# locales
+	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	local lang langs
+	langs=""
+	for lang in ${PLOCALES}; do
+		if use l10n_${lang}; then
+			langs="${langs} ${lang}"
+		fi
+	done
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if ! use wxwidgets; then
+		mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+		rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+		gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+		gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index 6ff117683bd9..fc466a0f0db9 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1,4 +1,4 @@
 AUX fbreader-0.99.4-combined.patch 23589 BLAKE2B 81cb00abe9ba0f40723e6c1cac626916f90eede960d8b191bcb48c8186be8fc3d1fb18954f62e3ba5f15de159034a6060dc7efaf94f9531aabad9f76b6f53658 SHA512 c4dd5237113fa9d54ae3e63a19a06841570e5751108befe4d18ae7b4730628d3a4a5613dd302bc426b14c280f2b5abf9e394aedca821de995efb45ae7b32f632
 DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
-EBUILD fbreader-0.99.4-r5.ebuild 1934 BLAKE2B e12e5cdb9714e1f97e6a375c3e64dc65aedd93b9214417e7d3b3f2dfb4b39f53a8cb540cf2636bed5940b202f64ab7f8817d541d32b212ac5a1835656e923fe9 SHA512 48a634082045cdc346d06473db3ac1b17e1ff91451fae50900ef7b19e5a7529b82c683d8ff93435b9d0053f69ccee8e924ec82854b06f213895657cec26aaad6
+EBUILD fbreader-0.99.4-r5.ebuild 1963 BLAKE2B 7e57a9735769fb874456cd61ec0b2c6baf4a953847bad977b397753a0ece645bf6c8390663ad5fee1ea925f2c8168209652e13cc5ae9b261eee5054ccf1f76aa SHA512 dd2afce62eed3c7f5b0ad8bfa8f4a065511b1609d29b5bb1f5b2418abe24f487370803c952b52a4c5f6722055347ea6e4523fac637e8c14fc548b935fcf1ac05
 MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
index 7c47fc4ac07a..75cd8347fff2 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils multilib flag-o-matic qmake-utils
+inherit flag-o-matic qmake-utils
 
 DESCRIPTION="E-Book Reader. Supports many e-book formats"
-HOMEPAGE="http://www.fbreader.org/"
-SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
+HOMEPAGE="https://www.fbreader.org/"
+SRC_URI="https://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,18 +16,19 @@ IUSE="debug"
 
 RDEPEND="
 	app-arch/bzip2
+	dev-db/sqlite
 	dev-libs/expat
-	dev-libs/libunibreak
 	dev-libs/fribidi
-	dev-db/sqlite
-	net-misc/curl
-	sys-libs/zlib
+	dev-libs/libunibreak
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
 	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
+	net-misc/curl
+	sys-libs/zlib
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 
@@ -61,15 +62,15 @@ src_prepare() {
 	sed -e "s:MOC = moc-qt4:MOC = $(qt5_get_bindir)/moc:" \
 		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
 
-	echo "TARGET_ARCH = desktop" > makefiles/target.mk
-	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
+	echo "TARGET_ARCH = desktop" > makefiles/target.mk || die
+	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk || die
 
-	echo "UI_TYPE = qt4" >> makefiles/target.mk
+	echo "UI_TYPE = qt4" >> makefiles/target.mk || die
 
 	if use debug; then
-		echo "TARGET_STATUS = debug" >> makefiles/target.mk
+		echo "TARGET_STATUS = debug" >> makefiles/target.mk || die
 	else
-		echo "TARGET_STATUS = release" >> makefiles/target.mk
+		echo "TARGET_STATUS = release" >> makefiles/target.mk || die
 	fi
 }
 
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 552885ccb17e..adf6ebfbeda9 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,9 +1,11 @@
 DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67
 DIST ghostscript-9.53.0.tar.xz 41358720 BLAKE2B 9a8b5872dc799f14759033685c37890f2da28450b1e115fcc63a2a920bb22bfc02db078d3f39dc62778da2a2518b82c2fc91f349486e83914c88c70d1e15d7e8 SHA512 fa594ef99e58257074b651e4d078bd1025f7bc2c435cd2a5454ba59c2a98cc82e93339ccd1eaa4fe624275165aacefeabc6f8336476027946f56aeb02e93da30
 DIST ghostscript-9.53.1.tar.xz 41362600 BLAKE2B f4f3e9c067d120195cdcbd8ba3ecbb5618d668e0582408cc76b0e13627aca06c40064a7ae96d0ebe8c313ec282c4d3f5dddddabef3d0194ff9aaf98832b5a50c SHA512 5c78ed0a03983cbf9d55885c5ee8fbfc987db367b020ad0148b8861de42923e38c688447cfc6efcea5521121545ecfbea9690058fd3c4438629a43b5990800c5
+DIST ghostscript-9.53.2.tar.xz 41362364 BLAKE2B 1ff4d00661d28f7f9a14064928182147fa0b20b41accb287b779a40651fbc45047eefc8522242b7dd909324b6e3ebc15f421b351c69fb248fef2095210c81461 SHA512 fe430e96b67a082b58942d66193a89b8af042574929e8299e1f8b1ef2a7f71565ba5a96b72d26db38f4a05e70119a019c5fe73b842d51afd357d642d39d95320
 DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
 DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5097 BLAKE2B 748ff28b3a38714562d03d63b267a2cbb762103972d41883d2c5917083cbed564ca36788fdde92ac8366768153d0453ece4b25b760bad6c3d97e08c9e86961bf SHA512 82e9b5f3f1515236197510bb29238ca955cf042a233ef314036b8b88887df2bc8dc353342b09c7d0444d73de9f98412a2c7252d19782e956f15dac2147b3d289
 EBUILD ghostscript-gpl-9.53.0.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
 EBUILD ghostscript-gpl-9.53.1.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
+EBUILD ghostscript-gpl-9.53.2.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.2.ebuild
new file mode 100644
index 000000000000..0d3acf4a9d16
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/"
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+MY_PATCHSET="ghostscript-gpl-9.53-patchset-01.tar.xz"
+
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+
+if [[ -n "${MY_PATCHSET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
+fi
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cups dbus gtk l10n_de static-libs unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	>=media-libs/jbig2dec-0.19:=
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/openjpeg-2.1.0:2=
+	>=media-libs/tiff-4.0.1:0=
+	>=sys-libs/zlib-1.2.7
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	unicode? ( net-dns/libidn:0= )
+	X? ( x11-libs/libXt x11-libs/libXext )
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	app-text/poppler-data
+	>=media-fonts/urw-fonts-2.4.9
+	l10n_ja? ( media-fonts/kochi-substitute )
+	l10n_ko? ( media-fonts/baekmuk-fonts )
+	l10n_zh-CN? ( media-fonts/arphicfonts )
+	l10n_zh-TW? ( media-fonts/arphicfonts )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if [[ -n "${MY_PATCHSET}" ]] ; then
+		# apply various patches, many borrowed from Fedora
+		# https://src.fedoraproject.org/rpms/ghostscript
+		# and Debian
+		# https://salsa.debian.org/printing-team/ghostscript/tree/debian/master/debian/patches
+		eapply "${WORKDIR}/patches/"*.patch
+	fi
+
+	default
+
+	# remove internal copies of various libraries
+	rm -r cups/libs || die
+	rm -r freetype || die
+	rm -r jbig2dec || die
+	rm -r jpeg || die
+	rm -r lcms2mt || die
+	rm -r libpng || die
+	rm -r tiff || die
+	rm -r zlib || die
+	rm -r openjpeg || die
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -r Resource/CMap || die
+
+	if ! use gtk ; then
+		sed -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			-i base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		-i configure.ac || die
+	# Some files depend on zlib.h directly.  Redirect them. #573248
+	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
+	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+	sed -e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		-i base/lib.mak || die
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		-i Makefile.in base/*.mak || die "sed failed"
+
+	# remove incorrect symlink, bug 590384
+	rm ijs/ltmain.sh || die
+	eautoreconf
+
+	cd ijs || die
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		"${EPREFIX}"/usr/share/fonts/urw-fonts \
+		"${EPREFIX}"/usr/share/fonts/Type1 \
+		"${EPREFIX}"/usr/share/fonts \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
+	done
+
+	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--with-system-libtiff \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with X x)
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd ijs || die
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake DESTDIR="${D}" install
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if ! use l10n_de; then
+		rm -r "${ED}"/usr/share/man/de || die
+	fi
+}
diff --git a/app-text/groonga-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest
index db64eb03c36b..ef7fa46e44ac 100644
--- a/app-text/groonga-normalizer-mysql/Manifest
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -1,9 +1,3 @@
-DIST groonga-normalizer-mysql-1.0.6.tar.gz 430461 BLAKE2B f124608b13888f337fc35ed02b4757818d145943a13f645da73dbf0735a4a5627026ad995435b822f6022d61f6cf0a6821824a1272c389459adb16932bc06bcc SHA512 36ef0344ba73633669d12dd13b08cd336b2b77a7c76e11b52b5ce17fcf20b17a0ea8a3f68be1be91d07e3fe5a87b667664d7a503a54ba1cace3bd6c252286821
-DIST groonga-normalizer-mysql-1.0.9.tar.gz 527908 BLAKE2B 20112b60a2a9f5f5b1d805280cd5dc77e8d039a768410a3f2259aa60449c660eb6c3764d14edd3db819dd68a830ba38aebe5bc0d6014dcd04752a194b1da87dd SHA512 878d10dc6f7280c62e9563db19a61450a0181c19d47b2a5afe3bef4bfa157abfe3de726f0d61b6b7040b3b37abd78f63cd257f48fe779ff6a1ea0ed262b70a97
-DIST groonga-normalizer-mysql-1.1.0.tar.gz 529179 BLAKE2B 1092b6245eb60a2e54cadf6193a402ad085923224e05d35f80453505fb2f0a4e97822746907d1f9a8c0b95f82d0b1396b7ff81d133099def75b850e54a899725 SHA512 a607ea875a1500b408742f52c5a0e465db4fc45101cd6b433a5fede8631fdadd6d24571ec188f70e39906178d35ad46138848bd57aaac721da32c064f3506416
 DIST groonga-normalizer-mysql-1.1.1.tar.gz 548788 BLAKE2B c2f06ffa4aaf52266dabf1397d592b772a10a45fe8b9184ffb7fc5f30a8db3c81011c19a80d3d14a228ea47b4b6ba21b7ab7f81e283533beef4596065d0c4b6b SHA512 40686a50133149b614057907c58f5b37d596fcaf697b4a6f3e68b776ac8c728cdd4c8a6e7c5676fe92ff96a4358b623f2b3740f6b72d317f1650c006cfb34369
-EBUILD groonga-normalizer-mysql-1.0.6.ebuild 714 BLAKE2B 9700d2835f3f1558fa659eaa88f6ca4cfdaa382d023b9558ea28dea2dc07782d1f0286e862456fb054c0ba421e12930da2c3307ae21470d1eed05188f09370ef SHA512 1c78bcd77d2438b85f51e591964cebe3d14e335b24899b89e1625a30db3a1e98c9175075e7deca1ae7c91b5ef24be5064c9a73c31b1fbd4df5810f1bf597fa38
-EBUILD groonga-normalizer-mysql-1.0.9.ebuild 702 BLAKE2B 21096c271665dcb14c2828519ba5d0338918d6bbf575195cfb4e0e577c2628e8b280a51e73346bfe014d6cf43e6bb4b6ea364bca76049320134a256372aa3abd SHA512 bbff6609a47a4ef115fb72e70c8443ad9bceddb7a56f5447438f71c5c90d2d33b0bedeaba918a6e2772416438b39636c370f58092da39f4db8b9cfdfd8365301
-EBUILD groonga-normalizer-mysql-1.1.0.ebuild 702 BLAKE2B 21096c271665dcb14c2828519ba5d0338918d6bbf575195cfb4e0e577c2628e8b280a51e73346bfe014d6cf43e6bb4b6ea364bca76049320134a256372aa3abd SHA512 bbff6609a47a4ef115fb72e70c8443ad9bceddb7a56f5447438f71c5c90d2d33b0bedeaba918a6e2772416438b39636c370f58092da39f4db8b9cfdfd8365301
 EBUILD groonga-normalizer-mysql-1.1.1.ebuild 677 BLAKE2B 43c428007fc189bc6fc1f1ff62251c99ade97f9bb2f0775f4fa4bad48cf15733a2886cb1700f773817ef38386d1585c234303b61c8756d89eb3deda2047e7a3b SHA512 6b387668dee0f7c4d68dc1b690ef028ff8e14da6f8a15a764d300497b1eca16329adfd1a2adfe98e3aecbb8c2267acd742b1f02c31904dc3c7264d2ee0e0edac
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild
deleted file mode 100644
index a2e51d5c428e..000000000000
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools ltprune
-
-DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="https://groonga.org/"
-SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/groonga"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( README.md )
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-ruby19 \
-		--docdir="${EROOT}usr/share/doc/${P}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-	# Dont install README twice nor license
-	rm -r "${D}usr/share/doc/${PN}" || die
-}
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild
deleted file mode 100644
index febf15c849db..000000000000
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools ltprune
-
-DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="https://groonga.org/"
-SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/groonga"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( README.md )
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	# ruby is only uses for tests
-	econf \
-		--without-ruby \
-		--docdir="${EROOT}usr/share/doc/${P}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-	rm -r "${D}usr/share/doc/${PN}" || die
-}
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
deleted file mode 100644
index febf15c849db..000000000000
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools ltprune
-
-DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
-HOMEPAGE="https://groonga.org/"
-SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/groonga"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-DOCS=( README.md )
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	# ruby is only uses for tests
-	econf \
-		--without-ruby \
-		--docdir="${EROOT}usr/share/doc/${P}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-	rm -r "${D}usr/share/doc/${PN}" || die
-}
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
index 05c2fc6bdddd..5cb622ac6994 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -1,11 +1,7 @@
 AUX groonga.confd 259 BLAKE2B 440b084d0e41da1b81e27ffa1e42963ce22d83027841039d488d516dce8beffce0e2ca03f5ca78a6aae02fa7bf238f0cf900e770ebfba04cfac581a13bd2381f SHA512 489feed6a4c22eb2ac02be070dd84ed3eb677b4f250b7eacd5619c1749b322b302bdff36fc3586e83125ac7ef02569054c4f267ddd7b26e5aa378af428cbc8ea
 AUX groonga.initd 715 BLAKE2B 0cf870704257490477a7a254a670ef5ce48141b8c9c4119446bcfab92972319857c77ebe41044c7d338b10bb720744788ce0313f8b2ee50277571513d0cfdb83 SHA512 7b4f789c9201f40fee0d99b94554bc33aebf024da02794143317215713cea3f2a9fda2e87d2a8bb864a7d0c8a2c44e824c65deecd4c95360423f7d3a4f04f8c2
-DIST groonga-5.0.3.tar.gz 12421501 BLAKE2B 22b695fca6c4d0859b7a9ed5b1bc46be48493faa513524634662b0d520d1159bc70b4dc34d82ba83e5c57681f01f01dbe47d5a957f110eab2db65cf8eefe878f SHA512 c4595054f46e150b0b95b3d1fb6a18098c93471ee0cdeefc54d266a710db57d6b68a6aceb1a61ede5ebb4e1b5518be64b9b96809bd85634b61c84c1923cbf158
-DIST groonga-5.0.9.tar.gz 12851324 BLAKE2B a58084146e5e8fbcbc56f9737a3623b4385123cc449fb63b136f3f312d31d5574620831a4fa6e759381950ee6aa035e4d6a4c277c26c7d8ebb1e99fe5bf02e75 SHA512 6e89be8894737616cfcbd0edd92c94a25fb8a2f9c97bd0aab10c2d628664aa328384d6b953516fe96cec5b58fd229c42262caad4785ca9574c759d6d7177fba6
 DIST groonga-6.1.2.tar.gz 14028916 BLAKE2B c05a1a5a73bce63655eb588b3021570d22a0016837810c12813bb4f208bf9b114fc514a8887e4f756fb0ec27ad2c991eea026bf57391e9234e49ee084656d26c SHA512 cd2dd667608fac856b36a824c5ea285da937cc11b6d4e5ad2f84581f6fbc714b4bb381515ec7b467ddccfad77c77c080000def653d9cdd8725c0f512c7b83f20
 DIST groonga-8.0.2.tar.gz 15095427 BLAKE2B fa83034a434edaa35dede08cb042e48f15e1e2edd78a121f9341f53f53a5eef863d02e2ea6384428c720c4ff9acf1083504046c8c11a1ea8d7bfc4b541db66b5 SHA512 bc5590604054c4adfbc80b39c7cf367e8a989c47d80c37c48feffb9a427b4b4e360289f3d732f6affa7d26a1c8559f23bda1c70b6736a06601398fce9a53acf1
-EBUILD groonga-5.0.3.ebuild 2423 BLAKE2B 68844a8cd8c52e45eeba804d8d44659a32b723182a7584c6acea02bdb165334ebad517901eccfcbdf0249f1c8772d60cb9fc75ff7d7c72a604574cdad31acc59 SHA512 25cd58568c1947f1d42e441b297542c7856c0b8033dcea73791aaac720bf74bfa6df47f55776f37e5b4869f76d13b31b423c0893163480b7208804090c81da07
-EBUILD groonga-5.0.9.ebuild 2423 BLAKE2B 68844a8cd8c52e45eeba804d8d44659a32b723182a7584c6acea02bdb165334ebad517901eccfcbdf0249f1c8772d60cb9fc75ff7d7c72a604574cdad31acc59 SHA512 25cd58568c1947f1d42e441b297542c7856c0b8033dcea73791aaac720bf74bfa6df47f55776f37e5b4869f76d13b31b423c0893163480b7208804090c81da07
 EBUILD groonga-6.1.2.ebuild 2413 BLAKE2B 0d9472484b1d0bfd0949c968e52f6b80737d5398d9304a35826984a30db9555610fc2e8512b8eeba6bd0fd33b9f337d70ceceb425ebe9180530fdcff75390327 SHA512 d6832fac842eab906b5c9df2cbc9e9158b1336c39775a42eea818e8e8fb3ea40917ad02b6b89517bf6a75e6477e92bc0cb290343fe5fb8bf685cff79c3c6fdbe
 EBUILD groonga-8.0.2.ebuild 2621 BLAKE2B efcfa60f6d05c88d765973434c2fa53f25d28de79ac627cd1d5ba7a3f7313e214c88ecff5b70f16b1fac046f7b8ad919311c6d5abef3ce762f413a0de4fe2627 SHA512 875ffc1cd44664637e860ffd5ac91ae1e5b8b6858ca6413fa0076090e04a0bf78fa89e03e3e8f52941adf1d8a748bdbd4d0c46a8aa3bcf6ec00914b219b03aea
 MISC metadata.xml 1156 BLAKE2B a6fdcf212e2de097ea99dee4c071da0af7c4024a9c4390aaee67a94f1940ff3483e08a5c20e301e47de63dffc59856a2114c2bf72de9f22e2031bd60c719fe6d SHA512 a1e8936921f6688690cc70ef39eee1abfcdb7b6940de9a29c6f1f3750c3dab4e8f50d1e189ee57ca87085e8e0daf81ff52a93cd81076745f6f479d291fabe079
diff --git a/app-text/groonga/groonga-5.0.3.ebuild b/app-text/groonga/groonga-5.0.3.ebuild
deleted file mode 100644
index 7854044dc1d6..000000000000
--- a/app-text/groonga/groonga-5.0.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils libtool ltprune user
-
-DESCRIPTION="An Embeddable Fulltext Search Engine"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
-
-RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
-	libedit? ( >=dev-libs/libedit-3 )
-	libevent? ( dev-libs/libevent )
-	lzo? ( dev-libs/lzo )
-	mecab? ( >=app-text/mecab-0.80 )
-	msgpack? ( dev-libs/msgpack )
-	sphinx? ( >=dev-python/sphinx-1.0.1 )
-	zeromq? ( net-libs/zeromq )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sphinx? ( dev-python/sphinx )"
-
-REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
-
-pkg_setup() {
-	enewgroup groonga
-	enewuser groonga -1 -1 -1 groonga
-}
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	# httpd is a bundled copy of nginx; disabled for security reasons
-	# prce only is used with httpd
-	# kytea and libstemmer are not available in portage
-	# ruby is only used for an http test
-	econf \
-		--disable-groonga-httpd \
-		--without-pcre \
-		--without-kytea \
-		--without-libstemmer \
-		--with-log-path="${EROOT}var/log/${PN}.log" \
-		--docdir="${EROOT}usr/share/doc/${P}" \
-		--without-ruby \
-		$(use_enable abort) \
-		$(use_enable benchmark) \
-		$(use_enable debug memory-debug) \
-		$(use_enable doc document) \
-		$(use_enable dynamic-malloc-change) \
-		$(use_enable exact-alloc-count) \
-		$(use_enable fmalloc) \
-		$(use_enable futex) \
-		$(use_enable libedit) \
-		$(use_with libevent) \
-		$(use_with lzo) \
-		$(use_with mecab) \
-		$(use_with msgpack message-pack "${EROOT}usr") \
-		$(use_enable nfkc) \
-		$(use_with sphinx sphinx-build) \
-		$(use_enable static-libs static) \
-		$(use_enable uyield) \
-		$(use_enable zeromq) \
-		$(use_with zlib)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	keepdir /var/{log,lib}/${PN}
-	fowners groonga:groonga /var/{log,lib}/${PN}
-
-	dodoc README.md
-
-	use examples || rm -r "${D}usr/share/${PN}" || die
-	# Extra init script
-	rm -r "${D}usr/sbin/groonga-httpd-restart" || die
-}
diff --git a/app-text/groonga/groonga-5.0.9.ebuild b/app-text/groonga/groonga-5.0.9.ebuild
deleted file mode 100644
index 7854044dc1d6..000000000000
--- a/app-text/groonga/groonga-5.0.9.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils libtool ltprune user
-
-DESCRIPTION="An Embeddable Fulltext Search Engine"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
-
-RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
-	libedit? ( >=dev-libs/libedit-3 )
-	libevent? ( dev-libs/libevent )
-	lzo? ( dev-libs/lzo )
-	mecab? ( >=app-text/mecab-0.80 )
-	msgpack? ( dev-libs/msgpack )
-	sphinx? ( >=dev-python/sphinx-1.0.1 )
-	zeromq? ( net-libs/zeromq )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sphinx? ( dev-python/sphinx )"
-
-REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
-
-pkg_setup() {
-	enewgroup groonga
-	enewuser groonga -1 -1 -1 groonga
-}
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	# httpd is a bundled copy of nginx; disabled for security reasons
-	# prce only is used with httpd
-	# kytea and libstemmer are not available in portage
-	# ruby is only used for an http test
-	econf \
-		--disable-groonga-httpd \
-		--without-pcre \
-		--without-kytea \
-		--without-libstemmer \
-		--with-log-path="${EROOT}var/log/${PN}.log" \
-		--docdir="${EROOT}usr/share/doc/${P}" \
-		--without-ruby \
-		$(use_enable abort) \
-		$(use_enable benchmark) \
-		$(use_enable debug memory-debug) \
-		$(use_enable doc document) \
-		$(use_enable dynamic-malloc-change) \
-		$(use_enable exact-alloc-count) \
-		$(use_enable fmalloc) \
-		$(use_enable futex) \
-		$(use_enable libedit) \
-		$(use_with libevent) \
-		$(use_with lzo) \
-		$(use_with mecab) \
-		$(use_with msgpack message-pack "${EROOT}usr") \
-		$(use_enable nfkc) \
-		$(use_with sphinx sphinx-build) \
-		$(use_enable static-libs static) \
-		$(use_enable uyield) \
-		$(use_enable zeromq) \
-		$(use_with zlib)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	keepdir /var/{log,lib}/${PN}
-	fowners groonga:groonga /var/{log,lib}/${PN}
-
-	dodoc README.md
-
-	use examples || rm -r "${D}usr/share/${PN}" || die
-	# Extra init script
-	rm -r "${D}usr/sbin/groonga-httpd-restart" || die
-}
diff --git a/app-text/htp/Manifest b/app-text/htp/Manifest
index a5c3b9bf32e7..b244e5404530 100644
--- a/app-text/htp/Manifest
+++ b/app-text/htp/Manifest
@@ -1,6 +1,4 @@
 AUX strip.patch 261 BLAKE2B 760a04284f2b79e942fbee21d7b075d41c047f8f7f5eca563f6754e4a9fec1c372986dbcc965f2a1009ac26f8347868f7c0cb4bb767ac98c3be8b2895c49677f SHA512 2f2a9afb828e9de08fa97ca2798a0d2dc6f65cbf192cbc749c3790ed542f75c49c5fbb4644fb8017f93dc24a42c584914d5659841a211c1fe74a3aa43be633e4
-DIST htp-1.16.tar.gz 141133 BLAKE2B 58f0ab7df1400d561ec1994a98ce4fa3acaa3299b51d9382f9baaecbd95a623795d72204617c153fd4e165910fdabd0328e737cccb242be2075edd2573af55c1 SHA512 f33a9497fc3a1d0b95d8e3ee2747583d58626b565644e7c8cc054570458907aac9db42c6fa816b176b0e10db98ec7d1cedb521406035a8e7173e1abd991533a0
 DIST htp-1.19.tar.gz 208683 BLAKE2B 86837290a2f14b8a0337d9eb6a0fa4ad553c5c51074d5df903ee19aa7ba441898199f0649b39b93c35fa3707e4084a284e02d8802c014bf5c0277e3f18d02c98 SHA512 32d82bb42ef877bd815fe45fa81599a1428ad6d3269cbe53a4e686bcfe6d1c12ac2af280462768d488b1983ca67cc521da4ed78cc82d904575ffeff08c7eec1d
-EBUILD htp-1.16-r1.ebuild 1229 BLAKE2B fec83aa0771a504a8f53da9fc66663f15b59f093f784c0b7d46568d408b46f3a694a093139df4cd9bc383de4d5764f617eb3a2e649108985b912d23ca7dbe487 SHA512 9e9b73f8b7d413446be1be74ddc673e30bb75035244f63346d7da29b699d38940c9c12c5095dec942d9264f749b4ac73dbfeff7f862feb9e4f14cfc5d3f502b4
 EBUILD htp-1.19.ebuild 698 BLAKE2B 943bad8608f7c0eb9677747b2a68838204c4c8d0a1137eba07f8a7c8844dc16e99b215745b707d8df7e94616fc08b8802d625bdbf25cf18c176dde59dfdb69b7 SHA512 d7f085bbdc08fb1b1a0afaf076c1593bd4ad96d2ee26e65c98f958cd01fa1112074d2654a39ea3f47e12d787a33dfd1585fa24edad65ec0db0a9a0880535cdab
 MISC metadata.xml 323 BLAKE2B 815632fb1a839f62a7e2201270b77e1cb16955e5bcc978bebd09d0501eb2df6f56bf20a8ed6a7c2ed6d7a5fcb5d0900a06c38f22dc649c731ada0d36478f3aa1 SHA512 f5c0a7720bd23aa0c604e0ffa07e2925afe69f9af09c9364818e16197fdf55c1decac5839234cdb08e483be1bfb4d0a88279e57c2b48c0002d3de27e90616f26
diff --git a/app-text/htp/htp-1.16-r1.ebuild b/app-text/htp/htp-1.16-r1.ebuild
deleted file mode 100644
index 6a5c090922df..000000000000
--- a/app-text/htp/htp-1.16-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An HTML preprocessor"
-HOMEPAGE="http://htp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="Clarified-Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
-IUSE=""
-
-# HTP does not use autoconf, have to set options defined in Makefile.config
-
-src_prepare() {
-	epatch "${FILESDIR}"/strip.patch #240110
-	# let src_test take care of testing
-	sed -i -e '/SUBDIRS /s:tests::' Makefile || die
-	# don't install doc files with +x perms
-	sed -i -e '$aINSTALL += -m644' homepage/ref/{*/,}Makefile || die
-	# make src_test abort on failure
-	sed -i -e '/DIFF.*FAILED/s/echo/exit 1; :/' tests/Makefile || die
-	# the png file in this test isn't fetchable
-	sed -i -e 's: width="630" height="331"::' tests/png.html.exp || die
-}
-
-src_compile() {
-	emake \
-		CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \
-		CC="$(tc-getCC)" \
-		LINK='$(CC) $(LDFLAGS)'
-}
-
-src_test() {
-	emake -C tests
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		prefix='$(DESTDIR)/usr' \
-		pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \
-		install
-}
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
index 09e92a967f6f..efda90d75bcd 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,4 +1,3 @@
 DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942
-EBUILD jabref-2.10-r2.ebuild 1818 BLAKE2B 9fd1b25bb773e29e924cefce7e7b85046f1c84c88727c8009785af90dfe65475454962f5e3c0b88d3788cc37ea674374500b8d14fd1163df06c498a407417479 SHA512 4c685bce3c6d9cf4dae811548d7f230647049c728669bbb5816ddf1de43c226efe1002d7e2d42cce7008a4aaaf920e5136913b1f0072d49953f808ce44e2e050
 EBUILD jabref-2.10-r4.ebuild 1839 BLAKE2B 14f139884a63130ffdf59ee41f8640117ab925a39058c6ec80d515d7e8deb8379da387baa50023a08e218888811f1fb89ee9bb840cfdba2a0021b8a09da83f4e SHA512 53df22685ae2fe8a572f87ddb0bb1b953438bb05d2a8fe6ad1a64a97037348819309d55e3d532eea61fbba5c58470e732a68005fc5eaba435d90b55f89b0898f
 MISC metadata.xml 537 BLAKE2B 1aa32da69c977641a51f05b3e615d4cfb15d21912ab649b0db7f6a4b35daf5428225431533e97eca895253e4370dfd03baa60beaee4ee333a225df8942e715d4 SHA512 8478bf7312a365c4fce15051b0cedb465e92a274e215bcf989e744434ed93f568217f953cbaa07e9adfc5e620187d4ed4076d3201806bfe2df55ae8743bfaaa2
diff --git a/app-text/jabref/jabref-2.10-r2.ebuild b/app-text/jabref/jabref-2.10-r2.ebuild
deleted file mode 100644
index 731fc02ac090..000000000000
--- a/app-text/jabref/jabref-2.10-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit eutils java-pkg-2 java-ant-2 java-utils-2
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="http://jabref.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-COMMON_DEP="
-	dev-java/antlr:3
-	dev-java/fontbox:1.7
-	dev-java/jempbox:1.7
-	dev-java/log4j:0
-	dev-java/spin:0
-	dev-java/microba:0
-	>=dev-java/glazedlists-1.8.0:0
-	"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-java_prepare() {
-	# Remove bundled dependencies.
-	rm lib/antlr*.jar || die
-	rm lib/fontbox*.jar || die
-	rm lib/jempbox*.jar || die
-	rm lib/spin.jar || die
-	rm lib/microba.jar || die
-	rm lib/glazedlists*.jar || die
-
-	# Remove unjarlib target (do this only once we have removed all
-	# bundled dependencies in lib).
-	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-
-	# Fix license file copy operation for microba bundled lib.
-	sed -i -e 's:^.*microba-license.*::' build.xml
-}
-
-src_compile() {
-	local EXTERNAL_JARS="antlr-3,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
-	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
-	eant \
-		-Dgentoo.classpath=${CLASSPATH} \
-		jars \
-		$(usex doc docs "")
-}
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-
-	use doc && java-pkg_dojavadoc build/docs/API
-	dodoc src/txt/README
-
-	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
-	newicon src/images/JabRef-icon-48.png JabRef-icon.png
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index e434ca1b5e0f..6337820a5611 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,7 +1,5 @@
 DIST lcdf-typetools-2.106.tar.gz 643503 BLAKE2B cb016da74dfbad92808292842de653badec4dd3b703fee5e177016856a795e1383ceeed68de668846cce167b7b9c74bd7e0b17ea3a60b2f9b9caa0b73444e02d SHA512 039215132585214e6518864161885f7a06f08f8b36b002a961b1d83182e388b31eb034eaa4466ba56a2af52e1cfb202e88f004be17c22df1343f94481e3114cf
-DIST lcdf-typetools-2.107.tar.gz 652445 BLAKE2B bbbc428673c8e036f8d3be8ec80dbcf8892f60976fee7f11d622af8442c4d3eda0e118d47b364f55fe0dc8b53062ece0926be1d67e6627500a787bce810c074c SHA512 be54d4346d567c640b260dc513854085901af96b82701fccb8f0feae4b373ac69962c568a648515eb9ebfcabc828359ab2d742947ccdf9422643b0d889961ff3
 DIST lcdf-typetools-2.108.tar.gz 651350 BLAKE2B c60986672a31bcf47b876fa75d04a976be761442b04b1541f7f9082521d716708542b8708fd3da558f9df6b459cca1043a7e1ee2eb006f94054611dd4ef348d5 SHA512 2c7afe1c6838f432ddd5bbd5fa86a58743242d5a2203220d3cd0153c0c69f23ca734e8d4352ed3c8a6bffc1c61bb93c19d00c6483545a09d6f8363f870bf2fd0
 EBUILD lcdf-typetools-2.106.ebuild 863 BLAKE2B 7789c49b02c9c7f4be70c853d4a8c90537b4d77e7386c875a2b06e777eaf4bb4e056d2d4458308b2d30b4f52f5228813fe80d6e361a75af08823bfe779ed4a8c SHA512 50ca06f247bdc12a597989c94073085e3c0efbe30345c3b6eab63b6d0a34c92f2032ae4b9e968f7d7f0268472287c3f094eeb197f22fe45fc462e54544e1b046
-EBUILD lcdf-typetools-2.107.ebuild 870 BLAKE2B dc9521fe2510e84e01410a8e0f9b1ab67f6f2b991bb85eb28c822f7dc3cad20c00833c6ccc2385b9a2ab21bf6b9e7115116c9325cd35ced95ca2025c878114cf SHA512 012fd232f0a36178e410ff311b6fb75a522f2dcea6ae4d97a06123a944422c09945fd01722da51f22c271176554fd8616093fd22fdcac48666c668ab5007cfd1
 EBUILD lcdf-typetools-2.108.ebuild 870 BLAKE2B dc9521fe2510e84e01410a8e0f9b1ab67f6f2b991bb85eb28c822f7dc3cad20c00833c6ccc2385b9a2ab21bf6b9e7115116c9325cd35ced95ca2025c878114cf SHA512 012fd232f0a36178e410ff311b6fb75a522f2dcea6ae4d97a06123a944422c09945fd01722da51f22c271176554fd8616093fd22fdcac48666c668ab5007cfd1
 MISC metadata.xml 794 BLAKE2B c611036ee3c2daf88b72b026f0d8bec0e05595db2f73df051fb37793eda6304e1a32137e7759028ef4eb75bc56426d6ee2649d5384bbcc41c2da56d32a647b8e SHA512 9ae4e29814e34012d731aacc0a8b4a38649c95a988049f3fc10c7f260cb6ebcc57caa0a93d21eb8e66e64207673842ab7ab2fb71792ed3d537b7eca891609cba
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
deleted file mode 100644
index 54e4b30c16d1..000000000000
--- a/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Font utilities for eg manipulating OTF"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="+kpathsea"
-
-RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	use kpathsea && has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	econf $(use_with kpathsea)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc NEWS.md README.md ONEWS
-}
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index 07c28258985a..d9197b2ed096 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,5 +1,5 @@
 DIST libnumbertext-1.0.5.tar.xz 281640 BLAKE2B 5480c72fed80a9d4825b37a876efa8588c8efb187ee5a65629ac800d98a2882312f443736f4c967ee0ae2fc32a0dbe758b1c275378d807df3d1da4cee6dff9bc SHA512 4d61464f26f631d272ef7285fbb931d3931b08240b58166b7e9a28c95ff5a537ca04af4c9673541b73997339d66061858c9cd18873b4c16f9ad2ccd1b68e81a3
 DIST libnumbertext-1.0.6.tar.xz 283416 BLAKE2B d02a521db19a21c6036412f902af7227d7442ca25d38e5e35339f74c8ee6e275ed085aeb4c4f07f998bcdc33ac62be84ce6915dd430594dedad1fa0f65b388b6 SHA512 0b2a5226f363af9a6df90f788f6cdc5fe95ddb524d96ad2db1caf2e7f414649ce2975eae3c9e5fceecbf825a90c736a0717b02ec9671e980ab9cfb3e2df73b8d
 EBUILD libnumbertext-1.0.5-r1.ebuild 544 BLAKE2B 886724679f53691089fe45359180712ee3bf74c16c7a939fda4b84493283065fc6f9cf9ca4b6890adf6e0f2f390cac52fe4c20294232db7f96fb278e28da4b83 SHA512 d3737fb073898718813b7b0465a295a9e772f6fb119250b6d70522ca09802f79e2a3741788f63985a29c1d55d25f78f55e2f3271ae9b7327b013e486fe38b786
-EBUILD libnumbertext-1.0.6.ebuild 547 BLAKE2B 1a08a4acf77cec1ee6ad97206badb8c594e057f2a8b17275db251676a7ebb1a806b89bcee25fc44ef126f70bd93e0f98dcd8d3973afc003c6a726eaff02447c9 SHA512 bae5fdba976bb5ab02f407887916f1e247bd5352e597195889bef0b26ae3d15123232490cbace05fdca002b0363b1aea8a07900caa96ca850a0eca7640fe587f
+EBUILD libnumbertext-1.0.6.ebuild 546 BLAKE2B 525a518f93f30c5f039a44ec638db8fb655637d45ae0441d38be80609eda2d3489970a85fadc3e1e9b6dc26eccfe513318f269afb88b95d9fd6e47a1d3ca5f12 SHA512 c4ed0b8bba6f24349340ce6a5e6bb5fa64ad1ab482912aaac5363886967f9467d327fe0337bcf7d22dfb4aba4dd8dc5c7a3926dba68b70e01f2622757f839d43
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.6.ebuild b/app-text/libnumbertext/libnumbertext-1.0.6.ebuild
index f652a58f5a45..eb21ab61e89d 100644
--- a/app-text/libnumbertext/libnumbertext-1.0.6.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE=""
 
 src_configure() {
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 61d82c830d50..88b4a532d911 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,5 +1,5 @@
 DIST libwps-0.4.11.tar.xz 706000 BLAKE2B e733b2fed9a05352b41126b2c0225807b3fe9a57f01f3b2a3bf35f99bd0adbd47bab8ef058f45de749332d407d589f6c33a03a3579fc76551548cb92c236e09f SHA512 6c81342b68fd93974c10ec0907dd46e9417cafa46d06205843941650828f4299a8793a7ace5c0ca755b8b9fb91fc1d6ef63304c641e7b5de36885e9995566e36
 DIST libwps-0.4.12.tar.xz 713008 BLAKE2B c95bdab54f8853cd1d13b59904ee4064cded3741cb91f2b067f139d80cdae6ea19bac68e6855cad74878403bc1a04c6f4bdd3181407b69b7e50f1e7bf4255f58 SHA512 d23667681f443b0c718b55006bee881e8a07d6b071cda742a783a89e9ed0e4c60c66c7dc9612a3fb4a419ff6d6e572f5981cec1d9470422e10cf9837e92a4649
 EBUILD libwps-0.4.11.ebuild 782 BLAKE2B 74bd852c8cce0c5ccacf6d96f30f9dfb4b1f68a022c7f75fa11ec86f29bab9a5d8c5e671645bb3bcf6813771b06f0d2778b1a15b0d70773a402c8129e73dd65a SHA512 b27f0287b4ac60676578b94e0398aaa2b820b068b716478fdd73681ee91b451aaa8a66edb9f8d0970dc2cddacd04fd29c049c5c0d9b6a4f1cd647b678384c11b
-EBUILD libwps-0.4.12.ebuild 757 BLAKE2B fa5142857e2530c08f2dd024b3d9d0623ed8ce41c4b7a4433b1f01fa67edbb4a12cd21883495820ec5161c15b6cf718804c9a01d4b1b19328ce2e4837587cf16 SHA512 08c95a50555af60751821b42395f79f74dcba4a2ca48c23d44988af6ed93617ca9469398af418ec201da9d877be3cba392b9b90b1260395f2dc7c90e54b3ab46
+EBUILD libwps-0.4.12.ebuild 756 BLAKE2B b2ca793800d38a7fe1073b241d71b89e19f551aec31a0ab8340046c3bf17008df90a64ef4006582da9fdb9f4ce14605a86dabf144b332a99bfac1fed158a4d02 SHA512 7311f62ef7c72dbb95a10beb63b4a4d1b37111dea4dc9a84bb5b9a73691574522f2aa256ff388750768d309738c321429dbca32d487c518f0d7edb7a506a76b9
 MISC metadata.xml 512 BLAKE2B e2125277139c062748282be37319771c209ba9b9c6f68e0ab9b8e9b5d10c4dfda9f6369aca792be2f21db8c1dcf3e840f78f159190162114458ed9279bf46270 SHA512 971b6f541825d73b66f09bc6b6ab677c2b1f1430a6cdd469dfe57162528d13b048681c8e00de061aa8ef5f98914b36b8bce7e13a35044937e65298469241bc1e
diff --git a/app-text/libwps/libwps-0.4.12.ebuild b/app-text/libwps/libwps-0.4.12.ebuild
index 9499a49c965a..fa7139d22038 100644
--- a/app-text/libwps/libwps-0.4.12.ebuild
+++ b/app-text/libwps/libwps-0.4.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc64 ~x86"
 IUSE="debug doc tools"
 
 BDEPEND="
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 6017e92fe834..ba4b3318d85d 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,6 +1,4 @@
 AUX multitail-6.4.1-gentoo.patch 1440 BLAKE2B 968afe0a5f78e328c16019df6330cef6abc03999d919e4f761c4cf97d1a465a9aa085452538f48f6f1f0357d1b9a7a69f48dfc47fa2c09703595f896dcc97fdb SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7
-DIST multitail-6.4.1.tgz 155717 BLAKE2B 621e511c74f774681de95c7ad85bac12d528ffac1808ff22b5824c3b97c64397db2d084697a2d4f11a87eab3d4ff29715632d51afa7f7338178a9e89ccdf6e1c SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b
 DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
-EBUILD multitail-6.4.1.ebuild 1297 BLAKE2B f42d72abd21ec2b2d5e8386dfe5915fabb73538a47dc353956788c3f86d6d7f05a27334dd0e6f94d1edcb48ea0e83d82034a517db67b7c543a83c01a84e6e38c SHA512 1b14d664c5cb2f4d17c96785c59f38655b2241a437e738a345bc479da37e3934441eabbea5deba077fba4b26f05e4e2e18b18843bfcb2f55e64943550cdadf96
 EBUILD multitail-6.4.2.ebuild 1315 BLAKE2B 69c6437bcd25047d02850de483fc6533603fd73b94277f25f619770f603b6c1a5440353b8f8e0d46b05959865451325383c316d2aa1f15d1b07b46b4e2fcedf6 SHA512 6c6268804d965d733cd1fb9148012dc4f24693b7ae9d2067d4f3d6262e8826e781bc9a8010f1f4e745fc7b16cdd8f2c4038674051e615886a4cf5930f3af9e9c
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-text/multitail/multitail-6.4.1.ebuild b/app-text/multitail/multitail-6.4.1.ebuild
deleted file mode 100644
index 9b88ebb4680e..000000000000
--- a/app-text/multitail/multitail-6.4.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch eutils flag-o-matic optfeature toolchain-funcs
-
-DESCRIPTION="Tail with multiple windows"
-HOMEPAGE="http://www.vanheusden.com/multitail/"
-SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug examples unicode"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-RESTRICT="test" # bug #492270
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-6.4.1-gentoo.patch
-
-	sed \
-		-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
-		-i Makefile || die
-
-	sed \
-		-e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
-		-i xclip.c ${PN}.conf || die
-
-	tc-export CC PKG_CONFIG
-
-	use debug && append-flags "-D_DEBUG"
-}
-
-src_compile() {
-	emake UTF8_SUPPORT=$(usex unicode)
-}
-
-src_install() {
-	dobin multitail
-
-	insinto /etc
-	doins multitail.conf
-
-	DOCS=( readme.txt thanks.txt )
-	HTML_DOCS=( manual.html )
-	einstalldocs
-
-	doman multitail.1
-
-	if use examples; then
-		docinto examples
-		dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
-	fi
-}
-
-pkg_postinst() {
-	optfeature "send a buffer to the X clipboard" x11-misc/xclip
-}
diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest
index dd1e2223bb89..f817bf85f81d 100644
--- a/app-text/pdfgrep/Manifest
+++ b/app-text/pdfgrep/Manifest
@@ -1,7 +1,5 @@
-DIST pdfgrep-1.4.1.tar.gz 151926 BLAKE2B 68b846b26c28e8209fa3ac7a7e6fe3d0c4c6a298e9bea2e3929fd82a44482ec914bd3594f3e07da8c56766e94ca3d4c3c2d6997364393e95b3741b1bf9685ec5 SHA512 27ce23c25a5f284b3eba92a0f8dbf02600248548967c1e71dfb41e43528824d9add587ea0ac23899ff07d2ffc6c74c2e6e4c2e7240e69494b8d31b7a4afc3735
 DIST pdfgrep-2.0.1.tar.gz 187217 BLAKE2B f498158e63e2f8419829df0d1801a31d3dff02627ccf0efee7239650203300233d1a19a5c72c57eb24495f2b5403e0e2c6a479b0f28a8d053aa578c732866b1a SHA512 4285f8cb514975a0040cdd6b82133090e27ba5c2f95ca880dccc3dd4fa3427260a5fc73d807df9124a79fa36ac6ed8c11380cde11e00599ed7134d92c50df4a0
 DIST pdfgrep-2.1.2.tar.gz 197289 BLAKE2B 94d20649104f7b17adf2d99bdf2ce215cf16746c649f7ec77d58a41b90b13dd903d47b5ed2d35f56ca7ca12ae49cfb8a57004f9ad3ee6b8930f533b33d7d8463 SHA512 27bc4741e5203b2fd265815a22ad8d702b3455b2ae932641b040fc9ce615bc9ff0abef221eb2ec8aa59c79cb139d31184261d076f9731177129a473d62aa4e5c
-EBUILD pdfgrep-1.4.1-r1.ebuild 631 BLAKE2B f98ddc8be42c8534972df535a2e27bd433278382cc854d23fc34adf75b98cd07eecc22d654e79bfe1149e4fdc1395a3186a815f3947625ae8dbe8335088f28c1 SHA512 3dd3e6515d913d44b749d0491d6120e6ee32a3f3ea458d8d3515c1d6ec0e99719d5dc85005ec4951158dff230cae1cfaf751dfde131324cd079f58bd2a73b7fe
 EBUILD pdfgrep-2.0.1.ebuild 701 BLAKE2B 8b877e130a6d58635312771cb09778454d25fbb87cb2686deb92adbb981b9ecfb5706fe842a6bd8477e67d098d07c4e941809b94f7e92a29f456a0934c843844 SHA512 c1c78707a9cf2589800d275b50dc0a8a97a7f5477c2f1f0773312801aad082c2af4752380d5463aec6b136ead175d4f42cd75d9632da8bebe557c4776b03a879
 EBUILD pdfgrep-2.1.2.ebuild 761 BLAKE2B c6879de906a6b25f22eaa4e24566df386ea4b9545da164084a61465664d82559d24fe5b9ef860902ea6932b05f1580888a8704a7553550f34643b857e10f66ef SHA512 48865871bd3e0f115e7acaf64218703341ef162e637609adbe138f70a73ab32e8d30b46bfb433e447a79ba648a3ad5cdf5b9596d7aebd431fd29971905b6ad7c
 MISC metadata.xml 492 BLAKE2B 7cee2a75825f42f20f364427915e938fecd8a62d0d7053bfc8dad1f9e377a8d0ef5f6155c756fef486a0136181b67b08d5536783613d27cfd63bf32b850a6f69 SHA512 2db060e5b59ad5bb8d8f1d66178e28ca923afbf68420898b27e69bb46f7edea4296bd87f2f35c954f75062cec9b765369aaf45a5516d33b79581ae60efc25d1c
diff --git a/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild b/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
deleted file mode 100644
index bd8de67b356e..000000000000
--- a/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A tool similar to grep which searches text in PDFs"
-HOMEPAGE="http://pdfgrep.org/"
-SRC_URI="https://pdfgrep.org/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="+pcre test unac"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-text/poppler:=[cxx]
-	pcre? ( dev-libs/libpcre[cxx] )
-	unac? ( app-text/unac )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-			dev-texlive/texlive-latex
-			dev-util/dejagnu
-		)"
-
-src_configure() {
-	econf \
-		$(use_with pcre libpcre) \
-		$(use_with unac)
-}
diff --git a/app-text/pdfsandwich/Manifest b/app-text/pdfsandwich/Manifest
index 10e5841dc049..aa15d007e5e9 100644
--- a/app-text/pdfsandwich/Manifest
+++ b/app-text/pdfsandwich/Manifest
@@ -1,6 +1,4 @@
 AUX pdfsandwich-0.1.7-gentoo.patch 1211 BLAKE2B 47461d33a0ecea51de9db0cda447f13c74094b7bf630abfa0ca0b5a72357e20b9adfc86b2035b89af8addbec9ee9ebdac9751490afe7166005c2ebad2b9333bb SHA512 d9865439ea2ed6ffec6c30abe9da1042b5b12a28d266131d421e1d459ff8f0bd60f8d6c2e68017464341f26215a04b4a537cf3f445cebeec55723831a9dee454
-DIST pdfsandwich-0.1.4.tar.bz2 16401 BLAKE2B cb431f35b199e3e6290c60a3f6c7b2621dd3652a29346092869d8e5f86f5664079de1ef431f9b5e8b9f7cc044d64006295a8176d6a28b2ea5fb820db8c952000 SHA512 ee03aea13c72cc5a02136b5d16d2425f685f0b7a9d6fa6cff6c792bd24e6316720dff321b5e8237b949c98c713f39cb8b08b855b76e2a77350927b1ee7943171
 DIST pdfsandwich-0.1.7.tar.bz2 17461 BLAKE2B edeb08ab55df89ef2d1f3e43446e831c66e57273b36ecd56a4cc5f910ca5b59a03e2a66b13e7150f06f8f3eb26ed14cd1c80d02cd38d6bd6cfe923c30c801577 SHA512 ac315aeba2cc753fddc380e2522d0c41d65ea80372a23c2cd5371ebc239ac104ab5a5a1386378b9e026b2935a767128224f7617a5eb8f5ef9d6874cc18ef83ff
-EBUILD pdfsandwich-0.1.4-r1.ebuild 970 BLAKE2B 416b43bc2a95175aabde4379e23207fa524bb882e4b40c7c61c1fff87fb6b016721bff23720b2bf7712892b4eb7d5786edf7c5500dadb9a5ec1646eb7612c8b7 SHA512 3505739fec5f3d76a7d51c0c9f4f4cf992faa59e23779dfd0ebf677246da0a794ca18af304a5631e7fc0984bd698bfe69f6c3a012389cdc943a543ac0fe4b263
 EBUILD pdfsandwich-0.1.7.ebuild 1044 BLAKE2B 93a792a16a1e7612283e25d56b92648614fd606a19b50065192a904cdf12b20e1ff297b8f6c925e92ef5320b5fed08aac94e152a3e8a1c44c9375a96bf2a6dcf SHA512 dd59831311042b08e22a818b2cd553e26b0e7a58c2e3ee558d16a13100b7a3636bbe36f8a791fe8ce15d134aa1d452e5e100a7f427e1859c763664d1d4cdceed
 MISC metadata.xml 939 BLAKE2B 88b45ad8aa691ea97c50e7b9ba9f97455eb8557e8d244f70eb3715b8838530ce8cad94c0e30f8d73755fb738c798d727dab80507260a34298266f2d8cdae608f SHA512 b2e12b2457c8e8cdc35b7c6a3bcce5c52850a554b378849201654ba892f223891fbdfe58f1b6b9bbf711b621c01a5507577241e3c41746fd29e3b14cc5c6bd19
diff --git a/app-text/pdfsandwich/pdfsandwich-0.1.4-r1.ebuild b/app-text/pdfsandwich/pdfsandwich-0.1.4-r1.ebuild
deleted file mode 100644
index 21bf32dcc96f..000000000000
--- a/app-text/pdfsandwich/pdfsandwich-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="generator of sandwich OCR pdf files"
-HOMEPAGE="http://www.tobias-elze.de/pdfsandwich"
-SRC_URI="mirror://sourceforge/pdfsandwich/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="png"
-
-RDEPEND=">=app-text/tesseract-3.00
-	media-gfx/exact-image
-	app-text/unpaper
-	app-text/ghostscript-gpl
-	virtual/imagemagick-tools[png?]"
-DEPEND="sys-apps/gawk
-	>=dev-lang/ocaml-3.10[ocamlopt]"
-
-src_prepare() {
-	sed -i "/^OCAMLOPTFLAGS/s/$/ -ccopt \"\$(CFLAGS) \$(LDFLAGS)\"/" Makefile || die
-	sed -i "s/install -s/install/" Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	elog "pdfsandwich relies on the tesseract library for OCR."
-	elog "Consequently language support is determined by tesseract's"
-	elog "language support which in turn is controlled via the LINGUAS"
-	elog "variable in make.conf."
-}
diff --git a/app-text/tofrodos/Manifest b/app-text/tofrodos/Manifest
index 61a2eb906b8f..3633599c75b4 100644
--- a/app-text/tofrodos/Manifest
+++ b/app-text/tofrodos/Manifest
@@ -1,7 +1,5 @@
 AUX tofrodos-1.7.13-CFLAGS.patch 192 BLAKE2B a83cb40a82e2034820315423d4da8dd800cbf5c5e3f5e50c04e7d489e5b68c471c19c846ae40db4f69c2568d03ce79640e8bb5b6438c6dcaebbfb0f1d103067e SHA512 137b0d00edd1a534eba7a415b46ddc455eb5954a06148ca2132579bcca859b18b642deeb6e5bc364e1ec1824a5f0d72512de58109acbbad2ba958b6071aa9723
 AUX tofrodos-1.7.8-CFLAGS.patch 306 BLAKE2B 4e3b3ec28cb47d758d053394c4a0c806f27bc2bb97f0b715e85c21c6c3646924fcdb0b520dd819460f84c787a5852e0aab3ff67479c16dd959aa202b3c04711d SHA512 d96573638ba4cc4c3413ad42b903a08ac84286571317097aabcba7dfc69f794e53601154b5faf3e19ca0833377a742df745209ae3958ec9e7d2895e13bce5b2d
-DIST tofrodos-1.7.12a.tar.gz 97588 BLAKE2B ca8794df5b58e0e88d23a52287ec3f9c58918baa6590b6e2d571782c4c2ff1625e208648cce8346b2f63b52031da5dd3aff0e66522e670525cdc09bdfd8744b0 SHA512 45a03203ccd053ec02a420fe4a63b427ee74dfa2c30e914836621a1cd7836ce81800e8bd5f1cccdb93233780ce79bc74d4ad49dca6192899b3039cf559baa8a2
 DIST tofrodos-1.7.13.tar.gz 99975 BLAKE2B 677b5cf7b1ef061b86a60229e083dc19ddcb7887b1319685ccd5a50493c1f02feb8556db3c2866f3ca1851304d0e97592a8abdd880a5f4e70eb7032f4238445d SHA512 629804caf20ac7bfc6f47637b7bc575766f032e324142df3be14347f050c61d969e023f8fed0ce5c87d8fc57b25c60c4e0214600738c5079d5e731045dae4843
-EBUILD tofrodos-1.7.12a.ebuild 699 BLAKE2B 6cb65a781ef4ea7b86b8bd62a4ea6714140663dac58aeb24d349eef8856f3fc7e5cc46e3f0d7926d11a897d4208b845b86886bd5c4e50ee5dc6073a21492746a SHA512 8c4e88d3082d5c597f18fcf45c092ac86d291236ab9cd2e78cdae2a62cb6c85bec5adbee83007c9a64cf8dfe85401db3ace18e45561ac13ea7d92284943462ad
 EBUILD tofrodos-1.7.13.ebuild 678 BLAKE2B 506e4bffe84c7af833a70ba1db010c57e097ac17aded77c4d222e1bfc6bb78ef23d77008f96ecd7e3069b0a211bff3de87b350c932dd054176d7bb7ee2e4c9e1 SHA512 43401bdad6358fc79d96015dae8df3dbfdfaee3c02535fe6540660e7f9b6c07eace732df3aaf29864f48d003cee0768d29c3f7b75cf2be5a81f842ef8d5e391a
 MISC metadata.xml 325 BLAKE2B 89b80fe9769278e73ae9aaeea66f6037a6321f25725f6645a0b02220d1ba06a18213bdf71a2d7676150d75f58ba67ad79a4f4f5fe8c8ba7e5dd4d95054c0e45f SHA512 d32c6a8e3e9bd397896145130afc1328ed86f507af35e2ab5b0a9b385462624542728178a06530af5cda863aee10e961bf3d189fbe3d1cf64619ba3d0a8f0b8b
diff --git a/app-text/tofrodos/tofrodos-1.7.12a.ebuild b/app-text/tofrodos/tofrodos-1.7.12a.ebuild
deleted file mode 100644
index cc6d10bee44b..000000000000
--- a/app-text/tofrodos/tofrodos-1.7.12a.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utility that converts ASCII files between the MSDOS and the Unix format"
-HOMEPAGE="http://tofrodos.sourceforge.net/"
-SRC_URI="http://tofrodos.sourceforge.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}/src"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.8-CFLAGS.patch
-}
-
-src_compile() {
-	emake DEBUG=1 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin fromdos
-	dosym fromdos /usr/bin/todos
-	doman fromdos.1
-}
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
index 615c717786ec..252137bd890f 100644
--- a/app-text/unrtf/Manifest
+++ b/app-text/unrtf/Manifest
@@ -1,7 +1,5 @@
 AUX unrtf-0.21.8-automake-fix.patch 191 BLAKE2B ca81dbbebd8ab2ae786e6291018ecae848ee79a0193c0c176e15052712363f196776b2014a83a2f294d718528588251087c896c87f24335dc4f1fcaf76b926a3 SHA512 7df52c8bc5a6955096fdb3a0e2c151ecec8226c4f703a7d6095f9ca4e4507084b0b0a97b10d853b5da0e27b01bb4e73a6080aec35e5fef14fb015c36bed222ad
 AUX unrtf-0.21.8-iconv-detection.patch 301 BLAKE2B 53d3125d59e44da9c539a13f76d99828be94261e61e367c3582da17cb8625caa75accdd38bfb59b6a7e15a3879ed8ecaf62df3ff26d5e757a86f963ef6c3094f SHA512 57d51baa1160b772896a7fa2ce88c5ea70110d2d7edf6cac121d86849e7352e34ff0cb684161ef9a68e96e886beb6072323c9a66517691e42dce852e04035ca0
 DIST unrtf-0.21.10.tar.gz 812696 BLAKE2B 3edc654feee461bb785877c3c3829462b9f55556e352bd12a19e426911336e161431badf5fdf5e00b0c488ca1804a0922ac7eb6980ebec58232112f6cf156f34 SHA512 31bedd1a23a052c1235e1328a12b346a0fe48b3f3cf78d72c068fe0d3edf18bc78f4c9dfe2f093ee8b4f3c79e923c6ceda49bc257d191dd5371f9273809343c9
-DIST unrtf-0.21.9.tar.gz 828590 BLAKE2B 832ab672265efa8f1ed5dfdcc73e310ef920199db57cc2be5303c7d0c502a15e7027cb9539ee5a27df66e2589d9dce88aac40d465f87d39770de9c4b5d886b8f SHA512 56d279ba8c8c20b8e39705dd4313c2b1607273d02ca2cdaeca5771bdbb3d99c338b816671dba1037961879be8ac6efddcd1af4cecb5c337f899575cae2989c03
 EBUILD unrtf-0.21.10.ebuild 410 BLAKE2B cd3520f0d3fc77ae683afe34210b2cd6c93d293274aa944f9f23df3c2d19b4856fc95525e2c8a82f0d72974eba1db24ec3704f866cf1e7af629826a231821ae9 SHA512 749fdba434a8788d2ede21351de8d5fa09119b3bfd4c1652ad8e0053ea7480243b7e845ae07026de447e4e9abbaf682a510f883a01d456cee280ce35f39466c4
-EBUILD unrtf-0.21.9.ebuild 730 BLAKE2B 222ce4105c497644f5fa5183b71f9e6ce5e4750cacbe3e0b0eb15fcba31f4883ad1fb599d34b024b8f122fb82cdcbbd331950397009c62b0723fd1ddafc471f0 SHA512 e592ca14d15900ede6345f4e64ceb7a1451dded20be5f0dfdfa607bf3f6123a79cbf9a93cae4376388d692cbf9fb38a9d710e27ddcc086e378216b016189f8e6
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/unrtf/unrtf-0.21.9.ebuild b/app-text/unrtf/unrtf-0.21.9.ebuild
deleted file mode 100644
index 1bc242caf1b4..000000000000
--- a/app-text/unrtf/unrtf-0.21.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Converts RTF files to various formats"
-HOMEPAGE="https://www.gnu.org/software/unrtf/unrtf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-IUSE=""
-
-src_prepare() {
-	# eautoreconf fails when automake-1.14* is installed. Please check with
-	# next version bump if we still need this workaround.
-	rm aclocal.m4 || die
-
-	epatch "${FILESDIR}"/unrtf-0.21.8-automake-fix.patch
-	epatch "${FILESDIR}"/${PN}-0.21.8-iconv-detection.patch
-	eautoreconf
-}
diff --git a/app-text/wiki2beamer/Manifest b/app-text/wiki2beamer/Manifest
index ce3af968dccb..13a05258ad3a 100644
--- a/app-text/wiki2beamer/Manifest
+++ b/app-text/wiki2beamer/Manifest
@@ -1,7 +1,5 @@
 AUX wiki2beamer-0.10.0-doc-examples-makefile.patch 641 BLAKE2B cbac271fbfcb8a41e9bfdb4eb950a9cad46f71f38378a5a4309b401ac6a136865dae81fbe6f75bc1dcbcbc43f1d78a225c5f48205667aad869067b2eb5eb3daa SHA512 0e92df952bd4e82d6198d26f88303c9e992d9f409185079c9261ee11d3a61e76e988574ad7b830fdd9075430ed2fde9e5a635f512e71fa730557af95bcbe23c9
 AUX wiki2beamer-0.10.0-doc-man-makefile.patch 1441 BLAKE2B bfbf6c71f037d67359d1460a4e3c75b7b0a260252881efc2429ddc0b5aa90005c2c4bd36b18873106f9010803f765217f19a1575ee7ba5324ad53e52908a23d6 SHA512 b6ad3ce2b1435d79cce8a517e1a784399b349c4390c245d888b50acb2f5b89aaa49241d3687e4b5432fde7d433bf5ab5fb4bd1d4d96dfaa44358a6c0961bc76b
-DIST wiki2beamer-0.9.5.zip 443288 BLAKE2B a0263ba7044966ff45c892e9f0f78f6916346c051bf57cc8445f4127019cc4cd031719b1b5b61fc7d41a85b42439fa20cdf8fc35fbed43feb28d6d9797c781c7 SHA512 0cad0458c293c335cfb0b2181822652b12662877a2ed66d743e5f258d9983ee91fb34664c032357995606bcf17bebbb7409b6100ba2340b06cc6f253e8c6b0f7
 DIST wiki2beamer-v0.10.0.tar.gz 164911 BLAKE2B 0a532669915f0db5f1bb8755297bcd36e4175bc57d3b5f14df01566ac74e425c999447ff3f2bd20f2bcd50671bd65accfcf8049476a1656439fc46bab2becafd SHA512 712c719bcdd97f48c65aff1919f2e6a838a0beba1d2e5569063fd1f84bf68eda3137ac20e5dc463dff64c8b4656ce0bf02a0acea090b9a30262374cbee5db433
 EBUILD wiki2beamer-0.10.0.ebuild 946 BLAKE2B 21783eff4aa4eb1a981ed36a64c1ca0d10ebbf011d0e4d9c8e973117523cf112ee798a6dd2d476c87fb789df3d6073a4a5043fd674273deaae4094b302fe8b85 SHA512 1754372e1c4cc0c14988b515fa5f7cb8d42740af6e988d4af808c74ed1798232b83010aa68eb18240e3dfbeee1989d2a27516ece5ea5255564add3ed7662f9be
-EBUILD wiki2beamer-0.9.5-r1.ebuild 784 BLAKE2B 2d30ac44221d37aff5cf627805bafb0a07d106bd526ec9be8842789c1d89662e6059bd9a796a6af07b1e6cf5b08590fff4466f77da5609d28648c4a8a155e545 SHA512 2ce36544aa7ad33dc468ce4c6867e20867231e9c4066a7726c7f2e33fec43c3ddb82f77178ec1d414b55e1a6b2918c88e54cdb164e8618348ae7f05eaddfa985
 MISC metadata.xml 330 BLAKE2B 27059ed0cbe2bf10ad3b028d1f0e12b0617c0e2146432e375ccae5d570d8b1c1860bb9b9f36021a588ce859b7b30dfc04fb1f841890c549093687f3b6ad8addb SHA512 27c93b4ed84b734c1d8b6a7dc86a4d25f18694c0c096351afd35acf378e823dca63d692e853571e9d98e1e7dade682eb3802add4a7088f432279dbf890636cc1
diff --git a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
deleted file mode 100644
index c87c19f7d575..000000000000
--- a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-single-r1
-
-DESCRIPTION="Tool to produce LaTeX Beamer code from wiki-like input"
-
-HOMEPAGE="http://wiki2beamer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="|| ( GPL-2 GPL-3 ) FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_install() {
-	if use examples; then
-		# Patch example Makefile
-		sed -e 's|../../code/wiki2beamer|wiki2beamer|' \
-				-i doc/example/Makefile \
-				|| die
-
-		dodoc -r doc/example
-	fi
-
-	doman doc/man/${PN}.1
-	dodoc ChangeLog README
-
-	python_doscript code/${PN}
-}
diff --git a/app-text/wscr/Manifest b/app-text/wscr/Manifest
index 26cfb316d734..1227db98e1a2 100644
--- a/app-text/wscr/Manifest
+++ b/app-text/wscr/Manifest
@@ -1,4 +1,3 @@
 DIST wscr-1.2.tar.gz 3502 BLAKE2B 4a6684dd6d9eb9c23caa92f9ddf62332f59b20eb4aba0f475015ddc7e66c592177b0d15ec25249fed86e2302a53463f59d608bd727d97bc33a42d903ecd04281 SHA512 8a26c7fb190f830f6436240fc00dcf61405b1818ff311999e02c64b3506fa6abf13a6f212dbb9b15794ecae4f122def563f9301eebdd7e8d09f22cd647467ee3
-EBUILD wscr-1.2-r1.ebuild 614 BLAKE2B bab67559b806a208d93eb4c6a32086e0e7455408987f89178b29190dbd38db5ffd1608624c835dcef62c431e5660babb1595641ea93eb22180f05464e99e50e3 SHA512 e22ae0d8250bd8a377446b5b0c3bb60c2e78491c268a87c1156f6312ecdd5941c6fdf68acacd21907c7a918e9d50c50d5ddcc564d19729b520b62d38424037e6
-EBUILD wscr-1.2-r2.ebuild 618 BLAKE2B 1f31256e75563d9dc010ff3c53163c83cd0fd6e914a6ed40cf22cddbca38b0979e3c58047aaf6877ee4d294e8ee359828810b8f13454a821148244e2cb0bd7f9 SHA512 a269f6a1f89461263d44d8f3b37744d9055d451ed05cb7028054215b0c21b3e74c5dbea7c0fc9a38f3c380907f1e59c282b649ec8f669e4bacb38777c41e5f68
+EBUILD wscr-1.2-r2.ebuild 615 BLAKE2B 18ec7f574e279bd960b9609673ce34af861c6aa390f4a238f89f82a7ec56f0c297029142ac08e4a20dc9baf8a43eaf74a800b954c1369dd7bb242a118f7e36e7 SHA512 945b79643488740ce22f6e255a61b7618bcdeeb6c7f8bfa06f0c2b51f4a9fafb152de0376bf322ea6136ae8deef602369a93f2f6fc72208f5dd59d4a27c43190
 MISC metadata.xml 421 BLAKE2B dd48a7b914e790db0db06781519466d05de32f96ff8399e9fcb24ff040119dcec5380677910d9155c611c28203ac1ee7bf5d9602faeed69d4bff35a8cb1d6b3d SHA512 70722daa9c12a7e783b5fb3651f207c057648287e104739043f96c726820268ceb8e4ec211af9a3e2f8fcf7a5e03c9346cea7a25a70478dfdb60f333112b70e7
diff --git a/app-text/wscr/wscr-1.2-r1.ebuild b/app-text/wscr/wscr-1.2-r1.ebuild
deleted file mode 100644
index 7b47ea900355..000000000000
--- a/app-text/wscr/wscr-1.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A Lightweight and Fast Anagram Solver"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-LICENSE="public-domain"
-SLOT="0"
-
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE=""
-RDEPEND="sys-apps/miscfiles"
-
-src_prepare() {
-	sed -i 's#"/usr/dict/words";#"/usr/share/dict/words";#' wscr.h || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" FLAGS="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dobin wscr
-	doman wscr.6
-	dodoc README
-}
diff --git a/app-text/wscr/wscr-1.2-r2.ebuild b/app-text/wscr/wscr-1.2-r2.ebuild
index 1760d0f73dd2..b0d8920b953b 100644
--- a/app-text/wscr/wscr-1.2-r2.ebuild
+++ b/app-text/wscr/wscr-1.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"
 RDEPEND="sys-apps/miscfiles"
 
 src_prepare() {
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 8bcd4df9bd2b..436d0b0eda97 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,11 +1,9 @@
-DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febba2d8c79906fd98c66becd59d7d387174728551785ca42db1f69662cc157bbfc35c0e29f96958ddb76670797d9a4bcf7 SHA512 f412538cd50c82d7af28f2620c1e377afd3f03186259a145f9a37cd64d05837b7cc6f205627a3c8e4c25ec19efc2a81a6fe3a415d00b7a6f4df847d6ff2d453c
 DIST xapian-omega-1.4.14.tar.xz 540532 BLAKE2B 193e03bfea5cf7cb5fc5bfca57f80b1390ba63ca999f235a10a7ab9bf4db378273cf6f7f6b3107c80c1ebb44bdb1a94ce3c00585f83ac0bec188163633be843b SHA512 27059d13bbdfc2ee9e8f4f6e74479bac0885cabab97d7eb1ebdc57eacbff1724b2684ba72efdf6d35f608e2e8f0891d47c626aaa100c713f4c2f66f923d841b7
 DIST xapian-omega-1.4.15.tar.xz 545916 BLAKE2B be89c817d13888bc8de28973be15a512992dc1e6c23ea55f0470b179c9b29b82f2f2988c6ac430d62c3e45e6502555a3497bf3f3ce7bebf832fc8cf8e3dc9f1d SHA512 99ffe32c37b22db4557cae214a157d3b1bda27b2eb86f99862ca59ac326e5ba3f044fbd58a0ec9db7098700dd6a2422634c80987c9152536ec217e48d9694679
 DIST xapian-omega-1.4.16.tar.xz 546360 BLAKE2B 990eab976833854d2a172e1584383b71375fe2e0b83a8ff0a150f4c9fdb6e99cbd42e58720e81698292843918112426d3b445efe14d9ee5f76e85304439475de SHA512 7f8c3d4e372c49f89e28da999ee49f0754052a339bbc4492b50f8134cf29b2c433ddae9e58ef3a2468898b711b4510ea87687a247ce21e83eba2f8daaa2910c4
 DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae9b028b64389b4a6e6f1179c0e1c2a92983a3fe7a71f68fe11e04eb61e9f011c21f2edf5660f9feedccd41de8ed2f445 SHA512 0388714ae307044b486e92eacac2d8c09c334e1b77be6cc2c36f8c0c679b4fee660c9b12074e9a278e2981b4a5b4a607d068a5d16c852bef719245bb70b7ce7c
-EBUILD xapian-omega-1.2.25.ebuild 1265 BLAKE2B e6431300b0eeea58f502e8475225830986573e839441f1701cf9387c1ad53bf2bc838d08aa823c65f93d62c94501def769602b4772d714cf2d9396a052c61c50 SHA512 a22cbd4bf3a7ea46c0a60b7a1884af858f09464928f90d63e0526385e5fc6cad123446d59affe1efbad286c883c1bc125b5f6f7fb6a8b224f9b242ddcfd13a98
 EBUILD xapian-omega-1.4.14.ebuild 1154 BLAKE2B 8811fc7b98c00a549752cc33f1f6ee53a5c9af856e3bc534b830e89aae2a8f2e4dc9b33f14bb5de528bde8941c5629e3c31660daa9e20c5a77133203befd539d SHA512 58671f926670abde77437ed28e6b602777475bc5e5a57775d65d02ff0c6e0ef2c6fa1eb3c2db250c44496697ca6fe4c2bac9a48f73a0b6b8d2d657114227c347
 EBUILD xapian-omega-1.4.15.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
 EBUILD xapian-omega-1.4.16.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
-EBUILD xapian-omega-1.4.17.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
+EBUILD xapian-omega-1.4.17.ebuild 1161 BLAKE2B 5324c482030c68c492ee1bebe5a010e8614278ea0092476ca8eac5b69e622e12e5897529ef5823c34fadd0dd0f1e6c52efbb0887ddb64d701256dc7894b22c21 SHA512 a1843680dbc57a14bd3b78fa853b00feb546311d4ba4478cc2ea428bab0b48e481c00582d5ae1ee3139c7f32d079dc9f327b874ddd0ec5b8ca72a830d404e91e
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
deleted file mode 100644
index aee8e82c2156..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/1.2.22
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	#move docs to /usr/share/doc/${PF}.
-	mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}" || die
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
index f76f70d1acab..844423d980fa 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
index 4cbbb2d28f5d..93867f5f6ff8 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -1,7 +1,5 @@
 AUX xournalpp-1.0.17-translations.patch 716 BLAKE2B df50ccfdf86069f08b29168af42955d80b363db5d271bd0c97f07cdc626995922471186cd83f7860f0eecbf8e53982639e23a5a2b817310f6d3d12e529577c45 SHA512 83ae3ff7ae1dd4933f063c9e35a38684eeb6638fbc9ec52b863bd1499d2fe958b7565e8609060d9ba8388eb6c89e046b8908c0fd7387981154cf86da3b574184
-DIST xournalpp-1.0.17.tgz 14885382 BLAKE2B 501feb4480eee5aa38cc148f561d6c730505e43fd5d8017936f4b1d15f1b83ae936eb0a2e81b9889c668f9ed0a9c46b9053c984d45815c88829b023b7dbbd209 SHA512 cc3568ce22fd42f0e8458f1428c102d2fc18a9650d8c5968cadd6693fc19374780beb3c7f6206f2f494439296a883b2a5160da37e3a0e10d6fe3654084967ab9
 DIST xournalpp-1.0.18.tgz 14892343 BLAKE2B d2aaede0e85d724cf8032f38a6fa2c3c4862f26d410dbab8264dd50ab8ee0d26889eeab433ef615fe9ce271710192eca380ff80149431d5368125926cf8d2b25 SHA512 90568a2674a18ff711ecef5f1a66ea1c5746d7f1fde271b36342d9bf48e096e63075cf7fd8b69e39e144273a4d1b922c415eee929eba94b2fa515a0bb481815a
-EBUILD xournalpp-1.0.17.ebuild 897 BLAKE2B 5a9c41c6960ca6317708ce27e379ef269d7e547f12d11122602abbc71ed11f706b81445ec033b54a64b97290b654123b6fe6c8debdce282a7324b56cfcf57145 SHA512 0c2eb1f2a74aa33029a0025e296f6c7014c5ac279ffa42fbfb6816c904cf51ccc81803cbc3eadb475491441d20c478321d76fe5eccd27e520641302d8ffbfddf
-EBUILD xournalpp-1.0.18.ebuild 845 BLAKE2B 75f63c7de44edfbf3a8ec372f6ef50beecd0ea62ca3f71a6700f3521247651f975461ca66de7c8018ff41125b59fee514906c9f2379397b9e524f08bb3e4d83b SHA512 a73628b37075cd9c0f8fbb74a4627d80195e49d8c67b5bb7044a7fbb516dcf4f830bfee9a7683a6af49c60542004fbd20a5c9b9d1c04748f26a9c2d2f704d418
-EBUILD xournalpp-9999.ebuild 845 BLAKE2B 75f63c7de44edfbf3a8ec372f6ef50beecd0ea62ca3f71a6700f3521247651f975461ca66de7c8018ff41125b59fee514906c9f2379397b9e524f08bb3e4d83b SHA512 a73628b37075cd9c0f8fbb74a4627d80195e49d8c67b5bb7044a7fbb516dcf4f830bfee9a7683a6af49c60542004fbd20a5c9b9d1c04748f26a9c2d2f704d418
+EBUILD xournalpp-1.0.18-r1.ebuild 852 BLAKE2B 0aadb7823ff69ec04308c4c0a70e5c69724912342cbface8855c9aac2639d89ef5d738a4dc376793d24f31aa2f0b15a8e8ee190b1fcfaf2fec15323412b380ef SHA512 4abf0f2f5cf053d58b4200aa11e6b44ef961ae1cec62a62f93db0c9550923751af32a56201f60095a2c6a2647fa568c3b064ea19ba7f5d9e174386c9f705ff53
+EBUILD xournalpp-9999.ebuild 852 BLAKE2B 0aadb7823ff69ec04308c4c0a70e5c69724912342cbface8855c9aac2639d89ef5d738a4dc376793d24f31aa2f0b15a8e8ee190b1fcfaf2fec15323412b380ef SHA512 4abf0f2f5cf053d58b4200aa11e6b44ef961ae1cec62a62f93db0c9550923751af32a56201f60095a2c6a2647fa568c3b064ea19ba7f5d9e174386c9f705ff53
 MISC metadata.xml 220 BLAKE2B a2c3e050477292c8000b5bb0ffa26d84a57fb435ba5c96dac5c5f4d6f3e823c07116520102eacefd24227a4490dd340c7836cf8d1ba28d23fc76eeaadf04c7b9 SHA512 594861f664581733d740d9f501b84c56f9c9c67f932e97f5905a37d4f19b5a19ef4045c50571a412fbc64d318f3ad1d403ed37c61449b37e74df3d5753aedda8
diff --git a/app-text/xournalpp/xournalpp-1.0.17.ebuild b/app-text/xournalpp/xournalpp-1.0.17.ebuild
deleted file mode 100644
index 4dac69f10a5d..000000000000
--- a/app-text/xournalpp/xournalpp-1.0.17.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
-	unset SRC_URI
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
-fi
-
-DESCRIPTION="Handwriting notetaking software with PDF annotation support"
-HOMEPAGE="https://github.com/xournalpp/xournalpp"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-COMMONDEPEND="
-	app-text/poppler
-	dev-libs/glib
-	dev-libs/libxml2
-	dev-libs/libzip:=
-	media-libs/portaudio
-	media-libs/libsndfile
-	sys-libs/zlib:=
-	x11-libs/gtk+:3
-"
-RDEPEND="${COMMONDEPEND}
-"
-DEPEND="${COMMONDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	sys-apps/lsb-release
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-translations.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
diff --git a/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild b/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild
new file mode 100644
index 000000000000..7057d336d41d
--- /dev/null
+++ b/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
+fi
+
+DESCRIPTION="Handwriting notetaking software with PDF annotation support"
+HOMEPAGE="https://github.com/xournalpp/xournalpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+COMMONDEPEND="
+	app-text/poppler[cairo]
+	dev-libs/glib
+	dev-libs/libxml2
+	dev-libs/libzip:=
+	media-libs/portaudio
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	x11-libs/gtk+:3
+"
+RDEPEND="${COMMONDEPEND}
+"
+DEPEND="${COMMONDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-apps/lsb-release
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
diff --git a/app-text/xournalpp/xournalpp-1.0.18.ebuild b/app-text/xournalpp/xournalpp-1.0.18.ebuild
deleted file mode 100644
index 6cb1258352c3..000000000000
--- a/app-text/xournalpp/xournalpp-1.0.18.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
-	unset SRC_URI
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
-fi
-
-DESCRIPTION="Handwriting notetaking software with PDF annotation support"
-HOMEPAGE="https://github.com/xournalpp/xournalpp"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-COMMONDEPEND="
-	app-text/poppler
-	dev-libs/glib
-	dev-libs/libxml2
-	dev-libs/libzip:=
-	media-libs/portaudio
-	media-libs/libsndfile
-	sys-libs/zlib:=
-	x11-libs/gtk+:3
-"
-RDEPEND="${COMMONDEPEND}
-"
-DEPEND="${COMMONDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	sys-apps/lsb-release
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
diff --git a/app-text/xournalpp/xournalpp-9999.ebuild b/app-text/xournalpp/xournalpp-9999.ebuild
index 6cb1258352c3..7057d336d41d 100644
--- a/app-text/xournalpp/xournalpp-9999.ebuild
+++ b/app-text/xournalpp/xournalpp-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE=""
 
 COMMONDEPEND="
-	app-text/poppler
+	app-text/poppler[cairo]
 	dev-libs/glib
 	dev-libs/libxml2
 	dev-libs/libzip:=
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 94f3be735305..0ba36667b8d7 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/c-support/Manifest b/app-vim/c-support/Manifest
index e3ca8fdb0d13..d748527c04bb 100644
--- a/app-vim/c-support/Manifest
+++ b/app-vim/c-support/Manifest
@@ -1,7 +1,3 @@
-DIST c-support-6.0.tar.bz2 130832 BLAKE2B 0cec691b367904647b2d8ea0e284027b3b7ce0d3f8db0c8e8d5c9ceac996d0cdcd2899cc4432425fd2ab0ee205069ab95a239686de81c13c77dbf7c16db06811 SHA512 280e8e91b8961ad856524f1869ecd580870ccbb6064c02aefdd5cec7f55a7bf12a17c76a4de91c8d2a7fed25bd96e793909f7cc258b9664f295e1324e0b392da
 DIST c-support-6.1.1.tar.bz2 167371 BLAKE2B 2c1d333d377eb57c52845f215c98d41e15029bd34fbef9cd8844cc2f237d129ed471d64dc71a55495189500de90b6e7fc3bb41cec18d62c51ba3b4ceb0331cc3 SHA512 dda33732505341bc260b9c3f73f95c70c3ee6f0eb50b9d1fd534fc8e83fb21d0caa3feea0ae50cf59da4abbef455c31fe1c02c80bb9168423cfa332941ff0886
-DIST c-support-6.1.tar.bz2 164255 BLAKE2B d57ab7d74eb0cc13767401aa2bad1f7883842d24e47ec0a03fb5354d5a6950029021ec1084acd7e5e86c42e9682eb4b1cc19c8c1f4c4f9d0a147571d88d51f8c SHA512 6fdc4f757ba0febfebe0c8898b6b0d582e03d6f7d08523e8663368011c41d6444df2620f96c6276d959b4a05b7c83a0e377bc5a8e75aaed5cf478f8bc83ce9ec
-EBUILD c-support-6.0.ebuild 482 BLAKE2B 3f9a451bd1c1c1e5daf2ab26c8b1d3a38d9f599d24443b730ee7a84e660dc7bd9c93375a365d0903e46ccae35d66fbc29e1e5c5b2a1d6bff975a098a20ef4919 SHA512 7950de1386b3d4dcc32aa11425f99a564e5009f9f91e2f9f3d460d50b15a4c67b8f7f5ee4268e827b62f8e31a1c31f110dac989a960279d1f9796742d3d49e9c
 EBUILD c-support-6.1.1.ebuild 472 BLAKE2B 0ae8b108eb6607233c00bb62a3a00850bad8971a0a3ff0380b08f0acbc9b54889cd3d5bd0ec8c9b142b127546ee857d6dae007b3cdfa63a906ab3e85d30b694f SHA512 34bc159b372bc8d15324b0d7a67f2eb7912410fdc19559d5075d91d6bbee5de7b8e4fd6544584fb620cd99bdfab15d02af0de9ebef29f4b2904308fc42f2fcec
-EBUILD c-support-6.1.ebuild 474 BLAKE2B e51b80a2794749007cdda1a8de58f5779b317461bd1929f8f70b577260ad4eb45e651ab5c894d47f61955f98928ebb89c584bd75e3e070d5d43fa8a33ca29066 SHA512 1c59e8308129105f946554daea9ba016667535a35bb1a115d10dbe2b8c3bd58225a2bd466622ccc95ffc489178c3f8c3969680976a9e9cd99c4ac04edea8ee42
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/c-support/c-support-6.0.ebuild b/app-vim/c-support/c-support-6.0.ebuild
deleted file mode 100644
index 9432efcde238..000000000000
--- a/app-vim/c-support/c-support-6.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="5"
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=213"
-LICENSE="public-domain"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-src_install() {
-	dodoc ${PN}/doc/{ChangeLog,c-hotkeys.pdf}
-	rm -r ${PN}/doc || die
-
-	vim-plugin_src_install
-}
diff --git a/app-vim/c-support/c-support-6.1.ebuild b/app-vim/c-support/c-support-6.1.ebuild
deleted file mode 100644
index b845e2e7abfc..000000000000
--- a/app-vim/c-support/c-support-6.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=213"
-LICENSE="public-domain"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-src_install() {
-	dodoc ${PN}/doc/{ChangeLog,c-hotkeys.pdf}
-	rm -r ${PN}/doc || die
-
-	vim-plugin_src_install
-}
diff --git a/app-vim/jedi/Manifest b/app-vim/jedi/Manifest
index 0da48a88edce..f5162725afb6 100644
--- a/app-vim/jedi/Manifest
+++ b/app-vim/jedi/Manifest
@@ -1,5 +1,5 @@
 DIST jedi-0.10.0.tar.gz 36820 BLAKE2B a66f7c58564487d83867d61480d83364af0047cee713c41dbd5c67bff0b2ac33d066c2d0f4367c30059f46fb9f4916fc8d2eb9c64aa6a489e2c16a03f56b0b3c SHA512 65482505446b1001e92870ae64a147b38c0bb4d3151e464d325be741729506a191b284a491f4c3eb77dc46cb9bcd6b8e7bf8689ed95107e89a1f6a05c7fbc9ea
 DIST jedi-0.8_p20171015.tar.gz 31593 BLAKE2B a34fc7a7d8211cefbaef0012b801bc2dec2b447d34a1d3c338ed37306d36262694f0d8e771042e899959d04bed8925c5beee32803cb7f56add7a83ceb4bf27d9 SHA512 e4238c745d509d9d7e8c0593a46935f1de3c0cdf8e3893deb156110be53e2c9012d98379a6ca747a0bdab77f1def2a88dd46ce5c7d3936f01f0d9ab597f14182
-EBUILD jedi-0.10.0.ebuild 886 BLAKE2B 4b12294d0e08c34a9c0b987016617753a935d29a4521d754cd2cdf02a65afdafb4eb2f1c5365c0c37e780f14e1a23c9c2e0843db0849c830987d607896f44b33 SHA512 07918560371756ee224d5b3029858f61f3b4ebfb63aa822da2e5f43471d65d742184555c4d661e5ed220fb945e0ff9a9e29db22887298ee56828f942b2700e29
+EBUILD jedi-0.10.0.ebuild 893 BLAKE2B 25282a4ead752ab5f71dae7285adb580c98e88dc9d14fa331e78d4a8a258817b91cb46f95335959d514ff9e549b77c9ec6437f291b1c0a054e461634695ea2cb SHA512 12d5437fe8c2ef4005735423fe7b5bd9466036900c79614cd4c3d21d43f5ec810caa187d43842ac57f46748eae27e0f507d97a13cb88f91aeb1dbe9938f99205
 EBUILD jedi-0.8_p20171015-r1.ebuild 849 BLAKE2B e508610614f56f3566f1097e0200a01cdcc4de21a6a5a2cea59625a92dfb2fe2c5703ccf863fbb568e58211cb3e023d4ed82363580d3f39432785b780f2ad2df SHA512 533d572e4249a331bf6466dcdd15a372b39b6f9af5016717e39373c97f01c0a6cbbcad371f4f6647d35edeea74278f67104f2d63db2ab7fed898522ab3c47f8b
 MISC metadata.xml 732 BLAKE2B cf90edcedbfd48646343d24df62a1946477bfb5a622976497209f822c28c0c714dda0153db2f8d541c7756d4ee3000b5fe340beb43b32408f380396cae18d735 SHA512 6fd3ce3d4ca0d4093f6d8f108925e00b51eabca129d70ec3dbaf26c0e83e7a3b58aee9d7df2da1fc1811260fdff2ebcf74322e54a65d145fdc8aaf472ab39177
diff --git a/app-vim/jedi/jedi-0.10.0.ebuild b/app-vim/jedi/jedi-0.10.0.ebuild
index b30e03db8527..73fbc6110e0e 100644
--- a/app-vim/jedi/jedi-0.10.0.ebuild
+++ b/app-vim/jedi/jedi-0.10.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/davidhalter/jedi-vim"
 SRC_URI="https://github.com/davidhalter/jedi-vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-vim/rails/Manifest b/app-vim/rails/Manifest
index c7339bb3c12b..197a575a94f0 100644
--- a/app-vim/rails/Manifest
+++ b/app-vim/rails/Manifest
@@ -1,5 +1,3 @@
-DIST rails-5.1.tar.gz 57639 BLAKE2B 71873d4428a72b02efc1a516a8cdfebacd6505c914af54e1b59abda1db65b4a52afa7fbdb641311350068e490d08b0f850ea02701cfa02d3e60b67240e9ee84d SHA512 15aac8a66c84c939ad7628480ebae8008644a09c4901d1c20c09945232f39ccff236f4d0926dc4f902b9373bda30dc6740d76f7f580e5e74892cb16749ad5a11
 DIST rails-5.2.tar.gz 60940 BLAKE2B 315b4bc96768682fdc8012eed63c9f3881e3e647f3fb065ac3c13b767325c13ff3c69f7c92d626f6cd01705b7bd56361b4a4bbe5c1626f9db0a41233285d6f92 SHA512 0a704545b864eed46513747ab3a9f0d3537e3d6a5d01cb1cf628131f79b4b72f90e567df26364e3344adef423ccf96586367a97d0e7d4a8be9c72f54e842a810
-EBUILD rails-5.1.ebuild 560 BLAKE2B 4a0f6b31ab8602c9222f66938b4ac21a514eed7bb314fa57974e5aa7cdf8489335d8a689eefb3bd4a9913339b945fa7a7570068cce7a9b64339fb8b4e4be69cf SHA512 79d7c57c6f7c2bc1cc982809b4dd3fc662f0c01409379e4ae96b3605ed1cf0663d1afeba5383afc4052e6c5b5eaf26c02a12b7108e1745977eff4bc0ccff4e84
 EBUILD rails-5.2.ebuild 560 BLAKE2B 4a0f6b31ab8602c9222f66938b4ac21a514eed7bb314fa57974e5aa7cdf8489335d8a689eefb3bd4a9913339b945fa7a7570068cce7a9b64339fb8b4e4be69cf SHA512 79d7c57c6f7c2bc1cc982809b4dd3fc662f0c01409379e4ae96b3605ed1cf0663d1afeba5383afc4052e6c5b5eaf26c02a12b7108e1745977eff4bc0ccff4e84
 MISC metadata.xml 339 BLAKE2B 6cff8149c1b1c38a8d6b9f12d9f2840a41e643b2f602d388d81dbf7774cd3cd9485c9d91c4801d4a04e17521b9d58317dae7250683dddd78d9951cd576624ddf SHA512 6c08bc15b40f53439632423b8139d2b10cb3a3e2d237e973efb08ab95e2ab306557cea32eb11fd31aceb4d03b2392f981595d181a9c2815801bbc6938be9903c
diff --git a/app-vim/rails/rails-5.1.ebuild b/app-vim/rails/rails-5.1.ebuild
deleted file mode 100644
index 10a6335781c2..000000000000
--- a/app-vim/rails/rails-5.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vim-plugin
-
-MY_PN="vim-rails"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="vim plugin: aids developing Ruby on Rails applications"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/"
-SRC_URI="https://github.com/tpope/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rm *.markdown || die
-}
diff --git a/app-vim/sleuth/Manifest b/app-vim/sleuth/Manifest
index f15fb1a2095f..42e26bd14f19 100644
--- a/app-vim/sleuth/Manifest
+++ b/app-vim/sleuth/Manifest
@@ -1,5 +1,3 @@
-DIST sleuth-1.0.tar.bz2 1839 BLAKE2B 884c1e3ad2e5202e4827d9973611584dff0ec7c0dff6f310a192a757daa2ae8342c62d15f075249550880843f3596b195ab358ba186a764cdc51080abce5d76c SHA512 19fb158a28bfa02e7364208f11911d0afcda77f4a35a410202b0342130e48b99b52db56aa687b2484ba0ac9595970ae040c349e7a0fd350f07c40b6b58d43a13
 DIST sleuth-1.1.tar.bz2 1972 BLAKE2B ca16a57f180bde63fd06510013c7e695ebe9111d42975b577932f860321286379dc71bb840135ce1d60f1f27de942792889ff9de974b1366988b2407413838c8 SHA512 76a2bbb651452cb7a2336cebed5f7e8ff79e995bc7ba11d36089f7e58f607df031306bf38fd161e7af728aa6699b37fa8c2c322b8a8cfa7889dfaa3e96d400c9
-EBUILD sleuth-1.0.ebuild 373 BLAKE2B 1a683ea8f794fd99d7dda89f8baff41f1b30a2d1d213f93dba95dbc1ea67865867018779a00fc360f87f197e5f2d636e886c99a8718860c9de16aaee3ba96667 SHA512 30d62c1d33372545fa8cbc731bc5057e325ff69d8312045efff8e79f724439f7c240ae9077cd007abed80582aad2880eb6916afb0958f6581dee312a45a2f8af
 EBUILD sleuth-1.1.ebuild 363 BLAKE2B 3973cc74eea58e535fa0c5c414ae68a64946a8bf2b426951708f08fc43dc1e53dac2140db118451baa039c1d1210e3adb80503cbac62fb66cd7415850624498c SHA512 867b893046fe1b7bcd335789799f1b75a031d5b8a130082785ef54f26d15b6515da26f2fffa037df86e629648a943aed4d9dc38f489b06f52a9d8290146d71d4
 MISC metadata.xml 340 BLAKE2B 0e3a5e7cb9c253bdcb3944d5717482fb61d2ffadb701c02a40c5cec18887a129da2b3eaa1e3f30f5f262093b0f5292f6fbb018119e8bcf1a4a4f848c5caf0978 SHA512 53ef8e8ee6f87ce5bb69f75ac07f0b59bb4e699a6ba6ef8cef6191d3cc887fcf18efa84a92d2403c925cfd8276245c4087298077b3a379f1017effe19dba488e
diff --git a/app-vim/sleuth/sleuth-1.0.ebuild b/app-vim/sleuth/sleuth-1.0.ebuild
deleted file mode 100644
index fa42aff92d2b..000000000000
--- a/app-vim/sleuth/sleuth-1.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: heuristically set buffer options"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth"
-LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/vim-r/Manifest b/app-vim/vim-r/Manifest
index e45b04a6a640..a20ea2fdeaf3 100644
--- a/app-vim/vim-r/Manifest
+++ b/app-vim/vim-r/Manifest
@@ -1,5 +1,3 @@
-DIST vim-r-1.0.tar.bz2 82116 BLAKE2B cd4b6c44644b1f5675ec5f893ddfed4a87879afb4ea97c338ff948d6e29065369e4da1a86a29b3c217e4556a43a926a05e07b32cef1f5756cfcf2bfa527ca887 SHA512 9df3bf35da9da6f650c3de23f0a7607e5e02a6193e1f2352d8129668d0ad37a63088a6ae7ac77831952aa7d35bde2d2d7b6f592a15dc856eaf64a1cbb5cd07cc
 DIST vim-r-1.2.6.tar.bz2 76361 BLAKE2B 0f3596f7cf249562700db24b837a77b2edf8295ab23bd1bf3dff2f59970033ffc2de6017f26e1a5b53aed240aea4c20e8bce673aabcced45ec4f7eef027a972f SHA512 187b31068d32c22c182650571dc5af68cc804562ffdc6b4902729735e4000b1ca4e0636d6b5617f3c2f36403eb4f0b1adc35d2387b5c110286da2ea2254f9009
-EBUILD vim-r-1.0.ebuild 553 BLAKE2B ed4b75bc221d24b99d9834ccbc818ff370846818543fe1bf2ceedabdcc8d718b074597244894fc1562d9ab6c17951ad45b7bc7f4a8f887fb5c82864ab9b51fb4 SHA512 b976f84cf060db8830311816ff9bc1e2961f6e1720ffac650c732a86e8b7a61c487f7aeca3f235d2e632d112d6d2ae93781abc18764b98ad6849649b0fa6ecff
 EBUILD vim-r-1.2.6.ebuild 553 BLAKE2B ed4b75bc221d24b99d9834ccbc818ff370846818543fe1bf2ceedabdcc8d718b074597244894fc1562d9ab6c17951ad45b7bc7f4a8f887fb5c82864ab9b51fb4 SHA512 b976f84cf060db8830311816ff9bc1e2961f6e1720ffac650c732a86e8b7a61c487f7aeca3f235d2e632d112d6d2ae93781abc18764b98ad6849649b0fa6ecff
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-r/vim-r-1.0.ebuild b/app-vim/vim-r/vim-r-1.0.ebuild
deleted file mode 100644
index c02b63c38175..000000000000
--- a/app-vim/vim-r/vim-r-1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: integrate vim with R"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2628"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-lang/R"
-
-VIM_PLUGIN_HELPFILES="r-plugin.txt"
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "This plugin requires the vimcom R package to be installed,"
-		elog "see https://github.com/jalvesaq/VimCom for instructions."
-	fi
-}
diff --git a/app-vim/vim-rest-console/Manifest b/app-vim/vim-rest-console/Manifest
index e6781c4feb98..437bfbb8f961 100644
--- a/app-vim/vim-rest-console/Manifest
+++ b/app-vim/vim-rest-console/Manifest
@@ -1,9 +1,3 @@
-DIST vim-rest-console-2.3.0.tar.gz 11584 BLAKE2B cb4a6b8a7f1280b329dc9a0b261519172a4c39c40f9a8f5fa4967f4530f089dcfbd5e0088dcb2b8067216e7d7fb623a3e720e9a2aefb9d376a36830f54bf771a SHA512 04fa4cc2177b87a6d69ad50d0e45f411169d178e4990280afde730c461cb718acd09dc034e61c51f73974369d9be9300281f1e60adf8084730977caa27c65da2
-DIST vim-rest-console-2.4.0.tar.gz 11795 BLAKE2B 84683c5ac65f429a1c4db0d792da76ad733b3700d1ae7d00baab6495465e27dede8c042c999f125f35b25c50039684dc919ffaf806c1d5c202c7cd4c2edb90ba SHA512 77f06a9cee534eda2e414c4b0b0fdbdf335b1a397ab9c45b4331f211db1dbeb89bd0a73906945b0ed08c8b795c4be444b9ffcd2c06e145a43b3efb456aa64666
-DIST vim-rest-console-2.5.0.tar.gz 11945 BLAKE2B 3959372c834cc51c0c74c39036633520bd753ebece30d4164a98f5b960f1e8756d7e526f840249ca0dde7dfc0b742f06c7b7e197a9578f30eb2644a345468f0d SHA512 1c2e2dafdcdd57216bac08adfaef4e5f3dc2331b13fd969064bd460681838cb4eb830644e33e9397388b0ff76b68d992523ba1c258c2385d6daae5ad87cbdd58
 DIST vim-rest-console-2.6.0.tar.gz 15935 BLAKE2B 93c9d9637b67c5fd3b7a765b2bddb2942798d93605f2e558abc95d338116d9325e08b1717c8326824c915f71388af84d70ac8ddea1baead12137c7564da57ddf SHA512 d75b9071eed1bdae604c3fc3457c319a8893ba01001c6b27b8bbea038e9964597bb1a7a2e03ac1d6d9e35e9d96ee350f1eaf6c12f2e8f53929f3f511a470170d
-EBUILD vim-rest-console-2.3.0.ebuild 515 BLAKE2B 71a57ed293aa27a54dcd3ad49d32c6b98093182414bab1eb327af76548f5e0302681f3d2b22e5b87e84d2d067f7cc8193565895befb4b2d74ff0cc8d8d76c84a SHA512 41891e407febfdd8ed20bb32769ff02c6ad4cff4e87671ac80a5caa44514fda4697c4a15fb0e72cba54df78759518cd43d17860565aa7397a89a72299e187a8e
-EBUILD vim-rest-console-2.4.0.ebuild 503 BLAKE2B 6d6aa62e54f52eba682e83109ca093bb44fc28ea32358e6dc83c190c9d881c84c164aaffdb3cfe405396af7b5930a5060c8c736eee25517d4d31904e9d9cdc30 SHA512 49cc3feafd5d7d8c695ff9b47d2c9f8966235e7d0403a8a56d9822795a58a3ed06ae9240c54165698fca489efcb231d1eb84cb3dda8c2848a5a011b7305ebf28
-EBUILD vim-rest-console-2.5.0.ebuild 503 BLAKE2B 6d6aa62e54f52eba682e83109ca093bb44fc28ea32358e6dc83c190c9d881c84c164aaffdb3cfe405396af7b5930a5060c8c736eee25517d4d31904e9d9cdc30 SHA512 49cc3feafd5d7d8c695ff9b47d2c9f8966235e7d0403a8a56d9822795a58a3ed06ae9240c54165698fca489efcb231d1eb84cb3dda8c2848a5a011b7305ebf28
 EBUILD vim-rest-console-2.6.0.ebuild 512 BLAKE2B 7f5b52a7803fdc77763ec0a2798e32411331e5cb829c9c04ad712109ddcb1d1581448759402d67b2ccfacaa5bfea64e6506b9c91e9685ab8dbe99483d2c258e7 SHA512 e465333ac587532d31916fc2fa344ca0482cd60f17048810949655ab80d7f2bc69387e80be16c8a917654addf0f129debee3d95a5cb48b5c13e28d9916003179
 MISC metadata.xml 346 BLAKE2B 64567ecfbad2ce7bd1b18616c8d7f6460246f48bac01f7dee59316088ada121ebe0f57f5dc6c796e5c1478f250ea08352a1b44869de2b47bb22319f1dad23eef SHA512 9139fde3f2e37523a44c0ae9f4745952e562012ac7338fb533a1698d8b1545c92c431e01c2f3b57ed5e02b651e5a72205205c927005bf23e2e7771c9d2701ba6
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.3.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.3.0.ebuild
deleted file mode 100644
index f9e7a6f06827..000000000000
--- a/app-vim/vim-rest-console/vim-rest-console-2.3.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=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: a REST console for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
-SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="net-misc/curl"
-
-src_prepare() {
-	rm *.md *.json *.rest || die
-}
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.4.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.4.0.ebuild
deleted file mode 100644
index 1a51e85303b6..000000000000
--- a/app-vim/vim-rest-console/vim-rest-console-2.4.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=5
-
-inherit vim-plugin
-
-DESCRIPTION="a REST console for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
-SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="net-misc/curl"
-
-src_prepare() {
-	rm *.md *.json *.rest || die
-}
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.5.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.5.0.ebuild
deleted file mode 100644
index 1a51e85303b6..000000000000
--- a/app-vim/vim-rest-console/vim-rest-console-2.5.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=5
-
-inherit vim-plugin
-
-DESCRIPTION="a REST console for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
-SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="net-misc/curl"
-
-src_prepare() {
-	rm *.md *.json *.rest || die
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index d5c465425e58..c84be58a83a9 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 27ac89279223..cf151905bda2 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,3 +1,6 @@
 DIST abseil-cpp-20200225.2.tar.gz 1679650 BLAKE2B bbadb2b86fd390f51322e687526c72a3b13caff6391974462a1146cc563616ce479330336a489a71e27b143e7cbea6695fc12c91fb721185a5116b3a6c5506b1 SHA512 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335
+DIST abseil-cpp-20200923.tar.gz 1783122 BLAKE2B cd72bd6df04ddef6e4190c40dcfc34f95f424c30f3a5018e8305e603de58d737e15c1e33239d11bba2e3c669d6b18770a2f9de3075685f6ba38de26fc6e572b8 SHA512 8ad89fb1e0d70fdd1df6ac996c186243af43842eb08d09efbb1b7bcdab617dd394aa4bf93644f0eacc05d2ddf3db78e2ebe3eb496cfa24ece919f197a3a624d6
+DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
 EBUILD abseil-cpp-20200225.2.ebuild 904 BLAKE2B be0083e3ec09f676d1d9d77d52c2f55b2493111392bee24ab5015d1ca066ee059c832ae4740d3c5a59878786cd759c755867a9dba708f74a029f5772c90bbc4f SHA512 2bd2303a1c136108e8a257721e69aea7123378f814419c08304087cbe33f6cd389e74873cf8e6c88b58d3c085f3143de3af916ee76b66df58ef1c20eb0d0de75
+EBUILD abseil-cpp-20200923.ebuild 1440 BLAKE2B b24ae1bf267c8ac1375f575df86bafee7165331f922a27665f968acfe23128f8bdac96bd3f1227801f8bbefeb0290b252f932a7497bf4117cf921f2795ec25d3 SHA512 1646df494d4d301e830408d1e83e5c2295a8540251350155e4ce9ca0d33d48c0d0c27ede5fb5c0ef6963234aec4e3eeb3528a1d8c8f0b0df5e703a4429ae25ef
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200923.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200923.ebuild
new file mode 100644
index 000000000000..51528f25fffe
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200923.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit cmake python-any-r1
+
+# yes, it needs SOURCE, not just installed one
+GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
+GTEST_FILE="gtest-1.10.0_p20200702.tar.gz"
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE}"
+
+LICENSE="
+	Apache-2.0
+	test? ( BSD )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( sys-libs/timezone-data )
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	absl/copts/generate_copts.py || die
+
+	sed -i 's/-Werror//g' \
+		"${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DABSL_ENABLE_INSTALL=TRUE
+		-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
+		-DABSL_RUN_TESTS=$(usex test)
+		$(usex test -DBUILD_TESTING=ON '') #intentional usex
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/aixlog/Manifest b/dev-cpp/aixlog/Manifest
index 813c552003de..bb21b8d4dff5 100644
--- a/dev-cpp/aixlog/Manifest
+++ b/dev-cpp/aixlog/Manifest
@@ -1,4 +1,4 @@
-DIST aixlog-1.2.1.tar.gz 11396 BLAKE2B 88cdc775acfd91ee74306fedd6429865f10bcd7cbe9b45f861463489330d74b017611078ca362a00994983dde746ba086a056c3da53b06099f200810d65c0c04 SHA512 776558fdd911f0cc9e8d467bf8e00a1930d2e51bb8ccd5f36f95955fefecab65faf575a80fdaacfe83fd32808f8b9c2e0323b16823e0431300df7bc0c1dfde12
-EBUILD aixlog-1.2.1.ebuild 592 BLAKE2B b9ca8cc5003a0979db8cd2992f7ee4a28782c166a4d387b4fa97252f4a52a522f0221ad13a6b2422660cfe1ca61dae975d050769f989d974c445ac976f9b5466 SHA512 6fca9db55df82d0ec0fa7e0d352d0c4ec09925373e2e07a498261b63bffe9ed7bea8afa7ea24163e29827b557cd30006d92fdf9bd8b3ebd6d369fa4d01210640
-EBUILD aixlog-9999.ebuild 592 BLAKE2B b9ca8cc5003a0979db8cd2992f7ee4a28782c166a4d387b4fa97252f4a52a522f0221ad13a6b2422660cfe1ca61dae975d050769f989d974c445ac976f9b5466 SHA512 6fca9db55df82d0ec0fa7e0d352d0c4ec09925373e2e07a498261b63bffe9ed7bea8afa7ea24163e29827b557cd30006d92fdf9bd8b3ebd6d369fa4d01210640
-MISC metadata.xml 418 BLAKE2B 52c792695b8c7ab44a71b9d20dc0e1f53f567f9a2fc91ad85e0b595069ef4e6fe07accfded9a394f4929b6cda2dc831cfb99431344909804cedcf02b21483b3d SHA512 e0277e2f80e6c0d3c54ec2532c1d474266e6b36b8b35905748bf6242bffb33c9dbd0d0b3369e8ffc08d871f58dfaebe5461d580d9be62c2018d881a915fb0fd9
+DIST aixlog-1.4.0.tar.gz 13262 BLAKE2B 6be17305e7de95b10bb2c8f0019e235bff9596e33c4fba341cfb4e6e0732330932f2b64be916e57fc0e49197931076701a00df7a305420c938630d6b5786080b SHA512 ec4f5a3902858ad979de8cfa81275951af73c4d159a2615a85cf60fe876ea283864f854b26198bea83c4a568948db82c5e50783c868bd2f6d8427d319b912d6f
+EBUILD aixlog-1.4.0.ebuild 567 BLAKE2B a0d0e1552b3b35d1eaa8193df63a259a512871631a5e7c6968f73099684acf87aac57d09302af6ad33ebe833998633c4ed2bcd9dfb1317c5b8fa6e4f3f53a58f SHA512 a4eef4b0a89f2bfb97ba52585e6f6e262560466a49a872c86e6968f9920c4a3861c89aba7d1a706059ceb506f3bb6ae38aac9d1eca96c988b39083ddaada19d3
+EBUILD aixlog-9999.ebuild 567 BLAKE2B a0d0e1552b3b35d1eaa8193df63a259a512871631a5e7c6968f73099684acf87aac57d09302af6ad33ebe833998633c4ed2bcd9dfb1317c5b8fa6e4f3f53a58f SHA512 a4eef4b0a89f2bfb97ba52585e6f6e262560466a49a872c86e6968f9920c4a3861c89aba7d1a706059ceb506f3bb6ae38aac9d1eca96c988b39083ddaada19d3
+MISC metadata.xml 619 BLAKE2B e3f7dd29a257d900b0b0744a40b5c89211cca8cbedba0d569adc86d3bdafd5d57342dc2579964dcef1ebcb8478c589579f2593a26894877a1471671544b459de SHA512 2eb302d4c2c22bc3fac529a6a2cb185adf04dfa43630ec2ca8680660d3fd761b48bde333443f74af7efb9df173ae3569ac9366593baef234101d07d0c689fef6
diff --git a/dev-cpp/aixlog/aixlog-1.2.1.ebuild b/dev-cpp/aixlog/aixlog-1.2.1.ebuild
deleted file mode 100644
index 1246304bfa01..000000000000
--- a/dev-cpp/aixlog/aixlog-1.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Header-only C++ logging library"
-HOMEPAGE="https://github.com/badaix/aixlog"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit cmake-utils git-r3
-
-	EGIT_REPO_URI="https://github.com/badaix/aixlog.git"
-	EGIT_BRANCH="develop"
-else
-	inherit cmake-utils
-
-	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
-
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/aixlog/aixlog-1.4.0.ebuild b/dev-cpp/aixlog/aixlog-1.4.0.ebuild
new file mode 100644
index 000000000000..b1164d6bbd11
--- /dev/null
+++ b/dev-cpp/aixlog/aixlog-1.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Header-only C++ logging library"
+HOMEPAGE="https://github.com/badaix/aixlog"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/badaix/aixlog.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/aixlog/aixlog-9999.ebuild b/dev-cpp/aixlog/aixlog-9999.ebuild
index 1246304bfa01..b1164d6bbd11 100644
--- a/dev-cpp/aixlog/aixlog-9999.ebuild
+++ b/dev-cpp/aixlog/aixlog-9999.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit cmake
 
 DESCRIPTION="Header-only C++ logging library"
 HOMEPAGE="https://github.com/badaix/aixlog"
 
 if [[ ${PV} == *9999 ]] ; then
-	inherit cmake-utils git-r3
+	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/badaix/aixlog.git"
 	EGIT_BRANCH="develop"
 else
-	inherit cmake-utils
-
-	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
+	SRC_URI="https://github.com/badaix/aixlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -25,5 +24,5 @@ SLOT="0"
 src_configure() {
 	local mycmakeargs=( -DBUILD_EXAMPLE=OFF )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-cpp/aixlog/metadata.xml b/dev-cpp/aixlog/metadata.xml
index 1422c838fbe5..82b79fa7bee7 100644
--- a/dev-cpp/aixlog/metadata.xml
+++ b/dev-cpp/aixlog/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<name>Johannes Pohl</name>
diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 539732abf6ae..3d85d7297704 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,5 +1,5 @@
 DIST benchmark-1.5.1.tar.gz 154896 BLAKE2B cb8d74b3e6662e35ea12809d8b62d1e3a6849668840c84697e7f4b2d29eaf68688bb1cda6f43c170e70366de88a93af79bb709d55dfc8d79140c11a31855a46b SHA512 1e8782ab6846b8b29c5eea41ed1ba19dd92a46a135cf74acdc588e2cd5ef05581c644d20fc0d6403456d65417538e1db80109ae87989601298b2fc56ae3c3161
 DIST benchmark-1.5.2.tar.gz 160235 BLAKE2B af14235d174e39b8bbb0a44960834b7d13b1aed6cd4494efa9eb58d32c051efdf244258a33b83b82ad82aa69917356c35ccb470caea838cb6fd7eda37f0f80f6 SHA512 a071613f3af669296aa613e0e64726bdcf27cc3db331d8003f49164581cd6935a86641ec435118ea590a9d722a926d3fef740e938e1a5f6eba8e2a5a615da1b0
 EBUILD benchmark-1.5.1.ebuild 580 BLAKE2B b9cfaafdadc15460de9e82ac2eea626b60b0e9f1137f4d43cbdaf1a48a6e05fe0722e5697293c4b780d81ee25b07894364596a2b293f210108740ec98ca667f8 SHA512 c176e0a30ce1dc759a1c552c20c8d2828f5446d922137ad2da790cfbfbdeaca55c7a8ebd2e5c4fec788ee729345a583149b20ab8186cc117066a3bff63db5668
-EBUILD benchmark-1.5.2.ebuild 580 BLAKE2B b9cfaafdadc15460de9e82ac2eea626b60b0e9f1137f4d43cbdaf1a48a6e05fe0722e5697293c4b780d81ee25b07894364596a2b293f210108740ec98ca667f8 SHA512 c176e0a30ce1dc759a1c552c20c8d2828f5446d922137ad2da790cfbfbdeaca55c7a8ebd2e5c4fec788ee729345a583149b20ab8186cc117066a3bff63db5668
+EBUILD benchmark-1.5.2.ebuild 587 BLAKE2B 7e2303e183f9f0ce4afbc0d7ac426da97fbbb0b94b4fce34769839fd863db1a5aee166ffd51367b5e11406fda077009866669ce4b8fdcbdb4152828b8b4d618e SHA512 107cfac36a3450da4333b729fec6be12f002d3601ad5584b97f5cf2719361a0534a4880d7b3681a2b972b7adeae98a504fbd13e08e336bcd0f5f62551d89ae1c
 MISC metadata.xml 599 BLAKE2B e7ccfaf68072c7afdc8a1bc7abf3788e566c49dc88bc3fdc4f78a71360293aa310e55e34970544388e604d886e145d3b21d20b058e47d70c89d4dd57405fc980 SHA512 512145e4f2352d1f44c4d5dd43605e24081424219faded0c25271aeb03533e0a48816b66918b24e0025026dbf566b6cb86d581e1b71471114101bcfecbce9679
diff --git a/dev-cpp/benchmark/benchmark-1.5.2.ebuild b/dev-cpp/benchmark/benchmark-1.5.2.ebuild
index c64fe45b19ae..ccdf771385b2 100644
--- a/dev-cpp/benchmark/benchmark-1.5.2.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gflags/Manifest b/dev-cpp/gflags/Manifest
index 84d4c36d1068..549b1925f390 100644
--- a/dev-cpp/gflags/Manifest
+++ b/dev-cpp/gflags/Manifest
@@ -1,7 +1,4 @@
-DIST gflags-2.2.0.tar.gz 96408 BLAKE2B 571f07dd0972cec201eae8ce66d5e0592abb6ddb81bcf3c539f38861f0cd379de2db20ba99eab885ba030235938816d7a61e589b74a61743de7cdb2710646854 SHA512 e2106ca70ff539024f888bca12487b3bf7f4f51928acf5ae3e1022f6bbd5e3b7882196ec50b609fd52f739e1f7b13eec7d4b3535d8216ec019a3577de6b4228d
 DIST gflags-2.2.1.tar.gz 96985 BLAKE2B 065dac9cf5d878e4179cb6d56ddf240052a552b72036fd06cb83197d9772a9b97fa544f809c6e1efd6f9ad8cd0222872fc6292c44bc013c5f70e235bcc5b290c SHA512 e919cbdcff1f993ddbfa9c06d8e595566a4717c27ff62f388a64c0e6b4683a93211c24ce78485eae84c2c76053341574064e6c56af185fc2782e2816b26e1fc9
-EBUILD gflags-2.2.0.ebuild 1046 BLAKE2B 16e0ff6295c8470e74f27ed0f098a540feaf450ba16f4e6da0fe23b956e242597ca375ba0e72b4e7e244dd79b05c499156a68b1da48ca7d1400d1af5604ee6f7 SHA512 2d98a05a69d1705b71dfe1c3d6cf7e584716e4178ae75ed327c110e81e35f69c709cd2914c6d7d9dc91a1246e397a0c7f7f307294878f5ce278224657f5ef71b
 EBUILD gflags-2.2.1-r1.ebuild 1017 BLAKE2B 226bc239a301b8524db2dca90550cf6cd273241b9939b98dcbd5a910e5119917cb1df6155516b43943e8694501f1b17a00e5df88fd9c5803aeeb8c82f6907519 SHA512 cef639c5c60e1d914edf537a90579f0762b96ed7c2f733fb366b87853d6c8bc29fdcf8719ccc7e20ae1dd8f2fda1c649b14028e9be9df713d51acc9c2af726de
-EBUILD gflags-2.2.1.ebuild 1050 BLAKE2B 341cd184b635ed67f52eb2b7b09ef7acc38af32af11c448419d143bd09768b6eb857c5c5f40b4776511842e503a861c2793937a8650ebfe29264202bc79d4b0a SHA512 39cbc290c2c51a2419eabb02d754363111fe5e2866fd3f0e8c0e8bfb814d31dece550658d45a203269bf71aae1be3bdb6bfffdde67838de700b709e53d7116fb
 EBUILD gflags-9999.ebuild 1023 BLAKE2B fcbc98b3905b1217437dfbca41ea80895561a95dcac2cce72ba44b1d5cfa47a8748f080e7d17dbd309ea828384fa2626049f49d74a19839be6cd56677a3b8458 SHA512 689641092ec7d8809e8dd259b23747ead84c21a250f3fd1b3ade473dfed72a1d9bc92b9f7c02838efd456184a3d7ee9b86edf6d0a5147ebfe538fe4bf238a02d
 MISC metadata.xml 303 BLAKE2B ffe806891bf2b398e66676c5a17dbbcf2b53a1738a92d994828aecd33bf52dae92d9f2631d262f2c5c375b7f4c6918c9011f03ed94a0bc6a50f2475ee4620537 SHA512 80f049b850a5f55f33964fd8776aa4b510d9937022caac6d3817d583ae3089dd5cc73bd44b8ef48e867a706fd9223861001759281903ee1a1a467149ca7bf37e
diff --git a/dev-cpp/gflags/gflags-2.2.0.ebuild b/dev-cpp/gflags/gflags-2.2.0.ebuild
deleted file mode 100644
index 6bf713cbeaea..000000000000
--- a/dev-cpp/gflags/gflags-2.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gflags/gflags.git"
-else
-	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Google's C++ argument parsing library"
-HOMEPAGE="http://gflags.github.io/gflags/"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-# AUTHORS.txt only links the google group
-DOCS=( ChangeLog.txt README.md )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-		# avoid installing .cmake/packages, e.g.:
-		# >>> /tmp/portage/dev-cpp/gflags-9999/homedir/.cmake/packages/gflags/a7fca4708532331c2d656af0fdc8b8b9
-		-DREGISTER_INSTALL_PREFIX=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/gflags/gflags-2.2.1.ebuild b/dev-cpp/gflags/gflags-2.2.1.ebuild
deleted file mode 100644
index 5425bbe89abf..000000000000
--- a/dev-cpp/gflags/gflags-2.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gflags/gflags"
-else
-	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Google's C++ argument parsing library"
-HOMEPAGE="http://gflags.github.io/gflags/"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-# AUTHORS.txt only links the google group
-DOCS=( ChangeLog.txt README.md )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-		# avoid installing .cmake/packages, e.g.:
-		# >>> /tmp/portage/dev-cpp/gflags-9999/homedir/.cmake/packages/gflags/a7fca4708532331c2d656af0fdc8b8b9
-		-DREGISTER_INSTALL_PREFIX=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index 79356383e1c0..e154c8de8ee4 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -1,6 +1,4 @@
 AUX muParser-1.32-parallel-build.patch 680 BLAKE2B 7699b129186f0173bfbc7f742d51175ed67eddb9898b61f7d6a3a462e1a262112a2d4af445e12501caa88d4630308bb5f273ef2a704e2948db9cdb7649ee6bb7 SHA512 a39af330803786ebb86259dd86ecfac00ca04978b0e623b418d887f6b20a6eb6cee2b37da8164aa7038b3accf388b40b6a6d4eccd2f20afdfd6051cc3505ac90
-DIST muParser-2.2.5.tar.gz 761315 BLAKE2B ddb7a226cecd164929a2f45ca0c2a5d20f37cd6bba2fca919c9e534017fa087523311bade8a7be4a5a011ecd5dec0a2496ff08354d2010341bccf2e2a8276c1d SHA512 d89380ebdc0ce91d0ea38fe43419ab6ed06c47d352b9ee20e1edcce48337b464366153493e0241c373ba2880a8b419fb9541e56cda0d14915daf9b98136ee682
 DIST muParser-2.2.6.1.tar.gz 755653 BLAKE2B b3b6b8da57c0e8a0bda74038689d444ba8da00d6cce80030d8b35693209f0293874e4822c4941974be21fd4b7c09ba7df2c9cef861bc10b890aae4f641040faf SHA512 01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496
-EBUILD muParser-2.2.5.ebuild 887 BLAKE2B c9e5fab264cfdf2eaf24b0e5f7d029946a66dbdb16a4e347be871ab1399f173d9938061882c31a75fe8b11c8094dc27f439f7417a05e5b906d76b8e171f1c7da SHA512 0c6888411c54bf17437e0671df21813fdd7d0764dc878896dc42dfd1e1f5b21848a8b0ede6cd8c66792e97fae75a890ad18967f813e5269bb6a0fa72ca397e38
 EBUILD muParser-2.2.6.1.ebuild 887 BLAKE2B c9e5fab264cfdf2eaf24b0e5f7d029946a66dbdb16a4e347be871ab1399f173d9938061882c31a75fe8b11c8094dc27f439f7417a05e5b906d76b8e171f1c7da SHA512 0c6888411c54bf17437e0671df21813fdd7d0764dc878896dc42dfd1e1f5b21848a8b0ede6cd8c66792e97fae75a890ad18967f813e5269bb6a0fa72ca397e38
 MISC metadata.xml 624 BLAKE2B fc3684b1f97031e5d63bddbe28679529add1a931930a351cc56ae5bef8395f9a05020a00557a0b1bc421e20c09ce59b5332597043f96981405c1911407948d7a SHA512 fdf266f68b3463e7f22358efbba60055512d7f7fce7a98de6f572a0b4c191c0b0b50b29676a432fa7fd604207029314ad5e43f043831d064de8c5f232fb424a5
diff --git a/dev-cpp/muParser/muParser-2.2.5.ebuild b/dev-cpp/muParser/muParser-2.2.5.ebuild
deleted file mode 100644
index 6e70ecf5770c..000000000000
--- a/dev-cpp/muParser/muParser-2.2.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Library for parsing mathematical expressions"
-HOMEPAGE="http://muparser.beltoforion.de/"
-SRC_URI="https://github.com/beltoforion/muparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/muparser-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.32-parallel-build.patch
-	sed -i \
-		-e 's:-O2::g' \
-		configure || die
-}
-
-src_configure() {
-	econf $(use_enable test samples)
-}
-
-src_test() {
-	cat > test.sh <<- EOFTEST
-	LD_LIBRARY_PATH="${S}/lib" samples/example1/example1 <<- EOF
-	quit
-	EOF
-	EOFTEST
-	sh ./test.sh || die "test failed"
-}
-
-src_install() {
-	default
-	dodoc Changes.txt
-}
diff --git a/dev-cpp/popl/Manifest b/dev-cpp/popl/Manifest
index 1765049a6c08..a9bd144df86a 100644
--- a/dev-cpp/popl/Manifest
+++ b/dev-cpp/popl/Manifest
@@ -1,4 +1,4 @@
 DIST popl-1.2.0.tar.gz 12302 BLAKE2B cfe775ef5cd823ce7b6cb651f7f8de6c67d24e5e3b657d13e7b2087f3b9673c11a870adbe2195665f4e2c3c7799c2427020d4e86126090ef845aa6a906c7a825 SHA512 a5d372346dd282f634b1ca92f468588f7069b34a5911a6ea46e5ef33e8e6c360ca13f67bf221555d76c7620c4222694077a74589a1c32bdbc094e64366299609
-EBUILD popl-1.2.0.ebuild 577 BLAKE2B 1ea3e74f319fde470c518c1a48917511cb3ebd57a71817688272f2339697091e9083f440f1ff7c9dd047780dfd72fd67c1d8dbee4e1471f2f3d1c07b1e94b4d6 SHA512 0e160c4e2934587494dc56ced49f0fc92f987a282340e0b3cd00b825511164913e4fa0b6cf6828c2b03d5d6924c03666d4bf84f298a6c4d457fb7f774b8a9dcc
+EBUILD popl-1.2.0.ebuild 576 BLAKE2B 7da06c88f777fa7a8fc843b7214f2f5f21c3acfe3dc7a5aaf3074ecde1c18f04607cb4e4fc8c3f88f962ae94a847ba6660453f8e4306e26324c09863218e84e3 SHA512 7e3ebb93c803fe716b7e536df014dff0349dcc32ed7067da70d445ec43fe75d178870486fcc32594acdbc7071799a4ace73009ca4c1c7edda65d555adc16ca18
 EBUILD popl-9999.ebuild 578 BLAKE2B 96cc325d37debbda1f48bf2437457aa2fb1d799b06bf2b2be989fdd695e530f3180de746f9838539d30a3500b650129d1e916990f15c9dde6234ec7657bea7e5 SHA512 4328adba89286af181433e60cf1fea305174e180d34b247e3ba99ea540f6901e190befca09fa271bcf4a06776447f60778bd563fcaed77a85bd062ed1b1a745c
 MISC metadata.xml 615 BLAKE2B d8b1ee056d6ec06554aec02e134d1645bfde0a0dd8ba8c51784bc0c4e8091dc763a7be1e16fcbe5b967b8572aa982cc48b097b6270a7204c8af73b6823fd6073 SHA512 5b03e952ffcdc47886a998ca6b707fb6598c044c202733cbc42bf266a9fe486f0270afb26d4d2952673d23d03443b01f2d965b0b1cd59f16b7b3bbe95b8054bb
diff --git a/dev-cpp/popl/popl-1.2.0.ebuild b/dev-cpp/popl/popl-1.2.0.ebuild
index 28fb84b2f4e1..a83ee4c545b4 100644
--- a/dev-cpp/popl/popl-1.2.0.ebuild
+++ b/dev-cpp/popl/popl-1.2.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 
 	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-cpp/pstreams/Manifest b/dev-cpp/pstreams/Manifest
index b78c9bfbf2eb..731c0b70ee0a 100644
--- a/dev-cpp/pstreams/Manifest
+++ b/dev-cpp/pstreams/Manifest
@@ -1,13 +1,4 @@
-DIST pstreams-0.7.0.tar.gz 55536 BLAKE2B 1201d3121ad3153330da0defbfde64012d97e385349898441fd790a1e4927f362e7f95b5d58cf2ccb53e7955a0ba7b0b5ae8305739f50d4e2a82022191ec9d04 SHA512 287a7503f25ad70c477b51f7c4af4c54947c1abc6c213371cdc7fc4ccdc20bf79b51959c0b482ae2fa9354e529036b2b53ca8ae5cbf8cd82ad43054856e5e00d
-DIST pstreams-0.8.1.tar.gz 58588 BLAKE2B c1f6544b1a9cd5f97c1f2f62fb9376afc248a1c833cd087b379f82d0f08054b7b093898ab86eaebf447491f389a0a7fca817f06a40c4cad94fa41024f3d48ea4 SHA512 edb6fa30e0a77c4a83bbb7a15c427376d39d73db17112cc5888c404fa1e99407c42c09c9ca072027ac52c753071fb7d7333237bd49aa44488512ce64de22d8f3
-DIST pstreams-1.0.0.tar.gz 68207 BLAKE2B 9993d17a9be14a79be549d97cb4c86d3bfe2a5f1b857a70d7bc3a976ccb8944f4ed721cbd2040dfde72a5cc1c64a20d4dfef96c091a3bc1c12dcab8ff46bb3e3 SHA512 172ce79431d00d9fd17af610dfb41580a522480265d58531413da1cd950caa00d5cdb8ee12e2888cfa8b93e475cdf8946be9dcc3d02cbda7eba0034e66566b56
 DIST pstreams-1.0.1.tar.gz 66188 BLAKE2B 937b9ae833dcace9f0f44dbac6907d5c73c5757f604ea96835c0ddf0ec9abd5fa4f40a1c01872a47fd0bcdc094f90215da6b7f80f261172f93f7b5233b60a5cb SHA512 279f758a4aeba124227e3de07e202f6cd838bfca4f34829a446f2f20cf426bd404f28960b881f810b5f2038e3946d38174ca09e6a07d5dacc0501f41746245e6
-DIST pstreams-docs-0.7.0.tar.gz 102315 BLAKE2B 837bd25092bd0192bc273f67e1eba6b50702033ee91817cf291c4b57618bb6222f383078fa6384fb7178bdabe015b48762b0a650bad9cc01c9a8f10de84325f8 SHA512 d7bccd0e2c83c694ff0c9ddc3ae173b4bdbae19f95c42dcc398e6dab25ea4076fda154ed84bc9b9f2872e468ad60f61a3cb20795b0c17e4bc297e4f425139f75
-DIST pstreams-docs-0.8.1.tar.gz 169559 BLAKE2B 0a625ce1fc4cd372ec4a063bf4209a3c223cbaf4cad42505e93f2534075d36c76b11fefce7abd4e2f6ddbfce7a3c4810ca47409c77fcd8c3a5f1dc829cd91608 SHA512 4b42950831bb9a092ca5eeadceded57888306f6ed24d2bd6c486b890d38b42e241f4430a7411a182d5d59b01a1fe0972d3816ec9510c9e2e50812cf390bc68be
-DIST pstreams-docs-1.0.0.tar.gz 174207 BLAKE2B d5aa5f03254ed292dbe7052eb1caa411c41ec1d75fa13e4c6c343bd4762ef84975013b768449e457282d121478cb36d9b3856a12cecee806954ddcdc10bee644 SHA512 44ad649bec3e9b02a52eb9c942842f19700cd3ebb4d7de47dd7887106ab07ab456b477815c90377dd0d92724f6144b88c4a9be89328921a675a4f263d40d4872
 DIST pstreams-docs-1.0.1.tar.gz 178382 BLAKE2B dd44e4c6acd83dfc6896145e77408d7c23150c1156e477ccb4052341e041d82163d0ee3e8069ea5fda9033617c3a1162fc2068835d089f6ce7614477c2e3e58b SHA512 e645cb3d1c20cc0c717d03aa24e500489452d0880af0feddcf234e713878159b22a891ec04a66f0aad6988e71418a224a4ba66064e6a83578ecf957d9af167e2
-EBUILD pstreams-0.7.0.ebuild 758 BLAKE2B 404b8631b2c73f2b05ee468f55dd9b4da002738fbe603482fec6e15ea4f1cae8914f696bf64ae532094685fb46afde3b1d31f45b086d7df6d84fc25638d94bf5 SHA512 43704c358bd300189124cd014ff5bb57f4aa553edccf9821adf2588de2ebc2e0c8acdf7a8c6e826e70745b86d6ed372ef3132735b82702e1867cbca261a15911
-EBUILD pstreams-0.8.1.ebuild 758 BLAKE2B ab82016d95828e6c6ce600cd4334fddd1b66d23f70b455a94a9a5e39e15f59594a7879979e5c72ca94bf8f2bf610b645e367f5d85baafd17803a0ac755c40cbf SHA512 4ba61680ada14faa2d546ff15bdaa24c1fb55ceca366e53a7455ff5ef91185e1261ad596b9a4e801fccc4a8bf1551164e6287b2fb12f5d1107a9932351e733b7
-EBUILD pstreams-1.0.0.ebuild 758 BLAKE2B bce608fe65fa23e0985ba766a7e9e6bf2da74e74d4c3a6038506d55df07b70a58caa88abcc465b671837766bfa0a1ef198441f8c1662a9553266e1aae3f9e1a4 SHA512 a350436666258454825946514bb132addde5a933993391b1ab6d5943066d3421977a8e2965a37eb9235991e59a3c40840ac14a8637fd8477c20087b767d5e7af
 EBUILD pstreams-1.0.1.ebuild 758 BLAKE2B 63e50465cb35373552e4cc3a049cfa1a803054d7c2187adf74e52b618988f2cc745c49264d49459423c98066f5af87fb98649d381abd22c02de78873f73e9303 SHA512 db3174c8ee41bf0ed26a1392579dcb5bb4c09526f5b3fb34688eee90c8f7a69e684b77b0bd64c5500da34ca89752a77a3308bbd461d9af0a9203617b9ea611e9
 MISC metadata.xml 337 BLAKE2B 66acb2c28e0ad98c5ac08ea75c9e894bb93c8f4b843f42c8a801a0cc34a381605f966a8c7145e808c78698d4fda35edd3f13f7a70cdd960f8d1289133624a545 SHA512 ddcd30a829ddd52638e7ea4ff45a8050471f21f532f8d7cb7325346f1e81547ba7bc32d51fbae7fc0dbcf04f310be6cc0049941753191a0cee03a976163d6695
diff --git a/dev-cpp/pstreams/pstreams-0.7.0.ebuild b/dev-cpp/pstreams/pstreams-0.7.0.ebuild
deleted file mode 100644
index af6b1a5645d6..000000000000
--- a/dev-cpp/pstreams/pstreams-0.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="C++ wrapper for the POSIX.2 functions popen(3) and pclose(3)"
-HOMEPAGE="http://pstreams.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/${PN}-docs-${PV}.tar.gz )"
-
-SLOT="0"
-LICENSE="LGPL-3"
-IUSE="doc"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_compile() {
-	if use doc; then
-		doxygen -u || die
-		emake
-	fi
-}
-
-src_test() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		check
-}
-
-src_install() {
-	doheader pstream.h
-
-	dodoc AUTHORS ChangeLog README
-
-	use doc && dohtml -r "${WORKDIR}"/${PN}-docs-${PV}/*
-}
diff --git a/dev-cpp/pstreams/pstreams-0.8.1.ebuild b/dev-cpp/pstreams/pstreams-0.8.1.ebuild
deleted file mode 100644
index ce0945609167..000000000000
--- a/dev-cpp/pstreams/pstreams-0.8.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="C++ wrapper for the POSIX.2 functions popen(3) and pclose(3)"
-HOMEPAGE="http://pstreams.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/${PN}-docs-${PV}.tar.gz )"
-
-SLOT="0"
-LICENSE="LGPL-3"
-IUSE="doc"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_compile() {
-	if use doc; then
-		doxygen -u || die
-		emake
-	fi
-}
-
-src_test() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		check
-}
-
-src_install() {
-	doheader pstream.h
-
-	dodoc AUTHORS ChangeLog README
-
-	use doc && dohtml -r "${WORKDIR}"/${PN}-docs-${PV}/*
-}
diff --git a/dev-cpp/pstreams/pstreams-1.0.0.ebuild b/dev-cpp/pstreams/pstreams-1.0.0.ebuild
deleted file mode 100644
index c6e500fabd86..000000000000
--- a/dev-cpp/pstreams/pstreams-1.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="C++ wrapper for the POSIX.2 functions popen(3) and pclose(3)"
-HOMEPAGE="http://pstreams.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/${PN}-docs-${PV}.tar.gz )"
-
-SLOT="0"
-LICENSE="LGPL-3"
-IUSE="doc"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_compile() {
-	if use doc; then
-		doxygen -u || die
-		emake
-	fi
-}
-
-src_test() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		check
-}
-
-src_install() {
-	doheader pstream.h
-
-	dodoc AUTHORS ChangeLog README
-
-	use doc && dohtml -r "${WORKDIR}"/${PN}-docs-${PV}/*
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 85ca0e7b0ef5..f6d89652421c 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/aerospike-server-community/Manifest b/dev-db/aerospike-server-community/Manifest
index a6713aa520cd..6f362159c727 100644
--- a/dev-db/aerospike-server-community/Manifest
+++ b/dev-db/aerospike-server-community/Manifest
@@ -4,19 +4,7 @@ AUX aerospike.init 1194 BLAKE2B d21f481882027c748de84a01f599a0f3e17f7a14c14c1b7b
 AUX aerospike.logrotate 196 BLAKE2B e52b68100c48c2ea47d28583a80fbc8da44d866884ef159520315641f8e5261f0e8561cf53460a23fe0daa12133023a5a2c8bc4a8efa81bf89f2b17735ff4bc3 SHA512 2810df72e5a570be0d3118b0c3244fb13ae7bb98684219d681f02a1ec1499191e1f7e3455da818a8ca36d36a7d194cf85ee1985930bf6fe63b1723060af05cba
 AUX aerospike_mesh.conf 1476 BLAKE2B 76dd16b34f024faec1cbbad526b72dfc389f5ba875928a71147e2a21e1f5cec3754c2bd821d2a329cea475ec5f12b6f4c355d15e0a6092733959a4f6131b5a12 SHA512 a7d5e52738a3153b649cc81d8a9b635b70fe21335802f5c2f348fe71f3b7087ea85aaf926c4ad3ce71514fa1b479f98bc27aadb95995a5bbb8808219bcbe28c4
 AUX aerospike_ssd.conf 1341 BLAKE2B 70720ac3bf9c7b41eb595a4ef2ff16d559abbd2f8c64b09159ea6ad7068513040ac0b036eb4dcd77252b454002935b7e8255c79e6a4ebf06850d3acc325100df SHA512 0382842d4e7b20caaa4c39d999da0cd2b67c24bdd9fad6e5d2d393758b6f788decf0039ae9a262a4db7e89b358cbb9954efd082a15549d12e3e244b2c51675c9
-DIST aerospike-server-community-3.13.0.9-debian7.tgz 10657823 BLAKE2B a4f88eb24e91e54abb70358e027ff68de48dd4e0c6f919ce0b8d31b27aaaf3cf5894fe876d092247a5adedec39461426195a220cbcb93fe2bbcb648a5d16d332 SHA512 e7a25377970121bbf453b79d5d6504b054c82b9c3e0dbd43dc665aebfe32a8f5319a9654f98d8c89443b493c0ba44babf38e55138ea356c14619fa5b138d19d9
-DIST aerospike-server-community-3.14.1.8-debian7.tgz 14017262 BLAKE2B a02e516e690c84cd5df973bfc08ba019511f685fc20b303a9ff1548a92bf2dbf4b5be9f5bdd0bb94a5586e49eb368b02457dbf4ac40901fb2b601114f5e9b636 SHA512 867b3c90bd56b1eca0ed17ed97004130310ee74cf24d48e52d47fdd926aea536fad8781c43fe0ae37ea2e2dc1864ca64335fefa6b67d3d89b78393f4035b528b
-DIST aerospike-server-community-3.15.1.4-debian7.tgz 9775381 BLAKE2B 4f7fe86d99cb0cdc74d0bacdcdaea8112e105b6daa870fee12a0137447118ba73adc580b4e4a47f9e1338bc393aeb32787b067a75415bf5c1c6d76cf4ee94d7c SHA512 2b77622ea4eb35de9eb26b33f0cf47fc8d29a70fe75848b81245842b2f3c728d6b2d3ebe72369b91ef0d53be168cea04086ae469ad69124ab2010f48f3005fd5
-DIST aerospike-server-community-3.16.0.6-debian7.tgz 11106496 BLAKE2B b4d9e4856e7d30f537685ed6f924bae8ba953e8aab363f0fa0ba1e5522719f4a521f757944693c46af2933f9ce4e7f10d60808ef76cb78523347cac38cd0608b SHA512 0e32c73881f29d634b67f1c46cdd608ad306fb164753ae3a113761adc806dba72fbd8d8022f7c5fb1b84171f145113b6659092a23e283e147d292931c5befde7
-DIST aerospike-server-community-4.0.0.1-debian7.tgz 16352955 BLAKE2B e6dd6295a71b4c6edf13a52c4f1be9e8fcea0c94078559b13be456ca714c9c38952a96385003391484bf7d24e3d52745806935c249f0f3cc96a154264a10c2a3 SHA512 896783c0cbe4b136605f17601317c6d62e8791adac6c6bebb8f80be1d33cf2f425a431af7e3fe8e5e7771a196bd4baa9db32dc11b030850c1eb3db755767934a
-DIST aerospike-server-community-4.0.0.4-debian7.tgz 16355017 BLAKE2B ad88330e7cc2a3b6c13a8a5ac2c1aa1bd7cf68ed4c9c2669e366cda153aca7b0bdfce35df47269b42222ec5699e06bafbb9f7098abae9b83d259c1c259da2c1a SHA512 b3ca3e882d543dfb5fd6293c6d6e95689c31f3c5e8cd77b3611d36c6981f3350b771eebc41d536b0a1e272bd16614354979d7d6a04c10004dd80bb5973b4c6be
 DIST aerospike-server-community-4.1.0.1-debian7.tgz 16538371 BLAKE2B b879fa134d932dd5c5f3432abd6902e3a1bfd071b7753a78b4d2fdd1cc58e6b875c6793285dbfa18612f9ccd98af4f8ae3a16e7178a30d03715a4d38dc369b1c SHA512 f3954f209a3aab446c193b07fe6c045de89af115f29815a886c99b5648da1e3ff1b348cb1ec4299ce772d7619918e2340de6c25393e04c3bf4b9f1760646625d
-EBUILD aerospike-server-community-3.13.0.9.ebuild 1638 BLAKE2B 67efcc3e85ebeb249e9929d815c48b8f98930879e4341ef2382bd22d95a24ec83dae61624a28132b9373f8a5caf2cca30e76cb20e38a2b8baf4c5ca98c76146f SHA512 875b7394d88e1e6a50924202ff71fbbb3af14fdcfdc15c27125ce323d56fee3ffc5773ee796bde1b6990acbeeef421666408299f225016d33e34d515a1c5a5e9
-EBUILD aerospike-server-community-3.14.1.8.ebuild 1638 BLAKE2B 67efcc3e85ebeb249e9929d815c48b8f98930879e4341ef2382bd22d95a24ec83dae61624a28132b9373f8a5caf2cca30e76cb20e38a2b8baf4c5ca98c76146f SHA512 875b7394d88e1e6a50924202ff71fbbb3af14fdcfdc15c27125ce323d56fee3ffc5773ee796bde1b6990acbeeef421666408299f225016d33e34d515a1c5a5e9
-EBUILD aerospike-server-community-3.15.1.4.ebuild 1638 BLAKE2B 3d082543b0a601e6620e41790b2eca111cb68fff04916bbfcee461c4e6611f309e64c33d623a0048f422e8bb4f96158b53220e21a8959a96d278a35c20fc5c36 SHA512 def3d4526e089225dee5d3a96a692536ca0611ca6dd0d1476e6ce55b18cc215464dc35fd52f0a2fd3a21776999ccf714435515b6f7a9f30b1da9d1f160a66a8f
-EBUILD aerospike-server-community-3.16.0.6.ebuild 1638 BLAKE2B 1ce48fbefbc7b5232ab2449042ca013200b2da2c083fadbab5e12bc42b3d052fe15078886359b133248a39ec0350e9902a6bf54c08402905f1d7212432e6f398 SHA512 935895faaad66c0051cc9945862e0c54f6427e6b59fc664c921c06fa59f529f63e6cbc46514cd73ffe5dbfb2fb160a3a191e5fcee5db60b7b570cf12f36d0198
-EBUILD aerospike-server-community-4.0.0.1.ebuild 1638 BLAKE2B 7572376d50c39edcb444d35b3b006c3f79d41c1138cd22d221182ccdf549dabf26c7ae876c0128dda245fbeb2c3ca6a2d96672d816147a591ce60b4d9ace09b4 SHA512 8e3ccb10b5daf85fab5e23412884cbcfc4db93a0cf2e49d55f5948c59dfabfeafba61f3e8f8aa82603764bc7a3f232458a96147b2987c33a767d0ce9f29f26ac
-EBUILD aerospike-server-community-4.0.0.4.ebuild 1638 BLAKE2B 7572376d50c39edcb444d35b3b006c3f79d41c1138cd22d221182ccdf549dabf26c7ae876c0128dda245fbeb2c3ca6a2d96672d816147a591ce60b4d9ace09b4 SHA512 8e3ccb10b5daf85fab5e23412884cbcfc4db93a0cf2e49d55f5948c59dfabfeafba61f3e8f8aa82603764bc7a3f232458a96147b2987c33a767d0ce9f29f26ac
 EBUILD aerospike-server-community-4.1.0.1.ebuild 1638 BLAKE2B 751741ae79b6700d6233106c6d47daab9ed2d998fafa1162ad19612a4e2ad6865d7a06f698d56aaf52f61ad06203bd6551657a68c0c6d7dd6c027f3a8cd0fd96 SHA512 44c44e9aa4781b43d74d2a2e397c724916ee02da62899525436d6b8eb0b2ac20a9507f3cb2b24cadcf4168859a3b61b6e1dc78ed2c9b9c3bf104f17f10c359c3
 EBUILD aerospike-server-community-9999.ebuild 1921 BLAKE2B 7ee8da5034709fe63c47aa0f6caaf426be2184d68b6f5403261173e4f56fe87ded940b35a65e6994154da9a2ba2c7f023c4c65789a5e12ad1238cce2d3950572 SHA512 3c034f9f0498c74317d8996fca9f022b3eb7d9bca05bea1903e10596a632165a4f1e7ca516cbbf97e24cd8d1b6b89812ae48ec0ee5e448b1436384e3c18fe3fa
 MISC metadata.xml 281 BLAKE2B c83365afa5d87cf5b8d65ed299e16797d54a0c5f8632ad69c7449edcd52b32f150bc7f933a9e3662d45c37fc64dfcd97b09b3d265a328cdc3ca6cc609a2311f2 SHA512 d3a33c339bb7409528ddca6187790b842150e273bd7630a610c0be08be50e26278ed7b4d42305bfd1a796544c6be251301c938b15d70e609b9d91bd22161aee6
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.13.0.9.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.13.0.9.ebuild
deleted file mode 100644
index ba571f1a2bec..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.13.0.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-libs/readline:0
-	sys-libs/zlib
-	dev-libs/openssl:0
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
-	enewgroup aerospike
-	enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
-	local server_deb="${P}.debian7.x86_64.deb"
-	local tools_deb="aerospike-tools-3.13.0.1.debian7.x86_64.deb"
-
-	ar x "${server_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	ar x "${tools_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
-	rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
-	insinto /opt/
-	doins -r opt/aerospike
-
-	fperms +x -R /opt/aerospike/bin/
-	fperms +x -R /opt/aerospike/lib/python/
-
-	for dir in '/etc' '/var/log'; do
-		keepdir "${dir}/aerospike"
-	done
-
-	insinto /etc/aerospike
-	for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
-		doins "${FILESDIR}/${conf}"
-	done
-
-	insinto /usr/bin
-	doins usr/bin/*
-	fperms +x -R /usr/bin/asd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/aerospike.logrotate aerospike
-
-	newinitd "${FILESDIR}"/aerospike.init aerospike
-
-	fowners -R aerospike:aerospike /opt/aerospike/
-	fowners aerospike:aerospike /usr/bin/asd
-	fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.14.1.8.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.14.1.8.ebuild
deleted file mode 100644
index ba571f1a2bec..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.14.1.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-libs/readline:0
-	sys-libs/zlib
-	dev-libs/openssl:0
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
-	enewgroup aerospike
-	enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
-	local server_deb="${P}.debian7.x86_64.deb"
-	local tools_deb="aerospike-tools-3.13.0.1.debian7.x86_64.deb"
-
-	ar x "${server_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	ar x "${tools_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
-	rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
-	insinto /opt/
-	doins -r opt/aerospike
-
-	fperms +x -R /opt/aerospike/bin/
-	fperms +x -R /opt/aerospike/lib/python/
-
-	for dir in '/etc' '/var/log'; do
-		keepdir "${dir}/aerospike"
-	done
-
-	insinto /etc/aerospike
-	for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
-		doins "${FILESDIR}/${conf}"
-	done
-
-	insinto /usr/bin
-	doins usr/bin/*
-	fperms +x -R /usr/bin/asd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/aerospike.logrotate aerospike
-
-	newinitd "${FILESDIR}"/aerospike.init aerospike
-
-	fowners -R aerospike:aerospike /opt/aerospike/
-	fowners aerospike:aerospike /usr/bin/asd
-	fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.15.1.4.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.15.1.4.ebuild
deleted file mode 100644
index fe0f879e87c6..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.15.1.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-libs/readline:0
-	sys-libs/zlib
-	dev-libs/openssl:0
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
-	enewgroup aerospike
-	enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
-	local server_deb="${P}.debian7.x86_64.deb"
-	local tools_deb="aerospike-tools-3.15.1.2.debian7.x86_64.deb"
-
-	ar x "${server_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	ar x "${tools_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
-	rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
-	insinto /opt/
-	doins -r opt/aerospike
-
-	fperms +x -R /opt/aerospike/bin/
-	fperms +x -R /opt/aerospike/lib/python/
-
-	for dir in '/etc' '/var/log'; do
-		keepdir "${dir}/aerospike"
-	done
-
-	insinto /etc/aerospike
-	for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
-		doins "${FILESDIR}/${conf}"
-	done
-
-	insinto /usr/bin
-	doins usr/bin/*
-	fperms +x -R /usr/bin/asd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/aerospike.logrotate aerospike
-
-	newinitd "${FILESDIR}"/aerospike.init aerospike
-
-	fowners -R aerospike:aerospike /opt/aerospike/
-	fowners aerospike:aerospike /usr/bin/asd
-	fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.16.0.6.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.16.0.6.ebuild
deleted file mode 100644
index d69e7847e7e0..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.16.0.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-libs/readline:0
-	sys-libs/zlib
-	dev-libs/openssl:0
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
-	enewgroup aerospike
-	enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
-	local server_deb="${P}.debian7.x86_64.deb"
-	local tools_deb="aerospike-tools-3.15.2.1.debian7.x86_64.deb"
-
-	ar x "${server_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	ar x "${tools_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
-	rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
-	insinto /opt/
-	doins -r opt/aerospike
-
-	fperms +x -R /opt/aerospike/bin/
-	fperms +x -R /opt/aerospike/lib/python/
-
-	for dir in '/etc' '/var/log'; do
-		keepdir "${dir}/aerospike"
-	done
-
-	insinto /etc/aerospike
-	for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
-		doins "${FILESDIR}/${conf}"
-	done
-
-	insinto /usr/bin
-	doins usr/bin/*
-	fperms +x -R /usr/bin/asd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/aerospike.logrotate aerospike
-
-	newinitd "${FILESDIR}"/aerospike.init aerospike
-
-	fowners -R aerospike:aerospike /opt/aerospike/
-	fowners aerospike:aerospike /usr/bin/asd
-	fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-4.0.0.1.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-4.0.0.1.ebuild
deleted file mode 100644
index 83946c562c0d..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-4.0.0.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-libs/readline:0
-	sys-libs/zlib
-	dev-libs/openssl:0
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
-	enewgroup aerospike
-	enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
-	local server_deb="${P}.debian7.x86_64.deb"
-	local tools_deb="aerospike-tools-3.15.3.2.debian7.x86_64.deb"
-
-	ar x "${server_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	ar x "${tools_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
-	rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
-	insinto /opt/
-	doins -r opt/aerospike
-
-	fperms +x -R /opt/aerospike/bin/
-	fperms +x -R /opt/aerospike/lib/python/
-
-	for dir in '/etc' '/var/log'; do
-		keepdir "${dir}/aerospike"
-	done
-
-	insinto /etc/aerospike
-	for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
-		doins "${FILESDIR}/${conf}"
-	done
-
-	insinto /usr/bin
-	doins usr/bin/*
-	fperms +x -R /usr/bin/asd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/aerospike.logrotate aerospike
-
-	newinitd "${FILESDIR}"/aerospike.init aerospike
-
-	fowners -R aerospike:aerospike /opt/aerospike/
-	fowners aerospike:aerospike /usr/bin/asd
-	fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-4.0.0.4.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-4.0.0.4.ebuild
deleted file mode 100644
index 83946c562c0d..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-4.0.0.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-libs/readline:0
-	sys-libs/zlib
-	dev-libs/openssl:0
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
-	enewgroup aerospike
-	enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
-	local server_deb="${P}.debian7.x86_64.deb"
-	local tools_deb="aerospike-tools-3.15.3.2.debian7.x86_64.deb"
-
-	ar x "${server_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	ar x "${tools_deb}" || die
-	tar xzf data.tar.gz && rm data.tar.gz || die
-
-	rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
-	rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
-	insinto /opt/
-	doins -r opt/aerospike
-
-	fperms +x -R /opt/aerospike/bin/
-	fperms +x -R /opt/aerospike/lib/python/
-
-	for dir in '/etc' '/var/log'; do
-		keepdir "${dir}/aerospike"
-	done
-
-	insinto /etc/aerospike
-	for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
-		doins "${FILESDIR}/${conf}"
-	done
-
-	insinto /usr/bin
-	doins usr/bin/*
-	fperms +x -R /usr/bin/asd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/aerospike.logrotate aerospike
-
-	newinitd "${FILESDIR}"/aerospike.init aerospike
-
-	fowners -R aerospike:aerospike /opt/aerospike/
-	fowners aerospike:aerospike /usr/bin/asd
-	fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/apgdiff/Manifest b/dev-db/apgdiff/Manifest
index 36b3aea77628..98a19c3c7795 100644
--- a/dev-db/apgdiff/Manifest
+++ b/dev-db/apgdiff/Manifest
@@ -1,11 +1,3 @@
-DIST apgdiff-1.4-src.zip 178608 BLAKE2B 5ea0c4ea151a4bb60711b90ecd27a42b02ab08f16034d194646a8b3d3b22fc7d98862b4629a4411127ba6a2898d25264311287d9299cd801969d5d8d04ffd036 SHA512 c1dcd3f39e931f90e65a439a610d5b264b790419a59b2c90f6d9107c1b5151c602887588f378110a2e9420428414fc333c7919e2137e2dc35168654ceb3ae8d0
-DIST apgdiff-2.2.1-src.zip 194305 BLAKE2B 9c4d5eb7639038b591d31a6059efa0c78cdd1e21826ab5992a236abc492d3ef9e8712b0a7516253903bb88055d8594e83a1f5892e6fae90336e76258eecee4bd SHA512 cab6b2349d5822ca579c1e021ea7f02f5ddf39d56559f841d0cadfdccc1c1c61399c494302ea5909984b9a8a6d91cf08868f012dd3487a8633f65e3bbd28f19c
-DIST apgdiff-2.2.2-src.zip 198814 BLAKE2B b044f16475576fd714b6196da55ec1b744255aeb3cdccc2fd654500235cd0b500b8188e7d06962bb8fd28dc1a77e3526cf39550eb89da101d6255b1b6b9fe59d SHA512 273ba473b5b4ccfe2ae1b3f34ce2c2b825e446fad166f28a4575528190c20922e6794563ae3e5b2918ade5a3292a792ea363e9e5ec0900e924332d8771548c0b
-DIST apgdiff-2.3-src.zip 215881 BLAKE2B 05482ec11e278f5408305e16ee57bef99eb3e362ebdc5055781017ff40890a56936b515dd9973b557ad64d4a7e934b1bb5886207a9d9a9e0365d0e41f3fe008c SHA512 e716143ff4378fc27c4781076c51826583c2ad9dab17f4364acbfed0f9a0958dca0de9a72171816bbce41653ad33834158cb9277dd8790649da4bd24e013bbb5
 DIST apgdiff-2.4-src.zip 227714 BLAKE2B 1c62c94592b28a7caf5a56f4ef4206cc2655f2da278d5a71e165f409587d1573dd44b62261817f0b994ed95a398555190dee6a2873fe493f695e91c6cf9dd22c SHA512 f37e0f86ff8a8bc53a43cac1748ab3a2c96ab6c972b37ee63f281ee397b31a7b48986cbc963d89ea773f1bb7b10b798de74a4c88a03f2db7672501b93355261b
-EBUILD apgdiff-1.4.ebuild 1101 BLAKE2B 068494e8686934f6e7a7857f1cd8a12dfe034bff11d59ae7d20128c79881b977ab5779617f82c381b64d04ad5cad3741ea871575e5952661ca4ed9271cdf4db5 SHA512 3ade424c6cbc9fc15ef70fc857b16519116d3d7b5e11d5dbdfa3a647c7e11af26c2068e956b6472e34befe7dda67684672fbaaae13c1586b382eb86eb0811437
-EBUILD apgdiff-2.2.1.ebuild 1104 BLAKE2B 8c8205a063b3679349eb369f04bd75bad8f1a9c90aa9caba37d8bda85116210269ebe2797ef146f41e71a2f34d706e2ddc7cb49fcf94ad8e98e8a5eb0e65402f SHA512 7f47a043a0d5b1fbeb98a0eed7cdeef5a4408d88ee469f3a281fc1e99f24a14222a7d1a8b64e9b0e2a80dc2aaf8d56d49d9ee731ab0d4440de35a5d58032780c
-EBUILD apgdiff-2.2.2.ebuild 1098 BLAKE2B b0ef57ba86411a0fc2d864654d650fa3164133c54cb9ec8b0781a697bfafc97d4e6beba47bba730c72a8d406875254ec7a2a295975671389f5940804e5c721e8 SHA512 f9284908521f49d42cc1312a8db98ad08c6c076f2786c7c2aeb6fd40d6fa1f80c88d007977a60cf2e3a241a4342b85a4d4f6e9326f2135e0e7438e5e11aacd51
-EBUILD apgdiff-2.3.ebuild 1098 BLAKE2B b0ef57ba86411a0fc2d864654d650fa3164133c54cb9ec8b0781a697bfafc97d4e6beba47bba730c72a8d406875254ec7a2a295975671389f5940804e5c721e8 SHA512 f9284908521f49d42cc1312a8db98ad08c6c076f2786c7c2aeb6fd40d6fa1f80c88d007977a60cf2e3a241a4342b85a4d4f6e9326f2135e0e7438e5e11aacd51
 EBUILD apgdiff-2.4.ebuild 1098 BLAKE2B b0ef57ba86411a0fc2d864654d650fa3164133c54cb9ec8b0781a697bfafc97d4e6beba47bba730c72a8d406875254ec7a2a295975671389f5940804e5c721e8 SHA512 f9284908521f49d42cc1312a8db98ad08c6c076f2786c7c2aeb6fd40d6fa1f80c88d007977a60cf2e3a241a4342b85a4d4f6e9326f2135e0e7438e5e11aacd51
 MISC metadata.xml 301 BLAKE2B f760bd727a4a0cc9572e5ff436dd66ef64d8f734e8605ce15599645a6ccfaef3b0d17348d916894171e99e6920ba60b0e4a13917f9445562473dbd5949ce6f55 SHA512 c38dc6bf13779d6e575526c42fc108080b160b9a7127aaea7f93b8a7ca46dbee5d349e95bfbc8a598c745ba0d2c8ce8ce6ea65a475854ad4d5a85e3620166552
diff --git a/dev-db/apgdiff/apgdiff-1.4.ebuild b/dev-db/apgdiff/apgdiff-1.4.ebuild
deleted file mode 100644
index b23143f348bd..000000000000
--- a/dev-db/apgdiff/apgdiff-1.4.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"
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A simple PostgreSQL diff tool that is useful for schema upgrades"
-HOMEPAGE="https://www.apgdiff.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.7.0:0
-	>=dev-java/ant-junit-1.7.0:0
-	app-arch/zip:0
-	test? (
-		dev-java/hamcrest-core:0
-		>=dev-java/junit-4.4:4
-	)"
-
-RDEPEND=">=virtual/jre-1.5"
-
-java_prepare() {
-	mkdir "${S}"/lib
-	cd "${S}"/lib
-	if use test ; then
-		java-pkg_jar-from --build-only hamcrest-core
-		java-pkg_jar-from --build-only junit-4
-	fi
-}
-
-src_compile() {
-	eant -Dnoget=true jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-	java-pkg_dolauncher apgdiff --jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant -Dnoget=true test
-}
diff --git a/dev-db/apgdiff/apgdiff-2.2.1.ebuild b/dev-db/apgdiff/apgdiff-2.2.1.ebuild
deleted file mode 100644
index 82e2382f3931..000000000000
--- a/dev-db/apgdiff/apgdiff-2.2.1.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"
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A simple PostgreSQL diff tool that is useful for schema upgrades"
-HOMEPAGE="https://apgdiff.com"
-SRC_URI="https://apgdiff.com/download/${P}-src.zip"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.6
-	>=dev-java/ant-core-1.7.0:0
-	>=dev-java/ant-junit-1.7.0:0
-	app-arch/zip:0
-	test? (
-		dev-java/hamcrest-core:1.3
-		>=dev-java/junit-4.4:4
-	)"
-
-RDEPEND=">=virtual/jre-1.6"
-
-java_prepare() {
-	mkdir "${S}"/lib
-	cd "${S}"/lib
-	if use test ; then
-		java-pkg_jar-from --build-only hamcrest-core-1.3
-		java-pkg_jar-from --build-only junit-4
-	fi
-}
-
-src_compile() {
-	eant -Dnoget=true jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-	java-pkg_dolauncher apgdiff --jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant -Dnoget=true test
-}
diff --git a/dev-db/apgdiff/apgdiff-2.2.2.ebuild b/dev-db/apgdiff/apgdiff-2.2.2.ebuild
deleted file mode 100644
index 8066c91411e7..000000000000
--- a/dev-db/apgdiff/apgdiff-2.2.2.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"
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A simple PostgreSQL diff tool that is useful for schema upgrades"
-HOMEPAGE="https://apgdiff.com"
-SRC_URI="https://apgdiff.com/download/${P}-src.zip"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.6
-	>=dev-java/ant-core-1.7.0:0
-	>=dev-java/ant-junit-1.7.0:0
-	app-arch/zip:0
-	test? (
-		dev-java/hamcrest-core:0
-		>=dev-java/junit-4.4:4
-	)"
-
-RDEPEND=">=virtual/jre-1.6"
-
-java_prepare() {
-	mkdir "${S}"/lib
-	cd "${S}"/lib
-	if use test ; then
-		java-pkg_jar-from --build-only hamcrest-core
-		java-pkg_jar-from --build-only junit-4
-	fi
-}
-
-src_compile() {
-	eant -Dnoget=true jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-	java-pkg_dolauncher apgdiff --jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant -Dnoget=true test
-}
diff --git a/dev-db/apgdiff/apgdiff-2.3.ebuild b/dev-db/apgdiff/apgdiff-2.3.ebuild
deleted file mode 100644
index 8066c91411e7..000000000000
--- a/dev-db/apgdiff/apgdiff-2.3.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"
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A simple PostgreSQL diff tool that is useful for schema upgrades"
-HOMEPAGE="https://apgdiff.com"
-SRC_URI="https://apgdiff.com/download/${P}-src.zip"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.6
-	>=dev-java/ant-core-1.7.0:0
-	>=dev-java/ant-junit-1.7.0:0
-	app-arch/zip:0
-	test? (
-		dev-java/hamcrest-core:0
-		>=dev-java/junit-4.4:4
-	)"
-
-RDEPEND=">=virtual/jre-1.6"
-
-java_prepare() {
-	mkdir "${S}"/lib
-	cd "${S}"/lib
-	if use test ; then
-		java-pkg_jar-from --build-only hamcrest-core
-		java-pkg_jar-from --build-only junit-4
-	fi
-}
-
-src_compile() {
-	eant -Dnoget=true jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-	java-pkg_dolauncher apgdiff --jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant -Dnoget=true test
-}
diff --git a/dev-db/go-etcd/Manifest b/dev-db/go-etcd/Manifest
index d94f3b478e18..66aabab91f59 100644
--- a/dev-db/go-etcd/Manifest
+++ b/dev-db/go-etcd/Manifest
@@ -1,6 +1,3 @@
-DIST go-etcd-0_p20141013.tar.gz 18214 BLAKE2B ceb14c88dc65c81d0b8f620986ad30d9b0b21f92169979c69d0f7fd97abd81ef0c210dd3cb4bc23f361fc13aa97ba2cf5fcf59524608a14637780a381f3bf21d SHA512 af07b2434bbad219962e989ca1d6ccb86bb40f698aa3f2b681ac04094dc7e878593af6a54e9c1e976d1aeb451661d8100295b0637291b46bafa45452537f1575
 DIST go-etcd-2.0.0.tar.gz 18214 BLAKE2B ceb14c88dc65c81d0b8f620986ad30d9b0b21f92169979c69d0f7fd97abd81ef0c210dd3cb4bc23f361fc13aa97ba2cf5fcf59524608a14637780a381f3bf21d SHA512 af07b2434bbad219962e989ca1d6ccb86bb40f698aa3f2b681ac04094dc7e878593af6a54e9c1e976d1aeb451661d8100295b0637291b46bafa45452537f1575
-EBUILD go-etcd-0_p20141013-r1.ebuild 1081 BLAKE2B bb94dfb8e724443b37a67fc6e8367b822d72d1b4b7980f343e37282c1b2ee0d6c1d0fef78c47e67f581976e37d6699ee246be3b4389004f99db4f7c8d54e198e SHA512 3642c33e67863ef4859305dd38b356da075041ec9a58f9397a84c0b76a2a632881ba882d76d6e4fb2d8fd3b5a3cc34c111f75a1207b851c48c5e24abc6ee9192
 EBUILD go-etcd-2.0.0-r1.ebuild 1076 BLAKE2B e314338a3a2be797f1d99e98d53a2be2b27ca595a07ae88bfab51fb67c0faad05b2f81620d5eb37b471ee1139e437c5895135cdffcfafa93cf6386d9a4bb6d73 SHA512 0fc9e9b769543e2c5d1224ad14c8f889e370dba66258b79822c88b3e27a8800c6223bcaa58e8d8042f18c5bdb723064c34cbf550a0d4e92e59f839b52ac09d96
-EBUILD go-etcd-2.0.0.ebuild 1081 BLAKE2B ded93e184bf74d3bd53e620176551209f20371523bc7f38535736cbf62afc11ae6d5d7770c4cd1c5dde0b386e3a0a349a7329164cb85b7f9dd0228c74d54f300 SHA512 32fd17f07b4dfc8693c575b0ca4623d562b397b270902155d7e6873a3581098dedb96add88b477bfa5ad80a8aacecdb3690dce58259f3e709fff5054f32f5c29
 MISC metadata.xml 509 BLAKE2B 4f392436ef8f201f72e16cd373c00dfef3f95cd1766233fb68fae2479cf9d3d844b2ab2222f7a91ba0bf3704c20822edad309916d0ce3dc16145a8940ba3acb1 SHA512 0162c39d76959d8cbe7ca2a280a4c415912c09f1d0044216ad73367c865dcf61037da0022711777fcc277fa8ee65feb5c04a2a4a50fb549a9585798ceb3c6d28
diff --git a/dev-db/go-etcd/go-etcd-0_p20141013-r1.ebuild b/dev-db/go-etcd/go-etcd-0_p20141013-r1.ebuild
deleted file mode 100644
index e7ea9c19b91f..000000000000
--- a/dev-db/go-etcd/go-etcd-0_p20141013-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils vcs-clean
-
-GO_PN=github.com/coreos/${PN}
-DESCRIPTION="Go client library for etcd"
-
-HOMEPAGE="https://github.com/coreos/go-etcd"
-EGIT_COMMIT="25e2c63be8e8ab405014a78879e0992ae5ff55e8"
-SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.4"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	default_src_unpack
-	mkdir -p src/${GO_PN%/*} || die
-	mv ${PN}-${EGIT_COMMIT} src/${GO_PN} || die
-}
-
-src_compile() {
-	# Create a filtered GOROOT tree out of symlinks,
-	# excluding go-etcd, for bug #503324.
-	cp -sR /usr/lib/go goroot || die
-	rm -rf goroot/src/${GO_PN} || die
-	rm -rf goroot/pkg/linux_${ARCH}/${GO_PN} || die
-	GOROOT=${WORKDIR}/goroot GOPATH=${WORKDIR} \
-		go install -x ${GO_PN}/etcd || die
-}
-
-src_install() {
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go
-	doins -r pkg
-	insinto /usr/lib/go/src
-	egit_clean
-	doins -r src/*
-}
diff --git a/dev-db/go-etcd/go-etcd-2.0.0.ebuild b/dev-db/go-etcd/go-etcd-2.0.0.ebuild
deleted file mode 100644
index b47229902f49..000000000000
--- a/dev-db/go-etcd/go-etcd-2.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils vcs-clean
-
-GO_PN=github.com/coreos/${PN}
-EGIT_COMMIT="25e2c63be8e8ab405014a78879e0992ae5ff55e8"
-
-DESCRIPTION="Go client library for etcd"
-HOMEPAGE="https://github.com/coreos/go-etcd"
-SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.4"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	default_src_unpack
-	mkdir -p src/${GO_PN%/*} || die
-	mv ${PN}-${EGIT_COMMIT} src/${GO_PN} || die
-}
-
-src_compile() {
-	# Create a filtered GOROOT tree out of symlinks,
-	# excluding go-etcd, for bug #503324.
-	cp -sR /usr/lib/go goroot || die
-	rm -rf goroot/src/${GO_PN} || die
-	rm -rf goroot/pkg/linux_${ARCH}/${GO_PN} || die
-	GOROOT=${WORKDIR}/goroot GOPATH=${WORKDIR} \
-		go install -x ${GO_PN}/etcd || die
-}
-
-src_install() {
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go
-	doins -r pkg
-	insinto /usr/lib/go/src
-	egit_clean
-	doins -r src/*
-}
diff --git a/dev-db/libdbi/Manifest b/dev-db/libdbi/Manifest
index 2c728b2560db..3e384a2c304d 100644
--- a/dev-db/libdbi/Manifest
+++ b/dev-db/libdbi/Manifest
@@ -1,5 +1,5 @@
 AUX dbi.pc.in 244 BLAKE2B b42f4a78c39034fe1ff4f2cf1ffc8bd252eb17e68dc50e03fd47ecd9838c37d00d5c4eb4a4b5ae5b3dd66ad63ba2c313923203b5514bf1161e405cd21e4fa4ce SHA512 6865b37e8d84d7a95b0ae482d9b1cb486ab7abbe726e699099ea4368d418f64b6d8cb02ecd4d1473f643aa5d715c57817a9496bd8950461921d5db4ff4272ef9
 AUX libdbi-0.9.0-doc-build-fix.patch 662 BLAKE2B 652bdba6b0e9b04bee87f48f0db1fba774bf153bd73f925b3d1111823c14e82ccf3202f8023736e3b0a91e00c28c6aca14ca5ffcad3126723c7f02cbc30a7049 SHA512 db18d3697be13ef416914843d0933caead3b1f57c13790373ec435318212f0ccfb599514f8bd6f1c603e09f13bd526b62322ff92e68512e43020b31f8d0dec55
 DIST libdbi-0.9.0.tar.gz 1194284 BLAKE2B 36ee5d9ec0a9b088735173cfa9a85e30ee595d6781aafeb994271e7745d259dbe983bea037182c471dc35ae36486a5fb8690e9c716e2e08a4a3964d90abd64f0 SHA512 ee8777195af43057409d051a6055ec0467cd926d48da076458b09f91d2f0995a1cc4bc071762e401b7bdcd8a4173fd8ea3472db3a1518e34b4c5b5ed24e4e2ce
-EBUILD libdbi-0.9.0.ebuild 1350 BLAKE2B 3980625877ac1cf4962f0e47c1dbe2928528625e42086f2db69d1f623dc316aaebc03473043b7530180c2eaa4041d1aa618b4f8576a868670259e4a44e9de49a SHA512 54e710ed0a52fc260a2541219e918e6350f8462dddbc07c7d5bd45de994ea4e943bbadd9a974c0b921d950a15987ba508a8789972d6fb95e524cd21ee654bb3e
+EBUILD libdbi-0.9.0.ebuild 1205 BLAKE2B 83b3fe6b73d9fe7753f55f480f9f4d26bc5795ac8409c29282a5b499de594461be8ee243bcb3e573c66f7cc017f8f9e307d55f82bd68230e5ed039fa71d7fba9 SHA512 0df73652fd32c98ef8184d0490880a3abfa707d82d025e1083d9f2cb42ed32a771ee632b59bebcd8ef57ca685c65d8fc4fd6bfe809ae1d77097df496fa1c3c5a
 MISC metadata.xml 294 BLAKE2B 1d9ff5692cbe4272918f7c3a8a5f9f1e564fd2ac3d5e5878be44f916557ecdefb843ad3b56e778d2833361609ac8cc9dec2939c04bab59687b4a7d2c25f4c750 SHA512 acb2d7a1ab6206a1f489cc8999ae35f014453bc95764000c5a6492a4b8832f2e0cf83bc875aecf50a6a6beb6bedabddb74628a2599f6c84a2d4aded345a39cd1
diff --git a/dev-db/libdbi/libdbi-0.9.0.ebuild b/dev-db/libdbi/libdbi-0.9.0.ebuild
index b1fe05a9a1b5..f042010c2407 100644
--- a/dev-db/libdbi/libdbi-0.9.0.ebuild
+++ b/dev-db/libdbi/libdbi-0.9.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils autotools ltprune multilib
+inherit autotools
 
 DESCRIPTION="A database-independent abstraction layer in C"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -14,7 +14,7 @@ IUSE="doc static-libs"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 SLOT=0
 
-DOCS="AUTHORS ChangeLog README README.osx TODO"
+DOCS=( AUTHORS ChangeLog README README.osx TODO )
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -24,21 +24,17 @@ DEPEND="${RDEPEND}
 "
 PDEPEND=">=dev-db/libdbi-drivers-0.9.0" # On purpose, libdbi-drivers 0.8.4 does not exist
 
-src_unpack() {
-	unpack ${A}
-	chown -R portage:portage "${S}"
-}
-
 src_prepare() {
-	#epatch "${FILESDIR}"/${PN}-0.9.0-fix-ac-macro.patch
-	#epatch "${FILESDIR}"/libdbi-0.8.1-pkg-config.patch
-	#cp -f "${FILESDIR}"/dbi.pc.in "${S}"/dbi.pc.in
-	epatch "${FILESDIR}"/libdbi-0.9.0-doc-build-fix.patch
+	eapply "${FILESDIR}"/libdbi-0.9.0-doc-build-fix.patch
 
-	# configure.in has been changed
+	mv configure.in configure.ac || die
+
+	# configure.in/ac has been changed
 	eautoreconf
+
 	# should append CFLAGS, not replace them
 	sed -i.orig -e 's/^CFLAGS = /CFLAGS += /g' src/Makefile.in
+	eapply_user
 }
 
 src_configure() {
@@ -50,7 +46,7 @@ src_configure() {
 src_install() {
 	default
 
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die "removing .la files failed"
 
 	# syslog-ng requires dbi.pc
 	insinto /usr/$(get_libdir)/pkgconfig/
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index de0fdc7e5174..56d6ce4b9243 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -14,17 +14,11 @@ AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba93
 DIST mongodb-src-r3.6.13.tar.gz 40853787 BLAKE2B de9621de4f570d569df5cfe026ea5da24641c97f1ac9f3e58a0706b1d0bd74757390a075c95c6d3acd12f3c5c7bcbeb9302ac997248c54a5b7910b582debdc82 SHA512 eb84fb22ff871b5ec620d6fc29a6a66072211656e914630ad0f53e4fcad55aa40a76a0e68e68bdbe8ef061bea09ce6ad6aea5d8d865ea8a8fdca0ed829555fcd
 DIST mongodb-src-r3.6.17.tar.gz 40932592 BLAKE2B 94bbb943fd929318a2b32344cb4574243ad234d1cd14ffef864d7fd2d60841866fd5a1966eae8f14266a9648deb62b7b55386d41338b515d5e6849e980143d42 SHA512 b4d9e9bfc7ff886532641058c99da29420d1aa472cb4cf2b254e0fd0af5ecc72ac8bf28dcd55ab738b799b00132ffacddd154dea37ccfbf459c7cc603c2582e0
 DIST mongodb-src-r4.0.12.tar.gz 49937644 BLAKE2B 81044a6d68be6420d30fb2d7386ff29871a696cad94ce5977c1aba60c2ce80e18ccb86492c1947a359ef124332ea82ac3cb0fb73a68f51904a008fdf911aa055 SHA512 802eaf57d56c5e8e217344f10104a201acb6f5abef0065fc1bb8e6ceef13fe489b7ae46ed0d55b5bad50fe3579860b1c1471d224b51b0f15f968278cb5f6a47a
-DIST mongodb-src-r4.0.16.tar.gz 50091501 BLAKE2B a383f9fef8e5b2ceda9646dfc4f4f46bc3bee66be45e94a846b1a7ce859826273812d4ce11aa96d1766071bf5fb422771bf2176350145deae99e64e59c164e38 SHA512 90458dea29a4c9a3078e1f13ffd2163911bf5a5f42884553ad9b3c2a2fafea2f73e506640c78f55f27bc16551582ad22244437356b89786fef383ce4b24bb617
 DIST mongodb-src-r4.0.19.tar.gz 50126414 BLAKE2B 2691e2a9c8833ff9a086b28fd137bc8e8f10d58570117657c7cc01edbf61568ae62f58440d72e8711de98b9fc6868c1095b4ee88eb7b0eb63ea45ce19e842edd SHA512 57032a009ea7e79de4cac496a2d1266b83b99cc45eb9f1169be2fcdca1ed2003a659ceedf9eafbd4aa7fc5b3b0513066a5d712af7666cee5a897b2a2d7dd30cb
-DIST mongodb-src-r4.2.3.tar.gz 61565615 BLAKE2B 695310a497e57f1c735f175f5b321c93cda376ec734bb08d4cabbd562a865b327f529560220be9c22f571cc70af333a77f0116f04c7f7e3a40f275ab53ab1bf9 SHA512 60e9091cfab4a189a937dfa7ce232eb6ead2ca192c916579f4fb5da2040aa340ae9de0ea8c7a4ccb0edcfdbdf6e666144657f171c3f23c0a62bccf27cd351c69
-DIST mongodb-src-r4.2.6.tar.gz 61671088 BLAKE2B 7f2b6240b05639d2bbe37ea148cbb225b30813879f71a5fc3c135ef7debd58edf75abe925d00f9ff96dc6a75a525b4504e25254b0046326069c05bb1dfd60827 SHA512 117c910807a8363aab6b899b436a4b06564b6e53abfa7f0fe6e01c1e242401ab5a3634d9edc5e0a5e2d548a480c90b70ac492eb199b3f2476d9045a78e376af8
 DIST mongodb-src-r4.2.8.tar.gz 61730247 BLAKE2B f1d98b8ac8f62c0c7aff100ef663bb20345de0e77e0ff420817db0843fe735b58af8075578a7f8d83cc9dc4e597c95ae09f89ce7a21cf8146ff15bcb11eba924 SHA512 163fce480762bd377d6c78b661bfe51fc883223a5309a68f9556e1bafb99e26e476d81dbe6de825d90469e835442be097be630ca9678e54b9d09091e0b5d67c4
 EBUILD mongodb-3.6.13.ebuild 4253 BLAKE2B 9c549c4a4f86d0642845b704af18c2f6e813ac71c188b1cc770b188e634dc388368607f92bc164afb24f0e4de09ee77d52a126450a89fa0af3f0254f6d8258d7 SHA512 aeacc08eb48dbd86141d694b1a71579b79da29cfc9f1f2e7727c25ccbb47bdc3f9b4d0091fd269ef04aff7bfce27059ac4059e7f7c14f8258ccc194996999c3b
 EBUILD mongodb-3.6.17.ebuild 4239 BLAKE2B 2e88b7f99c60bdc724aba683ac6397634e005ebd0ede16d40620f84de196d77b616defcb2faa1fd84434a922826ebcd53c2902f4cb9fdf052a4b4a4d767b638d SHA512 10425c5c499a7182a22bf80479ddd61bcea5f51c4b99fd64aaf4c8fe29fec9db7dfeca211ead81431faf98f800d5dd3f381be32737acde01d4608d14a9d4f77c
 EBUILD mongodb-4.0.12.ebuild 4314 BLAKE2B 6e1d33a0d5e3948e2c6d7258379050b8b090a2debd04623f7f51a1e35a54fdf6fe3407eb6ff7afea121f8274f329564f192e26104d2173a08b5ad31ca52f669d SHA512 4509e201ec92554b3b5cc7c2f1d2daba1195357e8e064ad2f639667136194f2c683a420b95a69d086f8abc00da32daab64e33b921a5278eb4ea095022d2048e9
-EBUILD mongodb-4.0.16-r1.ebuild 4593 BLAKE2B 25a75906f5b037572499b8f5a51bc5df9be6e4e413055c85c340a653809587b9467bb51a6b6bd69d5e9609a062727540b7ca90a71e738958b6d50ae21fb46683 SHA512 661332d0421a768ac8b22d9e5f8bc44c5e7ef986dc2180d3c2163e72190fab3557c378d162a63029c897fa1dc1e1a2e5ed2dde5b22d33e7a84de61fa02a52a08
-EBUILD mongodb-4.0.19.ebuild 4593 BLAKE2B 25a75906f5b037572499b8f5a51bc5df9be6e4e413055c85c340a653809587b9467bb51a6b6bd69d5e9609a062727540b7ca90a71e738958b6d50ae21fb46683 SHA512 661332d0421a768ac8b22d9e5f8bc44c5e7ef986dc2180d3c2163e72190fab3557c378d162a63029c897fa1dc1e1a2e5ed2dde5b22d33e7a84de61fa02a52a08
-EBUILD mongodb-4.2.3-r1.ebuild 4716 BLAKE2B a58003ae719b3726ef7ae083c03f753bbec1ad98f9a211c2274f81fa01a7dd96f46d505bf555b19eaa5ea12cb733d5437fd0bacf145fe35379048ac4e69d87a2 SHA512 a2b478e4a8d9f20aed3a653325ed6c47dc141421cec1e2782996443eefc5b7059931f21fb21781d1ccbe62d5809d127dc5658b39eeb98742317fc2ec0a42d3e5
-EBUILD mongodb-4.2.6.ebuild 4716 BLAKE2B a58003ae719b3726ef7ae083c03f753bbec1ad98f9a211c2274f81fa01a7dd96f46d505bf555b19eaa5ea12cb733d5437fd0bacf145fe35379048ac4e69d87a2 SHA512 a2b478e4a8d9f20aed3a653325ed6c47dc141421cec1e2782996443eefc5b7059931f21fb21781d1ccbe62d5809d127dc5658b39eeb98742317fc2ec0a42d3e5
-EBUILD mongodb-4.2.8.ebuild 4716 BLAKE2B a58003ae719b3726ef7ae083c03f753bbec1ad98f9a211c2274f81fa01a7dd96f46d505bf555b19eaa5ea12cb733d5437fd0bacf145fe35379048ac4e69d87a2 SHA512 a2b478e4a8d9f20aed3a653325ed6c47dc141421cec1e2782996443eefc5b7059931f21fb21781d1ccbe62d5809d127dc5658b39eeb98742317fc2ec0a42d3e5
+EBUILD mongodb-4.0.19.ebuild 4592 BLAKE2B 7e2feeb4abdfdd2eebe27265665576ea7c899cdb06bf5d5a70e8ac54a227815a93e79d5a58538effd1732b3e8e9e08d9ed38d7a3e6a463c4c21c5f3850ccd77d SHA512 f37ef841a74cb6b9b9f7adf6879977352d94be11e583b8ff475e3610f4c016203ffcad06ce45808734e93a1fff4aee067b29a9e828961abeca59e15e0396604a
+EBUILD mongodb-4.2.8.ebuild 4785 BLAKE2B 882ce4365612621348c851383ea19a20db880a11c4b7eb38ac3e7e4508a231d3c4bfca90615425eb9801cee85885c2cccfa61aeef1c26b5f22c4971cc8f31c5c SHA512 3c3fa9e7698f8853f9310bab8890e8e30c1bbc095eb2ede1f6196accaaf770cf1bec94b1bfaf019fdf727f9f1243f0dc2dfcaacbfd651187e852d4aa171e04ce
 MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/mongodb-4.0.16-r1.ebuild b/dev-db/mongodb/mongodb-4.0.16-r1.ebuild
deleted file mode 100644
index 651219492475..000000000000
--- a/dev-db/mongodb/mongodb-4.0.16-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/mongodb
-	acct-user/mongodb
-	>=app-arch/snappy-1.1.3
-	>=dev-cpp/yaml-cpp-0.5.3:=
-	>=dev-libs/boost-1.60:=[threads(+)]
-	>=dev-libs/libpcre-8.41[cxx]
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.11:=
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	mms-agent? ( app-admin/mms-agent )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		test? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-		>=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/typing[${PYTHON_USEDEP}]
-	')
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	debug? ( dev-util/valgrind )"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
-	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
-	"${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
-			ewarn "To upgrade from a version earlier than the 3.6-series, you must"
-			ewarn "successively upgrade major releases until you have upgraded"
-			ewarn "to 3.6-series. Then upgrade to 4.0 series."
-		else
-			ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
-		fi
-	fi
-}
-
-python_check_deps() {
-	if use test; then
-		has_version "dev-python/pymongo[${PYTHON_USEDEP}]" ||
-			return 1
-	fi
-
-	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/cheetah[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/typing[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
-	# remove compass
-	rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-	)
-
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use lto && scons_opts+=( --lto=on )
-	use ssl && scons_opts+=( --ssl )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/mongos.initd-r3" mongos
-	newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		diropts -m0750 -o mongodb -g mongodb
-		keepdir "${x}"
-	done
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-4.0.19.ebuild b/dev-db/mongodb/mongodb-4.0.19.ebuild
index 651219492475..8b315a9df686 100644
--- a/dev-db/mongodb/mongodb-4.0.19.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.19.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/mongodb/mongodb-4.2.3-r1.ebuild b/dev-db/mongodb/mongodb-4.2.3-r1.ebuild
deleted file mode 100644
index b88bcf9c846f..000000000000
--- a/dev-db/mongodb/mongodb-4.2.3-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="debug kerberos libressl lto ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/mongodb
-	acct-user/mongodb
-	>=app-arch/snappy-1.1.3
-	>=dev-cpp/yaml-cpp-0.6.2:=
-	>=dev-libs/boost-1.70:=[threads(+)]
-	>=dev-libs/libpcre-8.42[cxx]
-	app-arch/zstd
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.11:=
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
-		>=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	')
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	debug? ( dev-util/valgrind )"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
-	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-	if use test; then
-		has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
-		has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
-	fi
-
-	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
-			ewarn "To upgrade from a version earlier than the 4.0-series, you must"
-			ewarn "successively upgrade major releases until you have upgraded"
-			ewarn "to 4.0-series. Then upgrade to 4.2 series."
-		else
-			ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
-
-	# remove compass
-	rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-		--use-system-zstd
-	)
-
-	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use lto && scons_opts+=( --lto=on )
-	use ssl && scons_opts+=( --ssl )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/mongos.initd-r3" mongos
-	newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		diropts -m0750 -o mongodb -g mongodb
-		keepdir "${x}"
-	done
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-4.2.6.ebuild b/dev-db/mongodb/mongodb-4.2.6.ebuild
deleted file mode 100644
index b88bcf9c846f..000000000000
--- a/dev-db/mongodb/mongodb-4.2.6.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="debug kerberos libressl lto ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/mongodb
-	acct-user/mongodb
-	>=app-arch/snappy-1.1.3
-	>=dev-cpp/yaml-cpp-0.6.2:=
-	>=dev-libs/boost-1.70:=[threads(+)]
-	>=dev-libs/libpcre-8.42[cxx]
-	app-arch/zstd
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.11:=
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
-		>=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	')
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	debug? ( dev-util/valgrind )"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
-	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-	if use test; then
-		has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
-		has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
-	fi
-
-	has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
-			ewarn "To upgrade from a version earlier than the 4.0-series, you must"
-			ewarn "successively upgrade major releases until you have upgraded"
-			ewarn "to 4.0-series. Then upgrade to 4.2 series."
-		else
-			ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
-
-	# remove compass
-	rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-		--use-system-zstd
-	)
-
-	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use lto && scons_opts+=( --lto=on )
-	use ssl && scons_opts+=( --ssl )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/mongos.initd-r3" mongos
-	newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		diropts -m0750 -o mongodb -g mongodb
-		keepdir "${x}"
-	done
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-4.2.8.ebuild b/dev-db/mongodb/mongodb-4.2.8.ebuild
index b88bcf9c846f..c0a0f5b5245f 100644
--- a/dev-db/mongodb/mongodb-4.2.8.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.8.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="debug kerberos libressl lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
@@ -134,7 +134,8 @@ src_compile() {
 
 # FEATURES="test -usersandbox" emerge dev-db/mongodb
 src_test() {
-	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+	ewarn "Tests may hang with FEATURES=usersandbox"
+	"${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
 }
 
 src_install() {
diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index b46560f2414d..321310afc41b 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -1,14 +1,9 @@
 AUX 11.2.0.3-makefile.patch 2250 BLAKE2B f680a9dbe7a8fb51c09667b3a49eaa86cc965a36f3d3df6c789e944ce83126fef1f12e0fa083f41e94b0b56ff1bcef5c9128f959f553730ec679051e83523da2 SHA512 1573f20608cf1e8a9c6dc94b40f4a7dac822f7888b2232ff13bf3db5456bbc0f653022acb194bdb2014698665042108d7f2b13e95ce00bd492c4c0eb03f4c9db
 AUX tnsnames.ora.sample 2939 BLAKE2B d02d4be5eae8c8da346f8b0ddd2b6808e59f8e77f805b22154a77d22db325d415ecaf811323de3c7a6764a9167fb7f9a9708d1cf2de891858bc43bd5e050954d SHA512 25bb734bf4b7ea1d2ce2bddfd241204e796cad0d1d49036e567237d7ca92d158ab7bf69ff3abe210050c8ee0a0630f9217ced22dc31770814d822f93b2af5845
-DIST instantclient-basic-linux-11.2.0.3.0.zip 58502865 BLAKE2B da0f428447a4300dc64b9845d6f55c3dbeff38af06b1cb38b083f661a575a5c1749737ab389b7222f7be2a05ccdf367830642b1656505b078c0c3ca523159ae8 SHA512 c790f593e67bcc7c114a6287e1f064c03f292472e0a1a5e617a9f19017f06442f31502f66af8e6cfdf2235a18546104dc9aac164a3aa641db5728b66685c9302
 DIST instantclient-basic-linux-11.2.0.4.0.zip 58793148 BLAKE2B e0f92f119a5e8890a4507160179cd49af15ed14bd7c48480d3f685a3e4918a96e6444e75c6ea11d34681a6c66ff0e8011f44840de5f080e2dc3c03079361e4a1 SHA512 b333c9334e960617ac7cc68ad1c7b45f990d5c24c7a5bc8e51b3bc8ff6476acfb6a032521f75ba39327c71ee9676d1163b252066d52e97c1dfe9c092a92a62a0
-DIST instantclient-basic-linux.x64-11.2.0.3.0.zip 60331694 BLAKE2B 8d3e4946c04edd515f0d2495e8ce25b152ded0d903d58244d0d2a2b8bbaf263b0de67829a932f637193c08e96f4a532c131f50b6594009ca4ee1dc228d6a06d1 SHA512 708940b5ca5bc4e0617da2c4da61d0a85834e3e0731ac328a201954558a624162f71d342d674b08ec2cf076e8f639c230f88a73f6d9bfe8908b0e76805e617b7
 DIST instantclient-basic-linux.x64-11.2.0.4.0.zip 60704657 BLAKE2B 77735e81a0acf88221fefff38447536a81a32a6f5cb09dcd4526d43315be1fabb6882bb9e7a5703a4188ac9e112fba611f3e2c064a128eb66512935a1af62b33 SHA512 01ed32f1771bfa2f8ef1b81314843fb2b7b81582f33c07d86670c959bbb08355dc7cc8da586852bb353a3a914658d1e7828d6b5df884215de8d76881c956a989
-DIST instantclient-sdk-linux-11.2.0.3.0.zip 639306 BLAKE2B 80d0cac2061156fd4cfe0792a7bebcaca77ce855335c651472d0ee74cf87350ae4925d92ecd12407b285605fb0d533dcf2a6dfc46d8a0eaa6172461e9c96dc2f SHA512 fa0f98d4b2002982fab4438f734904e0ebfab777d601321423b454f9188c3b863e853fc5486c9958771f7ff8c9a544ce73e80750d745c3142872927ed1777ee1
 DIST instantclient-sdk-linux-11.2.0.4.0.zip 643080 BLAKE2B 9ea15b227d260f7e24b572be1238074dc3a3033a2ab6313d95b750ae48468bda018c52ac604664caa128396024c0ff4bcbc0d401b7900ae27f5f3877a4b44123 SHA512 09e14a0ed88182b685a00b6370da4379710c4179fcf2d5ebdb43684b7099484122f7f5181a80352464f03ae9d0150f5c2ee5f20ede98faa9073294324b9faec8
-DIST instantclient-sdk-linux.x64-11.2.0.3.0.zip 641586 BLAKE2B b3a3fa4c362031aa9d9e926f852e2bccc41dd12c8dac0a18b707f22130a8bfc1b04e12c13b7f94a845439d922884d9f83c149ac0d59af498a73f4c74730be715 SHA512 08b3fdc68e09f262549e2505867943aff5c3927d158569ea7e0bca4f958af725a46143d325dcf80a6d48d09f9240f147470439ac55ea848a27df3eeedd28f732
 DIST instantclient-sdk-linux.x64-11.2.0.4.0.zip 643089 BLAKE2B 710f0a2a81dde6cabdfb2e1472f40cb715d1e060377bec1d05d8b1c794ec05b023f4feca30603202487b52527723ed9d60f73371443ce76ad2781da9c1ed5412 SHA512 7198ddc7d8804353900e45b36de79659d75dee0197c4dd58bd4d69408e7131c95025223bbd1f39ef208269bff379daa6e05f4371af83a82b83997cafadc1d642
-EBUILD oracle-instantclient-basic-11.2.0.3.ebuild 5382 BLAKE2B fcd3cecc4c386c1b4f3f1e9de11c5a93747711faa0eb4b83f49ed06262f04b18d542431212d9d5353291c9a3f6e66264f6ddb17b6eaa972d50dccd516abf1952 SHA512 c64cd1bff11ed6a11251bc3aca214b7b8a4d9a75d01702eb29ce935f9f02fb72bb9128247d2e32d87fbc1e042b0b19a72dfb6009f940bb69b455adc4f38128fe
 EBUILD oracle-instantclient-basic-11.2.0.4.ebuild 5545 BLAKE2B 787d424a25ba6407ac3e0576929a93912ec5d56edcef22fe464bfd30aefb04848a43417124e5540b7d4e8d9e7376a12fcee6fb86b8fa53d29236871592d9d87f SHA512 f7f97eca82b62f43dd17170d5c9ee492f029f8e99b746511712b56cdc4cd45a96a68757101350ab05aab6e7ed5cfe2fd70154c8b28fa4e3c07bc6f961e1fec2b
 EBUILD oracle-instantclient-basic-12.ebuild 399 BLAKE2B f7f1068e3c81af7a4f78972eaad534d44bac0aaaa22516d21fe21852991883a3f2269286e44f84f142771e99175677c589a8d5ea34f79d745f431679ea78c11c SHA512 9bd43fa3ff7ec7f0c281dcbb4ae68f354b820de8ec454c86efafb84a483a20527e4696305c0882d96250d57d604c317e6e61242804ca7b49f5bf068c7f3249f2
 MISC metadata.xml 214 BLAKE2B b60ecbef37fd3eed5949889bfea31a68f4941db8a7a36e4dbbb7d7381d587eaefc230349c83a9eda4bbdfd1d45b4af0928da1ff7ed2f6f4e2c704a10033c6610 SHA512 e4dddc0b51fec262729e9eedd302b3c7d7a91d227e1043134c0242c8aea2f2c6cef5fd8caca6ea1424cc38b3beeb05fed373ffcc2c8751662dd4117639a7b5de
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
deleted file mode 100644
index a63d14bc52b8..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-MY_PLAT_x86="Linux x86"
-MY_BITS_x86=32
-MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
-MY_ASDK_x86="${MY_A_x86/basic/sdk}"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_BITS_amd64=64
-MY_A_amd64="${PN/oracle-}-linux.x64-${PV}.0.zip"
-MY_ASDK_amd64="${MY_A_amd64/basic/sdk}"
-
-DESCRIPTION="Oracle 11g Instant Client with SDK"
-HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
-SRC_URI="
-	x86?   ( ${MY_A_x86}   ${MY_ASDK_x86}                             )
-	amd64? ( ${MY_A_amd64} ${MY_ASDK_amd64} multilib? ( ${MY_A_x86} ) )
-"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="fetch"
-IUSE="multilib"
-
-EMULTILIB_PKG="true"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	dev-libs/libaio
-	multilib? ( >=dev-libs/libaio-0.3.109-r3 )
-"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
-
-set_my_abivars() {
-	S="${WORKDIR}/${ABI}/instantclient_11_2"
-
-	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_ASDK=MY_ASDK_${abi}; MY_ASDK=${!MY_ASDK} # sdk distfile
-
-	[[ -n ${MY_PLAT} ]]
-}
-
-oic_distfile_status() {
-	if [[ -r ${DISTDIR}/${1} ]]; then
-		echo "already here"
-	else
-		echo "still absent"
-	fi
-}
-
-pkg_nofetch() {
-	eerror "Please go to"
-	eerror "  ${HOMEPAGE%/*}/index-097480.html"
-	eerror "  and download"
-	for ABI in $(get_install_abis)
-	do
-		set_my_abivars || continue
-		eerror "Instant Client for ${MY_PLAT}"
-		eerror "    Basic: ($(oic_distfile_status ${MY_A})) ${MY_A}"
-		if is_final_abi; then
-			eerror "    SDK:   ($(oic_distfile_status ${MY_ASDK})) ${MY_ASDK}"
-		fi
-	done
-	eerror "After downloading these files (for *all* shown architectures), put them in:"
-	eerror "    ${DISTDIR}/"
-}
-
-src_unpack() {
-	for ABI in $(get_install_abis)
-	do
-		set_my_abivars || continue
-		mkdir "${WORKDIR}"/${ABI} || die
-		cd "${WORKDIR}"/${ABI} || die
-		unpack ${MY_A}
-		if is_final_abi; then
-			unpack ${MY_ASDK}
-		fi
-	done
-}
-
-src_prepare() {
-	# need to patch for the final ABI only
-	set_my_abivars || die "${ABI} ABI not supported!"
-	cd "${S}" || die
-	epatch "${FILESDIR}"/11.2.0.3-makefile.patch
-}
-
-src_install() {
-	# all binaries go here
-	local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
-	into "${oracle_home}"
-
-	local ldpath=
-	for ABI in $(get_install_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 "${S}" || die
-
-		# shared libraries
-		dolib.so lib*$(get_libname)*
-
-		# ensure to be linkable
-		[[ -e libocci$(get_libname) ]] ||
-		dosym libocci$(get_libname 11.1) \
-			"${oracle_home}"/$(get_libdir)/libocci$(get_libname)
-		[[ -e libclntsh$(get_libname) ]] ||
-		dosym libclntsh$(get_libname 11.1) \
-			"${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)
-
-		eend $?
-	done
-
-	# ensure ORACLE_HOME/lib exists
-	[[ -e ${ED}${oracle_home}/lib ]] ||
-	dosym $(get_libdir) "${oracle_home}"/lib
-
-	einfo "Installing SDK ..."
-	cd "${S}"/sdk || die
-
-	# SDK makefile, for #165834
-	# As we change the relative filesystem layout compared
-	# to vanilla instantclient.zip content, it feels easier
-	# to fake the layout found in Oracle eXpress Edition.
-	# Both layouts are known to DBD::Oracle (cpan).
-	insinto "${oracle_home}"/rdbms/demo
-	newins demo/demo.mk demo_xe.mk
-
-	# Remove ldap.h, #299562
-	rm include/ldap.h || die
-	# DBD::Oracle needs rdbms/public as real directory
-	insinto "${oracle_home}"/rdbms/public
-	doins include/*.h
-	dosym rdbms/public "${oracle_home}"/include
-	# ruby-oci8 expects the headers here
-	dosym "${oracle_home}"/rdbms/public /usr/include/oracle/${PV}/client
-
-	dodoc demo/*
-
-	eend $?
-
-	# create path for tnsnames.ora
-	insinto /etc/oracle
-	doins "${FILESDIR}"/tnsnames.ora.sample
-
-	# Add OCI libs to library path
-	{
-		echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
-		echo "LDPATH=${ldpath}"
-# who does need this?
-#		echo "C_INCLUDE_PATH=${oracle_home}/include"
-		echo "TNS_ADMIN=/etc/oracle/"
-	} > "${T}"/50oracle-instantclient-basic
-	doenvd "${T}"/50oracle-instantclient-basic
-}
-
-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 ${EROOT}etc/oracle by default,"
-	elog "put your tnsnames.ora there or configure TNS_ADMIN"
-	elog "to point to your user specific configuration."
-	ewarn "Please re-source your shell settings for ORACLE_HOME"
-	ewarn "  changes, such as: source /etc/profile"
-}
diff --git a/dev-db/oracle-instantclient-jdbc/Manifest b/dev-db/oracle-instantclient-jdbc/Manifest
index 23a7b430ba2b..ed7d2d33b1d4 100644
--- a/dev-db/oracle-instantclient-jdbc/Manifest
+++ b/dev-db/oracle-instantclient-jdbc/Manifest
@@ -1,8 +1,5 @@
-DIST instantclient-jdbc-linux-11.2.0.3.0.zip 1562543 BLAKE2B 7f32c39cb7c4fbdd54db0015e081bc8d913e9570c4651d2e41f17155f2a77772826ec823adaf36b44d1264ff686c3735835a483f3cd1551a1f5274c028692fd3 SHA512 f78991e57eed2b095e8659825723bfc107d3c4519d1864769a0190f22e3d5667a1a4213a067470a8fb07c1f0562ec950c9fbe37f70e9475811dd1edfaf3f17f0
 DIST instantclient-jdbc-linux-11.2.0.4.0.zip 1562440 BLAKE2B e3f377802958b22aede4d91c9bc16a85f5c0ff2cec3066a4a49f5c71ab90c17f9b7c6f29da146304327569cb3d5d533a3807941e4061254e0cf57a8387a55b04 SHA512 0a92a6529642203d48846d3f22f3756ada22942ea5e7c36d779d220dc7195301d4016edd8ee5124f9e51429bb77d9890602c1a18884eec58ff40c2aed24e55f9
-DIST instantclient-jdbc-linux.x64-11.2.0.3.0.zip 1562504 BLAKE2B 07f0753ff2add12924d05c6a4b4d07356726c7ca7d8a3118e0d65bf30db04eb89aeb0255591583714cd168782313eb083764d6ca9ed64b2081dc119c46222114 SHA512 afb824786e01f316dfa244e304fae7d9a34f4175de8ff6622bed116a9810bfca9ec5eceda6a1de95d46f7170fb63f1345dc1886efd168f1daa8c8498d2b3c8d7
 DIST instantclient-jdbc-linux.x64-11.2.0.4.0.zip 1562474 BLAKE2B f93a05ad324bb364ddab83b0bc75f6c0bc8d7224f53cf337c9887f99e07c98a8752e7d4581b19ca38c70bbe3fcf1b492d753f715bed7ba8144f37c03cc9524c0 SHA512 289a08bddc81687b73a42fb35ae6ea294dd8f536ae9d3e95142ab78ad72eeebf66947fa6f5585e48e35b7f92e65fe6a295fb564b8353d389e76bfecf35c48c18
-EBUILD oracle-instantclient-jdbc-11.2.0.3.ebuild 2156 BLAKE2B a3d41f3326b3241c08b0237fb368016b2150b5d9c92f09b1e46c557cbab7a8f6409e86caf396adf65823cc0c941d4019057aeb319780c9767f2a7f6e9c9f4076 SHA512 ab75d9b8d07156987e55c734a2e4ae1f73f5ff8261f944481b3ad49885f15d9c3ed6c20cadf48081efde9b70f3b9bf3a6bb2546f172c02ab1955ed36fcfa137f
 EBUILD oracle-instantclient-jdbc-11.2.0.4.ebuild 1940 BLAKE2B 82d646597b770e00aba5ba209e201bda7712e4907cc1e8ad657f9fa017b5fb88e9e6127ca383c7b307abedcab2b3c184c43b17d6071912f8c1aa4956cddeaab0 SHA512 02c6e4f6e355c47ca49f179ed5ba429e9129f7a23dbaa544f8e63c65e76d3aa9e9ce5e3d5ec72bda68eacfa7b368e7b00ef79daf0ed7e02ff9c125e47807f453
 EBUILD oracle-instantclient-jdbc-12.ebuild 443 BLAKE2B cac8918d5dbb95f01e8325d16177977b7a8cda057a8a7e6145f117b434443a7709f8bbd085076000c6e03874d4456395950a0397ae69242819d433d0504a139c SHA512 caedd280c4ca86e740e68a71ffa50d9a1c38fce5c565a7abae1b7c543d668841c9f35fff046c702d2012b9040caed937d0da1f9f1e56282b9b44ab92c91db0c5
 MISC metadata.xml 214 BLAKE2B b60ecbef37fd3eed5949889bfea31a68f4941db8a7a36e4dbbb7d7381d587eaefc230349c83a9eda4bbdfd1d45b4af0928da1ff7ed2f6f4e2c704a10033c6610 SHA512 e4dddc0b51fec262729e9eedd302b3c7d7a91d227e1043134c0242c8aea2f2c6cef5fd8caca6ea1424cc38b3beeb05fed373ffcc2c8751662dd4117639a7b5de
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.3.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.3.ebuild
deleted file mode 100644
index 303d9dbd2c5b..000000000000
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-MY_PLAT_x86="Linux x86"
-MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_A_amd64="${PN/oracle-/}-linux.x64-${PV}.0.zip"
-
-DESCRIPTION="Oracle 11g Instant Client: JDBC supplement"
-HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
-SRC_URI="
-	x86?   ( ${MY_A_x86}                             )
-	amd64? ( ${MY_A_amd64} multilib? ( ${MY_A_x86} ) )
-"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="fetch"
-IUSE="multilib"
-
-DEPEND="app-arch/unzip"
-RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
-
-default_abi() {
-	[[ ${DEFAULT_ABI} == 'default' ]] && echo ${ARCH} || echo ${DEFAULT_ABI}
-}
-
-abi_list() {
-	if use multilib; then
-		echo ${MULTILIB_ABIS}
-	else
-		default_abi
-	fi
-	return 0
-}
-
-set_abivars() {
-	local abi=$1
-	# platform name
-	MY_PLAT=MY_PLAT_${abi}
-	MY_PLAT=${!MY_PLAT}
-	# runtime distfile
-	MY_A=MY_A_${abi}
-	MY_A=${!MY_A}
-	# abi sourcedir
-	MY_S="${S}/${abi}/instantclient_11_2"
-	# ABI might not need to be set at all
-	[[ -n ${ABI} ]] && MY_ABI=${abi} || MY_ABI=
-	# abi libdir
-	MY_LIBDIR=$(ABI=${MY_ABI} get_libdir)
-}
-
-pkg_nofetch() {
-	eerror "Please go to"
-	eerror "  ${HOMEPAGE%/*}/index-097480.html"
-	eerror "  and download"
-	local abi
-	for abi in $(abi_list)
-	do
-		set_abivars ${abi}
-		eerror "Instant Client for ${MY_PLAT}"
-		eerror "    JDBC: ${MY_A}"
-	done
-	eerror "After downloading, put them in:"
-	eerror "    ${DISTDIR}/"
-}
-
-src_unpack() {
-	local abi
-	for abi in $(abi_list)
-	do
-		set_abivars ${abi}
-		mkdir -p "${MY_S%/*}" || die
-		cd "${MY_S%/*}" || die
-		unpack ${MY_A}
-	done
-}
-
-src_install() {
-	# all binaries go here
-	local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
-	into "${oracle_home}"
-
-	local abi
-	for abi in $(abi_list)
-	do
-		set_abivars ${abi}
-		einfo "Installing runtime for ${MY_PLAT} ..."
-
-		cd "${MY_S}" || die
-
-		ABI=${MY_ABI} dolib.so lib*$(get_libname)*
-
-		insinto "${oracle_home}"/${MY_LIBDIR}
-		doins *.jar
-
-		eend $?
-	done
-}
diff --git a/dev-db/oracle-instantclient-odbc/Manifest b/dev-db/oracle-instantclient-odbc/Manifest
index 6fd970c4c40c..daae269ca093 100644
--- a/dev-db/oracle-instantclient-odbc/Manifest
+++ b/dev-db/oracle-instantclient-odbc/Manifest
@@ -1,8 +1,5 @@
-DIST instantclient-odbc-linux-11.2.0.3.0.zip 273840 BLAKE2B 54fd920bb69a12f2df387e89907c6c2a64f05fd611cb53737d6773752c3a08fbe4cb36cc43017a62e7861cd6245b4d92cbf635fabc921c0aeeaa8d00f9e012d5 SHA512 4d928e9eb3deb26db7a95a0e5417bd9355e97956d9394dc2792752fd45002b0abc3463fbb7f337f4731084aa6006d1ff635443c5503f94c6bd97d1bae7245885
 DIST instantclient-odbc-linux-11.2.0.4.0.zip 274999 BLAKE2B 33855608fcd61a7f4ebcab3f969b028069d636d5a709676c07733aeb20dcb4335f485844ec72cb0816307e36c7f0b6748c08ea6e5c67c853999ddc1b0c23eae8 SHA512 64d75c6f9aa4e5b74da12a2a293e6ee7017017a12a724596d51606d3a8d7a9d9653c158d389a5faeb02893ca6a6a93650605d71f885f9439427847583f5cc820
-DIST instantclient-odbc-linux.x64-11.2.0.3.0.zip 309061 BLAKE2B 9ddd2569364a383f525052d4c795c423ed4b44a588ec4e11e5f5130604b6d74b4ede2afdb326023d8a0167b1522669c9acc6f9e74928423f62d08c93404cd98d SHA512 a18c040fc780f893ea22fd6c79b3299d9327975a768a6518622a8ff522dd29a7019494ca7a1227483098f13afe1af1655611a32e06806bab94ab2fce2dc55e3a
 DIST instantclient-odbc-linux.x64-11.2.0.4.0.zip 310560 BLAKE2B dc97373ac00f07b4d02beb45ed053d5aa8909fc380990426c118e3fb42b08e8e5e699a518aa137b3fe159107c73929e61d59c997e741a343803f5c26036adf9b SHA512 19f999207e5ea2b5db18b40c0eb40c6ec1ea8a3117915a723338e5c423122b747c5e371446d631c00a5c01005453f85da1d2e680a2c1771a495dc0b68812df69
-EBUILD oracle-instantclient-odbc-11.2.0.3.ebuild 2353 BLAKE2B c0d060beb5acf0c3220cb4ee2bb4726f56c2b3e89de34b1025f6301ecc3f4bb1f920f8877831acdeadc9a5d0288b6171f78adb6572995540987506d73962f1d6 SHA512 598894987ea0d942faf418f1041e0cd71929c748cb12e4f0039195cb06dff3de6a058ee59665b9981944c1565d0c4bb3face220f5f9c552804033053deac9f8f
 EBUILD oracle-instantclient-odbc-11.2.0.4.ebuild 2083 BLAKE2B 07ff5ed964d5fa8b0d71bc98ec0cac68fba5baab2eeb20aa1e8f8d6512ddce221aa38ca512e57176a2530375bc32495c13bbb9ef830f580c316c0fbfad93ec83 SHA512 41b13fd6d264e51176e54496cbd149893649e6ffde2cf38098ee71adfb07b50eb20e00b840ec1f263910df0341d2ba33bd420ae51203102b93a2b3f1e1be3741
 EBUILD oracle-instantclient-odbc-12.ebuild 443 BLAKE2B ded66d6bd0a342ea40f461981f5c13cdcf6484b8d1a85915a3e1ccdec595d5c60ac27e53b174f8a7d597478dbc1c08e6df3188c814654b81eef3f61722c6ad5b SHA512 3af66244b1186fefd956424912f33eeebbc6d5d2543bf5bda24bcd0949181b99c32b09690a29f4f9e733d982fdc7a494c1dd4e75eb7fd899aff26f74b100a69f
 MISC metadata.xml 214 BLAKE2B b60ecbef37fd3eed5949889bfea31a68f4941db8a7a36e4dbbb7d7381d587eaefc230349c83a9eda4bbdfd1d45b4af0928da1ff7ed2f6f4e2c704a10033c6610 SHA512 e4dddc0b51fec262729e9eedd302b3c7d7a91d227e1043134c0242c8aea2f2c6cef5fd8caca6ea1424cc38b3beeb05fed373ffcc2c8751662dd4117639a7b5de
diff --git a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild
deleted file mode 100644
index e0fbfdf509ab..000000000000
--- a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-MY_PLAT_x86="Linux x86"
-MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_A_amd64="${PN/oracle-/}-linux.x64-${PV}.0.zip"
-
-DESCRIPTION="Oracle 11g Instant Client: ODBC supplement"
-HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
-SRC_URI="
-	x86?   ( ${MY_A_x86}                             )
-	amd64? ( ${MY_A_amd64} multilib? ( ${MY_A_x86} ) )
-"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="fetch"
-IUSE="multilib"
-
-DEPEND="app-arch/unzip"
-RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
-
-default_abi() {
-	[[ ${DEFAULT_ABI} == 'default' ]] && echo ${ARCH} || echo ${DEFAULT_ABI}
-}
-
-abi_list() {
-	if use multilib; then
-		echo ${MULTILIB_ABIS}
-	else
-		default_abi
-	fi
-	return 0
-}
-
-set_abivars() {
-	local abi=$1
-	# platform name
-	MY_PLAT=MY_PLAT_${abi}
-	MY_PLAT=${!MY_PLAT}
-	# runtime distfile
-	MY_A=MY_A_${abi}
-	MY_A=${!MY_A}
-	# abi sourcedir
-	MY_S="${S}/${abi}/instantclient_11_2"
-	# ABI might not need to be set at all
-	[[ -n ${ABI} ]] && MY_ABI=${abi} || MY_ABI=
-	# abi libdir
-	MY_LIBDIR=$(ABI=${MY_ABI} get_libdir)
-}
-
-pkg_nofetch() {
-	eerror "Please go to"
-	eerror "  ${HOMEPAGE%/*}/index-097480.html"
-	eerror "  and download"
-	local abi
-	for abi in $(abi_list)
-	do
-		set_abivars ${abi}
-		eerror "Instant Client for ${MY_PLAT}"
-		eerror "    ODBC: ${MY_A}"
-	done
-	eerror "After downloading, put them in:"
-	eerror "    ${DISTDIR}/"
-}
-
-src_unpack() {
-	local abi
-	for abi in $(abi_list)
-	do
-		set_abivars ${abi}
-		mkdir -p "${MY_S%/*}" || die
-		cd "${MY_S%/*}" || die
-		unpack ${MY_A}
-	done
-}
-
-src_install() {
-	# all binaries go here
-	local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
-	into "${oracle_home}"
-
-	local abi
-	for abi in $(abi_list)
-	do
-		set_abivars ${abi}
-		einfo "Installing runtime for ${MY_PLAT} ..."
-
-		cd "${MY_S}" || die
-
-		ABI=${MY_ABI} dolib.so libsqora*$(get_libname)*
-
-		# ensure to be linkable
-		[[ -e libsqora$(get_libname) ]] ||
-		dosym libsqora$(get_libname 11.1) \
-			"${oracle_home}"/${MY_LIBDIR}/libsqora$(get_libname)
-
-		eend $?
-	done
-
-	set_abivars $(default_abi)
-	cd "${MY_S}" || die
-	dobin odbc_update_ini.sh
-	dodoc *htm*
-}
diff --git a/dev-db/oracle-instantclient-sqlplus/Manifest b/dev-db/oracle-instantclient-sqlplus/Manifest
index 08f7e3dae097..4a9788a47b8a 100644
--- a/dev-db/oracle-instantclient-sqlplus/Manifest
+++ b/dev-db/oracle-instantclient-sqlplus/Manifest
@@ -1,9 +1,5 @@
-DIST instantclient-sqlplus-linux-11.2.0.3.0.zip 796570 BLAKE2B 0492185103d5fb36f3acb8f52e937fca35bb8b7308eb9317d43f25f4fbde39f15b8b6de0fc9065d04c809a94731c7c011dcac1daf4e734405d065d9959cf215f SHA512 241d812b3955b11efba7764f463417e79dd973ce7ad0624144e661403b71b1c4fb091c6e42d05759eaf74355dfe432970375064d4018cae9ae67cd1401095460
 DIST instantclient-sqlplus-linux-11.2.0.4.0.zip 792608 BLAKE2B c3e8f0843700df9f95428b01520400d95076df5e19169f2a79982293e54ce6cc74321de0f34a0e7865d5d29535e38b60bcca127be06343c979a40985bf349012 SHA512 8f5ff27043a036eab038080bbdc056325cc2c197e12de34e74a8da17bf69b44e4fd4200b638881d86fdf1dc1450d8e1d033daaa56386bd2c8784d556ba0093ce
-DIST instantclient-sqlplus-linux.x64-11.2.0.3.0.zip 837574 BLAKE2B c1f123b68b60f211843af954e33922e46d05ff89ce68e8357a8839e7fce83cccc31ab3f16b87204343376657839fd582fb2c80be3148cc34f2340191ed261526 SHA512 55bbac5e8267a4de2c7f9f6750f0e38dcf7c775bccc2e1e05df7fda9e6ffa7d394776e605980d8b67176acf52ba88f2dcaa959934740a1ca6f91d10b12d14024
 DIST instantclient-sqlplus-linux.x64-11.2.0.4.0.zip 834491 BLAKE2B 487091d97c0f2ec383018c39a957c8a27b030c4c8754a6c2714237dc875b89b250b47dbd28ca228a98c6199323ddd031452e1cc90c60824fbcca536aa38bff1f SHA512 b7180b5667e604564cf379b9eb55a2fc8994b87cfb993e728b4c1bdd297cab134a55580018429bdbb2b101ebdf8a350bacc1ddf5a30e1cc419092054c79a108b
-EBUILD oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild 1548 BLAKE2B 1cb7586a8711f10f75e8c8bac21e0ca64ee6bf34d21afd8d3a514d9f4db677be4699dd0bf2b5d9bdccc6f73a2cef1185eb06aaad3068102d145a584999f3c3d5 SHA512 3241aced8104ab05dc50ae175166dcd1f1d439c408dc78eb359152f8e28f9634c2ffde13a9e61945526d0936365f132d7301fd3b79cef4317f6ad8e2f60a6c53
-EBUILD oracle-instantclient-sqlplus-11.2.0.3.ebuild 1481 BLAKE2B 873726887fc60e56ce892d0888a48435d6848cecd4bf13911ed3dd9f1981d74a3b28bbfa5a2c058fe263c05f38446cb6f0da29c0d782f98db80ed223ffe1ff99 SHA512 816432be2dddfd401a80087466fe5856f65910c26e769fb06bb58a9e47fe3b571fd252b77ec15f7120fcba583ce2eb32c16770bfc2f501efe60395f9645234fe
 EBUILD oracle-instantclient-sqlplus-11.2.0.4.ebuild 1550 BLAKE2B cadc194b853439546501545aa6ab3da3e65204afd7c9582d86ae1b815491290c630257f0bd74146ce6ff1bfe544ba3e698a59da9b7303f4f0e12779e9e4ef557 SHA512 f3c3acdddd951cc28e645fc3ddf0b0814021797409b7dbf69a613a44d2b1a7fee06815a7ef18523a761c14e4c4e343ef81ac7bd3622bfedddc6b467e44702e4d
 EBUILD oracle-instantclient-sqlplus-12.ebuild 446 BLAKE2B c18dd02c3ed130d20b665868309c6a63d15f753afe2b892dc80569d6baba07481a137d5f2157ca3e27b92e095bcb646f20cd7061cddce68db00e5c9c7327e3ca SHA512 3a22a431e5a538e48cbbe38cb6c9779da0f57bcddfe2373cebd391de22bd5bcd70fa8d7434ef8f1a90f8f9f5b4f26633e37482d39f59da499e737b2a4c89971e
 MISC metadata.xml 214 BLAKE2B b60ecbef37fd3eed5949889bfea31a68f4941db8a7a36e4dbbb7d7381d587eaefc230349c83a9eda4bbdfd1d45b4af0928da1ff7ed2f6f4e2c704a10033c6610 SHA512 e4dddc0b51fec262729e9eedd302b3c7d7a91d227e1043134c0242c8aea2f2c6cef5fd8caca6ea1424cc38b3beeb05fed373ffcc2c8751662dd4117639a7b5de
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild
deleted file mode 100644
index 190e6ba230e7..000000000000
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib pax-utils
-
-MY_PLAT_x86="Linux x86"
-MY_A_x86="${PN#oracle-}-linux-${PV}.0.zip"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_A_amd64="${PN#oracle-}-linux.x64-${PV}.0.zip"
-
-DESCRIPTION="Oracle 11g Instant Client: SQL*Plus"
-HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
-SRC_URI="
-	x86?   ( ${MY_A_x86}   )
-	amd64? ( ${MY_A_amd64} )
-"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
-
-S="${WORKDIR}"/instantclient_11_2
-
-QA_PREBUILT="
-	usr/lib*/oracle/${PV}/client/lib*/lib*
-	usr/lib*/oracle/${PV}/client/bin/sqlplus
-"
-
-my_arch() {
-	# platform name
-	MY_PLAT=MY_PLAT_${ARCH}
-	export MY_PLAT=${!MY_PLAT}
-	# distfile
-	MY_A=MY_A_${ARCH}
-	export MY_A=${!MY_A}
-}
-
-pkg_nofetch() {
-	my_arch
-	eerror "Please go to"
-	eerror "  ${HOMEPAGE%/*}/index-097480.html"
-	eerror "  and download"
-	eerror "Instant Client for ${MY_PLAT}"
-	eerror "    SQL*Plus: ${MY_A}"
-	eerror "After downloading, put it into your DISTDIR directory."
-}
-
-src_install() {
-	# all binaries go here
-	local oracle_home=usr/$(get_libdir)/oracle/${PV}/client
-	into /"${oracle_home}"
-
-	dolib.so libsqlplus$(get_libname) libsqlplusic$(get_libname)
-	dobin sqlplus
-
-	insinto /"${oracle_home}"/sqlplus/admin
-	doins glogin.sql
-
-	pax-mark -c "${ED}${oracle_home}"/bin/sqlplus || die
-
-	dosym /"${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
-}
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild
deleted file mode 100644
index c9939d8beae3..000000000000
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-MY_PLAT_x86="Linux x86"
-MY_A_x86="${PN#oracle-}-linux-${PV}.0.zip"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_A_amd64="${PN#oracle-}-linux.x64-${PV}.0.zip"
-
-DESCRIPTION="Oracle 11g Instant Client: SQL*Plus"
-HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
-SRC_URI="
-	x86?   ( ${MY_A_x86}   )
-	amd64? ( ${MY_A_amd64} )
-"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
-
-S="${WORKDIR}"/instantclient_11_2
-
-QA_PREBUILT="
-	usr/lib*/oracle/${PV}/client/lib*/lib*
-	usr/lib*/oracle/${PV}/client/bin/sqlplus
-"
-
-my_arch() {
-	# platform name
-	MY_PLAT=MY_PLAT_${ARCH}
-	export MY_PLAT=${!MY_PLAT}
-	# distfile
-	MY_A=MY_A_${ARCH}
-	export MY_A=${!MY_A}
-}
-
-pkg_nofetch() {
-	my_arch
-	eerror "Please go to"
-	eerror "  ${HOMEPAGE%/*}/index-097480.html"
-	eerror "  and download"
-	eerror "Instant Client for ${MY_PLAT}"
-	eerror "    SQL*Plus: ${MY_A}"
-	eerror "After downloading, put it into your DISTDIR directory."
-}
-
-src_install() {
-	# all binaries go here
-	local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
-	into "${oracle_home}"
-
-	dolib.so libsqlplus$(get_libname) libsqlplusic$(get_libname)
-	dobin sqlplus
-
-	insinto "${oracle_home}"/sqlplus/admin
-	doins glogin.sql
-
-	dosym "${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
-}
diff --git a/dev-db/oracle-instantclient/Manifest b/dev-db/oracle-instantclient/Manifest
index 0d14533a860c..79b8a3d4ddb2 100644
--- a/dev-db/oracle-instantclient/Manifest
+++ b/dev-db/oracle-instantclient/Manifest
@@ -68,5 +68,6 @@ EBUILD oracle-instantclient-18.3.0.0-r2.ebuild 12167 BLAKE2B 40c852da52c88e48aad
 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.5.0.0.ebuild 12164 BLAKE2B bc143095749d223aa1ba84c4bc645c3ac173607f4f8388522fbe1d1d5d760434b546bac67b02926b92d1cec885da78b06973407f1f0312705eb8943f542c2ef8 SHA512 e358de60d252f50d14861592e45f322329810162f5f754c855ef2111aa7561cfd9b8730586422138aa658c7729f78c15e73c488dd1f52746c42e36e7f4278867
+EBUILD oracle-instantclient-19.6.0.0-r1.ebuild 10900 BLAKE2B b911e5ea33651fe21e1434adf517426bbc784160eb703686beaddfe2bf519ab7289464450664e4e0b82c6e50e5aaadc25a634b002b28920dcdf68080139b649d SHA512 e54293f042af641f0a26fc5721062d8683e13e1991c2d6eb12ed42e979f04f92c1f60a49c9cff861b134be2df711977fd971b593a7bb60c24a2ef9a736922f0f
 EBUILD oracle-instantclient-19.6.0.0.ebuild 12164 BLAKE2B bc143095749d223aa1ba84c4bc645c3ac173607f4f8388522fbe1d1d5d760434b546bac67b02926b92d1cec885da78b06973407f1f0312705eb8943f542c2ef8 SHA512 e358de60d252f50d14861592e45f322329810162f5f754c855ef2111aa7561cfd9b8730586422138aa658c7729f78c15e73c488dd1f52746c42e36e7f4278867
 MISC metadata.xml 957 BLAKE2B dfe01a80765d0ec1afac4a5045e2081e39ee9060a17f278b6eb7cfae7670ec102a504397d037b2b8d8ad82d242a9fa3ed1d4309b25158b934f8674a062dec53e SHA512 dd8c982f1ce276e7701e6b82b71e2464eaa21e413115c2a4d3bbd49053539ff3a9bcfc84252ef7aa9c39d36054fee119002716de5d525a20bb1f2da0d44b3c89
diff --git a/dev-db/oracle-instantclient/oracle-instantclient-19.6.0.0-r1.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-19.6.0.0-r1.ebuild
new file mode 100644
index 000000000000..4779da161c1b
--- /dev/null
+++ b/dev-db/oracle-instantclient/oracle-instantclient-19.6.0.0-r1.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2020 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/database/technologies/instant-client.html"
+
+MY_SOVER=19.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_URI="https://download.oracle.com/otn_software/linux/instantclient/$(ver_rs 1-4 '' $(ver_cut 1-4))"
+MY_PLAT_x86="Linux x86"
+MY_BITS_x86=32
+MY_A_x86="${MY_URI}/${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="${MY_URI}/${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_URI}/${MY_A_x86_odbc%.zip}${MY_PVP}.zip"
+	MY_A_amd64_odbc="${MY_URI}/${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="mirror splitdebug test"
+
+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} ]]
+}
+
+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/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index a12af4090379..e007c6d4df8f 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -2,6 +2,8 @@ AUX pgadmin4-4.17-python-3.8.patch 595 BLAKE2B 695b133a61d2a54939a3bd8fa3c8fe3ea
 AUX pgadmin4.desktop 298 BLAKE2B 9048ee03c9f8e05807f2907fd7dcfda9d76bb3cd3b2567676cf6bc9acebdf8d2b4de1626f9fe57c4940422766fa7e6fa9111a5bc9c252e34f72af2850813b158 SHA512 a083c525cf49543751dcf4f98a9e2607ce06c35a573c5a97d4088b21b41dc260ea0fcbb139ce153f0e1deb6bd8e6e75e69a6fe08ff2f4aa563d7398bd52553b2
 DIST pgadmin4-4.17.tar.gz 28007097 BLAKE2B d296f2b9372c23067db899fa82e1b8e732837b01a6172dd2d70520f815aafde161715eea9d9d53e7507a6a715dbfdaabf001a10d143c1aa0505237b2b138e334 SHA512 f9e292ba7ff1e5edaa8738188eb01744d69d0eb134700feb0623806425c998e7f298f74cd498a09f2d9a073a9a349c82f7a3f617e1da3c8dd757cc982d941c9f
 DIST pgadmin4-4.25.tar.gz 33167393 BLAKE2B 5a40e45c53f79ea66c6f685d1605ddce7b1758540bf3a6863d4b092cc4dab5b00daff15832cd6feee28aa348c7a5376e25a93508fd348d8ffd4d29031e2b6c68 SHA512 a1944f9c65b8aa7ec5bd83ef75702293d869ae341ea73f81fb4358bfbc7f91a6981237eb9f1b20055c5f3fa182428afe19dc170963265789c34d73f2e240c268
+DIST pgadmin4-4.26.tar.gz 33525278 BLAKE2B 2a4061f59299bc48b029a4a93f410538170b6c3d97597074d2b3b6eed1de0f9a1ac88bc187614d9e46d8fe872941f173ba0f0a02def590451dad09e6a3b78e5a SHA512 952a4771f80541c54234fcaa9c870283fdf4887246d0d9751a77c28340b7e39ba871141f230086efda9a274d5e6bd567305047cdc7edf766ccd41112281fdf94
 EBUILD pgadmin4-4.17-r1.ebuild 3307 BLAKE2B 2f4dab13a9365051abc89e66101bf6b8c93400b3eefb34f53033feb9d6d49321f9e2fcb7c3f58340ab21b1d358006d0a1846a08ce6a26048bde0a4a779cdf131 SHA512 4c80f4f5f243a25aee956ee3230ff6ee9a55e1dce19fcd1c1da91b00b4f16942fdc64815559bfbc873a67f99b6676f463cf923987d7fe039ed8d027b7a64b51a
 EBUILD pgadmin4-4.25.ebuild 3545 BLAKE2B 3e716cd6cb3f4fe19d2ffe6f6f8581f6ce9b558df9291c21eec36de684e766373fac11e610585d416911eb097d13310804320fe82985428a14f5fcbfb3c6acaf SHA512 46b1e593c9d10d4d69df656656bd1a5d020698a6e799e06b63f8f27358dfbcac2501ce2d34c55d2448d274aacf6a1a85eb89dea43f6e6113b74f02c6ee77bd8e
+EBUILD pgadmin4-4.26.ebuild 3797 BLAKE2B 37f2b12586c1c12d0485673af2f63b5434e79271630c32e7da611d2edcfa044262424387be8449af46548750c084087968bf724991238704f48d25958f0cedf4 SHA512 9b175c0ec000a9d3801093294378004deb289d7c08fae35944d2128fd3b2aa3a2d2979200b684d7f2275fc5383163cdf32676a8f2f04d8801e190797d5d87c6e
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-4.26.ebuild b/dev-db/pgadmin4/pgadmin4-4.26.ebuild
new file mode 100644
index 000000000000..239acf0a8228
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-4.26.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+inherit desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="GUI administration and development platform for PostgreSQL"
+HOMEPAGE="https://www.pgadmin.org/"
+SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+# libsodium dep added because of 689678
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/libsodium[-minimal]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
+"
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	virtual/imagemagick-tools[png]
+"
+
+# In 4.25's requirement.txt, bcrypt is listed as <=3.17, but upstream's
+# git history shows this is just for compatibility with <python-3.6.
+# In 4.26's requirement.txt, cryptography is listed as <=3.0, but upstream's
+# git history shows this is just for compatibility with Windows.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-compress-1.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-wtf-0.14.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/ldap3-2.5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/passlib-1.7.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-5.7.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pytz-2018.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.13[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sshtunnel-0.1.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/werkzeug-0.15.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/bcrypt[${PYTHON_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+S="${WORKDIR}"/${P}/runtime
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+}
+
+src_configure() {
+	export PGADMIN_PYTHON_DIR="${EPREFIX}/usr"
+	eqmake5
+}
+
+src_compile() {
+	default
+	use doc && emake -C "${WORKDIR}"/${P} docs
+}
+
+src_install() {
+	dobin pgAdmin4
+
+	cd "${WORKDIR}"/${P} || die
+
+	local APP_DIR=/usr/share/${PN}/web
+	insinto "${APP_DIR}"
+	doins -r web/.
+	newins - config_local.py <<-EOF
+		SERVER_MODE = False
+		UPGRADE_CHECK_ENABLED = False
+	EOF
+	python_optimize "${D}${APP_DIR}"
+
+	insinto /etc/xdg/pgadmin
+	newins - pgadmin4.conf <<-EOF
+		[General]
+		ApplicationPath=${APP_DIR}
+		PythonPath=$(python_get_sitedir)
+	EOF
+
+	if use doc; then
+		rm -r docs/en_US/_build/html/_sources || die
+		insinto /usr/share/${PN}/docs/en_US/_build
+		doins -r docs/en_US/_build/html
+	fi
+
+	local s
+	for s in 16 32 48 64 72 96 128 192 256; do
+		convert runtime/pgAdmin4.png -resize ${s}x${s} ${PN}_${s}.png || die
+		newicon -s ${s} ${PN}_${s}.png ${PN}.png
+	done
+	domenu "${FILESDIR}"/${PN}.desktop
+}
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index e1a3dab94670..36d59e9fabbb 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1,3 +1,5 @@
 DIST pgcli-2.2.0.tar.gz 436991 BLAKE2B 9041240952a8ba9a770705850bf4281eaa89ac5b970366c7ec27e705bec65d9c3c455fb2c9d2220d53f4a9ff31142501437faa6974839f6fe59e6fc1618d8a6d SHA512 239a3278b604248b7bd5cdaf4d0b0f3e62188617b04c358d123e2fa2ad1449c3854ef84995b89239fcf559ce010ee0dd80e12ddd72b27dcb89f92ac08d34c49b
-EBUILD pgcli-2.2.0.ebuild 1227 BLAKE2B 70cb370b11af8c0a9865aad9331998813bc0fcacdbe6f70230c72dac5fa411e343f4026a8f976db2ecbe2edf6ab881d5b2936401563bbc40d60c3707000af8a4 SHA512 d9e70578ed9bec3e0af2d3705742bb770f436ee6b26bdcedc9894095f05994d9538e9df5c84444542c219e5bc3638535075e05d36570a3d0dc6b34bb160ae937
-MISC metadata.xml 248 BLAKE2B 544d521c2906b39cedeab1526ba34e3f3e2d58753f4bf7d6f48baa5ca33c92c2cf164e4e0ae803aeaee4f61fdc10096229145bfae24b0b857f5f6b28dbb9623a SHA512 e19fd5801f389567e3e592435a8ae7e793d342e73f23aba01d24f342346549f1e70433c5fccfeec8c27c32df73d1c509f667fdb49e22bf77e9fff88ff4f5cb9f
+DIST pgcli-3.0.0.tar.gz 437733 BLAKE2B 5db69997f675812c3ef847b220b66e7872b134b4d8debd668154bdfa6020432ac08829e7c2ce42adc4cf124e84de5eb9aacbe19636216502f81373a71f21b68f SHA512 7ac52cbfc492dc85163dac7df7a5dde6bfa0327ac1ef6580891cb76d617b998d74c2a59b27d2f8abf8699eb5a69aba30bf13e95ad7bee75c83350730ac061262
+EBUILD pgcli-2.2.0.ebuild 1227 BLAKE2B 08be8bcd8eda124c8255abce36cf761a4e3f3575895ecc74d07d1a502db90b8e8d7342f659582b8bf178ad3eda913aba8ebe1e9996ab4eaa41241dc066debb21 SHA512 cc67eeb6889411784bd79f226d8a000fb54f040b25be2f5a1dbffb39331b28a92d9385c09cb5129638e44a3610492b399ea58754a5ff858fb37706d9d2fb5ff7
+EBUILD pgcli-3.0.0.ebuild 1191 BLAKE2B 464b0c076ad1fea19cd3379956e0acde58320a014dee948c00322c5867fa2263b60133e1c6fbefa1d8e0ff9df3ca60ab866cb393bd078cfe292463e8ad905393 SHA512 f191bc82ff307655109f8101dca5eaf7e7a46bf91bd326a0fcc281f9c3be35b110acf41b7e75e0d9b73a0061fd3712223c4ac46d5513579dd746138cfa9c7d13
+MISC metadata.xml 460 BLAKE2B c6dc837776eb72ba61b0b0e00cd3f3adc022b70385204346eb2aa0eb8229636ab230be67b194993b22e18cda08b4f968ff02b96d390b8782aac2a4f4de92d7ee SHA512 a3b44f66861c5f8b66cda0fcac6b1d3418bf04835e7ed202ae22faca50ee22187fda785c6e7e7c0848f31b88e1cd9c8c6b4be1999eb600d48965edff2e959c35
diff --git a/dev-db/pgcli/metadata.xml b/dev-db/pgcli/metadata.xml
index 3a8ef6d0eebe..5e8bd61f502f 100644
--- a/dev-db/pgcli/metadata.xml
+++ b/dev-db/pgcli/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>jakov.smolic@sartura.hr</email>
+    <name>Jakov Smolic</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">dbcli/pgcli</remote-id>
   </upstream>
diff --git a/dev-db/pgcli/pgcli-2.2.0.ebuild b/dev-db/pgcli/pgcli-2.2.0.ebuild
index fbeeff21ca54..54f699d3aa06 100644
--- a/dev-db/pgcli/pgcli-2.2.0.ebuild
+++ b/dev-db/pgcli/pgcli-2.2.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="CLI for Postgres with auto-completion and syntax highlighting"
 HOMEPAGE="https://www.pgcli.com https://github.com/dbcli/pgcli"
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/dbcli/pgcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
diff --git a/dev-db/pgcli/pgcli-3.0.0.ebuild b/dev-db/pgcli/pgcli-3.0.0.ebuild
new file mode 100644
index 000000000000..ea2e13b936ea
--- /dev/null
+++ b/dev-db/pgcli/pgcli-3.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="CLI for Postgres with auto-completion and syntax highlighting"
+HOMEPAGE="https://www.pgcli.com https://github.com/dbcli/pgcli"
+SRC_URI="https://github.com/dbcli/pgcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/sqlparse-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/cli_helpers-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/humanize-0.5.1[${PYTHON_USEDEP}]
+	>=dev-python/pgspecial-1.11.8[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/setproctitle-1.1.9[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	test? (
+		dev-db/postgresql
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-db/pgmemcache/Manifest b/dev-db/pgmemcache/Manifest
index cefafee86336..e8d8f7e79076 100644
--- a/dev-db/pgmemcache/Manifest
+++ b/dev-db/pgmemcache/Manifest
@@ -1,7 +1,3 @@
-DIST pgmemcache-2.1.2.tar.gz 16685 BLAKE2B d447cda1cc164063e2f76bec87547dd0de9d7e38cce210bec7ca2a0c48afb85d34a7882d6711027e74fcd973bb2bd3b94112359eb482b6be2d5ea01f098a7a9b SHA512 2be9aeef214f569473efcb849611e10c4fdb179e5cb8b1105f63fe0ab7bd829648a7891fd4e21109afc1b6375aeae0c2449a977a67631ee4d505e3faf83bc3f3
-DIST pgmemcache-2.2.0.tar.gz 17742 BLAKE2B 3620cfec0b712fa570fed77cae1b2dc65e5a36679e37c1531a94c80190725ee4af13b1912e58c8fb2fe5d181338190ca9df04f2bbf5868ed3107920b2fe39ca0 SHA512 8d63aa25fec9c5f1895cf5107bbb261be2b35d5e05ac03e8fa59597ed18cf123c45aa0690eafeca4a26bdfabf61088bd1e2518c3fa13b683333b1ca0b5d8446f
 DIST pgmemcache-2.3.0.tar.gz 21135 BLAKE2B 527043018fd6af9d4c00788518daeac28c89450e3bc43dee2df205d2eea7eac42fb4a73633f9b54dcd9ce5f35b01ea0ce7f6e2f26b3d9ab75e57c25e47b69933 SHA512 75ae3b7c9087078b2276ebadf66f9d419323927f6b8c8f61f8681fe939d086dbfe6aa935f20afa3acc11171e00329e5758a8a6a952cfbcf3aef45c8cc3f50a3b
-EBUILD pgmemcache-2.1.2.ebuild 548 BLAKE2B 536e5bf39cd7cb8a6635e7093a73682c179c604ec333e924abadb2a74281953f68731042db8b2ed9f1f6f5bee0228234ffdfa45e9117cc86346dfbd92c75e68f SHA512 64e9c790166d299a83b345bf85cc16dda6d79eab33d1aac70864f64248a18d6b6b4eee23ec2ce845bc6dc1f7688d5687b0e08381d5a9d3cfc0a11bb230cd7021
-EBUILD pgmemcache-2.2.0.ebuild 601 BLAKE2B 405c77a21ccc9300a1950aadc9e993bc525987c86ede0851a48f4954a8677098f16d1a2a77f103b533141e0bf25aa332c87b032886f07936f122af3c3990954e SHA512 c980e61b09d6b66acce579e13cdd09a3ff560378c3e8248a995d62dc2a74f47e52c3514561ef8e4c37b49b557d82896d7037a4d3cf9257b5cc0307648ad63177
 EBUILD pgmemcache-2.3.0.ebuild 601 BLAKE2B a94fac459711211f648c63c2c76ce81dbe4463fb8964de18327f2af78d3dcae0db655fc45f4509bdd68d57aca74493fab697b67b70b13ea4bb9915fe0cedc393 SHA512 e9a9a4be1416c3026a6240642b132c51a2416f80d14939fac93aff167bf92531114feba50c0530fecbec3da257a63a8cf799373e57ec969cb84853e8260529a4
 MISC metadata.xml 337 BLAKE2B 49c3772f9dc4488d0572b4676288c3f6b5ad7e0b0c27e7bff4a937d49ae2dbd14582b2bd0a0c2de025eccdd0be0d1b76e7b95b9c5079d96e9fbc4bb673273eaf SHA512 60efb420b03d8d9ae99fd4d5aa64312407fb56ffc473394538067546d6e482bc52df7fef3b864dc3f73b8ee54bdd71003eaa8c1a0e11828c529f25710fbe75a3
diff --git a/dev-db/pgmemcache/pgmemcache-2.1.2.ebuild b/dev-db/pgmemcache/pgmemcache-2.1.2.ebuild
deleted file mode 100644
index d3137046d2b0..000000000000
--- a/dev-db/pgmemcache/pgmemcache-2.1.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A PostgreSQL API based on libmemcached to interface with memcached"
-HOMEPAGE="http://pgfoundry.org/projects/pgmemcache https://github.com/ohmu/pgmemcache"
-SRC_URI="https://github.com/ohmu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-db/postgresql
-	dev-libs/cyrus-sasl
-	>=dev-libs/libmemcached-1.0.18[sasl]"
-RDEPEND="${DEPEND}"
-
-DOCS=( NEWS README TODO )
diff --git a/dev-db/pgmemcache/pgmemcache-2.2.0.ebuild b/dev-db/pgmemcache/pgmemcache-2.2.0.ebuild
deleted file mode 100644
index 7d0ec99a8032..000000000000
--- a/dev-db/pgmemcache/pgmemcache-2.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A PostgreSQL API based on libmemcached to interface with memcached"
-HOMEPAGE="http://pgfoundry.org/projects/pgmemcache https://github.com/ohmu/pgmemcache"
-SRC_URI="https://github.com/ohmu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-db/postgresql
-	dev-libs/cyrus-sasl
-	>=dev-libs/libmemcached-1.0.18[sasl]"
-RDEPEND="${DEPEND}"
-
-DOCS=( NEWS README TODO )
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-}
diff --git a/dev-db/plr/Manifest b/dev-db/plr/Manifest
index 0b3498e52ab4..f4d9d966b230 100644
--- a/dev-db/plr/Manifest
+++ b/dev-db/plr/Manifest
@@ -1,3 +1,5 @@
 DIST plr-8.3.0.17.tar.gz 74017 BLAKE2B 314b4cfa2c3ca8ed31e80a72233a6dc8cdb9f3811dad6e9f3eb5147c17cdf5a039436598b0fc2b30c6702b02dd3cb2da33543764aee3199c6864aae22be875ce SHA512 d7080c62349d1dcdd17008a7be3643b54678e0f66bf721068df73057394496d025c4fe01e52945c3acf9cc21eb90241512667772ef3fe519a3c9081efe92dd40
+DIST plr-8.4.1.tar.gz 265142 BLAKE2B 859913ba14d3e6876eb5a3d7593346b98ab2e1b6c70d9fd9cc7e1810fe11ecb3c552305485735cf975cc41ce2de6cbd7bcf407c9e373fc4024230be797c9899a SHA512 0db407355271009bad95c21f81e544839322f0fa0a63d2abd8edbf9eab8f61e208a3e4f7083729cc8247411885197ff3569c88264db0a29b34523dc83bbed7ec
 EBUILD plr-8.3.0.17.ebuild 1700 BLAKE2B 441f233545359ab8d171834c88564883acdb1470ffc88e01c8b617cded8af24b2dbce943a23ae4ab7275908f809b805773915e96c9788b1be71ccf9fd65cb07f SHA512 deb87ada7c10d6fd263f0a1261e31444c1034dcfd603ad3ef1287f1f5fb30c040953d64de5ba0a58ef7c7036b38923cfb4beb94518a25e5e363a6dc2bed87563
+EBUILD plr-8.4.1.ebuild 1706 BLAKE2B 9cf57201d0630c2f3f8934b2d64db8c01409cbf1001a0e3ce0949682e01280da700f4a9f14165e5c06fb369136f7cecff8c9b3f8f3465540893dc9f84ebba75c SHA512 45a3d957f45b2d71eff298b9f8931a495fcb6c7f48edf318d21f036a682d899d003fdaf56c4688395d716ce8a8f1eaf4554cfd124b96ac5221e75c7ae7095310
 MISC metadata.xml 800 BLAKE2B b12bbd609b12d63306bdc9af15f788d91847ae4a8960b26f92d1d8ca000291a047424f2632d22798855a1b61cad2a9d46095f214ba9f7c41616c5a90ee4dddbf SHA512 23728ed4ec8bd27a2ccf2081f4b0ddd2d8ecf47fd9c44f999406c8f3bd7c2f86545dbf837c99dc0e9ef9100b2028a9ae3f10a6d60a21bafbbc7231c445a9c85a
diff --git a/dev-db/plr/plr-8.4.1.ebuild b/dev-db/plr/plr-8.4.1.ebuild
new file mode 100644
index 000000000000..b78d06bcddf3
--- /dev/null
+++ b/dev-db/plr/plr-8.4.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_USEDEP="server"
+
+inherit postgres-multi
+
+DESCRIPTION="R language extension for postgresql database"
+HOMEPAGE="http://www.joeconway.com/plr/"
+SRC_URI="https://github.com/postgres-plr/plr/archive/REL${PV//./_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-lang/R
+	${POSTGRES_DEP}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
+S=${WORKDIR}/contrib/${PN}
+
+src_unpack() {
+	unpack ${A}
+	# the build system wants 'contrib' to be part of the path
+	mkdir -p "${WORKDIR}/contrib"
+	mv "${WORKDIR}/${PN}-REL${PV//./_}" "${S}"
+}
+
+src_prepare() {
+	local BUILD_DIR="${S}"
+	postgres-multi_src_prepare
+}
+
+src_compile() {
+	pg_src_compile() {
+		cd "${BUILD_DIR}"
+		PG_CONFIG="${SYSROOT}${EPREFIX}/usr/$(get_libdir)/postgresql-${MULTIBUILD_ID}/bin/pg_config" \
+		USE_PGXS=1 \
+		emake -j1
+	}
+	postgres-multi_foreach pg_src_compile
+}
+
+src_install() {
+	pg_src_install() {
+		cd "${BUILD_DIR}"
+		PG_CONFIG="${SYSROOT}${EPREFIX}/usr/$(get_libdir)/postgresql-${MULTIBUILD_ID}/bin/pg_config" \
+		USE_PGXS=1 \
+		emake -j1 DESTDIR="${D}" install
+	}
+	postgres-multi_foreach pg_src_install
+}
+
+pkg_postinst() {
+	elog "The plr extension needs to be explicitly added (or 'created') on each database"
+	elog "you wish to use it with.  As of postgresql-9.1 the easiest way to do this is"
+	elog "with the proprietary SQL statement:"
+	elog
+	elog "\tCREATE EXTENSION plr;"
+	elog
+	elog "For more info on how to add PL/R to your postgresql database(s), please visit"
+	elog "http://www.joeconway.com/doc/plr-install.html"
+}
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index d4b00d5a455e..d3d9a44c0742 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -13,14 +13,14 @@ AUX postgresql.tmpfiles 39 BLAKE2B 25a5725af53c8e4e4009887e998172dd863ce218a5438
 DIST postgresql-10.14.tar.bz2 19042154 BLAKE2B addddf00179190780bd30ed97cf6881670d18fda77062cdb5dc7cc161c64c3d5522db288902d0612db30fc6fcc1b619c7a102887ed438e27739e936bf5659425 SHA512 eecd2aa8df7e4779606ec547b7bf0207ebb2be10a4b332f06c3b72116f0619fe27fb651f2fd4504c73b740ab7f92468919244a615d460bb9c35085174a0dbc78
 DIST postgresql-11.9.tar.bz2 19959019 BLAKE2B 655d1c9e6eebde19402a4c220ee674c589641c5b6f4e6298c8c06d3330069178952455f5af58f90b9af196ba9c8fd03db0ccd70b8bc49335e465f0ed537eaf59 SHA512 2c5c2f51aa01f02af4aa0849441767383e30fef69dd52efa442892f39d2456bfa8bf01f633a265e00eca0745e792609d2c1d33f77d8f29a02f5f374c84f2bf6e
 DIST postgresql-12.4.tar.bz2 20669776 BLAKE2B fb3f865a8a5e5280e7cc5da43f8658029170cd15dae8cc5fb1e741a122ea1f13418ac7743ec417ab4436976bc0ce12753fc8a301200143c975e8739d59816fa7 SHA512 36daf10878ca153370829178786dd6ee366ab4d4d6dc9c527536740fdb14b688ae4c33f850eb4243a7667d23f87e4bfd1ddee0755447ad4f3996e423e391c2f3
-DIST postgresql-13rc1.tar.bz2 20996763 BLAKE2B 5073474f2e558580d70c83e932df8ad2c7b79e02b5736e40c5cbdf76e6265d993141dd292c61ce60b180f0742988896645f0bafc850ebcfff5dbbb8b1edf37d3 SHA512 4587e4195a1eed999f181ff6567feb621b838cd9d3c4a75877d968a669fb5d59f0144c828e5d41f9721fcba77fbded1be16a4dcd4b6fd3a4c17672807fd74b52
+DIST postgresql-13.0.tar.bz2 20999465 BLAKE2B c2c6475ad3c1c79afac1bc181ae3f9b74c097f9679bf562a0f1b4e16f426c9b0235aec476582ef548d14987a9232b938f2920446a8d5a8aa08ae5752f40481f2 SHA512 1fde89487c3e50a7a07e1d42fba60d415645ea89c5d4c5c7fcc93fbd5330feca7ec991d5b274f6ab757d5d04667ca1a7efdf4eaaa760add19d2e02437465f8f5
 DIST postgresql-9.5.23.tar.bz2 17682366 BLAKE2B 74713d6483ae1ad3d2dfc4b1ac9d30a6785ff34f61b735924f2d469861516ad5160cbfda9c09b96adf264237b6f3ad8fd6ddeef60b6af6b5b63d6c1a36fb9354 SHA512 b7a1e936a0043b57b3ece79610855820d2ea6a86e4a4be0c4c8358bf3e1ef8fa88bc60106d6b865d86231d16b5e3c098b4dbd93125a125b3cc5d468ffea64db1
 DIST postgresql-9.6.19.tar.bz2 18880036 BLAKE2B ad9c5684e2c0fb276589560f7dbe01241b5caf763f5a20991244ad7b473397576c9530658eb91e085e8416156b0ac81750f08ed85d5e5a689321891d10b6e114 SHA512 4d8d4a0e4645d71683a5fccb9cd88917e1870ba139f102e0ea82da9c8d1ad669f029e0feb6d409e2016dfd247229ec7daf04f7f2de3ab6c5b4053834ac244a26
-EBUILD postgresql-10.14.ebuild 13535 BLAKE2B fb84595125a36ed531d700db25845abacf4ced5897eaaad4e9cf5e8e1bcf4fd941a483d7380bfbf6fcfe2432ba9fbfde3edde1865309dd09ab44043abb3c3533 SHA512 01858923a47d0692501e8e56347068144b691cb5d554bc6cc44e8e9fc01ed005467d44376e0f7ec6cfc90b2580fe5fdf3c2c877d83da04fe5f5a69dd41d1acc6
-EBUILD postgresql-11.9.ebuild 13666 BLAKE2B d8cabef60a2d0ddb71340d1a0c6df2e582e8bcb2c35f6288f5f67f680c0fe5be9c0c60738487ebbc4a22aed658c8cb4032d61a03cf4a39ba57712ae1acd7e5a0 SHA512 ecc859a075ea988abb2f2b37bc94418b604abc7a93cf643102fd240ec2bddd14109a09443b4d86ff2de4f84f2ce8c6a3960e10d72b2b2e6976da7636333a2616
-EBUILD postgresql-12.4.ebuild 13638 BLAKE2B 9eb30632bb9dbe9599fd5ca555f74a6a3a1e1279e7abc29b9118b00bbac88048a17250b76e346c240adc3a210fcf802a543647da4622ca380e0744e3602c344a SHA512 520e1f44fcc83a639f85301db662c8262cfc3fb56371358c4f2139cb15ff95c5d288e44261b7d3591e0c8532c311668cddc70d803b1ea329b0d6cccdc7e548bb
-EBUILD postgresql-13_rc1.ebuild 13462 BLAKE2B 57f75f15da71e3bf0ce48b15a52e378f753c03ea9dd59f16a5630f2abd3705df9c270a061f6729d541cbcf1c73ef861b4179000459b4aa2dfed39d686b7fb043 SHA512 c43bbbff4fad1f343a845b499305001d7b1e6d933fd2141625e3bbe4a3ebb2fe1cbd8051bf50ee33b5608be25b95c9716b3f09d0d10fb628eb447e7fedbfbf97
-EBUILD postgresql-9.5.23.ebuild 14356 BLAKE2B e1cda95af93a53aee2404107b876861115a1415b51024853498e921147a70720b249285aeca777c47c317be5c5824d80c943c336ada8d07f7204afb0223d2120 SHA512 c7b6fefe53fbb12cecfa3db8f21acc4b2718a2e7b042d68b2c39e9892fb190e31dfd12690838e1d3d93940887d16c4b8cfc376ee813659aebebe316cadc0efec
-EBUILD postgresql-9.6.19.ebuild 14589 BLAKE2B a7c07a8a1fbe8bf35bad70a8e37579d20c8664e9511dea076c7a37ed40e9833721ab23b60ce28116c7bf1abf7f1b80423a298f97720536f229ce3b86ec8ab2fa SHA512 7373ecf70a742efb6d37b34934b3256bc9a638ba8aa6550069f714682bfa43c94b50e8a374ef51fc623409607a5d30180c129ca666f1011b1610a3f1f32f8741
+EBUILD postgresql-10.14.ebuild 13539 BLAKE2B 79ca887021d2bbc53b2e6a2ac201cdd8dde5b43a042608f609cbdfe3bf41b4b8410357fa1de6ea10cff6666ac8a2e6f9afb9838e096f92eca127c6a924b1a816 SHA512 c6c95f2e4a0c538eaab7969c3abae90056ee74eab6da639819d4e0b3b43c517df46e32bfe2afbeacf9ff99a74e682eaa3cbdd45ac3c2d00a9249e4e4569b3ed2
+EBUILD postgresql-11.9.ebuild 13670 BLAKE2B cbfeb229e65b864add0f5282ea9e5b38ad48dd837b4df4d18a7fab4ddd1eb7e5a67423207237043a9865e5433161a0e9386f587d617be78e064faea0ec6f2ae2 SHA512 d657eb9925c54a4e0dc5ff9b1f5397eff267ab45b5b526f5776006c1afdc7a7d323f612c5198b46cdf28092fdcb0b27e1cfdd23491b5d3a01a9772081aff85ed
+EBUILD postgresql-12.4.ebuild 13642 BLAKE2B 62b40b236c8e2ae78224868ff4d42dbf195fb6f0f2864b528dbdadf91529bbd71b03dac89899f336b9858e1e574c057729afbc0a5e122534c08d6d2ddda6c2b9 SHA512 83964ccf386a54ecd86bae1e3ec75650a45eccd3f1b0db7dc5bfcf6cab20a3dc216a053a25c312cff6df23586211f3482ce665a10a1c6509db1563d5b448343f
+EBUILD postgresql-13.0.ebuild 13654 BLAKE2B cb1a2882dcc848dd1706006f35d0362715f6be1079eb9482cfd656d028aad9d19a80b17deb8bad410a5ac830222cb23a6e5d59781f19c19496e2976525e6b7a5 SHA512 e14cd8831c4d1e7f9c605001dc5b6858d09c9e865a0cfc1237d48ea162ddd07615d91151fadf70382ddb03167c63759e0738725b921e2fab27dc68c4d4ba6647
+EBUILD postgresql-9.5.23.ebuild 14360 BLAKE2B 5737e94065f6efecdf7d43298c071fedd1281d484ebbf7a77731d3de68e5920e69a36581d6b43634c5d8805724688668cce9d4550e8235e22d85025fb99c245b SHA512 be18fb31727ae3f0796f3a0fd9ff0c272be7fbcd0f7a287b94caa18c781f6aa0be1e36b3a4b926fca8c789405d5ac84af8c55c14198c4aac735f8203c0eb633a
+EBUILD postgresql-9.6.19.ebuild 14593 BLAKE2B 41614372b80c5691822bd59a02f66b93139eebc3f49421237660643b8690baec26c0466b38bca1a502108d220659a01a10ebc45d729412c3dd83bb3ebe3fe8c5 SHA512 a2ffcfcbed1637c78ebae251a272d49b6730a37137aaeb7ea9a9958b0644e958033243a2d8a35a0a9bc5eda5b86a7761fabe8068a44f0f8498c48c68acc15e18
 EBUILD postgresql-9999.ebuild 13812 BLAKE2B f0eb8f0d79c3d4d9f0bdd0fe49f9b8354ce0bbd237b286e1509b9d9573cb6c023a855c10c97d836909495a0e23fc785716820e6e54e86b0f31765e0aef53a645 SHA512 3e56a9b619e4a94658035121d71a5e86c115f7dd3a13318ff0b6c341b59ad0cb836376b7f0074a3e28e7b17f93c3e2b9317a6662de19f77d6f6c4e6b4bc1066b
 MISC metadata.xml 715 BLAKE2B 71b868113676bdbb1996ecc8e3727b0cc16a559c5906e6459a41c330bcb5a5f4b3f4b5c4473a81905713c2f0735f185cd14612c69108b6bb602a7d8a92d6f3ce SHA512 4148c9c11ffaea5d30cd18befb06af914147d41eec4a8f905127f0abc5317ca370a745e0fd51b03c4583efde927fe9c1b3333853e80c2aa3e7677de65cd5d1ba
diff --git a/dev-db/postgresql/postgresql-10.14.ebuild b/dev-db/postgresql/postgresql-10.14.ebuild
index 533fd71130ee..a0d0ae70a56a 100644
--- a/dev-db/postgresql/postgresql-10.14.ebuild
+++ b/dev-db/postgresql/postgresql-10.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
 
diff --git a/dev-db/postgresql/postgresql-11.9.ebuild b/dev-db/postgresql/postgresql-11.9.ebuild
index a5d28f91604f..f49a3c2de54f 100644
--- a/dev-db/postgresql/postgresql-11.9.ebuild
+++ b/dev-db/postgresql/postgresql-11.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
 
diff --git a/dev-db/postgresql/postgresql-12.4.ebuild b/dev-db/postgresql/postgresql-12.4.ebuild
index 3d24f5a80a7e..88a1f960cb28 100644
--- a/dev-db/postgresql/postgresql-12.4.ebuild
+++ b/dev-db/postgresql/postgresql-12.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
 
diff --git a/dev-db/postgresql/postgresql-13.0.ebuild b/dev-db/postgresql/postgresql-13.0.ebuild
new file mode 100644
index 000000000000..36cc823987e9
--- /dev/null
+++ b/dev-db/postgresql/postgresql-13.0.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT=$(ver_cut 1)
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="https://www.postgresql.org/"
+
+IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
+	  perl python +readline selinux +server systemd ssl static-libs tcl
+	  threads uuid xml zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-2.0
+acct-group/postgres
+acct-user/postgres
+sys-apps/less
+virtual/libintl
+icu? ( dev-libs/icu:= )
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+llvm? (
+	sys-devel/llvm:=
+	sys-devel/clang:=
+)
+pam? ( sys-libs/pam )
+perl? ( >=dev-lang/perl-5.8:= )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+server? ( systemd? ( sys-apps/systemd ) )
+ssl? (
+	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+	libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+	local front back
+	while [[ ${#} -gt 1 ]]; do
+		front+="${1}? ( "
+		back+=" )"
+		shift
+	done
+	echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+sys-devel/bison
+sys-devel/flex
+nls? ( sys-devel/gettext )
+xml? ( virtual/pkgconfig )
+"
+
+RDEPEND="${CDEPEND}
+selinux? ( sec-policy/selinux-postgresql )
+"
+
+pkg_setup() {
+	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Set proper run directory
+	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
+		-i src/include/pg_config_manual.h || die
+
+	# Rely on $PATH being in the proper order so that the correct
+	# install program is used for modules utilizing PGXS in both
+	# hardened and non-hardened environments. (Bug #528786)
+	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
+
+	use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
+
+	if use pam ; then
+		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
+			-i src/backend/libpq/auth.c || \
+			die 'PGSQL_PAM_SERVICE rename failed.'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	case ${CHOST} in
+		*-darwin*|*-solaris*)
+			use nls && append-libs intl
+			;;
+	esac
+
+	export LDFLAGS_SL="${LDFLAGS}"
+	export LDFLAGS_EX="${LDFLAGS}"
+
+	local PO="${EPREFIX}"
+
+	local i uuid_config=""
+	if use uuid; then
+		for i in ${UTIL_LINUX_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=e2fs"
+		done
+		for i in ${BSD_LIBC[@]}; do
+			use ${i} && uuid_config="--with-uuid=bsd"
+		done
+		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
+	fi
+
+	econf \
+		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
+		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
+		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
+		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
+		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
+		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
+		$(use_enable !alpha spinlocks) \
+		$(use_enable debug) \
+		$(use_enable threads thread-safety) \
+		$(use_with icu) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with llvm) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with ssl openssl) \
+		$(usex server "$(use_with systemd)" '--without-systemd') \
+		$(use_with tcl) \
+		${uuid_config} \
+		$(use_with xml libxml) \
+		$(use_with xml libxslt) \
+		$(use_with zlib) \
+		$(use_enable nls)
+}
+
+src_compile() {
+	emake
+	emake -C contrib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install -C contrib
+
+	dodoc README HISTORY
+
+	# man pages are already built, but if we have the target make them,
+	# they'll be generated from source before being installed so we
+	# manually install man pages.
+	# We use ${SLOT} instead of doman for postgresql.eselect
+	insinto /usr/share/postgresql-${SLOT}/man/
+	doins -r doc/src/sgml/man{1,3,7}
+	if ! use server; then
+		# Remove man pages for non-existent binaries
+		serverman=(
+			initdb
+			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
+			pg_{test_{fsync,timing},upgrade,waldump}
+			post{gres,master}
+		)
+		for m in ${serverman[@]} ; do
+			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
+		done
+	fi
+	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
+
+	# Create slot specific man pages
+	local bn f mansec slotted_name
+	for mansec in 1 3 7 ; do
+		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
+
+		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
+		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
+
+		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
+			bn=$(basename "${f}")
+			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
+			case ${bn} in
+				TABLE.7|WITH.7)
+					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
+					;;
+				*)
+					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
+					;;
+			esac
+		done
+
+		popd > /dev/null
+	done
+
+	insinto /etc/postgresql-${SLOT}
+	newins src/bin/psql/psqlrc.sample psqlrc
+
+	# Don't delete libpg{port,common}.a (Bug #571046). They're always
+	# needed by extensions utilizing PGXS.
+	use static-libs || \
+		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
+			 -delete
+
+	# Make slot specific links to programs
+	local f bn
+	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
+					-mindepth 1 -maxdepth 1)
+	do
+		bn=$(basename "${f}")
+		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
+			  "/usr/bin/${bn}${SLOT/.}"
+	done
+
+	if use doc ; then
+		docinto html
+		dodoc doc/src/sgml/html/*
+	fi
+
+	if use server; then
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
+
+		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
+
+		if use systemd; then
+			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+				"${FILESDIR}/${PN}.service-9.6-r1" | \
+				systemd_newunit - ${PN}-${SLOT}.service
+			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
+		fi
+
+		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+		if use prefix ; then
+			keepdir /run/postgresql
+			fperms 1775 /run/postgresql
+		fi
+	fi
+}
+
+pkg_postinst() {
+	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
+	postgresql-config update
+
+	elog "If you need a global psqlrc-file, you can place it in:"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
+
+	if use server ; then
+		elog
+		elog "Gentoo specific documentation:"
+		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+		elog
+		elog "Official documentation:"
+		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
+		elog
+		elog "The default location of the Unix-domain socket is:"
+		elog "    ${EROOT}/run/postgresql/"
+		elog
+		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+		elog "so that it contains your preferred locale in:"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+		elog
+		elog "Then, execute the following command to setup the initial database"
+		elog "environment:"
+		elog "    emerge --config =${CATEGORY}/${PF}"
+
+		if [[ -n ${REPLACING_VERSIONS} ]] ; then
+			ewarn "If your system is using 'pg_stat_statements' and you are running a"
+			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
+			ewarn "the following command after upgrading:"
+			ewarn
+			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+		sleep 10
+		eend 0
+	fi
+}
+
+pkg_postrm() {
+	postgresql-config update
+}
+
+pkg_config() {
+	use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
+	[[ -z "${DATA_DIR}" ]] \
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
+
+	# environment.bz2 may not contain the same locale as the current system
+	# locale. Unset and source from the current system locale.
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
+		unset LANG
+		unset LC_CTYPE
+		unset LC_NUMERIC
+		unset LC_TIME
+		unset LC_COLLATE
+		unset LC_MONETARY
+		unset LC_MESSAGES
+		unset LC_ALL
+		source "${EROOT}/etc/env.d/02locale"
+		[ -n "${LANG}" ] && export LANG
+		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
+		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+		[ -n "${LC_TIME}" ] && export LC_TIME
+		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
+		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
+		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+		[ -n "${LC_ALL}" ] && export LC_ALL
+	fi
+
+	einfo "You can modify the paths and options passed to initdb by editing:"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	einfo
+	einfo "Information on options that can be passed to initdb are found at:"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+	einfo
+	einfo "PG_INITDB_OPTS is currently set to:"
+	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+		einfo "    (none)"
+	else
+		einfo "    ${PG_INITDB_OPTS}"
+	fi
+	einfo
+	einfo "Configuration files will be installed to:"
+	einfo "    ${PGDATA}"
+	einfo
+	einfo "The database cluster will be created in:"
+	einfo "    ${DATA_DIR}"
+	einfo
+
+	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
+	sleep 5
+	eend 0
+
+	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+		eerror "The given directory, '${DATA_DIR}', is not empty."
+		eerror "Modify DATA_DIR to point to an empty directory."
+		die "${DATA_DIR} is not empty."
+	fi
+
+	einfo "Creating the data directory ..."
+	if [[ ${EUID} == 0 ]] ; then
+		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
+		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
+		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
+	fi
+
+	einfo "Initializing the database ..."
+
+	if [[ ${EUID} == 0 ]] ; then
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+	else
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+	fi
+
+	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+	fi
+
+	# unix_socket_directory has no effect in postgresql.conf as it's
+	# overridden in the initscript
+	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
+
+	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+		# On the off-chance that you might need to work with UTF-8 encoded
+		# characters in PL/Perl
+		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+	EOF
+
+	einfo "The autovacuum function, which was in contrib, has been moved to the main"
+	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+	einfo "by default. You can disable it in the cluster's:"
+	einfo "    ${PGDATA%/}/postgresql.conf"
+	einfo
+	if ! use systemd; then
+		einfo "The PostgreSQL server, by default, will log events to:"
+		einfo "    ${DATA_DIR%/}/postmaster.log"
+		einfo
+	fi
+	if use prefix ; then
+		einfo "The location of the configuration files have moved to:"
+		einfo "    ${PGDATA}"
+		einfo "To start the server:"
+		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+		einfo "To stop:"
+		einfo "    pg_ctl stop -D ${DATA_DIR}"
+		einfo
+		einfo "Or move the configuration files back:"
+		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+	elif use systemd; then
+		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	else
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "instead of 'pg_ctl'."
+	fi
+}
+
+src_test() {
+	if use server && [[ ${UID} -ne 0 ]] ; then
+		emake check
+
+		einfo "If you think other tests besides the regression tests are necessary, please"
+		einfo "submit a bug including a patch for this ebuild to enable them."
+	else
+		use server || \
+			ewarn 'Tests cannot be run without the "server" use flag enabled.'
+		[[ ${UID} -eq 0 ]] || \
+			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+		ewarn 'Skipping.'
+	fi
+}
diff --git a/dev-db/postgresql/postgresql-13_rc1.ebuild b/dev-db/postgresql/postgresql-13_rc1.ebuild
deleted file mode 100644
index 210d6e3dfda1..000000000000
--- a/dev-db/postgresql/postgresql-13_rc1.ebuild
+++ /dev/null
@@ -1,458 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
-
-KEYWORDS=""
-
-SLOT=$(ver_cut 1)
-
-MY_PV=${PV/_/}
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="https://www.postgresql.org/"
-
-IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
-	  perl python +readline selinux +server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
->=app-eselect/eselect-postgresql-2.0
-acct-group/postgres
-acct-user/postgres
-sys-apps/less
-virtual/libintl
-icu? ( dev-libs/icu:= )
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-llvm? (
-	sys-devel/llvm:=
-	sys-devel/clang:=
-)
-pam? ( sys-libs/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-server? ( systemd? ( sys-apps/systemd ) )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || eapply "${FILESDIR}/${PN}-13_beta1-no-server.patch"
-
-	if use pam ; then
-		sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable debug) \
-		$(use_enable threads thread-safety) \
-		$(use_with icu) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with llvm) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(usex server "$(use_with systemd)" '--without-systemd') \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		serverman=(
-			initdb
-			pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby}
-			pg_{test_{fsync,timing},upgrade,waldump}
-			post{gres,master}
-		)
-		for m in ${serverman[@]} ; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	# Create slot specific man pages
-	local bn f mansec slotted_name
-	for mansec in 1 3 7 ; do
-		local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}"
-
-		mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir"
-		pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed"
-
-		for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do
-			bn=$(basename "${f}")
-			slotted_name=${bn%.${mansec}}${SLOT}.${mansec}
-			case ${bn} in
-				TABLE.7|WITH.7)
-					echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name}
-					;;
-				*)
-					echo ".so ${rel_manpath}/${bn}" > ${slotted_name}
-					;;
-			esac
-		done
-
-		popd > /dev/null
-	done
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	# Don't delete libpg{port,common}.a (Bug #571046). They're always
-	# needed by extensions utilizing PGXS.
-	use static-libs || \
-		find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \
-			 -delete
-
-	# Make slot specific links to programs
-	local f bn
-	for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \
-					-mindepth 1 -maxdepth 1)
-	do
-		bn=$(basename "${f}")
-		dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \
-			  "/usr/bin/${bn}${SLOT/.}"
-	done
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT}
-
-		if use systemd; then
-			sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-				"${FILESDIR}/${PN}.service-9.6-r1" | \
-				systemd_newunit - ${PN}-${SLOT}.service
-			newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-			systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf
-		fi
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 1775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-
-		if [[ -n ${REPLACING_VERSIONS} ]] ; then
-			ewarn "If your system is using 'pg_stat_statements' and you are running a"
-			ewarn "version of PostgreSQL ${SLOT}, we advise that you execute"
-			ewarn "the following command after upgrading:"
-			ewarn
-			ewarn "ALTER EXTENSION pg_stat_statements UPDATE;"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-
-	ebegin "Continuing initialization in 5 seconds (Control-C to cancel)"
-	sleep 5
-	eend 0
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs"
-		mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR"
-		chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	# unix_socket_directory has no effect in postgresql.conf as it's
-	# overridden in the initscript
-	sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	if ! use systemd; then
-		einfo "The PostgreSQL server, by default, will log events to:"
-		einfo "    ${DATA_DIR%/}/postmaster.log"
-		einfo
-	fi
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	elif use systemd; then
-		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	else
-		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.5.23.ebuild b/dev-db/postgresql/postgresql-9.5.23.ebuild
index ef898daa47e5..acc5e9779fd6 100644
--- a/dev-db/postgresql/postgresql-9.5.23.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
 
diff --git a/dev-db/postgresql/postgresql-9.6.19.ebuild b/dev-db/postgresql/postgresql-9.6.19.ebuild
index 586527a2a689..b36d51b81cea 100644
--- a/dev-db/postgresql/postgresql-9.6.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 45e1eb59a16d..3ff3bbb61267 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -12,5 +12,5 @@ DIST sqlite-doc-3330000.zip 9834159 BLAKE2B f67155a8ce8e46c2fbc0a4e35722d1fcad86
 DIST sqlite-src-3320300.zip 12461750 BLAKE2B 59cce74d284191cfc69ac09b6014701ddd2b7b3d7ebaad5da4ad71cc200e70285b3b201ff174819aa8dde5f610589d7947f547450334f0f17149014078316185 SHA512 7e027c7163a760fb9b6dbfd2e4ccffb39d4972280583fb0d7f8390017101dfed3b12a36653b3130a548ae4d04c6abb11c0a1921b6f09c54c6ae1e72fbdcb2fd4
 DIST sqlite-src-3330000.zip 12591089 BLAKE2B 14888bca229683e97c4666f8efb535be5bd3e322de0089f0175ba15e038016be3a3cc00b5bfa8c111538116914cf6d8439839ca5d1e20339b184e547ddf260a4 SHA512 3260e3e03ee2f6a4ff2bc4ea4bada5a1497afeca33878c155a8005824970c6c1eb8a2db58eb3023cab084af475fadb81d1c3c9892ae92c07f884881e6602e173
 EBUILD sqlite-3.32.3-r1.ebuild 10369 BLAKE2B c997121e13e1f2b86128e18a86d7260f340f4a1be42b8ff2c02a34b13689f883572352e4e3c9ada1dbfccd2e215d8d1e6b18e912a6d966bb76112aaba241bb53 SHA512 39c97994f1f8d505055701173ebdf41732dbce2b4071c5a4b2e17a8d29f09ae92a2b731521fcf2a33ad5821cb18e9bd790dd1789d4fe9e3e9002786e34caf8ca
-EBUILD sqlite-3.33.0.ebuild 11478 BLAKE2B fb14a0169ca4e8db8d48dfb4787bf9700012474f2e3310b067b4431e147957bf1c60e1b891bbc6cf16f8a0f7fc3ae9dfffa60ca875929344f500fbad7c0cc947 SHA512 3acc03c4d6390b254c53eb358de40f5be83ecaf28ac31596d43105de279ae94b8533f3469987fcc970a734e82bd64b2fa55116a12cc9b9898cb33747389e85f5
+EBUILD sqlite-3.33.0.ebuild 11472 BLAKE2B f1468e867136e66411c7ce5ac428403bafcbc08f83d6b95dda0722067aecffd40c94cba268590c217ece2ab7227ed0d631f02d6e8f3f54a16b61fce0044dfa0a SHA512 ffbcbd56f26f09043873a834bb45057d83ad3e2f0c5890ee03273609edb6f1776079b1f4223984c994dfb01503973f36823f12005297a2c1fddb1fd59e5f6b64
 MISC metadata.xml 748 BLAKE2B c58da3e33e12b7747bbadacfd1a6137cf847fd5bd0525fc02ef854eb5bcad7bad0b29739257b632e19190995659768fdea418ffa7e485e55ef15f40f58b8382c SHA512 66f3f134065f76229b74a7ab7b469066a93da737a9037435e6fe78e85f45c980ec561537f2bb9b95db9de026bad025d8b06682187c97dedd2741717e893d43da
diff --git a/dev-db/sqlite/sqlite-3.33.0.ebuild b/dev-db/sqlite/sqlite-3.33.0.ebuild
index f4c16d01b362..854ed01b48ce 100644
--- a/dev-db/sqlite/sqlite-3.33.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.33.0.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 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"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"
diff --git a/dev-db/sqliteodbc/Manifest b/dev-db/sqliteodbc/Manifest
deleted file mode 100644
index 7efe331d047b..000000000000
--- a/dev-db/sqliteodbc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX sqliteodbc-0.93-respect_LDFLAGS.patch 1180 BLAKE2B b7f80800269febf41e0693faf55bd4698f56ea37e1f585449626b2571c67bcc9f9b43188ba9575b1dcc07b4cf817d953c196ae9254d8eeeb5540ccef8eada843 SHA512 083a9640d89976097a402483ebc16c1e5328e705fcea92d78a8f56988cc73b6f75143cf7f2f67b6a783f1bc9cd5ae5671aaf8d794c3548f764d6726cd78f6531
-DIST sqliteodbc-0.99.tar.gz 696992 BLAKE2B ec5f87b7719573ce533d9bc316e840def5e07f3da65dca822068e57eb0e3f5eb8f1593119d704ad007f015cdf35d85c0cc53cdea5d0688faedccf611fc4d2fae SHA512 adf213acee4ee69c299f39582887fd2adba3856ce6d298d250e3a96744d041c720cefb7fd8acd504c41461751b46b8a729c4fbfa7e56832fb6e4c5a1c537955d
-EBUILD sqliteodbc-0.99.ebuild 817 BLAKE2B 39848b20a2b2059261f7adf326572bb0934117ead1d91e8a750244a4074b54664d900d9b2aa41886edbdacc5f68d526415fe5d3a972986f228dd0712b332c897 SHA512 db7756cb15fb3f82633cb78bff6180fff2b386f2c070d0c936248dce89e76ef5f6fccdd06ed857b5eafbc059ac3bac51dab6508bd4f68257ea9104184fc190af
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-db/sqliteodbc/files/sqliteodbc-0.93-respect_LDFLAGS.patch b/dev-db/sqliteodbc/files/sqliteodbc-0.93-respect_LDFLAGS.patch
deleted file mode 100644
index 129ce3e65ff3..000000000000
--- a/dev-db/sqliteodbc/files/sqliteodbc-0.93-respect_LDFLAGS.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.in.old	2012-03-24 12:57:34.533234122 +0100
-+++ Makefile.in	2012-03-24 12:58:06.908198492 +0100
-@@ -37,23 +37,23 @@
- all:		@LIB_TARGETS@
- 
- libsqliteodbc.la:	sqliteodbc.lo
--		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libsqliteodbc.la \
-+		$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libsqliteodbc.la \
- 		    sqliteodbc.lo -rpath $(drvdir) $(SQLITE_LIB) \
- 		    $(ODBC_LIB) -release $(VER_INFO)
- 
- libsqlite3odbc.la:	sqlite3odbc.lo $(SQLITE3_A10N_O)
--		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libsqlite3odbc.la \
-+		$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libsqlite3odbc.la \
- 		    sqlite3odbc.lo $(SQLITE3_A10N_O) -rpath $(drvdir) \
- 		    $(SQLITE3_LIB) $(ODBC_LIB) -release $(VER_INFO) \
- 		    @DL_INITFINI@
- 
- libsqlite3_mod_blobtoxy.la:	blobtoxy.lo
--		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) \
-+		$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) \
- 		    -o libsqlite3_mod_blobtoxy.la \
- 		    blobtoxy.lo -rpath $(drvdir) -release $(VER_INFO)
- 
- libsqlite3_mod_impexp.la:	impexp.lo
--		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) \
-+		$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) \
- 		    -o libsqlite3_mod_impexp.la \
- 		    impexp.lo -rpath $(drvdir) -release $(VER_INFO)
- 
diff --git a/dev-db/sqliteodbc/metadata.xml b/dev-db/sqliteodbc/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-db/sqliteodbc/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-db/sqliteodbc/sqliteodbc-0.99.ebuild b/dev-db/sqliteodbc/sqliteodbc-0.99.ebuild
deleted file mode 100644
index 997233a895fe..000000000000
--- a/dev-db/sqliteodbc/sqliteodbc-0.99.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="ODBC driver to access local SQLite database files"
-HOMEPAGE="http://www.ch-werner.de/sqliteodbc/"
-SRC_URI="http://www.ch-werner.de/sqliteodbc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE=""
-
-DEPEND=">=dev-db/sqlite-3.6
-	|| (
-		>=dev-db/unixODBC-2.2
-		>=dev-db/libiodbc-3.5
-	)"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.93-respect_LDFLAGS.patch"
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	dodir "/usr/$(get_libdir)"
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-	dodoc ChangeLog README
-}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index c04be86ef438..9fe70f24c632 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/ftdi_eeprom/Manifest b/dev-embedded/ftdi_eeprom/Manifest
deleted file mode 100644
index 2b8cfe9d11c6..000000000000
--- a/dev-embedded/ftdi_eeprom/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX ftdi_eeprom-0.3-chip-type.patch 542 BLAKE2B 396716821e5ee6980159df7e655d9df355028c7576d8e174ca9611166cd56bca1e44c70a4fde97b62a037ac911fe5dbb405aa909b7cfe957e6840e568c77c979 SHA512 6dbe2e0cef9ee1772a5c99280432050bc2fe037ffb7861c9e7c70ce91d7d4cda23669abc0e108d3de90345041ba33887bb0c2b93099fab9b7952540a02fffb31
-AUX ftdi_eeprom-0.3-newer-chips.patch 726 BLAKE2B d6b94a04b4498b62f0dcbd848bf7b2aadb5242635fcbf26fef7266ce7a1de70033c2a7634dabddbfa29191f8d1482a2938cdc330d8ca3348bfad58649e908da8 SHA512 fb3d7f77820fa7847315e6b366a0fb43cea174530603b860ddbeed37fcc893f15597781e82f1bf561fde6fadf707eb2be8099f18ca873f420d6b2e1d20710a35
-DIST ftdi_eeprom-0.3.tar.gz 103723 BLAKE2B a378b82f3e2239a62b9002933ac5b5bbfab326f33b893712a78489115348fce6401d80ea454355fac8349354437eb852489e2bd2474182c303fa03ba57dfbd2d SHA512 292617434d618c1f47fd94922cff1c32da271a9262b70ee56a8931b7a07ec1ae2cfe92a0ddfe14d9516d295188dc0a750c0cf7f5a26bb4c3fd384f252aeda18d
-EBUILD ftdi_eeprom-0.3-r1.ebuild 641 BLAKE2B 154f3f88e92cb846009815702b4127661ea40c4e52522eeccf6c661afc3ff6e40cf554663160c04a0e7cc6b430ea82db73bb7ed4c1ecbec3e5e31554dc9b09e0 SHA512 182a907f70f9f316ed2dfafc6ea77fed14ef9a3dcdd136a33d13cb5940c4703c5bfffca3d038d2d09c9fab0d15d5405d3f697baeb1db090fad846a9a64b1976e
-EBUILD ftdi_eeprom-1.0.ebuild 476 BLAKE2B e74be7839e3d20808a1ef1daebd1a4e83314df84156ebe0b44c80c368276213800aa38d6306b130892594b1151e613946f20966596b0b87d2fd0eb6e7a4017a9 SHA512 7f7a3db471fbb821adcb706d33f0660ce1f873e88a64eceb09afe12e6305a36ce403682c044be0e4183ce054c89850be1456e0874f7632d0762facc23d132433
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch
deleted file mode 100644
index 1492194045ab..000000000000
--- a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/390805
-
-fix by Egor Y. Egorov for building with newer libftdi versions
-
---- a/src/main.c
-+++ b/src/main.c
-@@ -106,7 +106,7 @@ int main(int argc, char *argv[]) {
- 
-     eeprom.vendor_id = cfg_getint(cfg, "vendor_id");
-     eeprom.product_id = cfg_getint(cfg, "product_id");
--    eeprom.BM_type_chip = cfg_getbool(cfg, "BM_type_chip");
-+    eeprom.chip_type = cfg_getbool(cfg, "BM_type_chip");
- 
-     eeprom.self_powered = cfg_getbool(cfg, "self_powered");
-     eeprom.remote_wakeup = cfg_getbool(cfg, "remote_wakeup");
diff --git a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch
deleted file mode 100644
index 7a678cd4bce2..000000000000
--- a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-latest upstream vcs tree supports this stuff in a diff way
-
-https://bugs.gentoo.org/376117
-
-patch by Robert Pearce
-
---- ftdi_eeprom-0.2/src/main.c
-+++ ftdi_eeprom-0.2/src/main.c
-@@ -131,9 +131,13 @@
- 	
- 	if (i != 0) {
- 	    printf("Unable to find FTDI devices under given vendor/product id: 0x%X/0x%X\n", eeprom.vendor_id, eeprom.product_id);
--	    printf("Retrying with default FTDI id.\n");
-+	    printf("Retrying with default FTDI ids.\n");
- 
-     	    i = ftdi_usb_open(&ftdi, 0x0403, 0x6001);
-+	    if (i != 0)
-+    	    	i = ftdi_usb_open(&ftdi, 0x0403, 0x6010);
-+	    if (i != 0)
-+    	    	i = ftdi_usb_open(&ftdi, 0x0403, 0x6011);
- 	    if (i != 0) {
- 		printf("Sorry, unable to find FTDI USB chip\n");
- 		exit (-1);
diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
deleted file mode 100644
index e488beb2ab56..000000000000
--- a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Utility to program external EEPROM for FTDI USB chips"
-HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
-SRC_URI="https://www.intra2net.com/en/developer/libftdi/download/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-embedded/libftdi:0
-	dev-libs/confuse"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-newer-chips.patch #376117
-	epatch "${FILESDIR}"/${PN}-0.3-chip-type.patch #390805
-}
-
-src_install() {
-	default
-	dodoc src/example.conf
-}
diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild
deleted file mode 100644
index 5479b10f65bb..000000000000
--- a/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Utility to program external EEPROM for FTDI USB chips"
-HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-embedded/libftdi:1[tools]"
-
-pkg_setup() {
-	elog "This tool has moved to libftdi itself (via USE=tools)."
-	elog "Please install that package and remove this one."
-}
diff --git a/dev-embedded/ftdi_eeprom/metadata.xml b/dev-embedded/ftdi_eeprom/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/ftdi_eeprom/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/libjaylink/Manifest b/dev-embedded/libjaylink/Manifest
index f7dab1217fb4..b1c8628d8d1d 100644
--- a/dev-embedded/libjaylink/Manifest
+++ b/dev-embedded/libjaylink/Manifest
@@ -1,4 +1,6 @@
 DIST libjaylink-0.1.0.tar.bz2 53672 BLAKE2B 9dbe687b97e76bf4f928cbb8010af0fff95025d3989294b959c6187f0549e9f0dc495f88c39b57d0f98e34d8df2df0cb3bef31047208d4807588416a72401b9f SHA512 5b420c816809c4d2a458d2e28591a2e97bdc161c42ada12f6e0a1cff3490463c0cbef49ecefd8c1ff51e661345185e6087bfc12e259b20fab8b177bb4f3f4638
-EBUILD libjaylink-0.1.0.ebuild 604 BLAKE2B de316ea7a75020514e8f6bff71cfc06e0883155cfeccbc07b01c15a378861318975e2fbf5f57583832749c0ff8f0703bf5148cfadbe8b009516fdd70b8863ad6 SHA512 38cc9230f4419fc5f1ea23dd949ed5acdac1011b0627765f74c36696eac56bdd1ebf0a6cb73a0c79289b2c7d9989ad7cc5bb7e70a65a3068054d308ae50f3ca0
-EBUILD libjaylink-9999.ebuild 566 BLAKE2B 256916fe1c1275fa53b8b7fdafa95f63a302ba3b270fb7feb8a9ae135e8833a76d74d4561407444b9e027f604fa122b0e8cce5b8766c19a47f24f330cb370415 SHA512 a57a77992ec1beb56e99c31a64c39737a502b955ef2eb7e0c9848e9b95b74cca4e0ca850838cc9a2a97ab691d1c8e1537bb78ef596673eb8b4f709e762129e1f
+DIST libjaylink-0.2.0.tar.bz2 59078 BLAKE2B 7928875248972bc00ec46511861e160491f7a53f729e0fbfe3a6d08335532fffc9e285e8a354a390037bebe696b6740bdc422164238947baf5e0fcf8f55c0dd5 SHA512 5a8c458982fdea2025aa3ce774d41cc58a283824dcd90a94531ee5e6ca50d9961b0ebb40a6dd3a97fdfcb44625437d685151560185449c3161fe399e0651da44
+EBUILD libjaylink-0.1.0.ebuild 683 BLAKE2B dfff512f28a66aa90e945d14006eccfb904e5238824fc2a2855427a233377fe18531b1aa80a3816c8ed4a20f24488c769a204db746774bd6646c8963c97be056 SHA512 f518a67882f6085d62a00a9a50a7cf21584a8ad7e54e7088896880e4ed0ee2781af5e5b3dde76298cb8b62e794d4f5c841c4ba625dba265845a14a1324bdfae4
+EBUILD libjaylink-0.2.0.ebuild 818 BLAKE2B 77f43249021e1d95a6a467215559baac294692867cab6beb4808051285cde3343e415af7a8c200abd9232ffa9bd703f7949a2133a541ef1e97124b1d3f25099b SHA512 8bbb4a8099ddfc337b6c44118f41dce51e5b86994217cbfdd3921fdca79e4145330f73c3a7fefc52e69ea3c7f1662b3f1b321cb7b18d8727ecabd812928527e5
+EBUILD libjaylink-9999.ebuild 790 BLAKE2B 72c7377905e1b424d249bf18e7b1d46b09707e41bb70099d5811b7fc7ae72177e8eeb9d61827ee5653df64cc80eee20747e0bc5a9893d11f09406f77e3d8091d SHA512 68f0b0d7e3b8c06e88195bb008eadc710c193be68d8bea41c009c98dbb50e406e7c8493937699936433ee3f6cc6417c0ff823929b3290babbc8bec0dc8934870
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild b/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild
index 1f202d8baeb1..daffa2fb2392 100644
--- a/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild
+++ b/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild
@@ -6,9 +6,9 @@ EAPI="6"
 inherit autotools eutils ltprune
 
 DESCRIPTION="Library to access J-Link devices"
-HOMEPAGE="https://gitlab.zapb.de/zapb/libjaylink"
+HOMEPAGE="https://gitlab.zapb.de/libjaylink/libjaylink"
 
-SRC_URI="https://gitlab.zapb.de/zapb/libjaylink/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,6 +19,7 @@ DEPEND="virtual/libusb:1"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i -e "/^JAYLINK_CFLAGS=/ s/ -Werror / /" configure.ac || die
 	eapply_user
 	eautoreconf || die
 }
diff --git a/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild b/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild
new file mode 100644
index 000000000000..c532bb87780a
--- /dev/null
+++ b/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library to access J-Link devices"
+HOMEPAGE="https://gitlab.zapb.de/libjaylink/libjaylink"
+
+SRC_URI="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static-libs"
+
+DEPEND="virtual/libusb:1[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e "/^JAYLINK_CFLAGS=/ s/ -Werror / /" configure.ac || die
+	eapply_user
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	use static-libs || find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-embedded/libjaylink/libjaylink-9999.ebuild b/dev-embedded/libjaylink/libjaylink-9999.ebuild
index 3f1f59b950a1..af23bef609c1 100644
--- a/dev-embedded/libjaylink/libjaylink-9999.ebuild
+++ b/dev-embedded/libjaylink/libjaylink-9999.ebuild
@@ -1,32 +1,36 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
-EGIT_REPO_URI="https://gitlab.zapb.de/zapb/libjaylink.git"
+EGIT_REPO_URI="https://gitlab.zapb.de/libjaylink/libjaylink.git"
 
-inherit git-r3 autotools eutils ltprune
+inherit git-r3 autotools multilib-minimal
 
 DESCRIPTION="Library to access J-Link devices"
-HOMEPAGE="https://gitlab.zapb.de/zapb/libjaylink"
+HOMEPAGE="https://gitlab.zapb.de/libjaylink/libjaylink"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="static-libs"
 
-DEPEND="virtual/libusb:1"
+DEPEND="virtual/libusb:1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	eautoreconf || die
+	sed -i -e "/^JAYLINK_CFLAGS=/ s/ -Werror / /" configure.ac || die
+	eapply_user
+	eautoreconf
+	multilib_copy_sources
 }
 
-src_configure() {
+multilib_src_configure() {
 	econf $(use_enable static-libs static)
 }
 
-src_install() {
-	default
-	prune_libtool_files
+multilib_src_install_all() {
+	einstalldocs
+	use static-libs || find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 24c677d4f91f..ba7dfb43c5ba 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 a2338f80707e..7f21bfd2c528 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -2,5 +2,5 @@ AUX freecell-solver-5.22.1-no-docs.patch 1013 BLAKE2B d766bb4a12e546c7a2e6ccdaf0
 DIST freecell-solver-5.24.0.tar.xz 422468 BLAKE2B 3fc98a6ba5116bbbdc79c8c09c820b3992fd666c14736fca98b2191c752b5c5a465dcf4ad3fc79ac944d2189647097aad70f99b140e6feff133bae26d4d52411 SHA512 264a7e016a5dbd093f126aab520b36c98c02111a3834ba09646ba527046973163aeefe41449e05d161d1790d2f599c6a3302402442b96b9bd524e97fc4f54b91
 DIST freecell-solver-6.0.1.tar.xz 421700 BLAKE2B 1effa1c16c90ca09078728eb698b48c30c3489e2c05ef8163dfba825bc44422ec3897a89d4094bedef42e796d3ebfdfe5b65d2783965458d0c11218eb56cc197 SHA512 4e8a810a6385cb448432a54a0791ed948bacd0e4b8d02dfa1a5aed4544846384c6921ca6322496387daba825930d6f9d9fa01bdc1e3e31094fc9e6d3b0ae78e5
 EBUILD freecell-solver-5.24.0.ebuild 1161 BLAKE2B 73860259237a23fdde5991db845c36125a6a811c3c76ca27e5b5a65af0f2b207c06189f8eef3f365046641799e18d4192d0c80178f063ae19f661586a5120538 SHA512 1dd80ab38e2bba567ef1526a92bf6b924851b762317622ffa0d1a9c4d3c6e010272c39c745ccf447dd39ce231cf2e7e75a59e2c1410320b9f50e70688c2b8233
-EBUILD freecell-solver-6.0.1.ebuild 1172 BLAKE2B 6eeb4e978092b920da519c4d6089c7c769eff82a538332ffa69a69a7076a71afa9410fe2e6fe8b1bc454c87bbfe60b8b9e938b6e028ab96bd75d783fd8dfe173 SHA512 6911385afc8f0e6715e91babf9e211cb5d6bedeb48bac4cdd2c8c63c1ab60dbc4ece191960ee8b4da65dc6236472fabc3e8a0ecc4a629aad290dace09588cb4a
+EBUILD freecell-solver-6.0.1.ebuild 1179 BLAKE2B 8b4265c16779ba206c9b420a5baf94d2354f0c38c6825a5a44941ee6ec5d3f6dbbf0da5fc72b219890fc4566e44bfd1420716c8a2721171f2923634777f2c75c SHA512 b51ab1643e5629a8923110db56cde7a846e770733e202c8ef390a014c2438a0ff0cc26249aba5bfbfd0009cc5faa4981b3d3183d07bd6c5f9912b948324f3682
 MISC metadata.xml 330 BLAKE2B 2d2fad43c972b00253e7740bb472027d4edc54537d6d2564f2804b13c7b02b43a34598bf698255d0f42962b14e207da31cf69f021793d0ae16e198d0a1765e8a SHA512 8e5d4cfa7283a489ea757e3dede6b82334b2ceee2a28a98a8dd3b269a2f8bba02e2f0e6a169712e5ff890dcb7bec2feeedef496143bde90ad587771c87a12726
diff --git a/dev-games/freecell-solver/freecell-solver-6.0.1.ebuild b/dev-games/freecell-solver/freecell-solver-6.0.1.ebuild
index 94ebeef52d0e..9816507ca29f 100644
--- a/dev-games/freecell-solver/freecell-solver-6.0.1.ebuild
+++ b/dev-games/freecell-solver/freecell-solver-6.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="tcmalloc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index ef6c120b5f0a..79ce389557c1 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,5 +1,5 @@
 AUX irrlicht-1.8.4-remove-sys-sysctl.h.patch 1101 BLAKE2B 186373a614e3e15330559784eba9d56f19d915d3db7d29db1f919c10b17ef4c2242cfc0acfb6e5b3e56599a64e77171721ef4b4d5e1fe5ff1ddcc94ccf58e23a SHA512 a1a7bbc1c25ce8ddb4aefd323c420085d99463600cda2f633279cf16f97fb38094841b6b6d2f434710e16eb5b25374f51c420518567b1f855e4da37c02f85f08
 DIST irrlicht-1.8.4-patchset.tar.bz2 4813 BLAKE2B acad0f0dcc2ff5778608d0620063e7c70935838447f4bd1b241e08fb24f69531c29d96e95de394a3018e239fd7865bc3b50dc9ed5d54dd171b7b51df6c740b4d SHA512 5035cdf42fd26449d03e849ca248f6abcfcea1b0e9827683f00be2545ce90e3979e41c94fd487cfb1c67450e2e973f872d11d233c5a5b654700cec2ccb7f5602
 DIST irrlicht-1.8.4.zip 27927144 BLAKE2B 2c2d7e1306b169e537258152f88b11578d8a33c0ebe58e7ee48242048b70b9ba01069fcf272e44e18f7afbd1e6ec89d6bd86289d203929388e6b96871c048a98 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1
-EBUILD irrlicht-1.8.4-r1.ebuild 1880 BLAKE2B b1fd187e1deb25f5005bb660d7380b09cfc3b818c5c2101f67cdddb1a494fc33e4274efa818af651af2624ef24eb538fa177d6fd07cdc6f3212967bf364fca36 SHA512 717b5436c722cbf35e25c89ece1ad33a3f983b8a779463a00dd43660c2db7e14959566fd7af4158dbab212306a8e967c2edd5a39b703cb784963677f339a5e31
+EBUILD irrlicht-1.8.4-r1.ebuild 2028 BLAKE2B 7eca1f574c362bf253ddeab288519ca6fa18e0251e7aa4ce8ab995a6fe7b96549d42c6c1e4f2051980ae2b12baeb91957543db4a1d799b0c643dd98edcf2a1ef SHA512 30a41eff2f6f79508f5d5ebc0f330975f948e6a1bf3946a4912e868624143c6884765dce2455a515a9668fead0b0c214f8550c5b436a5ed8d9dbdd4eb34d4f54
 MISC metadata.xml 964 BLAKE2B 53a776bc251d381e194ad54eb4f0a24e3d1b0729281d69e1f48d1b744a1de1f33b7e5b400123d4cd04aa74a3e5db0a00682a67f389744fd33c4307437d0e5a30 SHA512 858c0cf4a2ac22ca6728a1449e59fd7a8c098a01587cd039e725b26ee71feb13217036f24bb5de2cbde6f27855eeb0347b43887a56f64a6f7a98f47b0f481503
diff --git a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
index 8a74c20ddcfb..93fb56f1380e 100644
--- a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
@@ -51,6 +51,12 @@ src_prepare() {
 		$(grep -rl '\.\./\.\./media' examples) \
 		|| die 'sed failed'
 
+	# Fix line endings so ${P}-remove-sys-sysctl.h.patch applies
+	sed -i \
+		-e 's/\r$//' \
+		source/Irrlicht/COSOperator.cpp \
+		|| die 'sed failed'
+
 	default
 }
 
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 391ce0d6fd1c..22422abb3bfa 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,7 +1,8 @@
 AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107bd429564248fd72c6f4d70c1622b2933273e02f294d5fd3b2529fdbbdef65cdba41db7b441b7334b6180995896b52f8212 SHA512 2905fa5031641f2d3a8cec46c32c1cbf8adfb34b7c460c22eaecca66f5cc0b73c2bda4ed68dca3bda12a5f49385c2257bd5b4f3271b13eb979298eeaefb45789
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
+AUX openscenegraph-3.6.5-use_boost_asio.patch 9659 BLAKE2B b4ee11d6a69367e47b8a0f4fb9af81fafdf59d5358caaa0f096e0fd1d3ef08c88c1b52a43b32db2c79fceb0aca888c2dca64d90409de5249d0eab8cf5e659792 SHA512 2cd9454b13428811aac5e9a9d167265479b9368deac0e1676ccc51292f74740b9f26ab82d0f4ba074dcb454c3958bfaa8cc1a783bd6abd6161b2d9cea849ec03
 DIST OpenSceneGraph-3.6.4.tar.gz 5771539 BLAKE2B 3f608566ed8bd927f30c18ab25147826a40655bfa0eca2b0765f775d1fca53c090b77c9963b392bb73b405150f64f1b3bdc57ac6ef59de7f88bf9fd208b2ff6e SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19
 DIST OpenSceneGraph-3.6.5.tar.gz 5780762 BLAKE2B 31ebeeae94eb6aff043788313946d5c08886f97d97cd5796e600918e137ef7f06839206b79b2f5649aac7f34037d4d79e18a5638152e150de931b7f7a7d3c38b SHA512 7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b
 EBUILD openscenegraph-3.6.4.ebuild 4084 BLAKE2B 1cdcd148184400626cace2503ca2d0606584c35f945dd510fd5a3588dc14f002b15bb3bbad765af147a3d520ff25cbf6b858f043e4b9741043110c798aef1e3a SHA512 662490b464497b06b3b210327244c71b820dc20502ff1b7f32d0effe788de74d325935860f84a4f32f04de62cf24e2f241cacbe0da6e92f306050bb3e975135b
-EBUILD openscenegraph-3.6.5.ebuild 3999 BLAKE2B 164e857edb269a18453ce00da9d7c80ff8f4cf4c3daf765a10eaae2ed4f46bfdb3841a4fbbb10170139417a664b5aa1fcff5270889f6283a7e8e494a845da9ac SHA512 af11df69e1e7c948ddca05c59653534f99c7644887ce0c4340b83b69873e5e81a0fa0701496b38df30a3e65d6ddde052525b2f52f02cb6bc75e1d070f8a10dc7
+EBUILD openscenegraph-3.6.5-r1.ebuild 4007 BLAKE2B 1078a301063691466d290619b28f665e9e85b4df967de6317e414029065a35feb7c98dbcfa29414f3d18ec2b15df436414f89ec9bb7daf3b93fd5e4dc89a7829 SHA512 66faa450a1d508312ddc03ffd3ca5c4eb038206c7c98945a2d09b2abc0095bf3aad01e56125b6f8ca25c31aad63bb93d31751dde06af8534990273af02271501
 MISC metadata.xml 1853 BLAKE2B 038f64d567fb10f67d1b004d704ed6cc43e95bd5396f10b486e98e95dfb61bb21c15081044c07faa95397f7f57220e7575113507f5a3d0eff256a06b6b791b18 SHA512 1fb1aa5e600d15060f84e68748b8c86266788f859f847a6789896aad1129b88e546f631fc38532d5c4f95d1eeec6195a8eb7137c45701cb4b84e0e72ce234f99
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch b/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch
new file mode 100644
index 000000000000..4dfeedcaf191
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.6.5-use_boost_asio.patch
@@ -0,0 +1,274 @@
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeLists.txt osg-my/CMakeLists.txt
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeLists.txt	2020-01-31 12:03:07.000000000 +0100
++++ osg-my/CMakeLists.txt	2020-09-26 18:45:41.191099844 +0200
+@@ -764,7 +764,7 @@
+     FIND_PACKAGE(DirectInput)
+     FIND_PACKAGE(NVTT)
+     IF (NOT WIN32)
+-        FIND_PACKAGE(Asio)
++        FIND_PACKAGE(Boost)
+     ENDIF()
+     FIND_PACKAGE(ZeroConf)
+ 
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindAsio.cmake osg-my/CMakeModules/FindAsio.cmake
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/CMakeModules/FindAsio.cmake	2020-01-31 12:03:07.000000000 +0100
++++ osg-my/CMakeModules/FindAsio.cmake	1970-01-01 01:00:00.000000000 +0100
+@@ -1,22 +0,0 @@
+-# Locate ASIO-headers (http://think-async.com/Asio)
+-# This module defines
+-# ASIO_FOUND, if false, do not try to link to gdal
+-# ASIO_INCLUDE_DIR, where to find the headers
+-#
+-# Created by Stephan Maximilian Huber
+-
+-FIND_PATH(ASIO_INCLUDE_DIR
+-  NAMES
+-    asio.hpp
+-  PATHS
+-    /usr/include
+-    /usr/local/include
+-)
+-
+-SET(ASIO_FOUND "NO")
+-IF(ASIO_INCLUDE_DIR)
+-    FIND_PACKAGE( Boost 1.37 )
+-    IF(Boost_FOUND)
+-        SET(ASIO_FOUND "YES")
+-    ENDIF()
+-ENDIF()
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/CMakeLists.txt osg-my/src/osgPlugins/CMakeLists.txt
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/CMakeLists.txt	2020-01-31 12:03:07.000000000 +0100
++++ osg-my/src/osgPlugins/CMakeLists.txt	2020-09-26 20:04:59.345449848 +0200
+@@ -299,13 +299,13 @@
+ #
+ # Device integration plugins
+ #
+-IF   (SDL_FOUND)
++IF(SDL_FOUND)
+     ADD_PLUGIN_DIRECTORY(sdl)
+-ENDIF(SDL_FOUND)
++ENDIF()
+ 
+-IF(ASIO_FOUND)
++IF(Boost_FOUND)
+     ADD_PLUGIN_DIRECTORY(RestHttpDevice)
+-ENDIF(ASIO_FOUND)
++ENDIF()
+ 
+ 
+ IF(ZEROCONF_FOUND)
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/CMakeLists.txt osg-my/src/osgPlugins/RestHttpDevice/CMakeLists.txt
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/CMakeLists.txt	2020-01-31 12:03:07.000000000 +0100
++++ osg-my/src/osgPlugins/RestHttpDevice/CMakeLists.txt	2020-09-26 18:46:57.096859301 +0200
+@@ -1,6 +1,5 @@
+ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+-INCLUDE_DIRECTORIES(${ASIO_INCLUDE_DIR})
+-    
++
+ SET(TARGET_SRC
+     connection.cpp
+     io_service_pool.cpp
+@@ -26,7 +25,7 @@
+     RestHttpDevice.hpp
+ )
+ 
+-SET(TARGET_ADDED_LIBRARIES osgPresentation )
++SET(TARGET_ADDED_LIBRARIES osgPresentation)
+ 
+ #### end var setup  ###
+ SETUP_PLUGIN(resthttp)
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.cpp osg-my/src/osgPlugins/RestHttpDevice/connection.cpp
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.cpp	2020-01-31 12:03:07.000000000 +0100
++++ osg-my/src/osgPlugins/RestHttpDevice/connection.cpp	2020-09-26 18:32:19.690576603 +0200
+@@ -37,14 +37,14 @@
+ void connection::start()
+ {
+   OSG_DEBUG << "RestHttpDevice :: connection::start" << std::endl;
+-  
++
+   socket_.async_read_some(asio::buffer(buffer_),
+       boost::bind(&connection::handle_read, shared_from_this(),
+         asio::placeholders::error,
+         asio::placeholders::bytes_transferred));
+ }
+ 
+-void connection::handle_read(const asio::error_code& e,
++void connection::handle_read(const boost::system::error_code& e,
+     std::size_t bytes_transferred)
+ {
+   if (!e)
+@@ -82,12 +82,12 @@
+   // handler returns. The connection class's destructor closes the socket.
+ }
+ 
+-void connection::handle_write(const asio::error_code& e)
++void connection::handle_write(const boost::system::error_code& e)
+ {
+   if (!e)
+   {
+     // Initiate graceful connection closure.
+-    asio::error_code ignored_ec;
++    boost::system::error_code ignored_ec;
+     socket_.shutdown(asio::ip::tcp::socket::shutdown_both, ignored_ec);
+   }
+ 
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.hpp osg-my/src/osgPlugins/RestHttpDevice/connection.hpp
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/connection.hpp	2020-01-31 12:03:07.000000000 +0100
++++ osg-my/src/osgPlugins/RestHttpDevice/connection.hpp	2020-09-26 19:56:49.410701890 +0200
+@@ -11,7 +11,7 @@
+ #ifndef HTTP_SERVER_CONNECTION_HPP
+ #define HTTP_SERVER_CONNECTION_HPP
+ 
+-#include <asio.hpp>
++#include <boost/asio.hpp>
+ #include <boost/array.hpp>
+ #include <boost/noncopyable.hpp>
+ #include <boost/shared_ptr.hpp>
+@@ -21,6 +21,8 @@
+ #include "request_handler.hpp"
+ #include "request_parser.hpp"
+ 
++using namespace boost;
++
+ namespace http {
+ namespace server {
+ 
+@@ -42,11 +44,11 @@
+   ~connection();
+ private:
+   /// Handle completion of a read operation.
+-  void handle_read(const asio::error_code& e,
++  void handle_read(const boost::system::error_code& e,
+       std::size_t bytes_transferred);
+ 
+   /// Handle completion of a write operation.
+-  void handle_write(const asio::error_code& e);
++  void handle_write(const boost::system::error_code& e);
+ 
+   /// Socket for the connection.
+   asio::ip::tcp::socket socket_;
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.cpp osg-my/src/osgPlugins/RestHttpDevice/io_service_pool.cpp
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.cpp	2020-01-31 12:03:07.000000000 +0100
++++ osg-my/src/osgPlugins/RestHttpDevice/io_service_pool.cpp	2020-09-26 19:56:12.353279737 +0200
+@@ -11,7 +11,7 @@
+ #include "server.hpp"
+ #include <stdexcept>
+ #include <boost/bind.hpp>
+-#include <boost/shared_ptr.hpp>
++#include <boost/thread.hpp>
+ 
+ namespace http {
+ namespace server {
+@@ -36,17 +36,14 @@
+ void io_service_pool::run()
+ {
+   // Create a pool of threads to run all of the io_services.
+-  std::vector<boost::shared_ptr<asio::thread> > threads;
++  std::vector<thread> threads;
+   for (std::size_t i = 0; i < io_services_.size(); ++i)
+-  {
+-    boost::shared_ptr<asio::thread> thread(new asio::thread(
+-          boost::bind(&asio::io_service::run, io_services_[i])));
+-    threads.push_back(thread);
+-  }
++    threads.emplace_back(thread(boost::bind(&asio::io_service::run,
++                                            io_services_[i])));
+ 
+   // Wait for all threads in the pool to exit.
+   for (std::size_t i = 0; i < threads.size(); ++i)
+-    threads[i]->join();
++    threads[i].join();
+ }
+ 
+ void io_service_pool::stop()
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.hpp osg-my/src/osgPlugins/RestHttpDevice/io_service_pool.hpp
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/io_service_pool.hpp	2020-01-31 12:03:07.000000000 +0100
++++ osg-my/src/osgPlugins/RestHttpDevice/io_service_pool.hpp	2020-09-26 18:37:02.119722575 +0200
+@@ -11,11 +11,13 @@
+ #ifndef HTTP_SERVER_IO_SERVICE_POOL_HPP
+ #define HTTP_SERVER_IO_SERVICE_POOL_HPP
+ 
+-#include <asio.hpp>
++#include <boost/asio.hpp>
+ #include <vector>
+ #include <boost/noncopyable.hpp>
+ #include <boost/shared_ptr.hpp>
+ 
++using namespace boost;
++
+ namespace http {
+ namespace server {
+ 
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/reply.hpp osg-my/src/osgPlugins/RestHttpDevice/reply.hpp
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/reply.hpp	2020-01-31 12:03:07.000000000 +0100
++++ osg-my/src/osgPlugins/RestHttpDevice/reply.hpp	2020-09-26 18:28:42.741206569 +0200
+@@ -13,9 +13,11 @@
+ 
+ #include <string>
+ #include <vector>
+-#include <asio.hpp>
++#include <boost/asio.hpp>
+ #include "header.hpp"
+ 
++using namespace boost;
++
+ namespace http {
+ namespace server {
+ 
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.cpp osg-my/src/osgPlugins/RestHttpDevice/server.cpp
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.cpp	2020-01-31 12:03:07.000000000 +0100
++++ osg-my/src/osgPlugins/RestHttpDevice/server.cpp	2020-09-26 19:53:17.692061347 +0200
+@@ -23,7 +23,7 @@
+     request_handler_(doc_root)
+ {
+   // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
+-  asio::ip::tcp::resolver resolver(acceptor_.get_io_service());
++  asio::ip::tcp::resolver resolver(io_service_pool_.get_io_service());
+   asio::ip::tcp::resolver::query query(address, port);
+   asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
+   acceptor_.open(endpoint.protocol());
+@@ -47,7 +47,7 @@
+   io_service_pool_.stop();
+ }
+ 
+-void server::handle_accept(const asio::error_code& e)
++void server::handle_accept(const boost::system::error_code& e)
+ {
+   if (!e)
+   {
+diff -ruN OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.hpp osg-my/src/osgPlugins/RestHttpDevice/server.hpp
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/RestHttpDevice/server.hpp	2020-01-31 12:03:07.000000000 +0100
++++ osg-my/src/osgPlugins/RestHttpDevice/server.hpp	2020-09-26 18:29:38.894046375 +0200
+@@ -11,7 +11,7 @@
+ #ifndef HTTP_SERVER_SERVER_HPP
+ #define HTTP_SERVER_SERVER_HPP
+ 
+-#include <asio.hpp>
++#include <boost/asio.hpp>
+ #include <string>
+ #include <vector>
+ #include <boost/noncopyable.hpp>
+@@ -20,6 +20,8 @@
+ #include "io_service_pool.hpp"
+ #include "request_handler.hpp"
+ 
++using namespace boost;
++
+ namespace http {
+ namespace server {
+ 
+@@ -38,12 +40,12 @@
+ 
+   /// Stop the server.
+   void stop();
+-  
++
+   void setCallback(request_handler::Callback* cb) { request_handler_.setCallback(cb); }
+ 
+ private:
+   /// Handle completion of an asynchronous accept operation.
+-  void handle_accept(const asio::error_code& e);
++  void handle_accept(const boost::system::error_code& e);
+ 
+   /// The pool of io_service objects used to perform asynchronous operations.
+   io_service_pool io_service_pool_;
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r1.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r1.ebuild
new file mode 100644
index 000000000000..66084018cb7c
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="OpenSceneGraph"
+MY_P=${MY_PN}-${PV}
+WX_GTK_VER="3.0-gtk3"
+inherit cmake flag-o-matic wxwidgets
+
+DESCRIPTION="Open source high performance 3D graphics toolkit"
+HOMEPAGE="http://www.openscenegraph.org/"
+SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
+gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2
+svg tiff truetype vnc wxwidgets xrandr +zlib"
+
+REQUIRED_USE="sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )"
+
+# TODO: COLLADA, FBX, GTA, NVTT, OpenVRML, Performer
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	media-libs/mesa[egl?]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libXext
+	curl? ( net-misc/curl )
+	examples? (
+		fltk? ( x11-libs/fltk:1[opengl] )
+		fox? ( x11-libs/fox:1.6[opengl] )
+		glut? ( media-libs/freeglut )
+		sdl2? ( media-libs/libsdl2 )
+		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	gdal? ( sci-libs/gdal:= )
+	gif? ( media-libs/giflib:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jpeg? ( virtual/jpeg:0 )
+	las? ( >=sci-geosciences/liblas-1.8.0 )
+	lua? ( >=dev-lang/lua-5.1.5:* )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	openinventor? ( media-libs/coin )
+	pdf? ( app-text/poppler[cairo] )
+	png? ( media-libs/libpng:0= )
+	sdl? ( media-libs/libsdl )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vnc? ( net-libs/libvncserver )
+	xrandr? ( x11-libs/libXrandr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.37.0:*
+	x11-base/xorg-proto
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.3-cmake.patch
+	"${FILESDIR}"/${PN}-3.6.3-docdir.patch
+	"${FILESDIR}"/${PN}-3.6.5-use_boost_asio.patch
+)
+
+src_configure() {
+	if use examples && use wxwidgets; then
+		need-wxwidgets unicode
+	fi
+
+	# Needed by FFmpeg
+	append-cppflags -D__STDC_CONSTANT_MACROS
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDYNAMIC_OPENSCENEGRAPH=ON
+		-DLIB_POSTFIX=${libdir/lib}
+		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
+		$(cmake_use_find_package curl CURL)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		$(cmake_use_find_package dicom DCMTK)
+		$(cmake_use_find_package egl EGL)
+		-DBUILD_OSG_EXAMPLES=$(usex examples)
+		$(cmake_use_find_package ffmpeg FFmpeg)
+		$(cmake_use_find_package gdal GDAL)
+		$(cmake_use_find_package gif GIFLIB)
+		$(cmake_use_find_package gstreamer GLIB)
+		$(cmake_use_find_package gstreamer GStreamer)
+		-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
+		$(cmake_use_find_package jpeg JPEG)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		$(cmake_use_find_package las LIBLAS)
+		$(cmake_use_find_package lua Lua51)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Lua52=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package openinventor Inventor)
+		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
+		$(cmake_use_find_package pdf Poppler-glib)
+		$(cmake_use_find_package png PNG)
+		$(cmake_use_find_package sdl SDL)
+		$(cmake_use_find_package sdl2 SDL2)
+		$(cmake_use_find_package svg RSVG)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package truetype Freetype)
+		$(cmake_use_find_package vnc LibVNCServer)
+		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
+		$(cmake_use_find_package zlib ZLIB)
+	)
+	if use examples; then
+		mycmakeargs+=(
+			$(cmake_use_find_package fltk FLTK)
+			$(cmake_use_find_package fox FOX)
+			$(cmake_use_find_package glut GLUT)
+			$(cmake_use_find_package wxwidgets wxWidgets)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
+}
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5.ebuild
deleted file mode 100644
index 6a1d992b139e..000000000000
--- a/dev-games/openscenegraph/openscenegraph-3.6.5.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="OpenSceneGraph"
-MY_P=${MY_PN}-${PV}
-WX_GTK_VER="3.0-gtk3"
-inherit cmake flag-o-matic wxwidgets
-
-DESCRIPTION="Open source high performance 3D graphics toolkit"
-HOMEPAGE="http://www.openscenegraph.org/"
-SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="wxWinLL-3 LGPL-2.1"
-SLOT="0/161" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
-gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2
-svg tiff truetype vnc wxwidgets xrandr +zlib"
-
-REQUIRED_USE="sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )"
-
-# TODO: COLLADA, FBX, GTA, NVTT, OpenVRML, Performer
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	media-libs/mesa[egl?]
-	virtual/glu
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libXext
-	asio? ( dev-cpp/asio )
-	curl? ( net-misc/curl )
-	examples? (
-		fltk? ( x11-libs/fltk:1[opengl] )
-		fox? ( x11-libs/fox:1.6[opengl] )
-		glut? ( media-libs/freeglut )
-		sdl2? ( media-libs/libsdl2 )
-		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	gdal? ( sci-libs/gdal:= )
-	gif? ( media-libs/giflib:= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jpeg? ( virtual/jpeg:0 )
-	las? ( >=sci-geosciences/liblas-1.8.0 )
-	lua? ( >=dev-lang/lua-5.1.5:* )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-	openinventor? ( media-libs/coin )
-	pdf? ( app-text/poppler[cairo] )
-	png? ( media-libs/libpng:0= )
-	sdl? ( media-libs/libsdl )
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	vnc? ( net-libs/libvncserver )
-	xrandr? ( x11-libs/libXrandr )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.3-cmake.patch
-	"${FILESDIR}"/${PN}-3.6.3-docdir.patch
-)
-
-src_configure() {
-	if use examples && use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-
-	# Needed by FFmpeg
-	append-cppflags -D__STDC_CONSTANT_MACROS
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDYNAMIC_OPENSCENEGRAPH=ON
-		-DLIB_POSTFIX=${libdir/lib}
-		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
-		$(cmake_use_find_package asio Asio)
-		$(cmake_use_find_package curl CURL)
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		$(cmake_use_find_package dicom DCMTK)
-		$(cmake_use_find_package egl EGL)
-		-DBUILD_OSG_EXAMPLES=$(usex examples)
-		$(cmake_use_find_package ffmpeg FFmpeg)
-		$(cmake_use_find_package gdal GDAL)
-		$(cmake_use_find_package gif GIFLIB)
-		$(cmake_use_find_package gstreamer GLIB)
-		$(cmake_use_find_package gstreamer GStreamer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON
-		$(cmake_use_find_package jpeg JPEG)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		$(cmake_use_find_package las LIBLAS)
-		$(cmake_use_find_package lua Lua51)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Lua52=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package openinventor Inventor)
-		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
-		$(cmake_use_find_package pdf Poppler-glib)
-		$(cmake_use_find_package png PNG)
-		$(cmake_use_find_package sdl SDL)
-		$(cmake_use_find_package sdl2 SDL2)
-		$(cmake_use_find_package svg RSVG)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package truetype Freetype)
-		$(cmake_use_find_package vnc LibVNCServer)
-		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
-		$(cmake_use_find_package zlib ZLIB)
-	)
-	if use examples; then
-		mycmakeargs+=(
-			$(cmake_use_find_package fltk FLTK)
-			$(cmake_use_find_package fox FOX)
-			$(cmake_use_find_package glut GLUT)
-			$(cmake_use_find_package wxwidgets wxWidgets)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc_openscenegraph doc_openthreads
-}
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index db0d2c2d9ac6..7a7583a649c3 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,5 +1,6 @@
 AUX simgear-2019.1.1-gdal3.patch 388 BLAKE2B 364d5f6692809c67d73a3191f387cbd9735e7183a25696e612827c1a796c872ee5d4a09085fa8a24a0fd524725fdeca9303c5c5ee71981de054ab5a8833d5285 SHA512 44d59cf379c8c7d82b87a31a4d29dd02aaa865c37f12c7e565c641bf3fb14497f4d63b69bbc973551b53d74919ddce5495e3f29b598ed87a6a4565e22ec81667
+AUX simgear-2020.1.2-boost.patch 299 BLAKE2B e62fa6dd8cd88306e5cc1b043f5bc174fd64b228517d7dc48c32f5174de807af073ef0b41aa00aa3567d91dd0a2571bfbc036dda4da2135e208b076185d42448 SHA512 bdbf7e15927d62a1e78486ca6ecdd7a9f7306f5d4e0fe2fad7de18556758b3c92d8cf794c309e4a66f8b3b96941de5b0ff1a3266e136518c2da6f1198c2eada8
 DIST simgear-2020.1.2.tar.bz2 1393059 BLAKE2B 62fa15d88368177e23cf52edf51e8c56252399d8f2661e518911c1093a0d7f9f11069da8d65b479f2d4b45792dcd011194e57fa99ac3991f749e8196aaff9552 SHA512 c2e835de471f374a6c33cfd1769b7079d178ee66075bfe87cc9eb1f06dc2648db93c31f62f0ac7a664703406817cb1e909a531812cb76c99cd8751eb7e6782e7
-EBUILD simgear-2020.1.2.ebuild 1539 BLAKE2B 3a0a2292ad3857dee255793748fa4479f3cad2d048a101bc5102cebeacccdb13228b8c57c569c08d723f0d8b479af626a0b7bf1ed35f65f8f65e5f49a6632cce SHA512 4f3ffba5632b910fe429d41a432443269a20a2ca50fcfca3bafedfe6c5f4d039323e6b07cf07e7d7bf38d7502f46c333f6f2cc7cb8252b02be42d7a64e7815ec
+EBUILD simgear-2020.1.2.ebuild 1571 BLAKE2B 18c0d444f7839f2bb259d5591ae9679368480a68809b9bb25ac9a620eab412cc94d88ec5c55d49a1c7b5124aee4ddc3061a52decb9628b6bd21e78730a740fbc SHA512 648be7da517c9e298951848a680afa45b8be574480d58cadbf4b08b3e030177a7752370b80a403021f97c079727ac44e4f7496cf05649cd64952e3b9a8dc235b
 EBUILD simgear-9999.ebuild 1601 BLAKE2B 2abe5a461a36bc073eb134133a2b648fd1b699441e99730bad0f01497c4005d492f7363dcb1e59f4325e6b2a709f53f6365a9b227b9bd9f5b2dce916d4c608bd SHA512 37a6cc57913c1a5d4d313748bafe6f93eb55c1c35c6c5389f2f65dba67d13504cebcac050e5d867e0021689f8d77c30b4986a8e3f1525c6becd32cd823119c44
 MISC metadata.xml 911 BLAKE2B 978dd6e83dce780a6b6250e86def3f5f3052d7c09cda9d4974ec9f63d151cb0040c9434cde00007a8821b28854d2c49c5a040e29f176d1ebb91600e97ba09f17 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8
diff --git a/dev-games/simgear/files/simgear-2020.1.2-boost.patch b/dev-games/simgear/files/simgear-2020.1.2-boost.patch
new file mode 100644
index 000000000000..d28853cb3811
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2020.1.2-boost.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -227,7 +227,7 @@
+ endif()
+
+ find_package(Boost REQUIRED)
+-set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
++set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG")
+ include(BoostTestTargets)
+
+ if(SIMGEAR_HEADLESS)
diff --git a/dev-games/simgear/simgear-2020.1.2.ebuild b/dev-games/simgear/simgear-2020.1.2.ebuild
index 0b85c837275b..2408384dadbc 100644
--- a/dev-games/simgear/simgear-2020.1.2.ebuild
+++ b/dev-games/simgear/simgear-2020.1.2.ebuild
@@ -35,6 +35,7 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
+	"${FILESDIR}/${P}-boost.patch"
 )
 
 pkg_pretend() {
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 97bf7071b72c..cc9897777112 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/alsa-core/Manifest b/dev-haskell/alsa-core/Manifest
index 1a33ff864469..6205d5b06166 100644
--- a/dev-haskell/alsa-core/Manifest
+++ b/dev-haskell/alsa-core/Manifest
@@ -1,3 +1,3 @@
 DIST alsa-core-0.5.0.1.tar.gz 2668 BLAKE2B 869b90b509fac4017378cf1e2f98e374e2bb50673d2d2f48afdd66ab6cefec9c589efebee10915d7b33a784d1ce9a03f8136c3b86df4ede3a00f129b255091d2 SHA512 e02c8353911bf2c0c703400701ae72be6f510f771ff56dfc09322cbcf3a006f4cd0903f71f7ed2268886b3468113d5ce76933eedf5fad47aa71cb052d07fc4b4
-EBUILD alsa-core-0.5.0.1-r2.ebuild 679 BLAKE2B 75b00a212f2469e469b37ed5554cb0c135b02762e4a488d5c8b8ef7f667abfe0364276c93b35236b6ee75a88db3d69e024483f0f0f1621d75db8b2bb1b0c9cf9 SHA512 6702b0be2871b2566418a7d7bf4d8e1191dc09137899cf4a90f69229b4bf068945589fea1bf4ccf851b38c34d6aa6e264efc2bcf047b01736a52d14487a76cd6
+EBUILD alsa-core-0.5.0.1-r2.ebuild 794 BLAKE2B 0e3ee4083c1b4cb643d3b25f80df743735d800490a38bd1b4e0693699872d6965e485bf383a64fbc0dbc65d213d474dc4f22b90b7bb9aa3d1853877402a1d6d7 SHA512 fd92064b2317cb56420acd876c6e17a6b1cc92570938d446b7805e27d072eec8f80bc74de34e8fc4ac021672a713551a63e169239e5ec921275cad619074d936
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild b/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
index 98195b831952..c94cd28992d4 100644
--- a/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
+++ b/dev-haskell/alsa-core/alsa-core-0.5.0.1-r2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.3.1.9999
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: +pkgconfig
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
@@ -17,9 +18,16 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?]
-		<dev-haskell/extensible-exceptions-0.2:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		media-libs/alsa-lib"
+RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	media-libs/alsa-lib
+"
 DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
+	>=dev-haskell/cabal-1.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=pkgconfig
+}
diff --git a/dev-haskell/ascii-progress/Manifest b/dev-haskell/ascii-progress/Manifest
index 921775afdf49..a2783ffb86b5 100644
--- a/dev-haskell/ascii-progress/Manifest
+++ b/dev-haskell/ascii-progress/Manifest
@@ -1,3 +1,3 @@
-DIST ascii-progress-0.2.1.2.tar.gz 6385 BLAKE2B 881137613669a9e043c801769dd290d4c96c5aabeb7a50951bcb984f612be3722aa866bd48f61751538a076e97cb347b555c19932af2c25ce9233607efab01a9 SHA512 cc1a9f1d48d522fe3a8d9afe7a200c2bd4f9e573f99ccae0993af75ab15ede8bfe7630776385e680af3540661613c60cf7aa81a08b9b83b5d8f72aaf8f869b52
-EBUILD ascii-progress-0.2.1.2.ebuild 1077 BLAKE2B 32022806575b3910ce138596f69b5f76cc5aa2fefab19ddb9f9a05b1f6aa2effbc73c1cf1ca55358cc0600ea6583be81a4e87eb9c4557645273533fa4c5e7b05 SHA512 614a436e6e9527c6146c535467869160721b05c3844bcbb8b65913ea9554929e6f8c5c003b63cff154dd4cb25f709d50e5c5c5c29111fd205cd04c4dca2a26ab
+DIST ascii-progress-0.3.3.0.tar.gz 6585 BLAKE2B 660f9721eda21a77e8fe9e39e16b51ab9176dd211b9c44ef0bf249414a4ffd6035203734e07dcce51bd2c0d74a6ab1e760cd3f48b25b454f4136f65eb379dcfa SHA512 766ff51ae441a7e7016d4016dbef6e6b1fea9e9f9b66f7bc622f8d977123a046aa03bf87fddb90b4439f8ec2939dd9a00f345c732a780027e294b42489dd61c3
+EBUILD ascii-progress-0.3.3.0.ebuild 1137 BLAKE2B 57fad4a619957a3c1ef1bb2594aa551fd1d675631d471cae2c08f0e4287850de36a8af79a042b4af7c4ab7fa48ed6006a012ae22c3bb23698dc442a9fd7cacb1 SHA512 49e701052d9a24256f14f248be742ed64ae0ef0a355eb3c6d8bdc1fae7dcf8e329785e99af56fec045224b95ff2a11bff379cb9b1c63b38279b9a3a0a171b0ab
 MISC metadata.xml 615 BLAKE2B 993060b61fda7fe9f518fbb85441aec367eb8515a029cefdb6035af8a47e1ab39613861ee4bb71f790b2b0a646e6b7e4966db1e6328cf5afa7cf611e124c5f9c SHA512 dfd2b21fcf84b945b7967584bf6639186f2e8780f11cb61c6ff055c2fee6dda644e4758e762971d54b69644b4c3be7c316bacdd28f1e3fd6411d82ac9fd1f338
diff --git a/dev-haskell/ascii-progress/ascii-progress-0.2.1.2.ebuild b/dev-haskell/ascii-progress/ascii-progress-0.2.1.2.ebuild
deleted file mode 100644
index bfaf52102657..000000000000
--- a/dev-haskell/ascii-progress/ascii-progress-0.2.1.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A simple progress bar for the console"
-HOMEPAGE="https://github.com/yamadapc/haskell-ascii-progress"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="dev-haskell/ansi-terminal:=[profile?]
-	>=dev-haskell/async-2.0.1.5:=[profile?]
-	>=dev-haskell/conduit-1.2:=[profile?]
-	>=dev-haskell/data-default-0.5.3:=[profile?]
-	dev-haskell/http:=[profile?]
-	>=dev-haskell/http-conduit-2.1:=[profile?]
-	>=dev-haskell/http-types-0.8:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-3
-		>=dev-haskell/quickcheck-2.6 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples)
-}
diff --git a/dev-haskell/ascii-progress/ascii-progress-0.3.3.0.ebuild b/dev-haskell/ascii-progress/ascii-progress-0.3.3.0.ebuild
new file mode 100644
index 000000000000..e5cc5e951f48
--- /dev/null
+++ b/dev-haskell/ascii-progress/ascii-progress-0.3.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A simple progress bar for the console"
+HOMEPAGE="https://github.com/yamadapc/haskell-ascii-progress"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-haskell/async-2.0.1.5:=[profile?]
+	>=dev-haskell/concurrent-output-1.7:=[profile?]
+	>=dev-haskell/data-default-0.5.3:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+	examples? ( >=dev-haskell/conduit-1.2:=[profile?]
+			dev-haskell/http:=[profile?]
+			>=dev-haskell/http-conduit-2.1:=[profile?]
+			>=dev-haskell/http-types-0.8:=[profile?]
+			dev-haskell/random:=[profile?]
+			>=dev-haskell/transformers-0.3:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-3
+		>=dev-haskell/quickcheck-2.6 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag examples examples)
+}
diff --git a/dev-haskell/asn1-parse/Manifest b/dev-haskell/asn1-parse/Manifest
index 54e5ccdffb4d..7724fb1d28d4 100644
--- a/dev-haskell/asn1-parse/Manifest
+++ b/dev-haskell/asn1-parse/Manifest
@@ -1,3 +1,3 @@
-DIST asn1-parse-0.9.4.tar.gz 2860 BLAKE2B 9e9d1ae63a125215143ec31f10149fb3cd4e821c83b91e99031de8fabe73cd0c91ebba6c2ca77ec78a2093e5d1760483f4174e409d957f5f86045b91444b85c4 SHA512 10579753addf0580d33f2d7d8571bedb3b4ff3d485891dd7db8b75ae09550cbd42ee9d00a452263810079eeb77ec630687b193a6d4b538bfdb683b92c9e64637
-EBUILD asn1-parse-0.9.4.ebuild 670 BLAKE2B bc4aea0b08fc96857a548be95c48618112eb71c1a23df63dfd1f0ab5ea237542710fe55de381a267f9e5a4689a6fe9073adaf2b858b42367abfc3daccb68a5eb SHA512 7764071086a5f94e6ca8b4f38b0991c7c105ab68791549b2c3e832f5152e57b6cf1500a5451d15ac9eb3fa698fdb63a11f972eb4f8aa064e49360376e3b64d8d
+DIST asn1-parse-0.9.5.tar.gz 2951 BLAKE2B 000ef16e2ecca8e8b045dcb9c5b21955ca75b957380f47c6707b7083a22980bf45ed89007fdc1fe9f46f167513aefcfb713457ce0cb192522d14414bc8e76356 SHA512 d352422479a4bb31a6c7ea02fc3da701d1417bb37a9f029636f6e2646530e4bd8a8de65e192b2beaa5b0b115487c45f42252acf05f58e5f513dea4c81be59a7f
+EBUILD asn1-parse-0.9.5.ebuild 670 BLAKE2B 6ac7744cfe54d38a32280878483aa91d72a4a50c937d1cdd14ea6932595d67281aea7f3c974deb3bdbd9d7167227ce025913ffe6cd39358ff72cc86eb169def6 SHA512 580abb463d2dbdd83bc872f0ab022a1f72c16651854978b19f5c73ff1fea4385de53f6f2346b842b50e8136f629b0d843b8208f174c2f64fa388888255d23b73
 MISC metadata.xml 331 BLAKE2B 07ab1932c25a88eea1d8091d7423c6cd2823142a9a20380bc0a46b9024f29ed3b7ba95d06f2f670f325525e98a5c1089504bfb0cb6b9b1adbbe67fb270dc2dc8 SHA512 d6220a197105844f43502d4c29587da1ae473fd8bc74ff87de9d1c716a49659afd917c6a78e3c3611a3868dde9b12fc453fc3d2311e9f157b4e74aa752bfc5e7
diff --git a/dev-haskell/asn1-parse/asn1-parse-0.9.4.ebuild b/dev-haskell/asn1-parse/asn1-parse-0.9.4.ebuild
deleted file mode 100644
index 24224124c10a..000000000000
--- a/dev-haskell/asn1-parse/asn1-parse-0.9.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Simple monadic parser for ASN1 stream types"
-HOMEPAGE="https://github.com/vincenthz/hs-asn1"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?]
-	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild b/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild
new file mode 100644
index 000000000000..82d27ddeea93
--- /dev/null
+++ b/dev-haskell/asn1-parse/asn1-parse-0.9.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Simple monadic parser for ASN1 stream types"
+HOMEPAGE="https://github.com/vincenthz/hs-asn1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/asn1-encoding-0.9:=[profile?]
+	>=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
diff --git a/dev-haskell/attoparsec-conduit/Manifest b/dev-haskell/attoparsec-conduit/Manifest
index f908388f48a2..bdf201093004 100644
--- a/dev-haskell/attoparsec-conduit/Manifest
+++ b/dev-haskell/attoparsec-conduit/Manifest
@@ -1,3 +1,3 @@
 DIST attoparsec-conduit-1.1.0.tar.gz 1210 BLAKE2B b2a02358ff9516971d1abcca57c3c6e2eb9b83f83af3bbd9ed3b89af4977329fbf7dc9b776cef7383715d7911cfde0df41601aff07d50160c1bb3b463f3eedb6 SHA512 7a883b25cc1bfed03a35593927d51dba920fca8d29e610adb7a409807867241847583f68550cc1344a2e333639a703db860ac6c8f6e19f36595a9001e9334472
-EBUILD attoparsec-conduit-1.1.0.ebuild 567 BLAKE2B 70c32c7841dbfeaf24534ede7abfe73b091fd4e2188359c85c6f7be8598bb217bd704ce6e0d5b339cb8b4106f7ec005f6d5f1e754fa558102af8c834be2a2d36 SHA512 ae398c44f25423951efe21db6a19305db5a817b1915c56854a1acaaec58845cdaa1144b27bac6e1e5cdbfe2f6698e943b922c657c718dc1f88d8491ffd8b7173
-MISC metadata.xml 330 BLAKE2B d56163baf6c38494b371fd7f1fcd301119899051db4735a607f802ec25550dcdac277005a9785b323311bd0e4282630ea8de2abff756b5fc1067ef4d07d6de51 SHA512 48095eabcee345441e214e87e05b66a2323a48ccf2f596601105375f3f36d30dfe5c193e717858ff4f4719e49bdb9e5c3bf85c52cd87cb039e35c2208db3417e
+EBUILD attoparsec-conduit-1.1.0.ebuild 590 BLAKE2B eb50fa2bbed2b7f323560d5b821b225ed95814c3fb8e73671779c3077442323d5b7622b8f3b1e673628105481889896f087963e7025c10ab18392d47a12646cc SHA512 e60330bdf628f0b3cbc4c068f5eaf739d0deeca62214110ac91d03ee41990c16a533a77da51e2374499fdd75315ab40db93ad66593030f5e6a2bdb27855cde86
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild b/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild
index 00a88875ab4c..922d4df188ad 100644
--- a/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild
+++ b/dev-haskell/attoparsec-conduit/attoparsec-conduit-1.1.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.3.6.9999
+# ebuild generated by hackport 0.6.6.9999
 
-CABAL_FEATURES="lib profile"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Consume attoparsec parsers via conduit. (deprecated)"
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
+	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
diff --git a/dev-haskell/attoparsec-conduit/metadata.xml b/dev-haskell/attoparsec-conduit/metadata.xml
index b22e8f68da82..b7878815d80d 100644
--- a/dev-haskell/attoparsec-conduit/metadata.xml
+++ b/dev-haskell/attoparsec-conduit/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">snoyberg/conduit</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/attoparsec-enumerator/Manifest b/dev-haskell/attoparsec-enumerator/Manifest
index 51d5d7294ad2..3f8ccc15d3e2 100644
--- a/dev-haskell/attoparsec-enumerator/Manifest
+++ b/dev-haskell/attoparsec-enumerator/Manifest
@@ -1,3 +1,3 @@
 DIST attoparsec-enumerator-0.3.4.tar.gz 2485 BLAKE2B e5d290228bec79723b4693e1c6e56e318483e2c60fd226022fc968903cbfd25ca6b8f09a2a4376c1671b3bd2dbf72e35f1a9f39e1d0ac8187e3e9b71f0c37744 SHA512 caf6bc858c9c0f41f3ec332cf4149bdc9233cad112579eb79a20dff1893994cee365c2863a47a72fef8d30aaab1d30b506b98c3a8b8429c461811f717c8fd31d
-EBUILD attoparsec-enumerator-0.3.4.ebuild 770 BLAKE2B 488f51c41d352c9bb192ea7094055fab9f05ba1e25cbb09690964f7682fd5bdf70286bd721c092f2d7cd0d9dd18a1c9f1bd8b6817cb4f716b5a08ac4ebde5ae1 SHA512 dfd153c87fc62fb73353bba649a9bdaef61749e7697b4c390fb4f8c80e22364f6b0ef642b4e2abdf7816f0b801d3808dbf4e168caaa452348f70f970332efe78
-MISC metadata.xml 1034 BLAKE2B a2196ee3dccd3617b51604662ab3ecee40c9b882337f0ce1c839ee26633354705ac1121b48d59b76986cd9f3fcf3f82a715f22ff1125d2af253bd37260122808 SHA512 4d2750da94e3b02f493fa2b8ea288c429b5795367ff77b8010e0cdcaafd7974a5425e8041301038cc8fb142b791a5fcfd95e717adeff2f343b84334b2d4c8a22
+EBUILD attoparsec-enumerator-0.3.4.ebuild 770 BLAKE2B e3152192e8a73f314aa95994b577c820afcbe03b27b197643c39b844bdde809fc99973f20ce8519c8ebde0f178e25338b97961825e4ab2d640600fbb567e5f23 SHA512 4f02a8b64eed93b55f74b113d51c0e2868e44446f08a9531a1d93a6ea962961b070acf7074e18014df623b787705c5f4cd62a72cb1c3f232defb94c52b5c3c63
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild b/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
index 27b6b385987c..566c5d2c8ee6 100644
--- a/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
+++ b/dev-haskell/attoparsec-enumerator/attoparsec-enumerator-0.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
diff --git a/dev-haskell/attoparsec-enumerator/metadata.xml b/dev-haskell/attoparsec-enumerator/metadata.xml
index 4f48a5c05d4f..b7878815d80d 100644
--- a/dev-haskell/attoparsec-enumerator/metadata.xml
+++ b/dev-haskell/attoparsec-enumerator/metadata.xml
@@ -5,28 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This library allows an Attoparsec parser to receive input incrementally
-		from an enumerator. This could be used for parsing large files, or
-		implementing binary network protocols.
-		
-		&gt; (-# LANGUAGE OverloadedStrings #-)
-		&gt;
-		&gt; import Control.Applicative
-		&gt; import Data.Attoparsec
-		&gt; import Data.Attoparsec.Enumerator
-		&gt; import Data.Enumerator
-		&gt; import Data.Enumerator.Binary (enumHandle)
-		&gt; import Data.Enumerator.List
-		&gt; import System.IO
-		&gt;
-		&gt; parser = string "foo" &lt;|&gt; string "bar"
-		&gt;
-		&gt; main = do
-		&gt;     xy &lt;- run_ (enumHandle 1 stdin $$ do
-		&gt;         x &lt;- iterParser parser
-		&gt;         y &lt;- iterParser parser
-		&gt;         return (x, y))
-		&gt;     print xy
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/bio/Manifest b/dev-haskell/bio/Manifest
deleted file mode 100644
index a0aa4767a756..000000000000
--- a/dev-haskell/bio/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX bio-0.5.3-ghc-7.10.patch 266 BLAKE2B 2db06eaf40ef90741aca5c329e096a82f259c5c068728338d798ba083ab7cd194f95cb54d0b2eee1257b15b8cce534a270adfd4b01b21ecab7245eb88b5b1bb5 SHA512 58efe74d17f2233f43c43d56eaabb849bc7753e27b3499544856036984504add5a50f4d6e1cf43af64a19695c1ef44cdd82514ce5126d50815b659e20bd93785
-DIST bio-0.5.3.tar.gz 103707 BLAKE2B 31c9e354ba33f20d6129a20d6272063498bfd4b4ea2cba9eddab8ede62ee894659eb5e6383ef022f5e003deab8bb3c92a98bcadae44db22e7b0346471cad5e4d SHA512 fbe09240a600abbcac952f52f05f28f9b305a1ae3def8b4144bd73bdb160acfbe5457086ef829057d5a73df1df5061668487b2ca5621df73628c8c4990b6b544
-EBUILD bio-0.5.3-r2.ebuild 1423 BLAKE2B 656c1291fb96b3aa6709a44394d1ba056ac7cd3fd6dcce27b9f11a486e6f646046e18dc7c804d11cb33202732b3eb753b84a8321d2a235048c29672fc4364e7f SHA512 0eac9b3802ccf73cddc16c59df089d49e3f042049229be1b7a3992410d44e118044008b240c1302b3e93183b63ee96fa1cfce096bd83c280ac819d45845162cf
-MISC metadata.xml 1145 BLAKE2B 1b90a811913c7c6247ca1e2237a8d0ea8e0bd56f7e3310a5e61df90d6dadc365ed4a5c58829a94efe61f88c57270e7c715989f5b0ff02ad75395703e2d7bd596 SHA512 c91ebcc3b83ab7d9bbcaee0cff08cf212b3d77b1d2a34c70308d7bb3ff47f898668c1cb13c2e761ce25653bf167bce55fa9dd848d52e6ffd8e93021e173e8e7f
diff --git a/dev-haskell/bio/bio-0.5.3-r2.ebuild b/dev-haskell/bio/bio-0.5.3-r2.ebuild
deleted file mode 100644
index 9d49efd38d86..000000000000
--- a/dev-haskell/bio/bio-0.5.3-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-DESCRIPTION="A bioinformatics library"
-HOMEPAGE="http://biohaskell.org/Libraries/Bio"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/binary-0.4:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		dev-haskell/old-time:=[profile?]
-		dev-haskell/parallel:=[profile?]
-		dev-haskell/parsec:=[profile?]
-		>=dev-haskell/quickcheck-2:2=[profile?]
-		dev-haskell/random:=[profile?]
-		>=dev-haskell/tagsoup-0.8:=[profile?]
-		>=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-
-	cabal_chdeps \
-		'binary >=0.4 && <0.5' 'binary >=0.4'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag examples examples) \
-		$(cabal_flag test test)
-}
-
-src_test() {
-	dist/build/qc/qc || die
-}
-
-src_install() {
-	haskell-cabal_src_install
-
-	use test && rm "${ED}"/usr/bin/qc
-	# many examples collide with dev-haskell/flower
-	if use examples ; then
-		pushd "${ED}"/usr/bin
-		local example
-		for example in *
-		do
-			mv "${example}" "${PN}-example-${example}"
-		done
-		popd
-	fi
-}
diff --git a/dev-haskell/bio/files/bio-0.5.3-ghc-7.10.patch b/dev-haskell/bio/files/bio-0.5.3-ghc-7.10.patch
deleted file mode 100644
index d570d22917a7..000000000000
--- a/dev-haskell/bio/files/bio-0.5.3-ghc-7.10.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/Bio/Alignment/Bowtie.hs b/Bio/Alignment/Bowtie.hs
-index 883b057..3e58f0e 100644
---- a/Bio/Alignment/Bowtie.hs
-+++ b/Bio/Alignment/Bowtie.hs
-@@ -1 +1,2 @@
-+{-# LANGUAGE FlexibleContexts #-}
- {-| This module provides a data type to represent an alignment
diff --git a/dev-haskell/bio/metadata.xml b/dev-haskell/bio/metadata.xml
deleted file mode 100644
index 8927e5f99073..000000000000
--- a/dev-haskell/bio/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This is a collection of data structures and algorithms
-		useful for building bioinformatics-related tools
-		and utilities.
-		
-		Current list of features includes: a Sequence data type supporting
-		protein and nucleotide sequences and conversion between them.  As of version
-		0.4, different kinds of sequence have different types.  Support for quality
-		data, reading and writing Fasta formatted files, reading TwoBit and
-		phd formats, and Roche/454 SFF files.  Rudimentary (i.e. unoptimized) support
-		for doing alignments - including dynamic adjustment of scores based on sequence quality.
-		Also Blast output parsing.  Partly implemented single linkage clustering, and
-		multiple alignment.  Reading Gene Ontology (GO) annotations (GOA) and
-		definitions\/hierarchy.
-		
-		The Darcs repository is at: &lt;http://malde.org/~ketil/biohaskell/biolib&gt;.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cipher-blowfish/Manifest b/dev-haskell/cipher-blowfish/Manifest
deleted file mode 100644
index efabc6661cf1..000000000000
--- a/dev-haskell/cipher-blowfish/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cipher-blowfish-0.0.3.tar.gz 12876 BLAKE2B 56eb4c925055b8ddac187ad36a7f1fb2f28ff337812eef81fadeb5cd519df6fdd8e41b0047d4e15eea5e567c0440ca5c5c9fb65887b3687d85f9a8fae68308fe SHA512 5fcccde71c1324b34e54c01c41d878150ab8db48728d1bfc21406eda58e4a363de8397f395eaa25a6fb26e4d8c95683abafe0c6bf42d7853db07d768ed245cc0
-EBUILD cipher-blowfish-0.0.3.ebuild 905 BLAKE2B a2c815e3302b880a904e07857f26c3833edfb9074738a481bf0ee4680f5398a0405a0e24ff6731c596020b1455e9aa2b8523bcdf02e048af709debb196837442 SHA512 97f783a262f876b0cbac8d338c869f0c29784cb0b4eeb12f84fe3f2d83e7006459129bb15a4f5a651676660010a89f03d67aca6ceabfc359be77dfe41c294387
-MISC metadata.xml 340 BLAKE2B fa7ffd27bb988c64b885de8879661929121e2833c146b373a23c2d649e58379dfcfd182fdc90d20116f4ab31251b379f0310a84040aa0bf6d7209ce9388a7873 SHA512 88ce6598988d5ac898de9b179e55518b3e68ffa9095a9ae194ea058340544c4d9f3ad9bd3f36d5ea8c50c3a52664140756ce19d91b06ec994fcf8d326ade85a4
diff --git a/dev-haskell/cipher-blowfish/cipher-blowfish-0.0.3.ebuild b/dev-haskell/cipher-blowfish/cipher-blowfish-0.0.3.ebuild
deleted file mode 100644
index fabcfa72dc54..000000000000
--- a/dev-haskell/cipher-blowfish/cipher-blowfish-0.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Blowfish cipher"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/byteable:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-haskell/securemem-0.1.2:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/crypto-cipher-tests
-		>=dev-haskell/quickcheck-2
-		>=dev-haskell/test-framework-0.3.3
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
-"
diff --git a/dev-haskell/cipher-blowfish/metadata.xml b/dev-haskell/cipher-blowfish/metadata.xml
deleted file mode 100644
index 234d150ab62e..000000000000
--- a/dev-haskell/cipher-blowfish/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/citeproc-hs/Manifest b/dev-haskell/citeproc-hs/Manifest
deleted file mode 100644
index de809e88e0fc..000000000000
--- a/dev-haskell/citeproc-hs/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX citeproc-hs-0.3.10-ghc-7.10.patch 1106 BLAKE2B 77333b6784814b212c6ba40e378f2524dbe87610d4aabe47a83747dfaa413697cb952f3c9362d5f7135777f195043ec80f42519a50016641743c5649e0104ec5 SHA512 99743acfe916238dfbd7ed3e7bd680787e48eee38300243be284a8d20632957f9c52dd3b3574a96423a7f9f921eb2531a1495fc7975ef83d7a65748393013a97
-AUX citeproc-hs-0.3.10-pandoc-1.16.patch 5933 BLAKE2B 9fcfc937118b24f6e3e130b51e681278179c94df2941c404d925eac4c4b2175507026c16d0f090436441159070a1e0c3cf992cca97258f825c0304c06416f733 SHA512 9ac93221d544c4db306e71c33daa4583485704bae6a4800776fcf2b6950583d385cf91877418b8efd9c8dbb5feb14c329c8667b853bc8e322e60b39b78a4f303
-DIST citeproc-hs-0.3.10.tar.gz 115588 BLAKE2B f4b62c40dfe8abaa2eded4d2440915670cd1903eb326f86f3451764ef249ff1226facd77d2b68f2f875460f3beeabc07dd3c231f47581d57d867c77fafa4d81c SHA512 961c97fb82a0d497946695ef71dcbf0072dd9522a0f3b8e44975348b9ccf3ee703e2923408b3c3f1c58de04665418f54b95773865ed9cb16ad31a548a18b8b6f
-EBUILD citeproc-hs-0.3.10-r1.ebuild 1671 BLAKE2B e64ac2b2f5e7d89db93cf86bee5976814fddf046b2308d54a93d5f477b8b79473ad87b845701132c54ad910f6ba16cc2edb80ddd8c1143ddce34cc9af328b221 SHA512 5b305b2039487543d609aff72c7da9ad188e271d2066fe98a9c1eb16c65c37f66d1c3a01e46a703c464278fb37c740b5253a4282a1147f58e12474f1ff6041d8
-MISC metadata.xml 1205 BLAKE2B 4027085294377069d38f586741ecb288612457e567f083cf7dd970b524a1994d14722b33a3b905aed9162d0d537ec6b7545c791727c9028265f5e19177fde6f8 SHA512 7a55fb2e236b0030011e22f28362b692e67af0df54b6e9ad3ee9117352a41248e44c5242aace52a13f86d9b327531efea42d89300779afca21e4639be503aeeb
diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild
deleted file mode 100644
index cdef1f881ffb..000000000000
--- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A Citation Style Language implementation in Haskell"
-HOMEPAGE="http://istitutocolli.org/repos/citeproc-hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bibutils embed-data-files +hexpat +network +small-base unicode-collation"
-
-RDEPEND="dev-haskell/json:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pandoc-types-1.8:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/syb:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] )
-	embed-data-files? ( dev-haskell/file-embed:=[profile?] )
-	hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] )
-	!hexpat? ( dev-haskell/xml:=[profile?] )
-	network? ( >=dev-haskell/http-4000.0.9:=[profile?]
-			>=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	unicode-collation? ( dev-haskell/text:=[profile?]
-				dev-haskell/text-icu:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-	epatch "${FILESDIR}"/${P}-pandoc-1.16.patch
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bibutils bibutils) \
-		$(cabal_flag embed-data-files embed_data_files) \
-		$(cabal_flag hexpat hexpat) \
-		$(cabal_flag network network) \
-		$(cabal_flag small-base small_base) \
-		$(cabal_flag unicode-collation unicode_collation)
-}
diff --git a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch b/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch
deleted file mode 100644
index 0ea6ce4e4313..000000000000
--- a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-ghc-7.10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- citeproc-hs-0.3.10-orig/src/Text/CSL/Eval.hs	2015-03-17 21:32:38.000000000 +1100
-+++ citeproc-hs-0.3.10/src/Text/CSL/Eval.hs	2015-04-04 11:18:45.018893632 +1100
-@@ -1,4 +1,5 @@
- {-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module      :  Text.CSL.Eval
---- citeproc-hs-0.3.10-orig/src/Text/CSL/Eval/Names.hs	2015-03-17 21:32:38.000000000 +1100
-+++ citeproc-hs-0.3.10/src/Text/CSL/Eval/Names.hs	2015-04-04 11:18:28.823909497 +1100
-@@ -1,4 +1,5 @@
- {-# LANGUAGE PatternGuards #-}
-+{-# LANGUAGE FlexibleContexts #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module      :  Text.CSL.Eval.Names
---- citeproc-hs-0.3.10-orig/src/Text/CSL/Test.hs	2015-03-17 21:32:38.000000000 +1100
-+++ citeproc-hs-0.3.10/src/Text/CSL/Test.hs	2015-04-04 11:21:42.164719120 +1100
-@@ -29,7 +29,9 @@
- import Data.Maybe (isJust)
- import Data.Time
- import System.Directory
-+#if !MIN_VERSION_time(1,5,0)
- import System.Locale
-+#endif
- 
- import Text.ParserCombinators.Parsec
- 
diff --git a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch b/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch
deleted file mode 100644
index ab95388748d4..000000000000
--- a/dev-haskell/citeproc-hs/files/citeproc-hs-0.3.10-pandoc-1.16.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff --git a/citeproc-hs.cabal b/citeproc-hs.cabal
-index 542f893..606ec05 100644
---- a/citeproc-hs.cabal
-+++ b/citeproc-hs.cabal
-@@ -119,3 +119,3 @@ library
-     build-depends:    containers, directory, mtl, json, utf8-string,
--                      bytestring, filepath, pandoc-types >= 1.8 && < 1.13
-+                      bytestring, filepath, pandoc-types >= 1.8
- 
-diff --git a/src/Text/CSL/Output/Pandoc.hs b/src/Text/CSL/Output/Pandoc.hs
-index 0f2cdfb..74e698f 100644
---- a/src/Text/CSL/Output/Pandoc.hs
-+++ b/src/Text/CSL/Output/Pandoc.hs
-@@ -1,2 +1,2 @@
--{-# LANGUAGE PatternGuards, DeriveDataTypeable #-}
-+{-# LANGUAGE PatternGuards, DeriveDataTypeable, CPP #-}
- -----------------------------------------------------------------------------
-@@ -78,2 +78,10 @@ tailFO (f:fs)
- 
-+#if MIN_VERSION_pandoc_types(1,16,0)
-+#    define P16_ATTRS nullAttr
-+#    define P16_ATTRS_ _attrs
-+#else
-+#    define P16_ATTRS
-+#    define P16_ATTRS_
-+#endif
-+
- renderFo :: Style -> FormattedOutput -> [Inline]
-@@ -85,3 +93,3 @@ renderFo sty fo
-     | FO     fm xs <- fo = toPandoc fm $ rest xs
--    | FUrl u fm    <- fo = toPandoc fm [Link (toStr $ snd u) u]
-+    | FUrl u fm    <- fo = toPandoc fm [Link P16_ATTRS (toStr $ snd u) u]
-     | otherwise = []
-@@ -109,3 +117,3 @@ renderFo sty fo
-       setCase' f i
--          | Link s r <- i = Link (map (setCase f) s) r
-+          | Link P16_ATTRS_ s r <- i = Link P16_ATTRS_ (map (setCase f) s) r
-           | otherwise     = setCase f i
-@@ -148,3 +156,3 @@ renderFo sty fo
-       rmZeros = dropWhile (== '0')
--      escape s x = Link x (s,s) -- we use a link to store some data
-+      escape s x = Link P16_ATTRS x (s,s) -- we use a link to store some data
- 
-@@ -181,3 +189,4 @@ clean s b (i:is)
-     | Strong      x <- i = split (isLink' "strong"  ) (return . Strong     ) x ++ clean s b is
--    | Link      x t <- i = clean' s b (Link x t : clean s b is)
-+    | Link P16_ATTRS_ x t <- i = clean'
-+                                        s b (Link P16_ATTRS_ x t : clean s b is)
-     | otherwise          = clean' s b (i        : clean s b is)
-@@ -185,10 +194,10 @@ clean s b (i:is)
-       unwrap f ls
--          | Link x _ : _ <- ls = clean' s b x
--          |        _ : _ <- ls = f ls
-+          | Link P16_ATTRS_ x _ : _ <- ls = clean' s b x
-+          |                   _ : _ <- ls = f ls
-           | otherwise          = []
-       isLink l il
--          | Link _ (x,y) <- il = x == l && x == y
-+          | Link P16_ATTRS_ _ (x,y) <- il = x == l && x == y
-           | otherwise          = False
-       isLink' l il
--          | Link _ (x,y) <- il = (x == l || x == "nodecor") && x == y
-+          | Link P16_ATTRS_ _ (x,y) <- il = (x == l || x == "nodecor") && x == y
-           | otherwise          = False
-@@ -201,3 +210,3 @@ clean' _ _   []  = []
- clean' s b (i:is)
--    | Link inls (y,z) <- i, y == "inquote"
-+    | Link P16_ATTRS_ inls (y,z) <- i, y == "inquote"
-     , y == z    = case headInline is of
-@@ -235,7 +244,7 @@ flipFlop (i:is)
-             reverseEmph' e
--                | bo, Emph inls <- e = Link (reverseEmph False inls) ("emph","emph")
-+                | bo, Emph inls <- e = Link P16_ATTRS (reverseEmph False inls) ("emph","emph")
-                 | Emph     inls <- e = Emph (reverseEmph True  inls)
--                | Link ls (x,y) <- e = if x == "nodecor" && x == y
--                                       then Link ls ("emph","emph")
--                                       else e
-+                | Link P16_ATTRS_ ls (x,y) <- e = if x == "nodecor" && x == y
-+                                                  then Link P16_ATTRS_ ls ("emph","emph")
-+                                                  else e
-                 | otherwise          = e
-@@ -244,7 +253,7 @@ flipFlop (i:is)
-             reverseStrong' e
--                | bo, Strong inls <- e = Link   (reverseStrong False inls) ("strong","strong")
-+                | bo, Strong inls <- e = Link P16_ATTRS  (reverseStrong False inls) ("strong","strong")
-                 | Strong     inls <- e = Strong (reverseStrong True  inls)
--                | Link   ls (x,y) <- e = if x == "nodecor" && x == y
--                                         then Link ls ("strong","strong")
--                                         else e
-+                | Link P16_ATTRS_  ls (x,y) <- e = if x == "nodecor" && x == y
-+                                                     then Link P16_ATTRS_ ls ("strong","strong")
-+                                                     else e
-                 | otherwise            = e
-@@ -306,3 +315,3 @@ initInline (i:[])
-     | Strikeout   is <- i = return $ Strikeout   (initInline is)
--    | Link      is t <- i = return $ Link        (initInline is) t
-+    | Link P16_ATTRS_ is t <- i = return $ Link P16_ATTRS_ (initInline is) t
-     | otherwise           = []
-@@ -336,3 +345,3 @@ mapHeadInline f (i:xs)
-     | Strikeout   is <- i = Strikeout   (mapHeadInline f is)   : xs
--    | Link      is t <- i = Link        (mapHeadInline f is) t : xs
-+    | Link P16_ATTRS_ is t <- i = Link P16_ATTRS_ (mapHeadInline f is) t : xs
-     | otherwise           = i : xs
-@@ -348,3 +357,3 @@ getInline i
-     | SmallCaps   is <- i = is
--    | Link      is _ <- i = is
-+    | Link P16_ATTRS_ is _ <- i = is
-     | otherwise           = []
-diff --git a/src/Text/CSL/Test.hs b/src/Text/CSL/Test.hs
-index 1a470cf..2d9befa 100644
---- a/src/Text/CSL/Test.hs
-+++ b/src/Text/CSL/Test.hs
-@@ -166,2 +166,8 @@ pandocBib s
- 
-+#if MIN_VERSION_pandoc_types(1,16,0)
-+#    define P16_ATTRS_ _attrs
-+#else
-+#    define P16_ATTRS_
-+#endif
-+
- pandocToHTML :: [Inline] -> String
-@@ -179,3 +185,3 @@ pandocToHTML (i:xs)
-                               SingleQuote -> "‘" ++ pandocToHTML is ++ "’" ++ pandocToHTML xs
--    | Link     is x  <- i = case snd x of
-+    | Link P16_ATTRS_ is x  <- i = case snd x of
-                               "emph"     -> "<span style=\"font-style:normal;\">" ++
diff --git a/dev-haskell/citeproc-hs/metadata.xml b/dev-haskell/citeproc-hs/metadata.xml
deleted file mode 100644
index 9c951e54db57..000000000000
--- a/dev-haskell/citeproc-hs/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="bibutils">use Chris Putnam's <pkg>app-text/bibutils</pkg></flag>
-		<flag name="embed-data-files">Embed locale files into the library (needed for windows packaging)</flag>
-		<flag name="network">use <pkg>dev-haskell/network</pkg> and <pkg>dev-haskell/http</pkg> to retrieve CSL file from URIs</flag>
-		<flag name="hexpat">use <pkg>dev-haskell/hexpat</pkg> instead of <pkg>dev-haskell/xml</pkg> for XML parsing</flag>
-		<flag name="small-base">Choose the new smaller, split-up base package.</flag>
-		<flag name="unicode-collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag>
-	</use>
-	<longdescription>
-		citeproc-hs is a library for rendering
-		bibliographic reference citations into a variety
-		of styles using a macro language called Citation
-		Style Language (CSL). More details on CSL can be
-		found here:
-		&lt;http://citationstyles.org/&gt;.
-		
-		For the API documentation please see "Text.CSL".
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/cryptocipher/Manifest b/dev-haskell/cryptocipher/Manifest
deleted file mode 100644
index d31d40e6f93c..000000000000
--- a/dev-haskell/cryptocipher/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cryptocipher-0.6.2.tar.gz 2027 BLAKE2B 617f3c184baa3acb6a248b60dc928fc4696d4818b31a55fe111838154a1f1a6e3fd42c96cb4d8ecceb21ae0145550fe2b097635524207b5d9e63f41e29047d67 SHA512 d63984d26e355ff613a4176c11634f1012f8b9ec43180ffed236f37aa7a1b1dafee1871799eec53774544518c886c27ae19bb0b058288da6bd8f2b45eaa5e5ab
-EBUILD cryptocipher-0.6.2.ebuild 1082 BLAKE2B d5ac157182f50cac640f4cce97369d352bdeeb09ae420d9702b4606ef84640ed030f30b39eeaaab60609e2a0251a9a294d091ed66ea2e8e93078478ecdce97be SHA512 e89dc0f10f32ebfde9818f1aea65c7b9653f391c511c791c83fe6c866457688f5cb55c89b393cbc4432c2df40d643f987aa473c35beb4ea340b27263dd55391c
-MISC metadata.xml 340 BLAKE2B fa7ffd27bb988c64b885de8879661929121e2833c146b373a23c2d649e58379dfcfd182fdc90d20116f4ab31251b379f0310a84040aa0bf6d7209ce9388a7873 SHA512 88ce6598988d5ac898de9b179e55518b3e68ffa9095a9ae194ea058340544c4d9f3ad9bd3f36d5ea8c50c3a52664140756ce19d91b06ec994fcf8d326ade85a4
diff --git a/dev-haskell/cryptocipher/cryptocipher-0.6.2.ebuild b/dev-haskell/cryptocipher/cryptocipher-0.6.2.ebuild
deleted file mode 100644
index 7e4abba23154..000000000000
--- a/dev-haskell/cryptocipher/cryptocipher-0.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Symmetrical block and stream ciphers"
-HOMEPAGE="https://github.com/vincenthz/hs-crypto-cipher"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cipher-aes-0.2.3:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?]
-	>=dev-haskell/cipher-blowfish-0.0:=[profile?] <dev-haskell/cipher-blowfish-0.1:=[profile?]
-	>=dev-haskell/cipher-camellia-0.0:=[profile?] <dev-haskell/cipher-camellia-0.1:=[profile?]
-	>=dev-haskell/cipher-des-0.0:=[profile?] <dev-haskell/cipher-des-0.1:=[profile?]
-	>=dev-haskell/cipher-rc4-0.1.3:=[profile?] <dev-haskell/cipher-rc4-0.2:=[profile?]
-	>=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/cryptocipher/metadata.xml b/dev-haskell/cryptocipher/metadata.xml
deleted file mode 100644
index 234d150ab62e..000000000000
--- a/dev-haskell/cryptocipher/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-crypto-cipher</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/drift/Manifest b/dev-haskell/drift/Manifest
deleted file mode 100644
index 9c768295bd4e..000000000000
--- a/dev-haskell/drift/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX drift-2.4.2-ghc-7.10.patch 581 BLAKE2B 466fba075f3428dccdc6dc8dd5c6c18367bf37fed6d13b3d4d9bef02e9351d558a0c66ea99b14f6ff8a7f51c8c6a67ae791847a6eca0e64255adaa3c5c205bf2 SHA512 33d6ff669da9adf11f2a595748b6b1d726729186b0846c47951bb8fdc900d7c17ddf5cc5fc27a3e77c8766365c3b4e1f33b49a35a8f6f5ab88e7223fb1361014
-DIST DrIFT-2.4.2.tar.gz 69676 BLAKE2B 8b072b88e52f9106eeddd62c391805b17bab0cea59e6ac8eedb1c88d22dce91ba697174b2380ee2d2fd41036116fa41778d119bfa5b673444ee466815e49c7f0 SHA512 c6f36e9efad171c165ea8028b7d251e66d5b410aaa51a74e4b8745cf76b77fcfdf6f641fd375f15663b559ae6b8939622a175ba321537afdbb2a114a1550f7db
-EBUILD drift-2.4.2.ebuild 750 BLAKE2B 68881776502bcef4a860f3372d807ad147978e4cd861ceaa21fd101c718a72cb8c9d9976c0db2b99a4543abb98e26d69db6ffcc6abf234277732be9c82324ab7 SHA512 84f1b327cdc4f93150f5d2dfee312f7b99eea45435f967f345de9c1493b118b6ba1fce9420b2a191817667338bbd19b4b5c498de3650e140e2b6689d3d415dfe
-MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/drift/drift-2.4.2.ebuild b/dev-haskell/drift/drift-2.4.2.ebuild
deleted file mode 100644
index 3ac6bb595f28..000000000000
--- a/dev-haskell/drift/drift-2.4.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit eutils haskell-cabal
-
-MY_PN="DrIFT"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Program to derive type class instances"
-HOMEPAGE="http://repetae.net/computer/haskell/DrIFT/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/old-time:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
diff --git a/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch b/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch
deleted file mode 100644
index c45a2945fd2a..000000000000
--- a/dev-haskell/drift/files/drift-2.4.2-ghc-7.10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/ParseLib2.hs b/src/ParseLib2.hs
-index 730e4be..a7406fa 100644
---- a/src/ParseLib2.hs
-+++ b/src/ParseLib2.hs
-@@ -34,2 +34,3 @@ module ParseLib2
- import Data.Char
-+import Control.Applicative hiding ( many )
- import Control.Monad
-@@ -49,2 +50,6 @@ instance Functor Parser where
- 
-+instance Applicative Parser where
-+    pure  = return
-+    (<*>) = ap  -- defined in Control.Monad
-+
- instance Monad Parser where
-@@ -58,2 +63,6 @@ instance Monad Parser where
- 
-+instance Alternative Parser where
-+    (<|>) = mplus
-+    empty = mzero
-+
- instance MonadPlus Parser where
diff --git a/dev-haskell/drift/metadata.xml b/dev-haskell/drift/metadata.xml
deleted file mode 100644
index 522384de8446..000000000000
--- a/dev-haskell/drift/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-haskell/glade/Manifest b/dev-haskell/glade/Manifest
deleted file mode 100644
index 507de93c03a5..000000000000
--- a/dev-haskell/glade/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX glade-0.13.1-glib-2.62.patch 304 BLAKE2B 2206296250af1bb835669f5cb9bd68c3775d6d3a70217d7368a7cd01f5bf12012c5dbd680d8074182e0181cec4b26524ffb542cd9ce4408d28709b27eeb3a95d SHA512 2483f381af0e6ad1adf33a77e062c07fe33f3c62dce1f7da8983346f3344d88297dd592db256ef922812efac99fe86900fc98549110e80765d4c8dbe9491ed03
-DIST glade-0.13.1.tar.gz 145648 BLAKE2B 31d650bdbe848b2e14efadc90f074664775cfa040def9328c084871efbd708a1bd03d34047d83f9a76cfe4069f14f787c50bde419abb0539597be2ea4a806032 SHA512 3e4282c4a8170351a6c82bf346685da7dd192d9e0139d8ef3f104f085b10686d1b89a77f01f1edc500f5d9584c1c31a63d1f89dc48a1a9a3f100207ae425ddce
-EBUILD glade-0.13.1.ebuild 954 BLAKE2B ac770ceed772b52518022d7a204dd59038cfbd499ccedee158f03cd47096a4da956a81d4cab771f9e5d65cfdf56e3fd33352199c936b183e8560a8f6e301dbdf SHA512 971fcf2d2e58806c807ee45421fd6aa73a15e2774503cce78ddd16d36fdcf866f0f61642b7503a43a9dab71eabeb985d2f78a7aee20edf3804b198e006abec1c
-MISC metadata.xml 597 BLAKE2B 76105e5cba3a760b7b4ed8c904b46798b07d90e0f3f20b5ee8e882f972e9d7fb920f75a99291329f137d336aa63691f056f1c1db7e4a19f552ca00351249e496 SHA512 949a3f88b0af3944a268f389e7cfb202f4bb7ccb725c52c28bd127814b853f34cc201c1a9859d97804cf1eb911a5aaa70f7a0415680476343bf0bcb5fa12e63c
diff --git a/dev-haskell/glade/files/glade-0.13.1-glib-2.62.patch b/dev-haskell/glade/files/glade-0.13.1-glib-2.62.patch
deleted file mode 100644
index 953c9df0ec13..000000000000
--- a/dev-haskell/glade/files/glade-0.13.1-glib-2.62.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/glade.cabal
-+++ b/glade.cabal
-@@ -82,6 +82,7 @@ Library
-         default-language: Haskell98
-         default-extensions: ForeignFunctionInterface
- 
-+        cpp-options: -D__attribute__(A)=
-         if os(darwin)
-           cpp-options: -U__BLOCKS__ -D__attribute__(A)= -D_Nullable= -D_Nonnull=
- 
diff --git a/dev-haskell/glade/glade-0.13.1.ebuild b/dev-haskell/glade/glade-0.13.1.ebuild
deleted file mode 100644
index d6e64bb0411d..000000000000
--- a/dev-haskell/glade/glade-0.13.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the glade library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/glib-0.13.4:0=[profile?] <dev-haskell/glib-0.14:0=[profile?]
-	>=dev-haskell/gtk-0.14.5:2=[profile?] <dev-haskell/gtk-0.15:2=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	gnome-base/libglade:2.0
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	>=dev-haskell/gtk2hs-buildtools-0.13.2.0:0= <dev-haskell/gtk2hs-buildtools-0.14:0=
-	virtual/pkgconfig
-"
-
-PATCHES=("${FILESDIR}"/${PN}-0.13.1-glib-2.62.patch)
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'Cabal >= 1.24 && < 1.25' 'Cabal >= 1.24'
-}
diff --git a/dev-haskell/glade/metadata.xml b/dev-haskell/glade/metadata.xml
deleted file mode 100644
index 2ba679a49549..000000000000
--- a/dev-haskell/glade/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		This library allows to load externally stored user interfaces into
-		programs. This allows alteration of the interface without recompilation
-		of the program.
-		
-		Note that this functionality is now provided in gtk directly
-		(as of version 2.12 of the gtk+ C lib) by the
-		Graphics.UI.Gtk.Builder module.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-haskell/pandoc-types/Manifest b/dev-haskell/pandoc-types/Manifest
index dd261c86bca6..08befe61d750 100644
--- a/dev-haskell/pandoc-types/Manifest
+++ b/dev-haskell/pandoc-types/Manifest
@@ -1,3 +1,3 @@
 DIST pandoc-types-1.20.tar.gz 29505 BLAKE2B f455cc8462b20e86403cba1de836545100402db34b23f8be0d8907fa9d5596fe515f522c513f0cef3c67e7f8d3bb5bd3409f7bf5f1216f9b9f234c44552650fd SHA512 36c658093237246a344dc65bf9e214b250ea1a0aecf9931d80299f44ee152553c4326948bfae8e0f3e5aaabe93bc7a9aca0c79383e48b0f9d2696383df2b40ee
 EBUILD pandoc-types-1.20.ebuild 1212 BLAKE2B 2114df77a615113b867e7ce381b3475611944ff92bc14f883848afba80342fd034328f5ff5a64a14525fca73a1cee0c74d18a5dc233ee45e6de28d2418833b41 SHA512 99ba7d61c11258a1ba09ba6769efc9ffff14c32f0aad3fc5220c2bbcab691909452e876d91325ae7f993cb6a8ab0d2ef2c902ba61e3fb4054fbdc8cb0365c980
-MISC metadata.xml 742 BLAKE2B be89ec8208d0891fbe9af9f4cdbd438daaaf96e8fa3478b9b9713c57349e6a516c0b8d5ad1074e4b34d02e0d1f1d52ff27a7dcc2699362ed7ddd5bee18940255 SHA512 438830b6cd891695dbc45cb03b0bcd34f85fb5d7225384617a1d130c086b687e7dfed06d4122b0025ad70eba4ed25e2d3dd2803a0a84012d225b75cdfb6fa9e6
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/pandoc-types/metadata.xml b/dev-haskell/pandoc-types/metadata.xml
index 39e4e9303f27..b7878815d80d 100644
--- a/dev-haskell/pandoc-types/metadata.xml
+++ b/dev-haskell/pandoc-types/metadata.xml
@@ -5,14 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package contains definitions for the <pkg>app-text/pandoc</pkg> data
-		structure, which is used by pandoc to represent
-		structured documents.  These definitions used to live
-		in the pandoc package, but starting with pandoc 1.7, they
-		have been split off, so that other packages can use them
-		without drawing in all of pandoc's dependencies, and
-		pandoc itself can depend on packages (like <pkg>dev-haskell/citeproc-hs</pkg>)
-		that use them.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/process-conduit/Manifest b/dev-haskell/process-conduit/Manifest
deleted file mode 100644
index 1154bacbbce0..000000000000
--- a/dev-haskell/process-conduit/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX process-conduit-1.1.0.0-conduit-1.1.patch 1101 BLAKE2B 88af32409f6d08011814fe05aabbe7d9ebc547e0e113cdd8cd65ea13f676119163a19294803dcf8f0d905e5747e38872a8b0d26b4745c94e57cfd8f036547db7 SHA512 26035f7bae533194455ef48c650230ffe5796c1afa92a811ad1dd3302a833fd5ca04f8dbd87e6d60b9d5abb16ad38fbc8b6496bf918cbb34fa2b8d2079e85f30
-DIST process-conduit-1.1.0.0.tar.gz 3884 BLAKE2B 70792cc3ac8a65e591939782b8ef03e2d339cda469b40ed9858ede5a18a8ee6ab18d72b538fc3a265ebdfb9fcec05e4de020ac96826d2c8264da711e89ecfbdd SHA512 d7390a1083bc3bc5db2ce2bc0ec55f90e6c8bb8d224cc16b52a2e272baf3dceb18ee11eafd3cc306902945b04b2d746738f5a5e88bfd73e5ad0a9f5d4e5914dc
-DIST process-conduit-1.2.0.1.tar.gz 3958 BLAKE2B 5c9ca54c43b99032fea566cbd1b4693bceb8a07ed1121b7ce2e74c034adf7ec39b2874978335a59880f34eceae6dc299886b3e45c865eb16765677e955a26b04 SHA512 f58d37b04523007fcc447b865510f59559608df8c470456f5f5269d04e7104b018451ae260018cf04b03a253e7436ff0fc517c9f0d5cde705cbb8661a868b920
-EBUILD process-conduit-1.1.0.0-r1.ebuild 975 BLAKE2B a7ac13731ef17654a7908efdfd30d2d71b40d45ee2b42361d4ee6eac3eaea1c3cf99d25daf8851fcba1fc883eb9997fc239c1f77133e161849b109484956eb62 SHA512 801f3b85550d4f5dbacfd34d1374b73cd99912f26a34a5ce9b8a04605fdbd33adb5500cdc04a068647fa4406acfbaeb4e415c85f4d1e6da7d4bde2461d2e8711
-EBUILD process-conduit-1.2.0.1.ebuild 951 BLAKE2B cc2a3842bc895b8a61fbfa64529fc6229037e1f6c71a3b5e0922c3e94ed0e6b9dea3b787da3e5b8e8f738db301ad32449c4b9dbc5bb910fa869a1ffaff638177 SHA512 6002371e46148efa01b8c2741fe3d6b1ddeaac0b9d00c5bc3404f90f0f2adfb1f4ced0b0f25bfdc0c1a4901016bddf9d2983b397a333611abd031443e2062ec6
-MISC metadata.xml 495 BLAKE2B 30bee57f6a0ecfc70313769c6523a11f69a24150382c6887bd32cf1731ce31a181abd16dbed045ac3699535149c938c69ed9c0f784fa84820bd365fac4de57da SHA512 fe8762abe81705e982768ecd21e61c1ab2849528d9e75e26cc4c8f92b2a56724cdfb7c90e5895f87a6376dc5b8f5d4621b9ae4f908b5507dc36930c06310c37a
diff --git a/dev-haskell/process-conduit/files/process-conduit-1.1.0.0-conduit-1.1.patch b/dev-haskell/process-conduit/files/process-conduit-1.1.0.0-conduit-1.1.patch
deleted file mode 100644
index e829cc58de0f..000000000000
--- a/dev-haskell/process-conduit/files/process-conduit-1.1.0.0-conduit-1.1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- process-conduit-1.1.0.0-orig/process-conduit.cabal	2014-04-03 18:54:59.000000000 +1100
-+++ process-conduit-1.1.0.0/process-conduit.cabal	2014-07-02 09:45:32.738952743 +1000
-@@ -34,6 +34,7 @@
-                      , text             >= 0.11
-                      , process          >= 1.0
-                      , conduit          >= 1.1
-+                     , conduit-extra    >= 1.1
-                      , resourcet        >= 1.1
-                      , shakespeare-text >= 1.0
-                      , shakespeare
-@@ -48,4 +49,6 @@
-                      , bytestring
-                      , hspec           >= 1.3
-                      , conduit
-+                     , conduit-extra
-                      , process-conduit
-+                     , resourcet
---- process-conduit-1.1.0.0-orig/test.hs	2014-04-03 18:54:59.000000000 +1100
-+++ process-conduit-1.1.0.0/test.hs	2014-07-02 09:51:31.862391926 +1000
-@@ -7,6 +7,7 @@
- import Data.Conduit
- import qualified Data.Conduit.Binary as CB
- import Test.Hspec
-+import Control.Monad.Trans.Resource (runResourceT)
- 
- main :: IO ()
- main = hspec $ do
diff --git a/dev-haskell/process-conduit/metadata.xml b/dev-haskell/process-conduit/metadata.xml
deleted file mode 100644
index 476cab9249fe..000000000000
--- a/dev-haskell/process-conduit/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Conduits for processes.
-		For more details: &lt;https://github.com/tanakh/process-conduit/blob/master/README.md&gt;
-	</longdescription>
-	<upstream>
-		<remote-id type="github">snoyberg/process-conduit</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-haskell/process-conduit/process-conduit-1.1.0.0-r1.ebuild b/dev-haskell/process-conduit/process-conduit-1.1.0.0-r1.ebuild
deleted file mode 100644
index 16d6ac96635d..000000000000
--- a/dev-haskell/process-conduit/process-conduit-1.1.0.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-DESCRIPTION="Conduits for processes"
-HOMEPAGE="https://github.com/tanakh/process-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=("${FILESDIR}/${PN}-1.1.0.0-conduit-1.1.patch")
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/shakespeare-text-1.0:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/process-conduit/process-conduit-1.2.0.1.ebuild b/dev-haskell/process-conduit/process-conduit-1.2.0.1.ebuild
deleted file mode 100644
index efbdeb02c28c..000000000000
--- a/dev-haskell/process-conduit/process-conduit-1.2.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conduits for processes (deprecated)"
-HOMEPAGE="https://github.com/snoyberg/process-conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?]
-	>=dev-haskell/mtl-2.0:=[profile?]
-	>=dev-haskell/resourcet-1.1:=[profile?]
-	dev-haskell/shakespeare:=[profile?]
-	>=dev-haskell/shakespeare-text-1.0:=[profile?]
-	>=dev-haskell/text-0.11:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/conduit-extra
-		>=dev-haskell/hspec-1.3 )
-"
diff --git a/dev-haskell/zlib-enum/Manifest b/dev-haskell/zlib-enum/Manifest
index b160bb4e0a7d..832022cdae11 100644
--- a/dev-haskell/zlib-enum/Manifest
+++ b/dev-haskell/zlib-enum/Manifest
@@ -1,3 +1,3 @@
 DIST zlib-enum-0.2.3.1.tar.gz 4652 BLAKE2B a0148de59f5beac8dac5239228f8d2855249b613af2bebd6fae52f194fc17f4b0d517567267bfb6d5973e67b56e947a18e4f4904f504e33f0803bb66619fad50 SHA512 e68c72ab44922fa2df3b2bc718f65ce313be24742e2edfcbb97cb12f7963e9448aa68ba2e64ef08369b07f641773f4688a787615f76dd183982089ef7fe68a8c
-EBUILD zlib-enum-0.2.3.1-r1.ebuild 1047 BLAKE2B c6611f0705226a77586797dbadba5ddc36c8df5010ff440f04819756790c4800bd11f680799e3faca69fb7fe682981eec3e3416e11cb9cc28dedb714cfe0b134 SHA512 3231b641abf185005fda07d3217c300c36e0349b5b192aa65d85222eb6e02f979402b0a9b0f645dba59756e374f684f6f2661a3f88519f6ccf16f368e210e880
-MISC metadata.xml 330 BLAKE2B d7e4c1120786af26a92ee98021be24e1f3a47d98aa8241bd3a71308cd090a94635218e13397e43b74dc2cc7928c4b5271c9f289669ce9cd1818d3cd4f15bf637 SHA512 f5e3b4f9ec5717f1624558ffe9e8913c7119a1f3050fcb75a067a4b8ddb1ff90edee17a5b520169830d0eb407bcfe7728737a241e5ab9ffce68cf2d02b45bce4
+EBUILD zlib-enum-0.2.3.1-r1.ebuild 1016 BLAKE2B 85e5010ce6bb2f2f684180132b1517a2f11bc52b83a9b351a817c697889bba94a4890849022c97d36bfd5a698280cec0adf98c4816cc3ca59b0ae8a871ef429e SHA512 156cee66c3583d0574931755e70a65978f330d5705e34161aac9035d64b8a90d3ddf041629d0689675b4efc799b2ea2b5f0720f25b274fbe0dbee8887cc02805
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/zlib-enum/metadata.xml b/dev-haskell/zlib-enum/metadata.xml
index e12ead7adebb..b7878815d80d 100644
--- a/dev-haskell/zlib-enum/metadata.xml
+++ b/dev-haskell/zlib-enum/metadata.xml
@@ -5,7 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">maltem/zlib-enum</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild
index ae09a03b09a1..fa38a9d13005 100644
--- a/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild
+++ b/dev-haskell/zlib-enum/zlib-enum-0.2.3.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.9999
+# ebuild generated by hackport 0.6.6.9999
 #hackport: flags: -test
 
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Enumerator interface for zlib compression"
@@ -19,15 +19,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?]
-	>=dev-haskell/transformers-0.2:=[profile?]
 	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
+	>=dev-haskell/cabal-1.18.1.3
 "
 
 src_prepare() {
+	default
+
 	cabal_chdeps \
 		'transformers          >= 0.2 && < 0.5' 'transformers          >= 0.2' \
 		'transformers               >= 0.2      &&   < 0.5' 'transformers               >= 0.2'
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 18c8887ff5c4..12d5cf2c110c 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index eb10cf874eb3..0e6d7602dcfe 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -19,5 +19,5 @@ EBUILD bcprov-1.52-r1.ebuild 1347 BLAKE2B 53b6e67db4ad60cd847a4d4ff23231d19fd158
 EBUILD bcprov-1.52-r2.ebuild 1352 BLAKE2B b64efb5bacd2a605e35bb242e4009cdc65009dd023f2bd50f3cf5978b8db4be55f8baff925abb09cd1e0b3245da34f48c44dc733ad47f710f99977a73645309b SHA512 7e070f559ffe303268f20a21b9f3258f983daa367d727ff91757c4fd2dd55c5008bb7e9bd52bb645fc6f369791853cc7862db1b54c98b05aa64effea2be1b0ac
 EBUILD bcprov-1.52-r3.ebuild 1325 BLAKE2B 5617350d06e52736b19b1ccc87aafc4bbfa5b02a3c06fe7dc4ed33f46dd8fa7a6d85e8f3546be83e14790d8068439c3e0f923e6f95cac1839e077dd004a45777 SHA512 cff73472e90c3bdb219a926fb65bc49685c42def85dbb5fa5d936f82a7dc3916f82c2f27e401cf94bbd32773b9d451c14c0392e49b433251bd631e81b4718c98
 EBUILD bcprov-1.54.ebuild 1332 BLAKE2B b7575fc50709ff5c4250b07b8e72ed008d426236746e8a037ae75693a4496d4a519152878090b922c18aae8ac68056edb47788f49f9e8f7f2bc7cddd1f43f8d6 SHA512 f38d0fa76c72147986c206a1363c8e90f65a7a7efa85a07b91e569dbea4cd55a4702fb9e2323ef95b2423d9c8809073a4233fb5999ed0688994c686d5415a376
-EBUILD bcprov-1.66.ebuild 1343 BLAKE2B f3a219a442e18fd399243fb2a6b6d2ea60795805c01aa97cd1d061d06dcf7039c2347a93fc9f0b5aabc6172c7c063aa805d063d35a34d5fa99719a12ba1383de SHA512 2cfcb9b3cbe7863b2f788ab8323ddc8a72d39373c6406c2fb233e45240a3ad6517913128de2455152d4627603c937fe48a6b91a8ef508426968f4c0cb7bcbfc0
+EBUILD bcprov-1.66.ebuild 1341 BLAKE2B b6e8fa6fe16ee1905aec54602c325f5f4b484be63b9e8e5e6f79827a1aa5121ed2d369b49506dc7d4091000e0c6753391934f634b026aac9c04e7152b7efa486 SHA512 64556678ad3ead8a9b139672db2fe31d934084e48680298212a77dba9e816e88408b1932098dddfc6407bb8f648f411d141687485c72d924bca3bee7adebaac0
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/bcprov/bcprov-1.66.ebuild b/dev-java/bcprov/bcprov-1.66.ebuild
index 4ef9b5431d1f..2dad26804214 100644
--- a/dev-java/bcprov/bcprov-1.66.ebuild
+++ b/dev-java/bcprov/bcprov-1.66.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.bouncycastle.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.66"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND=">=virtual/jdk-1.8
 	app-arch/unzip"
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index bad85a2701f8..78c1eb728817 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -2,12 +2,12 @@ DIST apache-maven-3.0.5-bin.tar.gz 5144659 BLAKE2B a109f1ab8656d031c4c904b9972b5
 DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1
 DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
 DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
-DIST apache-maven-3.6.1-bin.tar.gz 9136463 BLAKE2B d630ceeb1c35f742eae324a025c3385fac0b7aa58e0bd3fe239a2027138127604a076958e5f6db6bba4f1e99bc524f0c62643bc4ab4d570378e93e8f72c234c0 SHA512 b4880fb7a3d81edd190a029440cdf17f308621af68475a4fe976296e71ff4a4b546dd6d8a58aaafba334d309cc11e638c52808a4b0e818fc0fd544226d952544
 DIST apache-maven-3.6.2-bin.tar.gz 9142315 BLAKE2B f8b4ad4148a508b076cdb9f5ca322860157d6c3517c1ac7bd7d369066cc1567681761e1b638ea74f20461f8c111ff488e1478399a2ebfd406e91a10ace582d86 SHA512 d941423d115cd021514bfd06c453658b1b3e39e6240969caf4315ab7119a77299713f14b620fb2571a264f8dff2473d8af3cb47b05acf0036fc2553199a5c1ee
+DIST apache-maven-3.6.3-bin.tar.gz 9506321 BLAKE2B 45892ef05cc1e4578c05a794376fdda730a800070389a1be213cf58c8f8df87be5e22cb2e8fdcf718eed344eff3e133dc72a252b0bbb7dcaf4e0e184539f7b0d SHA512 c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
 EBUILD maven-bin-3.0.5-r1.ebuild 1288 BLAKE2B 5df56d1fb434fa78f2e31b706923a954f3eb544287ef2f2c903972d1f12b107c166b1415a04f9aadfaac0e1bd5d9c57b9227ee3eb1da8b950f4d3925f6f375d4 SHA512 d661caf7691165fceddb6b469d36ecc533b52dc2ee376cbc3bc1d158e5ea37f37c07212d6c6f79269d5101cf953c1b025b81703fc1a6493ceb88ebcefc9d652a
 EBUILD maven-bin-3.1.1-r1.ebuild 1234 BLAKE2B 4e3435b9bbfb4661f36cf1375211fc2818d0fcc937319bd918615c9ade29ad913ce570bb2ba3bb32a76bf52941a4e45c02c08a5617eac6f5745714ab1620e6f9 SHA512 d02c484ce95bff8e37d9c360ad49a987796e1332a7a9a33dcf69a7d472db4b50bc2f7f715c48786238b39bceac7ee707f690f47091aee290885703470b6ef114
 EBUILD maven-bin-3.2.5-r1.ebuild 1232 BLAKE2B 7e0fc95a813cd06342c77aef9aa137e06ac50f9dcd7089f175ece037583085f8d63fbd4e6cbdb3a0e779ce5eb018b19b6b6139aa8fa8dc80eaacae6561bf1862 SHA512 66a6e136376517e82b862bfca3033dcb92366bec865b51fafb19ce27a4e8d50e97ebef916b39b4c8438a69984698c71e8a146969cb16aa6a2d963675a054c992
 EBUILD maven-bin-3.3.9-r1.ebuild 1236 BLAKE2B 9641f5146ef168f7b1edb7616940f492011adc2d96d5c9852ec22171f2d3ab45452ab0ff2801348f82c726fe12c43160f2056b06d973b05c2d4f871e13d4fc16 SHA512 fe144d82cde207dca1b10cb072a747e8bc3649e493301bc9f45280e767a0ff85946f3702d1e86ea047a430fe8d088d2adae28a651e2c04e16a7f78e06c5f5b62
-EBUILD maven-bin-3.6.1-r1.ebuild 1236 BLAKE2B a18fa4ad369338ebd818f894414e084b895df52c9fd2123db1136133b1b71f3e11b2f2bd2f0cc76847c1f0998416317d7ea9b44f65336369ef5456a57e1ddd7f SHA512 ed8e9bc788d03e581e3d802eb350fce294034c726294e9929465d5a574900845cd003cf94251dc6f3b7739cd9b2612b3a044c705fdd48f0e678dd47054e96ace
-EBUILD maven-bin-3.6.2.ebuild 1236 BLAKE2B c2cd29540a34f506fcc8013cf59f343aaa953e2f1132a9c8324520a7320bd3e0979c3fcff2779f11e5cfbb05abae0f9ab142225fb4eee6c07dc40f09b0abcfee SHA512 09022fa6db8aac2186ef8b39bb105c7bfc265105d7a4b436fc0b0e780863dbd8b6457f4508cca3bfeb4faafb6cc19a8b10ab4269ddd4d8c115db19df062faf51
+EBUILD maven-bin-3.6.2.ebuild 1522 BLAKE2B 8bddaf9aa58bb4af704eae85e6bb1501aeb225c214936327a01eb2da6a54bf80123436511947ec94eb4a5358a528042b4cce4e4e15490b2214b25febde9bb910 SHA512 2ec374dcd0e0365c67256a7b7ab7b79207101c730bed39a0b9de1f569d43def4f8edfe092e26dcf3f70a0af871077f8aaed46905a963f4f0e85dc013080aa661
+EBUILD maven-bin-3.6.3.ebuild 1524 BLAKE2B 98e733774ff50a1994bfdff4e00b519a3dbcca1a6b0e6d8d43d90667cfb23d4c3f226f4c66205a683b572a947d17c162fe9a9a5ddef0cbd2cc72e502025da807 SHA512 b9c54d1c00454a8a78acb7e80b473502a5672174b440eb93617ec8ca0c7a57f7093d6083034e5534a135b8a57d46c994da481ee540383f565b73e26f8fbd3fb3
 MISC metadata.xml 610 BLAKE2B 84180dd51fc9e6b9089111a4f79aae2f2e8339a50b3db00cebb103714e7bb87c99a7fbfbd2401a5646f044b6d78cf370b1a1af7e524be91b7065176cf6b8673f SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083
diff --git a/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild b/dev-java/maven-bin/maven-bin-3.6.1-r1.ebuild
deleted file mode 100644
index 46ef90466cd5..000000000000
--- a/dev-java/maven-bin/maven-bin-3.6.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=6
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.6.2.ebuild b/dev-java/maven-bin/maven-bin-3.6.2.ebuild
index 622589dbd25c..e6cf194b7619 100644
--- a/dev-java/maven-bin/maven-bin-3.6.2.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,11 @@ S="${WORKDIR}/${MY_P}"
 MAVEN="${PN}-${SLOT}"
 MAVEN_SHARE="/usr/share/${MAVEN}"
 
+QA_FLAGS_IGNORED=(
+	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
+	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
+)
+
 # TODO:
 # We should use jars from packages, instead of what is bundled.
 src_install() {
@@ -48,6 +53,9 @@ src_install() {
 	# See bug #342901.
 	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
 	doenvd "${T}/25${MAVEN}"
+
+	# remove broken useless files (bug #734906 and #704618)
+	rm -r "${ED}"/${MAVEN_SHARE}/lib/jansi-native/freebsd* || die "Failed to remove FreeBSD files"
 }
 
 pkg_postinst() {
diff --git a/dev-java/maven-bin/maven-bin-3.6.3.ebuild b/dev-java/maven-bin/maven-bin-3.6.3.ebuild
new file mode 100644
index 000000000000..80d5384a1aee
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.6.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+QA_FLAGS_IGNORED=(
+	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
+	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
+)
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+
+	# remove broken useless files (bug #734906 and #704618)
+	rm -r "${ED}"/${MAVEN_SHARE}/lib/jansi-native/freebsd* || die "Failed to remove FreeBSD files"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 25a64a8e0a99..dd145904dc62 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -17,6 +17,6 @@ DIST openjdk-jaxws-8.265_p01.tar.bz2 2543597 BLAKE2B c83256ab68837cc44d65414343d
 DIST openjdk-jdk-8.265_p01.tar.bz2 48017864 BLAKE2B b30a573a79a06abfe98e5963521f762e3517bda2bf6849af758285b7ea61cc57d89290ec47538b1082eea99646d3dd6295b98ad65edd62d1b1fd2480c0928a74 SHA512 44ad75bf3b3c6fd6b782ee5383edfa60fb49ac2e40493b18487bcb8a4dac926ffcf5b663adbb8d3267021bd47d5b60652771a88257fbaff77aa2e1f627252418
 DIST openjdk-langtools-8.265_p01.tar.bz2 2399426 BLAKE2B 550a3dcee38b41feaf8c5b6b88f700c52f870ed0c3f25fa23f34bb3f40c333965e911ac126f4b038057472acea2b684917692a6881e46e4aa68b05cd7e4346da SHA512 24d0978a8e6254a96a5399420831d320ea2b2f5b7055ceba030802b85fcb9630031499504ca72305361fa3a386c2ca0a8c38082ee2b15b8569fdf7e815730be6
 DIST openjdk-nashorn-8.265_p01.tar.bz2 2852124 BLAKE2B 380202d487e62e08784b7fd5cb720c22a2b93d802898b90bf2686bac803fe2bc41d8d4b3d56b45bfb45686a2976d208359818b17b96ccce73fd55b389f4d04af SHA512 12522a06f16f1c63d6b6df525011d01ff91ba05f06ee7ade239faa31527ca9aaa9fa609c1ad261f0ae8d75cc195fe1af66e026815bdc0669fb6a286a49f86a5e
-EBUILD openjdk-11.0.8_p10.ebuild 7652 BLAKE2B 9ab04d8e05b7ab65029db969bcfb828db8cb09e93e7e11076cd24f5e4907cc576be0242e1278e801648f26b58d7eeb9d87adc830cf615a433eaa2a72d1388f0e SHA512 2a4b8bbfac4ef720b3a5b29d0a8d5cf8ec09987722df791fecb45b1ca96837ff225bd6605b47073f819a53bb8cec7e2c701e464bc3ffb5dfeec93ae3e3f454c0
-EBUILD openjdk-8.265_p01.ebuild 7152 BLAKE2B 6f607268ae92dccc6fd174d120773548e3ba1299895ca037b27ff0940b190c21630b1c129a9a634d134c4e80fee81807e28b65135a5d6118e1147dc652217a9d SHA512 4fd5f162d7a7693eed69e3fb36d8f8c9be312f85f779f61ae2e80a97161c7166e90e070505605579c3d8d21e818f47eb4adeffe469914f4fa1ef105ae34ecb5f
+EBUILD openjdk-11.0.8_p10.ebuild 7665 BLAKE2B 087fead2616959a22311b7749a05ac3f03b3bcce437bc2717440e1ce128258df7cd31fcc94c5a6087270b50ec52b8e7a9039d2788f0eaafed579dc1d437d7514 SHA512 0efd99c0557f17e643e6bf209212fa5541a7a28ae48a006238c50a5fdf376215ae4e530473cb528d5f6694c32448fbe3b26d4bd0ae615efc8bb9e148c0464858
+EBUILD openjdk-8.265_p01.ebuild 7165 BLAKE2B 8d7318c14d51eb2e3ba3bd6f0d0074142c5afe47e8b7a24f13f37119d6ba50102531c16860acae7e95238ddbe1102b1467c7f41cdb34b26b2b8450632d445701 SHA512 0a92e089258ee125225c6baed40cc0e132a193912491a25d5c1f8c22f62b3f26aa5e0a0056b226d65ae933c4eeac18d60db254d4489c9e758831313446fc79b1
 MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0
diff --git a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild
index 403654841b0e..bce9c577d492 100644
--- a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild
@@ -88,7 +88,7 @@ openjdk_check_requirements() {
 pkg_pretend() {
 	openjdk_check_requirements
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
 	fi
 }
 
diff --git a/dev-java/openjdk/openjdk-8.265_p01.ebuild b/dev-java/openjdk/openjdk-8.265_p01.ebuild
index 038f2db6b3c0..93129b459fd5 100644
--- a/dev-java/openjdk/openjdk-8.265_p01.ebuild
+++ b/dev-java/openjdk/openjdk-8.265_p01.ebuild
@@ -107,7 +107,7 @@ openjdk_check_requirements() {
 pkg_pretend() {
 	openjdk_check_requirements
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+		has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
 	fi
 }
 
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 37509418908b..3a5afcbb6860 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,12 +1,10 @@
-DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
 DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
-EBUILD protobuf-java-3.10.1.ebuild 1406 BLAKE2B 2f8480fbaabbe978827ccc7ad5705dc0d84b7e399cb2e6bd8fc71ed913c1aeb8539de5d3dcecc2f0675090d9697fca3992002498e4600e0fc99ec277d29a0a77 SHA512 fcfdf674f13bf0ed963066b720c584a10f815e1c9f849448f7ab47b8530240036636f324598e8f9a2aed2076ff95312fca96da416a3a24b3a3ee4a537dfcb475
 EBUILD protobuf-java-3.11.4.ebuild 1406 BLAKE2B e340b1b5f90c401c29928ec99e4214f1f59dc20e759004af30dcde4d1666879b6399addd932dda56311c3e1aae258e4f7708edb4ce79c70e6c191c496a56510d SHA512 6946b5d21e0f6a3e79d324db108a425ebdc1517eb39cd89574a088814c0e87f74ef72094545a1860e2b8e86a14c1e9a61824c1171e39f0975ef05e74629443f3
 EBUILD protobuf-java-3.12.2.ebuild 1407 BLAKE2B 8cb3425f46c6abe6e0c45b8ca5c0b6e460f99b6bfaaa5e505364ed75e7da2411729c84ebd0e9a4cb082672c04f0cff74a025a43a3f9ca6f3746e75765b393e5f SHA512 965bdbc69bda2810a809672bfb1c35bd58bb89d9bc9abf3e959d42385d82745abe5a15eaac50c7ee7e3ea0306e29e70fc36d9a2d8713d07b95049d43297264e0
-EBUILD protobuf-java-3.12.4.ebuild 1407 BLAKE2B 8cb3425f46c6abe6e0c45b8ca5c0b6e460f99b6bfaaa5e505364ed75e7da2411729c84ebd0e9a4cb082672c04f0cff74a025a43a3f9ca6f3746e75765b393e5f SHA512 965bdbc69bda2810a809672bfb1c35bd58bb89d9bc9abf3e959d42385d82745abe5a15eaac50c7ee7e3ea0306e29e70fc36d9a2d8713d07b95049d43297264e0
-EBUILD protobuf-java-3.13.0.ebuild 1407 BLAKE2B 9beab81a4efe605df1e064a6f0aba18593ecca121d3c430e6fb362f86af8f4fe11285edb25e579aa8b5a4566ce3697763a8547c2ba40c7ef5f8d697ca7748ff7 SHA512 6320ebc0a8abde69c8063a510b2f2448419f0912988fcbdf0a991b76b59b8a1607bab9f1e5881face94a40ed7d2795ce6c5b4e9b9c18e34db1fe6a111115a202
-EBUILD protobuf-java-9999.ebuild 1331 BLAKE2B 618eaa7131820759feb68c280eaf968dce8caf6ee527acb0f2be9fed4d6641340dfd4663ed8e3f4dfec479d74fd0da80d421466a5aea5bc7f8b9608988d40f55 SHA512 b6d704eb44be00dd49d7c9fd7da33db993803ccd691f262ef9467794a4e55958a2b5ada5fa0e52a6727b58f6f4143763c1af865c115d3da43d099066984ab0e0
+EBUILD protobuf-java-3.12.4.ebuild 1489 BLAKE2B d614cccadfeb776ad3a0ce67472a15034c89f07102ae766190710b89013ecae6bc7eeb691f37fd08080bbe2a4faeb70b669f822ee06078a680cb0e182a785d47 SHA512 a647dab84ade743212c3a726391023b9e2807017f75727df7225c7249af0a4b8960e9f6af6b3fe74bb4359501e0ed33c253a751dcfb17e6a657ddf0f428221cf
+EBUILD protobuf-java-3.13.0.ebuild 1491 BLAKE2B 89744945affadfedc119a4f3cbb81d052a49ac36637b685ecde9fb624517c983c94e7270d266db29407f1eaa32ea1c423c733176efbfb28f54d0cc41d473b0a0 SHA512 df3c43ad470392787c3a1f014d985101bed023fb47e04b1b1e0caf491a7bb24901f3ab13a400cc5ad3b5eefb87d528fd1b679de8d4a9679850f843fbf7774dc2
+EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B 4c53b7d0594d82a3a0e6f2e2420a88855149ea7964bb5e9143e38f6dee438583e1e60a9e8b5c8dd011542512e7f62a4eff213012a9cd7fb3f6db6c3bfd1ffd9f SHA512 ee91c5417bfa9e26df1c83832babb9e0aa51cae7fbef8b1c22aa84cef538442d06c4953ee076a951c5d4843be265545ec1305800a8370aa4016021a690ff5bff
 MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
diff --git a/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
deleted file mode 100644
index 1389952ec4be..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/21"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-BDEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild b/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild
index 09a8150fe7e7..469fb243d1a3 100644
--- a/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.12.4.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
@@ -39,7 +39,10 @@ if [[ "${PV}" == "9999" ]]; then
 fi
 
 src_prepare() {
-	default
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
 	java-pkg-2_src_prepare
 }
 
diff --git a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
index 00495e65a87c..e26dfe9374b2 100644
--- a/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.13.0.ebuild
@@ -39,7 +39,10 @@ if [[ "${PV}" == "9999" ]]; then
 fi
 
 src_prepare() {
-	default
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
 	java-pkg-2_src_prepare
 }
 
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index fe8374195d67..8f4365200b10 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -39,7 +39,10 @@ if [[ "${PV}" == "9999" ]]; then
 fi
 
 src_prepare() {
-	default
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply_user
+	popd > /dev/null || die
+
 	java-pkg-2_src_prepare
 }
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ebbb9643755c..387f36d53a53 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 48cca60e0a25..76f35487e9a5 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -8,7 +8,6 @@ AUX epmd.service-r1 159 BLAKE2B ec50e4bfd89dc2d35fc2e549c695f9aae163d3df4d3c7a0d
 AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f907e6f8b1ec2730d2b98aad5405383742563e050bc6ffaae22d55a22998658460109fac9f6628458f5e976e9fbfe71cc26f1d64 SHA512 0fd7cbef64a9a54e0959d49b50096f9abc6fcede4360c153631c7f649f5c41b35ffb1f2d06f80964bf49421464bcc43c96147c227d60cf413c51b3e89ae9ad24
 DIST erlang-22.3.2.tar.gz 55856668 BLAKE2B d5d2ae17b8fb1b7c3da0c145e4e17d38e47d5291d6bc77228c9280eaa114630003f0e75cc0b6eafd21642a86448d8fd907d95c006cdfe6f18978e796e20585bd SHA512 02333fed57394012834452aff38d9a3340c52b109b14e444b6e7975ac3a65485de1deda6ae6c732a28f75ca2518000de576f70497118306699e35af5f249a0d1
 DIST erlang-22.3.4.tar.gz 55861416 BLAKE2B 881eb664ea449fa021cdb6daaeb998ea5f736eae0900ad67c1416c0e0e0888b212e1fd1fc0ee655f1c05821b56bae52f150c3f29c2eddbac205d2a6f2fce5494 SHA512 14e90efb40568a1fd7a32b82fcdf32df8ccbda938b9e538bb3b1a77d343ae16f5721abb3d47e8dd567d7aa91d1dea6da8b7ada8a5cd8d33c38ba324f1d65eca1
-DIST erlang-23.0.1.tar.gz 56387006 BLAKE2B 4ecbb5a4de0f83d80da179071d5bed7c6e7eca11f5f8f8c5681673967eaf6f0573240b9ac59e00e7162fdaa3d41e89b357263f47371f0ff9365b448a9f7cf4a9 SHA512 fc9114312327f2b7289078b29ae658a1100c860dfae03e892c1b316007b5ff286cfc301772b336eb1f5b983b3d5f507f03eff2917f418b1b9cb9714f42a59db4
 DIST erlang-23.0.2.tar.gz 56391276 BLAKE2B a9f3203a28dfb3a8abe93f7cabd34b7c34346cf400dbad751c180dcbe33c40761c74680ef7ed1a3221a69c0519f37183787463f659e5a10393404df95c59fbec SHA512 82764ab879ea7588de505c6d58716999dc207163d8dcded226fe6849a3239c00088cb614558b77c038dcad1440f9b2e3ca2b2f1251df5d71b423d3f6e7497c6e
 DIST erlang-23.0.3.tar.gz 56388263 BLAKE2B 58f41ab2956c93fbabc6b91f89e3c3f3c23a7dc7dc5473f1cf99817043aa18949933d6182e7e7daefa394529d2b2be8efb51462d8e7a8beb23ed70dbe2c0a319 SHA512 f7752bfa06dd283b36e330ba4270ee37ca759be697c804e6ac249becdc67de4bccb43f60a8d47f9a094d778f11fb17cf6d29de8ce60471aeb18c5fbd64cdfb4d
 DIST erlang_doc_html_22.3.tar.gz 34041790 BLAKE2B 76372acf5d6a581fb97cac9fa8230f1505650e9398d0a8e6ed163718f6d64cbbb3b7c79a1b7129827482345ddf950be4a5d83f0dac44e173f0ef45b148b73faa SHA512 9199b6229b73a22e271c232ce03b83b65c265367062d57ca5babd23a2f0a088fde3054b25c65c1bf2cb714cb70354ce4324aa8e865db72beb1f788c27389558c
@@ -17,7 +16,6 @@ DIST erlang_doc_man_22.3.tar.gz 1366911 BLAKE2B 89931e9ea4ef54526eb910d3b0a56711
 DIST erlang_doc_man_23.0.tar.gz 1383486 BLAKE2B 63a9989c26797fe07fbd0ccca0d8425d94bc60a86fa93b5332c8d1f3e12a0071d9e6d4759be73bf44bf35dd14723b9e6707a84ba834e1775bc28aeec1edbe168 SHA512 81575ce7b267f5bb48bd844808e8edd4e373640bbc481372b288602eb9d3c9917e6c7c040c035b63a2f6edf437c3d826d6afdf5801765b51d9edd4a3b2a5b16f
 EBUILD erlang-22.3.2.ebuild 4569 BLAKE2B cd3901f37bb9156c4f4b234aefdfb02fea06c9cde15622e428c73b05f29c70c02c82415359d1ad68f665b88a0a13d6e0177c46ea1b992cbd2d01af2f3912d2ef SHA512 ee49c37719ab86d5f2335336cccd9b9264906f8d9af315fc5abf7a5ff4564d38d763eee1c3450489117aaa69697bb2948c1f5cc9fd8401c7866423a620ce5ea5
 EBUILD erlang-22.3.4.ebuild 4574 BLAKE2B b55208b5f2c15f62d6687f3ad44e54f958323cb7ae771d4f3313acf5a57edc30a51e0f0c2477765a591a1b9035029094894d8776567bc4996bfa9a5ace1a0b72 SHA512 0d17ac78b892861017bd245444e06eefc52761da19eeb663aaa26b8ad099cc4b1fcfa553353651670f1a575a00ef06805b6e7db97c789cd3dc2fcfd1a3c1f68e
-EBUILD erlang-23.0.1.ebuild 4569 BLAKE2B cd3901f37bb9156c4f4b234aefdfb02fea06c9cde15622e428c73b05f29c70c02c82415359d1ad68f665b88a0a13d6e0177c46ea1b992cbd2d01af2f3912d2ef SHA512 ee49c37719ab86d5f2335336cccd9b9264906f8d9af315fc5abf7a5ff4564d38d763eee1c3450489117aaa69697bb2948c1f5cc9fd8401c7866423a620ce5ea5
 EBUILD erlang-23.0.2.ebuild 4574 BLAKE2B 09f50e6cd3bb9d1066e76b7642b758ae980158303472efd97ad3306a4d7ac64000eee51f126cbc28d2e5daa967081492d97f937d240673f9899413ac438dcbb8 SHA512 faf0daa84d3641e09c8fba82ad632ac08b8335b94b5e812dc66a3849508f8bd062698fc3dc9ee90927eb72f21f87d59c99f7da841d196f70e4ed15873ddfdbf8
 EBUILD erlang-23.0.3.ebuild 4579 BLAKE2B b7a52935662849574e256264fa0b58be9eb2da0475b9f4ea9400adb3c8677316138d2a747f38989d115ed77e90cf0ce60ee897401c55beaf16fd5bbe57ebf378 SHA512 22881fb4febeab72ba16aa63b568c102444e170ad27de09c73e3c8d115f4cc218f4723ff2c17ef0e8314853d88425ff3491aef8fd40bcd06deddb26d8082dba0
 MISC metadata.xml 834 BLAKE2B 1f394278eed4a3ac5e1c04f4ffced7042cc910d9e84ed4ad955cf91240446410f0ffbf1c138cc76cfa55d40c0eb0f110da98cd49c59df2b12ae70c13afd45a06 SHA512 7c067d233ffae83e4b1b55ba9e8adffe125d27f5f81401a4e4262d9b713b08bdaa4dd927570b2d32591092ca387372ee206e25e0b939ca721c96317fcd3d2be2
diff --git a/dev-lang/erlang/erlang-23.0.1.ebuild b/dev-lang/erlang/erlang-23.0.1.ebuild
deleted file mode 100644
index eefe9fc3c904..000000000000
--- a/dev-lang/erlang/erlang-23.0.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0"
-
-inherit 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"
-# We use this subslot because Compiled HiPE Code can be loaded on the exact
-# same build of ERTS that was used when compiling the code.  See
-# http://erlang.org/doc/system_principles/misc.html for more information.
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~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="
-	acct-group/epmd
-	acct-user/epmd
-	sys-libs/ncurses:0
-	sys-libs/zlib
-	emacs? ( >=app-editors/emacs-23.1:* )
-	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 )
-	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"
-)
-
-SITEFILE=50"${PN}"-gentoo.el
-
-src_prepare() {
-	default
-
-	./otp_build autoconf || die
-}
-
-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)
-		$(use_enable systemd)
-		$(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
-		# Note: we explicitly install docs into:
-		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
-		# To maintain that layout we gather everything in 'html-docs'.
-		# See bug #684376.
-		mkdir html-docs || die
-		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
-		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
-		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-r2 epmd
-	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
-	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 34149157162d..98b0cf899cf9 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -1,13 +1,4 @@
-AUX 0.9.2-include.patch 314 BLAKE2B 44f0f36503f9e2e9e588ef78a6d27fac00d2b63f5220a791fc90ac40fa90638731ac1f0989227b74eb6ad893420b781ef4ba005b75adab6459d2d6393ba16e6f SHA512 3dc426de776f004b9c9840f37af0002907036b6f9d370535c51a2ed6916156d34d640214bec2dba58c9553917c16b996b61194bf15bb3e1c6f2b6f81edb13a4c
-AUX 0.9.5-antlr.patch 3059 BLAKE2B abf4380e73e846960143c8c7e25ff7a81c99ae98c06750c7479f39c93cd1ec476d9adb9f6714e9d72c6797aa663f931c4446a48f7f407ed61523877515d23691 SHA512 2d8d47162fc0179319b728041421a72c965657023e396285de5ec2849b667e21117a587c771b88eb84c54f983747cb1635b7bfb0955762af1912efa88128593c
-AUX 0.9.5-png.patch 489 BLAKE2B d83cf980353485b8210bd888d41ee27254f89d850a4fb59381f27ed9905a87c0ef6d49f0b79c1c2148ecc624544d59b49cc3a5f1ee48a05d607aaa9777f9c36b SHA512 6a7b09286fb62ad18b57434804260a6155c1f4739d72a9ed440c6efe1d682b126a297885d092fbf0cb1e2809a663cb9c7755507c807613199b317f981df7cfc1
-AUX 0.9.6-disable-tests-hanging-under-xvfb-run.patch 1884 BLAKE2B 193e24b0842996f00773b1eec164a2c57eb40decefc7c80048aebec7ad51d7decfed55ad352e8fa911c4fa87a4376de88d14b5b01fa88ce3378edf8234c1b5b8 SHA512 00e97be57c6e278814d9bab8f41c294475f5bae3dad682d288814cec153b27adf1f45257851620dfdb450a184f39b621d5d8fa0c407c612e06c8639454c8f5f7
-AUX 0.9.6-fix-file-move.patch 639 BLAKE2B 664ced9bba24646ec2149e51af67866ed46ebb5941f2b9ab0a62b157088937549131d3fffb8abef60d85644feb8928030ad55e916af4d03059cd803415ce517e SHA512 761266807892aca4d9e8031ddf75b8066d364efc63c624151f6929ac74ee0d43dd4e7e189ba754bbb6d2b134f390f67fc919b33f0402ef8a221801ff678fb78a
-AUX 0.9.6-fix-python-function-call.patch 987 BLAKE2B 3cae08850e5a6ccccf90c072e9d965cbe79fec7c8a8234a1014f3264a9df30c2c43aa238519f3ed068cc7cab2e8344eecaddba574e2573bdaad8224fa36e290a SHA512 f75c8bee4dbbbdff6fbfe5fa5d41cdfda2acbfd4806e3233fb4d6b499680ea9e9653461a1f6686bf44738fa26fe49d22e14e6bf0e857fd9713655e9763103680
-AUX 0.9.6-formats.patch 4241 BLAKE2B 8513efa84b2f8b4f2a06ee0784df6e7194b59f321a95c00151eaf02caf92611baf2b92de7a5c520746718c802919b6e985774df67736c5fc89bd4b243d590612 SHA512 7f947b0a13d7a1f56df311ced9673cf9b85a77f351164a4162d386a35a5022ae4f914216a2d801b0a8a7e52341318d498e480cba1f9959b08500753150a6da07
-AUX 0.9.6-fun-fix.patch 2064 BLAKE2B 45d2f76e437cbd557460a51a6fd49881a8dde5c200b829dc3ace4a3f6483c74e5c528d57f0aae261bfe042d015ddab3fa8c2b773c6c911be8d105977db394d59 SHA512 e3bafb4803541442c39f35370cedf3e2a2dd4502f2011c72ff92eb9f1f846362e560da69ac60914c71fc0c759e186368cae644b6eff9baa78c057cee70d08bd9
-AUX 0.9.6-gcc6.patch 1255 BLAKE2B a529b29d007a0b71f1a1f2ecfc0940d73696ba97dc2a48bfd3be995d3d9e37b788b1fa6c1d13a7c63f2c5dbe2b07accfd86766f56f495f984baf0acb7ab6f27f SHA512 870231a918cd2d114ac31973bbd2c53733c3e64811c48eadf88c78f82a353aecf4d604e28dfa3a532efb3b0480e5d7209e8fad1fef793212027e89f53608c619
-AUX 0.9.6-python-use-path-and-startup.patch 682 BLAKE2B f4a3f07c7757e297a8a40056aad3f36705f035f8ca63dfd0d8c75dec15953b826d8074fbbf1b698ec8d9c92a4e364993c2eced1df3c86ef4a3915a17b2ed65ba SHA512 f6e20eadb6acfd3805d5f41bba8d90e9dba5230211577e0b47217638b97745dd921c657dad7adf935abeeb9316989554858976d915f14b79dc2082eb132f9418
-DIST gdl-0.9.6v2.tgz 1777167 BLAKE2B 4d92ed93f12e0979d591959d60ae9fa6785400e4f169a00f462103d263bce1aa02e615cc8467b53146791a12045850f9dae1da113f9caff4d6b44dd2a5798b3b SHA512 a816ee2e3822af380a1131a6138263c33560db7286cd699b864da305a1103d5afc881a1cd3574d2e243bfb7e65e759e46322c5e55c66ec15620d9c514565c2c5
-EBUILD gdl-0.9.6-r3.ebuild 4120 BLAKE2B 754ad88aab633d014a8c0bc16700001bc72bc4271792765ac7ea648f6a7ba33fee58fbe26694471cac44803a794181ac5163108c07a12310b072361837f856f9 SHA512 e639db3b5a75e450ef15fb54f8c2e90b3d9cedf19382f99a6ea4cd5e23903bbfa5c87029b976d357032b06a229243aa1217da8240ce3b2a3e54849e5072b9dc0
-MISC metadata.xml 1028 BLAKE2B bf82665c331acc8ebe611ea473e0ce9e68bef85cae01a89a5356c5db4a7b5c611fc580f5abbf116492d1b49c2f54379644c30cff099d2c0a7c6c317cb3a76aff SHA512 bbf8bafc0aa727148a15b800c096037ef4ad4f17de36ee76082fd51355d7e60a211faf57ddeb9ee1012258a78e67f948fca4c8a010dce891b1e0875cb088e23d
+AUX gdl-1.0.0_rc3-cmake.patch 3673 BLAKE2B 81ede9a3b1fc6147ab528f49efabb140ff505a687ac6a4c1c3f91f0d652b9d13b866ecaefc9d4106011207379afbf390ab1e395a45da63954fd25b0e80bc86f6 SHA512 b4407bf99154ad8e6ad5d7635273b51df6a49b62e06aa18ce420e046380bc27fda74c37e4559fa136d28b5b4723b23d325bfce1b3340208f4b79ee5e0ee6e9d1
+DIST gdl-1.0.0_rc3.tar.gz 32650313 BLAKE2B cdecfe0646e2271e2389e0a04f8da1e8de4534faf743f233169bccf326198025eff7fd7a7b62ed8bd05fa4a0222c6fd30f9469e3edf0f5b2991ef3ef545e616b SHA512 3fde22c7e709b9cdc72a23d2317c043037379c7903418211a699c7e5caa2ed17e78e32e6d2f9b4aa89200e729fc21555821140dfdd58a5a636a858e2841f6335
+EBUILD gdl-1.0.0_rc3.ebuild 3706 BLAKE2B 37eecea0adf2e4ee5f9be23ee82c7055c64ec5bc8e225868439e308832815150a73871077569036bb96857aecdfdb131015f1aaec7e60be4f96e79f783e36a8f SHA512 3e112af740afb1c548a8f18f74b1ce996e438f59270cd187ada7943459390b8ed42f0a13233df5476743ad23999791dd13a2bbe14833b6d0ea58cbc3bd63efa4
+MISC metadata.xml 1118 BLAKE2B 62643bcc8fb4f18696aaf9655818296bef05f32fe24c77d8a03b97820989e4281a714114b0dfd246b01e7ef496b810a0546e03406ae883cf2af17a65c462d1ad SHA512 b08af333e71c0cb79a09bc8643d7a38bbb607b3c003fadbe0a4c7d9036dbc0d9a8dcf5b9a7b99f47477608a31468540540576ee807c694878221294dd81e62ea
diff --git a/dev-lang/gdl/files/0.9.2-include.patch b/dev-lang/gdl/files/0.9.2-include.patch
deleted file mode 100644
index 49613da16e21..000000000000
--- a/dev-lang/gdl/files/0.9.2-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gdl-0.9.2.orig/src/cformat.g	2010-07-25 17:59:19.000000000 +0100
-+++ gdl-0.9.2/src/cformat.g	2012-06-21 16:34:12.000000000 +0100
-@@ -16,6 +16,7 @@
-  ***************************************************************************/
- 
- header "pre_include_cpp" {
-+#include <cstdlib>
- #include "includefirst.hpp"
- }
- 
diff --git a/dev-lang/gdl/files/0.9.5-antlr.patch b/dev-lang/gdl/files/0.9.5-antlr.patch
deleted file mode 100644
index f5b627ab444e..000000000000
--- a/dev-lang/gdl/files/0.9.5-antlr.patch
+++ /dev/null
@@ -1,91 +0,0 @@
- CMakeLists.txt               | 14 +++++++++++---
- CMakeModules/FindANTLR.cmake | 11 +++++++++++
- src/CMakeLists.txt           | 18 +++++++++++-------
- 3 files changed, 33 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 407e39a..c4b3278 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -111,6 +111,8 @@ set(SZIPDIR "" CACHE PATH "GDL: Specify the SZip directory tree")
- 
- set(GDL_DATA_DIR "/share/gnudatalanguage" CACHE PATH "GDL: data directory relative to CMAKE_INSTALL_PREFIX")
- 
-+set(BUNDLED_ANTLR OFF CACHE BOOL "Use bundled ANTLR grammar ?")
-+set(ANTLRDIR "" CACHE PATH "Specify the system ANTLR directory tree")
- 
- # check for 64-bit OS
- if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
-@@ -174,9 +176,15 @@ check_library_exists(m nexttoward "" HAVE_NEXTTOWARD)
- # mpi
- check_include_file(mpi.h HAVE_MPI_H)
- 
--# SA: whithout it compilation of antlr fails if there's a conflicting 
--#     version of antlr in system-wide directories
--include_directories(src)
-+if(BUNDLED_ANTLR)
-+  # SA: whithout it compilation of antlr fails if there's a conflicting 
-+  #     version of antlr in system-wide directories
-+  include_directories(src)
-+else(BUNDLED_ANTLR)
-+  find_package(ANTLR QUIET)
-+  set(LIBRARIES ${LIBRARIES} ${ANTLR_LIBRARIES})
-+  include_directories(${ANTLR_INCLUDE_DIR})
-+endif(BUNDLED_ANTLR)
- 
- if(WIN32 AND NOT CYGWIN)
- 	# For Win32 find Pdcureses instead of (N)Curses
-diff --git a/CMakeModules/FindANTLR.cmake b/CMakeModules/FindANTLR.cmake
-new file mode 100644
-index 0000000..b61cc5b
---- /dev/null
-+++ b/CMakeModules/FindANTLR.cmake
-@@ -0,0 +1,11 @@
-+
-+
-+find_library(ANTLR_LIBRARIES NAMES antlr)
-+find_path(ANTLR_INCLUDE_DIR NAMES antlr/ANTLRUtil.hpp)
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(ANTLR DEFAULT_MSG ANTLR_LIBRARIES ANTLR_INCLUDE_DIR)
-+
-+mark_as_advanced(
-+ANTLR_LIBRARIES
-+ANTLR_INCLUDE_DIR
-+)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1f7ffec..776a1fd 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -262,9 +262,8 @@ widget.cpp
- widget.hpp
- )
- 
--add_subdirectory(antlr)
- 
--include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
-+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR})
- link_directories(${LINK_DIRECTORIES})
- 
- if(PYTHON_MODULE) #libgdl
-@@ -275,11 +274,16 @@ else(PYTHON_MODULE) #gdl
- 	add_executable(gdl ${SOURCES})
- endif(PYTHON_MODULE)
- 
--add_dependencies(gdl antlr) # be sure that antlr is built before gdl
--target_link_libraries(gdl antlr) # link antlr against gdl
--if (MINGW)
--target_link_libraries(gdl ws2_32)
--endif (MINGW)
-+if(BUNDLED_ANTLR)
-+  add_subdirectory(antlr)
-+  include_directories(${CMAKE_SOURCE_DIR}/src/antlr)
-+  add_dependencies(gdl antlr) # be sure that antlr is built before gdl
-+  target_link_libraries(gdl antlr) # link antlr against gdl
-+  if (MINGW)
-+    target_link_libraries(gdl ws2_32)
-+  endif (MINGW)
-+endif(BUNDLED_ANTLR)
-+
- target_link_libraries(gdl ${LIBRARIES})
- add_definitions(-DHAVE_CONFIG_H)
- 
diff --git a/dev-lang/gdl/files/0.9.5-png.patch b/dev-lang/gdl/files/0.9.5-png.patch
deleted file mode 100644
index 1140fcc9ac75..000000000000
--- a/dev-lang/gdl/files/0.9.5-png.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 407e39a..f24a087 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -270,7 +270,6 @@ if(PNGLIB)
- 	set(USE_PNGLIB ${PNG_FOUND})
- 	if(PNG_FOUND)
- 		set(LIBRARIES ${LIBRARIES} ${PNG_LIBRARIES})
--		set(LINK_DIRECTORIES ${LINK_DIRECTORIES} ${PNG_LIBRARY_DIRS})
- 		include_directories(${PNG_INCLUDE_DIRS})
- 	else(PNG_FOUND)
- 		message(FATAL_ERROR "libpng is required but was not found.\n"
diff --git a/dev-lang/gdl/files/0.9.6-disable-tests-hanging-under-xvfb-run.patch b/dev-lang/gdl/files/0.9.6-disable-tests-hanging-under-xvfb-run.patch
deleted file mode 100644
index 6ce92aff0ab7..000000000000
--- a/dev-lang/gdl/files/0.9.6-disable-tests-hanging-under-xvfb-run.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Disable tests which work fine with local X but hang under xvfb-run
-Author: Axel Beckert <abe@debian.org>
-Last-Update: 2014-10-10
-
---- a/testsuite/Makefile.am
-+++ b/testsuite/Makefile.am
-@@ -18,7 +18,6 @@
-   test_bug_2876372.pro \
-   test_bug_2892631.pro \
-   test_bug_2949487.pro \
--  test_bug_2974380.pro \
-   test_bug_3033108.pro \
-   test_bug_3054361.pro \
-   test_bug_3055720.pro \
-@@ -43,7 +42,6 @@
-   test_bug_3152899.pro \
-   test_bug_3189072.pro \
-   test_bug_3199465.pro \
--  test_bug_3275334.pro \
-   test_bug_3285659.pro \
-   test_bug_3286031.pro \
-   test_bug_3288652.pro \
-@@ -74,16 +72,12 @@
-   test_ce.pro \
-   test_clip.pro \
-   test_common.pro \
--  test_congrid.pro \
-   test_constants.pro \
-   test_convert_coord.pro \
-   test_correlate.pro \
-   test_deriv.pro \
--  test_device.pro \
-   test_dicom.pro \
-   test_erfinv.pro \
--  test_execute.pro \
--  test_extra_keywords.pro \
-   test_fft.pro \
-   test_fft_dim.pro \
-   test_fft_leak.pro \
-@@ -122,7 +116,6 @@
-   test_memory.pro \
-   test_message.pro \
-   test_modulo.pro \
--  test_moment.pro \
-   test_mpfit.pro \
-   test_multiroots.pro \
-   test_nans_in_sort_and_median.pro \
-@@ -130,10 +123,8 @@
-   test_netcdf.pro \
-   test_null.pro \
-   test_obj_new.pro \
--  test_plot_oo.pro \
-   test_plotting_ranges.pro \
-   test_pmulti.pro \
--  test_pmulti_basic.pro \
-   test_postscript.pro \
-   test_product.pro \
-   test_ps_decomposed.pro \
-@@ -144,7 +135,6 @@
-   test_python_module_2.pro \
-   test_qromb.pro \
-   test_qromo.pro \
--  test_random.pro \
-   test_readf.pro \
-   test_reads.pro \
-   test_rebin.pro \
-@@ -167,13 +157,11 @@
-   test_suite.pro \
-   test_systime.pro \
-   test_trisol.pro \
--  test_tv.pro \
-   test_typename.pro \
-   test_url.pro \
-   test_voigt.pro \
-   test_wait.pro \
-   test_wavelet.pro \
--  test_window_background.pro \
-   test_where.pro \
-   test_zeropoly.pro \
-   test_zip.pro \
diff --git a/dev-lang/gdl/files/0.9.6-fix-file-move.patch b/dev-lang/gdl/files/0.9.6-fix-file-move.patch
deleted file mode 100644
index 31d4f066f49c..000000000000
--- a/dev-lang/gdl/files/0.9.6-fix-file-move.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Remove trailing slash at the end of dir when moving files specified by wildcard
-Forwarded: https://sourceforge.net/p/gnudatalanguage/patches/97/
---- a/src/pro/file_move.pro
-+++ b/src/pro/file_move.pro
-@@ -31,7 +31,7 @@
-         res=FILE_SEARCH(dir, FILE_BASENAME(source[ii]), /fully)
- 
-         for jj=0,N_ELEMENTS(res)-1 do begin
--            if(FILE_DIRNAME(res[jj], /MARK_DIRECTORY) eq dir) then flist=[flist, res[jj]] ;
-+            if(FILE_DIRNAME(res[jj]) eq dir) then flist=[flist, res[jj]] ;
-             ;print, 'dir ', dir, ' res ', FILE_DIRNAME(res[jj])
-         endfor
- 
diff --git a/dev-lang/gdl/files/0.9.6-fix-python-function-call.patch b/dev-lang/gdl/files/0.9.6-fix-python-function-call.patch
deleted file mode 100644
index fe90774e5c7b..000000000000
--- a/dev-lang/gdl/files/0.9.6-fix-python-function-call.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Bug: https://sourceforge.net/p/gnudatalanguage/bugs/377
-Bug: https://sourceforge.net/p/gnudatalanguage/bugs/679
-Forwarded: https://sourceforge.net/p/gnudatalanguage/patches/91
- https://sourceforge.net/p/gnudatalanguage/patches/92
-Description: Fix Python calling GDL functions
- * user defined functions crash
- * data arrays of 64 bit element size are not completely converted to Python
---- a/src/pythongdl.cpp
-+++ b/src/pythongdl.cpp
-@@ -329,7 +329,7 @@
- 		  }
- 	      }
- 	  
--	    sub = proList[ proIx];
-+	    sub = funList[ proIx];
- 	  }
-       }
-     else
---- a/src/topython.cpp
-+++ b/src/topython.cpp
-@@ -67,7 +67,7 @@
-     // TODO: free the memory:  PyArray_Free(PyObject* op, void* ptr) ?
-     throw GDLException("Failed to convert array to python.");
-   }
--  memcpy(PyArray_DATA(ret), DataAddr(), this->N_Elements() * sizeof(Sp::t));
-+  memcpy(PyArray_DATA(ret), DataAddr(), this->N_Elements() * Data_<Sp>::Sizeof());
-   return ret;
- }
- 
diff --git a/dev-lang/gdl/files/0.9.6-formats.patch b/dev-lang/gdl/files/0.9.6-formats.patch
deleted file mode 100644
index 105fa9cb8eff..000000000000
--- a/dev-lang/gdl/files/0.9.6-formats.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -up gdl-0.9.6/testsuite/test_formats.pro.formats gdl-0.9.6/testsuite/test_formats.pro
---- gdl-0.9.6/testsuite/test_formats.pro.formats	2015-09-06 13:15:01.000000000 -0600
-+++ gdl-0.9.6/testsuite/test_formats.pro	2016-01-12 14:26:18.811283030 -0700
-@@ -13,6 +13,10 @@
- ;    is OK for negative input, wrong for positive one !!
- ; -- extra "\ ^J" added in GDL between the Re/Im parts for (D)Complex
- ;
-+; Changes: 
-+; 2016-01612 : AC various changes for better managing paths,
-+;              expecially for Cmake automatic tests !
-+;
- ; md5sum of current version of "formats.idl" (-1 et 12 ...)
- ; 5d1cfbc31312a833f62033e297f986a2  formats.idl
- ;
-@@ -53,7 +57,10 @@ end
- pro GENERATE_FORMATS_FILE, nb_cases, verbose=verbose, test=test
- ;
- filename='formats.'+GDL_IDL_FL()
--;
-+if FILE_TEST(filename) then begin
-+    FILE_MOVE, filename, filename+'_old', /overwrite
-+    MESSAGE,/cont, 'Copy of old file <<'+filename+'_old'+'>> done.'
-+endif
- ; value to be write : one negative, one positive
- ;
- struct_neg = {BYTE:-1b,short:-1us,ushort:-1us, $
-@@ -104,17 +111,53 @@ soft=GDL_IDL_FL(/verbose)
- ;
- GENERATE_FORMATS_FILE, nb_cases, verbose=verbose
- ;
--if (soft NE 'idl') AND ~FILE_TEST("formats.idl") then MESSAGE, "missing reference file <<formats.idl>>"
-+; locating then read back the reference idl.xdr:
-+;
-+; we need to add the current dir. into the path because new file(s)
-+; are writtent in it. Do we have a simple way to check whether a dir
-+; is already in !PATH ?
-+;
-+CD, current=current
-+new_path=!path+PATH_SEP(/SEARCH_PATH)+current
-+list_of_dirs=STRSPLIT(new_path, PATH_SEP(/SEARCH_PATH), /EXTRACT)
-+;
-+; only this reference file is mandatory !
-+;
-+filename='formats.idl'
-+file_fmt_idl=FILE_SEARCH(list_of_dirs+PATH_SEP()+filename)
-+;
-+if (soft NE 'idl') AND (STRLEN(file_fmt_idl) EQ 0) then begin
-+    MESSAGE, 'reference file <<'+filename+'>> not found in the !PATH', /continue
-+    if KEYWORD_SET(no_exit) OR KEYWORD_SET(test) then STOP
-+    EXIT, status=1
-+endif
-+if N_ELEMENTS(file_fmt_idl) GT 1 then print, 'multiple reference file <<'+filename+'>> found !'
-+file_fmt_idl=file_fmt_idl[0]
-+;
-+filename='formats.gdl'
-+file_fmt_gdl=FILE_SEARCH(list_of_dirs+PATH_SEP()+filename)
-+if N_ELEMENTS(file_fmt_gdl) GT 1 then begin
-+    print, 'multiple reference file <<'+filename+'>> found ! First used !!'
-+    print, TRANSPOSE(file_fmt_gdl)
-+    file_fmt_gdl=file_fmt_gdl[0]
-+endif
-+;
-+filename='formats.fl'
-+file_fmt_fl=FILE_SEARCH(list_of_dirs+PATH_SEP()+filename)
-+if N_ELEMENTS(file_fmt_fl) GT 1 then begin
-+    print, 'multiple reference file <<'+filename+'>> found !'
-+    print, TRANSPOSE(file_fmt_fl)
-+    file_fmt_fl=file_fmt_fl[0]
-+endif
- ;
- if (soft EQ 'idl') then begin
--   if ~FILE_TEST("formats.gdl") then MESSAGE, /cont, "missing file <<formats.gdl>>"
--   if ~FILE_TEST("formats.fl") then MESSAGE, /cont, "missing file <<formats.fl>>"
--   if ~FILE_TEST("formats.gdl") AND ~FILE_TEST("formats.fl") then begin
--      MESSAGE, /cont, "No useful file found for comparison. Just Reference file written."
--   endif
--   if FILE_TEST("formats.gdl") then soft='gdl' else begin
--         if FILE_TEST("formats.fl") then soft='fl'
--   endelse
-+    soft=''
-+    if ~FILE_TEST(file_fmt_fl) then MESSAGE, /cont, "missing file <<formats.fl>>" else soft='fl'
-+    if ~FILE_TEST(file_fmt_gdl) then MESSAGE, /cont, "missing file <<formats.gdl>>" else soft='gdl'
-+    if (soft EQ '') then begin
-+        MESSAGE, /cont, "No useful file found for comparison. Just Reference file written."
-+        return
-+    endif
- endif
- ;
- ; reading back the 2 files : one created ("formats.gdl" or
-@@ -123,9 +166,10 @@ endif
- print, "Files to be compared : formats.idl, formats."+soft
- ;
- GET_LUN, lun1
--OPENR, lun1, "formats.idl"
-+OPENR, lun1, file_fmt_idl
- GET_LUN, lun2
--OPENR, lun2, "formats."+soft
-+if (soft EQ 'gdl') then OPENR, lun2, file_fmt_gdl
-+if (soft EQ 'fl') then OPENR, lun2, file_fmt_fl
- ;
- ref=STRING("")
- val=STRING("")
-@@ -155,7 +199,7 @@ CLOSE, lun1, lun2
- FREE_LUN, lun1, lun2
- ;
- if (nb_errors GT 0) then begin
--   MESSAGE, /continue, 'Using a "diff formats.idl formats.gdl" in a shell'
-+   MESSAGE, /continue, 'Using a "diff formats.idl formats.{gdl|fl}" in a shell'
-    MESSAGE, /continue, 'should help to debug !'
- endif
- ;
diff --git a/dev-lang/gdl/files/0.9.6-fun-fix.patch b/dev-lang/gdl/files/0.9.6-fun-fix.patch
deleted file mode 100644
index a3a4118ceb0a..000000000000
--- a/dev-lang/gdl/files/0.9.6-fun-fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Author: Vitaliy Tomin <highwaystar@users.sf.net>
-Description: Fix direct calling of direct function calls from Python
-Bug: https://sourceforge.net/p/gnudatalanguage/bugs/678
---- a/src/pythongdl.cpp
-+++ b/src/pythongdl.cpp
-@@ -392,25 +392,31 @@
-     
-     BaseGDL* retValGDL = NULL;
-     Guard<BaseGDL> retValGDL_guard;
--    if( functionCall)
--      {
--	if( libCall) 
--	  retValGDL = static_cast<DLibFun*>(static_cast<EnvT*>(e)->
--					    GetPro())->Fun()( static_cast<EnvT*>(e));
--	else
--	  retValGDL = interpreter->call_fun(static_cast<DSubUD*>
--					    (static_cast<EnvUDT*>(e)
--					     ->GetPro())->GetTree());
--	retValGDL_guard.Reset( retValGDL);
--      }
--    else
--      {
--	if( libCall) 
--	  static_cast<DLibPro*>(e->GetPro())->Pro()(static_cast<EnvT*>(e)); // throws
--	else
--	  interpreter->call_pro(static_cast<DSubUD*>
--				(e->GetPro())->GetTree()); //throws
--      }
-+
-+    if (functionCall) {
-+        DLibFun* sub_fun_chk = dynamic_cast<DLibFun *>(static_cast<EnvT *>(e)->GetPro());
-+        if (sub_fun_chk) {
-+            //handle direct call function first
-+            if (sub_fun_chk->DirectCall()) {
-+                BaseGDL* directCallParameter = e->GetParDefined(0);
-+                retValGDL = static_cast<DLibFunDirect*>(sub_fun_chk)->FunDirect()(directCallParameter, true /*isReference*/);
-+            }
-+        } else if (libCall)
-+        retValGDL = static_cast<DLibFun *>(static_cast<EnvT *>(e)->GetPro())
-+                        ->Fun()(static_cast<EnvT *>(e));
-+      else
-+        retValGDL = interpreter->call_fun(
-+            static_cast<DSubUD *>(static_cast<EnvUDT *>(e)->GetPro())
-+                ->GetTree());
-+      retValGDL_guard.Reset(retValGDL);
-+    } else {
-+      if (libCall)
-+        static_cast<DLibPro *>(e->GetPro())
-+            ->Pro()(static_cast<EnvT *>(e)); // throws
-+      else
-+        interpreter->call_pro(
-+            static_cast<DSubUD *>(e->GetPro())->GetTree()); // throws
-+    }
- 
-     // copy back args and keywords
-     success = CopyArgToPython( parRef, kwRef, *e, argTuple, kwDict);
diff --git a/dev-lang/gdl/files/0.9.6-gcc6.patch b/dev-lang/gdl/files/0.9.6-gcc6.patch
deleted file mode 100644
index e017255b0bef..000000000000
--- a/dev-lang/gdl/files/0.9.6-gcc6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up gdl-0.9.6/src/specializations.hpp.gcc6 gdl-0.9.6/src/specializations.hpp
---- gdl-0.9.6/src/specializations.hpp.gcc6	2015-08-24 15:26:47.000000000 -0600
-+++ gdl-0.9.6/src/specializations.hpp	2016-03-03 16:30:46.694379312 -0700
-@@ -534,16 +534,6 @@ void Data_<SpDString>::MinMax( DLong* mi
- 
- // default_io.cpp
- template<>  
--std::istream& operator>>(std::istream& i, Data_<SpDFloat>& data_); 
--template<>  
--std::istream& operator>>(std::istream& i, Data_<SpDDouble>& data_); 
--template<>  
--std::istream& operator>>(std::istream& i, Data_<SpDComplex>& data_); 
--template<>  
--std::istream& operator>>(std::istream& i, Data_<SpDComplexDbl>& data_); 
--template<>  
--std::istream& operator>>(std::istream& is, Data_<SpDString>& data_); 
--template<>  
- std::ostream& Data_<SpDLong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr); 
- template<>  
- std::ostream& Data_<SpDULong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr); 
---- gdl-0.9.6/src/typedefs.hpp.gcc6	2014/08/09 15:33:29	1.76
-+++ gdl-0.9.6/src/typedefs.hpp	2016/02/04 22:48:46	1.77
-@@ -235,7 +235,7 @@
-   
-   Guard& operator=( Guard& r)
-   {
--    if( &r == this) return;
-+    if( &r == this) return *this;
-     delete guarded;
-     guarded = r.guarded;
-     r.guarded = NULL;
diff --git a/dev-lang/gdl/files/0.9.6-python-use-path-and-startup.patch b/dev-lang/gdl/files/0.9.6-python-use-path-and-startup.patch
deleted file mode 100644
index a76cd8cb6275..000000000000
--- a/dev-lang/gdl/files/0.9.6-python-use-path-and-startup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Ole Streicher <olebole@debian.org>
-Description: Initialize GDL path if one is defined
-Forwarded: https://sourceforge.net/p/gnudatalanguage/patches/93/
---- a/src/pythongdl.cpp
-+++ b/src/pythongdl.cpp
-@@ -537,6 +537,14 @@
-     // instantiate the interpreter (creates $MAIN$ environment)
-     interpreter = new DInterpreter();
- 
-+    string gdlPath=GetEnvString("GDL_PATH");
-+    if( gdlPath == "") gdlPath=GetEnvString("IDL_PATH");
-+    if( gdlPath == "")
-+      {
-+        gdlPath = "+" GDLDATADIR "/lib";
-+      }
-+    SysVar::SetGDLPath( gdlPath);
-+
-     PyObject* m = Py_InitModule("GDL", GDLMethods);
- 
-     gdlError = PyErr_NewException((char*)"GDL.error", NULL, NULL);
diff --git a/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch b/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch
new file mode 100644
index 000000000000..dd7abcc54d90
--- /dev/null
+++ b/dev-lang/gdl/files/gdl-1.0.0_rc3-cmake.patch
@@ -0,0 +1,94 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -206,10 +206,6 @@
+ # mpi
+ check_include_file(mpi.h HAVE_MPI_H)
+ 
+-# SA: whithout it compilation of antlr fails if there's a conflicting 
+-#     version of antlr in system-wide directories
+-include_directories(src)
+-
+ if (NOT WIN32)
+     # Ncurses MANDATORY for readline on POSIX
+     # -DNCURSESDIR=DIR
+@@ -399,8 +395,10 @@
+ 
+ # PLplot MANDATORY
+ # -DPLPLOTDIR=DIR
+-set(CMAKE_PREFIX_PATH ${PLPLOTDIR})
+-find_package(Plplot QUIET)
++
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(PLPLOT REQUIRED plplot plplot-c++)
++
+ set(HAVE_LIBPLPLOTCXXD ${PLPLOT_FOUND})
+ if(PLPLOT_FOUND)
+     set(LIBRARIES ${LIBRARIES} ${PLPLOT_LIBRARIES})
+@@ -490,33 +488,16 @@
+ # -DMAGICK=ON|OFF
+ # -DMAGICKDIR=DIR
+ if(MAGICK)
+-  set(CMAKE_PREFIX_PATH ${MAGICKDIR})
+-  find_package(ImageMagick QUIET COMPONENTS Magick++ MagickWand MagickCore)
+-  mark_as_advanced(ImageMagick_EXECUTABLE_DIR ImageMagick_Magick++_INCLUDE_DIR ImageMagick_Magick++_LIBRARY
+-    ImageMagick_MagickCore_INCLUDE_DIR ImageMagick_MagickCore_LIBRARY ImageMagick_MagickWand_INCLUDE_DIR ImageMagick_MagickWand_LIBRARY)
+-  set(USE_MAGICK ${ImageMagick_FOUND})
+-  if(ImageMagick_FOUND)
+-    find_program(MAGICKXXCONFIG Magick++-config)
+-    if(MAGICKXXCONFIG)
+-      execute_process(COMMAND ${MAGICKXXCONFIG} "--libs" OUTPUT_VARIABLE MAGICKXXCONFIGLIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+-      set(LIBRARIES ${LIBRARIES} ${MAGICKXXCONFIGLIBS})     
+-    else(MAGICKXXCONFIG)
+-      message(FATAL_ERROR "ImageMagick is required but was not found (Magick++-config).\n"
+-    "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n"
+-    "Use -DMAGICK=OFF to not use it.\n"
+-        "(suitable Debian/Ubuntu package: libmagick++-dev)\n"
+-        "(suitable Fedora/CentOS package: ImageMagick-c++-devel)")
+-    endif(MAGICKXXCONFIG)
+-    set(LIBRARIES ${LIBRARIES} ${ImageMagick_LIBRARIES})
+-    include_directories(${ImageMagick_INCLUDE_DIRS})
+-    set(MAGICK_LIBRARIES ${ImageMagick_LIBRARIES})
+-  else(ImageMagick_FOUND)
+-    message(FATAL_ERROR "ImageMagick is required but was not found.\n"
+-      "Use -DMAGICKDIR=DIR to specify the ImageMagick directory.\n"
+-      "Use -DMAGICK=OFF to not use it.\n"
+-      "(suitable Debian/Ubuntu package: libmagick++-dev)\n"
+-      "(suitable Fedora/CentOS package: ImageMagick-c++-devel)")
+-  endif(ImageMagick_FOUND)
++  find_package(PkgConfig REQUIRED)
++  pkg_check_modules(Magick++ REQUIRED Magick++)
++  pkg_check_modules(MagickWand REQUIRED MagickWand)
++  pkg_check_modules(MagickCore REQUIRED MagickCore)
++
++  set(MAGICK_LIBRARIES ${Magick++_LIBRARIES} ${MagickWand_LIBRARIES} ${MagickCore_LIBRARIES})
++  set(LIBRARIES ${LIBRARIES} ${MAGICK_LIBRARIES})
++  include_directories(${Magick++_INCLUDE_DIRS})
++  include_directories(${MagickWand_INCLUDE_DIRS})
++  include_directories(${MagickCore_INCLUDE_DIRS})
+ endif(MAGICK)
+ 
+ # if GM or IM activated, we check whether Plplot is OK for that
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -186,9 +186,9 @@
+ )
+ endif(USE_EXPAT)
+ 
+-add_subdirectory(antlr)
++find_library(ANTLR_LIBRARY NAMES antlr)
+ 
+-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/antlr ${CMAKE_BINARY_DIR})
++include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+ link_directories(${LINK_DIRECTORIES})
+ 
+ if(PYTHON_MODULE) #GDL.so
+@@ -203,8 +203,7 @@
+ 	add_executable(gdl ${SOURCES})
+ endif(PYTHON_MODULE)
+ 
+-add_dependencies(gdl antlr) # be sure that antlr is built before gdl
+-target_link_libraries(gdl antlr) # link antlr against gdl
++target_link_libraries(gdl ${ANTLR_LIBRARY}) # link antlr against gdl
+ if (MINGW)
+ target_link_libraries(gdl ws2_32)
+ endif (MINGW)
diff --git a/dev-lang/gdl/gdl-0.9.6-r3.ebuild b/dev-lang/gdl/gdl-0.9.6-r3.ebuild
deleted file mode 100644
index 3a51f5b1f4b9..000000000000
--- a/dev-lang/gdl/gdl-0.9.6-r3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx
-
-DESCRIPTION="GNU Data Language"
-HOMEPAGE="https://github.com/gnudatalanguage/gdl"
-SRC_URI="mirror://sourceforge/gnudatalanguage/${P}v2.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+eigen fftw graphicsmagick gshhs hdf hdf5 +imagemagick netcdf openmp
-	  png proj postscript python static-libs udunits wxwidgets"
-
-RDEPEND="
-	dev-cpp/antlr-cpp:2=
-	sci-libs/gsl:0=
-	sci-libs/plplot:0=[-dynamic]
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	x11-libs/libX11:0=
-	fftw? ( sci-libs/fftw:3.0= )
-	gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= )
-	hdf? ( sci-libs/hdf:0= )
-	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	netcdf? ( sci-libs/netcdf )
-	proj? ( sci-libs/proj )
-	postscript? ( dev-libs/pslib )
-	python? (
-		${PYTHON_DEPS}
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)
-	udunits? ( sci-libs/udunits )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	dev-java/antlr:0[java(+),script(+)]
-	virtual/pkgconfig
-	eigen? ( dev-cpp/eigen:3 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/0.9.2-include.patch
-	"${FILESDIR}"/0.9.5-antlr.patch
-	"${FILESDIR}"/0.9.5-png.patch
-	"${FILESDIR}"/0.9.6-fix-file-move.patch
-	"${FILESDIR}"/0.9.6-fix-python-function-call.patch
-	"${FILESDIR}"/0.9.6-fun-fix.patch
-	"${FILESDIR}"/0.9.6-python-use-path-and-startup.patch
-	"${FILESDIR}"/0.9.6-disable-tests-hanging-under-xvfb-run.patch
-	"${FILESDIR}"/0.9.6-gcc6.patch
-	"${FILESDIR}"/0.9.6-formats.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	use wxwidgets && need-wxwidgets unicode
-	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-
-	# make sure antlr includes are from system and rebuild the sources with it
-	# https://sourceforge.net/p/gnudatalanguage/patches/39/
-	rm -r src/antlr || die
-	einfo "Regenerating grammar"
-	pushd src >/dev/null || die
-	local i
-	for i in *.g; do
-		antlr ${i} || die
-	done
-	popd >/dev/null || die
-
-	# gentoo: avoid install files in datadir directory
-	# and manually install them in src_install
-	sed -e '/AUTHORS/d' -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# MPI is still very buggy
-	# x11=off does not compile
-	local mycmakeargs=(
-		-DMPICH=OFF
-		-DBUNDLED_ANTLR=OFF
-		-DX11=ON
-		-DEIGEN3="$(usex eigen)"
-		-DFFTW="$(usex fftw)"
-		-DGRIB=OFF
-		-DGSHHS="$(usex gshhs)"
-		-DHDF="$(usex hdf)"
-		-DHDF5="$(usex hdf5)"
-		-DLIBPROJ4="$(usex proj)"
-		-DNETCDF="$(usex netcdf)"
-		-DOPENMP="$(usex openmp)"
-		-DPNGLIB="$(usex png)"
-		-DPSLIB="$(usex postscript)"
-		-DUDUNITS="$(usex udunits)"
-		-DWXWIDGETS="$(usex wxwidgets)"
-	)
-
-	if use imagemagick; then
-		if use graphicsmagick; then
-			mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF )
-		else
-			mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON )
-		fi
-	else
-		mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF )
-	fi
-
-	configuration() {
-		mycmakeargs+=( $@ )
-		cmake-utils_src_configure
-	}
-	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
-	use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use python && python_foreach_impl cmake-utils_src_make
-}
-
-src_test() {
-	# there is check target instead of the ctest to define some LDPATH
-	virtx emake -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use python; then
-		installation() {
-			mv src/libgdl.so GDL.so || die
-			python_domodule GDL.so
-		}
-		python_foreach_impl run_in_build_dir installation
-		dodoc PYTHON.txt
-	fi
-	#dodoc AUTHORS README
-	echo "GDL_PATH=\"+${EPREFIX}/usr/share/gnudatalanguage\"" > 50gdl || die
-	doenvd 50gdl
-}
diff --git a/dev-lang/gdl/gdl-1.0.0_rc3.ebuild b/dev-lang/gdl/gdl-1.0.0_rc3.ebuild
new file mode 100644
index 000000000000..b5fb1c358bcb
--- /dev/null
+++ b/dev-lang/gdl/gdl-1.0.0_rc3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{6..9} )
+
+# gdl's build system is a travesty, and actually calls
+# itself in the testsuite, which is something that ninja
+# obviously doesn't support.
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake python-r1 toolchain-funcs virtualx wxwidgets
+
+DESCRIPTION="GNU Data Language"
+HOMEPAGE="https://github.com/gnudatalanguage/gdl"
+SRC_URI="https://github.com/gnudatalanguage/gdl/archive/v$(ver_cut 1-3)-rc.$(ver_cut 5).tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+eigen fftw glpk graphicsmagick gshhs hdf hdf5 +imagemagick netcdf
+	openmp png proj postscript python tiff udunits wxwidgets"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-cpp/antlr-cpp:2=
+	dev-libs/expat
+	sci-libs/gsl:0=
+	sci-libs/plplot:0=[cxx,-dynamic]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	x11-libs/libX11
+	fftw? ( sci-libs/fftw:3.0= )
+	glpk? ( sci-mathematics/glpk:= )
+	gshhs? (
+		sci-geosciences/gshhs-data
+		sci-geosciences/gshhs:0=
+	)
+	hdf? ( sci-libs/hdf:0= )
+	hdf5? ( sci-libs/hdf5:0= )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	netcdf? ( sci-libs/netcdf )
+	proj? ( sci-libs/proj )
+	postscript? ( dev-libs/pslib )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	tiff? (
+		media-libs/tiff
+		sci-libs/libgeotiff
+	)
+	udunits? ( sci-libs/udunits )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	eigen? ( dev-cpp/eigen:3 )"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( app-admin/chrpath )"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)-rc.$(ver_cut 5)"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0_rc3-cmake.patch )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	use wxwidgets && setup-wxwidgets unicode
+	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+
+	# remove bundled antlr
+	rm -r src/antlr || die
+
+	# gentoo: avoid install files in datadir directory
+	# and manually install them in src_install
+	sed -e '/AUTHORS/d' -i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# MPI is still very buggy
+	# x11=off does not compile
+	local mycmakeargs=(
+		-DMPI=OFF
+		-DREADLINE=ON
+		-DX11=ON
+		-DEXPAT=ON
+		-DEIGEN3=$(usex eigen)
+		-DFFTW=$(usex fftw)
+		-DGRIB=OFF
+		-DGLPK=$(usex glpk)
+		-DHDF=$(usex hdf)
+		-DHDF5=$(usex hdf5)
+		-DLIBPROJ4=$(usex proj)
+		-DNETCDF=$(usex netcdf)
+		-DOPENMP=$(usex openmp)
+		-DPNGLIB=$(usex png)
+		-DUDUNITS2=$(usex udunits)
+		-DWXWIDGETS=$(usex wxwidgets)
+		-DGRAPHICSMAGICK=$(usex imagemagick $(usex graphicsmagick))
+		-DMAGICK=$(usex imagemagick $(usex !graphicsmagick))
+		-DTIFF=$(usex tiff)
+		-DGEOTIFF=$(usex tiff)
+		-DSHAPELIB=OFF
+		-DPLPLOTDIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+
+	configuration() {
+		mycmakeargs+=( "$@" )
+		cmake_src_configure
+	}
+	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
+	use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON
+}
+
+src_compile() {
+	cmake_src_compile
+	use python && python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	# there is check target instead of the ctest to define some LDPATH
+	virtx cmake_build check
+}
+
+src_install() {
+	cmake_src_install
+	if use python; then
+		installation() {
+			chrpath -d src/GDL.so || die
+			python_domodule src/GDL.so
+		}
+		python_foreach_impl run_in_build_dir installation
+		dodoc PYTHON.txt
+	fi
+
+	newenvd - 50gdl <<-_EOF_
+		GDL_PATH="+${EPREFIX}/usr/share/gnudatalanguage"
+	_EOF_
+}
diff --git a/dev-lang/gdl/metadata.xml b/dev-lang/gdl/metadata.xml
index a0c94d341881..16e4a758b28f 100644
--- a/dev-lang/gdl/metadata.xml
+++ b/dev-lang/gdl/metadata.xml
@@ -13,6 +13,7 @@
 	<use>
 		<flag name="eigen">Build matrix manipulation with <pkg>dev-cpp/eigen</pkg></flag>
 		<flag name="hdf">Add support for the Hierarchical Data Format v.4</flag>
+		<flag name="glpk">Use GNU Linear Programming Kit <pkg>sci-mathematics/glpk</pkg></flag>
 		<flag name="gshhs">Add support for projection adn continent maps with <pkg>sci-geosciences/gshhs-data</pkg></flag>
 		<flag name="proj">Add support for <pkg>sci-libs/proj</pkg> (geographic projections)</flag>
 		<flag name="udunits">Add support for manipulating units of physical quantities</flag>
diff --git a/dev-lang/gnuprologjava/Manifest b/dev-lang/gnuprologjava/Manifest
index 0914b50c7e93..63b9ace62b54 100644
--- a/dev-lang/gnuprologjava/Manifest
+++ b/dev-lang/gnuprologjava/Manifest
@@ -1,5 +1,4 @@
 AUX gnuprologjava-0.2.6-manual.patch 414 BLAKE2B 6bad70e46f1c2e9bdf9e4ef45cdbc4a4074671de28188aac7b69082e44eed86ef3fc1be1b5e83ea81da52df5d1b218583ab7ae73fdeeeb8241f50e8d45c23713 SHA512 419b509abae773e5ac3f2d79328bb4014776cc7c6390b8afa2d3d7242afec41e92d22830ed1be3c15f3d007c9fa08b303b553d883b18e1bde1fe9af09a0c7644
 DIST gnuprologjava-0.2.6-src.zip 477058 BLAKE2B 00248df0b307b733595b585ed5b847413d5de32c3348008ce53bb4dab93bfc465531bd59ea224f5c0bc6a66c3186ff55d353a0fe88d222b490927100cbafceea SHA512 b175c74e754a7176f5fc38ea2215809bb9d60ec5b8852f99a48a72a0bdb316b33b7195ff5c85398bb63aa2e522d12dfc75e2ff3af9f89ff44448d2f73357f0a4
 EBUILD gnuprologjava-0.2.6-r1.ebuild 877 BLAKE2B 2641b8cbde51bd39f51fba2edceb66aa7b1d3fef763c8079c714c7b911061b022014e484942a1af80ab70ad2af0ef72ac7f78394bab7dedb3574bea3b8f4fcb1 SHA512 fe5a0a27ceae3c19408a0aacdcb3cce53866b0591ccebae9090cfad33307bb1181f3f1ceb46448c6183947cb78658e3d794de158d49aaba6c8494afae314e1ec
-EBUILD gnuprologjava-0.2.6.ebuild 838 BLAKE2B 289f4e669963ac5660b20ac07f21d3c5029a14e908b4d8a09d25930c3d86fb5477b81799a19803b0575c1f5a917275d5e262c6199b7e7d2b2055702768e5674d SHA512 f74d26baa10ad05b53fe3af7c63e3b6749bce9d23e28d2dcc1ac001784e3c4782b965abf1603e21a42a95d575c547aaea6d2e5e2ac4e8b86e3db71efc7efb3cf
 MISC metadata.xml 236 BLAKE2B 665f3de6dc90f46a18379b3416063a49b1a79ddd7ef89eaed9be78f9adc5b234e9693cd31d6cf2d3477fc7dc00055492bef7de78da6c901c4a6e55eb0e781325 SHA512 e776224736bd575412c7b5b799f649c6b2947a70e6a9aea580063d9da7d09a8144e5ebaf7ac3ef131d578486cf05dec814dce11b2aeb884cded3be3cab70fcec
diff --git a/dev-lang/gnuprologjava/gnuprologjava-0.2.6.ebuild b/dev-lang/gnuprologjava/gnuprologjava-0.2.6.ebuild
deleted file mode 100644
index c94727fc1877..000000000000
--- a/dev-lang/gnuprologjava/gnuprologjava-0.2.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="GNU Prolog for Java is an implementation of ISO Prolog as a Java library"
-HOMEPAGE="http://www.gnu.org/software/gnuprologjava"
-SRC_URI="mirror://gnu/gnuprologjava/${P}-src.zip"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=virtual/jdk-1.6:="
-DEPEND="${RDEPEND}
-	dev-java/ant-core"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-manual.patch
-}
-
-src_compile() {
-	eant jar
-	if use doc ; then
-		eant doc
-	fi
-	mv build/${P}.jar build/${PN}.jar || die
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r build/api || die
-		java-pkg_dohtml -r build/manual || die
-	fi
-
-	dodoc NEWS.txt docs/readme.txt
-}
diff --git a/dev-lang/polyml/Manifest b/dev-lang/polyml/Manifest
index d1bd6a1edd4a..ed271763c9d7 100644
--- a/dev-lang/polyml/Manifest
+++ b/dev-lang/polyml/Manifest
@@ -1,26 +1,7 @@
-AUX polyml-5.4.1-asm.patch 1026 BLAKE2B adb541bddcc00957fca16a50f841b8572da68b0cd5a085da3e28473c58a3e95e93f6277ad76b8349e19ec168a8a898d1c5f9d86e7f0d7fd0aa0fec4204e5346f SHA512 bf19cedff74b11feba72c0ba2f5a9b6ee8169b5bb1b783d3559640070025ca0e7627d751bc703c41d812025d6909cba56101e49f0199f2aee310bc95ca4f2d6d
-AUX polyml-5.4.1-configure.patch 459 BLAKE2B e97785d1581259f8fa8102034d6b6e3b7c43c5337afeef75c903753cc69bd3174175781fcf5dac498f85339f40e05f7c636e2b95ecf9fa9dcdc3749d841baee2 SHA512 4e3a5e6651c8b6b9cb018f72f100755eee0265ad7dd0ba57030b7bce95670ff35e7191661be469b59206266f5eb51042d98504601311629bc2e83ed36a0cef8f
-AUX polyml-5.5.0-asm.patch 351 BLAKE2B 7fb6afeeefafbbc15dd9088ed417688dbbdc007c9d9c380675797af1a9c620779eeae7aec2fe43e04a6e06c0b2786261adae2c71c69b8ab679ba3449ba69ea7c SHA512 92a14615483aaac76e708ae19fccab132f80223ebaad7a390482af164335199a7d2e52be8726cc96d7971efae73a9cdf0284ec96f014af606edce2024d5b3996
-AUX polyml-5.5.0-configure.patch 4658 BLAKE2B 7ab06882eb18efd3ee3e90e65d1cd5aae3437080e4d675b6406f46637d59ef33229823b58330fbfcf0020714ebc51105e90f8fdcca9215ab934de39b68fd75c4 SHA512 d4a8ee5d41469d958d7f61a6608c5d4bd50e5497fadcd5333b2a94cd253c65d27f493bd743574eb3ccab37a39fdb2182e25106443f1855b30be1a70c9d450cc6
-AUX polyml-5.5.0-x-it-basis.patch 562 BLAKE2B f883eb0f72ca5678318472feaf41a009bb9f418431d78c126252f55d67f7ec0339ec7337a87c578373d66c0e9120f6db0d9480f5010f5a925a3cfb6a4ea201ab SHA512 ed5864b7ce5767133a47d914b5b439177e5c841669870292f90a73edee2e505aff6883b9a80baf0036d87bf728038ffa4609f9bacde4a704bfca291aa9cf50a4
-AUX polyml-5.5.1-inputN-return-for-zero-chars.patch 1476 BLAKE2B 38c9fa12ee5755493f8e3883d8f1e9045fb7f79586b5ee0c9e1d3d4e6180d939eba07052b092f7a714ebceceb90a5615f6890392b20dfe3b1c695e40df0d90c0 SHA512 998e9eb09a3b35bbbb6a9748e0b19c423f2204ccfb3f5a6de3173ca91f67d523884743f382052c22d14655310265ef7f8259e5104c61f9ab2b9a52f7257a011f
-AUX polyml-5.5.1-optimize-closure.patch 6695 BLAKE2B 421c5da3accc302f201be6f8a137d24014ec9b3ba3ec6c67175ffea37b08d4a9379bcf560f2ffe5a7180b67a5cacbfec6f76fcfccd3f2b923a345255856b6ecc SHA512 7cf1c66114058c8b3c9ceed3a84fe9a99f0cf063cce3364be79c7402353e8e29c5082cfedef16a32f38cb4275b0b3622db88cf7746115d1c43c483635a46f147
-AUX polyml-5.5.2-r1952-check_for_negative_sized_array.patch 548 BLAKE2B ea01cee4f83d87fe0793fc69a020c7dec9e2a54572acdea64850eb32a80cc3160c3c30031c823db93a1ed4454de21da916bb321bc4104f189ecf977737c14e60 SHA512 d979c6542a2a983ab1b536e8b983d4d0a154f4f5e00f3d4161dd38f965f63ea5bd339785904690928a715ec43cb2a296f535ff6af1da522b096ffae0bba759a4
-AUX polyml-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch 4089 BLAKE2B 8407734817afa2902ca115f129c3feb0197082848921a6a41389c49516329b0c6294d9a381b143cfe1b2a1855b1916a49fc50de8f969a6c5bffc87b7c10ff982 SHA512 8b4f174ace31a839ea592402c10068af62f03227a43a663ea17ea5eefecf52472fc6a3437cd99f1593de7d575af57ae4b8156756695623c7db0f9e726e5f21a6
-AUX polyml-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch 1247 BLAKE2B 7df0a97bdb56d264b090bebad500d4f1f4354d8d66feed289a4f535e63d3357a33a6533acd4170e7c4e69bf477f56355684b3037f0c895adad299de20cf246d0 SHA512 ac2d1baff1c8d743ee783ac81f31df12cc4598874dd5a9a7855cd06fb179af2c64bc02a87d85a72238f19c805128143693839bd0a58d9a4002bc75fae985303b
-AUX polyml-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch 951 BLAKE2B c2aa5777c35d27d0c403f6676b323a280e43c30bbacdcbfc6535d39b66031b11e6e40074ecd3fb72b40953942fb53cb88d62f82e47cff072a4e53ca973615019 SHA512 644e90f26ef80aa8e945257eafa4da1ee2da9d353db40b5c6e367d032f41db4a6589a2527bce9d84d45794d88d31edaeb3cea53d57b4421bf209f6c07be69cf0
 AUX polyml-5.6-configure.patch 390 BLAKE2B 7f20e9de1c00a429ed86ab33cd05bd2aed0a4c431d92f52e7c93c4c44f4f4611637299020d3cbf7c32b9d43f868757f4b7c534f68e5b7120c75ee0b27b5f8316 SHA512 d868d6739e88ccacf7ab5ee495ffaa54fb3ace83c57633fde2d97fb894c9e0c81e896e15192318f9b8bbcb678efb95a827549a0fd30d2ca87473b582fa09f850
 AUX polyml-5.6-ffi3.patch 584 BLAKE2B 6c7e38c077968f439f03739a4d95bad6d5f631b4cf4e1a51a58ae6273c40a1ae5dbd1fe3aa6e338215f9cedec950435e846351275be7bccb80fd313965888b78 SHA512 22bb8e13672ddb0a8f7a3ed9908fb652e238c849b553ab3ceb9b33daebc35d6502dbff3f099ab933f4e2639b5eac2294e21d45bfc96dcb1b9c6be0129c57232d
 DIST polyml-5.6.tar.gz 6066166 BLAKE2B dc7e35ad1f51f270f9043736bca8b3d8a96e208dfa2833a2de3c06c969e8bb9d5e92c3ab025e4e55539188a9d6d5000b7befdd3cfc17aa3b0e54315778ab71b0 SHA512 cd4f25c225831dec512f7136dfda4ba31abd6939d9e8e0cacdb6d48212488b56ba5969c76e76fcbfcfa83d015a67d9cf62457286086f3c2b3f7914a7939d7b59
 DIST polyml-5.8.tar.gz 9817105 BLAKE2B 93992c8baa78017bfda6c2151d1f48805829b77c0b7ed9bec87c951fc4a4236459ed59aab1eca88ed4a1d7aa10eb9734f93324583e012b18bb7d8cce84b5a35b SHA512 50baed79b50b14bd87acc637de93fd6d0f05e61fe0f03682a12a1d2c5f382313488d48f84b49ad915b01acc5a3a5769fb05fcaa7b24499c56402ddd3ba393930
-DIST polyml.5.4.1.tar.gz 6107319 BLAKE2B 1fdff3b26fa7554a0f3d31cca0dc4a4e013fb930e6295cd6107012bc67e87db1f64916087edb34e403c3e1a88b26bff947c1cc9d946fe93ac7a1144434d15081 SHA512 4a7b404ed648b5a9fd9d52917214688d15f4f9a5f4570ba13b52a8304bde1cc4b534f539ffc3c9554283816ae130e4c898a179d776df6d3220fba9743a19b175
-DIST polyml.5.5.1.tar.gz 5465794 BLAKE2B 0ae6973c866cdf33e0eeb26475c95f26f11eca13458ab52c2c6fd3f4b3034cd5e71a7e4dbff5574070a11833479bff2723066bfc71367d71cd6e4f9f17a5cba1 SHA512 283954c8bf5599d83ea69916b827b1acae7137fe4add67537026092da2e6f1a89d71d3a394dbba599bbe9e967ded1446f39f4d81afb90301532db6be949f7a6f
-DIST polyml.5.5.2.tar.gz 5599140 BLAKE2B 08b7c4be7c52bd8f57c53f6caa24be7ab457c7419459192f33369bf3c7024002ffd98dfd7af4db53c3a2484f9c966010a635f4e09e9edf8a62b5d5230f9a04bf SHA512 248c2a38c4691898bc1243a041f4683bf227d9c8a98c6c3545af2a8a3249ed5ed96f33f90cb2dede8809b42f33c0557650147302cfe046a5fba965ccd93cbc5b
-DIST polyml.5.5.tar.gz 5504389 BLAKE2B 8ad51504e4bc4a3f6090052d641389b7378aa56295ebe8503ea09082a0bb85ee157c04ac19ca66ab8b8c8b49b0d645339d499ea7d4eba18eae6f90be8afcc907 SHA512 4725c2e4a786b8c63bc6fc1cadad0de818ed935014d51040af43defa07b03ba7bedb2185bfb2e39a0db7284479e79e698b31ec7fe8463c306b668de1eda69b89
-EBUILD polyml-5.4.1.ebuild 884 BLAKE2B aad076fd479a9d037fdb44ff2c8838f5ec7f374e4d544de4b7d9925e0b538e7582e99be66ba8e95ae61b4dfde5e0d765625040ebfd0410b52257822bfe201ad9 SHA512 cd5474f947837de1566c88b407fc9c7869167d516cf9c24d551d6785a03f3d2f9366d4c12e7aba16572f41c4650bf1a7a3fa351e2acf8c19186a728fd7bf8b1e
-EBUILD polyml-5.5.0.ebuild 1123 BLAKE2B f7d424922bd490449f0fc7f098e8c7b56c3533211e4476bcc52ee0df5acc6beb606d089dca8862c43aca053073d009c0c3bd610df632cff044ad1568adf109a6 SHA512 70a0b5e67002bafd4a550f188d46e00a2f524ddbdcaf7763b77a119f9f18567f6f7d610c8ac434ee0abad4936eae7055e2efb17e7530c01131c6a1e0b230611b
-EBUILD polyml-5.5.1.ebuild 1808 BLAKE2B f70c8ea8616894fc6551a1bcdf7e7de3dd5c4bfb1b344e8c1b12204b7aa05e67f234298f1d0d9e99751a1f23e6ee2faacb6cbbfdae4ab5bdead98b646689ba92 SHA512 322132df157489c9ee5dded3da25b489480df00d3d5b395e7d8f3a08e0f30fa2cb9942582c05397a171c274082adf8b327fac0e201a094fcd00477b63fa37055
-EBUILD polyml-5.5.2.ebuild 1965 BLAKE2B 36f8fc6a9b085e0d646e7cc4990cd198b8acb2da3c03667331c4bf0004bf4823110fb59bf7f74f701d8738f1a2f0438517510fa28326b3352b1e3c86a38c50d0 SHA512 692128341e53deb259b6516dad1e2e311f625b034b95a351bb907ecae17c25f61f69eb91046af7a3c453f81204b72c4ca7f32e2347fd52c33664464b4e0658cc
 EBUILD polyml-5.6.ebuild 1209 BLAKE2B a5490bacdab41a33525d841ef527a45b4f5068130888c206db3dd51cdbbba5a779f364e03603450c8432443fc512305c0aa9a5db81aa78884fb677ef89f1a4b9 SHA512 d8fc8f66cfe3b9065e530cf3d839756250a9b08847d3dafc80f18e062cd92f11d209c8cb432208c46f2206dbc4e31a2e2d5b9317202182fd9f00af2b1eceb0cb
 EBUILD polyml-5.8.ebuild 1219 BLAKE2B 05123eacb9c5e19207cbf6fe3f6ccc81372333baeadb092d078897fdef0da567f22186e71edba2e3f506064f7d7b0d5bc6e9609fe736effec2cc47d48b147727 SHA512 f414bd49ba8a01f190354ab5a76d056f9e454c58d3a2344ff7f4dff5957098476c595322e362a2f5ebd1e238ef45228eb1eeecbc292d0c83fba2adfa67a0e21d
 MISC metadata.xml 357 BLAKE2B f994f420abc8bb1020fc533a0adf04c861961b8e6cd72626db3d7d2e8ef8558903df895d182266eb419e75f6293524e690b45738902cb74ac79afe04a94f2a99 SHA512 d7f4c4c4f07e7f516fac55a58d83256f54566e0bce940d178e739b05c740abf842f6f343add927dd098546828547f16f3176e874fb8501e84d12ca7ead9fcb32
diff --git a/dev-lang/polyml/files/polyml-5.4.1-asm.patch b/dev-lang/polyml/files/polyml-5.4.1-asm.patch
deleted file mode 100644
index af8bd8d49149..000000000000
--- a/dev-lang/polyml/files/polyml-5.4.1-asm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- polyml.5.4.1-orig/libpolyml/x86asm.asm	2011-07-13 00:06:49.000000000 +1000
-+++ polyml.5.4.1/libpolyml/x86asm.asm	2012-01-08 16:00:09.740684843 +1100
-@@ -2714,4 +2714,7 @@
- 
- 
- ENDIF
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
- END
---- polyml.5.4.1-orig/libpolyml/power_assembly.S	2010-04-09 01:49:20.000000000 +1000
-+++ polyml.5.4.1/libpolyml/power_assembly.S	2012-01-08 15:46:35.006200143 +1100
-@@ -1735,3 +1735,6 @@
-     dd  Mask_assign_byte         /* 254 */
-     dd  Mask_assign_word         /* 255 */
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- polyml.5.4.1-orig/libpolyml/sparc_assembly.S	2010-08-13 01:01:36.000000000 +1000
-+++ polyml.5.4.1/libpolyml/sparc_assembly.S	2012-01-08 15:46:12.516642791 +1100
-@@ -1498,3 +1498,6 @@
-     .long   Mask_assign_byte         /* 254 */
-     .long   Mask_assign_word         /* 255 */
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/dev-lang/polyml/files/polyml-5.4.1-configure.patch b/dev-lang/polyml/files/polyml-5.4.1-configure.patch
deleted file mode 100644
index aaaed02f8e16..000000000000
--- a/dev-lang/polyml/files/polyml-5.4.1-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- polyml.5.4.1-orig/configure.ac	2010-09-03 21:22:40.000000000 +1000
-+++ polyml.5.4.1/configure.ac	2012-01-09 22:44:04.153668402 +1100
-@@ -321,7 +321,7 @@
- AC_ARG_WITH([portable],
-     [AS_HELP_STRING([--with-portable],
-               [Build the portable interpreter version of Poly/ML instead of native @<:@default=no@:>@])], [
--    ac_cv_with_portable=yes], [
-+    ac_cv_with_portable="$withval"], [
-     ac_cv_with_portable=no])
- 
- case "${host_cpu}" in
diff --git a/dev-lang/polyml/files/polyml-5.5.0-asm.patch b/dev-lang/polyml/files/polyml-5.5.0-asm.patch
deleted file mode 100644
index cffa627b9f32..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.0-asm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- polyml.5.5-orig/libpolyml/x86asm.asm	2012-05-03 21:07:59.000000000 +1000
-+++ polyml.5.5/libpolyml/x86asm.asm	2012-09-19 17:41:51.767737295 +1000
-@@ -3003,4 +3003,7 @@
-     dd  Mask_assign_byte         ;# 254
-     dd  Mask_assign_word         ;# 255
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
- END
diff --git a/dev-lang/polyml/files/polyml-5.5.0-configure.patch b/dev-lang/polyml/files/polyml-5.5.0-configure.patch
deleted file mode 100644
index 1a2e114e6503..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.0-configure.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-Index: polyml/configure
-===================================================================
---- polyml/configure	(revision 1599)
-+++ polyml/configure	(revision 1600)
-@@ -20870,10 +20870,8 @@
- # Check whether --with-portable was given.
- if test "${with_portable+set}" = set; then :
-   withval=$with_portable;
--    ac_cv_with_portable=yes
- else
--
--    ac_cv_with_portable=no
-+  with_portable=check
- fi
- 
- 
-@@ -20894,36 +20892,46 @@
- 
- $as_echo "#define HOSTARCHITECTURE_SPARC 1" >>confdefs.h
- 
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-             ;;
-       power* | ppc*)
- 
- $as_echo "#define HOSTARCHITECTURE_PPC 1" >>confdefs.h
- 
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-             ;;
-       arm*)
- 
- $as_echo "#define HOSTARCHITECTURE_ARM 1" >>confdefs.h
- 
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-             ;;
-       ia64*)
- 
- $as_echo "#define HOSTARCHITECTURE_IA64 1" >>confdefs.h
- 
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-         ;;
-       *) as_fn_error $? "Poly/ML is not supported for this architecture" "$LINENO" 5 ;;
- esac
- 
--# If we have explicitly set --with-portable or we are on a machine without
--# a code-generator set to use the interpreter.
--if test "$ac_cv_with_portable" = "yes"; then
-+# If we explicitly asked to use the interpreter set the architecture to interpreted.
-+if test "x$with_portable" = "xyes" ; then
-+    polyarch=interpret
-+fi
- 
-+# If we asked not to use the interpreter check we have native code support.
-+if test "x$with_portable" = "xno" ; then
-+    if test "x$polyarch" = "xinterpret" ; then
-+        as_fn_error $? "--without-portable was given but native code is not supported on this platform" "$LINENO" 5
-+    fi
-+fi
-+
-+# Set the define if this is the interpreter.  This is no longer actually used.
-+if test "x$polyarch" = "xinterpret" ; then
-+
- $as_echo "#define INTERPRETED 1" >>confdefs.h
- 
--       polyarch=interpret
- fi
- 
- # Put this test at the end where it's less likely to be missed.
-Index: polyml/configure.ac
-===================================================================
---- polyml/configure.ac	(revision 1599)
-+++ polyml/configure.ac	(revision 1600)
-@@ -368,10 +368,10 @@
- # Test the --with-portable option to build the interpreter even if
- # we have a code-generator.
- AC_ARG_WITH([portable],
--    [AS_HELP_STRING([--with-portable],
--              [Build the portable interpreter version of Poly/ML instead of native @<:@default=no@:>@])], [
--    ac_cv_with_portable=yes], [
--    ac_cv_with_portable=no])
-+            [AS_HELP_STRING([--with-portable],
-+              [Build the portable interpreter version of Poly/ML instead of native @<:@default=no@:>@])],
-+            [],
-+            [with_portable=check])
- 
- case "${host_cpu}" in
-       i[[3456]]86*)
-@@ -384,28 +384,39 @@
-             ;;
-       sparc*)
-             AC_DEFINE([HOSTARCHITECTURE_SPARC], [1], [Define if the host is a Sparc (32 bit)])
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-             ;;
-       power* | ppc*)
-             AC_DEFINE([HOSTARCHITECTURE_PPC], [1], [Define if the host is a Power PC (32 bit)])
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-             ;;
-       arm*)
-             AC_DEFINE([HOSTARCHITECTURE_ARM], [1], [Define if the host is an ARM (32 bit)])
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-             ;;
-       ia64*)
-             AC_DEFINE([HOSTARCHITECTURE_IA64], [1], [Define if the host is Itanium])
--            ac_cv_with_portable=yes
-+            polyarch=interpret
-         ;;
-       *) AC_MSG_ERROR([Poly/ML is not supported for this architecture]) ;;
- esac
- 
--# If we have explicitly set --with-portable or we are on a machine without
--# a code-generator set to use the interpreter.
--if test "$ac_cv_with_portable" = "yes"; then
-+# If we explicitly asked to use the interpreter set the architecture to interpreted.
-+if test "x$with_portable" = "xyes" ; then
-+    polyarch=interpret
-+fi
-+
-+# If we asked not to use the interpreter check we have native code support.
-+if test "x$with_portable" = "xno" ; then
-+    if test "x$polyarch" = "xinterpret" ; then
-+        AC_MSG_ERROR(
-+            [--without-portable was given but native code is not supported on this platform])
-+    fi
-+fi
-+
-+# Set the define if this is the interpreter.  This is no longer actually used.
-+if test "x$polyarch" = "xinterpret" ; then
-        AC_DEFINE([INTERPRETED], [1], [Define if using the interpreter] )
--       polyarch=interpret
- fi
- 
- # Put this test at the end where it's less likely to be missed.
diff --git a/dev-lang/polyml/files/polyml-5.5.0-x-it-basis.patch b/dev-lang/polyml/files/polyml-5.5.0-x-it-basis.patch
deleted file mode 100644
index 2f6ce7b864bd..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.0-x-it-basis.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: polyml/mlsource/extra/XWindows/ml_bind.ML
-===================================================================
---- polyml/mlsource/extra/XWindows/ml_bind.ML	(revision 1600)
-+++ polyml/mlsource/extra/XWindows/ml_bind.ML	(revision 1601)
-@@ -2437,7 +2437,7 @@
- 
- exception XWindows = XWindows.XWindows;
- 
--let
-+local
-   open XWindows;
-   
-   fun printRect _ _ (r:XRectangle) =
-@@ -2447,6 +2447,6 @@
-     PolyML.PrettyString ("Rect " ^ PolyML.makestring R)
-   end;
- in
--  PolyML.addPrettyPrinter printRect
-+  val () = PolyML.addPrettyPrinter printRect
- end;
- 
diff --git a/dev-lang/polyml/files/polyml-5.5.1-inputN-return-for-zero-chars.patch b/dev-lang/polyml/files/polyml-5.5.1-inputN-return-for-zero-chars.patch
deleted file mode 100644
index 8f5b02ee9084..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.1-inputN-return-for-zero-chars.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://sourceforge.net/p/polyml/code/1875/
-Required for sci-mathematics/isabelle-2013.2
-
-------------------------------------------------------------------------
-r1875 | dcjm | 2013-10-30 10:49:05 -0600 (Wed, 30 Oct 2013) | 1 line
-
-Backport commit 1874 from trunk.  This fixes TextIO.inputN and StreamIO.inputN so they return immediately if the request is for zero characters.
-Index: polyml/basis/BasicStreamIO.sml
-===================================================================
---- polyml/basis/BasicStreamIO.sml	(revision 1851)
-+++ polyml/basis/BasicStreamIO.sml	(working copy)
-@@ -213,6 +213,8 @@
-         fun inputN (f, n) =
-         if n < 0
-         then raise Size
-+        else if n = 0 (* Defined to return the empty vector and f *)
-+        then (emptyVec, f)
-         else
-         let
-             val (vecs, f') = inputNList (f, n)
-Index: polyml/basis/TextIO.sml
-===================================================================
---- polyml/basis/TextIO.sml	(revision 1851)
-+++ polyml/basis/TextIO.sml	(working copy)
-@@ -597,6 +597,8 @@
-         |   inputN' n (ref(Direct(strm as {buffer, bufp, buflimit, ...}))) =
-             if n < 0 orelse n > CharVector.maxLen
-             then raise Size
-+            else if n = 0
-+            then "" (* Return the empty string without blocking *)
-             else if !buflimit = 0
-             then (* Last read returned end-of-file.  Clear the EOF state once
-                     we return this empty string. *)
diff --git a/dev-lang/polyml/files/polyml-5.5.1-optimize-closure.patch b/dev-lang/polyml/files/polyml-5.5.1-optimize-closure.patch
deleted file mode 100644
index 5b33203d69e1..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.1-optimize-closure.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-https://sourceforge.net/p/polyml/code/1869/
-Required for sci-mathematics/isabelle-2013.2
-
-------------------------------------------------------------------------
-r1869 | dcjm | 2013-10-11 05:59:58 -0600 (Fri, 11 Oct 2013) | 1 line
-
-Back-port commits 1855 and 1867 from trunk.  These fix two optimiser bugs.  Includes the regression tests.
-
-Index: polyml/mlsource/MLCompiler/CodeTree/CODETREE_OPTIMISER.sml
-===================================================================
---- polyml/mlsource/MLCompiler/CodeTree/CODETREE_OPTIMISER.sml	(revision 1851)
-+++ polyml/mlsource/MLCompiler/CodeTree/CODETREE_OPTIMISER.sml	(working copy)
-@@ -645,8 +645,9 @@
-                     (thisDec :: decs, thisArg @ args, LoadLocal newAddr :: mapList)
-                 end
- 
--            |   mapPattern(ArgPattCurry(currying, ArgPattTuple{allConst=false, filter, ...}) :: patts, n, m) =
--                (* It's a function that returns a tuple. *)
-+            |   mapPattern(ArgPattCurry(currying as [_], ArgPattTuple{allConst=false, filter, ...}) :: patts, n, m) =
-+                (* It's a function that returns a tuple.  The function must not be curried because
-+                   otherwise it returns a function not a tuple. *)
-                 let
-                     val (thisDec, thisArg, thisMap) =
-                         transformFunctionArgument(currying, [LoadArgument m], [LoadArgument n], SOME filter)
-@@ -657,7 +658,7 @@
- 
-             |   mapPattern(ArgPattCurry(currying as firstArgSet :: _, _) :: patts, n, m) =
-                 (* Transform it if it's curried or if there is a tuple in the first arg. *)
--                if List.length currying >= 2 orelse
-+                if (*List.length currying >= 2 orelse *) (* This transformation is unsafe. *)
-                    List.exists(fn ArgPattTuple{allConst=false, ...} => true | _ => false) firstArgSet
-                 then
-                 let
-@@ -685,6 +686,13 @@
- 
-             and transformFunctionArgument(argumentArgs, loadPack, loadThisArg, filterOpt) =
-             let
-+                (* Disable the transformation of curried arguments for the moment.
-+                   This is unsafe.  See Test146.  The problem is that this transformation
-+                   is only safe if the function is applied immediately to all the arguments.
-+                   However the usage information is propagated so that if the result of
-+                   the first application is bound to a variable and then that variable is
-+                   applied it still appears as curried. *)
-+                val argumentArgs = [hd argumentArgs]
-                 (* We have a function that takes a series of curried argument.
-                    Change that so that the function takes a list of arguments. *)
-                 val newAddr = ! localCounter before localCounter := ! localCounter + 1
-@@ -1214,9 +1222,11 @@
-                             let
-                                 fun checkArg (ArgPattTuple{allConst=false, ...}) = true
-                                         (* Function has at least one tupled arg. *)
--                                |   checkArg (ArgPattCurry(_, ArgPattTuple{allConst=false, ...})) = true
--                                        (* Function has an arg that is a function that returns a tuple. *)
--                                |   checkArg (ArgPattCurry(_ :: _ :: _, _)) = true
-+                                |   checkArg (ArgPattCurry([_], ArgPattTuple{allConst=false, ...})) = true
-+                                        (* Function has an arg that is a function that returns a tuple.
-+                                           It must not be curried otherwise it returns a function not a tuple. *)
-+                                (* This transformation is unsafe.  See comment in transformFunctionArgument above. *)
-+                                (*|   checkArg (ArgPattCurry(_ :: _ :: _, _)) = true *)
-                                         (* Function has an arg that is a curried function. *)
-                                 |   checkArg (ArgPattCurry(firstArgSet :: _, _)) =
-                                         (* Function has an arg that is a function that
-Index: polyml/Tests/Succeed/Test146.ML
-===================================================================
---- polyml/Tests/Succeed/Test146.ML	(revision 0)
-+++ polyml/Tests/Succeed/Test146.ML	(revision 1875)
-@@ -0,0 +1,24 @@
-+(* Bug in transformation of arguments which are curried functions.  It is not
-+   safe to transform "f" in the argument to "bar".  Although it is curried
-+   the application to the first argument "()" is not immediately followed
-+   by the application to the second. *)
-+
-+local
-+    val r = ref 0
-+in
-+    (* Foo should be called exactly once *)
-+    fun foo () = (r:= !r+1; fn i => i)
-+
-+    fun checkOnce () = if !r = 1 then () else raise Fail "bad"
-+end;
-+
-+fun bar f = let val r = f() in (r 1; r 2; List.map r [1, 2, 3]) end;
-+
-+bar foo;
-+
-+checkOnce();
-+
-+exception A and B and C;
-+fun rA () = raise A and rB () = raise B;
-+fun h (f, g) = let val a = f() in g(); a () end;
-+h(rA, rB) handle A => ();
-
-Property changes on: polyml/Tests/Succeed/Test146.ML
-___________________________________________________________________
-Added: svn:eol-style
-## -0,0 +1 ##
-+native
-\ No newline at end of property
-Index: polyml/Tests/Succeed/Test147.ML
-===================================================================
---- polyml/Tests/Succeed/Test147.ML	(revision 0)
-+++ polyml/Tests/Succeed/Test147.ML	(revision 1875)
-@@ -0,0 +1,31 @@
-+(* Bug in optimiser transformation.  A function argument that returns a tuple
-+   can be transformed to take a container but only if it is not curried. *)
-+
-+(* Cut down example from Isabelle that caused an internal error exception. *)
-+
-+fun one _ [] = raise Fail "bad"
-+  | one pred (x :: xs) =
-+      if pred x then (x, xs) else raise Fail "bad";
-+
-+fun foo (scan, f) xs = let val (x, y) = scan xs in (f x, y) end;
-+  
-+fun bar (scan1, scan2) xs =
-+  let
-+    val (x, ys) = scan1 xs;
-+    val (y, zs) = scan2 x ys;
-+  in ((x, y), zs) end;
-+
-+fun bub (scan1, scan2) = foo(bar(scan1, (fn _ => scan2)), op ^);
-+
-+val qqq: string list -> string * int = bub(one (fn _ => raise Match), (foo((fn _ => raise Match), String.concat)));
-+
-+(* Further example - This caused a segfault. *)
-+
-+PolyML.Compiler.maxInlineSize := 1;
-+fun f g = let val (x,y) = g 1 2 in x+y end;
-+
-+fun r (x, y, z) = fn _ => (x, y+z);
-+
-+val h: int-> int*int = r (4,5,6);
-+
-+f (fn _ => h);
-
-Property changes on: polyml/Tests/Succeed/Test147.ML
-___________________________________________________________________
-Added: svn:eol-style
-## -0,0 +1 ##
-+native
-\ No newline at end of property
diff --git a/dev-lang/polyml/files/polyml-5.5.2-r1952-check_for_negative_sized_array.patch b/dev-lang/polyml/files/polyml-5.5.2-r1952-check_for_negative_sized_array.patch
deleted file mode 100644
index 1451d2df8d84..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.2-r1952-check_for_negative_sized_array.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: polyml/basis/Array.sml
-===================================================================
---- polyml/basis/Array.sml	(revision 1951)
-+++ polyml/basis/Array.sml	(revision 1952)
-@@ -129,7 +129,7 @@
-      
-     fun array(len, a) =
-         let
--            val () = if len >= maxLen then raise General.Size else ()
-+            val () = if len < 0 orelse len >= maxLen then raise General.Size else ()
-             val vec = System_alloc(len+1, 0wx40, RunCall.unsafeCast a)
-         in
-             System_setw(vec, 0, RunCall.unsafeCast len);
diff --git a/dev-lang/polyml/files/polyml-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch b/dev-lang/polyml/files/polyml-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch
deleted file mode 100644
index 783577026f67..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Index: polyml/libpolyml/foreign.cpp
-===================================================================
---- polyml/libpolyml/foreign.cpp	(revision 1953)
-+++ polyml/libpolyml/foreign.cpp	(revision 1954)
-@@ -4,7 +4,7 @@
- 
-     Copyright (c) 2000-7
-         Cambridge University Technical Services Limited
--    Further development Copyright David C.J. Matthews 2008-2011.
-+    Further development Copyright David C.J. Matthews 2008-2014.
- 
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-@@ -251,6 +251,10 @@
- 
- static Volatile *vols;
- static PLock volLock; // Mutex to protect vols.
-+// TODO: There is a theoretical risk of deadlock if any ML allocation is made while this
-+// lock is held.  An allocation can result in a GC which requires all threads to release
-+// ML memory but another thread could block waiting for the mutex.
-+// N.B. raising an exception involves an allocation.
- 
- #define FIRST_VOL 0
- 
-@@ -268,24 +272,8 @@
- static unsigned callBackEntries = 0;
- static PLock callbackTableLock; // Mutex to protect table.
- 
--
- /**********************************************************************
-  *
-- *  Malloc / Free Wrappers
-- *   
-- **********************************************************************/
--
--static POLYUNSIGNED malloc_count = 0;
--#if 0
--#define Vmalloc(where,size) {where = malloc(size); printf("malloc: %p,%d\n",where,size); fflush(stdout); malloc_count++;}
--#else
--#define Vmalloc(where,size) {where = malloc(size); malloc_count++;}
--#endif
--#define Vfree(p) { free(p);  malloc_count--;}
--
--
--/**********************************************************************
-- *
-  *  Volatile Allocation
-  *   
-  **********************************************************************/
-@@ -349,8 +337,12 @@
-     PLocker plocker(&volLock);
-     Handle res = vol_alloc(taskData);
-     trace(("size= %" POLYUFMT "\n",size));
--    Vmalloc( C_POINTER(UNVOLHANDLE(res)), size );
-+    void *p = malloc(size);
-+    if (p == 0)
-+        RAISE_EXN("Insufficient memory");
-+    C_POINTER(UNVOLHANDLE(res)) = p;
-     OWN_C_SPACE(UNVOLHANDLE(res)) = true;
-+
-     return res;
- }
- 
-@@ -685,7 +677,7 @@
-             {
-                 // Can now free this.            
-                 trace(("Freeing malloc space of <%" POLYUFMT ">\n",from));
--                Vfree(vols[from].C_pointer);
-+                free(vols[from].C_pointer);
-                 vols[from].C_pointer = 0;
-                 vols[from].Own_C_space = false;
-             }
-@@ -702,7 +694,6 @@
-         }
-     }
-     next_vol = to;
--    info(("unfreed mallocs=<%" POLYUFMT "> next_vol=<%" POLYUFMT ">\n", malloc_count, next_vol));
-     
-     /* Callback table.  Added DCJM 12/4/04.  We always process these as strong references.
-     For the time being at any rate we treat these as permanent entries so that once a
-@@ -910,8 +901,9 @@
-         RAISE_EXN("libffi error: ffi_prep_cif failed");
- 
-     // malloc memory for the result
--    void *result;
--    Vmalloc(result, result_type->size);
-+    void *result = malloc(result_type->size);
-+    if (result == 0)
-+        RAISE_EXN("Insufficient memory to allocate space for result");
- 
-     processes->ThreadReleaseMLMemory(taskData);
-     ffi_call(&cif, sym, result, arg_values);
-@@ -1580,6 +1572,9 @@
- 
-     unsigned num_args = length_list(argTypeList->Word());
-     ffi_type **arg_types = (ffi_type**)malloc(num_args * sizeof(ffi_type*));
-+    if (arg_types == 0)
-+        RAISE_EXN("Insufficient memory to allocate space for arguments");
-+
-     PolyWord p = argTypeList->Word();
-     for (POLYUNSIGNED i=0; i<num_args; i++,p=Tail(p))
-         arg_types[i] = ctypeToFfiType(taskData, Head(p));
-@@ -1587,6 +1582,9 @@
- 
-     // The cif needs to be on the heap so that it is available in the callback.
-     ffi_cif *cif = (ffi_cif *)malloc(sizeof(ffi_cif));
-+    if (cif == 0)
-+        RAISE_EXN("Insufficient memory to allocate space for cif");
-+
-     if (ffi_prep_cif(cif, abi, num_args, result_type, arg_types) != FFI_OK)
-         RAISE_EXN("libffi error: ffi_prep_cif failed");
- 
diff --git a/dev-lang/polyml/files/polyml-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch b/dev-lang/polyml/files/polyml-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch
deleted file mode 100644
index 36c82947f37b..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: polyml/libpolyml/gc_mark_phase.cpp
-===================================================================
---- polyml/libpolyml/gc_mark_phase.cpp	(revision 2006)
-+++ polyml/libpolyml/gc_mark_phase.cpp	(revision 2007)
-@@ -130,13 +130,6 @@
-                     if (locPtr == LARGECACHE_SIZE) locPtr = 0;
-                     largeObjectCache[locPtr].base = obj;
-                     largeObjectCache[locPtr].current = currentPtr;
--                    // To try to narrow down a bug that results in the ASSERT failing,
--                    // add these extra checks.
--                    POLYUNSIGNED lengthWord = obj->LengthWord();
--                    ASSERT (OBJ_IS_LENGTH(lengthWord));
--                    POLYUNSIGNED length = OBJ_OBJECT_LENGTH(lengthWord);
--                    ASSERT(length == originalLength);
--                    ASSERT(currentPtr > (PolyWord*)obj && currentPtr < ((PolyWord*)obj)+length);
-                 }
-             }
-             else StackOverflow(obj);
-@@ -579,6 +572,8 @@
-     ASSERT(nInUse == 0);
-     MTGCProcessMarkPointers *marker = &markStacks[0];
-     marker->active = true;
-+    marker->locPtr = 0;
-+    marker->largeObjectCache[0].base = 0;
-     nInUse = 1;
- 
-     // Scan the permanent mutable areas.
diff --git a/dev-lang/polyml/files/polyml-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch b/dev-lang/polyml/files/polyml-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch
deleted file mode 100644
index 0629f12f72ca..000000000000
--- a/dev-lang/polyml/files/polyml-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: polyml/libpolyml/gc_mark_phase.cpp
-===================================================================
---- polyml/libpolyml/gc_mark_phase.cpp	(revision 2008)
-+++ polyml/libpolyml/gc_mark_phase.cpp	(revision 2009)
-@@ -176,6 +176,16 @@
-     // Clear the mark stack
-     for (unsigned i = 0; i < MARK_STACK_SIZE; i++)
-         markStack[i] = 0;
-+    // Clear the large object cache.  Actually only largeObjectCache[0].base
-+    // needs to be set to zero and for the objects allocated on the heap it is
-+    // cleared before each GC in either MarkRoots or MarkPointersTask.
-+    // The remianing case is the RescanMarked sub-class which is allocated on the stack
-+    // but it doesn't hurt to clear it in all cases.
-+    for (unsigned j = 0; j < LARGECACHE_SIZE; j++)
-+    {
-+        largeObjectCache[locPtr].base = 0;
-+        largeObjectCache[locPtr].current = 0;
-+    }
- }
- 
- // Called when the stack has overflowed.  We need to include this
diff --git a/dev-lang/polyml/polyml-5.4.1.ebuild b/dev-lang/polyml/polyml-5.4.1.ebuild
deleted file mode 100644
index 022401f5434b..000000000000
--- a/dev-lang/polyml/polyml-5.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base autotools
-
-MY_P=${PN}.${PV}
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="https://www.polyml.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="X elibc_glibc +gmp portable test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="X? ( x11-libs/motif:0 )
-		gmp? ( >=dev-libs/gmp-5 )
-		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=("${FILESDIR}/${PN}-5.4.1-configure.patch"
-	"${FILESDIR}/${PN}-5.4.1-asm.patch")
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with X x) \
-		$(use_with gmp) \
-		$(use_with portable) \
-		$(use_with threads)
-}
-
-src_test() {
-	emake tests
-}
diff --git a/dev-lang/polyml/polyml-5.5.0.ebuild b/dev-lang/polyml/polyml-5.5.0.ebuild
deleted file mode 100644
index 3cde23196400..000000000000
--- a/dev-lang/polyml/polyml-5.5.0.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 base autotools versionator
-
-# Although the download is called 5.5, after building it poly -v says
-# it is 5.5.0.
-MY_PV=$(get_version_component_range "1-2" "${PV}")
-MY_P="${PN}.${MY_PV}"
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="https://www.polyml.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="X elibc_glibc +gmp portable test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="X? ( x11-libs/motif:0 )
-		gmp? ( >=dev-libs/gmp-5 )
-		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
-		virtual/libffi"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=("${FILESDIR}/${PN}-5.5.0-configure.patch"
-	"${FILESDIR}/${PN}-5.5.0-x-it-basis.patch"
-	"${FILESDIR}/${PN}-5.5.0-asm.patch")
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-system-libffi \
-		$(use_with X x) \
-		$(use_with gmp) \
-		$(use_with portable) \
-		$(use_with threads)
-}
-
-src_test() {
-	emake tests
-}
diff --git a/dev-lang/polyml/polyml-5.5.1.ebuild b/dev-lang/polyml/polyml-5.5.1.ebuild
deleted file mode 100644
index 0ceb98cb5d9c..000000000000
--- a/dev-lang/polyml/polyml-5.5.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base autotools pax-utils
-
-MY_P="${PN}.${PV}"
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="https://www.polyml.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="X elibc_glibc +gmp portable test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="X? ( x11-libs/motif:0 )
-		gmp? ( >=dev-libs/gmp-5 )
-		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
-		virtual/libffi"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	# Bug 256679 - patch the assembler code.  The remaining executable stacks in ./.libs/poly
-	# comes from the polyml generated ./polyexport.o file.
-	"${FILESDIR}/${PN}-5.5.0-asm.patch"
-	# https://sourceforge.net/p/polyml/code/1875/ for isabelle-2013.2
-	"${FILESDIR}/${PN}-5.5.1-inputN-return-for-zero-chars.patch"
-	# https://sourceforge.net/p/polyml/code/1869/
-	# Adds Test146.ML that fails, applying it anyway as it is required by
-	# sci-mathematics/isabelle-2013.2
-	"${FILESDIR}/${PN}-5.5.1-optimize-closure.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-	if [ -f "${S}/Tests/Succeed/Test146.ML" ]; then
-		mv "${S}/Tests/Succeed/Test146.ML" "${S}/Tests/Succeed/Test146.ML.disable-test-as-it-fails"
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--disable-static \
-		--with-system-libffi \
-		$(use_with X x) \
-		$(use_with gmp) \
-		$(use_with portable) \
-		$(use_with threads)
-}
-
-src_compile() {
-	# Bug 453146 - dev-lang/polyml-5.5.0: fails to build (pax kernel?)
-	pushd libpolyml || die "Could not cd to libpolyml"
-	emake
-	popd
-	emake polyimport
-	pax-mark m "${S}/.libs/polyimport"
-	emake
-	pax-mark m "${S}/.libs/poly"
-}
-
-src_test() {
-	emake tests
-}
diff --git a/dev-lang/polyml/polyml-5.5.2.ebuild b/dev-lang/polyml/polyml-5.5.2.ebuild
deleted file mode 100644
index 0cb11d7b3447..000000000000
--- a/dev-lang/polyml/polyml-5.5.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit base autotools pax-utils
-
-MY_P="${PN}.${PV}"
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="https://www.polyml.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="X elibc_glibc +gmp portable test +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="X? ( x11-libs/motif:0 )
-		gmp? ( >=dev-libs/gmp-5 )
-		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
-		virtual/libffi"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	# Bug 256679 - patch the assembler code.  The remaining executable stacks in ./.libs/poly
-	# comes from the polyml generated ./polyexport.o file.
-	"${FILESDIR}/${PN}-5.5.0-asm.patch"
-	# Patches from https://sourceforge.net/p/polyml/code/HEAD/tree/fixes-5.5.2
-	# which are required to build and run sci-mathematics/isabelle-2015
-	"${FILESDIR}/${PN}-5.5.2-r1952-check_for_negative_sized_array.patch"
-	"${FILESDIR}/${PN}-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch"
-	"${FILESDIR}/${PN}-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch"
-	"${FILESDIR}/${PN}-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-	if [ -f "${S}/Tests/Succeed/Test146.ML" ]; then
-		mv "${S}/Tests/Succeed/Test146.ML" "${S}/Tests/Succeed/Test146.ML.disable-test-as-it-fails"
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--disable-static \
-		--with-system-libffi \
-		$(use_with X x) \
-		$(use_with gmp) \
-		$(use_with portable) \
-		$(use_with threads)
-}
-
-src_compile() {
-	# Bug 453146 - dev-lang/polyml-5.5.0: fails to build (pax kernel?)
-	pushd libpolyml || die "Could not cd to libpolyml"
-	emake
-	popd
-	emake polyimport
-	pax-mark m "${S}/.libs/polyimport"
-	emake
-	pax-mark m "${S}/.libs/poly"
-}
-
-src_test() {
-	emake tests
-}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 5a7f8664693c..5cf76d366b3b 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -7,6 +7,7 @@ DIST Python-3.7.8.tar.xz 17399552 BLAKE2B 4bf6c47b1132b6d31a79232002c4d38e2cd123
 DIST Python-3.7.9.tar.xz 17389636 BLAKE2B 484833aa2aa4e29051a02969294f72099ff6f1a47d944b1a0dd15f8e6c22a0406d551bcbcd1048cf89defedaccf060733211e34b38e31fd8391dd823eaa35bc0 SHA512 e4217b25529b5336e43b63d17f3758a8177a58184564cf02bd92a312f58dba9e096485c9e3cb3544f966e847ea15b3ab30ed065d28a6ca52a6d7e0faddf7d9f9
 DIST Python-3.8.4.tar.xz 18020412 BLAKE2B cfcfb293c413b25fc3ca48116cf8ffaba7bee18e9af9accf26be9b4373a0c62dd8e9da70e5a8a38ba6da4d1afbdbd589ae5ea4b618b65130ae061698b445908c SHA512 37a36d014a8372742be9d0bd9dd3a275e100dc21b1515c145bc62425d4d157327b6e63ad99bc888c0b36c1da4c05676c40eb086e75072d1906e3210ec3043dcb
 DIST Python-3.8.5.tar.xz 18019640 BLAKE2B bb3e0566afe28759e4ab129ad0986a0fc5103514f2e2b22ff4aa3973c3173ebdd24d4267fbaf903841814a611fd9ea122673e5a1918934366e5c0efaef9d7517 SHA512 460cee65d7df7150694590575502d7f22e548ebfc99c8f8b363eef8bf30ee72e58d8ffacb1d607824f877f880eb9fd6775a508388029583e1e1df3380f3f9587
+DIST Python-3.8.6.tar.xz 18233864 BLAKE2B c8a8ef6055e344dda30eb808804cfa62016b4f840257cffd5a495e5932f5696e50579d49b8181a487c9cd4a89bdb95656e80981039783a21d20f7980aa2c9883 SHA512 22faec84f6e172e1ac7c6bd6fd37e9b6ae4afc91cf5136aa8cac8ebbed8d18793f9196e8749b8ccc43447cb6c41cb450f65ea72dd363c06dfaeb14e0455f5560
 DIST Python-3.9.0rc1.tar.xz 18798364 BLAKE2B 2ebf669720bcc057f7e1056aca6ff42686a8e567a5ea10304f19e53ae80ba6ba60b9157ae401427be4afa1ec296d97bb81a2b55c60a4df3dba39ae545484e0fc SHA512 8fddf940600bdd4096c0144f689fb9e803bdc7a1ee00f46ccfde3566342ed465c7ac6806613e4f61440fb65f8f83057204bd0dc432ac379759cd4d410c151eef
 DIST Python-3.9.0rc2.tar.xz 18802576 BLAKE2B fa39f359ca79db83873a9a05c07b3915e759df887c80835f6d0db0e4906f919677c3cac23b83aeb7397800107207f742a876efa8dd74a2bf3b418fd1b05df069 SHA512 77aced89518d86c1fb0e48a96be135c8385f6fb912543f7bb8e792b15ca0d59005269a4c35d4185d31536980572f8fa0adee022a572a268e1f8e9832a052ef5c
 DIST python-gentoo-patches-2.7.18-r1.tar.xz 15500 BLAKE2B 7008b29827dbbd80d4ab8f010ccf9efced99c6b4b9109e4430c0ba269ce53529cb6fedd832502c8d2d3aa21938749cc3591c2545b21c0a59a6e60f8598e84ccc SHA512 e656ab07281fd932b92165674619bbf55ecf410d2937ae4ae771d490b4532540498cc731d30d19c1e8aafd1f64df8a406bbfbb46ea985b3dcd8edb89a0b7f20f
@@ -18,6 +19,7 @@ DIST python-gentoo-patches-3.7.8-r3.tar.xz 13232 BLAKE2B 9df47b1f61d08f62a80221b
 DIST python-gentoo-patches-3.7.9.tar.xz 10588 BLAKE2B f60c8500671e7e3977412474c838905846e0609a7fdac787f2c6a8bfa53c887dcfd3466c5276772ffb8c20205e8b3f207f7d148c04524f19d095964b519da62d SHA512 11f411eb2d59fd45fbd80bdb1d1a83d413770779244045006942c5cb84837cba606673bcde102ae03b1d4579f526b551c93a64d39dba530b4584ba8dd8e9f13e
 DIST python-gentoo-patches-3.8.4-r2.tar.xz 12660 BLAKE2B 3197edc6beb2b1be05399f268ff9b337ed67f699e3867160fea8e50f763a62b184ddd7adcdfa55dafc8c14f91e020b409461027361d04858db667992794b1168 SHA512 c56adbec04bfb950f7fb65f38cc0b78eaae9783800c755b7ac934b07725fcf4d69bbc2c29f7d1255acd6e88559a216dc8a6088042a479aa0d453b706e318c0cf
 DIST python-gentoo-patches-3.8.5.tar.xz 11280 BLAKE2B 163c577da75f4ec0ebe86b5a08bea96d5ae406020bd211439b1405c0f8a5dddc9422a9ea5b16eed195433cbec010d9def3126a578d3f9716325482216b9e4d62 SHA512 6b7f72b8deb87fb7a169e97391185823984b5e9c99ec5232504c670843fbe0ca76afe32fc3fbe1f850ec6c42e9325cf4697022f36f7b00a4028b324069dd4d5b
+DIST python-gentoo-patches-3.8.6.tar.xz 10956 BLAKE2B e3241d97f886d0a37f85735102db8f00902df59ee12e8501b6c7f549dd4b26a6289bf34ff8dba02b369ed7875fad3d18e177afe9e367db4cb06f2ee908482f9e SHA512 7afa8e54f7b7e6ab35edc16d4214384b8ad8a03068d1984656876d6477b278af931e8c797d03d1bed2f10f9d58ac387db1a43921e54fb17cf4b779f33820abc0
 DIST python-gentoo-patches-3.9.0rc1.tar.xz 8856 BLAKE2B 7bd032dfd047640c6a53633b5b9ee7b24199106b985230f772dda978d3b79fe0406eea64c4a842603a20afb71a90469befa7ec59a5ef1f793e4c901aa85952d1 SHA512 85a7d4397abf2a0f3c3d07a94a3e184ba3dcb347f3b70ee2cb77e81aac63846b01323a0228afd0fd1d32b3cafb64b18f82e6f5bfd88e4d564261ddae11e747eb
 EBUILD python-2.7.18-r1.ebuild 10596 BLAKE2B 2aa1a8152a9fd960de4dbc37e3b959d412855e3901c946783b908feeaf25af6333a5d375a26eef50436b8c5167019c7c7b5e0610787850f73b57ee6a4814fe65 SHA512 cdc9dafd0fadd459a4a8d22c5dc7b89fc125ca13ee3ca45166416acc26628b7f97478b4efd9e976177e209b1e2fa592a5034c79f343096053f4ddd790424f0d7
 EBUILD python-2.7.18-r2.ebuild 10598 BLAKE2B da6ce13402115486dac4e869dfec74cc3e8a0f25311d20769da2da4da8a48f7cc9741d16f25d2a957929523b50c410a57eb2d88f6a3ee0c835a6c76cf94067f4 SHA512 84785d05fa0266891e66b9bd6f86dd881260c70aceca425ade838e42ca932705b5fe0eb4380db7dd5405619f1a4d6ad0f0b1e2e27c5245c7910d4507eac89d12
@@ -28,6 +30,7 @@ EBUILD python-3.7.8-r2.ebuild 10157 BLAKE2B 9d802985fd19463a82452e390a7c20144c83
 EBUILD python-3.7.9.ebuild 10158 BLAKE2B 7a4d34bb98b2e9fa552982909aa7929605c3c35416b1c1008ed6f58be9fb19324d5278668fa654190eefe235d019b65e12db9210e89147a9c18a792710624ae4 SHA512 4cf310237bbbe00b916caa4c70c8b5a8abb1f0832968f79e80776c33c13c8ef4ac2605262c797c95c6796509e8f9841a17aedaf7ac9969bd6efd3b12532cddf2
 EBUILD python-3.8.4-r1.ebuild 9928 BLAKE2B 9ebf074bef412756a79b6a9995f8eebdb92239e0558101b873e5d81a3ce74ef8bdcd0fcfb12f93a5d684d919b840912f91213351ef2db4e634feb00e3071ca81 SHA512 c3f9125df55adada570e75a521017e503e095335f98ef899b9d932ac731af8e21487e0710a70572c2766193ed02cc1e32f2350b457add36519762607c131a629
 EBUILD python-3.8.5.ebuild 10257 BLAKE2B cd47eea37fd760e8d295fabab6202a6cba3d34bd74735bc4ba1ee79c91fb5ca369ac0d1bc7eafc58d1caa7af9ae1235f0da16ce0f3b29aaa4aacafec87532375 SHA512 f98dc41b5565e712fb290633b13a86526edd85714840d3ad7b7f53c22283cc589fe740cb3dbffa4a4b06aabee76983863484395ec524a01db110ac69d0d62419
+EBUILD python-3.8.6.ebuild 10264 BLAKE2B e5944d7a4541e80ca09c5338e5a4bbe262e818f2c9f5f8e1f0a70215689077b60afd26f0b1f93ceabc160104cf4fc60d305776682b5a1e8e79e3932a97feb434 SHA512 8450971ec472fff9df800c45cda50c98874cceef811ee46e58eed1358bdab6c598cecb94a1087879e2bbd74d298d04e5fb6280dad7399281df570903cc2ddd71
 EBUILD python-3.9.0_rc1.ebuild 9542 BLAKE2B 8185c40c749ce46f8bcadccf0da4f6f67d7b134cf3c145d5d7aecde49bbe1fd3aef035362b6d96c1cae596d91df58daeb2d504713cce5ab93a4b02f650bdf438 SHA512 5ac13c9dbb331b6eb50314770623ca29c7bb1fff15177845b0d2a67c82795062b6fc02d274364d9ecd58a5e9d4caf23350df414b46d7c483a90e178916c9bce9
 EBUILD python-3.9.0_rc2.ebuild 9542 BLAKE2B 7534f920099c3cfe5293ba093496a5858e4107f8e9e7f885c62a8d70e2c7ae4a0185b28d3753d07809b8bc99dc71ee7c4aef94880989ff43fc43fd77cbcae076 SHA512 f4fbf2530ea2c7c64d2aedaaa05890977d45709b5d6bfea2e8bf417996e59f6f8be41ac59b8811fc105b7c6f13ecb8b514fa7c4643a6871286f974190897db09
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-3.8.6.ebuild b/dev-lang/python/python-3.8.6.ebuild
new file mode 100644
index 000000000000..cb6c8db09403
--- /dev/null
+++ b/dev-lang/python/python-3.8.6.ebuild
@@ -0,0 +1,355 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic multiprocessing pax-utils \
+	python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+	app-arch/xz-utils:=
+	dev-libs/libffi:=
+	sys-apps/util-linux:=
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? ( >=sys-libs/readline-4.1:= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+	virtual/pkgconfig
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat || die
+	rm -fr Modules/_ctypes/libffi* || die
+	rm -fr Modules/zlib || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	# force correct number of jobs
+	# https://bugs.gentoo.org/737660
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
+	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm      || disable+=" gdbm"
+	use ncurses   || disable+=" _curses _curses_panel"
+	use readline  || disable+=" readline"
+	use sqlite    || disable+=" _sqlite3"
+	use ssl       || export PYTHON_DISABLE_SSL="1"
+	use tk        || disable+=" _tkinter"
+	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		$(use_enable ipv6)
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	emake test EXTRATESTOPTS="-u-network -j${jobs}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	# Remove static library
+	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	local -x EPYTHON=python${PYVER}
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+	fi
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" \
+		"${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" \
+		"${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" \
+		"${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" \
+		"${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" \
+			"${scriptdir}/idle" || die
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || \
+			! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || \
+			! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
+	then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-lang/snobol/Manifest b/dev-lang/snobol/Manifest
index e181e0d060c3..512693acc1ef 100644
--- a/dev-lang/snobol/Manifest
+++ b/dev-lang/snobol/Manifest
@@ -1,5 +1,3 @@
-DIST snobol4-1.1.tar.gz 677333 BLAKE2B a6ccecaa66657438b2c05dfca9f7db95270b4d1a3502ad06c8d217d50d54ac33b0195eb8b2e045ac0b6c49c19a5bf3ee46e4a35b45555d67fc669317c7a5db2b SHA512 ae8482bc64f3d9020dc4d7e390296114e7498ef2764ebb69b6c4960d0c1b01daf4d77dff1aa583231a7f50d4c54f7f72cedc3e4744b03f4b2370fa6de837a3cc
 DIST snobol4-1.4.1.tar.gz 736837 BLAKE2B bb86d2cd3788ad66b7246d86ebd9f289189f5bd059238d2df3fb621aa4a1e910a8ad029f482077eb78916a84c3a28d868e8ac6eef83b48d7f09a8964c57a855d SHA512 5413af10018141e93f05c9ea637711bb3981f2b67557691d05dde8911178d90900f0fdef6c1d2416ebdda6afeeabd21b9e371b6711b2d093df629cc865fc61f9
-EBUILD snobol-1.1.ebuild 1434 BLAKE2B 77b38c81c661e550885fdb8cb7fb9f07e84cb30be582f8032733e7de30baf384f665334ed5006a4ed5b940c8c4431555523def324c931d36a14f083d62a1c431 SHA512 151cc5ab28dbe1ebbfe2fd48ac6e69ff6bcfbc51a90ea311a2031eb86ac91dd9f0367a728ae33d719b830116fbf776a65d5c74157fa56dceebfe7af7324871c2
 EBUILD snobol-1.4.1.ebuild 1293 BLAKE2B 8181290a619a940f1b7c9d4b2009dedccc2f43244a439418da099520ae9c352f1ec20f5913695f436c879dbd30112d794c9ba658a1cf338f74cf44a2a780a186 SHA512 4a967e0d6a91cd6ff86f4ee7f025a9cd18420f8f71404ff08c5ecbf5b9a4849856c9b700ce05f4cd94a63ae65d45d93d1a10dc823f23011249f078e94bf16a91
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/dev-lang/snobol/snobol-1.1.ebuild b/dev-lang/snobol/snobol-1.1.ebuild
deleted file mode 100644
index 562b03b8eecd..000000000000
--- a/dev-lang/snobol/snobol-1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Phil Budne's port of Macro SNOBOL4 in C, for modern machines"
-HOMEPAGE="http://www.snobol4.org/csnobol4/"
-MY_PN="snobol4"
-MY_P="${MY_PN}-${PV}"
-#SRC_URI="ftp://ftp.snobol4.org/snobol4/${MY_P}.tar.gz ftp://ftp.ultimate.com/snobol/${MY_P}.tar.gz"
-SRC_URI="ftp://ftp.snobol4.org/snobol/old/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="sys-devel/gcc
-		sys-devel/m4"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	#export CFLAGS="-O0 -pipe"
-	sed -i.orig -e '/autoconf/s:autoconf:./autoconf:g' \
-		-e '/ADD_LDFLAGS/s/-ldb/-lndbm/' \
-		"${S}"/configure
-	echo "ADD_OPT([${CFLAGS}])" >>${S}/local-config
-	echo "ADD_CPPFLAGS([-DUSE_STDARG_H])" >>${S}/local-config
-	echo "ADD_CPPFLAGS([-DHAVE_STDARG_H])" >>${S}/local-config
-	echo "BINDEST=${EPREFIX}/usr/bin/snobol4" >>${S}/local-config
-	echo "MANDEST=${EPREFIX}/usr/share/man/man4/snobol4.1" >>${S}/local-config
-	echo "SNOLIB_DIR=${EPREFIX}/usr/lib/snobol4" >>${S}/local-config
-}
-
-src_configure() {
-	# WARNING
-	# The configure script is NOT what you expect
-	:
-}
-
-src_compile() {
-	emake
-	emake doc/snobol4.1
-}
-
-src_install() {
-	into /usr
-	newbin xsnobol4 snobol4
-	dodir /usr/lib/snobol4
-	insinto /usr/lib/snobol4
-	doins snolib.a snolib/bq.sno
-
-	doman doc/*.1
-	dohtml doc/*.html
-	rm doc/*.html
-	dodoc doc/*.ps doc/*.txt doc/*.pdf
-}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 9f47de16747f..3b77706f7cef 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -8,7 +8,9 @@ AUX spidermonkey-perl-defined-array-check.patch 341 BLAKE2B e11a74cc2afbea5e39ec
 DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7 SHA512 9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128
 DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c SHA512 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
 DIST firefox-78.2.0esr.source.tar.xz 331996944 BLAKE2B bd16877d078de66a418ae114c534b26313f112b9e40ad5cf112fb07a4d7335dc47071ee6e959e3e4c179b95afbdc5ab9cda7cdefa96355dbbaf6b75c7805d171 SHA512 38f91a24634ce5d0c10340c9ac762071f8488f4bd7649bff9ed9cb1cbecda23e207b593118d38488810540e63be39d9c1c45c3b9a6acb477b6b2edf636e56d5b
+DIST firefox-78.3.0esr.source.tar.xz 331073228 BLAKE2B 01f3d3c0b8b963dedfa89631c518225104c739637a8bf22c121e3a942fa0b1d1f8cf1c4c2edad2e823e0e3922f865cc8d3430c6fc9246deea855295eaff84a0e SHA512 89e12797429d99760b294e302d803432f533b7c2c10f1fcd3781b89b27ec9698173d4fbf1bfe7506186602daf6666c09152407ce5668fb5b7391e38b5566f2f2
 DIST firefox-esr-78-patches-01.tar.xz 30808 BLAKE2B c3005a04233462c800ff0da7ba5e4f1e4d350c21e2642a93aa48637fcc19b8c0e97222669629a152ad6403652f83d4fdf3191b3c2741dca5327b101ef491d962 SHA512 7b2aba8dd4ff2f8ac3236ae95eec73aff3560e8f11f170f09b28ae2c7681dc0220ac63724a331dcc792c86e73145acee173a19bce5fcf995ba40ed5d067e1eff
+DIST firefox-esr-78-patches-02.tar.xz 36288 BLAKE2B f177027ea550b4f41616c104865a4d1a99fa0a84ca431176b5191107f23b2fcdd8361ad97493d3182d01dfeb7f2805caf16725b8a81bf1f7847cf400f87018d6 SHA512 7eff0a4f5d2b4abcb0293877b3fe562b5fa2581f46b4905ff8ad839559049e4d903dcca4aad6a7196720cc7b3cd93ae88ca0093da51f70e56609faaadf646c78
 DIST js185-1.0.0.tar.gz 6164605 BLAKE2B 76a37f0ceae05d3475853875bd0ce4be6e525e4114816f8f281ea6fc6b60a71060975a0fa1cb843f57ad1e2f842dfb26b24244fa0fd6c20f6ae2ebbe430f70be SHA512 2af7122a7c7007fd7b6668776fe1222515a810b3e43bbf0f76b8f94e1ef406ffd3fb5ccec393021b00274c05b38a77235bc8d6886994c56762fcaf0aa7cf6718
 DIST mozjs-52.9.1pre1.tar.bz2 30178574 BLAKE2B 0920432b5140e78297a9bcbccb54268d75a223d5e75e4ff90b3b01aab4f7736b4a4e05c47b3a925ff0a74607a0abad3b6583c75d070ef5142009b20ebaf6e4bf SHA512 187b231b246a5ae09e55c0fef77866b316d75f38f4c2e066d5d4325d8da63433027020c929439cab46af3253ac63ab2f780223a8fd2c6ff535b3409bb6c4aa0f
 DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0
@@ -22,4 +24,5 @@ EBUILD spidermonkey-52.9.1_pre1-r2.ebuild 4592 BLAKE2B 506e6a1958e0c4cd7f3898410
 EBUILD spidermonkey-60.5.2_p0-r4.ebuild 4238 BLAKE2B a5f3d1bcb0c12a678795d2e632822687e2d025bbb679daf0a5ffc2d262118bd5120f0a112ed39cf1feda178b609c6a2395e3d424c9e796b824a048bcb7385deb SHA512 3961fce1b9984e3929005a4d0ce3e0494ff1de7d42d07c70023b57d4e45f2d3cca1c6c8d8c803b95dcacf5a56ef9a66a339fe891bef594d079f275861d16b035
 EBUILD spidermonkey-68.12.0.ebuild 6847 BLAKE2B 686cb9a7c48fce686c33b62398a9a5a87c6447ceb19d7a2eb7b90ce122cd5ae65f6a2238a0fc082bf034944e4f856ae86811299ad1e6a848bff74995e7435d0b SHA512 d35822d650390c09fd89e118933ae4261237c38350e2185cc628ff25b5568b86e009834961f19afdbdb920b9f2df10606ba75fbe375b95a7399921979c6f7d9f
 EBUILD spidermonkey-78.2.0.ebuild 7024 BLAKE2B abaefb9e14eed44068f4e2f5c40497a363e093c2baf533af3d69aa63260e174e8d3371dcecab54ff85a1ab6f2f51d198a2ddc2650df0d84b9c084ffd5ce7d965 SHA512 0c2943adfb48663bc174e31bfaaf65f485577447ba1c326a2112a13bf5753f3406400dcf3aff59973ec269324b9356fed20c06c4717691475c558ae8c8a0e06e
+EBUILD spidermonkey-78.3.0.ebuild 7032 BLAKE2B 7d7152dfbc2d7c059fc5debd21615ad680cabdbc0eef432cbe5a981c02586153c9f72ec2f8d82efd7f357402ac3999a5a08a1d313a3bc0540361e0350319a4aa SHA512 b7079d75dcc81455b2d81be19183a75efb192a949a748c5d3476032a2332960883d2a2b5f93011f67bcc8d4cee9aa49ae2a83be8ce917a0f7816eccb7df9b7a3
 MISC metadata.xml 744 BLAKE2B d495aa93bf62337ed6ba895708caa6215e23d50c54c64ea34b1be76d06f5b53fc08da5b314130345f91a96fb9427f87f044289337d98f54a3b4d80ae237ff5ab SHA512 9e6e220335341133f35dd78ced565fd6ee1951f968388913097453eca7bd78cc3bc7a54245b6d28a2dda398160215d799d89ea367df4d587fb23287990ee3956
diff --git a/dev-lang/spidermonkey/spidermonkey-78.3.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.3.0.ebuild
new file mode 100644
index 000000000000..beec62444260
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-78.3.0.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+WANT_AUTOCONF="2.1"
+
+inherit autotools check-reqs multiprocessing python-any-r1 toolchain-funcs
+
+MY_PN="mozjs"
+MY_PV="${PV/_pre*}" # Handle Gentoo pre-releases
+
+MY_MAJOR=$(ver_cut 1)
+
+MOZ_ESR="1"
+
+# Convert the ebuild version to the upstream mozilla version
+MOZ_PV="${MY_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
+FIREFOX_PATCHSET="firefox-esr-78-patches-02.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-01.tar.xz"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/firefox/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/firefox/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/firefox-${MOZ_PV}.source.tar.xz"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${FIREFOX_PATCHSET}
+	https://dev.gentoo.org/~{whissi,polynomial-c,axs}/mozilla/patchsets/${SPIDERMONKEY_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_URI}
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~x86"
+
+SLOT="78"
+LICENSE="MPL-2.0"
+IUSE="cpu_flags_arm_neon debug +jit test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/llvm
+	>=virtual/rust-1.41.0
+	virtual/pkgconfig"
+
+CDEPEND=">=dev-libs/icu-67.1:=
+	>=dev-libs/nspr-4.25
+	sys-libs/readline:0=
+	>=sys-libs/zlib-1.2.3"
+
+DEPEND="${CDEPEND}
+	test? (
+		$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	)"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/firefox-${MY_PV}/js/src"
+
+python_check_deps() {
+	if use test ; then
+		has_version "dev-python/six[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_pretend() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="6400M"
+	else
+		CHECKREQS_DISK_BUILD="5600M"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	if use test ; then
+		CHECKREQS_DISK_BUILD="6400M"
+	else
+		CHECKREQS_DISK_BUILD="5600M"
+	fi
+
+	check-reqs_pkg_setup
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	pushd ../.. &>/dev/null || die
+
+	eapply "${WORKDIR}"/firefox-patches
+	eapply "${WORKDIR}"/spidermonkey-patches
+
+	default
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	einfo "Removing pre-built binaries ..."
+	find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	MOZJS_BUILDDIR="${WORKDIR}/build"
+	mkdir "${MOZJS_BUILDDIR}" || die
+
+	popd &>/dev/null || die
+	eautoconf
+}
+
+src_configure() {
+	tc-export CC CXX LD AR RANLIB
+
+	cd "${MOZJS_BUILDDIR}" || die
+
+	# ../python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	local -a myeconfargs=(
+		--host="${CBUILD:-${CHOST}}"
+		--target="${CHOST}"
+		--disable-jemalloc
+		--disable-optimize
+		--disable-strip
+		--enable-readline
+		--enable-shared-js
+		--with-intl-api
+		--with-system-icu
+		--with-system-nspr
+		--with-system-zlib
+		--with-toolchain-prefix="${CHOST}-"
+		$(use_enable debug)
+		$(use_enable jit)
+		$(use_enable test tests)
+	)
+
+	# Modifications to better support ARM, bug 717344
+	if use cpu_flags_arm_neon ; then
+		myeconfargs+=( --with-fpu=neon )
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			myeconfargs+=( --with-thumb=yes )
+			myeconfargs+=( --with-thumb-interwork=no )
+		fi
+	fi
+
+	# Forcing system-icu allows us to skip patching bundled ICU for PPC
+	# and other minor arches
+	ECONF_SOURCE="${S}" \
+		econf \
+		${myeconfargs[@]} \
+		XARGS="${EPREFIX}/usr/bin/xargs"
+}
+
+src_compile() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+}
+
+src_test() {
+	if "${MOZJS_BUILDDIR}/js/src/js" -e 'print("Hello world!")'; then
+		einfo "Smoke-test successful, continuing with full test suite"
+	else
+		die "Smoke-test failed: did interpreter initialization fail?"
+	fi
+
+	local -a KNOWN_TESTFAILURES
+	KNOWN_TESTFAILURES+=( non262/Date/reset-time-zone-cache-same-offset.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zone-path.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zones-historic.js )
+	KNOWN_TESTFAILURES+=( non262/Date/time-zones-imported.js )
+	KNOWN_TESTFAILURES+=( non262/Date/toString-localized.js )
+	KNOWN_TESTFAILURES+=( non262/Date/toString-localized-posix.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/timeZone_backward_links.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/DateTimeFormat/tz-environment-variable.js )
+	KNOWN_TESTFAILURES+=( non262/Intl/Locale/likely-subtags.js )
+	KNOWN_TESTFAILURES+=( test262/intl402/Locale/prototype/minimize/removing-likely-subtags-first-adds-likely-subtags.js )
+
+	if use x86 ; then
+		KNOWN_TESTFAILURES+=( non262/Date/timeclip.js )
+		KNOWN_TESTFAILURES+=( test262/built-ins/Number/prototype/toPrecision/return-values.js )
+		KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.1.js )
+		KNOWN_TESTFAILURES+=( test262/language/types/number/S8.5_A2.2.js )
+	fi
+
+	echo "" > "${T}"/known_failures.list || die
+
+	local KNOWN_TESTFAILURE
+	for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
+		echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
+	done
+
+	PYTHONPATH="${S}/tests/lib" \
+		${PYTHON} \
+		"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+		--exclude-file="${T}"/known_failures.list \
+		"${MOZJS_BUILDDIR}"/js/src/js \
+		|| die
+
+	if use jit ; then
+		KNOWN_TESTFAILURES=()
+
+		echo "" > "${T}"/known_failures.list || die
+
+		for KNOWN_TESTFAILURE in ${KNOWN_TESTFAILURES[@]} ; do
+			echo "${KNOWN_TESTFAILURE}" >> "${T}"/known_failures.list
+		done
+
+		PYTHONPATH="${S}/tests/lib" \
+			${PYTHON} \
+			"${S}"/tests/jstests.py -d -s -t 1800 --wpt=disabled --no-progress \
+			--exclude-file="${T}"/known_failures.list \
+			"${MOZJS_BUILDDIR}"/js/src/js basic \
+			|| die
+	fi
+}
+
+src_install() {
+	cd "${MOZJS_BUILDDIR}" || die
+	default
+
+	# fix soname links
+	pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die
+	mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die
+	ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die
+	popd &>/dev/null || die
+
+	# remove unneeded files
+	rm \
+		"${ED}"/usr/bin/js${MY_MAJOR}-config \
+		"${ED}"/usr/$(get_libdir)/libjs_static.ajs \
+		|| die
+
+	# fix permissions
+	chmod -x \
+		"${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \
+		"${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h \
+		|| die
+}
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 335719821b8f..1bcc1f3404da 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,19 +1,9 @@
-AUX build-2.9.2.xml 2863 BLAKE2B f7c86965edbe1ba6d332b170caab1db5d872174b3b014d25dda12681e8183de1d5de9c3a3a2595d7e6ebd3f44528703f0f7478aa1e4f0fc6b24d182a51f3a88f SHA512 ca4dd0b76ae5a503a07f4c660f8715ff38b1c8e582de52928dad040f42a5fb7a9c774e039d9b7ca4b310b29241da6ab6b43115d741ed6dfbcc8538e384a05673
 AUX build-3.x.xml 2968 BLAKE2B e403d134a62504c396842f2fad71cf2aec1786c5d7902d7d08398894eb0dfe709617ae137b2249cf81d5c82f14707364b072990b1cc695b9deb49f6cffb96377 SHA512 4e65ba93141f8c47b2be9f534b05be3c4fa33428df73a23148b8f0f675f617071ad6c14c8aaa1f1ed6de03832f3e26b0b065b2f67834199244fbe55b398f0f20
-AUX tuprolog-2.9.2-no-dynamic-object-test.patch 758 BLAKE2B 8e4ed5b4a5a12e6140c5bdf4074a02061cc82c50b29dfa7d09fc4b2b44b7a6b580abda565d1c1615ae864fcc7fc6a86b6d71e69e3eabec00e2bf92800da06ee8 SHA512 bbaef70b751fe049680826fb82dc46a339f88d7b8062df0865fddb15de2c991939e7e2fae0f889db0c72d802790287487f442316ad6c9e7fa7276b30083b7365
-AUX tuprolog-2.9.2-no-ikvm.patch 3929 BLAKE2B 0a6ec1d96c71762fee02b5701e2c445b000fae37eb335ed2a3fecdaabd4f28fbe894b2768a0c01e298accc267ff233e413370e7e744009b364b8b4888635b71f SHA512 a90b55f74841271a6ae9f4143203a9920adee9f7ab32c814d41f8830b7310919fcf035361f87fcd1ba7f7f0f0efe0c0a29ddff704c0d4d14ed2a41b4f7574a74
-AUX tuprolog-3.0.1-no-ikvm.patch 4844 BLAKE2B 6518c8821ef06f5b99de779d139b4d23e9e1458622edc267b237e7cb83d64164cd27a321d751423cbd0403a3666096322e80d0fdc6300df51a3ab54d4c1d9412 SHA512 c018d9028a9a4aea6c36057ac2d8b46d41da4961570fff491521c7b6bb816653db54a9e2a1049bd037aede7fa00262089f3787cad4a1e10836aa4f7442c727cd
-AUX tuprolog-3.0.1-oolibrary-unit-test.patch 762 BLAKE2B 615eb657e9c40a4cec568ae1a8b1868eaaa94d7911386099b65f06dd8002f9d77bce675f79c03db0c900f4b7fb10149b95aa328c582674fefe94ec7af8996d9d SHA512 54e3e9ef7ecc5ff27e687067a057e0c66f37e4d5f268d670210df89435333f7e303e640e12a4afd3c7906e3c52cd2de2466dc81b6cd2113aeb2ee0c7b5ad7a88
 AUX tuprolog-3.1.0-no-ikvm.patch 4862 BLAKE2B c5e49ecc13f923157a9287ece06b1ecf1c8a418e449cc9f73ca6a5c2f2bbc7ec567b76ba04a43c6f42fce381941c1f5ee3897a6df20d6600e8d00c550100f9f2 SHA512 ceb45121b4bec54cdd26683ce1e7a63baea9d5c899cd5993d51cbaf8fdbc4b9138f926e164e1dd96eafb2af6b2112c44bf15b1f79c6b9096ac028e02c2dab1a0
 AUX tuprolog-3.1.0-test-suite.patch 518 BLAKE2B 08cfea93b9675826bacb9f7a9970120a02fed2826d8edfa025dfaf4ee03f3bceba32cb197178a9edb1bf2d41354d6ca22c25e3a851578d61735c63c54cd5e6c2 SHA512 58d3ea5c0bb4606c72fa1bb7a1d92974fe9e5229e9674212f8fdbf53d09a345090fda96bf05dd867c01484577bd5f28a56813c8808e072c7c03282afc6d9933a
-DIST tuprolog-2.9.2.tar.gz 6262268 BLAKE2B 39bbc4dcb2336a713f47252ff6f7d00f15aa0072c4864c2d3e453ec43b2c646f9cdc7a69444e21d9cc20ba283ddee5fd980855811f8f80ba4afe7c37cdd47317 SHA512 831c7390fe33fc57cb01d4b1d61485ac5df1aa8ebf386d5aae5c5d32f7677d46aa5aa6cc0eb1d3bb79989a54f8484ad8b97754b7f75fc21af6116ae170a28316
-DIST tuprolog-3.0.1.tar.gz 6326591 BLAKE2B a051eb3f22c01e1c269b167fa7d1daec6e4818229e2035c1140401c38094c53451ea720638adaa6d6fda0ea70daf6f5f1bc9ea84f1e4ba9de9f00ca83529697c SHA512 56fa96f717b5c8e56fd2979f2953744964d844e5abf215456e31309d3d92bde142f9bff55e6442b6de55f219c7f143a275ccf89359ff2f2944459bbc94770afa
 DIST tuprolog-3.1.0.tar.gz 7201383 BLAKE2B 9d8b610240611cd5b3d0dae104a44c72bb5e7c0512e4dbf3e178204d9d36e461219cd869ca1e16e3054ca3e1ee34d3b2c6fa5c659df16f54e3266c7c826af8d6 SHA512 1093e29a79964cb3991326da14f020cdc8ff64f2444c84dbb6b22aa5c4ecbf48f74dbc26af0af949ccc31020573ce5908684af794db4654fb475efa697a82cbf
 DIST tuprolog-3.2.0-gentoo-patchset-0.tar.gz 1813 BLAKE2B 4ed7ffbb752a821a2b2842cfdbc1f4ec92d14b35a1c5a722207b45ec9dbdc44588acc010fb6386e8ed2e7d30d3bc8d425f0f74e8cc953cb7afad8305904e1499 SHA512 454757fc01f3f697510426e7a2a41b57350c1e3f980e381e197616e10eaf88339155226096f1d417397b9bc6f4964a45b3d547c6794ad23a4a014b06212b08f0
 DIST tuprolog-3.2.0.tar.gz 6242286 BLAKE2B 77a3d3f886673aca72fffd9bb60657efcbe7ea5bb0f84eea7a72df513295d572c8116472f8d544240fac676ac9a6a0fcecfc3166e6426ef7d8af80eac4ba8d85 SHA512 e27bd989d66bae26c646cb69670fb75232ebdd18d1dbb9d600f9847921ecd56d17221736b3ec15c087857509272ce89af8bc44924130430db3860870a06bb499
-EBUILD tuprolog-2.9.2.ebuild 1301 BLAKE2B 88be118553d16626a1c411017072614889f74b1b23636586c6ccae116cb5561e441c5403e84f606e8ada9cacb7ce2c6f63d3702e149f90e53d336501b33e99aa SHA512 1638295c84bc6c32b695f39b866c299b8375be07d48e061dd08b5d8b6b5763e42477971c6ec3e8bf3af61107997c332b41bf6e7ec24c7089c2ebc4efb6216cd2
-EBUILD tuprolog-3.0.1.ebuild 1347 BLAKE2B 93688d55fe1c777e78164da283c356b6371cd4036a6a8d1c917d9801bce70c8278cf0bbfedd9651364a425c7b56b42500cd6f0dd856fbc42742ca955ba630491 SHA512 8137b9e2b4371fc4f3a90a61e3febb4dc4c700db185d9d846f2671fc57353bd6527df8011086ebe6f49cb5ca9890ff9effc06e7c2e1b5689e273c84419f11fa2
 EBUILD tuprolog-3.1.0-r1.ebuild 1360 BLAKE2B 3f81572cf4281d056c4f913beca279a9042854c28eba5736e3c2b3086293092b267759cfbb5111d00262eb8fc29c77a96fdd2bde719e1fa8b5cece6064c0b104 SHA512 06d7bc49dd97a4f3999222ae3b67dbd00d8c047cc7849b6b90578c1b278a834a34df578bcb2fc7b353503a1d47d2eb77645c8e3f16a37de891adf81cf1fef583
-EBUILD tuprolog-3.1.0.ebuild 1294 BLAKE2B cd580a5297944c2c897b4adbec8d7e491b0aa44ac62f2413b433933c047f2c3e095d3e0233372919a471a5e662bd6031d79675341e5bf43ce96f286f39512058 SHA512 434ddf51d71489a18298eea3a695b22c8b4be18bec88094750b3822d01b1edb4287a4ff5f9627274dc851a54ce32d7a13800c38c540bfb5509b4bf8a37c74292
 EBUILD tuprolog-3.2.0.ebuild 1442 BLAKE2B b35cbdabc2f62bcf6da14417301b2d00724235478a10c2926d5cd7231af9a4f783ec8ea6ebe85057a18d27c176a21682c9b683ae1e047ff4b8209e3ff2f2a492 SHA512 953441a4b4a231a3aa9b237880a5e626b05ecf936266074a6760010ba858169c1bb7e71d8e8009f0c6eaa4ee46d07f54b5009836f5c1c821c24cb1fcf4095c7b
 MISC metadata.xml 318 BLAKE2B bbdb9dc3b4feafc27fa6fae1b0740bde801196a214bb96f5815a2a274c89d6208c158c2616e40f17fbef4f8becd03b686410a3ee7b8253cceb70b80bc4b03c5f SHA512 6a43476b9ed9a343488c8a80908e8b4fcb96c75d9a3e6b6c05c22d8ffb87f5c8df8a3cfd2db5297f60236d6740ab0770e68e1acb4c457398a280df9dc4c266a9
diff --git a/dev-lang/tuprolog/files/build-2.9.2.xml b/dev-lang/tuprolog/files/build-2.9.2.xml
deleted file mode 100644
index 823c2371d1fd..000000000000
--- a/dev-lang/tuprolog/files/build-2.9.2.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" ?><project default="jar" name="tuprolog">
-
-	<!-- some properties -->
-	<property name="src.dir" value="src"/>
-	<property name="build.dir" value="build"/>
-	<property name="docs.dir" value="docs"/>
-	<property name="dist.dir" value="dist"/>
-	<property name="test.dir" value="test"/>
-	<property name="test.build.dir" value="test.build"/>
-	<property name="jarfile" value="${ant.project.name}.jar"/>
-	<property file="build.properties"/>
-
-	<path id="compile.classpath">
-		<fileset dir="lib" includes="*.jar"/>
-		<pathelement path="${gentoo.classpath}"/>
-	</path>
-
-	<!-- init -->
-	<target name="init">
-		<tstamp/>
-		<mkdir dir="${dist.dir}"/>
-		<mkdir dir="${build.dir}"/>
-		<mkdir dir="${docs.dir}"/>
-		<mkdir dir="${test.build.dir}"/>
-	</target>	
-
-	<!-- compile everything -->
-	<target depends="init" name="compile">
-		<javac deprecation="off"
-			destdir="${build.dir}"
-			encoding="ISO-8859-1"
-			srcdir="${src.dir}"
-			target="1.7">
-			<classpath>
-				<path refid="compile.classpath"/>
-			</classpath>
-		</javac>
-		<copy todir="${build.dir}">
-			<fileset dir="${src.dir}">
-				<exclude name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<!-- build the jar file -->
-	<target depends="compile" name="jar">
-		<jar basedir="${build.dir}" jarfile="${dist.dir}/${jarfile}"/>
-		<jar basedir="${build.dir}" jarfile="${dist.dir}/2p.jar">
-			<manifest>
-				<attribute name="Main-Class" value="alice.tuprologx.ide.GUILauncher"/>
-				<attribute name="Class-Path" value="."/>
-			</manifest>
-			<zipgroupfileset dir="lib" includes="*.jar"/>
-		</jar>
-	</target>
-
-	<!-- generate javadocs -->
-	<target depends="init" name="javadoc">
-		<javadoc
-			author="false"
-			destdir="${docs.dir}"
-			encoding="ISO-8859-1"
-			breakiterator="yes"
-			packagenames="alice.*"
-			sourcepath="${src.dir}"
-			use="true"
-			version="true"
-			verbose="no"
-			windowtitle="${ant.project.name} API">
-			<classpath>
-				<path refid="compile.classpath"/>
-			</classpath>
-		</javadoc>
-	</target>
-
-	<!-- clean up -->
-	<target name="clean">
-		<delete dir="${build.dir}"/>
-		<delete dir="${dist.dir}"/>
-		<delete dir="${docs.dir}"/>
-		<delete dir="${test.build.dir}"/>
-	</target>
-
-	<!-- run testsuite -->
-	<target name="test">
-		<path id="dist.classpath">
-			<fileset dir="${dist.dir}">
-				<include name="*.jar"/>
-			</fileset>
-		</path>
-		<javac classpathref="dist.classpath"
-			deprecation="off"
-			destdir="${test.build.dir}"
-			encoding="ISO-8859-1"
-			srcdir="${test.dir}/unit"
-			target="1.7"/>
-		<junit haltonfailure="on" showoutput="no" printsummary="yes">
-			<classpath>
-				<path refid="dist.classpath"/>
-				<pathelement path="${test.build.dir}"/>
-			</classpath>
-			<formatter type="xml"/>
-			<batchtest todir="${test.build.dir}">
-				<fileset dir="${test.build.dir}">
-					<include name="**/*TestCase.class"/>
-				</fileset>
-			</batchtest>
-		</junit>
-	</target>
-</project>
diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch
deleted file mode 100644
index 0416258e9e14..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tuprolog-2.9.2.orig/test/unit/alice/tuprolog/JavaLibraryTestCase.java	2015-02-27 14:02:49.000000000 +0100
-+++ tuprolog-2.9.2/test/unit/alice/tuprolog/JavaLibraryTestCase.java	2016-02-17 15:24:47.000000000 +0100
-@@ -39,7 +39,7 @@
- 		SolveInfo goal = engine.solve(new Struct("demo", t));

- 		assertFalse(goal.isSuccess());

- 	}

--

-+/*

- 	public void testDynamicObjectsRetrival() throws PrologException {

- 		Prolog engine = new Prolog();

- 		JavaLibrary lib = (JavaLibrary) engine.getLibrary("alice.tuprolog.lib.JavaLibrary");

-@@ -53,7 +53,7 @@
- 		TestCounter counter = (TestCounter) lib.getRegisteredDynamicObject(id);

- 		assertEquals(2, counter.getValue());

- 	}

--

-+*/

- 	

- 	public void test_java_object() throws PrologException, IOException

- 	{

diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch
deleted file mode 100644
index d94dc66bbac5..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -urN tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java
---- tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java	2014-09-29 18:14:21.000000000 +0200
-+++ tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java	2015-01-11 14:48:57.000000000 +0100
-@@ -9,11 +9,11 @@
- import java.net.URL;
- import java.net.URLClassLoader;
- import java.util.*;
--import cli.System.Reflection.Assembly;
-+//import cli.System.Reflection.Assembly;
- 
- import alice.tuprolog.event.LibraryEvent;
- import alice.tuprolog.event.WarningEvent;
--import alice.util.AssemblyCustomClassLoader;
-+//import alice.util.AssemblyCustomClassLoader;
- 
- /**
-  * @author Alex Benini
-@@ -179,31 +179,7 @@
- 				} else
- 				// .NET
- 				{
--					Assembly asm = null;
--					boolean classFound = false;
--					className = "cli."
--							+ className.substring(0, className.indexOf(","))
--									.trim();
--					for (int i = 0; i < paths.length; i++)
--					{
--						try
--						{
--							asm = Assembly.LoadFrom(paths[i]);
--							loader = new AssemblyCustomClassLoader(asm, urls);
--							lib = (Library) Class.forName(className, true, loader).newInstance();
--							if (lib != null)
--							{
--								classFound = true;
--								break;
--							}
--						} catch (Exception e)
--						{
--							e.printStackTrace();
--							continue;
--						}
--					}
--					if (!classFound)
--						throw new InvalidLibraryException(className, -1, -1);
-+					throw new InvalidLibraryException(className, -1, -1);
- 				}
- 			}
- 
-@@ -462,4 +438,4 @@
- 		return optimizedDirectory;
- 	}
- 
--}
-\ No newline at end of file
-+}
-diff -urN tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java
---- tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java	2014-09-29 18:14:21.000000000 +0200
-+++ tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java	2015-01-11 14:46:23.000000000 +0100
-@@ -18,7 +18,7 @@
- package alice.tuprologx.ide;

- 

- import alice.tuprolog.*;

--import alice.util.AssemblyCustomClassLoader;

-+//import alice.util.AssemblyCustomClassLoader;

- 

- import java.io.File;

- import java.net.URL;

-@@ -26,7 +26,7 @@
- import java.util.ArrayList;

- import java.util.Hashtable;

- import java.util.StringTokenizer;

--import cli.System.Reflection.Assembly;

-+//import cli.System.Reflection.Assembly;

- 

- /**

-  * A dynamic manager for tuProlog libraries.

-@@ -155,10 +155,7 @@
- 	        	// .NET

- 	        	if(System.getProperty("java.vm.name").equals("IKVM.NET"))

- 	        	{

--	        		Assembly asm = Assembly.LoadFrom(file.getPath());

--	        		loader = new AssemblyCustomClassLoader(asm, new URL[]{url});

--	        		libraryClassname = "cli." + libraryClassname.substring(0, 

--	        				libraryClassname.indexOf(",")).trim();

-+	        		throw new InvalidLibraryException(libraryClassname,-1,-1);

- 	        	}

- 	        	// JVM

- 	        	else

-diff -urN tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java
---- tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java	2014-09-29 18:14:21.000000000 +0200
-+++ tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java	1970-01-01 01:00:00.000000000 +0100
-@@ -1,21 +0,0 @@
--package alice.util;

--

--import java.net.URL;

--

--public class AssemblyCustomClassLoader extends java.net.URLClassLoader

--{

--  public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls)

--  {

--    super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm));

--    // explicitly calling addURL() is safer than passing it to the super constructor,

--    // because this class loader instance may be used during the URL construction.

--    for (URL url : urls) {

--    	addURL(url);

--	}    

--  }

--  

--  public void addUrl(URL url)

--  {

--	  addURL(url);

--  }

--}
-\ No newline at end of file
diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch
deleted file mode 100644
index 660b22c79341..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -urN tuprolog-3.0.1.orig/src/alice/tuprolog/LibraryManager.java tuprolog-3.0.1/src/alice/tuprolog/LibraryManager.java
---- tuprolog-3.0.1.orig/src/alice/tuprolog/LibraryManager.java	2017-09-27 12:31:06.689334505 +0200
-+++ tuprolog-3.0.1/src/alice/tuprolog/LibraryManager.java	2017-09-27 12:50:04.193286931 +0200
-@@ -9,11 +9,11 @@
- import java.net.URL;
- import java.net.URLClassLoader;
- import java.util.*;
--import cli.System.Reflection.Assembly;
-+//import cli.System.Reflection.Assembly;
- 
- import alice.tuprolog.event.LibraryEvent;
- import alice.tuprolog.event.WarningEvent;
--import alice.util.AssemblyCustomClassLoader;
-+//import alice.util.AssemblyCustomClassLoader;
- 
- /**
-  * @author Alex Benini
-@@ -179,31 +179,7 @@
- 				} else
- 				// .NET
- 				{
--					Assembly asm = null;
--					boolean classFound = false;
--					className = "cli."
--							+ className.substring(0, className.indexOf(","))
--									.trim();
--					for (int i = 0; i < paths.length; i++)
--					{
--						try
--						{
--							asm = Assembly.LoadFrom(paths[i]);
--							loader = new AssemblyCustomClassLoader(asm, urls);
--							lib = (Library) Class.forName(className, true, loader).newInstance();
--							if (lib != null)
--							{
--								classFound = true;
--								break;
--							}
--						} catch (Exception e)
--						{
--							e.printStackTrace();
--							continue;
--						}
--					}
--					if (!classFound)
--						throw new InvalidLibraryException(className, -1, -1);
-+					throw new InvalidLibraryException(className, -1, -1);
- 				}
- 			}
- 
-@@ -462,4 +438,4 @@
- 		return optimizedDirectory;
- 	}
- 
--}
-\ Manca newline alla fine del file
-+}
-diff -urN tuprolog-3.0.1.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-3.0.1/src/alice/tuprologx/ide/LibraryManager.java
---- tuprolog-3.0.1.orig/src/alice/tuprologx/ide/LibraryManager.java	2017-09-27 12:31:06.696334504 +0200
-+++ tuprolog-3.0.1/src/alice/tuprologx/ide/LibraryManager.java	2017-09-27 12:50:04.194286931 +0200
-@@ -18,7 +18,7 @@
- package alice.tuprologx.ide;

- 

- import alice.tuprolog.*;

--import alice.util.AssemblyCustomClassLoader;

-+//import alice.util.AssemblyCustomClassLoader;

- 

- import java.io.File;

- import java.net.URL;

-@@ -26,7 +26,7 @@
- import java.util.ArrayList;

- import java.util.Hashtable;

- import java.util.StringTokenizer;

--import cli.System.Reflection.Assembly;

-+//import cli.System.Reflection.Assembly;

- 

- /**

-  * A dynamic manager for tuProlog libraries.

-@@ -155,10 +155,7 @@
- 	        	// .NET

- 	        	if(System.getProperty("java.vm.name").equals("IKVM.NET"))

- 	        	{

--	        		Assembly asm = Assembly.LoadFrom(file.getPath());

--	        		loader = new AssemblyCustomClassLoader(asm, new URL[]{url});

--	        		libraryClassname = "cli." + libraryClassname.substring(0, 

--	        				libraryClassname.indexOf(",")).trim();

-+	        		throw new InvalidLibraryException(libraryClassname,-1,-1);

- 	        	}

- 	        	// JVM

- 	        	else

-diff -urN tuprolog-3.0.1.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-3.0.1/src/alice/util/AssemblyCustomClassLoader.java
---- tuprolog-3.0.1.orig/src/alice/util/AssemblyCustomClassLoader.java	2017-09-27 12:31:06.699334504 +0200
-+++ tuprolog-3.0.1/src/alice/util/AssemblyCustomClassLoader.java	1970-01-01 01:00:00.000000000 +0100
-@@ -1,21 +0,0 @@
--package alice.util;

--

--import java.net.URL;

--

--public class AssemblyCustomClassLoader extends java.net.URLClassLoader

--{

--  public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls)

--  {

--    super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm));

--    // explicitly calling addURL() is safer than passing it to the super constructor,

--    // because this class loader instance may be used during the URL construction.

--    for (URL url : urls) {

--    	addURL(url);

--	}    

--  }

--  

--  public void addUrl(URL url)

--  {

--	  addURL(url);

--  }

--}
-\ Manca newline alla fine del file
-diff -urN tuprolog-3.0.1.orig/src/alice/util/proxyGenerator/Generator.java tuprolog-3.0.1/src/alice/util/proxyGenerator/Generator.java
---- tuprolog-3.0.1.orig/src/alice/util/proxyGenerator/Generator.java	2017-09-27 12:31:06.700334504 +0200
-+++ tuprolog-3.0.1/src/alice/util/proxyGenerator/Generator.java	2017-09-27 12:50:04.195286931 +0200
-@@ -1,7 +1,7 @@
- package alice.util.proxyGenerator;

- import javax.tools.*;

- 

--import cli.System.Reflection.Assembly;

-+//import cli.System.Reflection.Assembly;

- 

- import java.lang.reflect.*;

- import java.util.*;

-@@ -29,7 +29,7 @@
-     }

-     

-     if(System.getProperty("java.vm.name").equals("IKVM.NET"))

--    	ikvm.runtime.Startup.addBootClassPathAssemby(Assembly.Load("IKVM.OpenJDK.Tools"));

-+    	throw new UnsupportedOperationException("IKVM.NET not supported!");

-     

-     jc = ToolProvider.getSystemJavaCompiler();

-     if (jc == null) {

diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch b/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch
deleted file mode 100644
index 9d09ff202b08..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur tuprolog-3.0.1.orig/test/unit/alice/tuprolog/PrologTestCase.java tuprolog-3.0.1/test/unit/alice/tuprolog/PrologTestCase.java
---- tuprolog-3.0.1.orig/test/unit/alice/tuprolog/PrologTestCase.java	2017-09-27 12:31:12.908334244 +0200
-+++ tuprolog-3.0.1/test/unit/alice/tuprolog/PrologTestCase.java	2017-09-27 19:30:31.813282027 +0200
-@@ -32,7 +32,7 @@
- 		assertNotNull(engine.getLibrary("alice.tuprolog.StringLibrary"));
- 		Library javaLibrary = new alice.tuprolog.lib.OOLibrary();
- 		engine.loadLibrary(javaLibrary);
--		assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.JavaLibrary"));
-+		assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.OOLibrary"));
- 	}
- 	
- 	public void testGetLibraryWithName() throws InvalidLibraryException {
diff --git a/dev-lang/tuprolog/tuprolog-2.9.2.ebuild b/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
deleted file mode 100644
index ee49fbe50a3c..000000000000
--- a/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://tuprolog.unibo.it/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jdk-1.7:=
-	 dev-java/javassist:3"
-
-DEPEND="${RDEPEND}
-	dev-java/ant-core
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/junit:4
-		dev-java/hamcrest-core:1.3
-	)"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist:3"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-ikvm.patch
-	epatch "${FILESDIR}"/${P}-no-dynamic-object-test.patch
-
-	cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_test() {
-	cd "${S}"/dist
-	java-pkg_jar-from junit:4
-	java-pkg_jar-from hamcrest-core:1.3
-	cd "${S}"
-	ANT_TASKS="ant-junit4" eant test || die "eant test failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dojar dist/2p.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r docs/* || die
-		dodoc doc/tuprolog-guide.pdf
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins doc/examples/*.pl
-	fi
-}
diff --git a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild b/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
deleted file mode 100644
index 411a1f875b0e..000000000000
--- a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://tuprolog.unibo.it/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-3 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jdk-1.8:=
-	 dev-java/javassist:3
-	 dev-java/commons-lang:3.1"
-
-DEPEND="${RDEPEND}
-	dev-java/ant-core
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/junit:4
-		dev-java/hamcrest-core:1.3
-	)"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.1"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-ikvm.patch
-	epatch "${FILESDIR}"/${P}-oolibrary-unit-test.patch
-
-	cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_test() {
-	cd "${S}"/dist
-	java-pkg_jar-from junit:4
-	java-pkg_jar-from hamcrest-core:1.3
-	cd "${S}"
-	ANT_TASKS="ant-junit4" eant test || die "eant test failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dojar dist/2p.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r docs/* || die
-		dodoc doc/tuprolog-guide.pdf
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins doc/examples/*.pl
-	fi
-}
diff --git a/dev-lang/tuprolog/tuprolog-3.1.0.ebuild b/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
deleted file mode 100644
index d22edc7d11f3..000000000000
--- a/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://tuprolog.unibo.it/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-3 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jdk-1.8:=
-	 dev-java/javassist:3
-	 dev-java/commons-lang:3.1"
-
-DEPEND="${RDEPEND}
-	dev-java/ant-core
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/junit:4
-		dev-java/hamcrest-core:1.3
-	)"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.1"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-ikvm.patch
-
-	cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_test() {
-	cd "${S}"/dist
-	java-pkg_jar-from junit:4
-	java-pkg_jar-from hamcrest-core:1.3
-	cd "${S}"
-	ANT_TASKS="ant-junit4" eant test || die "eant test failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dojar dist/2p.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r docs/* || die
-		dodoc doc/tuprolog-guide.pdf
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins doc/examples/*.pl
-	fi
-}
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index acfb9dae9921..55c87fa42ec1 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -1,11 +1,4 @@
-DIST XSB360.tar.gz 12842882 BLAKE2B 734d17a05eb9cb79906a98a77a6562a9445603a884523689c1f2e5e5f9cd4ebfc7182e9ecde9bf9f97c18a90bc4d0d35a2344ac92193d9ee43eb733530571836 SHA512 2ac2f4d4c7501479648b7f618815d4cd996969791a617f2148ef7498cf08bacd67eab298136303b6804cb689129ae3365e1490ec693f2232f9c9f1ad515d9c6c
-DIST XSB370.tar.gz 12322913 BLAKE2B 64db80704ce656bfaa402d161a94c7b1cd3119a363e848b2c7768665df580b25f1fc43b49b381960d9049d947590b7eb3c846c1a2d6b8a1233d8eb2c4de04f7e SHA512 e2c11b0e5fbbffc2fb6d493e39b7dd74de43509ea1c844f1b3e5d1002c116d6fb8b245905b7b512499e40765a6603d4bef883052bdeec4a3078011c305f85a9f
 DIST XSB38.tar.gz 13830570 BLAKE2B 60a6ab38435348d09e2d08bc65ca62c06b38495b72f40a6f3f10fe8d23949bfed0c580c9be0c8304d8a88a53b227bb695870b558d67f33a47543de6c1529180f SHA512 457c691450afcf3ed4e2fffc28deaef0949ef4bbf6fd69b504acc6507fbb144f2c6e427a25da2b6346b15b82e803c02d1b6962af698d16c1fcb9a3d56160ea30
-DIST xsb-3.6.0-gentoo-patchset-4.tar.gz 7513 BLAKE2B cf846dc94e0f1194f5da381b888f4ce6476a4e861cb23e6dca87b0cd2c0ea24c4290ea080432d2c5440f7350cf0862c7fc34e303a8dfe824e2e3e06f29aa4815 SHA512 bb7ba7836fa2df7a54fd2837b4cb760f7ae0e9511bc0a4b2be8cba89ed4aeedda6712937a4748bd9e9ee16366d442fd962a121dbf83017e2199eb3a287efb1d5
-DIST xsb-3.7.0-gentoo-patchset-3.tar.gz 5636 BLAKE2B f7b66131d3f02fd75e8b6019f8e64cb6f531155116364da432df41a8f7b3ba2b8d300f7b64bbcae7a755478c6aeb637b36457b491998c88457a96b64e5ecb46e SHA512 bee6d62b900c9ee3a373dfa0ad7362b18c748bb9e0559a878534ed517067d753e1fa79277b0588133a1eeceafcd56b4dcc9ff81892309f6c6666150baaaaf047
 DIST xsb-3.8.0-gentoo-patchset-3.tar.gz 7297 BLAKE2B b3da3b4458e6e97c32fc6318bfa95d9755398572b85fe10a00af327c7cf940e18b8ae49cd2543544b363daf39bdc9db3963487e134c3a1b3a31c05344ed927fd SHA512 96064c2a27c4570b213613b97386bed1dac8082881794b7e18e5ae9ee9c28af78412c793b1fe26a293664ba88236257fbb3804cdda63799fff6fb72ca498b4a4
-EBUILD xsb-3.6.0-r1.ebuild 3719 BLAKE2B 3f9ad681420e551346f3d75172e5a1c1bafce0a232d3c5fe2eca73e2c39ed01e82768bac93b6ca79712fe362a9f4c48c4a44daf3461d0aa1a0658a521bd89494 SHA512 52d15ea7b41a1dfca4b12a559a90ba0dab170eb40ec9ac7f6f4cc290396ecb4276b85866fef9dc5fefe20b680a5f282193e876bf1f08ff713d29fbe31064b5d2
-EBUILD xsb-3.6.0.ebuild 3701 BLAKE2B 4654f47cf403163d1893f8b2d7d7276d86fae58e15f77143b360787ab5dfd8769165c980cef1d1e4c4a12db3fbba0133bf134fb3db0975d6877367ec959ef8e9 SHA512 ccf6c318f3615a7efa28582c33a79bc27b039821fba01152873eb7e759ab271e8e5c6c3ee0ec335af96bcc6692f489294cd4ed4d990eeac12c366599105b8983
-EBUILD xsb-3.7.0-r1.ebuild 3662 BLAKE2B 51219153887a0702feac12dae98ef326a65ec524a32395ec55576c3c1c1ba08031d068b268bf787863b1d2961a82ee15610d4d6dbdf1aa83a0b442c44a604c28 SHA512 146fc16485c95f4b4bcd7ee8735edec39ee76347b9f6b5b8d7690e545ebdfcac141b3cb1ee08067597f815fde6c3c4deee0faffc8e99431a253ab10802420010
 EBUILD xsb-3.8.0.ebuild 3684 BLAKE2B 7c80f0e041e0ed06e2f8a6d14a4aae6ea63875182865bf46afc6c6871399c6554329eb91e71f8c1ffd90e6398eb835748a1ab99b8718f25fdb8c4fa3b0ece609 SHA512 17281a3bbecf9750c7491dba0ce97d375485376668246e2df0a24754f363fa17c46753d2ae0ee5c6efd7438d28d9196a89fbfca73846894163073f2273287ba6
 MISC metadata.xml 313 BLAKE2B e6feaeb68ae7144def50a0dff4671b3a9ff070be4d447d45e5b8fbab61940026a5ea9d13c54fb21a808ed67630debf2f55e44d9186e83ea094b26dccab3bf1e6 SHA512 e271dc66bb407abe43ebc5b1fc27c318cc8082b4b14f43f1c33f3453e4a248c83ba2fcc73ba32a63828e172093a00b507f81c629d022799c4cd5a14417fc5ef0
diff --git a/dev-lang/xsb/xsb-3.6.0-r1.ebuild b/dev-lang/xsb/xsb-3.6.0-r1.ebuild
deleted file mode 100644
index b33ce06c15cd..000000000000
--- a/dev-lang/xsb/xsb-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="XSB${PV//./}"
-
-PATCHSET_VER="4"
-
-inherit autotools java-pkg-opt-2
-
-DESCRIPTION="XSB is a logic programming and deductive database system"
-HOMEPAGE="http://xsb.sourceforge.net"
-SRC_URI="http://xsb.sourceforge.net/downloads/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl debug iodbc java mysql odbc pcre threads xml"
-
-RDEPEND="curl? ( net-misc/curl )
-	iodbc? ( dev-db/libiodbc )
-	java? ( >=virtual/jdk-1.4:= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/XSB
-
-PATCHES=( "${WORKDIR}/${PV}" )
-
-src_prepare() {
-	default
-	cd "${S}"/build
-	eautoconf
-}
-
-src_configure() {
-	cd "${S}"/build
-
-	econf \
-		--prefix=/usr/$(get_libdir) \
-		--disable-optimization \
-		--without-smodels \
-		$(use_with odbc) \
-		$(use_with iodbc) \
-		$(use_enable threads mt) \
-		$(use_enable debug)
-
-	if use curl ; then
-		cd "${S}"/packages/curl
-		econf
-	fi
-
-	if use mysql ; then
-		cd "${S}"/packages/dbdrivers/mysql
-		econf --with-mysql-libdir=$(mysql_config --variable=pkglibdir)
-	fi
-
-	if use odbc ; then
-		cd "${S}"/packages/dbdrivers/odbc
-		econf
-	fi
-
-	if use pcre ; then
-		cd "${S}"/packages/pcre
-		econf
-	fi
-
-	if use xml ; then
-		cd "${S}"/packages/xpath
-		econf
-	fi
-}
-
-src_compile() {
-	cd "${S}"/build
-
-	default
-
-	# All XSB Packages are compiled using a single Prolog engine.
-	# Consequently they must all be compiled using a single make job.
-
-	cd "${S}"/packages
-	rm -f *.xwam
-	emake -j1
-
-	if use curl ; then
-		emake -j1 curl
-		emake -j1 sgml
-		if use xml ; then
-			emake -j1 xpath
-		fi
-	fi
-
-	if use mysql ; then
-		emake -j1 mysql
-	fi
-
-	if use odbc ; then
-		emake -j1 odbc
-	fi
-
-	if use pcre ; then
-		emake -j1 pcre
-	fi
-}
-
-src_install() {
-	cd "${S}"/build
-	default
-
-	local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
-	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
-
-	cd "${S}"/packages
-	local PACKAGES=${XSB_INSTALL_DIR}/packages
-	insinto ${PACKAGES}
-	doins *.xwam
-
-	insinto ${PACKAGES}/chr
-	doins chr/*.xwam
-
-	insinto ${PACKAGES}/clpqr
-	doins clpqr/*.xwam
-
-	insinto ${PACKAGES}/gap
-	doins gap/*.xwam
-
-	insinto ${PACKAGES}/justify
-	doins justify/*.xwam
-	doins justify/*.H
-
-	insinto ${PACKAGES}/regmatch
-	doins regmatch/*.xwam
-	insinto ${PACKAGES}/regmatch/cc
-	doins regmatch/cc/*.H
-
-	insinto ${PACKAGES}/slx
-	doins slx/*.xwam
-
-	insinto ${PACKAGES}/wildmatch
-	doins wildmatch/*.xwam
-	insinto ${PACKAGES}/wildmatch/cc
-	doins wildmatch/cc/*.H
-
-	if use curl ; then
-		insinto ${PACKAGES}/curl
-		doins curl/*.xwam
-		insinto ${PACKAGES}/curl/cc
-		doins curl/cc/*.H
-		insinto ${PACKAGES}/sgml
-		doins sgml/*.xwam
-		insinto ${PACKAGES}/sgml/cc
-		doins sgml/cc/*.H
-		insinto ${PACKAGES}/sgml/cc/dtd
-		doins sgml/cc/dtd/*
-		if use xml ; then
-			insinto ${PACKAGES}/xpath
-			doins xpath/*xwam
-			insinto ${PACKAGES}/xpath/cc
-			doins xpath/cc/*.H
-		fi
-	fi
-
-	if use mysql || use odbc ; then
-		insinto ${PACKAGES}/dbdrivers
-		doins dbdrivers/*.xwam
-		doins dbdrivers/*.H
-		insinto ${PACKAGES}/dbdrivers/cc
-		doins dbdrivers/cc/*.H
-		if use mysql ; then
-			insinto ${PACKAGES}/dbdrivers/mysql
-			doins dbdrivers/mysql/*.xwam
-			insinto ${PACKAGES}/dbdrivers/mysql/cc
-			doins dbdrivers/mysql/cc/*.H
-		fi
-		if use odbc ; then
-			insinto ${PACKAGES}/dbdrivers/odbc
-			doins dbdrivers/odbc/*.xwam
-			insinto ${PACKAGES}/dbdrivers/odbc/cc
-			doins dbdrivers/odbc/cc/*.H
-		fi
-	fi
-
-	if use pcre ; then
-		insinto ${PACKAGES}/pcre
-		doins pcre/*.xwam
-		insinto ${PACKAGES}/pcre/cc
-		doins pcre/cc/*.H
-	fi
-
-	cd "${S}"
-	dodoc FAQ README
-}
diff --git a/dev-lang/xsb/xsb-3.6.0.ebuild b/dev-lang/xsb/xsb-3.6.0.ebuild
deleted file mode 100644
index 033bb06053d6..000000000000
--- a/dev-lang/xsb/xsb-3.6.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="XSB${PV//./}"
-
-PATCHSET_VER="4"
-
-inherit eutils autotools java-pkg-opt-2
-
-DESCRIPTION="XSB is a logic programming and deductive database system"
-HOMEPAGE="http://xsb.sourceforge.net"
-SRC_URI="http://xsb.sourceforge.net/downloads/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl debug iodbc java mysql odbc pcre threads xml"
-
-RDEPEND="curl? ( net-misc/curl )
-	iodbc? ( dev-db/libiodbc )
-	java? ( >=virtual/jdk-1.4:= )
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/XSB
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	cd "${S}"/build
-	eautoconf
-}
-
-src_configure() {
-	cd "${S}"/build
-
-	econf \
-		--prefix=/usr/$(get_libdir) \
-		--disable-optimization \
-		--without-smodels \
-		$(use_with odbc) \
-		$(use_with iodbc) \
-		$(use_enable threads mt) \
-		$(use_enable debug)
-
-	if use curl ; then
-		cd "${S}"/packages/curl
-		econf
-	fi
-
-	if use mysql ; then
-		cd "${S}"/packages/dbdrivers/mysql
-		econf
-	fi
-
-	if use odbc ; then
-		cd "${S}"/packages/dbdrivers/odbc
-		econf
-	fi
-
-	if use pcre ; then
-		cd "${S}"/packages/pcre
-		econf
-	fi
-
-	if use xml ; then
-		cd "${S}"/packages/xpath
-		econf
-	fi
-}
-
-src_compile() {
-	cd "${S}"/build
-
-	emake
-
-	# All XSB Packages are compiled using a single Prolog engine.
-	# Consequently they must all be compiled using a single make job.
-
-	cd "${S}"/packages
-	rm -f *.xwam
-	emake -j1
-
-	if use curl ; then
-		emake -j1 curl
-		emake -j1 sgml
-		if use xml ; then
-			emake -j1 xpath
-		fi
-	fi
-
-	if use mysql ; then
-		emake -j1 mysql
-	fi
-
-	if use odbc ; then
-		emake -j1 odbc
-	fi
-
-	if use pcre ; then
-		emake -j1 pcre
-	fi
-}
-
-src_install() {
-	cd "${S}"/build
-	emake DESTDIR="${D}" install
-
-	local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
-	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
-
-	cd "${S}"/packages
-	local PACKAGES=${XSB_INSTALL_DIR}/packages
-	insinto ${PACKAGES}
-	doins *.xwam
-
-	insinto ${PACKAGES}/chr
-	doins chr/*.xwam
-
-	insinto ${PACKAGES}/clpqr
-	doins clpqr/*.xwam
-
-	insinto ${PACKAGES}/gap
-	doins gap/*.xwam
-
-	insinto ${PACKAGES}/justify
-	doins justify/*.xwam
-	doins justify/*.H
-
-	insinto ${PACKAGES}/regmatch
-	doins regmatch/*.xwam
-	insinto ${PACKAGES}/regmatch/cc
-	doins regmatch/cc/*.H
-
-	insinto ${PACKAGES}/slx
-	doins slx/*.xwam
-
-	insinto ${PACKAGES}/wildmatch
-	doins wildmatch/*.xwam
-	insinto ${PACKAGES}/wildmatch/cc
-	doins wildmatch/cc/*.H
-
-	if use curl ; then
-		insinto ${PACKAGES}/curl
-		doins curl/*.xwam
-		insinto ${PACKAGES}/curl/cc
-		doins curl/cc/*.H
-		insinto ${PACKAGES}/sgml
-		doins sgml/*.xwam
-		insinto ${PACKAGES}/sgml/cc
-		doins sgml/cc/*.H
-		insinto ${PACKAGES}/sgml/cc/dtd
-		doins sgml/cc/dtd/*
-		if use xml ; then
-			insinto ${PACKAGES}/xpath
-			doins xpath/*xwam
-			insinto ${PACKAGES}/xpath/cc
-			doins xpath/cc/*.H
-		fi
-	fi
-
-	if use mysql || use odbc ; then
-		insinto ${PACKAGES}/dbdrivers
-		doins dbdrivers/*.xwam
-		doins dbdrivers/*.H
-		insinto ${PACKAGES}/dbdrivers/cc
-		doins dbdrivers/cc/*.H
-		if use mysql ; then
-			insinto ${PACKAGES}/dbdrivers/mysql
-			doins dbdrivers/mysql/*.xwam
-			insinto ${PACKAGES}/dbdrivers/mysql/cc
-			doins dbdrivers/mysql/cc/*.H
-		fi
-		if use odbc ; then
-			insinto ${PACKAGES}/dbdrivers/odbc
-			doins dbdrivers/odbc/*.xwam
-			insinto ${PACKAGES}/dbdrivers/odbc/cc
-			doins dbdrivers/odbc/cc/*.H
-		fi
-	fi
-
-	if use pcre ; then
-		insinto ${PACKAGES}/pcre
-		doins pcre/*.xwam
-		insinto ${PACKAGES}/pcre/cc
-		doins pcre/cc/*.H
-	fi
-
-	cd "${S}"
-	dodoc FAQ README
-}
diff --git a/dev-lang/xsb/xsb-3.7.0-r1.ebuild b/dev-lang/xsb/xsb-3.7.0-r1.ebuild
deleted file mode 100644
index 983c93a7be46..000000000000
--- a/dev-lang/xsb/xsb-3.7.0-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="XSB${PV//./}"
-
-PATCHSET_VER="3"
-
-inherit autotools java-pkg-opt-2
-
-DESCRIPTION="XSB is a logic programming and deductive database system"
-HOMEPAGE="http://xsb.sourceforge.net"
-SRC_URI="http://xsb.sourceforge.net/downloads/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl debug iodbc java mysql odbc pcre threads xml"
-
-RDEPEND="curl? ( net-misc/curl )
-	iodbc? ( dev-db/libiodbc )
-	java? ( >=virtual/jdk-1.4:= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	xml? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/XSB
-
-PATCHES=( "${WORKDIR}/${PV}" )
-
-src_prepare() {
-	default
-	cd "${S}"/build
-	eautoconf
-}
-
-src_configure() {
-	cd "${S}"/build
-
-	econf \
-		--prefix=/usr/$(get_libdir) \
-		--disable-optimization \
-		--without-smodels \
-		$(use_with odbc) \
-		$(use_with iodbc) \
-		$(use_enable threads mt) \
-		$(use_enable debug)
-
-	if use curl ; then
-		cd "${S}"/packages/curl
-		econf
-	fi
-
-	if use mysql ; then
-		cd "${S}"/packages/dbdrivers/mysql
-		econf
-	fi
-
-	if use odbc ; then
-		cd "${S}"/packages/dbdrivers/odbc
-		econf
-	fi
-
-	if use pcre ; then
-		cd "${S}"/packages/pcre
-		econf
-	fi
-
-	if use xml ; then
-		cd "${S}"/packages/xpath
-		econf
-	fi
-}
-
-src_compile() {
-	cd "${S}"/build
-
-	default
-
-	# All XSB Packages are compiled using a single Prolog engine.
-	# Consequently they must all be compiled using a single make job.
-
-	cd "${S}"/packages
-	rm -f *.xwam
-	emake -j1
-
-	if use curl ; then
-		emake -j1 curl
-		emake -j1 sgml
-		if use xml ; then
-			emake -j1 xpath
-		fi
-	fi
-
-	if use mysql ; then
-		emake -j1 mysql
-	fi
-
-	if use odbc ; then
-		emake -j1 odbc
-	fi
-
-	if use pcre ; then
-		emake -j1 pcre
-	fi
-}
-
-src_install() {
-	cd "${S}"/build
-	default
-
-	local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
-	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
-
-	cd "${S}"/packages
-	local PACKAGES=${XSB_INSTALL_DIR}/packages
-	insinto ${PACKAGES}
-	doins *.xwam
-
-	insinto ${PACKAGES}/chr
-	doins chr/*.xwam
-
-	insinto ${PACKAGES}/clpqr
-	doins clpqr/*.xwam
-
-	insinto ${PACKAGES}/gap
-	doins gap/*.xwam
-
-	insinto ${PACKAGES}/justify
-	doins justify/*.xwam
-	doins justify/*.H
-
-	insinto ${PACKAGES}/regmatch
-	doins regmatch/*.xwam
-	insinto ${PACKAGES}/regmatch/cc
-	doins regmatch/cc/*.H
-
-	insinto ${PACKAGES}/slx
-	doins slx/*.xwam
-
-	insinto ${PACKAGES}/wildmatch
-	doins wildmatch/*.xwam
-	insinto ${PACKAGES}/wildmatch/cc
-	doins wildmatch/cc/*.H
-
-	if use curl ; then
-		insinto ${PACKAGES}/curl
-		doins curl/*.xwam
-		insinto ${PACKAGES}/curl/cc
-		doins curl/cc/*.H
-		insinto ${PACKAGES}/sgml
-		doins sgml/*.xwam
-		insinto ${PACKAGES}/sgml/cc
-		doins sgml/cc/*.H
-		insinto ${PACKAGES}/sgml/cc/dtd
-		doins sgml/cc/dtd/*
-		if use xml ; then
-			insinto ${PACKAGES}/xpath
-			doins xpath/*xwam
-			insinto ${PACKAGES}/xpath/cc
-			doins xpath/cc/*.H
-		fi
-	fi
-
-	if use mysql || use odbc ; then
-		insinto ${PACKAGES}/dbdrivers
-		doins dbdrivers/*.xwam
-		doins dbdrivers/*.H
-		insinto ${PACKAGES}/dbdrivers/cc
-		doins dbdrivers/cc/*.H
-		if use mysql ; then
-			insinto ${PACKAGES}/dbdrivers/mysql
-			doins dbdrivers/mysql/*.xwam
-			insinto ${PACKAGES}/dbdrivers/mysql/cc
-			doins dbdrivers/mysql/cc/*.H
-		fi
-		if use odbc ; then
-			insinto ${PACKAGES}/dbdrivers/odbc
-			doins dbdrivers/odbc/*.xwam
-			insinto ${PACKAGES}/dbdrivers/odbc/cc
-			doins dbdrivers/odbc/cc/*.H
-		fi
-	fi
-
-	if use pcre ; then
-		insinto ${PACKAGES}/pcre
-		doins pcre/*.xwam
-		insinto ${PACKAGES}/pcre/cc
-		doins pcre/cc/*.H
-	fi
-
-	cd "${S}"
-	dodoc FAQ README
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7ee1f201d664..e9167d485a8b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/aws-c-common/Manifest b/dev-libs/aws-c-common/Manifest
index 507afa7f9e56..2cf0403c97ba 100644
--- a/dev-libs/aws-c-common/Manifest
+++ b/dev-libs/aws-c-common/Manifest
@@ -1,3 +1,4 @@
-DIST aws-c-common-0.4.11.tar.gz 306933 BLAKE2B 5a2370a3696e4d90b67bc03fbf88f152e1a2d6e4d4a9ff2a9423a2cf18c14a1e3b6d978250c3359f4ebb2cf5e524e416b11604dc09dc45f5c8a5a6f982b344a7 SHA512 1e00f6aa025578978551fc8ca1bc09b448f79ac28bdc969af4312569ffca035d656dc68825da15ad8f4f890bbdb03327c624147dded1ce402e9dab1726290890
-EBUILD aws-c-common-0.4.11.ebuild 499 BLAKE2B 651345b7c6e7cb6ae4e285ea5028fcba4431865d13599fb3409783be631a091ac6681cb9a81a1b1e6011dc78ceb32eeb9ac8824dc4e59f1be2c43cfe6d04b7ad SHA512 d06cccb62a6d66f81d45537be0ecc6eeb14c926df935eef5d955e9aa6a12f6e3967e3df1a2af304094146d04261fb6f5f155329bd76fd406b0c05688d7e59562
-MISC metadata.xml 334 BLAKE2B c8226dcaf19a3265fdc804e29bdc44227eba6e8ad6202bda3e78a1441be5f12204c3fbfbf6de2c17b4ac8aaf12f0ac14b95dd9fc93340f4a52b5236706830a18 SHA512 60907b2d5f02cdf8e10e7bf1fa44bf3a74109f71894933c00f3e9aa688651721342b8fa69a076950ec66dbe667da1ac01074ffdd632858b90c69a72841321265
+AUX aws-c-common-0.4.57-remove-Werror-CFLAG.patch 424 BLAKE2B 211f9b23c979b6c6d867d66a8a6c5ab023229f4fd90affd147c319ba5baeb5cf90cb1aeb8c42066b5de698ed5fa6a7513645e24b61ead58e5c6dda8b45f3c8ce SHA512 39264f91b5ce4ac506d771a97b7403503009f5d6616d8e0ad440574cffa1c18e1f6970fee75f712ec2e514d54885d37e9f157ac1160575af0883a6e56ad0b0c5
+DIST aws-c-common-0.4.57.tar.gz 418954 BLAKE2B cfb268d92e90343e01756b571d0d7fa1269a144b933b5dfae6e5fb92a2b384ff73bf14ad830b53427ad37e9dbd9a0afff5b571108869a69a8d466982a2e6c6ef SHA512 77a9110a067e3057ae3cb90ee0b1fa42e18595e476b803f83711ecc164053db73683df2fccf75ad992b7d08e142cb31d6a70f87ce2f3b87ce28ee1e8151b3c62
+EBUILD aws-c-common-0.4.57-r1.ebuild 613 BLAKE2B c125ea227cba881411af3c5614ffa4392061f898e547f92eb4ae70bd1674fc9415287114698b5a6ebae621547594575c543da0d1ac9c19bcc2afa768813cb04e SHA512 81efd0f3d3529d8804ba5401da09e9c8212a8e6702fc7347b4907b2bb6c14673bb90cd99d07e164e72eb8d1d0b5ad42f6437f83efc8256bedb14a83f79bb42c7
+MISC metadata.xml 532 BLAKE2B 30b517d35fb386776dfb24dab54c359e4edeac3fe3ba5a0c54ef09f0542c05bb91cf7e38c9bab3e0939ead184351326bb1eaaaae17c2f71b3cd7264c1091cd46 SHA512 19b51c483bc90b059d6b8b5282289239140b361362142c3a8252bae3d4dfc57098b2b7869f4440c5312db136b801d2c9d725ec64709fa4a0c46c04a6c640b9f2
diff --git a/dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild b/dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild
deleted file mode 100644
index f0198268ad0d..000000000000
--- a/dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Core c99 package for AWS SDK for C"
-HOMEPAGE="https://github.com/awslabs/aws-c-common"
-SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/aws-c-common/aws-c-common-0.4.57-r1.ebuild b/dev-libs/aws-c-common/aws-c-common-0.4.57-r1.ebuild
new file mode 100644
index 000000000000..120faea56d6a
--- /dev/null
+++ b/dev-libs/aws-c-common/aws-c-common-0.4.57-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Core c99 package for AWS SDK for C"
+HOMEPAGE="https://github.com/awslabs/aws-c-common"
+SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-Werror-CFLAG.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/aws-c-common/files/aws-c-common-0.4.57-remove-Werror-CFLAG.patch b/dev-libs/aws-c-common/files/aws-c-common-0.4.57-remove-Werror-CFLAG.patch
new file mode 100644
index 000000000000..767407062453
--- /dev/null
+++ b/dev-libs/aws-c-common/files/aws-c-common-0.4.57-remove-Werror-CFLAG.patch
@@ -0,0 +1,11 @@
+--- a/cmake/AwsCFlags.cmake	2020-09-29 09:19:28.820584526 +0200
++++ b/cmake/AwsCFlags.cmake	2020-09-29 09:19:36.068584784 +0200
+@@ -48,7 +48,7 @@
+         list(APPEND AWS_C_FLAGS "${_FLAGS}")
+ 
+     else()
+-        list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
++        list(APPEND AWS_C_FLAGS -Wall -Wstrict-prototypes)
+ 
+         if(NOT SET_PROPERTIES_NO_WEXTRA)
+             list(APPEND AWS_C_FLAGS -Wextra)
diff --git a/dev-libs/aws-c-common/metadata.xml b/dev-libs/aws-c-common/metadata.xml
index 88030cf0f62e..e3151ef13d4c 100644
--- a/dev-libs/aws-c-common/metadata.xml
+++ b/dev-libs/aws-c-common/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sven.eden@prydeworx.com</email>
+		<name>Sven Eden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Core c99 package for AWS SDK for C. Includes cross-platform primitives,
 		configuration, data structures, and error handling.
diff --git a/dev-libs/aws-c-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest
index 92a4ae48aa9b..d3e1457b9c09 100644
--- a/dev-libs/aws-c-event-stream/Manifest
+++ b/dev-libs/aws-c-event-stream/Manifest
@@ -1,4 +1,4 @@
 AUX 0.1.3-add_missing_cmake_install_prefix.patch 566 BLAKE2B 1e638a3fc81c27addf3fba53173584b379b271a357246f448d5df0dd34dbcea42f698c4e5be87937070d5274940e25c1dc893c2af621b999405925cd57471c70 SHA512 872305633d8f3129280d3252632dbc07d24ee666f236f02e568e27153dd69657a2cdfdb2d594d9a86816f09923fba5b0e9cb2bd3eb0198b2a9077e02082ff54a
-DIST aws-c-event-stream-0.1.3.tar.gz 27945 BLAKE2B 1e6944006d4da339726a4a4f292af5c0a9a31dcb907ff01cfb63f2efbcda0466fc42b770936704e3c8d49f00b1ba9e180726ed0de9acc38c3fb23553395da1b7 SHA512 d8959b8b30795a62fe5f15d95ccc81a705e9ba8f4e5f6a05e5a965bf705877992df5660d91fde3499fd3087405018e3207e0991fba214c1362d78ee824f4cca9
-EBUILD aws-c-event-stream-0.1.3.ebuild 664 BLAKE2B 1ce8ccef25923dcfed76f6ed79458ea2c2570939edd450d83033b543c9e36b1095daa02a79d1f899115f1ade5467b9f1ccde604df55c285ea30cb6b8c1a63f7a SHA512 19e3c1e9a6df30c7b9cfe77951517bc41b5a547e9dbe212dc8472893dd2c96f8f4524934420b47a7b627d5e629431efadfb5d378c1f9535ad8cce6ab56c128e3
-MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
+DIST aws-c-event-stream-0.1.6.tar.gz 26952 BLAKE2B 0edebb4c290d7e33d06dcba64a339bb3f4c60aa8b9455d8d519b41c7cab7eae3ac80e3545219ce87174de8ca47be4c4cd88d7cf21deff87a10f4d121ca66d3bb SHA512 2eca4176d9429de2741e9650f84b726a9979842e729fd0d900c1265ff89886dd7e12f72b61fc3af7c3282ec9357b8f6290c92713cef68e474150c947a5773421
+EBUILD aws-c-event-stream-0.1.6-r1.ebuild 768 BLAKE2B 34acc6016b79fe1b1496ab1c7c5c4fa66048d839e11fec7b1764f31d0ca9ac495612da2858066612c520ed14ebbaf9717b41994ff0c4b551e3bac84d63abc1a3 SHA512 bc586acddbc4f5c8269e6ee25b145775bbaa69aa7253582fa88d24352cfb74b19456277712951d1712fbdcab88f328d093537c75289534d498058186a85856d2
+MISC metadata.xml 365 BLAKE2B 173e5a8de1e8326296f192e96f64828c5148d5a37fc4b02c05507655d045c2e63d32833f148e76354e43d196f7f8305c2e26eb3b138eeee1856de18fa76f4140 SHA512 16a909436dd61400c177a54c56dd1302c6b1c5aa0f2f76fd049c22a124dab0ee9449adffa3631cd7bbe7998c69a349966d5434d57588adf438262326bdb78633
diff --git a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild
deleted file mode 100644
index 50dc823f254f..000000000000
--- a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C99 implementation of the vnd.amazon.eventstream content-type"
-HOMEPAGE="https://github.com/awslabs/aws-c-event-stream"
-SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/aws-c-common
-	dev-libs/aws-checksums
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-add_missing_cmake_install_prefix.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.6-r1.ebuild b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.6-r1.ebuild
new file mode 100644
index 000000000000..9c59ceb1a5eb
--- /dev/null
+++ b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.6-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C99 implementation of the vnd.amazon.eventstream content-type"
+HOMEPAGE="https://github.com/awslabs/aws-c-event-stream"
+SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/aws-c-common-0.4.26:=[static-libs=]
+	>=dev-libs/aws-checksums-0.1.9:=[static-libs=]
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.1.3-add_missing_cmake_install_prefix.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/aws-c-event-stream/metadata.xml b/dev-libs/aws-c-event-stream/metadata.xml
index 585b0dc75dda..82d545903897 100644
--- a/dev-libs/aws-c-event-stream/metadata.xml
+++ b/dev-libs/aws-c-event-stream/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	</pkgmetadata>
+	<maintainer type="person">
+		<email>sven.eden@prydeworx.com</email>
+		<name>Sven Eden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/aws-checksums/Manifest b/dev-libs/aws-checksums/Manifest
index 0f3337293da2..526e9e1b641b 100644
--- a/dev-libs/aws-checksums/Manifest
+++ b/dev-libs/aws-checksums/Manifest
@@ -1,3 +1,4 @@
-DIST aws-checksums-0.1.3.tar.gz 78242 BLAKE2B e78f3bb34e124351ad494e86e579613799afebcfe491fb36b20190121f2bf9de9d96714ad304a7fcd702708f5be417c6dbafe65606b2fe42c340edc796a3ecf3 SHA512 79bf71a6c4c268b27efe8a6a3c4b90281da4ce7f6e4c1c62fce80b11a4756ecfd4dc2b19624ace3f54137113d0cb56a517de0b91dd6338ee8ca069756bca13f4
-EBUILD aws-checksums-0.1.3.ebuild 536 BLAKE2B 2078883a7d3521896f5759b4f240693bb31da6cd1ede0841f5ac4c785bf92b15164f30a7df0df649413a15f421dce0ad8b9688cc040cb1b77d1993c63c880d8a SHA512 32a92b41b5bd40dd2ea80e9442315942e7bb7c9e211edd3e4a766afcb948e342cbd1f95d4ae6635fe2459b6f578891036d5baaf7d323e9f5d67ebf93ae349e9f
-MISC metadata.xml 362 BLAKE2B 5547648b863d8a47ca4fdde628bbb7c4cb7316c8edfb0daa2c9dc79cce94325858c3f26f0bd9cd36ba57851e13c27822005cf3563e175877d06a13c43ceadea7 SHA512 e57176253c813d8e6b37f2f64416e9ef478230013fe39bd057f4af1945c7ac4ed9cf415b30b6c375263e87db11e6279a4ae55a7748b9e0cd1fcfb4d7888c40da
+AUX aws-checksums-0.1.9-cmake-prefix.patch 966 BLAKE2B 5b1db93baf8699786ebb011590dbb5151dcd5210580fa5555b59c7cf28a7ff1336fb308dec393e1fd559d221359550375ec7de820977757495cabbe4aebf1fe2 SHA512 3b436c32ef1fcf1eab933ec4da9eb8952f4f8af9cdd8de4976b142b412bf132b310442e157731fd13ba21cd507ff70c552870e117e1e8a06f5c0830a077f99a8
+DIST aws-checksums-0.1.9.tar.gz 70967 BLAKE2B 2be344e9757236400879de2f946e7d7a41106c9544c1eefda0150bee3e483b909719d4612f4a8bbef1df01a8f5f887332f06e99aa0867f9d0f9b92f76c8badeb SHA512 16d8f1624d4a60c6a285c6212d2cc1bdf081fec4be5034095b89040543a0ccec6a2f22d9bacf156c781e0e06e80935e13f39c3643a77c2186b58211da4ca1207
+EBUILD aws-checksums-0.1.9-r1.ebuild 703 BLAKE2B e60e6a738acf70000c8cded9d9b5142a06f641bfcfe8e53d46446b9cefaa7819a8441af03655f0be3c61caabaae97f4cb60707c35e9c9d74cd89159272eb06db SHA512 20eab09bf6a5d2deedd838c14aba385a88d0739d193bf38da68921ee6a6556a82305d5ae1834711f85cecebeb6bff48f9490260755c90ec3c430bbfae5b73078
+MISC metadata.xml 560 BLAKE2B 9021d243e459572ef30be51e493e325f08cb515dd7484b0bb9268fedb69c11bdf9e4728931bf89ea9ff5250ee51592cdee543c5fe18d65293820ff4b167a0b84 SHA512 3106bc8fad12b73fdd39af5fc38cde0411c0fe24fa07b8b37349bcd4615cef52875595215455dde9db3bb847c65f1bebd79a16cb7d6261c4cec1ecc3d7faed6b
diff --git a/dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild b/dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild
deleted file mode 100644
index aaf6a73ee9aa..000000000000
--- a/dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Cross-Platform HW accelerated CRC32c and CRC32 with software fallbacks"
-HOMEPAGE="https://github.com/awslabs/aws-checksums"
-SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/aws-checksums/aws-checksums-0.1.9-r1.ebuild b/dev-libs/aws-checksums/aws-checksums-0.1.9-r1.ebuild
new file mode 100644
index 000000000000..bda76dac92c3
--- /dev/null
+++ b/dev-libs/aws-checksums/aws-checksums-0.1.9-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Cross-Platform HW accelerated CRC32c and CRC32 with software fallbacks"
+HOMEPAGE="https://github.com/awslabs/aws-checksums"
+SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/aws-c-common-0.4.26:=[static-libs=]
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake-prefix.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/aws-checksums/files/aws-checksums-0.1.9-cmake-prefix.patch b/dev-libs/aws-checksums/files/aws-checksums-0.1.9-cmake-prefix.patch
new file mode 100644
index 000000000000..9ca2437960fc
--- /dev/null
+++ b/dev-libs/aws-checksums/files/aws-checksums-0.1.9-cmake-prefix.patch
@@ -0,0 +1,26 @@
+From 97b3ba123af200d7dc4fe83e191e77c83ed7aff2 Mon Sep 17 00:00:00 2001
+From: Jakov Smolic <jakov.smolic@sartura.hr>
+Date: Tue, 1 Sep 2020 09:55:46 +0200
+Subject: [PATCH] CMakeLists: Add mising CMAKE_INSTALL_PREFIX
+
+Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 888742b..193a94a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,7 @@ elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ endif()
+ 
+ # This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
+-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
++set(AWS_MODULE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake")
+ string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
+ # Append that generated list to the module search path
+ list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
+-- 
+2.26.2
+
diff --git a/dev-libs/aws-checksums/metadata.xml b/dev-libs/aws-checksums/metadata.xml
index d128563f8d91..43f7aa0e4eba 100644
--- a/dev-libs/aws-checksums/metadata.xml
+++ b/dev-libs/aws-checksums/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sven.eden@prydeworx.com</email>
+		<name>Sven Eden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Cross-Platform HW accelerated CRC32c and CRC32 with fallback to
 		efficient SW implementations. C interface with language
diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest
index 5c743553dead..b5e35fde0bec 100644
--- a/dev-libs/aws-sdk-cpp/Manifest
+++ b/dev-libs/aws-sdk-cpp/Manifest
@@ -1,3 +1,4 @@
+AUX aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch 1454 BLAKE2B 882ead67d2fa49ba8e44a9d0722912cb1cd7723dee05c03972df8a24ef34621adad3d8c14ddd44236c1afd3132d98367b27132260b8f68f371ed6340de43ef1b SHA512 d3c0c46ef67874980436e1e29e98f39ce0bdbf3d351464d69d99a3ffb0bbfb5055807c99a6f47fec3f26874ac6641d474bcefd354807e7cf36033422f1ebee87
 AUX aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch 256 BLAKE2B 66653717a66f51d8403367b8471eee9022045ce5340a232c0bce9cb47fd5ce1ab58e097155048ec54d2fbdd072ebd9c9eeb63f7c9a194445c8833cffc224fa84 SHA512 2af8fbf593cd2bbd7acbdb18f994f18b516abe58a4bb9ee215a72932ec62e463c33e04733bc9be6a60539e1ac8a3beaf4b0611cf0fca97fea1eddbcaa9315e53
 AUX aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch 787 BLAKE2B c7a7a0bf1de4041b64e5afa2073fb426659a82a64b10bfaba05ae1dffd8a4819e073692992c49ed66493569dc33ca736c4a27dac2da07d1235be48cffddca16f SHA512 d3246dbbbf8e7598053933d949a1c43b5c5929049eea12aae0ef00182594aba5dea9a5b3ea22bf795d9ecd2f4a6880bc815b83ed4532c0bc94a901894704e73c
 AUX aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch 194 BLAKE2B 7f6d935c5dff0ebb0701003e6daaba0d174cb90c3f39dd6da7dbab5ac5660b4d9685e5a00cfe7977ecbab5f6d27ebb8b3ed05b839a2322a56fb813dda72e02e5 SHA512 7754c2c0a418b8af82129eaea26cea102aa3e529d40d4cecdec2ae5bbf3b7c05ae0dade1d44efd550a8d068db671d15cafb17ced049c430c1589c1cdf8c0ed92
@@ -14,5 +15,5 @@ AUX aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch 1243 BLAKE2B f6ecdfae
 AUX aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch 319 BLAKE2B ca9b1664bc74bb4aec09efdfd640deda357c5f10e28ed6a3716096067669643436c35b93db0cab6ac9ff0582d77c548aadddc33dde36fb5759921a93127035be SHA512 3cc6ada02f65d97a2351ea4e9700db7ebe532084cbae5934371685d9a424993cbf60e68e6b64aad0d389c9c8774602cd6132cec351e136b5de8249d00ad32023
 AUX aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch 850 BLAKE2B 9ba442243492283f95d92769541dfcd218120e94cc96d857b10380d9cd6adc876a4b3c962dbc5171776be9a02dd236ae220924be7a481f0793927c16709539c2 SHA512 8975a8ea5162a7253c2b2ce64b47848b5ae566eef95ce432df2e8046ef82b66a78ff292e0fefde07a0a128a864716abcf077a6270abb6314ba0c6bd15fc39f7f
 DIST aws-sdk-cpp-1.8.46.tar.gz 28989406 BLAKE2B 47a72d1e0578ecd28e376f3c6688a997faeeae41ba5e4ab5aeff59a2d8f592fc63746445728ab3236952cfc045dc683c816c77dfb8fbe3d98904e50013201ace SHA512 9fedc9de84721189f001a0a5fb2dd63987a366a37ec6354234b244da39929b420e6289bd319d0f056fa4274b7bc682d1aab2dddd5dc823abdf24b69536610ed4
-EBUILD aws-sdk-cpp-1.8.46.ebuild 8302 BLAKE2B c6fdc9002429aaa8edf45aca9ea01cc01bc3232fd36ac399e6e71485dec5b877d783eb3f10458a8979cda562bdd46687867d4c1759750e901847b8df2e380809 SHA512 892b43a1b5027b7a7b33767d3c8307f395b93b5f13eb8e20f70ffd45a5bf80a6fa280cb22a34fccebf2bbccca90fba87b59effc07ee0f4c7dd97a9fe787978ee
-MISC metadata.xml 23851 BLAKE2B af85a4922358eab81028ad9003a39cca87c981a2068aeb26e2be86d5da5d888e2d2611ad15861a6562cf60294b1902e7026aef2ec4f16d862078926147a2896c SHA512 4cc2bbc93a0c396d77e8b506aa0f575523ab0cee5a786774a617c3156af910e49b06abf41b17314cc32968feff4367755812bb681daa4b399ce6da73929a3877
+EBUILD aws-sdk-cpp-1.8.46-r2.ebuild 8427 BLAKE2B 5d0fdb32e9f035fb77991dc3c31b94ad4dd506e44226d023ab3e7d932b7d6f64575baf3165293b2c964bb63a7517fc81a450dbae940003594fb2404c5b883f73 SHA512 4528cd4e62686d6a54cb96366c6bb1e50e1b1cd9ac34d5a88b7f24ab4e1094bc8df5381264c9f44ee6579f80373b1292e6b2f548ebb7deff8d051fd718dfed48
+MISC metadata.xml 23852 BLAKE2B a36bd66ac6baada3f9cb6926a642fdaae54e2ce1b4f577b4b91913d6d2e0529aceac4801c80a8462aebe72b6750d2d4f4353e979e2f6dfa55a8aee4b871fc10b SHA512 c0ce3534d965630881d4a306dfcb243aa241e1cd6d7fe3f21f062ce2f29222b5bcac20cb50b93b15a5c4cfcdd69c9b5511bf9eeea1b7785ca2dcd9325c57dbab
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46-r2.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46-r2.ebuild
new file mode 100644
index 000000000000..a2d30d7fccdd
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46-r2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="AWS SDK for C++"
+HOMEPAGE="https://aws.amazon.com/sdk-for-cpp/"
+SRC_URI="https://github.com/aws/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULES=(
+	access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media
+	cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs eks
+	elasticache elasticbeanstalk elastic-inference elasticloadbalancing elasticmapreduce email es events forecast
+	frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail machinelearning
+	macie managedblockchain marketplace networkmanager opsworks organizations other outposts personalize polly qldb
+	queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns
+	sqs textract transcribe translate waf
+)
+
+IUSE="+http libressl pulseaudio +rtti +ssl static-libs test unity-build ${MODULES[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	http? ( net-misc/curl:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	>=dev-libs/aws-c-common-0.4.26:=[static-libs=]
+	>=dev-libs/aws-c-event-stream-0.1.6:=[static-libs=]
+	>=dev-libs/aws-checksums-0.1.9:=[static-libs=]
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-upgrade_android-build_build_and_test_android_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_ExtractBuildArgs_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_handle_release_notification_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_CI_move_release_doc_to_models_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_build_3rdparty_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_build_example_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_dummy_web_server_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_endpoints_checker_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_gather_3rdparty_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_generate_sdks_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_renew_license_py-3.9.patch
+	"${FILESDIR}"/${PN}-upgrade_scripts_run_integration_tests_py-3.9.patch
+	"${FILESDIR}"/${P}-remove_Werror_from_FLAGS.patch
+)
+
+src_configure() {
+	local mybuildtargets="core"
+
+	for module in ${MODULES[@]}; do
+		if use ${module}; then
+			if [ "${module}" = "access-management" ] ; then
+				mybuildtargets+=";${module};accessanalyzer;acm;acm-pca;dataexchange;iam"
+				mybuildtargets+=";identity-management;identitystore;ram;sso;sso-oidc;sts"
+			elif [ "${module}" = "apigateway" ] ; then
+				mybuildtargets+=";${module};apigatewaymanagementapi;apigatewayv2"
+			elif [ "${module}" = "budgets" ] ; then
+				mybuildtargets+=";${module};ce;cur"
+			elif [ "${module}" = "cloud-desktop" ] ; then
+				mybuildtargets+=";appstream;workdocs;worklink;workmail;workmailmessageflow;workspaces"
+			elif [ "${module}" = "cloud-dev" ] ; then
+				mybuildtargets+=";cloud9;codeartifact;codebuild;codecommit;codedeploy;codeguruprofiler"
+				mybuildtargets+=";codeguru-reviewer;codepipeline;codestar;codestar-connections"
+				mybuildtargets+=";codestar-notifications;honeycode;xray"
+				if ! use "queues"; then
+					mybuildtargets+=";queues"
+				fi
+			elif [ "${module}" = "cloud-media" ] ; then
+				mybuildtargets+=";elastictranscoder;mediaconnect;mediaconvert;medialive;mediapackage"
+				mybuildtargets+=";mediapackage-vod;mediastore;mediastore-data;mediatailor"
+			elif [ "${module}" = "cloud-mobile" ] ; then
+				mybuildtargets+=";amplify;appsync;devicefarm;mobile;mobileanalytics;pinpoint"
+				mybuildtargets+=";pinpoint-email;sms-voice"
+				if ! use "sns"; then
+					mybuildtargets+=";sns"
+				fi
+			elif [ "${module}" = "cloudhsm" ] ; then
+				mybuildtargets+=";${module};cloudhsmv2"
+			elif [ "${module}" = "cloudsearch" ] ; then
+				mybuildtargets+=";${module};cloudsearchdomain"
+			elif [ "${module}" = "cloudwatch" ] ; then
+				mybuildtargets+=";application-insights;appmesh;cloudtrail;compute-optimizer;guardduty"
+				mybuildtargets+=";health;inspector;logs;monitoring;synthetics"
+			elif [ "${module}" = "cognito" ] ; then
+				mybuildtargets+=";cognito-identity;cognito-idp;cognito-sync"
+			elif [ "${module}" = "dynamodb" ] ; then
+				mybuildtargets+=";${module};dax;dynamodbstreams"
+			elif [ "${module}" = "ec2" ] ; then
+				mybuildtargets+=";${module};autoscaling;autoscaling-plans;application-autoscaling"
+				mybuildtargets+=";ec2-instance-connect;elasticfilesystem;imagebuilder;savingsplans"
+			elif [ "${module}" = "elasticloadbalancing" ] ; then
+				mybuildtargets+=";${module};elasticloadbalancingv2"
+			elif [ "${module}" = "email" ] ; then
+				mybuildtargets+=";${module};sesv2"
+			elif [ "${module}" = "events" ] ; then
+				mybuildtargets+=";${module};eventbridge"
+			elif [ "${module}" = "forecast" ] ; then
+				mybuildtargets+=";${module};forecastquery"
+			elif [ "${module}" = "iot" ] ; then
+				mybuildtargets+=";${module};greengrass;iot1click-devices;iot1click-projects"
+				mybuildtargets+=";iotanalytics;iot-data;iotevents;iotevents-data;iot-jobs-data"
+				mybuildtargets+=";iotsecuretunneling;iotsitewise;iotthingsgraph"
+			elif [ "${module}" = "kinesis" ] ; then
+				mybuildtargets+=";${module};firehose;ivs;kinesisanalytics;kinesisanalyticsv2"
+				mybuildtargets+=";kinesisvideo;kinesis-video-archived-media;kinesis-video-media"
+				mybuildtargets+=";kinesis-video-signaling"
+			elif [ "${module}" = "lex" ] ; then
+				mybuildtargets+=";${module};lex-models"
+			elif [ "${module}" = "macie" ] ; then
+				mybuildtargets+=";${module};macie2"
+			elif [ "${module}" = "marketplace" ] ; then
+				mybuildtargets+=";marketplacecommerceanalytics;marketplace-catalog"
+				mybuildtargets+=";marketplace-entitlement;meteringmarketplace;pricing"
+			elif [ "${module}" = "opsworks" ] ; then
+				mybuildtargets+=";${module};opsworkscm"
+			elif [ "${module}" = "other" ] ; then
+				mybuildtargets+=";AWSMigrationHub;alexaforbusiness;appflow;braket;clouddirectory"
+				mybuildtargets+=";comprehend;comprehendmedical;connect;datapipeline;datasync"
+				mybuildtargets+=";directconnect;discovery;dms;docdb;ds;dynamodb;gamelift;glue"
+				mybuildtargets+=";groundstation;importexport;kafka;lakeformation"
+				mybuildtargets+=";migrationhub-config;mq;mturk-requester;neptune;quicksight;redshift"
+				mybuildtargets+=";robomaker;sdb;schemas;service-quotas;servicecatalog;servicediscovery"
+				mybuildtargets+=";signer;sms;snowball;ssm;states;storagegateway;support;swf"
+			elif [ "${module}" = "personalize" ] ; then
+				mybuildtargets+=";${module};personalize-events;personalize-runtime"
+			elif [ "${module}" = "polly" ] ; then
+				mybuildtargets+=";${module};text-to-speech"
+			elif [ "${module}" = "qldb" ] ; then
+				mybuildtargets+=";${module};qldb-session"
+			elif [ "${module}" = "rds" ] ; then
+				mybuildtargets+=";${module};pi;rds-data"
+			elif [ "${module}" = "resource-groups" ] ; then
+				mybuildtargets+=";${module};resourcegroupstaggingapi"
+			elif [ "${module}" = "route53" ] ; then
+				mybuildtargets+=";${module};route53domains;route53resolver"
+			elif [ "${module}" = "s3" ] ; then
+				mybuildtargets+=";${module};athena;awstransfer;glacier;s3-encryption;s3control;transfer"
+			elif [ "${module}" = "sagemaker" ] ; then
+				mybuildtargets+=";${module};sagemaker-a2i-runtime;sagemaker-runtime"
+			elif [ "${module}" = "transcribe" ] ; then
+				mybuildtargets+=";${module};transcribestreaming"
+			elif [ "${module}" = "waf" ] ; then
+				mybuildtargets+=";${module};fms;waf-regional;wafv2"
+			else
+				mybuildtargets+=";${module}"
+			fi
+		fi
+	done
+
+	local mycmakeargs=(
+		-DAUTORUN_UNIT_TESTS=$(usex test)
+		-DBUILD_DEPS=NO
+		-DBUILD_ONLY="${mybuildtargets}"
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DCPP_STANDARD=17
+		-DENABLE_RTTI=$(usex rtti)
+		-DENABLE_TESTING=$(usex test)
+		-DENABLE_UNITY_BUILD=$(usex unity-build)
+		-DNO_ENCRYPTION=$(usex !ssl)
+		-DNO_HTTP_CLIENT=$(usex !http)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46.ebuild
deleted file mode 100644
index 2ac7c4ce7732..000000000000
--- a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="AWS SDK for C++"
-HOMEPAGE="https://aws.amazon.com/sdk-for-cpp/"
-SRC_URI="https://github.com/aws/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MODULES=(
-	access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media
-	cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs eks
-	elasticache elasticbeanstalk elasticinference elasticloadbalancing elasticmapreduce email es events forecast
-	frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail machinelearning
-	macie managedblockchain marketplace networkmanager opsworks organizations other outposts personalize polly qldb
-	queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns
-	sqs textract transcribe translate waf
-)
-
-IUSE="+http libressl pulseaudio +rtti +ssl static-libs test unity-build ${MODULES[*]}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	http? ( net-misc/curl:= )
-	pulseaudio? ( media-sound/pulseaudio )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	dev-libs/aws-c-common
-	dev-libs/aws-checksums
-	dev-libs/aws-c-event-stream
-	sys-libs/zlib
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-upgrade_android-build_build_and_test_android_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_binary-release-pipeline_lambda_publish_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_CI_ConstructReleaseDoc_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_CI_ExtractBuildArgs_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_CI_handle_release_notification_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_CI_move_release_doc_to_models_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_doc_crosslinks_generate_cross_link_data_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_build_3rdparty_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_build_example_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_dummy_web_server_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_endpoints_checker_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_gather_3rdparty_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_generate_sdks_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_renew_license_py-3.9.patch
-	"${FILESDIR}"/${PN}-upgrade_scripts_run_integration_tests_py-3.9.patch
-)
-
-src_configure() {
-	local mybuildtargets="core"
-
-	for module in ${MODULES[@]}; do
-		if use ${module}; then
-			if [ "${module}" = "access-management" ] ; then
-				mybuildtargets+=";${module};accessanalyzer;acm;acm-pca;dataexchange;iam"
-				mybuildtargets+=";identity-management;identitystore;ram;sso;sso-oidc;sts"
-			elif [ "${module}" = "apigateway" ] ; then
-				mybuildtargets+=";${module};apigatewaymanagementapi;apigatewayv2"
-			elif [ "${module}" = "budgets" ] ; then
-				mybuildtargets+=";${module};ce;cur"
-			elif [ "${module}" = "cloud-desktop" ] ; then
-				mybuildtargets+=";appstream;workdocs;worklink;workmail;workmailmessageflow;workspaces"
-			elif [ "${module}" = "cloud-dev" ] ; then
-				mybuildtargets+=";cloud9;codeartifact;codebuild;codecommit;codedeploy;codeguruprofiler"
-				mybuildtargets+=";codeguru-reviewer;codepipeline;codestar;codestar-connections"
-				mybuildtargets+=";codestar-notifications;honeycode;xray"
-				if ! use "queues"; then
-					mybuildtargets+=";queues"
-				fi
-			elif [ "${module}" = "cloud-media" ] ; then
-				mybuildtargets+=";elastictranscoder;mediaconnect;mediaconvert;medialive;mediapackage"
-				mybuildtargets+=";mediapackage-vod;mediastore;mediastore-data;mediatailor"
-			elif [ "${module}" = "cloud-mobile" ] ; then
-				mybuildtargets+=";amplify;appsync;devicefarm;mobile;mobileanalytics;pinpoint"
-				mybuildtargets+=";pinpoint-email;sms-voice"
-				if ! use "sns"; then
-					mybuildtargets+=";sns"
-				fi
-			elif [ "${module}" = "cloudhsm" ] ; then
-				mybuildtargets+=";${module};cloudhsmv2"
-			elif [ "${module}" = "cloudsearch" ] ; then
-				mybuildtargets+=";${module};cloudsearchdomain"
-			elif [ "${module}" = "cloudwatch" ] ; then
-				mybuildtargets+=";application-insights;appmesh;cloudtrail;compute-optimizer;guardduty"
-				mybuildtargets+=";health;inspector;logs;monitoring;synthetics"
-			elif [ "${module}" = "cognito" ] ; then
-				mybuildtargets+=";cognito-identity;cognito-idp;cognito-sync"
-			elif [ "${module}" = "dynamodb" ] ; then
-				mybuildtargets+=";${module};dax;dynamodbstreams"
-			elif [ "${module}" = "ec2" ] ; then
-				mybuildtargets+=";${module};autoscaling;autoscaling-plans;application-autoscaling"
-				mybuildtargets+=";ec2-instance-connect;elasticfilesystem;imagebuilder;savingsplans"
-			elif [ "${module}" = "elasticloadbalancing" ] ; then
-				mybuildtargets+=";${module};elasticloadbalancingv2"
-			elif [ "${module}" = "email" ] ; then
-				mybuildtargets+=";${module};sesv2"
-			elif [ "${module}" = "events" ] ; then
-				mybuildtargets+=";${module};eventbridge"
-			elif [ "${module}" = "forecast" ] ; then
-				mybuildtargets+=";${module};forecastquery"
-			elif [ "${module}" = "iot" ] ; then
-				mybuildtargets+=";${module};greengrass;iot1click-devices;iot1click-projects"
-				mybuildtargets+=";iotanalytics;iot-data;iotevents;iotevents-data;iot-jobs-data"
-				mybuildtargets+=";iotsecuretunneling;iotsitewise;iotthingsgraph"
-			elif [ "${module}" = "kinesis" ] ; then
-				mybuildtargets+=";${module};firehose;ivs;kinesisanalytics;kinesisanalyticsv2"
-				mybuildtargets+=";kinesisvideo;kinesis-video-archived-media;kinesis-video-media"
-				mybuildtargets+=";kinesis-video-signaling"
-			elif [ "${module}" = "lex" ] ; then
-				mybuildtargets+=";${module};lex-models"
-			elif [ "${module}" = "macie" ] ; then
-				mybuildtargets+=";${module};macie2"
-			elif [ "${module}" = "marketplace" ] ; then
-				mybuildtargets+=";marketplacecommerceanalytics;marketplace-catalog"
-				mybuildtargets+=";marketplace-entitlement;meteringmarketplace;pricing"
-			elif [ "${module}" = "opsworks" ] ; then
-				mybuildtargets+=";${module};opsworkscm"
-			elif [ "${module}" = "other" ] ; then
-				mybuildtargets+=";AWSMigrationHub;alexaforbusiness;appflow;braket;clouddirectory"
-				mybuildtargets+=";comprehend;comprehendmedical;connect;datapipeline;datasync"
-				mybuildtargets+=";directconnect;discovery;dms;docdb;ds;dynamodb;gamelift;glue"
-				mybuildtargets+=";groundstation;importexport;kafka;lakeformation"
-				mybuildtargets+=";migrationhub-config;mq;mturk-requester;neptune;quicksight;redshift"
-				mybuildtargets+=";robomaker;sdb;schemas;service-quotas;servicecatalog;servicediscovery"
-				mybuildtargets+=";signer;sms;snowball;ssm;states;storagegateway;support;swf"
-			elif [ "${module}" = "personalize" ] ; then
-				mybuildtargets+=";${module};personalize-events;personalize-runtime"
-			elif [ "${module}" = "polly" ] ; then
-				mybuildtargets+=";${module};text-to-speech"
-			elif [ "${module}" = "qldb" ] ; then
-				mybuildtargets+=";${module};qldb-session"
-			elif [ "${module}" = "rds" ] ; then
-				mybuildtargets+=";${module};pi;rds-data"
-			elif [ "${module}" = "resource-groups" ] ; then
-				mybuildtargets+=";${module};resourcegroupstaggingapi"
-			elif [ "${module}" = "route53" ] ; then
-				mybuildtargets+=";${module};route53domains;route53resolver"
-			elif [ "${module}" = "s3" ] ; then
-				mybuildtargets+=";${module};athena;awstransfer;glacier;s3-encryption;s3control;transfer"
-			elif [ "${module}" = "sagemaker" ] ; then
-				mybuildtargets+=";${module};sagemaker-a2i-runtime;sagemaker-runtime"
-			elif [ "${module}" = "transcribe" ] ; then
-				mybuildtargets+=";${module};transcribestreaming"
-			elif [ "${module}" = "waf" ] ; then
-				mybuildtargets+=";${module};fms;waf-regional;wafv2"
-			else
-				mybuildtargets+=";${module}"
-			fi
-		fi
-	done
-
-	local mycmakeargs=(
-		-DAUTORUN_UNIT_TESTS=$(usex test)
-		-DBUILD_DEPS=NO
-		-DBUILD_ONLY="${mybuildtargets}"
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DCPP_STANDARD=17
-		-DENABLE_RTTI=$(usex rtti)
-		-DENABLE_TESTING=$(usex test)
-		-DENABLE_UNITY_BUILD=$(usex unity-build)
-		-DNO_ENCRYPTION=$(usex !ssl)
-		-DNO_HTTP_CLIENT=$(usex !http)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch
new file mode 100644
index 000000000000..9c8ff79e311e
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch
@@ -0,0 +1,30 @@
+--- a/cmake/compiler_settings.cmake	2020-09-29 10:15:14.293703615 +0200
++++ b/cmake/compiler_settings.cmake	2020-09-29 10:15:32.173704251 +0200
+@@ -53,7 +53,7 @@
+ endmacro()
+ 
+ macro(set_gcc_warnings)
+-    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra")
++    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-pedantic" "-Wextra")
+     if(COMPILER_CLANG)
+         if(PLATFORM_ANDROID)
+             # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning.
+--- a/cspell.json	2020-09-29 10:19:23.102712472 +0200
++++ b/cspell.json	2020-09-29 10:20:32.195714931 +0200
+@@ -11,7 +11,7 @@
+         // CMake
+         "cmake",
+         // Compiler and linker
+-        "Wpedantic", "Wextra", "Werror", "xldscope", "Wtype", "Wunused",
++        "Wpedantic", "Wextra", "xldscope", "Wtype", "Wunused",
+         // Android NDK
+         "JNIEXPORT", "jint", "JNICALL", "jobject", "jclass", "jmethod", "Ljava",
+         // XML parser
+--- a/CI/install-test/CMakeLists.txt	2020-09-29 10:19:32.094712792 +0200
++++ b/CI/install-test/CMakeLists.txt	2020-09-29 10:19:46.064713289 +0200
+@@ -4,4 +4,4 @@
+ find_package(AWSSDK REQUIRED COMPONENTS s3)
+ add_executable(${PROJECT_NAME} "main.cpp")
+ target_link_libraries(${PROJECT_NAME} ${AWSSDK_LINK_LIBRARIES})
+-target_compile_options(${PROJECT_NAME} PRIVATE "-Wall" "-Werror")
++target_compile_options(${PROJECT_NAME} PRIVATE "-Wall")
diff --git a/dev-libs/aws-sdk-cpp/metadata.xml b/dev-libs/aws-sdk-cpp/metadata.xml
index d9d348be77d8..632e0dfe1944 100644
--- a/dev-libs/aws-sdk-cpp/metadata.xml
+++ b/dev-libs/aws-sdk-cpp/metadata.xml
@@ -206,7 +206,7 @@
 			Set up, manage, and scale distributed in-memory cache environments in the AWS Cloud
 		</flag>
 		<flag name="elasticbeanstalk">Quickly deploy and manage applications in the AWS Cloud.</flag>
-		<flag name="elasticinference">
+		<flag name="elastic-inference">
 			Amazon Elastic Inference is a service that allows you to attach low-cost GPU-powered
 			acceleration to many Amazon machine instances in order to reduce the cost of running deep
 			learning inference by up to 75%. Amazon Elastic Inference supports TensorFlow, Apache MXNet, and
diff --git a/dev-libs/bcm2835/Manifest b/dev-libs/bcm2835/Manifest
index d644ef33b08a..81b77cee86c5 100644
--- a/dev-libs/bcm2835/Manifest
+++ b/dev-libs/bcm2835/Manifest
@@ -1,5 +1,5 @@
-DIST bcm2835-1.52.tar.gz 258007 BLAKE2B b681617352ee0239c9c4effb5a5e161b2c409514d08e0d60d35e9bb58126f2a00bb9ab1a7f767db4c68a28eab4432f1f8908d5a4372b5b1c05f6f979f27c036d SHA512 5a6c608ed10169b0bcf9dab91dc0193b9fd16814c5c6bb18ea242b36ac803e56c49147721ed48c83ff72892683be6032f2e85bcc76dae523e5d79a5ae52f5154
 DIST bcm2835-1.57.tar.gz 262233 BLAKE2B 618a6089f773b874905ba8341eb42b6751355dc8607c51957b6020a0d484734ef5ea4e49a6086ba25cc820c57cb077f292654fdc4eeb1b293746f9cbb83ca462 SHA512 0af59c22869511465a9fdcc384d7456f04bec06a1480e0575b7756628f0ecc72648974a9ace7a46df257b0fd45a117c89c430c3e97d214081d038cbaef398821
-EBUILD bcm2835-1.52.ebuild 579 BLAKE2B 74dc8492eef09b9994152a565eb2169028aece2a11a7d771b6b856d4b1eedff3f5e419ddd6c50be72e61d6b22b5abbd21dbb85c0ab46f387d6cf8f98a6996ac8 SHA512 1d24a860e1051ab855133d7b17f1ebb590b91aaf03078e69dded8c8d51f90c8f9ca66002470081a54d7b7bc4732078845fa04c84186aa8d7ee20c14c30bb5a4e
+DIST bcm2835-1.68.tar.gz 272796 BLAKE2B d848e901b1b3a51712009e3fbf00c43f870fd6c28812be710276620f80c4173e92529891e53ec02e2076069a5da8ba7190f8dcc620ce4a843773cb85622dd830 SHA512 bdc91af8f28755899611d41cf954c9b2ca107befe984b79ee6fe23b66bbb7f50e746e084c3e431b1b0cdf1b0735cec8a54018ebf12b713380e5db97e3564f477
 EBUILD bcm2835-1.57.ebuild 579 BLAKE2B c3c00db822c408dedadf639f05e12bb49b1a935083678f84c4f16a71e42ac9184d934f0c9c38b22078cff55055ac5b1d3b2ab2f77d1e8ee50a0761efa317d772 SHA512 8cd5eb782fd264cf3c2354e7212f1e55196b531c606cf58affb99160de5aeb03b732179d322f5b70f6b24bb702d5bed78f47cf0e0468ac164431235062b3d987
+EBUILD bcm2835-1.68.ebuild 646 BLAKE2B 5b0abd1092a7263cfe9a4d162bb5da182cc6575ac7218b15f47b176115bec876cc80b4c54c679f9c389acb9563e4a972c83c54f46587674d03b29c3be61162ef SHA512 f11a85289aba36e1a4c7098821e27f8f198d02c12b18116ab544311e1acb016b0d1c7d3a03d8df9ac220fd569b538d03fe2854f7e707e2856716d655d6a61786
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/dev-libs/bcm2835/bcm2835-1.52.ebuild b/dev-libs/bcm2835/bcm2835-1.52.ebuild
deleted file mode 100644
index df21044d8808..000000000000
--- a/dev-libs/bcm2835/bcm2835-1.52.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Provides access to GPIO and other IO functions on the Broadcom BCM2835"
-HOMEPAGE="http://www.airspayce.com/mikem/bcm2835/"
-SRC_URI="http://www.airspayce.com/mikem/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="doc examples"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	default
-}
diff --git a/dev-libs/bcm2835/bcm2835-1.68.ebuild b/dev-libs/bcm2835/bcm2835-1.68.ebuild
new file mode 100644
index 000000000000..454774b9bb63
--- /dev/null
+++ b/dev-libs/bcm2835/bcm2835-1.68.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Provides access to GPIO and other IO functions on the Broadcom BCM2835"
+HOMEPAGE="https://www.airspayce.com/mikem/bcm2835/"
+SRC_URI="https://www.airspayce.com/mikem/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="doc examples"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	default
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 113c54d3c41f..d9be27bb106f 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -11,7 +11,7 @@ AUX boost-1.73-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f3
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
-EBUILD boost-1.72.0-r1.ebuild 11337 BLAKE2B bb6e82cc6c0dd49627cbd9841a4e02cf80e5e4dc3588a10c93abe587327bf3ad0d2e427bd3eb4944a8c0dee53c48de617e7305ba80091385e1a448c3e86cb544 SHA512 f07607be1571a204f050a9ae7d8c2994b944259301c1c3cb0bb81d7c84c4721b8baba8bd2795abaf01585e6a36749492527b5c8ce56c2d3fe81ba52590d9e2e0
-EBUILD boost-1.73.0.ebuild 11348 BLAKE2B 25c73b12e45920322fecba41e58217771e85b5963dae04cbeb456fa540be68488f6b7321290e65662cbb1cdd035d7577b63be3d80889ae476224646cf60e535d SHA512 d63b8b5a3ef6b1506159c435d618af77ef601507ad7bbb8393d65b0c6aefa2a2fe380553556733c10a8f21f67be1eb6c1131fa07a9f0dfc5d11edd5f7bdfd806
-EBUILD boost-1.74.0.ebuild 11238 BLAKE2B 7eb2f3f696a01e2a44b9c36dde218d009f0fe980061c72888f8c7ae1acfc174a11ea38dc9f3e12b889b6e942887608ad1fc5f788c98c78988764a82999ae7e0f SHA512 a0c72d4e089bf060a34f1739662a674d2d11310f859d937d94888abde18f78a6ca9608ce494f7ef799da1d7074d2624b0bcd4d25ba37c446a94d0e0c7c4f9fad
+EBUILD boost-1.72.0-r2.ebuild 11331 BLAKE2B f7294b4da3f7ec6e91766f0ca4439ff24b12f7eb16e1875fdb29d276396bd3c48a094d7fd909c49fce9013118f10a13606d9a8da444f1e9268c6bb9a1c12672a SHA512 1662769daf62586acf8894bf46ff506721054001b2f130f3818575c661bd9de10e1b433bae0f35bc4aca8f04ead7a84b5a8c4ac15cda8bee0c7e0829449b1b66
+EBUILD boost-1.73.0-r1.ebuild 11342 BLAKE2B a56c730c06512795c2bab24328c3754b7882db93300cc0e2d67a97b3761749e783454b770a8676deac10a032e7e01c0ea8b02feee1ca5ffcd5bc8bf55714ac46 SHA512 2819b369f167417b2fcc4d66cba8257eb313314ef161800be39be031c56fa8de214a83d27784a2cdbb334202de147f958ea6a08e597efeaf15fff6ecdb8dd94e
+EBUILD boost-1.74.0-r1.ebuild 11232 BLAKE2B 7a4df095b55cd0a76bc0b032e73c5d2628e03aa6e78a387b8805dbabf762a718ea3adefc7d19086cc70f815727294c95c03f2307fdc8bb6d2e20f8076bfbf9f1 SHA512 b85bfd9ad79eef5dbd8dc910f09af8419a9eeb9c52c48be4b80fc7b077474120d42032eefe21fa57a77182aa05d99fa46b07486cbdb845a92dfc4c5426c2817c
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.72.0-r1.ebuild b/dev-libs/boost/boost-1.72.0-r1.ebuild
deleted file mode 100644
index c7f52577df42..000000000000
--- a/dev-libs/boost/boost-1.72.0-r1.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-
-inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
-
-MY_PV="$(ver_rs 1- _)"
-MAJOR_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
-IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
-REQUIRED_USE="
-	mpi? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-RDEPEND="
-	!app-admin/eselect-boost
-	!dev-libs/boost-numpy
-	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? (
-		${PYTHON_DEPS}
-		numpy? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3) )
-	)
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
-
-S="${WORKDIR}/${PN}_${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
-	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
-	# Bug 703294, incomplete Boost.Serialization refactoring
-	"${FILESDIR}"/${PN}-1.72.0-missing-serialization-split_member-include.patch
-	# Bug 703036, per python-impl Boost.MPI
-	"${FILESDIR}"/${PN}-1.72.0-boost-mpi-python.patch
-	# Bug 704128, missing include on Boost.Ranges
-	"${FILESDIR}"/${PN}-1.72.0-revert-cease-dependence-on-range.patch
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local user_config_jam="${BUILD_DIR}"/user-config.jam
-	if [[ -s ${user_config_jam} ]]; then
-		einfo "${user_config_jam} already exists, skipping configuration"
-		return
-	else
-		einfo "Creating configuration in ${user_config_jam}"
-	fi
-
-	local compiler compiler_version compiler_executable="$(tc-getCXX)"
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-	fi
-
-	if use mpi; then
-		local mpi_configuration="using mpi ;"
-	fi
-
-	cat > "${user_config_jam}" <<- __EOF__ || die
-		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-		${mpi_configuration}
-	__EOF__
-
-	if python_bindings_needed; then
-		append_to_user_config() {
-			local py_config
-			if tc-is-cross-compiler; then
-				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
-			else
-				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
-			fi
-			echo "${py_config}" >> "${user_config_jam}" || die
-		}
-		python_foreach_impl append_to_user_config
-	fi
-
-	if python_bindings_needed && use numpy; then
-		einfo "Enabling support for NumPy extensions in Boost.Python"
-	else
-		einfo "Disabling support for NumPy extensions in Boost.Python"
-
-		# Boost.Build does not allow for disabling of numpy
-		# extensions, thereby leading to automagic numpy
-		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
-		sed \
-			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
-			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
-	fi
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
-		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
-			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
-			die "Unsupported target in ${EROOT}/etc/site-config.jam"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-ejam() {
-	create_user-config.jam
-
-	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
-	if python_bindings_needed; then
-		append_to_b2_opts() {
-			b2_opts+=( python="${EPYTHON#python}" )
-		}
-		python_foreach_impl append_to_b2_opts
-	else
-		b2_opts+=( --without-python )
-	fi
-	b2_opts+=( "$@" )
-
-	echo b2 "${b2_opts[@]}" >&2
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-		pch=off
-		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
-		$(usex mpi '' '--without-mpi')
-		$(usex nls '' '--without-locale')
-		$(usex context '' '--without-context --without-coroutine --without-fiber')
-		$(usex threads '' '--without-thread')
-		--without-stacktrace
-		--boost-build="${BROOT}"/usr/share/boost-build
-		--prefix="${ED}/usr"
-		--layout=system
-		# CMake has issues working with multiple python impls,
-		# disable cmake config generation for the time being
-		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
-		--no-cmake-config
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=$(usex static-libs shared,static shared)
-		# this seems to be the only way to disable compression algorithms
-		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
-		-sNO_BZIP2=$(usex bzip2 0 1)
-		-sNO_LZMA=$(usex lzma 0 1)
-		-sNO_ZLIB=$(usex zlib 0 1)
-		-sNO_ZSTD=$(usex zstd 0 1)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-}
-
-multilib_src_compile() {
-	ejam "${OPTIONS[@]}" || die
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-		ejam \
-			"${OPTIONS[@]}" \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use numpy; then
-		rm -r "${ED}"/usr/include/boost/python/numpy* || die
-	fi
-
-	if use python; then
-		if use mpi; then
-			move_mpi_py_into_sitedir() {
-				local pyver="${EPYTHON#python}"
-				python_moduleinto boost
-				python_domodule "${ED}"/usr/$(get_libdir)/mpi${pyver/./}.so
-				rm "${ED}"/usr/$(get_libdir)/mpi${pyver/./}* || die
-				dosym mpi${pyver/./}.so $(python_get_sitedir)/boost/mpi.so
-
-				# create a proper python package
-				touch "${D}"/$(python_get_sitedir)/boost/__init__.py || die
-				python_optimize
-			}
-			python_foreach_impl move_mpi_py_into_sitedir
-		else
-			rm -r "${ED}"/usr/include/boost/mpi/python* || die
-		fi
-	else
-		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED}"/usr/include/boost/context || die
-		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	ejam \
-		"${OPTIONS[@]}" \
-		--includedir="${ED}/usr/include" \
-		--libdir="${ED}/usr/$(get_libdir)" \
-		install || die "Installation of Boost libraries failed"
-
-	pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd >/dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
-}
-
-pkg_postinst() {
-	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
-	elog
-	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
-	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
-	elog
-	elog "Then you need to recompile Boost and all its reverse dependencies"
-	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
-	elog "requires a complete rebuild of the boost-dependent ecosystem."
-	elog
-	elog "See for instance https://bugs.gentoo.org/638138"
-}
diff --git a/dev-libs/boost/boost-1.72.0-r2.ebuild b/dev-libs/boost/boost-1.72.0-r2.ebuild
new file mode 100644
index 000000000000..2556d26576ee
--- /dev/null
+++ b/dev-libs/boost/boost-1.72.0-r2.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="$(ver_rs 1- _)"
+MAJOR_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
+REQUIRED_USE="
+	mpi? ( threads )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+RDEPEND="
+	!app-admin/eselect-boost
+	!dev-libs/boost-numpy
+	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+	python? (
+		${PYTHON_DEPS}
+		numpy? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3) )
+	)
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
+
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
+	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
+	# Bug 703294, incomplete Boost.Serialization refactoring
+	"${FILESDIR}"/${PN}-1.72.0-missing-serialization-split_member-include.patch
+	# Bug 703036, per python-impl Boost.MPI
+	"${FILESDIR}"/${PN}-1.72.0-boost-mpi-python.patch
+	# Bug 704128, missing include on Boost.Ranges
+	"${FILESDIR}"/${PN}-1.72.0-revert-cease-dependence-on-range.patch
+)
+
+python_bindings_needed() {
+	multilib_is_native_abi && use python
+}
+
+tools_needed() {
+	multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+	local user_config_jam="${BUILD_DIR}"/user-config.jam
+	if [[ -s ${user_config_jam} ]]; then
+		einfo "${user_config_jam} already exists, skipping configuration"
+		return
+	else
+		einfo "Creating configuration in ${user_config_jam}"
+	fi
+
+	local compiler compiler_version compiler_executable="$(tc-getCXX)"
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+	fi
+
+	if use mpi; then
+		local mpi_configuration="using mpi ;"
+	fi
+
+	cat > "${user_config_jam}" <<- __EOF__ || die
+		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+		${mpi_configuration}
+	__EOF__
+
+	if python_bindings_needed; then
+		append_to_user_config() {
+			local py_config
+			if tc-is-cross-compiler; then
+				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
+			else
+				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
+			fi
+			echo "${py_config}" >> "${user_config_jam}" || die
+		}
+		python_foreach_impl append_to_user_config
+	fi
+
+	if python_bindings_needed && use numpy; then
+		einfo "Enabling support for NumPy extensions in Boost.Python"
+	else
+		einfo "Disabling support for NumPy extensions in Boost.Python"
+
+		# Boost.Build does not allow for disabling of numpy
+		# extensions, thereby leading to automagic numpy
+		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
+		sed \
+			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
+			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
+	fi
+}
+
+pkg_setup() {
+	# Bail out on unsupported build configuration, bug #456792
+	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
+		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
+			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "Boost can not be built in such configuration."
+			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
+			die "Unsupported target in ${EROOT}/etc/site-config.jam"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+ejam() {
+	create_user-config.jam
+
+	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
+	if python_bindings_needed; then
+		append_to_b2_opts() {
+			b2_opts+=( python="${EPYTHON#python}" )
+		}
+		python_foreach_impl append_to_b2_opts
+	else
+		b2_opts+=( --without-python )
+	fi
+	b2_opts+=( "$@" )
+
+	echo b2 "${b2_opts[@]}" >&2
+	b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+	# Workaround for too many parallel processes requested, bug #506064
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+	OPTIONS=(
+		$(usex debug gentoodebug gentoorelease)
+		"-j$(makeopts_jobs)"
+		-q
+		-d+2
+		pch=off
+		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
+		$(usex mpi '' '--without-mpi')
+		$(usex nls '' '--without-locale')
+		$(usex context '' '--without-context --without-coroutine --without-fiber')
+		$(usex threads '' '--without-thread')
+		--without-stacktrace
+		--boost-build="${BROOT}"/usr/share/boost-build
+		--prefix="${ED}/usr"
+		--layout=system
+		# CMake has issues working with multiple python impls,
+		# disable cmake config generation for the time being
+		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
+		--no-cmake-config
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=$(usex static-libs shared,static shared)
+		# this seems to be the only way to disable compression algorithms
+		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
+		-sNO_BZIP2=$(usex bzip2 0 1)
+		-sNO_LZMA=$(usex lzma 0 1)
+		-sNO_ZLIB=$(usex zlib 0 1)
+		-sNO_ZSTD=$(usex zstd 0 1)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	fi
+
+	# Use C++14 globally as of 1.62
+	append-cxxflags -std=c++14
+}
+
+multilib_src_compile() {
+	ejam "${OPTIONS[@]}" || die
+
+	if tools_needed; then
+		pushd tools >/dev/null || die
+		ejam \
+			"${OPTIONS[@]}" \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use numpy; then
+		rm -r "${ED}"/usr/include/boost/python/numpy* || die
+	fi
+
+	if use python; then
+		if use mpi; then
+			move_mpi_py_into_sitedir() {
+				local pyver="${EPYTHON#python}"
+				python_moduleinto boost
+				python_domodule "${ED}"/usr/$(get_libdir)/mpi${pyver/./}.so
+				rm "${ED}"/usr/$(get_libdir)/mpi${pyver/./}* || die
+				dosym mpi${pyver/./}.so $(python_get_sitedir)/boost/mpi.so
+
+				# create a proper python package
+				touch "${D}"/$(python_get_sitedir)/boost/__init__.py || die
+				python_optimize
+			}
+			python_foreach_impl move_mpi_py_into_sitedir
+		else
+			rm -r "${ED}"/usr/include/boost/mpi/python* || die
+		fi
+	else
+		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
+	fi
+
+	if ! use nls; then
+		rm -r "${ED}"/usr/include/boost/locale || die
+	fi
+
+	if ! use context; then
+		rm -r "${ED}"/usr/include/boost/context || die
+		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
+		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	if use doc; then
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+		docinto html
+		dodoc *.{htm,html,png,css}
+		dodoc -r doc libs more tools
+
+		# To avoid broken links
+		dodoc LICENSE_1_0.txt
+
+		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+	fi
+}
+
+multilib_src_install() {
+	ejam \
+		"${OPTIONS[@]}" \
+		--includedir="${ED}/usr/include" \
+		--libdir="${ED}/usr/$(get_libdir)" \
+		install || die "Installation of Boost libraries failed"
+
+	pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
+
+	local ext=$(get_libname)
+	if use threads; then
+		local f
+		for f in *${ext}; do
+			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
+		done
+	fi
+
+	popd >/dev/null || die
+
+	if tools_needed; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED}"/usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# Yai for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
+		if [[ -L ${symlink} ]]; then
+			rm -f "${symlink}" || die
+		fi
+	done
+
+	# some ancient installs still have boost cruft lying around
+	# for unknown reasons, causing havoc for reverse dependencies
+	# Bug: 607734
+	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
+}
+
+pkg_postinst() {
+	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
+	elog
+	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
+	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
+	elog
+	elog "Then you need to recompile Boost and all its reverse dependencies"
+	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
+	elog "requires a complete rebuild of the boost-dependent ecosystem."
+	elog
+	elog "See for instance https://bugs.gentoo.org/638138"
+}
diff --git a/dev-libs/boost/boost-1.73.0-r1.ebuild b/dev-libs/boost/boost-1.73.0-r1.ebuild
new file mode 100644
index 000000000000..0e349645c055
--- /dev/null
+++ b/dev-libs/boost/boost-1.73.0-r1.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="$(ver_rs 1- _)"
+MAJOR_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
+REQUIRED_USE="
+	mpi? ( threads )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+RDEPEND="
+	!app-admin/eselect-boost
+	!dev-libs/boost-numpy
+	!<dev-libs/leatherman-1.12.0-r1
+	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+	python? (
+		${PYTHON_DEPS}
+		numpy? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3) )
+	)
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
+
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
+	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
+	# upstream unresponsive to pull request
+	# https://github.com/boostorg/python/pull/286
+	"${FILESDIR}"/${PN}-1.73-boost-python-cleanup.patch
+	# Boost.MPI's __init__.py doesn't work on Py3
+	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
+	# Remove annoying #pragma message
+	"${FILESDIR}"/${PN}-1.73-property-tree-include.patch
+	# https://github.com/boostorg/geometry/issues/721
+	"${FILESDIR}"/${PN}-1.73-geometry-private-inheritance.patch
+)
+
+python_bindings_needed() {
+	multilib_is_native_abi && use python
+}
+
+tools_needed() {
+	multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+	local user_config_jam="${BUILD_DIR}"/user-config.jam
+	if [[ -s ${user_config_jam} ]]; then
+		einfo "${user_config_jam} already exists, skipping configuration"
+		return
+	else
+		einfo "Creating configuration in ${user_config_jam}"
+	fi
+
+	local compiler compiler_version compiler_executable="$(tc-getCXX)"
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+	fi
+
+	if use mpi; then
+		local mpi_configuration="using mpi ;"
+	fi
+
+	cat > "${user_config_jam}" <<- __EOF__ || die
+		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+		${mpi_configuration}
+	__EOF__
+
+	if python_bindings_needed; then
+		append_to_user_config() {
+			local py_config
+			if tc-is-cross-compiler; then
+				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
+			else
+				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
+			fi
+			echo "${py_config}" >> "${user_config_jam}" || die
+		}
+		python_foreach_impl append_to_user_config
+	fi
+
+	if python_bindings_needed && use numpy; then
+		einfo "Enabling support for NumPy extensions in Boost.Python"
+	else
+		einfo "Disabling support for NumPy extensions in Boost.Python"
+
+		# Boost.Build does not allow for disabling of numpy
+		# extensions, thereby leading to automagic numpy
+		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
+		sed \
+			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
+			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
+	fi
+}
+
+pkg_setup() {
+	# Bail out on unsupported build configuration, bug #456792
+	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
+		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
+			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "Boost can not be built in such configuration."
+			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
+			die "Unsupported target in ${EROOT}/etc/site-config.jam"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+ejam() {
+	create_user-config.jam
+
+	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
+	if python_bindings_needed; then
+		append_to_b2_opts() {
+			b2_opts+=( python="${EPYTHON#python}" )
+		}
+		python_foreach_impl append_to_b2_opts
+	else
+		b2_opts+=( --without-python )
+	fi
+	b2_opts+=( "$@" )
+
+	echo b2 "${b2_opts[@]}" >&2
+	b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+	# Workaround for too many parallel processes requested, bug #506064
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+	OPTIONS=(
+		$(usex debug gentoodebug gentoorelease)
+		"-j$(makeopts_jobs)"
+		-q
+		-d+2
+		pch=off
+		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
+		$(usex mpi '' '--without-mpi')
+		$(usex nls '' '--without-locale')
+		$(usex context '' '--without-context --without-coroutine --without-fiber')
+		$(usex threads '' '--without-thread')
+		--without-stacktrace
+		--boost-build="${BROOT}"/usr/share/boost-build
+		--prefix="${ED}/usr"
+		--layout=system
+		# CMake has issues working with multiple python impls,
+		# disable cmake config generation for the time being
+		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
+		--no-cmake-config
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=$(usex static-libs shared,static shared)
+		# this seems to be the only way to disable compression algorithms
+		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
+		-sNO_BZIP2=$(usex bzip2 0 1)
+		-sNO_LZMA=$(usex lzma 0 1)
+		-sNO_ZLIB=$(usex zlib 0 1)
+		-sNO_ZSTD=$(usex zstd 0 1)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	fi
+
+	# Use C++14 globally as of 1.62
+	append-cxxflags -std=c++14
+}
+
+multilib_src_compile() {
+	ejam "${OPTIONS[@]}" || die
+
+	if tools_needed; then
+		pushd tools >/dev/null || die
+		ejam \
+			"${OPTIONS[@]}" \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use numpy; then
+		rm -r "${ED}"/usr/include/boost/python/numpy* || die
+	fi
+
+	if use python; then
+		if use mpi; then
+			move_mpi_py_into_sitedir() {
+				python_moduleinto boost
+				python_domodule "${S}"/libs/mpi/build/__init__.py
+
+				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
+				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
+
+				python_optimize
+			}
+			python_foreach_impl move_mpi_py_into_sitedir
+		else
+			rm -r "${ED}"/usr/include/boost/mpi/python* || die
+		fi
+	else
+		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
+	fi
+
+	if ! use nls; then
+		rm -r "${ED}"/usr/include/boost/locale || die
+	fi
+
+	if ! use context; then
+		rm -r "${ED}"/usr/include/boost/context || die
+		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
+		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	if use doc; then
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+		docinto html
+		dodoc *.{htm,html,png,css}
+		dodoc -r doc libs more tools
+
+		# To avoid broken links
+		dodoc LICENSE_1_0.txt
+
+		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+	fi
+}
+
+multilib_src_install() {
+	ejam \
+		"${OPTIONS[@]}" \
+		--includedir="${ED}/usr/include" \
+		--libdir="${ED}/usr/$(get_libdir)" \
+		install || die "Installation of Boost libraries failed"
+
+	pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
+
+	local ext=$(get_libname)
+	if use threads; then
+		local f
+		for f in *${ext}; do
+			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
+		done
+	fi
+
+	popd >/dev/null || die
+
+	if tools_needed; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED}"/usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# Yai for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
+		if [[ -L ${symlink} ]]; then
+			rm -f "${symlink}" || die
+		fi
+	done
+
+	# some ancient installs still have boost cruft lying around
+	# for unknown reasons, causing havoc for reverse dependencies
+	# Bug: 607734
+	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
+}
+
+pkg_postinst() {
+	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
+	elog
+	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
+	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
+	elog
+	elog "Then you need to recompile Boost and all its reverse dependencies"
+	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
+	elog "requires a complete rebuild of the boost-dependent ecosystem."
+	elog
+	elog "See for instance https://bugs.gentoo.org/638138"
+}
diff --git a/dev-libs/boost/boost-1.73.0.ebuild b/dev-libs/boost/boost-1.73.0.ebuild
deleted file mode 100644
index e5b91ab30530..000000000000
--- a/dev-libs/boost/boost-1.73.0.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-
-inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
-
-MY_PV="$(ver_rs 1- _)"
-MAJOR_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
-IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
-REQUIRED_USE="
-	mpi? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-RDEPEND="
-	!app-admin/eselect-boost
-	!dev-libs/boost-numpy
-	!<dev-libs/leatherman-1.12.0-r1
-	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? (
-		${PYTHON_DEPS}
-		numpy? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3) )
-	)
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
-
-S="${WORKDIR}/${PN}_${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
-	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
-	# upstream unresponsive to pull request
-	# https://github.com/boostorg/python/pull/286
-	"${FILESDIR}"/${PN}-1.73-boost-python-cleanup.patch
-	# Boost.MPI's __init__.py doesn't work on Py3
-	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
-	# Remove annoying #pragma message
-	"${FILESDIR}"/${PN}-1.73-property-tree-include.patch
-	# https://github.com/boostorg/geometry/issues/721
-	"${FILESDIR}"/${PN}-1.73-geometry-private-inheritance.patch
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local user_config_jam="${BUILD_DIR}"/user-config.jam
-	if [[ -s ${user_config_jam} ]]; then
-		einfo "${user_config_jam} already exists, skipping configuration"
-		return
-	else
-		einfo "Creating configuration in ${user_config_jam}"
-	fi
-
-	local compiler compiler_version compiler_executable="$(tc-getCXX)"
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-	fi
-
-	if use mpi; then
-		local mpi_configuration="using mpi ;"
-	fi
-
-	cat > "${user_config_jam}" <<- __EOF__ || die
-		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-		${mpi_configuration}
-	__EOF__
-
-	if python_bindings_needed; then
-		append_to_user_config() {
-			local py_config
-			if tc-is-cross-compiler; then
-				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
-			else
-				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
-			fi
-			echo "${py_config}" >> "${user_config_jam}" || die
-		}
-		python_foreach_impl append_to_user_config
-	fi
-
-	if python_bindings_needed && use numpy; then
-		einfo "Enabling support for NumPy extensions in Boost.Python"
-	else
-		einfo "Disabling support for NumPy extensions in Boost.Python"
-
-		# Boost.Build does not allow for disabling of numpy
-		# extensions, thereby leading to automagic numpy
-		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
-		sed \
-			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
-			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
-	fi
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
-		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
-			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
-			die "Unsupported target in ${EROOT}/etc/site-config.jam"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-ejam() {
-	create_user-config.jam
-
-	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
-	if python_bindings_needed; then
-		append_to_b2_opts() {
-			b2_opts+=( python="${EPYTHON#python}" )
-		}
-		python_foreach_impl append_to_b2_opts
-	else
-		b2_opts+=( --without-python )
-	fi
-	b2_opts+=( "$@" )
-
-	echo b2 "${b2_opts[@]}" >&2
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-		pch=off
-		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
-		$(usex mpi '' '--without-mpi')
-		$(usex nls '' '--without-locale')
-		$(usex context '' '--without-context --without-coroutine --without-fiber')
-		$(usex threads '' '--without-thread')
-		--without-stacktrace
-		--boost-build="${BROOT}"/usr/share/boost-build
-		--prefix="${ED}/usr"
-		--layout=system
-		# CMake has issues working with multiple python impls,
-		# disable cmake config generation for the time being
-		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
-		--no-cmake-config
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=$(usex static-libs shared,static shared)
-		# this seems to be the only way to disable compression algorithms
-		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
-		-sNO_BZIP2=$(usex bzip2 0 1)
-		-sNO_LZMA=$(usex lzma 0 1)
-		-sNO_ZLIB=$(usex zlib 0 1)
-		-sNO_ZSTD=$(usex zstd 0 1)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-}
-
-multilib_src_compile() {
-	ejam "${OPTIONS[@]}" || die
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-		ejam \
-			"${OPTIONS[@]}" \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use numpy; then
-		rm -r "${ED}"/usr/include/boost/python/numpy* || die
-	fi
-
-	if use python; then
-		if use mpi; then
-			move_mpi_py_into_sitedir() {
-				python_moduleinto boost
-				python_domodule "${S}"/libs/mpi/build/__init__.py
-
-				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
-				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
-
-				python_optimize
-			}
-			python_foreach_impl move_mpi_py_into_sitedir
-		else
-			rm -r "${ED}"/usr/include/boost/mpi/python* || die
-		fi
-	else
-		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED}"/usr/include/boost/context || die
-		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	ejam \
-		"${OPTIONS[@]}" \
-		--includedir="${ED}/usr/include" \
-		--libdir="${ED}/usr/$(get_libdir)" \
-		install || die "Installation of Boost libraries failed"
-
-	pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd >/dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
-}
-
-pkg_postinst() {
-	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
-	elog
-	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
-	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
-	elog
-	elog "Then you need to recompile Boost and all its reverse dependencies"
-	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
-	elog "requires a complete rebuild of the boost-dependent ecosystem."
-	elog
-	elog "See for instance https://bugs.gentoo.org/638138"
-}
diff --git a/dev-libs/boost/boost-1.74.0-r1.ebuild b/dev-libs/boost/boost-1.74.0-r1.ebuild
new file mode 100644
index 000000000000..7c71efd0cdef
--- /dev/null
+++ b/dev-libs/boost/boost-1.74.0-r1.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_PV="$(ver_rs 1- _)"
+MAJOR_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
+REQUIRED_USE="
+	mpi? ( threads )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+RDEPEND="
+	!app-admin/eselect-boost
+	!dev-libs/boost-numpy
+	!<dev-libs/leatherman-1.12.0-r1
+	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+	python? (
+		${PYTHON_DEPS}
+		numpy? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3) )
+	)
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
+
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
+	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
+	# upstream unresponsive to pull request
+	# https://github.com/boostorg/python/pull/286
+	"${FILESDIR}"/${PN}-1.73-boost-python-cleanup.patch
+	# Boost.MPI's __init__.py doesn't work on Py3
+	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
+	# Remove annoying #pragma message
+	"${FILESDIR}"/${PN}-1.73-property-tree-include.patch
+)
+
+python_bindings_needed() {
+	multilib_is_native_abi && use python
+}
+
+tools_needed() {
+	multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+	local user_config_jam="${BUILD_DIR}"/user-config.jam
+	if [[ -s ${user_config_jam} ]]; then
+		einfo "${user_config_jam} already exists, skipping configuration"
+		return
+	else
+		einfo "Creating configuration in ${user_config_jam}"
+	fi
+
+	local compiler compiler_version compiler_executable="$(tc-getCXX)"
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+	fi
+
+	if use mpi; then
+		local mpi_configuration="using mpi ;"
+	fi
+
+	cat > "${user_config_jam}" <<- __EOF__ || die
+		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+		${mpi_configuration}
+	__EOF__
+
+	if python_bindings_needed; then
+		append_to_user_config() {
+			local py_config
+			if tc-is-cross-compiler; then
+				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
+			else
+				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
+			fi
+			echo "${py_config}" >> "${user_config_jam}" || die
+		}
+		python_foreach_impl append_to_user_config
+	fi
+
+	if python_bindings_needed && use numpy; then
+		einfo "Enabling support for NumPy extensions in Boost.Python"
+	else
+		einfo "Disabling support for NumPy extensions in Boost.Python"
+
+		# Boost.Build does not allow for disabling of numpy
+		# extensions, thereby leading to automagic numpy
+		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
+		sed \
+			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
+			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
+	fi
+}
+
+pkg_setup() {
+	# Bail out on unsupported build configuration, bug #456792
+	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
+		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
+			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "Boost can not be built in such configuration."
+			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
+			die "Unsupported target in ${EROOT}/etc/site-config.jam"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+ejam() {
+	create_user-config.jam
+
+	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
+	if python_bindings_needed; then
+		append_to_b2_opts() {
+			b2_opts+=( python="${EPYTHON#python}" )
+		}
+		python_foreach_impl append_to_b2_opts
+	else
+		b2_opts+=( --without-python )
+	fi
+	b2_opts+=( "$@" )
+
+	echo b2 "${b2_opts[@]}" >&2
+	b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+	# Workaround for too many parallel processes requested, bug #506064
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+	OPTIONS=(
+		$(usex debug gentoodebug gentoorelease)
+		"-j$(makeopts_jobs)"
+		-q
+		-d+2
+		pch=off
+		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
+		$(usex mpi '' '--without-mpi')
+		$(usex nls '' '--without-locale')
+		$(usex context '' '--without-context --without-coroutine --without-fiber')
+		$(usex threads '' '--without-thread')
+		--without-stacktrace
+		--boost-build="${BROOT}"/usr/share/boost-build
+		--prefix="${ED}/usr"
+		--layout=system
+		# CMake has issues working with multiple python impls,
+		# disable cmake config generation for the time being
+		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
+		--no-cmake-config
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=$(usex static-libs shared,static shared)
+		# this seems to be the only way to disable compression algorithms
+		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
+		-sNO_BZIP2=$(usex bzip2 0 1)
+		-sNO_LZMA=$(usex lzma 0 1)
+		-sNO_ZLIB=$(usex zlib 0 1)
+		-sNO_ZSTD=$(usex zstd 0 1)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	fi
+
+	# Use C++14 globally as of 1.62
+	append-cxxflags -std=c++14
+}
+
+multilib_src_compile() {
+	ejam "${OPTIONS[@]}" || die
+
+	if tools_needed; then
+		pushd tools >/dev/null || die
+		ejam \
+			"${OPTIONS[@]}" \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use numpy; then
+		rm -r "${ED}"/usr/include/boost/python/numpy* || die
+	fi
+
+	if use python; then
+		if use mpi; then
+			move_mpi_py_into_sitedir() {
+				python_moduleinto boost
+				python_domodule "${S}"/libs/mpi/build/__init__.py
+
+				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
+				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
+
+				python_optimize
+			}
+			python_foreach_impl move_mpi_py_into_sitedir
+		else
+			rm -r "${ED}"/usr/include/boost/mpi/python* || die
+		fi
+	else
+		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
+	fi
+
+	if ! use nls; then
+		rm -r "${ED}"/usr/include/boost/locale || die
+	fi
+
+	if ! use context; then
+		rm -r "${ED}"/usr/include/boost/context || die
+		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
+		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	if use doc; then
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+		docinto html
+		dodoc *.{htm,html,png,css}
+		dodoc -r doc libs more tools
+
+		# To avoid broken links
+		dodoc LICENSE_1_0.txt
+
+		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+	fi
+}
+
+multilib_src_install() {
+	ejam \
+		"${OPTIONS[@]}" \
+		--includedir="${ED}/usr/include" \
+		--libdir="${ED}/usr/$(get_libdir)" \
+		install || die "Installation of Boost libraries failed"
+
+	pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
+
+	local ext=$(get_libname)
+	if use threads; then
+		local f
+		for f in *${ext}; do
+			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
+		done
+	fi
+
+	popd >/dev/null || die
+
+	if tools_needed; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED}"/usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# Yai for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
+		if [[ -L ${symlink} ]]; then
+			rm -f "${symlink}" || die
+		fi
+	done
+
+	# some ancient installs still have boost cruft lying around
+	# for unknown reasons, causing havoc for reverse dependencies
+	# Bug: 607734
+	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
+}
+
+pkg_postinst() {
+	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
+	elog
+	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
+	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
+	elog
+	elog "Then you need to recompile Boost and all its reverse dependencies"
+	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
+	elog "requires a complete rebuild of the boost-dependent ecosystem."
+	elog
+	elog "See for instance https://bugs.gentoo.org/638138"
+}
diff --git a/dev-libs/boost/boost-1.74.0.ebuild b/dev-libs/boost/boost-1.74.0.ebuild
deleted file mode 100644
index ed0bc9519c89..000000000000
--- a/dev-libs/boost/boost-1.74.0.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
-
-inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
-
-MY_PV="$(ver_rs 1- _)"
-MAJOR_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
-IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
-REQUIRED_USE="
-	mpi? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-RDEPEND="
-	!app-admin/eselect-boost
-	!dev-libs/boost-numpy
-	!<dev-libs/leatherman-1.12.0-r1
-	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? (
-		${PYTHON_DEPS}
-		numpy? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3) )
-	)
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
-
-S="${WORKDIR}/${PN}_${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
-	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
-	# upstream unresponsive to pull request
-	# https://github.com/boostorg/python/pull/286
-	"${FILESDIR}"/${PN}-1.73-boost-python-cleanup.patch
-	# Boost.MPI's __init__.py doesn't work on Py3
-	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
-	# Remove annoying #pragma message
-	"${FILESDIR}"/${PN}-1.73-property-tree-include.patch
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local user_config_jam="${BUILD_DIR}"/user-config.jam
-	if [[ -s ${user_config_jam} ]]; then
-		einfo "${user_config_jam} already exists, skipping configuration"
-		return
-	else
-		einfo "Creating configuration in ${user_config_jam}"
-	fi
-
-	local compiler compiler_version compiler_executable="$(tc-getCXX)"
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-	fi
-
-	if use mpi; then
-		local mpi_configuration="using mpi ;"
-	fi
-
-	cat > "${user_config_jam}" <<- __EOF__ || die
-		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-		${mpi_configuration}
-	__EOF__
-
-	if python_bindings_needed; then
-		append_to_user_config() {
-			local py_config
-			if tc-is-cross-compiler; then
-				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
-			else
-				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
-			fi
-			echo "${py_config}" >> "${user_config_jam}" || die
-		}
-		python_foreach_impl append_to_user_config
-	fi
-
-	if python_bindings_needed && use numpy; then
-		einfo "Enabling support for NumPy extensions in Boost.Python"
-	else
-		einfo "Disabling support for NumPy extensions in Boost.Python"
-
-		# Boost.Build does not allow for disabling of numpy
-		# extensions, thereby leading to automagic numpy
-		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
-		sed \
-			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
-			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
-	fi
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
-		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
-			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
-			die "Unsupported target in ${EROOT}/etc/site-config.jam"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-ejam() {
-	create_user-config.jam
-
-	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
-	if python_bindings_needed; then
-		append_to_b2_opts() {
-			b2_opts+=( python="${EPYTHON#python}" )
-		}
-		python_foreach_impl append_to_b2_opts
-	else
-		b2_opts+=( --without-python )
-	fi
-	b2_opts+=( "$@" )
-
-	echo b2 "${b2_opts[@]}" >&2
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-		pch=off
-		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
-		$(usex mpi '' '--without-mpi')
-		$(usex nls '' '--without-locale')
-		$(usex context '' '--without-context --without-coroutine --without-fiber')
-		$(usex threads '' '--without-thread')
-		--without-stacktrace
-		--boost-build="${BROOT}"/usr/share/boost-build
-		--prefix="${ED}/usr"
-		--layout=system
-		# CMake has issues working with multiple python impls,
-		# disable cmake config generation for the time being
-		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
-		--no-cmake-config
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=$(usex static-libs shared,static shared)
-		# this seems to be the only way to disable compression algorithms
-		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
-		-sNO_BZIP2=$(usex bzip2 0 1)
-		-sNO_LZMA=$(usex lzma 0 1)
-		-sNO_ZLIB=$(usex zlib 0 1)
-		-sNO_ZSTD=$(usex zstd 0 1)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-}
-
-multilib_src_compile() {
-	ejam "${OPTIONS[@]}" || die
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-		ejam \
-			"${OPTIONS[@]}" \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use numpy; then
-		rm -r "${ED}"/usr/include/boost/python/numpy* || die
-	fi
-
-	if use python; then
-		if use mpi; then
-			move_mpi_py_into_sitedir() {
-				python_moduleinto boost
-				python_domodule "${S}"/libs/mpi/build/__init__.py
-
-				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
-				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
-
-				python_optimize
-			}
-			python_foreach_impl move_mpi_py_into_sitedir
-		else
-			rm -r "${ED}"/usr/include/boost/mpi/python* || die
-		fi
-	else
-		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED}"/usr/include/boost/context || die
-		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	ejam \
-		"${OPTIONS[@]}" \
-		--includedir="${ED}/usr/include" \
-		--libdir="${ED}/usr/$(get_libdir)" \
-		install || die "Installation of Boost libraries failed"
-
-	pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd >/dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
-}
-
-pkg_postinst() {
-	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
-	elog
-	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
-	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
-	elog
-	elog "Then you need to recompile Boost and all its reverse dependencies"
-	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
-	elog "requires a complete rebuild of the boost-dependent ecosystem."
-	elog
-	elog "See for instance https://bugs.gentoo.org/638138"
-}
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 60c8fd3edebc..805d7a3bbb57 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,6 +1,4 @@
 AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f1967756b2e2912d76826c2fb92d9008afc338f19a4edc55b23e2751ce46f52e2fccc3e091f7143647a42a017c02ee580e138c3a50536 SHA512 4370bb6551c3e2f414b6580f26ed3a7429278139d5835b44c8769f1583363aaf8e25982e6f86bbcf2e7fc06d3c406d9a2af4a47fbb99377c6589f276aa9f29a3
-DIST check-0.15.0.tar.gz 306428 BLAKE2B fea2a169b86248a6657f890469f41cd699dd95efb91e311ccf188548a6c8c28568decf0b5f03b08aed31e14c69d50707b418e1e71c6db7e1b7938ee36aa19cd8 SHA512 efde93977a38520b3b83a9e2f678d07b916fc27e41cf839a663900c4153d645fe4274ec3b7e2dabf475457f909f61734632c97b7257c49f5853fd11d920b0c84
 DIST check-0.15.2.tar.gz 306136 BLAKE2B e93755b58ddfea7ecc013e5449806611baedb91b362e573d4e3b6f716feeb0012cceec80f7109e44b2808deb980300c4f7825919b97878b160a1bf884357bde3 SHA512 cf81ca63142f33779df2e3542e049b9034d30bc502a663a4379bbfe85c7ee8fd80ce382583e781651d99fe830895122dab5b6793f87425b571c3927f0ba3b60e
-EBUILD check-0.15.0.ebuild 1498 BLAKE2B f3e01f34d5ae27733a0e281cfb3f95a6f44617cef468dc62bdb00b9db72a9dd555ab3c7adf016edffa962031c9994150f1c1b4ba0f00e96d0f68b3bc33e480ce SHA512 fb817b17ec6039b0b1d52d36454ebd5ca8f6fd590084ad41f168f1300b899197b6e8ff231f9f175bf162eb0d7b576ab62a2458b97c2b6f78c45cb1aaa1fc1c15
 EBUILD check-0.15.2.ebuild 1579 BLAKE2B 6887123d2d16ae72e2145d73bf9bf09c7d42ee597042d10030d724938ab1935b31c8cf7832d44cbcc8d1d486247b7a82cf308844d67b6fb02db442c40d5840f1 SHA512 1d0d113035fc6488f240512ece6d39c0d4ac5a278fd9fa9936b9086a955ec52b35e3145f25cf2760c7fdfdc7b1d4a60a485a05f0d4769cf31882a1cbbf14c3fd
 MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.15.0.ebuild b/dev-libs/check/check-0.15.0.ebuild
deleted file mode 100644
index 16d464eda35f..000000000000
--- a/dev-libs/check/check-0.15.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="A unit test framework for C"
-HOMEPAGE="https://libcheck.github.io/check/"
-SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc subunit test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}/check-0.14.0-r2-disable-automagic-dep.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Fix wrong libdir, probably caused by multilib
-	sed -i "s|\${libdir}|/usr/$(get_libdir)|g" check.pc.in || die "sed .pc failed."
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHECK_ENABLE_SUBUNIT=$(usex subunit ON OFF)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-
-	if use doc && multilib_is_native_abi; then
-		cd "${S}"/doc/ || die "Failed to switch directories."
-		doxygen "." || die "Failed to run doxygen to generate docs."
-	fi
-}
-
-multilib_src_install_all() {
-	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
-	einstalldocs
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 927da9036ff5..94f828357c89 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,6 +1,7 @@
 DIST efl-1.24.3.tar.xz 72278592 BLAKE2B c5d07e947139087976a0a974c3129ea31211be4c235e94d6fc3c2b9c7ec0be97b78fcf6a18aebd4b4d476224c9e6f5a29ad41d93e6c10065ff7591c2792b8481 SHA512 3791955c588bc1b2ca55caa19dc0fb351c9f6c681791bfe76a435255edd55257c9c5ab2f16d0d91ec2d55113bd9d24d45c0f9026ae72d9f6afbddfd093975089
+DIST efl-1.24.4.tar.xz 72283172 BLAKE2B 4e21b21108337fdf3fa7be55e804f25f32dd8dc6a1743819910d83da713bae28cb4771f2f0df5d392a6f542158ed3c48566fef8d8dfaad9c65747f9a8ee1560a SHA512 5796b33152e0375196d54557803db5928bfc45267250b80406043157193773084c39482bca40dc6811f4a3dd53d416b0d3b8317405923add0560debb24a3a385
 DIST efl-1.25.0.tar.xz 72308216 BLAKE2B 11cafe753b28eaf273e5458008bcb027b25b2768952246835d81996ca7e5acf3878e1c80dd1aa47ad2af86da2d7e96c7391120ababf1bfd85ffab83ba4d8cbda SHA512 1362e46399d4f22bd16abd5356fc57da0eb3d92dde36413cf671c1279ca6ff24ba91b358e2cff7158fa0dc9646ed83282f952e2a23e1fd92d3e37c03ba47cf1f
-EBUILD efl-1.24.3-r1.ebuild 7343 BLAKE2B ada5159b715e503b410a0db611728aae02464bcd6c396fa80850ce74f6b819d3033f6ac705e51f82f096ef52d18fafb66fb7f957c0a31f1c30508e08880e96f2 SHA512 a7bed9390fce3368c3bd50c36e6d9989307c519612ff093e1c0ac4a4dceaf6536bbfcb2940e7e44a99f2471d320837c5bd8501148cfc0847a32d1fd3797d988f
 EBUILD efl-1.24.3.ebuild 7102 BLAKE2B 363fdf6553532a47fc4d6b95c8d28a32fbd53e8b8b632567a690e96b59ecbd2fce9e0808c88b6041a3e537a57203c4b964786a708b21b401072c31f592d3c2ba SHA512 f423decb04ef2dd4ac64f127ab9f4ebaed1030aa71803aa2e7579edd8662db51322d0c5239572803713bd1276d56a01b6c2ce3efa1c5a5abaf22e1f39d9b6ef7
-EBUILD efl-1.25.0.ebuild 7654 BLAKE2B c2f8cf5098c82d900c6036b02fe790065ff21adbfd260c4357414bf4d90d861e37a48b7a81b34c4cef398bb63e8ae31c1c3904ebcbd47da2a08a9d8339019bf0 SHA512 fc6efe03cd85a78f53325a634990a20f4ee2759e49e88f4be581b563cb4d37fbcca3f3c7f0c1d920549df4450fc6c1f5feaaed501eb28748d0d74a8a6c50616f
+EBUILD efl-1.24.4.ebuild 7343 BLAKE2B a6730f3d79edc0fcd5d8a913a0c166c36e5f4127dff362d0f43b0013e274cda38a3e1d7bc2280864f54b2f84c13f90b6a77d6ebb47f7827fb97bdb42a815f0f2 SHA512 10b9a2fc8d5caf3cda150c82ea09f30b7d823c691cf0370dea6493e310a4c0ec61475e507bfc1e43ec4f9d29d386d16d5d3288e89f7fa4832ae66bad19610e20
+EBUILD efl-1.25.0-r1.ebuild 7767 BLAKE2B e65c2de696221a73a94f9ea81691ed94418b45a55a46b6163905bc866de409f6ecf35689568f2b6b815089ecbf96fa0067480123c6a70817ca372c6ed4740126 SHA512 e2e3f4bf98d1042a595b4035c8c5bda9997e9ac5c330a86c6d12f3f1ebfbc2bfa610269d80b2cf7fc0e65fdb3aaf81c730e819b5f1bfab6c62ce3a421b6344a7
 MISC metadata.xml 1985 BLAKE2B 5ad17cbfc665a26357c6b8d473d211663224eca97ed9a22c8575122e331b9661118890db1cf4f41e9e0e9b16f157d48da0920026fc83fdf965e4d1bd7c3d1ede SHA512 dbc127099457c88bcc419bd0c415f801765aeb85f010d7de43ea03e9400a7888c33c80f53048bf4edfd34ff95a43ac506026775a7bf11b041adc89acef0ec15d
diff --git a/dev-libs/efl/efl-1.24.3-r1.ebuild b/dev-libs/efl/efl-1.24.3-r1.ebuild
deleted file mode 100644
index f7493cc7904a..000000000000
--- a/dev-libs/efl/efl-1.24.3-r1.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+X bmp connman cpu_flags_arm_neon dds debug doc drm +eet elogind examples
-	fbcon +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz
-	hyphen ibus ico libressl lua +luajit jpeg2k json nls mono opengl +pdf
-	physics pmaps postscript psd pulseaudio raw scim sdl +sound +ssl +svg
-	+system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim
-	xpm xpresent zeroconf"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	?? ( gles2-only opengl )
-	^^ ( lua luajit )
-	ssl
-	drm? ( gles2-only )
-	examples? ( eet svg )
-	gles2-only? ( || ( wayland X ) )
-	pulseaudio? ( sound )
-	wayland? ( gles2-only !opengl )
-	xim? ( X )
-	xpresent? ( X )
-"
-
-# Requires everything to be enabled unconditionally.
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/check
-	net-misc/curl
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/jpeg:0=
-	X? (
-		media-libs/freetype
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		wayland? ( x11-libs/libxkbcommon[X] )
-	)
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		dev-libs/wayland
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	elogind? (
-		sys-auth/elogind
-		virtual/libudev
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gles2-only? (
-		media-libs/mesa[egl,gles2]
-		virtual/opengl
-	)
-	glib? ( dev-libs/glib:2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:= )
-	json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
-	lua? ( dev-lang/lua:* )
-	luajit? ( dev-lang/luajit:* )
-	mono? ( dev-lang/mono )
-	opengl? ( virtual/opengl )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? ( media-libs/libsdl2 )
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? ( gnome-base/librsvg )
-	system-lz4? ( app-arch/lz4 )
-	systemd? ( sys-apps/systemd:= )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	v4l? ( media-libs/libv4l )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	xpm? ( x11-libs/libXpm )
-	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	# Remove automagic unwind configure option, #743154
-	if ! use unwind; then
-		sed -i "/config_h.set('HAVE_UNWIND/,/eina_deps += unwind/d" src/lib/eina/meson.build ||
-			die "Failed to remove libunwind dep"
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		--buildtype=release
-
-		-D buffer=false
-		-D cocoa=false
-		-D drm-deprecated=false
-		-D g-mainloop=false
-		-D install-eo-files=true
-		-D mono-beta=false
-		-D dotnet=false
-		-D pixman=false
-		-D wl-deprecated=false
-		-D dotnet-stylecop-severity=Warning
-
-		-D edje-sound-and-video=true
-		-D eeze=true
-		-D libmount=true
-		-D native-arch-optimization=true
-		-D xinput2=true
-		-D xinput22=true
-
-		$(meson_use X x11)
-		$(meson_use debug debug-threads)
-		$(meson_use drm)
-		$(meson_use elogind)
-		$(meson_use examples build-examples)
-		$(meson_use fbcon fb)
-		$(meson_use fontconfig)
-		$(meson_use fribidi)
-		$(meson_use glib)
-		$(meson_use gstreamer)
-		$(meson_use harfbuzz)
-		$(meson_use hyphen)
-		$(meson_use luajit elua)
-		$(meson_use nls)
-		$(meson_use physics)
-		$(meson_use pulseaudio)
-		$(meson_use sdl)
-		$(meson_use sound audio)
-		$(meson_use systemd)
-		$(meson_use tslib)
-		$(meson_use v4l v4l2)
-		$(meson_use vnc vnc-server)
-		$(meson_use wayland wl)
-		$(meson_use xpresent)
-		$(meson_use zeroconf avahi)
-
-		$(meson_use !system-lz4 embedded-lz4)
-	)
-
-	if use opengl; then
-		emesonargs+=( -D opengl=full )
-	elif use gles2-only; then
-		emesonargs+=( -D opengl=es-egl )
-	else
-		emesonargs+=( -D opengl=none )
-	fi
-
-	if use gnutls; then
-		emesonargs+=( -D crypto=gnutls )
-	else
-		emesonargs+=( -D crypto=openssl )
-	fi
-
-	if use connman; then
-		emesonargs+=( -D network-backend=connman )
-	else
-		emesonargs+=( -D network-backend=none )
-	fi
-
-	local disabledEvasLoaders=""
-	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
-	! use dds && disabledEvasLoaders+="dds,"
-	! use eet && disabledEvasLoaders+="eet,"
-	! use gstreamer && disabledEvasLoaders+="gst,"
-	! use ico && disabledEvasLoaders+="ico,"
-	! use jpeg2k && disabledEvasLoaders+="jp2k,"
-	! use json && disabledEvasLoaders+="json,"
-	! use pdf && disabledEvasLoaders+="pdf,"
-	! use pmaps && disabledEvasLoaders+="pmaps,"
-	! use postscript && disabledEvasLoaders+="ps,"
-	! use psd && disabledEvasLoaders+="psd,"
-	! use raw && disabledEvasLoaders+="raw,"
-	! use svg && disabledEvasLoaders+="rsvg,svg,"
-	! use tga && disabledEvasLoaders+="tga,"
-	! use tgv && disabledEvasLoaders+="tgv,"
-	! use tiff && disabledEvasLoaders+="tiff,"
-	! use webp && disabledEvasLoaders+="webp,"
-	! use xcf && disabledEvasLoaders+="xcf,"
-	! use xpm && disabledEvasLoaders+="xpm,"
-	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
-	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
-
-	local disabledImfLoaders=""
-	! use ibus && disabledImfLoaders+="ibus,"
-	! use scim && disabledImfLoaders+="scim,"
-	! use xim && disabledImfLoaders+="xim,"
-	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
-	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
-
-	local bindingsList="cxx,"
-	use luajit && bindingsList+="luajit,"
-	use mono && bindingsList+="mono,"
-	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
-	emesonargs+=( -D bindings="${bindingsList}" )
-
-	local luaChoice=""
-	if use luajit; then
-		luaChoice+="luajit"
-	else
-		luaChoice+="lua"
-	fi
-	emesonargs+=( -D lua-interpreter="${luaChoice}" )
-
-	# Not all arm CPU's have neon instruction set, #722552
-	if use arm && ! use cpu_flags_arm_neon; then
-		emesonargs+=( -D native-arch-optimization=false )
-	fi
-
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-
-	if use doc; then
-		cd doc/ || die "Failed to switch into doc/ dir."
-		doxygen . || die "Doxygen failed to run."
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
-	meson_src_install
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples/
-		dodoc -r "${BUILD_DIR}"/src/examples/
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.24.4.ebuild b/dev-libs/efl/efl-1.24.4.ebuild
new file mode 100644
index 000000000000..f9943bbda177
--- /dev/null
+++ b/dev-libs/efl/efl-1.24.4.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X bmp connman cpu_flags_arm_neon dds debug doc drm +eet elogind examples
+	fbcon +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz
+	hyphen ibus ico libressl lua +luajit jpeg2k json nls mono opengl +pdf
+	physics pmaps postscript psd pulseaudio raw scim sdl +sound +ssl +svg
+	+system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim
+	xpm xpresent zeroconf"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( gles2-only opengl )
+	^^ ( lua luajit )
+	ssl
+	drm? ( gles2-only )
+	examples? ( eet svg )
+	gles2-only? ( || ( wayland X ) )
+	pulseaudio? ( sound )
+	wayland? ( gles2-only !opengl )
+	xim? ( X )
+	xpresent? ( X )
+"
+
+# Requires everything to be enabled unconditionally.
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/check
+	net-misc/curl
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/jpeg:0=
+	X? (
+		media-libs/freetype
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		wayland? ( x11-libs/libxkbcommon[X] )
+	)
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		dev-libs/wayland
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	elogind? (
+		sys-auth/elogind
+		virtual/libudev
+	)
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gles2-only? (
+		media-libs/mesa[egl,gles2]
+		virtual/opengl
+	)
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:= )
+	json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
+	lua? ( dev-lang/lua:* )
+	luajit? ( dev-lang/luajit:* )
+	mono? ( dev-lang/mono )
+	opengl? ( virtual/opengl )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? ( media-libs/libsdl2 )
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? ( gnome-base/librsvg )
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd:= )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	v4l? ( media-libs/libv4l )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	# Remove automagic unwind configure option, #743154
+	if ! use unwind; then
+		sed -i "/config_h.set('HAVE_UNWIND/,/eina_deps += unwind/d" src/lib/eina/meson.build ||
+			die "Failed to remove libunwind dep"
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		--buildtype=release
+
+		-D buffer=false
+		-D cocoa=false
+		-D drm-deprecated=false
+		-D g-mainloop=false
+		-D mono-beta=false
+		-D dotnet=false
+		-D pixman=false
+		-D wl-deprecated=false
+		-D dotnet-stylecop-severity=Warning
+
+		-D edje-sound-and-video=true
+		-D eeze=true
+		-D install-eo-files=true
+		-D libmount=true
+		-D native-arch-optimization=true
+		-D xinput2=true
+		-D xinput22=true
+
+		$(meson_use X x11)
+		$(meson_use debug debug-threads)
+		$(meson_use drm)
+		$(meson_use elogind)
+		$(meson_use examples build-examples)
+		$(meson_use fbcon fb)
+		$(meson_use fontconfig)
+		$(meson_use fribidi)
+		$(meson_use glib)
+		$(meson_use gstreamer)
+		$(meson_use harfbuzz)
+		$(meson_use hyphen)
+		$(meson_use luajit elua)
+		$(meson_use nls)
+		$(meson_use physics)
+		$(meson_use pulseaudio)
+		$(meson_use sdl)
+		$(meson_use sound audio)
+		$(meson_use systemd)
+		$(meson_use tslib)
+		$(meson_use v4l v4l2)
+		$(meson_use vnc vnc-server)
+		$(meson_use wayland wl)
+		$(meson_use xpresent)
+		$(meson_use zeroconf avahi)
+
+		$(meson_use !system-lz4 embedded-lz4)
+	)
+
+	if use opengl; then
+		emesonargs+=( -D opengl=full )
+	elif use gles2-only; then
+		emesonargs+=( -D opengl=es-egl )
+	else
+		emesonargs+=( -D opengl=none )
+	fi
+
+	if use gnutls; then
+		emesonargs+=( -D crypto=gnutls )
+	else
+		emesonargs+=( -D crypto=openssl )
+	fi
+
+	if use connman; then
+		emesonargs+=( -D network-backend=connman )
+	else
+		emesonargs+=( -D network-backend=none )
+	fi
+
+	local disabledEvasLoaders=""
+	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
+	! use dds && disabledEvasLoaders+="dds,"
+	! use eet && disabledEvasLoaders+="eet,"
+	! use gstreamer && disabledEvasLoaders+="gst,"
+	! use ico && disabledEvasLoaders+="ico,"
+	! use jpeg2k && disabledEvasLoaders+="jp2k,"
+	! use json && disabledEvasLoaders+="json,"
+	! use pdf && disabledEvasLoaders+="pdf,"
+	! use pmaps && disabledEvasLoaders+="pmaps,"
+	! use postscript && disabledEvasLoaders+="ps,"
+	! use psd && disabledEvasLoaders+="psd,"
+	! use raw && disabledEvasLoaders+="raw,"
+	! use svg && disabledEvasLoaders+="rsvg,svg,"
+	! use tga && disabledEvasLoaders+="tga,"
+	! use tgv && disabledEvasLoaders+="tgv,"
+	! use tiff && disabledEvasLoaders+="tiff,"
+	! use webp && disabledEvasLoaders+="webp,"
+	! use xcf && disabledEvasLoaders+="xcf,"
+	! use xpm && disabledEvasLoaders+="xpm,"
+	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
+	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
+
+	local disabledImfLoaders=""
+	! use ibus && disabledImfLoaders+="ibus,"
+	! use scim && disabledImfLoaders+="scim,"
+	! use xim && disabledImfLoaders+="xim,"
+	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
+	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
+
+	local bindingsList="cxx,"
+	use luajit && bindingsList+="luajit,"
+	use mono && bindingsList+="mono,"
+	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
+	emesonargs+=( -D bindings="${bindingsList}" )
+
+	local luaChoice=""
+	if use luajit; then
+		luaChoice+="luajit"
+	else
+		luaChoice+="lua"
+	fi
+	emesonargs+=( -D lua-interpreter="${luaChoice}" )
+
+	# Not all arm CPU's have neon instruction set, #722552
+	if use arm && ! use cpu_flags_arm_neon; then
+		emesonargs+=( -D native-arch-optimization=false )
+	fi
+
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use doc; then
+		cd doc/ || die "Failed to switch into doc/ dir."
+		doxygen . || die "Doxygen failed to run."
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
+	meson_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples/
+		dodoc -r "${BUILD_DIR}"/src/examples/
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/efl/efl-1.25.0-r1.ebuild b/dev-libs/efl/efl-1.25.0-r1.ebuild
new file mode 100644
index 000000000000..be750ab8e3a4
--- /dev/null
+++ b/dev-libs/efl/efl-1.25.0-r1.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one elogind examples fbcon
+	+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
+	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
+	sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf
+	xim xpm xpresent zeroconf"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( gles2-only opengl )
+	?? ( fbcon tslib )
+	^^ ( lua luajit )
+	ssl
+	drm? ( gles2-only )
+	examples? ( eet svg )
+	gles2-only? ( || ( wayland X ) )
+	pulseaudio? ( sound )
+	wayland? ( gles2-only !opengl || ( elogind systemd ) )
+	xim? ( X )
+	xpresent? ( X )
+"
+
+# Requires everything to be enabled unconditionally.
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/check
+	net-misc/curl
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/jpeg:0=
+	X? (
+		media-libs/freetype
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		wayland? ( x11-libs/libxkbcommon[X] )
+	)
+	avif? ( media-libs/libavif )
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		dev-libs/wayland
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	elogind? (
+		sys-auth/elogind
+		virtual/libudev
+	)
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gles2-only? (
+		media-libs/mesa[egl,gles2]
+		virtual/opengl
+	)
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:= )
+	json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
+	lua? ( dev-lang/lua:* )
+	luajit? ( dev-lang/luajit:* )
+	mono? ( dev-lang/mono )
+	opengl? ( virtual/opengl )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? ( media-libs/libsdl2 )
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? ( gnome-base/librsvg )
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd:= )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	v4l? ( media-libs/libv4l )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
+	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.0
+		/usr/$(get_libdir)/libefreet_mime.so.1.25.0"
+}
+
+src_prepare() {
+	default
+
+	# Remove automagic unwind configure option, #743154
+	if ! use unwind; then
+		sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build ||
+			die "Failed to remove libunwind dep"
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		--buildtype=release
+
+		-D buffer=false
+		-D cocoa=false
+		-D drm-deprecated=false
+		-D g-mainloop=false
+		-D mono-beta=false
+		-D dotnet=false
+		-D pixman=false
+		-D wl-deprecated=false
+		-D dotnet-stylecop-severity=Warning
+
+		-D edje-sound-and-video=true
+		-D eeze=true
+		-D install-eo-files=true
+		-D libmount=true
+		-D native-arch-optimization=true
+		-D xinput2=true
+		-D xinput22=true
+
+		$(meson_use X x11)
+		$(meson_use debug debug-threads)
+		$(meson_use drm)
+		$(meson_use examples build-examples)
+		$(meson_use fbcon fb)
+		$(meson_use fontconfig)
+		$(meson_use fribidi)
+		$(meson_use glib)
+		$(meson_use gstreamer)
+		$(meson_use harfbuzz)
+		$(meson_use hyphen)
+		$(meson_use luajit elua)
+		$(meson_use nls)
+		$(meson_use physics)
+		$(meson_use pulseaudio)
+		$(meson_use sdl)
+		$(meson_use sound audio)
+		$(meson_use tslib)
+		$(meson_use v4l v4l2)
+		$(meson_use vnc vnc-server)
+		$(meson_use wayland wl)
+		$(meson_use xpresent)
+		$(meson_use zeroconf avahi)
+
+		$(meson_use !system-lz4 embedded-lz4)
+	)
+
+	if use elogind || use systemd; then
+		emesonargs+=( -D systemd=true )
+	else
+		emesonargs+=( -D systemd=false )
+	fi
+
+	if use opengl; then
+		emesonargs+=( -D opengl=full )
+	elif use gles2-only; then
+		emesonargs+=( -D opengl=es-egl )
+	else
+		emesonargs+=( -D opengl=none )
+	fi
+
+	if use gnutls; then
+		emesonargs+=( -D crypto=gnutls )
+	else
+		emesonargs+=( -D crypto=openssl )
+	fi
+
+	if use connman; then
+		emesonargs+=( -D network-backend=connman )
+	else
+		emesonargs+=( -D network-backend=none )
+	fi
+
+	local disabledEvasLoaders=""
+	! use avif && disabledEvasLoaders="avif,"
+	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
+	! use dds && disabledEvasLoaders+="dds,"
+	! use eet && disabledEvasLoaders+="eet,"
+	! use gstreamer && disabledEvasLoaders+="gst,"
+	! use ico && disabledEvasLoaders+="ico,"
+	! use jpeg2k && disabledEvasLoaders+="jp2k,"
+	! use json && disabledEvasLoaders+="json,"
+	! use pdf && disabledEvasLoaders+="pdf,"
+	! use pmaps && disabledEvasLoaders+="pmaps,"
+	! use postscript && disabledEvasLoaders+="ps,"
+	! use psd && disabledEvasLoaders+="psd,"
+	! use raw && disabledEvasLoaders+="raw,"
+	! use svg && disabledEvasLoaders+="rsvg,svg,"
+	! use tga && disabledEvasLoaders+="tga,"
+	! use tgv && disabledEvasLoaders+="tgv,"
+	! use tiff && disabledEvasLoaders+="tiff,"
+	! use webp && disabledEvasLoaders+="webp,"
+	! use xcf && disabledEvasLoaders+="xcf,"
+	! use xpm && disabledEvasLoaders+="xpm,"
+	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
+	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
+
+	local disabledImfLoaders=""
+	! use ibus && disabledImfLoaders+="ibus,"
+	! use scim && disabledImfLoaders+="scim,"
+	! use xim && disabledImfLoaders+="xim,"
+	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
+	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
+
+	local bindingsList="cxx,"
+	use luajit && bindingsList+="lua,"
+	use mono && bindingsList+="mono,"
+	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
+	emesonargs+=( -D bindings="${bindingsList}" )
+
+	local luaChoice=""
+	if use luajit; then
+		luaChoice+="luajit"
+	else
+		luaChoice+="lua"
+	fi
+	emesonargs+=( -D lua-interpreter="${luaChoice}" )
+
+	# Not all arm CPU's have neon instruction set, #722552
+	if use arm && ! use cpu_flags_arm_neon; then
+		emesonargs+=( -D native-arch-optimization=false )
+	fi
+
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use doc; then
+		cd doc/ || die "Failed to switch into doc/ dir."
+		doxygen . || die "Doxygen failed to run."
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
+	meson_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples/
+		dodoc -r "${BUILD_DIR}"/src/examples/
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/efl/efl-1.25.0.ebuild b/dev-libs/efl/efl-1.25.0.ebuild
deleted file mode 100644
index fd0d1587fa97..000000000000
--- a/dev-libs/efl/efl-1.25.0.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one elogind examples fbcon
-	+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
-	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
-	sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf
-	xim xpm xpresent zeroconf"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	?? ( gles2-only opengl )
-	^^ ( lua luajit )
-	ssl
-	drm? ( gles2-only )
-	examples? ( eet svg )
-	gles2-only? ( || ( wayland X ) )
-	pulseaudio? ( sound )
-	wayland? ( gles2-only !opengl )
-	xim? ( X )
-	xpresent? ( X )
-"
-
-# Requires everything to be enabled unconditionally.
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/check
-	net-misc/curl
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/jpeg:0=
-	X? (
-		media-libs/freetype
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		wayland? ( x11-libs/libxkbcommon[X] )
-	)
-	avif? ( media-libs/libavif )
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		dev-libs/wayland
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	elogind? (
-		sys-auth/elogind
-		virtual/libudev
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gles2-only? (
-		media-libs/mesa[egl,gles2]
-		virtual/opengl
-	)
-	glib? ( dev-libs/glib:2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:= )
-	json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
-	lua? ( dev-lang/lua:* )
-	luajit? ( dev-lang/luajit:* )
-	mono? ( dev-lang/mono )
-	opengl? ( virtual/opengl )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? ( media-libs/libsdl2 )
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? ( gnome-base/librsvg )
-	system-lz4? ( app-arch/lz4 )
-	systemd? ( sys-apps/systemd:= )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	v4l? ( media-libs/libv4l )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	xpm? ( x11-libs/libXpm )
-	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so.
-	QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.1.25.0
-		/usr/$(get_libdir)/libefreet_mime.so.1.25.0"
-}
-
-src_prepare() {
-	default
-
-	# Remove automagic unwind configure option, #743154
-	if ! use unwind; then
-		sed -i "/config_h.set('HAVE_UNWIND/,/eina_ext_deps += unwind/d" src/lib/eina/meson.build ||
-			die "Failed to remove libunwind dep"
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		--buildtype=release
-
-		-D buffer=false
-		-D cocoa=false
-		-D drm-deprecated=false
-		-D g-mainloop=false
-		-D install-eo-files=true
-		-D mono-beta=false
-		-D dotnet=false
-		-D pixman=false
-		-D wl-deprecated=false
-		-D dotnet-stylecop-severity=Warning
-
-		-D edje-sound-and-video=true
-		-D eeze=true
-		-D libmount=true
-		-D native-arch-optimization=true
-		-D xinput2=true
-		-D xinput22=true
-
-		$(meson_use X x11)
-		$(meson_use debug debug-threads)
-		$(meson_use drm)
-		$(meson_use elogind systemd)
-		$(meson_use examples build-examples)
-		$(meson_use fbcon fb)
-		$(meson_use fontconfig)
-		$(meson_use fribidi)
-		$(meson_use glib)
-		$(meson_use gstreamer)
-		$(meson_use harfbuzz)
-		$(meson_use hyphen)
-		$(meson_use luajit elua)
-		$(meson_use nls)
-		$(meson_use physics)
-		$(meson_use pulseaudio)
-		$(meson_use sdl)
-		$(meson_use sound audio)
-		$(meson_use systemd)
-		$(meson_use tslib)
-		$(meson_use v4l v4l2)
-		$(meson_use vnc vnc-server)
-		$(meson_use wayland wl)
-		$(meson_use xpresent)
-		$(meson_use zeroconf avahi)
-
-		$(meson_use !system-lz4 embedded-lz4)
-	)
-
-	if use opengl; then
-		emesonargs+=( -D opengl=full )
-	elif use gles2-only; then
-		emesonargs+=( -D opengl=es-egl )
-	else
-		emesonargs+=( -D opengl=none )
-	fi
-
-	if use gnutls; then
-		emesonargs+=( -D crypto=gnutls )
-	else
-		emesonargs+=( -D crypto=openssl )
-	fi
-
-	if use connman; then
-		emesonargs+=( -D network-backend=connman )
-	else
-		emesonargs+=( -D network-backend=none )
-	fi
-
-	local disabledEvasLoaders=""
-	! use avif && disabledEvasLoaders="avif,"
-	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
-	! use dds && disabledEvasLoaders+="dds,"
-	! use eet && disabledEvasLoaders+="eet,"
-	! use gstreamer && disabledEvasLoaders+="gst,"
-	! use ico && disabledEvasLoaders+="ico,"
-	! use jpeg2k && disabledEvasLoaders+="jp2k,"
-	! use json && disabledEvasLoaders+="json,"
-	! use pdf && disabledEvasLoaders+="pdf,"
-	! use pmaps && disabledEvasLoaders+="pmaps,"
-	! use postscript && disabledEvasLoaders+="ps,"
-	! use psd && disabledEvasLoaders+="psd,"
-	! use raw && disabledEvasLoaders+="raw,"
-	! use svg && disabledEvasLoaders+="rsvg,svg,"
-	! use tga && disabledEvasLoaders+="tga,"
-	! use tgv && disabledEvasLoaders+="tgv,"
-	! use tiff && disabledEvasLoaders+="tiff,"
-	! use webp && disabledEvasLoaders+="webp,"
-	! use xcf && disabledEvasLoaders+="xcf,"
-	! use xpm && disabledEvasLoaders+="xpm,"
-	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
-	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
-
-	local disabledImfLoaders=""
-	! use ibus && disabledImfLoaders+="ibus,"
-	! use scim && disabledImfLoaders+="scim,"
-	! use xim && disabledImfLoaders+="xim,"
-	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
-	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
-
-	local bindingsList="cxx,"
-	use luajit && bindingsList+="lua,"
-	use mono && bindingsList+="mono,"
-	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
-	emesonargs+=( -D bindings="${bindingsList}" )
-
-	local luaChoice=""
-	if use luajit; then
-		luaChoice+="luajit"
-	else
-		luaChoice+="lua"
-	fi
-	emesonargs+=( -D lua-interpreter="${luaChoice}" )
-
-	# Not all arm CPU's have neon instruction set, #722552
-	if use arm && ! use cpu_flags_arm_neon; then
-		emesonargs+=( -D native-arch-optimization=false )
-	fi
-
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-
-	if use doc; then
-		cd doc/ || die "Failed to switch into doc/ dir."
-		doxygen . || die "Doxygen failed to run."
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
-	meson_src_install
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples/
-		dodoc -r "${BUILD_DIR}"/src/examples/
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 25d5dc40b090..e9e29a5cc0d2 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -4,5 +4,5 @@ DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db2
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 EBUILD glib-2.62.6.ebuild 9758 BLAKE2B ad374e654c1afbe60c8b65e04cf1934791f8c487a3881b82deb0684f0c903e4d7a4e08c954f325a896a42f935634ecc37d764ad6e16a4fcd6b1a04528aaab378 SHA512 bf35ad4fa21d1d9a7e1bd495a800d67fed2aca2f5002cf8df58523ed980abb05b076d19382274556a99a72fa4bf4a796d693534b19ed4e309fb642e4ed7f0feb
 EBUILD glib-2.64.4.ebuild 10341 BLAKE2B f86bfc8fff0ebc1fd53b89f98a3924cdbf814de9fe2a8cdd0a65aa5cd5a4c24d04b112cde58e1a3b5911d74de8cc65087fd09a88192c9fcbe1ecc8178748052b SHA512 d0b44d65e055f1afc22126675ed54f5168faa3b55aad5f1bf52880d71232f226924c9c888ad3dd969fa010d089dc0634abefb90c16368840ac161435e043d8cf
-EBUILD glib-2.64.5.ebuild 10344 BLAKE2B 41f17b87deb363b16093aa5ee004bd828b1d9d998206db4c30ddb0295a63e321ceef2e6864ff7f842d455b82ec4d4df04154e3492721e75d926aa8bab370677c SHA512 e2c4656c0e1cfc824c1662a7727e00fbab5f874757d32eb2704c60c7a151ea22cc0f8289d1e4dab02e7db1b24b4d89181e10c25c3c67ca2216745839c71687c4
+EBUILD glib-2.64.5.ebuild 10343 BLAKE2B 84d82001f55a173d36d263675f0168a0d8f9cfae88c53358b722ebf9c7a07fe12a10ecde623e3e26423216a08ca74a94037727ac64c8287a3de80334dc8ce4a4 SHA512 a5f70fe09a276c7a1e4ebb6e924995b0e216879ab42fd57dc185716c3985547c1e46aeea2e2798548a33d227afc9c4cfc961fb2e0fca17b156022bc168b341b5
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.64.5.ebuild b/dev-libs/glib/glib-2.64.5.ebuild
index 20eae495eb41..837596c8f777 100644
--- a/dev-libs/glib/glib-2.64.5.ebuild
+++ b/dev-libs/glib/glib-2.64.5.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~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/igraph/Manifest b/dev-libs/igraph/Manifest
index 3fcb9eb0ff54..2edd5aa134f0 100644
--- a/dev-libs/igraph/Manifest
+++ b/dev-libs/igraph/Manifest
@@ -1,4 +1,7 @@
 AUX igraph-0.7.1-unbundle.patch 8525 BLAKE2B 716137c2d7b4ffc3e29b484539867216574162dc3c55ea747c57cf24689ef3de032776f9e7f1d76cdb1c0e39bd6afd5fc3cc2e74de4209d632bdd568a8b884a4 SHA512 8b796f95044a231b2695532d158721cf48dfd266f5acfc2eec8a7f3706208190ee07eccaf83823ba9323edaef15afbca60ff7013cf0d9d7fda0ab5b0ee5e0eff
+AUX igraph-0.8.2-unbundle.patch 4755 BLAKE2B da0d8940fdddcffae07332db988a3195e3fb8d8628707191c45d7d1d37828fc4fc7ba3bb86f5fdef3f693e5d50d50e0dc504f2ff6334dd44aacaa32238ee46f8 SHA512 737ca787a729538300058307ee003cbf1b70e93bfc1e4fd5853647d033c61537bb935e6f46c1a689f4f69ad188602c71493693d45216e43f912e5c4c4757ca3c
 DIST igraph-0.7.1.tar.gz 2967134 BLAKE2B 27f0a2f51e561a3ea2e2e6d31853fe10ffd66f9f67603d77f2c0449a4c2bcd4d45c98516b526fb0f23a871ebe3db1fcf0c691551714d044124778faa147bd30f SHA512 ac7d7e3fbc6d27ae69079224881ca03db2c7e0b50d016706f3e167c614e2c9332c675d2fcd3cde12874e13a8fc402d42222308c6195afadee15152cec93f94dd
+DIST igraph-0.8.2.tar.gz 3625308 BLAKE2B b3be5a28b6507c98c88a96c4a14e6b9c45645985f5b16aaae0739412a5f26a1ccdbda3180fac5d12525b4da2f5fc3d6caad3928cd1306b151b89104bbbb5f6e8 SHA512 e1035ed22541c7d253c201da5d2f8c5ceb154a6bf4be1b41981a02d6bbe72038647bf011432e2446307e615c27aa8079d4ef2c4447c2eba3764788e26e8f790b
 EBUILD igraph-0.7.1-r2.ebuild 1021 BLAKE2B f57456480c2b191750bda562f88503df46b4c6adaaa0d70bee3dd570d323eb7d26c355328bf40d896238f90c9b485ac35aad3b059141425f57463a7308f7b911 SHA512 6f852704fa6bcd52ae289f78115d4f21df0c1ff720cd7f5673882f17d34d5d174f8657b461a1543f9a8984b6d100cd91584279e3e3b33fde77b05bd527b65688
-MISC metadata.xml 603 BLAKE2B 996b695aa3f67e6bfbbed5a505c6aa08dd72c68911d3b881cf8d99c20439eabbf4d87fe714e0fb7363ee9870f389005b19943ff1ecf865dfb0f5a8936021850b SHA512 31eb84c71fc2afb1fb804f2fe94eafa4c0e0a37eb933b6c89c530e32bdcfa684512e4aff9c36a58d363df0ce6321eaa298a5d48778f93e8c8ad8fe7e31b5b152
+EBUILD igraph-0.8.2.ebuild 1169 BLAKE2B e15a502fa48ac7f7174103cb76db131333f3635ca55ef838abf1107835d7c8adb5a91244f2a5b34cd129290252416a385259182b3b5167dcab76336acda5a91d SHA512 efa374895127874150b12119c1a81aed2d03be6e5fc9648cb0be1553f7770ab48d34c73aecc2e4fa1e21a892d1501d6e371023b07aca8b520e483d19df527524
+MISC metadata.xml 807 BLAKE2B 9388edde0d01baaedc25d6cdf128e2f4b1df9c9894bb371fe088573bae73da4d572b89aad9dff6e77d080c1e084e31c2d2e7f0cf7c994b2b91e5d00b6ea86850 SHA512 a71270dd5c1a1c99792a623563f5efc70bdc16575f2e83296b6a04f4d2b960a73ffa4c8a696844f38d01b51af4ba0c054d59cb132c6da660dff10cd12e02777a
diff --git a/dev-libs/igraph/files/igraph-0.8.2-unbundle.patch b/dev-libs/igraph/files/igraph-0.8.2-unbundle.patch
new file mode 100644
index 000000000000..859c6387b7f5
--- /dev/null
+++ b/dev-libs/igraph/files/igraph-0.8.2-unbundle.patch
@@ -0,0 +1,150 @@
+diff --git a/configure.ac b/configure.ac
+index b422caf..dae8647 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -333,6 +333,8 @@ else
+   internal_glpk=no
+ fi
+ 
++PKG_CHECK_MODULES([CS],[cxsparse])
++
+ # Link time optimization feature in newer gcc/g++
+ # based on http://svn.r-project.org/R/trunk/configure.ac
+ AC_ARG_ENABLE([lto],
+diff --git a/examples/simple/igraph_sparsemat2.c b/examples/simple/igraph_sparsemat2.c
+index 24877c2..0f4b45c 100644
+--- a/examples/simple/igraph_sparsemat2.c
++++ b/examples/simple/igraph_sparsemat2.c
+@@ -21,7 +21,7 @@
+ 
+ */
+ 
+-#include <cs/cs.h>
++#include <cs.h>
+ #include <igraph.h>
+ #include "igraph_blas_internal.h"
+ #include "igraph_arpack_internal.h"
+diff --git a/examples/simple/igraph_sparsemat3.c b/examples/simple/igraph_sparsemat3.c
+index 09329f0..31d4f1f 100644
+--- a/examples/simple/igraph_sparsemat3.c
++++ b/examples/simple/igraph_sparsemat3.c
+@@ -21,7 +21,7 @@
+ 
+ */
+ 
+-#include <cs/cs.h>
++#include <cs.h>
+ #include <igraph.h>
+ 
+ int permute(const igraph_matrix_t *M,
+diff --git a/examples/simple/igraph_sparsemat4.c b/examples/simple/igraph_sparsemat4.c
+index 3a33979..c0ea489 100644
+--- a/examples/simple/igraph_sparsemat4.c
++++ b/examples/simple/igraph_sparsemat4.c
+@@ -21,7 +21,7 @@
+ 
+ */
+ 
+-#include <cs/cs.h>
++#include <cs.h>
+ #include <igraph.h>
+ 
+ igraph_bool_t check_solution(const igraph_sparsemat_t *A,
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f9d02d2..8ab3385 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -9,9 +9,6 @@ AM_YFLAGS = -d
+ 
+ lib_LTLIBRARIES         = libigraph.la
+ 
+-include lapack/blas.inc
+-include lapack/lapack.inc
+-include lapack/arpack.inc
+ include plfit/plfit.inc
+ 
+ F2C =	f2c/abort_.c	  f2c/dolio.c	    f2c/r_sin.c\
+@@ -99,8 +96,6 @@ if INTERNAL_ARPACK
+   ARPACK_LIB = libarpack.la
+ endif
+ 
+-include ../optional/glpk/glpk.inc
+-
+ if INTERNAL_GLPK
+   libglpk_la_SOURCES = 	$(GLPK)
+   libglpk_la_CFLAGS = -I$(top_srcdir)/optional/glpk
+@@ -365,7 +360,7 @@ SOURCES = 		     basic_query.c games.c cocitation.c iterators.c \
+ 			     drl_layout_3d.cpp drl_graph_3d.cpp \
+ 			     DensityGrid_3d.cpp \
+ 			     foreign-dl-parser.y foreign-dl-lexer.l \
+-			     $(CS) sparsemat.c mixing.c bigint.c bignum.c \
++			     sparsemat.c mixing.c bigint.c bignum.c \
+ 			     version.c optimal_modularity.c \
+ 			     igraph_fixed_vectorlist.c separators.c \
+ 			     igraph_marked_queue.c igraph_estack.c st-cuts.c \
+@@ -408,7 +403,7 @@ libigraph_la_CXXFLAGS	   = -I$(top_srcdir)/include -I$(top_builddir)/include $(W
+ libigraph_la_LDFLAGS       = -no-undefined
+ libigraph_la_LIBADD        = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIB) \
+ 				 $(LAPACK_LIB) $(ARPACK_LIB) $(GLPK_LIB) $(PRPACK_LIB) \
+-				 $(PLFIT_LIB)
++				 $(PLFIT_LIB) $(CS_LIBS)
+ 
+ if INTERNAL_GLPK
+   libigraph_la_CFLAGS   += -I$(top_srcdir)/optional/glpk
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 56703d4..cc30d48 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -2411,7 +2411,7 @@ SOURCES = basic_query.c games.c cocitation.c iterators.c \
+ 	gengraph_powerlaw.cpp gengraph_random.cpp decomposition.c \
+ 	bipartite.c drl_layout_3d.cpp drl_graph_3d.cpp \
+ 	DensityGrid_3d.cpp foreign-dl-parser.y foreign-dl-lexer.l \
+-	$(CS) sparsemat.c mixing.c bigint.c bignum.c version.c \
++	sparsemat.c mixing.c bigint.c bignum.c version.c \
+ 	optimal_modularity.c igraph_fixed_vectorlist.c separators.c \
+ 	igraph_marked_queue.c igraph_estack.c st-cuts.c \
+ 	cohesive_blocks.c statusbar.c lapack.c complex.c eigen.c \
+diff --git a/src/sparsemat.c b/src/sparsemat.c
+index 0ed4678..4fb724d 100644
+--- a/src/sparsemat.c
++++ b/src/sparsemat.c
+@@ -23,7 +23,7 @@
+ 
+ #include "config.h"
+ 
+-#include "cs/cs.h"
++#include <cs.h>
+ 
+ #include "igraph_sparsemat.h"
+ #include "igraph_error.h"
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index d350f11..31a1f5a 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -13,7 +13,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
+ 	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+ 	} >$(srcdir)/package.m4
+ 
+-EXTRA_DIST += package.m4
++#EXTRA_DIST += package.m4
+ 
+ TESTSUITE_AT = \
+ 	testsuite.at \
+diff --git a/tests/mt.at b/tests/mt.at
+index 050974a..b154ce1 100644
+--- a/tests/mt.at
++++ b/tests/mt.at
+@@ -23,11 +23,11 @@ AT_BANNER([[Thread-safety tests]])
+ 
+ AT_SETUP([Simple error handling test :])
+ AT_KEYWORDS([thread-safe])
+-AT_COMPILE_CHECK([simple/tls1.c], [], [], [], [-lpthread])
++AT_COMPILE_CHECK([simple/tls1.c], [], [], [], [-lpthread $(${PKG_CONFIG} --libs arpack)])
+ AT_CLEANUP
+ 
+ AT_SETUP([Thread-safe ARPACK:])
+ AT_KEYWORDS([thread-safe ARPACK])
+ AT_COMPILE_CHECK([simple/tls2.c], [simple/tls2.out], [], [internal], 
+-                 [-lpthread])
++                 [-lpthread $(${PKG_CONFIG} --libs arpack)])
+ AT_CLEANUP
diff --git a/dev-libs/igraph/igraph-0.8.2.ebuild b/dev-libs/igraph/igraph-0.8.2.ebuild
new file mode 100644
index 000000000000..fbacf2931bef
--- /dev/null
+++ b/dev-libs/igraph/igraph-0.8.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Creating and manipulating undirected and directed graphs"
+HOMEPAGE="http://www.igraph.org/"
+SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/gmp:0
+	dev-libs/libxml2
+	sci-libs/arpack
+	sci-libs/cxsparse
+	sci-mathematics/glpk
+	virtual/blas
+	virtual/lapack"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
+
+src_prepare() {
+	default
+	rm -r src/lapack optional/glpk src/cs || die
+	eautoreconf
+}
+
+src_configure() {
+	# even with --with-external-f2c
+	# we don't need f2c as none of
+	#    arpack lapack blas
+	# are internal
+	tc-export PKG_CONFIG
+	econf \
+		$(use_enable debug) \
+		--enable-gmp \
+		--disable-static \
+		--disable-tls \
+		--with-external-arpack \
+		--with-external-blas \
+		--with-external-lapack \
+		--with-external-f2c \
+		--with-external-glpk
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/igraph/metadata.xml b/dev-libs/igraph/metadata.xml
index 6ba23eeb564f..91a6671aeaf2 100644
--- a/dev-libs/igraph/metadata.xml
+++ b/dev-libs/igraph/metadata.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
 	<longdescription lang="en">
-igraph is a free software package for creating and manipulating undirected and 
-directed graphs. It includes implementations for classic graph theory problems 
-like minimum spanning trees and network flow, and also implements algorithms for
-some recent network analysis methods, like community structure search.
-</longdescription>
+		igraph is a free software package for creating and manipulating undirected and
+		directed graphs. It includes implementations for classic graph theory problems
+		like minimum spanning trees and network flow, and also implements algorithms for
+		some recent network analysis methods, like community structure search.
+	</longdescription>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">igraph</remote-id>
 	</upstream>
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
new file mode 100644
index 000000000000..e483b1ed59e1
--- /dev/null
+++ b/dev-libs/inih/Manifest
@@ -0,0 +1,3 @@
+DIST inih-51.tar.gz 16258 BLAKE2B 91a5aee6e0ecadf949fbf0b58bd2596bcb985c76fc9000a671d65cb5325c51dbb8bd945ccd7721b72dafafd11c70a9c84ad910768d0fc479e5491db8b7aacbd8 SHA512 eb2f58979d93e51a09326e6c187828643887ac1a239d4b12205567c7d87a671c9c49ca99db376c031d366bc680e579c30dcea9f3eb130ec802597411b2cb3cf4
+EBUILD inih-51.ebuild 733 BLAKE2B 35c324b1927627143e78e9f18e6121e5092541ac96ff10b17fe7717f546bce6ecbd8e0f0aea086a736543f44b2fcdcc3976b3f1364f8146c39fc279b1c0bc5da SHA512 a7f9767609347bd9618156e41815b13f88551e7531f4c6ba5df58caa362d2395aea12466dc19225e2e320dc893ef17d0b48e0dc7976d36a353a46bdffb616902
+MISC metadata.xml 504 BLAKE2B 9dbb7e8ce4c8524166a60e799e67d972a60297d48aeaaa572797303f23b599168a7d9fa061550287694c0243562ab4139aa48674704e65a5ac50339bfffbb0ba SHA512 bb42c3ff3e4b1ba3b3bc70b2f1d719c3ade733d2f4c8e90d98e20d2fd716a633b22e3a4212a29c56291e7fe6c475f0e540f37454302bc279342bbec95fbd320f
diff --git a/dev-libs/inih/inih-51.ebuild b/dev-libs/inih/inih-51.ebuild
new file mode 100644
index 000000000000..3cbd85dd6604
--- /dev/null
+++ b/dev-libs/inih/inih-51.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit meson multilib-minimal ninja-utils
+
+DESCRIPTION="inih (INI not invented here) simple .INI file parser"
+HOMEPAGE="https://github.com/benhoyt/inih"
+
+SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+
+DOCS=(
+	LICENSE.txt
+	README.md
+)
+
+S="${WORKDIR}/inih-r${PV}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=shared
+		-Ddistro_install=true
+		-Dwith_INIReader=true
+	)
+
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/dev-libs/inih/metadata.xml b/dev-libs/inih/metadata.xml
new file mode 100644
index 000000000000..9aa6590570ff
--- /dev/null
+++ b/dev-libs/inih/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>hurikhan77+bgo@gmail.com</email>
+		<name>Kai Krakow</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/benhoyt/inih/issues</bugs-to>
+		<remote-id type="github">benhoyt/inih</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 24a80afc8d6d..d8bae99b4aa0 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,5 +1,5 @@
 DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb
 DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
 EBUILD jansson-2.12.ebuild 817 BLAKE2B e517e55debf4bd3971c2d93b906a1081baa510222deff3e2c8e09388e28af1891c3d0d43b6800abdbc33b6380bdf5627a8409f6da21d2356c146fb6c2155427f SHA512 500d974d2708280e1ae4a157e39034bab3b73ba56e4aad3ed7ed6e9942165b31500fb92fafcf0b94328fa863ef2c01308069fa1f6f13cb32dcd6287913fc3b2e
-EBUILD jansson-2.13.1.ebuild 898 BLAKE2B 6fcf7ab07434b15e1c319084e58a2008e01edbf2e7ae9583c9591a5620404b31359e2e4c4a55032e0ed854b3688babe829d4912245a183aa3a28118580b4f979 SHA512 963d872a5a70c41a06c07bb5ba6542dfdd41ba806638a82ad546ae3dc5d2f905f5edbc3c6a468ba4b9b2dde65f97aeb37951e7ea99461fb8b54b62746dba4678
+EBUILD jansson-2.13.1.ebuild 896 BLAKE2B 3692dfe2b23f2d67914061e0a5a59df63cb6799dadfd6235c02fce77b2f831c98aff1d6b6ccfa1899d2c3794d0e1de5194c87352242587030cb759febe937e28 SHA512 daea0277d404311fb46c0141752ebccb511bc3e052efa3047352cdf0fca26e79e01fe39313e5c37610b013b42f8ec65a49db2a5e6067b4f09d4f782ee5d84520
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.13.1.ebuild b/dev-libs/jansson/jansson-2.13.1.ebuild
index d2941ff336ab..830692135c98 100644
--- a/dev-libs/jansson/jansson-2.13.1.ebuild
+++ b/dev-libs/jansson/jansson-2.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="doc static-libs"
 
 # dev-libs/jansson-2.13.1[doc]: fails to build with >=sphinx-3.0, #731668
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index b27e3ac512bd..0306e0067ae7 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,3 +1,5 @@
 DIST jsoncpp-1.9.3.tar.gz 212922 BLAKE2B 6f89762e899ffe127705a30c1fe86f458d62fa05b8dbde6c465c73b6855d3945f3d739ff0c26e1a6326a211c946277908684ace9363df72ba0f460f66b3e3fd8 SHA512 f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
+DIST jsoncpp-1.9.4.tar.gz 214057 BLAKE2B 9a8c52e5d0b78f1593c93bc40f48d3789b031ba0da519c99cce17f1f6e104b24e0ffe88138c25da6dfa250586aeb9e98d00fbf74d9fb9309b29a6d4f17762263 SHA512 adfd4afbdf6b79bd37edcf0e248f07864994f1c4bcb7431f3b44102490ce467f72381908066655fa486dec12f467af0a11f42f859bbf719895974c7339db7d22
 EBUILD jsoncpp-1.9.3.ebuild 1026 BLAKE2B ba65cafacac63ce802717de8e05e95108371fb7489ff4bd4a29c4fe098ab8fb50fb559b7b284a6c402f42686ba3db2758d62983f4c86d8f8b67c2ced72b15aa6 SHA512 9d6d9e5fd9e45605a5fe24c5f738c7e3bf7b5b2bdcbb67ad4ff4c2abddef1abfd54c2efe4fd2af0b9d431bd51e6379fa778633b64acbc926101f225d4ae4eee4
+EBUILD jsoncpp-1.9.4.ebuild 1035 BLAKE2B b287b5f7d5ed0d156ad9db401fb6252915783f86a273516b8f2c31938d1a19e29a6cd6ecd774ef50962878a745dbd71f1a2d26ccecd15b0fd3c1db652abf2cbb SHA512 b97101d3c16ed538fa01799c6f1d900b03dc10d5bdddc585b2f004571f61ca0756edcf531c5131bec32ebbf86664855fa2d97443436301c07b968de9a82162d5
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
new file mode 100644
index 000000000000..1d7f0a221b2b
--- /dev/null
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="C++ JSON reader and writer"
+HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
+SRC_URI="
+	https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="|| ( public-domain MIT )"
+SLOT="0/24"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_configure() {
+	local emesonargs=(
+		# Follow Debian, Ubuntu, Arch convention for headers location
+		# bug #452234
+		--includedir include/jsoncpp
+		-Dtests=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use doc; then
+		echo "${PV}" > version || die
+		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
+		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
+	fi
+}
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index ee91b0827073..29e30e30bca6 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -7,5 +7,5 @@ EBUILD libcbor-0.5.0.ebuild 1308 BLAKE2B 1024113bdbf7409c9e7e6644ca543edc3bb5835
 EBUILD libcbor-0.6.0-r1.ebuild 1303 BLAKE2B d7caa064bea8106579e3da3267cd64f6086d10509a38cf108b0e7faff386208afb72292f9d9847a539478ca64fa1a0328b1807b50194ab409da2a5276fd4a29c SHA512 3922e922e408f6f9adca1f704ee6a0800ee7657d06276b9b17477350850e1d1933638adf7bb534d39da6e1214ea24bab37aae0c793d0cd850aea76483373d1cd
 EBUILD libcbor-0.6.1.ebuild 1309 BLAKE2B edc2449e15d584345d162d18c21aefc832f8890cc42b2f95cea0891ed69377e16cc3ddc3697e0ecc4e8f38eaffb415d06c4c321f966638b2e87a58947bfbdb99 SHA512 4d8abc7dea8dafe9d6249ccd98578d989078d1bfa46b3932b8ce7b42f51e053134678742814725e435f63d516fe9344ec5c77d843d944809f2f2ba54680211eb
 EBUILD libcbor-0.7.0.ebuild 1351 BLAKE2B 7744c2f1ce576b2de409979f5292411163d881e73217f09c9415310e69303aff380b58d97538dd4ba7259c3eeafee23c0efca26d32130d47d4bc12ab111f15ea SHA512 ebc838adb4ec17b9620a8b6011336dacac5af031fcaac37db3c9c7e55d3ae52d7d68700327d196a078a77ad63df31d1ea752779bd17c89b043eccd5ae28d0e4e
-EBUILD libcbor-0.8.0.ebuild 1360 BLAKE2B 20e3b784dfea24416c2d462917488f55b1ed0c813100c9f0366325b64fa22b501f7ab08d8577af1888bc494162cec18917ab1639dae7c908a4229bdeaaf9a27f SHA512 3c8721b654c33a57a0a06454e46c58b021698c0a648374a2dcd20743cb1751484717d300fa3c7f3e938ffad1624b8642b2ceca3e4a7c84c6c3e55d8aab59df4a
+EBUILD libcbor-0.8.0.ebuild 1366 BLAKE2B e36e0ef84fd7e39f84d9c42cedcf3fa03e68e956ee03264b1f857678a31fe9e20c4c5f769dac4d1b213fb37093a767ffe740acc2f381d17e1a6fdaa22b65e1e6 SHA512 25baff256e22ec98a614fa40a116367e8593febe8036f23363fabf7ca8793c4644413549a8b4f55b4527639ab23c584e55e6dadef90442bb711218dcb17ea811
 MISC metadata.xml 353 BLAKE2B ac88c66fa58046797dba48cfe47fc42a3aaf8d8a256fab563def54d126c7ad903bc2d47095ca7221b84f0fd59bcbb6677ffaef9062c9c662ef95b02bf3563b99 SHA512 56f76a4b80d8cf12f854022c2c7353119b11052bf6d454b5d2f6427a02ab64176d2d7ecfadecabafceac6b7aa5ec066145a62831d33f09a829b37cdb8bec64cf
diff --git a/dev-libs/libcbor/libcbor-0.8.0.ebuild b/dev-libs/libcbor/libcbor-0.8.0.ebuild
index 07dbf2319eae..6ddbb366f865 100644
--- a/dev-libs/libcbor/libcbor-0.8.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="+custom-alloc doc test"
 
 BDEPEND="
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 4884b0a3d975..da4aeb382362 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,9 +1,12 @@
+AUX libdnet-1.14-ndisc.patch 18209 BLAKE2B a295d81c247f884293efdf8d4740e2a4fd80c9febd8a5eed02db725151f886ad32e3a52ee7a62cabd31c0a218b23a9acf7d9c52b48c0d9aa597524886e38cfc4 SHA512 6da36c0f421b58819410df9507a973199fcafebb6447765c5de97fde6bdb16607f32dcb8b86da4216656c4d4ad4d21e153f15906a400249a7d44766d0539ecfb
+AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74cc17e173252227707bef616df827c0ce0d7a7e4349ebc442a9198ee8953c45739b03b306ddc2af2753e31a15ebbd SHA512 8cabaf75382537755d79b588b629978d47a4b8e7c4bda22d7098bba09b5b1fec8dabeacb1727a821df2d29040a3e420803ebfdc66df5824630fae8da1059d164
 DIST libdnet-1.12.ipv6-1.patch.gz 5124 BLAKE2B 674866a441a5907df97942772b1e4b95aee004ddb110204df0580cec6b6bb3ba4074831d83e675e1914f1a29281b02227e95016db6ce6a0e8b99417d1aa6aaab SHA512 fa2380e41548ecdd978722930ecf90dffabd15cf06cbae0e113285072fe98a066f1e686b6d79e2d8b9f8adcf29783f313d61933b9e1e74e71da8dc7d741f815a
 DIST libdnet-1.12.tar.gz 959945 BLAKE2B a19f8c83425861d02f832330cf0eb5bc317eec157737e0eacd48a7827d423c626b24ce833f66429c9f2a0018502cae5426d5cfc1019aed307d63e4fa6b3845c8 SHA512 a2410a98b76d4bccecf7bcb82ff0b6e9fb809b389f7fea938cc42d94e18622cc5f353d2de737121a1990d9e16e9db8cc2f82677c94f78cd03c9227e815eab9e0
 DIST libdnet-1.12.tgz 970125 BLAKE2B 74be00b6fe1c7848010a7044628a6ad8f4b2f2c4f9676066c15e02c7a8b613e26a5e7743df524869fee2eb7d93438bf346f772b8df199b8ec337279dd50d5d77 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
 EBUILD libdnet-1.12-r1.ebuild 1552 BLAKE2B 76c2f623188831fc9cbd7273ce90bb58eb2e35b19f9602a9ada16b533db237401f21bf2fc569a5a785f7d2e13057a78811a3a03d86ff1268237d3f9cc01cc38b SHA512 b8648b062ef377e0431210776add07d00dfd9647b801ad3b4a4d0a32cbdfa3a065706a66be71d137445887ba97d3588790b15b027a96e22596924bf7f01a8de5
 EBUILD libdnet-1.12.ebuild 1520 BLAKE2B ce48aaf6543ede9d1db165aee357c37447b1a75e48b23439ad2fb8b848edd003b6a1457b1407cbe6962759fc2ab20a1bf3f3ed9b70fa711b1ad28dad851f91b7 SHA512 7c7392c123fa430c97015eaf6d926a525791f0bcc51bda4c95cadc17267f52f99fd22d747b42060b9307324a601ec1d83b91399233991e87597f5bbc59038afd
-EBUILD libdnet-1.14.ebuild 1389 BLAKE2B 115af50d6c17df1bda7923c5468772f0f50ac9f5469ee9323382efd637d1da4d0507b5c8ef6d3621caf7fae00c8c5cbaadf0f35d48062aa3d0c8b88542a6ef12 SHA512 730d4fc6bb732a7f2bb8e9e6039f64ce3f3e900d7dd34580fdd8c752338cad0296f950b771406e063e9ffe4a002e152a5e92cdace2547e97527a0bb86da4e128
-EBUILD libdnet-9999.ebuild 1304 BLAKE2B 42da11f210ae69feadac13950baa8194a817784c0c0e8bb31befc07f20bd842d81348b623137a4b8ca6b857cd45246e23d75db6a807e5710f70574cd4c61484a SHA512 9e432bb2bcee9baef6fbe8428da44455fb02e8e4b14fe3575194f2e1c1f9e5a38f8c57280350c1fc570f03753c5fe121a2e37580812d6e92af1a2e98cbf3513f
+EBUILD libdnet-1.14-r1.ebuild 1483 BLAKE2B 8958077ab8b4c04f6b56cbbb19af258d838e0e973728187b37e827b0e96e36a2a131aac66be1524ac4774d8e384067d1a643f9f8874dbccc5f21c201e9927409 SHA512 d44804937d5fdde9198045f6bd2af607819ab9e078270b90955a589c9d4becfa92e497a911e8cccd6f71bfa038a7aa42bdc2eb65d8fe29ade6e84f1d599fe74e
+EBUILD libdnet-1.14.ebuild 1438 BLAKE2B 26fea0961643486ddba314b80cc9844c262edcfecdfd17d5b31c7b6781b2322d032572a28282811064026874ee6a41cbe14d14397b11c6737ba099a48cc7b438 SHA512 cfebda19c0867bc45b3050e58f7ff113dfc88a6e4a360b82f03497f355b189b559bd62b2fce98c3d116d9b097d24585dd2fdfe03f85991f7866689d57690cab1
+EBUILD libdnet-9999.ebuild 1376 BLAKE2B 9b8e58f34258ff145a513a3758b458e69cf6dce876b9488648c81c75a5ea074044bdec2494b86f40ca1ee8f4738e4a294530e45d61f56b9b3b1037c118287f2f SHA512 8b59231e80d511ff5bb59bdb750daf2713379358889805625a81e06b3481b031586fa2cb4aa7d959a6e75960edb7a4628c9fc833f1d4814b643cc91d62a5637d
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/files/libdnet-1.14-ndisc.patch b/dev-libs/libdnet/files/libdnet-1.14-ndisc.patch
new file mode 100644
index 000000000000..439ffb7cb927
--- /dev/null
+++ b/dev-libs/libdnet/files/libdnet-1.14-ndisc.patch
@@ -0,0 +1,796 @@
+From 1c324828f4c6c64c9340f169bc059152dba1f998 Mon Sep 17 00:00:00 2001
+From: Stas Grabois <finpushack@gmail.com>
+Date: Sat, 5 Sep 2020 13:15:32 +0300
+Subject: [PATCH] IPv6 support
+
+---
+ configure                |  20 ++++
+ configure.ac             |   7 ++
+ include/dnet.h           |   1 +
+ include/dnet/Makefile.am |   2 +-
+ include/dnet/Makefile.in |   2 +-
+ include/dnet/ip6.h       |   3 +
+ include/dnet/ndisc.h     |  35 +++++++
+ include/dnet/route.h     |   3 +
+ src/Makefile.in          |   2 +-
+ src/intf.c               | 101 +++++++++++++-------
+ src/ip6.c                |  56 +++++++++++
+ src/ndisc-linux.c        | 197 +++++++++++++++++++++++++++++++++++++++
+ src/ndisc-none.c         |  55 +++++++++++
+ src/route-linux.c        |  95 ++++++++++++++++++-
+ 14 files changed, 541 insertions(+), 38 deletions(-)
+ create mode 100644 include/dnet/ndisc.h
+ create mode 100644 src/ndisc-linux.c
+ create mode 100644 src/ndisc-none.c
+
+--- a/configure
++++ b/configure
+@@ -22025,6 +22025,26 @@
+ 
+ fi
+ 
++if test "$ac_cv_dnet_linux_procfs" = yes ; then
++	case $LIBOBJS in
++    "ndisc-linux.$ac_objext"   | \
++  *" ndisc-linux.$ac_objext"   | \
++    "ndisc-linux.$ac_objext "* | \
++  *" ndisc-linux.$ac_objext "* ) ;;
++  *) LIBOBJS="$LIBOBJS ndisc-linux.$ac_objext" ;;
++esac
++
++else
++	case $LIBOBJS in
++    "ndisc-none.$ac_objext"   | \
++  *" ndisc-none.$ac_objext"   | \
++    "ndisc-none.$ac_objext "* | \
++  *" ndisc-none.$ac_objext "* ) ;;
++  *) LIBOBJS="$LIBOBJS ndisc-none.$ac_objext" ;;
++esac
++
++fi
++
+ if test "$ac_cv_header_linux_if_tun_h" = yes ; then
+ 	case $LIBOBJS in
+     "tun-linux.$ac_objext"   | \
+--- a/configure.ac
++++ b/configure.ac
+@@ -303,6 +303,13 @@
+ 	AC_LIBOBJ([route-none])
+ fi
+ 
++dnl Check for ndisc interface.
++if test "$ac_cv_dnet_linux_procfs" = yes ; then
++    AC_LIBOBJ([ndisc-linux])
++else
++    AC_LIBOBJ([ndisc-none])
++fi
++
+ dnl Check for tun interface.
+ if test "$ac_cv_header_linux_if_tun_h" = yes ; then
+ 	AC_LIBOBJ([tun-linux])
+--- a/include/dnet.h
++++ b/include/dnet.h
+@@ -16,6 +16,7 @@
+ #include <dnet/ip6.h>
+ #include <dnet/addr.h>
+ #include <dnet/arp.h>
++#include <dnet/ndisc.h>
+ #include <dnet/icmp.h>
+ #include <dnet/tcp.h>
+ #include <dnet/udp.h>
+--- a/include/dnet/Makefile.am
++++ b/include/dnet/Makefile.am
+@@ -5,4 +5,4 @@
+ dnetincludedir = $(includedir)/dnet
+ 
+ dnetinclude_HEADERS = addr.h arp.h blob.h eth.h fw.h icmp.h intf.h ip.h \
+-	ip6.h os.h rand.h route.h tcp.h tun.h udp.h sctp.h
++	ip6.h os.h rand.h route.h tcp.h tun.h udp.h sctp.h ndisc.h
+--- a/include/dnet/Makefile.in
++++ b/include/dnet/Makefile.in
+@@ -106,7 +106,7 @@
+ dnetincludedir = $(includedir)/dnet
+ 
+ dnetinclude_HEADERS = addr.h arp.h blob.h eth.h fw.h icmp.h intf.h ip.h \
+-	ip6.h os.h rand.h route.h tcp.h tun.h udp.h sctp.h
++	ip6.h os.h rand.h route.h tcp.h tun.h udp.h sctp.h ndisc.h
+ 
+ subdir = include/dnet
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+--- a/include/dnet/ip6.h
++++ b/include/dnet/ip6.h
+@@ -179,6 +179,9 @@
+ char	*ip6_ntoa(const ip6_addr_t *ip6);
+ #define	 ip6_aton ip6_pton
+ 
++ssize_t	 ip6_add_option(void *buf, size_t len,
++           int proto, const void *optbuf, size_t optlen);
++
+ void	 ip6_checksum(void *buf, size_t len);
+ __END_DECLS
+ 
+new file mode 100644
+--- a//dev/null
++++ b/include/dnet/ndisc.h
+@@ -0,0 +1,35 @@
++/*
++ * ndisc.c
++ *
++ * Kernel arp/ndisc table operations.
++ *
++ * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
++ *
++ */
++
++#ifndef DNET_NDISC_H
++#define DNET_NDISC_H
++
++/*
++ * NDISC cache entry
++ */
++struct ndisc_entry {
++    int    intf_index;
++	struct addr	ndisc_pa;			/* protocol address */
++	struct addr	ndisc_ha;			/* hardware address */
++};
++
++typedef struct ndisc_handle ndisc_t;
++
++typedef int (*ndisc_handler)(const struct ndisc_entry *entry, void *arg);
++
++__BEGIN_DECLS
++ndisc_t	*ndisc_open(void);
++int	 ndisc_add(ndisc_t *n, const struct ndisc_entry *entry);
++int	 ndisc_delete(ndisc_t *n, const struct ndisc_entry *entry);
++int	 ndisc_get(ndisc_t *n, struct ndisc_entry *entry);
++int	 ndisc_loop(ndisc_t *n, ndisc_handler callback, void *arg);
++ndisc_t	*ndisc_close(ndisc_t *r);
++__END_DECLS
++
++#endif /* DNET_NDISC_H */
+--- a/include/dnet/route.h
++++ b/include/dnet/route.h
+@@ -26,7 +26,10 @@
+ __BEGIN_DECLS
+ route_t	*route_open(void);
+ int	 route_add(route_t *r, const struct route_entry *entry);
++int	 route_add_dev(route_t *r, const struct route_entry *entry, const char* dev);
++int	 route6_add(route_t *r, const struct route_entry *entry, int intf_index);
+ int	 route_delete(route_t *r, const struct route_entry *entry);
++int	 route6_delete(route_t *r, const struct route_entry *entry, int intf_index);
+ int	 route_get(route_t *r, struct route_entry *entry);
+ int	 route_loop(route_t *r, route_handler callback, void *arg);
+ route_t	*route_close(route_t *r);
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -144,7 +144,7 @@
+ 	intf-win32.c intf.c ip-cooked.c ip-win32.c ip.c memcmp.c \
+ 	route-bsd.c route-hpux.c route-linux.c route-none.c \
+ 	route-win32.c strlcat.c strlcpy.c strsep.c tun-bsd.c \
+-	tun-linux.c tun-none.c tun-solaris.c
++	tun-linux.c tun-none.c tun-solaris.c ndisc-linux.c ndisc-none.c
+ SOURCES = $(libdnet_la_SOURCES)
+ 
+ all: all-am
+--- a/src/intf.c
++++ b/src/intf.c
+@@ -20,6 +20,9 @@
+ # define IP_MULTICAST
+ #endif
+ #include <net/if.h>
++#ifdef HAVE_NET_IF_DL_H
++# include <net/if_dl.h>
++#endif
+ #ifdef HAVE_NET_IF_VAR_H
+ # include <net/if_var.h>
+ #endif
+@@ -79,6 +82,21 @@
+ 	u_char		ifcbuf[4192];
+ };
+ 
++/* TODO: move to .h */
++union sockunion {
++#ifdef HAVE_NET_IF_DL_H
++       struct sockaddr_dl      sdl;
++#endif
++       struct sockaddr_in      sin;
++#ifdef HAVE_SOCKADDR_IN6
++       struct sockaddr_in6     sin6;
++#endif
++       struct sockaddr         sa;
++#ifdef AF_RAW
++       struct sockaddr_raw     sr;
++#endif
++};
++
+ static int
+ intf_flags_to_iff(u_short flags, int iff)
+ {
+@@ -129,14 +147,10 @@
+ 
+ 		setsockopt(intf->fd, SOL_SOCKET, SO_BROADCAST,
+ 						(const char *) &one, sizeof(one));
+-#ifdef SIOCGIFNETMASK_IN6
+ 		if ((intf->fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
+-#  ifdef EPROTONOSUPPORT
+ 			if (errno != EPROTONOSUPPORT)
+-#  endif
+ 				return (intf_close(intf));
+ 		}
+-#endif
+ 	}
+ 	return (intf);
+ }
+@@ -586,34 +600,50 @@
+ 	return (_intf_get_aliases(intf, entry));
+ }
+ 
++static int
++get_max_bits(const struct addr *a)
++{
++	if (a->addr_type == ADDR_TYPE_IP) {
++		return IP_ADDR_BITS;
++	} else if (a->addr_type == ADDR_TYPE_IP6) {
++		return IP6_ADDR_BITS;
++	} else {
++		return 0;
++	}
++}
++
+ static int
+ _match_intf_src(const struct intf_entry *entry, void *arg)
+ {
+-	int matched = 0;
+-	int cnt;
+ 	struct intf_entry *save = (struct intf_entry *)arg;
+-	
+-	if (entry->intf_addr.addr_type == ADDR_TYPE_IP &&
+-		entry->intf_addr.addr_ip == save->intf_addr.addr_ip) {
+-		matched = 1; 
+-	} else {
+-		for (cnt = 0; !matched && cnt < (int) entry->intf_alias_num; cnt++) {
+-			if (entry->intf_alias_addrs[cnt].addr_type != ADDR_TYPE_IP)
+-				continue;
+-			if (entry->intf_alias_addrs[cnt].addr_ip == save->intf_addr.addr_ip)
+-				matched = 1;
+-		}
++	int len = save->intf_len < entry->intf_len ? save->intf_len : entry->intf_len;
++	int i;
++
++	struct addr a, saved_addr;
++
++	saved_addr = save->intf_addr;
++	saved_addr.addr_bits = get_max_bits(&saved_addr);
++
++	a = entry->intf_addr;
++	a.addr_bits = get_max_bits(&a);
++
++	if (addr_cmp(&a, &saved_addr) == 0) {
++		memcpy(save, entry, len);
++		return 1;
+ 	}
+ 
+-	if (matched) {
+-		/* XXX - truncated result if entry is too small. */
+-		if (save->intf_len < entry->intf_len)
+-			memcpy(save, entry, save->intf_len);
+-		else
+-			memcpy(save, entry, entry->intf_len);
+-		return (1);
++	for (i = 0; i < (int)entry->intf_alias_num; i++) {
++		a = entry->intf_alias_addrs[i];
++		a.addr_bits = get_max_bits(&a);
++
++		if (addr_cmp(&a, &saved_addr) == 0) {
++			memcpy(save, entry, len);
++			save->intf_addr = entry->intf_alias_addrs[i];
++			return 1;
++		}
+ 	}
+-	return (0);
++
++	return 0;
+ }
+ 
+ int
+@@ -631,24 +661,27 @@
+ int
+ intf_get_dst(intf_t *intf, struct intf_entry *entry, struct addr *dst)
+ {
+-	struct sockaddr_in sin;
++	union sockunion sun;
+ 	socklen_t n;
+ 
+-	if (dst->addr_type != ADDR_TYPE_IP) {
++	int fd;
++
++	if (dst->addr_type != ADDR_TYPE_IP && dst->addr_type != ADDR_TYPE_IP6) {
+ 		errno = EINVAL;
+ 		return (-1);
+ 	}
+-	addr_ntos(dst, (struct sockaddr *)&sin);
+-	sin.sin_port = htons(666);
+-	
+-	if (connect(intf->fd, (struct sockaddr *)&sin, sizeof(sin)) < 0)
++	addr_ntos(dst, (struct sockaddr *)&sun);
++	sun.sin.sin_port = htons(666);
++
++	fd = dst->addr_type == ADDR_TYPE_IP6 ? intf->fd6 : intf->fd;
++	if (connect(fd, (struct sockaddr *)&sun, sizeof(sun)) < 0)
+ 		return (-1);
+ 	
+-	n = sizeof(sin);
+-	if (getsockname(intf->fd, (struct sockaddr *)&sin, &n) < 0)
++	n = sizeof(sun);
++	if (getsockname(fd, (struct sockaddr *)&sun, &n) < 0)
+ 		return (-1);
+ 	
+-	addr_ston((struct sockaddr *)&sin, &entry->intf_addr);
++	addr_ston((struct sockaddr *)&sun, &entry->intf_addr);
+ 	
+ 	if (intf_loop(intf, _match_intf_src, entry) != 1)
+ 		return (-1);
+--- a/src/ip6.c
++++ b/src/ip6.c
+@@ -9,6 +9,8 @@
+ #include "config.h"
+ 
+ #include "dnet.h"
++#include <string.h>
++#include <errno.h>
+ 
+ #define IP6_IS_EXT(n)	\
+ 	((n) == IP_PROTO_HOPOPTS || (n) == IP_PROTO_DSTOPTS || \
+@@ -70,3 +72,57 @@
+ 		}
+ 	}
+ }
++
++ssize_t
++ip6_add_option(void *buf, size_t len, int proto,
++    const void *optbuf, size_t optlen)
++{
++	struct ip6_hdr *ip6;
++	struct tcp_hdr *tcp = NULL;
++	u_char *p;
++	int hl, datalen, padlen;
++
++	if (proto != IP_PROTO_TCP) {
++		errno = EINVAL;
++		return (-1);
++	}
++
++	ip6 = (struct ip6_hdr *)buf;
++	p = (u_char *)buf + IP6_HDR_LEN;
++
++	tcp = (struct tcp_hdr *)p;
++	hl = tcp->th_off << 2;
++	p = (u_char *)tcp + hl;
++
++	datalen = ntohs(ip6->ip6_plen) + IP6_HDR_LEN - (p - (u_char *)buf);
++
++	/* Compute padding to next word boundary. */
++	if ((padlen = 4 - (optlen % 4)) == 4)
++		padlen = 0;
++
++	/* XXX - IP_HDR_LEN_MAX == TCP_HDR_LEN_MAX */
++	if (hl + optlen + padlen > IP_HDR_LEN_MAX ||
++	    ntohs(ip6->ip6_plen) + IP6_HDR_LEN + optlen + padlen > len) {
++		errno = EINVAL;
++		return (-1);
++	}
++
++	/* Shift any existing data. */
++	if (datalen) {
++		memmove(p + optlen + padlen, p, datalen);
++	}
++	/* XXX - IP_OPT_NOP == TCP_OPT_NOP */
++	if (padlen) {
++		memset(p, IP_OPT_NOP, padlen);
++		p += padlen;
++	}
++	memmove(p, optbuf, optlen);
++	p += optlen;
++	optlen += padlen;
++
++	tcp->th_off = (p - (u_char *)tcp) >> 2;
++
++	ip6->ip6_plen = htons(ntohs(ip6->ip6_plen) + optlen);
++
++	return (optlen);
++}
+new file mode 100644
+--- a//dev/null
++++ b/src/ndisc-linux.c
+@@ -0,0 +1,197 @@
++/*
++ * ndisc-linux.c
++ *
++ * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
++ *
++ */
++
++#include "config.h"
++
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <sys/socket.h>
++#include <sys/uio.h>
++
++#include <asm/types.h>
++#include <netinet/in.h>
++#include <linux/netlink.h>
++#include <linux/rtnetlink.h>
++
++#include <net/route.h>
++
++#include <ctype.h>
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++
++#include "dnet.h"
++
++struct ndisc_handle 
++{
++	int nlfd;
++	int seq;
++};
++
++ndisc_t *
++ndisc_open(void)
++{
++	struct sockaddr_nl snl;
++	ndisc_t *n;
++
++	if ((n = calloc(1, sizeof(*n))) != NULL) {
++		n->nlfd = -1;
++
++		if ((n->nlfd = socket(AF_NETLINK, SOCK_RAW,
++			 NETLINK_ROUTE)) < 0)
++			return (ndisc_close(n));
++		
++		memset(&snl, 0, sizeof(snl));
++		snl.nl_family = AF_NETLINK;
++		
++		if (bind(n->nlfd, (struct sockaddr *)&snl, sizeof(snl)) < 0)
++			return (ndisc_close(n));
++	}
++	return (n);
++}
++
++static int
++netlink_addattr(struct nlmsghdr *n, int type, const void *data, int data_len)
++{
++	int len = RTA_LENGTH(data_len);
++	struct rtattr *rta;
++
++	rta = (struct rtattr *)((uint8_t*)n + NLMSG_ALIGN(n->nlmsg_len));
++	rta->rta_type = type;
++	rta->rta_len = len;
++	memcpy(RTA_DATA(rta), data, data_len);
++	n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len);
++	return 0;
++}
++
++int
++ndisc_modify(ndisc_t *n, const struct ndisc_entry *entry, int type, int flags)
++{
++	struct nlmsghdr *nmsg;
++	struct ndmsg *ndm;
++	struct rtattr *rta;
++	struct sockaddr_nl snl;
++	struct iovec iov;
++	struct msghdr msg;
++	u_char buf[512];
++	int i, af, alen;
++
++	switch (entry->ndisc_pa.addr_type) {
++	case ADDR_TYPE_IP:
++		af = AF_INET;
++		alen = IP_ADDR_LEN;
++		break;
++	case ADDR_TYPE_IP6:
++		af = AF_INET6;
++		alen = IP6_ADDR_LEN;
++		break;
++	default:
++		errno = EINVAL;
++		return (-1);
++	}
++	memset(buf, 0, sizeof(buf));
++
++	nmsg = (struct nlmsghdr *)buf;
++	nmsg->nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg));
++	nmsg->nlmsg_flags = NLM_F_REQUEST | flags;
++	nmsg->nlmsg_type = type;
++	nmsg->nlmsg_seq = ++n->seq;
++
++	nmsg->nlmsg_flags |= NLM_F_ACK;
++
++	ndm = (struct ndmsg *)(nmsg + 1);
++	ndm->ndm_family = af;
++	ndm->ndm_state = NUD_PERMANENT; 
++	ndm->ndm_ifindex = entry->intf_index;
++	
++	netlink_addattr(nmsg, NDA_DST, &entry->ndisc_pa.addr_data8[0],
++			alen);
++
++	if (type == RTM_NEWNEIGH) {
++		netlink_addattr(nmsg, NDA_LLADDR, 
++				&entry->ndisc_ha.addr_data8[0], ETH_ADDR_LEN);
++	}
++
++	memset(&snl, 0, sizeof(snl));
++	snl.nl_family = AF_NETLINK;
++
++	iov.iov_base = nmsg;
++	iov.iov_len = nmsg->nlmsg_len;
++	
++	memset(&msg, 0, sizeof(msg));
++	msg.msg_name = &snl;
++	msg.msg_namelen = sizeof(snl);
++	msg.msg_iov = &iov;
++	msg.msg_iovlen = 1;
++	
++	if (sendmsg(n->nlfd, &msg, 0) < 0)
++		return (-1);
++
++	iov.iov_base = buf;
++	iov.iov_len = sizeof(buf);
++	
++	if ((i = recvmsg(n->nlfd, &msg, 0)) <= 0)
++		return (-1);
++
++	if (nmsg->nlmsg_len < (int)sizeof(*nmsg) || nmsg->nlmsg_len > i ||
++	    nmsg->nlmsg_seq != n->seq) {
++		errno = EINVAL;
++		return (-1);
++	}
++	if (nmsg->nlmsg_type == NLMSG_ERROR) {
++		struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(nmsg);
++		errno = -err->error;
++		if (errno == 0) {
++			return 0;
++		}
++
++		return (-1);
++	}
++
++	return (-1);
++}
++
++int
++ndisc_add(ndisc_t *n, const struct ndisc_entry *entry)
++{
++	return ndisc_modify(n, entry, RTM_NEWNEIGH, NLM_F_CREATE | NLM_F_EXCL);
++}
++
++int
++ndisc_delete(ndisc_t *n, const struct ndisc_entry *entry)
++{
++	return ndisc_modify(n, entry, RTM_DELNEIGH, 0);
++}
++
++int
++ndisc_get(ndisc_t *n, struct ndisc_entry *entry)
++{
++	/* TBD */
++	errno = ENOSYS;
++	return (-1);
++}
++
++int
++nsidc_loop(ndisc_t *n, ndisc_handler callback, void *arg)
++{
++	/* TBD */
++	errno = ENOSYS;
++	return (-1);
++}
++
++ndisc_t *
++ndisc_close(ndisc_t *n)
++{
++	if (n != NULL) {
++		if (n->nlfd >= 0)
++			close(n->nlfd);
++		free(n);
++	}
++	return (NULL);
++}
+new file mode 100644
+--- a//dev/null
++++ b/src/ndisc-none.c
+@@ -0,0 +1,55 @@
++/*
++ * ndisc-linux.c
++ *
++ * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
++ *
++ */
++
++#include "config.h"
++
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++#include "dnet.h"
++
++ndisc_t *
++ndisc_open(void)
++{
++	errno = ENOSYS;
++	return (NULL);
++}
++
++int
++ndisc_add(ndisc_t *n, const struct ndisc_entry *entry)
++{
++	errno = ENOSYS;
++	return (-1);
++}
++
++int
++ndisc_delete(ndisc_t *n, const struct ndisc_entry *entry)
++{
++	errno = ENOSYS;
++	return (-1);
++}
++
++int
++ndisc_get(ndisc_t *n, struct ndisc_entry *entry)
++{
++	errno = ENOSYS;
++	return (-1);
++}
++
++int
++nsidc_loop(ndisc_t *n, ndisc_handler callback, void *arg)
++{
++	errno = ENOSYS;
++	return (-1);
++}
++
++ndisc_t *
++ndisc_close(ndisc_t *n)
++{
++	return (NULL);
++}
+--- a/src/route-linux.c
++++ b/src/route-linux.c
+@@ -39,6 +39,7 @@
+ 
+ struct route_handle {
+ 	int	 fd;
++	int	 fd6;
+ 	int	 nlfd;
+ };
+ 
+@@ -49,10 +50,13 @@
+ 	route_t *r;
+ 
+ 	if ((r = calloc(1, sizeof(*r))) != NULL) {
+-		r->fd = r->nlfd = -1;
++		r->fd = r->fd6 = r->nlfd = -1;
+ 		
+ 		if ((r->fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+ 			return (route_close(r));
++
++		if ((r->fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
++			return (route_close(r));
+ 		
+ 		if ((r->nlfd = socket(AF_NETLINK, SOCK_RAW,
+ 			 NETLINK_ROUTE)) < 0)
+@@ -90,6 +94,67 @@
+ 	return (ioctl(r->fd, SIOCADDRT, &rt));
+ }
+ 
++int
++route_add_dev(route_t *r, const struct route_entry *entry, const char* dev)
++{
++	struct rtentry rt;
++	struct addr dst;
++
++	memset(&rt, 0, sizeof(rt));
++	rt.rt_flags = RTF_UP;
++	rt.rt_dev = (char*)dev;
++
++	if (ADDR_ISHOST(&entry->route_dst)) {
++		rt.rt_flags |= RTF_HOST;
++		memcpy(&dst, &entry->route_dst, sizeof(dst));
++	} else
++		addr_net(&entry->route_dst, &dst);
++
++	if (entry->route_gw.addr_ip != 0) {
++		rt.rt_flags |= RTF_GATEWAY;
++	}
++
++	if (addr_ntos(&dst, &rt.rt_dst) < 0 ||
++	    addr_ntos(&entry->route_gw, &rt.rt_gateway) < 0 ||
++	    addr_btos(entry->route_dst.addr_bits, &rt.rt_genmask) < 0)
++		return (-1);
++
++	int ret = (ioctl(r->fd, SIOCADDRT, &rt));
++	return ret;
++}
++
++int
++route6_add(route_t *r, const struct route_entry *entry, int intf_index)
++{
++	struct in6_rtmsg rt;
++	struct addr dst;
++
++	memset(&rt, 0, sizeof(rt));
++	rt.rtmsg_flags = RTF_UP;
++
++	if (ADDR_ISHOST(&entry->route_dst)) {
++		rt.rtmsg_flags |= RTF_HOST;
++		memcpy(&dst, &entry->route_dst, sizeof(dst));
++	} else {
++		addr_net(&entry->route_dst, &dst);
++	}
++
++	rt.rtmsg_dst_len = entry->route_dst.addr_bits;
++	rt.rtmsg_ifindex = intf_index;
++	rt.rtmsg_metric = 1;
++
++	memcpy(&rt.rtmsg_dst, &dst.addr_ip6, sizeof(rt.rtmsg_dst));
++
++	if (!IN6_IS_ADDR_UNSPECIFIED(&entry->route_gw.addr_ip6)) {
++		rt.rtmsg_flags |= RTF_GATEWAY;
++		memcpy(&rt.rtmsg_gateway, &entry->route_gw.addr_ip6,
++				sizeof(rt.rtmsg_gateway));
++	}
++
++	int ret = (ioctl(r->fd6, SIOCADDRT, &rt));
++	return ret;
++}
++
+ int
+ route_delete(route_t *r, const struct route_entry *entry)
+ {
+@@ -112,6 +177,32 @@
+ 	return (ioctl(r->fd, SIOCDELRT, &rt));
+ }
+ 
++int
++route6_delete(route_t *r, const struct route_entry *entry, int intf_index)
++{
++	struct in6_rtmsg rt;
++	struct addr dst;
++
++	memset(&rt, 0, sizeof(rt));
++	rt.rtmsg_flags = RTF_UP;
++
++	if (ADDR_ISHOST(&entry->route_dst)) {
++		rt.rtmsg_flags |= RTF_HOST;
++		memcpy(&dst, &entry->route_dst, sizeof(dst));
++	} else
++		addr_net(&entry->route_dst, &dst);
++
++	rt.rtmsg_dst_len = entry->route_dst.addr_bits;
++	rt.rtmsg_ifindex = intf_index;
++	rt.rtmsg_metric = 1;
++
++	memcpy(&rt.rtmsg_dst, &dst, sizeof(rt.rtmsg_dst));
++	memcpy(&rt.rtmsg_gateway, &entry->route_gw, sizeof(rt.rtmsg_gateway));
++
++	int ret = (ioctl(r->fd6, SIOCDELRT, &rt));
++	return ret;
++}
++
+ int
+ route_get(route_t *r, struct route_entry *entry)
+ {
+@@ -278,6 +369,8 @@
+ 	if (r != NULL) {
+ 		if (r->fd >= 0)
+ 			close(r->fd);
++		if (r->fd6 >= 0)
++			close(r->fd6);
+ 		if (r->nlfd >= 0)
+ 			close(r->nlfd);
+ 		free(r);
diff --git a/dev-libs/libdnet/files/libdnet-1.14-strlcpy.patch b/dev-libs/libdnet/files/libdnet-1.14-strlcpy.patch
new file mode 100644
index 000000000000..abc3a6b0f2d3
--- /dev/null
+++ b/dev-libs/libdnet/files/libdnet-1.14-strlcpy.patch
@@ -0,0 +1,10 @@
+--- a/python/dnet.c
++++ b/python/dnet.c
+@@ -22,6 +22,7 @@
+ #endif
+ __PYX_EXTERN_C double pow(double, double);
+ #include "dnet.h"
++#include "config.h"
+ 
+ 
+ typedef struct {const char *s; const void **p;} __Pyx_CApiTabEntry; /*proto*/
diff --git a/dev-libs/libdnet/libdnet-1.14-r1.ebuild b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
new file mode 100644
index 000000000000..a709c3f636c7
--- /dev/null
+++ b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+AT_M4DIR="config"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL=1
+inherit autotools distutils-r1
+
+DESCRIPTION="simplified, portable interface to several low-level networking routines"
+HOMEPAGE="https://github.com/ofalk/libdnet"
+SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
+LICENSE="LGPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="python static-libs test"
+
+DEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	${DEPEND}
+"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+DOCS=( README.md THANKS TODO )
+S=${WORKDIR}/${PN}-${P}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14-ndisc.patch
+	"${FILESDIR}"/${PN}-1.14-strlcpy.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's/libcheck.a/libcheck.so/g' \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		configure.ac || die
+	sed -i \
+		-e 's|-L$libdir ||g' \
+		dnet-config.in || die
+	sed -i \
+		-e '/^SUBDIRS/s|python||g' \
+		Makefile.am || die
+
+	eautoreconf
+
+	if use python; then
+		cd python
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_with python) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd python
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	if use python; then
+		cd python
+		unset DOCS
+		distutils-r1_src_install
+	fi
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libdnet/libdnet-1.14.ebuild b/dev-libs/libdnet/libdnet-1.14.ebuild
index d44d1d79a672..3c236abaf8f3 100644
--- a/dev-libs/libdnet/libdnet-1.14.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
 LICENSE="LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="python static-libs test"
 
 DEPEND="
@@ -26,6 +26,9 @@ RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 DOCS=( README.md THANKS TODO )
 S=${WORKDIR}/${PN}-${P}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14-strlcpy.patch
+)
 
 src_prepare() {
 	default
diff --git a/dev-libs/libdnet/libdnet-9999.ebuild b/dev-libs/libdnet/libdnet-9999.ebuild
index 3878f74646eb..c1471b35968c 100644
--- a/dev-libs/libdnet/libdnet-9999.ebuild
+++ b/dev-libs/libdnet/libdnet-9999.ebuild
@@ -10,6 +10,7 @@ inherit autotools distutils-r1 git-r3
 DESCRIPTION="simplified, portable interface to several low-level networking routines"
 HOMEPAGE="https://github.com/ofalk/libdnet"
 EGIT_REPO_URI="https://github.com/ofalk/libdnet"
+EGIT_BRANCH="devel"
 LICENSE="LGPL-2"
 
 SLOT="0"
@@ -25,6 +26,9 @@ RDEPEND="
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 DOCS=( README.md THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14-strlcpy.patch
+)
 
 src_prepare() {
 	default
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 8a5afb039b8b..dab235c0242c 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -7,5 +7,5 @@ DIST libfido2-1.4.0.tar.gz 391439 BLAKE2B d45ff3e1a5605c5ea4c5bddbe423bb69e6237e
 DIST libfido2-1.5.0.tar.gz 407259 BLAKE2B 23a04f9230c45652aa1ac9fd8b3e809096ae31699c65ca0fda27b27b1b47263e375bb99e5b1ebc515b9edfb801bb2fba9c4f50d88e755efe3eaa23463ca01946 SHA512 240e2368e43846fddf5e98bbcc247468833565bcde4ec27976b88c814d787f1a477241a82b064818aa0eb0a98ff46a65d80b8243f4d0bbd763270e42492354e2
 EBUILD libfido2-1.3.1.ebuild 926 BLAKE2B c5f312bba979b24d41a7c62efb6404974e1fffdce9f83dee419ced2afdc98c8039b477eba994c6205d4b25826eb7b048d2f6489bacae158d5261d20485eca663 SHA512 0d108575faaf6af6adb53812b72dc2479068f7be72bded5564dd2f54a6545e7ceed12bbe7fae70530e49c8fd7c5e4f346e6cc3eee1e2406cc580a49eff23e4c4
 EBUILD libfido2-1.4.0.ebuild 913 BLAKE2B 98fc338e47d6eec425b9a0dc28e66d811bf6502f831170a179a2a0d69067fde8af24b9906e4906c2421f72f5bee1429e6932573ff2c59febb84dd72ca323e256 SHA512 987c094d3bdaf4d88728f083c4485c47e2fb5e4162f27fa21503f44c224b72ca42b45ff6236130cca64e78c3161e64e81c16ad479be4142c7863046ec3fc664a
-EBUILD libfido2-1.5.0.ebuild 902 BLAKE2B b388afe810ecb1ff5077120e2750bd8f93f1efea5282ea4db36d85d8044a06c0c005f02205a0979bd2deb9bfc5736702a788514aecc8b4bfe0c2c5411ceae671 SHA512 3e065ce487c5d9709000689062ba3e90c42bb23bee28e980964b0553949c65283e1eb5c8620671d899fbf11e784336cad3b35b534e60bd43ffdc457c80123fb1
+EBUILD libfido2-1.5.0.ebuild 908 BLAKE2B 4d36147e57052d072309f7fc9946097f4d9d9fab38159cbdc749f0e1a9c5213deb644aa6470880f26561889300f2750f59b5c072fc69add130fc3db86ca39c17 SHA512 a76cc636f87e87498bbc56326416bc4d7ee93a8f28885887a0af03bdd6266beaf70e44acbe12eefeec0a4e2ca3a455be4a4442e4f69b5f2bc7b684ff47eef087
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/dev-libs/libfido2/libfido2-1.5.0.ebuild b/dev-libs/libfido2/libfido2-1.5.0.ebuild
index 3615de97d12f..2005a19941db 100644
--- a/dev-libs/libfido2/libfido2-1.5.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="libressl +static-libs"
 
 DEPEND="
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index b5636fce9b9a..67f8f2d86e16 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,4 +1,6 @@
 AUX libmateweather-1.24.0-fix-tzdata-hints.patch 1101 BLAKE2B 484b389062d7f3d61085c3d937862dac48ca26c338fa21f72e0a189349834efe0bf5583fc6a54fc80d8514786d20a4130ca1b91331367d8762ffb3a241f31237 SHA512 97afd9cf53e35370b86b09d2414ca0b784d3b7e571d39873045f47b67f851a22be4181f8160007cc16f3037f8838868a4fd8f4dc4a06cb4ccdb403206f6e94d2
 DIST libmateweather-1.24.0.tar.xz 2233116 BLAKE2B 2b642af39e850d38d16f6a458568e43262007f2a1150db87371fca46f6db3f1b977a6cbad601ed182b8c0fdc9c5015e493ab60bc2c0e3485091e71992951cd72 SHA512 077a7cbcc75df0a64d9fab23d46154e58cf2455c8a2a17ecc04a8c691ead18b5027e177278a1d8e051ffb76e98bfd8e26ed5ca10ad974546e5446116a4f71300
+DIST libmateweather-1.24.1.tar.xz 2223880 BLAKE2B e9d86e66755760937e71b983adbd61a5d71a311b1550e7ed445e94d4f74efc4f5d4cf1af17558035c74a0c56b598cc7f464f4a011a873a2d00a26ad4c37c8209 SHA512 1e653a167b12593171bb3dcfae3a5e57b3f874b220c34ca4ad2e575da7df424ce8a71f88088f53ec53cf9614d40ecda48b088ef6bede680c0ce81dca35ee1156
 EBUILD libmateweather-1.24.0-r1.ebuild 1117 BLAKE2B dea76225a962e0f4629c92c737864dca79811059021eb91948ea4dbbe1a3ccd52e1a98398a087dcafe9cf2fd7364b8eeac85071a4ef6cdbd27f648cdb5d137d9 SHA512 f29017258f1e403cd6ad83a01f9781ec3e97755a2dd6241f5ebcf16e1bfe80494d326afa807e66a6a8c9dd472bb8d0c2e52e45ae7e89a3112228d20bb0deefbb
+EBUILD libmateweather-1.24.1.ebuild 864 BLAKE2B f3150774a7be4a0cea1b7a918e92a0f98cd09ba32c3610630d502d84d72b9a2626a9c2f8d78d791435e3eba56d8672e640a28e472dd9d392677184a390bddaa8 SHA512 e4d8312b027e6c0bba32589ca62f359b0b1e5e8a8a9bb2e651cecdc1344fd4a8987d6257d17eee38415dd18d4f6ae954cd5c7cf44d635907f053bcf50020e0fc
 MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a
diff --git a/dev-libs/libmateweather/libmateweather-1.24.1.ebuild b/dev-libs/libmateweather/libmateweather-1.24.1.ebuild
new file mode 100644
index 000000000000..a5ee3530e693
--- /dev/null
+++ b/dev-libs/libmateweather/libmateweather-1.24.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit eapi7-ver mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE library to access weather information from online services"
+LICENSE="LGPL-2.1+ GPL-2+"
+SLOT="0"
+
+IUSE="debug"
+
+COMMON_DEPEND=">=dev-libs/glib-2.50:2
+	>=dev-libs/libxml2-2.6:2
+	>=net-libs/libsoup-2.54:2.4
+	>=sys-libs/timezone-data-2010k:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2.6:2
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--enable-locations-compression \
+		--disable-all-translations-in-one-xml \
+		--disable-icon-update
+}
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 47f98f8ef18e..3eab5ef8d8dd 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -3,12 +3,10 @@ AUX libnl-1.1-vlan-header.patch 2378 BLAKE2B c6d72cb5c7437bc6600e2c34eb6f17fd22d
 AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86921f2372d200468206ab06cb391a3fce01998d7e4924fd6d235e9292bbbd6134dbc87aa3ebc3dafd16610b4a2a1 SHA512 fe625a9ac6ea8776c8f7ef3d7e3553651c0244e830883587bd7e86490e0ec6e8b29865e172a0e39947e213b910a4279202eabfdd5d7f08e835f5be91d4ff9d6b
 AUX libnl-99999999-2to3.patch 1082 BLAKE2B d3749aa9cf5fd7a2e255ebf6e7ab6c59c81da86fe419ef36b58a9fb14173a9944e7252e64c1a72ccbf9ca9a42f558642548e5247f900344df1bf2f2d54ebac86 SHA512 75796506b16e0953d7fb22d600b747eb48c900badacda665740302002ce112e1cbebd44061158e0557e829c3c16a06917d2acfdb2f450211834de14643112a66
 DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
-DIST libnl-3.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b1184e91b2bb45ba61a2e95355e7a3f5d0a74bdaf7ae003393a6c7556d5b201d0d0052dfc66042aa9e137986 SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
 EBUILD libnl-1.1.4-r1.ebuild 1151 BLAKE2B 4f0985dfaccfe22881176666c5d0c0226e36151bf38bec832a98e5efc2331dc8e1a299219586acbf64bc3b3f505bba1cdce99708f1fc265c6a950fb61cb03c6d SHA512 6b1a666cfe7c5c9c4ba11aa5be790afb8f912503e55578bbec683f0a8861be2c8854be40f3f83b53d071e42c3bc9616902d0202d59639912512236bb82d7a053
 EBUILD libnl-1.1.4.ebuild 1130 BLAKE2B f82bb5df7f1a038dbcd7fce4ba45647b7977b6afbaf72a607dfa1f45b2d4d3e7f922af597d03f5f6ede83c2b041228b723f1a8b1b629f6ea566cfb1c56cd433b SHA512 3e1b6edc66c242d55914af818ed8f6177282cbce83287d92deedc9a4f3273c3542e185137559bf3ae88dd9c399a2bcf6e38220e15b302c6be63c521617527e51
 EBUILD libnl-1.1.9999.ebuild 1055 BLAKE2B 89c39a6ec77da02bd2adf5aa55116bdd6a9c12771502bb5a7ae922ea58f6e6aa240e98332cc037d1320f30383488415e5edbc1ac45164382567c9160e70d6194 SHA512 c1648b9fd4003454d9bf54e5c5af1deb68eff4d048f450180675870cedb915f9e54350c6bba9649289e10aec654d2f2e8025e0fde72240394e9f2bed2e055738
-EBUILD libnl-3.4.0.ebuild 2374 BLAKE2B 244a5c7ab75393db34b8511ad0d694f89d5be5dd00c1cf9b3efdd2754f7d69029cd27df0cc1f1d76a7c19fe4e22cf8a807b39307842ccdb214be341773dedb97 SHA512 e475e155734081f30024553190903e2f158fbe7103508ccfcc1a2241dd3aa6758e56ca0414cf002def4e639795fabf847b512d413aa4fae7f6b64cc8f4b108ad
-EBUILD libnl-3.5.0.ebuild 2389 BLAKE2B 4cd9dff1baad8856ae702dc8d3763e7b06d69c2cf14a390ca575d11111eac147c5b6edfac9cc435b6b3b621e56c0a0bdf9cc75df3b7195ae952ad864f9326260 SHA512 26e792c2f23f116fe9ddcbd1fb1beee269fac03119f478f8b11487b467af7e74e1cb9c27bf2c7d16f6baae4a780c579d6b704340f837d21b1b9b95f236c9e19c
+EBUILD libnl-3.5.0.ebuild 2387 BLAKE2B 9ec0d860e1faae60b7820a2324725f208add864e8db8d3a6fbf4aab700bea990034926508b4d48cdb3b8743d0fea299f43e17157caeab3a30d4d6751249edba9 SHA512 c0f4debc883331a4f06b2f31cf36eed4cb85c9e8b6f72140773d61c5c3e0dd74ad93a8fada4d83f8c475e8b394ee3e13d9a94cbd6002398c93cbabecf3bdbed2
 EBUILD libnl-99999999.ebuild 2429 BLAKE2B 2eca6e27b7712ffd35e72df536ddf2740ef67f4af222d55f8db5fdcb4ac9046ff7545207869b71754d17e9302e0f3c8f59a61bb5f54ecd4d26bfb8319975a647 SHA512 72d03036db53aefcc25ff84ec27dc1f83f5f703f2f80196c45ab0d60a164f088c5a1bfe024404620739ae7b1e2270ee9b27db6ca8b4960f3b3eef73d7eb7f736
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
deleted file mode 100644
index fe516272f7f1..000000000000
--- a/dev-libs/libnl/libnl-3.4.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_OPTIONAL=1
-inherit distutils-r1 eutils libtool ltprune multilib multilib-minimal
-
-LIBNL_P=${P/_/-}
-LIBNL_DIR=${PV/_/}
-LIBNL_DIR=${LIBNL_DIR//./_}
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
-SRC_URI="
-	https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz
-"
-LICENSE="LGPL-2.1 utils? ( GPL-2 )"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+debug static-libs python +threads utils"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	sys-devel/bison
-	sys-devel/flex
-"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-DOCS=(
-	ChangeLog
-)
-
-S=${WORKDIR}/${LIBNL_P}
-
-MULTILIB_WRAPPED_HEADERS=(
-	# we do not install CLI stuff for non-native
-	/usr/include/libnl3/netlink/cli/addr.h
-	/usr/include/libnl3/netlink/cli/class.h
-	/usr/include/libnl3/netlink/cli/cls.h
-	/usr/include/libnl3/netlink/cli/ct.h
-	/usr/include/libnl3/netlink/cli/exp.h
-	/usr/include/libnl3/netlink/cli/link.h
-	/usr/include/libnl3/netlink/cli/neigh.h
-	/usr/include/libnl3/netlink/cli/qdisc.h
-	/usr/include/libnl3/netlink/cli/route.h
-	/usr/include/libnl3/netlink/cli/rule.h
-	/usr/include/libnl3/netlink/cli/tc.h
-	/usr/include/libnl3/netlink/cli/utils.h
-)
-
-src_prepare() {
-	default
-
-	elibtoolize
-
-	if use python; then
-		cd "${S}"/python || die
-		distutils-r1_src_prepare
-	fi
-
-	# out-of-source build broken
-	# https://github.com/thom311/libnl/pull/58
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(multilib_native_use_enable utils cli) \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable threads)
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		# Unset DOCS= since distutils-r1.eclass interferes
-		local DOCS=()
-		cd python || die
-		distutils-r1_src_install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index 61695c261d15..6a56b881381b 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+debug static-libs python +threads utils"
 
 RDEPEND="
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index f8cd7f829830..b80ddec063c0 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,5 +1,3 @@
-DIST libpqxx-6.4.5.tar.gz 715081 BLAKE2B 4f1356dc5fc9baddd8fdea6095541f4d90657ef0211edec7796ddd3693933b8d37d5bb14e19249a2e4627b85aef11c582b0ffac0226c8e99a70af1d2b0396e5c SHA512 b6f79c4af93876eaf859626c2deae3b23bd4fa1a438390bc01513ccc48b90565d59588f6977e7475bb7b8dbeb8b1c8ef2a4737d8eb4d15682531fbf78590ed5e
 DIST libpqxx-7.1.2.tar.gz 693152 BLAKE2B da28d0041fc345eb7774eadf0a886e2a89692ac47d870120991aa97328a6be7d10e8cb2d6deb9e056dc7e05b04fd317d9d0fe4dcf8eab901114b27cd64bf4ff6 SHA512 a4a76c62f6115f5898e4c4bb1c6f095284bdb7ae6a1efa45add9efd422d2a8280d1698caa2469acbb087168208ae0fd8efa36c8735a8ce30e58853e27acd4161
-EBUILD libpqxx-6.4.5.ebuild 2160 BLAKE2B 33eead22f70496238c3a6f8b090545558ce421d3d1fb4bf64ffbf7baa316f1788c41d54e59144531d7fd018c45c0ece349086601319105c0d8e422a003a2eba1 SHA512 e9c95b7fa3251f5806c402ae61893bb35f8269f14b1f02f3a89d3da408fddd0825d8ed1166ae1780c3fa5031a2e99743cf554ee81869abf2214c977314e1a08f
 EBUILD libpqxx-7.1.2.ebuild 2024 BLAKE2B 621549d79c7cc9da9dac463fa6be48af6a1d687ddc8368d0fa67fba5c2978a9cd036db4927cac5c64545020333b07c79206e1ff382fa43b7f7da890f0fcdac00 SHA512 15a9a65617d82b0e6d146eb0497ff669ed8d11bf86b5aa688f186ca93dd0d5cd6c734f99d3e786865dd71f8cf614b7908c87d21af0bfd978103a5dfe2e9aa2d7
 MISC metadata.xml 611 BLAKE2B 1960af3cc6dc4e15de110c38b2ca41ca94355054539cf28169de54c952726e96327ce21c82dcc0e439d997fd52a8deb825a9f6bc921e727636a9edb9a3ce176b SHA512 2cc8f173d0f1e390e212741307420722c6a8fa8b5afe60ff6a706d4cec17086c88e84ce5f3ed265a0d8d8699de8fffa83c10fb7e1e700370f1eef1d6c3ba4bd3
diff --git a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
deleted file mode 100644
index 6c4547472135..000000000000
--- a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1
-
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
-SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://pqxx.org/development/libpqxx/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND="dev-db/postgresql:="
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? (
-		app-doc/doxygen
-		app-text/xmlto
-	)
-"
-
-DOCS=( AUTHORS NEWS README{.md,-UPGRADE} )
-
-src_prepare() {
-	default
-
-	sed -e 's/python/python2/' \
-		-i tools/{splitconfig,template2mak.py} \
-		|| die "Couldn't fix Python shebangs"
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable doc documentation) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	einfo "The tests need a running PostgreSQL server and an existing database."
-	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
-	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
-	einfo "    ${EROOT}/etc/libpqxx_test_env"
-
-	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
-		if [[ -f ${EROOT}/etc/libpqxx_test_env ]] ; then
-			source "${EROOT}/etc/libpqxx_test_env"
-			[[ -n $PGDATABASE ]] && export PGDATABASE
-			[[ -n $PGHOST ]] && export PGHOST
-			[[ -n $PGPORT ]] && export PGPORT
-			[[ -n $PGUSER ]] && export PGUSER
-		fi
-	fi
-
-	if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
-		local server_version
-		server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
-		if [[ $? = 0 ]] ; then
-			cd "${S}/test" || die
-			emake check
-		else
-			eerror "Is the server running?"
-			eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
-			eerror "    Role: ${PGUSER}"
-			eerror "    Database: ${PGDATABASE}"
-			die "Couldn't connect to server."
-		fi
-	else
-		eerror "PGDATABASE and PGUSER must be set to perform tests."
-		eerror "Skipping tests."
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 05eba456d42d..040d750ea9e1 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -2,7 +2,7 @@ AUX libstrophe-0.9.2-libressl.patch 843 BLAKE2B f979127225535d271dafdb379d9e07bd
 DIST libstrophe-0.10.0.tar.gz 520645 BLAKE2B 85998ffa7d2051bf3372842a0bc6d5404932c41853609943ae0420760e0434a74b711bd5f23657f061f1227647247b1989833c54c11a88490fe7617459687818 SHA512 9d2e8f95ab5f9611529e18b0130322a196d4b59aae69c931a6d7dc462d4a6a4fa395d6fbca56d9f329fc943e3de005b570ea34629a504175f3f2ec91f85bf40a
 DIST libstrophe-0.9.2.tar.gz 500459 BLAKE2B 0b1f6f1daac1215bcdcbde0e54264b98f5a863de339500826f625f8c5e8143ce7200fb251d04248715e9a8b6621a4360e7ca2780bf4684d916ec13361b5f6fcc SHA512 a0129c49ca574afaefa77c412143571af2eb1100c7d737d497b65d44680d35e2404ee2d4d4e1378b06ac1bcc5c587f505f79fea9251af1cbb36afd990d48570d
 DIST libstrophe-0.9.3.tar.gz 502449 BLAKE2B 662b0c329b0bf7d7f34fc80bf0608b921fa1ad54c8277e88f23f3ed17d0892dc7e3d9bcaaa9707306801e9254bba4a127390025ab95e1d9d850c299a7b26d980 SHA512 9c8ba980f532c5576c2c5a9e3cdca9f833ec78debcb06b17e2f534de0e710ec416b997b0498be77a89fa7f57187456edb1d602993c695a5e738718ea593697a5
-EBUILD libstrophe-0.10.0.ebuild 939 BLAKE2B bf7d1b2bc28e0b84526a24b40421da03a4c1cf3a9921404dcf7c2944b7d29bf4d8956786f69d698fa85cccb7e7651418f63d76acc67d0464de662dbcaa0a271e SHA512 4bb5bced839555972d3b6cc73cb18eec6e1a86e3464e9c21a840c7f66e50c206e96511bc8db746e87998c8add26b707c44dfec896107c81504c8529ea8af5838
-EBUILD libstrophe-0.9.2.ebuild 997 BLAKE2B cccba2a7f657e6a37789e4f914e40c73205feb81929b0c6ee67dbe2c3009dacf2bd436dcfd0991726ed0e3fa687af65fd4af6f15718cc91c6e4ebe288ddbcd03 SHA512 a7bc876d1788aa24210548f8c92dd26648841db64eb672123d2684769110715dbc1b3c1b6601a34e1688bb83f0fd8b32287d19333c1018f275a5b50a458b4bf2
-EBUILD libstrophe-0.9.3.ebuild 939 BLAKE2B bf7d1b2bc28e0b84526a24b40421da03a4c1cf3a9921404dcf7c2944b7d29bf4d8956786f69d698fa85cccb7e7651418f63d76acc67d0464de662dbcaa0a271e SHA512 4bb5bced839555972d3b6cc73cb18eec6e1a86e3464e9c21a840c7f66e50c206e96511bc8db746e87998c8add26b707c44dfec896107c81504c8529ea8af5838
+EBUILD libstrophe-0.10.0.ebuild 1092 BLAKE2B 185281c223cd29f2d90dedfdfa18525be8ef017a170b8a78a3f151b4051bd2a8f00a452322b272c36f762efd99bab47da162ff33983ff1a59e5200fa5377534c SHA512 d4744a181fb65e52f7b3f2d549db4278a0dceb4e00723dd6590a02393df29e1740a468b5496cd7b7f6083f27201e08c06af3cdfc530625a98370b3df2df80035
+EBUILD libstrophe-0.9.2.ebuild 1150 BLAKE2B 307a9eb08191ad50f3c9c43d6b9ba6ad1f4ea695a9ca904355218f359a50cd4cb49d41c170b058d9aa898a2e9a37a00fa6b561928d522ee437e35ce2a15e93cf SHA512 00c14fb2236618196b874fc16ecaa8c58e12996f702c76db46ebaa179fc0920a989c3492657e85c0e54f4369acde9e1a3731df08d048bedc30dc390892a939f6
+EBUILD libstrophe-0.9.3.ebuild 1092 BLAKE2B 185281c223cd29f2d90dedfdfa18525be8ef017a170b8a78a3f151b4051bd2a8f00a452322b272c36f762efd99bab47da162ff33983ff1a59e5200fa5377534c SHA512 d4744a181fb65e52f7b3f2d549db4278a0dceb4e00723dd6590a02393df29e1740a468b5496cd7b7f6083f27201e08c06af3cdfc530625a98370b3df2df80035
 MISC metadata.xml 591 BLAKE2B 0706dfaeb6ebcf44525e7ecfe772c8496020da59ed5b3024775e41a79ec0ac5861d118e136d45187f819e70ac7e2bf360bf210d159167aeb1eccaa75747353fd SHA512 d05b0612eae08214749144fdca408ae9b630cd9763762fec74b46639d7faed460c2c4cc07e278453c637376e78aa50eafdf137a6143f7ded355358ffb292fd60
diff --git a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
index be09401f2e96..5757ff621942 100644
--- a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
@@ -43,3 +43,9 @@ src_install() {
 	use doc && dodoc -r examples
 	find "${D}" -name '*.la' -o -name '*.a' -delete || die
 }
+
+# Explicit src_test is there to document that the test suite is integrated and
+# is expected to pass. Please do not remove.
+src_test() {
+	emake check
+}
diff --git a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild b/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
index e370927cb139..c312bb04fe2b 100644
--- a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
@@ -44,3 +44,9 @@ src_install() {
 	use doc && dodoc -r examples
 	find "${D}" -name '*.la' -o -name '*.a' -delete || die
 }
+
+# Explicit src_test is there to document that the test suite is integrated and
+# is expected to pass. Please do not remove.
+src_test() {
+	emake check
+}
diff --git a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
index be09401f2e96..5757ff621942 100644
--- a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
@@ -43,3 +43,9 @@ src_install() {
 	use doc && dodoc -r examples
 	find "${D}" -name '*.la' -o -name '*.a' -delete || die
 }
+
+# Explicit src_test is there to document that the test suite is integrated and
+# is expected to pass. Please do not remove.
+src_test() {
+	emake check
+}
diff --git a/dev-libs/libugpio/Manifest b/dev-libs/libugpio/Manifest
index 83a60b6cf32d..1aa98eb5e2fa 100644
--- a/dev-libs/libugpio/Manifest
+++ b/dev-libs/libugpio/Manifest
@@ -1,5 +1,5 @@
 DIST libugpio-0.0.6.tar.bz2 252283 BLAKE2B ebdfae8ef400b3deb95e4313fd0ca2ad7b195945c850ce5c84904373bca2f2c9d446aec45b0500f549ab5319a294fbc2f0c37a6734fab69d8571389a0cb5fb63 SHA512 f40517d34509f9f3b5b26a5cb5523863034d48887ef3f26bd38a38e9aeac73e09ecf71099cd5a036e23fe3db5c8c2ead588c49022a398f2a426bc7148cc64ecd
 DIST libugpio-0.0.7.tar.bz2 300015 BLAKE2B 430a17651f3c443424694d50817e562ab3c682ae2006c14d2ca46ee3078993e85214a0ca0b9323d148ca3aedaa758985cf5e2e45527e1d1278d3a36c3648ecf9 SHA512 27f8b00b13b4865635fa26e9b14c7fe217ee005c316500f0f344268d82f8d2858def524bd5cee11e9cca9c2a534a50546d5fc3504ecd1f88bd96c6fbefe1586e
 EBUILD libugpio-0.0.6.ebuild 605 BLAKE2B 48b6c2faca3a050d2624321f70507e56926b428d2bc11445a21d9b5a076e2b5059945c02e9bcaa22814291010504c0eb1878026a1efc1d6590dc9c655916d9c4 SHA512 346a2fad0ef0f6c1db939989520a7e8c290aa2399fd1a68f100c4826298147068ed4a8de249a7e17aa6438420efcb3151ea9a1165c235aff578493e5e7f27640
-EBUILD libugpio-0.0.7.ebuild 609 BLAKE2B d9cb106ec206dce0efbdcd273eeb68fa16dcf1ce94154fe39981f58deb26eb2d96dd9d16c02e0482f0b3abf12217fe3b372dcdb24379b078e9c4da0793676cee SHA512 8aaf3a20064cf74d4c53a023e276c470f2e85d51d65f117fffd7e10184ab2ef85f76edff3130eb177c57d91bcb54343f701d160a249827aac118779bc6792566
+EBUILD libugpio-0.0.7.ebuild 607 BLAKE2B c06a1642dcfefbc37c1a9a8c5493fc9e437f7f1625e54d4cfc323a1aadf5a6662c64571759949573272114c49cdab7b8d4a573f8453d6f2955f3964667d2c964 SHA512 f4256423ad931dfdfeb91654c44853d544b12775dec0e29c0a44f03a3bd200f0f8b210d887b9561dd90c769a7002d301af743a9665261f4eaeaa8a3cdd81b218
 MISC metadata.xml 634 BLAKE2B 08bf2fa023595f3444926c7fca72af2d2a649ff2ac5b8372447f58113f4667ba4d85b46c0a872cef9ce76f4bd437b6c28a03e5c602c640de465a08ffe3718720 SHA512 946cb753670d9a2bb3c2cb4a35feb3e633e4d3d9a44584ff2e896544e11621aeb31630938d7e64d7d830e1e9fcf7edb4755dbda6fa502d624472e23227dd6d14
diff --git a/dev-libs/libugpio/libugpio-0.0.7.ebuild b/dev-libs/libugpio/libugpio-0.0.7.ebuild
index 9ce29b2cceda..39f1fe2de5e7 100644
--- a/dev-libs/libugpio/libugpio-0.0.7.ebuild
+++ b/dev-libs/libugpio/libugpio-0.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mhei/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 
 CONFIG_CHECK="~CONFIG_GPIO_SYSFS"
 
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 61697c7929e2..07edfa3fe6ea 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,4 +1,6 @@
 DIST libuv-1.39.0.tar.gz 1272565 BLAKE2B a5ca826f99f2b7fc1736463df3c455caf2b63c8915fba61edd7b418639040910dfab6e170a089da0c18cd928d3b80c586cd10be4c5331a924a37105328960ca5 SHA512 b6aca197cbfc96125321ff071f6b2f3e56e99f85db8db6e20601019eae08056b42330ea7a73aa8c9960d142a1c8209910bc33050527f6fe0afaa8f7ed9f54066
+DIST libuv-1.40.0.tar.gz 1274587 BLAKE2B 91d0e64a92be5686c0da3c4ad35fa52351012434a2a23db3fd91c26fc8e7b42d20d183a861feb876e2b5ab43e45ab59e720299f622a79c6bbdc6350b4b9e6e3d SHA512 14a6880e636e9d046e1f4c86061d7ca5fe0cdae0efb0c6fec6b6ad03b17c626da479d6cc1ae84da281ec04a75e0d56fa99ef25164432cdb246cf59f0964a7e8b
 EBUILD libuv-1.39.0.ebuild 1222 BLAKE2B 1ea452b11211781bfbb0fb7566f737208a9ceb288b41f613ee1c2189fca091127322bbfc1e4a8f71bd6e62527bff66bec218cdef398f31f0d0f05d69ceadc318 SHA512 5d9a665b8267f7cf058f6f3b3afe4de75e214973c7a9d8d9c0eecf062f60dfb30de805e4ab1ffff02238219e70ec7149ad554ec712a5a759503a0a9e9c6a49ec
+EBUILD libuv-1.40.0.ebuild 1231 BLAKE2B 07bbc6b09e38c9afb4fa929b74b636905c6e4eccaa14a594d68ff189f3523a4c5e1e0bc14c4244e21d95f49e8943a24d88ab9e818ee78ce0b3bff4f8b532ec2f SHA512 ec0b799dd24416c8b70112f745ac2604010f9f809d8dc385341aaf1ef825eecf111bfec1ab68372428a71e85b5973549bd5128ef6d256a8279b36d08a3343c37
 EBUILD libuv-9999.ebuild 1000 BLAKE2B 39cca04aa13e367adbbe3aaab32e0eb2edd1d7966b6f81ea5a8b7772fb6e590aebb06da9ede6782ce9e4806737251d970992f2c4d56726469b11815ed58ee3e4 SHA512 170a10be4f9b177894113114b28f3932836a943a29dfe8c2ea12213421ea96c0d66b65039fa3ad60a208a30786ead3faabeda532433e741bb6d8f7b44f9dc21e
 MISC metadata.xml 1392 BLAKE2B e4e8980feed751a6ddc0284d1bc0e56635707adad5ccedea3a78c9a22b0ef700f7554a62d7edc5a2d824dfd66036937e9056bd9db7cd302c5028469bbebbd3e9 SHA512 d2d709b7c1cfa4d83957365d62bf7fb95e1948129f499a907718228c067d871212c9b16f8272f000db92aad8eeb35505dd50a08357b8ae07dbbc9a4fe8534b3b
diff --git a/dev-libs/libuv/libuv-1.40.0.ebuild b/dev-libs/libuv/libuv-1.40.0.ebuild
new file mode 100644
index 000000000000..a9a8ca340c4c
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.40.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 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="https://github.com/libuv/libuv/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 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+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/libxml2/Manifest b/dev-libs/libxml2/Manifest
index c559b54615f6..46f232f217ec 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -10,7 +10,7 @@ DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f5
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.10-r1.ebuild 6815 BLAKE2B 1c4619b182be59bc8448deca9af64fcd8aed9b23120b4dcb25bf592b9f7957f5902d7bc24fda73874abb8b0f71f6d16662941d1b1096810ade59a46a995b4e88 SHA512 71af1ea794074a405e5e5e046263d1d3510e157b25cbe84cfb7c0463d0a71f5845ac54333905eb6ec4ace24f57b77f5acf97acb53cefc991a85c90ab710e7fa2
-EBUILD libxml2-2.9.10.ebuild 6816 BLAKE2B 7d1574df705961e96f314c4e64a05fff9930c01164ef006e28466ea57327558db7ab1bf698798a0182d0bd3c45e15314ad78515c1651b3dd53d14209162be6e5 SHA512 517edfdc130d70de52b825c37d3ca36ecc0a4b04ceca5e7bde251d823dcf53b43ce08fced4bf06a940395fcdefe2f9ff93d6c67ad813c9ad9a6228232df316cb
-EBUILD libxml2-2.9.9-r3.ebuild 6943 BLAKE2B cfc351f4626fb77dec2032e57385fe0800d8ea79c5a776efb31549b7d7a1af9822762ae463bf08982988d740e693eeb4139c117e4a8dcb0b71bdb7dd1d8c3574 SHA512 be36f698c42bffd8d153806bef4e2820e5f8f0245abe4c5547986fab64067d3282227dccf16d7d1e475572abb952b1f57f16a4a311e18071a31a1bf4d7fbd7b4
+EBUILD libxml2-2.9.10-r2.ebuild 6806 BLAKE2B 3b71125772ee4351c1c6870796cf204456f1f3d9b1d532e7f8625d6b77ca9e0f159d4d90907b08a33a9dba24eeabeb5843784d77d682360d66469bb2d0640e99 SHA512 ddd6ec3ccf0c0b6744b71e7c2906c86d05b721c7ad6c57266bfb9717bb96f612690b3270be675d684e60a6d12450040748bdfecb4b15c44e268726ab407eff2c
+EBUILD libxml2-2.9.10-r3.ebuild 6809 BLAKE2B 35bc0c4630c0f9ebd3c8da1b90b26eb33ab7388c62b95a7c2f4975d3d4932e654c6fca345cd79fb06acd347938bb4bdf1c9338bf4d0bd057f09022bc380fb3bb SHA512 509a4df958b37b040d4fc674311523f9c74dd310377a066ff9d094fa443b2c6ea6d318c77b674e9854f3c4661c5fbad6a01a38be3db82f36ee873bd4353b7083
+EBUILD libxml2-2.9.9-r4.ebuild 6933 BLAKE2B 49187c14be3109743739465ec89ca0bb01e6982d1dffcb8f68de2d55286c41262552abee8d01c774351f518f1eb723a84bcbc8a34e9eb76a70690b8153a83003 SHA512 5249bfd2def69de21b7b94b3134a7fd4102be75ede637c1df35d22b99dd362e83f7709e7adeb68b6009f7ad23e45a30143132e4af3f28047aaca7b549aa74b0b
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild
deleted file mode 100644
index a7e1eb4a9918..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PF}-patchset.tar.xz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	unpack ${PF}-patchset.tar.xz
-	cd "${S}" || die
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5)
-	eapply "${WORKDIR}"/patches
-
-	# Patches needed for prefix support
-	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-	# Fix build for Windows platform
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
-	# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	# Fix python detection, bug #567066
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
-	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-	# Fix python tests when building out of tree #565576
-	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Avoid final linking arguments for python modules
-		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
-		# gcc-apple doesn't grok -Wno-array-bounds
-		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
-	fi
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-#	epunt_cxx # if we don't eautoreconf
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure \
-			"--with-python=${EPYTHON}" \
-			"--with-python-install-dir=$(python_get_sitedir)"
-			# odd build system, also see bug #582130
-	}
-
-	libxml2_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	ln -s "${S}"/xmlconf || die
-	emake check
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}/etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r2.ebuild
new file mode 100644
index 000000000000..2993851ec4a0
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.10-r2.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="xml"
+
+inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
+
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 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"
+IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20080827.tar.gz"
+
+SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patchset.tar.xz
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+src_unpack() {
+	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${P/_rc/-rc}.tar.gz
+	unpack ${P}-patchset.tar.xz
+	cd "${S}" || die
+
+	if use test; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
+
+	# Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5)
+	eapply "${WORKDIR}"/patches
+
+	# Patches needed for prefix support
+	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
+
+	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+	# Fix build for Windows platform
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
+	# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
+
+	# Fix python detection, bug #567066
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
+	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+
+	# Fix python tests when building out of tree #565576
+	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Avoid final linking arguments for python modules
+		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
+		# gcc-apple doesn't grok -Wno-array-bounds
+		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
+	fi
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	# We now need to run eautoreconf at the end to prevent maintainer mode.
+#	elibtoolize
+#	epunt_cxx # if we don't eautoreconf
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# USE zlib support breaks gnome2
+	# (libgnomeprint for instance fails to compile with
+	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+
+	# --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-subdir=${PF}/html \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable ipv6) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	libxml2_py_configure() {
+		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
+		run_in_build_dir libxml2_configure \
+			"--with-python=${EPYTHON}" \
+			"--with-python-install-dir=$(python_get_sitedir)"
+			# odd build system, also see bug #582130
+	}
+
+	libxml2_configure --without-python # build python bindings separately
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxml2_py_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+	if multilib_is_native_abi && use python; then
+		local native_builddir=${BUILD_DIR}
+		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+	emake check
+	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxml2_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	# on windows, xmllint is installed by interix libxml2 in parent prefix.
+	# this is the version to use. the native winnt version does not support
+	# symlinks, which makes repoman fail if the portage tree is linked in
+	# from another location (which is my default). -- mduft
+	if [[ ${CHOST} == *-winnt* ]]; then
+		rm -rf "${ED}"/usr/bin/xmllint
+		rm -rf "${ED}"/usr/bin/xmlcatalog
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${P}
+	einstalldocs
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ "${ROOT}" != "/" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# we dont want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e ${CATALOG} ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+	emake "$@"
+	popd > /dev/null
+}
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild
new file mode 100644
index 000000000000..360bcffb2024
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="xml"
+
+inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
+
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20080827.tar.gz"
+
+SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-r1-patchset.tar.xz
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+src_unpack() {
+	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${P/_rc/-rc}.tar.gz
+	unpack ${P}-r1-patchset.tar.xz
+	cd "${S}" || die
+
+	if use test; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
+
+	# Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5)
+	eapply "${WORKDIR}"/patches
+
+	# Patches needed for prefix support
+	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
+
+	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+	# Fix build for Windows platform
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
+	# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
+
+	# Fix python detection, bug #567066
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
+	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+
+	# Fix python tests when building out of tree #565576
+	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Avoid final linking arguments for python modules
+		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
+		# gcc-apple doesn't grok -Wno-array-bounds
+		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
+	fi
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	# We now need to run eautoreconf at the end to prevent maintainer mode.
+#	elibtoolize
+#	epunt_cxx # if we don't eautoreconf
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# USE zlib support breaks gnome2
+	# (libgnomeprint for instance fails to compile with
+	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+
+	# --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-subdir=${PF}/html \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable ipv6) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	libxml2_py_configure() {
+		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
+		run_in_build_dir libxml2_configure \
+			"--with-python=${EPYTHON}" \
+			"--with-python-install-dir=$(python_get_sitedir)"
+			# odd build system, also see bug #582130
+	}
+
+	libxml2_configure --without-python # build python bindings separately
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxml2_py_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+	if multilib_is_native_abi && use python; then
+		local native_builddir=${BUILD_DIR}
+		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+	emake check
+	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxml2_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	# on windows, xmllint is installed by interix libxml2 in parent prefix.
+	# this is the version to use. the native winnt version does not support
+	# symlinks, which makes repoman fail if the portage tree is linked in
+	# from another location (which is my default). -- mduft
+	if [[ ${CHOST} == *-winnt* ]]; then
+		rm -rf "${ED}"/usr/bin/xmllint
+		rm -rf "${ED}"/usr/bin/xmlcatalog
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${P}
+	einstalldocs
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ "${ROOT}" != "/" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}/etc/xml/catalog"
+
+		# we dont want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e ${CATALOG} ]]; then
+			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+	emake "$@"
+	popd > /dev/null
+}
diff --git a/dev-libs/libxml2/libxml2-2.9.10.ebuild b/dev-libs/libxml2/libxml2-2.9.10.ebuild
deleted file mode 100644
index d0bf6aa7bf9d..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.10.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 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"
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patchset.tar.xz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	unpack ${P}-patchset.tar.xz
-	cd "${S}" || die
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5)
-	eapply "${WORKDIR}"/patches
-
-	# Patches needed for prefix support
-	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-	# Fix build for Windows platform
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
-	# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	# Fix python detection, bug #567066
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
-	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-	# Fix python tests when building out of tree #565576
-	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Avoid final linking arguments for python modules
-		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
-		# gcc-apple doesn't grok -Wno-array-bounds
-		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
-	fi
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-#	epunt_cxx # if we don't eautoreconf
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure \
-			"--with-python=${EPYTHON}" \
-			"--with-python-install-dir=$(python_get_sitedir)"
-			# odd build system, also see bug #582130
-	}
-
-	libxml2_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	ln -s "${S}"/xmlconf || die
-	emake check
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}/etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
deleted file mode 100644
index b226aa06cb99..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-RDEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P/_rc/-rc}.tar.gz
-	unpack ${P}-patchset.tar.xz
-	cd "${S}" || die
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5)
-	eapply "${WORKDIR}"/patches
-
-	# Patches needed for prefix support
-	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-	# Fix build for Windows platform
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
-	# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	# Fix python detection, bug #567066
-	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
-	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
-
-	# Fix python tests when building out of tree #565576
-	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
-
-	# Workaround python3 itstool potential problems, bug 701020
-	eapply "${FILESDIR}"/${PV}-python3-unicode-errors.patch
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Avoid final linking arguments for python modules
-		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
-		# gcc-apple doesn't grok -Wno-array-bounds
-		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
-	fi
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-#	epunt_cxx # if we don't eautoreconf
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --with-mem-debug causes unusual segmentation faults (bug #105120).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure \
-			"--with-python=${EPYTHON}" \
-			"--with-python-install-dir=$(python_get_sitedir)"
-			# odd build system, also see bug #582130
-	}
-
-	libxml2_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	ln -s "${S}"/xmlconf || die
-	emake check
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e ${CATALOG} ]]; then
-			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r4.ebuild
new file mode 100644
index 000000000000..6e250aac8ffe
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.9-r4.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
+
+DESCRIPTION="XML C parser and toolkit"
+HOMEPAGE="http://www.xmlsoft.org/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+XMLCONF_TARBALL="xmlts20080827.tar.gz"
+
+SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+	https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
+"
+
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+src_unpack() {
+	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${P/_rc/-rc}.tar.gz
+	unpack ${P}-patchset.tar.xz
+	cd "${S}" || die
+
+	if use test; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	default
+
+	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
+
+	# Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5)
+	eapply "${WORKDIR}"/patches
+
+	# Patches needed for prefix support
+	eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
+
+	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+	# Fix build for Windows platform
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760456
+	# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
+
+	# Fix python detection, bug #567066
+	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
+	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
+
+	# Fix python tests when building out of tree #565576
+	eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
+
+	# Workaround python3 itstool potential problems, bug 701020
+	eapply "${FILESDIR}"/${PV}-python3-unicode-errors.patch
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Avoid final linking arguments for python modules
+		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
+		# gcc-apple doesn't grok -Wno-array-bounds
+		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
+	fi
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	# We now need to run eautoreconf at the end to prevent maintainer mode.
+#	elibtoolize
+#	epunt_cxx # if we don't eautoreconf
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# USE zlib support breaks gnome2
+	# (libgnomeprint for instance fails to compile with
+	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+
+	# --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-subdir=${PF}/html \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable ipv6) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	libxml2_py_configure() {
+		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
+		run_in_build_dir libxml2_configure \
+			"--with-python=${EPYTHON}" \
+			"--with-python-install-dir=$(python_get_sitedir)"
+			# odd build system, also see bug #582130
+	}
+
+	libxml2_configure --without-python # build python bindings separately
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxml2_py_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+	if multilib_is_native_abi && use python; then
+		local native_builddir=${BUILD_DIR}
+		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+	emake check
+	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxml2_py_emake \
+			DESTDIR="${D}" \
+			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
+			exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
+			install
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	# on windows, xmllint is installed by interix libxml2 in parent prefix.
+	# this is the version to use. the native winnt version does not support
+	# symlinks, which makes repoman fail if the portage tree is linked in
+	# from another location (which is my default). -- mduft
+	if [[ ${CHOST} == *-winnt* ]]; then
+		rm -rf "${ED}"/usr/bin/xmllint
+		rm -rf "${ED}"/usr/bin/xmlcatalog
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${P}
+	einstalldocs
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [[ "${ROOT}" != "/" ]]; then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${EROOT}etc/xml/catalog"
+
+		# we dont want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [[ ! -e ${CATALOG} ]]; then
+			[[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+	emake "$@"
+	popd > /dev/null
+}
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 58485ca32f69..1bbc0d71fac0 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,5 +1,7 @@
 DIST libzia-4.21.tar.gz 631871 BLAKE2B 8c54ae86e38569914c05da6c11b8ffe2c349884fb4e8ea00b05b88da12f6ee4e80ddac82f1790b67586c24d9df5b0ab71053fc80479cfdde22250a034db6dbef SHA512 e4277dfc3c004a0a1d1ccd8a11431e46344763ff5df68403b451e2be4b6bd00862fe2af0e15ce9017c3d6144d301e792f9279632687697e0dd4a238c805b04a8
 DIST libzia-4.22.tar.gz 626973 BLAKE2B 6cc87ce5bb11824fc6fbaebbf1ab3c4728884d626c18455088e02d61f84d361f194d07567eed5408671e0c31c015e1fb1d9245294457e699a0342f8487778023 SHA512 1b04460e3706e13e7b6e680a1c58c72131a7f7436a40e9b74ddfd1119cb8507e509658081b9d2daa8eb085f101091a897f8ffec518d74d4409cbd07d999d2c40
+DIST libzia-4.23.tar.gz 627405 BLAKE2B 913173aca367dd660b8e04502e1198072e99e9ece5cd30ef2d4ad528292b3aba00799d89ee336bdf6a1cebf43118610caddfeeedccdd4b5af48bd54ac795066b SHA512 c34aff9b8a19713ea9881ea5a58a038fe7f0127c3503c845ecd6187ab07f90f7ae2727331e43b9cfb6b8db15d8dcbf80b2e1f4105bb4a34e9b30d9778d3a815b
 EBUILD libzia-4.21.ebuild 838 BLAKE2B ff1f384a87ddb0b798b03c8f04b83f86168b4e45755f12d979825d4ffcc234784cfcd52773ca37eefc6cd04885946d25bab069b542faf6ccbeca3dfbc3c512f9 SHA512 edc8c49c7186755c8dd25cc0d2958c27c26d9f607804fccdb3a85debb8bba4edc3f124ba044712273411909781a06072f301db8e121d2df08a5389df3d5ed6d5
 EBUILD libzia-4.22.ebuild 965 BLAKE2B 43c805e94e0a1a466a0c6bd427320f29130991ed079deff9a3fe3d0858db261e2a59550bb883ab6c6fda8f7542422abb3f473377b7fa3553e5bd0e1df35ecbdb SHA512 cf875842735ff957b9385fdfe0ac37ae50cd5196ac2c3d3f87c91f37ddd242ade6efc402e65884222e789ff2c08e3b44625f9613c36ccd7f2369214feec1bcc9
+EBUILD libzia-4.23.ebuild 965 BLAKE2B 43c805e94e0a1a466a0c6bd427320f29130991ed079deff9a3fe3d0858db261e2a59550bb883ab6c6fda8f7542422abb3f473377b7fa3553e5bd0e1df35ecbdb SHA512 cf875842735ff957b9385fdfe0ac37ae50cd5196ac2c3d3f87c91f37ddd242ade6efc402e65884222e789ff2c08e3b44625f9613c36ccd7f2369214feec1bcc9
 MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c
diff --git a/dev-libs/libzia/libzia-4.23.ebuild b/dev-libs/libzia/libzia-4.23.ebuild
new file mode 100644
index 000000000000..4977fe81e7dc
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.23.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:0 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 82750533cf7c..f53df10c9fa1 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,8 +1,5 @@
-AUX link-grammar-5.3.9-out-of-source-build.patch 2541 BLAKE2B 6b60a65bb39e628f8c555dce20410872a4dd56d27402e7bc939d49483053cf84199f3f5bab495c16f734b4b6662b467b0369cda4dc852a39568f27b68c0f14da SHA512 340a03c31ed94f53b00622bf7f925d8f47c658ec81843f0139deb5b38074f346ad4d65dc49653cccf1b7b49966c77029ab64e993d113e709e75ebb930448b8f6
 AUX link-grammar-5.8.0-dont-inject-O3.patch 621 BLAKE2B becccc08314e45416ee96ec52a5b03b3cf5b1fc141a427a774c7d2b816cff985abba54a99b8bc308e9e75759045b335380a186031d647cc8df00582669615ebd SHA512 71e05d722d24a4647af9f879c14d74d2875ee5435f1b70acb8f962f9e7e602e044e8ed98e118e3ad9ebf725a9701a302ca1e5ea75aa8662326f29251c1317138
 AUX link-grammar-5.8.0-out-of-source-build.patch 1189 BLAKE2B ba89966a0744b39f0f24fa3359a031041cae61f3ec26aaad42eb6e05cbc5c33e54f927c460b33f8d1d37b3987e149f1c88da1ebaab408d322954eefa755b38cb SHA512 e2f094f341bf943a57ce04f10f49a1aac8345ced88a63c54fdfceda946ab575ff088c597d61847d9a9bbebf10af9ad1c284239f29004fc7917deddcd79ddce69
-DIST link-grammar-5.3.11.tar.gz 3632617 BLAKE2B 07fe951743096a0d6b906c9b7174b58fcc54b0e2c54805d15731de783888327799fd77f64a2ae7f4e09327feb08d91cb95471e9c0c3c2fe00fca3553f40b1905 SHA512 09671d187deac3b9530dd63eb4497de9c2c9db32d79da06c677bdbccac015adef06813819692a92d15499c7cb347071c58b73c52505af154bdc8a8fcd409ddd2
 DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e
-EBUILD link-grammar-5.3.11.ebuild 3632 BLAKE2B d0e14eb500342a137661236b1c4ed9ab67623a854b994cabe70ed3c3cf6e15e6aa0035380461c99ae4cc665f0921e92bcb995c264dc4d2547a1bd37c5ffdeec6 SHA512 b0e9264782da3b7bfc6aea75870fc7c789591eca23c442f29051dec5f28e0b8d5100f971e6eba143be14dfb27d06042952b469af5f6337d3c89020eea3112d76
-EBUILD link-grammar-5.8.0.ebuild 3181 BLAKE2B 18941b1f0bd78512702cd4fb5cd213e1a93a4b911b341e8b1ab36fc7d5a14c935577bc2d07c12c38f56c5c9c539927c3793e00f51be95539b60a5741966883d5 SHA512 f6f44ee826cab91f012f18eb8a863955caf074ffe3fbf7b0d58211391f5d4b7ac651424083cdee342e26a7ea1ae9b8cc3f734fd7335ebc5610e799f91df0d91d
+EBUILD link-grammar-5.8.0.ebuild 3180 BLAKE2B e431e616920aeef3b86a82ded5ae20c72de2d74e63ee074d258cbf4340c4e9fec348375dfad2d513cb78f6f0f23ecf83ece841db6a76d469e3f0b1feb924dcb5 SHA512 8ac6a02816241df0be5c89fce69926b8daad1f8c321653efd737fd8efbc6abb3d10c4086eb086dfe0d54af5776ab7483e43d40c425402b16cd716bfcde821ce9
 MISC metadata.xml 963 BLAKE2B ebe0a68ad3a8fee0aa3d112f152e306d691b73e6969bf1fb7026edbdfb814fa1476c2e7d9e8ff9051e5920f9279acea871fab85da58ff8642ec819b5a4fbb57f SHA512 d53e9c7867629e8caf488cef531e258bb2cad3fcbe458e80024b0292fe90148656a77069c45f42e782ba473daafec5cf1fa93e9be00571ceefd21bf59b0ea5a2
diff --git a/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch b/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch
deleted file mode 100644
index 6eacc6610f90..000000000000
--- a/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/bindings/python/Makefile.am	2016-08-26 04:28:48.000000000 +0200
-+++ b/bindings/python/Makefile.am	2016-09-10 16:13:33.554781694 +0200
-@@ -4,9 +4,8 @@
- # Created by Linas Vepstas February 2014
- #
- 
--SWIG_SOURCES = ../swig/link_grammar.i
--# BUILT_C_SOURCES = $(top_builddir)/bindings/python/lg_python_wrap.cc
--BUILT_C_SOURCES = ../../bindings/python/lg_python_wrap.cc
-+SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i
-+BUILT_C_SOURCES = $(top_builddir)/bindings/python/lg_python_wrap.cc
- BUILT_PY_SOURCES = $(top_builddir)/bindings/python/clinkgrammar.py
- 
- # Over-ride the install location, so as to remove the dash in the
-@@ -20,7 +19,7 @@
- pkgpython_PYTHON =                                 \
--   linkgrammar.py                                  \
-+   $(srcdir)/linkgrammar.py                                  \
-    $(top_builddir)/bindings/python/__init__.py     \
--   $(top_builddir)/bindings/python/clinkgrammar.py
-+   $(BUILT_PY_SOURCES)
- 
- 
- # These are packaged in the tarball; make clean should not remove them.
---- a/bindings/python3/Makefile.am	2016-08-26 04:28:48.000000000 +0200
-+++ b/bindings/python3/Makefile.am	2016-09-11 01:30:35.700926275 +0200
-@@ -4,9 +4,8 @@
- # Created by Linas Vepstas February 2014
- #
- 
--SWIG_SOURCES = ../swig/link_grammar.i
--# BUILT_C_SOURCES = $(top_builddir)/bindings/python3/lg_python_wrap.cc
--BUILT_C_SOURCES = ../../bindings/python3/lg_python_wrap.cc
-+SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i
-+BUILT_C_SOURCES = $(top_builddir)/bindings/python3/lg_python_wrap.cc
- BUILT_PY_SOURCES = $(top_builddir)/bindings/python3/clinkgrammar.py
- 
- # Over-ride the install location, so as to remove the dash in the
-@@ -18,9 +17,9 @@
- 
- # Files that get installed in $pkgpythondir
- pkgpython3_PYTHON =                                 \
--   ../../bindings/python/linkgrammar.py             \
-+   $(top_srcdir)/bindings/python/linkgrammar.py     \
-    $(top_builddir)/bindings/python3/__init__.py     \
--   $(top_builddir)/bindings/python3/clinkgrammar.py
-+   $(BUILT_PY_SOURCES)
- 
- 
- # Apparently, anaconda does not work without this!?
---- a/bindings/python3/Makefile.am	2016-09-11 12:44:01.466971878 +0200
-+++ b/bindings/python3/Makefile.am	2016-09-11 12:44:22.385788941 +0200
-@@ -26,7 +26,7 @@
- # This seems wrong and lme to me, but see issue #298
- pkgpypathdir=$(pythondir)
- pkgpypath_PYTHON =                                 \
--   linkgrammar.pth
-+   $(srcdir)/linkgrammar.pth
- 
- # These are packaged in the tarball; make clean should not remove them.
- maintainer-clean-local:
diff --git a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild b/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
deleted file mode 100644
index ddab5316ca13..000000000000
--- a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils gnome2 java-pkg-opt-2 python-r1
-
-DESCRIPTION="A Syntactic English parser"
-HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
-SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="aspell +hunspell java python static-libs threads" # pcre
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# XXX: sqlite is automagic
-# Does not build with >=sci-mathematics/minisat-2, bug #593662
-# add pcre support: pcre? ( dev-libs/libpcre )
-RDEPEND="
-	dev-db/sqlite:3
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )
-	java? (
-		>=virtual/jdk-1.6:*
-		dev-java/ant-core )
-	python? ( ${PYTHON_DEPS} )
-	!sci-mathematics/minisat
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-
-NORMAL_BUILD_DIR="${WORKDIR}/${P}-normal"
-
-pkg_setup() {
-	if use aspell && use hunspell; then
-		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
-		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
-		ewarn "you want aspell support."
-	fi
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-
-	# http://bugzilla.abisource.com/show_bug.cgi?id=13806
-	eapply "${FILESDIR}"/${PN}-5.3.9-out-of-source-build.patch
-	eapply_user
-	eautoreconf
-
-	if use python ; then
-		prepare_python() {
-			mkdir -p "${BUILD_DIR}" || die
-		}
-		python_foreach_impl prepare_python
-	fi
-
-	mkdir -p "${NORMAL_BUILD_DIR}" || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		--disable-editline
-		--disable-perl-bindings
-		--enable-shared
-		--enable-sat-solver=bundled
-		$(use_enable aspell)
-		$(use_enable hunspell)
-		$(usex hunspell --with-hunspell-dictdir=/usr/share/myspell)
-		$(use_enable java java-bindings)
-		# $(use_enable pcre regex-tokenizer)
-		# $(use_with pcre)
-		$(use_enable static-libs static)
-		$(use_enable threads pthreads)
-	)
-
-	cd "${NORMAL_BUILD_DIR}" || die
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		--disable-python-bindings \
-		--disable-python3-bindings \
-		${myconf[@]}
-
-	if use python ; then
-		prepare_python() {
-			ECONF_SOURCE="${S}" gnome2_src_configure \
-				--disable-python-bindings \
-				--enable-python3-bindings \
-				${myconf[@]}
-		}
-		python_foreach_impl run_in_build_dir prepare_python
-	fi
-}
-
-src_compile() {
-	cd "${NORMAL_BUILD_DIR}" || die
-	gnome2_src_compile
-
-	if use python ; then
-		compile_binding() {
-			emake -C bindings/python3 \
-				VPATH="${S}:${NORMAL_BUILD_DIR}" \
-				_clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				_clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la
-		}
-		python_foreach_impl run_in_build_dir compile_binding
-	fi
-}
-
-src_test() {
-	cd "${NORMAL_BUILD_DIR}" || die
-	ln -s "${S}"/data tests/data || die
-	emake check
-}
-
-src_install() {
-	cd "${NORMAL_BUILD_DIR}" || die
-	gnome2_src_install
-
-	if use python ; then
-		install_binding() {
-			emake -C bindings/python3 \
-				VPATH="${S}:${NORMAL_BUILD_DIR}" \
-				_clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				_clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl run_in_build_dir install_binding
-	fi
-}
-
-pkg_preinst() {
-	use java && java-pkg-opt-2_pkg_preinst
-	gnome2_pkg_preinst
-}
diff --git a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
index 1ef3c88c3730..d37b96f28aa0 100644
--- a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="aspell +hunspell java python" # pcre
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index ca754112f9ea..fad529c7306a 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,5 +1,3 @@
-DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
 DIST mpc-1.2.0.tar.gz 840711 BLAKE2B 3609d299623a722ca90d4b04ff64becaaa399a5fa40fbc43a1d027692d8fbe6f4ebd24a3c8ea963963977952d130cd3993887da7b0b0c1613a27a24dd37e5831 SHA512 84fa3338f51d369111456a63ad040256a1beb70699e21e2a932c779aa1c3bd08b201412c1659ecbb58403ea0548faacc35996d94f88f0639549269b7563c61b7
-EBUILD mpc-1.1.0-r1.ebuild 911 BLAKE2B a4f737a415faf743345c5f01a63e97ee130b0bc01f4773c60688b64111886e365f61807b173fa5090474cc6d522c918655793e63668a05827ccad3f0f7ec6900 SHA512 9be5809d00f2c567c2ce0c422479825685aec708bd3bc1a12656bb0872de11e1695872fca17d0949a4b48e4e16cd6179371e682cf2564a98c9208e486f610f0d
 EBUILD mpc-1.2.0.ebuild 925 BLAKE2B e004095824d4c34af521daf27d5d991cf61471e7954f035136455b1210d9ab2cbdbf62512b4508285b3f95f2017007ceb4d773e00ce551c6f38c939d0ec9d420 SHA512 741a78c01d227fee1872eefe0438f37bd7d71c4893b69aaad4bc4726018cd358338a09350f9a6e4ad0d863bc282315fce2094dcd8ad126a3a85356f39253f7f3
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
deleted file mode 100644
index ccf53fd81003..000000000000
--- a/dev-libs/mpc/mpc-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
-HOMEPAGE="http://mpc.multiprecision.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
-IUSE="static-libs"
-
-DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/mpfr-3.0.0:0=[${MULTILIB_USEDEP},static-libs?]"
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 08c38a7f544e..0106be35c171 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -1,12 +1,5 @@
-AUX msgpack-1.0.0-cflags.patch 1189 BLAKE2B c62a041fce3efcb0d643e8a3e3529d5be5cf7d263a731a8d7d9a839ece6e56451be4e7bd27c4f7889a31f21b3003227d8208f94811316b7e650b31b59be526bb SHA512 7e6aa85e8850b7daf0c9ee741548bab7bfe9e62871c4f5388598c28819ed8efc14cb8e828a449369ba5f97b68d4257b246a017f5815ed7d8d5cfedc4a793be51
-AUX msgpack-1.0.0-static.patch 1324 BLAKE2B eb133b5bd2a344b5029dc1ed6a6ec1654e6f53531c8810e7ab83ae4f4c301e9104454a012a91fe89b52d321a932b55ae1177861a03a3fe3163cf51a9c1bfafc9 SHA512 a99cbca27fe4773711ad0220c75645d247fd1b4ed99baa41d5a952d65b316d2ea2e60182e8e1fafd6caa667ab0e6eaf110024f66337604effcdda2c9dd87d3f0
-AUX msgpack-1.1.0-gcc6.patch 900 BLAKE2B 770cce3486efe6b402a5d8a54c317cc31e603a34ece09bc10182e12d8970e34f06d03b94e744be5607ba9b09c5ae9873e0ead71eae87c761344bd041bbb4ecaf SHA512 be88e6f2119ded151af8334315c40027967603240158f0a1ab0aadbfdd0e8a04df13aecc9ed26135d6684a0f40f627727635c032722108bb4a63a68d8eed789b
-DIST msgpack-1.1.0.tar.gz 493551 BLAKE2B 3ee162fcba5ae61c7c69945a567ac4d39526e7941f42cc2ed55bc5885b823af84eea212c4e75e8e8583e8ea8a5e12f75e969409193c5e7273430e2e02d33a02c SHA512 6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd1111252b9861a1e373901
-DIST msgpack-3.1.1.tar.gz 495858 BLAKE2B a99b7edb2a6de80e018d5c4084ea199518e34045a6293c622c8690147ae353abdb63856eb031962a02ce20903d4443ec2b01a3c033e756c339f8674ff801d4c3 SHA512 cc634ef38b3844bf994159024441fe72d99055c42b0a4d81245b0629fd1f3147587eb36537cfb85e4cae2edc1dc23d7fa400022efa5a10dca295f9a6acd38346
 DIST msgpack-3.2.0.tar.gz 499188 BLAKE2B 6e5fd59a96ca726d3429b173b3db4c74163eaf6d314b289845237b6ace6208478dbbbb60397c630d515f6f6eed344b74f76225d1a4ca143b91ebb9b3a1369c14 SHA512 f3d011adfaa71b3c5d5f3eb43f0addbd461ae82b8ac22f367ddba7ef762d3bea500477501cf394d1770f0c47809bc363fc1088819ecfdfa668e93529885f4b88
-DIST msgpack-3.2.1.tar.gz 1234733 BLAKE2B 97fb6cab5125463f10e7ad2c55ee478b2bf3dab5628a40ce1b0bcdd96cc002f5c99e495592c91f1342e6623d32b5594536de226b0bf80e1cb5290dae9b0566dc SHA512 68d06b05a1f00a3d9d7d39313a9e11f42828606c39d9d4c07673a48c9b88028a6316f2a964881cc8e4d185616a037711f02a7d3cd6029eadbacf52145603538b
-EBUILD msgpack-1.1.0.ebuild 1055 BLAKE2B f50c69aa071803feb8fe923a4013555713f275c0efe59d6fb72664275a590b45f5b6c95e3514d8afb170c85f68ea9e3f5d9cebc6baa12b7ee3b02a09c80c3994 SHA512 39c31dd96a67f9c8e36b68c6c4f7392eb90305934696b47464eb2677323e0a59cbe1100d06d2e23455e75b8fb671f90d4a6347abb13b8c43f35608f185cd69ef
-EBUILD msgpack-3.1.1.ebuild 1717 BLAKE2B bf44d36d1b0c747d054699dfbc13b4d51badbc80575ec44769ea1f27459ec50fdcabc6b1b3c76273ee686fc843561ce6e02ba883c159ffcf48fecf21bfc24e32 SHA512 a1bab4c161c0493441413584d0eb8957b5d074809c5008d1084bb2da9c1bc9741bdd5562dacd461cc96f873a2181abdb5f209a0a8ee716752089e33cf2bb47cb
+DIST msgpack-3.3.0.tar.gz 508001 BLAKE2B 3017c44689f8afbf078b9c498449e21b4e3b87591c50a37bf9ae73869dab550819f24d6e5179a3600df297aa2c024e5a7fe1defcbab7c0f1aff826870de2ab32 SHA512 ad3e32edc8c6afd70282b3d4b493c2ffe74a697c41bd1f39030c5b4752cccefaa965bc049d4c2e63103a210bf714dc3bddd474691bc067d1475ae017593f55e6
 EBUILD msgpack-3.2.0.ebuild 1715 BLAKE2B 48a074fdc4f7e465d1339914853469eb240edecef610d6f4d81018bfd945601ad3891ac4e32e9fb9e36b4aa53052301546808519c5b54ca6ef65a72e66cc7f10 SHA512 7c1f10c53ab2f13a259bc43fc8e485f6d523b1bf9a9e21c36e367967d3f5e1fbc530cca28267e56ecff89fec41f3f3b918a6934da80da568f8182f3c644b21c8
-EBUILD msgpack-3.2.1.ebuild 1724 BLAKE2B 55a6691b776143a253cf727b382042c2ef67f9ecc1484981cffeab77ab85ccd7ee64e4e75bb397dd9ef150acde0b21c909630547d67728ffe9f897bfa493413e SHA512 e4e4e26d30aa7138ccdfcdb99cba3a281f12cb0db358eb79f5b30a967fe51290bbe80f8c254d12b15e5bd977d70838ceb34b7052713d1ee190287d131c935db0
+EBUILD msgpack-3.3.0.ebuild 1730 BLAKE2B d634a5064f4266b2b4d3be1625c1e9649b49105b63c658cfaa497c33482e69857bf982986bbc0aae1e4fdcb907e241965d2daa9ed21d8ec6ee3dff91d4a37959 SHA512 9b4d4947a34eefce90515841f676da14bc25213768e4c7226ca283f34adf979651581da9181b52082eb857d7235538de3dd2ac51ad16743574872cddd0bfa4e4
 MISC metadata.xml 409 BLAKE2B 7656515e9cbf76555dd77ba3350bfc3720d685f061aa2a4c9ef793c7d0eb0dcf327bd707f00a01b0d2be706ec79d62778cf7266998457a62f4291ccb1a5de194 SHA512 f56436ccd3ab6d2d5cf453e4eaeb8e3b79cd8d89a73c1c0ff17c2a47b1802641b20e41d75a12ea161f0a47e0236c84425a02cf8bb16e4b9d5b406fba4d2f1ec1
diff --git a/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch b/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch
deleted file mode 100644
index fc6cacd0a03c..000000000000
--- a/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- msgpack-1.0.0/CMakeLists.txt
-+++ msgpack-1.0.0/CMakeLists.txt
-@@ -213,10 +213,6 @@
-     ADD_SUBDIRECTORY (test)
- ENDIF ()
- 
--IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
--    SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3 -DPIC")
--    SET_PROPERTY (TARGET msgpack-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3" )
--ENDIF ()
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-     IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-         STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
---- msgpack-1.0.0/test/CMakeLists.txt
-+++ msgpack-1.0.0/test/CMakeLists.txt
-@@ -52,9 +52,6 @@
-         ${CMAKE_THREAD_LIBS_INIT}
-     )
-     ADD_TEST (${source_file_we} ${source_file_we})
--    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
--        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3")
--    ENDIF ()
-     IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-         IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-             STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
diff --git a/dev-libs/msgpack/files/msgpack-1.0.0-static.patch b/dev-libs/msgpack/files/msgpack-1.0.0-static.patch
deleted file mode 100644
index e40a9deaaece..000000000000
--- a/dev-libs/msgpack/files/msgpack-1.0.0-static.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- msgpack-1.0.0/CMakeLists.txt
-+++ msgpack-1.0.0/CMakeLists.txt
-@@ -17,6 +17,7 @@
- 
- OPTION (MSGPACK_CXX11 "Using c++11 compiler" OFF)
- OPTION (MSGPACK_32BIT "32bit compile" OFF)
-+OPTION (MSGPACK_STATIC "Build static library" ON)
- 
- IF (MSGPACK_CXX11)
-    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-@@ -196,12 +197,15 @@
-     ${msgpack_HEADERS}
- )
- 
--ADD_LIBRARY (msgpack-static STATIC
--    ${msgpack_SOURCES}
--    ${msgpack_HEADERS}
--)
-+IF (MSGPACK_STATIC)
-+    ADD_LIBRARY (msgpack-static STATIC
-+        ${msgpack_SOURCES}
-+        ${msgpack_HEADERS}
-+    )
-+    SET_TARGET_PROPERTIES (msgpack-static PROPERTIES OUTPUT_NAME "msgpack")
-+    INSTALL (TARGETS msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ENDIF ()
- 
--SET_TARGET_PROPERTIES (msgpack-static PROPERTIES OUTPUT_NAME "msgpack")
- SET_TARGET_PROPERTIES (msgpack PROPERTIES IMPORT_SUFFIX "_import.lib")
- SET_TARGET_PROPERTIES (msgpack PROPERTIES SOVERSION 3 VERSION 4.0.0)
- 
-@@ -233,7 +237,7 @@
-     SET(CMAKE_INSTALL_LIBDIR lib)
- ENDIF ()
- 
--INSTALL (TARGETS msgpack msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+INSTALL (TARGETS msgpack DESTINATION ${CMAKE_INSTALL_LIBDIR})
- INSTALL (DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
- INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- 
diff --git a/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch b/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch
deleted file mode 100644
index 2fc9bb46e4bf..000000000000
--- a/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Bug: https://bugs.gentoo.org/623492
-Backported from: https://github.com/msgpack/msgpack-c/commit/66a5fcf8f1a9e57b02904a6ac55a86a9c74ea1de
-
---- a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
-+++ b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
-@@ -46,13 +46,14 @@
-     public:
-         using base = std::tuple<Types...>;
- 
--        using base::base;
- 
--        tuple() = default;
-         tuple(tuple const&) = default;
-         tuple(tuple&&) = default;
- 
-         template<typename... OtherTypes>
-+        tuple(OtherTypes&&... other):base(std::forward<OtherTypes>(other)...) {}
-+
-+        template<typename... OtherTypes>
-         tuple(tuple<OtherTypes...> const& other):base(static_cast<std::tuple<OtherTypes...> const&>(other)) {}
-         template<typename... OtherTypes>
-         tuple(tuple<OtherTypes...> && other):base(static_cast<std::tuple<OtherTypes...> &&>(other)) {}
diff --git a/dev-libs/msgpack/msgpack-1.1.0.ebuild b/dev-libs/msgpack/msgpack-1.1.0.ebuild
deleted file mode 100644
index 934638604a4a..000000000000
--- a/dev-libs/msgpack/msgpack-1.1.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=6
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
-HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+cxx static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-cflags.patch
-	"${FILESDIR}"/${PN}-1.0.0-static.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMSGPACK_ENABLE_CXX=$(usex cxx)
-		-DMSGPACK_STATIC=$(usex static-libs)
-		-DMSGPACK_BUILD_TESTS=$(usex test)
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-libs/msgpack/msgpack-3.1.1.ebuild b/dev-libs/msgpack/msgpack-3.1.1.ebuild
deleted file mode 100644
index 9f05ddf33b7d..000000000000
--- a/dev-libs/msgpack/msgpack-3.1.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
-HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-
-LICENSE="Boost-1.0"
-SLOT="0/2"
-IUSE="boost +cxx doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-	doc? ( app-doc/doxygen[dot] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMSGPACK_BOOST="$(usex boost)"
-		-DMSGPACK_ENABLE_CXX="$(usex cxx)"
-		-DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
-		-DMSGPACK_BUILD_TESTS="$(usex test)"
-		# don't build the examples
-		-DMSGPACK_BUILD_EXAMPLES=OFF
-		# enable C++11 by default
-		-DMSGPACK_CXX11=ON
-	)
-	cmake-multilib_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make doxygen
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		if use doc; then
-			local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-			mkdir docs || die
-			mv doc_c/html docs/c || die
-
-			use cxx && mv doc_cpp/html docs/cpp || die
-		fi
-
-		if use examples; then
-			docinto examples
-
-			dodoc -r "${WORKDIR}/${P}/example/."
-
-			docompress -x /usr/share/doc/${PF}/examples
-		fi
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/msgpack/msgpack-3.2.1.ebuild b/dev-libs/msgpack/msgpack-3.2.1.ebuild
deleted file mode 100644
index a1129dcdc409..000000000000
--- a/dev-libs/msgpack/msgpack-3.2.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
-HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-
-LICENSE="Boost-1.0"
-SLOT="0/2"
-IUSE="boost +cxx doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-	doc? ( app-doc/doxygen[dot] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMSGPACK_BOOST="$(usex boost)"
-		-DMSGPACK_ENABLE_CXX="$(usex cxx)"
-		-DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
-		-DMSGPACK_BUILD_TESTS="$(usex test)"
-		# don't build the examples
-		-DMSGPACK_BUILD_EXAMPLES=OFF
-		# enable C++11 by default
-		-DMSGPACK_CXX11=ON
-	)
-	cmake-multilib_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make doxygen
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		if use doc; then
-			local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-			mkdir docs || die
-			mv doc_c/html docs/c || die
-
-			use cxx && mv doc_cpp/html docs/cpp || die
-		fi
-
-		if use examples; then
-			docinto examples
-
-			dodoc -r "${WORKDIR}/${P}/example/."
-
-			docompress -x /usr/share/doc/${PF}/examples
-		fi
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/msgpack/msgpack-3.3.0.ebuild b/dev-libs/msgpack/msgpack-3.3.0.ebuild
new file mode 100644
index 000000000000..c21dd416d641
--- /dev/null
+++ b/dev-libs/msgpack/msgpack-3.3.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
+HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
+
+LICENSE="Boost-1.0"
+SLOT="0/2"
+IUSE="boost +cxx doc examples static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
+RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DMSGPACK_BOOST="$(usex boost)"
+		-DMSGPACK_ENABLE_CXX="$(usex cxx)"
+		-DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
+		-DMSGPACK_BUILD_TESTS="$(usex test)"
+		# don't build the examples
+		-DMSGPACK_BUILD_EXAMPLES=OFF
+		# enable C++11 by default
+		-DMSGPACK_CXX11=ON
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	if multilib_is_native_abi && use doc; then
+		emake doxygen
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use doc; then
+			local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
+
+			mkdir docs || die
+			mv doc_c/html docs/c || die
+
+			use cxx && mv doc_cpp/html docs/cpp || die
+		fi
+
+		if use examples; then
+			docinto examples
+			dodoc -r "${WORKDIR}/${P}/example/."
+			docompress -x /usr/share/doc/${PF}/examples
+		fi
+	fi
+
+	cmake_src_install
+}
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index e1502489f6f6..98453a7506a3 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -3,7 +3,9 @@ AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84
 DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
 DIST opencl-clang-10.0.0.2.tar.gz 53935 BLAKE2B a0f1c1d8f9e4be24e63318daf38fc70a0372ee1dc5cb2443831b6bf64dd3d44ac3f52ca70de5f52dabab2b34a53d4efafd9c19598b471e6f3b855355c03cf4af SHA512 817cc7d977629e63b9d61bdf7ec8e93596f28102a321927507b035397c99e6e6eda1e5f36d0ed59c9949ba12baab32b138f5053a6bc84ba74211e199ddbf3109
 DIST opencl-clang-9.0.1.tar.gz 24574 BLAKE2B 2e3b69c10b572678f91e92fa0ca885dd9332d172c483c394f4c1b140a5fd926b26eff4d4ab722733e1e164ff99a6eb397b8bc9e30a0b7e289506432fd1291b2b SHA512 01c5011dc1ea66288f3e425f85c921142fd3bc5a3d79eeafe5c14b5741b8281f17727cbffa7ed31869f7704be957d2fed5e5e8a57ab31e7b8c3a9688f048cced
+EBUILD opencl-clang-10.0.0.1-r1.ebuild 1136 BLAKE2B d6f1bbe34d2af79dfd9aec8246ba785c0befd4da31948d86ef5bdc495e69b20fe3b9a1c3af3c0a535f90e782a7d02f51438bdb8f78b95f36e8976130b926259f SHA512 16f6191679ac3268e201b1d03c76473f1660bb9747dca49f6cbfa37826f8bb28150c2811294ab501d23aafc710ecf2040de67804d3ba1203711f04ec95da348e
 EBUILD opencl-clang-10.0.0.1.ebuild 977 BLAKE2B c999d6908707986a138485141b441eb95ca55d07e839bbd8d2b613ce846450f137aeb5bcaf2dd3e6c48f91202d70f0c7c640f8ad3a6e1c3c1cb043b1c41f32c9 SHA512 e484696df78c482232406c8fffae4e6af3d2c3b73a95ebc40b79608d3c67418f3adf241a91e2bebc2868722d62e3eb3fea56ea7a9e89ed91dc4199ef97761e6d
+EBUILD opencl-clang-10.0.0.2-r1.ebuild 1156 BLAKE2B 267d9b3b910ec6e141aaa7ae309eae9b50f5212f5d56084ae4c339f1df563839ac24292d199544e152fc0f39e12dab5e8c9268470ca36deb0fc98bdef381d84a SHA512 647d1edbd6d2a69ea16e5388c56e0b933c0c5dce741b028a1369a07398fc485bb30cf4836641bb23faf68f63c0196a11300499e65ad67a4ae00de20dd2a1bfb8
 EBUILD opencl-clang-10.0.0.2.ebuild 997 BLAKE2B 0dd9f22f085765e93f5652bcc2ee128950df801dc820a6c53a3cfc3dafe381afdf1985dd679b7484d12cacb8a2cfcec430d7b35be2338cffc6e94dd98243e80f SHA512 cb0a15b2a66830dfa2e45800b8a3e3430fa7edb32840efd51f7a1fe3c729376614c9e930d4fdcead87d38caaf2543ba718cc2d9f7b95cd5616266a78326f0ec6
 EBUILD opencl-clang-9.0.1.ebuild 869 BLAKE2B 4a19199ca6e9141ba8ecbfabe949d328aa54f51619aa8842f32cad1cd45d98ad2743a8b233db7b2e8bbe9f917bb4714656f2fcaa23772cec6b4eabd110316fca SHA512 2915ec087251d6ddcc3f24cd3fabfb03b8cdc05c99a62c1608e7d423ecc7521070ad1d56a993cde42edeba828e22c780ed8bcf21fbeb0e850a745ab2ff77a5a0
 MISC metadata.xml 329 BLAKE2B d50cf1fac225c2240bd4af19962089d9b7446549d9cc7067d860218e76013acfbc65f40abfffded01c098b06dd4c8a5688c94e40710ecdf6e7db71e05816498d SHA512 de4a3177f7091c00cd54f5eb52d8d88ae88d207ca72acd71c824220593d27ebdbf3673459ab48440373af19eb88603a5fcdd5956597d816927c9663be177eccb
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild
new file mode 100644
index 000000000000..362abf92b92f
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib llvm
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="10"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${MY_P}"
+
+# Force a rebuild of this package once clang has been updated from 10.0.0 to 10.0.1
+# in order to work around Bug #743992. Hopefully a one-time thing.
+DEPEND="~sys-devel/clang-10.0.1:10=[static-analyzer,${MULTILIB_USEDEP}]
+	sys-devel/llvm:10=[${MULTILIB_USEDEP}]
+	dev-util/spirv-llvm-translator:10=[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+LLVM_MAX_SLOT=10
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.2-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.2-r1.ebuild
new file mode 100644
index 000000000000..1c81dddfcdf5
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-10.0.0.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib llvm
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="10"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${MY_P}"
+
+# Force a rebuild of this package once clang has been updated from 10.0.0 to 10.0.1
+# in order to work around Bug #743992. Hopefully a one-time thing.
+DEPEND="~sys-devel/clang-10.0.1:10=[static-analyzer,${MULTILIB_USEDEP}]
+	sys-devel/llvm:10=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-llvm-translator-10.0.0_p20200909:10=[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+LLVM_MAX_SLOT=10
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index f46298843f24..b3f0895c592a 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -9,18 +9,13 @@ AUX protobuf-3.12.0-system_libraries.patch 6352 BLAKE2B 17f24c6cdcc845dada12424f
 AUX protobuf-3.13.0-disable_no-warning-test.patch 965 BLAKE2B e9a5eb9887ef2088ad0ce06375aedb36deeed3cd60a557e1d9972609fa5d5faa8e04c4d758a6ff0916f2a9d4c1b886a7197ded35501fbdf712ea985d442f8b43 SHA512 536b968f9a95d19236d034be3194b6d750dcb5619677817aaa5191a70370a646e4ad475a89592b6e96c44fc1ae380e782483afe4263617d7e03af2d5b06731fe
 AUX protobuf-3.13.0-protoc_input_output_files.patch 10321 BLAKE2B 3973d819c43f30d81d162b0ff167582f2983ca2752b33315e7f0b462068d437b8fe7b6faac9d3dd96f17740919ed51b19837e75b96791d765f347415ae893fcb SHA512 5812e471f83ec368886e2682f84ff5c92ad6b2a897e1cba3a1b8fbf291c0349d411ac06bc013d514fdc42eb40559f6d78bcebbe5826ab1efcbb1f851db1b74e5
 AUX protobuf-3.13.0-system_libraries.patch 6352 BLAKE2B a615d54449fe8bad5d9c7f0b4f03c0ded27c3fc4dc7d0fd6fc78874e65096731a5436a2569396ccd13c5f185bf73823eb70274e71c1bc35cccc820a2318ace5c SHA512 4a2f0fdd2512c8e8abd108bfb986d788153c2ccd761318fe05aef49f268814f2f6f35350bf2fadaafe3e5250521739cc5660f0106437f75831a8704fa755f817
-AUX protobuf-3.8.0-disable_no-warning-test.patch 965 BLAKE2B 0183ed17104e192fbd9efb4739a41ec2d6f39e31cf6aacb141f4e5015335096321491d68748613ef18eacdc57437b111a15b5b4762b0b339c716b98dc1b7041d SHA512 37846745f1e88fda8dc84a829e266e8f8d2c98a075750b2e548fa2b8f34a97d37b6b5200e880fc29a9682fb95a8c75567b53bca532859068a7b379540940067a
-AUX protobuf-3.8.0-protoc_input_output_files.patch 10351 BLAKE2B 54115688e2fb6a7b8c33cd2efb4dddd777f4d536f4b078badb60d6e458766b69c915fe4091f4ca379eee59d75875bcab9837a96bc461b6a60c15b93000fa7e38 SHA512 2e18b47aa82a035a76c45d6f80de7818449f6358e0e253cb6330158bf9d5b213052b372797189246eaeebea8497b289e8a0de16441f25bcae81ab807733bcf60
-AUX protobuf-3.8.0-system_libraries.patch 6352 BLAKE2B fde8a49ac3034320d9ae03479127946b1b50a0fe64d388132a129d8cd0a5cb6eb82565e82089fd1dada83848ef494fa87eac8dec4cd4b90dde580123dbe7f006 SHA512 0264d20c585312345315364a4732905abcca569535460d274528ddb6dcef6cdcb9661804f22c8cb209a7123fb41df7974ac739baa65debe0b676b2b902482d4a
-DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
 DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
-EBUILD protobuf-3.10.1.ebuild 3030 BLAKE2B e555296b22b00886ca0557dbb90a8ca544fc650895fda3face5e32e886dea426f7c61334fdafaa6fa71a9e47cf675cc0e0f4145e9c57ede5d68fb3597322732d SHA512 18203bed470210102b6e5301a231af2c792ceb14c124a78516dce7a8af564aacbf48a94b67bd1af8b9e93baf3b04dde87021e7d18ac5da92df856e06a5fa4c7d
 EBUILD protobuf-3.11.4.ebuild 3019 BLAKE2B b8efa8797e32842f1009580492a26fb0557a9555713875012d13aa4de247417c81c451ea0c6eeaf8a784a497591a29afa6516422a48c29c87e1e962d4f945617 SHA512 0955a68f5d0aed9a963c43aaf04f649a019dbf2a93f38f3561f7a276dfa8b3877291448dbb3680b89b4643d3ad6b1d3f621504614171c001ca6373eb9bf03cd3
-EBUILD protobuf-3.12.2.ebuild 3026 BLAKE2B 2947ec5816430b051e9d1d279e66057230e371d94e5196aa09349ea1e41d88fb9f07d833cc56a7d8991c3da7260c69450ae7c5047369f85c0020a61e3f72aa72 SHA512 703f0930a9890ca2826783c3676189c55c3fa9bd3827f7b6b5f4b5873bcb3e020b6b7db40676c089728b54d49b7acecd6576d938218afc57e9a3f5209da0f005
-EBUILD protobuf-3.12.4.ebuild 3218 BLAKE2B a201cc755244f015986e90255fbe0d1a95e25d348a851b44c2a14fa1dcf93927f6a8b77822ef2f5bec4971583c115da71e0ff85f3ad5b03b0ef09d58c9a3821e SHA512 8b4931aa05a0571ddcc0944ecf04d2ca8335d09b9bf3f1f7344ee5afb63e7ff63f0981c720f280ef858e63adddc4d1c31de3a81d29155bcfb87e0cbe5bedff8f
+EBUILD protobuf-3.12.2.ebuild 3023 BLAKE2B 17edacc34ba8056d3da2ce8b04501fa7548f4c119ee1f2715d901109a776f3c94fedd2420d68bbc2994b1125f39b5ab384d9e962ac0b7b4328036bbeb1209faf SHA512 40bb0f399d6c5761fbaefaa9a934a21ce7de263e096334e596400aababa2856b0e178fc0e14c55b083a1c4805044c86511c7d673d5d326f0d536ccd7b535ab16
+EBUILD protobuf-3.12.4.ebuild 3216 BLAKE2B 00884ac0dbfbe0f0219278f0af46510a8c706a01e5085266913f09438b03883a39b681100867b1fd5dc9fd4e7719b22c1e881c1513ef9b2c09242a221a19fcb5 SHA512 194f2956012785bf70ecdcc672ae57cbf80c26ea527a24acc221095a2c814e917eb26ac22aff33d5915cc2568fae11d99c1639f734f2f1da043c950a686c7631
 EBUILD protobuf-3.13.0.ebuild 3218 BLAKE2B c3a7389f4da1d9ff6f1628b504897ebc1e72ae02c33d713b7625cbd30ff74e4a5cc8e9823005e6d31512edbe4cb06ab09de35bd9d65b003003fc6437b2cbfab8 SHA512 6462ef2647c0ee9ea3d703afd7402aaf337ec3078fe5fe0219cd7f157101446f3df863063427863604fac0f61f8def5df61255020b095c8ab4aa7b09426f478f
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B 19039df5ff9af194b335978f77c6ac9f8ed3387840e01c449e7661ce628129a1bc9de5938c453a08e21d9ce6e0d734430796aa911135a3c43c84557500da43ad SHA512 32744cffb2e57592c6475845bebc5dc221a8cd933a057699c2203205ed93828041e4b6242aa34c1e07d5f36cb24573a675ef0bbf9ab3fc56e341e3e31acbec47
 MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/files/protobuf-3.8.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.8.0-disable_no-warning-test.patch
deleted file mode 100644
index a09edb9ef368..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.8.0-disable_no-warning-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings.
-
---- /src/Makefile.am
-+++ /src/Makefile.am
-@@ -715,7 +715,7 @@
- GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
--                 no-warning-test $(GZCHECKPROGRAMS)
-+                 $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                       $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
-                       $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
-@@ -899,4 +899,4 @@
- 
- TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
-         google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
--        protobuf-lite-arena-test no-warning-test
-+        protobuf-lite-arena-test
diff --git a/dev-libs/protobuf/files/protobuf-3.8.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.8.0-protoc_input_output_files.patch
deleted file mode 100644
index fafd4bdb8f96..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.8.0-protoc_input_output_files.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-https://github.com/protocolbuffers/protobuf/pull/235
-
---- /src/google/protobuf/compiler/command_line_interface.cc
-+++ /src/google/protobuf/compiler/command_line_interface.cc
-@@ -949,6 +949,28 @@
-   }
- 
-   if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
-+    bool success = false;
-+    int in_fd = STDIN_FILENO;
-+    int out_fd = STDOUT_FILENO;
-+
-+    if (!protobuf_in_path_.empty()) {
-+      in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
-+      if (in_fd == -1) {
-+        std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
-+        return 1;
-+      }
-+    }
-+    if (!protobuf_out_path_.empty()) {
-+      out_fd = open(protobuf_out_path_.c_str(),
-+                    O_WRONLY | O_CREAT | O_TRUNC,
-+                    0644);
-+      if (out_fd == -1) {
-+        std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
-+        close(in_fd);
-+        return 1;
-+      }
-+    }
-+
-     if (codec_type_.empty()) {
-       // HACK:  Define an EmptyMessage type to use for decoding.
-       DescriptorPool pool;
-@@ -957,13 +979,20 @@
-       file.add_message_type()->set_name("EmptyMessage");
-       GOOGLE_CHECK(pool.BuildFile(file) != NULL);
-       codec_type_ = "EmptyMessage";
--      if (!EncodeOrDecode(&pool)) {
--        return 1;
--      }
-+      success = EncodeOrDecode(&pool, in_fd, out_fd);
-     } else {
--      if (!EncodeOrDecode(descriptor_pool.get())) {
--        return 1;
--      }
-+      success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
-+    }
-+
-+    if (in_fd != STDIN_FILENO) {
-+      close(in_fd);
-+    }
-+    if (out_fd != STDOUT_FILENO) {
-+      close(out_fd);
-+    }
-+
-+    if (!success) {
-+      return 1;
-     }
-   }
- 
-@@ -1001,6 +1030,11 @@
-   for (int i = 0; i < proto_path_.size(); i++) {
-     source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
-   }
-+  if (mode_ == MODE_COMPILE &&
-+      (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
-+    std::cerr << "--protobuf_in and --protobuf_out are only valid with "
-+         << "decode operations. Ignoring.";
-+  }
- 
-   // Map input files to virtual paths if possible.
-   if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
-@@ -1627,6 +1661,12 @@
- 
-     codec_type_ = value;
- 
-+  } else if (name == "--protobuf_in") {
-+    protobuf_in_path_ = value;
-+
-+  } else if (name == "--protobuf_out") {
-+    protobuf_out_path_ = value;
-+
-   } else if (name == "--error_format") {
-     if (value == "gcc") {
-       error_format_ = ERROR_FORMAT_GCC;
-@@ -1763,29 +1803,50 @@
-          "  -h, --help                  Show this text and exit.\n"
-          "  --encode=MESSAGE_TYPE       Read a text-format message of the "
-          "given type\n"
--         "                              from standard input and write it in "
--         "binary\n"
--         "                              to standard output.  The message type "
--         "must\n"
-+         "                              and write it in binary.  The message "
-+         "type must\n"
-          "                              be defined in PROTO_FILES or their "
-          "imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode=MESSAGE_TYPE       Read a binary message of the given "
--         "type from\n"
--         "                              standard input and write it in text "
--         "format\n"
--         "                              to standard output.  The message type "
--         "must\n"
--         "                              be defined in PROTO_FILES or their "
--         "imports.\n"
-+         "type and\n"
-+         "                              write it in text format.  The message "
-+         "type\n"
-+         "                              must be defined in PROTO_FILES or "
-+         "their imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode_raw                Read an arbitrary protocol message "
--         "from\n"
--         "                              standard input and write the raw "
--         "tag/value\n"
--         "                              pairs in text format to standard "
--         "output.  No\n"
-+         "and write\n"
-+         "                              the raw tag/value pairs in text format."
-+         "  No\n"
-          "                              PROTO_FILES should be given when using "
-          "this\n"
--         "                              flag.\n"
-+         "                              flag.  The input/output protobuf files "
-+         "are\n"
-+         "                              specified using the --protobuf_in and\n"
-+         "                              --protobuf_out command line flags.\n"
-+         "  --protobuf_in=FILE          Absolute path to the protobuf file "
-+         "from which\n"
-+         "                              input of encoding/decoding operation "
-+         "will be\n"
-+         "                              read.  If omitted, input will be read "
-+         "from\n"
-+         "                              standard input.\n"
-+         "  --protobuf_out=FILE         Absolute path to the protobuf file "
-+         "to which\n"
-+         "                              output of encoding/decoding operation "
-+         "will be\n"
-+         "                              written.  If omitted, output will be "
-+         "written to\n"
-+         "                              standard output.\n"
-          "  --descriptor_set_in=FILES   Specifies a delimited list of FILES\n"
-          "                              each containing a FileDescriptorSet "
-          "(a\n"
-@@ -2101,7 +2162,9 @@
-   return true;
- }
- 
--bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
-+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
-+                                          int in_fd,
-+                                          int out_fd) {
-   // Look up the type.
-   const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
-   if (type == NULL) {
-@@ -2113,15 +2176,15 @@
-   std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
- 
-   if (mode_ == MODE_ENCODE) {
--    SetFdToTextMode(STDIN_FILENO);
--    SetFdToBinaryMode(STDOUT_FILENO);
-+    SetFdToTextMode(in_fd);
-+    SetFdToBinaryMode(out_fd);
-   } else {
--    SetFdToBinaryMode(STDIN_FILENO);
--    SetFdToTextMode(STDOUT_FILENO);
-+    SetFdToBinaryMode(in_fd);
-+    SetFdToTextMode(out_fd);
-   }
- 
--  io::FileInputStream in(STDIN_FILENO);
--  io::FileOutputStream out(STDOUT_FILENO);
-+  io::FileInputStream in(in_fd);
-+  io::FileOutputStream out(out_fd);
- 
-   if (mode_ == MODE_ENCODE) {
-     // Input is text.
---- /src/google/protobuf/compiler/command_line_interface.h
-+++ /src/google/protobuf/compiler/command_line_interface.h
-@@ -286,7 +286,9 @@
-       GeneratorContext* generator_context, std::string* error);
- 
-   // Implements --encode and --decode.
--  bool EncodeOrDecode(const DescriptorPool* pool);
-+  bool EncodeOrDecode(const DescriptorPool* pool,
-+                      int in_fd,
-+                      int out_fd);
- 
-   // Implements the --descriptor_set_out option.
-   bool WriteDescriptorSet(
-@@ -418,6 +420,13 @@
-   // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
-   std::vector<std::string> descriptor_set_in_names_;
- 
-+  // When using --encode / --decode / --decode_raw absolute path to the output
-+  // file. (Empty string indicates write to STDOUT).
-+  std::string protobuf_out_path_;
-+  // When using --encode / --decode / --decode_raw, absolute path to the input
-+  // file. (Empty string indicates read from STDIN).
-+  std::string protobuf_in_path_;
-+
-   // If --descriptor_set_out was given, this is the filename to which the
-   // FileDescriptorSet should be written.  Otherwise, empty.
-   std::string descriptor_set_out_name_;
---- /src/google/protobuf/compiler/command_line_interface_unittest.cc
-+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
-@@ -95,7 +95,7 @@
-   virtual void SetUp();
-   virtual void TearDown();
- 
--  // Runs the CommandLineInterface with the given command line.  The
-+  // Run the CommandLineInterface with the given command line.  The
-   // command is automatically split on spaces, and the string "$tmpdir"
-   // is replaced with TestTempDir().
-   void Run(const std::string& command);
-@@ -2335,6 +2335,17 @@
-     EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_));
-   }
- 
-+  void ExpectBinaryFilesMatch(const string &expected_file,
-+                              const string &actual_file) {
-+    string expected_output, actual_output;
-+    ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
-+    ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
-+
-+    // Don't use EXPECT_EQ because we don't want to print raw binary data to
-+    // stdout on failure.
-+    EXPECT_TRUE(expected_output == actual_output);
-+  }
-+
-  private:
-   void WriteUnittestProtoDescriptorSet() {
-     unittest_proto_descriptor_set_filename_ =
-@@ -2429,6 +2440,19 @@
-       "net/proto2/internal/no_such_file.proto: No such file or directory\n");
- }
- 
-+TEST_P(EncodeDecodeTest, RedirectInputOutput) {
-+  string out_file = TestTempDir() + "/golden_message_out.pbf";
-+  EXPECT_TRUE(
-+      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
-+          " --encode=protobuf_unittest.TestAllTypes" +
-+          " --protobuf_in=" + TestUtil::GetTestDataPath(
-+              "net/proto2/internal/"
-+              "testdata/text_format_unittest_data_oneof_implemented.txt") +
-+          " --protobuf_out=" + out_file));
-+  ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath(
-+      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
-+}
-+
- INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
-                          testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
- }  // anonymous namespace
diff --git a/dev-libs/protobuf/files/protobuf-3.8.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.8.0-system_libraries.patch
deleted file mode 100644
index 020b0cc74aaa..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.8.0-system_libraries.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- /Makefile.am
-+++ /Makefile.am
-@@ -11,28 +11,10 @@
- # Always include third_party directories in distributions.
- DIST_SUBDIRS = src conformance benchmarks third_party/googletest
- 
--# Build gmock before we build protobuf tests.  We don't add gmock to SUBDIRS
--# because then "make check" would also build and run all of gmock's own tests,
--# which takes a lot of time and is generally not useful to us.  Also, we don't
--# want "make install" to recurse into gmock since we don't want to overwrite
--# the installed version of gmock if there is one.
- check-local:
--	@echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
--	@cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
--	@cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
- 
--# We would like to clean gmock when "make clean" is invoked.  But we have to
--# be careful because clean-local is also invoked during "make distclean", but
--# "make distclean" already recurses into gmock because it's listed among the
--# DIST_SUBDIRS.  distclean will delete gmock/Makefile, so if we then try to
--# cd to the directory again and "make clean" it will fail.  So, check that the
--# Makefile exists before recursing.
- clean-local:
--	@if test -e third_party/googletest/Makefile; then \
--	  echo "Making clean in googletest"; \
--	  cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
--	fi; \
--	if test -e conformance/Makefile; then \
-+	@if test -e conformance/Makefile; then \
- 	  echo "Making clean in conformance"; \
- 	  cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
- 	fi; \
---- /configure.ac
-+++ /configure.ac
-@@ -218,12 +218,5 @@
- esac
- AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
- 
--# HACK:  Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
--#   since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
--#   too.
--export CFLAGS
--export CXXFLAGS
--AC_CONFIG_SUBDIRS([third_party/googletest])
--
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
- AC_OUTPUT
---- /src/Makefile.am
-+++ /src/Makefile.am
-@@ -709,19 +709,11 @@
-   google/protobuf/testing/file.cc                              \
-   google/protobuf/testing/file.h
- 
--GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
--GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
--GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
--GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
-                  $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
--                         -I$(GOOGLEMOCK_SRC_DIR)/include
-+                      -lgtest -lgmock -lgmock_main
- # Disable optimization for tests unless the user explicitly asked for it,
- # since test_util.cc takes forever to compile with optimization (with GCC).
- # See configure.ac for more info.
-@@ -810,12 +802,8 @@
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
-                       libprotoc.la                                   \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
--                                         -I$(GOOGLETEST_SRC_DIR)/include \
--                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
-+                      -lgtest -lgmock -lgmock_main
-+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lazy_descriptor_test_SOURCES =                        \
-   google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-@@ -836,11 +824,7 @@
- # full runtime and we want to make sure this test builds without full
- # runtime.
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
--                           $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
--                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
--                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
--                             -I$(GOOGLETEST_SRC_DIR)/include
-+                           -lgtest -lgmock -lgmock_main
- protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_test_SOURCES =                                           \
-   google/protobuf/lite_unittest.cc                                     \
-@@ -852,11 +836,7 @@
- # gtest when building the test internally our memory sanitizer doesn't detect
- # memory leaks (don't know why).
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include  \
--                                    -I$(GOOGLETEST_SRC_DIR)/include
-+                      -lgtest -lgmock -lgmock_main
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_arena_test_SOURCES =       \
-   google/protobuf/lite_arena_unittest.cc \
-@@ -866,8 +846,7 @@
- 
- # Test plugin binary.
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                    $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
--test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
-+                    -lgtest
- test_plugin_SOURCES =                                          \
-   google/protobuf/compiler/mock_code_generator.cc              \
-   google/protobuf/testing/file.cc                              \
diff --git a/dev-libs/protobuf/protobuf-3.10.1.ebuild b/dev-libs/protobuf/protobuf-3.10.1.ebuild
deleted file mode 100644
index 53bd166190bc..000000000000
--- a/dev-libs/protobuf/protobuf-3.10.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/21"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="emacs examples static-libs test zlib"
-RESTRICT="!test? ( test )"
-
-BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.8.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.8.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.8.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${D}" -name "*.la" -type f -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.12.2.ebuild b/dev-libs/protobuf/protobuf-3.12.2.ebuild
index ec32fddd43b9..2bc0efa743dc 100644
--- a/dev-libs/protobuf/protobuf-3.12.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.12.2.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/protobuf-3.12.4.ebuild b/dev-libs/protobuf/protobuf-3.12.4.ebuild
index c21840f05fc8..1229fc8ca166 100644
--- a/dev-libs/protobuf/protobuf-3.12.4.ebuild
+++ b/dev-libs/protobuf/protobuf-3.12.4.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 3ea96787d7f9..e394a1534357 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,7 +1,3 @@
-DIST re2-2020-06-01.tar.gz 403203 BLAKE2B 46270c39fdb9eda127752e97e5dfea24a6cb9ddc32bfc298e123eb29609a003fd1a7a3591e760944ec36721ee1981f9bdbbc0b04d596764922e6bbc3daa9159c SHA512 8592a5409cb087c3188023746a4121bd58972a7a21bae98022af587f6191b3096bbb5d379e622ea853ff3373c76972fb61f331354550715c9a7e77d08fba6f3c
-DIST re2-2020-07-06.tar.gz 404055 BLAKE2B 1dca93ec928ef508aa30c44889d3f451acdf1f4430dc62b05c256790cb755e30ec5fac6aca23d44ad57eb61b0971437529bf63fb89b4bd7bf1937748046e61a9 SHA512 5ff5b0fa80d28a5c1cd56e42de4392899347e083c8eedb79282763b8967d301e0d287223e2b1a140cc30f7420a4a1aed5d7be0b68e8f5d2e8813ab4bfa64c103
 DIST re2-2020-08-01.tar.gz 404076 BLAKE2B 063c3e78cf4983d214309a93a234d864d5ad3acc63ca40befb0b78604ea1406676eb85c34489f3baf74afc0f05ea46482bd7400eb485cd1951feaf4c1429b21c SHA512 1ae261155a1eb96606788eb736faa4dc3240d85f47e3b4c412a4f85f7e4cc69f7c7cbab98397aaf725def1cbc9c5da2c679cfb5573a442d60897740766ae2967
-EBUILD re2-0.2020.06.01.ebuild 1345 BLAKE2B ac8742ad050636bcf8ed1cf04f08dedd105db7f28366da9e55976d2935d63544ecf3077f093794670caee6784ed082446f9b032f4a2ae836c92265f9d7fbbff1 SHA512 422480e4547f33c0827f43a248f9ed331f5ad8e7bd7ec60c96f1f396609bf4f6fb4ed8fe4be3eb3b0e687fdb2fdbb3c8d45b13a5400cb91fe79563372533c375
-EBUILD re2-0.2020.07.06.ebuild 1349 BLAKE2B fe65773026c5209e22cd94c9a1c2153ea5cccb39b1343c45471b01d4aac88cb39673a63a99ca1abf9fb9e1bc3859d9815f81a11e583cf64096e754cf1e63bede SHA512 9e646e078f73598a321893431ca6b1c1cb4652ae6d42ffa6da693b964740a0502e0a9d357f1ea1b06d70aa2fbcbb2140a8019253fe9af4bd1b407079d030033d
-EBUILD re2-0.2020.08.01.ebuild 1347 BLAKE2B bdb9fc615575c109a7ccbc389d2726f8d1f5f183d6d8abe4b1f46bb95f208b3e900d90fd39bf432dc156d662adf51fe7de3056a988b30b05864d3c584e8b9d15 SHA512 df2f0f8eaa7519bb0b92b1f410bc8d1ce7e5c2c27e1bdf6f995868ac3a9c63cd9ccdaf595ccf65aaf5de4d175d2082caa168347b604188fb392aa512feabc68e
+EBUILD re2-0.2020.08.01.ebuild 1345 BLAKE2B e5f9646ea36c54b50b5e4e5eced5fc37181f28dc1c951e6e07970f16ca88402531f233d17cc9b80a6c0ac835bf15860689277be1089b1e343c22a99ab97f36bc SHA512 1a83552bd446f1fa5e4e9eba72a60d22ee3e542a55ff798d7e6eef85d328f80dfc6a0e48afdc990e662c1aa6cbb5eea414209cb2601417496f8e27201356a5bb
 MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
diff --git a/dev-libs/re2/re2-0.2020.06.01.ebuild b/dev-libs/re2/re2-0.2020.06.01.ebuild
deleted file mode 100644
index b1b73d54da92..000000000000
--- a/dev-libs/re2/re2-0.2020.06.01.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="7"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="icu"
-
-BDEPEND="icu? ( virtual/pkgconfig )"
-DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}" shared
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
-}
diff --git a/dev-libs/re2/re2-0.2020.07.06.ebuild b/dev-libs/re2/re2-0.2020.07.06.ebuild
deleted file mode 100644
index adf595f07b8b..000000000000
--- a/dev-libs/re2/re2-0.2020.07.06.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="8"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="icu"
-
-BDEPEND="icu? ( virtual/pkgconfig )"
-DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}" shared
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
-}
diff --git a/dev-libs/re2/re2-0.2020.08.01.ebuild b/dev-libs/re2/re2-0.2020.08.01.ebuild
index 658704eab243..69b48d1d9c89 100644
--- a/dev-libs/re2/re2-0.2020.08.01.ebuild
+++ b/dev-libs/re2/re2-0.2020.08.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="8"
 SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="icu"
 
 BDEPEND="icu? ( virtual/pkgconfig )"
diff --git a/dev-libs/rinutils/Manifest b/dev-libs/rinutils/Manifest
index b59483cc65c2..896d3dca5742 100644
--- a/dev-libs/rinutils/Manifest
+++ b/dev-libs/rinutils/Manifest
@@ -1,5 +1,7 @@
 DIST rinutils-0.4.0.tar.xz 17072 BLAKE2B 90cd40fca0f682b730457da04bb392eada83ee2ab2ae3287ffdfd2235776038d6597143ca60c51b9c8d13b366511a5cd084b90811c5cfc7663125952fa009105 SHA512 96c0fc1e8164df8703910a8e14215e1a3fa52d5cc2fdf90af2f21dd064236e2b2b5f44485689553cd0df7cb99aa01f71241983166683934175d907e9f583edb5
 DIST rinutils-0.4.1.tar.xz 17136 BLAKE2B 890b7201845609026577ab49b952db193480bd252c2798d3084610d29b1d62ddd9afb791150ad0ac951e6e1518c5711de11f8f7253c1c4ce115dd220cc27f5b0 SHA512 e175e5ce6e32e85d4102ba788c5dec40bd09ecd4002e6de10e726843b7ac562a63b305898061cab623eb85d46983ae777ac6b57c46194a29d78f0fe498fa63e7
+DIST rinutils-0.6.0.tar.xz 16768 BLAKE2B a4fe413c6a4f18bd8c41a4d933a2515ba64f2dbe180d8a5868eadd8cd6ed7008d30f5b6cd5fa730edcb6548f6ea269ab419b912fd6c7346dd013a737320bb714 SHA512 2523747f9cf5f830e5fb5acc1e92691e8acfb59d6c4474d3768b68de9190dbc63c9e06cdd3c6ac67f8a853d37d1711d4c18550bb24446b2730198668f4ad0c45
 EBUILD rinutils-0.4.0.ebuild 567 BLAKE2B 8d8d59bf7764a81d1264384956314f662884c1da009ba871fcac827f1f4b1384250848c28003903fdbbe6f8b61a801bd91f5827e728b54bb000e9c946ca609eb SHA512 318b02ed7f1330ee8d71654bad78debfd3ca2ed5a2357b92b29031808113bf6057664d50b2962162daaee1b48ef9884b57ab085ca9374057911472fe289b23dc
 EBUILD rinutils-0.4.1.ebuild 570 BLAKE2B 30d2366fd0a960f501b31ddbe691698a3579fa325912d2c653ca962cb976029c0cb69201328f9b399bb4c2f5a8acc2f26b1f66eddfa1faea500c8604ad713d94 SHA512 596126c33be635552308d28f22b47721ddb44e193a5ca3fe75493aedfc97f7c9ba77857c2f053ab84b2684accb23e6a4ecdd81e79e0d25959ac6bbcae4147c90
+EBUILD rinutils-0.6.0.ebuild 570 BLAKE2B 30d2366fd0a960f501b31ddbe691698a3579fa325912d2c653ca962cb976029c0cb69201328f9b399bb4c2f5a8acc2f26b1f66eddfa1faea500c8604ad713d94 SHA512 596126c33be635552308d28f22b47721ddb44e193a5ca3fe75493aedfc97f7c9ba77857c2f053ab84b2684accb23e6a4ecdd81e79e0d25959ac6bbcae4147c90
 MISC metadata.xml 330 BLAKE2B cfc9f4f9873b63df5ed997fa0fb659fd5c15205a53b727a963c125cc31cb071ccd7fcdd524939ed10b8dd6fadf4c4cc304ed3c4be852fc1e29feb0918efb698e SHA512 aa5bbe760f05a3c67365ddfa2f0c9d52636bd645075ac0ca2a96124e1127557b20d12162fe2c44b4cd77cf6106c5803da3d25b36a4dc9bb21bc1842e0da71b24
diff --git a/dev-libs/rinutils/rinutils-0.6.0.ebuild b/dev-libs/rinutils/rinutils-0.6.0.ebuild
new file mode 100644
index 000000000000..fa04b75970b8
--- /dev/null
+++ b/dev-libs/rinutils/rinutils-0.6.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Set of C headers containing macros and static functions"
+HOMEPAGE="https://www.shlomifish.org/open-source/projects/ https://github.com/shlomif/rinutils"
+SRC_URI="https://github.com/shlomif/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_APPLYING_RPATH=OFF
+		-DWITH_TEST_SUITE=OFF # tests require perl
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index e85e8b86fe56..48022dfdf07f 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -2,6 +2,6 @@ AUX rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch 548 BLAKE2B ae42344
 AUX rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch 529 BLAKE2B c5902c6582d4ab23196829dd5953bd74469951d41ac393e92b9858d6a6336dd68c73cf57d917a13fb3869c84b1e6930e7a0de71936091011039bcd3bfc3b102e SHA512 2ac5248e05b479b9e84322cd9afb1bb783e03440648fe91e0f92e77bb2f673f9752412a2a689aba152663b5235df176a6ab54b5ecea3a20e720b831bdf6292f9
 AUX rocm-opencl-runtime-3.7.0-amdocl64icd.patch 503 BLAKE2B 33154b45dd539c068cb86d29bfbfe07b189c1bd7ec36bb5ecba7e7b6a8de416c8c6794f9aed5f18f8aab33c50718f25882a46b86e4c0678440e24586eee9d967 SHA512 8f22ba90782290d0b89b3d48dbf24d5ff1418bf2d82effe5f362456ebbd65f4e3ffe044072d9023e585ec38eb3ac501ce598fef297099753818a93948bc06ccd
 AUX rocm-opencl-runtime-3.7.0-change-install-location.patch 2523 BLAKE2B f31cd13f8b50ea75c3ababe89905881ef92ec0319057a98978ff49514f213e5aad0f72d2eda75d300836ee4e90d1ac8b6b897442c968b30ad4c8af6c31f61fca SHA512 945d37ef36adec5ff6915bc4f3cc30801776370bce8097b53bc4e72568d4801fb7f092ebc0103ec0f625a0297d8ab5a43dcaa84d59f7145ea87610a7bc855f79
-DIST rocm-opencl-runtime-3.7.0.tar.gz 1004361 BLAKE2B 7fa9481c77884dda15a3b0335449b2879fbac000f644fc56bbd8d06c5fd77d8355f159b9b7e8920f06351e388d0df41379b7e1fcff51cf81714a28f902218e42 SHA512 6ea509dde0290f13e66497eaad587099ed6a98df967adce207afc857ecd961b65801332ca74e36173719488639480cfcffc625a007345d0e48c10c8a0efdfa3f
-EBUILD rocm-opencl-runtime-3.7.0.ebuild 1977 BLAKE2B 7e1d8e62cc3c8c89fbdbe253d0393e1a567d924d41ab184d4c7cdafc0320e88e0cf33a88af67725c30d49fee579546faf1b78f75698165ff28933d38b58bc368 SHA512 427ea0cbbecb7195ca79b250216b5649b5e9431b9369e40876b9c49631d85b8f050c78524f4a16a53005671c07058392c5a583ac7f16dc57d7f4f3e41cf82efe
+DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
+EBUILD rocm-opencl-runtime-3.8.0.ebuild 1977 BLAKE2B 7e1d8e62cc3c8c89fbdbe253d0393e1a567d924d41ab184d4c7cdafc0320e88e0cf33a88af67725c30d49fee579546faf1b78f75698165ff28933d38b58bc368 SHA512 427ea0cbbecb7195ca79b250216b5649b5e9431b9369e40876b9c49631d85b8f050c78524f4a16a53005671c07058392c5a583ac7f16dc57d7f4f3e41cf82efe
 MISC metadata.xml 380 BLAKE2B ead1a4d03ea8079057819764408b0d70da70bfa15b374f448f82ff90dc31067d9dfd2a7f888bdfc72a331e2c35b606dde55dde89215f7d52fef8e73740b3ca68 SHA512 1dda9d4be917efcf0b0d447b5f6a2a1ac5f6815699269e0ff6cc0763f286a32dc6180a7a844be0534847511f847afbf12ee5c249f4dd0976f773107ec46859f7
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.7.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
index 5a1a4386433c..5a1a4386433c 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.7.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index ca2034e7141e..fb9aca0c2c71 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,5 +1,5 @@
 DIST serd-0.30.2.tar.bz2 590337 BLAKE2B 7b47f4f9940d9d2d37772c034c3f15801fff2bc8a058d30b40891ae900bdee3a631803e25505230a853e4beb083be4c854c627074eb89c0b23781da42fbde2d5 SHA512 b1e18ac883aac2a8146ee0e1de553ac2b512deba5307e5c9fa2733d9011ed0777d67790aa6527e73b3f11c9da0d8c9a98227457bb412897296f4464228cac0f7
 DIST serd-0.30.4.tar.bz2 605441 BLAKE2B 6b9b561db04a612d04726f29b1b56f535b9af57b7cbcf521c2a6afdafaf63b2ff4a205015d2f4c20bf48340348edda586dfed4a7cff24c57363b0f218d185609 SHA512 4cc032f826d891213c6db787b10a41ffb8f4b2a3357ffa536e34013755dc34db7109d1b42f550a0d559d8651f56c3a5dfb3654c3e2047ee6e609ff9a5fe803d6
 EBUILD serd-0.30.2.ebuild 1149 BLAKE2B 3c7ff48c692a05f300fa0fc93accc6f93cb1cf2a7328765fa5689ec0b0bc524cea24ef161fb130bb94da8f6a8b0b3950baf1d09d382e82a1044c3f4c684bf16b SHA512 f124f80e396d11ad5e8a3600ecf713a714efb22674bffb77ee8940e44008af7b78475ed1a013a150537906f66eb43774bab526d2a111d882b1cdb9ebf3030c44
-EBUILD serd-0.30.4.ebuild 1155 BLAKE2B a851119894d7b86edf2c0de340a332c1229bb659d19481ff5e44d885632252189f68911e4877ac553aa165ff8c7abf714e5af5d490f873a81716f95e2dd7f17d SHA512 ca344766dabba0552390d57b23ac684175a0f9233c6c62b59568f5b6d19a3dbcaa8daefa5b924e454b784806c39271c808b6028be4c979c32b1df154e9dc8e66
+EBUILD serd-0.30.4.ebuild 1154 BLAKE2B 1ceedd8b0824c3156c18a9b6acc593ff8922cc7e94992dd7cd3803dd106a3f6a94b61e5e7a659d377658ced82c2ecfb0d3b7f3b86d082bb85f5f25af5c802981 SHA512 679c97234694b2fd1757f5572b7e45cdd63de81ac280f3a07b334ad32c11445a96de39c2e2135e04ebfda7092de52672c69c5a590df7f58f50e041fd6993320f
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.30.4.ebuild b/dev-libs/serd/serd-0.30.4.ebuild
index 5cc979180ac6..2c0d9cab644c 100644
--- a/dev-libs/serd/serd-0.30.4.ebuild
+++ b/dev-libs/serd/serd-0.30.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 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 static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index a6230eea1182..94d532e8d31f 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -2,5 +2,5 @@ AUX softhsm-2.5.0-libressl.patch 1046 BLAKE2B e647878998493606d9941f1b4683be8f07
 DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb
 EBUILD softhsm-2.5.0.ebuild 1112 BLAKE2B bec60391d1bd029ad7904113fb97acd9a1407cf355463f0a958ca6faeecda12e59cfde0ac4fc727d63d607936cb7b13e8beb7493eaeada5f179ded9490bb115f SHA512 56c3ddfadaeb674d1f9e56473729f8d99667933357a8fbc366384d5efa264f7edc8a1faafed0066848c52c9956e8cae92ff14bda340ea14bdc24ded7adc345e5
-EBUILD softhsm-2.6.1.ebuild 1064 BLAKE2B 9593218c5058cf0e159fea27287492bb335ff728f1f012bbce29314678879d6414a8d0ca20f7f14b7ff76322e3efd6b3586d1ba0b33143aaefa849b3487bf9bd SHA512 784945f1962fcbd19ded377344c3aefa69f21032780902507b32fad09fc17dcfe9f541a837c4c600852d98cb71b49d5d9bc66858ce5d68da8933ab6bc4e1804a
+EBUILD softhsm-2.6.1.ebuild 1069 BLAKE2B f4fb6078aba387cf3d6ccbc07b3be60a630e73a78e51685bf20f3be6b4b8a2cd60b60354c992f10562ee59d4dc5984ac2f09d80e66d15348d74a108e6de1d792 SHA512 85ed4dfdf6faf55ad5fbaecdaceeb32f64263f4dd141dcc33fadada396837de2265e7656ce54aff44cd0e66a708b853ebcb1b60161eb8f262e5f60b8e908a95f
 MISC metadata.xml 292 BLAKE2B 273da0cfca0f98179144303c91b631ff47844748840f99b6bf1ece28ec442191e950756308242c25f4f27ab907674cdbd6efc88a4af1887676eb878d01b73f7c SHA512 7b3d1e2e5adc04c50256ea1f98490787cc0d2ff33af13462501cb5e08f482de3ce6da60d3026d5aacd1f46075915d1cc5c37206d398c61176ca7a023adae693d
diff --git a/dev-libs/softhsm/softhsm-2.6.1.ebuild b/dev-libs/softhsm/softhsm-2.6.1.ebuild
index 41a1b769e854..6d8c36701e27 100644
--- a/dev-libs/softhsm/softhsm-2.6.1.ebuild
+++ b/dev-libs/softhsm/softhsm-2.6.1.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A software PKCS#11 implementation"
 HOMEPAGE="https://www.opendnssec.org/"
 SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bindist gost libressl migration-tool test"
 RESTRICT="!test? ( test )"
 SLOT="2"
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 039718164af4..b57b5aeac93c 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,5 +1,8 @@
+AUX sord-0.16.6-x86_32.patch 1292 BLAKE2B 0177c404d77cbc27a79a31b21c6c7e51015aba6c912bc2e3ed660f1d9516cf6afe8f52fd2f2bcf4028addc340f441cf9c1a61d412b10bd5e696ccb10902db33f SHA512 c851bd761eb1c77177c5333208f74b577a36a8e5b0ea0b2dc704c30d1e984c28df7003208ba629981a395b5e893b94289210f6c6273f51551d595276353cc1bf
 DIST drobilla-autowaf-6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d.tar.gz 384589 BLAKE2B d643df2e133c2b70e00d85562d1c30f8a01190b4c1e1a512b732d016db3ae77ff543d4acafc00309edb173e7bbaaf17b0c2844bef2ffe786c02a51930f03f29a SHA512 50b2d063866630c7c566af9da07c9ac0da2cf86e70f76ad6af57973ae0b346d4687c0b4263cefa90f0c0ba9e853a60583457c9f8b1313db3f4298ca2f0cfc4d3
+DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98
 DIST sord-81e138633076c2d7ef7e1691845757208d02f478.tar.gz 293332 BLAKE2B 794aed020b14f0cd4bae851de12f24fe54c87202b69c3f21cc26a86f0da092b05ea2244279be16ab3231431a8a5fb0cbab7236c2e761715e9a1759bb5b3ab54b SHA512 ba0dd8a8434a04be3548b959789b5b81491cd2f91f6125d3620fa17d4d38ae18015db7cd72af71900a0a17331c6b5400756719a25e09e596590ff943798a5991
 EBUILD sord-0.16.4_p20200803.ebuild 1584 BLAKE2B 4c4c075c41f094bbc70054c63d423d9d0574c5fb103f1a45f3e5180e4ac1ab4cb67cbb801524dc10022ab58616c636d519c9035b4a62091769aae23b1ca00939 SHA512 1a28340237a91a4ed316b216b925459005eaccda7863e132682740d32916f5e4e2c0b77caa5f6fe3ac94d827a22fdf8ff9e2db5483b08f9ffa933d447ce9ae6e
-EBUILD sord-9999.ebuild 1125 BLAKE2B 39b455cafddea954aefad917eb782504eaa38f5cf5a07abdd56d5b0dc06227464c0d3dd3c2e64519cad415d6278ac4f0cf16b48ba7023b5df759dc3d39522952 SHA512 11739648e64dbdb746d2774a2632a9fd54b36af4ec147b71166ad006ef438b62618a588b9a69ac5e08b152d2644783f49773ec314da2fd4664d508e9489e2cc0
+EBUILD sord-0.16.6.ebuild 1215 BLAKE2B 114775f3ed2e81a94e05049a5a5015252aa7c4aa28b7909a5e6a9c29eab8cc21de9acf40a9cd1616fdf099b1dd4f4a15ece3fad01380d9c36d66194884dd65bd SHA512 36bdfe99b243f3178ebd207100d47b78fb701ed6dab610d6764e40c608826030f572e4851f097dad190dbc629599c74b9cc1b23d5322996c8df402d6945a4efd
+EBUILD sord-9999.ebuild 1169 BLAKE2B e814b98d57f0c12b816134b113417f4fb09923c56a275cd54086f54529242335cd3df8a8d7bb8ecb458f530c83ec2dd55bb10fd38483baa91773e6bb16d498d2 SHA512 4a88c8475943eb0bf4a487124c1cac7c891c3ffa53bf460656e170db13e9b55ab87a672a62d16833eb89c957718ca739ea6c12f1dc5c6e07315ee7231342d02b
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/files/sord-0.16.6-x86_32.patch b/dev-libs/sord/files/sord-0.16.6-x86_32.patch
new file mode 100644
index 000000000000..3effc4d44dc3
--- /dev/null
+++ b/dev-libs/sord/files/sord-0.16.6-x86_32.patch
@@ -0,0 +1,44 @@
+diff --git a/src/zix/digest.c b/src/zix/digest.c
+index 889cfde..00b9fcf 100644
+--- a/src/zix/digest.c
++++ b/src/zix/digest.c
+@@ -38,10 +38,12 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
+ {
+ 	const uint8_t* str = (const uint8_t*)buf;
+ 
++#ifdef __x86_64__
+ 	for (size_t i = 0; i < (len / sizeof(uint64_t)); ++i) {
+ 		hash = (uint32_t)_mm_crc32_u64(hash, *(const uint64_t*)str);
+ 		str += sizeof(uint64_t);
+ 	}
++#endif
+ 	if (len & sizeof(uint32_t)) {
+ 		hash = _mm_crc32_u32(hash, *(const uint32_t*)str);
+ 		str += sizeof(uint32_t);
+@@ -57,6 +59,7 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
+ 	return hash;
+ }
+ 
++#ifdef __x86_64__
+ ZIX_API uint32_t
+ zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
+ {
+@@ -72,12 +75,17 @@ zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
+ 
+ 	return hash;
+ }
++#endif
+ 
+ ZIX_API uint32_t
+ zix_digest_add_ptr(const uint32_t hash, const void* const ptr)
+ {
+ #if UINTPTR_MAX == UINT64_MAX
+-	return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
++	#ifdef __x86_64__
++		return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
++	#else
++		return (uint32_t)_mm_crc32_u32(hash, (uintptr_t)ptr);
++	#endif
+ #else
+ 	return _mm_crc32_u32(hash, (uintptr_t)ptr);
+ #endif
diff --git a/dev-libs/sord/sord-0.16.6.ebuild b/dev-libs/sord/sord-0.16.6.ebuild
new file mode 100644
index 000000000000..bd3d4f728ec6
--- /dev/null
+++ b/dev-libs/sord/sord-0.16.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for storing RDF data in memory"
+HOMEPAGE="http://drobilla.net/software/sord/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre
+	dev-libs/serd
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-x86_32.patch"
+)
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild
index e1388ab2877c..acfd96a2744a 100644
--- a/dev-libs/sord/sord-9999.ebuild
+++ b/dev-libs/sord/sord-9999.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libpcre
-	>=dev-libs/serd-0.30.0
+	dev-libs/serd
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( "AUTHORS" "NEWS" "README.md" )
 
+PATCHES=(
+	"${FILESDIR}/${P}-0.16.6-x86_32.patch"
+)
+
 src_prepare() {
 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	default
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index 821711525d9f..d25f62c88f45 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -1,3 +1,6 @@
+AUX unibilium-2.1.0-no-compress-man.patch 576 BLAKE2B a99123e8be6e229c0661b2ca9df0a56c5280e9f0a3f1e2fffae10537f5dfcd1e6ba5b35a78ceda8b52437b42442e30d1793c5a79ade78bbe2755e2d17c84d505 SHA512 501f93e537dcf8e2b5cd03e63d6c03b91c422bea52a4f615fbdd0acd64ba839d95dcf2f209ca28dcdeece902445a19d5777329a40af7b795529ea8cd9755ce53
 DIST unibilium-2.0.0.tar.gz 112570 BLAKE2B 95c24c53e11590faabf3d4b8484c344be0b2a0988f05bde785d03dac338d9f18fc65324f5ccc402723c9fabe2990083ce260d8fa57129591a1b2a1f8405eff9d SHA512 e93f319b7a85a4441c7f4e30d12d906805f066b14bff03331e48b6257da893f6447e257c8ba731077ad4b54d82d3ebf1ccf1fcf2d864273e0d4321a26ef7c172
+DIST unibilium-2.1.0.tar.gz 121971 BLAKE2B e035eab4343ee779218c302b3cae3ff5d443fc9bd723cade53a3d38dde3d66ee3d7374f7c69b85508a59d44d936601b24f33b01d923e55677d2bac71bd520fea SHA512 c0074ff8431f82c92072b8c0c9d3cf38d759b4de996b168c6ab00e475b0a6204d9c29b0a6e48e62dd4fa4898f82246150ef7cd5e246893d2c225c50ec4d4ac68
 EBUILD unibilium-2.0.0.ebuild 784 BLAKE2B f8decdab42671f3f9891ae9f019692f0c658c527c902ee2499395c1b0ec34b49f0056deec87396ed439ea1cb0a25d12b50d7727da739d4db5f4d9d11add57d43 SHA512 2c1f1edc2b1e0ace8f7dc54840636558873004f44d68ce0f434cfc403437d9fe5873ca1a66841febcaf4923bff2c82ac9d0c7937c180f11cddc721783d6eef66
+EBUILD unibilium-2.1.0.ebuild 871 BLAKE2B b89f7e59d5e3ebb9104293c138bab0a0cccc71063e139fd3089b5dfa0cd91592139c45960d7b0bfe8aee9bdbffe13e7cb4bf83a548804f1b821e2293c278f72a SHA512 75146a7a44f9343a17422ff02f2174934a792f2cab797c2c77aa499b04f5e4795052cb30ca73548f676c61963d390d0e613060dca5f7768e125265c793791c78
 MISC metadata.xml 339 BLAKE2B 36a1748f4030bc835201a0001ddf70b7ee4f1a73703c40a98650df0ef8b7e48e8acf3bb2272232ce528e2794310908214f1f9d9ac3ed75cf5bfadac1bd1cf19f SHA512 27c4da145b68654f559c956b5414a877ff9ca54a794390e690e1c11596dfda61d4d2ebfc3f891593f40c42f4070dd802ae7c73a9ece69e4c9ce0c1f76873644a
diff --git a/dev-libs/unibilium/files/unibilium-2.1.0-no-compress-man.patch b/dev-libs/unibilium/files/unibilium-2.1.0-no-compress-man.patch
new file mode 100644
index 000000000000..d4c1944554bd
--- /dev/null
+++ b/dev-libs/unibilium/files/unibilium-2.1.0-no-compress-man.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,7 @@ OBJECTS=unibilium.lo uninames.lo uniutil.lo
+ LIBRARY=libunibilium.la
+ 
+ PODS=$(wildcard doc/*.pod)
+-MANPAGES=$(addprefix man/,$(notdir $(PODS:.pod=.3.gz)))
++MANPAGES=$(addprefix man/,$(notdir $(PODS:.pod=.3)))
+ 
+ TOOLS=$(wildcard tools/*.c)
+ 
+@@ -121,8 +121,8 @@ install-man: build-man
+ .PHONY: build-man
+ build-man: $(MANPAGES)
+ 
+-man/%.3.gz: doc/%.pod
+-	$(POD2MAN) $(POD2MAN_OPTS) $< | gzip > $@
++man/%.3: doc/%.pod
++	$(POD2MAN) $(POD2MAN_OPTS) $< > $@
+ 
+ 
+ # Regenerate static test files, based on existing terminfo entries.
diff --git a/dev-libs/unibilium/unibilium-2.1.0.ebuild b/dev-libs/unibilium/unibilium-2.1.0.ebuild
new file mode 100644
index 000000000000..54bebfe17a3d
--- /dev/null
+++ b/dev-libs/unibilium/unibilium-2.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A very basic terminfo library"
+HOMEPAGE="https://github.com/neovim/unibilium/"
+SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+ MIT"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="static-libs"
+
+BDEPEND="
+	dev-lang/perl
+	sys-devel/libtool"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.0-no-compress-man.patch"
+)
+
+src_compile() {
+	append-flags -fPIC
+	tc-export CC
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib${PN}.a || die
+	rm "${ED}"/usr/$(get_libdir)/lib${PN}.la || die
+}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 5761b3b07175..fd0a312a832d 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -5,5 +5,5 @@ DIST xapian-bindings-1.4.17.tar.xz 1135100 BLAKE2B 8c45322725c341f6e6484e0aa8716
 EBUILD xapian-bindings-1.4.14.ebuild 6446 BLAKE2B 2b98e0f1095d527c021792c20b7c5d6977025d16001ec1a82bbff83164adc9af27a8aa04f7b80ae7571bac2fe43bb248ad063e9ca4c28109408e5a562e35e3dd SHA512 ecf37332ea6f17c243447d81425389549a9549afc62e79602aaf9a51a96a2441d92848d85a7e63907af143b871b14f4f77470a7f0760f2a37a0752bdb10f07db
 EBUILD xapian-bindings-1.4.15.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd
 EBUILD xapian-bindings-1.4.16.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd
-EBUILD xapian-bindings-1.4.17.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd
+EBUILD xapian-bindings-1.4.17.ebuild 6453 BLAKE2B 918f0b17fd076f95991f6bfe5672d8c18a32de1f834d1d8c454c6bb552fd559cb9091ca70945c9338cb84a32e7e3562a071e5a51d88951fc205e71d9b7fc4dfb SHA512 d174d0ccca69c4dc900e81e202c3680974025f260da4ac5b3f3f6ba80d49e9cf9cabb601b0d4e98f940fa2ea55461598a717bdb825033e992f24c56f5f33ec83
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
index f1522bf0ac05..ac2ceee5d1d1 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 9dbe414b4d8f..c6405bf5a527 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luaposix/Manifest b/dev-lua/luaposix/Manifest
index 35e97f6e7440..8dcb9c3c0164 100644
--- a/dev-lua/luaposix/Manifest
+++ b/dev-lua/luaposix/Manifest
@@ -1,3 +1,3 @@
 DIST luaposix-35.0.tar.gz 178091 BLAKE2B b2d2ca01f18f0e98b45008919fc886e05d2cad034c84e870900c33891dd5867d9bc7aa8deae06c3f3f0852db902c1e766e693162b32ed474eb710b379bf9e3ed SHA512 4bb61892b78d9e59418a9a6360b9f611fb9b5438b9261a2c6672f053a1b21dfd9a2060b8d2f0d3eac6185773cf84672c1769c081c4ab53d2ddae2232e4a9269b
-EBUILD luaposix-35.0.ebuild 1059 BLAKE2B 8dea5357ede61b2859eeb93cb844b0ce3c95fce9efd2f02f5b9c9002b4a1e6cefdf45e96cc73259d4643704447e8c9c292354cfd601052f51d333469559096ef SHA512 f9ae8c1a46a5ecafee6cce50d9b029ab135abcacc9d3aedd17fd9e12d4edb5d4ec501b2f1eea1317b03802f5edc946e441e28256b79a54e35893b63d95a94e8f
+EBUILD luaposix-35.0.ebuild 1267 BLAKE2B 12cefcfb60eb5bdc13a789587fe8d8911c8ba59f89c80ce0959f98c7a0896c183f1a39bcb7e4f14a57e11240460fcf7804da1f82d8d2ece70123fa447174c7fd SHA512 85649949f8bd79602e1d79ac17e654c2f47d7246725d7763286da0dc538e50d3fc00e9c38995c59d4a9c9952576635979f83babe4e1ed53895036380cdb81ae5
 MISC metadata.xml 474 BLAKE2B c2297ba4eae7fdfaf22dd9f93fe1f41a48ed085a3493fd30dc23e186bc89c5b6f0dc535fad0e15af24f8d9498c38ee8e99f7fafae0ac2969d91cca96fefe4ba6 SHA512 b0acb936e00d9668b5cad5478243d3067677ee015451cc06d0a7165a0e87035d23347f8dd40f481088be178d0ca6d06486b8984910021171903a37be970519e4
diff --git a/dev-lua/luaposix/luaposix-35.0.ebuild b/dev-lua/luaposix/luaposix-35.0.ebuild
index a49f69845d1a..06ef159c1e90 100644
--- a/dev-lua/luaposix/luaposix-35.0.ebuild
+++ b/dev-lua/luaposix/luaposix-35.0.ebuild
@@ -17,12 +17,20 @@ RDEPEND="dev-lang/lua:0=
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	default
+	# Temporary fix for respect LDFLAGS (#739050)
+	# Fixed in luke 0.2.1
+	sed -i -e "s:c_module,libdirs:c_module,'\$LDFLAGS',libdirs:g" \
+		build-aux/luke || die
+}
+
 src_compile() {
 	./build-aux/luke package="${PN}" version="${PV}" \
 		PREFIX="${ED}/usr" \
 		INST_LIBDIR="${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \
 		INST_LUADIR="${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \
-		CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die
 }
 
 src_install() {
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 20e65f79f34c..c1faffa927ea 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
index d556f47ddf5d..8aceacc3d0b9 100644
--- a/dev-ml/alcotest/Manifest
+++ b/dev-ml/alcotest/Manifest
@@ -1,5 +1,3 @@
-DIST alcotest-0.8.1.tar.gz 24358 BLAKE2B 4f905cb478183015355b7bed85b2b20de6880b64d6425a4804cf050dd95fe024e83d9c2f6b57f908bdf7eac650cd2133811219fd30de0c45fa0e66caa3178980 SHA512 76224df2d4923e666fd844a0735f2a23035454bb3c3aeb6a6f8d19376342f0f94f39a401d6225af3f90cddd2f65aa779ce87e42ee8d82e6b3ca33730d4277253
 DIST alcotest-0.8.2.tar.gz 25456 BLAKE2B 6f3362dd83d127600710a9efcf5428ce1d960a2a8798a533c3216d7c8934dadd38f672f383e45c0a0ab441e723b4c6477a3c92905e2351e81bbfda324e373e69 SHA512 df1cf5ab42e91a66cae2913504d6825f842169332b8673047faea769966f62d61cb1c288325a840211df0b22c31208566cf754b0816bfdf5d8ef34e8c5127668
-EBUILD alcotest-0.8.1.ebuild 642 BLAKE2B 882f487e41026d7d61b9b87feb03cde4c88076842e946053bc846e55bd708f416ea4eabea1d0d4fd25d1f9e8e86bee325b8bd00abe9d399b7810ab5bfdb004c8 SHA512 55f2359e9f260b46559c86190268854c925a9c5771e8072ab99f7d82cae7ff9a8efff36f5a0ddea83f6bb00aa119baf51936d44be56e8bc9f130760ae504f9c9
 EBUILD alcotest-0.8.2.ebuild 642 BLAKE2B 882f487e41026d7d61b9b87feb03cde4c88076842e946053bc846e55bd708f416ea4eabea1d0d4fd25d1f9e8e86bee325b8bd00abe9d399b7810ab5bfdb004c8 SHA512 55f2359e9f260b46559c86190268854c925a9c5771e8072ab99f7d82cae7ff9a8efff36f5a0ddea83f6bb00aa119baf51936d44be56e8bc9f130760ae504f9c9
 MISC metadata.xml 247 BLAKE2B ddda0ea2f5068bed824871d1b734188ba122a58d22ab67fb491beb7d48349ded25fb96d6c95f0efa4c756d44a7e30d8a78b0a2b8020fb35b2715c4ea3b41c02a SHA512 4fda15644be2ad3faf61b9a05fad67cdb8ac023dd63de9e0fb034396a38c512d51721d299e07881521fac159d18ba7561fa614980b7ccb60b741fec24e1ef609
diff --git a/dev-ml/alcotest/alcotest-0.8.1.ebuild b/dev-ml/alcotest/alcotest-0.8.1.ebuild
deleted file mode 100644
index b0d314768165..000000000000
--- a/dev-ml/alcotest/alcotest-0.8.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit opam
-
-DESCRIPTION="A lightweight and colourful test framework"
-HOMEPAGE="https://github.com/mirage/alcotest/"
-SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-ml/fmt:=
-	dev-ml/astring:=
-	dev-ml/cmdliner:=
-	dev-ml/result:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/jbuilder
-	dev-ml/findlib"
-
-src_compile() {
-	jbuilder build -p alcotest || die
-}
-
-src_test() {
-	jbuilder runtest -p alcotest || die
-}
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 094c613e49d6..29c78836b890 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -5,5 +5,5 @@ DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B 068c1016a75616811787eb480b61349a329609
 DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B 8dff6f82618d0f61a56acfa71ae679d4ba5ed4aea272019da7b19ea64960c80e50c55482ff9782748dad5042aa1bcd8728ff0825f8f900ff27239db0e0db3515 SHA512 1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075
 EBUILD camlp4-4.04_p1.ebuild 1080 BLAKE2B a82e0f1ef9b7ad40793b6d084e1bade7a161d5cadc60b2813cacff2e85b4334691297bf4583bdbe9de66a3bf5f9704041b32429e7856eb4ce7374fb835a98472 SHA512 d0bb1de5714a47bce471366a3237d07a292a10a7609e6503a154e71c4a58a900ee023e0089241a5f156ee74525eee434f5d6489677ebd58a59a0ec0d769ac306
 EBUILD camlp4-4.05_p1.ebuild 1086 BLAKE2B f35abade6648a491050fdf6167c24d6e95db7236ecf95cce33ece643fd27c8022b132b290d56d41eb4e6a836f9b92c8974bcee6e4db139f8381574ecbbdf8d7b SHA512 87c5d9df79146013a030411b0adbd0524c7ae6984d42ef5f30e007d8c979f82f1870f18659993ae598064ace7f0b1ea27b87e7b7c60426836a8871349e2a6e4a
-EBUILD camlp4-4.08_p1.ebuild 1151 BLAKE2B a8bdc5d0c46b205f1e046f1205251d5acc70211478b8691880e8b3630debdf715572107aac8222ae86495acc73d3a899868076269a077a0906823fbd3b020be3 SHA512 73623777ec50db527d57a16440b421a15322c2fe9165b86775b662e41b00eb5c583c51a4969e2bbd48071a52d3d5739a8d8604e46e5a0ece88a58c599517507b
+EBUILD camlp4-4.08_p1.ebuild 1150 BLAKE2B 81fd6efe4bdd0fa9ba5a96d166a90f3bf2552c22e7e6a1ecae1bdc1d37c2339d52af5a11c9b6d6494cf30e70a36541c95408750bf9f733cbe51dd063cdd737ac SHA512 fa27787074d84b42f2a16f6468e27414e675a14427223caf39a85bfc473480488aedbba4bb0116642d3f6d3caa9569967d882e3331c0283f40bc10b747bc1ec8
 MISC metadata.xml 250 BLAKE2B 6e80f75f919556451e33d44238de1d3f78f80356deeee40c8ba8ffeae46cd00cf1ffcc9cd5bcc2795f91cd7e2bcdab31dc7cb815a28a48a7b1746cef356395fb SHA512 e4a2f011f87a8a3442fd64fd97e19a6b74f9fc4a5f0da4ad49ac023258461633e6b12fcc8fd68900b57c1ec7db48b29733e264642c6bbe3a8dcc62e51c86a458
diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
index 0aed51629a8d..aee3b5ec2ecb 100644
--- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt?]"
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 5fe0a52bfe27..06f6742d922f 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-ocaml-10.0.0.ebuild 3219 BLAKE2B 8d2ac0dc88b865f723c527315aaabb6bbd75773660b63197c833c72d7915495e494d73144f84a451dec3793d45a2f7f44dc22beb5c60f55dfd88a23bb04aede0 SHA512 fa83b587c1170564e25c040e2809daf6dc13d1718074d22a7093f08e7444d6378dbeb2f5ddc57f681f4a93b14c95275c87027c9e9191757b1fba4c9008464d38
 EBUILD llvm-ocaml-10.0.1.ebuild 2960 BLAKE2B bf67406bf61b50af82f34276f7bfa6abe0bf809656e2addcc51efb7c1be5d4137462c9108239eea5f273a0e68f26c3300b3d2cc3cfe9df0c8555926e481fe231 SHA512 05e79634eb5e5ba38e0b0638a9627b7c8b38dfc7c685eaed8571283ed7791eb5d0ae2f6333cddf9b1f0f19b47e6d0e4c10444a4bc8bcdb69ce7061b25440a1b3
 EBUILD llvm-ocaml-11.0.0.9999.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
 EBUILD llvm-ocaml-11.0.0_rc3.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
+EBUILD llvm-ocaml-11.0.0_rc4.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
 EBUILD llvm-ocaml-12.0.0.9999.ebuild 2947 BLAKE2B b457ceed658d32cafc3926b32d73b4da03fb1b2b3d26988a95b839c75a97a61e401f1249acd10ba25b380ddac1ffa65b1e07ee97d054940da8d999bbb0fbe915 SHA512 8fb8849eef370b9becb05033c1108b0858dff95cfada75a634c52e558bf551346b69e6cfcd406c4c6a0d2a0660a00d92808c99471ec0b65ff5986f4cf399a630
 EBUILD llvm-ocaml-9.0.1.ebuild 2922 BLAKE2B d7ae97c680d9f223a0fbaf2989ee60c4ae2baebf73664c9909485fea6c99f5c4c817ff522bee6175a741a5632687d1d0ea5b7b961587a258ca0737ac419390ac SHA512 dc30f078950d944a5c9d18d8804db82300845564afc05878cc7b157d37ad32259c528b358b9cd12684da3b9885b62e92cc6a32b46b8c4cbf48269839bd4cfa02
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc4.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..575154be6047
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0_rc4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	!sys-devel/llvm[ocaml(-)]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-ml/findlib
+	test? ( dev-ml/ounit )
+	${PYTHON_DEPS}"
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_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
+		-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
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# 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_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.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build 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-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index dba1fdae226b..a466d8bfb255 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -1,8 +1,6 @@
 AUX ocaml405.patch 4761 BLAKE2B eb6a2fabcbcda0676652e4010e28edc8fd82b0d2307fb5d847105aff775e405b3399854d13be13660255aaf0a55627ab0d307545fbb7d91076a50ff103b97d34 SHA512 79378c0cb59ca4abc2280932045ca80e5d7e3ff47919067c363f96d32e24899825f79a83bcf0abfc600513eecc8e046382a42937545b4b62f9b5f992d8d29480
 DIST ocamlnet-4.1.2.tar.gz 4623183 BLAKE2B 7e8d5cdc823b9e924258f75f00957ba185d49555377ba2a2d960c47e2ea958059e1ab62e27be63770bb4f547e1fa0cb788a54c3e698180b2b15f0097fe84455a SHA512 69f42042a54efd662db2217224da53513fc7e72c7b2313d4a4a1128f1b4624f4f6298434f5b19f354b832119ff151abc81e85eb0108d6eb24f30f82d176e0b4d
-DIST ocamlnet-4.1.3.tar.gz 4553037 BLAKE2B 177d2a3b947e6123bdef0ee180c612f832a22dfd90fe0c44b60ba2ebea3629103db9730eb1b926b7d7bf39b489934b8949b0fd08e5155c7f41e3c065c215558c SHA512 683ab6f529639c9da01478ba8ba7a1bf89a418ad3872331bb3e29067c0a75ddc0db996630ce5a5dd116967d6e3e756ade02d9a78b865bbc226f95d01af9e3956
 DIST ocamlnet-4.1.4.tar.gz 4552969 BLAKE2B 3dfedcd09eb91d1ca8e13b7a87dfe70cfb88d57d0b4fa970fe6179affa05ba3fdeaad0dfbb6ac267e7a6530c289408b1a8ad66a805226245f80fe66770addad5 SHA512 ca502444f81898ccda27d61760a357aad59624cf3c4c025d49dd1c2e7bc3ef497c199634247ba7731e016c234e5cd92d2599d1ef9ecd55c3b6e7a64fc4773ee0
 EBUILD ocamlnet-4.1.2.ebuild 1638 BLAKE2B b333c280a66e1500d2c99956c4d2bf21fc034e466fe2e777146f2477f88cf2709e22be8ffb03a1b991ffb9a5f1f28f7bc63b4f08e1fbee2217669313ccad5117 SHA512 5343d7253ae2019b0ddcda5ae1174038c3a32350b17c0b13216c9618f67101006b703e23d92b5462a15af1de250c0bc88754c55b9ea1970118d2a9253b4bfdd9
-EBUILD ocamlnet-4.1.3.ebuild 1585 BLAKE2B 2f56a4f9c6a9e528e08aaf1b393cedad05ea17ddbed7f214749f80cadadae4dcb4986b5d47eecb959de2868667ac76eab41b2b0b9df8a5ca15339d5be17f5ae2 SHA512 9324a69d39084ece0c4bb521d9f51424bb3df5252b216b55949ce64fae8dc73a7e002c080306f0efc2f648666894b3fe3356e5dbf38866f827f8d44a6e72b1eb
 EBUILD ocamlnet-4.1.4.ebuild 1585 BLAKE2B 2f56a4f9c6a9e528e08aaf1b393cedad05ea17ddbed7f214749f80cadadae4dcb4986b5d47eecb959de2868667ac76eab41b2b0b9df8a5ca15339d5be17f5ae2 SHA512 9324a69d39084ece0c4bb521d9f51424bb3df5252b216b55949ce64fae8dc73a7e002c080306f0efc2f648666894b3fe3356e5dbf38866f827f8d44a6e72b1eb
 MISC metadata.xml 340 BLAKE2B a5d53a85c5073945cf7c9c2368fa6f6b290d617f47e4f71482ac784e969e5ac26dc7df9e6261cb892f21d285b28b8ec2cc09e4d196b1e0b137b294ed9aad79f8 SHA512 e3341232ffe5655584bf06dbe24f44909512d2f73cc2f47a67e1c0116e1b86fc410d6910f74f752adcd78fd7706ece9f20367e10a1b4b075a7064f69d6a8b490
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.3.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.3.ebuild
deleted file mode 100644
index 1d38ddb0e813..000000000000
--- a/dev-ml/ocamlnet/ocamlnet-4.1.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils findlib
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-
-LICENSE="ZLIB GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
-RESTRICT="installsources strip"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-RDEPEND=">=dev-ml/findlib-1.0
-		pcre? ( >=dev-ml/pcre-ocaml-5:= )
-		>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-		tk? ( dev-ml/labltk:= )
-		ssl? ( net-libs/gnutls:= )
-		gtk? ( >=dev-ml/lablgtk-2:= )
-		kerberos? ( virtual/krb5 )
-		zip? ( dev-ml/camlzip:= )
-		"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_configure() {
-	./configure \
-		-bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable ssl gnutls) \
-		$(ocamlnet_use_enable gtk gtk2) \
-		$(ocamlnet_use_enable kerberos gssapi) \
-		$(ocamlnet_use_enable pcre pcre) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_enable zip zip) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		|| die "Error : econf failed!"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
diff --git a/dev-ml/ounit/Manifest b/dev-ml/ounit/Manifest
index b7b2cd6de77e..1e2fb4949ab7 100644
--- a/dev-ml/ounit/Manifest
+++ b/dev-ml/ounit/Manifest
@@ -1,7 +1,3 @@
-DIST ounit-2.0.0.tar.gz 103504 BLAKE2B e936d0a3df48eb46623eadfc39a4f64a6776972c713280c388ef5e9e1b6a20d9959a68b30ce21fae7e553e4e43a7ad1cd5652d49da7aa2699ca59fc03e1f1352 SHA512 e12c8fb534ef88de7a83a34e5a578060a90abfce601d8532408412a56e843f69b89cfd6ce69bd7c5519e9a04e306d46339e9b8f13975727a3458afe20cd776d0
-DIST ounit-2.0.5.tar.gz 114285 BLAKE2B d41faf95ec11f16accb70aaa1a9005f468727ebfe01082827669d7a7afbeb44d8cd740376ea9df26a811913b3a87b8d9fb85c0d4690e0d18e6b129949c2b145f SHA512 b2414b7581ec230a949de0d7a677786bb63ef3a3ee0c3dc666d176f83705b5bc8aeab4b6e2327c98714bb26c249d71766ed831ebf572aff2b8829a33cc0e4b75
 DIST ounit-2.0.6.tar.gz 114305 BLAKE2B 94ae4e2f7ace6fe5732253d724115cdc3e24af91db2066b36439501cb17df7f44fb9230242b8400ec59a72f9317c22361f068f7f2634d29ccfdcca63cb95c275 SHA512 466ec1f691a81e0abd93f698c7328e6db4fa2d617d8f5262d9f18b57ede3d389a3ee122ed7bccc8dff20600826fbbae1d17dd88d7c1329562798792fae54417d
-EBUILD ounit-2.0.0.ebuild 469 BLAKE2B 89032c445cb8db73518b2fc945996b6d080b70cb1b3bf3734870db57ab79297162424121ed0af7229c9545f8fe87977b3bb9a6be1976cb7a19e0b2522e0f711a SHA512 73b25b25c9b1f380bcca7e3ab625daef5d2b84d57c8da535f93d547e5e4d4da238bb370261f85358af7c5c04f66ffca4281a262a8aa3e33657c5d8f435f32d0d
-EBUILD ounit-2.0.5.ebuild 473 BLAKE2B 7971d57958b50f8a8eb74add4f51a57cba036636ce6a58b10a51dea1143077b5e74e225babd60a54a2d5a1dd35ee13b577c71a36004f55b2adb9a53e3f784984 SHA512 c517aa5f0d2521050624d0dcfe58089d3f59e013fa7db9809d9045db286d753b0703ab3317cb0e00a390a1fdef38df1d6a5c2c1779c5861ab04a443707fb37bf
-EBUILD ounit-2.0.6.ebuild 468 BLAKE2B 55f1303b5624c091f3c0be4c9f3e0e31d053f99a257d44b4672e42072e5acc9cac57cd48140b6d4b278366fa9f26bfca09ed9d729d044643a5144e225e282ff0 SHA512 8a1241e3c80592bb900ccc170bc661ddf3457fcb0e9ab488f363fe87f592fdcb41132d2504171a22a7b29e8f8552cec2a9f357ee108116cb154b04d1069fc74d
+EBUILD ounit-2.0.6.ebuild 467 BLAKE2B 5d98f2c39230944bc3a2555ed19e649f21b1c0a31b7cdcdd0d903eb3c0c54b073d0cdc2aeeadca27b55b7fc25b8f38a4bf8987f89642dd0dfc91f7ccdc2a08e3 SHA512 1ed4883c62fca5854fc577ebce066add696f72732e5afaebcd5857f17580d45f9a4d5dce0402f1b81ec8e359bd5c39be31814047012e3217a579bd0c0f300fde
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/ounit/ounit-2.0.0.ebuild b/dev-ml/ounit/ounit-2.0.0.ebuild
deleted file mode 100644
index 8779d2f64cf7..000000000000
--- a/dev-ml/ounit/ounit-2.0.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="Unit testing framework for OCaml"
-HOMEPAGE="http://ounit.forge.ocamlcore.org/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1258/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ~ppc x86"
-DEPEND=""
-RDEPEND="${DEPEND}"
-IUSE=""
-
-DOCS=( "README.txt" "AUTHORS.txt" "changelog" )
diff --git a/dev-ml/ounit/ounit-2.0.5.ebuild b/dev-ml/ounit/ounit-2.0.5.ebuild
deleted file mode 100644
index f597ba581192..000000000000
--- a/dev-ml/ounit/ounit-2.0.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="Unit testing framework for OCaml"
-HOMEPAGE="http://ounit.forge.ocamlcore.org/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/1719/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-DEPEND=""
-RDEPEND="${DEPEND}"
-IUSE=""
-
-DOCS=( "README.txt" "AUTHORS.txt" "changelog" )
diff --git a/dev-ml/ounit/ounit-2.0.6.ebuild b/dev-ml/ounit/ounit-2.0.6.ebuild
index 904805aa573d..2a141c85006a 100644
--- a/dev-ml/ounit/ounit-2.0.6.ebuild
+++ b/dev-ml/ounit/ounit-2.0.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://ounit.forge.ocamlcore.org/"
 SRC_URI="https://forge.ocamlcore.org/frs/download.php/1722/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 DEPEND=""
 RDEPEND="${DEPEND}"
 IUSE=""
diff --git a/dev-perl/Algorithm-Annotate/Algorithm-Annotate-0.100.0-r1.ebuild b/dev-perl/Algorithm-Annotate/Algorithm-Annotate-0.100.0-r1.ebuild
deleted file mode 100644
index 7f886f3766f3..000000000000
--- a/dev-perl/Algorithm-Annotate/Algorithm-Annotate-0.100.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=CLKAO
-MODULE_VERSION=0.10
-inherit perl-module
-
-DESCRIPTION="Represent a series of changes in annotate form"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND=">=dev-perl/Algorithm-Diff-1.150.0"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Algorithm-Annotate/Manifest b/dev-perl/Algorithm-Annotate/Manifest
index 4cbecb8d52bb..cba78631f0a2 100644
--- a/dev-perl/Algorithm-Annotate/Manifest
+++ b/dev-perl/Algorithm-Annotate/Manifest
@@ -1,4 +1,3 @@
 DIST Algorithm-Annotate-0.10.tar.gz 1611 BLAKE2B 35c93df4fda8bd217f2966f8bcad9e8e26482b5e345bcf7a2f847769ac2321f8f270b424a75b436bf7aea72091134c2a69e36e5026b8e942599dac7ec3f2843e SHA512 ee828f91876713db6dbcb3ca97dfee57350f1487f3583ecc1874a6a86eeb13d1bb35ee57dad67a8bd8b050417763ff4efef9db49e7061e355972f7a8aa6d000d
-EBUILD Algorithm-Annotate-0.100.0-r1.ebuild 439 BLAKE2B 1cd5d8dc40986849451013628a5573193f5eb5f6c446f10edc2e8b770306ca37bfa63d768cc976cd57d974041e4f562a37e3099c0be70a8c84d70a2e0edc36c3 SHA512 3af486d69056891bbaed8dc72a872f154f85dde88ec508b0914c7929f79e720ed47077e26e97433b1df613c50e748e0ea78d59f43a2ddf3bb87c94c88cf8fc4e
 EBUILD Algorithm-Annotate-0.100.0-r2.ebuild 413 BLAKE2B a649b26e76aea45ac003d3ae5a0573370f6fcf0a6371b43ee7044122752f18f5b71e9cbccea67e45e93a6abecfbc795d632f96fb2e51fdb039fb28d48aa8b6b7 SHA512 e3622bd4e9ed2428efdc6ce5e75bd201532cdae71a6a0cc1186801aee88b6a12f56951fbf034c8a76dada1afaf58221e5d93efe18bd186498f8fbe87f48ddb4d
 MISC metadata.xml 408 BLAKE2B 1e4d1bb009ea8903f4df43df6b59d44caa17a88684fb9fb1972428ceb1fe0716f8a2a257dd085d7e89a2ecb332c83db6876103f7b0e4ab9f0907a6f2721d89c0 SHA512 d83d0383323a7c74a15b918ca67ca2efff174a21667c982cc3f69424ec6080ffa03b5614ddd3c81527cb8b4c49653c06cacbf6f49e45f55f020d56bb99e3b272
diff --git a/dev-perl/Algorithm-Munkres/Algorithm-Munkres-0.80.0-r1.ebuild b/dev-perl/Algorithm-Munkres/Algorithm-Munkres-0.80.0-r1.ebuild
deleted file mode 100644
index 3cc2a5bf4195..000000000000
--- a/dev-perl/Algorithm-Munkres/Algorithm-Munkres-0.80.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=TPEDERSE
-MODULE_VERSION=0.08
-inherit perl-module
-
-DESCRIPTION="Munkres solution to classical Assignment problem"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Algorithm-Munkres/Manifest b/dev-perl/Algorithm-Munkres/Manifest
index 8b30e5f9ca64..4015b80c87d2 100644
--- a/dev-perl/Algorithm-Munkres/Manifest
+++ b/dev-perl/Algorithm-Munkres/Manifest
@@ -1,4 +1,3 @@
 DIST Algorithm-Munkres-0.08.tar.gz 8608 BLAKE2B 6d2830fc609381ff4c3ea099f4a458910741197b4a8d62a07ce2e27ac38611ce48ed238e4ed22ddfe6585dc9673520adf30e8654de2551e37fc5ec54b86d33a5 SHA512 3dcb9cd3caf6fb71c4a6463fbf5d1897f8675be9e095a4c1c30a4fdd2b635d46ac8e7db7ff660ba3c2a361cf4d020905c1cc121e3a6802b9b89a3999d8b41278
-EBUILD Algorithm-Munkres-0.80.0-r1.ebuild 313 BLAKE2B 7609005a7885589a396d7aa37359b00f90624a689e1f67d66ee4758a6056b801e256537f7da6ac88d9a8f9f6e009321f4cff2f6f85349ca1e490c240a9219708 SHA512 1227a664294d164eaf1b14005da489e6ebc92bb649ffee587cd6591f0e965f984541534ed860ab7cc5810b146f823d22245c4e6a5d59c45bf38bb62d01d51f28
 EBUILD Algorithm-Munkres-0.80.0-r2.ebuild 284 BLAKE2B 9070628355826e3ca7e1d44461e1fd1a6d02117f22c27cc5e003968e579ed6713cd80de547398232fc5896cf8cf65b35dbfffc470861d98f0d767120b6aebfea SHA512 dcded8a16cec558442cbbf1583445f4aa374dad457271ef4e694c56982619318a3064307283b8c0fcc86916f903a55af0922f0ff4dae6ada22fa877ded769a85
 MISC metadata.xml 526 BLAKE2B 4145bba3cf578b91d7b19c2cd5ed41028c04ed361015639132973daf77741bd3b815653165ea7333e3c6abce239100ef0b16db7a5f8ba5ae042e402330dbedd6 SHA512 5498007dc708eae066bf0eb2ec80bba8c7b83edc4bb2a83b14992bcf3e6241560c6ee17e13f906879ecdc67a13c0d1b61edce41fb5a982626cffba39bbcc8a13
diff --git a/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.140.0.ebuild b/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.140.0.ebuild
index 4ca80c8d2605..f6655953d886 100644
--- a/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.140.0.ebuild
+++ b/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.140.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="A Module::Build subclass for building Alien:: modules and their libraries"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild b/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild
index 3a6c921064c8..a0602d488083 100644
--- a/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild
+++ b/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="A Module::Build subclass for building Alien:: modules and their libraries"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Alien-Base-ModuleBuild/Manifest b/dev-perl/Alien-Base-ModuleBuild/Manifest
index 89ee1d161660..791c49e69890 100644
--- a/dev-perl/Alien-Base-ModuleBuild/Manifest
+++ b/dev-perl/Alien-Base-ModuleBuild/Manifest
@@ -1,5 +1,5 @@
 DIST Alien-Base-ModuleBuild-1.14.tar.gz 62072 BLAKE2B 64a94621b36b13ad32861c228e787ca44ae8fbec5f1a2fcd65ade8188c44021dbca45fc7f62aa390d10920f670779511ceb96f214b41c4cce2a6424a0f72b47e SHA512 6fcfb7e5525972d5ca565441717143b036ed9c4079700426df2e96d76a91baeaf103ac406a8fa86dfd820929041525d7bb66c32762258cfb7752fb7634171fbf
 DIST Alien-Base-ModuleBuild-1.15.tar.gz 63870 BLAKE2B dc89d63c31cfe618db58cc11c17190b8e881efa3b245c5bb81a99f4c4263a621747579ea5313f646b171bf7446261b01aa2eda45b81ee0a6ef6cb16c5c4092d2 SHA512 6aa366c9748c8470abef2597684bdd68edb952ec9e8f36e31741a3376bd96aea7cd62caeea47a5ff0fb205f6d2087a63a20baf4767f87321fd54dda2727e1a70
-EBUILD Alien-Base-ModuleBuild-1.140.0.ebuild 1095 BLAKE2B e69214a64b8e30a2ed3e4ac5329d031daee9206dd94c01c6d571dc38e0f4a04cb8410fb1a342aa6e6fc690b1f69fc882f7d4598ccb2e75db1fe7e89a52e0dcbe SHA512 2a6881cb0b89d9a6fe30c427c3f125e440c013325e23a5a29d84f4c20450e6a97af3acf0d0ecfd5fe2c982ff7b03734f693052669fcbf9b878121bccf4951800
-EBUILD Alien-Base-ModuleBuild-1.150.0.ebuild 1084 BLAKE2B 64380c2f4f4d120a5c30e991110fbda98fef4b3a7207fa7ea775d89518ad05b9c4d6e040e4e19cd86bf695f4d219e0404494ce5c9be09d1c9cd2a1dcc998a7bf SHA512 493c1c86c758076dfe8da0bceb3eaa0a1ef1549f29099f310f346fa33eb8a560a5af398de99b541ef71ffd1b290b61347fd5b8918cea8bb7b6f6109bcd63d560
+EBUILD Alien-Base-ModuleBuild-1.140.0.ebuild 1102 BLAKE2B bfbc2653dc00d04ae541cca5a82b29a5d36cfb460140b09b2b7a18afd73b24c2c43f67b7194c8682f6cc4af82fede022d7fa0b5785e949e766ebc242e72b36de SHA512 0517e01a06d615466479b95c84a8a11e7d1a0fbee9723feb11e10319a7c8c6c3d6e375ae18f1417dec4e79188c3db45aa1c1cc5b076230915e7fd65ed6acc795
+EBUILD Alien-Base-ModuleBuild-1.150.0.ebuild 1102 BLAKE2B 47d4641ebb16714830f8157a86efa3b065bbd97ddff9732582c56605242f294e4e60d59b43ef2bbbc9666bac5af61283dc7a148a2560b7cdc7e6aaf489458f74 SHA512 591293d22f0c1a000c8dcdb5a20242e30e649fb0a6357238a8cf904bcce5278ede6f21b6e17b4f830a5a6b3317aca9e17fc3e82b215dd4354ca16f9dcd2ddb68
 MISC metadata.xml 1122 BLAKE2B 6b3c55547713e9615d690e18923f9540c2581cf19d13d59c5e701c4fdd2794144fb9a65a8bddeb3922bd9b57f7516803d0b9b8e490ca8576be574107a696ba96 SHA512 6fa6ae3591a2114b245228458b45d710aeca571746996d2f6c4589f3254e3eaea1ac8f63c03b9af78260086fb701378995854f9674e164ee00215e8d02648346
diff --git a/dev-perl/Alien-Build/Alien-Build-2.290.0.ebuild b/dev-perl/Alien-Build/Alien-Build-2.290.0.ebuild
index 3828f4dfb4d1..4c17120855eb 100644
--- a/dev-perl/Alien-Build/Alien-Build-2.290.0.ebuild
+++ b/dev-perl/Alien-Build/Alien-Build-2.290.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Build external dependencies for use in CPAN"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="minimal test zip"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Alien-Build/Alien-Build-2.320.0.ebuild b/dev-perl/Alien-Build/Alien-Build-2.320.0.ebuild
index 137bdfac4124..7680876a3d79 100644
--- a/dev-perl/Alien-Build/Alien-Build-2.320.0.ebuild
+++ b/dev-perl/Alien-Build/Alien-Build-2.320.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Build external dependencies for use in CPAN"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="minimal test zip"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Alien-Build/Alien-Build-2.330.0.ebuild b/dev-perl/Alien-Build/Alien-Build-2.330.0.ebuild
index 766ace9cc282..3120b732589c 100644
--- a/dev-perl/Alien-Build/Alien-Build-2.330.0.ebuild
+++ b/dev-perl/Alien-Build/Alien-Build-2.330.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="Build external dependencies for use in CPAN"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="minimal test zip"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Alien-Build/Manifest b/dev-perl/Alien-Build/Manifest
index be59ea6db343..8b25f33e8f3c 100644
--- a/dev-perl/Alien-Build/Manifest
+++ b/dev-perl/Alien-Build/Manifest
@@ -7,7 +7,7 @@ DIST Alien-Build-2.33.tar.gz 328283 BLAKE2B 2b793a65fdf08bb767cf96fd4e8eac2d56a7
 EBUILD Alien-Build-1.790.0.ebuild 1053 BLAKE2B 640a8726f878c03bbedffc05322510233a4a47276d915b15a6885013daf3c8b1a14376d9e408af13c9faed987a2cb7eaa8b4f5c215adbf85b62849b0565b5b66 SHA512 e7eacc8fa2e86c35a4f108d80f2582acef60b9be48a4e45257aa6b8237d34aba8b253954a917c265fea7a0d13b226bfb194d1f2d438cfd62867f89242c98e3de
 EBUILD Alien-Build-2.230.0.ebuild 1096 BLAKE2B 56adb9a663198b101a4605c749162a3a801510fa43b3ca0a560a5632a4d654f5d41878c7bbdc638ef234b22efce317f64f8ed35054e2021a6e7c9567fb0bd439 SHA512 78e287418ae4ef2730fd85f13ef742c9e0c6ccf37556144f0889721c9d279e071f6d222892bcc918b1eb03a37305c63ac545fdd2f49bbb5353c76273c9206875
 EBUILD Alien-Build-2.280.0.ebuild 1105 BLAKE2B 69eff4b4f68be868ac61f8501c4a754a5146838fbde0f9f155816ec792b4951973a5d60ef50573d7a2fc95268068a8e0c5fad0d4b30a701d19b6304518a8e557 SHA512 4ffe5afb1c0a27219e2a1ef6a95b422e8b70c7ec354f947f2465b4254f55aaa6aaf3a3ba44ac44d354ab448b7280747ed84b5c6ef2037a17744667ecc1277298
-EBUILD Alien-Build-2.290.0.ebuild 1275 BLAKE2B 8b68f86285364dcdddb25edb12c0f8af1d50ed45ee427628c38df4dbc51d124a7fa891a6499396b1d720135da0c4b46eea1b07a438d80bad21b2a6c059b7d275 SHA512 58debcbf0019bdb6e6ff4ddd3894efcd9e3d9f8f65f809dc7e3a5896fa36440ee19fef8ba9bf6c4705d840ac79d9a508d69530eb850ecfb5b8af21db658f5cff
-EBUILD Alien-Build-2.320.0.ebuild 1275 BLAKE2B 47d8cfda0bb565b15c791d564b3f66d508dc14a8003e181677457244c4c2c344395ea35dd6601303d1e722fd5d37224ec578d4060d31bf2fb648505b7ddc5f58 SHA512 0c87f9072fe029bed7c06ac6fe432ac6866161e16677a738b615dc5c2240b7f0f9a06335498a82461c0a6e6b743248f8d8c712b01d3224a6b9b7702d6c6c8c77
-EBUILD Alien-Build-2.330.0.ebuild 1275 BLAKE2B 4fb333192499c3c9ff0599d1d35b8d4ec95bb97ce09c7b8977b1f225f91fe68cf671b992aa371a7463e577b9e77568e611fe62888d2c4cea3107313a0ec7f8d0 SHA512 62bdc63cfec02fceaeb3f933df919e484b4309173a40a35a263c773dbba73c73050a82f0e6302c3fa47c6112f88f533c05127ad969360017ee43c304ba8610c6
+EBUILD Alien-Build-2.290.0.ebuild 1282 BLAKE2B 8fae5740ae7186ef08000501eb6d94875b4156fc02211874aa4108c4e015ecc97d37bc24897527e30751f934266faa0f27516a1a9d4cd24fa9532bd4838a212f SHA512 829bc5b5d97ce3513fc3d6a6cba8fe95f26d930eca015ca5ec037a3a6394dc9399d0767f293639a7e968004177b65eea23829bc90604a109dba89c0e557d4e94
+EBUILD Alien-Build-2.320.0.ebuild 1282 BLAKE2B 5bbcaf9953c5d99e9deb364e285552f93c83404cdb9809d0f5069b96c0ad9739bff549d235ebdd19d2d8412e4f57c2ea754b2054e715c36bbaadbc0bc5937c23 SHA512 e1067a2c62eb83891ec343bd9449b85016e2c16df2d29305ed95e277d5fa204435d097842f18829009fa47552aa77908f6162f503d7d494a9ca761f20501b18c
+EBUILD Alien-Build-2.330.0.ebuild 1282 BLAKE2B 2b97c707f8fec149602bde9f797fc357c203ecda5ce2e36755f3a4dd7aa90d48bdeca3a55add369a99088703235cec858442a7e2b49befbdc5c08eb97e3ccb4c SHA512 7df994fa1b36201c58ad6bb6a31ff52f44abd612652f43dc1ebf4cf8617b51498c89d32be6c9eeffac61a892056996550cae558568edf51efd4d97e779c723fc
 MISC metadata.xml 6070 BLAKE2B fa07bcd25d8424fd55b3c2cadc9c6fce88df3b82cc9e3a527a81ab64c37281f5e24423f8edfcb55a5f1ef8320d0681b97bba3686a5567fba55ab59a0163ffee6 SHA512 330bc596318d3c59e2e71ba7d8ac842ade71832279e55585997e362b740a5523af14a959590ccbdb795aa916c2233d3edbd08bccab7d6c09e4ac6d7198381e06
diff --git a/dev-perl/Alien-SDL/Alien-SDL-1.446.0.ebuild b/dev-perl/Alien-SDL/Alien-SDL-1.446.0.ebuild
deleted file mode 100644
index 00f674f9360f..000000000000
--- a/dev-perl/Alien-SDL/Alien-SDL-1.446.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=FROGGS
-MODULE_VERSION=1.446
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="building, finding and using SDL binaries"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-
-# File::Fetch, File::Find, Test::More -> dev-lang/perl
-RDEPEND="
-	dev-perl/Archive-Extract
-	dev-perl/Archive-Zip
-	dev-perl/Capture-Tiny
-	dev-perl/File-ShareDir
-	dev-perl/File-Which
-	dev-perl/Text-Patch
-	media-libs/libsdl
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-ExtUtils-CBuilder
-	virtual/perl-ExtUtils-MakeMaker
-	dev-perl/Module-Build
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	tc-export CC
-	epatch "${FILESDIR}"/${PN}-1.444.0-fix-build-option.patch
-	perl-module_src_prepare
-}
-
-SRC_TEST=do
-myconf='--with-sdl-config'
diff --git a/dev-perl/Alien-SDL/Manifest b/dev-perl/Alien-SDL/Manifest
index 47c5eef08bf8..d321f3c05305 100644
--- a/dev-perl/Alien-SDL/Manifest
+++ b/dev-perl/Alien-SDL/Manifest
@@ -2,5 +2,4 @@ AUX Alien-SDL-1.444.0-fix-build-option.patch 1063 BLAKE2B 6a2dfabede9da1a517a849
 AUX Alien-SDL-1.444.0-no-sysclean.patch 933 BLAKE2B 16b1dce97122001a80582e6ed35f2db44e388ee77538d0fd0f62478db0659bd629318154393c2284fc73a93b2f190f52630b9029086b205c982b2b7ab51f796d SHA512 3a8575c73fe95d5ff3ee1b87bae0135f91d16b9903d5cdae7a3fde7df263baad4ea40759bacc5cb9d3bda16f515d26a83faeaa06d1525524920f419456cb1421
 DIST Alien-SDL-1.446.tar.gz 350448 BLAKE2B 6513873f9cbd2435af06676d8b63ddaba2aa03f3f080259299704acfd80d59f26e8eea9845152fe44de6c59751190faf7b0600fe65dea3e1639d1e6795c694be SHA512 dfb5f104f449857b9567ca93a0c3b15aed2618e27019569c95c4b7469e1f7d5cc390fe2dda9c6add41e9648c1f6efe053d08a4bd0fcc5bc546a217721bea824c
 EBUILD Alien-SDL-1.446.0-r1.ebuild 1015 BLAKE2B 40962f54b88b707978aebdd9a26fd603f99831e3a6bf5d542d15f2090b04e0e82d748bf2858b2f09fae64d2ab0e4ac1c22cacd4c9ab6cef9feb7b51dccef5ef7 SHA512 5db675ff49299abe5ba02d056a89d2c7675aade240514322a0e7e842b2c016f826c5b578e0e4c0763e2c9a8000c766143d2f9d7d0e03b1fc085feae3373a2d53
-EBUILD Alien-SDL-1.446.0.ebuild 872 BLAKE2B 970f2368ab0de1602c1543eeff15e38bde4988f62bad0408e08ad9735e41786338f2a772ce411bee212abe8077bde8ce574b99be344bb32bb32311e63941f18f SHA512 a84868f6e095402d697bf3966ecd5ae8a43c820e2606ac5d0324a0b10c3477d9a97d7cb163ffde0e9a10ef200a6d8eadebd267ed991f92fbe21ab0efebfd43e5
 MISC metadata.xml 510 BLAKE2B fbb9b903178e973b6b296442f00b9a14ec71ee9ab020ad6c8d2c7085b8ad7f5d300c19a0fe4d5dfbecca1db8832bceb34e42a07ca96f21af19f357a215f23e76 SHA512 aa9df2337c60f4d14eaa3e6b793f261b4bf48f48615a050dc1719c17c92a516bada5759f3b8d2ced06b3c4b276749a43b484cc4157099a2c8adcaca48b4d3b69
diff --git a/dev-perl/AnyEvent-HTTP/AnyEvent-HTTP-2.240.0.ebuild b/dev-perl/AnyEvent-HTTP/AnyEvent-HTTP-2.240.0.ebuild
deleted file mode 100644
index 3d1cc696d187..000000000000
--- a/dev-perl/AnyEvent-HTTP/AnyEvent-HTTP-2.240.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MLEHMANN
-DIST_VERSION=2.24
-inherit perl-module
-
-DESCRIPTION="Simple but non-blocking HTTP/HTTPS client"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/AnyEvent-5.330.0
-	dev-perl/URI
-	>=dev-perl/common-sense-3.300.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/AnyEvent-HTTP/Manifest b/dev-perl/AnyEvent-HTTP/Manifest
index abffd1b74c91..3d560b6ad401 100644
--- a/dev-perl/AnyEvent-HTTP/Manifest
+++ b/dev-perl/AnyEvent-HTTP/Manifest
@@ -1,5 +1,3 @@
-DIST AnyEvent-HTTP-2.24.tar.gz 31399 BLAKE2B da386e02705a90b6eda0118f760de1f646c89a24aff4233c8e0831adc6be474171fd513336970ff6e21aa8cac99e3b8f280a598372cc11f83224719f0ed7670b SHA512 53fdd2105773a8dba4f128d3b01a243179464d31f7e94b28bb447c8e3435ad6169be57f35e49f4d6f3dee8a0aef93980ca1d626a95495a6a652ddc7575075e9a
 DIST AnyEvent-HTTP-2.25.tar.gz 28514 BLAKE2B d42cd3ee456ab270ac8cebbd604ebf2564d9ad085f62b7d3dd19705a5d64cd5d904079f0396bc273136c1e18b033eef3a6854833ca889acdbef59c0c1d88c5d7 SHA512 bc189a6a37cb3c3b6f1c36bd965911e110019fec5b8f82bea60dab2e3cf0dda0117a83a5f0608f7865f457b016f94f1ccc78939e22849bceb82a096edc24de9c
-EBUILD AnyEvent-HTTP-2.240.0.ebuild 411 BLAKE2B d7169d939791ec32f2b03a4fd71edd3efe82aba48f0676c11c855386c58d4d4bb897df9f90ef1268002e776e60b0240db8448761e57b7a490332d9cf6584e7b6 SHA512 2668bae32728bb8675620baf3923405d64b7a6ded770f906fdfc682e168a8474098c85b2ed49c147f82cbc64ca378892b6884c61bfc63e0f4223ea1621050a24
 EBUILD AnyEvent-HTTP-2.250.0.ebuild 404 BLAKE2B 75b8c42f127e6f5b309ad0f3d68feb7a44ba4bd33542936b65f2f8307451c364ea8761eca1b3fd261475e49acd2b9abcaa010fb60979bda6fcfcf584d963ef74 SHA512 5a4c9c6976bb4c77c05c43acec8c4f23d0949394445d08367d3f03894470e916affb638c73e7ed894008a983f5e0b80b8ba5051d3af543455144b8a9843307da
 MISC metadata.xml 382 BLAKE2B 7099615c375d36bef70f0b7aa57fb4c1edf86021344668ea180d132263578c00e4da829c8ce8fc053ee9bb9fd4393eb3aea44616f1d302465cd6d6c83b8758a4 SHA512 d3d0367890ad7dc71b53544e5ac2de5959146a04098f4dec025b1dae5f91fedfef912fdcb24cf6ad3b031a5667eec5e0340cbef758dfacb5773cca0b355abb74
diff --git a/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.270.0-r1.ebuild b/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.270.0-r1.ebuild
deleted file mode 100644
index d4f49ea9393b..000000000000
--- a/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.270.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
-
-DIST_AUTHOR=MSCHOUT
-DIST_VERSION=3.27
-inherit perl-module
-
-DESCRIPTION="Perl Authentication and Authorization via cookies"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=www-apache/mod_perl-2
-	virtual/perl-Carp
-	>=dev-perl/Class-Load-0.30.0
-	virtual/perl-Encode
-	dev-perl/HTTP-Body
-	dev-perl/Hash-MultiValue
-	dev-perl/WWW-Form-UrlEncoded
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=dev-perl/Apache-Test-1.390.0
-		>=dev-perl/URI-1.310.0
-		>=virtual/perl-Test-Simple-0.940.0
-		!www-apache/mpm_itk
-	)
-"
-src_test() {
-	perl_rm_files t/author-* t/signature.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Apache-AuthCookie/Manifest b/dev-perl/Apache-AuthCookie/Manifest
index fa3b74afb388..41edac82c15d 100644
--- a/dev-perl/Apache-AuthCookie/Manifest
+++ b/dev-perl/Apache-AuthCookie/Manifest
@@ -1,5 +1,3 @@
-DIST Apache-AuthCookie-3.27.tar.gz 58156 BLAKE2B b4f0e94ad28616584c77505fdebf393571b7dc3629cbeebad7854dc88ceb1c3f59b313e796d9beefee7dc13a584a013ad970f7283f5e71a372ccb6be8455b41e SHA512 580bea66d52382cda5d0d55bdac1c323d60641de60e670da10d24ee20ef570a6f46f3b3b45a8f11be347af3597494595224e7b27e986eece1650086385e9ecfb
 DIST Apache-AuthCookie-3.30.tar.gz 62722 BLAKE2B cbfc5ac6080611dfbb0f14eadc99887c9652ee96325124f760d49e47e1aeab7c987e4a9814c5cdafad4a85a14ba3a1600cfd928752fbd22422fb8c7e4914d02b SHA512 8a8c2f28718611efab7683590e51c895da0232452be50d50e8c1abea68baec182e99eb72e33d867cbda474f39d9fa377e0048e7c38054e000c0634d7068ad1a0
-EBUILD Apache-AuthCookie-3.270.0-r1.ebuild 750 BLAKE2B 6d3be4eb8b5e69aabf91b16f36a54213a450cdef2a95fd54ba9ed9a35c13fd25a01cbef58e7be77121aa9057fbadad013fe7b289025c814f5fd2940b85008e64 SHA512 881865b5fda6c8ee24e29ba3e0048fc653f895d563494513c3871634ad3d9855f2b1fc5212819c689d9d9a97c6aa868b1559556707a96220eb3c7e3123fe8339
 EBUILD Apache-AuthCookie-3.300.0.ebuild 750 BLAKE2B bd49fcebe95011c7158680e644c65a3127559f05ee32038e1b6478f8cce963ea9d0d29e35ede6ae2350b333b3bcc19cac815669e7b07d5042954863bd3bf91dd SHA512 c910ccb486c0e139b41899d5232980ba455471bda8a002935bdcefbb172ec7d7c7d755a9a20832ff41e21fecb281cd3322b8484e139139a3b955c77442484e73
 MISC metadata.xml 1358 BLAKE2B 382c20f86cb25c97fe95d596813957e31ef7da1df4fd08ff8608678f9ff1f130664c85ad894d22373c3df18cb32cb2bec5ddf8c7ab1fa0f34a3bf7b24962eb42 SHA512 0c65d910ec6a25d9ad669ced9a772c723552bf194d31875ad9cfc1b8994af59b32dbc5d4227ce08052b10e224c0db3b8ca2fc657c097bfd016b3a07898fab936
diff --git a/dev-perl/App-perlbrew/App-perlbrew-0.840.0.ebuild b/dev-perl/App-perlbrew/App-perlbrew-0.840.0.ebuild
deleted file mode 100644
index 517841808132..000000000000
--- a/dev-perl/App-perlbrew/App-perlbrew-0.840.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=6
-
-DIST_AUTHOR=GUGOD
-DIST_VERSION=0.84
-inherit perl-module
-
-DESCRIPTION='Manage perl installations in your $HOME'
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-ExtUtils-MakeMaker-6.860.0
-	>=dev-perl/CPAN-Perl-Releases-3.660.0
-	>=dev-perl/Capture-Tiny-0.360.0
-	>=dev-perl/Devel-PatchPerl-1.520.0
-	>=virtual/perl-File-Temp-0.230.400
-	virtual/perl-JSON-PP
-	>=virtual/perl-Pod-Parser-1.630.0
-	>=dev-perl/local-lib-2.0.14
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-Tiny-0.34.0
-	test? (
-		>=dev-perl/File-Which-1.210.0
-		>=dev-perl/IO-All-0.510.0
-		>=dev-perl/Path-Class-0.330.0
-
-		>=dev-perl/Test-Exception-0.320.0
-		>=dev-perl/Test-NoWarnings-1.40.0
-		>=dev-perl/Test-Output-1.30.0
-		>=virtual/perl-Test-Simple-1.1.2
-		>=dev-perl/Test-Spec-0.470.0
-		>=dev-perl/Test-TempDir-Tiny-0.16.0
-	)
-"
-mydoc=("doc/notes.org")
diff --git a/dev-perl/App-perlbrew/Manifest b/dev-perl/App-perlbrew/Manifest
index 051b289fcc76..89bce0517263 100644
--- a/dev-perl/App-perlbrew/Manifest
+++ b/dev-perl/App-perlbrew/Manifest
@@ -1,5 +1,3 @@
-DIST App-perlbrew-0.84.tar.gz 83189 BLAKE2B 06d1a33c6d564c380a585e9f859e9a2c4b3df5bf32dff9b8b0e80069b77ccd60058b2a2d8fda15624fda399b26daa24643dba32090541176553400eb176c5761 SHA512 2e283a6e6f6c4ca78a50548ad80b91f5f5b791bcd46ce1881037e3c1bb52c1863879c978cb621c55ec26fc97d24163c4f710812c0fef868cd6dd3ebc2aa1eb0c
 DIST App-perlbrew-0.88.tar.gz 92126 BLAKE2B f7bff0635d9d3d768f781ffd0f67c69db4d837b7f2dffc72a002c3dee4ea2e7cc04b1e4ed46e68e52d675859516b88832be563f8cdfa35d6dc6cccc875ecf265 SHA512 16a60637f9de4ca12b270b3a6946b15b0881af797e5f811be601895ed25db0eb98f6056a219025213f439ceb5f2253bb175e0efa5d3742fffd7820fcf0433115
-EBUILD App-perlbrew-0.840.0.ebuild 988 BLAKE2B 93b7e75df4e4c57c2909e296aa1b725ab60fe468673e5313006012a6ea9ba3c5d17d4128ca93df91130f746cce386ca17eebd7b471a997d0f60c44f8e7aff985 SHA512 2784eb181494825994e543144823222a303dd446bb1fdd1b0f63deeb1b46f72f18f5ee69641aff26bf0f4d521cd5c283c7876facad3a4270152be0b669e0b29e
 EBUILD App-perlbrew-0.880.0.ebuild 1623 BLAKE2B c026fb9c7e69a2bde4f86ba917ebed88e24d5a84d552fa07c61b42147956f40becb9da90e61ac965c6326ab964548f8d0d51e20d6fe61542ad824a85bdbb4ddb SHA512 b722f1b7350e04f00f9b0ac40cff0b20cb74ba2b8288faff45b02fab1c0c49aa8ece7c6c727a69f36a68b97b7ea54b413f8b0b228a75315fcbeefd4cf2b0757f
 MISC metadata.xml 805 BLAKE2B a5399dd449fc9c317b1ba815f8fbf91f7c1af8c995b4571b31e079369960f2f04f2a3a36a6e31be1f314a60f936c1f5157df629db3143a5f7a2a5684c5c30d24 SHA512 e1c363c3654dcf7de70dccbb1185bd9c2ecf54dd1fba0ddce2a6bb86bfdb1b197abcac8d68856a5aaf0c608f052f39d94a0d3fc5579331f45a07d01ff34576d0
diff --git a/dev-perl/Archive-Any/Archive-Any-0.94.500.ebuild b/dev-perl/Archive-Any/Archive-Any-0.94.500.ebuild
deleted file mode 100644
index 9cfc951cd015..000000000000
--- a/dev-perl/Archive-Any/Archive-Any-0.94.500.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=OALDERS
-DIST_VERSION=0.0945
-DIST_EXAMPLES=("anonymize-archives");
-inherit perl-module
-
-DESCRIPTION="Single interface to deal with file archives"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Archive-Tar
-	dev-perl/Archive-Zip
-	dev-perl/Module-Find
-	dev-perl/MIME-Types
-	dev-perl/File-MMagic
-	virtual/perl-File-Spec
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.280.0
-	test? (
-		virtual/perl-Test-Simple
-		dev-perl/Test-Warn
-	)
-"
diff --git a/dev-perl/Archive-Any/Manifest b/dev-perl/Archive-Any/Manifest
index 72ff14624928..ce5eb963f794 100644
--- a/dev-perl/Archive-Any/Manifest
+++ b/dev-perl/Archive-Any/Manifest
@@ -1,5 +1,3 @@
-DIST Archive-Any-0.0945.tar.gz 193669 BLAKE2B 7d6e726c9316dccf47e33b30d992c4d01a3f64ceac549d0c6a733f00e1844571e60c50adba5e37ff312a28899088e9282b6e2ee505ebd2567c3e04c143705035 SHA512 a362a6b85eb2aa3fa90aa004b2216492b06982d7c52b1c8feb7a90c506b57a492834ddb2d2d5ccebd6a340c95d82058bce6b1e2fba79160e38ff10ded82ea86a
 DIST Archive-Any-0.0946.tar.gz 202588 BLAKE2B 57fbfc558de39681db035df745d276f8b5a6ffde11a434937acc804b0afc9eec42e534b92b2c6816890b6aa628596675bbd4d0cdec69831fa1eac85634ad054b SHA512 705649df672da278004e373d511691b733257b35fc4f5767b193c617776b26d1147687607f96accf678d1249aa9640bd3af52fc391e3a14ed8d99d937221b0eb
-EBUILD Archive-Any-0.94.500.ebuild 604 BLAKE2B 6423b1a8274056895dbfc4034a32447584f7202227c456eb13673d2aa76e1126b9a255a4cfc7c50f8373df94fae7cfd8687fecc5baf1b314d4c8914e493f3c9e SHA512 fc1d52a5c39c94b89a781a71b5c44c5bbcba1cdfb5592dabf8f575614b850832e6ddda5cf9d2375b293808822646b02b223b2396a118289a8269d8e34970072a
 EBUILD Archive-Any-0.94.600.ebuild 605 BLAKE2B 3c55ed82ad4395b1fb3eecfe741f1d56fd249e179e5ec91eaa60e5befaea0ab0f200d5ae45406f5f6f6e3df4bcb104a8a5a2f9b3f92b6fd5524b89ca827118ed SHA512 7c8a646182ee96e1619e057b7d4467b83f23972b35fea3b3062af48618ad0f68eff6a4997242d120ec9e933ae0cce1bf694c0fa41a22c0d597863f676b74230a
 MISC metadata.xml 865 BLAKE2B 89f910339bd560775254490aec46cbfeb9bb70b3aee935b5d96c0bfdb33fe5346153e7172254f006c4256123ffde4791b72bd50a798e0bc88c6771807af6f459 SHA512 a3d2b3f70775c86f52e15b5264614041e11afe64c9419fb6f8446a077027dfa6d64f736f50860d3834b2e6271ee8522d64e2715471bbb53599bd63339dea6ed3
diff --git a/dev-perl/Archive-Extract/Archive-Extract-0.860.0.ebuild b/dev-perl/Archive-Extract/Archive-Extract-0.860.0.ebuild
index d99db1fc0af8..799e52247a29 100644
--- a/dev-perl/Archive-Extract/Archive-Extract-0.860.0.ebuild
+++ b/dev-perl/Archive-Extract/Archive-Extract-0.860.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Generic archive extracting mechanism"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Archive-Extract/Manifest b/dev-perl/Archive-Extract/Manifest
index 12c9960be1e2..62664361b025 100644
--- a/dev-perl/Archive-Extract/Manifest
+++ b/dev-perl/Archive-Extract/Manifest
@@ -1,5 +1,5 @@
 DIST Archive-Extract-0.80.tar.gz 27813 BLAKE2B 0775eab96cfb67d742ecb2663fc58133368358187f22e89ed0b1bb113bd0efd680b800225fb65ab11379feab767aa3e6c31a7cac2b018acb6341799d4d605fb4 SHA512 2f216ea29639c4d8b7b19e4b23542b6f69e970cfb0188dca55ff7ce7d3a3021e43129dbdf81b82f7d97d0080d00f858c6af3595520b6bacac30073a8b25ea4f0
 DIST Archive-Extract-0.86.tar.gz 28033 BLAKE2B 0a2f6551d31d43256405379c980e5f671e4a9b168050a0b08b8ecc2d076b5f3cdc49075f1001646a3d2c0b9eb60aefd79aeb11997f2de3766cd9b23839bbdac7 SHA512 a091b8c489275b8dd3d38e52e983bef7cab7d642e0dc8f6e95f1d8d006d769857b4e5950778bddd3044d6f11b3563c7796361e88869f60a9875529b78c9d1c76
 EBUILD Archive-Extract-0.800.0.ebuild 596 BLAKE2B b57cc87c0a141ed829dfb9a807820a4fcd99f777953902d870fec9819d33e36f4c3d6a6c9911f2cdcf0104193bd476013f32095738d679d52c4b0948f9fd3603 SHA512 ade7f9beb8abee53031a221ffe461c3f138524d86b4cadf5065ae50cd29a61893fc1667f8c65ac02400ac89d598c6484480d042cace48fdfc6d2230a4a224a15
-EBUILD Archive-Extract-0.860.0.ebuild 682 BLAKE2B a7438d061b5c0e8202adc704783778945def738a50f91cc4e63e6652014f093e91bf80ebc4c3a1d935e6e62fd3b2a948ccfd02a2657e472f40facca59eae9fba SHA512 bc752817521942dc7a731e6377937533c6fe33919bebfdf55886bcbe512a942c7d1c436f07a1742f920f3847a75e30c89585579fae6fe523c1ba56e44e29ed61
+EBUILD Archive-Extract-0.860.0.ebuild 689 BLAKE2B 180990163ac2a641ca3de9368e32bbcccc474ec4a6357448a6dcda1f95ecf5ba996d3c59b74b9152ed0ce63c9d92b86479832bcd0ede56290aaa6e5c84856727 SHA512 531dd86d7f4f3c2d334146a68264e909115abfe44201a6331c95b01d02a829b253578aaab320fc0f6b5881f7177f9d1f158a2c6b448ff2d38adbbac7936af17e
 MISC metadata.xml 402 BLAKE2B aee0776ccde1281bb3fd9c85a90ed3356049950661f6423ed554548176d57390063843d97ff04911d097159ab7beee830c87049c24d7a50d61cbff69b654e627 SHA512 f29fbff453d0747d68b69d7710ffa8bccd9ce0a2aca7c7e354d044c992aef6562a4d22bab695b7e956861c70bb372fed6b914425f02042c5aa4d24cf06bdf622
diff --git a/dev-perl/Array-Window/Array-Window-1.20.0-r1.ebuild b/dev-perl/Array-Window/Array-Window-1.20.0-r1.ebuild
deleted file mode 100644
index 8fe9a5bd9d3f..000000000000
--- a/dev-perl/Array-Window/Array-Window-1.20.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ADAMK
-MODULE_VERSION=1.02
-inherit perl-module
-
-DESCRIPTION="Array::Window - Calculate windows/subsets/pages of arrays"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/Params-Util"
-DEPEND="${RDEPEND}
-	test? ( virtual/perl-Test-Simple )"
-
-SRC_TEST="do"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install /use lib q[.]; use inc::Module::Install /' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Array-Window/Manifest b/dev-perl/Array-Window/Manifest
index a90096f55a41..3738cc4c0024 100644
--- a/dev-perl/Array-Window/Manifest
+++ b/dev-perl/Array-Window/Manifest
@@ -1,5 +1,4 @@
 AUX Array-Window-1.02-no-dot-inc.patch 469 BLAKE2B 31e82e3fa663ae74f4be422a6fd23a0dd764da2b9adf83bd50be9f344a315aeffeaf0424039e75301012c2d1bd402cb7ca532ec9e52b84215c45e06460d36f11 SHA512 8ef4ed23fee4bd2967515d7416f411fbbebe317abcb55a513a0da5687659e9fd65e1b5b413df0d41dc21ea7d976b1a3ba5a9a895a22f96ff65c71cd5ee9e9bf3
 DIST Array-Window-1.02.tar.gz 26434 BLAKE2B d9da2b9fd1e8107f7505306cbd23be0a18dcc0cf7286022f743e43c73bf5f83e5b690d410a475bdf9f74555df5a7dda854ea320b28180959122b80b8ae034c13 SHA512 ae28c4d36b6a5f6ab0b229b42ec3ae97f3d55da1f94cde1cddd5c7c7633e55437f610b39fd126e5b63982778c0afa1f7b4a5dfa98757fe391200319d2a7f894e
-EBUILD Array-Window-1.20.0-r1.ebuild 629 BLAKE2B b931a81a1eec1cd3abf548b7a40fe834db13c221ac7e13a69e7c3fc686370a8333940209b3c70d8c91f87a62cd69fcdda0faeee3cc6ad2913350f2f2272b9690 SHA512 68f55bf9583f2d8e0c755045297746d77911d5ecfc236d24a443141257546ba58b44da6685587f385752ba76a06d7d7082a2a141bc14d8cc1da754b2fd0ac8c7
 EBUILD Array-Window-1.20.0-r2.ebuild 535 BLAKE2B be82b197fbf3ff5b08a5c555cac62022e3a5cd53a60887fd3b6f92e3bdfe3406e4786459a6d828fff8f5ad13e7a68755591424c486584480ca99e8b54fa59de2 SHA512 9c621f84e35cc5e4b3b0d043adb8726e168f867ca13c25ca2e77ed5ba997e0157122b732558a87ffc11293ae752b9270bc0c3307234b462194d218b6a8d42aed
 MISC metadata.xml 396 BLAKE2B cc555164980ce7a28378d61394e840cfe0918fa1b60e0f77e01ea69d993565a30d292e9b106ca47b576acd0bfc3d7dee6dc86259b23d1635bed335d31c3526ce SHA512 854ad5afc69437eb9ea21f2e979ddb599d8e401d32b15037355ec3129ce32a1d1fa2f3332ac2dc6483c88808036a09528ad596c8185db3c699c0ebcd8823edd8
diff --git a/dev-perl/Audio-DSP/Audio-DSP-0.20.0-r2.ebuild b/dev-perl/Audio-DSP/Audio-DSP-0.20.0-r2.ebuild
deleted file mode 100644
index 38bfa6e2f43f..000000000000
--- a/dev-perl/Audio-DSP/Audio-DSP-0.20.0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SETHJ
-DIST_VERSION=0.02
-inherit perl-module
-
-DESCRIPTION="Perl interface to *NIX digital audio device"
-
-SLOT="0"
-KEYWORDS="amd64 sparc ~x86"
-IUSE=""
-
-src_test() {
-	local MODULES=(
-		"Audio::DSP ${DIST_VERSION}"
-	)
-	local failed=()
-	for dep in "${MODULES[@]}"; do
-		ebegin "Compile testing ${dep}"
-			perl -Mblib="${S}" -M"${dep} ()" -e1
-		eend $? || failed+=( "$dep" )
-	done
-	if [[ ${failed[@]} ]]; then
-		echo
-		eerror "One or more modules failed compile:";
-		for dep in "${failed[@]}"; do
-			eerror "  ${dep}"
-		done
-		die "Failing due to module compilation errors";
-	fi
-	if [[ "${AUDIO_DSP_HW_TEST:-0}" == 0 ]]; then
-		ewarn "Comprehensive testing of this module needs hardware access to dsp"
-		ewarn "devices. Set AUDIO_DSP_HW_TEST=1 in your environment if you want full"
-		ewarn "coverage"
-		ewarn "For details, see:"
-		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Audio-DSP"
-	else
-		perl-module_src_test
-	fi
-}
diff --git a/dev-perl/Audio-DSP/Manifest b/dev-perl/Audio-DSP/Manifest
index 952b905a1218..833f266db81a 100644
--- a/dev-perl/Audio-DSP/Manifest
+++ b/dev-perl/Audio-DSP/Manifest
@@ -1,4 +1,3 @@
 DIST Audio-DSP-0.02.tar.gz 28446 BLAKE2B 6c330c551afc411c26347feaa667c9d7ae8a2b029a52d79e3e2f259e46a35fc02d869b901abdb3b71b8ac814c6cefd8601d51e388e7f0451aca0764c5fcb676d SHA512 19b4526962ac2f229f9fca4490e2542e4c259e35aea626f684a225a673666b632f6c69cf33d0940f97bfa7b3c8a2ba86674dc1efe8efb432be9bc0a371d61fa2
-EBUILD Audio-DSP-0.20.0-r2.ebuild 1069 BLAKE2B 2012558e7aa44019a7ac6f59911813717a54b402100eb39ac2c831110a567522092a995316faad7a2ef6c427dca2e8a8f96e0a794a309fe7cb62af4595171047 SHA512 50591d8c97ba29e568896b6fd51c38946f53d05c3b455db47a04cddb45a6c163cbae1fc4073a5ace344d7324b5f9e064b6646dce996cf05b09674e5ad7d23fb1
 EBUILD Audio-DSP-0.20.0-r3.ebuild 1137 BLAKE2B 40a510d1526fc0fffc78320529681847371d2310bd32436caa2c3603f1340388f003f42ded0626feabbae00379bfc3d94c6e16353ab851ff0e465b92121b416e SHA512 75e19238b347ce83ece7d20fd809560d63393b806f4f8677bf7c10a7facc3dcbfb1c8e6201973a4cb7941fc98fd1d5f2ae184fa58618f6c0381ea491fb2b2e4a
 MISC metadata.xml 390 BLAKE2B 9c3b343851dacd52c417bc4adf157f524a3b8f504781396dd987f3958c8d0d17403aeed4c47f0983ed3cc92ec938693116f2ca864c7867b9a7ebfbbfbfce6efe SHA512 032307a9f84a0bb4bb227f943095a3aad819900fe79244bfd4bebe7454dc72859ddabf0426fae148f9ac3d0138d158522e0de94c072a71ce7820798d24d96aab
diff --git a/dev-perl/Audio-Mixer/Audio-Mixer-0.700.0-r2.ebuild b/dev-perl/Audio-Mixer/Audio-Mixer-0.700.0-r2.ebuild
deleted file mode 100644
index 3beb5e073d46..000000000000
--- a/dev-perl/Audio-Mixer/Audio-Mixer-0.700.0-r2.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
-
-DIST_AUTHOR=SERGEY
-DIST_VERSION=0.7
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="Perl extension for Sound Mixer control"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-volumepl.patch"
-	"${FILESDIR}/${P}-clang.patch"
-	"${FILESDIR}/${P}-testsuite.patch"
-)
-
-src_test() {
-	local MODULES=(
-		"Audio::Mixer ${DIST_VERSION}"
-	)
-	local failed=()
-	for dep in "${MODULES[@]}"; do
-		ebegin "Compile testing ${dep}"
-			perl -Mblib="${S}" -M"${dep} ()" -e1
-		eend $? || failed+=( "$dep" )
-	done
-	if [[ ${failed[@]} ]]; then
-		echo
-		eerror "One or more modules failed compile:";
-		for dep in "${failed[@]}"; do
-			eerror "  ${dep}"
-		done
-		die "Failing due to module compilation errors";
-	fi
-	if [[ "${AUDIO_MIXER_HW_TEST:-0}" == 0 ]]; then
-		ewarn "Comprehensive testing of this module needs hardware access to mixing"
-		ewarn "devices. Set AUDIO_MIXER_HW_TEST=1 in your environment if you want full"
-		ewarn "coverage"
-		ewarn "For details, see:"
-		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/dev-perl/Audio-Mixer"
-	else
-		perl-module_src_test
-	fi
-}
diff --git a/dev-perl/Audio-Mixer/Manifest b/dev-perl/Audio-Mixer/Manifest
index 4046562313a0..ac3fb32da1fe 100644
--- a/dev-perl/Audio-Mixer/Manifest
+++ b/dev-perl/Audio-Mixer/Manifest
@@ -2,6 +2,5 @@ AUX Audio-Mixer-0.700.0-clang.patch 646 BLAKE2B 7206d3c12fdc33ca9ed359a2299497c6
 AUX Audio-Mixer-0.700.0-testsuite.patch 3550 BLAKE2B bc92e394e8296c11d909544391ee5f0b82053cbc7c9043f52be8a54ff562d97cedac1b5f13f8309d02d9396359df1be50e5122cf4400c083d8b16326ce5919b1 SHA512 79d83bec47bfc2f39064c49c6f16a1846fb7f147c450f8e719ca4687bc27299e9272cc9b4aabb666a938dbc863034da5a09b39983cc71ae8380f76c1d75ee3c9
 AUX Audio-Mixer-0.700.0-volumepl.patch 840 BLAKE2B 691267d2723039b1c714ccbe60a30ff5c80dd569cd943d0a075b0c01ee1c0a2508a8ddd516a1597ac1048602af6ce9e7b2ed030ba27da7c743a17f1af2156a58 SHA512 74ca5e1d053dce6f3c5220c6f1c67dc5180a7ab70cbd5f09c0cce1a5338281dac7f97db24814579e2831c92203262d7c85e2a5a66b0847a795d9768445b5634c
 DIST Audio-Mixer-0.7.tar.gz 6709 BLAKE2B fd7f07bf007a49b84a138a631205527c7a6e2ff841e3d6b49ee07478ba348352ec9238bdc5f1b35bee4ef0d720f7a766c3f7ffc0c8e640bb088e6bab92203fd8 SHA512 a2adacf34c4bfbe4e436cf399a8585689f680f90a362931fd09e0f62f08e2ab59615361daae3a65c4fbf00946196e1dbc0207a7973c3c5a875f73f673f167568
-EBUILD Audio-Mixer-0.700.0-r2.ebuild 1224 BLAKE2B d32b68d8a352218b8247eaf60717380bb48d9d86c3fcfb891d4650e085ead13ab3c73bcbd20b208b8a35c61be5d305a39b430b3ccf036fd10b03e059b4c58b5a SHA512 05f2df8e2faff2e7f2651aea6c471f37aa69d1c5eea1a6e76be1d1634a96c7c756eac384f73fd00cebc49526d479e7c058102f2b7eae16dd83a41e993d71ba11
 EBUILD Audio-Mixer-0.700.0-r4.ebuild 1384 BLAKE2B 394d8a9190c4091e65257d65b4ba0c0a5a960deb0d54568a5daac330f755312374ac6f849b6dfdce83d72af92280b4077e36bba1aa39ba6c55f1f89fcb5f81d4 SHA512 38735f8515fb2f9b07c5ad5a8456159bd974c3a170374f90b258701e79ca76083dc85599077b0b4f5cae0474d5e5ba2359b31490be46c14ca65ce1f5196c8a66
 MISC metadata.xml 394 BLAKE2B af33f381dd2c50b59d393ff9c806797b863dd82078edde7e690f4b57c2b611324fb9f9991326ca805ab22fbb8adde0c74162e8575e5bbba1b458e5c886e795d5 SHA512 14fe7ac889669e2908f310cb8364c41406c75f733c6c63fd7379af09be87670be642454adb87bd190064dd4aee4459d6d1c4e9aac376b33ae24b4e186c392745
diff --git a/dev-perl/Authen-DigestMD5/Authen-DigestMD5-0.40.0-r1.ebuild b/dev-perl/Authen-DigestMD5/Authen-DigestMD5-0.40.0-r1.ebuild
deleted file mode 100644
index 8fc3d2c2f2f1..000000000000
--- a/dev-perl/Authen-DigestMD5/Authen-DigestMD5-0.40.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SALVA
-MODULE_VERSION=0.04
-inherit perl-module
-
-DESCRIPTION="SASL DIGEST-MD5 authentication (RFC2831)"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 sparc x86"
-IUSE=""
-
-SRC_TEST="do"
-
-export OPTIMIZE="$CFLAGS"
diff --git a/dev-perl/Authen-DigestMD5/Manifest b/dev-perl/Authen-DigestMD5/Manifest
index a219a241ba82..94f04a753413 100644
--- a/dev-perl/Authen-DigestMD5/Manifest
+++ b/dev-perl/Authen-DigestMD5/Manifest
@@ -1,4 +1,3 @@
 DIST Authen-DigestMD5-0.04.tar.gz 4131 BLAKE2B 676873873c66c160581bd0c9deb52171fac2b53e8bbe524e909765e9b0bff6343bf0bdd8e1daa366122b6148d5e080bab865866b7d2176eb7d49db8fe8d99a7c SHA512 b159d487738c22d9a1de2b9e068680697369b905b56370b57e3b3fb46ecea65ce2d3801b5733b032aa7ad8d320b29b551eef1c67304b53a86983e40969e0c14f
-EBUILD Authen-DigestMD5-0.40.0-r1.ebuild 340 BLAKE2B cb71277066b2f0ded8851fefd5daacbbd9141c0b92a4a65f592233872b19558b35a30dc53ed7d2922a56d438927cc26e38dca1567a5be3a0fe14798de8cef30a SHA512 d754b38ade69bf08062e7163d229e0fdeeccf0490287018ed10cb7b4d1df425d8e0ba10f422fcd584caaeac01f0bd139ed9ce74dc65579a5df879e9d36120f82
 EBUILD Authen-DigestMD5-0.40.0-r2.ebuild 573 BLAKE2B ec91b5f7a6b2b33df0510b50d654e2a01db6017fc2c1611824ac638a7d470198af8f6ebcf80c4ab29fcb0bf2ea5ad235380e70688224818468515c61065620bd SHA512 4737048627ab47395bc06b984b5de868b04b326c934c2ed3dbdbfd7af822e676863912ba077aa307caced8d911d819ee4686f0368fc247e1713827a1210f2eb7
 MISC metadata.xml 623 BLAKE2B 9c0cced0f9410490d3c0c606f519da7837898585fe46645f8c46f27b00d31fc495acdfbd2d2a3c0bcd4b2e038d52d00204c78f892ddf2c0de13d5b2fb133a0c0 SHA512 50511429bf44556837019e1208e6a828cd3feaa0666b64163915f690c3f45febb4804c0ac33921bbf213a16e3ad1a4e3c148724aa20e81c101d07f503bcfa6cc
diff --git a/dev-perl/Authen-Htpasswd/Authen-Htpasswd-0.171.0-r1.ebuild b/dev-perl/Authen-Htpasswd/Authen-Htpasswd-0.171.0-r1.ebuild
deleted file mode 100644
index d27f69f6a1f3..000000000000
--- a/dev-perl/Authen-Htpasswd/Authen-Htpasswd-0.171.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MSTROUT
-MODULE_VERSION=0.171
-inherit perl-module
-
-DESCRIPTION="interface to read and modify Apache .htpasswd files"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-perl/Class-Accessor
-	dev-perl/IO-LockedFile
-	dev-perl/Crypt-PasswdMD5
-	dev-perl/Digest-SHA1"
-# pod tests need TEST_POD anyway
-RDEPEND="${DEPEND}"
-
-SRC_TEST=do
diff --git a/dev-perl/Authen-Htpasswd/Manifest b/dev-perl/Authen-Htpasswd/Manifest
index 2b9b16dc9259..5dd4cf48b7b5 100644
--- a/dev-perl/Authen-Htpasswd/Manifest
+++ b/dev-perl/Authen-Htpasswd/Manifest
@@ -1,4 +1,3 @@
 DIST Authen-Htpasswd-0.171.tar.gz 8342 BLAKE2B 183a4cfa05f5ee7ecdbcd052abd38bb3134ece40615792d08b16d569bb54accbd89a44ea62391a290af32f9aede43cd8fe75b27f61e0c099b4fe81aa47d6fb72 SHA512 a269b26097cf6e7ad537def8a5f4bce4321711149544228b5bdd790f569b691d2b8b4f1eb9004aabb23d95275297e044d824186601afe7518196092d36026714
-EBUILD Authen-Htpasswd-0.171.0-r1.ebuild 457 BLAKE2B 9b24529bc20326caade4bfa36ef600f8f219bbda92ff993bd1d5baf156089a01b354e3e1068bdd6dff3fb85ea8b6f596888c7800932ebc41179ed1d10108128d SHA512 06622f5a379d95508384b623abffaa8a4f49dbf41129719b8b62db707908ad33cd6c1754333cf63cd54c3b885ef373ec5f8b9a05e8997a105aeaa3163a10d502
 EBUILD Authen-Htpasswd-0.171.0-r2.ebuild 539 BLAKE2B 1f85aaa0bfeee5915597159a6a740181ee581f3d94d7d02880c5ff8e0ae0237c90bf496d4df8e849d04321180bdf023a7edb60c4fa48dce17615bb269d5db51f SHA512 dd48168e6ae6ae04782c82d5f7f554ca7d8720c95c604eddb45fcf68aebf6d999514d912b2c5c3ed007a6cf9469fc9643455e7513b08c26dce26916b49d62e66
 MISC metadata.xml 540 BLAKE2B 843f40864925f7395d11b786c02e7c52b61405a6bdc1dc8c685905e74ce22406080476eec79fddc726865a0c9b0405536aa85053777f3847d7d60b6b4d8608c5 SHA512 e4a3f8f115e381a7ad91e4f1f2f0888358f15de9b56ca84da580110c691b3a8997fb4c52f1e28a07ef710ad814107a39eba1950179c5cb275d26a59076ace921
diff --git a/dev-perl/Authen-Radius/Authen-Radius-0.270.0.ebuild b/dev-perl/Authen-Radius/Authen-Radius-0.270.0.ebuild
deleted file mode 100644
index 5921f6549769..000000000000
--- a/dev-perl/Authen-Radius/Authen-Radius-0.270.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=PORTAONE
-DIST_VERSION=0.27
-DIST_EXAMPLES=("contrib/*")
-inherit perl-module
-
-DESCRIPTION="Communicate with a Radius server from Perl"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Data-Dumper-1.0.0
-	>=dev-perl/Data-HexDump-0.20.0
-	>=virtual/perl-Digest-MD5-2.200.0
-	>=virtual/perl-IO-1.120.0
-	>=dev-perl/Net-IP-1.260.0
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	test? (
-		dev-perl/Test-NoWarnings
-		virtual/perl-Test-Simple
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.26-cisco-dictionary.patch
-	"${FILESDIR}"/${PN}-0.26-no-install-db.patch
-)
-
-src_configure() {
-	export OPTIMIZE="$CFLAGS"
-	perl-module_src_configure
-}
-
-src_install() {
-	perl-module_src_install
-
-	# Really want to install these radius dictionaries?
-	insinto /etc/raddb
-	doins raddb/dictionary*
-}
diff --git a/dev-perl/Authen-Radius/Manifest b/dev-perl/Authen-Radius/Manifest
index 3c1880e3b4b7..7598e29af7c8 100644
--- a/dev-perl/Authen-Radius/Manifest
+++ b/dev-perl/Authen-Radius/Manifest
@@ -1,7 +1,5 @@
 AUX Authen-Radius-0.26-cisco-dictionary.patch 1176 BLAKE2B a090393a57ee39c06345d0969f5c54de30158265fd548fbe88d7dfd40335523c9ef3c9c5d5ae6432796d992c4f19e793544013bbdb7f9c5cc7854a66ae5a15c6 SHA512 f040137ade128614a0f35fe016a58989e3d5bf8fdc2ed20358223fd5ac4792d72edc135e0c1a4335be3f66d38e0120d8d42950266def30b273484ed6bda66b4c
 AUX Authen-Radius-0.26-no-install-db.patch 1234 BLAKE2B 004c2fefaf43efedfcf92bacff4139795a66c06394984f2c5cda14951214d0fdb97a84f4fbe9617b991a052091281037fcfb2592df0a620c4b8090c9365c5eca SHA512 ee947157e5bb02ccb171554d5b83e44482f0fc44b5d2c1e3d3488943baa175a87950999930ea79dd087c731b145ee15bcf394d784cbcabcd73a2f4ef8362b485
-DIST Authen-Radius-0.27.tar.gz 49679 BLAKE2B 81a676cce378054b971932f78b37c6e9683b2acd0f214ad4dbdb84e089b683e6011cc3f75e952d687a364d29c1907b586f369fe6e5e9d1cf77ce131b8ce9035d SHA512 0b039b3b5b434225a92596075a3943f278f87c634c6764de477a31de515065d1ded762b38621c338785f73fe2a0e132d835a33a00891707950777a16e0277f67
 DIST Authen-Radius-0.31.tar.gz 51311 BLAKE2B 52aaa623ca28b1b406c027fb54f38c9f24b347815aefb3336649b4ff505a0b97db516b6877546bd330505516f3481934b0c46975c017ae76ed475bc476bd1c6d SHA512 6b78254a6a94f67bd3a5529d4313da779d630a57e2300b02a49034c153b34fec0c6e745c5419f5a5e3ba2996d39907834d3f909ce9fdbd0edc6c43668f89d380
-EBUILD Authen-Radius-0.270.0.ebuild 986 BLAKE2B e071f26087d2bb932acad644e5bea92d0db324c2904b86842df563ce7b8c2f0fafc9068b7c7966757aedbfaaf2ca80254a54e4644ef9b9807167aecc6479a187 SHA512 92a658781d92cef1917db5ff1babe72c4e716a058cbfeb9682b5c0afcd66fee1e07505b799681700692681d93450e35085ffee370b3ab2ab8a59c865771bda61
 EBUILD Authen-Radius-0.310.0.ebuild 986 BLAKE2B 8ca3ef42d2ffa3dc40b93bcdeeeebaca6f903a8c67df69326e244eca7ac4d2bc10fe782572211a29433dfccb5fc47acc7580a786da1475dd6eb5f37375c9c6de SHA512 9c8fc015aa9ea0bd8dfa90d49d552f4ccb66daf43f8eb1f357df4a517cfd3199f64fa80aeb2e9e241e8bdbe2039a5ccc053abd440824589cde322d27f9133874
 MISC metadata.xml 398 BLAKE2B e4d3554055d85f7488c0b8e71da8792d7e86560ffe3cfd3037caf69e708f777ffc6e9044d76228463b71c82ad1ca85230e1aec637140fdc2ffe3f9042344acbd SHA512 780392f67556558208d30f88e4bb2ea9c58acbeb250bb01df4de7b9d1cc90e6d17634c4447cb7f779fd1748be3c363b280cac716b250a66c7d1cc1dd349a4ece
diff --git a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
index be5260f0e90e..a940c99b8d66 100644
--- a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
+++ b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="additional B helpers to check COW status"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/B-COW/Manifest b/dev-perl/B-COW/Manifest
index c058a65036a8..b9a6153c7083 100644
--- a/dev-perl/B-COW/Manifest
+++ b/dev-perl/B-COW/Manifest
@@ -1,3 +1,3 @@
 DIST B-COW-0.004.tar.gz 18295 BLAKE2B 7fcba80755dd7ca425f4f4caf2a39c4b813036d9538cb93f05e4eeb9fb15042c3f185d795da78a9d89c75a969b6f9a181506dcc3d072c390c0bafb514c866544 SHA512 97beaac8056e4aaeafb535a8e69f103632eb3746fa815313f84612414081155ab640299c18b4cb7b9ff0f61263cc1b9ce25de3313bbefce318163902a4503292
-EBUILD B-COW-0.4.0-r1.ebuild 562 BLAKE2B f3d2518553580edba4e65c4d110930ef798634a20012f6ccc6be79fa348f33cb258952c9563b5a0c2362bce0126db6dd2d74219588c037f506accd5e23e09089 SHA512 cec796dc18c7f6039cc5ec49ae00e43f3761f4c9171d7436a77a4f7ed5a0aafeee4f796dc993f315f457346a2ba8f31ae494c550df662b82d568982404f01d99
+EBUILD B-COW-0.4.0-r1.ebuild 569 BLAKE2B 94a79d28de1939d9024bd5db1f3cba2d189c55d4acc7595f883d4814088bca1e754fcbb71108384662196e4921e0c0821bd97275d459adeed1d601588b1859ca SHA512 288ce3fc032ed238e081091682add2c2c4fc2353e3a5bd0e8cd5f3364701286a9242bfaa0d352c9c385b625bad6456fa61579341481e2d9dec82d524f7ea4bee
 MISC metadata.xml 382 BLAKE2B aed091ef4956c0df3803f55b4d1cdb8cf33451257df3aa802865e32ddd8d3522abb45d8ab72691fc8b31a8eb44ecde83d8bf23a0b3f058ae12289c7789157ba2 SHA512 1f0eac593d2dde59cf0ed1935cf07cd0bf0029e421a03fe1aaec840ad13dd69ae33d9cb9012347c455da84bd55b1af78c835fdf5a353fde273e1abd0ffb13ed1
diff --git a/dev-perl/Business-FedEx-DirectConnect/Business-FedEx-DirectConnect-1.10.0-r1.ebuild b/dev-perl/Business-FedEx-DirectConnect/Business-FedEx-DirectConnect-1.10.0-r1.ebuild
deleted file mode 100644
index abeaeb23f0fa..000000000000
--- a/dev-perl/Business-FedEx-DirectConnect/Business-FedEx-DirectConnect-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=JPOWERS
-MODULE_VERSION=1.01
-inherit perl-module
-
-DESCRIPTION="Interface to FedEx Ship Manager Direct"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 x86"
-IUSE=""
-
-RDEPEND="dev-perl/libwww-perl
-	dev-perl/Tie-StrictHash"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Business-FedEx-DirectConnect/Manifest b/dev-perl/Business-FedEx-DirectConnect/Manifest
index 5a39b9e5dfba..3ce874265eee 100644
--- a/dev-perl/Business-FedEx-DirectConnect/Manifest
+++ b/dev-perl/Business-FedEx-DirectConnect/Manifest
@@ -1,4 +1,3 @@
 DIST Business-FedEx-DirectConnect-1.01.tar.gz 17254 BLAKE2B 363010b85f240c121ab5475ba8ea770801dd73f232c5ed2b6c67c6f2e9b7e42e9bd88941e01bc3c9247df108fb41cda1d2e14db156caffda4a8e5a0f11c7308b SHA512 65d254bd8f0820cc5ccb69a8ffae715dd5957da1c0c5186a6ecdc3033780320d04d623fd2eac35ebf473c92f6b199493b14b85a897528b9b3f6230c5a444e207
-EBUILD Business-FedEx-DirectConnect-1.10.0-r1.ebuild 369 BLAKE2B b44d4cbb2aab903f10a558d41735aeac0d0f54e9fb539186429fbdf2593a4c1a82829f6f10590ce1f42bf13f5c2ce9fe3d2a627b54b00d824a5d97a46972b597 SHA512 9941b4c15a04b7b86b9f5c28f52d55a968fad675c741d04e0b5f1499e7f6a446a79b0c4e155d7624a171f5d56fb034e5d261314831b503ecad36a79b81d67fd3
 EBUILD Business-FedEx-DirectConnect-1.10.0-r2.ebuild 340 BLAKE2B fb0909bd553048c6edab4c5b74797962359f7737e0f3fa75fcea0ddda6629ea01f6b5087127e104ddb58ad9739be755d7e0c721249f4d61597503abeeaa5af89 SHA512 e0f1f114e774c7dbcec8ee553f4016818c9a54a537ba81ffbec0c34425c5731fd65eed27a1b8c947f9ada045d053004b5b887e5bfbd711616b8121531800cb18
 MISC metadata.xml 502 BLAKE2B 955efe31d702112b2c36ed769a154a2798bb0feeef49dcecf67765c0f59c90bab1aa4c179ae49097cc1bd93b5e0c68aa1f909fcace5ffcc709042758e3e4a521 SHA512 340c3ba3fe36ecce28137d6428b75edcefaa108edc3a00541ee2f7816d909c8664c0b6451ac57f0017a22fecc61021ef3424b5dcfc905b2d1140639aab7285e5
diff --git a/dev-perl/Business-Hours/Business-Hours-0.120.0-r1.ebuild b/dev-perl/Business-Hours/Business-Hours-0.120.0-r1.ebuild
deleted file mode 100644
index 6662c29dc0a5..000000000000
--- a/dev-perl/Business-Hours/Business-Hours-0.120.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR="RUZ"
-DIST_VERSION="0.12"
-
-inherit perl-module
-
-DESCRIPTION="Calculate business hours in a time period"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND=">=dev-perl/Set-IntSpan-1.120.0"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/Business-Hours/Manifest b/dev-perl/Business-Hours/Manifest
index aea3259e5328..2ddebd136a00 100644
--- a/dev-perl/Business-Hours/Manifest
+++ b/dev-perl/Business-Hours/Manifest
@@ -1,5 +1,3 @@
-DIST Business-Hours-0.12.tar.gz 16021 BLAKE2B 35301570707c0b212d4dbae20f8ceac1205eceab2bae5263e9a0003b6a21a43f72514269ecb9837d11b7c50f8f87e5567122fdb1d80b03d5728fa16157251992 SHA512 6d2c5fc1d5ddcc0263c24cbc0fc3536bbd19bf24976087c959e4649200c32df13d8ef66298f2e077566e4d8951b07b0461cf2740e32c425552443adef3881745
 DIST Business-Hours-0.13.tar.gz 16391 BLAKE2B ec29b4f0c75953ba5f6c5862c5e4851f82ed827ea01c113bff89082dc264c368f45fed6e1def64b283fb1ef72c633ce28ff301fc8e522c9ff06906cd6bc3e2a2 SHA512 2fb0c5c017f4dd5eaeaf394b7534348473bf47009020d23d5fb642ae67a06d8041f6dae4d554e8e36412cecf447a300f30bcacf4f8aab3c357ea81b6a5c55d7c
-EBUILD Business-Hours-0.120.0-r1.ebuild 326 BLAKE2B b8161b8eb0e96574cf6d883db2ead18ad0d02a37bd213389c02a2b1b987c5d7ff5a8e144051e5819b572ce08b966fe7940f458f5de4a78eb7e4144035eabc464 SHA512 d21aae3715e53c8049c4633a71b0c879a9743970d2d090c4387282208643685b6ac639121fc6c0fe2cd5c05c721ea8ba40c0ce005ec62b78c8297d98897ff2cb
 EBUILD Business-Hours-0.130.0.ebuild 381 BLAKE2B a75414333da50026ac48927731cbd08367679bd8a7b8422aabb7a055ea5e7af227b71d82616a1718baf4ab3a23efe302734b05e478d1fca2c3cdaba17c23f114 SHA512 910b78073cef0596cb81876ebb68e6298025313a34d9811ee8a8c974ef9139dd0bf687bc039c1a1572f86b8361c7748673374887e1b476f78e7ac2687ea2831e
 MISC metadata.xml 400 BLAKE2B 65cd93f92cafff59751e0f3f6e14032e42121b1a575d07a0702fb444962776e75e4fc3f8a3d8b6cfb60d49699b156eb70e68aca10c560118cf8ecb7ab27cfa6a SHA512 c4d3b193c854dae5fcba69bc9d6807ec3522e7425a29203b9942e64c02eaaf94653ff89722f03dffce7c6499eda0e424cbc83a6941c0cbf4385809b64ff75e21
diff --git a/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20140910.3.0.ebuild b/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20140910.3.0.ebuild
deleted file mode 100644
index b256461e8687..000000000000
--- a/dev-perl/Business-ISBN-Data/Business-ISBN-Data-20140910.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BDFOY
-DIST_VERSION=20140910.003
-inherit perl-module
-
-DESCRIPTION="Data pack for Business::ISBN"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PERL_RM_FILES=(
-	"make_data.pl"
-)
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-File-Spec
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	test? (
-		>=virtual/perl-Test-Simple-0.950.0
-	)
-"
-src_test() {
-	perl_rm_files t/pod{,_coverage}.t
-	sed -r -i '/^pod(|_coverage)\.t$/d' "${S}/t/test_manifest" || die
-	perl-module_src_test
-}
diff --git a/dev-perl/Business-ISBN-Data/Manifest b/dev-perl/Business-ISBN-Data/Manifest
index 8c4dd004d42c..68f237c050b5 100644
--- a/dev-perl/Business-ISBN-Data/Manifest
+++ b/dev-perl/Business-ISBN-Data/Manifest
@@ -1,5 +1,3 @@
-DIST Business-ISBN-Data-20140910.003.tar.gz 21156 BLAKE2B 47978f748d5e94da63b6204ced20c133c1c6394dfcb25d7c0944eedced6f460276b3f1582c742259a3535ba37ac9038505ae0cbecee0831aaa4646c912a8713b SHA512 90e866e58d242e0de3b097a2df04d26d36eef92366a5fa0b21413065b09ec0e45d5a0cd7c657505975ff58a0b5270cfcec712d3fa5ef60e91c4dec7fe50708ed
 DIST Business-ISBN-Data-20191107.tar.gz 24838 BLAKE2B 660a7aa9ab7848cc74c20bcc8426126dc8054d81b0229c609d808bd3300a967d177a474019b2faf87d44198bdfbb4cab1fc39b3da7352d725a92795edee8f3a7 SHA512 33e6197de8b026484784d33fdd88e1a0d442b633ade4eeeb45812709cca252c235a377e3b03bb3cade35256b5f5d592b70504cfb7cccd1005544af2a1e4a11a2
-EBUILD Business-ISBN-Data-20140910.3.0.ebuild 646 BLAKE2B 4e1f82a0616fada0967682ecc0e4b28965b6a03ceb33e9e8e56e3c367e978e32a94402203dd44443b47cdc2ae02ba3345fb0a9f58b917c9260f41bc588c488e9 SHA512 4f77fa2db6a407068a4829c65e2f1ea6e63ed8637d41b073a84b321d2999dcfd90271570e85c33ad0b2a8cec3e4ea92795d1ca6cbc93401a0ba3919c57b13761
 EBUILD Business-ISBN-Data-20191107.0.0.ebuild 665 BLAKE2B e5be92ad812b9560974fa941f4dfc2b920096cc150ab2e81f0f279bf619621a24c673fa314e194eeb663fc9f65939458bd3d86eff2fb0cbb80d1c74784b42845 SHA512 d68d38ddea6b1f4206bd073b616449edd49ebd7fb29400dfd113c3a721a35707ea028716ea52544975eaa2d2fc3abcd6d4a7a8985f8c27b19ce4e714eca54f2a
 MISC metadata.xml 397 BLAKE2B e4bdbe6bac37eee08b563895b3f115354f8da2eaf188f07dc5fe5622123bcb0b2a6922aaa36225592421ead5112ee4726ebffbdf4cb9d49b9bb9a9fcb8f245d7 SHA512 6b4c787a3c7d17cfba431a75ad690ee825c9cb7729638a3e84d7f226b30a462f5dc15fe2ce6e6d3a6c87ea355225b2c08320dbca5e564d843f94e77dfa820be6
diff --git a/dev-perl/Business-ISBN/Business-ISBN-3.4.0.ebuild b/dev-perl/Business-ISBN/Business-ISBN-3.4.0.ebuild
deleted file mode 100644
index ad6ca076d3f1..000000000000
--- a/dev-perl/Business-ISBN/Business-ISBN-3.4.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
-
-DIST_AUTHOR=BDFOY
-DIST_VERSION=3.004
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Work with ISBN as objects"
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="test barcode"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	barcode? (
-	    dev-perl/GD-Barcode
-	    dev-perl/GD[png]
-	)
-	>=dev-perl/Business-ISBN-Data-20140910.2.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.950.0
-	)
-"
-
-src_test() {
-	perl_rm_files t/pod{,_coverage.t}
-	sed -i -e '/^pod\.t/d;/^pod_coverage\.t/d' t/test_manifest || die "Can't fix test_manifest"
-	perl-module_src_test
-}
diff --git a/dev-perl/Business-ISBN/Manifest b/dev-perl/Business-ISBN/Manifest
index f9f3cc6d5df1..7137828f29e1 100644
--- a/dev-perl/Business-ISBN/Manifest
+++ b/dev-perl/Business-ISBN/Manifest
@@ -1,5 +1,3 @@
-DIST Business-ISBN-3.004.tar.gz 363331 BLAKE2B a63844c6fccb6b2f9dd69c4a30ccd82b0e308342a7f303cb8f542235680932dbf9ed0de8785e8ccd798f5d7569712516e47e45821146fa119de12d48e7e1092f SHA512 0ffdfac05da6852a0acc4399acb9cb5171cbc46b5d7b11ee3544763d57946282c06a29c2fbf4ef678f4c1f76a6df0f5def3be76224e3f842f66669aabf394121
 DIST Business-ISBN-3.005.tar.gz 361815 BLAKE2B 1c6feb5ca5eaa88b01739ed63af997e39d32cae3efe6c9f0b803b306764e9710c66c01977564058585fa6797ab820801dc24f7cd0b67576787a2ba80f6816006 SHA512 f341a0d24c717032e9e6f179fa800bf7bb4be3e340cbd2f23a480b8f76fa24db58cdcbb41c1ee2fe063408bf6d2f7b0191ee657387723090d3f497582cf61579
-EBUILD Business-ISBN-3.4.0.ebuild 739 BLAKE2B 8ae192c0daef9bb67a8d54875666f76f78bb732f7c4cdb842a4572a6e339cc99a44868d78a0faa6dc8e14357420e441cc83de0b57e6fb6433229c0b254d8899c SHA512 5e3072c7cb946347b929baa736d900e102a94f63fc683d72960083cb8a3866a0f20fd6760fdfc4fa65d3a69383c8ea661a954b7a88c1db79f870064c67b734e3
 EBUILD Business-ISBN-3.5.0.ebuild 753 BLAKE2B 6a2e0b96b884fef834114e16bf30d86de9c742f97f2dbbc31b379c986fa81e9b2378b1bd4b6a0334026333074ca99c295046a836cad9accea2c1d1ee01b85cf2 SHA512 d7cae7a31da78cd23eb4fa1cf390187e62473e01ec1b9f60c4c4184ac7c642da6fd498a11bb26cb976502423eddda4fd87205bf29a4ad8e1f97b9a15503009f5
 MISC metadata.xml 631 BLAKE2B 245ad524744ec4f43bce27fb6d58efce3bc872fbd8e4862b7f72603adcf9056b25d29f60bef840642bdfa8a8954622700bd0fc74ccad5bb00d307eb81bfdf799 SHA512 eedb04ebc345fa817b9efe29db6e79060e9f04cd7be3c1886fcfd5d81080b0043750d5cd985bb3cff1f704ddeb1906389226f16198184106b4144e09309552a3
diff --git a/dev-perl/Business-ISMN/Business-ISMN-1.132.0.ebuild b/dev-perl/Business-ISMN/Business-ISMN-1.132.0.ebuild
deleted file mode 100644
index a10662da4b8e..000000000000
--- a/dev-perl/Business-ISMN/Business-ISMN-1.132.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BDFOY
-DIST_VERSION=1.132
-inherit perl-module
-
-DESCRIPTION="International Standard Music Numbers"
-LICENSE="Artistic-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Tie-Cycle-1.210.0
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	virtual/perl-File-Spec
-	test? ( >=virtual/perl-Test-Simple-0.950.0 )
-"
-PERL_RM_FILES=(
-	t/pod.t
-	t/pod_coverage.t
-	t/test_manifest
-)
-PATCHES=(
-	"${FILESDIR}/${PN}-1.132-no-test-manifest.patch"
-)
diff --git a/dev-perl/Business-ISMN/Manifest b/dev-perl/Business-ISMN/Manifest
index f1960630d401..e12f995109f7 100644
--- a/dev-perl/Business-ISMN/Manifest
+++ b/dev-perl/Business-ISMN/Manifest
@@ -1,6 +1,4 @@
 AUX Business-ISMN-1.132-no-test-manifest.patch 755 BLAKE2B eaed31d13688d5afd1f17301225f17ef2751bcdb2155d905b5f50363912de00b47c325332eeb76bf96aa41fae66d0ab11c7216d236b5fa7dd47048f7f40adec2 SHA512 f183c66de430edecdb05eba7f31b8afbe8a6ac9831b81792bce198b1bbdebc0b7e085cc2132f1dea444a377f89fb145167e4cfefc93e1818d6dbd749ead38651
-DIST Business-ISMN-1.132.tar.gz 14528 BLAKE2B 85e157ad32b5ffa383cdaabf0e77452ce265dcfa7fc2b3001ef2fe87622298fa2bfda08593459a2bd607a6c442917ce137b05a33de8311fbd3fabb83f3ecba17 SHA512 f83fd2a924bf293025466b19e266a6d2848f4918a026eb2f7a51168dcbac0dfc81a195634960a28d551541b35686ffc7adf94d8e755be127f90220a6ea168af6
 DIST Business-ISMN-1.201.tar.gz 14793 BLAKE2B fad3341efd853824e529b5629d501b7c8129724e922868f09cee13209281f15f65e04d7cb2b0d7a5c2c1599effa8367bf71bc503908307ddba00fffc4dc7fd06 SHA512 96f8783d90ddc561a24dff4905127b8983357809df2e31524f3e1f3ec30a56eb07ac9312bc127196602f72d4442b284fa195be22d6d71bb3a6e971dbabe46e22
-EBUILD Business-ISMN-1.132.0.ebuild 659 BLAKE2B 314fdcdee0f8aa6a3aa67c01c57ef7404b60547de98dcd6a0e8b823e69a84af6211c4749d062e1c0ae744035199c4f2842e8219f5f5b65d3ac75a276203fa923 SHA512 7942c5541950e3c00fe0cbaaaf4f105b8e0c5ee0f838cbac9c0e0645c294a7915fb592e1f2a693425d97ef7e1f0c4950a09104305dd83089198ac23e0ebbc734
 EBUILD Business-ISMN-1.201.0.ebuild 660 BLAKE2B 20ec4cf8f38fd852aa678b9150dfe92619048fe84505c7d4730aec4eacb69fac907fa1c4dd894fa1f5a8a66d5fea25142fadabed68eef50d7c4a8b9d77b95a92 SHA512 8ec9433d379fcde38bac5e91603ff657607d5534af1e1a931141b2ebcb8b3ee2d0c0b7eab507736ffd735e490446a6a0854732edda28549e59cf98f9f0cb13bd
 MISC metadata.xml 451 BLAKE2B b8a6f64a351d0c2130eef0af9ae3cb3aa0ec3556ce2c1bb36595def33ffb66fd258764eb1dcc1d971c66db49d83f00e91d2bcab571a6f806677d1418cb471e5a SHA512 863d618148d547d932ae2b2121a7a4acc1b44c0a5b4d41acf5330da36ff149bce1be81e6b1167c82535b0866e4a74a3c0d811e3c990474adad30dbf3b488d508
diff --git a/dev-perl/Business-ISSN/Business-ISSN-1.3.0.ebuild b/dev-perl/Business-ISSN/Business-ISSN-1.3.0.ebuild
deleted file mode 100644
index 30159a9c80d8..000000000000
--- a/dev-perl/Business-ISSN/Business-ISSN-1.3.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
-
-DIST_AUTHOR=BDFOY
-DIST_VERSION=1.003
-inherit perl-module
-
-DESCRIPTION="Object and functions to work with International Standard Serial Numbers"
-LICENSE="Artistic-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Exporter
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	virtual/perl-File-Spec
-	test? ( virtual/perl-Test-Simple )
-"
-PERL_RM_FILES=(
-	"t/pod.t"
-	"t/pod_coverage.t"
-	"t/test_manifest"
-)
-PATCHES=(
-	"${FILESDIR}/${PN}-1.003-no-test-manifest.patch"
-)
diff --git a/dev-perl/Business-ISSN/Manifest b/dev-perl/Business-ISSN/Manifest
index 683caa5d42af..5cda62ec58d7 100644
--- a/dev-perl/Business-ISSN/Manifest
+++ b/dev-perl/Business-ISSN/Manifest
@@ -1,6 +1,4 @@
 AUX Business-ISSN-1.003-no-test-manifest.patch 759 BLAKE2B d89f7c59b29742276456743a926c6cdf9ed2b3e9ccd4259c73080a32bdc9efdcec720f473fa75ef084270e9e4e3c6603ca08552ce612d03ffc2c01b37037e92a SHA512 e923dcd24f9077d90d37255c68f5b46b6ad6c3edceaba41d27f65c6f0e87bcb007b620b477eb77384d96e09771cd56cd1927462e5c3d462f6cad51785c819829
-DIST Business-ISSN-1.003.tar.gz 10204 BLAKE2B 079689867074bcf1875998fda17fedf2e5467e5cce0a59204de9be72fe5cb1378f27cde1bed15d98de6f6349a6fb4df94f4379c88699b293b065fda38fe327b4 SHA512 7991a7bbe9ca7dfc42d18a06df3434b7621458fa8f9dece6db45247595e4cbfacd2dd6f4f9ddd74d529849d0835bd7bb9dc7bcfe71ba57188662887fd3132e1d
 DIST Business-ISSN-1.004.tar.gz 10175 BLAKE2B ee2bb9397a4cb5fa8824f4c194b0cb127b8c9c1fa6b7bdde3f6bd81ab27d0b075bd58debb81842637328104a9e6eed0b005b04f3ad0bd02113ab7822276d2418 SHA512 5f6223c3f42b483fdcce832f21276a20df1e809f933823caa5115d339eb4e37565d2ec63f3a5bed76a02580cfe81127f150fac5ff323410273d9127b22ad4a5e
-EBUILD Business-ISSN-1.3.0.ebuild 651 BLAKE2B 41fad03cc0727162c599ead0d776963edcc6653b9e7bee8419e47103da54f8044e7c8248591d9724acbeaacfb6dcdab1ee006f06041ba89e8e18f51ceda1f194 SHA512 97c3d916638af41f85ba4aa699fa9eab31edfad1f8834b891c672dc0adc7dd486a26cbb5bb93f6ac27486c52d4330bee3850fc2cc393d674018d0b0c94b18abc
 EBUILD Business-ISSN-1.4.0.ebuild 663 BLAKE2B 006692720c275d970cd6e4e161a4f561a86c1b9a687df9456ce54df82cbeec59d42e80426bee68d4c84d40a82a7ac152d66cf140e0b2b4263b6269cbf3a8e2de SHA512 d32438c5817e150af5148408c043b2e1d9eafb5f696b1046f1e3dc6b0aee2049a307643f563018da56df4b5f8f9d0fea38717c6af113d91b24ab4a871b472ac8
 MISC metadata.xml 386 BLAKE2B 51f1283124ba5390e7b6e4bc2bdc14d70046997d731b1d986800f2c5fd1d2075b05ff1a21b72e6afcf01a6d5e8c135cf51b0a2c614187352ef50dc2223d60dbb SHA512 e3d151450960dfbfd9ccc8a3dea0a5c2541a3aa76453a73741b26cf13fd5215e9da958f64e4d2f811c5be6e4e0dc765edb1cf838aa92e30a838bd697ca00bf25
diff --git a/dev-perl/Business-UPS/Business-UPS-2.10.0-r1.ebuild b/dev-perl/Business-UPS/Business-UPS-2.10.0-r1.ebuild
deleted file mode 100644
index 28e5068e041c..000000000000
--- a/dev-perl/Business-UPS/Business-UPS-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=TODDR
-MODULE_VERSION=2.01
-inherit perl-module
-
-DESCRIPTION="A UPS Interface Module"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-perl/libwww-perl"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Business-UPS/Manifest b/dev-perl/Business-UPS/Manifest
index d4bdbb929c1c..eaf5b7cb7284 100644
--- a/dev-perl/Business-UPS/Manifest
+++ b/dev-perl/Business-UPS/Manifest
@@ -1,4 +1,3 @@
 DIST Business-UPS-2.01.tar.gz 9341 BLAKE2B b3b4e6e80fbd42e9e0626befd49bf6318d31215fdca1707516e1c104249ddb8e40d7c3df3c23a5284102d7a41006bb9b803ba890f9997402cbeda152ee1413b8 SHA512 1c0d60e9a3a513fd0ce2513e4e561eec60de5890bfe497b19d44976a2da9d7f31870bbc1824569b882ac573ddd969ad1d67293a2ac08a7750e2dd881d0f49f16
-EBUILD Business-UPS-2.10.0-r1.ebuild 320 BLAKE2B a2d95f6e46753e78fa52f36ec78065ca35ebc676e60914dd2a75bc6c9d9baecc1111ecb32fc92d87b0357db14dea44d7feac0d5e379a19be867423976fc36653 SHA512 c4de67b063f250fe0a2b1ea179a7a03b2982237637a08b54b59817013f3cac82a42413681d5a1c01e4c6bd71c341160f911a731946491e753ddc7a7cc8f92850
 EBUILD Business-UPS-2.10.0-r2.ebuild 354 BLAKE2B e767d61a8434627eee88c4b3ec58c84127676bbcf26cf02d4682057b5d83897d5ba2290a0f36c43271a2438519bcc01ca85a31652052090e1a16e6c35b7cba98 SHA512 4ba0cb3d1e44948ade652fc3005fdc1ed4084e84c213f67c5c37b0d240e9e45eb9527e8e9d76ff4eb8a46e77360d98c6d3c4f8933ca87184e493100fcc506c6d
 MISC metadata.xml 396 BLAKE2B 754d2a709bc3a6cbc9b87257272db73cca51d147425fa9012454a75f935b273bd5154a6aba9a457f705286dd6ae1aded5b023430e6f47641d57fd02acc6ac60c SHA512 4abb0090cd043da2249a1a04645c17d83ca276916568dcb4ba6ad58df14d9f962fa0efe97ff3d4059d4f20bc67cab198ccf9f62b277a39f8dcba0ebacc9c908b
diff --git a/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0.ebuild b/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0.ebuild
deleted file mode 100644
index ad07f81284d7..000000000000
--- a/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BIGPRESH
-DIST_VERSION=3.10
-inherit perl-module
-
-DESCRIPTION="Extremely fast, reliable form generation and processing module"
-HOMEPAGE="http://www.formbuilder.org/ https://metacpan.org/release/CGI-FormBuilder"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.90.0-rt81650.patch"
-)
-# Templates that can be used - but they are optional
-#	>=dev-perl/CGI-SSI-0.920.0
-
-RDEPEND="dev-perl/CGI"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-optdep_notice() {
-	local i;
-	elog "This package has support for optional features via the following packages"
-	elog "which you may want to install separately:"
-	elog
-	i="$(if has_version '>=dev-perl/CGI-Session-3.950.0'; then echo '[I]'; else echo '[ ]'; fi)"
-	elog " $i >=dev-perl/CGI-Session-3.950.0"
-	elog "     - Multi-page form persistence with CGI::FormBuilder::Multi";
-	elog
-	elog " Alternative Template Engines:"
-	i="$(if has_version '>=dev-perl/CGI-FastTemplate-1.90.0'; then echo '[I]'; else echo '[ ]'; fi)"
-	elog " $i >=dev-perl/CGI-FastTemplate-1.90.0"
-	elog "     - CGI::FastTemplate via CGI::FormBuilder::Template::Fast";
-
-	i="$(if has_version '>=dev-perl/HTML-Template-2.60.0'; then echo '[I]'; else echo '[ ]'; fi)"
-	elog " $i >=dev-perl/HTML-Template-2.60.0"
-	elog "     - HTML::Template    via CGI::FormBuilder::Template::HTML";
-
-	i="$(if has_version '>=dev-perl/Template-Toolkit-2.80.0'; then echo '[I]'; else echo '[ ]'; fi)"
-	elog " $i >=dev-perl/Template-Toolkit-2.80.0"
-	elog "     - Template.pm       via CGI::FormBuilder::Template::TT2";
-
-	i="$(if has_version '>=dev-perl/Text-Template-1.430.0'; then echo '[I]'; else echo '[ ]'; fi)"
-	elog " $i >=dev-perl/Text-Template-1.430.0"
-	elog "     - Text::Template    via CGI::FormBuilder::Template::Text";
-
-	if use test; then
-		elog
-		elog "This module will perform additonal tests if these dependencies are"
-		elog "pre-installed"
-	fi
-}
-
-src_test() {
-	optdep_notice;
-	echo
-	perl-module_src_test
-}
-
-pkg_postinst() {
-	use test || optdep_notice;
-}
diff --git a/dev-perl/CGI-FormBuilder/Manifest b/dev-perl/CGI-FormBuilder/Manifest
index 01e64f12c895..175ff9ee49bf 100644
--- a/dev-perl/CGI-FormBuilder/Manifest
+++ b/dev-perl/CGI-FormBuilder/Manifest
@@ -1,5 +1,4 @@
 AUX CGI-FormBuilder-3.90.0-rt81650.patch 5659 BLAKE2B b1481c41d4dfcd5fec774e1cae5c445730595e5b7d63843477d7adf9fac5f8da8c8703a0eb882c2b6a335f2f24aaa45f97498b842efae37fd5a3128fd179d708 SHA512 fd5957adf995c2d269bfdc69d54a5244f1190f0786c57a614ec438c6386733b2587d1b8b9720c6e8c89f24e9b9bc33745a62b16e355f9b5e7ddedde639eee8d1
 DIST CGI-FormBuilder-3.10.tar.gz 162346 BLAKE2B 96850d80b10e1c96cefd4fa83316b470898388047cc34ce7dc8b6f29086e6622e743ec548370faecee8b88a4f5ee87e7ec4c98cb5df04cac5a4a8d63e45c5ae3 SHA512 38d8e6eb729e188074d872b979ad46133152877bb30b95329a2c7275154646a4afb62dc3539cb34781149f424b1d384d05230efe8b174967742625a81765bad5
 EBUILD CGI-FormBuilder-3.100.0-r1.ebuild 2205 BLAKE2B 0d0d23c687f5da7b9d64a08a36ed066dd26f9ec0767ffc88b9d3ca18128a8c6786e7ae4c4fc72c8853e047fed069f064330a9eeb3c416d2752f823eda231527a SHA512 e2726f6c0830bc1182d1412b349f6eb9610803dc5a6af2ca9d89836dfb26b20ebe4807669cf32171e4e38e9c16e50a3b38d78aa5f64156b3d1e7df6a4bf40dbd
-EBUILD CGI-FormBuilder-3.100.0.ebuild 2138 BLAKE2B 184ae228ab915fd32c64db089e499beb809ef0e1c4ec5c24452456cdfd23f1410755638a38aeb21f4d9dd8e063d3561c51c64534de131e6080aa5601fb0f2635 SHA512 dc5480332d4f78c8b90acf58236ff261387528ade9cceb372be801ef1bf745cc52f1665cef5c390420c41395352a872a0e948913e34568b2b0c0115c3329ab3d
 MISC metadata.xml 3257 BLAKE2B 0c635a557374087cd578c64560c82b5e6be2b3ea1c65de78f40a7e1084a482813e3b0087773e78b1454097c327e668b1c446614ac7887c0b4df1aa0b4f7c837a SHA512 56a828674dafff65d7338211d07dc4f6c3655d9423cdf1ffc2d8961f87850dff6860701e1a1c452962fdcac7800d8fb6546618de4e9e521987b1a1ad4af1b902
diff --git a/dev-perl/CGI-PSGI/CGI-PSGI-0.150.0-r1.ebuild b/dev-perl/CGI-PSGI/CGI-PSGI-0.150.0-r1.ebuild
deleted file mode 100644
index de54a5de6b41..000000000000
--- a/dev-perl/CGI-PSGI/CGI-PSGI-0.150.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MIYAGAWA
-MODULE_VERSION=0.15
-inherit perl-module
-
-DESCRIPTION="Adapt CGI.pm to the PSGI protocol"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/CGI-3.330.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=virtual/perl-Test-Simple-0.88
-	)
-"
-
-SRC_TEST="do"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/CGI-PSGI/Manifest b/dev-perl/CGI-PSGI/Manifest
index 0853fbb76aab..c8b322ee213d 100644
--- a/dev-perl/CGI-PSGI/Manifest
+++ b/dev-perl/CGI-PSGI/Manifest
@@ -1,5 +1,4 @@
 AUX CGI-PSGI-0.15-no-dot-inc.patch 468 BLAKE2B 913ffa9e50ae61c28927a06c0c6a7373d34977ff5614d2742d71c17e405ef64abf19a8bbc6f733be7db394f2f24a63c7df3ef32c754c51ae27016791665d208e SHA512 7166f958114789f4e60a5834805d026bcf68f87bee3bac7544db31b8bfab4d836f6e7fd10100cfe9281a93c27695de9931e7017ce8c35858ab2421265713f381
 DIST CGI-PSGI-0.15.tar.gz 27933 BLAKE2B 76219465cf3e0079e35a72a9cf5a94fc1cd386a8378d7742f822bc505a0d64a81dc9524081642ae7b5ef984f0a3fe29cbfb49dee97c59c5e0787389a85d8d815 SHA512 5cdb32846dab5e35a81b52611bb109c66c72db98ddc6fe93a5b91335a1f03cc6ed396c415fb5ee311ce78d72e45e4986b5809569b6394d601af24d4d117fe96f
-EBUILD CGI-PSGI-0.150.0-r1.ebuild 608 BLAKE2B db6cca52ecfeafa5f767456ba07e07eea2ddc48aedd6380a07bf41da3a1e97048d88d4ff9cfdb6d1059b975c2b99895f77b3a14c6f49b809f114e6af79851959 SHA512 400b2417bcb7baf623bfd615d88f7e1de91fca8ac5fb447fd51a456b68183d1111083a34fe015c484c03092ae24ecd761960141790aabfa4fc658b1eec06e00c
 EBUILD CGI-PSGI-0.150.0-r2.ebuild 452 BLAKE2B e1f405468a6f8f282ee6a2127ea08b478b0d75f047cccdc33edccfd33ff529cc2683095a3f3948d76d72c5f562241366067a3f95ba2ae666a1dc670624511a84 SHA512 084d48fe0a8c1f8459bd286bdd778d45a179bd5fb2cb436578be50f526fd6615b2ff9be094550ccc78c40191718165e2c1cf683d4cf28d0cb81626a990bdeada
 MISC metadata.xml 388 BLAKE2B fb30d568dc1dfd36ffa4b1a0fa67622397f5933886afe375dafde92bf8a980c4500fb3d95bed75e342b197c637c335e7e6fcdf47008818371531190464b570ea SHA512 0c5b8967c647304dd411cbf1448758c2b41fc7e49c89c85fe40a9c94f8527f79324cf34c030eb8fbd46e395aa267e6d891caa69cab8ba056452c8532a0a79d18
diff --git a/dev-perl/CGI-Session/CGI-Session-4.480.0-r2.ebuild b/dev-perl/CGI-Session/CGI-Session-4.480.0-r2.ebuild
deleted file mode 100644
index 510ddd2936a9..000000000000
--- a/dev-perl/CGI-Session/CGI-Session-4.480.0-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MARKSTOS
-DIST_VERSION=4.48
-inherit perl-module
-
-DESCRIPTION="persistent session data in CGI applications"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-Scalar-List-Utils
-	>=dev-perl/CGI-3.26
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.380.0
-	test? (
-		virtual/perl-Test-Simple
-		dev-perl/CGI-Simple
-	)
-"
diff --git a/dev-perl/CGI-Session/Manifest b/dev-perl/CGI-Session/Manifest
index e66cce54293f..444054b498e9 100644
--- a/dev-perl/CGI-Session/Manifest
+++ b/dev-perl/CGI-Session/Manifest
@@ -1,4 +1,3 @@
 DIST CGI-Session-4.48.tar.gz 95291 BLAKE2B d1d915c85e230ec73575d56cc92589c45a5f6d35f52737b5cefa61704cfc42aeb6682e3e56e1b8cb015ff2d55b141dcfe01ad4fe376e70ff17014edd3951a531 SHA512 82d6a498035b91474df712fdae2c9ce7290157ddec36095757f16b5cbce593d3b5115077c722350d1c890c299230f7489a41328ed64b85a0f4c3cfff8aceef54
-EBUILD CGI-Session-4.480.0-r2.ebuild 518 BLAKE2B 4e3019d5177ee778f3d7d7cc1fcc4a246ba64467be9e7145d9db69fe0c12f54efe6a23daccf5f409334c26aa83f1aa50ed3c86380ae82f667521e01e8cdc3859 SHA512 6a8da96d70a114785debb24fb37ab9d9ebb10b2dec307b9cd1326c91e4e8b9b1defca37b51e16522836a367fe4ce52102b6f0b51ae5e0123df8413dd140957cb
 EBUILD CGI-Session-4.480.0-r3.ebuild 625 BLAKE2B 70cb12d2cfde88204824e9d186ffa48a3c686c27afa909174f9a566bfb7f0995ee4782a00a8a807be37273ef2157d7dc79137eb1aab0f232d119e3bcc2cb1ac9 SHA512 8ce19ed7829950e79f2af482c849dc9b5ab126c7296c0ecd9d5da56913e9caa0fd6321ec783515cd1fbcb099de15d7c5dde3fc7f45e662e98aabe7189280f72d
 MISC metadata.xml 1721 BLAKE2B 40faed24613f6a20a61b2c7ebba7d7e2bf924663679f055e4f3c5787f89be7a970de31ada575bff326f751e997c8de47d80c10ac52ff295c430c289179a63cd8 SHA512 6ea6ca3c7fde2642c9dbefd6e26e98bb9179788d9a4c6956ab8f339b7f069860cd519c64d2db182bbc318ee488a402474ba1110959b13bb2e0bb86a19a87d818
diff --git a/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2-r1.ebuild b/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2-r1.ebuild
index df01d2b95045..a6e725df22d6 100644
--- a/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2-r1.ebuild
+++ b/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Read and write Changes files"
 SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2.ebuild b/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2.ebuild
deleted file mode 100644
index bc25746ef13c..000000000000
--- a/dev-perl/CPAN-Changes/CPAN-Changes-0.400.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=HAARG
-MODULE_VERSION=0.400002
-inherit perl-module
-
-DESCRIPTION='Read and write Changes files'
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Text-Tabs+Wrap-0.3.0
-	>=virtual/perl-version-0.990.600
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.960.0 )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/CPAN-Changes/Manifest b/dev-perl/CPAN-Changes/Manifest
index b8bf1c2f4bd1..c55bd8e8d6ad 100644
--- a/dev-perl/CPAN-Changes/Manifest
+++ b/dev-perl/CPAN-Changes/Manifest
@@ -1,4 +1,3 @@
 DIST CPAN-Changes-0.400002.tar.gz 21361 BLAKE2B fd3f293e3bedfc4b1dcc5a9fc20187d08a3ffdd5c9fcf8233cc666d614c65d9b071bc410843b969307a873ecc2c5ad375e5a7e8a9834da53da821b1b7ba74434 SHA512 d359073d9d5ed2126835d4895c1ee5288cc09e72202ba77441bb25cf13e9cd0f16d4040b7e2cf1785efd6e8ccbe7908415fb4fefeebe9c0548d838d2ac850dfb
-EBUILD CPAN-Changes-0.400.2-r1.ebuild 606 BLAKE2B 0b27398e33a211178d5c6324bfaf3a1f4570ae57ab00151c2049cd0493e801efdae91ff61adb1fe9613af15d84dde3b30773e78cf7f625cb0e7772893350e6bc SHA512 7cbabc01209b6763ee2943fe88156855bfeeb61ee4a91019253eac5d94e16919281585597e5cba7c2d3f0fded69446b800201b776f801f817cdb890e080204cd
-EBUILD CPAN-Changes-0.400.2.ebuild 633 BLAKE2B 993be4f11eb404ca97442bb930d6502d2a053432b45a63086bccdf54f13a8e32fa16c4925cbe632f17869916e750e12a8ef1d4eb6ec9d82cfaacb0a31db28080 SHA512 0b6965b8bc67d5af095bf6ec125a3e889fae654e2604e5caf5342304493852b201dbf8d0b28213b5524bc739cbbb4bd950492268b8d682f7decc7f172bf74a29
+EBUILD CPAN-Changes-0.400.2-r1.ebuild 613 BLAKE2B b77b15eae3038a6382a9b59f6729f0cae7749a5f2732b0d68cd81cd85d2d539404d915a3d90ce1b62103c4265338931aa51e4a1d3baeede3c8e0eef4f663e475 SHA512 28ceb9a830548eab0ad4f4209ec33dea81c3535efb88fb7967fa7cab545b73e0fdd26a4fa13e103ab38f9014f72dc5c8ff5cc3a4b3cacdb8473bbc41de38b64c
 MISC metadata.xml 580 BLAKE2B 82b1d1cf8d44e0225d38d1365458c545faecfeabcf27f78c6d5e2b6896b6ed3d7f2477dd529af6b0413ada74b1bf910d52458cb8ffe43bcad7a581179efd7c3b SHA512 f8e07624ebc445876dc298d04aed6a38ba17b73a564bb3be1e8fd1475aba258a795e687e340b2e317051201fe79de7b7dcbef095c67aaf593fc36dce5f813de5
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.760.0.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.760.0.ebuild
deleted file mode 100644
index c7988f129469..000000000000
--- a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.760.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BINGOS
-DIST_VERSION=3.76
-inherit perl-module
-
-DESCRIPTION="Mapping Perl releases on CPAN to the location of the tarballs"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-IO
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
-PERL_RM_FILES=( "t/author-pod-coverage.t" "t/author-pod-syntax.t" )
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.7.170.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.7.170.ebuild
deleted file mode 100644
index f15ff4f0b098..000000000000
--- a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.7.170.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=BINGOS
-DIST_VERSION=5.20200717
-inherit perl-module
-
-DESCRIPTION="Mapping Perl releases on CPAN to the location of the tarballs"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-IO
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
-PERL_RM_FILES=( "t/author-pod-coverage.t" "t/author-pod-syntax.t" )
diff --git a/dev-perl/CPAN-Perl-Releases/Manifest b/dev-perl/CPAN-Perl-Releases/Manifest
index 449ed3a54ec4..4443d83a0d59 100644
--- a/dev-perl/CPAN-Perl-Releases/Manifest
+++ b/dev-perl/CPAN-Perl-Releases/Manifest
@@ -1,11 +1,7 @@
-DIST CPAN-Perl-Releases-3.76.tar.gz 23487 BLAKE2B 1f9f8a39299ec8e1c5758c508796b5ec9e3e602a394554701c99a823f2eab458ab535db279ca1353e54da498bf5a2658f2f7ed25fe66569ac6b2915618b0fb89 SHA512 83fc38db852bdfac7a1e5c8b2d0f9689b91417c663a8d6b0182e583a76e5aa4d45efc84dc35b849a3d13590eaab69c70a1f785019cba749275c3768da15e20ac
 DIST CPAN-Perl-Releases-5.20200428.tar.gz 23709 BLAKE2B 0ef30b30e482884d6a18d78402a7ead872ff8a0100723921e8b1e39d851af7c2dc432d5033b7524afa44cfdca87fdd8d8d9f5cc70d88df723a8bbd2962571079 SHA512 44ea58bd29d3db8715c92a1d1e5953a5a185669a08d5f01bd36a695ef8687c9fcf08a399a2d52a84c214f0b4dceaf829030fc17d29b6663bc50f9abb89378c9b
-DIST CPAN-Perl-Releases-5.20200717.tar.gz 23787 BLAKE2B 1181c6379ad938455d67a58ee10b29b99c1f51356d91876d8b36bdeaad21f6a2c18405910d4f7cc547a0f0da6a74efbc24f070500d5cfe390a5c79da22422b24 SHA512 8464bcff42c4f27f001cbfbeee798f168c67068928eb0c062c9a0b6cf6044d474de882cb14ddda078f099c2d7f99cbb978a2a2f208e5f00cf81b8cc27983f20b
 DIST CPAN-Perl-Releases-5.20200820.tar.gz 23732 BLAKE2B 2064dfd1260e990361c9f7bf9ad43c579e01480c994c6e2d654a9d9e262b1fbad77bf809e0bc58d8e6e92f889af6564e3d95f783bbc5833bae7faa90bb73b3d4 SHA512 1fbfdf32cc261803a435825320672736a906e8d4dc1997e8c424931c04fd686e162cf368bf9ed7d9c4cefc2140569357fe8e30c10733f8a7694a56aec16d5d22
 DIST CPAN-Perl-Releases-5.20200920.tar.gz 23596 BLAKE2B abb354f1ff2f0e761223a2df39513abd10b9c409522b2f006ab8469db4d54df90d5dbed13496a907e3cb087a0a5bb01174ecd7ef3ee9d4be9614c4df1a1c3d50 SHA512 b6d28721e3941fba74eb3a377b9d25a896865b9b3aebc7ee476cebf894db999de79bcbad9091d5763c2e82594c9d5cc5c4dfae075d0525f085d7a5026f1db31a
-EBUILD CPAN-Perl-Releases-3.760.0.ebuild 542 BLAKE2B 9ecf7bd71655c6d82443fd8e6e11f34b1e9db702725fd45355259d4286cd0499ffc43ff3913b53b414a33f1d9358e7f5b47f9da4e49c3131b57ef4859c6c46dc SHA512 2215e0f261aa86de0dd123841ad6363bc562b76345470a19838c86790b2873538e139e3ea78daf84af5d723bda909e7cfd9e3bd52fb20de8a7d39d78765dd5f0
 EBUILD CPAN-Perl-Releases-5.202.4.280.ebuild 528 BLAKE2B 24eb766a5c697f36442d752871e7c6e01464d2a0febcebdaa36b467d1e29d5ee5f9ef0c5de2d297459876229b86395459ef8abed85dd9973f6228d239bf927df SHA512 95734c8c1306b9e5333ff3209c512d3b2109e28b2d2648d847f80afec49c208a750cc8ba50570ed5432dc592a9ad8ffb03d0a7ccd5eef254958e209dd2551ba2
-EBUILD CPAN-Perl-Releases-5.202.7.170.ebuild 530 BLAKE2B 5f04d119256b6e4c9e4126106a9223c45d3666ea6d1246b31d7c9b87eac0d65e725b579050d073db0a3673d6fe3ac3a9ceae2464bf9a519a6aa389481b2f1667 SHA512 de9399b0500eb9413593ec8ee08fcf53b6dad8a4300f714d40d5e6004d0f08cf23013c95768bdb55d8917b1d1f144abdb255a5dd6c20b5f8157e7c5e76db5066
 EBUILD CPAN-Perl-Releases-5.202.8.200.ebuild 530 BLAKE2B 7ddda5045eeec127fcbc1c89ac38d15525d3dcb1ce453895b376c0dac3f5b50c095ab8571aad0cc6c79e921016836ab3caeefa830028d684fc3127a478719f59 SHA512 632a0c48d1c03d4acc66c87e34c0db68d1d587754d708c8c869c15581964a9b6a9767292f8677b6f006298f94adb91c7d4d99f8477703d7d391e0c04b9402a0f
 EBUILD CPAN-Perl-Releases-5.202.9.200.ebuild 530 BLAKE2B c8edea21bc0cd33fdc9d4acfbd5164fc4a74b67f38ef208855356887bfd2d3513ce680a7a5586ed0edb0a6225b8dae9adb58364375e79fa57a600504620bf97d SHA512 6362456946e933b36915c07cb721325f6e7d87ee3aa4e56bf106fd220eb23dd8c041c1ffa098c50fa4fec6d3871763bbf580005955cb1d7d9ed06dcc79c249b1
 MISC metadata.xml 433 BLAKE2B a0b86cd3b77e9a90dffecb2d6b828713c337200098e616d348afcacc7871299a7f11d30b44b1211440f083d60eb81f28b8c6d92f6ed573bffa695b6bfb4bf217 SHA512 b890be772a432a55a6ff50c91180c9684754f167dadaf64ac05f638865e76960a36274207d7e816bcd85a53f6fc5f2b263fcf7adc3bfd609e64551aa23529363
diff --git a/dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.14.ebuild b/dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.14.ebuild
deleted file mode 100644
index 1715e65381e3..000000000000
--- a/dev-perl/CPAN-Uploader/CPAN-Uploader-0.103.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DIST_AUTHOR=RJBS
-DIST_VERSION=0.103014
-inherit perl-module
-
-DESCRIPTION="upload things to the CPAN"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test minimal"
-RESTRICT="!test? ( test )"
-
-# r: File::Basename -> perl
-# r: HTTP::Request::Common -> HTTP-Message
-# r: HTTP::Status -> HTTP-Message
-# r: LWP::UserAgent -> libwww-perl
-# r: strict, warnings -> perl
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-Digest-MD5
-	dev-perl/File-HomeDir
-	virtual/perl-File-Spec
-	>=dev-perl/Getopt-Long-Descriptive-0.84.0
-	dev-perl/HTTP-Message
-	>=dev-perl/LWP-Protocol-https-1.0.0
-	dev-perl/libwww-perl
-	dev-perl/TermReadKey
-"
-BDEPEND="
-	${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		!minimal? (
-			>=virtual/perl-CPAN-Meta-2.120.900
-		)
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
diff --git a/dev-perl/CPAN-Uploader/Manifest b/dev-perl/CPAN-Uploader/Manifest
index 60fc19c0bfd6..50548ebcc18a 100644
--- a/dev-perl/CPAN-Uploader/Manifest
+++ b/dev-perl/CPAN-Uploader/Manifest
@@ -1,5 +1,3 @@
-DIST CPAN-Uploader-0.103014.tar.gz 21562 BLAKE2B 09596c89e21eb3a4e8ee8b3375f668e156508857828f0d421ea4f2ee5f831ae58e10091e93be7c362fd4cb7cbd42b03d193974497ed8749ed3cf9b6e4b16671e SHA512 2c7434e0bb6afb6aa73b9ac5cb4d1a865d179c63eaf1f985fc2117ced877b9845c71144e5fda29cad24dbf0073d3e167235f4ba359adca58a081c167f5aabb80
 DIST CPAN-Uploader-0.103015.tar.gz 21615 BLAKE2B 63d576c6a57f7a28bee4ab4b2d5ed1b52d97edd6518b5eab8c7d932ebfa99ccd6b67d8c3c50ad2fd175a910bfafd203e30f3f35ddb185bf390d2ff839eabac71 SHA512 f4204c2b9caf98b50e4551b1eb68f1a8144b42b129539b4bcd71508e3df93b41219b3f323f01ac35d86d9d81ed14fbfccf4a77266296c62cdec44b268f512ed4
-EBUILD CPAN-Uploader-0.103.14.ebuild 900 BLAKE2B b901b43ab6c121646d005142067ff859168f41c5b2ee66306439e55af74677d63e3edb19e7a832d4fd80183945d0c055097452bf3eeedbe6a66dab9a17660e62 SHA512 04a8f29ef6f953c2b2612e1ab934924b7f7fd9f0cb7d2d98791cdf87f9d9132c4666790fc3bbcde4ac98585bd53c6163148db7c2fe48de8bc0cdc647d48c84d8
 EBUILD CPAN-Uploader-0.103.15.ebuild 900 BLAKE2B 01a1f28263c1e860a390143ab7609a19c739387afc39b0f52980a84b807c1a19b4bfcb0ba7f229ce85132cd98edcaac50d091f2db41af3cdb56bd888327576b4 SHA512 2804d126eb2b576eea0d25b0c2f3e56e1b633a0faa0d76b88c6776308bb9ce9df337d09c2669a7dbbc756c11ba9bf343c02407b8cb98eedcc020f93f0a606eb4
 MISC metadata.xml 398 BLAKE2B feb7c968153fec9cadca6c5973834b28161e94d0d4cbc062d1e5b65af914c1edcf2fbc731d5b6c2c264e3ac4eae748519a420c107e0777cc4553a5ed0bd2a6eb SHA512 07efe44d7a1e13c7678d188f012188cb8d5a0bae599a6d8b98ff881f7b99a1d6956c09053f4a345acddbddfad813e3e7aee6a352ce8b918ee5a03ff37481ce43
diff --git a/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.90.0-r1.ebuild b/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.90.0-r1.ebuild
deleted file mode 100644
index 4dc6d7ec9b7a..000000000000
--- a/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.90.0-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
-
-DIST_AUTHOR="GTERMARS"
-DIST_VERSION="0.09"
-
-inherit perl-module
-
-DESCRIPTION="XS based CSS minifier"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="
-	dev-perl/Module-Build
-	virtual/perl-ExtUtils-CBuilder"
-RDEPEND=""
diff --git a/dev-perl/CSS-Minifier-XS/Manifest b/dev-perl/CSS-Minifier-XS/Manifest
index b1bff896baaf..7bd97d30e2de 100644
--- a/dev-perl/CSS-Minifier-XS/Manifest
+++ b/dev-perl/CSS-Minifier-XS/Manifest
@@ -1,4 +1,3 @@
 DIST CSS-Minifier-XS-0.09.tar.gz 14363 BLAKE2B e7dd8c24ef30c98146ec4bce1c0299fcf83c7c7696b8ffed96100b02654a313d826cdbf87cb9c60f08ac850b7cc5389f8cc38e2ff50d544237084dd84f2ed105 SHA512 520e40fa4a6d70bd7692880f3bc5c813a8648dfe12946426dedf0874e180ccd98e703d67ed8b502a7b00489aa2404edce844d80b1eccc48f94156a0d5c36ad51
-EBUILD CSS-Minifier-XS-0.90.0-r1.ebuild 326 BLAKE2B 39c18562da5a96a0033a7a0c8d8dac0c644f312d060f4732e2a1e415d7faba0eb8ebc995560691b0cc234167b52091209eed9224f86afe180e00a95137c6696b SHA512 991f1a220c0efad80dea4a60b2d374c0dcfadce64109281f6f80d656c61f69c990d2585f63df642ea98461117a6fcd5df8e02a1db9689e617d5a5891eba6fe55
 EBUILD CSS-Minifier-XS-0.90.0-r2.ebuild 525 BLAKE2B ce5ac2add8fe5e5494620effc05de9ae3e66b477625833791918eba8be2e3112475c7ed669a42652a14ae8597c8c35112bf37cb853edcfa1731538ec0615143b SHA512 0e5156cd56f2a13837ff79d58ab360df5d33d0e628b156aa213b1759c00feb8abbfdc662dd4855f638633800b52a08d6bbb226033953862e15bdf5ff3b63a7d3
 MISC metadata.xml 403 BLAKE2B 025a38da49301bb4b4512a0be3542eae08c5ca47b6d2546dfae483212c72e49baef55d0988f877e721c2d9f0d4c895949ed727e16ead064d8e040ee16eb9c189 SHA512 23aa349976466bbc6cf6cdb98de641278e96c39af22c4805431b6ff22895e949dd5d526053c7d31071505a89d42b1b276fffa3e7a600d4ec4a3528ef817abf7c
diff --git a/dev-perl/CSS-Squish/CSS-Squish-0.100.0-r1.ebuild b/dev-perl/CSS-Squish/CSS-Squish-0.100.0-r1.ebuild
deleted file mode 100644
index 59572df55ec4..000000000000
--- a/dev-perl/CSS-Squish/CSS-Squish-0.100.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=TSIBLEY
-MODULE_VERSION=0.10
-inherit perl-module
-
-DESCRIPTION="Compact many CSS files into one big file"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/URI
-	virtual/perl-File-Spec"
-DEPEND="test? ( ${RDEPEND}
-		dev-perl/Test-LongString )"
-
-SRC_TEST="do"
diff --git a/dev-perl/CSS-Squish/Manifest b/dev-perl/CSS-Squish/Manifest
index 4594931614af..1c0b351df69e 100644
--- a/dev-perl/CSS-Squish/Manifest
+++ b/dev-perl/CSS-Squish/Manifest
@@ -1,4 +1,3 @@
 DIST CSS-Squish-0.10.tar.gz 8646 BLAKE2B b230595247adc9d7332f28d7b38f3d047de3eca39a3f1ad2ef511ef8e3acaaf1f1a4e8b6225f600e54fc6420cf7d187f70709f67770f27ffb93f689021c1fb81 SHA512 82140c51a1e0cbed5e63a04134f56f8dcc0b383aa6b7b40574cf6636d3f92373cdd0eb474045daa8c5769cea7cd2b60bc7b36804ebea090541174d9a9e0ba6ac
-EBUILD CSS-Squish-0.100.0-r1.ebuild 427 BLAKE2B 3d782d962a44aa69af78ceda17e9b646888818514501b8d927205352d7a4c1ba0b80188671fce36ef85270bfbb9a5cce4a91776db0864544010ddd20e0d327b1 SHA512 19973572df11b4a56a598ad9b3ce246d12606c8c13ce4881160baa3eceb1a9becfcd40a3325bb6e2cc6ef6e4550e7e3bcccf878d60f3e5beafdf067cc4950fa2
 EBUILD CSS-Squish-0.100.0-r2.ebuild 610 BLAKE2B 9309ebd3b41b923b086c436da83d321bcae21350c1d9e639a07288db86aeaa9d2f519137f52db689e7b9a8c61b3a2a41ac7651cfa06a487811d238a2371512c4 SHA512 3a88335b7ff482f16a91cd6e368736f72730aa444517e84320450ad459506dd0b09a111fb748090e03f52b433fe73973bb9762097dedb6ebe916f4ad381767ef
 MISC metadata.xml 392 BLAKE2B 60f0f88e187e7145630642250fe15a3f2d55d1bbd05e614d2e8ba8791cecdb65252aeef6b28f2ecaec2b558084c794df8fb42a500446c7c9fa70dba9e69a844c SHA512 5a360c44706f506192bc0174a832185b4a7c1d9c622b5e87662f97ca1e03dc7dc0f62fd71e4c088e8f432d684df3fcce7c45803639cc4a799b62ac2467ebc0bd
diff --git a/dev-perl/Calendar-Simple/Calendar-Simple-1.230.0.ebuild b/dev-perl/Calendar-Simple/Calendar-Simple-1.230.0.ebuild
deleted file mode 100644
index c992882c4afe..000000000000
--- a/dev-perl/Calendar-Simple/Calendar-Simple-1.230.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DAVECROSS
-DIST_VERSION=1.23
-inherit perl-module
-
-DESCRIPTION="Perl extension to create simple calendars"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86 ~ppc-aix"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Time-Local
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.28
-	test? ( virtual/perl-Test-Simple )
-"
-
-PERL_RM_FILES=( "t/pod_coverage.t" "t/pod.t" )
diff --git a/dev-perl/Calendar-Simple/Manifest b/dev-perl/Calendar-Simple/Manifest
index a684db483fe7..ee5e1f5d00a0 100644
--- a/dev-perl/Calendar-Simple/Manifest
+++ b/dev-perl/Calendar-Simple/Manifest
@@ -1,5 +1,3 @@
-DIST Calendar-Simple-1.23.tar.gz 7989 BLAKE2B 24c25e60021e6210e06645a51fd068c7e0887b5273c83b3fc2cf632deef2530e548d6c3282807c8564d4999ce2f133303a9bb2e6a40ae0aaa77cfb11f205bb5e SHA512 3d024e3de896a20b837adfc4fbac2bcd1dce969ac426445573ae0975e189ffde906e7c25d3c6f0595a7e49d47a09cd3e9bdfb6810ca7c9e20f9e01a4ecb7ec49
 DIST Calendar-Simple-v2.0.0.tar.gz 7024 BLAKE2B b86153bd0d50b14e6910bc0bafe5aa8c7343112c2538001714c62de3a2926a1b98e2cfbc05289e7fac702e638c5ad6090929baf611e33366bb309bfb5ae231ea SHA512 2e9e16a27d254cf68e38be2ee1715e1f8d0d3b224ed8fb1a2a5e56ac172a25f67beec08b7a18bf0bf69a66a3ed7d94d058faad46f3a266a24e2b39fa8e2d3efe
-EBUILD Calendar-Simple-1.230.0.ebuild 512 BLAKE2B 50e0f9718189111b0d902082cea8fdb4657709cda1e5503f753c5cefc0c0fc20904e36323b6ed2eeee4d19bbfa74f2b59fdf11ad049cc1b07ae8930c1e60600a SHA512 ebf87b3691574f6db0c80e6167857dc78bd1664e3828c8b2c0b80af6f3601bedfa101f99961953f4e20926f9cd7b8c397215eb9adfe9eb98922e85598d93c32c
 EBUILD Calendar-Simple-2.0.0.ebuild 593 BLAKE2B 99cf84c9a5dda237d4dd10b5a9bdf52ae2b3d29a03a86f54c28bd6f685e489435db6c0991d9a07c8314b27de2319ba33a1bdf3247b42b20138dcc81bbc3257f4 SHA512 a8976ec74f89d6a2a7c7dc66220167d839aa94bccdd20d02a6b0e46558627f527bb014c59a26ef59cb7b81950744374c3e60741f01045c96529752966d589e34
 MISC metadata.xml 402 BLAKE2B e465130f7fe7cb9d112ee98993aef5e231358cb81da41b3b69f0d32f06be9d7789d92322f8c3d42d6f4da3254b3aaac502aade47bc5c3da28754bf07ae803ab8 SHA512 d35e03eecd4213fc034e86a4d8786aeeadfce4e58bc210cdc50e39b89aad8cd407481ee44cc7bd96e510279087b782d5470eb8fcd4f653236c717bcea01e18cd
diff --git a/dev-perl/Carp-Assert-More/Carp-Assert-More-1.160.0.ebuild b/dev-perl/Carp-Assert-More/Carp-Assert-More-1.160.0.ebuild
deleted file mode 100644
index ef0b31734bc9..000000000000
--- a/dev-perl/Carp-Assert-More/Carp-Assert-More-1.160.0.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
-
-DIST_AUTHOR=PETDANCE
-DIST_VERSION=1.16
-inherit perl-module
-
-DESCRIPTION="convenience wrappers around Carp::Assert"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	dev-perl/Carp-Assert
-	virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Test-Exception )"
-
-src_test() {
-	perl_rm_files t/pod-coverage.t t/pod.t
-	perl-module_src_test
-	local MODULES=(
-		"Carp::Assert::More ${DIST_VERSION}"
-	)
-	for dep in "${MODULES[@]}"; do
-		perl -Mblib="${S}" -M"${dep} ()" -e1 ||
-			die "Could not load ${dep}"
-	done
-}
diff --git a/dev-perl/Carp-Assert-More/Manifest b/dev-perl/Carp-Assert-More/Manifest
index d7f969875492..75d5ca254f4f 100644
--- a/dev-perl/Carp-Assert-More/Manifest
+++ b/dev-perl/Carp-Assert-More/Manifest
@@ -1,5 +1,3 @@
-DIST Carp-Assert-More-1.16.tar.gz 12290 BLAKE2B 818badbd216e70813993ea859796a16c531c767211ed6b294fab870dd342117b5445db73601f4fc955ec907d1340bfce6f17a784580bac8823a9d72153af38ea SHA512 9f81604574eab5a0a5003ad747ffec3a3dd33bc63e67d12697e4e30de8cb234a73e225f82a4d0f31576e19382cc2d6a402962f5fe1e4c5289e080ca23b30c0fe
 DIST Carp-Assert-More-1.20.tar.gz 13282 BLAKE2B aa85111f076f78d0de2e4568b2ddb3c1318c5dae76da3b29f442e07e7b4f729c62abf94bc320477f1c572c6ff64d87c30793fb64e88f0774cba873c7f5aa8ffd SHA512 9caacf2cc4acb190b071a7312e5e1cdee5a0b7a0e9db0efc6dca0fa19167524a3bd6beecc4bb8e68eace719fc1d918063e9d259a24cb28e81dd628ea75ba541b
-EBUILD Carp-Assert-More-1.160.0.ebuild 750 BLAKE2B d058ab695f044a68de632d44100c1edfead12fa48bcbf2981caafd2d4fe31a8ee9aeeb37af9a1ebf6b55c74ddffe8144d29e3bb3ae24cc28fcffcec247fd49fe SHA512 f662cc6cde9ae3c00bde6bc03fe0e23ddcf021085268e52252462787116e367f666d53d2d1b7ff34f255827db26213d9dee923f8c190008c6d9361e5996ceb41
 EBUILD Carp-Assert-More-1.200.0.ebuild 796 BLAKE2B cc13b5720302329fed6b4de514bb4f1e8503a9326deec5902344cb865bfcc0960a61597e252720237865606728a702d11d099e8e60121379a7b57291a8be7533 SHA512 4536d5f64f3ae0ecb58b07802d132deb535be2ee41d4145ce9b23af685bfd507bffd7d4bb28f3e966f84a242822127f2f2f6842adcb403bfcc5c4ca2dbc0a241
 MISC metadata.xml 405 BLAKE2B d8ca44fe4df62b0f030d968ea7835b52f9bd1dd0fe2409c0555fad6f1574c872dd2815a87f6c238ba2d7f4dd2ee3ff7fa712177b919b2d5dee3091a6d2871f42 SHA512 ea517d0eb9c3a7b9100622391d5a6ad41f3da6a019a612ba03ce6d850c229d41a41f53c7c0e59c06b80c145c0fbbdf597d5dbe803fab77271671ca3bed5b4889
diff --git a/dev-perl/Carp-Assert/Carp-Assert-0.210.0.ebuild b/dev-perl/Carp-Assert/Carp-Assert-0.210.0.ebuild
deleted file mode 100644
index 4e111dc4073e..000000000000
--- a/dev-perl/Carp-Assert/Carp-Assert-0.210.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=NEILB
-MODULE_VERSION=0.21
-inherit perl-module
-
-DESCRIPTION="Executable comments in carp"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Exporter
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.880.0 )
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Carp-Assert/Manifest b/dev-perl/Carp-Assert/Manifest
index a769c3d22abe..39e6d0f31a41 100644
--- a/dev-perl/Carp-Assert/Manifest
+++ b/dev-perl/Carp-Assert/Manifest
@@ -1,4 +1,3 @@
 DIST Carp-Assert-0.21.tar.gz 11106 BLAKE2B a0efb692807225fce181f4984043146fb0af7a74a63133926d116b83d9a121e1e7150090475faa03749ab25052d4537d9499f5cc83bfd56f76b019c6983d921d SHA512 9fb96ebaf03a86edcd0262b5216b345839dc99e504738e52f883932e425cac33470fcb0e8e4653488c0d8e63e9904af311056213c63ae40bc3935eec4c0410a0
 EBUILD Carp-Assert-0.210.0-r1.ebuild 514 BLAKE2B 502c9efd04143edabaea97bf7d70a1240199f4362d2b23fc30dd3ba3690f1477e0df21cd890088f8553fd25212775dfb0352aed87022170e337e93398d541f00 SHA512 1e08202ac766be9d7010e9d435e8951914fae93afb9acb75460c6001d09aeda62c05794a06c676671c3b2f8be302f7988127232de7ef5c426aa02df55248236e
-EBUILD Carp-Assert-0.210.0.ebuild 532 BLAKE2B 2184b3f6dcc0dc44e9978643a23207bc7ccc1a8d79721cc3cc0f37491e21e8419fb732f1b60d394a6011696e29a8548e7af6c5dcbd31ba9f42a2fc67e51c1c92 SHA512 c81d1ee15d932af68fabcc8ef6420edc2424ce580383ca1111df08ad23694faa95aa4e490192c0895d48416d276e22635a8f2034ad3be466aafc8d22c34af0ff
 MISC metadata.xml 394 BLAKE2B 5fabaa4cb2c4c892649bd942cc39aa0859d6ddb897b5100882465e67516c120d5fd44b0be2203ced59a09d9c4e7ba9c37dc0f7a90fca0f9675e0ac4a43acbb91 SHA512 89011752498bb7bd8ee219d92fb1499da44b848bed95299cc1c7bb1b23117d065d51651cf48d66dcb5e10b98ebdc6e8924f00bc9502ad8f2a06ca373af960202
diff --git a/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.60.0-r2.ebuild b/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.60.0-r2.ebuild
deleted file mode 100644
index 318e59d6ff4e..000000000000
--- a/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.60.0-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ADAMK
-MODULE_VERSION=1.06
-inherit perl-module
-
-DESCRIPTION="Implements an algorithm to find good values for chart axis"
-
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips ~ppc x86"
-IUSE=""
-
-RDEPEND=">=virtual/perl-Math-BigInt-1.70
-	>=virtual/perl-Storable-2.12
-	>=dev-perl/Params-Util-0.15"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install::DSL /use lib q[.];\nuse inc::Module::Install::DSL /' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Chart-Math-Axis/Manifest b/dev-perl/Chart-Math-Axis/Manifest
index 926fb2f19446..70b674b481d0 100644
--- a/dev-perl/Chart-Math-Axis/Manifest
+++ b/dev-perl/Chart-Math-Axis/Manifest
@@ -1,5 +1,4 @@
 AUX Chart-Math-Axis-1.06-no-dot-inc.patch 472 BLAKE2B 217607c3b005c86f4b23e28f3e1e48648a896e59b69bbf66594a11904588ce1c7e7a9aa1772820d6f68e907a1d728f6d882372b96914f00608360601d63acf58 SHA512 e5f3d42c1880edbd26f93d5e1c1dfe602e88192ad3138e83306c4011403617325194201fda6da07c989eca64ff8adafc22d4f1f9ae4a314b6004c638674c477e
 DIST Chart-Math-Axis-1.06.tar.gz 34217 BLAKE2B e61763606af967128434b7e5d429e060ec743d9ded1d11d1845ace9bd485dba056ab1bccb5ec232e60ddc832b5c38ecfb61e2b93acfd10d3f1e5f48cc49acb7f SHA512 7e8d8264177bdfa96629fe01ccc883b1dccaef81ccb2529c56aec9ca20e6fcda747fc6f8703e997c7a3ce4b7ee4bd77e21a7d6953e735eba785ffccf2278bca5
-EBUILD Chart-Math-Axis-1.60.0-r2.ebuild 646 BLAKE2B 25f3f08f40993e913aaf3a04505fe28ff7f6b38c33da378f0b9f6eeccdef685cd81ddaaa3c12a2093fffe44d7ebe7d83bba90a02c11a96a83790f6d342bfcb23 SHA512 2939f0e2498f9fad4faf4d75e8ecb69d450aa9d2dc9abe2afa948cf42e3b873e671315103805b15f096b286a1f5be0670fe8fc693b4e99690d5f7e2c4f5ed36a
 EBUILD Chart-Math-Axis-1.60.0-r3.ebuild 612 BLAKE2B eaa200010522dfb56ccd32a0a5d83f6f20c1e3494eb2f546b99e77f5b090a512cc3286a21181101e2afa0f6eb23b06ebf121fbfbf4e2b8800d8832a73ab6494e SHA512 6ee1c4c5ca72a85fb390f719976fe320ff87bb7c5b28896993fdead2adf1f49fd30f54c7cfd1b78c51d1c16afa3eab547db3880410ed9f4ae290c531a10782db
 MISC metadata.xml 403 BLAKE2B 5846cf5386fd787a591aa08daebb9195fa31aee0b3d19bbfe57c0aaf884d09bbb46b415f9658b6a5d77b0c5e285eb1ab5a2e1adb3a36220b6a34b9961aedd6a6 SHA512 b2d0bac91eac8199b82221924e99086d889b229bd8ddc9152a70edcf5abf69d203331d00ba06e50a65586486b262bd851e84914570acbdfa659551db2593e2cd
diff --git a/dev-perl/Class-Accessor-Chained/Class-Accessor-Chained-0.10.0-r1.ebuild b/dev-perl/Class-Accessor-Chained/Class-Accessor-Chained-0.10.0-r1.ebuild
deleted file mode 100644
index c4264f053335..000000000000
--- a/dev-perl/Class-Accessor-Chained/Class-Accessor-Chained-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RCLAMP
-MODULE_VERSION=0.01
-inherit perl-module
-
-DESCRIPTION="Perl module to make chained class accessors"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-aix ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/Class-Accessor"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build"
-
-SRC_TEST="do"
diff --git a/dev-perl/Class-Accessor-Chained/Manifest b/dev-perl/Class-Accessor-Chained/Manifest
index 81be8a40a809..1ad7ea9126ed 100644
--- a/dev-perl/Class-Accessor-Chained/Manifest
+++ b/dev-perl/Class-Accessor-Chained/Manifest
@@ -1,4 +1,3 @@
 DIST Class-Accessor-Chained-0.01.tar.gz 2322 BLAKE2B a53bdc8ab32939b020d9d57b807bc42ae1d5b1853aec45d20e74a2291ae9a6e4d39004e2c6a26d70b26301c742ca13daab7230c1abade23918a0a5b4769f6d62 SHA512 b2728d12dd3bd01169b43ef6cc5d0e8f82660ed80f5473415025ce3d5e93c059cd9ef4fbad2b0481e0efc7478cbdff7bec0042ea3bd6bddac51d78ee5bf25a04
-EBUILD Class-Accessor-Chained-0.10.0-r1.ebuild 390 BLAKE2B 6268878a3abe7a42f1fc749620c75acff83154e5dc10a53203d7a6b318564d78c8d6e52c8d8f19db212c58655ea20962c09f798a6192ce8ea4f71a2784fc6bb7 SHA512 4f769be8a5c5158795a249e78197add1118b1dd8ac12905517ebbc42f5da0b1d008ee21855e101dedae2e2e456b16ecc59ff0054ca164d84d6f0fa7e5f99d697
 EBUILD Class-Accessor-Chained-0.10.0-r2.ebuild 471 BLAKE2B 3d66dc8afc0a8e3dab8ef4fe4b8c2657e93f592ee2f135c0413d57839cd8f932e3aa463bc0663e82c867e65592bd6100ff0ac5f8405ed91baac6b75a4300417c SHA512 03ace981f5c0f5588095fa9251c005936c2e0bb0b50be36071fc309119f13bd620b9c5e060d8d9be3c697ad4c357306d4667dbed1b0d151d54d3ef5c316c1722
 MISC metadata.xml 494 BLAKE2B e684384469fba08ead895cacb8410756459f8d518f1fc4ef0cae5584e962cb1678baff487b5d09cf42801951fb3ed9a0cab0114edfa1ea05274479a16bec6f62 SHA512 14ada4c2f5a8a7b1cb5d20c5d4445606244220946a55c8525f9c7fce5ca064d34462ec59bd81f8a5c3bd49e12a91aa31f551dbcf8a5d1fa8b7735d970b640cbf
diff --git a/dev-perl/Class-Default/Class-Default-1.510.0-r1.ebuild b/dev-perl/Class-Default/Class-Default-1.510.0-r1.ebuild
deleted file mode 100644
index cdd82a9cadf4..000000000000
--- a/dev-perl/Class-Default/Class-Default-1.510.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=ADAMK
-MODULE_VERSION=1.51
-inherit perl-module
-
-DESCRIPTION="Static calls apply to a default instantiation"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.28"
-
-SRC_TEST="do"
-
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install;/use lib q[.]; use inc::Module::Install;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Class-Default/Manifest b/dev-perl/Class-Default/Manifest
index 8d69381f75c0..f5c9d5d551a9 100644
--- a/dev-perl/Class-Default/Manifest
+++ b/dev-perl/Class-Default/Manifest
@@ -1,5 +1,4 @@
 AUX Class-Default-1.51-no-dot-inc.patch 470 BLAKE2B 054645ab77d18be4e0d45d84eaeb4426880942f5cbcaf8d0aa969f42232c563304c43be9c78a3409294c2377c1b5d57d88336fe81f35a3737beb71fabc01e0d0 SHA512 b95156a915cecbde7f59b0ffebcf0d13edf5becade24ef8105e8356fbcdd96e0776f825e5571459321eca9d991d1b38c3bf9d711df5fc9cb77630b39fd58d89b
 DIST Class-Default-1.51.tar.gz 24677 BLAKE2B f2f2853480ebf129ce3f3f5116a38d868cebfe8296c3343335eb68103c70daf01583110f52890c7f611fedd2bcd28ffc749428d7e36250970b0781deb39da827 SHA512 c72758ecf4aba11191ff7cf6b316919f02213cef47227c6d96205d5672f638c06756bfdb2114563eddd822620be9d6801c53155fc3191daf813367c6dcf4eaea
-EBUILD Class-Default-1.510.0-r1.ebuild 578 BLAKE2B 4395d93597695aca77fd426cb20808c4bcddda941d0a30e10d9ae7f500504cb8d43d271bcd7e095d6d3f988aff7c43ee3505cbb732f1a3c19619361a46bd0d0b SHA512 b95455aad11c0192087e518037e8ddb6ab60b2d019597906e631a9d23281923f5b62a29d8a9ba7786c7792bdd279f4bc6b1b7403f9620e1871828cb5628ed692
 EBUILD Class-Default-1.510.0-r2.ebuild 494 BLAKE2B c07e96fe1a7d84d33e9eb1611ee310ac88337284b5630b19499e2b5c3b304a25df97b0c536e37c7a6244115f15efdc30ce9f3363005403ce8a0eae3a83402c2a SHA512 e08626bcb8afa83b403c4421cb518877fced342c840606a9683f83425aa0f18ed668c077b1ea71eadf6d5ab256a75c8895cc6a3928a517e6200824600a153ec7
 MISC metadata.xml 398 BLAKE2B 05a462a968527b65bf1bc87da4365e60b3be09fa474ca18695bd1a47f3a898655349944581bbb47d45de2d639caa1f5e0cfd0831bfe014de9329ef592b8838ed SHA512 bb89ed9a8cd282cef581e86241f4ef857fb79f7396435030e2f8db23f1c83ee706de8ed98a2fb6c679b030fa41ab94ffb561b4e6167c9b4c498ed034fc673a44
diff --git a/dev-perl/Class-Loader/Class-Loader-2.30.0-r1.ebuild b/dev-perl/Class-Loader/Class-Loader-2.30.0-r1.ebuild
deleted file mode 100644
index 4c6064210580..000000000000
--- a/dev-perl/Class-Loader/Class-Loader-2.30.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=VIPUL
-MODULE_VERSION=2.03
-inherit perl-module
-
-DESCRIPTION="Load modules and create objects on demand"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/Class-Loader/Manifest b/dev-perl/Class-Loader/Manifest
index a59226fbcf67..11e4d2aca507 100644
--- a/dev-perl/Class-Loader/Manifest
+++ b/dev-perl/Class-Loader/Manifest
@@ -1,4 +1,3 @@
 DIST Class-Loader-2.03.tar.gz 6187 BLAKE2B 9ba44cb2922734af1c7d7f02097147bf3fdcc0582f76e85377bbf3487082e9f01119bac11c8968b14b26080a9ecff76079d5b519cd3b6fb89585e5a0fda11f08 SHA512 1ca245ea55b6fb101c5a6000c833c5a7b6885619811882a693916d4bf9225ecb55127e340647c8d6ff70b18ee5b8ba9f15184c2a70e8b6737762fcd5baf76adc
-EBUILD Class-Loader-2.30.0-r1.ebuild 376 BLAKE2B b5cbab9b0d8b25a73f903251d0d2c0597f1fd2d56d6e68569a1afce770cda61a47d60af2ccb3903023f60044d575ef254756aa8ce7d2e5ed012e65b1b1f4671c SHA512 5b9c4408b55b20fe3691c8e57f4d4250c2d3a16c275aed8cb8e21f16e6e260ee14c65a636e8c8101447631ba76680bd1458b478947e648e98e4ad6fe84610343
 EBUILD Class-Loader-2.30.0-r2.ebuild 351 BLAKE2B a2370455d89ca88209caa5f4f9a35c92f30e42a27c34c99ff56eef0b535d72b2dbdcf9321924700b151763989558641f1c685cebd2ad1b158bd4339f8fa6ef30 SHA512 5987814ea16a3a4734737f2cf9be5f228a63ad146d73d7f1a89199149f2deabc9395e611cbb62bf7994a9f751725d81cdb71121ebdf17b1e01d348e81b7ddc76
 MISC metadata.xml 460 BLAKE2B b2379c9e76348701f14d9adab4baa6e86740ff151c4c2370963b70c0001a54a439abaa1af7452666db1eee2fa289763ab1287c8ea2bcb780364d590fa011e7be SHA512 af11191cfce14a0892823e6d8becfdffe792c8d7a5ce79edf983557a5eaa1a76ea5b49670f0345cc91efef717f35bf973b8533c3bc7c42e46dcbcc2c87aea938
diff --git a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild
index eb9980e9d23a..657fd7910a78 100644
--- a/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild
+++ b/dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="provides Moose-like method modifiers"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Class-Method-Modifiers/Manifest b/dev-perl/Class-Method-Modifiers/Manifest
index 9a480dad6648..4eb0f25b88b3 100644
--- a/dev-perl/Class-Method-Modifiers/Manifest
+++ b/dev-perl/Class-Method-Modifiers/Manifest
@@ -1,5 +1,5 @@
 DIST Class-Method-Modifiers-2.12.tar.gz 38979 BLAKE2B 60983ca8afaf6fe01119c06371b2a1581e7f0323f6cc55a9edda128467b7614287c4fa77831d6d3b48dc076f1c41dc25321d9648454b45995c7cfd193a574844 SHA512 18c7cdff214d39a475b116cc5e6dda043c31765bcdfa9a1fa7242ce61e42583c4981d41a43ba556fb5a057e0cfbd5e52dd60048ea7dfae0fec3618dc47876dd4
 DIST Class-Method-Modifiers-2.13.tar.gz 41385 BLAKE2B a48d22505e58f20c670da89df1507e4ccf589c0004357d3b5f060994217a6aa74c74a5a5d116c0f0ab65eac080ae1c5e28578ff86028c1df85a07b621370ed07 SHA512 379afff763b647b787dd2049d9a8b928ca88be34e50c91c0848c5652efb1e4b40d8cacd2a1d5f6ce7bb254b9e65801b7c1a710f9807458a129af0af470f5ebbe
 EBUILD Class-Method-Modifiers-2.120.0.ebuild 651 BLAKE2B 7e1f94c1dfb2c1031b93810aa8fcc2b50ac737e680770de788ce62d972318aaae1f23f6f59851c55bd19221aa99c1421cfa247b8340f3dfb8eed48974f3cc0e8 SHA512 f8034bd526a786461431e0c3f6078deed03404397960584e2b58075ef1745ef64d5f0fe0b870fdfd4c2ad6c645e3155748c95ffeb1e3e2b1d87316718d734433
-EBUILD Class-Method-Modifiers-2.130.0.ebuild 680 BLAKE2B 5671d0b83362e3121cc961baa72402d04e62f916af4b7e147b39ef7a4bed96e2663ca5c5d83af9125b7940c87aa4f5ec77ba35fd7672b57520e04f18da1b3f59 SHA512 bb4ca013601151263e9fe4dbf005bf831522cad6b795f9f5f34b8964a7e212cb8ce4fea5d46bd5430d28cc6640bb43d6c877797b484259fde3832d3df09d837a
+EBUILD Class-Method-Modifiers-2.130.0.ebuild 687 BLAKE2B 18f8d9ca8ea2104ec1ed858f93c74153aeda9ec509bdb1c15339b47f3d98dc7b3a6bc163f96e20536baab983218b3e07951cf19ae3a682585d29841d5f5fa969 SHA512 0cebc9936f71f26b7b826584d293e31a33e909c2aff477b2199ece7ce359fdf6262d7d50c62eef4abdf3d2da7b0f7a1b45b6d38aa9c17944b59708b41ce926e9
 MISC metadata.xml 405 BLAKE2B 4be360e7c8188542a61227c6f94ebbce09bf41f78a0ef3079f29cd1367c765c12f97d0ee957339ea8fa0a8b3e776e88ddf3a6c7ade1217e1b671b56d7615c8b7 SHA512 b62508725a92b4985ea7bca9c1010670e7a6c94e41dc9cd575d8364fad22581f74ce6fcb0de3c574914b5caf2efb7c4065005c4c1b6dbbc992763a316df32ae5
diff --git a/dev-perl/Class-Mix/Class-Mix-0.6.0.ebuild b/dev-perl/Class-Mix/Class-Mix-0.6.0.ebuild
deleted file mode 100644
index 70e8039c46e2..000000000000
--- a/dev-perl/Class-Mix/Class-Mix-0.6.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_AUTHOR=ZEFRAM
-DIST_VERSION=0.006
-inherit perl-module
-
-DESCRIPTION="dynamic class mixing"
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	dev-perl/Params-Classify
-	virtual/perl-Exporter
-	virtual/perl-if
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-src_test() {
-	perl_rm_files t/pod_cvg.t t/pod_syn.t
-	perl-module_src_test
-}
diff --git a/dev-perl/Class-Mix/Manifest b/dev-perl/Class-Mix/Manifest
index 70ca9dbe5915..0c3632fcbd7f 100644
--- a/dev-perl/Class-Mix/Manifest
+++ b/dev-perl/Class-Mix/Manifest
@@ -1,4 +1,3 @@
 DIST Class-Mix-0.006.tar.gz 8328 BLAKE2B 30585b59e3957b95974b1da5a30934dd8511d0eb6395789bfc871e84de9202a2f4f92f75b2e4c7d3216f59ca9b142c5554a45c05210ee63ea30aacca9abad5ef SHA512 f1e52d189a57b4a6e4b7b093cd561881bcccec03dcf7286d69b592865343ab413ab35e42c14dd92ceb0089df1df33df4ff2a502026fde060ef246e77c8d21af1
 EBUILD Class-Mix-0.6.0-r1.ebuild 552 BLAKE2B aa7e20e3e9453d6020ea15d0ab652640a4eccb55b939aaa9bb411e32ea92012c0e5045d386a46d240f6f3dbd25c3cbe502c1fbe869cac668586dbaca66f1cf74 SHA512 c455f3ab7320865f2572691f523b758fce0ba282737096b3c1bf19020ab425d2194c6748b5c1f97a97ee1352db04c494ea4a7e8bd2489af87d5a2f8874eec146
-EBUILD Class-Mix-0.6.0.ebuild 581 BLAKE2B 48ddfefeca8accc4ad8cd35c79349c017b07945e8d94b0fe4d5012c41808ce3319544200e227af2b51109c96e5668cc127acbbf36565bb3f9d6db885963f2b78 SHA512 c2267c3e0220068c5c21025e2880ab3a04a373a397186854300c6bb3eb8df2a50985c6c4047cef58708a9b3ceeaaf0c071e425d50c68dd594e5c0aaf48a7de2d
 MISC metadata.xml 502 BLAKE2B 008895322e4372da722b54dd62bc1f2cd3db4efbb901dd4724a66b6e5f6259ba56943b899299ed4f33f2ad5056aca0fbf124f28e8a35e395243356773f8bdeef SHA512 070204256c663948e5442de55462e21c727757ba2fc772912ad76b9bbf1f832640bbea211c7764d0f2a18378949954bf643b6ed6114a4a8d25dd8cf5bbb9c53e
diff --git a/dev-perl/Class-WhiteHole/Class-WhiteHole-0.40.0-r1.ebuild b/dev-perl/Class-WhiteHole/Class-WhiteHole-0.40.0-r1.ebuild
deleted file mode 100644
index 0a080d4c7f1d..000000000000
--- a/dev-perl/Class-WhiteHole/Class-WhiteHole-0.40.0-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=MSCHWERN
-MODULE_VERSION=0.04
-inherit perl-module
-
-DESCRIPTION="base class to treat unhandled method calls as errors"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ppc64 sparc x86 ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Class-WhiteHole/Manifest b/dev-perl/Class-WhiteHole/Manifest
index eceb2e9c0ae0..1379d8908dcc 100644
--- a/dev-perl/Class-WhiteHole/Manifest
+++ b/dev-perl/Class-WhiteHole/Manifest
@@ -1,4 +1,3 @@
 DIST Class-WhiteHole-0.04.tar.gz 3279 BLAKE2B 4b45894b26214c5f56ac2bd436c3ec3094bc1c583b89c6ec16aa9dbc06a8e997d90bd7ec7f243d9dd6a7fc3692b601bf26b62729bb0602afa6ce075a389add6d SHA512 2b972e4e520123d2b367887cf20e7655b7f513bdc45a3659b73c4f9475e28cd1b824461092616d1fc357f6b811df1eef15de2d8403f42b2e41dfa35f361a9de7
-EBUILD Class-WhiteHole-0.40.0-r1.ebuild 337 BLAKE2B b0c829353c014c7051dd514b74f7d33e1b9b851e8d24ee8fdb3d79896b89e90fe87d04e0b43c7679bec0aac9ff6e0e32a02d18c3fd9651610ae9ae61306d28a3 SHA512 9705c3389e6f868a752dcf8b178552194464dde8f82f884d5866f7321ce33f14cc23c5b0a4139c46fc8b7e7eba49cc2ae71a34210b4354be5ad1acb1d8dc2577
 EBUILD Class-WhiteHole-0.40.0-r2.ebuild 307 BLAKE2B a230b58968b918e71e51e843b31bd41e1009ead56ed78234ba4d23ae3d74e525569662d25b5d1b18cdbe72cc57c0be91296525427bf120cbb8ae3c726f64d8a6 SHA512 337a21040d29232703e94f8662d0dcdb0b1243a000affaa0c4a0b0b6465eb2d227c90d0fe3f4dc17795b5fd295d36ecfd260706b392ad4849e1af97062cf8f70
 MISC metadata.xml 402 BLAKE2B f2700c2e92f81c1d2f35b2d48350098c104c6892cef339774740f2500ef3e79dc609dd790f14af83b46b5b25ab4277cf6de79e51398cec9720660e52c1fda906 SHA512 3c28c9b772fba9337d2d0817bd83b3557e94a2eacd64c25db6a1c3b35a8b0629175f0f1f985c2c18aeeacf3f9f5c27477a8b696eefbf1929609742741d091d38
diff --git a/dev-perl/Class-XPath/Class-XPath-1.400.0-r1.ebuild b/dev-perl/Class-XPath/Class-XPath-1.400.0-r1.ebuild
deleted file mode 100644
index 53d33f982841..000000000000
--- a/dev-perl/Class-XPath/Class-XPath-1.400.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SAMTREGAR
-MODULE_VERSION=1.4
-inherit perl-module
-
-DESCRIPTION="adds xpath matching to object trees"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? ( dev-perl/HTML-Tree )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Class-XPath/Manifest b/dev-perl/Class-XPath/Manifest
index ed2497d5caef..41d593ef8bed 100644
--- a/dev-perl/Class-XPath/Manifest
+++ b/dev-perl/Class-XPath/Manifest
@@ -1,4 +1,3 @@
 DIST Class-XPath-1.4.tar.gz 10802 BLAKE2B 532ed4a2baaaad9c0a47573a6e17858185eb84210733ad9aa11bd7e0a5c47ffa30f40dfd26312e480aa0ba7e64d74b9cf91a842658157d0d532d9c2c2b6fd021 SHA512 27cc62d8490c7f0ccb99ade0c3d229a0854540be248acab0f295ef64fdc50898cbfbdcded8a57b68e8b05adaa030265e2816cd49a060062a31620fd61c373a15
-EBUILD Class-XPath-1.400.0-r1.ebuild 386 BLAKE2B b56f09dad388279693db56e19903da597733d7b2019d1a7268bcc53e0de2e2d48093db39a380c0b58b33a73ed4d9d7ea7f5327e73d31352ba0d09bd59379ec29 SHA512 b7323ae517f597718337c111f8b0c917e1c90ef1f2617bf630be224f0f84c7eb46e976d16c1450f8d4c5d2827f2429198e73b6485e2217cfa728bad6fbfe5dbc
 EBUILD Class-XPath-1.400.0-r2.ebuild 345 BLAKE2B 09a334d5669316e839a46b82ac4afbbace6514f6845fe75411cb45e961ca4614174790fac2c958f7ad789b2ebfa4ba99e3ba992bbeed3d431e9783c1276660b5 SHA512 44b75b1c19e84b967cca52d3a88ff4f2b1d3a28304b00f65d0de24bd8426be3d9f0699c031b62bea6eeff40e882648d701bcd69014083a080f2bf1a40a4fe060
 MISC metadata.xml 394 BLAKE2B 3bb7c758620105db008b3b16e640ff64b012461c225ec8fe807782c2efade90d0670f13decb903dcd799b0fc1cf3dfd764092d7925fde77127bd955a0739f14d SHA512 79057ea3f878156cd3c2cd9f4a811a585c29b41498de06d78b06219eed970d18d1f70e983e4abb3e37bd407eb00130d25d35dbe927237792e072daf0274f82ce
diff --git a/dev-perl/Clone/Clone-0.450.0.ebuild b/dev-perl/Clone/Clone-0.450.0.ebuild
index 9faa5101c3ea..ddf0ea87d83e 100644
--- a/dev-perl/Clone/Clone-0.450.0.ebuild
+++ b/dev-perl/Clone/Clone-0.450.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Recursively copy Perl datatypes"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Clone/Manifest b/dev-perl/Clone/Manifest
index 2e87b6ced669..22d397715594 100644
--- a/dev-perl/Clone/Manifest
+++ b/dev-perl/Clone/Manifest
@@ -1,5 +1,5 @@
 DIST Clone-0.39.tar.gz 13785 BLAKE2B d3a1434a922f602110156e1eceb51709d8c41a292e69e9822f508d99c8868e617f46e71b3c640f15fd994700cbc8187e3dabdd43d1dfc1a7d2f19c8608f40e4a SHA512 5e3feeff7646fb2ea075267962f7f7013186310974cdbb87f779ece0f56baf62e7dbb0afa94816e20675dc03bc5fbe271b9594e12ea441863b78860691822b6b
 DIST Clone-0.45.tar.gz 16130 BLAKE2B 92c4dd90e26b14754a77452c9e185094cb4604aecd06261783dc3d805e75a3d8e0a93492002c1e771b0e562b06a942d987e6bf3f2cf9e2450d5749146b98cb1b SHA512 4d91580fb60876cca7670411748e42e6af0eaba8fac25d60e7a50685ae7b1e697e12c8a2835693e3e4abf3c13c060a2740344eb804ec26ed274b895f599340af
 EBUILD Clone-0.390.0.ebuild 600 BLAKE2B f71e4146798a547fea3c42b7d289172371b07c02741f759bfa92a664f9a1fec9d0fc76eae49fd39ea2bc2e0ea6ac8bcfd46dfa4dcebbce7e70a55f401792781f SHA512 f1b3d59162cf8d0db8e1c0dbec572e4a364834e03299f01787fa02e120d35fb7f064c432bba173417605eea5255e9139c6c99b023d7c71c27e918f508b5b08cd
-EBUILD Clone-0.450.0.ebuild 529 BLAKE2B 6d9b14a022a9e7c641c6e84efac687fbf920bd6b5342b1d6a089f8b862a093eeaed842d102a229f386d0cf803f8926a0a719162179a75e2434486628b70b0a7e SHA512 eb8bcd49bda7e43b94cb08ff3196df03fa6ac62cdc1197734c8b21286af8c6a2239162c1d236531f2583c8b9e74249c7b40328e92b3d68a5f8ce54d3550baa8a
+EBUILD Clone-0.450.0.ebuild 536 BLAKE2B 6b0dfd310b447cfdf3b9c5721e3b54dcd5fbba10f2f4eb22d3dd8b8229109a40b95bbe66622e2c386723753a2e03c3759e1eedd2b57c7f3302b49edfc47537ab SHA512 b36af0696e12fa24dc86322f03dce1a84666be660f3ac4bf46b2f5df60066fbe0ebe964f5ac3bd607d1aa305457c895621b6311660684ec4ed4902a9dc25de7f
 MISC metadata.xml 381 BLAKE2B 5626d365cfa4134c5838d948102ade74dd9ea2625b20dd514c5b9156d8eb2dca021cd5a54cbfab4db4e2487527d8337cd85a538ffaa1d9693276275c8821873f SHA512 cdae589f0c32e71bff82bd75ce3953caea18dccba25b29661b396a740ac61d392b398399cab3a97e33c16d75750b2c2d1fc8a7e1c9599f9e64d53c042cf15fc5
diff --git a/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0.ebuild b/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0.ebuild
deleted file mode 100644
index 2edcf500111d..000000000000
--- a/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR="CNANGEL"
-DIST_VERSION="0.100"
-
-inherit perl-module
-
-DESCRIPTION="Perl extension for libconfig"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~s390 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PERL_RM_FILES=(
-	"t/boilerplate.t"
-	"t/pod-coverage.t"
-	"t/pod-spell.t"
-	"t/pod.t"
-)
-RDEPEND="dev-libs/libconfig
-	virtual/perl-XSLoader"
-DEPEND="${RDEPEND}
-	dev-perl/ExtUtils-PkgConfig
-	test? (
-		>=dev-perl/Test-Exception-0.430.0
-		>=dev-perl/Test-Deep-1.127.0
-		>=dev-perl/Test-Warn-0.320.0
-	)"
diff --git a/dev-perl/Conf-Libconfig/Manifest b/dev-perl/Conf-Libconfig/Manifest
index 98254c19bb2f..c782bab3d2e6 100644
--- a/dev-perl/Conf-Libconfig/Manifest
+++ b/dev-perl/Conf-Libconfig/Manifest
@@ -1,4 +1,3 @@
 DIST Conf-Libconfig-0.100.tar.gz 47742 BLAKE2B c41ae5722d4e657121457ae0c8f8ec5daa10644ade5ec42999edbbe0140440ebbe3e0ec77c9bad7e8afc516a56771cc176bd4421f50a59d34e0b8ed00a196073 SHA512 52f652bd55131b0357aae6cc8f83811a4ceb5ec005977765ed70e5cb08f828c789d8bcbe247880c1807110b5486915dc90f84d52263b2e7f60adb2ee4654d2a3
 EBUILD Conf-Libconfig-0.100.0-r1.ebuild 728 BLAKE2B 9beff5394599a37fc67b5bf15430d0a63d0f054f4e00c9df2003596a137756a3c21f7e827abceafe728d33dbd5ae6a44f07c169ad1ac6735c695522941e6cce2 SHA512 09ca2b68174e2c14209a21f06f3fecae666082459c5cc46135bb38cd9f4693cbbc1c58038b097965c46392037dcb5ff6afc02af06078a6a47760e68116330682
-EBUILD Conf-Libconfig-0.100.0.ebuild 615 BLAKE2B 71058904c6867ffd1454353ac6c0dd6b87b530cf9802ee37d11ed6c49d801e3e17bece7dbd8376b9c9172353b2a40677995fbbb03022e7e05d2152d356ca102f SHA512 d90c224920e81cd687e7fe6353c67f1153c979e2daf002218e193dcd6563c470292c0f39fb44e3a0ef76c46add635683b6a27f2953d7d6ccf65c40d8807098bb
 MISC metadata.xml 517 BLAKE2B 0c6079315d6c3ce4b1bb049b1290a7a4129fa545b4328684f760864005ab12139e07802ea93fa882d10d9c1734f20dbae9c05ea4382d00f4d0c91a8618c615cf SHA512 d0be65380340bff74a529240774cfcabcef02495732ef38941aa228280fd394a177a2a8eab47cc07f5950f978c1beeba26d58887fd4b1c9a40fb25f9cae937e7
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
index c7e858714a79..4afd912134e4 100644
--- a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Guess OpenSSL include path"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="libressl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Manifest b/dev-perl/Crypt-OpenSSL-Guess/Manifest
index afaa48e7419d..48c0a688fb64 100644
--- a/dev-perl/Crypt-OpenSSL-Guess/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Guess/Manifest
@@ -1,3 +1,3 @@
 DIST Crypt-OpenSSL-Guess-0.11.tar.gz 11346 BLAKE2B f22d09e23e91c36c722dc9800391b67a1f912f8af6a13ec95c9074e65559585c77e72596a6dae17db28e11f8449813777423a60d9af0147819dfcb91ba489152 SHA512 cdae7f20a15d24842cf117bfba4f3bc0ec7d1066251e0480cbadd8f0aa28c9c9573905726fc1333ea9fbbb3769a67dbf28043de8487dcce27dab5d14a0848b09
-EBUILD Crypt-OpenSSL-Guess-0.110.0.ebuild 679 BLAKE2B 8a34fdddd3866611858cd0693e61a5ad66723cc9a8a9a4e70f69436a9ea4a0bce0417d889a83b02881a582d448524c9cf492ab315838f02a4abad85d854263d4 SHA512 9da98e4b9daf4a3662b0fae56f1d084b1fc0284e58a9c16857fbd016519f22eb8e168efd214cb09fe053ddb20815b437adcd389a219c2848318a1de2257c6db3
+EBUILD Crypt-OpenSSL-Guess-0.110.0.ebuild 686 BLAKE2B cf728e32f9977fe6518009f3fdf788c73b43a5fe7fe42f2681bd25b17a01bd82f030f7fec4be7f2cd3854ae160f999a402b8bc45ba88ab26dfe3ef1ec05f179f SHA512 0852d22a78b23c4c3542f874cfbf8367502d8736f6b445ebd5f2681d15991c6474b679419bdf61d8bb5611ee3220c3601b485f6354ab8c12254449c8e7025e54
 MISC metadata.xml 411 BLAKE2B 777372daa18fae2658976904b22a5e17c15e1ce863a3ca026a03131be84cd435a8fa582c162500ae76881c6605abc8a2737ce877448d62f46e5101c1a9776b6a SHA512 da55f9571c2cec8cd96e6fbf95f74cab2b89cca8c74d32bfd217680f60ea0454b60b6cd851b0f8f841ea07ca2e23cb83764f0e28340eea38119ba216a31113f0
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
index 8f4b9f0004bf..339b4251e480 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="RSA encoding and decoding using the OpenSSL libraries"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="libressl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Manifest b/dev-perl/Crypt-OpenSSL-RSA/Manifest
index 51a66de26b22..3fca13e33ad2 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/Manifest
+++ b/dev-perl/Crypt-OpenSSL-RSA/Manifest
@@ -2,5 +2,5 @@ AUX Crypt-OpenSSL-RSA-0.280.0-openssl-1.1.0.patch 7018 BLAKE2B 58b6adac6c8d7fa6e
 DIST Crypt-OpenSSL-RSA-0.28.tar.gz 20035 BLAKE2B 9b98a22e68f2c16a38c0aee6ee9a509cd6c6b1d20b1c6533856b7682aa074c24a2e12e87ebdaf3deb7011cbe257737335646b52be74537533d836cbf6fb6ce6d SHA512 4a20c3f814e80ea15304b2a189001172e72237d703a0f9281e7e46d593c521508abfac3a259701994ec867f160821bec37e4e8234d04b792168db19b065ce324
 DIST Crypt-OpenSSL-RSA-0.31.tar.gz 25856 BLAKE2B 172d48cd6cc0f3df2c1c1684897d8ee376663cb366a1e28c13e4af603b2b985d542f83284112be5e4717a3a13a512926b4413b5a8f08f7ed613cd9929683cce9 SHA512 e00d25fc1d39253ea2d7d6ee478403d2b38bd9125602baf5815672fb9e81674ff58bbb47539e425526db1988ebc1a40837372cf42ffd466cb532efa2e450ccab
 EBUILD Crypt-OpenSSL-RSA-0.280.0-r3.ebuild 718 BLAKE2B 422cf2673094d24207e2b0edd8ca70b9112fdd9b459f51e89a3789cb7b98fe3199284e4d86b00b8401bd2aaedd5be1c7f4494ab71357275c71e13e60877d1c25 SHA512 3370be2a7276825e31c1638a132e8926463cdfa0adaab4247a3d1bfa8a56684d01fec143c8b21752ea13c498f6c52fee762e677abd10ebf8c597668010c5d9e1
-EBUILD Crypt-OpenSSL-RSA-0.310.0.ebuild 932 BLAKE2B 5c1e535ce123df84112b5186447de9e737acd4fd259997391d6ac24e3beacb8139c566826797c999977b24ede206ad79a10c58e7a78b902660ef52784e03b4ec SHA512 4ea4d3957ce2d23c228b81fc098689495edf377f0c4bc9667e7b5600245bef58e72801f102231b0e55984521cb03f39f831166e7e7368ce9b4ceb2a72359fa49
+EBUILD Crypt-OpenSSL-RSA-0.310.0.ebuild 939 BLAKE2B 38dc4edbd880dcae668d5846c20a5fa83a64d0247d74b32ae6f9355899731ef30b41ec421be174302628fd8c9b6044cad741b658e0f04668f8936618589e1e15 SHA512 8640b826612f3347692acd83d7ab9cc224ce1ca118382e0244306a5c4cbc87a35806a6a08e9bd436fc2c2fc12099557a5770f7e86b0acdaaab5b07e3e98d7c44
 MISC metadata.xml 407 BLAKE2B 0dfbb22c5bd94b1f49bf73aa69d6f6ac9272aa4631f93d890a10f8ce0f17df9c3760a79f82bbe4453b4ce7bb1c9dd4a05d838b11681aae42611b8bb9496d2ac1 SHA512 5cd69acf50b1ec86397e96b03d6aca318669f83b7a6276231572634622e889479330e741ac7a858a5c4fd633f40b5c4ca7cc0bc40e6cfc8eb02bee827eabb9a2
diff --git a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
index 69bb6f552323..7555135e7e9a 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="OpenSSL/LibreSSL pseudo-random number generator access"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-perl/Crypt-OpenSSL-Random/Manifest b/dev-perl/Crypt-OpenSSL-Random/Manifest
index 13931142cf67..1c45e1631b2d 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Random/Manifest
@@ -1,5 +1,5 @@
 DIST Crypt-OpenSSL-Random-0.11.tar.gz 15161 BLAKE2B 33c491755f210514361f6d97715dee781a3f1b99879b2357002dc6dfc8e6c63df530cbcc1ceb8da407928aa531d0fbe85f43afab3d86995f0ade6c58f8bbd320 SHA512 c579cb2b586dbabd697a9c7c989a360ed4bd8e9b28d7c93ad99a86bd9bd680a89c3fa77f6315a1105fd41bfdfa18087ca4cd51fb320faad7a6be9b90e3e69b95
 DIST Crypt-OpenSSL-Random-0.15.tar.gz 15506 BLAKE2B 4ed167082904f814fb5484e2c95c0ac881530afecf7ff170041261eebcf3f1227ba8cf98b375a0cf2b18376c7f849340f11ae673ff9638a4c5e4f38db995b9b5 SHA512 bba8ce86b97ce2d6271be503efff6e6e0ff60a797282a2b7cb9c6c0592b69cc43344f9738b4790e5fc165a7273ff01e35ada481cf8c4dfde38cb7ad741d97530
 EBUILD Crypt-OpenSSL-Random-0.110.0.ebuild 767 BLAKE2B 378a31d832dcfe9871c510a584a61b24cc502770ccdb596c8822656cfcab71179190a74a4d9bd8c0a43dd9bd8b7ebb9ab4c246a51061573b9c5a272912657e70 SHA512 748227d1dbd91497673bff651eaf4719812259f679bd81d316e51f52d38ded23f36d42270877819a3edeaae8eb88a5d3ab4794ef9ad0e7ebb8bb07cf18c1c135
-EBUILD Crypt-OpenSSL-Random-0.150.0.ebuild 821 BLAKE2B 23e70dc5939ab7991b0c0866c3dd718b7030adef4c4e22e34bcfa2769d6671dec1e44f54660709c1d468cc2f7d1c9adfe779c355e00ec5bcc90b0b0601cf6727 SHA512 49eccefffb446433a0011753c6059492fb8e93eed636681f470f44db4e95efee95aaa2842617ade231daf6276f7d28583acd5a92a265dfeeb62e140aa0aae035
+EBUILD Crypt-OpenSSL-Random-0.150.0.ebuild 828 BLAKE2B 7961979cd8c16006e955b48603d34488a204c9158ac5bb765ec9bd8d3fc3d2dc98c51d76c0567c94cb3eada2b9893ae6089394cb1d4db14e2c80eb1e28ff5af2 SHA512 1fe20ea739925b883f202cbf5cb7ff7d56543b621cacbba10d8f2ed0baa4a05d9cc8321f9ef940098763eda1ae2e52d06615d9489c74e17b45b9a81ef3f1d4a3
 MISC metadata.xml 413 BLAKE2B 03a4dca7d919259dff481a02856287747167ede1794ca2a3307f653ea32c5e34c0a65d32961620ddb1a549da94b1b6a32d7db3f19651a4ff9e93fac03d34b642 SHA512 db707a5e0349fcbf52586739288ea6b95c907918897c611837baab0b8792e58c4864cf785d719af8b8a096c8bc607d2198c5e627dd4cb5a322cbe42c5bfc5e58
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.260.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.260.0.ebuild
index 8b054063e145..ef6b2c6a8545 100644
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.260.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.260.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"
 
 LICENSE="|| ( Artistic GPL-1+ ) unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/DateTime-Locale/Manifest b/dev-perl/DateTime-Locale/Manifest
index 1a68fe763da1..dcd21c08da3e 100644
--- a/dev-perl/DateTime-Locale/Manifest
+++ b/dev-perl/DateTime-Locale/Manifest
@@ -6,7 +6,7 @@ DIST DateTime-Locale-1.27.tar.gz 1390926 BLAKE2B bb23a61d5649a613028c743e7215e32
 DIST DateTime-Locale-1.28.tar.gz 1391000 BLAKE2B ec19047a6d0e55db0235db480e96d49d3ef091df8a3b37acd87fc54936923298cb70b55480b048ac64376e28784f6995ce5f42793f626b5e8022078b03c98eee SHA512 5c6349e9115bd8d6dba0b33809f9d8544f0d40802bbf0111005fda4990d3d815b236c44f60a1b5fe8d28d3f2f19343627df2d7ac87158be07e7de4f05c19a763
 EBUILD DateTime-Locale-0.460.0.ebuild 762 BLAKE2B 514e889c4efc2ebb044985049aa8e9e98cc9735adf80ed88e3a909dacff664c24b9b272b38838434f8655a43c2259d2331b2d06b7a1afc013918270e376bfb04 SHA512 2e1240318e759c3878930f6aa33e8a2ba19b3e753846fc5652e7059895d99eded60a93ea58dd42b61fb4f07a7095d301183ceab35ed7b6dd9de454b51629ae63
 EBUILD DateTime-Locale-1.160.0.ebuild 1144 BLAKE2B 701c53fd24a057514cfc5e209edc7af25304e8a45e5e81ebc68a9a690467792a0ef3759a37101d9d2424e27c9052911acbb381f69aa3f27952d0e192b3b3e405 SHA512 bb7a87014151d49c77a1486ce35353d7c16c6443804e5603b9f2c0b510c7cb4c52543bdc0bbdfe2136e1b37647ba8e76616c52fd74a49d223da71445cae2a2ec
-EBUILD DateTime-Locale-1.260.0.ebuild 1200 BLAKE2B d067974e89340c2d017b6392e505c5a5bd05d57b38ce2901feaec8c84684ac5959598c5114d91cd5e62deca8140912dadd1f3084a6682edba9020768c1619a37 SHA512 f551ca442750596504a8e7964f333777b307386f1524b226ffe025fe9625e438397bfcfc5ec10e7178e1f615ad0bdcfeb9fa59cb4dc8a8c09bdc54284caa00a9
+EBUILD DateTime-Locale-1.260.0.ebuild 1207 BLAKE2B c841242bb0839f1ffa6394b047df6813288f4245b05a89e2c708907efbcbc4e64eeb9992d292e826cca6ff0d8f2b99e602b2f7a9d154e512c64b9856c1b217b8 SHA512 ceb1a13d177ceed1985ea2f00ae4c03104a5b0c36189b0103961e6ca490c9ec7464b03d1947b71a335e2c5e09b377e8c90f844ab6f1191c4bbd4d5d4c7d3bfa2
 EBUILD DateTime-Locale-1.270.0.ebuild 1317 BLAKE2B 69dee5b402698845deeb31691d9cd86e2fd950b15cccb9f069451b4288dfd940e333d06fe878ffeea6af9cdfb4e5782fcc662d9d277178bbf808c2da34154f50 SHA512 a4f407f979274c2fe2182378b685bce4c790846942dadb612daba69f09d9776c8ff300a2a7b7e897c0be9e3609e6ac6ba2c0604b9ce643fda128c4c5f2594721
 EBUILD DateTime-Locale-1.280.0.ebuild 1213 BLAKE2B 1d91631fcfdce3e7bc25c80e70981bf48fdca8206e242a0165ea8317ab95d353be527dd3a4959aea60370933fbe22ff9785c82fedfefe30e1cbde4d8eba07912 SHA512 b7de594ddf30f449ed8decda4e8cc0da633add618de54cd9755663ca9d4651dbe7f0d56a9218352274f78abab87a55b5f9114f1d505c2d4ffad8e639ba82933b
 EBUILD DateTime-Locale-1.30.0.ebuild 853 BLAKE2B 454da02a99f4d28fc5e1716163c4d60f8940a3fb949f9138c6bb28507a564a3d77ee217c8f63ffe3f540ef2fbc3682d7351f1e59c82c03441005249cfd53ddfe SHA512 89448eb79051dcfb585b88b49f0278c140b8586dd45763d035ccf060ec5fc8c6d455ee3f83436a1ca218b1d2cd9a963fc3a5ad7ad3185dccc4838250ce7be851
diff --git a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild b/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
index cf1d28acf3b1..4c679efe0e3a 100644
--- a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
+++ b/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="uses File::Copy to recursively copy dirs"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Copy-Recursive/Manifest b/dev-perl/File-Copy-Recursive/Manifest
index 014c66443f5b..09b8024a316b 100644
--- a/dev-perl/File-Copy-Recursive/Manifest
+++ b/dev-perl/File-Copy-Recursive/Manifest
@@ -1,5 +1,5 @@
 DIST File-Copy-Recursive-0.38.tar.gz 10843 BLAKE2B 5bba9545224c919e8de3e3bb48cbbd3b6707022cd4df43358c78582562c29f728688d91168c15e43b0cb6705cf65957c32c45fa2ba3dcfdb7b6a8530ebc70576 SHA512 49e5dbfc5bdbc554ad8a019c25db85ebfa55765a73758d95271b5f3de9550fd68b4d99aa287898d86bc6c11ea8de97469a85c53d4ad8534594b411be1f18eb87
 DIST File-Copy-Recursive-0.45.tar.gz 19256 BLAKE2B 15a6065883d3b53e51c168a3d67eaf0a78d13c354a73bc2e58eda541980c0b709f2ba431b97486c112d74354b98a4d81a30a13db0fe12e5022fe65ff7eaef2e9 SHA512 6d8a6c55bc54bfe5ce3834527776c6b1466d5672f5f8901c27053188bbc78e87dd62bed8d330c04079b02d0967be0a8d0cd779e67973cf79a2c6ff87d5921c60
 EBUILD File-Copy-Recursive-0.380.0-r1.ebuild 486 BLAKE2B 49bb4bc2ebbabac8f462b0b407370d4e2c66f382fe2b516bcfc98d75fa670d00625ae52b678fea30f29b27da9d5b7a9646f53b52643cd18a49cb99539c586bb1 SHA512 bd3426493689efcf6ac5055a1fa1e78e9eb6199e86146782f1e8699cc5e164b64828a5de769295551f52ec3afd6ea30bd9631c56c501603e70e97b4f1662d74c
-EBUILD File-Copy-Recursive-0.450.0.ebuild 629 BLAKE2B cdef6d950ec9288eb32a49b029d76cf47722b3bd255440f17b1420c0d3432f7bc8608dc314e5527ce2b3301ebfe09c3890ca7406a84a3c02f9a68ac498496c00 SHA512 0091a73718e60760c4dc6fb8cddce6f4d06e3779687e339243fd59c6864357d4ee4d33c85cb13286cecabc8a597311a9df72985b1acc0955d1bbcceec2a551ea
+EBUILD File-Copy-Recursive-0.450.0.ebuild 636 BLAKE2B 3c95299c0921cfe3c2de046e4352bf2094643fd7a283120990b068dc117075ca9f50349d0921f288a90a59186176c88fe89a79bf6bbe2c8057dfecc8b2ae4787 SHA512 649f1b0742402ba9091ecab85a9994d3cc263cf0c7f4959099c8c331dca94b82e4dcbee20af17451fb7faec9f71bb89b80578d5fff287dac2663fe590505b786
 MISC metadata.xml 411 BLAKE2B e7ad5cf73916c9e73cf4f4ec8985c1e607ce601014c696d4b50f3b86133a7b811e292212987ea29146a103da68a1562230b13e0f7d4b6f3d2c56cfcc4274682c SHA512 e985cd6973bdcc89176854669990e5ae810cef2946925d89a2ca976534a4dd483861d30221e51704445dd3b80d1790ca7202b9a41c9c87e90736e51ea5f149dc
diff --git a/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild b/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild
index a5d000c85f64..4a2595875b32 100644
--- a/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild
+++ b/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple and Efficient Reading/Writing/Modifying of Complete Files"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/File-Slurp/Manifest b/dev-perl/File-Slurp/Manifest
index 18deb77c43c5..4a01b477fcb9 100644
--- a/dev-perl/File-Slurp/Manifest
+++ b/dev-perl/File-Slurp/Manifest
@@ -1,5 +1,5 @@
 DIST File-Slurp-9999.27.tar.gz 37734 BLAKE2B 2e2589b834e1092a869a9527395d9ed589f0dafac99b13ca3e802c4bf159ebc55f7b28284a13effdcbd476b7c7d7727a9b25735dc9f9b1711a9ec63444d44888 SHA512 24a5e2b93f7fda65cbdf0e54687de3af511cfd3909dcf4c79610882bf4f119afdf2bd60de28fcb8d9155b94a29ca4f901e28930a810949e490ba1c584d7a6ee0
 DIST File-Slurp-9999.32.tar.gz 34574 BLAKE2B d75d7253945908328124ef46f53d86fba7ba0751e87ae493f071b03844d17b969371d1b26fddbc94f4b788475b09b5ee76c3d2c0b6f1c0c64959da0be95dd0f0 SHA512 413337e0257e95e8e8d2aabf684bec81e746000a741809935b058490b8c42b494064f724e618b250330d8bb67a0a7a2a5adad17e3e6c96d4b193531a192a4d56
 EBUILD File-Slurp-9999.270.0.ebuild 801 BLAKE2B 08c2935deda28f43caaf360943c9ed091da9de261c6f0ebe23b8188f055a6ce24de2f3ac7cc3b7cd4d30464117848ffa580155545aa1683cdb40fc3806cbccc4 SHA512 a572ffdd0db9c0fe8f9bc557cc80f90c878eb762501fb0c371d08a9cb7f076d2144a2409698aa49dfe98b3edc062e81903f7bc1ef47715a89bc78304cd61babe
-EBUILD File-Slurp-9999.320.0.ebuild 861 BLAKE2B 1d563acc36e105216c7a24a436be1566a1551bcfb4055e40dd4e80128b6da030a9be08753aa92520fc253d163a680bed77669044fd90c45ca87e092ebd9a8cf6 SHA512 c33a05069d9ef05f1ddd911a2412e7730fc9f9c6ec55f6f6546c60f1af0e995d9a2b022c7f090bcf763e694c5adf022bb1099156fa4d0edfe5463482cab47100
+EBUILD File-Slurp-9999.320.0.ebuild 868 BLAKE2B 3f7b995db6f60228dd09d6506c90ab90fb324520832c71e6ed66cd059ed120c74e53d9f26bd549797d94716e8e23ef8760c01d4c4cabe31f200504fa6e734e57 SHA512 057cb7b33393632f6248a4d92998c67f1c6b1a9126f8c9f3f12bae1a34b1af415226ad8a7fb38921354bbda66b4c301936d22bbea5fdb68bc5c63032adebd147
 MISC metadata.xml 392 BLAKE2B 1f26c92590188aceac252580091405f51e615666b62b9a6ad2b0ae2a980a42aecd02abb1179d848d1dc7de16505599697b544e182c58f178eaa4d766642fcb1a SHA512 0523fea20212b3d74c23ec0ab59a1ee4db16d81ce91f742569c9d6c04e23e7637a7a0aafd7eb8b42cbc059bfdef27ee8794b8ca89a82f8d284f14916fb4af7b5
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild
index 33121a098221..d6a379c8ff80 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.426.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide the missing functionality from List::Util"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test +xs"
 RESTRICT="!test? ( test )"
 # See MoreUtils.pm/LICENSE
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild
index 8b2432839806..6b7266c16cfe 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.428.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide the missing functionality from List::Util"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test +xs"
 RESTRICT="!test? ( test )"
 # See MoreUtils.pm/LICENSE
diff --git a/dev-perl/List-MoreUtils/Manifest b/dev-perl/List-MoreUtils/Manifest
index 3e1226ea9e80..f1eef9c50ef6 100644
--- a/dev-perl/List-MoreUtils/Manifest
+++ b/dev-perl/List-MoreUtils/Manifest
@@ -5,6 +5,6 @@ DIST List-MoreUtils-0.426.tar.gz 145518 BLAKE2B 773e0a78147a4d62ad61493cbe8d4c40
 DIST List-MoreUtils-0.428.tar.gz 146030 BLAKE2B 8a2accf028ab4c3c9f48f0cdb17624022c1951cb99d715c0af573aa55a659cf6fb51644a2b1ad225edc475ca2476401960fecc7d1319d496a7db27eb52bc1216 SHA512 f7e11f10f1d7bd3b8f9f8bc2fc325e1a9230056f68591da624aed01fb4e4cbac20caeae0c3e2aa3acc8b71febd6d4149284367f051d3c1e608e3a4ca8b62dbd8
 EBUILD List-MoreUtils-0.418.0.ebuild 726 BLAKE2B d45604c4d4c50ab5ed242abd67745578b226382f3a35ccfd6252c6deeaaadb596815941eb124f3b751f13b5d355d8059a2a8c0899073fe084dffc2ce3202aea3 SHA512 cb444a787b2e9f5c7db91cb12edbf4d0fe11b5ed2d481e94c2375b46afac48cadf9e60a463af571c8e94f13c01f607397aae11141501241002a13619d91e1410
 EBUILD List-MoreUtils-0.419.0.ebuild 734 BLAKE2B 5c6f6243c51ba1cd221c11ad256b7e97145a4513525aaae3973fc7e0feb8fa0e392a6b8bbaa549fc2f45e254e5e8ab111a141cf6da1e53d59144ebb5eeb68f24 SHA512 bcc01e5713f45655aa5a70cc7ee1fd157c8197a74d277ede74fe9a3c802c1b2cfef8d6c9bf81bd91260091d8290beb955ad69a8c522e18768903834a715cb384
-EBUILD List-MoreUtils-0.426.0.ebuild 864 BLAKE2B bc8d8be2aa2fc95ecef65deb390fed0056785467552c968b9453e7a215b270e489f602bbc28335ad4c2cb0f5d4556160675768cff95498facb695d408f5a5d8d SHA512 d233dcae1cf82b1b0c82036ffc22f1f25b65c37ac7e22416a86ce7ed58dff5bc74ba541b1c9d8e3e16bf4bbc15444f50527464b2171feb04827bda40993f6133
-EBUILD List-MoreUtils-0.428.0.ebuild 909 BLAKE2B d674a788e915c6a4a75cfd4f4d654d399edbf2476544ccf2aabdefd859ace94eadc88356958aa274958651083067a1cec6a0d32451ceb44eec338840df2fd685 SHA512 5cb93325cb7a5c153c04ee66957a4636253d668422f2d5719be57cf5e3a7f414f94396c7312524f289e4920c02b607944204419a94be88bc696b21aec2a225f2
+EBUILD List-MoreUtils-0.426.0.ebuild 871 BLAKE2B efbcf4627dab58ac643ceb97cc849d06bb13000f2663309ee7f2179d77167abbba63fa329131627001cb3180f9c23f253d50a736653d672b8490e80933a3bd82 SHA512 ff832d0c7b76503c06a52d1578c34c78178178263e51b14736f9825918081e3c9fd0bb82a8c391f235b56e1be7c23be0c79a073d41ec2ffe15f3b89b1d2cde10
+EBUILD List-MoreUtils-0.428.0.ebuild 916 BLAKE2B 200677982f36e43de4afa61c2ca8fb07dcd6a7560dc7f17cebb42835d10e208483559d243fff41bbb5ca74f725e612a667cf9248b23ba57b0a685eced6188482 SHA512 838b14f4984b6898076803f40fa7a3582d717a30f4f1c434626e6d5ed8031e3110fe1e1cd2c9062c61f44e51d112cbd147364de7c3932563e0982ded3ad9e5dd
 MISC metadata.xml 565 BLAKE2B 1d9445527a6329e96a6d38f590f02fa98710bbf649ec5709533b5212402b7beaa4fb9211fe93814de01054a4bdf7c89ea52e8e0f6ee625ffd50f367b2c6286aa SHA512 b4fc48156533446dd91d18f6aac2dd58a61f3e3911357930b3710241f8b3e29a7a9143b02bf348e25c15e5cb323c66dbaf6b3555d64b5b333bc7281bded865be
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index f0036e6cdf33..f94b124e0d6b 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Moo/Manifest b/dev-perl/Moo/Manifest
index 481b7eaae331..b80505181614 100644
--- a/dev-perl/Moo/Manifest
+++ b/dev-perl/Moo/Manifest
@@ -1,3 +1,3 @@
 DIST Moo-2.003003.tar.gz 97527 BLAKE2B c23975f64aae881e6e17ce899b7a2f393d52e598e0d46cd199633f9ebacde81864899ed5cf1a429ddc7811a06f97f93ae537f82a22683d9409148f084113a49e SHA512 f1b2aa2f3dee8749cd2c772b65b8c48dbf67358e62dff856d980422e87c74751013376f82488bff7e8b8b0a707c54cedce8e0da873904b712138cba2c9a7f1c7
-EBUILD Moo-2.3.3.ebuild 816 BLAKE2B a84c29774da10499905ceb6fa73ec642793869c364339398658be25f1a1272dd9aa11be0d152563d03c268580a82fe91854ed0352d6d6af0c7f46c9df0347c0c SHA512 61488066590ecdf7b63a127c85d0ccbfc0e6989b782f8cb2dadee0705814f641a30a20b2c26a525034c3c031ae8ffeb29c3c95a6ca85770b0b71a5fa8c8b7ad4
+EBUILD Moo-2.3.3.ebuild 830 BLAKE2B d8c5f6926db684329ca9595cac1038184fadb7c4edfe44e715db48497c0619dbec76837048d6d6983c6ebeb70ea57daa7acb562520d67b8d2c723f482807958a SHA512 2a3a8b8d07cf129034690aa74b4364b35eafd5a4efc0f4d550c4adb4e5b869b22e1e6e02d6bb1579a00796f1942254b7cff61bf66a9bf73041acf11235a2054a
 MISC metadata.xml 1197 BLAKE2B 7611199f57b617634c1aaeca3184d66f3f445bb700fae40ca5880aa8e654f7fd1f90f03fcdbef60ec200cd6e3a5da0f6b385628c15a1098219b6bdd9458eadec SHA512 1baccf32ca49e459aa24ad83ccd3206630462181219ad5981787b42f70591254103231e26065848716b52e579c2b09f471b559dd54925750e80adb9494c06a28
diff --git a/dev-perl/Moo/Moo-2.3.3.ebuild b/dev-perl/Moo/Moo-2.3.3.ebuild
index 810f690a21b4..a57d7449cec8 100644
--- a/dev-perl/Moo/Moo-2.3.3.ebuild
+++ b/dev-perl/Moo/Moo-2.3.3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Minimalist Object Orientation (with Moose compatiblity)"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Pod-Markdown/Manifest b/dev-perl/Pod-Markdown/Manifest
index dd5ca567a771..b07faa036263 100644
--- a/dev-perl/Pod-Markdown/Manifest
+++ b/dev-perl/Pod-Markdown/Manifest
@@ -1,3 +1,3 @@
 DIST Pod-Markdown-3.005.tar.gz 57716 BLAKE2B 823826c25b0d333941f08af4fa9c9690e9686cd407e8e5084987e2eb7adc63b9027a414fc30f96bf632e89d147e4a1108510e09386d257d7174c412876102548 SHA512 1fb9879913a5f9229267c84bbe97aee624330f3079827f18aa7db31de0b70e0ef0df55ea2ea01655f4b335c7b2338bdc1e5156f49088d6ce048bfa38713ee2c8
-EBUILD Pod-Markdown-3.5.0.ebuild 859 BLAKE2B 26f38ed2dcd3d43afc9392501063a410444c40216c90f1242d5358b18ba622b61fdce61a608c1bd1996d9f22808da406f8b59b5da30a73e7fb5ee725c60bfd80 SHA512 f01f45115bddaeb05e181f0d019e94e3833ac10ad4af1318450af6233862baeb8ee56896c09eb3ca7087f66df5227098987f675e250ad04c2415468b8892387c
+EBUILD Pod-Markdown-3.5.0.ebuild 866 BLAKE2B d56f171a900879e827019b4fde4b757c6a7fa6faf06ed34da4cfb27cb174507f8ab409df2d913d7a1c9afe9af8d777930779b2b3ad870f389531e05c23243918 SHA512 830f54aeaa77528ef0a8c7c2ecf6eed1767c2ab108e6186c152c03b25835435f5be873c57572f82e2d2655d86192aa9a02ee5357901f4b836665a8e1ff7bca50
 MISC metadata.xml 462 BLAKE2B 0c4d31494bb524541d5a0238becc4296637bc226b3b46e96927c054516531054d5c703d7f0b6d1952e1dc796fbc7d34b9a7f194b3d1f4ed59d209ca333d7938b SHA512 679531a25e865d72d03e40f297719c364a70b1988aa3befa86751a10b6e96d15b780653880bfcfe732d2427071575162c8c38bd72af71d1e78ed63c75ea87bdb
diff --git a/dev-perl/Pod-Markdown/Pod-Markdown-3.5.0.ebuild b/dev-perl/Pod-Markdown/Pod-Markdown-3.5.0.ebuild
index aea4c94997f8..50ca268f344e 100644
--- a/dev-perl/Pod-Markdown/Pod-Markdown-3.5.0.ebuild
+++ b/dev-perl/Pod-Markdown/Pod-Markdown-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Convert POD to Markdown"
 SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Pod-Simple-LaTeX/Manifest b/dev-perl/Pod-Simple-LaTeX/Manifest
index 7f17cc4745a8..8ac9c6801ae4 100644
--- a/dev-perl/Pod-Simple-LaTeX/Manifest
+++ b/dev-perl/Pod-Simple-LaTeX/Manifest
@@ -1,3 +1,3 @@
 DIST Pod-Simple-LaTeX-0.06.tar.gz 4839 BLAKE2B 9ed2271f0f14c69db22fb0db1304e8d0188e8cfa5f15246efaecf5ca1b5033504b7c0ab725c35dec814d726f95b92be55fe98818ef106aa9c56a0616ca5b22e6 SHA512 7f678b1ce40314c59a6dd355bbeabc2f3d8f86282609880bf97946611a1b64b9c724e538488196e8336ed2f3f4067d3a8dc0e518f69e5c1de7bbc185503a3f8b
-EBUILD Pod-Simple-LaTeX-0.60.0.ebuild 475 BLAKE2B 5e8558542fede4a8c01374f2a8fdb3eb102384fc60a30c4d48b55277f4793dc0ede22db9af7e3f635e4bc72c7623be797fc7108f6710ed91972468688adb32f8 SHA512 374aad310b48634c44fd510584e0ae7fb00d1cd0176c85ffb00fe56e8e0d84b4396c8fca32b9350c8941b057941f14a2df61f3c00463ddc35d76cc37cee32322
+EBUILD Pod-Simple-LaTeX-0.60.0.ebuild 482 BLAKE2B 3b5b2a0a77cb6a06fcb381bdc5743c95b6f2ca47a303960392fcce7dc804eb566219d281b4d465290df1f7acad736389cc8c942579f4a294f98dd5e58f1906e5 SHA512 65b9fd36c22a5177ee50024e5be5cbe5cae0bfc359e21c3672ae0732bcd4a7152c8bebcd836b7139aa74f31b690a133422058eba28c62db479a1954c0b5047dd
 MISC metadata.xml 405 BLAKE2B 08b5d5759fdbc754eca124c453ee6c2926648479515cdc9e5fbf4cf11789acf9171ebee43f9d2d91a908856b2f8d36e5be2000f2b0e043666e319f07c5de013c SHA512 6d4c1d4b16788ad193fbacde3119bf65638f5b6a3b1a64ed8af57867a7f876ede8f72df3a5781cda90fd53ae730e833a05dee86aff0fabcc022e9b987c1e3653
diff --git a/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0.ebuild b/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0.ebuild
index e24575ee7b54..7942d04ed05c 100644
--- a/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0.ebuild
+++ b/dev-perl/Pod-Simple-LaTeX/Pod-Simple-LaTeX-0.60.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="format Pod as LaTeX"
 SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Shell-Config-Generate/Manifest b/dev-perl/Shell-Config-Generate/Manifest
index 31d6fa683de2..801d1d8853a7 100644
--- a/dev-perl/Shell-Config-Generate/Manifest
+++ b/dev-perl/Shell-Config-Generate/Manifest
@@ -1,3 +1,3 @@
 DIST Shell-Config-Generate-0.33.tar.gz 28382 BLAKE2B 5bb797e79c0adf5176c1e54cabe2ad2776a7431427601e980942e86a7715b2b08e732d3489203b1fbb64ef3580b5aab1d92a6eca71b068c250346c48c2c751c6 SHA512 57041179a9798ec4dde78c13770fc58499776201891fe865baff4cd00efe6801411eb3bc1f89271cf4a35edf4782de33fdcb8a572c6c5adba188f50a13755bd3
-EBUILD Shell-Config-Generate-0.330.0.ebuild 522 BLAKE2B 067b637ab5f730ff3fc3f9acb786839152d66169d1c0e88463a1dba546b4a4dce3deea585524dd077a5dd3337b8e64c6231903df8d213b344c937364b89720f4 SHA512 f2fbf940484eb6ddbae50782e5b187c52de52f2f5498a58784d1c8fdbf4d48820a0307c931a80d84d5b086d5c73c56e0e08dab9a7fecb23e38e8933fb6b30813
+EBUILD Shell-Config-Generate-0.330.0.ebuild 529 BLAKE2B 19a978a8a59e794a7ec1b6a8f573b19db800bcb0fcf28004e63e4a6ed51e67ef9be3308ec2403e51dd3e62e4ceb27efec58fdce9b87127a37fee7ba85a18a375 SHA512 a0650b06822b8a3b08af02a65c1687cfbd2eca81c37c1f5fa79626e57e53ac5bcdf1538d0157ab4fa9cea76f2fbda92f6a991bbb0ff81561f8e88c918b4a99b0
 MISC metadata.xml 535 BLAKE2B 6e28795a27ed633870291abc39e309befea214a2ddfd21df34a1685b7938fad3d84626d06c6918e508194c54c495a5822db5c6078f62b8d0d1e4ab8c2a5fad01 SHA512 668c884c03be99153dbfd33d31ffbad488974ec1a216f71b9d35d7322196bfa3ef5e01f7b08ea86064d57b95ecf8ca3507a981ed60d3baab4b1bfeb8324d9995
diff --git a/dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.330.0.ebuild b/dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.330.0.ebuild
index 6a36117463f1..c3dba3f5bc7e 100644
--- a/dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.330.0.ebuild
+++ b/dev-perl/Shell-Config-Generate/Shell-Config-Generate-0.330.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Portably generate config for any shell"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Shell-Guess/Manifest b/dev-perl/Shell-Guess/Manifest
index 3f3963ec2081..fc2957406c8c 100644
--- a/dev-perl/Shell-Guess/Manifest
+++ b/dev-perl/Shell-Guess/Manifest
@@ -1,3 +1,3 @@
 DIST Shell-Guess-0.09.tar.gz 21663 BLAKE2B 1d7ae26373201348bb6b38674f929cc6e9c4211a3f34f0dab80560bd7a79771748e4036ed3c7d08625c435babdbe8d975f593e4faaa7b55eb92d164d2c0041b2 SHA512 60d8b315491cd10eb2cb1c3941db6369d93148e0bd500c72bc082b1673624dead6485d4238e241127c3a04a0f776222fbb90a40af6a327ed9e2988852fff544e
-EBUILD Shell-Guess-0.90.0.ebuild 450 BLAKE2B c5e36306eee97d9b4463eafe044ca132d135a4a09c4c1c07dae3737c8af1e9668e6bae998f221e07f529965a16f2395b9224bbcbf248c156a1bfdc9e4f637680 SHA512 cf70c908983bf0d5b92f10041514e970540e64a6ac288db2bbe0b5f181be4b7068b2bf02df04bbf7fbf821f256e1cf2109b6b1e13e2b4d0fa6be44745cd2b82f
+EBUILD Shell-Guess-0.90.0.ebuild 457 BLAKE2B 9b13d1a5038a89d2c0e9251f5682b29a18798a087cf94731c6324049e5598f5a7110e3e0d711ea9dd8c238609f6f329a4fab10bf89aa1d05dc2a5830b56130c9 SHA512 abaf8555beaa8cddd28abe78cb02abb1124cf044a54f689f301bf9f28409bf77b9da629fa769ceebc5eb1ff4cbb6af80876883e026add4d4787ddf38371d3d5a
 MISC metadata.xml 514 BLAKE2B 06231bec1a1089ca9b6a0be47c047a0886d088c8969c85be0123f375f0b1b8ae242adf33b30ecdb31b8e1121e5090dc4ea7f99441781ebc0e93a5a23b768711e SHA512 023675dc6d5c6d2a5f426519aaf6f1e7351716c191349bf46fb86c61967796c095b38cd6cd2cbd8d09102daeafdf9802b4941fafcc06ba8f8763f028fe2a8fc0
diff --git a/dev-perl/Shell-Guess/Shell-Guess-0.90.0.ebuild b/dev-perl/Shell-Guess/Shell-Guess-0.90.0.ebuild
index 27558396f5b2..703f0d0e03e4 100644
--- a/dev-perl/Shell-Guess/Shell-Guess-0.90.0.ebuild
+++ b/dev-perl/Shell-Guess/Shell-Guess-0.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Make an educated guess about the shell in use"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Test-Differences/Manifest b/dev-perl/Test-Differences/Manifest
index a7f1b0f7746c..3991f575f3e6 100644
--- a/dev-perl/Test-Differences/Manifest
+++ b/dev-perl/Test-Differences/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Differences-0.64.tar.gz 12577 BLAKE2B 8167ea94514c8680f407713677828dee56f56fed3627597e43decc4342d063518a3b3762692595183dece1b3f6641f33caa82fb4f7a541fabd7e7256efe4ab4e SHA512 118a4b8e3f61f64d6676c82913bb605a843a408f3fc5d960b40cc86f10423380a203b2a5604e15ba8d4e0cff96af88b551fba1c7aa2ada3c0ef408a27ee5f069
-EBUILD Test-Differences-0.640.0.ebuild 781 BLAKE2B e22e1f16869b4847595080590f5240902ddd5b8906be211bcf35d46292a4cf41c69026c5366be825332a816aeac46147cab04e0097770cd6834c13fda41a5aa3 SHA512 cf0d5126b0ee25ce82082a2a225fe4dbdc128142d5f7e23a2bc8a96f34d94de29bf2ff28136bd4080be44208004f381d9fc122c69e824c267b6ea6b656018dc9
+EBUILD Test-Differences-0.640.0.ebuild 788 BLAKE2B 7213ac953e5f527770ce90be81ae6a2fbb72b3b91e72e932e0077d5c4963c68089d4e34c1ba0e25cd7c8c0b59926a3becffb44446323d52d027178b69dce955e SHA512 5b46e233f6a1628830e8de8b5282f5993f8cfde13741367f2b015329e0536e4f4a030519abbe1f3800c0503a93e43f4ef6639c65cbc0bd2ef65fc53d01b6bbd4
 MISC metadata.xml 404 BLAKE2B 0c49069162cadf91f069dffc7402f904801ee55c0fccb19f4f0a0a03ef82a3cac070464adf0cc704483e703115fc122f96904e917923a5767ffa246c4e993962 SHA512 3867a794ae70efc4dbabb8d40c0f0e69127dead110a196dec49a9834c9df9e5ec56f92decab5f7833ddb1a240790874933b0fb6ff491e6fb83d0c63845a94a83
diff --git a/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild
index dcdfe3766c6e..f035251e2dc1 100644
--- a/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild
+++ b/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test strings and data structures and show differences if not ok"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~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 ~mips ppc ppc64 ~riscv sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 PERL_RM_FILES=(
diff --git a/dev-perl/Test-File/Manifest b/dev-perl/Test-File/Manifest
index 33f0f1a7c032..86361e022361 100644
--- a/dev-perl/Test-File/Manifest
+++ b/dev-perl/Test-File/Manifest
@@ -1,3 +1,3 @@
 DIST Test-File-1.443.tar.gz 27065 BLAKE2B 0f1568dbb27aa2aaffd13cc1d8327260e4bfa03fea01a80a810c0c10fdb1a18b3ba6fb5c50212d8956fa14dd0114438dfc7c3523495a20f8f35fdd13734a87c5 SHA512 9ad66b3a9dc1c3752a4ec22934db9139ac010ac3237a3de018d4ec4a65ac047f0152ab9e7979a2615412c1af02a1f2dfa0dbfdf5eba5358628b1b443232c45b2
-EBUILD Test-File-1.443.0.ebuild 680 BLAKE2B eeac9342a1b0f9ff2cda6ff1573d2ff636bc2557f3a307859d8f98c5316d8cb21898bfc71d99607b6aa1398018ac25808b8b2c53e49c09caaef5ca83d9872ac6 SHA512 f438f07235148a22fb5cedc0d04fbd1c52f7d3d12c1e83384f7d635fa275feb2b047adb6e0f152f3feca816fb80aca5d1d90f1a409d1f5bcdbc37395926864df
+EBUILD Test-File-1.443.0.ebuild 687 BLAKE2B 5c6e8642bb5683a91a47357c8b17719bbc383d1d0037e3a7bd936beec3eb03d434d064c92e0c5e1c325447b3b0dbe51c3c981c7ba2c7f54ca34699e0ac5eb49b SHA512 8f9b12aa254ebdaf9dfae841e60f820517cb08f185e31b654ff82e0b9ac116747da894f94ad5625b6da338e5ea486b72698abb9560f6e03fdd3750c590559073
 MISC metadata.xml 390 BLAKE2B 515dde783fa52220e00b4f58cc9dde38d80b6eed484bfb0bdcdf89f7daa62246f76dbc7bee8610b067f743af4ce9698ccc75c7d85546ca1f6f7f96d97378085a SHA512 93e9377cbec8728c2ff3c879a306c89e52db8af41443138c8f68fa4100a2965af2b97afab9426f4f64ddba7d88e52a123dec6976a253f7b47257172bf3140677
diff --git a/dev-perl/Test-File/Test-File-1.443.0.ebuild b/dev-perl/Test-File/Test-File-1.443.0.ebuild
index 254c681c6c79..1da9361af2fa 100644
--- a/dev-perl/Test-File/Test-File-1.443.0.ebuild
+++ b/dev-perl/Test-File/Test-File-1.443.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test file attributes"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Test-utf8/Manifest b/dev-perl/Test-utf8/Manifest
index 319b93ce620d..d6176ed5a2c2 100644
--- a/dev-perl/Test-utf8/Manifest
+++ b/dev-perl/Test-utf8/Manifest
@@ -1,3 +1,3 @@
 DIST Test-utf8-1.01.tar.gz 33308 BLAKE2B f6681d50e55e56e29cc9db7b724e5545f916b822cb510a066a4adf2da83a671ac499ea119cad56446c4ba4a3a0257a51f39ad8267efc893d9983c81fb50fc894 SHA512 07dcd5ed98a63f7d96bb0fc629b168773d02bb4c93c5bc44ec60738fc29669794547dfde5913f9de682cd583cf85f4d82b6151398aaebcfec9278525447b9c4e
-EBUILD Test-utf8-1.10.0.ebuild 555 BLAKE2B bcb01b04bb814a44b5b096c2dabb3b7f58fbea6aa6606740cfc4d39518a6f38e454e340015c6155b14caafcea857233ff6a56769542a301fe416967ea1b0ed70 SHA512 672ffa821b02673f65b92f6fc6ee35914d353c1aa62fa580eb27221488f4877714deaabc37aab2b9002cb73d0fb3770459dba91afd61d01be9105125f5ef73d3
+EBUILD Test-utf8-1.10.0.ebuild 562 BLAKE2B 4a2047e8a39822bcfb89dfaae1e66df957b0bab25a8805ed4f29b5467f4e67c3555f53b702fe107bef1606c4fe370194358bfaab9cbb4fcb021d5e0ab77e4b3c SHA512 2b39e2d2e9a821eac745ded4caa0f44d00df9f5e859e4ee683f0cc5d1f6a3c433fe8741b712ba5b2a9f23dcaaf182b10ec5f81ed8defacbda543d3d835f0621b
 MISC metadata.xml 390 BLAKE2B c83ef0105dbc22593183aa9647f03a3005a894f7e3756d2b158280beada2f693ba91f7deee4ae7f1c7f4cd9db3c0eb5ee314d64330dd15a1ef7560a10f97ff2e SHA512 8766197bebb4765d647745c4e1db2e3f02a7a3a5bbd337387e7f8e5ff8b83b4bde724c3b521787e18979f6b0a708e7f7b1655e3ef60f4b74e892bb8de8b3ec5a
diff --git a/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild b/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
index 9f8f2e2fc50d..34bffb2203eb 100644
--- a/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
+++ b/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Handy utf8 tests"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/asa/Manifest b/dev-perl/asa/Manifest
index 357a05839908..b13f6fac9dc9 100644
--- a/dev-perl/asa/Manifest
+++ b/dev-perl/asa/Manifest
@@ -1,5 +1,3 @@
-DIST asa-1.03.tar.gz 30840 BLAKE2B a80fba4f55cbc5a4b612404cf623b567e11f543127d0a1e5b4d979af652178ed9dd7c7cab101fd37079a7b69e76da3fd5f47e6436fd3fceb4bb3ae80a471aee3 SHA512 22cbccb93c8c9e96ec6e2cfa159f20a5220d722eb369a3c28a9ebae246fa145fb915db5d043722d52894d45f58015cc549f6aa0ba1dd4cbe498ad73cee918a1c
 DIST asa-1.04.tar.gz 27573 BLAKE2B f6e98af1c3705affb2d92c8bc709d55ba4cf9a226aa639f7f4dd5f02b9d4d2b48f94e8da970357a84080be73213dbde2a887b98e0dc8a06ee2c3923dec4a091d SHA512 8584036c1c520741fe1bd4fb2875a86a46e2abd07d441078ef64bd90a31ba13b001079b020263add298ff004e094f8380b2ec590aacfc808cc1ba4be6b177b0a
-EBUILD asa-1.30.0-r1.ebuild 706 BLAKE2B 29e0ef0899e9f0c558afaa9f0a4b99ff556d57025aaa933090eac0762150c02e28ff9fa000ea5dec2785eae277143d700f41bcf8b906b720383f0cfff26a03c0 SHA512 b0b3956395261500a166723599d24b6c3279d5d213aee25cdc465f67b7b4641a9074ce98ccde1b65d0749ec57f5a841a53c170c733b1213e751d90b11ffdd7a2
 EBUILD asa-1.40.0.ebuild 523 BLAKE2B 11b8b559d8167e36ea653e31c68e381530b4b44839488f056f1be9ea47749d31dc7e9186fc1e75a1c4fe64bf4ca9c590ec6cca4d7cacfd31a1503b325173112d SHA512 6e7103d1f6312ddb062bab48b9f08b1e8da1e10d3084796e30bbf6d02dde05a563953879454df1fe4db64dd73f4f558a106f4b7ff657d87006ce723280c6529a
 MISC metadata.xml 377 BLAKE2B 045175fd2f723b7716d986fc88a49156169be5c67af8f934076fab8635934901b4292e655a1b8dd0da781db480890db1d4bd471e971c81efef4e440e14d1b7ea SHA512 cf234c63e4ae7486d0dbdc9ecbfe4ad3c07d376f6db1420ab7b23b448e9f97af32d26789c688cfdf1ea2cfd726d63dcff5b36bb08168c3101c1fde1d2965381b
diff --git a/dev-perl/asa/asa-1.30.0-r1.ebuild b/dev-perl/asa/asa-1.30.0-r1.ebuild
deleted file mode 100644
index ef85c9579956..000000000000
--- a/dev-perl/asa/asa-1.30.0-r1.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
-
-DIST_AUTHOR=ADAMK
-DIST_VERSION=1.03
-inherit perl-module
-
-DESCRIPTION="Lets your class/object say it works like something else"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
-	test? (
-		>=virtual/perl-File-Spec-0.800.0
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
-src_prepare() {
-	sed -i -e 's/use inc::Module::Install::DSL;/use lib q[.];\nuse inc::Module::Install::DSL;/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/autobox/Manifest b/dev-perl/autobox/Manifest
index 789b009695ac..6868dab34456 100644
--- a/dev-perl/autobox/Manifest
+++ b/dev-perl/autobox/Manifest
@@ -1,4 +1,3 @@
 DIST autobox-v3.0.1.tar.gz 87047 BLAKE2B d83aff0e68eae40297081d6213290e80b62f2a318627d2490b0cb6e66e94c7efbcc7b984211474393926d8f281f1afc838f605489175a5ccd4ab6432735d165c SHA512 401d5e87e15cf26362a88e5d23d8c9e842b951c03ac7010da2317af5ea897fa1fe2e4862cc5c691f25851fd5ba5398935c27f6d9f87fbc2fe52bb68a25d3d3a0
 EBUILD autobox-3.0.1-r1.ebuild 580 BLAKE2B fac81ff2f8c2c0d3d22a0c61d97d541e2fe64dbe6d661c200f8edfeb24d73075cf8261c7ee9cafd4cdce0324e4bd830745cfbff9986a24a6f44a431a278e27cf SHA512 dc91f979bef61806bb2947ffb4f4156f83623d3354cd7eb8a3cd81e1bd00612dce50e496a08c4c5a42d6edcb894353e14845c104a88cdbd30ac60010fd51e104
-EBUILD autobox-3.0.1.ebuild 500 BLAKE2B 253dfe4d7cc8ffaf295f1e71dfbbd45f5c83446b6f3f63fb86345a066cf364a4776b490dc68d10283b4818b112c9f6df564ce91953fc78433681c337c0b8d8b5 SHA512 d5283ea2a2960b80af30838e4afc99fb91d680383a319d569b1d05c35f1de9f68ee2f76c37d9b253e91d8e375448b82883eb294f4270a518f67346d7a15eb0d7
 MISC metadata.xml 450 BLAKE2B 27aef631bf8d3ff524c9e660eae951ed9a5c4e84b9c69179089153383143339fd41e42a21f1721cf9c15227c4d490b758dd6a6c236711e5fb0c19e2467358a6e SHA512 9ed2d562f9190af27032d580a564f9dfcc3feb8ec6ddbbda7d0595e6d9761180637dbd5f1e065487481449d1a2e68b1b7586e1fc29c98e86ca40f48001df4d75
diff --git a/dev-perl/autobox/autobox-3.0.1.ebuild b/dev-perl/autobox/autobox-3.0.1.ebuild
deleted file mode 100644
index ebcc2e6dcdf9..000000000000
--- a/dev-perl/autobox/autobox-3.0.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=6
-DIST_AUTHOR=CHOCOLATE
-DIST_VERSION=v3.0.1
-inherit perl-module
-
-DESCRIPTION="Call methods on native types"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Scope-Guard-0.210.0
-	>=virtual/perl-version-0.770.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=dev-perl/IPC-System-Simple-1.250.0
-		>=dev-perl/Test-Fatal-0.14.0
-	)
-"
diff --git a/dev-perl/autovivification/Manifest b/dev-perl/autovivification/Manifest
index dedea5c22ba6..2aac6dd07e50 100644
--- a/dev-perl/autovivification/Manifest
+++ b/dev-perl/autovivification/Manifest
@@ -1,4 +1,3 @@
 DIST autovivification-0.18.tar.gz 55854 BLAKE2B 3f429ca462b685c4b02de265b7bdc5e3ccc9a2fcfd7a182834252a1a46a8e173657613c4e1391df8c9139f9b0716c10c25767d419343275b8e64b37aaef78cad SHA512 f5058bf1672a53281d70431cbb2bdd1a37dda8dc3d4191ca3c68c469089c5a1f2a36522f2a0b5d19847d91296f43e49cf6296c87b78940e786f0d0ac106a539e
 EBUILD autovivification-0.180.0-r1.ebuild 556 BLAKE2B b4e48abdfd1289302181d5e35f4d94bd18005631ac0d29a738266ea0cf15cf272cbbf19c0f289f79e8951bfc693d30bd41315c9c915ad0ff7f78d05593a8ba22 SHA512 14dc1673b08d1f6186e9cd94ea7582ee77470573f2118004f0b14656c586534261fc21882593bbe056084d0e2d9bc00538fa933579acbef8feeacbcc64cd26ed
-EBUILD autovivification-0.180.0.ebuild 476 BLAKE2B 28bd4faac48b2cd7bfd5c87096418986aba0963a99d230cc032e563691d5c43c0edab8d269dcdb8cf3ee270b4dbb510d5b6c3e1f4055416c6f9e675d4d0010de SHA512 4ccb9084c2e681f0a65bb0158dc8abfb70824a5d6306a9024e22bda252f8c988c443d454c17fb013d885de63b6f08ed7ace2655192c9d3fd67bd97fce9ab8e79
 MISC metadata.xml 356 BLAKE2B 25e3f0315c9a2670f1ecb0a5e17f1e8b3dfb14a72e54dc30744153e8dbe2f893cf8e0cdbf74786023eab895f0e5bbbcb7bbe69647841f80f05bc7af41cf1fc4e SHA512 bca4923c1ddc222b8fb47aed6e8959870d58844a17c8e76fe9f656943a9f04c5df9772e937c036ad11626504453b453c2c57f2d97ee8f2efa3fbebeb15f5291c
diff --git a/dev-perl/autovivification/autovivification-0.180.0.ebuild b/dev-perl/autovivification/autovivification-0.180.0.ebuild
deleted file mode 100644
index 90d973c07de3..000000000000
--- a/dev-perl/autovivification/autovivification-0.180.0.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
-DIST_AUTHOR=VPIT
-DIST_VERSION=0.18
-DIST_EXAMPLES=("samples/*")
-inherit perl-module
-
-DESCRIPTION="Lexically disable autovivification"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="virtual/perl-XSLoader"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Exporter
-		virtual/perl-Test-Simple
-	)
-"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index a3fcfcfd6ff9..273361a4ecb8 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index 5a0c9b9fa276..66ee58d1a6a7 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,5 +1,7 @@
 AUX pecl-event-2.5.3-no-sockets.patch 638 BLAKE2B 868bff8eb515cf466d9b844baf7322999520c8829f49fb3547229b884b090fd130b72c7b27c74297d3c3d7567f7b5056484a4624dcf6e5010ae8213f01ac8ffa SHA512 482338228ec8e6ea2d91c77e6fe4b2a5619ee39880824bdac134d9f2cd23a2363df2f68eac4a849579c02d9fc140112887d30b601e36d96e4e93837a3c6a653d
 DIST event-2.5.3.tgz 140913 BLAKE2B e9b1886b65d1c307bf4a40ebe20e19f33d9e422ce98fb704c7174e953c2488b87f941fc5615bfee07e7d51e1775a0256349e023e6d8921fdd237e527ab108151 SHA512 359eee2f501444f444904ee1960d85af0b77259e59a06d9c6ae1ec008f7bda9bda5bf999d437d84416150a965466519c04e4c2f36dbca44367075fcbb46cd917
+DIST event-2.5.7.tgz 141451 BLAKE2B 6d5e87b0b4892b59e2dc37dde0ae8ecafd104fbaa90fcc4d2b7183d4e3ba2f8fa182ddee90d5ebaebeb826f3e02d760ae25ce5ca01582fec9dfa5cb05dc6f5c6 SHA512 8160c3df1f6faa4b3ee37b9212a7953e5c0cdc747228517d238ea638b2b441e4b64e9d8c91d3af6bd33f33486137e9da1c7cb45b8d8400b8ab46d1ae4c03590a
 EBUILD pecl-event-2.5.3-r1.ebuild 1287 BLAKE2B 0997b61878600d61f4c7bed21dae3779cd94969822e251b6f8058e278af2618f95750303153f5a6994936b292bb9abb9027adea1119460ba1dff8845f6c45c88 SHA512 0e812328044810c6637a59664f130d67d3d169f99e86f53ac928b97efd797d37318dcaa098ce96ccdc03044f3b4e367446ea993817bb3ca3a13cb723b5aa703a
 EBUILD pecl-event-2.5.3.ebuild 1228 BLAKE2B 404fb20be843887e48696ff4bf0bc0f795b2fc8257d3e41771d23762a2b1b94851262bcc9c3dbbf87cbf98d909f814db5d6c60ac70ec064c3db6508929c96910 SHA512 112041bcedb204a3e978f691ca608569f821e305409f5a0d29148315555a1795737ef6040ffa472e0d095e03a896083f63e09af410b07dd0ea08de4eb445ea3d
+EBUILD pecl-event-2.5.7.ebuild 1171 BLAKE2B 32ca8c89683b02f8a55450ec23eac07212f48c465eda8429d7814f72857622b77fc92a2e1269d9a6d863bf477b4d3b4ae6aae055577409c36d24d0b2f23c2329 SHA512 1981c5cb35eda5db3b35fa90563735e71a931b9f263e89aca7a477d5d38bf5581f163162a1737312d3f23a77bad208740c8e8ec28b63dba5a6215b31ed4e6633
 MISC metadata.xml 431 BLAKE2B 25421824761cdcc90c610236ac4acfd85e18fb63e4f92ff3fa5e51698a7e2004812a7193ced70646baf02bacd0bc896a5959ee88bd88dd5de68db729661ad02f SHA512 6349913306ea30f9ee6cd5ad862e0323d143815f4db47da14e5d54d0dcfb604118e3845f664f2a9b8527797b262c9567bbf5f189426f9becbd169be0ec111056
diff --git a/dev-php/pecl-event/pecl-event-2.5.7.ebuild b/dev-php/pecl-event/pecl-event-2.5.7.ebuild
new file mode 100644
index 000000000000..51a0782ec320
--- /dev/null
+++ b/dev-php/pecl-event/pecl-event-2.5.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="event"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README.md )
+
+USE_PHP="php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ia64 ~x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libevent2"
+SLOT="0"
+
+DEPEND="
+	>=dev-libs/libevent-2.0.2
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	php_targets_php7-2? ( dev-lang/php:7.2[sockets?] )
+	php_targets_php7-3? ( dev-lang/php:7.3[sockets?] )
+	php_targets_php7-4? ( dev-lang/php:7.4[sockets?] )"
+
+RDEPEND="
+	${DEPEND}
+	!dev-php/pecl-libevent"
+
+IUSE="debug examples +extra libressl +sockets +ssl threads"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--with-event-core
+		$(use_enable debug event-debug)
+		$(use_with extra event-extra)
+		$(use_with ssl event-openssl)
+		$(use_with threads event-pthreads)
+		$(use_enable sockets event-sockets)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0e212658f472..d58c6a5c3540 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 7d6dd75b7794..8fba06ed9a60 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,5 +1,3 @@
-DIST PyGithub-1.51.gh.tar.gz 2950990 BLAKE2B 214014b8205d954c559f2d19a38c7bc93800f40500c294397f16d55a4a027b7827910c93d98b6f5dd867bb0049ad1c9618c08ff72996f3717480ad17ce0ec64d SHA512 617b7bbc1fbd680735d5a57910ac1863cf67d9b2afc037d20fbd140a32aaa146164a76f73d76f2395aff1eee1fb13eac7a146c9cd05791b27db9a06a28d520e0
 DIST PyGithub-1.53.gh.tar.gz 3026570 BLAKE2B 7204c5934b94d5629b38e841a9c9011ea561ca8aa8d3d169915975fb02fe8db059fcb521d11bbb2350a806457d98abbfe36a19c4e5f633c82cdf06b8b7203c6d SHA512 f98d013d5fdf31ee59405c52edb35942ca5a3d2c1ff9653c71f03871bb28d0c247412bfc2593991026ddb989e1a33dfe91d19b4ebb1e89386b54493d51071768
-EBUILD PyGithub-1.51.ebuild 765 BLAKE2B 00f5df1c6be8b6f146d7c5f27eec89cd001c2c2cdf14ff1abd4aa84c089b76e42dd35e478b1aab3583b4ed6524a21cc68d391b598bee60c791df044fc3431094 SHA512 1ba906569f5ec5c07d5c7c387024cb0b6285a7f535ca04e3396d373815a2ea342e7e6be33355cb8e6f50e5aad8f4dbc556a1d6ce6a9476da79ed7a3249f0aec6
-EBUILD PyGithub-1.53.ebuild 767 BLAKE2B e06845d6d84823f891fcb5cfc2278193b625d536ba95e063bb0fe5fe99617155a2a38eca2d7e057f1d25e12752906e52096435d9de44d919d99a9a7c5bdab6a5 SHA512 a67b987c5663a5fe7b9f883e387523ccb04513ac176c2754ceae509998f1bf978b0892d87889e60baacb88033112cd1d5ba5a74e3c58cbc4f65249db6e27e6fa
+EBUILD PyGithub-1.53.ebuild 765 BLAKE2B 00f5df1c6be8b6f146d7c5f27eec89cd001c2c2cdf14ff1abd4aa84c089b76e42dd35e478b1aab3583b4ed6524a21cc68d391b598bee60c791df044fc3431094 SHA512 1ba906569f5ec5c07d5c7c387024cb0b6285a7f535ca04e3396d373815a2ea342e7e6be33355cb8e6f50e5aad8f4dbc556a1d6ce6a9476da79ed7a3249f0aec6
 MISC metadata.xml 471 BLAKE2B 1d1b80ed6b439d4e66af20c29e7ff4a2c229e29bcd9c3b8c4735c7e15f8176c0fcecd88d2cc26745edc52f99c75e9e70ffb70df1a1acc2b46c29d8801973effc SHA512 a6c6fb332c408fd4219ec277d30233693397b9badf6a8bf438ff65ae3cbb9431caaf4124c2291cf9cc9b1dc671f162bb6018de7ec6495f6a9740daf9a25bffb1
diff --git a/dev-python/PyGithub/PyGithub-1.51.ebuild b/dev-python/PyGithub/PyGithub-1.51.ebuild
deleted file mode 100644
index ae1dba794d4a..000000000000
--- a/dev-python/PyGithub/PyGithub-1.51.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-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"
-
-RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/PyGithub/PyGithub-1.53.ebuild b/dev-python/PyGithub/PyGithub-1.53.ebuild
index 0a466756e898..ae1dba794d4a 100644
--- a/dev-python/PyGithub/PyGithub-1.53.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.53.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"
 
 RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
 	dev-python/pyjwt[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 80b02831bb36..84e1fd023857 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,5 +1,5 @@
 AUX aiohttp-cors-0.7.0-py3_7.patch 991 BLAKE2B e2a08dab701bd31e4a9008c8f89ae97508fb6b99b89db69a05b731849e09c6f04e8b148d82d38f2093e00bb9bee03e45f230cfc8eff4b71ca7797a95524732e2 SHA512 efe7c488d9f30da7eebbe355d86c603657bddc75c88f5cd1bb4b0e76b17f26f5827cc2f42ab8766767a4ad16c08fa636a4f61e50a8c478e7f32eb2567e26427c
 AUX aiohttp-cors-0.7.0-tests.patch 2422 BLAKE2B 4660be793987dd0cd5c945703aa4d6d4b499ba0ab1c305b80e26bac9cc87d811131f6ab179e402821740f193bbfc86a384b58e35aaa453fdfd5d4db3bcc44b23 SHA512 b3fa463b87a112529443f516fe1c37ffda092e8a0133a6d37f407519e32842f65773c87e939082591edb969ee243170be3a4828896ec5ffc1150c3f43aedd9d5
 DIST aiohttp-cors-0.7.0.tar.gz 39728 BLAKE2B 747499856272f551cf8e2e0911ff7cbb2c7cb8a1f3159327dd8f0d40cabbbd9713a1a9e30ef9c99f3f9642567c99025e049db837c89f907d6698a27005ac2632 SHA512 72e0b365b952c08a02c1123d7672cfea01063e2ff01743a71e10f804d22178edc0f1c6b7f87b7ed484ca7c24e89a32de90d0d279f2f5c060427319182f9bdd3b
-EBUILD aiohttp-cors-0.7.0-r1.ebuild 957 BLAKE2B e607bc8cb189c8dfd8c731918ed2bb81c1c8df568b3478d67edaf26893d0fc47f6cd0e260ccdb8da459f704800dcd96fd550270e8701f880be8cbf361d138e38 SHA512 e78f462237ac84f2423f100fd172a1339a8d11890b64c55fb0f23f8649c4b12274775bfb6ffad1e4ec998a1cbef4facf2646e9d94e30c64d582185f9aab9fbbd
+EBUILD aiohttp-cors-0.7.0-r1.ebuild 964 BLAKE2B fe0fda2af78a6440fe20ae250c877af143ca72f630d969f980c7af4469a603ccb20c1e416c146467835dbc85e6380f374e5dcca52b68b36dd2c8e8dccab66379 SHA512 2bcc8d751b266a133ac4002b25ae250000ab5c57abaf22a14af3a17c90d66e07043d7a8370cccf0899258a4e3abc651559905b183897747ba545502997c07806
 MISC metadata.xml 453 BLAKE2B 425da23ceef20765f00fd1f15b34bf99166f66dc7d6cdc0ee74a7d6439ed912ebf79c365daf9cb50a918802706aa8782d88cee3520b1e37bf3e6505579521263 SHA512 690dfd58364f19eb58ae3348b9b2a8d64fdf4324dd26fb63cf563762f4f8368437fbae1afeeffeb0ccaeac100d793008e28b66309139e27418ef5cd70daf0d8c
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
index 355a196ad404..7b154442adf0 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 0e19f986f816..ebf40d1be47b 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-3.6.2.tar.gz 1076923 BLAKE2B 14327a0bc5b5fffdf436a4c3525e4c25d80100aa464ed652316f7724c2bea6de4ace6c27e8a2a8cf9d895673ed63ed52e8c958ad611636e1e524a4e40efa4735 SHA512 49bd3089158c05ff6312420190ccd7fed95efb4a18b8aff7497d5507c71c692080d6949801edabdcd95379ca8e6614398408118d72ff1e782399e059e2cfc1a8
-EBUILD aiohttp-3.6.2.ebuild 6761 BLAKE2B 3ecfc4251403d3f5df85a4752c1aa19d31b585f342940f39fc292f47d46b87631cafbd93bd86342559df614e63bf190c3cccd1fb3060a9fb4d09edf7f74278be SHA512 0d4825b013f7205c34e92fd0064b45824c4e5be30c159d768491335000d8a58ed015c5b5890c7e1c7f53f842682a2e7e86eab8f01b26a69138acbdb8461d9abc
+EBUILD aiohttp-3.6.2.ebuild 6768 BLAKE2B 6f4d67ce941d1c548272fe49ed8e2adeea5d080a658f15841c108692b2264cd18eaaa8c54bb52bb0de62e96ccc9450f6e6419d222022d2d7f8f365405069f19e SHA512 00fb1fa28f9e1cc71d4cad57bccceff967a055a2df264a09688bc4ac4fb68810295929c8103ab4a2c47971ca6c911693d21eb9818ecfd9fc135fa82628112746
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.6.2.ebuild b/dev-python/aiohttp/aiohttp-3.6.2.ebuild
index b2089b92c174..8576aff21c99 100644
--- a/dev-python/aiohttp/aiohttp-3.6.2.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index 127d820e2d7f..162cbce7f549 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -1,3 +1,4 @@
+AUX aiorpcX-0.18.4-py38.patch 1913 BLAKE2B f15e8cf86a2447944cca64e5a6e99239918e9e2971faea70bffa13a38c89ae6007bb5504fba13830a4c7dff36fda8e55953907b49421e19204c732e323cf7b34 SHA512 ff7af0ae3f9a538e36d225fef827cb4684d6fa5eccd7f24276888a538dd72f9972d643110fcba87a2f5fcf3c1d54124d85364a51ebb1a1807e608564ed72cbd1
 DIST aiorpcX-0.18.4.gh.tar.gz 65500 BLAKE2B 8c84ace1e2bc974e68702e25efe126f7f69dd7451f438ccd924ee8be3c0cccc5c9b3d116bf2d0a755b013bdfe61a398d856031970e5ae82b571af09551231bed SHA512 d4df1343f575af72dff31f1794485c0cbb5b6c31d6d933b07cc8375a1418ad4fb81b2649b3c60adaaeab75b7a5d959838accc38269373310eb07895acf4c9496
-EBUILD aiorpcX-0.18.4.ebuild 734 BLAKE2B 7936a4a32656d5caf34502fbd20c6ceeb912e5a2ca2fca72689bef58dbbfc87a996fa62a822acd4ec9205d4b55143a39d6116c7747cee11f5892d4e4924cf399 SHA512 b7dfe1260f9884187c37706a03b697426a8d1e5e11cb3a9fe0b9ba8ce592bae78674bb75acf2b9551214738899181f07c3b2b81beb30e836d3649ea44e52aca3
+EBUILD aiorpcX-0.18.4-r1.ebuild 779 BLAKE2B 27da6ffd9e4a54d0a4fbc52e3a43b9b56a33d870bdf844f2641bbb2d89df39c515eb6cadf02048bbd27423591eed4dc1911ec94de05d2ce1ed03d66b4236c202 SHA512 ad38457b6891d2fcb24adc377ea8e6fa2a0431cd061b924ded6685dca46c3b514e6e1e293d8f19dc8132e88acc8ed793877059cc01c996f32ff8350750447e55
 MISC metadata.xml 380 BLAKE2B c1355cf2d901123fa14fadb4f4bf084d385dfd870baa0a2189c68d05cd3bed57ae4f1caaa668211b74b6e2491e3263b99ba8b99446c0e4f5336ea06577dc540f SHA512 b025f50be4d5ba7e95f7ae7b91099498b76b75c7faa28df52f0bb64dbe55b494107f011d42bc4cd6f5c9e5786b2dc1eb8ffc8561334326dff9c99f7877576364
diff --git a/dev-python/aiorpcX/aiorpcX-0.18.4-r1.ebuild b/dev-python/aiorpcX/aiorpcX-0.18.4-r1.ebuild
new file mode 100644
index 000000000000..304db91bcbf8
--- /dev/null
+++ b/dev-python/aiorpcX/aiorpcX-0.18.4-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
+HOMEPAGE="https://pypi.org/project/aiorpcX/
+	https://github.com/kyuupichan/aiorpcX/"
+SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
+	-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/uvloop[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py38.patch
+)
+
+src_prepare() {
+	# websockets are optional and not packaged in Gentoo
+	rm tests/test_websocket.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/aiorpcX/aiorpcX-0.18.4.ebuild b/dev-python/aiorpcX/aiorpcX-0.18.4.ebuild
deleted file mode 100644
index 8aa08960194e..000000000000
--- a/dev-python/aiorpcX/aiorpcX-0.18.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic async RPC implementation, including JSON-RPC"
-HOMEPAGE="https://pypi.org/project/aiorpcX/
-	https://github.com/kyuupichan/aiorpcX/"
-SRC_URI="https://github.com/kyuupichan/aiorpcX/archive/${PV}.tar.gz
-	-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/uvloop[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# websockets are optional and not packaged in Gentoo
-	rm tests/test_websocket.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/aiorpcX/files/aiorpcX-0.18.4-py38.patch b/dev-python/aiorpcX/files/aiorpcX-0.18.4-py38.patch
new file mode 100644
index 000000000000..bc189277c4c6
--- /dev/null
+++ b/dev-python/aiorpcX/files/aiorpcX-0.18.4-py38.patch
@@ -0,0 +1,53 @@
+diff --git a/aiorpcx/socks.py b/aiorpcx/socks.py
+index 92ad396..4a6cefa 100644
+--- a/aiorpcx/socks.py
++++ b/aiorpcx/socks.py
+@@ -45,7 +45,7 @@ SOCKSUserAuth = collections.namedtuple("SOCKSUserAuth", "username password")
+ 
+ # Random authentication is useful when used with Tor for stream isolation.
+ class SOCKSRandomAuth(SOCKSUserAuth):
+-    def __getitem__(self, key):
++    def __getattribute__(self, key):
+         return secrets.token_hex(32)
+ 
+ 
+diff --git a/tests/test_curio.py b/tests/test_curio.py
+index 9292f52..97b479b 100644
+--- a/tests/test_curio.py
++++ b/tests/test_curio.py
+@@ -1,4 +1,5 @@
+ from asyncio import get_event_loop, InvalidStateError
++import sys
+ import time
+ 
+ import pytest
+@@ -525,6 +526,8 @@ async def test_nested_context_timeout():
+     ]
+ 
+ 
++@pytest.mark.xfail(sys.hexversion > 0x03080000,
++                   reason='broken on py3.8, upstream ignores the problem')
+ @pytest.mark.asyncio
+ async def test_nested_context_timeout2():
+     async def coro1():
+@@ -562,6 +565,8 @@ async def test_nested_context_timeout2():
+     await parent()
+ 
+ 
++@pytest.mark.xfail(sys.hexversion > 0x03080000,
++                   reason='broken on py3.8, upstream ignores the problem')
+ @pytest.mark.asyncio
+ async def test_nested_context_timeout3():
+     async def coro1():
+diff --git a/tests/test_jsonrpc.py b/tests/test_jsonrpc.py
+index 315f639..b0cdd60 100644
+--- a/tests/test_jsonrpc.py
++++ b/tests/test_jsonrpc.py
+@@ -1126,7 +1126,6 @@ def test_handler_invocation():
+         (Request('missing_method', []), 'unknown method'),
+         (Request('add_many', []), 'requires 1'),
+         (Request('add_many', {'first': 1, 'values': []}), 'values'),
+-        (Request('powb', {"x": 2, "y": 3}), 'cannot be called'),
+         (Request('echo_2', ['ping', 'pong']), 'at most 1'),
+         (Request('echo_2', {'first': 1, 'second': 8, '3rd': 1}), '3rd'),
+         (Request('kwargs', []), 'requires 1'),
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 6eac13af4341..c93213d14904 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,3 +1,5 @@
 DIST argcomplete-1.12.0.tar.gz 53625 BLAKE2B 29b4f620537a087629c63dc71c6a0101d40967145680518b566b9c81e3e744c5d73e1ed016795f0ea4338be4e8f20b7df1968e388e1ff09308e012ed1ba6d0c0 SHA512 5e21e3caf1dcee661c0dadf28d7b127147325475fe3ae569fae8797a762c34b55125df9f52de8d76f0aa6dd4efdac260a358b325a7659beae02b1dedab501c18
+DIST argcomplete-1.12.1.tar.gz 53677 BLAKE2B 85c5d75b59875b6fe5bb932ed05916f3af23ef64b993544c69ae431d9e6b5d8c23a9bd35d76b570538ce8e722a6ffc8cbcbfbc9209fbf29ddb000c60a809c03c SHA512 236871966361ac781c04f52c02d90c20badabad12d34bd7c5cb1cf1a74d442f9147e04b320530b55abc0490f7bcd11494cdc13ed5c339c91737f1c979010d096
 EBUILD argcomplete-1.12.0-r1.ebuild 837 BLAKE2B 854f8cdceb843ad602bbf6990f87f65af2014c0db0bf22b7efd50a000e983e6da5453a5823e007d84cd1e3debf3ed4228a32969277a49f5514dddc8612bf33b6 SHA512 7a487867cc788f382f2a33fd3e870d8ebdfc1abf75cdf78da270978defa07c7b1387589c3abec343d060dba5c41fb40671f7999ea49808a4a1e16272ab4b557b
+EBUILD argcomplete-1.12.1-r1.ebuild 845 BLAKE2B e4b5274d0ddef1cd9fc44ce31a5fe3b45efe058f6bd4afe8073a8d89a54e6242254f4ed9350609b3828f9d482efb402b94cdfd28eacd238aff7e945900166aea SHA512 9064048d5c985a95d09802ceb031a2417efa3e755e5fc4a33496fc4aabc38068d3596da2c071667ded79b5cfd662d276e31b74550f80d068d9cbe6fec41dff1b
 MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.12.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..9756cbf400bc
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.12.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.org/project/argcomplete/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/importlib_metadata-3[${PYTHON_USEDEP}]
+	' -2 python3_{5,6,7} pypy3)"
+# pip is called as an external tool
+BDEPEND="
+	test? (
+		app-shells/fish
+		app-shells/tcsh
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pip-19
+	)"
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 7cd3639f0da3..229082962b2e 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,5 +1,5 @@
 DIST arrow-0.15.8.tar.gz 92220 BLAKE2B 8650d31b5b75c6222d86b5e13f253ae6baff66e91044a74235eda4589a47ebf680b31e2007fb13c83287402ffeaa446437aace9124637e6952ef139388aa51fa SHA512 93d161cbeb48636f2e3f91ebcc51cddbb3b21175ae31f5d9251a22358c7d1934663a8e47a82efd8773bf30c28efefcd8d2a3baf581fe191777cd41f12f29d4d2
 DIST arrow-0.16.0.tar.gz 94403 BLAKE2B 9d2ad18732cce5bafdb628a2e9b825e6d1ebd94f7848391c0a0752a802a7e2e8a34afe0da7474df0265c4a83016530a1c070f4f1629c8fee8172812a53a3a7af SHA512 e48316bd31a86d640e50987010bd56c6859e972522e753c00d83730f1ce4764716eb9a22c4aa9aa0d64949f25acb7e1a3479ce0e1c62058fcb887a442f2247d6
 EBUILD arrow-0.15.8.ebuild 693 BLAKE2B 1a17920f4be6b1636a112c4836fd5df0d70752cf731cc5dd6336cacce74a0b7582b74464b153c4665651c9ac9c0c7edb486bcaa8a107e168052a065c54c00bb3 SHA512 737b3519042b7f72f6fb36a03f3cb1ca99940ed6bdc1daeb7b3b0823ad97a4fcc6cc0d5fd2851f9e4f26ff52b40d42b7a857ca8fdfdc47de87ee2005bfd5b0fa
-EBUILD arrow-0.16.0.ebuild 703 BLAKE2B 5974df6331c78efa84ef7dbe22555d20bc963a327446445688199003bd5c539e8e012839eaf24d0358d59ae8494012d46927231bd8ce4a29f9081c403242eb88 SHA512 52894163dbc1fbf14d6f489d1c5300154a57a8d7b243a6b79b4d5c0aa3622e051bc7081e8090e849fece78a9efe0cb7004ab0b4156d415ca116a12e0ed643573
+EBUILD arrow-0.16.0.ebuild 701 BLAKE2B 5fd0b11f5bb287d47d1cf02ebc7ebf07eb0cc9fc5f624f967b2b2ad2908e1b65cb8f6f26ce67758addec83c2dbb98f4a07ad76f64a1f47aecc9e7f283ec4abb9 SHA512 f84b16734673d75c7ec2311ec165d31b5e3f3144479e3d453a5ba9f2120cc328ca9140d10484e1fd4b00c5d1673a2a40a8e768a9fe764488f8393e5571d95dec
 MISC metadata.xml 388 BLAKE2B 68ef136715f60b69973bcfa1957f23ddf81a8d1cb99d2edaf955562b78f6d92a6187b97f208366b320c0bf140d2ce0d9b62aa9a8d6631b9277f58dd60cfdf5bf SHA512 66f3d1a07042e4e935dcac1e5417893b9fd7b9e97b9f7e3670c85960dc2344e101715cfc11fd2776aeddad8b622c4e8fbe509ee5d93c5250183486a7dd53e16b
diff --git a/dev-python/arrow/arrow-0.16.0.ebuild b/dev-python/arrow/arrow-0.16.0.ebuild
index 1056296f2129..1cc6a3c1c47a 100644
--- a/dev-python/arrow/arrow-0.16.0.ebuild
+++ b/dev-python/arrow/arrow-0.16.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index 653c15280074..5f39e0601d1f 100644
--- a/dev-python/async_generator/Manifest
+++ b/dev-python/async_generator/Manifest
@@ -1,3 +1,3 @@
 DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
-EBUILD async_generator-1.10.ebuild 685 BLAKE2B 49f5cd601fc27bfb8f4fd912e6d6279df0a8942a655815ac065e8fcf4ae7847861c8c914ce8e8280b81471d2cca8e92b49e35b58018df73e8a4a34bd3c37cb0f SHA512 166c43f389694520d622e0c416f616b415e1c4ce157f1f379df77f863e05d3072f4ab49145bb66150d2b01707a3036ae610ba1bab5b13fc91f0ee19720b9d275
+EBUILD async_generator-1.10.ebuild 692 BLAKE2B 6b41e4e7b7dde7bd455a5903923a625df428a8e85268682594f662e3f8401c880911033581ac8f50fb52c78f79e70500a2e3789b0648f6d899700e651a6cd9d8 SHA512 4f63a79843a4d43522dead01420c4e0d6e9ea6d20d9815b95cf01073496f2bebeaca0054340fd66ecdb6a09314a6bb9833ee3d00c297b4346e3b0506f7405490
 MISC metadata.xml 442 BLAKE2B 93ff73ecbd80ae38cb18b2ffe11bb60c411b7f3ce36b196566e230fecda350a13d19892e672a65fd278038feb53273b39ed7eb42809bd397bb71b8eeb4baf5ca SHA512 fdd4036bac7d48e387e8ad059be940d3eb3cebcf1d6a6079cf4effe25265c3a52d360269fccd8e45f67374d2ce4c2b67245e75fd59656df92a36744265494f07
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index 6fc53dac5a04..328f79e69dc0 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DOCS=( README.rst )
 
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 3db4f1d9e8c6..4a3c777cf635 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,3 +1,3 @@
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-EBUILD async_timeout-3.0.1.ebuild 1004 BLAKE2B 8e274597cbf11e7aa53a71360afebd093dcd083c67c88f0e5f1973d910688af4dad04b77be07408efcbc90b06cc5a5e525c017eeeac71bbba5e5abb89e3fd8a1 SHA512 5be4beed84c46256495ebb8da04911b6de7b405f5fd43e9cbb1a2b717f83df94f537fcae6184ff4baf554352cf8d217204ffb3f9ba2b7924e1bceb06fa9b1f0a
+EBUILD async_timeout-3.0.1.ebuild 1011 BLAKE2B 96762976a1ed2b2a794bb3fd80092756af5ced437fb5671804ba03d7b5a23f280781f84448c81109b0b16c062ca0fd697af6a66e97f28e8603465b0524667a58 SHA512 e1761c9a050f9e05a8dd8d5619333607f233c1299f0f86f777a24755ad4ecba2a19543583698d00ce4a45de18621b761a7acf67945f29637402487209622b3bf
 MISC metadata.xml 435 BLAKE2B a3bf9896730a3f697c6a41257e9f3c168154760ffba1cc5d5660a1442a3b5f5f8032d48ae0b069a412e3ef2e792376e29d3a0867a46576bf8b412acca0798388 SHA512 a7a43ad3fabf98be2d846d8a4bea1ff2a867f934e27d9f88b1c76daaf4d4195f8ffc6039f283313dd009566c732bcb0ab8a847e0b6424afdce902539530637dd
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
index a9291b7803c5..618cfd9b570f 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/atpublic/Manifest b/dev-python/atpublic/Manifest
index 8ded0967493c..3fa1d66cd3a8 100644
--- a/dev-python/atpublic/Manifest
+++ b/dev-python/atpublic/Manifest
@@ -1,3 +1,3 @@
 DIST atpublic-1.0.tar.gz 13611 BLAKE2B b5ce4cbbe950943c001e25c3f0c1fe6c25a99a96e4c630844a409cb0ae9a2e7d8fae8d010864364bb2bc948ce78ed17bef5c1f1ca1435faca439f62521bcc719 SHA512 f9e6f7bbbe12d86df5bc849c432e789fb55c6d19b9d6b3fb2462ea38aa8ad6602504a30a95ec14e001f62709ae5e11ae29258b9cb7a71eaa48879f9cb0cb19d8
-EBUILD atpublic-1.0.ebuild 495 BLAKE2B 1d71d3b681a9e7b5bb443f1772ed23849de2e6ef97e2f4f66a0d6db15f7c77abad32dc4848aefdf0e6f3eae01e3945619254d199e9414c841cb71e7f9691d2d5 SHA512 0212885e9bdf42d832a534bb6ebff24f31bb4d88708bfc8b1c19784d191afcdfc1610b21b69f5b9928dd4579b095f66a13bcc9fe5d80201bc7ae98d3086e7558
+EBUILD atpublic-1.0.ebuild 491 BLAKE2B f5631f8eef7ab14c94994484f0759a18007a0c882982e9b523fc40d83f2d840a8940987d6e5fe6cf817a98692bf7dc2288aa1fbafba8dcbe31ed447b30e39e6e SHA512 64db34c22bf2cc034170cb774c961314dd7e58a4bab9e375e680adcf5574e481184944e796ab536e72f3acfb6ff6983cc461112d1eb65ba54481ba1eee936135
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/atpublic/atpublic-1.0.ebuild b/dev-python/atpublic/atpublic-1.0.ebuild
index 6cdb26be63ac..0b3d317de132 100644
--- a/dev-python/atpublic/atpublic-1.0.ebuild
+++ b/dev-python/atpublic/atpublic-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="A decorator and function to polulate a module's __all__ and the module globals."
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index ce53e6d16685..0299fed4cda4 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,3 +1,5 @@
 DIST beautifulsoup4-4.9.1.tar.gz 374759 BLAKE2B 43f5dc296bd0c4967036fcb70889f988c0dfc9d8713f8bbab423c9089e87960323392458b3abb9b2332acff286efbbb308a5c77058462c15f8dfe9056f0304c3 SHA512 a1fe9cbfe8616d2ff25cc836769ff02d51ed86b06ca9a37366867b145440b7f64b866346600ed74820f0407c8e70eaac3d58700766a99b5ff7433cb736a57b3c
+DIST beautifulsoup4-4.9.2.tar.gz 375880 BLAKE2B 99137530e3b95aa4dde80b64dd42f0614c6429aca421208eab98764f7929c30a725e9df3625afa4a2c2e8bd4be56144cb9077e8e260741b6b306cfa696e6a076 SHA512 3bac5d57404e0be1e77a1bd560750e831c8636fc5f9b3c05b375c0cf44d6846ed73127a2a7d1d8ca657c21ec33854b8194f76b62820fb627d80a5906229a7454
 EBUILD beautifulsoup-4.9.1.ebuild 865 BLAKE2B 56ad3bad060f06f8c8c5a423756737103788c45f0989e8ec3b6b73d3a5e3d2f9cdc8d45e488a518ea018fa24b04cff0ac670a1c25cd81a8cfed7845b6cbfea5e SHA512 4d7262aefafc557a8f5a82312043aa2128cff129032fba20a17b25363e2047cebd6c73423c16375a0690ad829aaa60fee13a0fba83022e00f2244e469e850028
+EBUILD beautifulsoup-4.9.2.ebuild 849 BLAKE2B 6d2b22bff7e16eac5f5e4fbabbd280d42d10fa671ea3f4b85384c9689bfcd8e0d4a46d6bd84644ac0023cd06cd9af2a79e12c24c764b248f01b7edf8fc5d61dc SHA512 3e8c20c173aba4009c59be54b2cd62ea748e6a8ed325e042bf951e5b6bcb3c4d06c45e877e5ebbda5226d42a57372b32b9f1bc20a68555369c87ac8afc916703
 MISC metadata.xml 744 BLAKE2B 93987e4adb8dc5dea9b897940cae80d431b29d693bd1fea9d242de75174b1fd86afaecc6a5fb5e4ad06576caa559a918d09da28d253147f2683703d911435f76 SHA512 f56ab7ff03d21187e38f292b24396eccfd53622c84f5f489bd1e515393dbf85b75bbdfe26a6875352b16dcbf16f89cd9a051dfe44dbca8786efecd7db914f789
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.9.2.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.9.2.ebuild
new file mode 100644
index 000000000000..8c2e9be5885e
--- /dev/null
+++ b/dev-python/beautifulsoup/beautifulsoup-4.9.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN}4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
+HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/soupsieve[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+distutils_enable_sphinx doc/source
+
+python_test() {
+	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 474246cbe479..cd8b776a05ee 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,4 +1,4 @@
 AUX black-20.8_beta1-setuptools_scm.patch 467 BLAKE2B 4dd16dde09bdb9c9b8480eff2542f11cbe712919dec6678193fae1dd2d58c646c76ecc4831a6bcbb54ed5a7f3692f61953bbb8856e8dcf6b64918ccbf32fe69c SHA512 47df09f60aae9ebbddfdf513d9b6caa30aaf60d65cd21027e965b0544085d63312dcbdc54906a0d1ef0edfaaf00f3cc753a7af3c113f4001ef4b48ca53e04c6d
 DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
-EBUILD black-20.8_beta1.ebuild 2196 BLAKE2B a25330d815527c3bb5df0bcbebe481618c2028099253998067a5359624279c0bc2d799bbc0eadba5c6e5bc90c8bb3660eb0942ee59228cca36d026aeb7182d6e SHA512 7db27cefdb3f98c801955ea3d680ab4c0b7cea237f4564b3369ef002faadb4b8e5c67a6fd3ca3e589d0296486b5a11633fd1ae1f9a66051074b3ba1b1277713c
+EBUILD black-20.8_beta1.ebuild 2203 BLAKE2B db78e9b9cbf8f289ad0284155e20f766bc2952958834eac0dfa61568e8865e0d2fcf9e208c9574e1aeabb580283239955a937858849235c3fe034450532ab915 SHA512 2e683fbc67c51e18dea4424cd6f794796fd07ba84091c105ab5a025b83e93d1d51ff9de8258c7b9f01c364118b7dc2ec84a56a512300c9f428e887a2f257b37b
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/black/black-20.8_beta1.ebuild b/dev-python/black/black-20.8_beta1.ebuild
index 229cdc66ac76..68248b52a45f 100644
--- a/dev-python/black/black-20.8_beta1.ebuild
+++ b/dev-python/black/black-20.8_beta1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index e747f0d7dd4b..f3dcefc2e52b 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -2,5 +2,5 @@ AUX blockdiag-1.5.3-py2_7-test-fix.patch 551 BLAKE2B d7e44b823390b6338bdb2d33cbd
 DIST blockdiag-1.5.4.tar.gz 2693073 BLAKE2B 8a825742b4144667153af00d5e334325f8a3b49823355787dbd577729da8b0fc221ead14ab899ef8aef1800bbc2cdc47f060330bf0a2f2f1bcd055d172d8adbb SHA512 0eef8b3837282ed611e044ee618abca1f799b4a151bc2d7cece140c97ac728b2f3b9a3bb6877d3fed42a74e0173d0cbfd2966521c4dfb21c266975b4062405d2
 DIST blockdiag-2.0.1.tar.gz 2694776 BLAKE2B 289bbeab89dff4e8274efb9e2061b1e412e29bfbd663f64b55346ee09d09279e0813347c51b6cdc9e547b417eba637a85f7cb37f48006467bfa1c9875a113971 SHA512 07690882b05d4cf7be04245e183a7c54d9cd4acab3bb4b5e170b7b0f9229d6ea42eba4dc9fab47604c1572d3c4b09de96cffb610c0c31882b9c0b150f0e76d89
 EBUILD blockdiag-1.5.4.ebuild 1750 BLAKE2B ece073452af02fe443aeac91de5684691fd0f7cb61a59d3ffb115e68c9a4c450c652ba9ab6d0decef9bc37d44ccb4e723ecfe9702eff91a975d7e2758debd854 SHA512 14d788ec56261ac0ee8d7c9c64bdc3e57ca04e5ae1c17c114ee239846cd0e1e0fb8b1f071587207968abb4f4d34f67a7ca481c2f2d6cb5bcf8faeae211744fcc
-EBUILD blockdiag-2.0.1.ebuild 1698 BLAKE2B ebf09c851a0ecd89c2b595bb38f9ce4c85c215aa6f2ab4cfc10919bde2bb0d6498332df82f21c14cfe87d9b3e0eae87e1f7d92a604957fc9a3721f78dae4f9d6 SHA512 a67c58b4372f2fe0b0c87586952dd9bf2a99a3831204faaba1b59f4f7c9a8d595c01721d0098e7794633fbeb4dc3bfb40e3a3c40633a7248c0e83b6ef3331fba
+EBUILD blockdiag-2.0.1.ebuild 1704 BLAKE2B f0400d6b774b1b439f8de14a7633caf04847b3e99937f6926fe408ee724c9a739bc91836eebaaeb0162a4c3686e801eff95dab354bd915ffa53635d45d9ce4c4 SHA512 4dc538e420e1fa2e5089755da3fd323d183b4f66e4b5736e6877e67c654cb409cfb91caca519a10fdc4744d45771cfb939e918d97deae6df3459c547b652a37e
 MISC metadata.xml 773 BLAKE2B 898f9291909c30bee45f6b25bfd9c2746d536eb9a238535cd7b7770565f64a6a91590fcf51f52fbc6a77cd4604014c3c9a8c66667b04359f7a686a284b8aaf41 SHA512 2d7ca8b92d199ed60f2035868175afb50a01e634da31cdbf0b6d583ca75c8362d186a613edcad83f42172c5abbf42063316116b62a4e6a7513493a734f51309d
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
index e01eb61ac595..2a481caaf805 100644
--- a/dev-python/blockdiag/blockdiag-2.0.1.ebuild
+++ b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 3348327c73f1..0376e42ff109 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,6 +5,11 @@ DIST boto3-1.15.0.tar.gz 335099 BLAKE2B 0cdf8cc0007a90671d4d3c66482d834e24860990
 DIST boto3-1.15.1.tar.gz 335146 BLAKE2B d2d008dcb2059b120f142aaf588264122d1e84b450ab1fbc938627d1c8cc9bb60d1b80e68bc5e538376b56866156ca901abde747a8f973588b64b962284229c4 SHA512 46e1aabaa975b0215c2ece160b5e584468ba19699f87686c2787404d0a13274f763272cec577f830c6c71cb7f9e10b1c317a1348770f49283257d8cba65c5e3a
 DIST boto3-1.15.2.tar.gz 335231 BLAKE2B f1eb144da7afc1cf630cdc1f61880d094186a37d46556ae361da278fd3045a119dcb09c3d08387a019ca88d6502fa8710a5e5733cd9dc9056676ef17853d76e2 SHA512 6866e0d6a50d11495e5f2a33a392b0edbe1ff6625235b26b5d6028f7c2c7089d78febe17b982f65dc2564254800a23409247ac09716b099f09f3751c5b7f47b5
 DIST boto3-1.15.3.tar.gz 335286 BLAKE2B 05c9ef757b8d227ae06a22e78d978821ff50da719f122ac025940b2e1ac5728d6bac044d4bfab95c56ac8c363efd7abfe3de2b3fd65d423ab53dbdfc60b910da SHA512 dfecfc075896ce84fd58d0437b84a6a794af69ff3e598b35b43f83b2b5ef57b88f96ef62a0d6505d5fe7fef0401513c8ecf0dfcaa22e4575510acd3ece191901
+DIST boto3-1.15.4.tar.gz 335401 BLAKE2B 42ee1f2cf1e82338ea59a40b95aa5c76abae51aacf325ae845f407ccbc3caf1b3901bca48036889ad6307f96c257259cce39784a3f52ec6ff03c0c6c5633c654 SHA512 14626faa3943b65a215b8f1bce24f217e69421cdfd40caaf7de0fec13ca9b5b25c5e290c27672b2a6bc41316917224209110e2efd5be817de7273f93ae5764ce
+DIST boto3-1.15.5.tar.gz 335536 BLAKE2B e4476272346dce929be52be220ac7da2e258bc20f5586eec8adb18bfedf1be63c6318a4ac9890d1380b625a67aa4ca5068fbccd6c36972a9ec8baf4473d1f2f1 SHA512 d9d49176b800f2fdf70ae3da657201571a26112f23b12337b133459c6e03d4f56970f6a7be3da6570439f32c41fc917adcc8c3b1d9cd74196728ac55ca0bb933
+DIST boto3-1.15.6.tar.gz 335618 BLAKE2B 6f3816b6363757ea1dbdef4bd710a68f07b513d2f4b6a7ad05769e2417e8b0a6752dcff8f3600f8bb419f074a24b32c9386c9f11dc549097bd963c32d20a0d23 SHA512 7357f8ac98ca1bb1983af22537d1ed939b1e51371966a7c312ec748f6acf9fbbb102335965a79cf44ebbb2b0b4db9ce859c4470f542d19ceea4513d90eaba274
+DIST boto3-1.15.7.tar.gz 335640 BLAKE2B 01becc9a36fc03937153fc7d4a37b5630bb1c1d6f72ff9420de73a05f4ef7e5e39561e4175b6f652241d15efae708123b41673d9d69453b9b902c0f1568282b1 SHA512 4b612fc51e453af77e84ddbe5d3ee8e03e25be37a2b8fe65a960c22b8ee3423b1ddf0a482a189378e470500b3fe78af615571f15f9fb8fa86147a4334ef22ffa
+DIST boto3-1.15.8.tar.gz 335724 BLAKE2B 4b034d21108bcf7fc100f71e534e348dfd72cf1ffea7e4ae53fa420e05c1e854216095e3179c4ce16c893a5bd32665830fc5ef3c3a4f0a011797b227ac53501d SHA512 dc6b9816fe58401a391aee2843698d8245141cb9735cc8b3c27181388ce8df070649e15d437ad96bbe3948061c97b0285e323c48e298c57271cd83d11180c768
 EBUILD boto3-1.14.46.ebuild 1353 BLAKE2B acf7d5909ffe2c1b58d3c2438b8ce995f98e092b2a76977674ad1c0491b4e2093ea53d8a1cd45b225e3577ed28847b60319a1a682d1af74c71acde7a822c4da2 SHA512 fc2ac14ce0c1ce9e7ccac46bdc9fde2e84687a7c634a784cc0ac7e99556b84f4ef3d2d27e546c445b687b93dcc293b63a5e3716ae645b01a60d8550fda591c4c
 EBUILD boto3-1.14.59.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.14.63.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
@@ -12,5 +17,10 @@ EBUILD boto3-1.15.0.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a
 EBUILD boto3-1.15.1.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.15.2.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.15.3.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.15.4.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.15.5.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.15.6.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.15.7.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.15.8.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 32d6cf48455240fb127d359f94ab09e45ec78655fbd63a5a1f29cd5a2b3de2941599c7d7068abc186b6e25baf13456b5e52958879871a5a8fc338b87e087fceb SHA512 58d3f3b2a1c04252e9c7527ccb094ec7ca41c9191de1aab85b4f6b2c6babe0c95d43f189031d2c8d1da2b35689d3ece1c27cdced6ecdec596a286893e05a5f55
 MISC metadata.xml 668 BLAKE2B 0fd93bc75c34b2348e49e39aa58d6404fc0bdeac1129a1c5644262973b08fc3f9afe371fdf9ee87ff00fd0aaa18b86bfbdbf86394434661b5253ae9b5b9dacd4 SHA512 ab5ea5b31b95ce548c12ec80f2261b98fb0e51b34218c23bafbe7cc0ac792b0680b5886062c2a016bd58ceaf1cdebc7fabade37edae756851895257b1ef1fc59
diff --git a/dev-python/boto3/boto3-1.15.4.ebuild b/dev-python/boto3/boto3-1.15.4.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.15.5.ebuild b/dev-python/boto3/boto3-1.15.5.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.15.6.ebuild b/dev-python/boto3/boto3-1.15.6.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.15.7.ebuild b/dev-python/boto3/boto3-1.15.7.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.15.8.ebuild b/dev-python/boto3/boto3-1.15.8.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 71c7453b0d71..84255414be87 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -7,6 +7,11 @@ DIST botocore-1.18.0.tar.gz 6838497 BLAKE2B efc0930b8ffafdf8d7f24d4f30cbf12e0dd8
 DIST botocore-1.18.1.tar.gz 6839699 BLAKE2B 188c5a05345fc7c4d4c05b3a8d9b675b5c2141326caa62f9ae8a5a996f6c7ff4e56c581fd010afbc4c57073d7b6efd22debad3e03456f6ad0453c7f823d6409e SHA512 63a9a7ac93a8774d7a1a511da0464d7b5d0841598c7358e97343406b4d76842ca56a0187ff173e0a29d9da9ee22f94fde66f4b8c3e9c8a3fbcabdaddbe95b752
 DIST botocore-1.18.2.tar.gz 6843154 BLAKE2B 77f4cbccd6a686cfbdb2f25fafb9f2210c0e23de72fb40403f905711ec5d073b92cfd003d39406d273feb0bfb90e2ab594f2bb9c1564b5b0879efdf3bcfa47e3 SHA512 f4fec4caf3b4ebca8a593d58827fb4377c2458b7ebccb53ccd830df5423a2021ecebd534d2fe276662f8d8e91078bb5adbf611a52baa29c8ab3526d9c7b975ac
 DIST botocore-1.18.3.tar.gz 6846755 BLAKE2B 3f6709cac832dff1ba07c2e8b4c235b5bcdf305c9851eedea2ce5f7847d0be93d7e9cbcb1765add47aaec1d0c1c31cdd2c88542a984af570140ffb7fe30d8388 SHA512 a8831b1549a768cea9d550dc2dc3c1c8afc03e018d2ce246569bed35cb9ce25bcb18689d066dc5b6e6dcc69db93e0b0957b32cb68c101127e01cfe3fbfa9fe08
+DIST botocore-1.18.4.tar.gz 6850892 BLAKE2B 013319b1055db5a65f25b4d11c0ae97e6eb58a8976eafea98c80a33c756b8715d69fddb86c900e9c3c1a6447d05a7afd2f11a155db5f6cbcefc5f80fccbf680c SHA512 c84b7c5dcb78101d6d04bea2a4453e2c47711133bf4ee1e96c6bea18a0b3de7c41021bfe5ac501eeb2b35d50bfe8782ee29d931adf79ae77a45a2f3b117716df
+DIST botocore-1.18.5.tar.gz 6852318 BLAKE2B 3aeca749a143cba59ce637935a711df14351444bdbc3c2c6133431700a9d0ca1d8fb878ee3561e34c223df4c91f3e7054abfd82b09469369610ad0f35de2ff22 SHA512 3ba448a45460ce746a01372ab8e37b2faed7529bdd1e17d9ce9d79545a3700231e36f9b00ba448dcd33f60734dedd5dc9851def843eff55a0c9ccf711ee06b35
+DIST botocore-1.18.6.tar.gz 6854270 BLAKE2B d5d8a321adde9c16706768633a8ed32d4db086ec2634dae8e2057c2217b2e729bfd02e2968a9749d660ded41c883ac153a80083256a27496b4b59013b57520e5 SHA512 d4c3f79f1531f85f2ab793bcdeb13f8f51c333e704f404415e49f50d310a715f752f19bc4bc7ce07c5b20f19c5924008f47146f737c318b9204d8a4af4f6fe8d
+DIST botocore-1.18.7.tar.gz 6854828 BLAKE2B d4b3095d29fea7157ca8b5499726886527941e04e0c2f274eba3573acc8a8c6ff26fd734f144335e03b9bb25c9fba128bb817a68178c284406a232c1d8881050 SHA512 c94ef62d4cc89317cb13fd96f5661de8ea3b1478c4dbce039d6e3b6af6ac4e58e3e5cf2d7d62c90e5b6b046303fc1e9273041640ae4907086591213ba3f79877
+DIST botocore-1.18.8.tar.gz 6865779 BLAKE2B 5b67b67deba73a0a69d4b413bfb105b3eeae5d62a38b0f109d172652270e490eed55b42c8a67c14039aec3f8f0b8b1d1dd9d6945bf9c86d1466bf69d4dc4237f SHA512 467b8ac3c3860777efbf37868add24fc56eecf65003c03692f45669e4ece965c129e18fe3ee0e1ed75b02c886f5762186572927c5e99b3eae85724d7443072d4
 EBUILD botocore-1.17.46.ebuild 1609 BLAKE2B fce27c888fa414b4121f897eb9745f7747f70ce1968a3552c2721baec6e8a11169ce366acda929565eb71192fb2698b4e2e48a7898e1daaaf60e69574b4dda1d SHA512 dab881e9279a7125f3c478608664b198d57bba5ddfc7f8710fd84f5b965a5414fbf931dd8e931a452f1a31f0d08bc9b8ac6915e561e9062e4df0eff19239f1b8
 EBUILD botocore-1.17.59.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
 EBUILD botocore-1.17.63.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
@@ -14,5 +19,10 @@ EBUILD botocore-1.18.0.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7b
 EBUILD botocore-1.18.1.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
 EBUILD botocore-1.18.2.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
 EBUILD botocore-1.18.3.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
+EBUILD botocore-1.18.4.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
+EBUILD botocore-1.18.5.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
+EBUILD botocore-1.18.6.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
+EBUILD botocore-1.18.7.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
+EBUILD botocore-1.18.8.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
 EBUILD botocore-9999.ebuild 1606 BLAKE2B 15b1624c806724dd4cf8f86099a4f9049214ab9c0afa47f0211c0a5f66fe37b6ecc03db5448bfb3b4764f8eda23e19ab9f37bbe1461837bf0dccfae7da17faa7 SHA512 b5e16cf97b370e96e814c413d80793684a1579d293bbaf16b435de83af274efb299dbe42fb824c955b28099c50841c46124c8212bd539861ff01b278e6a7ee3d
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.18.4.ebuild b/dev-python/botocore/botocore-1.18.4.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.18.5.ebuild b/dev-python/botocore/botocore-1.18.5.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.18.6.ebuild b/dev-python/botocore/botocore-1.18.6.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.18.7.ebuild b/dev-python/botocore/botocore-1.18.7.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.18.8.ebuild b/dev-python/botocore/botocore-1.18.8.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 84871d6f7e29..ee5458995bb3 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,3 @@
 DIST breathe-4.14.1.tar.gz 69369 BLAKE2B 93c394d7174aff8e8e8b1c95435d88c5f344ea1a26f46e9ef6ea8e7457bb9650d0cce96d03bc5c23e58704e3dcda3228ef1a61b16cd9ab45b07c2f1989eea88f SHA512 7247aae71c8e3e2491b76e6a5889fd9b97100e921e8c724c26e6c75b904c4e5dca825ae824b015f156960d5afbbf622b29535a46261c7fa0c24dd52deb46d096
-EBUILD breathe-4.14.1.ebuild 758 BLAKE2B fced61c688f9496422adb3267165824904c93b4959107d87a84d7368168e8ac124c4c927a6df2590cc059368c16fd9db2b6b6dcd862c859a3cd00d0c3c5dce2b SHA512 b693afa217365628e5606be195d1e96a44ed6522e9aeacc06674df15034524bb8f62a3164efeff9550b24ab2c21dad83c5d9be7cf4a638416f476665703fbf33
+EBUILD breathe-4.14.1.ebuild 764 BLAKE2B 7c4fe46495538c0a713d5dafb3a8cd71a9f1d8b5f84fdc54e6e76bb14de2b6cb6ff54b66403e8b4a971698990b2aa866041f7ce90582e90c54e729c6800ee5e8 SHA512 1235f63ff79f275a403478bdcad3ee8723d4ebbd274bcf1545b489fbfc4174ef4f7b2cc76020038933397a0a53d9e65f3d82350b4a5b6cba0ba29d49747b3ba3
 MISC metadata.xml 796 BLAKE2B 5f7541beb0113e83fb387eadfbbefea4bfe9d6a172c61fd60a2de473ec9e61f1a941d768350526de1464ff0ebbc58dabf13e7be3e38cac1d3a3cbcd791260d40 SHA512 734fa318039a2831c3cd35fa9f710739406b627f1e0f1d34c772d1d9dae53ea6921c21a236cabf00e3a1d3d2e95f053ea39436b1f539d9fa0c2bf1abbaf9018f
diff --git a/dev-python/breathe/breathe-4.14.1.ebuild b/dev-python/breathe/breathe-4.14.1.ebuild
index a9bf669f7e1b..9f9c21dc8aa4 100644
--- a/dev-python/breathe/breathe-4.14.1.ebuild
+++ b/dev-python/breathe/breathe-4.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/capturer/Manifest b/dev-python/capturer/Manifest
index f5ccecb52013..051580dd2b98 100644
--- a/dev-python/capturer/Manifest
+++ b/dev-python/capturer/Manifest
@@ -1,3 +1,5 @@
 DIST capturer-2.4.tar.gz 16963 BLAKE2B 329e388059a033993cf2ac3744a8df273beea0239f3696d19aece57767b0b5cd3397fa095f860c4f00ef24e8cd6bf2e58aab4158a86cf8c0c09c89d2065de0da SHA512 d85614b0424ab8817df9475ac0d230d7151289a3353a3c043a7fa89dac0528265a4dee535cac9ad0a3c2fbb0cac18afa69cd0a405b1becab55f9a6be13df0c46
+DIST capturer-3.0.tar.gz 18146 BLAKE2B 345313fa9e58c4e0121c795bd99606f99e46459215ed239da56586da8f8ffab35d97f0bf655258abe9cc45d4abaf7cb0ad2e76054d8c1781be2531ca01b04381 SHA512 3c83c0eade27380304347bdc93df392b2cb84c084e50693993dcca5fd572b8f92d31de43b4a2ddd0a0e8c7eb097629127e86a4860918c507d13b0e2979a04098
 EBUILD capturer-2.4.ebuild 738 BLAKE2B 2755052a169fe6c3f5c2741198c5f44f538bdbdadb2f6ee9ebc8cfb92813afe684ddaf12d7b2c61f4eb677b52a655c4df65cb687ede328b8cf3e3a3a53ff450e SHA512 14fbd0716ae21a0685c38fc7d520cf1c1bd90698f81c59cee7e53b4b9f65beb0c76a60a131c7bd9a0063ff50525519abc6172c9d100ce46a36242342d2fc074b
+EBUILD capturer-3.0.ebuild 717 BLAKE2B d5ba8786a9d0cfb7fc5c0d4407a283ee550ff252844338865aa34ffa266875e84940cde3f26a65eee836a77e485ae6100e779488f49bfc11de12d1275259c356 SHA512 1fe27fbc52b7513c1c384f1de4114feb9517cbd028de0e77ee0a1e1d54434ef68de9071ff728c34633255dcd4044fbe59494772b6028b261e962d707df63c8b4
 MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
diff --git a/dev-python/capturer/capturer-3.0.ebuild b/dev-python/capturer/capturer-3.0.ebuild
new file mode 100644
index 000000000000..871d5abc7b60
--- /dev/null
+++ b/dev-python/capturer/capturer-3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily capture stdout/stderr of the current process and subprocesses"
+HOMEPAGE="https://capturer.readthedocs.io/en/latest/
+	https://pypi.org/project/capturer/
+	https://github.com/xolox/python-capturer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/humanfriendly[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv ${PN}/tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 86c735effeee..41baf4e178b6 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,7 +1,7 @@
 AUX catkin_prefix2.patch 1741 BLAKE2B 31884cff0d6150e458fd76fadff86e16f0d76d73c2422c2a5c02ae45a8494de939e141a1eca5caf0e3de37b12e1456ff7a83eb2fc550f2b5f5b25a204db6d51c SHA512 e6a04b6d53676acb3f9f20ce76040a4b2ed9da72bd32fd7d27419d0602ce9c05826128af055f1f498e1e3299525e665a4af1987ba9eec6889f6d7ed493dd813b
 AUX infinite_loop4.patch 1327 BLAKE2B 609c67413dcd65db3961d0c96066d6921cc909ca1aab4c253c83045ae6792dc5420c516c53f354d64aa45389f99c50e7ba34db6ccc7d00845444e409804f3dfa SHA512 7ef9d36aaa9fe88fc8f3ce60c233e4ad92facd04dfe9bfbfd496d96659f2e977702e6cb0ce5ec1654cfc8773b91b5e5ee83ac6634599c30b015c1c40c6564e9e
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
-DIST catkin_pkg-0.4.22-gh.tar.gz 64407 BLAKE2B cbcc9b766b8fcde05a89b41d6797c02e12b65ee4518b37e31d120aa2cc43d5b7d588ca668ae0bbe2a2b10ae2883aaf8e3414449292af7ea8ba01d05e649e402e SHA512 e7119dde7fc70503d8b8cedf505d93aef719039a836186738d017500f8d53cbd73ae4f017cb8d86cc007978066e6471b971039387a07e2eb3c6894569a30946b
-EBUILD catkin_pkg-0.4.22-r1.ebuild 1259 BLAKE2B 95e5898ddec6dd48da319da21d715187fc81218a010d607a94e964964ed70722c428f96d93a9c85f972968977a3977dc956204841e07b996e06ad94e28c91431 SHA512 d8e4d1d73121396e56056e4baacb70e2dc87f6a51a2bc9d2d749e916c07a8223dad2682a9d743b859e96d1c61ccca4657c2b4d5ea381c9b1381a0ceaa6a61fca
-EBUILD catkin_pkg-9999.ebuild 1259 BLAKE2B 95e5898ddec6dd48da319da21d715187fc81218a010d607a94e964964ed70722c428f96d93a9c85f972968977a3977dc956204841e07b996e06ad94e28c91431 SHA512 d8e4d1d73121396e56056e4baacb70e2dc87f6a51a2bc9d2d749e916c07a8223dad2682a9d743b859e96d1c61ccca4657c2b4d5ea381c9b1381a0ceaa6a61fca
+DIST catkin_pkg-0.4.23-gh.tar.gz 64677 BLAKE2B 7bdd6e748561fd7e1193bdc85373e621bba0f1f80452c85c9d90d3b7cf758a83596376dae841b0ccac56a4ba7732111d464a47bc50cf4d9f29fb607f00ec66d7 SHA512 f388eb9ae588dc3a7b69d20fdba127081c9bfa24f7d5d01fee4cac7b57cfb05beb342a23e96052d4952dcb16be87495a9514edae57ea9d7c9742dce9a8a99dee
+EBUILD catkin_pkg-0.4.23.ebuild 1292 BLAKE2B 0b65dd1e6f75c604f31b1099add252b2e305de1288ea9f6e2ab9f51a6c277a33b0b617a86754a0ef914d8437520f7138dd0fd30030c17fbeb4370d4ffc2dda34 SHA512 d9c1075d1440404b96002130033f72d5b7b07b812182da8b0249582eaa04f560401bbdc9a3290bc9b9c41f14c47f3db1d655054ac42871efc4e7dec443d3f560
+EBUILD catkin_pkg-9999.ebuild 1292 BLAKE2B 0b65dd1e6f75c604f31b1099add252b2e305de1288ea9f6e2ab9f51a6c277a33b0b617a86754a0ef914d8437520f7138dd0fd30030c17fbeb4370d4ffc2dda34 SHA512 d9c1075d1440404b96002130033f72d5b7b07b812182da8b0249582eaa04f560401bbdc9a3290bc9b9c41f14c47f3db1d655054ac42871efc4e7dec443d3f560
 MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild
deleted file mode 100644
index 53b5bb90f674..000000000000
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the catkin package system"
-HOMEPAGE="https://wiki.ros.org/catkin_pkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND} ${BDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${RDEPEND}
-	!<dev-util/catkin-0.7.14"
-PATCHES=(
-	"${FILESDIR}/catkin_prefix2.patch"
-	"${FILESDIR}/ros_packages.patch"
-	"${FILESDIR}/infinite_loop4.patch"
-)
-
-python_test() {
-	nosetests -s --tests test || die
-}
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild
new file mode 100644
index 000000000000..db0d224232a4
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="https://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND} ${BDEPEND}
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${RDEPEND}
+	!<dev-util/catkin-0.7.14"
+PATCHES=(
+	"${FILESDIR}/catkin_prefix2.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop4.patch"
+)
+
+python_test() {
+	nosetests -s --tests test || die
+}
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index 53b5bb90f674..db0d224232a4 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 28ecbb506b29..5502a35252ec 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,3 +1,4 @@
 DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c
+EBUILD certifi-10001-r1.ebuild 938 BLAKE2B 9eaabb0e1d9286b69fa318a8bfd051f146e1bdb585dd4de9f1c5ba5a6b4bcbc73cbc22bf37d4f8b0b75aeae69d5ad6e1ef18986880a14150ecbbb8a2e30f1aac SHA512 802ef5073c00a7edfccf882d3d7046ede2772a4521046c51ab8597ae99449a21cffc9bd1780923df9b88f528687413468a039d7264ea4819925f0ebc904a81fa
 EBUILD certifi-10001.ebuild 948 BLAKE2B 96903071c2d78f4fa556b36c8f2e367adc1e24face20abe6e4e872dfd94f17ebce210bb30defd61aab1b3f9937bf350c06a1f83214e83a4b6c989a436c9c9801 SHA512 84892fb0678dd12aecde7aef383d23996bea4aac62aca46bb71a4c10597e1f81391a3fce66ecbde94ce5706b549eba4b3c4e96929f521519b9dc5fdc211ddb20
 MISC metadata.xml 345 BLAKE2B 5cf437570a10505d4c41abd959ebea978c42c94d48bc28c83f6d8d707e71941ac74d6a9c11d95ff498eb0b1f6299ddc2d458da4cd1bb260c9854ed8e13d53e3e SHA512 27e9fe335402d355adbdad8adc1267903e8eed49a535cf00858b01f8ed05a07511038cdeb6841641d934b0fc5c8649d344dec7e2a5fade97d0b7fa38858cbae9
diff --git a/dev-python/certifi/certifi-10001-r1.ebuild b/dev-python/certifi/certifi-10001-r1.ebuild
new file mode 100644
index 000000000000..9a81b8332522
--- /dev/null
+++ b/dev-python/certifi/certifi-10001-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_P=certifi-shim-${PV}
+DESCRIPTION="Thin replacement for certifi using system certificate store"
+HOMEPAGE="
+	https://github.com/mgorny/certifi-shim
+	https://pypi.org/project/certifi"
+SRC_URI="
+	https://github.com/mgorny/certifi-shim/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
+
+RDEPEND="app-misc/ca-certificates"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -i -e "s^/etc^${EPREFIX}/etc^" certifi/core.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 947eedbfe831..0c2ea3fd22f2 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -3,8 +3,10 @@ DIST cfn-python-lint-0.30.1.tar.gz 4137425 BLAKE2B dd4f7d449236e567e7ea0fa662cbe
 DIST cfn-python-lint-0.35.1.tar.gz 4501826 BLAKE2B 84da0965fc198ce7b8f955a7d43f9a1c87c9688c301594abe6843509a832b4c9c5fadad1f75ac1c5b20ce2179244fd2b9681f5a92a1dbe38738a61c94f95982a SHA512 6d277048bbd7d8950ef7681c4a31cb82ccc231fb29f5083169caef69bfa4464cd87e473f40c775d798ff511a5db1dff9a17b0c08dcc800db0188e1e84990c9e4
 DIST cfn-python-lint-0.36.0.tar.gz 4879599 BLAKE2B a79a12290e20f4db1e45b29df0486d3b69f3c028f35cae8e8ba9ab5da191c1a5f7fed6bc339d24e3212faab7a05a82e859a79135847eb90b0161fe0aa7b8c995 SHA512 286c8e614ee083981105a74f09b4c75454ae6eef48812ac59852374bea5dfc0d111b006bb67c50e42fa2a1eeb54ce6f25b8bf0f06624da236344e9bbadf4ce1c
 DIST cfn-python-lint-0.36.1.tar.gz 4963743 BLAKE2B 31efc227bf2b5aafff0365d0ca949e4007684dd896e6e8a75afb692a260e05f6b134b9cc822855c99edec7398a1cdd767a71557ef7178ff9054c4e737a5a5ec5 SHA512 4682b7a010875df2322856e9a01aa547fcce171c5bb7531ee35d92bcf0cfc523f78b4180fcc6a6c4a1460d5b517e834ce0e0026fa6c2f6afb9ebf3b3c46434bd
+DIST cfn-python-lint-0.37.0.tar.gz 4990073 BLAKE2B 447e7685f5ae7d4a610512729d2ecda48f4838f2b2f22ae80cdfef53d52cd929953014f2f2779ca7d340ed88287bf6b4f221e3be3b69b10335fb6716104f44ca SHA512 4ef0763c0995baf196098aa1499b22400cf5fd44f1f519d391314c6e199091a22b2179d1b1cabae6cddc27a85673c294fc65c02b92d864a9546ceb5c42264590
 EBUILD cfn-python-lint-0.30.1.ebuild 1147 BLAKE2B 2f23485ac84f0911d2e403928924f0a96198aa863c712103c68295aa02f662d51e5c59d51883f9753159177f5b05dd47966489ce537e9cc8aca9de0cd5a75f56 SHA512 ae3c1238893d5d4d7ba86a6fb749aa407f0597f8ec2a59c8b455392105b45de8400ae133df8025d5b04a8b3a1b8edfa3ee30e2999c718107555a185e1e595077
 EBUILD cfn-python-lint-0.35.1.ebuild 1234 BLAKE2B 1a88241ea6c30d155790ebe1a599c184b8746b55c70021885549c8d10228f77052b564d2a8f0768746326db784c163bcffe52b108a5db442d4ddac366cbfb40e SHA512 8759e70f66de52b3ca3890e585ee8ffae47e966e5b28a72f078317edd8b87f0559ae862b3f10ef75950a1932907946ec14aaad0765df7d41e423e3a26fee7341
 EBUILD cfn-python-lint-0.36.0.ebuild 1234 BLAKE2B 1a88241ea6c30d155790ebe1a599c184b8746b55c70021885549c8d10228f77052b564d2a8f0768746326db784c163bcffe52b108a5db442d4ddac366cbfb40e SHA512 8759e70f66de52b3ca3890e585ee8ffae47e966e5b28a72f078317edd8b87f0559ae862b3f10ef75950a1932907946ec14aaad0765df7d41e423e3a26fee7341
 EBUILD cfn-python-lint-0.36.1.ebuild 1234 BLAKE2B 1a88241ea6c30d155790ebe1a599c184b8746b55c70021885549c8d10228f77052b564d2a8f0768746326db784c163bcffe52b108a5db442d4ddac366cbfb40e SHA512 8759e70f66de52b3ca3890e585ee8ffae47e966e5b28a72f078317edd8b87f0559ae862b3f10ef75950a1932907946ec14aaad0765df7d41e423e3a26fee7341
+EBUILD cfn-python-lint-0.37.0.ebuild 1234 BLAKE2B 1a88241ea6c30d155790ebe1a599c184b8746b55c70021885549c8d10228f77052b564d2a8f0768746326db784c163bcffe52b108a5db442d4ddac366cbfb40e SHA512 8759e70f66de52b3ca3890e585ee8ffae47e966e5b28a72f078317edd8b87f0559ae862b3f10ef75950a1932907946ec14aaad0765df7d41e423e3a26fee7341
 MISC metadata.xml 572 BLAKE2B e7e0e4631f4ec0e9b668f664607b89790edcaeea43c2da8b9cde1e9671eb5c18221d61d8981b1f23773b6d0582883d879b70d1850bfb4ab8a7bbfad60456b286 SHA512 6677b1994867314be92d0a95e2115102d8ef87f4137ac26d488957ca7d34e77cc618a308c8fb648405f28eecd872c8965dda5f042d410d5084c3dc38d54994ac
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.37.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.37.0.ebuild
new file mode 100644
index 000000000000..09f91de4ad66
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.37.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" -m unittest discover -v ||
+		die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 9c4e02ded827..a32eee48c417 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-python-10.0.0.ebuild 924 BLAKE2B d160ab3d5b4b57df192aebc214061fcadd11233a7fd97480124797bc52da0f3026be74021c127b68eba8e5e3db0e9d523e20e36537fbee3fc19ae606b48a5858 SHA512 862f0822b486311c4ffec46db51030d707c43a21d69ea22b5eafbedf004679805371b2d453d0bfe9939818d2f7d9658170bb7799e601f6974f3621df03b5bc12
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B b96dbdf62c22c703a871c8d00971976f1f856dd81bcaf34859bbb0f4de72f74a459331d732fcd6cf9afe0913815573459a1db933e10091f5c99cb8b8d23be1a1 SHA512 f033ff3e59044f45926ce86a594226eaee03b76ad5ea7b9ca390cafb619d01416370005fc947f2b643072b2fd6d6d700f5ba0cd686fa10fadb6816fe56c6dffd
 EBUILD clang-python-11.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-11.0.0_rc3.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
+EBUILD clang-python-11.0.0_rc4.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-12.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-9.0.1.ebuild 924 BLAKE2B 8a666866e1c2fa2806c29ae6c6787cee7dd7bbb33ac8d2d99e9072d13f8fd0b1a98388de9f655b9f26bc43085269af402592d62c29dd1ff3f2e1564c2e8a4c39 SHA512 c0c164894497d871a3016ec8dc19e09142f5f77d194dfe27d9ad12043daf22df7abaacefaa2294e7355aab2d45fe7f578e80ff7df87af6dcc0c75e8128f885ca
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-11.0.0_rc4.ebuild b/dev-python/clang-python/clang-python-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..6d7cb294e651
--- /dev/null
+++ b/dev-python/clang-python/clang-python-11.0.0_rc4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# 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}"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -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/cliff/Manifest b/dev-python/cliff/Manifest
index 14e0b3154cc3..93e301190fc1 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1,3 @@
 DIST cliff-3.4.0.tar.gz 78990 BLAKE2B d7d8209e2fe24614cde6d3e113eb0dbbba981addef045fe318143e71f9a240188c0fb74e831d868b31b6dafb4289f7beabfbb5fe1dade1df196f670c53a55549 SHA512 d625588f4eed0aeee549b4a21e604f1cb886b8c10a12df7c546a5292223ec5bf9067352b4d326d5710673dab56eec47e2fb46c9c5d5df6e9fbf026d030bcde1c
-EBUILD cliff-3.4.0.ebuild 1030 BLAKE2B a3d63fa28dd726341baf4548e86833fc8e76c47cb0505216b0cdde38c1a67832269baede6b7f011e60bc1bd5277e35686361658f3b06c4bd317ced86031c86f1 SHA512 6f216271a4840acc7806adeb9bfbba75a9663712c88f1f9d888ca86918432b05d7826009eaa47417e281abe2a1551005615504ed4773006f89b4203ac5e94673
+EBUILD cliff-3.4.0.ebuild 1180 BLAKE2B f93fbf092f3a261d13b66c6b63b6df4cc695d755027c8d3e4b0414834a4223a71176d4f086aa79d97765932de78809e53adcca2025a943e7f54bc69f571cccdd SHA512 1665f0121a8ac9b984088682182402ab40fdc6a134c8509763ea19c97fab03910857713c74a250d977bfc0931c74d673abea40fd5d6e0e6ae700d8f7b7e95bb7
 MISC metadata.xml 734 BLAKE2B cdfc9f839d8dd599e27c78314ca5688d94dc52b3128d0aca7c6ff11d8b7f5f9de9d2d43f6690543d8e44b8483899d0cc21ef7273dbbdbeca0b498b2a593279a9 SHA512 6103b640d65a93bbd2cd9cf6ca6ae42a12a0fbfcdc26dd164494b777bc976d14d7e0bd94372b84ed30f7eab3e1acb54787671d90f165cbf6b0b160770cdbcfff
diff --git a/dev-python/cliff/cliff-3.4.0.ebuild b/dev-python/cliff/cliff-3.4.0.ebuild
index 97560bbb48ee..2cb3eca1cbe9 100644
--- a/dev-python/cliff/cliff-3.4.0.ebuild
+++ b/dev-python/cliff/cliff-3.4.0.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+# pkg_resources is used even though the QA check doesn't detect it
+DISTUTILS_USE_SETUPTOOLS=manual
 
 inherit distutils-r1
 
@@ -20,12 +21,15 @@ RDEPEND="
 	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
 	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
 "
-BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index d8c17974828f..33ca905a534f 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1,4 +1,7 @@
 AUX coloredlogs-10.0-skip-sandbox-violation-tests.patch 5312 BLAKE2B bb7ac55706ca89a16d7727d796e586a665730d25f1cb69aa833b24082e42f0f5aed3a5d4f627e2015bb189ea3422ab1bcc2982933a7a123990adf821a7a2fdc2 SHA512 071ac2255ce9e6e4e379065ce377e86c3ebc9e910951d647cd19e15431983cb966eba7e1bb2a2431ecb91aa09f3802a5e365683a2e545e0e5fb2d58432748bfc
+AUX coloredlogs-14.0-fix-install-prefix.patch 1474 BLAKE2B fbd2751c0a4f0f7a412428839b5bd8891b863f609d0c890887b85737d7cce9480ccbd2c4c6bb4e6e600b5ef850c065862ce7867b352f41e262022e21841cf1a1 SHA512 50063a6c14d1d4baf76d6409fc9776ec366500f7fa9b1b9e1270dac456b174b015b907f067c5641d4e74b75abc62ca4cdc641e55af88216101ddc4916198f1c5
 DIST coloredlogs-10.0.tar.gz 273273 BLAKE2B 775b12718d780da396d74c7f960cdbbd4858c793bf3eefb53d29e9f6b415f682110ae2c7ac631be230578946a2fab8d75e0c3aa487ccd952bb05443f0a85700c SHA512 f4a51fd8fa92ea4e2ef0b58305dcc4bbe12851e722fc85cfd4f48a9388002efced52bcf027f6dc4c525b095f3f953970e73928fdce3245ab4f9d13ae36b9d498
+DIST coloredlogs-14.0.tar.gz 275863 BLAKE2B 0a8c026220955397378ad2b43a69c89c5710a09e2d9ed81a3f25408c60e171f4b8f78239696a0bc1b51fc3dd9bfca80df63e1f1d7afb6bee0046209a089e0d6d SHA512 3434a95f3216d19af5d7a48324e5afd5e975f92d9f6b99f40df2c0a635f1738e0bc6d7277a549a42a0fec5a8601f82908c4b0205ceeb3666f49210f66fe58671
 EBUILD coloredlogs-10.0.ebuild 973 BLAKE2B 4b4a9a736ee0a943b153b62e5b83c380f16c251bdb00be5bcb546a044c22f4d0c2978bda0b7835095daadcb389f189da0ebe074fe787e99bca319082690d67a2 SHA512 781543a8f486c50554f1270d18ff5c393396dcbd94608c17a75ee8d2ba0aafc95b539df42ffcd1bbe018030996699495e5820da8dc48b41afb3009d5fa7f04c8
+EBUILD coloredlogs-14.0.ebuild 1209 BLAKE2B c320068753a8d5e7f7a1541f990a83ffde29a0469788f18fc10326f444a198595dadd34a11cff68408718071d82df2bcce2bfeaa4d1921105117f85cd61e2c22 SHA512 f77a452c0fcf8437721c4abd4279e329450ddeec312beff16fe0503d7ec405446e45114bec79eb5aff109670015cc8a00ec82f8aebf500b18d73bc9e0b3f8ab3
 MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
diff --git a/dev-python/coloredlogs/coloredlogs-14.0.ebuild b/dev-python/coloredlogs/coloredlogs-14.0.ebuild
new file mode 100644
index 000000000000..89c3d911e9f4
--- /dev/null
+++ b/dev-python/coloredlogs/coloredlogs-14.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Colored stream handler for the logging module"
+HOMEPAGE="
+	https://pypi.org/project/coloredlogs/
+	https://github.com/xolox/python-coloredlogs
+	https://coloredlogs.readthedocs.io/en/latest/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/humanfriendly[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/verboselogs[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-install-prefix.patch" )
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	# test_cli_conversion requires the package to be installed
+	distutils_install_for_testing
+	# test_auto_install fails because the pth file isn't being loaded
+	pytest -vv ${PN}/tests.py \
+		--deselect ${PN}/tests.py::ColoredLogsTestCase::test_auto_install \
+		|| die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/coloredlogs/files/coloredlogs-14.0-fix-install-prefix.patch b/dev-python/coloredlogs/files/coloredlogs-14.0-fix-install-prefix.patch
new file mode 100644
index 000000000000..d6b60c3bdf57
--- /dev/null
+++ b/dev-python/coloredlogs/files/coloredlogs-14.0-fix-install-prefix.patch
@@ -0,0 +1,35 @@
+commit 6f566c799323feb3b8dc2b82e62953040a6a5129
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date:   Sat Sep 26 10:30:37 2020 +0200
+
+    setup.py: use absolute paths for pth files
+    
+    On some systems (such as PyPy3 on Gentoo), distutils' `data` path is not
+    `sys.prefix`, which means that we cannot rely on relative paths.
+
+diff --git a/setup.py b/setup.py
+index 057dd80..7674adc 100755
+--- a/setup.py
++++ b/setup.py
+@@ -66,9 +66,9 @@ def find_pth_directory():
+     Determine the correct directory pathname for installing ``*.pth`` files.
+ 
+     To install a ``*.pth`` file using a source distribution archive (created
+-    when ``python setup.py sdist`` is called) the relative directory pathname
+-    ``lib/pythonX.Y/site-packages`` needs to be passed to the ``data_files``
+-    option to ``setup()``.
++    when ``python setup.py sdist`` is called) the directory pathname
++    ``/usr/lib/pythonX.Y/site-packages`` needs to be passed to the ``data_files``
++    option of ``setup()``.
+ 
+     Unfortunately this breaks universal wheel archives (created when ``python
+     setup.py bdist_wheel --universal`` is called) because a specific Python
+@@ -81,7 +81,7 @@ def find_pth_directory():
+     directory without hard coding its location.
+     """
+     return ('/' if 'bdist_wheel' in sys.argv
+-            else os.path.relpath(distutils.sysconfig.get_python_lib(), sys.prefix))
++            else distutils.sysconfig.get_python_lib())
+ 
+ 
+ setup(name='coloredlogs',
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 3ed734be4beb..cb074ea8e41a 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,3 +1,3 @@
 DIST construct-2.10.56.tar.gz 1184110 BLAKE2B 01ce1800970826ae3584a9733de171e04dd926e7d19d8b48b4364406b4aa0f4d878ec52f9a7f755bb249aeeaca75ae6221d6bdf302d4342d4974d268b1782175 SHA512 cc9aa126c26a017a3fb7b78a6b8f2056194028a44c8ed615a6dc4a445d50f0463e2de0b80810ab5a252070925a56b5a61dbb601a3de9e445d861356231a146d5
-EBUILD construct-2.10.56.ebuild 954 BLAKE2B b40292d9336f1d2f47f253c09fe05952b4f5465fc8d7e5a6dad03488394ab4af172f44687030bc78d4ba591f49d14de2cad8bad3c3411f880588686d698fad7d SHA512 59ea367dc6a210f74ea84d918c33e873450f3d5d6869f91eca0472fc5aef0f5c448c1848319079fab9c19ac50b4248440bce528b376c2b5a9af40f4f6d5942d3
+EBUILD construct-2.10.56.ebuild 958 BLAKE2B e37950c42f3d91be6888f25f5ad22513aaf9c509536c022c1343f9278b004d08b66c3b2a1af71f10555787809e60e40bba191c35d44ff67e285c8e553f0ca3f0 SHA512 cdd17099299c635799ef650e7c96b146363576ce4b6cfc9c009c156ffb1c628a17ba19c1e77ec84a39d89d2ad51c7792dafba29afe377f353f5d5aafd72e2571
 MISC metadata.xml 491 BLAKE2B bf8f7729988a0a4c39c9f8081a4b05560d1596a69c8670e378ea1f1f81b8dd5a2c366e8211c36e07f809378c6ae769b01181a4ceaf3f82ec8eb2b1879d874a87 SHA512 a8a85937bda8fb36a51bd6e0c0bcb1ce721073ee07a8e198c88b64ee484e8fd1c813e937443885e5ea2e532cda3971e8eb59385797a7a8f44ec9524a57acbbf9
diff --git a/dev-python/construct/construct-2.10.56.ebuild b/dev-python/construct/construct-2.10.56.ebuild
index 3a485cc76365..b7ceabb00f5c 100644
--- a/dev-python/construct/construct-2.10.56.ebuild
+++ b/dev-python/construct/construct-2.10.56.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index 8d2950cdc2e8..e9b75f2a5beb 100644
--- a/dev-python/cookies/Manifest
+++ b/dev-python/cookies/Manifest
@@ -1,5 +1,5 @@
 AUX cookies-2.2.1-fix-warnings.patch 9038 BLAKE2B 78692c413a2a5495dc43c544cbc27410a341088c8ffc8cfb8543ef0a6f7e7393ae37379912dada2cf0e4ce8b238160244305869a12629ede435dfcb6df334910 SHA512 cc18c782d07bda0518a1d0824281ac068bc97684abc505ba24bc895e6f43f70bc16835c9781ffada42175ac2cb9dde7a200b0746910e7106c3b41e8a9a0cb382
 AUX cookies-2.2.1-tests.patch 1131 BLAKE2B c98b40cab2a20b5779e670bfb481f34abaa080d0780a76127f12783f0fd108b67c590d01304f2f173ab5808fd8f9ad7ef65d0227a1f31eac4296302b7610ea81 SHA512 ff571d810ca576a9dbcea1960056ed05ceaf738148324d434409b03cf399d43ecb5b13fe228da54465d020c6cabe109a447f1a04a37d1276feaf5be6cf38eea9
 DIST cookies-2.2.1.tar.gz 40704 BLAKE2B 422d70f15e93193ac9c4865f988b22a895a81c59ae98a86cb90289940c283f3998a7e1d3b7ecc0a4f4b004d6b4b64de6743cae7a10f45d9bd1e6136ff35518c0 SHA512 76f362a9a1d74b87c90c5b91ad806d872612d31f487e4067a627409316f6099602c9e5a429f85ce20adcb0a7b63dd131b9e1ecc5c0c6444d1569367432a719de
-EBUILD cookies-2.2.1-r1.ebuild 637 BLAKE2B c7967bf95252babc407f9bfa2aa42ec82c0d3cfc99080a3e0958875f0e481e78b8831421a9f9ebae24356f41a9f22d221d2878332e2f0ce3195845d97b9c6c3b SHA512 a65c3099511e792ab40ffd90f09fcf890a0103de4be48868f24894ac6a3239b18a76866962e297ea474258078e58a75f152dd814dc81d60a7b39fc4c4d510812
+EBUILD cookies-2.2.1-r1.ebuild 651 BLAKE2B 1762d12bbd783e9c382774286866ede3a5a363637a7c14b8e18d6b8a71ec84babed9f21f459db5d4118093bdaf04ccc920cc2c423f7009458eb211418300f6ac SHA512 5eeb2c07ef9acad56945b40abe8510103882a6a26b6ee3cf6a0f2ead122415507834c5d3183c63c393ab8432dc127d4b24dc908fbf84986f2fa8a39fb98ba9d4
 MISC metadata.xml 310 BLAKE2B 3f44f9692738692ca4eff801de2fa67bf33220d8b5a94985dcf33c21d1b18b78f6dc8f13bdc42b4edb4afa96a869583c6caa0643190ec68a24c57852c4212d8b SHA512 b98da30bc8b8f3deb352a59ca73a88a9640cadbc20b3049523930f6e671cd057d19b4dbd559702efdac09ba1ed238b7df95502e9203f1d34147fdea5a308c82b
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index 29ba466fc16c..0f5a2fce13ed 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	# https://gitlab.com/sashahart/cookies/merge_requests/2
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index 7dbc9523f5bc..50732e8c975b 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect-1.1.0.tar.gz 35516 BLAKE2B b4480ad4335ba15ae8a2ae758ff942865a5b61de68b3b00fb59d517b1dacfce1cd817280e4aac562dbf829f90601a56220f01d99aecbc502420b9102e50c46ca SHA512 b33bca6a026f4de37b75606fd238dbd170b57d06288fbff3ea97ce79685a99af275fb8522b04ea9d6693aba5a18541d70b657191fdad881be79718bcf2e7655c
-EBUILD cssselect-1.1.0.ebuild 763 BLAKE2B 4215a4a6e6d2d1d20a3ac55393b79991d70481cdbd888ed05c4da507e08a8471ed6c4dd0d676734c15a89c2597e032a714bbece63ea3410667434ae2dd2a4b1b SHA512 3e1980db8c2e76f9baef63626699a8bd0cc5fd06128b703e6d2b5ba4f3a848ba8a9eca9013bb29baa896b7f00cb875ab73ccfac0f7961ad81f8ab2a3172a84be
+EBUILD cssselect-1.1.0-r1.ebuild 757 BLAKE2B ca2a2d3733533ba23a30124ac7620a7bcb0996b911b192dd7c0de92ae970c464519cbda678c4c725ce6a95cbc1585408971cd84cfcddccb526bce1d9700d5a21 SHA512 43b53ec5e489547272fe4842618edb184987d083c8e82ef64df1459d304a320bcf0a674fe4b3ca71f6a7ef9a16d03c51c950f497ff54c29d2d6f5a1affde1ab0
 MISC metadata.xml 322 BLAKE2B 2ec56f6e5522f780aef1a27df29af54f7169cedf727e4698c0c3764002501a06e52db5a94901d795d75f792ae2e8eb7d82625f88e2069453c2ff4190352aa7c9 SHA512 9933f17432e27a6a708ad4c9ec1e5f65197c4c0048fe2deadf3ba66d878f98510e150dfdb83cf935294a529e505b261808b33503f5d6acb622ae1821e065d798
diff --git a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..9888e40d1b39
--- /dev/null
+++ b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
+HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
+	https://pypi.org/project/cssselect/
+	https://github.com/scrapy/cssselect"
+SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs
+distutils_enable_tests unittest
diff --git a/dev-python/cssselect/cssselect-1.1.0.ebuild b/dev-python/cssselect/cssselect-1.1.0.ebuild
deleted file mode 100644
index f456cadc5c7a..000000000000
--- a/dev-python/cssselect/cssselect-1.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
-	https://pypi.org/project/cssselect/
-	https://github.com/scrapy/cssselect"
-SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
index 24acfa798877..8b00631f4d94 100644
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect2-0.3.0.tar.gz 29534 BLAKE2B d7426d72c52ab2cbdbadfb935b3d4f1f23cbc960c94d6691a8f97c9935e0c8d6212e9e2c1c5b00df6fd450216a3deb2c7308c032821f9ef7fbb4d488a7728c8f SHA512 ae59314654d1c1ddf982b77521de7743d1496145a1367f51e02b6067d6757940e7ccb50b67959630f472972473a1e87cec8dfbc8eeb68ad5f16465a36b1447be
-EBUILD cssselect2-0.3.0.ebuild 712 BLAKE2B b9780a9fe36d9634c6e098a2a11ab4d3cea3c83178eae584883418d157bfbef302eeaee3546b52b7bb8884315c9642aca219b612cc4cdb81e863d01e8eec2c34 SHA512 23b388b635acdafe7f0e1f6749f64ac8a28b6e00ca2b52d844a4fe2a06afdf0d390faf428e31719a6a81f2a1182f58ea4110a1453205118fb4f0ec335a568901
+EBUILD cssselect2-0.3.0.ebuild 714 BLAKE2B 982bb2d99d8627720ebd8436f332e92265298eb8ea9ad99b63e0eb7c53e27d9a62a21e2a3a7aa14b64f97a96a993bcccc6c7c2cc5e9eacf9aa73be5adc791bff SHA512 0540e406fc5e79a16eb8b84823d86ebfbe62c3c8e2c3a4ae16198ba33cdf0f59b830d490a16f9895e7564d25c2caa620f3e604ae1a35e7de45621b12c28c7911
 MISC metadata.xml 323 BLAKE2B d7d2c7c44a6d77f88dbdcd8a0543282203a71e28f2b64f637d92d37cad737fa6e27d339d6d2c66fb96f83aead59794ef4da5fcabcfc51f1945c781b6c4295a89 SHA512 977631018db4c06abc89d7eeb92640e7a045c64fdc96ef9d69a4191a6e3e07f6ecea37c779b9fef2e01a433dfcb311e991b31fe4656119fd445154628789c005
diff --git a/dev-python/cssselect2/cssselect2-0.3.0.ebuild b/dev-python/cssselect2/cssselect2-0.3.0.ebuild
index addaa3168ba8..81ef567bdaf1 100644
--- a/dev-python/cssselect2/cssselect2-0.3.0.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.3.0.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
-	https://pypi.org/project/cssselect/
+HOMEPAGE="https://cssselect2.readthedocs.io/en/latest/
+	https://pypi.org/project/cssselect2/
 	https://github.com/Kozea/cssselect2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 351b8bb2acd0..8e88b0cb4340 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -6,5 +6,6 @@ DIST cython-0.29.20.gh.tar.gz 2087315 BLAKE2B c429dd2aec6c6dec0a3430ad8aefd17b62
 DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
 EBUILD cython-0.29.15.ebuild 1952 BLAKE2B 6369461078d2d1c3b33b47a05911bd019751f60fd1a4bf9df14302e0b699bfa3265d5449b9f1e669303958141a38d0afcba0b94fd1809b8e94fd99ff8eb930e5 SHA512 78559785f85582572c633f75eabdc54bca756461ac94c7aa7a2771862abda2c5c114d776edc0e6efdd04bf76a8136a132c627bc77b67282bff86ad703ca87dcb
 EBUILD cython-0.29.20-r2.ebuild 2007 BLAKE2B 5697ac1ac8003ed42aa63c72bca396bff005570be18f52b1a796a82dabfe0e684cd9f89c42f4268e995df24e6e25ac929c8af4543c87343ed95b62eb36f08bc0 SHA512 d40ac7f143feb16f357327be4d1d29771deb488f1dccf91d42eb1170bfe05631b83de35c74b713480c4533aa443a3c68663f595c99bbc4946bbbb54d15949b8d
+EBUILD cython-0.29.21-r1.ebuild 1812 BLAKE2B 24bc7484f50b8774fa9738f97afb777c21e7bdc83e20e34f4812e6279fd72ea4f12a805c98a28233dcdfd22a8f66ee8c266230524d7098fcf031fdf6bdaa81fa SHA512 3432f5e5ab4f7539184f98658163ad4adb6b5eec198c34762fb5e432c84b786c62b42568e3151937b9236f2bdffada419ac8c7355d1801fad2bc7f502805e908
 EBUILD cython-0.29.21.ebuild 1965 BLAKE2B bc1fe06112e8817406fbfebbe38628fb977d8c244888e9545ba1d2fc28ef7e5bbd2cfa47678c66462c74185518cfb6cb6eadb8ab6008ef014a45c070a20c8368 SHA512 e545e4ecd8e555934468ef92656038a4793fbb2a892d0b2c9ffa74411b2a62a6da2635d89a826a1bd51e4bd15f637e1736a6d4e94c09f5b7d6d66a350ca57e15
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.21-r1.ebuild b/dev-python/cython/cython-0.29.21-r1.ebuild
new file mode 100644
index 000000000000..0d37c4e33e83
--- /dev/null
+++ b/dev-python/cython/cython-0.29.21-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+	https://github.com/cython/cython"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			'python3*')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs
+
+python_compile() {
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index e0ab0f825a92..cce8cb1c9df5 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -2,8 +2,10 @@ DIST dask-2.23.0.tar.gz 2840133 BLAKE2B 2fe8e4007acf2bbd8bfab889e4d912a15518318d
 DIST dask-2.25.0.tar.gz 2842089 BLAKE2B 048a116a60dd98c7c1f3800426af13c2d8d116772a6b3133823b9a78ae6fcd34ab32dbfb9ae8db9eb6c948bce381e5d6e91caaab78203ae56159493ed7689038 SHA512 0d6e8e8c1efbaa4dc77e1a505e5c2df45eefc43868ce923ec674c5f768f12beb30e06c8712f621e44a826fc11f86fd50e60f0f6a78e261d74273f73b49503301
 DIST dask-2.26.0.tar.gz 2852574 BLAKE2B 66abba9ef32bee11249557e38eee7e60d2988f098904bd867e5e9ad110d735c1a3b3f10829c58fdca5400f078fc569822e7e73f0e9c6894dbbfa41b46d521f61 SHA512 07daf541570e9e30fcb97f607b9629761d14de58fcb4b89fd01f9688690af1b55b80e3e62eefc54942d47da5fcb9d3c4aa6bca0b76f4bf60e664054515e18fcb
 DIST dask-2.27.0.tar.gz 2852785 BLAKE2B 7be6704269f21891ed6a3289ee16827a1494591f7024d158e88001d4e10f263409e33f9c0e14e21ec8fed3d6798a6b011e8cfffec4659d6b07d2c4b31355c6a6 SHA512 afa7454e208cdfd482ff971aeda8db6364408661c1230c7e33fc05e63dfbe3e26e899415af0e4625a642dab15a29fce9c432d24d21e8a3bf7760f6ae304fc371
+DIST dask-2.28.0.tar.gz 2858331 BLAKE2B 9adbae83559a1a5a218aacb575ec6e4007cc0bcebf4f2ddac4a2bc23de2be74887ee41ff341c05e0e1612a42d4b3bd5d7ca072b58f7cbc9fa516d8c45f7f0ae2 SHA512 f36b1cc843b0ef7efdae0af1ffdc91ac251cfcbd63160379f479f55005b93e111818f782db2a7ecf8e6bbd63ea48661a178d1c2ca74473a4d477025bb955cbcd
 EBUILD dask-2.23.0.ebuild 1417 BLAKE2B 5d0c82471b9df5978841a9afd48a7a54b53e8f0c5c75a8f40f51c2c77f782b4fb9ce731a1bcb0e1dfeb0760638e57af355edfef1d961d2688a42dd5279ad6319 SHA512 13bd5850229a97bc512fcb4513ade5847ae0e7d93ad22d866cf941818861694596e04659fb32bc843ae417f31672ce2a319f96c82c304b05d75249aa8f2eab81
 EBUILD dask-2.25.0.ebuild 1185 BLAKE2B 8fa443f53041d790d94210aae2b3b8b87c5fcb9f59d68e0a8628485f24186e58d75cb60d4fc8143d90318fca1259f3367e787d48e05f4c731a32815526da0be5 SHA512 fe07f83b17e73d49a4d08b61d0b2e3eb238432556e97ddfcb8a6870d8c586e96ab4c72312bb68e550ef25f87aff2d234067e35f67ebf23b3de5282a3a30a99de
 EBUILD dask-2.26.0.ebuild 1221 BLAKE2B c180151bc29d71b4cce2cf55b32165d4fabeb4f64bb5d3836e1aced61d1999b8e48c9d49e5ca42e13e69f28293a31b9c8dc4b8d12d6c4bdf8ff33293004d17db SHA512 f22766a34191481f05542cd627f98a197a7b37f9ea669b2c08e75f17fbbd3181c22539347f66bac514bc41678e133d722e4051374794fac308aeb4894292be79
 EBUILD dask-2.27.0.ebuild 1221 BLAKE2B c180151bc29d71b4cce2cf55b32165d4fabeb4f64bb5d3836e1aced61d1999b8e48c9d49e5ca42e13e69f28293a31b9c8dc4b8d12d6c4bdf8ff33293004d17db SHA512 f22766a34191481f05542cd627f98a197a7b37f9ea669b2c08e75f17fbbd3181c22539347f66bac514bc41678e133d722e4051374794fac308aeb4894292be79
+EBUILD dask-2.28.0.ebuild 1166 BLAKE2B 198408df328fb2d8b8934e9582ad830921af9471ad1760ec33ef754c8d3fc52a859fb60e66fa9669fba5ed649b5cc6ef56ccc9df2360cc7848d8bd30f26b33ec SHA512 6c228d4357255315f06c80c3f1894d976d72c7d3a6c8758036c917ce6e19fffb6979e419ac442fb2d1bcf861597d0ccd1441edf4b4f75a88241bee321d3e084f
 MISC metadata.xml 763 BLAKE2B 110683c8d0066c5d55ae709f5025ad9bdd81d3e8e3f7bc39111eb55280a476b6f66fb274f3bb9676903423a6f7f604bb554db8929d7e12544b1882b36aec9d74 SHA512 7fc3a106e1cd073051be6ea7e48a39bff903c5fb43162ed24df4056c3b1ae481d59d16bd75cd441473ef75581d697ad1b8f9755c1282a8ad733a8fd72bb522eb
diff --git a/dev-python/dask/dask-2.28.0.ebuild b/dev-python/dask/dask-2.28.0.ebuild
new file mode 100644
index 000000000000..f0f21e67dc47
--- /dev/null
+++ b/dev-python/dask/dask-2.28.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.4[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv -m "not network" ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dataclasses/Manifest b/dev-python/dataclasses/Manifest
index 27a33ebc2246..c761d80daba6 100644
--- a/dev-python/dataclasses/Manifest
+++ b/dev-python/dataclasses/Manifest
@@ -1,3 +1,3 @@
 DIST dataclasses-0.7.tar.gz 35690 BLAKE2B 8d3c60d1e2ad4c9ceb3c502fa74f8fdae75717e52c698984b6def96e867cae633864de711856a69992df6a207617d17d7116f5e0daa7d757076dc8b97d7e0e9b SHA512 ff921237a99bac21e091ff253824eb07eb09be7e7ec02b869da9c68c35141fc1bee526b3d2942963bac7762827438ea8fdc89fa72404991b78d1d063a3c18661
-EBUILD dataclasses-0.7.ebuild 550 BLAKE2B 547bd291e9a0c39783cb005caab2cc9ae7470a059b61092d740ad937c53925b50f34d208b0a9b0c8d1645439f70c1ed4f9cb673a2fcd946ce8c613b726d0331f SHA512 22bc8eaab14eb62e397554010eb668f350b0dd3e21673abe7545610623e4d677f943734b417e8dac29cd555642034e7144343fb7533f2acddc7bff62144865e3
+EBUILD dataclasses-0.7.ebuild 557 BLAKE2B c7659b1f18e0c2af9026ddcce77e9f0f385a368f61266e1176a55ed839582e02a04a615f183f82bbfcc23f981b80e3e2d0968ce957171e11466283742fdbed25 SHA512 f68b196fa786dda9a6e100f80d218ca6042f29d427e474b4faf8481436c73fd15559546f79f6e559415eca9d0ee30a4421b942878229156d0c192591b39c5825
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/dataclasses/dataclasses-0.7.ebuild b/dev-python/dataclasses/dataclasses-0.7.ebuild
index 3abafb733cdc..e76e64feb12d 100644
--- a/dev-python/dataclasses/dataclasses-0.7.ebuild
+++ b/dev-python/dataclasses/dataclasses-0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 src_test() {
 	cd test || die
diff --git a/dev-python/deprecation/Manifest b/dev-python/deprecation/Manifest
index 36895e7db6a1..3671c3f9ae99 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,3 +1,3 @@
 DIST deprecation-2.1.0.tar.gz 173788 BLAKE2B 444c7ff688d6eab7dfcf58ad24580b5a6df39a5749341b28d6d5b9b516fd6aa7a462d7f644e6cba596bbf289be0224968f579837c6c71dbe7b36b65588da6eea SHA512 c184665d210c6eeb3f055b23e75c3714f3b18050e03bfe1384baf6c2504f1370116ae0e8c53ff818ccc54c0d633bbb3ba5791fe20b8029f3be0207b019a00275
-EBUILD deprecation-2.1.0.ebuild 597 BLAKE2B b46bb4afaf5550c7e8b6b67caba124b20e274d6f453d94ad8141abf8659180051f9c55d710e940aaab44bf296be8b0d3bfc5b450f3ec7d1a3e700256ec3ac688 SHA512 1b281307d41b75920ae0ce08a02da960a893bde443772ff3db83408ad762922d595caf571adee9c807304035a528913f0f379631d8b016ac81cadb9d25f5e3f4
+EBUILD deprecation-2.1.0.ebuild 603 BLAKE2B 48af348b1473137dbbafffa146d8c1e4f2c61fb46eb7dd7fa7818d6e846d6b72df6f47973536eec8a4c30de3130908b796f834b90e317fc249360e8b8320bd53 SHA512 022baaf19a098ef222f6699f5ae4a1f26aef31270ef0afe5c5f9d5341ea84faf3da5440e47a3b896d488aba0d0cd81e9263f3139d787e1431b1c63e415b0eb04
 MISC metadata.xml 565 BLAKE2B 007c1977dff6e93c49877fbd0a41e12f7b59e73b12dd8cbd0ee309860195ab560b9bbb3f52b861be6742d5e8f1b78564eb69f74cf53e121e7c9df2a2e58f0f8d SHA512 89374b3c32bbf7f35e585295cfd13c50019304f2620a4b8745b20f0e37b87abc04c7fa464b9277630a723a1a0d4a6a9460f85b87c902285ad4033519e6ad5120
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
index 3e560278b432..7b44faa014cc 100644
--- a/dev-python/deprecation/deprecation-2.1.0.ebuild
+++ b/dev-python/deprecation/deprecation-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index 6e03e351d25c..9d8fe821902e 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1,3 +1,5 @@
 DIST django-debug-toolbar-2.2.tar.gz 322475 BLAKE2B cff55a26f4d95353edff3d7f678a052c262636afc94307e22e4d9dc1b6bbe3c0bc1a4997c4904a397de97218b462d52e67ac0f80bb05de7736cb278c7dca58ee SHA512 5cd9e50852bd7efeb83879c5e9fe10fe6df5087b746e9cb2a0e13e66b3fe0a815a6eaea4b273258e7e682149bc29ad8979268d2be263539c522624e3f16aa5f5
+DIST django-debug-toolbar-3.1.tar.gz 228867 BLAKE2B af3d8011136ba30e690e03548d757405e9cd89fb5473b277720a3151149e92be212e50a6ec3d95903382716c9594405a1e93a7a1bf231f220f4b5c8ae1e38480 SHA512 c4cfa3cd98adfba7362e259e18a0240b886f294ba10f5c64e12887b00d4dc952e9b80cac0f78e7193a15566585f43d988f6d287e4d0dcc84c4f8395c7006e2b0
 EBUILD django-debug-toolbar-2.2.ebuild 1172 BLAKE2B c681f25cfd6881ec951ed1706e8901e666e76bcdfdaf9f791f32e87e81efa57464b5874503f33bf768628613896a667947872c7f75cc0da33fce7cf72e87b074 SHA512 19e61bd2944a8ec95a829d9f2b46c87e29f589a88a3c6efe1ddd12b9ea6098d540c1dafd6bb22e4653362a6f9879ea91375e73718f8dc40c21352211ae94badb
+EBUILD django-debug-toolbar-3.1.ebuild 1170 BLAKE2B 458a46ad50bca484063b13d883373c1d49c960538124329622435ba3803672578962d55252b1fce00c1dd449f8380d256dff06cd4a43ee646f3ec524d9b5db73 SHA512 9ad2f9b2ad80dfea4653783234d13fff87774c7913a8c06e3e930f652ca1c393e304a28bbfbe7452702c139b1d5dd8717009e9f23ebc8a308f78f9bcea887db5
 MISC metadata.xml 356 BLAKE2B c0d02bcf9ab38d7939a3edaf8eca080283ccee6f95f1e04ac96ce5870845e6a84d6672d6ac923c74d18c340326bca379691946aac7a51bdee8d6f4adcb45a50e SHA512 12686662e852b0283d2212f0db83c832c1248723a7cd751990e43b1641ddbad2cc2c71c17ac4704c01beec9a9366fc726504c10e9a9e56456b544a800cfa7847
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild
new file mode 100644
index 000000000000..5f9abc451510
--- /dev/null
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable set of panels that display debug information"
+HOMEPAGE="
+	https://pypi.org/project/django-debug-toolbar/
+	https://github.com/django-debug-toolbar/django-debug-toolbar/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.11[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+	)
+"
+
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# This prevents distutils from installing 'tests' package, rm magic no more needed
+	sed -e "/find_packages/s:'tests':'tests.\*', 'tests':" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 607611082ef6..8c117a7a6105 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,5 +1,5 @@
 DIST docker-py-4.3.0.tar.gz 236399 BLAKE2B fd9cb6426697a105f58c1199809adb009943761fc17a9b1c0a0c091d0950faf15d6e097aeddc7012b4d39770a66fcdcde73de6874a081e2a2172acd6b5c6e816 SHA512 c790563c6a3a5042f5a0d602c22b2b2838ad6f54df3bc1691e32da06336d6b651d7560ca77677ae1cb3f4d4aab721f98984e0479f7fed25deafceb1dc1c24a7c
 DIST docker-py-4.3.1.tar.gz 236548 BLAKE2B 2934410e9360ac0a0ea4a038fe75728252804c3ffc2dfb614d217a1771d6c61b50c93b1848df5c34f3bf6b6ad2fb98fc5295165c6a482895b6e7c8ef29bc658a SHA512 f82d8681edc866e73dcc0557a2be7ccfcb68e6add3cfd034d62f9639646c5d396e8e2b29df2b42006ee92adc8b432ca6a80bf2a10b54af42f33fe5ea8ed4a912
 EBUILD docker-py-4.3.0.ebuild 1114 BLAKE2B a353dc3c2f8897ac47d6de6c6ffc9c2a2ac5adc49265525a19ce6126bff90877ad353b7cad39ffccceb9b6645e7bdf8a30a3895ba29c5c0fc5babc02f42d99a4 SHA512 f966f70ff1c43b07541cb23c76c092648b1da53e0f605428d065596b1f321afda2f2ee381df0ef5559f4d7b8b2fbd6f199338a63b4fb3dde0f3262c2b65d31be
-EBUILD docker-py-4.3.1.ebuild 1116 BLAKE2B 1c4acd03d9f127b01a144f99c98f3b309308ecc582543556a7c9273a072a9053cad2477a07265cdcecfebec43f86c511ff4c5557b48e4f73ad3d36bb5a20bbea SHA512 267f8cad01e4bcea796f2c0d2ef9d2aac4180f2a2a78025662946f8da706c0a37f1a03893a58744b346abfb510fd5c72b4e7ed4f617dd79c4d57ff160687496c
+EBUILD docker-py-4.3.1.ebuild 1114 BLAKE2B a353dc3c2f8897ac47d6de6c6ffc9c2a2ac5adc49265525a19ce6126bff90877ad353b7cad39ffccceb9b6645e7bdf8a30a3895ba29c5c0fc5babc02f42d99a4 SHA512 f966f70ff1c43b07541cb23c76c092648b1da53e0f605428d065596b1f321afda2f2ee381df0ef5559f4d7b8b2fbd6f199338a63b4fb3dde0f3262c2b65d31be
 MISC metadata.xml 398 BLAKE2B 40d5a5305a062cdb348ca447eb5f50ae9a0ca7a80c9460ac33af87bd78dcc552ba089f465294214cb4c0d9fcabed0f696875d47ba67e19ee14d3dbbc7c2e7dc5 SHA512 f991f94b167947549e0a2a152cd52e3fba6a95d54297559602b01a90e39ab6f675bba5d002994bd824cb6b284506aa3dad655461ef5f130f225ca13143e3eaa0
diff --git a/dev-python/docker-py/docker-py-4.3.1.ebuild b/dev-python/docker-py/docker-py-4.3.1.ebuild
index 530692235251..5eba6c4519e1 100644
--- a/dev-python/docker-py/docker-py-4.3.1.ebuild
+++ b/dev-python/docker-py/docker-py-4.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index dea70888d411..fd84c0ac7a13 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -2,5 +2,5 @@ DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320
 DIST eyeD3-0.9.5.tar.gz 222657 BLAKE2B 3932c1b07e0961773a1cccaebec116c3b51a8c4560850661e8725efb3f4c5716b43ba610e35a2682f94b0e3b72513fbf108ffbc8c436a52977c308ad82e59400 SHA512 be89a2070b8cd5d70b25ff24e508c35e4e0ad20bfbe7bc91e4119614c1359cbc7a4ba812066b608f310abfd027d34b7bfa13f9dae8f3ab54f3ecfc9ce47c07e4
 DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
 EBUILD eyeD3-0.8.11-r1.ebuild 558 BLAKE2B 38f36e5f8c769a1e228f834495b4d56d9b9ab3dffc0211551d4f65a8a7288c969119d0b690f3426c2a2221945233235a87d6d6447f966105ff518dca683b82fa SHA512 70c13459cd085dc0cfcc844733baf13c54174b514d9ac500c76f0f0ff4430943e6a433429bf27acefca420064b0df680ee8f432248d3f9992808d102e341ac61
-EBUILD eyeD3-0.9.5.ebuild 1227 BLAKE2B 5ad5634f00c9e883afae0fe6e86ff4ae60fdf6685ef4d4af7badedb7c39b7b1b8fa4306a9bedf2fa9815becd851ece353767cdc0c40d0e647712f6e9a092eb63 SHA512 eb084bbeff60fd65a916530022f98a9fc164924bdb4b82dfd11649f9da742ff6dfc20ba0c264bdf5077dde36d90f17c10a7cf42c409f7b713bca8e16ef79552a
+EBUILD eyeD3-0.9.5.ebuild 1233 BLAKE2B 66ccbf6da0dd91cbb9e9450a409693359805dd9fef64231839fb025d05f3791be748e5c5bdf69b725d5d918cd3e0df233bb2ca51cd15532ba0d6a365ffd87427 SHA512 390a3cc2fdd1335b6a3c5ebbb327a25ed3a0559d665fb8488e1073da8e5db03c57783533ba761f24f927888174c24988ba79fbedc8cd3f7d7192c1115a036fea
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/eyeD3/eyeD3-0.9.5.ebuild b/dev-python/eyeD3/eyeD3-0.9.5.ebuild
index 87155128a941..79cdf41bddba 100644
--- a/dev-python/eyeD3/eyeD3-0.9.5.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.9.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/deprecation[${PYTHON_USEDEP}]
diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
index 0b8d2fa21572..d58988fcadb1 100644
--- a/dev-python/feedgenerator/Manifest
+++ b/dev-python/feedgenerator/Manifest
@@ -1,3 +1,4 @@
 DIST feedgenerator-1.9.1.tar.gz 25677 BLAKE2B 0293b3b41f83ab2d0e289cc5ea4b6088217dfa64caedf2da888d99a9d6860c45169852f9249049b2ee0983c9cebcf289b9b107ae63f5f5f5e057d93bf71d8a78 SHA512 db3642acb8f0c9fd692f37a79cf5862e60687a1745afbc6593d37a0372adb994de603238a17a8eae95ffcc993195f63037f16122a3cf8771e6922dea492fb5d5
+EBUILD feedgenerator-1.9.1-r1.ebuild 503 BLAKE2B 4c84f717f2267b8c8b7aecc74a5eae7f66a3b5163c621797268970707772b4a9c34eefce029661a92e89888ff579dca28a62ef8cc5498378f8433cefff6999ea SHA512 c8aadd8fc7b0e841c539ad3f216a07e08c7e41b454336aa9f5cd04385431986850927d10982235cca11743fcde66ea5ae6645c52a39021ae8ecfad1e90c6e4e1
 EBUILD feedgenerator-1.9.1.ebuild 671 BLAKE2B a07377c29c11a6da21ed114e591e1d67f2afe085f6c1acd1be75b8a3de88df76ed8eba66928f19b221cb27bbb6e111f732fb49e5c209db328843a3af53bf1bff SHA512 d4f93a59a5aaff4eae420d3002553f3273c3c04a3ae9217fc983796fbf5dd260f01aaffac922cc08f6c201802cc4df51f74afd19495d4bf23030aa255f975679
 MISC metadata.xml 452 BLAKE2B 418a1e8ead7966378946aa28e1978cd64b2a85890e3b380b808d064d37597d60205a6457d626968e1831256ef48a82325fec6b38ee5710a2e3841cf6b5f49437 SHA512 d37223c168450987a8f3d09a34636cbf08b6e95622ba23aad3a0d240ce179fde3f20d0645631cea16b147215b91c8132940d6376cbd3e6a435dd4ee00524b585
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..a0b696084642
--- /dev/null
+++ b/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Standalone version of django.utils.feedgenerator"
+HOMEPAGE="https://pypi.org/project/feedgenerator/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index fa0dc2127e05..81bcb9311b9b 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,4 +1,4 @@
 AUX filetype-1.0.7-examples.patch 824 BLAKE2B 1e3fe9e72a422eafa45f35b43d04bb0cb1d4ccc379b7a318b6de33924b3e4139ca3e6c6efe529da5d99e4cc4038b818f4edae38778c9b9f7e0e0fca740b5ffec SHA512 9d5171016461f65330d4f1e6c985d1764f1ee8a173529e35d4abebbe98a7a3ccf920752f4baab8b3c6fcca484b59043f0338cc7c0b3c319948399781eae31e7c
 DIST filetype-1.0.7.tar.gz 666636 BLAKE2B 3abc1cc3a94b3ca8c91b9b43909522efa18736c826f8f45990b3d7dab18047476f05b259108290bf7383e4df82a63def4249c0d52ae313b0dc23d377bb5369d8 SHA512 8d81261082a5765c2f96b587cc8372ec2e7347536f3e76c1f4c17f10011fd1808309ceaf55923f0e063f379cdd253020ce651a263b9535a9d16375f07dc8ec92
-EBUILD filetype-1.0.7.ebuild 527 BLAKE2B eb206f02c64f5f67191c6c7e39a6886084a47a72ee189c692ad0b712a056f05ad1fb82115905462833619d7e81ff97f455b93cec6738df9a9c86720cd5cbf1b1 SHA512 6603070cd275f2bb5d6412b9625380c0ce17fe28695d31263cd36412dce7857e66393d796eddf15c83a08188da569d36379af942ddb995c7064bdf05d64cce4e
+EBUILD filetype-1.0.7.ebuild 533 BLAKE2B 40b2a54f9e0d8a1ad2be49e76325b332bc129b408f308fc1bb1d700aba252cc8026ffac160c6e808165f9c063376723e852d40f904eaa321a789377a51ceb749 SHA512 68b61376667b96e11f203623b3865a2cdbf595fcf1101e60110dc15adf332415b8e591e4397e888f65eecf0a7df72f7a5304a7e0629515684f06664e58694a29
 MISC metadata.xml 477 BLAKE2B 6dbd312736921b69409b7fb9958069761814babf275ee8f27119fae412a59b13085eda8bc2075d4b1b0971b9662a8d7e1443f6ade74d644b109eb51df1d507e4 SHA512 e44e28a04f1a024d76a6a880eb0efcece6e9b5bce30fd1715dbcede55734412287ca810c42559470bf835705855e76c2c24286351ec53ed068e9b33932cca92c
diff --git a/dev-python/filetype/filetype-1.0.7.ebuild b/dev-python/filetype/filetype-1.0.7.ebuild
index 5fe6826b3bb2..70a0352bf347 100644
--- a/dev-python/filetype/filetype-1.0.7.ebuild
+++ b/dev-python/filetype/filetype-1.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 PATCHES=( "${FILESDIR}/${P}-examples.patch" )
 
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index cf3c832f7398..61be89b07590 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1,3 +1,3 @@
-DIST flask-paginate-0.5.3.tar.gz 118570 BLAKE2B 0c6d1163dcd8144afa80b217ab3a714a39f4015aa732b4c32cf0feee0d7ee06968bd8549651f2941be9c60d3fd36a18e132dd4c174eb4148e63f83e461cbf519 SHA512 fe3cdc808459528c449611b2411c377d46bdef4995cd2851730e90dc0091da15479022f401e31113c4d39f766841d9701f285c81e0ec6293eddd4c8f0821567e
-EBUILD flask-paginate-0.5.3-r1.ebuild 816 BLAKE2B 33c9a4ebd5f8cf7068236c541ef996453859a9bc2586eca36f57d8c8634b938ed951e516a11c3016f6109adff71646d8386d125fc54e546309822afc106275c3 SHA512 218bddaca192b67436a698c9dc7898d45c79b688623c39f1efbc5b9bcdebed101a8e801d087a196e435f9d45d36bf698fbea224f1984a72ea9d8f09f7e824c45
+DIST flask-paginate-0.7.0.tar.gz 119358 BLAKE2B 24c1f3bc77853c9c96bb72d3364e73845f8fd0870606dd96b4261861430bef864a6830dd793f4f6e8a9371c89342dda88c5f976d79ff4a1bec7d687614b2014a SHA512 11c335c08c6a9c32999e5b8ba7a76c1fb04769e5ab679b550efc87497446edbaa1e3ccb62a4c238a0b5585f7ba4067e43f158ae123c3b118db84b90cb5d4f219
+EBUILD flask-paginate-0.7.0.ebuild 593 BLAKE2B 7e551a8ff2f03e99fbbff323cbca30bdce156bd6d666830c4bf38f409764509247669c57a288f983c3bf99e6dcf52a8dc76c88539711601590ea1cd1d126aa9f SHA512 609ecb95be51e187515d3a0122c0f3c37a120b5e83b2bd70f215d12e9c3c3e7c16a88bccab02d1f1cac546e2df883da6b05dc669b2502a651b6e052afd903e0e
 MISC metadata.xml 618 BLAKE2B f9feebe27aa247c8458d416154475e0c0234e2ab391d6b9dcf06016c01cebd3d7078efde6079646ff3a8b718911cec1d0699bb5cb4eb2a319b14752718f8fdb5 SHA512 9f6ff105f8b01580628888ecba7a9175e42618ef17e96a90dce15f08335b5dbc76a6b09cbabfd9a7fb659557e04531e4fb46ec3856418d96e18cff5da7a61cba
diff --git a/dev-python/flask-paginate/flask-paginate-0.5.3-r1.ebuild b/dev-python/flask-paginate/flask-paginate-0.5.3-r1.ebuild
deleted file mode 100644
index 22d2f703dbb6..000000000000
--- a/dev-python/flask-paginate/flask-paginate-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_COMMIT="510ad833106134711868653fb597bf75ea8ac34f"
-
-DESCRIPTION="Pagination support for flask"
-HOMEPAGE="https://flask-paginate.readthedocs.io"
-# https://github.com/lixxu/flask-paginate/issues/68
-SRC_URI="https://github.com/lixxu/flask-paginate/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-python_test() {
-	pytest -vv tests/tests.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-paginate/flask-paginate-0.7.0.ebuild b/dev-python/flask-paginate/flask-paginate-0.7.0.ebuild
new file mode 100644
index 000000000000..8435e67f09fc
--- /dev/null
+++ b/dev-python/flask-paginate/flask-paginate-0.7.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Pagination support for flask"
+HOMEPAGE="https://flask-paginate.readthedocs.io"
+SRC_URI="https://github.com/lixxu/flask-paginate/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv tests/tests.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index e800088eac0c..b9964c38c6dd 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1,3 +1,6 @@
+AUX flufl-lock-dontinstalltests.diff 554 BLAKE2B 4440739b038f1a73e035555028152c14ceca39ad42ddbd5457c839c154d12160fbd6d3da1c4f0e24977b9f2d0f117fd031e2f65599198172a61ea0f19a39b84e SHA512 e0a918f69563e5573fb245736ebf7557ad98e917cf9cac51d331fa7265a6a46f3b9b1fee0f14f66d0d8ffb8d4e5b57cbc4271f3b95362ce0029e36046138b578
 DIST flufl-lock-3.2.tar.gz 19250 BLAKE2B 230d7122fb6db1b4002e5732a878d597837f1c8cb10b85f4c131f793f820dc0b76a494504aef89845be4f7bdfab94b17573f83002712c245206c9ce25fac893a SHA512 496195e1c52f628bc6c0e8fc3dcd5373ed01cfee35b6165cae37ab4b90d70265c6a0aea565f1e0663277c2b9e9bafde8af1420133a15e6254275fad2f28a56d0
+DIST flufl-lock-5.0.1.tar.gz 27788 BLAKE2B 2651898e881719f24bc61e14f697877ca39f2747fadf52de1a5fc917b26e23001df5f0a4ea2e48271da69198e1a1336e69cc0167a4f46fddd21f464b355fa4ca SHA512 f937fb6c7f7bef2b85674225f83f3162f34db3fe2df3d9a896f772c4489c3e0611361e3d1d9efda7727112d780f31022d3045d3a3b8e78e9412aca2f2418ca24
 EBUILD flufl-lock-3.2.ebuild 574 BLAKE2B 2ff8d9470afef5e042e561a721c6e77c3750fc25aa7f918e88e3c0917b773aab69de40c422d4c8fce37f8b121d976ebb1fbebdd6522b6fc98a8b487a445d732f SHA512 087e144a6c232a0467c50f0bd848ca6632c955abf9741c51e59f88004d8b2066d3a8edf76346d87ff320ea8918ba1c88deaaea95fcd4acb429183070c42d5bcd
+EBUILD flufl-lock-5.0.1.ebuild 820 BLAKE2B c8e28bcccbb13b75000f16c00ddb0b4c77da2c2c75fdc731bbbc5bb3562d7fe1dfdd38d539b03fa6bee3139ed91c597827b183b7ed1a2482d7d42aaa89b293c4 SHA512 bdd9e3c75e563e67063692d629cdc9d0c05eec760ca9e74f51f20a96df5b14bedacedead8fa4f4a0534d90f09feca1a8367ec15ad46e9db45a079dac9de5bf6a
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/flufl-lock/files/flufl-lock-dontinstalltests.diff b/dev-python/flufl-lock/files/flufl-lock-dontinstalltests.diff
new file mode 100644
index 000000000000..3cd5bfba99ed
--- /dev/null
+++ b/dev-python/flufl-lock/files/flufl-lock-dontinstalltests.diff
@@ -0,0 +1,12 @@
+diff -Naurp a/setup.py b/setup.py
+--- a/setup.py	2020-08-20 06:35:06.000000000 +0200
++++ b/setup.py	2020-09-27 17:50:43.776476265 +0200
+@@ -24,7 +24,7 @@ setup(
+     keywords='locking locks lock',
+     url='https://flufllock.readthedocs.io',
+     download_url='https://pypi.python.org/pypi/flufl.lock',
+-    packages=find_namespace_packages(where='.'),
++    packages=find_namespace_packages(where='.', exclude=['tests', 'docs']),
+     namespace_packages=['flufl'],
+     include_package_data=True,
+     # readthedocs builds fail unless zip_safe is False.
diff --git a/dev-python/flufl-lock/flufl-lock-5.0.1.ebuild b/dev-python/flufl-lock/flufl-lock-5.0.1.ebuild
new file mode 100644
index 000000000000..29e78cd92cc3
--- /dev/null
+++ b/dev-python/flufl-lock/flufl-lock-5.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="NFS-safe file locking with timeouts for POSIX systems."
+HOMEPAGE="https://gitlab.com/warsaw/flufl.lock"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_{6,7})"
+
+# See https://gitlab.com/warsaw/flufl.lock/-/issues/22
+PATCHES=( "${FILESDIR}/flufl-lock-dontinstalltests.diff" )
diff --git a/dev-python/fqdn/Manifest b/dev-python/fqdn/Manifest
index ff92b50d8b63..573f7330dc82 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1,3 +1,6 @@
+AUX 1.4.0-tests.patch 782 BLAKE2B 255832295218f4119fa152246606f67a24bcb7e71fa31ec54e164d1d5b154c98559fe7081cda4d2a6eb85599e4ff73294d6bcf8f0fbda79bb58ad8e70927e43b SHA512 09c3fee689dde053f0fe10e7f97919b6a5990744bd50960434460f5266968c5ff6ef47f5a198ddef681755394a054d4a5d4cdc7c78eff9c8ffd1d07b516c5b61
 DIST fqdn-1.2.0.tar.gz 12275 BLAKE2B 0bc862863ee3b196ea08a1f4f50f98dca88e8b81f37d2cb97bd3fd74ef9844157ea7a9f38707047fad17b95fb95c2f0e7ace8ad2c2310171cba6ff43471ae63d SHA512 ddfcfd82860d597075fd2d989d4bb1cd8c1dc79b711da432732bf786032e78b9356e04851a491c5299b336dcde173a66ddae0e23aea59b67c758d997554b494e
+DIST fqdn-1.4.0.tar.gz 12962 BLAKE2B 76b7bd7f2ebfd77b2bba04f7e07cdab42f0ff6c7ad5967f52e4c108fc3c3345c88a220b9f0330d998dc5abc53909d5768b1b52e08e48bc1e16009fa39f3afa16 SHA512 e2a67e97bc832526e234bbf19600af2e7eda8f7ede13ba33ec8c736888d19693727eded4b895efd4c88ab2e232db768d42761f44a479e615e13da8ddbf6d03a3
 EBUILD fqdn-1.2.0.ebuild 625 BLAKE2B 3f3ff8c5a36dd5fdb0ed8cceb030432d2da6215fb132c4a887d84b9bd89175bdca6ccb68e06ee42408757d1730ddf78d29198e6d59087ba38a7dcbf6032b3334 SHA512 fa46d2d375ef21a13f25f6c66d25676f2ee2b689710e1d5270c966e1d853336dd9c7ebbcf1ff27f876697cf1aedf49e8b9731c60a3d645d5b209316e7ef98e69
-MISC metadata.xml 526 BLAKE2B 1fb86ccea80fe5eadf839fb67a10f428907b402f8559935ba97ea054012497253b3b139818d7cab92f3375fae374772b8e90d470be10773998ec554b3407c401 SHA512 d9107d31f2e828667938b86209ecfe70f0eabd8c10517e3dfdaceb63ac860c314e4889a1b06ef680b2a9acd84212aa0f703147c6180a9b7e031bc4579e93e6a7
+EBUILD fqdn-1.4.0.ebuild 590 BLAKE2B 3b03928434d87df6d037a249f3bb70fa6c76138645f9ee451f7e615901fcd0dc73a9d2fc25ba8379af0f64bb885b501c83ebaedb718aca9a3b16490ca3ab4da2 SHA512 ca0efe80191eb429379302eea156a6b1fda6407fbf4027b57873513e84b37e93f365ce97ae559f3e2c618238ee8747d1fa2abf7829216f86b0872e97e2a5bf02
+MISC metadata.xml 651 BLAKE2B 52e04a7e3de79067b3ef936ecc8bd0a2ad9db6157901992e45b4c96fd84cffe68a836fdfabd3e6b8350e53fbc88af9fc5534d0754ecaaa7f2df8e4c7af146951 SHA512 1f938747b18ee81777209bc80b6ffd66fb680f980feba5e7fd2fa13c2e96727be27be004a4e69b244629e00da851b2ad384691816ebf49cc81e73e9ca000f1bc
diff --git a/dev-python/fqdn/files/1.4.0-tests.patch b/dev-python/fqdn/files/1.4.0-tests.patch
new file mode 100644
index 000000000000..0804be7d175b
--- /dev/null
+++ b/dev-python/fqdn/files/1.4.0-tests.patch
@@ -0,0 +1,24 @@
+From 0d6a6191a49fac252a96f72bd3193f21ae56424f Mon Sep 17 00:00:00 2001
+From: ypcrts <32625281+ypcrts@users.noreply.github.com>
+Date: Sun, 26 Apr 2020 01:51:43 -0400
+Subject: [PATCH] test __str__ to be congruent with absolute
+
+---
+ tests/test_fqdn.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_fqdn.py b/tests/test_fqdn.py
+index 37fcf52..60c8607 100644
+--- a/tests/test_fqdn.py
++++ b/tests/test_fqdn.py
+@@ -21,8 +21,8 @@ def test_constructor_raises_on_bytes(self):
+ 
+     def test_str(self):
+         d = "greatdomain.com"
+-        assert d == str(FQDN(d))
+-        assert d == str(FQDN(d + "."))
++        f = FQDN(d)
++        assert f.absolute == str(f)
+ 
+     def test_rfc_1035_s_2_3_4__label_max_length(self):
+         self.__assert_valid(
diff --git a/dev-python/fqdn/fqdn-1.4.0.ebuild b/dev-python/fqdn/fqdn-1.4.0.ebuild
new file mode 100644
index 000000000000..bec42af9f411
--- /dev/null
+++ b/dev-python/fqdn/fqdn-1.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="RFC-compliant FQDN validation and manipulation for Python"
+HOMEPAGE="https://github.com/guyhughes/fqdn"
+SRC_URI="https://github.com/guyhughes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/cached-property[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/1.4.0-tests.patch" )
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs
diff --git a/dev-python/fqdn/metadata.xml b/dev-python/fqdn/metadata.xml
index 8a3fbf73a49a..38e8c03d3dc6 100644
--- a/dev-python/fqdn/metadata.xml
+++ b/dev-python/fqdn/metadata.xml
@@ -5,10 +5,15 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Validate fully-qualified domain names compliant
 		to RFC 1035 and the preferred form in RFC 3686 s. 2.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">guyhughes/fqdn</remote-id>
 		<remote-id type="pypi">fqdn</remote-id>
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 72dc7b6b1ba8..b815b1ebff45 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,3 +1,3 @@
 DIST funcparserlib-0.3.6.tar.gz 30401 BLAKE2B cfce97cf08914f67ba3bd743bd3d6e7e7a03599ddc00d58a884aa84118d197d92bcc67a93ff1f7a2ab2074d66704078f5392c1d846004a5cd6eed2a423ba6b61 SHA512 efa52f788aa902b099660cb8bc60a025085a8c383e52bd0824a0c3ae28a6c13804a0659de0c80b4dcd839ee70491805d4eecda6cea221e35c3750ec569098c24
-EBUILD funcparserlib-0.3.6-r1.ebuild 714 BLAKE2B 7251b48b35b1993d36a2018d758ca9b79b2ac89b819f006b72b8e3d35308dca2e67321a5d2318c4895b20259f5f9085697ca13dda7a5d66320c9e5332787a228 SHA512 4feb41de697c9bffb6739d6ac0dd6724e46ab4d6e0e421c08db8f28ae27ada3eb7d7c7f8701922e93fbabe74200cd95eaf727d841e6b947e6dc8a4beede6d18c
+EBUILD funcparserlib-0.3.6-r1.ebuild 727 BLAKE2B f181e6cbef4b017cf5525aa405d737a622d63b08eaeb1f7616b622541a77445d54a8a942afb2ddb7bdd127375851f9489412f191b717fa8ffc439a7f4826ae05 SHA512 4fb9cfb3995fb1e18a472c755799e4dc04e570c337e88683a81c1240d2b60c8e022b75bda7bbd3f3cbfa36e98c1c9c82e4e943834dbd2b74babf8d66a8c6a7f3
 MISC metadata.xml 316 BLAKE2B 1899ee4255eb25643967fafb8aa09ea4b8e6319074de967e512d98ed182c2c7f7992c11c6689000f7bd2076b7296fc544fb8aff86fb03c86d661ce183a41c9b1 SHA512 9fe54328f405d097056ad5e3e0795ded4e3eacd72381dca3298a9af0e7c78f11eab97548b251c6bfaa9144dd0b00c00ac4292ad2ed5e84c31ab6c593a26b8caa
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
index 83574dcad3f6..6ea59ec4dca6 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index 8716463ea3ea..c50423ec12c4 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,5 +1,6 @@
 DIST gast-0.2.2.tar.gz 10294 BLAKE2B ad81309b1dd938a07f0cd39c21d4f89af6d902c136b8fe12afc5b26827c778f12561e06c66648a5b672b1c9d9eb79b3dfde7cad0acf8c7099451841b67c0daf4 SHA512 0be9b2b66b7815153e6f294b4db6b028c321d8a94d97c89d89b026df73e0c95dc2ee8af5c10f2eee51cbfb94af4b5a0da8a682896861870b98dec4c6c59a5dd3
 DIST gast-0.3.3.tar.gz 13760 BLAKE2B 0298ea81d3d133f8305fc6a7cf020213a75c2dbcb09c9648e533b8c2c58cf3e3f363448f905c8295bd34db0023be6dea00de0d901bffb1d55650773f7acc0135 SHA512 36869a5e0976223a5a82be8bf25a01654896f4de70affe0fec5252104ea6d1fea3eb8c5153530fcac8addc47b51535b02e3920a0e82aad11ba1ca8350cd11341
 EBUILD gast-0.2.2.ebuild 457 BLAKE2B f3bbda9a508e4807d87edcb71cb4b69ffa29ebceb6ddfe20e7302b3daffd4c64e3bb3f7d0d6aab72d0dad774eddbbda3703985295a5c59036b5c85ac3961902f SHA512 cfe70fee53cc47118c63e3436789d37144ad954ddeba13141996373b47df254ecadd531ed6e125f793f7b80b6f2efc6fddaaccb95dca6e1641b313089400622d
+EBUILD gast-0.3.3-r1.ebuild 459 BLAKE2B d7b7a5e46c65631bcb48dc61f3b1c1282afed3cefefb247d7185a6fdcbdea4402a4754893f5a51576159ed55d0e17e801dfc5f778067cddb2479a0292b9ee01d SHA512 7cac1089a9e5af3c30d471b240fbf44e79574978f48784f6ac22e1b500e4d0017a1c9e340bf6bce8d16ea974982d6b8232bf24bb513040027b41360fbfb13b91
 EBUILD gast-0.3.3.ebuild 458 BLAKE2B a2523227e20e5c3964df1f21107b3019034f41bea585ec67a3a1cbbb2e41c6610401f1647555b446abe5b18bea1e47d7b57105d1b3d8926a3bffddf9e6e8c1ff SHA512 4c4033f429bfb159b621c290c34eef7b667e163716805ea2bc928b879154dd8ad9281642ac15792f15b4f50a7efb1d267b35667aede0f68f72418f6e5b3e5507
 MISC metadata.xml 484 BLAKE2B d3b8be13b37bd1a2ef98b2f164c901cf21c8b73ef9b13914200c85ea26eb07dedaaca66b008dccde88dfa1bfcb733e25aac9920704625b87ce0a11a04e02b489 SHA512 5a3d09427a29d39047f396c91ad544a6cb5568f2af06216fcabc1aa12d9e4d34a71cda272d38667d8fb0114d54971626ad3de0c9d71a708cccd825ea1d7e2504
diff --git a/dev-python/gast/gast-0.3.3-r1.ebuild b/dev-python/gast/gast-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..a2d5b861bc85
--- /dev/null
+++ b/dev-python/gast/gast-0.3.3-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
+HOMEPAGE="https://pypi.org/project/gast/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index fd09751666ee..a346bd4d189a 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,3 +1,4 @@
 DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
+EBUILD google-auth-oauthlib-0.4.1-r1.ebuild 631 BLAKE2B 9a87391320fae8ad83b4896f8c8ff40cee0c5823e2cc9832870064dc9aea58b1b52219d7c65482e68dd95bdee6422da2aefce734729c7a574cf7490349121036 SHA512 2552e0378adf25366af9a71e81325ac1e9910a1c7edc18b45618fa0294e6c707717dd908d3f23109f092cc0737ce00075d9aa844bc693953f44f27a74ac4d51a
 EBUILD google-auth-oauthlib-0.4.1.ebuild 629 BLAKE2B 0cb2298c2fecf924e22458c8652d9f9d461f183444c234e4f5817954cb95e498630ebbfa4b75a2d38995cbd74b946518729bd47f6a45ed0ecd48b8fd6555e95b SHA512 41d56a3d6105833824b666862769d6a2c4ffc8e60abbb4f10f98cb598915d07f66cc34067a6537726ef6a299e32d35313d3f097f2087ce25659df9d0778784ea
 MISC metadata.xml 255 BLAKE2B c4c803a94d6885a8abc62874a17e76c1a13cc6a00ec4584d189c44c3e37fc87ef14b803739705e4e0051f57fcd1e475f4374ba28eb4520590b990ca53b16b272 SHA512 aca82b710a2d8d4338aead6d3e0443bd3d2175cc7bb4e2e72fee0535d0f0305bc55b87bbd9c87cc2385d7a7d4cfe81a4f123f9ba9010f667fcdc892a9883a362
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..ba3dc19e098d
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/google-auth[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index eb1a8184f9a9..f21d9a340fbd 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,4 +1,4 @@
 DIST graph-tool-2.35.tar.bz2 15153787 BLAKE2B 31f815f564510bb9628f43e8afab1a561222d23aabc3417ce474f0db69625954fc46119f61e8d7764d49a291e16e3b32f2e4249304f934c08d17af3e47a39ce8 SHA512 eadb122b75ff95fde165bfe1be8387deb08b48d041236aff11a0b8414d1a5027931a5e4b3216348edb61c53187b191a5e78af4eabb1ce679dd8736651f142bec
-EBUILD graph-tool-2.35.ebuild 1815 BLAKE2B 2c16de329fa4832c3d5145bbbc4fb95ebc2ec84578d58f96c1c8db24a4fb1ccac9664414a7e0a4f950c17234888ca9078773a43b037223f5933c013649d33272 SHA512 fd4d95f3a1c1537733cbd3abe8f3ef832f3d3b25ef865821d1b20ed5be7f5e0e5b0209eb65dcaee012b6e9c8d3b9f7c6ef6996204d6d169d0a84838fb2112bf8
-EBUILD graph-tool-9999.ebuild 1815 BLAKE2B 2c16de329fa4832c3d5145bbbc4fb95ebc2ec84578d58f96c1c8db24a4fb1ccac9664414a7e0a4f950c17234888ca9078773a43b037223f5933c013649d33272 SHA512 fd4d95f3a1c1537733cbd3abe8f3ef832f3d3b25ef865821d1b20ed5be7f5e0e5b0209eb65dcaee012b6e9c8d3b9f7c6ef6996204d6d169d0a84838fb2112bf8
+EBUILD graph-tool-2.35.ebuild 1813 BLAKE2B 9d5e874f2cabdad5acf309aecc6255aee0b828a86283d6bbe81d6b4ddd9802cddce88df3991446c3ac2ce6fcb54b02f4f166a4d89374c579f1834080cfd866ab SHA512 e97f000c5b861cb73ebc01d4b9b3459a981ca7de53a6f5d673db6e67a599150beab91ad1dfc02f39efe75c58041c13cb03d7419960ce281767d8dda4778f0136
+EBUILD graph-tool-9999.ebuild 1813 BLAKE2B 9d5e874f2cabdad5acf309aecc6255aee0b828a86283d6bbe81d6b4ddd9802cddce88df3991446c3ac2ce6fcb54b02f4f166a4d89374c579f1834080cfd866ab SHA512 e97f000c5b861cb73ebc01d4b9b3459a981ca7de53a6f5d673db6e67a599150beab91ad1dfc02f39efe75c58041c13cb03d7419960ce281767d8dda4778f0136
 MISC metadata.xml 346 BLAKE2B 69ef980447280fb170c6fc3d23bd775afb2cbc451054214ab0d1628ac5ac4be136a796c1f367d9e5ed2b914627cfe246372fba4f59e810469439b5e160d8aefa SHA512 1f8d51beb2a99ff4ac06f8e13529f09f4ed7322ed05ca281fc2e79d8cf309e3ef38695c57d27f80f25a490edb98ae4660b16fd3f671f232a3e1be2daf253ac7a
diff --git a/dev-python/graph-tool/graph-tool-2.35.ebuild b/dev-python/graph-tool/graph-tool-2.35.ebuild
index 20fbfe4e5570..bec6af3f123b 100644
--- a/dev-python/graph-tool/graph-tool-2.35.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.35.ebuild
@@ -70,7 +70,7 @@ src_configure() {
 
 src_compile() {
 	# most machines don't have enough ram for parallel builds
-	python_foreach_impl run_in_build_dir emake -j1
+	python_foreach_impl run_in_build_dir default
 }
 
 src_install() {
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index 20fbfe4e5570..bec6af3f123b 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -70,7 +70,7 @@ src_configure() {
 
 src_compile() {
 	# most machines don't have enough ram for parallel builds
-	python_foreach_impl run_in_build_dir emake -j1
+	python_foreach_impl run_in_build_dir default
 }
 
 src_install() {
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index a60090adb050..2989b7d1bf10 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,3 +1,5 @@
 DIST grpcio-testing-1.28.1.tar.gz 17127 BLAKE2B 494e232d4a4cf098cefa0948868f0610732d1aeb7c788d1481ad2693394767d73a74bfda49cb8c892f6f246f47b18c016318b5eefe3509fdc87be5649c253a17 SHA512 89c3aa5528e1f243a435997266a210ba6e287bca1401931689eb51f258a51768eb25a34c095d383dfcac7d446865535c48aefa0e37b4844bbb92214c7f431068
+DIST grpcio-testing-1.32.0.tar.gz 16814 BLAKE2B 70205dd8857256c9c4de8c7a5d115620b908deb4da35fc3cb77d9a93bd42ece34d6fcd2d32d587f8c3ede9bf49e61b9d37aac36ebc1fddbbd6e3ff2ce83809f1 SHA512 3ee10912a090287d3f039f350b11b8fc2ed656939e02a3e616911fd1af838e3f3570a7b3444c0ef54a25797a61edde87d545a9b9cabaf251a862b94100a45473
 EBUILD grpcio-testing-1.28.1.ebuild 526 BLAKE2B 48a7270fa3f6e8fcf6498bb5f059da45d9bd1a413fef8c9ade410127464951c2d05e231c770117ef00fd3cf37a9c95da1bb4a867edee36bbe787194f6264ed1b SHA512 b7cd30215fa0d7cb66ddfc7cdb3b32f0dd5d2f0752c23d8d65108fd539da6c57d375f4c6d51be9aa5cee68d379d100ec41d24ecc0ef10bb6f0c6d5f2a620f905
+EBUILD grpcio-testing-1.32.0.ebuild 488 BLAKE2B c1413d8cd6dc8836c27bb866fb06f9041799d4661e0e8a5b33de9ce42888833f2b83c86bf351eb43423f3562cebc03c4b45eb0acc29f6e08333dc0414670d335 SHA512 7cebbd04efb1d61cf8e7cb1984061060f4a01f68cc66e2bf72a13c297d99dcb169ea34a7dd6c0409d9a14c6f40547d97e8bd0e21a6ed75eb3049377a32969553
 MISC metadata.xml 377 BLAKE2B bd545cc0c7eca567c067fe1a6a77ab15026216bd2ac23a489b681d580395e1dd9669de6c0bc189a55e3e17da6fd3fbef4bcaa51e872e637a6135ea93e8b8eaad SHA512 bd18706bf10487e2771b213d706fda017282cc3b63ab60501b28b65012c77de4aae6e4199524aa97bbd7d34bd60211d974e1606b773de747497b3f4c0d52f50c
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.32.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.32.0.ebuild
new file mode 100644
index 000000000000..b27dfa6488ae
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.32.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index 27eec011d39b..5c4a1bb8f40e 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,4 +1,7 @@
+AUX 1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch 975 BLAKE2B 66dd2468bbed40d844d001b455bb03bfdffc349be39b848b0a6a6bab160887e91ee95c16d922b7c2f61f4988998fa9bcbd19fd727f75cb49d369b7386b712948 SHA512 f69edd7c7b65c5c4a0d827fb582767baae1a9b474d4019a6b40ccf8743e129b3b65bc01d0bda319d1af064e626abfff9d18c6d21a2696f2d2b0905685ee07186
 AUX setup.py-respect-cc.patch 636 BLAKE2B 8bbba520f02c83be4322e6ad2e65f95f23dc475f55b8acea15be341b131f9262c6595d7cc79dcfd0ede7ee3be61139a4c0d74586ffa845ce21dc253fc8e88bff SHA512 22aff2ae63dfeff93dd1bcb23d3f95f0e54908819b6fb7b54fad54b38cd86e62c2f4af8f1248c81516700377971c0da9dea027df99df9fa7d168f720dbac4d23
 DIST grpcio-tools-1.28.1.tar.gz 1986547 BLAKE2B 9f6eeb1e12dbf088a38bbff4daec95327cf86d6b9ac72dfdd826507d6b19d635bb263ccb4aca7577df7f585acaf02a45feebcfe0879c32a1190cac179d8cafba SHA512 b385fc567e8bb5965082164f87c1fafca5f0ec236feef343df92f82862b12ca33ddf9c94a366cd56437dc691ec5a37b82fd0f4fd547e389c6e9bcc7fe912d12e
+DIST grpcio-tools-1.32.0.tar.gz 2103777 BLAKE2B f33a54140a5356afb3930dd1ed7d48852744093621d7b252ba74ab9b615c90de36c637d1004689bd2dc3fc86757c9084795586f334a54c3ed45475f2565edf98 SHA512 aad072eb6de60d162d4ed6e353ced9d1b7d72e4ffd012237294fc5839c7d411dc640ea235746057007d289ee37235aa93c8ac23108299ab150c24f99cf050a4a
 EBUILD grpcio-tools-1.28.1.ebuild 762 BLAKE2B 8448040333dc9089d864949fb1abb1675688c43fce7b06f974261dd02405d5274388456b322b70d82893d935cc8802154566714a2a3aaed4e9b00dfe8e430a55 SHA512 a2f33ff11d7a524707471282d5b2757949d3888eb3755084ad2e5e1e18656021a65f34ebc86b2555fe4843852d018eb576e4346c9fe5b09c358383429f2e6d74
+EBUILD grpcio-tools-1.32.0.ebuild 843 BLAKE2B 5e92410d107f907057e196a12e8029ef123ebc431e3d13b79bd77ee2b8e906da8b2da8e34ac3acba08f1cb99f3d86082096eef60791eff49278b8bae8d739aba SHA512 637ffe1eadd2b771b64929c5b9abd96e658e3756d1317d91e1fc75833d7ae035b8f5770d3446296af71753a2f815dc3b2bb0456d8921308d004de31c70f8b2b2
 MISC metadata.xml 375 BLAKE2B 5bc161c29339492932031484663b5af94d2cdc7ab17fd7125e1f06988b8870c6c513549341348d531b5858e32757e0edd7bc0e364abcbefc58658d7153b85f71 SHA512 42bcc2c018fc04fe3166ad61cc7e4392d95edfdcc802d88423a903033ea6bbd781dd0a6df2251c6aca41b38db1fc57554149b390ed34d1e70527ac467007961c
diff --git a/dev-python/grpcio-tools/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch b/dev-python/grpcio-tools/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
new file mode 100644
index 000000000000..c6729e9808b4
--- /dev/null
+++ b/dev-python/grpcio-tools/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
@@ -0,0 +1,28 @@
+From c8e7e1c3cd55bf44b6fad6afa716dec9de3bf14f Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 25 Sep 2020 15:34:19 -0700
+Subject: [PATCH] setup.py: respect CC variable in latomic test
+
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 20a6d76..d1cd707 100644
+--- a/setup.py
++++ b/setup.py
+@@ -164,9 +164,10 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get(
+ 
+ def check_linker_need_libatomic():
+     """Test if linker on system needs libatomic."""
++    cc = os.environ.get('CC', 'cc')
+     code_test = (b'#include <atomic>\n' +
+                  b'int main() { return std::atomic<int64_t>{}; }')
+-    cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
++    cc_test = subprocess.Popen([cc, '-x', 'c++', '-std=c++11', '-'],
+                                stdin=PIPE,
+                                stdout=PIPE,
+                                stderr=PIPE)
+-- 
+2.28.0
+
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.32.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.32.0.ebuild
new file mode 100644
index 000000000000..1cd0831159e4
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.32.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 multiprocessing prefix
+
+DESCRIPTION="Protobuf code generator for gRPC"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch" )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	hprefixify setup.py
+}
+
+python_configure_all() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 232db8510d7a..daf7697bbec3 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,4 +1,7 @@
+AUX 1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch 975 BLAKE2B 66dd2468bbed40d844d001b455bb03bfdffc349be39b848b0a6a6bab160887e91ee95c16d922b7c2f61f4988998fa9bcbd19fd727f75cb49d369b7386b712948 SHA512 f69edd7c7b65c5c4a0d827fb582767baae1a9b474d4019a6b40ccf8743e129b3b65bc01d0bda319d1af064e626abfff9d18c6d21a2696f2d2b0905685ee07186
 AUX setup.py-respect-cc.patch 1152 BLAKE2B bc939dd5f28039c8d2a7c5ac40eaff2437c0cff1ed7859b150cc5865fa59be3410338d4507f1f0cc4ed1e36f8ba338840aeac3de847b43dba1e4a3fd91b345dc SHA512 93ebcffb27c0c30e282d45094cf21f9852a46055122aac37d8f6bdab8ff42410ed234a0c9bb661c05057d41a7c3291bf868275ef57a5e7c8ef3ad1de4ea074e2
 DIST grpcio-1.28.1.tar.gz 19511346 BLAKE2B 01ebdeddcba5efbb67880693ede04ccd828771fe73def24a91d882c28f5cf6f14215daca212df1d8bb9372f385aff1e31418870437c87343f218e7b78a06b04c SHA512 12feaee3816a5e7b20b648a144d37f7e550a057112f5460bc4ec016885461951148cd4d2900fbfc905f76059ef29ae4c4d1d5a3216e5e3a2d17048c8b45f394f
+DIST grpcio-1.32.0.tar.gz 20809917 BLAKE2B e28cb44d09fd775b9b6dc87dcd52bf7f144643b09912ff8b76bf39cb250743f90bc7e3769252d47f205f9532157ae68b6ac0a9202158cb14e7b9ad448d951656 SHA512 f802a7b83bd166502fdcbfaf162652adcda36da1b2e91b5073e3b3d97d38191fe989a6dcbec6c1bf27fff162633e54bdbdb20a92e74e14280fac4576baa92157
 EBUILD grpcio-1.28.1.ebuild 1027 BLAKE2B 283b657f796910b58c9e307007884fea2fe8ca296771b19063392ca52ebd66e1728b6be2c7bde859153f353c3b264aa751b8f3cd3787e036f4ee92f92d474179 SHA512 027a951f9367400c15f6ec99ea8dab3d67c4fb49749004559a68ea8156158a5f7084cae37be0ae34846f6d485b44c83e3bc00e744ea5977c9a1353a783147756
+EBUILD grpcio-1.32.0.ebuild 1110 BLAKE2B 32350c9c7d442810971507afd0d3edbcfa75e1ea032a1d94bf49d9c0a2fb1192644c7df63255c06073a0ed68a2738f9f4a4dc05399a98299568be98c65f0c54f SHA512 ea35539e4cc7249859dfe04ae1644f4cd3f51414790d8cfd31a2229ec6d777abcb44e77c0f381e601ca72346aab3c057b1e86cdb79f58f01c72a376846ad8f44
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch b/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
new file mode 100644
index 000000000000..c6729e9808b4
--- /dev/null
+++ b/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
@@ -0,0 +1,28 @@
+From c8e7e1c3cd55bf44b6fad6afa716dec9de3bf14f Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 25 Sep 2020 15:34:19 -0700
+Subject: [PATCH] setup.py: respect CC variable in latomic test
+
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 20a6d76..d1cd707 100644
+--- a/setup.py
++++ b/setup.py
+@@ -164,9 +164,10 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get(
+ 
+ def check_linker_need_libatomic():
+     """Test if linker on system needs libatomic."""
++    cc = os.environ.get('CC', 'cc')
+     code_test = (b'#include <atomic>\n' +
+                  b'int main() { return std::atomic<int64_t>{}; }')
+-    cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
++    cc_test = subprocess.Popen([cc, '-x', 'c++', '-std=c++11', '-'],
+                                stdin=PIPE,
+                                stdout=PIPE,
+                                stderr=PIPE)
+-- 
+2.28.0
+
diff --git a/dev-python/grpcio/grpcio-1.32.0.ebuild b/dev-python/grpcio/grpcio-1.32.0.ebuild
new file mode 100644
index 000000000000..d5fdc2f0f42b
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.32.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 multiprocessing prefix
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	sys-libs/zlib:=
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch" )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	hprefixify setup.py
+}
+
+python_configure_all() {
+	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 8f02d58c7c5b..aa0dff988889 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -2,5 +2,5 @@ AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
 DIST hpack-4.0.0.tar.gz 5301419 BLAKE2B 0164f6aafc0d1f17f6c397efe710503a22501faae3c7dbba4e57ca2dc76e4d373bc5e65bf55acda8bc61975d12f8a2084de0e0c4587539e5a3102e3cf66d562b SHA512 f482d086d7a82649393e3cfea55c98966ce57055cb1826bc4dec1ea334661c02708e7903f2e8e588ee1c30df41373e1de9fb960c2e7bbc18d0ace0b8f97b195b
 EBUILD hpack-3.0.0.ebuild 1141 BLAKE2B fa5b217246a531245d1b1c93176eed6918058252cb1d0bbf0aaed7e4575d53b87803d372c9865dfd6aae0874923d243506b2f1173c43d94a34e99b7696ee20bb SHA512 c6628c614799fda7f861d72ddb0d9768c0f877f392b8652ded30d354506711472076aa12af116de4076eb10682c29df2e5d361571ab6bf26ccf5a52b108bddd2
-EBUILD hpack-4.0.0.ebuild 704 BLAKE2B 7058a9975122825eff85502616b66f5c8c60880a90ad6c5ecf5b9c669ef89c3d4b6a3ba57882e19f3fe1bf091b407e03b9a13972fbe3a1b79903df052bfe22a9 SHA512 80ec08712faabf91b23f606e348ea4b2f9c35f22f29ab97f50d7d82445409254403d26cf1b57ae2cfe8b8387ecc06a775ef8c9c36e87ad35bc1f377bd0deab4a
-MISC metadata.xml 677 BLAKE2B 1440fcf100740188ffc8ae85da9bc014004feb2aa04d5f5db73546e62a01ffbe0975b9b588e6d579c45a2b1c803958999dbdd1cad8c1cbee597a3202556b7d4b SHA512 b7d64d3fa13e9e2f7a794aab733b511ec37809294b0c353d9cff55950dca47e57da8b5b5b80ffb0763f509a498816f94586c11dfdb569ecc6fa604f75c7a6132
+EBUILD hpack-4.0.0.ebuild 711 BLAKE2B be6c7d6abc49435921f4c74101e2984c278d96e46928aa71a17e0a87e3628e6cf1eb596dee134b0589fe09cad01fa94e7c2b8ba892554826131ba18a8e046732 SHA512 f1a90de9e64afad82cc782293f7d6bec90bbb548990ad0f5ebce91d680a41dc5fd6f3b26bb44cd21e3399fe0ca59ce290631d471feaf652950c72c64fd94dcb8
+MISC metadata.xml 701 BLAKE2B ddbb1fb2ed0eff9436e212933ba3a6d91a3b439c3457bc613d00c0f8ec06468df44d4476f19a3bef9daa163938804ab2ef9ced38b51ef29a81f208a704599c4c SHA512 f464fca486d271112fe08d65f800858427269292720804ff620127bb5ff3aa920e334bb1155f1788feeeb98d02d0e60114d2801d97febd77031bd524758c4184
diff --git a/dev-python/hpack/hpack-4.0.0.ebuild b/dev-python/hpack/hpack-4.0.0.ebuild
index 3d2885a39310..b0734a0afcfa 100644
--- a/dev-python/hpack/hpack-4.0.0.ebuild
+++ b/dev-python/hpack/hpack-4.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # dev-python/pytest-relaxed causes tests to fail
 BDEPEND="
diff --git a/dev-python/hpack/metadata.xml b/dev-python/hpack/metadata.xml
index 83d597b0e26f..a4853f53cb10 100644
--- a/dev-python/hpack/metadata.xml
+++ b/dev-python/hpack/metadata.xml
@@ -17,4 +17,5 @@
 		also contains a compatibility layer that automatically enables the use
 		of nghttp2 if it’s available.
 	</longdescription>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 6af4892a41e8..db0d17b1435e 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,3 +1,5 @@
 DIST humanfriendly-4.18.tar.gz 345853 BLAKE2B 9b03ea0679f787e216ee78efe8feb77f83562998813718845f4d21b7ce3f42cadff0e80b96f02da3cf6dc7f35cb0714f746940cf2ac0ec8e8981377989650c8a SHA512 01c7ee50d35154fe0b7ad39662ca6ff2dcd3e0f2a2eacc62f0184102c9db1c0fd99257273982aff56710b4e59024e8c20ee77ddd10c68e427c077ed4ca7e0022
+DIST humanfriendly-8.2.tar.gz 358747 BLAKE2B bc5824e94ea94df6ee93ea44d273ccb856f50b69e52ae6293afaedf06c9f00c67e064f0c85edd88be9954bb258334b1b9af4ab88efc5b352f3efe8d322fc55c1 SHA512 123d8592e6613a70421740648bb8998733b118927a0bd6182af848612e46eec8e35cae95168219c9b7672bed8e18e1c4a493a80248eabe47f8a4cb1813c8b591
 EBUILD humanfriendly-4.18.ebuild 807 BLAKE2B 0c03c4fc21aa1909fdd84cb53b82ff0ab27d020d38a40ffdfd5d559ae79284dbaec8c09b18106f25bbc79ea9f4024a1af181363edb2e58f3c346412899ba49ca SHA512 7f33d3e52c193d09ff1d58ece09f428d9ae75619ed0aeb9b17b902b0181adda126259fd0e51b444c5186a9d1012ed445db5700aec97ec015ead7327f86259dfd
+EBUILD humanfriendly-8.2.ebuild 896 BLAKE2B 5b351de246dce297e9aee2ba5149f893c3884446758b618570f8c053b46fa0f0dcf5b0f15082f5b1e52d93aa6ea9786281a566fc365bf865decda7e9a5ac3a5c SHA512 fc28d50dacacd1a48584e33434daed2c781ddb17db6b33b7a14b167468cd482355777f045f264386d3be191b8bb431a9c3fd30f3424710ad424f33c21bf371ab
 MISC metadata.xml 326 BLAKE2B 5db2fb344393d914a42d1b9b256782d2e8286daa33ff4b8687d23e613ae8d168052dc310cab48ef0c49c524d3b5115d2a17cbede518fe93e944c0067c94f9c7b SHA512 1338df242248b37b4d016d8f9a31ffa004eed60a9122ed9ec8f94103271b3136b698a613c0f7c91411f43d96b136777e0ffe808c250f9ece3d29922312457f47
diff --git a/dev-python/humanfriendly/humanfriendly-8.2.ebuild b/dev-python/humanfriendly/humanfriendly-8.2.ebuild
new file mode 100644
index 000000000000..a918f9d2b315
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-8.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Human friendly output for text interfaces using Python"
+HOMEPAGE="https://pypi.org/project/humanfriendly
+	https://github.com/xolox/python-humanfriendly
+	https://humanfriendly.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/coloredlogs[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_test() {
+	pytest -vv ${PN}/tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 2f2a07f8c8d5..83177ae4c93a 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,5 +1,5 @@
 DIST hyper-h2-3.2.0.tar.gz 2203333 BLAKE2B 245bab162852070e850613c41162c75efe5e43535945dacf448afdc948cade83402f77259aa46f375d0772a5287e42d8842b1259cb36392cc8fc222dec7cef75 SHA512 103a4ea2cd29037ce03ae676864125b4111c7d31a82bbbe7028557da886d88fb5363d885f08d5d3f68dfa29013b7b03350cc0cb4d9dddf32735e98dae5d7fc7c
 DIST hyper-h2-4.0.0.tar.gz 2142185 BLAKE2B e5ae692c1f21b6e3ea8695ec269a4d02f72b8d385b6f9c523775f3db2200379f9af5accb70fa06a357575728a6a5b2644dd1225cfdf458fffa80e84c7b1c7b2f SHA512 84578174a13782897f9286c62d450eaf11aa71c01c96b8660179cd2df77618dc1a6c4b354b2bc5731cd21c4709c8c0a8282a859a98c4a62a7295b6dfd1b5cfb2
 EBUILD hyper-h2-3.2.0.ebuild 958 BLAKE2B 9cc6c4a52f3ec041d9e6072f42e5ca7d17fb51533461a184d94aa74acc30647a10c74a7fcf4c31edb652091e96d35ce04a424c1d08f75013d8482a7041d77917 SHA512 7a54002d65b303d0d359123143184c9698153d6d6e3c5dfb6cd277353065898d8ed5adc22fb2351362923e844fc3e2d7c54282a03f1f972cb945dad2404f5651
-EBUILD hyper-h2-4.0.0.ebuild 791 BLAKE2B 0b2d449058720a8ca480a29d80255e8792fa0be8ddd6c1026059e82a78352d92e97cb74561d3dc1a7f4c6853ec95de0445041c3ef16e3617f0a817c281e6c37f SHA512 400c511d1b792b7a7f441e7f87442e92ab7be16ac8a8c1bba35070f7a4e9186c8816c11f2ee6783136999e21bd66e6ae0fc29f81e9cdfc6c35ddce9ec7bcb993
+EBUILD hyper-h2-4.0.0.ebuild 798 BLAKE2B 13239213aee8005cdcf5143b42ee56072927b901fd7c5bdd417217ddc51bab1372652faba5501bfa4b3276112faab181f26dd8d44d00f0483115e070ead04add SHA512 779435005ec6b5a203d6782e59e307b4e8483624d49b631753b28ad2f5b42b81a71f515f574fa35846bb97d8b57817a60d3bcea9713637e80663d26eb6ee91e6
 MISC metadata.xml 693 BLAKE2B 40bdc58c6b6541754e1fb5d2b3a6fa4ffd234f84768061f7ac1c1183f2f944a72948ca54824488ed2f177d96f9a0a74dc990ff6e97e6b9dabc4602522c0d27a0 SHA512 3f083b3de6499dfc1dbe59c4aa201f7b159847cf72076e0a7a9f80b029f668dd668395c2219e01dc5035677b21e6cd60f3ccf646fbef6bf458e208a0d79cb94d
diff --git a/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild b/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
index 284161100632..5937d1f73bda 100644
--- a/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/hyperframe-6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 74d15afd9f8e..06d0a4121457 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,8 +2,12 @@ DIST hypothesis-python-5.24.4.tar.gz 9054743 BLAKE2B 5c64c86ed58d8f0e4a07390b1b1
 DIST hypothesis-python-5.29.4.tar.gz 9071060 BLAKE2B 0668f3c7859fae7024c15f693b1f56ce8d02d6f3b8187d24b2d84e38e7bdb73c0824d2b02cfecc6b40bdfbbb1c91c0aa83d40848c499a97ab7e9223aaa6c78d4 SHA512 9da4b487fd3c56540a20e2fbff635704f0720f422d8a398d0accd24a1fb9517476b0d29135b9113a96e8dc98fcfc31cc53215ad82cb727be54e4e77b44d4c8e4
 DIST hypothesis-python-5.35.3.tar.gz 9084707 BLAKE2B ff0638194067a1c52a0297254be572ba66d67afa49c1f2fbcc42bff694ab4fe545d408d9144118314a6decfdffdbe950e2b72e89b689ae99b82ad3d3321e72fd SHA512 d862cba17444b36fa05877419495b5e49e8686980e0203da388e2dc4e528ace928f0bcb244afc8512f97bf466f2e5a2a421a2c873053849af61de71421d5c61a
 DIST hypothesis-python-5.35.4.tar.gz 9084892 BLAKE2B 5545f2b1f3e97eafb4c83d7918f1558124102b1b58854bf0ca3a75fa3f6f08c0cc862c0ec32f5fdcbbf12e6cfc849e7081fe82ab0bb24e6de8fe41108525816b SHA512 db26d0b8d23b753c4880e0ee54ef89957c68c75496847aaefd538196188e7734513d737e2073bdced5eb7a8677b096b2cf9d6d48e572922d8a3e5a5c930bc795
+DIST hypothesis-python-5.36.0.tar.gz 9086288 BLAKE2B 9deba5f50168185d5e9ef35a47bcb0dc6dfdf38b7da7a2aedee0a6fe18740fa9a353b0985e25a40da1a30d26900c6294161a1dfe03e5c7c9c31f74aa1b2cec9f SHA512 e7324f98ac8609c1ce7ed957d0ee0280d177e9a6d369cc3bdb2cc8bde7f5e79d8f19b53c6b19fdfc732c9f84e4cd7dffa9c2af3cc004b3b5dbe703d73ce64009
+DIST hypothesis-python-5.36.1.tar.gz 9086877 BLAKE2B 4b71daa1e9417d8249364292ca1dcbdbb31d041e2f5627776bb2d2d4493be82c85201d000e187e5cc445c79612f5918a5ac71a2787bbc0c21eff83d4c27b0dc3 SHA512 97d0446ba5660c189e60b47b8f782818525fcc1c5c1d64eec997b85d5ae47fc7d52771439b5c249002380ffe7d95696728f81efe513993ff90c8e192e2ceca8d
 EBUILD hypothesis-5.24.4.ebuild 1608 BLAKE2B c52cd842682347491245d4560fba737a85f8dd46e93416047c2bff5ff4dcde85bd337d7e7c65556e61d97bb1c2a1270652bf3dec8126049daa01215ed1424b3f SHA512 7d3450fa374c88dd6206663341a1437d177a7cfe5b0eb99161a85f4e62b97020843e052d28ae0975628d8c299655a35b86ba51cf67bacd296e839d949c06f785
-EBUILD hypothesis-5.29.4.ebuild 1782 BLAKE2B 7088d5f99f70a5195711fe19904daeb3286292e85f2c4b00b3c8f0b87ecea5f17e595f1204fad1f326847688da324d0a747d0b99c0fe0313c0c1330fe1569b2d SHA512 9bec8bf52fff95e4e4c5244c41f8987cc41f6a90d0a5ffaf4af1ce929601536752cf7a03180a626d343bea25c7016e3f40e4dae651b7e5ffb4c5aac60f6c4b15
+EBUILD hypothesis-5.29.4.ebuild 1789 BLAKE2B 675098e49370053498baf2a181d31e1beee829d19e94d0f95ec2bef24dd62cb9fadac2a8f7bee68bd12f5aee489857a4365c794d5791a5be46a91596b485e552 SHA512 36484ec011a777aac0aa8c14e06365f18ce2261cd7d49124e69fc04e634dc2054949ddd626eab4c95acf40190eadf1fe9dbe2b4da54bd79ee472cd6b708e0c37
 EBUILD hypothesis-5.35.3.ebuild 1796 BLAKE2B 3962807fed780a205f7ad0aa29d18c19cfe3b15ee2a96a6581e420cd67deb9b81984cec05d3445d27e689a613161a7bc03526c801ef6888a086b882ade089e54 SHA512 5555a953cdae1e0c70b5231c9ea9d14385b083135c585a2cd9cdf6dcd68d8ab051c541ef7c5d3c91bc5186e31c45abf485783ab00a7e3ee17338e8554ea57e33
 EBUILD hypothesis-5.35.4.ebuild 1796 BLAKE2B 3962807fed780a205f7ad0aa29d18c19cfe3b15ee2a96a6581e420cd67deb9b81984cec05d3445d27e689a613161a7bc03526c801ef6888a086b882ade089e54 SHA512 5555a953cdae1e0c70b5231c9ea9d14385b083135c585a2cd9cdf6dcd68d8ab051c541ef7c5d3c91bc5186e31c45abf485783ab00a7e3ee17338e8554ea57e33
+EBUILD hypothesis-5.36.0.ebuild 1796 BLAKE2B 3962807fed780a205f7ad0aa29d18c19cfe3b15ee2a96a6581e420cd67deb9b81984cec05d3445d27e689a613161a7bc03526c801ef6888a086b882ade089e54 SHA512 5555a953cdae1e0c70b5231c9ea9d14385b083135c585a2cd9cdf6dcd68d8ab051c541ef7c5d3c91bc5186e31c45abf485783ab00a7e3ee17338e8554ea57e33
+EBUILD hypothesis-5.36.1.ebuild 1803 BLAKE2B 04eac62c585b02bf721763309619d61eec9d526f332323daabe73e8a9829bbf6c2939baf751a196cae120134dfe68bde39e1567795ad5668cc718489e2a3e3f4 SHA512 0ff2d839e09d54bf1ec046f1de9cd29a13ba75d57ea6334a4aa812fba61b15e805596e92ca9a825ae482cd6528e94115bb4cc92e1a5439e691f4e23ff961f7ff
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-5.29.4.ebuild b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
index 5065388770fa..1b73cd15acf4 100644
--- a/dev-python/hypothesis/hypothesis-5.29.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.36.0.ebuild b/dev-python/hypothesis/hypothesis-5.36.0.ebuild
new file mode 100644
index 000000000000..c8d53477c0bc
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.36.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{6..9})
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-5.36.1.ebuild b/dev-python/hypothesis/hypothesis-5.36.1.ebuild
new file mode 100644
index 000000000000..b817839fd0ac
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.36.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{6..9})
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
index 84966b9f08d8..301fd24741c1 100644
--- a/dev-python/idna-ssl/Manifest
+++ b/dev-python/idna-ssl/Manifest
@@ -1,3 +1,3 @@
 DIST idna-ssl-1.1.0.gh.tar.gz 5267 BLAKE2B 07912379da74e4711f291a54bd0878e08d8820005b055f9b978a684b8263a801a7fb9ccbbf395aa226e009b3ebfe4a7cca11861502a9b859446279b111911209 SHA512 01e58e9f32f7e02ef203edbd76e199916ea0b16d01a929ca2fb272d83988483c17e9c36e131f47bfba7f7b657bef9e2be222f81800716a5b87d5847c27cce34d
-EBUILD idna-ssl-1.1.0.ebuild 857 BLAKE2B e43687a4cf70d0759f56bcfe5f01997dd8e45a6e06ae7b8161736cc15fff28b34603de2aa93addaae55c4d5e4316607636ccad7f10741e4e422e6cf32411d14e SHA512 fbf482d78ff4a208add93753b03a694f49d9370e46d6c1f79b64adb4234bb6396711fec7903513b4b992ef27ee6be0c0f1fd104be293d4ff1746673703f5fd2c
+EBUILD idna-ssl-1.1.0.ebuild 864 BLAKE2B 86dab263deabac9d1b6b9702655a9a62ea7187006e30153762cf3d7ff637d6248f83507a452ad6e67431b486b3da46972739420f277a2252cac8d463b93816be SHA512 4a30545c29d38c21b1156769db5d21f903454ffefadd32173d98ee83b72fac4e3c51c24411654fb854f4467248f21331394d5b03a1367c258b0454287b67a1ed
 MISC metadata.xml 368 BLAKE2B b2f78fb9dea9edf6f2b2a7fb72412302b014e8b1b536653ae12fcd2bc8fa94bb253ff780aedcfd32fcddfcc2030b363e12440dfa4efef1a886e99b8b0acd8dba SHA512 531bbcdb7ec492aa4c38f4352cb0a93c618c60d9f8920ff476f6f8b7991744ccba2188a9e441e696a02d1c4ef4ea9af3afeb2c81a0d046e700796ee45b7f3888
diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
index 802b3e0ff9ac..bfa486ba3f29 100644
--- a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 2e09ce4d60e0..05af6bf8d6dc 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,4 +1,4 @@
 AUX iniconfig-1.0.0-pytest-5.patch 1809 BLAKE2B ccb4383f447f84a88cb020daf0b17ae626c627ce46424ba89591e1feba8ba38b48877e0cac83cef8792cafe283e632cdcec358f6d3929146cc67d2da57848233 SHA512 347295b050cc31108ee013a20dd1135f42a85636d83fba19d509a09856e50ad9343074b965e3b80306a9b73bfcda4c5197800ed3c2e5cba8432d26c5397a135f
 DIST iniconfig-1.0.0.tar.gz 7807 BLAKE2B a77c4d8c6f549db911110505ac5a367be5175adbb580211d4aded14d1108e189fd6d6a229ac4e0e742baafa9b037d58c2bbc810897c8b274c07493c518ef752e SHA512 639a4e765637110f69627fb18a5e719b6d648e5549fd857168183d97da7880434d447c9af1e254dd2aa5d0e36cbd3f5c4ffabf8a949ed3d6294002e7e1b2f6e1
-EBUILD iniconfig-1.0.0.ebuild 564 BLAKE2B 1bc1935fdb3333abb4b9f2ce6b01467d732708eea1c7ffca71fd16f53d4d0aebdd6ed760aa769932e81376609a88f7f0f369e900b51e4a1d47fd466ec014f25d SHA512 c54f6dde5a7028b1e5b5cad60824ddae6055998f368336fac47cf10fe258a82f7b5fc75a07aa704340bbf0ad97780d6fd55fca123e3a81278bfd80dca27e324a
+EBUILD iniconfig-1.0.0.ebuild 568 BLAKE2B 93c0d6d18ed5a34f0ecb4dbaa093ed2f783b42a6ffa1283113b49f4ae1f7c4cf410736d044d13038e52cd12126f5a830fff4621ca2a451187e5c33b5d2456e93 SHA512 101d1330194335b67f222c839b26ea037edfbe66599e2130ae91e4999919dd28bd182cadbacd9d49221b58285e1ddc7ec809de2933913ae2cc5bb90eff9778e1
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
index 635312b96011..810b8151db13 100644
--- a/dev-python/iniconfig/iniconfig-1.0.0.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest
index eccf08b8992a..59e02e6b77ad 100644
--- a/dev-python/ipaddr/Manifest
+++ b/dev-python/ipaddr/Manifest
@@ -1,3 +1,3 @@
 DIST ipaddr-2.2.0.tar.gz 26266 BLAKE2B f12807beb52c5cb3c7da2afa4b61b264fb58f0100900e5ca062127ce218f9f5710f38ac7c7183a7aa08b77757c39866d169e6e39c3bc5c6c55df003a9b414ec0 SHA512 5adb117c44e6e5dbdb9e96543aa7a34f35b4a4ec9baa163a25448058c34091bf4019d24f0250928291e4d4bc97dcdf75865daef739e2d94f98cc584e6e6c50dd
-EBUILD ipaddr-2.2.0.ebuild 663 BLAKE2B 81d87d3ed102a165bf5ca25e5311bc2f882851c9b6c77cf4b2c8c75ea80619c6f0f5102471e6d8d4d5c02e6d27f9a74d58b9e0be1672611c15b99136c023ec67 SHA512 3e80c351d310bbbb4f52f548fde2ea57c553e6db99957c5d2206c18236e3cc2937e18e4dbd3e0e7059970c63afb3401ecaf0ed78e9dcca867a7a52492c81c466
+EBUILD ipaddr-2.2.0-r1.ebuild 657 BLAKE2B fe1db11eebdb11aa8f38488e646b790585a0f52aa0dc77fd422e84f9d5be110f5ba91b2997537ccc843cc4ffe7da4c7bbe90d59499acc1537a66d09845b95e7a SHA512 c3dc4a63e20f3b8ea8c796288c51d766344c23217eaaa2c933fa8946eed37a60f9c48d4f91e9ee7a86e5c982fc5cc380b4f5ddc7bc5e7ef141e7be0657ce8e2a
 MISC metadata.xml 493 BLAKE2B aebbbdad8a285f35bb8635efe1ebb3740108597d7c5842c64ce56aeea95e918445493fa2dd1acaa9db641c73b1fe36c48e6203dcde42dd8af9f52be7cafec9ab SHA512 23d6c158e1e33c5731eebede2743c612b0220e7f7d769470115a4143a6f69c46d8652c535837632f32494f852c1074112f808b67ca43488a49f09accff840779
diff --git a/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild b/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..4bc2aa1929eb
--- /dev/null
+++ b/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python IP address manipulation library"
+HOMEPAGE="https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+
+python_prepare() {
+	if python_is_python3; then
+		2to3 -n -w --no-diffs *.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" ipaddr_test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/ipaddr/ipaddr-2.2.0.ebuild b/dev-python/ipaddr/ipaddr-2.2.0.ebuild
deleted file mode 100644
index 84ed45148909..000000000000
--- a/dev-python/ipaddr/ipaddr-2.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python IP address manipulation library"
-HOMEPAGE="https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
-
-python_prepare() {
-	if python_is_python3; then
-		2to3 -n -w --no-diffs *.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	"${EPYTHON}" ipaddr_test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/jupyterlab_pygments/Manifest b/dev-python/jupyterlab_pygments/Manifest
index 729a75335548..6b828b3e083a 100644
--- a/dev-python/jupyterlab_pygments/Manifest
+++ b/dev-python/jupyterlab_pygments/Manifest
@@ -1,3 +1,5 @@
 DIST jupyterlab_pygments-0.1.1.tar.gz 561976 BLAKE2B ca317ed6709fd2c9a8afd137051140396bccdc3140c8c1ca97f64f8d4f74d2272c687661e1e28822a5008b2285306024408b18ba6ac92cb9d73acc29b8741fe4 SHA512 743e380f253f817ec9c9aedbe5d3c1cb5bc2c3de2136deba40b0fd3880bb04a4774099eb90437519638811ea9bea0324db3c3d8b1a9ab63857e7513deeaba669
+DIST jupyterlab_pygments-0.1.2.tar.gz 561989 BLAKE2B 85d6b59b2c959f838746c7c6fed99ad5adda89a514a77327cc8e9ba7d6a91b1c0206d999c09149e6c5b9c67911ca16914f0b17a67b3505db73c23a7194fe4566 SHA512 0b4f4c13017f8afbd83e9fb575b3c4ee44272bc01421761ae7b140ecab743d825aa195432caa5f6153bda0ef84fe3ab92dad61ffd9b048927736a916dd267b5a
 EBUILD jupyterlab_pygments-0.1.1.ebuild 492 BLAKE2B 664ce34a11198df300839ae4bce40c1e49314feba622ab1c62e4e621025f0987317d0360a2edafdd48d243468a4af39320d6a7e174b1829254baca037f2ab008 SHA512 7d2e3072ea8b388bf4d8b1fa0627976541357360613acfd20c58505bd618edc2fb88b4431d41b4726867913450cf8ed3d4728bc824ec955ea2d9ead80df457d8
+EBUILD jupyterlab_pygments-0.1.2.ebuild 492 BLAKE2B 664ce34a11198df300839ae4bce40c1e49314feba622ab1c62e4e621025f0987317d0360a2edafdd48d243468a4af39320d6a7e174b1829254baca037f2ab008 SHA512 7d2e3072ea8b388bf4d8b1fa0627976541357360613acfd20c58505bd618edc2fb88b4431d41b4726867913450cf8ed3d4728bc824ec955ea2d9ead80df457d8
 MISC metadata.xml 384 BLAKE2B c047f8bd2673bf34d6a1f17af9d3e6ca58fb54a8b237e433cf55f6c6bdda863cd8c39b41d44b7119d2b8c2ff0b3c3ac67a5e0a0cc606a545a46ada4e64704345 SHA512 fe21650260f3a89af0dbaaa7d4953e7e5396b94cd1ff630601e8c8bd82d0c91870380bc3da3a7d03aaa212ac278c834a19c2c83ca23b7a2a86d09460878e2813
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
new file mode 100644
index 000000000000..49809d701f83
--- /dev/null
+++ b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pygments theme making use of JupyterLab CSS variables"
+HOMEPAGE="https://github.com/jupyterlab/jupyterlab_pygments"
+SRC_URI="https://github.com/jupyterlab/jupyterlab_pygments/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index ea910ef2b4cd..c54feba9a50a 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,3 +1,5 @@
 DIST jwcrypto-0.7.0.tar.gz 80869 BLAKE2B 7b8a6928dff40d4d3e0bd61cfc81362ed5d0abd1001e1273aa12111166ed13e510d9cff935724578c2b7392bc74ffc94b0a733ea23f4a982e6bd8d35b1155ef4 SHA512 1d2b6268a54f3a3d466f7a7f7f0776164f0f35420b026c8ebfba099df530d965697eea85a49a73c44713e38fdb9ec4018cd4813b8e154a18117fc4006aa5578e
+DIST jwcrypto-0.8.0.tar.gz 81782 BLAKE2B a3cfb04f099a747c365f870c53d75574cdfaf8b98373f37cc107ebca956b414b7d7cb78f8fcd6d3964528d3bc8a217e5c645bf6e82531e951dfdd9ca03472111 SHA512 784134d27ff7abd31e1069763969513ed45f81fd2c242b7ff7036413c35ef374d535eae0123f5561a8e4eb2630cee40056d1c66454288e1310c4cbedecaac210
 EBUILD jwcrypto-0.7.0.ebuild 712 BLAKE2B 1f2d773a6e127377a7d0e5dea1d91c42d554145bb1496b3a0a1ce717a550c8e9e1d22ef874ae5521b7897b53f2fccd33f23dfc3abbb866e5031b66028251a30b SHA512 763e7b8394fffeb7330861aa76b4e63f81b726560944e6a7fe34b3a953b2a047a4bd5e88fb475ce001e79cf5b44e4f625c2dc13956d553a1f96e8f9375f03145
+EBUILD jwcrypto-0.8.0.ebuild 739 BLAKE2B 5c1c2da78f7f680559e303a8f30b9dedd94c4708c05800181b03382d5ea3689ad52c51192e5c2e6f711669d1b47cdd57a54e239b39746463b0e949b76706ccc0 SHA512 def1db76c2686cbfd5f7ef324cf358d403bc671e840e1a5f2ce4f71b6f109f0bb7b161b38210361dbf728318fcd7c08824adbddf6a8b71ef3924928b64a48111
 MISC metadata.xml 368 BLAKE2B d5656c56c5a851d766c1e6588409d4864688de0c3acd4f28fb00ce22a106e5cf7f3ca8d54a4e448250cfafd04f4a0acced22db2a99879da67eb80c03f141ca74 SHA512 fe3492bfd6ba81846e7ba185468617d19f06eb813d55e87ac8ac9d5c7997d069e2b0f90dbd11ec5508b1da1ddd1d6a291fbd524f0c9dcdbdc8447ca639b78735
diff --git a/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild b/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild
new file mode 100644
index 000000000000..babe4d90871f
--- /dev/null
+++ b/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
+
+HOMEPAGE="https://github.com/latchset/jwcrypto"
+SRC_URI="https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-python/cryptography-2.3[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not install doc in non-standard paths
+	sed -i "\|data_files = \[('share/doc/jwcrypto|d" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/lark-parser/Manifest b/dev-python/lark-parser/Manifest
index 0a282a69ccd2..43b57b1fdf11 100644
--- a/dev-python/lark-parser/Manifest
+++ b/dev-python/lark-parser/Manifest
@@ -1,3 +1,3 @@
 DIST lark-parser-0.7.8.tar.gz 276204 BLAKE2B c2d103f41b7b6ccb988c5935c53e422d495980c1d64cba125e9d27b9b7bf03c0864904e6c2c6b40ec56e8975a8051f1a18c9da126d02fe149dc3684ea7d41c30 SHA512 52eed1a5f26fa7ba79820298a8f6f7594b2351797abdaf8fd96f76e15a11711805955e055164ce287f7204edf3d19116562795cf56db464b4f2f15e40e1da561
-EBUILD lark-parser-0.7.8.ebuild 405 BLAKE2B 435ad90823354a3f90a1462832e1ab2da73f6c04babc2b2181de7fcf7b3b721640c986cf897cacb4874ab12d9a0049839bcace046baa64c6d1ed556dc558308e SHA512 8cc8853b17474539c52ac81626fc6c8bfe0cf1d3fa4f5f1ff365faabd4347539218faad57a8ef4b7fcfe1e13511136f37198a4ef94229c3ec7228ab79940b81a
+EBUILD lark-parser-0.7.8.ebuild 407 BLAKE2B 8e3e44b477b24891c3f58422211e3c3218517d70f563876a934e5e3e8069b35b9b67d1a311cb89a2f180061d2f65dbd519ad4872f10e61cc59d2d81079a9f215 SHA512 cf4245c3f1d339082598a942190e7add05b04e461c8849305212490cb1a90cb374458f746cf95587cb3163d3bab42bebd7c2176e1e190b2062c44918aa59d347
 MISC metadata.xml 503 BLAKE2B 99d3c5991b02f4c0b0daf656b1e6f38e38f04622715b0ceab73b40951f4bf1e97b52e6ebe06767948660370c93382a294efaa7d768937659e66b3916a44b3a31 SHA512 11eb50053b35b3dd0a92f0923d3e7c00abeeee046cc3a1113c5ae33993627e778fa58699b90bf0d4915b00ab8635f2200c4a4637754d9752a60874c419c6d4b0
diff --git a/dev-python/lark-parser/lark-parser-0.7.8.ebuild b/dev-python/lark-parser/lark-parser-0.7.8.ebuild
index d85e3e03e315..683bfc8846af 100644
--- a/dev-python/lark-parser/lark-parser-0.7.8.ebuild
+++ b/dev-python/lark-parser/lark-parser-0.7.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
index 36990d76a241..6782ed4378cc 100644
--- a/dev-python/libsass/Manifest
+++ b/dev-python/libsass/Manifest
@@ -1,4 +1,4 @@
 AUX libsass-0.20.0_rename_sassc.patch 1710 BLAKE2B 410f1256dbe433d5836a0c7f94a30b0fbe174285408d5c3c0589a7f4f58d2417c9be37af6ae137031365450ad2bca51ebb2cd6083c625d95a33ac8c0eb3bc80e SHA512 3e30b6a5cc387aac526ca2159d5854b28090ab41d7d4b2512627cc1e5b392569b81c0b1c845d3311a9cd44c73a6ed109b2a06a9677cbe15a4a39c7ab0c7c4a6d
 DIST libsass-0.20.0.tar.gz 321750 BLAKE2B 215bbe8d4a60d3f6851bfe92a7fb79e58bdf86fa5334a39c7ed051ad2ffc598e59afcb381f6526d25d6e3d021fd5eda51371a6628c01111f8bed42bda9581cb7 SHA512 ad6054f3e02b39730c4680b64d3ed20ba05443c7019c8a7a47ae557a6f52c60be1326a2cf2421f13de0a57a5f37347dffff1146190d1fa0eb8fd985f27ebf7d7
-EBUILD libsass-0.20.0.ebuild 882 BLAKE2B eae8e6d58a3b7f4813354049235ffa5e4a7ea62eedbd0573e7afe77e55d17337ba35455f2a7aa622769fda45e3e618c90582e03ba57160c52c7541a8c6cf60da SHA512 ffdfcad24892c7369dad358128676c22d8faa6b242e67d8656b78a39e33100b3634d3dfb7a6d4659990fa39a450c1b1f42c631e08a30adc63381b281bffcd836
+EBUILD libsass-0.20.0.ebuild 880 BLAKE2B 2efb02d977f7a5882ac76b4e5303fce24090b4cbe2ed8376770e5f4c27016c56b004d5fed0209b74df1c4efa0ec237c07cef40b8fff0f459098ad033cb818e96 SHA512 c97b6c5f00487efbc32b0a72decac4bbc5e5e3964cee52328cd5577ed3971edbbc87ec38e01eca4f05da402a57617f7a11b846656713a1e602d814d522e1ea12
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/libsass/libsass-0.20.0.ebuild b/dev-python/libsass/libsass-0.20.0.ebuild
index b745260bad65..4db2ec619f46 100644
--- a/dev-python/libsass/libsass-0.20.0.ebuild
+++ b/dev-python/libsass/libsass-0.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-libs/libsass
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 7723efb7a724..c238fa81b72f 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lit-10.0.0.ebuild 863 BLAKE2B efe99feb8f7c0b6b4121591f240120a47f3f2c673d5b5d3908184a6a395b206a84abcf0f524f3106357a35b7217122875b6b4d5365af26676a48d3e1194a0158 SHA512 a3cdcf3d5af68f02e0ced1427c0babc7470b1268f7400d6c4db7d9961d5f944191777a03e3ef2c30a55ce75f003c1cdea382f2a0218e5c32c1d0c4a0b2cbf523
 EBUILD lit-10.0.1.ebuild 895 BLAKE2B 868dc79efafa28332067b6070b2e8a632400888bd6ef80a380c35359acaa781d2d31f58a216318249e5b7317b888fd10e64b90c47d3bce8dd5094cc216fbd1ed SHA512 4b5e708921eabad1d1001fd332153e3af26068d97342ad908189125adc0038a2d5af5859a2ee0b1816f0e6eb467ef253adbe53e9eee17433f19c03b21851008b
 EBUILD lit-11.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
 EBUILD lit-11.0.0_rc3.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
+EBUILD lit-11.0.0_rc4.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
 EBUILD lit-12.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
 EBUILD lit-9.0.1.ebuild 861 BLAKE2B c4d1a504e922e182102538cc19ea99683500c533af440179bbc99f22aa21558585a7d4f6bdc8ca4159c2300150ffedba1cc980c448fbf5f146d4168e65a3c9e7 SHA512 7916fc0e882021c5b3bf21b4b565e73e83380d9c221b61b31af0acb5939ee3413a1a6638f7328b0815081316300b78836273ba20448b4d8c9d5baf73278184d9
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-11.0.0_rc4.ebuild b/dev-python/lit/lit-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..eafbdc683987
--- /dev/null
+++ b/dev-python/lit/lit-11.0.0_rc4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 65214384d7b2..c9ed8a98b9c8 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,4 +1,4 @@
 AUX lxml-4.5.0-tests-pypy.patch 17429 BLAKE2B d27a093c8419e0a9a8a192c91f0f764868aa0164851d3f8650eacda14ecca836b306321de81768b64788ebd013d1916ce2e608d9f000c0699b969cb13fc67ffb SHA512 dfe9bcfd035edbb7e931f9827405f6df449aa9b572970fe4c11e666977df874584bfba12145f79b3d59723da004815f9ec2f708398ef4d8205ad7c3954884361
 DIST lxml-4.5.2.tar.gz 943480 BLAKE2B 11130d2507ff0d61637d7fef2f4b28c5fbbbfe8864504c8f3a231899be4db14e6be65edc6e780719686605663b0c5f76f161beb509dc58d16ee3a9158a7db59c SHA512 146dcb4414b7f0815c5930048d9dc89711bf0a3ee091c89f4475265cdd6f1690a20f82ec24a282a43cff8854f9b960f0cd4430cff79a7506d39ac1baf7770695
-EBUILD lxml-4.5.2.ebuild 2247 BLAKE2B 98bcd13a52412ffae6f8be77266db161a37ca23c27ec8092f47c853567afaa35faf30700105e3c74f0ec22162e73502b3a0c8956d65d86c0d2dd366f20025341 SHA512 4656c26d3541440c6f5cbbdbe2ffbeb52ea0d4e2c637f399c73bc13947a377bc09bcf60df99509f4ae3ffe7013b3a644131a1eeba42e615b96d08e18580a92f4
+EBUILD lxml-4.5.2-r1.ebuild 2237 BLAKE2B 3a14828b9740d490d9f6df146e69692aefc20ca3610585305c468f63528281f8fc09cb992210d46440b5effebbca3f8c78f902f1621cb777dfcfb94cd5b07e55 SHA512 ef536b193167c0e594bad724c5c7b48283dde809c8457d2f21adafcce238bd37e0e99f06762957fd1df921abdbc733347d448cdea72c3b1d0016fd9312c8ce92
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.5.2-r1.ebuild b/dev-python/lxml/lxml-4.5.2-r1.ebuild
new file mode 100644
index 000000000000..91bdb6ed77b4
--- /dev/null
+++ b/dev-python/lxml/lxml-4.5.2-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1 optfeature toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
+SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+S=${WORKDIR}/lxml-${P}
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+RESTRICT="!test? ( test )"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+	>=dev-libs/libxml2-2.9.5
+	>=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+	"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.0-tests-pypy.patch
+)
+
+python_prepare_all() {
+	# avoid replacing PYTHONPATH in tests.
+	sed -i -e '/sys\.path/d' test.py || die
+
+	# don't use some random SDK on Darwin
+	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+		setupinfo.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	tc-export PKG_CONFIG
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		local DOCS=( README.rst *.txt doc/*.txt )
+		local HTML_DOCS=( doc/html/. )
+	fi
+	if use examples; then
+		dodoc -r samples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/lxml/lxml-4.5.2.ebuild b/dev-python/lxml/lxml-4.5.2.ebuild
deleted file mode 100644
index 5fda592375ee..000000000000
--- a/dev-python/lxml/lxml-4.5.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
-SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.5
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.5.0-tests-pypy.patch
-)
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/matterhook/Manifest b/dev-python/matterhook/Manifest
index 3ea76bf57399..5ef23f3f4e26 100644
--- a/dev-python/matterhook/Manifest
+++ b/dev-python/matterhook/Manifest
@@ -2,4 +2,4 @@ DIST matterhook-0.1.tar.gz 3150 BLAKE2B 841b64875d3ecc55c5056a15e07e8c46ac13ec48
 DIST matterhook-0.2.tar.gz 4458 BLAKE2B 83dae9d38eaa9de3abdca4925378475660ab6f9571565f9275425cb9579397c2f3d106735d4268b7045d6af2572bdb8e1f60aa89030b1fa44c4c5c1b19fcd106 SHA512 aa476a00a5b571c5c8bb21eccc5b1c325e0932da7e4f8095e3ad29356afd4716384abfa9e4927a820e6d1fcf8e62a516943f6372d90cd7a9e76d0292c352c483
 EBUILD matterhook-0.1-r1.ebuild 494 BLAKE2B 14f5af598f16368c6d26fc2ed631f32b8d84e58ee5a8d10d0df2dac84279396b0c909d5aa57fb0f3f29cfd381a2665a5c035e81058d5c7937d10e79d182c3c06 SHA512 454d714e7618be61c5da34208d7c5d703875ca70754ef0594d238e78aaf93f1e5203032abfa1970c1ddcf09aed385a53578f70faddf3778e6e1af86343e7f0e7
 EBUILD matterhook-0.2.ebuild 496 BLAKE2B 7fa2d6857b8430c50773e6ae17c6a79b6b1e114c6bf4b7246468e2d07e4c15b475b9735e8feaebe4102014ccd683a462959cae6df0b7d0da15503a30a4e70bb8 SHA512 2c3b9b70a7bde1eb2945e027ba31fe7858c2df5188270992d6bdcf5708e70e8721906621aa5093c65539f1d253ee362301f17584880728195366af6a8d53d379
-MISC metadata.xml 311 BLAKE2B 53b986a49d3c6615c99e1a79572bf81af5cd3f094d95abb417148c0bbe29bbd4d6f412a18b16d366cf0c9fd487acafebd6d0f192b48b855e8f7db3fe08add8b0 SHA512 0702ce6e8985e0c20f35455802d955e1cc69769de6e92cba5aa5de0edbbb5ed9104c6ebe82cc689d144226d64414001b8ee41a575786f6377f863d6bc0bab1fd
+MISC metadata.xml 336 BLAKE2B 1e7290ae691ca7a715f9dc60546340501b3ee5854f6d3960557c76039f90b8b96479d3a603b9d8e60d4fdc6a6551eaac3269946c0784d3c308e9d874f008473a SHA512 85d15317337059f72b1b2451d00eb95a6c196a9b09d180d0583ef8675a269615a8dfe91b726c6ffaa9b9a5eb4fe5da2357a5973fe85a6e77106daa8232406bdf
diff --git a/dev-python/matterhook/metadata.xml b/dev-python/matterhook/metadata.xml
index 334baca2874e..4c76899f3eeb 100644
--- a/dev-python/matterhook/metadata.xml
+++ b/dev-python/matterhook/metadata.xml
@@ -4,6 +4,7 @@
   <maintainer type="person">
     <email>ultrabug@gentoo.org</email>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">numberly/matterhook</remote-id>
   </upstream>
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index 020bbb0815b1..33efde3715c8 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,4 +1,4 @@
 DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-EBUILD mypy_extensions-0.4.3-r1.ebuild 811 BLAKE2B 46af92ddbe58766cab9a8bbbc9fb16a7f6ddd3104be6171093892d670506e9ccb7ebb51c3a58b62842e152754961ecf00c6f5a46488597b618eb72ab69899897 SHA512 47b2b1175204931b3c9549c8c3d3eb08bffbba6662e8e7a746400a5825758ab1744c2d697b9b8005159fbcb8fab5b4257bfedf258c5f0abf3a7516bacc23c8b4
+EBUILD mypy_extensions-0.4.3-r1.ebuild 818 BLAKE2B bac262f89661459cead7dc27743d369a940d6e8102b13256ff0b09e96a9b38a36db9336d9cd6d588c8b461fe79ab108241c9c7f631be856302ac38f32bdc3aa1 SHA512 9189edce03ced6534d1097d1a4ac797e7c7d5511e48ea78de66666790af60e6c235920894df0ac2adf5dbec152fec65f8080ced53f085eac88e1cc3dea15dd49
 EBUILD mypy_extensions-0.4.3.ebuild 1025 BLAKE2B 6e531146c9e8c331c64453e6701842bac7d4fb80330a103bdd897d11a10618202cf291a4ab5691b5e7f6ed7dd3c9986f66f9b216f9185b95e284e7784e6a419f SHA512 770e6c1ed105f69d7f8bbb33b6e16b9b5a906962ff81c65efbed6f5a2639cf469a49f09bb284aa1f078da36d7b7cc752e2410cae91d8c18fd979c40ee460c2c4
-MISC metadata.xml 328 BLAKE2B c8305ff15b161dc506756c3a5e9d06fd2d22de1789676d02b610377520d593a594aebe733dfe88d0c88bf235e7c0dbfc16309d57f729365660c9fe9284fa9830 SHA512 6fa42508eacd37f3cdb2b47371baa13f67d985bb4f47237a0f9be5fa27b2ce86670de842abb75ca6c21f8d4255e56be552f5415c66244fe0c5dc99865e61b252
+MISC metadata.xml 352 BLAKE2B 932d22dee01e3a1e586176e5e32423d36100c8d3116cf6b8eb1268665ac7a5456535fbb6b855a4e6849767d31dd6c2066eae3d08868662c211596d7c02f39ec7 SHA512 2eccb85a7150b8592717ee60ecba338f59563fbdc12c172924f8d7743d33c1a32cb9a0bfb41f150e86bfee3748488f32ae9d57bbb240cb7fae4b9f3a00621e4a
diff --git a/dev-python/mypy_extensions/metadata.xml b/dev-python/mypy_extensions/metadata.xml
index e0bf53421120..ddbd57b96d8e 100644
--- a/dev-python/mypy_extensions/metadata.xml
+++ b/dev-python/mypy_extensions/metadata.xml
@@ -5,6 +5,7 @@
 		<email>ikelos@gentoo.org</email>
 		<name>Mike Auty</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">python/mypy_extesions</remote-id>
 	</upstream>
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
index 5451fe4f4b28..f8af82c56a72 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/python/${PN}"
 	EGIT_COMMIT="master"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 0a682c5fbddb..3ab0a0ddf307 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,3 +1,3 @@
 DIST mysqlclient-1.4.6.tar.gz 85517 BLAKE2B f5e604094b06b919b92ecadc8b3f0249dd038149d1182ba882fe6b0ecd34f0bcceeed21b310318ca3291d9483fd3d1ac385c29415e07a8fbabb6cd65ccee8a2d SHA512 11ecb8a0a6f78edb193cd07472579aec1626994a80a584ff74de18774e7db8896de595f3e4d280b78e8636f53323ebcce8aa294ec7b2a54a839742d9699650ab
-EBUILD mysqlclient-1.4.6-r1.ebuild 876 BLAKE2B f86bed107710e37c01deec254d2750225ebf94a98556990aade9aa5f1bac1252a193ca556cc92058579cc5c9c52f08d16ccaaf550e2e685eedc393870bdbfce4 SHA512 a324faf541847499a19ef31219345e6c879c86304936f6b5eb928c00bdc7e9e39681f743cf1a26a53fa99b7db9c0bd8aa774532ccd37626c02940687f313af93
+EBUILD mysqlclient-1.4.6-r1.ebuild 875 BLAKE2B a4009a0d402ca70243aa460671f7472a7fced8b2ee075dc32f0249c4da89f3b4c196215d48b988edf4292fa64000f6f636cbc354984a76bb24e170e2f2df5bb2 SHA512 30a1a45ab4cad9de5e1b948c367c533c41831aa4980d849beb4633649ddf858ca70c55db120b48f063187b516ef7ba4f3825c7857ea9b3c4dfa71d113674c83d
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
index f90942112b29..9dd4e5a530d6 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
index 9a8428445847..f4a056526805 100644
--- a/dev-python/namespace-google/Manifest
+++ b/dev-python/namespace-google/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-google-1.ebuild 836 BLAKE2B 3bd6d4b42336e1c9b57e101c8a3b156b53af3e2d69533c3b979101d9bca8b3e42927d051d52384ee58679f086283b94fdcee6800df5b1230eb8e4c62babd8b2f SHA512 dcc8bdf7b2058c2e6e54dad6b953eb7a5c59371a90376ecec6c41c321735eda1f5ccaafd603569823869257ce179bac41652225a0b152ece331e6b657ab7e1f1
+EBUILD namespace-google-1-r1.ebuild 830 BLAKE2B 4d1f8cacb0974bdbdd85e5629b416dad3f06498e9f4584c4d1c6aff3be11d3bab5843f7968e7770cf996fe120f4a4a2e104879d5d0b30fe0ff8700016468cc4b SHA512 bda66556d8ddd1c408f1d5a5166ccc091938ce67f4d5e4c6ac01726a48ce57dca9b8cb21172970552b69d52f1d949b4e386cb093aa9b1192bcb001f8cecb569c
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-google/namespace-google-1-r1.ebuild b/dev-python/namespace-google/namespace-google-1-r1.ebuild
new file mode 100644
index 000000000000..fbf1dac945c4
--- /dev/null
+++ b/dev-python/namespace-google/namespace-google-1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-r1
+
+DESCRIPTION="Namespace package declaration for google"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_unpack() {
+	mkdir -p "${S}"/google || die
+	cat > "${S}"/google/__init__.py <<-EOF || die
+		__import__('pkg_resources').declare_namespace(__name__)
+	EOF
+}
+
+src_install() {
+	python_foreach_impl python_domodule google
+}
diff --git a/dev-python/namespace-google/namespace-google-1.ebuild b/dev-python/namespace-google/namespace-google-1.ebuild
deleted file mode 100644
index a54997c42810..000000000000
--- a/dev-python/namespace-google/namespace-google-1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{6..9}} )
-inherit python-r1
-
-DESCRIPTION="Namespace package declaration for google"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_unpack() {
-	mkdir -p "${S}"/google || die
-	cat > "${S}"/google/__init__.py <<-EOF || die
-		__import__('pkg_resources').declare_namespace(__name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule google
-}
diff --git a/dev-python/namespace-jaraco/Manifest b/dev-python/namespace-jaraco/Manifest
index fce97cc791fd..3691d3d0c9bb 100644
--- a/dev-python/namespace-jaraco/Manifest
+++ b/dev-python/namespace-jaraco/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-jaraco-2-r1.ebuild 809 BLAKE2B 66dae9c6eef9dca286d8cf4e79b0bdac3e8f8894d802e83ed27dfa70589e8d55553a3a548669a75b117176785a288c83421b6bbbf85722737010595d8e731cf1 SHA512 5b8ed87ec1837f66ee08b8ec96c07153498715727ed624455433636aa72861ba280dde9d469335e432f57ed92288a218436ffb60142c8979c2f4ac7154430fcf
+EBUILD namespace-jaraco-2-r2.ebuild 803 BLAKE2B 87641a3fd780de40865c663eb7cf15f3bff20dc3b2f0b71401c087069d3f6a650a993ded1da8103603f10229b64d978a990df961078812ab3a78dc447ae67f99 SHA512 48b4dc0730e7148318b27f41cab6e22c03694fe5fa26cde85fdece5af5caf531448db8105227fede88a5ad41b519e80a35dc24b18990dbefa8848767a52dfa3e
 MISC metadata.xml 346 BLAKE2B bf549c97be0470c6694566c73fb27eda911bd1c7e38641ccfc90e0cbf33717499177dcd4d6b6ce475d430a04ba395500d41aa5cf7d7938ae8bdd1c0840e0a6e0 SHA512 747d2fe0daa0213a7f9d737cc8c5037438ef9262ba049a7a687e944cb1251b9b3dc39ea03a810b5ca61c7b95c7f1360bc397c4d75fc26746cab5029f7736efdf
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-2-r1.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2-r1.ebuild
deleted file mode 100644
index 7cfab7705f6d..000000000000
--- a/dev-python/namespace-jaraco/namespace-jaraco-2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
-inherit python-r1
-
-DESCRIPTION="Namespace package declaration for jaraco"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE=""
-
-RDEPEND="
-	!<dev-python/jaraco-packaging-5.1
-	${PYTHON_DEPS}
-"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_unpack() {
-	mkdir -p "${S}"/jaraco || die
-	cat > "${S}"/jaraco/__init__.py <<-EOF || die
-		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule jaraco
-}
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
new file mode 100644
index 000000000000..5c395f853ebd
--- /dev/null
+++ b/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+inherit python-r1
+
+DESCRIPTION="Namespace package declaration for jaraco"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+IUSE=""
+
+RDEPEND="
+	!<dev-python/jaraco-packaging-5.1
+	${PYTHON_DEPS}
+"
+DEPEND="${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_unpack() {
+	mkdir -p "${S}"/jaraco || die
+	cat > "${S}"/jaraco/__init__.py <<-EOF || die
+		__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+	EOF
+}
+
+src_install() {
+	python_foreach_impl python_domodule jaraco
+}
diff --git a/dev-python/neovim-remote/Manifest b/dev-python/neovim-remote/Manifest
index 023676294b61..a007e59a4c18 100644
--- a/dev-python/neovim-remote/Manifest
+++ b/dev-python/neovim-remote/Manifest
@@ -1,4 +1,6 @@
 DIST neovim-remote-2.2.1.tar.gz 438078 BLAKE2B abbb056a10acb1c4e21c0c418ee2d6003869340eb34df0c0374b947fbbfa2d2e0f64f61ad571a6cad7ffad7374f1df17a519795e61b37b8d6741d566760759e9 SHA512 04a16a1ed5f4947b4fd763432a14fc565300abe9b480037a462f0c4700535d4854012ff08ac64234dbb1fccc1d3f5ba2174f94effc5564879fbcd1c83fee26ae
+DIST neovim-remote-2.4.0.tar.gz 438687 BLAKE2B 0dfbe3d660d9b2f6b7a4f1016d4d230d63612306ea99079364ed5c6dbae51df7a19c4d1bca51a7bfad142ffe5811e286b843edf6b0715c7aac921c584701030e SHA512 073bf95a0238c76c19258d886fe71e23ec85f9cba200b8a490014a2842d1a84b3c95092afcfdcc8ca80122639b9e07652594faa24ed6a6aff537192ec3a3d14c
 EBUILD neovim-remote-2.2.1.ebuild 782 BLAKE2B 7d7b8b8fd6168b69f5551f2c0a7f9e129bafa1391f3085afb5756bebd622cb021fef4a451023ad9c8def96830222e2c83c3511686b36308b8f18ca831c87e380 SHA512 0fef8c1a73da9bfc3540df682e6f5ea17f42a73429a55897e8edc3dc6490ceb02a73a6f54f72d1ffb750f146c7235b3dc9c548d44ef958c384d43dc83e45b424
+EBUILD neovim-remote-2.4.0.ebuild 703 BLAKE2B 133f32a1f6e90a206c87b7e2e8dec5bfbd85d559203ef5500f882c9103d2e88f2379e924e8cf00c0902cb1f843bcdfb27050113089a74bfe3771a3ec6d97247b SHA512 f890bfcd8698a49718942f8c3ce23a0adf5cd4173063bd4f875648241b91ccc7e5b715779c19cb172e54e2f6de77d9377ce9e701874b95fb43d3956646550a38
 EBUILD neovim-remote-9999.ebuild 650 BLAKE2B 1a539de9625bb01d8ae01757f59fb373e4664e2e2cbab51720a7d571214047d882074845a61ade063e00c83f72a786692fba0d3eadead8d93c4ec4c326a40ddf SHA512 1c4f39e444c14ae4d6a27ec80968c91377c6d97b1aa9fa6216ac1175ea2755011fe2cdd50d91441e5f4414559627d7b2986392dbf87984bc66b64dec6b1a32e9
 MISC metadata.xml 361 BLAKE2B 8cbaa82fad1a726eb2e09bc74bf9f6b18579fa767d56ee20d14c39d8bd7726d8ac044e5072e4cc00686f9acc41e0c9a2d4578705c79a3e84af5318c136c910e0 SHA512 b7a6d140b5642f8326e0d69752c0479319ef0746eaa440fce0a4bb2d36d4428f5bbe42364430906a1baf2dc953283130c5fb3eb7b9f9d45add2a398a1e9f5b64
diff --git a/dev-python/neovim-remote/neovim-remote-2.4.0.ebuild b/dev-python/neovim-remote/neovim-remote-2.4.0.ebuild
new file mode 100644
index 000000000000..e8e8df1ecd2e
--- /dev/null
+++ b/dev-python/neovim-remote/neovim-remote-2.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="A tool that helps control neovim processes"
+HOMEPAGE="https://github.com/mhinz/neovim-remote"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pynvim[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+BDEPEND+="
+	test? ( app-editors/neovim )
+"
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index fe39bb9d8bb0..85d738983ca9 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -3,5 +3,5 @@ AUX networkx-2.4-py39.patch 2188 BLAKE2B e94c8ee731642a596d0812d82dbf85379249a64
 DIST networkx-2.4.tar.gz 1462338 BLAKE2B 90fd7d249f3b022dd9c861dd023881fd241cba0515e2e9991516c278a40b92ee03663eb2b15bd584f179c066529df0587293f9c9a211e7c526addf77fdaf5cd6 SHA512 38eabef56e3667b7fa85206ae01a0a8f5c71bfa2f324bc2490c433cb973508a03955183a0c58ae40390f86d6a4741135cdb426c4c15e53e2f123072f0cac1b89
 DIST networkx-2.5.tar.gz 1542085 BLAKE2B a4d1d1f65a09f8e7cd830a9e670cf540c19b800dffb90aa1cc6ebda8b6116b6181969382f90339254746a3f277d786020506a3c8f10c90ff48999d3b2c3c433e SHA512 ab51198072d20bdba7c9ceb6856631a20a7e9527a7cadb41271a999f57bf60da5488269c6e4e1f3f4f33420ec6493af665386842c216ea1cfadd1792ccb6444e
 EBUILD networkx-2.4-r1.ebuild 1580 BLAKE2B fd4ee5c316255f11d6d90828851ebab513eeafbef8ec6fd9499a7dc88718d750ac2143862ffcdbe8e24910be575dc6e35658845f7159fccdef2020522c58c6e9 SHA512 96aeafb16cad3f2c089daa07121662f5adbecfdae5fa68270f0464130e95c39655849eeb8f9162bd8cd804842a493b25819cb4e29f23a12b4704d6b259f6e258
-EBUILD networkx-2.5.ebuild 1343 BLAKE2B 9d7ded05640aa495e6ed48bee95d8580e93b2dd6beef87c093bac941029b48e19e974bf7a523fe958b37ed3d1322a78d5d96491835de55f0b3f781d39451f9bb SHA512 e647180a28730670d3ee9659c985776aed39a45e36cbcb8ab14ec7a0bbbef8e6281d939c8c144669d260bf9a9ca66efe36716b77f30ec4f725b2ef8e32b469a1
+EBUILD networkx-2.5.ebuild 1341 BLAKE2B c11626738b1d236a56b931ecfd28a5a367738befa28f7e5e9b382d03c5b0b6081260615adb8fd29a57afcdbf5c9f074d585a045b7760dc953ae9b09ba32e8b0e SHA512 e1948968b8d43e0f6ca2929095f6f6516b090f8a5767813b88ebd6889189e2e2605b55d10ffaf77b774fd6b0383bdb6c01f9e7ea9aa69c5a2ecbf5ea6a44d560
 MISC metadata.xml 1460 BLAKE2B 2b3d94eb6c3b4827ff154dc73ecb99a46e8e194150cb508928b88366cfb6842f8b535c738fafb33fe0c4de70829b9a211cc64108621213fefd2305a725d8945f SHA512 3beefd0d791e9799438f097cc78e38aadec92100e013d5a477851f6a8db7a9fde606c3f1d5c2c0f4e75f4c8b3190b5daecf3b7c03b5f06a6f7866d46eecb1095
diff --git a/dev-python/networkx/networkx-2.5.ebuild b/dev-python/networkx/networkx-2.5.ebuild
index e3df9c8c3bcf..452500338b0e 100644
--- a/dev-python/networkx/networkx-2.5.ebuild
+++ b/dev-python/networkx/networkx-2.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples extras pandas scipy test xml yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 04e40a5ba14c..f27fa25f6987 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -3,4 +3,5 @@ AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd6
 AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
 EBUILD nose-1.3.7-r6.ebuild 2376 BLAKE2B 805a479082b87865e782f5de72ad024ddca3bde297cfa7d667a98ca36d395b343c0161defad74f35630b0c94a55f7594ab2df89f045919fb487ab16c1ddef672 SHA512 b930ea4730f8c6095ffe018810a42f9aaf316af9c9b93f61765dcf2a193bd595b17698ddb4d87c00ab0335d49817a8df8ad15f66c870085e046d9418f0d36869
+EBUILD nose-1.3.7-r7.ebuild 2303 BLAKE2B d5903baa2d1e645152220149d6fb06c5b765a426c1b679162bc38c4187fd3a42a8cf9b35196db734644271dda438c523e46f5c737ce79f0a0fb189dfa1b9e323 SHA512 4b1c0a40cd9cbe7bfa4c0fe1416fff644388d9460c6a5ce4df96ea74977cf90ea16140aada6b6c498268eb93ba2c39cdc9964c45bcb011ac7b2a9039a0329c17
 MISC metadata.xml 524 BLAKE2B 90a98bae0d27a49c51aee677f8bdebcbee461d74fad0f349f73458229098ba3038705d63a88c59f90ef8621931e5d3902c0209bd627c28d2b0296deaff4af75d SHA512 4dc9346469b9b3a0b87fffe49db530107a019bd798fba0620b671d71a43805537face8451c24d6ad40bf11ed3498d8970ddc1ce3109398534c9f3c8ed72743e0
diff --git a/dev-python/nose/nose-1.3.7-r7.ebuild b/dev-python/nose/nose-1.3.7-r7.ebuild
new file mode 100644
index 000000000000..f72c21ba2527
--- /dev/null
+++ b/dev-python/nose/nose-1.3.7-r7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
+HOMEPAGE="
+	https://pypi.org/project/nose/
+	https://nose.readthedocs.io/en/latest/
+	https://github.com/nose-devs/nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="coverage examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	coverage? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/twisted[${PYTHON_USEDEP}]
+		' 'python3*')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python-3.5-backport.patch
+
+	# Patch against master found in an upstream PR, backported:
+	# https://github.com/nose-devs/nose/pull/1004
+	"${FILESDIR}"/${P}-coverage-4.1-support.patch
+
+	"${FILESDIR}"/${P}-python-3.6-test.patch
+)
+
+python_prepare_all() {
+	# Tests need to be converted, and they don't respect BUILD_DIR.
+	use test && DISTUTILS_IN_SOURCE_BUILD=1
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_resolve/_&/g" \
+		-e "s/test_raises_bad_return/_&/g" \
+		-e "s/test_raises_twisted_error/_&/g" \
+		-i unit_tests/test_twisted.py || die "sed failed"
+	# Disable versioning of nosetests script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
+		-i setup.py || die "sed2 failed"
+
+	# fix manpage install path
+	sed -i -e 's:man/:share/&:' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local add_targets=()
+
+	if use test; then
+		add_targets+=( egg_info )
+		python_is_python3 && add_targets+=( build_tests )
+	fi
+
+	distutils-r1_python_compile "${add_targets[@]}"
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index 2f570119fbfd..dbc6ace57a4b 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,4 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
 EBUILD notify2-0.3.1-r1.ebuild 738 BLAKE2B 1050c727ef34716a21e4dfeb36a9834de07e110e15c9b68c7b91a14616646a6dc604265f574c9363ad4c7f2e4bbe299a3f81fd2ec9d8f0863a188d70055bc7cf SHA512 a794212cf4033def159205a3b8d4d7b8bde31ee375eb14bb5ede368005f93415cb94a2fe3fc512b902e3338613007b44b674b5f0b89f129f01522084850530d3
+EBUILD notify2-0.3.1-r2.ebuild 735 BLAKE2B 16ec1d30655285131c94d550148fddc3ab004fd052ec6e28deed0509157b5cbfd34ddda4ee26e97b9a82511bf05b8747eb59b20a04a4a3067558ef19a2cf0f65 SHA512 b4a3839a0d37abdc67fa8c3942449a6ca750bd4251a83eb3d3f5f7ea7ff0823a2e924972c83a7a714277fb3a25aaff94d433120d0e7b856affcfd2e9169414f3
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.1-r2.ebuild b/dev-python/notify2/notify2-0.3.1-r2.ebuild
new file mode 100644
index 000000000000..1a165cade8b1
--- /dev/null
+++ b/dev-python/notify2/notify2-0.3.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python interface to DBus notifications."
+HOMEPAGE="https://bitbucket.org/takluyver/pynotify2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
+BDEPEND="test? ( sys-apps/dbus[X] )"
+
+python_test() {
+	virtx ${EPYTHON} test_notify2.py
+}
+
+python_install_all() {
+	if use examples; then
+		rm examples/notify2.py || die
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 694200995b87..b6c1f2ed2aa5 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -6,6 +6,6 @@ DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761db
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 EBUILD numpy-1.19.0.ebuild 3726 BLAKE2B b7ff98d3782d037656a810490a46f8d6a1f9ffa407577b910fcc7a06ce900390d341a06213c5f8d3b6073c7b20053f151f65636beccb07cb055e4dd5a965cc9c SHA512 36ef418f6e17a0cb364bb0f5cef4890fdb84d3a2b748733e35f576574a84cdebfb1e086b8764aa6a14ab887d1730f12cd7f6550a70a792d942622b7ed8602407
-EBUILD numpy-1.19.1.ebuild 3741 BLAKE2B 3d16e9b26a02dc4c6a5a0d34bb5734aa73e161e198cc7e4311de287676c9b4cfd1d4fd982fe6572c71553d284be16978c06f5b170a9674dc747c3c99eb3728b0 SHA512 984cf6adc67ae4dd627ce0209522080f84a12cabac4c809fa17589e5acf1cc59060753d3a5f11cf3e5139904e3b8eeff2aba3f3490ff4551da23d0551756c235
+EBUILD numpy-1.19.1.ebuild 3740 BLAKE2B 7bc7ee8ad4958aa64a38cd89093cc2d866f37e297174eec66d2a131b70cd532c2eedfeb50656055ffa75756c1d701a59aeac99a9e57d107affed5e4854ab940f SHA512 8fb7b254c41c38059532a7ab897198844aab6da031de67c7166c87074bad21c426751f8d0b35d274d76d83eefd8825dccba05de69eb6f46ce0f5cacbeccb9006
 EBUILD numpy-1.19.2.ebuild 3741 BLAKE2B 3d16e9b26a02dc4c6a5a0d34bb5734aa73e161e198cc7e4311de287676c9b4cfd1d4fd982fe6572c71553d284be16978c06f5b170a9674dc747c3c99eb3728b0 SHA512 984cf6adc67ae4dd627ce0209522080f84a12cabac4c809fa17589e5acf1cc59060753d3a5f11cf3e5139904e3b8eeff2aba3f3490ff4551da23d0551756c235
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.19.1.ebuild b/dev-python/numpy/numpy-1.19.1.ebuild
index 48984ec1246c..d550852de8d8 100644
--- a/dev-python/numpy/numpy-1.19.1.ebuild
+++ b/dev-python/numpy/numpy-1.19.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 0a8528555693..7828846a6e18 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,3 +1,4 @@
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
+EBUILD olefile-0.46-r1.ebuild 553 BLAKE2B fa7a66540df05545ab8991a400d905b305c436d24c06e8a14017f49a8e1837e28256b50a17d3d5593f0424b587a845bd07efe32edde98ca8ee260d350def387e SHA512 051bb35b7299ab790d46cfcbfe54c8f44d0e81aa8fa0ec08301710a41ff1af6bd309d81a835e6ef69eabe5466154f60d7c7718f2012b497e20263fc8ad4e461b
 EBUILD olefile-0.46.ebuild 559 BLAKE2B ff2e3bd1e0737050f3d1cd9bf847ebc5e5f89e17dd5ea174b99dc1beb2e36d4021d48e0f9358abc349bef1373f9e6da2f63d59e4e0f50b48fa6ebb81e90078c2 SHA512 86e9252a0ea67104ed6c9537ffbbe51e3a95928db902002dd65e1fa4852d908b333bc010031076b915472a8269687ec168c17011fa4d2db8b28d25aaab74bd58
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.46-r1.ebuild b/dev-python/olefile/olefile-0.46-r1.ebuild
new file mode 100644
index 000000000000..cf09eeb237d8
--- /dev/null
+++ b/dev-python/olefile/olefile-0.46-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package to parse, read and write Microsoft OLE2 files"
+HOMEPAGE="https://www.decalage.info/olefile"
+SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_sphinx doc
+distutils_enable_tests unittest
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 14367429fb13..3b114cba7316 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,4 +1,5 @@
 DIST openpyxl-3.0.3.tar.bz2 2407120 BLAKE2B 8a746409d3424014150bad797923f076ac8ba0ab24ffe0ee75c1d65f02accbeecfdc0ae5d2c6025d0fa937cf0f1c75c8837a84ba0f9d63b3778c14c2899df4ba SHA512 7a17a21a4f3be391e7ab72ef6c5f6342094404f68a9e9ca69f874f1ac2441d81699b91224cd1ccd4fe3e7e5c99ca59088ee532bbd2e6edcab40c27a8f1898095
+DIST openpyxl-3.0.5.tar.bz2 2421647 BLAKE2B 60fc12188a608891a63513177e8e3399b3905ee9b4c4ff1631901ce0d99c3e05bc9413813d3c4f7bb9034e1d839f91e9dea5e610795c701a40d99f1011b08c45 SHA512 5f60f746b7b4bd32a018972f7c18adc0552a6d6904fcf1258db3fab28f21aa7b17e386b355ede41365889146e9aaa09911748a26343788477fd72ad5d1264974
 EBUILD openpyxl-3.0.3.ebuild 809 BLAKE2B f34bb1d7060b8d473d5e8488ff9cdffaab550a648109450f5b17ea37b97dc6551e31ade741ef8f78c40dc446c6ffec21db0b919cb878853d5ff53988620103af SHA512 7d171ddb051943e6c15b3a0c833dcb3ec58a333a64c0d5bdf7d001c9b917c25508d1f8b04cb9e1033ac360069c334a9896dab788af2b7d9fa6feba32c1656697
-EBUILD openpyxl-9999.ebuild 744 BLAKE2B 83fc282e5d97b801a2dfaa72f2e10918ce74ff4beadd3cd1b3235e60847dd8e38ce9289b955a9e9cc4d29b47d01524b36c31b902c1779926c6d54c4bb7e72ce0 SHA512 c8a857c719be0df90775c3709caa816e456cd1f3466931c876200d04c2bcfc1c3f90599a60f366be76364a870ae5d838cea964d16949fdf9663563364dee0584
-MISC metadata.xml 519 BLAKE2B 29b675ac6f0a0e38ae80b3f3f9d1a63bc2027f7d7def1f9dfac5fcb36cfbf19115eb9cbc94a98f1b99eca7557fd96b3d8c8c1aa00f67800de497671fff0a809e SHA512 e9d571588fa37161b57b5a65739ba59a9058392d1e96f004193054ac0605f1a144be1e0d1ba4b199fd1f49365d44e568b8ab00f3b051bb2a736c0c5926aa9f44
+EBUILD openpyxl-3.0.5.ebuild 746 BLAKE2B 2a49898be40ef0f6cd2bb09baf99c74b6d8077cb0c6784123caf135d0a6db232e3db5eefc21c025d0e631178d6ee968cd1d5ca6af28a881f62298b022686e808 SHA512 640cc23cce5fe8de78912baf8d6be2223f19060b6285c72d128642455971ad2e523c4127916b688304ac7a74aeb907b04f88a8f434a7968438e0e206fd80890b
+MISC metadata.xml 508 BLAKE2B 929353e837b5a3add8ba96cd39bae1072953891d0e20ce6223a817ba6ea014deacb8493c9a361445559086d9befad3e936484644d0551e4122a87b00bb06a065 SHA512 77e9c91e35ff72c60ec08596db72c0307126a13f017fc5c772091a427a324a3fa92172e3ed91ceba744e151d6b20a5a10855b4315969704e4aeb08609e0b21ec
diff --git a/dev-python/openpyxl/metadata.xml b/dev-python/openpyxl/metadata.xml
index ee52e74e72de..93dffff67799 100644
--- a/dev-python/openpyxl/metadata.xml
+++ b/dev-python/openpyxl/metadata.xml
@@ -7,8 +7,8 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">openpyxl</remote-id>
-		<remote-id type="bitbucket">openpyxl/openpyxl</remote-id>
-		<bugs-to>https://bitbucket.org/openpyxl/openpyxl/issues</bugs-to>
+		<bugs-to>https://foss.heptapod.net/openpyxl/openpyxl/issues</bugs-to>
 		<changelog>https://openpyxl.readthedocs.io/en/stable/changes.html</changelog>
+		<doc>https://openpyxl.readthedocs.io</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/openpyxl/openpyxl-3.0.5.ebuild b/dev-python/openpyxl/openpyxl-3.0.5.ebuild
new file mode 100644
index 000000000000..76ad7c8bc494
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-3.0.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
+# Upstream doesn't want to include tests in PyPI tarballs
+SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/jdcal[${PYTHON_USEDEP}]
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
+	)"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
diff --git a/dev-python/openpyxl/openpyxl-9999.ebuild b/dev-python/openpyxl/openpyxl-9999.ebuild
deleted file mode 100644
index 957f018d2820..000000000000
--- a/dev-python/openpyxl/openpyxl-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 mercurial
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-SRC_URI=""
-EHG_REPO_URI="https://bitbucket.org/openpyxl/openpyxl"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/jdcal[${PYTHON_USEDEP}]
-	dev-python/et_xmlfile[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	pytest || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index da47bdd1f72f..d53fe5afc3dc 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -1,3 +1,4 @@
 DIST opt_einsum-3.0.1.tar.gz 66204 BLAKE2B a8d2d1246e890d24ea73d129ed1ee99e8fbbca30771c96a48858acb5af5eac93bc73b9e8f1c5f1ece6e0872277de1f01fd1d0f7d27e044fa5f9de09060792565 SHA512 d6c2b95d17f523680e3f849ad2b0a4c36e7102e0540fddee365446bfddad4a26be2aed19060570ac0d1db42ccde8e15f0e7e4c066b9117024a58f8cc8978508a
+EBUILD opt-einsum-3.0.1-r1.ebuild 467 BLAKE2B a66a47c4c1c0dca4fb5ba352a272b3914362e667a5b4e844ef2dee5d4f346dc6f9e26e044ad83ef762840ce7167a05e7e4696b90696de680601765d566256129 SHA512 9a22177c4fc787d795d9590c3fc95f28f6997c1aa0dfe95a3be51318af8d1c807e6d2bba8b3647b4accbc2bd4cfca5a985cf3973a222823f9a44ccada61d20d0
 EBUILD opt-einsum-3.0.1.ebuild 465 BLAKE2B bb2aa8539690d7911c526b49a164900d6ee2145142aa94a734420f6380ef12ae7153cf908c4c2bbb09e1eb285b274d992ecf1dc9ef88f5e037cbcfbdb1d2f274 SHA512 b7816352355a75137195ce4ac6b405d99abd89afdda028ddb27fb16fff1b7eadd99c28a8d612b77afe704da87a56c533440a60955c5e6b52c5129336c2cafbdc
 MISC metadata.xml 373 BLAKE2B e60b5def188efafe8cbea965732384164a8dd735c37d065cfb9b8c3edc652dcd5b23641e11655fe535206823317e8aa9c0c2f2a624e654d511595e36ef8fc5af SHA512 5471c7592bfb2e9ab1f3c47fdb1ab2211debda6e928f2491f17a171d14c95d5faacf03eb105c94d35ab6f5e889f24cc327f5111e8ac8c11527dcca1e04d61290
diff --git a/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild b/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..cbcf6d756d09
--- /dev/null
+++ b/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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/pandas/Manifest b/dev-python/pandas/Manifest
index 035beeb0f361..91ef0301a5bb 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -2,6 +2,6 @@ DIST pandas-1.0.5.tar.gz 5007108 BLAKE2B 6aff9602f8b1642af1dca70c7c596f2978bfef8
 DIST pandas-1.1.1.tar.gz 5213685 BLAKE2B 6604c7def761f8eef4596a9ad6c1afe1f59fdd6181f9cdc9edfa97939a9e668e745ebc0abd8664eda4f864be54740d46e4aa10f32728306b897e397bd6e1f682 SHA512 db93e66956d832da594f04aaa5cb895ea22f66acd0e97ad76f22153f9e872e46845dad5b952b54463ec8ef3e2a73a766eea8d53e980a5508e3a3346429a07999
 DIST pandas-1.1.2.tar.gz 5220166 BLAKE2B 3351bf0e539335b7f13dd6e6590309989c3bd5d36c0fd188808be14a147b828f1a3a14007fc499e2b5f580072b02de8587885629a8ffb1fc70b2577fbd034001 SHA512 a81e9f82b866cc48eaf55c288610b150fe3fa6ba6100c0b13516eb0ce4b569397127b85161e53454d0b2b24f276aa9806baa007a521623aad2345e7b7168cbb5
 EBUILD pandas-1.0.5.ebuild 5713 BLAKE2B b3f9cd16526e1a3e76f5bc574db1e9f39a5f6981ae42309544ba1a2b3902c27238864225630ae1c13d83a2896b082cde2a47f8dd01fc5efd03e2c7fa61a95bcf SHA512 7c364d109a4cfc9be212bd9c819008f142c253d92a30d8f6f7ef546ede9f98f01809009f90f0cc02c011afd9efa3841d24d46fc6a87368ae8a940e32df086cba
-EBUILD pandas-1.1.1.ebuild 5953 BLAKE2B 9f0b4d1cd98ca2a9ed992fb90e35d8d0c47366a7b31f4d2e63028eb0ca5626cf1296c24306551c66ee31380959fa42132635ebf7df1f0365d30926d8b23579f3 SHA512 8aa324990366dbd38efa9eb30f366ea834fef65c1ec72246493e21c7b9bf704cb4cc7bd78e6aa0b253535587ae7d11abe53959d1165c5b373543caf2861938d7
+EBUILD pandas-1.1.1.ebuild 5952 BLAKE2B 25e4f9c8097bb7fddaeffd36468c5e71cac68477280e0c7f22649853982a5ec6715c9656d9e68033f674c5513e0f09a45634feca1a8652d23a19ed897f368357 SHA512 3285f52c91b4395bd966e316793456de6b5db438baf99ca757bc0ba73a475391b3b75cb7085b23a4ba16c7f2215ca5d0fde8d06a38b207ab16fca0c66b7263ce
 EBUILD pandas-1.1.2.ebuild 5953 BLAKE2B 9f0b4d1cd98ca2a9ed992fb90e35d8d0c47366a7b31f4d2e63028eb0ca5626cf1296c24306551c66ee31380959fa42132635ebf7df1f0365d30926d8b23579f3 SHA512 8aa324990366dbd38efa9eb30f366ea834fef65c1ec72246493e21c7b9bf704cb4cc7bd78e6aa0b253535587ae7d11abe53959d1165c5b373543caf2861938d7
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.1.1.ebuild b/dev-python/pandas/pandas-1.1.1.ebuild
index fac714b52820..347189e62999 100644
--- a/dev-python/pandas/pandas-1.1.1.ebuild
+++ b/dev-python/pandas/pandas-1.1.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index 5b9a76edbe2c..d66323cce5c1 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1,4 +1,6 @@
 AUX parver-0.3-test.patch 1078 BLAKE2B d81c48c59ec2f744c70c8dfea7ff6133c652105e933f2de77e6c50c097da5038f3d753e809d2237cb840fe927986ce1cbfd2620c629346ed8f232d7d1770ebe6 SHA512 2d4a8eec787eee57be68d57f6b041e4ae4fb437767b02568b3aa258c8853461922dd7a963fde0be134dd8cbcd4578cf93ad8eba37ec55b26733cc3671984de69
+DIST parver-0.3.1.tar.gz 29110 BLAKE2B da444a77907beac0bebd2dba812c8843052e27de1b8b802b5bdd37feb4ffe1cfdcabb84a91b6e6fe21275bce22e3b43736617df756570c6438af7ffd81a1ba87 SHA512 2ea7eb7be0c58657f5261d7b4729da6caaf2fac67db3fc3f36d29627bdbeba45f6ecb0e4bb251575b621908eb1ff5fa5ede5fc2ef0e041156dcc00548fd34360
 DIST parver-0.3.tar.gz 28324 BLAKE2B b7ffed6f6e03d9409ba512fb43336fa81ce4152fa066703c1de122f709410c946a1ce6fcedf8ddbdb0c9af66d8651c597f2abf3867115d89280381c6fb1f24e8 SHA512 0b31ee3c3fc24b056a97ccb9df10dec69ca66f4690b7f01ae84fbe583b77cf713b98d207eaf7a34c2192eecdf4077121154fe9b59aa83fe4836080cae729a90d
+EBUILD parver-0.3.1.ebuild 813 BLAKE2B 720422f4cf91f64622db19f5e87a5d1d1edad857738e3a5b3eb7e57e7562fbc7ee2c988cb752f10466a9c516b406a2d59137982457c309117615a0f8237594ec SHA512 691f586330a9c0a193bc652190c74d4d4364a38c20218b54021acaddd93db3207cff4165f32e94317b8b24db9f662967d6521476a27be58fcec714b6622c5461
 EBUILD parver-0.3.ebuild 894 BLAKE2B c9e4a89ae9badb85b3ae97db8f92a2e71208b11b56bcdc67f733d4d8dcb7afd0eb31021e4c455b0ccb676020fc40bb01ce6f79c21b2cbdcb6e3584c42ef9aca4 SHA512 5447934cc17277e5354b3fa8b491d852163f72050b0d2a97abcc53c69ea4ddaf5360cd59bc16f0a59777d56bffa5828f77392471c6b88bea450e1366d7481952
 MISC metadata.xml 433 BLAKE2B 816ccc76bf4592a65bb9577c64a81ad4dd6643b8db012506a931ed8420d68d18426085f9c6f13f3bf82679ecdeda9967f612571d54c6c09c0ad795246e41cb04 SHA512 9f271e8d1fdeee78d5a3c8fefbd1f9e1dfb999fcead3ae86453f63d4d9d44d36951fd7342e1512483eabea11515c729beea1041c28cac6b7255ad33522bbe569
diff --git a/dev-python/parver/parver-0.3.1.ebuild b/dev-python/parver/parver-0.3.1.ebuild
new file mode 100644
index 000000000000..3cf5e0976c79
--- /dev/null
+++ b/dev-python/parver/parver-0.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Parse and manipulate version numbers"
+HOMEPAGE="https://github.com/RazerM/parver https://pypi.org/project/parver/"
+SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/arpeggio-1.7[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	"
+
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unlock dependencies
+	sed -i -e 's:~=:>=:g' setup.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 8b5535e9ad60..0da6e1aefe6c 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,5 +1,9 @@
 DIST Paste-3.4.3.tar.gz 630569 BLAKE2B fa81b60ad048a2c999d4e57992f5a5603680bf7505f13a8618a55425b388ef906ceb2e118821d689905a20e7ec2b31d27a6aecd704f529540db6c4436f30268c SHA512 0869a3330a74cc14f88fb5ce24183328ec38fed1fc5cd669b428f09ee2fcafc770e95c2f4dc8de86dfce4d66861bad26c9502cccb81966c519ca4593ada094b1
 DIST Paste-3.4.4.tar.gz 630575 BLAKE2B 1d81efae1e1a783daf2d3fa86eb2e80cb95173a4bb182326c27471e2612b7de047bb3d98c0943aba9600f9888d760f39edd7c93ff4c16fbd4c90f68ebaa0caf6 SHA512 f977fa02b6800be27f703115b87987dcf8a1e4edd681f253b20fb363bfe625109b424ec6a0faba066e1d074f55a2ba336e17654f899b3100c9e3c3252d38b5a6
+DIST Paste-3.4.5.tar.gz 630575 BLAKE2B 2b6f08ed330fe4657bf12b4dfcc0cab95f73ec2647decaa5cb81635f7f2813814170615d1af945640f5bb2fc605f678fc20713b3016f55ad69e9e9b658938408 SHA512 cffc7a36ea880acfed6878a8865161c35263a3a056e853cf0d7c5e4dd2101d9462a4bf71a36e9f4c707c8fc11ae23ad2d0ae31080adf8614680462e489f47d3a
+DIST Paste-3.4.6.tar.gz 630593 BLAKE2B c1bfa58be8bc182878f0e67c89b09896152e1be993f301bc3ff1fd2673439146f3e95b0e2247d6c3cf43c346f67c7fdaf8a7721dfd0967f71d6346fbf62bab4a SHA512 64cf2abdd40850704060b3a07d1999dcfd05e19bf27270f7918c5c8683a4b1638d04da13d09f9f671b8acf069e26872d5932d5f0ed7022fd5cdc6bbda7602433
 EBUILD paste-3.4.3.ebuild 1094 BLAKE2B 42c35e023b4d38e2645cf89004712660142cd5860f2f65d3ee37745662dc7d4d991525a7e15c6d1068b934ad4de5cc73f3e9d1a60bc9e99e5fce64598135540a SHA512 0621ce3e077a240b7fe1f3d16e49c5ffad728502a8c3279fcea1cb53ceaa7a1575034ae41ac65a0a44145714fe9a95396f2c7539151fb9ac13243829724bab78
 EBUILD paste-3.4.4.ebuild 1103 BLAKE2B c5ad50193533d210fac4623a9de9cc8b558116e355feab4a6a495b09e7a757c09d2dce160f3079a1fba8843b1866443692ac5fd1dbcfbc058528b7e3133a79f4 SHA512 8ecf848ad049463f59557961afd799f6094b7a9f00ad765432ed89566af3739a977043ad1cf6f06bb447631ed904f3b08772154b05cf14d392ce930784240aac
+EBUILD paste-3.4.5.ebuild 1100 BLAKE2B afd13d9c10accf4aa274a5da8ae9e91717efd228ba79ebee0a03c4502d27eaefa6ff313de258b80b056c5fb1620a60788fee9713afa095aa3d058c6c71ffab51 SHA512 e9098c0514c335acd7d3ffede9e74271ea0406555526f8baf545ded1d1471cef97fa2fe99fd3d48a70a0b7c5e3675a9a4fe8352d7304633ca9c7f3dd5fff768a
+EBUILD paste-3.4.6.ebuild 1100 BLAKE2B afd13d9c10accf4aa274a5da8ae9e91717efd228ba79ebee0a03c4502d27eaefa6ff313de258b80b056c5fb1620a60788fee9713afa095aa3d058c6c71ffab51 SHA512 e9098c0514c335acd7d3ffede9e74271ea0406555526f8baf545ded1d1471cef97fa2fe99fd3d48a70a0b7c5e3675a9a4fe8352d7304633ca9c7f3dd5fff768a
 MISC metadata.xml 627 BLAKE2B 544d8a892fba33e583c08d31ff232d71c71397981b5d51f721545e9d1dae4342b68741d656d8eba8988f57eb9a6990adc2827c4f2f4a7b9262fa2be9bd9740be SHA512 a49e8e5ce28d107c97b02b00e7c0b3c260c780fc4ac7d80ea3e8163cd5a8fb44756470ad2603b0d9db312e5cd36b0039eae61dddc0339618ef0c6ee675f1ef58
diff --git a/dev-python/paste/paste-3.4.5.ebuild b/dev-python/paste/paste-3.4.5.ebuild
new file mode 100644
index 000000000000..87576606a344
--- /dev/null
+++ b/dev-python/paste/paste-3.4.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_P="Paste-${PV}"
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="https://pypi.org/project/Paste/"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+
+RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# TODO: 'Address already in use'
+	sed -e 's:test_address_family_v4:_&:' \
+		-i tests/test_httpserver.py || die
+
+	# Remove a test that runs against the paste website.
+	rm -f tests/test_proxy.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/paste/paste-3.4.6.ebuild b/dev-python/paste/paste-3.4.6.ebuild
new file mode 100644
index 000000000000..87576606a344
--- /dev/null
+++ b/dev-python/paste/paste-3.4.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_P="Paste-${PV}"
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="https://pypi.org/project/Paste/"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+
+RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# TODO: 'Address already in use'
+	sed -e 's:test_address_family_v4:_&:' \
+		-i tests/test_httpserver.py || die
+
+	# Remove a test that runs against the paste website.
+	rm -f tests/test_proxy.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index e82572a71ae5..9f924ef9f449 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -2,5 +2,5 @@ AUX path-py-12.0.2-py38.patch 602 BLAKE2B 5a836612a8fb6e85595973eedcc39720cf59b5
 DIST path-14.0.1.tar.gz 73830 BLAKE2B 7528f90708423802dbb177309b1a608bf8dd6b8b1563fcf3904a805830b1c53b76866ec8055bb8d4afda4adb88209b789aed90a33916e450748866479cad1889 SHA512 195abf3e70f3e82566653c8a1154047a8ab82b98eda09a2ae38ba8989e382fd3225fb5c772b827be54a3eafa696829afda2a0198d1bef7ee369e6dc40b0bf11c
 DIST path-15.0.0.tar.gz 73642 BLAKE2B 186b77b6571dd878a5b64b575289bb5ee549145ccd0c7b858f99c9e3772cf98f2cc7ff5da759e7fa660296abc49c053a388ad95466c51adccce2162c682c6566 SHA512 e41684c576b959e27258f60c0d8b69719c38a5a7a04d9646089aea91227781573368a08f01230dca831732ae687741d22caf52efd9a481378b8d4e77627fe3a5
 EBUILD path-py-14.0.1.ebuild 1416 BLAKE2B 855c9725a45b11734fd99bd03f5b2ecb20ca3a4aaac623380eb6121dd5302f5715b2c4e33d4136780d5b70a0d798597fb2a42d4320f7f39562ebb4eb508af5f9 SHA512 8395bb60da8df801e43581bdcd9a5b247f166e141032ee26e29714079becf7977f8f3ae713a6ff7092ec9d6980d521a6133c9c337f779e87a8313f93530ee037
-EBUILD path-py-15.0.0.ebuild 1253 BLAKE2B e67759daea90401a8b89abdfdf0434f1a140bc43d6e7b9c448c43c390237c01be3fc097cf5285eb6ba35076b2f1542180c0ff280e44c5becf8f088c91c1575a3 SHA512 dca9e206803c8e3b34d38e05d2fe35b7ec647b0a3ec771adb4fdea67164660f317c949e3f53876a8e66f02c22fff008a69d584e7adfb2de7076eb5a0c9f9ebf8
+EBUILD path-py-15.0.0.ebuild 1220 BLAKE2B 853fdab38de7c0b846b7ce1ac61b3f2dc04683e95db199b0b7c9268a5b870049e0e5f93db8c6683f657e1b69a0040f256105caf8329ef168e34f8a62a2372532 SHA512 d720de9a1124c4cfa3f2303826c260af674b88330c4b6ac11a14e46a680c724defed4592468608cc209f093ad1a5218bc771c7e2343feb3f5b5ea477eabed8f4
 MISC metadata.xml 401 BLAKE2B 5a8d84aaf65dc91b75cd7222e333e75f9bd6654ce4f9d55c91a8d28b141c5fc982b8c8a6a0b3b4f1c04fcf05fa56b13725062233961f323383110ace44089da6 SHA512 415b7917fd35598bd39c03ec7ede5e0e13266927b73647a995abb62d56004039aacebaeade95be39a265ef3944c35f3c61145cdb2100e563d8125753547bb729
diff --git a/dev-python/path-py/path-py-15.0.0.ebuild b/dev-python/path-py/path-py-15.0.0.ebuild
index 13c63b0ca9e1..1389d65eb266 100644
--- a/dev-python/path-py/path-py-15.0.0.ebuild
+++ b/dev-python/path-py/path-py-15.0.0.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 62d2eb02c8e0..5c1b1b9f1829 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,5 +1,5 @@
 DIST pbr-5.4.5.tar.gz 120510 BLAKE2B f0f22a25e41820a0848aface6c241e38d8c4500d14ac3c8abf3d3b5f3f2d88680505d43f045589d700e9c07ade1643712274b156832246ca3f2050f44e4cda26 SHA512 b53ca10b7af7e365ff99ecf11942d3f047112d69f7e963716d07bc156077b08d79bb708bb93aae342e5e03c83278507b6990137dc34d0ebc11de53bd57ab3654
 DIST pbr-5.5.0.tar.gz 117967 BLAKE2B cc3f023493150f0687ede07ccadc3abfb4a8dc5e0cdc0f9fd946d3a28fe2cf496683f37f934a5555875b5ac0546a0c0ed99e1bc2f7be53b47ec68d64d27cb78a SHA512 ce187787d5a51700d854790b329274aafd7d4f9e724b1b69b5ea8684cdc58c738274d30fd85bb890671bb77f2c7c88ccb488ea11df7ae9fd0505b4dc29292889
 EBUILD pbr-5.4.5-r1.ebuild 2296 BLAKE2B 0b406a9dc60649b7506a02b34854927529d6815d0e9ecbd06668a25af601bfce81b451407f7403102fd9f001aeb17dd4083d22585f3dbe7ff59417a22c0c088b SHA512 07fb007759938be0866bb33a75c346a889f6df35651210e5ab5785efb53d5627d2f4544de57d81ef075b99593901b6b9c377dd93f7ad11d9b860ccdbc22fbb28
-EBUILD pbr-5.5.0-r1.ebuild 2120 BLAKE2B 13de15d7a4fc9779ab19418c4fb7cbfe316c5e92ec856a5dae2e0e618276b4c0717cb040940ad09895c60de482920e98f9173ea4a2438956de08ce50fc09b0f2 SHA512 f14317f1668fecca804999b43825d41eeff01d4d78747b0d5829937b51d171f1df5ae125ec5585fdcb6533011e33329f311d240d7608c426c36b2a57adaf44c9
+EBUILD pbr-5.5.0-r1.ebuild 2127 BLAKE2B 066c4f0655f574a9301f682be45a782e53530d1ddf23c44871729284d4a2ab90c5ddb63847e486b1b4f2b3aaed99d5a51c4abe367782cb47f5710a47f561f0b1 SHA512 391bcae51e982bfd629580989e544a21707894e305c8d686bf8fc30af590211a042ee945e5f0c2b663ffb31959cbea35bf1afab7181ff514a8f388e84feda31e
 MISC metadata.xml 818 BLAKE2B b3ed054273dccfd8cd24f2e86e1505be70445aa45d193d37c30e6f5abcfcab489d59cb6a1e11d54cea70bbbcd152d9a208dc32237058537b99061172f573b868 SHA512 3d21678a6769bea88b901391d5df75882798e49ab5266ab7d5a73282c30793e479ebbe24cbb5b7d35ad19b517996e52243d238632a390f136ff30f77f54436fe
diff --git a/dev-python/pbr/pbr-5.5.0-r1.ebuild b/dev-python/pbr/pbr-5.5.0-r1.ebuild
index 7e7e611dcad7..09ae1032c9e7 100644
--- a/dev-python/pbr/pbr-5.5.0-r1.ebuild
+++ b/dev-python/pbr/pbr-5.5.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 4d657ae7dd62..93089b548da8 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,4 +1,4 @@
 AUX pexpect-4.8.0-sphinx-3.patch 761 BLAKE2B 609849b3587cd5eeada58ba5065111f3d5d38514d525c49682a9554fe5b21c4b5994ad3cc70725c1a73e19daf03c66644a7fa0ac880d87e912620263396df3d9 SHA512 d6cd0c3554c83c0092f46a2254dbe1752773abd76c220e0eeecd4a416f01ec57ecd51f26011e17d03537746d24f913472467d9ac8b569bdc168b6975292b4cab
 DIST pexpect-4.8.0.tar.gz 157037 BLAKE2B 742642bd6b9ec3f6cdfad054d4fd22db56b4a55b746d675c27a8cdf824ea749ec4589e296dffa08778195f3ccd20feb56bc0fd5212984396ea5aa0555c41ca96 SHA512 7447ae2d1e13be422c894a8fd51c5aaa788e37ea7f0c798c88b77afd401fb3631400a637077ccbb83c2e3876b0d0c5e1dbd5fdc9d3739d785b4d5ad7c0192580
-EBUILD pexpect-4.8.0-r1.ebuild 1260 BLAKE2B 55a81c13d04a7a308f04c7c621cd97d87bf8ff98b848634797304a8b78c147df049c5bf405bb65c4f3cd05460c306ccfeafda66de241945c1a99618641744c6d SHA512 4a8c32048b25f0a4edbfe94e746f49d20316aafc48799dff9690743b840c422eb9bd3cd3e10025e4a708acfc1bede2f86f084b1abe845e73a78dc3391a67d7a2
+EBUILD pexpect-4.8.0-r1.ebuild 1288 BLAKE2B 6987dcbfe95d60957b3a08d9ed4202d80dcae53ceed33f01d8ab91a002215a8438aa98db3f2bf338b6da6eb9b56ffa8b798c2f17118999f8adffc9b177278dc0 SHA512 d4c92b79623257e1e92a519e41526a0910f8f345fe50a630ac517a5086993248aade656811318bbf8f4c507206901ff5068e91cd81d17978b441633064921a16
 MISC metadata.xml 402 BLAKE2B e6c1f9d8cc5397177b54d7bda059a281267e005b9391e6d18e3b70ec3e6fd09bbdf1d214a105e608e3a43f34f0f6e5d7e924366e33647fdfc7d68283c8749d06 SHA512 bd48e666243651d02523b111ee7d8073ed10b8813765f19c7d17e12b7b84bf58be03a157486fcaa65f34866a983d46885723d944348a0cc16b9bb05cc474ffaa
diff --git a/dev-python/pexpect/pexpect-4.8.0-r1.ebuild b/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
index 8a77f172f4c2..9421d5c0fbc0 100644
--- a/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
+++ b/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 52ca9bd1c215..141c23f2e5e0 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,3 +1,5 @@
+DIST pgspecial-1.11.10.tar.gz 45560 BLAKE2B f4554eb812fadad984f746e8035a7a91f22480321df920bd15b96239c571c13cdf397ea38ea122f0a73167924a902955a1eb50dc865ba1e4445324358c3e3cef SHA512 452f217055873d3d1acff6b9b5016a3e721bffd4349aaa975aefe3ae1e25ca576f90eab13e7f913ebbfb796ac7b81dd8ed63c8e6d055c2ad7f8fd9d72ca8c21a
 DIST pgspecial-1.11.9.tar.gz 45009 BLAKE2B 3ae53d4225d448c3291d6701caf7388023d140678461a5811673c7cc7ed242fb0c18ea38427210366f58f1886894def348051469c23aff20be7abc5e5c96622f SHA512 b07083ed715a6ac3d1b32ac954b83852fcb154f4b2757fae91ce7c35524576fa8caef5cb7201d313eac783bc956ea89c9d68f099a11c332486d677dfb185caca
+EBUILD pgspecial-1.11.10.ebuild 638 BLAKE2B 907634b51799a7e46a08149ab962d6965cb9624e792fe722bf70a965122b2758d6d646762f3070b0d534e0544531a1c563e1190247ced3f05a232159ff7dc553 SHA512 26229aa2328883bd4ad613eaf9c4e4a3180c6478506623411429057406cd3c0f3e2b8fa0f047ecf412b4d4c71f98a8c6205faa98bc06edb64262544bc43dc936
 EBUILD pgspecial-1.11.9.ebuild 592 BLAKE2B c548518a8ea514a966c18745685cd35ab84ca681b83f1a3b32eac83dcf665fad182a8b2f745784bd3ac864da9a3422f8db291004becc8ee95a148ce08882cb61 SHA512 d95232a3a5c7773045a725b5b06af4c3370ff8a669a0a725bd6b2a0743cec4239669d41569f8b223487bed6447fda907ee74a1d676a2305acb2c24f0b1de1596
-MISC metadata.xml 252 BLAKE2B 3ef06410049f2fb424b0c05625f4713d633f0f56755817017edbb6dd335b73ea5f7d74c9d5dd4264ee1afbc4b44e425d062d026a12da84ccc1ee764e08de2036 SHA512 c4cc955c7e074d7173b983b935f1c1628d5d90c7eb640a7663b87509c8b68668cdbea2cae7b48add16ebaacb00dd178281b5793c181dd719537cf8b7b1412062
+MISC metadata.xml 634 BLAKE2B ea219e5ff71cf035dce0ac8a9159e8efa396b940ff0c1daf9e29cf820685107a3ffd074dbe5af26c8f690a0d42364ebedc68095ca04ca8622250e67089b7c714 SHA512 d2df8be3ddcc1fa7c21ece2d708efb3fd23af587a5766b922398f6e4bb1c2b37137e0613168fb2629e2979623bac7ac6201bf10cf00ccb66da5c3881d5b3f69f
diff --git a/dev-python/pgspecial/metadata.xml b/dev-python/pgspecial/metadata.xml
index 7afccfdce85b..aa7641b8040d 100644
--- a/dev-python/pgspecial/metadata.xml
+++ b/dev-python/pgspecial/metadata.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>andreacerisara@gmail.com</email>
+      <name>Andrea Cerisara</name>
+    </maintainer>
+    <maintainer type="project">
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    PGSpecial provides an API to execute meta-commands
+    (AKA "special", or "backslash commands") on PostgreSQL.
+  </longdescription>
   <upstream>
     <remote-id type="github">dbcli/pgspecial</remote-id>
   </upstream>
diff --git a/dev-python/pgspecial/pgspecial-1.11.10.ebuild b/dev-python/pgspecial/pgspecial-1.11.10.ebuild
new file mode 100644
index 000000000000..1f8952ae4e42
--- /dev/null
+++ b/dev-python/pgspecial/pgspecial-1.11.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of PostgreSQL meta commands"
+HOMEPAGE="https://github.com/dbcli/pgspecial"
+SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+DOCS=( License.txt README.rst changelog.rst  )
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 4966cd3f9b2f..d4e666fc4cb7 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
+DIST phonenumbers-8.12.10.tar.gz 2254112 BLAKE2B 1fa0faf7347371a548b5e890e3cf8ba9daa32275670f40f7efe507ecfa817a3c372d5b47f2b91a1366bb519657447a614d3579bf69ba3249255c579e37ae883b SHA512 14fcdaa76a61624db2c4d4290a3df27252d985f889b8fb29c80971b88b502a5fe74efa0a110ee3ec92459b8d6a1ccc03dd5eb211b6addad741c9bb7527d5e600
 DIST phonenumbers-8.12.8.tar.gz 2249617 BLAKE2B e02f851774bee9806f01b0359ea4e159c8c890a815edf45f19162dc35972aaa3c84f9e2e19a51ef3efb053d4e307a4d3a31b664a7fffc7c4ffe9a7c6c281ae86 SHA512 0897a5298b5aaee7c0775e12cbe35a6e25b85a1836d8302abc5eee7e327fc559bc06f3130c63ac5aa14207900d1615f3a7cd4137d6561855e4ad38b6e4af220f
 DIST phonenumbers-8.12.9.tar.gz 2250397 BLAKE2B 06b3f8beefe3c1e5cfa4d0f9bb550f40e568692f711513784001e9bad9d3805adc42ba0bdacfa292935239c6bcb47e4723a72da160efde21269308329299fce0 SHA512 0f1de43bd56ca05920721cc9639249bffaa6516f4713fc54b53491e4ffecceb357a26cd9d6126ea9e91eec1bb1fb4bf2003f95f1d62f61ae2f1275e0dca58e29
+EBUILD phonenumbers-8.12.10.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
 EBUILD phonenumbers-8.12.8.ebuild 433 BLAKE2B 05a63352cb4e9522f74d8bedc829b3f01ca7396c2cafd311ccec56a4079539d9c6784abea36076454ddc5fc27911323130cda292240e3f18b5510f085e0c8cfc SHA512 58baa6deb1d024174a2d019e63420ed0a33817234b643530ed9006e62644873540fe8f8dc4e0fec7152fe153e0709db6d8e66b91c216980dacea323f6dcd6f5a
 EBUILD phonenumbers-8.12.9.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
 MISC metadata.xml 517 BLAKE2B fbbefd64340f179046eff07f02cfc01416d9c99817d8bd4061aa908eaabf59560e704e40876b5d514389766b26697ee811a1a4ef9ee5a306790156892f45e8d1 SHA512 5246cff049767fba3892ae49499127453cc26806d3eca35de98012c71df29cca4192d104810ea21921a1160e736a2225e3538e829016d9712a0b489be0e5a17b
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.10.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.10.ebuild
new file mode 100644
index 000000000000..4d3183b1591b
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.10.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index dcf29b6e4a9d..55febb000aff 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,13 +1,10 @@
 AUX pip-19.3-disable-version-check.patch 872 BLAKE2B b0398674f56b78a066c4308f0a8ee0272c5c4c3cb569e6c300ac62fc9fbe8ec2a1bfe257047c15ddcf9cc44c47b7f8b9ab99e17b722bd6ae4cf9dc2a168e01d6 SHA512 1ece773f66556e4380eabf76490430e8fbec23f7cfad27dac02c7e49f7136b632515ef04843e89dfae42c095dbf5280d64e61da1544801c998f802aa59be8e22
 AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
-AUX pip-20.1.1-test-endian.patch 2779 BLAKE2B 63fd87aed4edb8c9cf5c64b3055c345234602a9dafd0b58b501bd30f5026ebd683720a9ad2931bbb9db2c35841fe6cac19a88a5181b195c9f0a4e4e590b18094 SHA512 21f52dc64746e5d8e5c0d92c3f9b6a75da0316eeafad49fccdbd92c8b560e083d4ffedf148590c6f4265cc367a67b8e70890c14d0f718934f4ca4ddea82bdf50
 AUX pip-20.2-no-coverage.patch 6154 BLAKE2B 743dcacd3107d9c6447197dd01bc85b1b16db5b1da3bf5f84e73801e645848a98854f350d958056eb17aa6b87f8bb2557a27e3bd78582958c3b37cb6ce61d7ce SHA512 67ea11c56b6a7b02faae28c9d941015ca2ba9c125dfcaf01eeaba7717cfb22f23fb84c28f993202f7b648ee64741baaf7545e9951be840d378e39d3af0a60fd0
-DIST pip-20.1.1.tar.gz 6503229 BLAKE2B 5b0409042c970ec47fa6f947b21a53aca43563a6bb442fd5f91788fa97caf7167a84b4f581de87453eb0e55657d2ccd11dca2d1815c3bfe9ef5923994306a6db SHA512 ee7b0345c08fbe0215811d07b4c57c1ceece826871842f6d1c174d82e8eee0ad810aa5413d6763ecd5a513e151792a53c36623ab99d2049555ef2542d32d1658
 DIST pip-20.2.2.tar.gz 8719081 BLAKE2B 642a8e9b2f7c3dc08b7e8f7874b7d1d988622f50b9430939060c3b9c086ae7bdaf4a58e9709376e0d36411fb2b492d4e44ddb6282f1fe12d7c8b9ecfdb1c0482 SHA512 0b000977f169900eebd4afeabfc7bd59b104246bbb048ce5b4db7f701e20ef1caef22c7ca2311843eafc4a37abbb81a74beddddf655eeaf2e33e3949d5a811e6
 DIST pip-20.2.3.tar.gz 8719284 BLAKE2B 280637627750302b11828f066b949df7a8d38c6fbdb7532a41eed0d4bd5b83a24ec717e9f57ebcf9d246a0c5aeb272bdaefc9299926dfe308ce20b84e82d81c2 SHA512 b2f7c6b2d5b0c3d743fa8b1061196f8cedf7f106e0cb87507070f1d930d1f1c8a875c800b2d1f7be5b9cada1ba6d3e5b2d7e2f3bdd42e43fd5147536ec1bdf48
 DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
 DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
-EBUILD pip-20.1.1-r1.ebuild 4075 BLAKE2B d91549b341b0b348162612e3d06022c441225b38dd8d0b8383150aa55b3077928bf1a670299fdbff06f240511c0b26a5f9f9f51702053bf04867fe69268b636d SHA512 f61c586e14567dbce823340cceccd75d8d8adde3f7df8a9ab10a0754e7c071047b3b2b64c3b6dc10dc3d8f012f0ca6e2dfc0ad93f370fe0300422af3bd1aadac
-EBUILD pip-20.2.2-r1.ebuild 4154 BLAKE2B be5d200d5d4e52020152f4fbdd3f43e2b4b3841a02a8fde9396c10c340ab1d612192ca549c847094f63b7fbd12d7b58b2c50228cefd23c069c0648337ae33fed SHA512 d393a995f3c554f96d0f7a95bb97bde714bb173bfab67cd19312ff47ebcc134f91fdaa1a60c174aa0c0149ebf6d71904b38f96ae1c66d7a02b12fdf9bab2af83
+EBUILD pip-20.2.2-r1.ebuild 4152 BLAKE2B e91199206e94eb1b3a83a9aecb20d53660fbf118963ca7f07cea0093a1176ea9aab450fdcff1f2984a77743847ca0fc08aa67bceb43eb75608ab0cc1217c7ef2 SHA512 8f9e73d690d8e318038891ee42d0b1550eeac5e66cc7d0a09ddd4b46b3c27c5d2eaa6ac6d0e509ee29f9a3f4f6d90f7b0319eed87a1e45e0bb44fb547b63db02
 EBUILD pip-20.2.3-r1.ebuild 4160 BLAKE2B f47df62e17beb0f818f07f6cd3387c3a716a8f99962eac5c13744d730e2990468c6871d69ca3aa971efc69ae0abbaed6ef7f00cbce1f9774f0a3a31bae7b4c10 SHA512 f11ea8026b81fad0895cc8b0a2e85c9a5e4a4ecf2f3662b192f46167da35ff78ab054238392acab18572a35e1850e75e0886752e64afc7d7aa34955ee946b0fa
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/files/pip-20.1.1-test-endian.patch b/dev-python/pip/files/pip-20.1.1-test-endian.patch
deleted file mode 100644
index b6aea145656f..000000000000
--- a/dev-python/pip/files/pip-20.1.1-test-endian.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From b30dd1e04e1f37901733f1be0a5a1e02c466ad0c Mon Sep 17 00:00:00 2001
-From: gutsytechster <prashantsharma161198@gmail.com>
-Date: Wed, 15 Apr 2020 19:54:48 +0530
-Subject: [PATCH] fix(tests/unit): Update tests to be endian safe
-
-This updates `test_path_to_display` and `test_str_to_display__encoding`
-to use the endian safe expected result instead of the hardcoded one.
-
-This fixes https://github.com/pypa/pip/issues/7921
----
- tests/unit/test_compat.py |  8 +++++++-
- tests/unit/test_utils.py  | 16 +++++++++++++---
- 2 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/tests/unit/test_compat.py b/tests/unit/test_compat.py
-index 1f31bc5c..b13087a1 100644
---- a/tests/unit/test_compat.py
-+++ b/tests/unit/test_compat.py
-@@ -2,6 +2,7 @@
- 
- import locale
- import os
-+import sys
- 
- import pytest
- 
-@@ -91,8 +92,13 @@ def test_str_to_display__decode_error(monkeypatch, caplog):
-     # Encode with an incompatible encoding.
-     data = u'ab'.encode('utf-16')
-     actual = str_to_display(data)
-+    # Keep the expected value endian safe
-+    if sys.byteorder == "little":
-+        expected = "\\xff\\xfea\x00b\x00"
-+    elif sys.byteorder == "big":
-+        expected = "\\xfe\\xff\x00a\x00b"
- 
--    assert actual == u'\\xff\\xfea\x00b\x00', (
-+    assert actual == expected, (
-         # Show the encoding for easier troubleshooting.
-         'encoding: {!r}'.format(locale.getpreferredencoding())
-     )
-diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
-index 7d74a664..ebabd29e 100644
---- a/tests/unit/test_utils.py
-+++ b/tests/unit/test_utils.py
-@@ -375,6 +375,18 @@ def test_rmtree_retries_for_3sec(tmpdir, monkeypatch):
-         rmtree('foo')
- 
- 
-+if sys.byteorder == "little":
-+    expected_byte_string = (
-+        u"b'\\xff\\xfe/\\x00p\\x00a\\x00t\\x00h\\x00/"
-+        "\\x00d\\x00\\xe9\\x00f\\x00'"
-+    )
-+elif sys.byteorder == "big":
-+    expected_byte_string = (
-+        u"b'\\xfe\\xff\\x00/\\x00p\\x00a\\x00t\\x00h\\"
-+        "x00/\\x00d\\x00\\xe9\\x00f'"
-+    )
-+
-+
- @pytest.mark.parametrize('path, fs_encoding, expected', [
-     (None, None, None),
-     # Test passing a text (unicode) string.
-@@ -383,9 +395,7 @@ def test_rmtree_retries_for_3sec(tmpdir, monkeypatch):
-     (u'/path/déf'.encode('utf-8'), 'utf-8', u'/path/déf'),
-     # Test a bytes object with a character that can't be decoded.
-     (u'/path/déf'.encode('utf-8'), 'ascii', u"b'/path/d\\xc3\\xa9f'"),
--    (u'/path/déf'.encode('utf-16'), 'utf-8',
--     u"b'\\xff\\xfe/\\x00p\\x00a\\x00t\\x00h\\x00/"
--     "\\x00d\\x00\\xe9\\x00f\\x00'"),
-+    (u'/path/déf'.encode('utf-16'), 'utf-8', expected_byte_string),
- ])
- def test_path_to_display(monkeypatch, path, fs_encoding, expected):
-     monkeypatch.setattr(sys, 'getfilesystemencoding', lambda: fs_encoding)
--- 
-2.26.2
-
diff --git a/dev-python/pip/pip-20.1.1-r1.ebuild b/dev-python/pip/pip-20.1.1-r1.ebuild
deleted file mode 100644
index 1d87f8aac745..000000000000
--- a/dev-python/pip/pip-20.1.1-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-SETUPTOOLS_PV="44.0.0"
-WHEEL_PV="0.34.2"
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
-	)
-"
-# PyPI archive does not have tests, so we need to download from GitHub.
-# setuptools & wheel .whl files are required for testing, exact version is not very important.
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-SLOT="0"
-IUSE="test -vanilla"
-
-# disable-system-install patch breaks tests
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/csv23[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
-		"${FILESDIR}/${P}-test-endian.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl \
-			tests/data/common_wheels/ || die
-
-		cp "${DISTDIR}"/wheel-${WHEEL_PV}-py2.py3-none-any.whl \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local -a exclude_tests
-
-	# these will be built in to an expression passed to pytest to exclude
-	exclude_tests=(
-		git
-		svn
-		bazaar
-		mercurial
-		version_check
-		uninstall_non_local_distutils
-		pep518_uses_build_env
-		install_package_with_root
-		install_editable_with_prefix
-		install_user_wheel
-		install_from_current_directory_into_usersite
-		uninstall_editable_from_usersite
-		uninstall_from_usersite_with_dist_in_global_site
-		build_env_isolation
-		user_config_accepted
-	)
-
-	distutils_install_for_testing
-
-	# generate the expression to exclude failing tests
-	local exclude_expr
-	printf -v exclude_expr "or %s " "${exclude_tests[@]}" || die
-	exclude_expr="not (${exclude_expr#or })" || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-
-	pytest -vv \
-		-k "${exclude_expr}" \
-		-m "not network" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; import pip.__main__; sys.exit(pip.__main__._main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-20.2.2-r1.ebuild b/dev-python/pip/pip-20.2.2-r1.ebuild
index f171089bb627..9288626db89d 100644
--- a/dev-python/pip/pip-20.2.2-r1.ebuild
+++ b/dev-python/pip/pip-20.2.2-r1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index 520f68142bb2..43e9e817a5c2 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -1,4 +1,4 @@
 AUX 3.6-picklefile-IOError.patch 681 BLAKE2B 2aacef3639c9ec920d6cfc5e56ead129234d54019757a4c816c48c563789e119e6148ed409e5432ccdd763b62ad83c1359b63faf8432326ef8ebf4c93fa564c3 SHA512 6dce69df1cc538ff9787cb70617437ac36972b68a998922123bd4f0529dd6f155befe4104741e704e7e8a1ed8822f2e99580867bbc894fc57896aad4130c317b
 DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33a7d62590a92388c4a21c9800599c1d4e4db6f02630e8dee4c8482611e26498e4aa8ccdb2cf3453ae1db4 SHA512 37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008
-EBUILD ply-3.11.ebuild 1082 BLAKE2B 8c1b0b4c1fe710e8d12748d4313483020f6e6a647162e9885b596d66d18e02f1d457ba54be9db6588e0764e283ecfa70164cb8aa6c91f5f65f00ae362fa94907 SHA512 757e9e7e47151af5d44fdad9d4775fcfed34950b75dd4016f4a162b7198b182ca79904b96f059fcf2c13e24a7eb359096962f961a02bfdef9018e0ada5dbaf63
+EBUILD ply-3.11-r1.ebuild 1072 BLAKE2B f23a0cb121ae5cdfca3556526a100fb870e3b33ecf0ba5924320d138ad2ef0b629fdd6351fbc1dcc3337ae908ef7dbadb8ba124a152f576c321114328de0ba27 SHA512 37a0d0a7e2cdeb52542b763407a967a69f91c17b9d7c76ba24ae40a7f7551a49a449fda2e92f15e08a2e6a95707a8bd881e372071326a8cba271c3c1c8abf17f
 MISC metadata.xml 1418 BLAKE2B df2c9fa5b1d9a0b7779fd72b390d4509f83e1ca4c49f3d64dd2c0b440d2f583c0b936535eb2c15bf323e649cacb4f1bd72bea797bd51afaf611fd8fa6490ae78 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc
diff --git a/dev-python/ply/ply-3.11-r1.ebuild b/dev-python/ply/ply-3.11-r1.ebuild
new file mode 100644
index 000000000000..f96ca8e95cf5
--- /dev/null
+++ b/dev-python/ply/ply-3.11-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Lex-Yacc library"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+
+DOCS=( ANNOUNCE CHANGES TODO )
+
+PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
+
+python_test() {
+	cp -r -l test "${BUILD_DIR}"/ || die
+	cd "${BUILD_DIR}"/test || die
+
+	# Checks for pyc/pyo files
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local t
+	for t in testlex.py testyacc.py; do
+		"${EPYTHON}" "${t}" -v || die "${t} fails with ${EPYTHON}"
+	done
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && dodoc -r example
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11.ebuild
deleted file mode 100644
index 464e6b1233c2..000000000000
--- a/dev-python/ply/ply-3.11.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-DOCS=( ANNOUNCE CHANGES TODO )
-
-PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}"/test || die
-
-	# Checks for pyc/pyo files
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local t
-	for t in testlex.py testyacc.py; do
-		"${EPYTHON}" "${t}" -v || die "${t} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r example
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 8f64e7c5c5ef..8b3be8b03486 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,5 +1,5 @@
 DIST process-tests-2.0.2.tar.gz 4815 BLAKE2B 14f2b2e266fd7365c4c1382a608ce641734c34c5215131b45b895a6d1d72591c2396332d1483f006ea7333a30993fae98d25e1a95cd58b38995d949c395da035 SHA512 6cf64d14587ab577a0680760ab6be146a60590091a0bbd6fb35d5c06ddf5289fa4d873c5658f882313837291b70adb37a3e41c13f1fe541777e05f5e9dac1750
 DIST process-tests-2.1.1.tar.gz 11522 BLAKE2B 6f6b97da73f1e4f449c3c7f85a6d860611de57e78cb57c352ea4563be07d7866a5c44107fae0ecfaad24b262c933806b59c2c9218be959b2576fc0d8250da4b9 SHA512 4bb520074a9964d3eed4aca7a1952bf1a0d99b475f3f61b5c51137d8f2e804352639187da5b5ff30ea8739466200eb9361e77dc3c43a20d5ea418f63a2765a1c
 EBUILD process-tests-2.0.2.ebuild 628 BLAKE2B 7c365f149c1bc8ca2df6440a9651fd7df2764962289f40a3f7459b2b8774be5398b94cea0a5df633528d3995d7a0f7823c44eb4b9a917a9a0589a34c05c4647f SHA512 5a106c5d5295afe8b283dce39c44222351100cbff55f4696b1e7af3db802170ba84800577360f5bdff262dc11527d4bde545ddd33055c0b14847c34cf755efe9
-EBUILD process-tests-2.1.1.ebuild 644 BLAKE2B c7044748399003ed13be8e779d4b65ae37043503ae2febb8634f381e9d37c0a916c145784200f4990d7a52ed7c9152cbac6dbb2bf19ebe67ab0558cea2b5b064 SHA512 012fef9e44178df7c40a4145ca79ecd5c04ef3f4c1140c7a2ec89f66eca10a9018f006a11c235163905d40aafb48c1f56ce9338be9035e6fe6e970bdc68538b7
+EBUILD process-tests-2.1.1.ebuild 636 BLAKE2B 0b0ed718a847ddab81450d142a7a46cb119c729597b078d8b4f4aa5a7d12e207030d2a627303452c841be3f506b1674d1171b71ce9aa397440c64de187a93472 SHA512 cf3d02f0a3761b79b68e57f9dda299469849ccb71b415976066e2bf03a082acf1032a800131d6c01bf3319e37b69c5a9742f0bfa621a3c54ca752823e3d4a6c6
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/process-tests/process-tests-2.1.1.ebuild b/dev-python/process-tests/process-tests-2.1.1.ebuild
index bd0aebc70432..583ac5f99d58 100644
--- a/dev-python/process-tests/process-tests-2.1.1.ebuild
+++ b/dev-python/process-tests/process-tests-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # There are no tests at all, under TODO
 # see https://pypi.org/project/process-tests/2.0.2/
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 8a57c5623080..45820afdc7ce 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,10 +1,11 @@
+AUX protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch 888 BLAKE2B 25d486e8ccd60753f372fb708bb66ef2dd6358cf088f84ea58d4fe6889bc31276930bb5d8fb5538b5a25d621959cf197ce9cd9d27299df05109432197c32c2ff SHA512 4ed96d0608146e268d717709d7d00272b306ce78dc91d715d35d0901a545dd58873ff40f903b42d46362deeef6bdeb0c2a34225f7c3fb4798d352e54fdf8c344
 DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
-EBUILD protobuf-python-3.11.4.ebuild 1557 BLAKE2B 4a81edccba9763452cec9166535bda9bfdef9b65d044d4151eb8f48bda036cbeef61a81cf7ae8dcb35a7df5bc031c5bc169fbf972098aec7f792c8db8e1964a9 SHA512 c3581654a93005e894d071a30a197358fe0643ff0a462a8fe2b21ceb6b27b208099251a3ff61af617c5ff443d0d090c9f2e8744c4eae6d9c8b542465ab4850c6
-EBUILD protobuf-python-3.12.2.ebuild 1558 BLAKE2B e752981210ab066a3f8a45f7db34174796b12c8c70371f2065818abf1ed0077c2973b0af7baa49363986d9c552a0994adad3f2c03faf0572ceea28d18f889703 SHA512 608783436fad1e86117c985ca8e1065f4212a3a20ae7df333e560db93fdd33a04e17fb7667a413daa2064b62830542dfdcd34c28357d51b62a70acdd94c0cef9
-EBUILD protobuf-python-3.12.4.ebuild 1566 BLAKE2B cc05b4213196c3b14186cfa0f5b0c879ff8245793e4853837b098cf7793edd60b5443d58e4562bafd9e451cade4b4920353ec988b15fe9c346eeb8156945dbc7 SHA512 a08d31ad529c83aec7809ae2f3dbf2d1f12a0c7308037a6864b9d8cca246c9685f7f6a3bd9993aee7bc80a59779bbf1a84ed512c896cfe65283e17f0761c71fe
-EBUILD protobuf-python-3.13.0.ebuild 1661 BLAKE2B 2263ced6fd5256904f674deffe3ee55e8dc062b87725122f1fc88bb0038f69d448c0c86e5c23dc5f0d15b5ade904bdf6e3af83428502bf02eaf437ec899087b8 SHA512 ab427ce891c3505aeef22e43ed68110ee42c55d6821d8b9c8de518385eea7b38bfe6fc6c343f934b3abcb16e40fdc555d14c0f1aaf077357e3f1b50901f74c6c
-EBUILD protobuf-python-9999.ebuild 1548 BLAKE2B 9c70147a9c667dfa8f5f71a92fa5a98deb56399006c7cb8d720afd437c2b07274ffcb78bbd245958c1ee3f2a709451fccba3d474aae530e3aa20b0ebcdecafce SHA512 6143050af118f1747ea0b0b720142ac46adcaaa0fbd13a1a635dbe5f2aa0c83c1b249ad8ee92180d5a9355c5537336a2a9fa56a8533e41e88106ae0baa2d27a2
+EBUILD protobuf-python-3.11.4-r1.ebuild 1755 BLAKE2B 3f799ed3eb955c14afc27c8874f1181039ebf689a128e3a4091ad4ad380ebdd705924998ad45c52bd829fa8399e961277733f24d5103e3e0d14291491dd7105a SHA512 e5768c3301f38aa0171052fed9d771b23965270f9c8d9866d06e7bb8a80cdf99ea9a30adae8687c6fda8468001eaebccd7ceaf6cca27165f2e2049b1327f67a6
+EBUILD protobuf-python-3.12.2-r1.ebuild 1753 BLAKE2B 1a53d4c3c6045b738eeee3b05fa588cf891158b7a48c4fc6ea1ca52676775a3e4514ce6fe095b52cfae2ad1d69ff5c4a7a8a5fcf9cbc3b440eab9dc2bec7c590 SHA512 cebc21b3ef6830bc771168fa5dd1d59adece556d43162702e534ba0b98a3125af3ee153c339effd9b038b716606a61347f20e5871300e33c0ba10d9e3f3c11ab
+EBUILD protobuf-python-3.12.4-r1.ebuild 1762 BLAKE2B 6f8960631feb4c1929461d23670ee6f06ed2cf7775cffe4ba57c346e53064b384b3b4cbe25453c0c0dedd07b3c0ffd321aec87f3e2f6cb61172d008de164ec97 SHA512 1279cb70cf1c121f14b9135e89ef033919c5a87e4e2b56b455a60d8b112a81432490abf921dd5843c04c3d8a41b55b68e78b101755d940e6a1fef94a7ef72bb9
+EBUILD protobuf-python-3.13.0-r1.ebuild 1841 BLAKE2B ce91807d58420bc3d7a6880d3b42311faf750c5fa5a2fb43e70614232ddbd7f830fc68c5572aefa0d924242dc832d79531fe286b4093e3090f0024b06d75f356 SHA512 8da8ba39e2399c6e66b1fe9e4fffef839021f98f2de25d99f90119f3bf51347e0bc96220f2699a002ba5b5562b28b7b9e315049de56a2737984135b7b613f46b
+EBUILD protobuf-python-9999.ebuild 1728 BLAKE2B db3e66b56226f42c1c3aeb26f7afcb92dc017ba7c65ad0a66cfb1d8993ae6f0167af6758c20537dfcd9f5b55d8f0a2fa90aefc177e32ce3770a7b8cdcab1f920 SHA512 640e1fd6576f92f1a644181ba071aa2c2ec9fb17322c1bbfdb63aa95e323516c869c337216fd035c4cb8d46449a4436355ceafdf7dd51d7f4ced9f8b78e07ae8
 MISC metadata.xml 539 BLAKE2B 32831dd18b1c8c19a3e5339788b48bcbc6719654148fab93412bb91aa53ccad7b39529bbc2ea78b33b157eeb024e77cfa981088375466273e58b9d043ebdd70b SHA512 c6f28c8549dc8d3552836e81322db479ed4ac7ab5a12232f64d55cd909d8e4face39eed67b3f2c79f01023cfe3d00cf0540493acdb0aac419e6b58abcd430890
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch b/dev-python/protobuf-python/files/protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch
new file mode 100644
index 000000000000..68318320b909
--- /dev/null
+++ b/dev-python/protobuf-python/files/protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch
@@ -0,0 +1,22 @@
+https://github.com/protocolbuffers/protobuf/issues/6205
+https://github.com/protocolbuffers/protobuf/pull/7016
+
+--- /python/google/protobuf/pyext/unknown_fields.cc
++++ /python/google/protobuf/pyext/unknown_fields.cc
+@@ -277,13 +277,13 @@
+   PyObject* data = NULL;
+   switch (field->type()) {
+     case UnknownField::TYPE_VARINT:
+-      data = PyInt_FromLong(field->varint());
++      data = PyLong_FromUnsignedLongLong(field->varint());
+       break;
+     case UnknownField::TYPE_FIXED32:
+-      data = PyInt_FromLong(field->fixed32());
++      data = PyLong_FromUnsignedLong(field->fixed32());
+       break;
+     case UnknownField::TYPE_FIXED64:
+-      data = PyInt_FromLong(field->fixed64());
++      data = PyLong_FromUnsignedLongLong(field->fixed64());
+       break;
+     case UnknownField::TYPE_LENGTH_DELIMITED:
+       data = PyBytes_FromStringAndSize(field->length_delimited().data(),
diff --git a/dev-python/protobuf-python/protobuf-python-3.11.4-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.11.4-r1.ebuild
new file mode 100644
index 000000000000..d9ae6a9e74dd
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.11.4-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/22"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}"
+RDEPEND="${BDEPEND}
+	!<dev-libs/protobuf-3[python(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/python"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(--cpp_implementation)
+}
+
+python_compile() {
+	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
deleted file mode 100644
index d95a668e36a0..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
-DISTUTILS_USE_SETUPTOOLS="manual"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/22"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
new file mode 100644
index 000000000000..5c10c9876757
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python3_{6..9})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}"
+RDEPEND="${BDEPEND}
+	!<dev-libs/protobuf-3[python(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/python"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(--cpp_implementation)
+}
+
+python_compile() {
+	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
deleted file mode 100644
index a6ada7b300a8..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_{6..9}})
-DISTUTILS_USE_SETUPTOOLS="manual"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild
new file mode 100644
index 000000000000..754ffae59d5e
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/23"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}"
+RDEPEND="${BDEPEND}
+	!<dev-libs/protobuf-3[python(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/python"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(--cpp_implementation)
+}
+
+python_compile() {
+	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
deleted file mode 100644
index 45575c8ab012..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS="manual"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
new file mode 100644
index 000000000000..ecca6acde4bd
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/24"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}"
+RDEPEND="${BDEPEND}
+	!<dev-libs/protobuf-3[python(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/python"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+
+	sed -e "/^[[:space:]]*setup_requires = \['wheel'\],$/d" -i setup.py || die
+}
+
+python_configure_all() {
+	mydistutilsargs=(--cpp_implementation)
+}
+
+python_compile() {
+	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild
deleted file mode 100644
index 51f7d5f7b7f2..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
-
-inherit distutils-r1
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Python bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/24"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	~dev-libs/protobuf-${PV}"
-RDEPEND="${BDEPEND}
-	!<dev-libs/protobuf-3[python(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/python"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e "/^[[:space:]]*setup_requires = \['wheel'\],$/d" -i setup.py || die
-}
-
-python_configure_all() {
-	mydistutilsargs=(--cpp_implementation)
-}
-
-python_compile() {
-	python_is_python3 || local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name "*.pth" -type f -delete || die
-}
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index fc808ec3a2a3..faaae29a1aa5 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -44,6 +43,11 @@ if [[ "${PV}" == "9999" ]]; then
 fi
 
 python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
 	distutils-r1_python_prepare_all
 
 	sed -e "/^[[:space:]]*setup_requires = \['wheel'\],$/d" -i setup.py || die
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index bd0c28b356f6..131076c90fbe 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,6 +1,4 @@
 AUX pycairo-1.19.1-py39.patch 890 BLAKE2B 8ee84005e17fd485f568213e751dd30bcb904806d4016088d0c6882958ce7edeba2517f3ab4b8139a8f923e3baec435bc9a21cf3546b60f4459c5cc9ad7a54d6 SHA512 607d6f2cf6bcaec394b755f452d3c4bc0f6edb39bea185a18258c1ee0db11a99d84c7605dbe9db83906518d41baf065b2b8d9261db3736f8a737a2a8f7dff266
-DIST pycairo-1.18.2.tar.gz 200462 BLAKE2B 1f755dc90fe3ee50aa68273a0816752312f144831ff857709e1a4695a58646ffe6be518733480ed37231c213a11d4e5aaf8dfd1cfa68104873bc7d4192435b89 SHA512 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0
 DIST pycairo-1.19.1.tar.gz 205196 BLAKE2B 504334628daf75dd9145c97fbd86ea133b4be225ce7fa911b48231ebd5434678ffa7b1f185e0527f96b4b36955e788d0bb4fa4d308843e5ae9b20a41d2126301 SHA512 a7955a2566d5e5586154b62f3aeef824e1e6076cbd3eb86af8288fedcc7d61c4e36a53691298cf9df2e2df7fc96292f96dec92c5d4343e6c1b4c971e97d0650f
-EBUILD pycairo-1.18.2.ebuild 1338 BLAKE2B 11805aacbe6c9779dcb6617ea7395e8a6fef2ed86a2fc4085fc5c73f94659405152754fde9aaf94bc2802615a1e1349e8170dbb50f604265bd68b4b1f818599c SHA512 ae1b95e7e12be835fdbed2ecf94a507cfd3df1181b12af3bed72f0644c61bfe465b43aee4ce0820046ef7bf691188eb217eb4933fa9acaa1842fca9603239171
 EBUILD pycairo-1.19.1.ebuild 1159 BLAKE2B 54c569d55ff94e0af8d810e1eb23acb9b1618efeb9a67bace79688920ebdc98d6ae01ff7170e67327f9e44f1d8bdd6a37bb009c72954475d627bb25e371a27ea SHA512 8612efb9fbb3e0b37a467748ba6063ec502e493d3a3b93bedf96c3f8ddb175180a09615fe53c90d48bf6130eba9dd1077144e849645232453148b754450103dc
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.18.2.ebuild b/dev-python/pycairo/pycairo-1.18.2.ebuild
deleted file mode 100644
index 253c565d333d..000000000000
--- a/dev-python/pycairo/pycairo-1.18.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/hypothesis[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		' -3)
-	)
-"
-RDEPEND="
-	>=x11-libs/cairo-1.13.1[svg]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.19.1-py39.patch" )
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests setup.py
-
-python_test() {
-	if ! python_is_python3; then
-		einfo "Skipping tests on Python 2 to unblock deps"
-		return
-	fi
-
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install \
-		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 95ca50842b38..1c506f7fc458 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,3 +1,3 @@
 DIST pycparser-2.20.tar.gz 161330 BLAKE2B 9a114e4b73e6c3c495bd78c393957146ec425eb5b15d72266cbf424f15e8d2e2e6402ef36d60a9dff41b393aab80fe1356befd25549517f398e129836a76b037 SHA512 ff0853c9f981b43b4f2e879350715c07b02cf9dab223d4980d8fe0a3138c98041b5f848a9355ae4f1cb45e7f137c03a88843008e18d77af9250e0d9c55f5ca1b
-EBUILD pycparser-2.20.ebuild 1683 BLAKE2B ad7cab4e547bcea5362f5de8d0207fef55b919b677d7297c37ad934980b2ac40bb7ea7d84f6909fdf4b73ecc7226534d73564a15ca642ce01a94dcefbfbff02a SHA512 5c92fbd01060822351c8b93026096499b587da471b2687c97213840e2285f6957de58114d4cc29b907a27339cf4b87715ca7b1b494b50f8ee2ebfdb7a4b02ae3
+EBUILD pycparser-2.20-r1.ebuild 1673 BLAKE2B f0424d312555273e3c2bdc98e22468eaebdec431d59aea646ecf0af11e489909aba2af4078351d2415828d11e0dad58f95296019903f3c4b6717b4a727734280 SHA512 a220f31f4dbaf1fa1151f05b37f715b034f09ad570c7fe5c313c9bc3753c0fbd99276c6fdbdb85b7eb75148a07e1eb1a301364bee5132ddd95e46a6db2ebe47e
 MISC metadata.xml 380 BLAKE2B b013fa2cb5c61b39b122c1c051ce40a8c002d4d4c6995ab78e0f3a35cec07d2f81cb5b05326ddac9c2526eb3ebcf90bc2660f588c4ebe5bacbd1a861fcf91985 SHA512 98ca8c63733123ae6a1d1c8b338d5f98a679b8f84b1e0abed8dc7fefa5549735a7f4de9a5851a26507a6169336fa46689616e46a49df0e9a52f6efb669eac865
diff --git a/dev-python/pycparser/pycparser-2.20-r1.ebuild b/dev-python/pycparser/pycparser-2.20-r1.ebuild
new file mode 100644
index 000000000000..75845e89e7a3
--- /dev/null
+++ b/dev-python/pycparser/pycparser-2.20-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="C parser and AST generator written in Python"
+HOMEPAGE="https://github.com/eliben/pycparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# remove the original files to guarantee their regen
+	rm pycparser/{c_ast,lextab,yacctab}.py || die
+
+	# kill sys.path manipulations to force the tests to use built files
+	sed -i -e '/sys\.path/d' tests/*.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# note: tables built by py3.5+ are incompatible with older versions
+	# because of 100 group limit of 're' module -- just generate them
+	# separately optimized for each target instead
+	pushd "${BUILD_DIR}"/lib/pycparser > /dev/null || die
+	"${PYTHON}" _build_tables.py || die
+	popd > /dev/null || die
+}
+
+python_test() {
+	# Skip tests if cpp is not in PATH
+	type -P cpp >/dev/null || return 0
+	# change workdir to avoid '.' import
+	cd tests || die
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# setup.py generates {c_ast,lextab,yacctab}.py with bytecode disabled.
+	python_optimize
+}
diff --git a/dev-python/pycparser/pycparser-2.20.ebuild b/dev-python/pycparser/pycparser-2.20.ebuild
deleted file mode 100644
index 86f47ce182ea..000000000000
--- a/dev-python/pycparser/pycparser-2.20.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="C parser and AST generator written in Python"
-HOMEPAGE="https://github.com/eliben/pycparser"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# remove the original files to guarantee their regen
-	rm pycparser/{c_ast,lextab,yacctab}.py || die
-
-	# kill sys.path manipulations to force the tests to use built files
-	sed -i -e '/sys\.path/d' tests/*.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# note: tables built by py3.5+ are incompatible with older versions
-	# because of 100 group limit of 're' module -- just generate them
-	# separately optimized for each target instead
-	pushd "${BUILD_DIR}"/lib/pycparser > /dev/null || die
-	"${PYTHON}" _build_tables.py || die
-	popd > /dev/null || die
-}
-
-python_test() {
-	# Skip tests if cpp is not in PATH
-	type -P cpp >/dev/null || return 0
-	# change workdir to avoid '.' import
-	cd tests || die
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# setup.py generates {c_ast,lextab,yacctab}.py with bytecode disabled.
-	python_optimize
-}
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index c197764bb5ec..d36e23f52a10 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,3 +1,3 @@
 DIST pyenchant-3.1.0.gh.tar.gz 75012 BLAKE2B dde78c4f8e986be7e7b4f82979bc446d68a88c3289d472948bb704120fb0dfc3064b8fd46b1883724b0084eefb9e52dfd522bcda290ed5e7a99ae62c948f828c SHA512 d2bf872c15fca1e2c1aa8de06a9ee2c0e6128a69f728383ae9b91fb0ead2d66f804388671cc8156716e240548c29da41eb6c0678dd889012009c690bd078a7de
-EBUILD pyenchant-3.1.0.ebuild 705 BLAKE2B 8fe00b1225cbe5ed97590fd4f5fbdef7a03f53ba81bac5d879ba05079852cc69e827375c4f17f55970726c8fc95fd1789faa789117a84913b5445e807301af9f SHA512 b5f7281dc69893bc56eeda19d907175b045ecee92e4248c776c220cc576641adca4c158370a886cfa664a45c5c986eab7ddf4167fbd4eaf9a150db2c8ed65d5c
+EBUILD pyenchant-3.1.0.ebuild 712 BLAKE2B 171748cbd5f65d678c0288c48848cc04995edd6c1ea3aa597935f70db52c50095bfdffb08b8965c8adf1145f9c9063d8750cf526d0c0e512c31e671c1c909bf0 SHA512 bf7420e73287ae8d13e6f58bcff45ebb578b8059dcecccb494021c712dda291050970f4f9066479c9bbdb262053ee9084623409e96ba02bbea5f3332c72850f1
 MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
diff --git a/dev-python/pyenchant/pyenchant-3.1.0.ebuild b/dev-python/pyenchant/pyenchant-3.1.0.ebuild
index efc28ba48790..b128cfe80b26 100644
--- a/dev-python/pyenchant/pyenchant-3.1.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="app-text/enchant:*"
 BDEPEND="
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index 82ad66d4fbed..a9313ddaf5e5 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -4,4 +4,5 @@ DIST pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz 2678274 BLAKE2B 537e63a7e4755f6fea
 EBUILD pygame_sdl2-6.99.12.4-r4.ebuild 1103 BLAKE2B 01f497b66ea90decb55533520ac36ee9ec17a28ebe9ee353fb0c0d75426942c68d52a47975129832f34536ab0d2e3d8146ad615da4c0088912447ec655a39c2a SHA512 c12cf0a700f05f7f93f5bdccef6386e2ce23a46325f6e10babe63a7e6a396c5f5ee240d392d02008fb601b7a9d0ec9f9fe75809f7fed0ece400fe78ef68b845d
 EBUILD pygame_sdl2-6.99.12.4-r5.ebuild 1113 BLAKE2B 83f99eaa4354ddbb00d7de872ff8d5a72cff5c3d174d0e3f8d11ba1fe88461e59142ab7c3fe575ba7d2ed778fded85b1f4d534b0ca9aee2fb4bacc867e50e52b SHA512 e3a2dd3e3d38859b1bf8e6fc4788dad33bb2f6118ef79db1f07251b2650aaba195027993f2134b2fb401fef7a5195654cf239d8f69635e1808052f0eae3e21a8
 EBUILD pygame_sdl2-7.3.5-r1.ebuild 1050 BLAKE2B 3acc4a3442b315bba46ee780d283f4ca2aab973eafcf4476e194590b434cde5f813fd0835373dec2e9de6b81c730369d850ed287692e04a95fed2d915687fb63 SHA512 530ed75bdcdc03ac211f4a5d2822be1842a92321c22370033ba83fb999035db6eda89ef7a82822cbd66752a3c7ec8a484b567b985af5383d909afa48ea22ee0a
+EBUILD pygame_sdl2-7.3.5-r2.ebuild 936 BLAKE2B f56e68e2a4cb47d8e9761b7d15fbde445c4111810efa2256b4c01114ceacbb86912b4f5f9cfa44b7d8fab073380cbe8b28cdc637122400762d1b6b400a9457d8 SHA512 8210375dae6c47460ec1d021681e21695840180b11e30e636437244edfdbc4ca1e469884814122ac084a21408911ed4d0c1a223efc8dc12a389f5cedc0a7c183
 MISC metadata.xml 332 BLAKE2B 3af5bfcb689c906453097e4bcc7a7b87ccec6bb1f1f8c43766d4ae5c473f9e220314b8591c63ab9b4ddd67eb411a27400a431a043ca5f696069fc4bf31291ffb SHA512 ae1f94e0d1f533a9f2db740f0a1c534456cf5a919262aebfcb501269ca3b508e697750c4bbc6eb60db8dda2182ecb712a10dad5d91efce20f24c5a736d9b3521
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild
new file mode 100644
index 000000000000..0790013708f6
--- /dev/null
+++ b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+inherit distutils-r1
+
+PYSDL="${PN}-2.1.0"
+
+DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
+HOMEPAGE="https://github.com/renpy/pygame_sdl2"
+SRC_URI="https://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libpng:0=
+	media-libs/libsdl2:=[video]
+	media-libs/sdl2-image:=[png,jpeg]
+	>=media-libs/sdl2-mixer-2.0.2:=
+	media-libs/sdl2-ttf:=
+	virtual/jpeg:0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
+
+# PyGame distribution for this version has some pregenerated files;
+# we need to remove them
+python_prepare_all()
+{
+	rm -r gen{,3} || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 7a5f26a76e26..0ad3640e5931 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,5 +1,5 @@
 DIST pygobject-3.34.0.tar.xz 552268 BLAKE2B a9cbeb644e0aa1b23067b591fe5c6299741395656631d39782a8c183a5d3a8e5e7f1a81acdefee186b7cc2bc34dda9271468b1828d5b9613ddc1256e24f1ecb8 SHA512 782195d22e564b88dea8d43469f0111f398b44b51a63df2fe7d07650af94d5cd037f322a5d7e405338823be3419fcdbf0113fe50b220ab1cfd07d4d01dbc4766
 DIST pygobject-3.36.1.tar.xz 556568 BLAKE2B cd38aec8e71ff230926327e77867d07ae0fd5549b71619301bb3be01821ea93e557ecf335ea238292176981a864b269eaa2a86da47e8fb320f187f54caf24dc4 SHA512 5e00dcd03dfe4f92acbf827c13c164b6b9740b2a8cef3b2dce70f96a2156fee2411c84dc669f12b910f4a93daa03ba845282832e2b09d8c887102d43764a345f
-EBUILD pygobject-3.34.0.ebuild 1906 BLAKE2B ba5de36b9f7f82dbf9bd11dc1f56dd5bce13dc3147935a60096d7943c779b8e96bc58cf9e7b711a3a993f1240e56f125d6ebc9c435dc8e765a1125dc3c467368 SHA512 096bc7dae1783d60d86cb69fa2b32612c5bbd8ce1ab2565b5806becd66e3e4ca85c47cd8a325167704a422d40c0e9f0baa6ca67da2541fa59ede6e42373f1243
-EBUILD pygobject-3.36.1.ebuild 1908 BLAKE2B d6d92dc86f635c73d7678a5c5e1285bb92fb3e54df1d9811b823ecfc5dc02c3fc72b483de7b83579a9e36709be5390297883e9ef65ba0c68204912f6597cbff7 SHA512 e0367979a1f076e3667dbe31955ff31171f89a03720214988ce7b6f8d895af7ef2a6a2dfb0fb3aad78841c48d6576b435ded87a0b7ccdd334e8f40229169feee
+EBUILD pygobject-3.34.0-r1.ebuild 1896 BLAKE2B 2e53e017e9a4d12394fa45b88700a5af9cfb725edad3925c9f6074cbaa446dc7ed159e8a2249d914be697d37f99900a1f379bee6b4efdbd9ac2477eccd96ad98 SHA512 08eaf6f24dc0a71d394a0ac9c2a823f906d25ebdbe8bec4947863226805a7c6f05366dc2754399ef23640ddb2f46011eb8e6596ab0233c6eb8264fe8c88451cf
+EBUILD pygobject-3.36.1-r1.ebuild 1898 BLAKE2B 890b7f739e38735d9e2ae796e75578bc42f4a63b5a4ab5f546a1301606c9be4f19511d8c489b2b8722b44133302d8db9f1358fbb267e8931cb3eeadc314e47d0 SHA512 77204741bd734b3c16c7b9b8a4729803d1c3c533f788517be46a3b657fd42b935aa707d1a97dc0044be8a3a9036135a7d0caa7b06971103ffdab805012b611d0
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.34.0-r1.ebuild b/dev-python/pygobject/pygobject-3.34.0-r1.ebuild
new file mode 100644
index 000000000000..5a3bf5df09bf
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.34.0-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit gnome.org meson python-r1 virtualx xdg
+
+DESCRIPTION="Python bindings for GObject Introspection"
+HOMEPAGE="https://pygobject.readthedocs.io/"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/gobject-introspection-1.54:=
+	dev-libs/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
+		x11-libs/cairo[glib] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-libs/atk[introspection]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			x11-libs/gdk-pixbuf:2[introspection,jpeg]
+			x11-libs/gtk+:3[introspection]
+			x11-libs/pango[introspection]
+		' -3)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			$(meson_use cairo pycairo) \
+			$(meson_use test tests) \
+			-Dpython="${EPYTHON}"
+	}
+
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+
+	testing() {
+		if ! python_is_python3; then
+			einfo "Skipping tests on Python 2 to unblock deps"
+			return
+		fi
+
+		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+		meson_src_test || die "test failed for ${EPYTHON}"
+	}
+	virtx python_foreach_impl testing
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pygobject/pygobject-3.34.0.ebuild b/dev-python/pygobject/pygobject-3.34.0.ebuild
deleted file mode 100644
index daaf30dc04df..000000000000
--- a/dev-python/pygobject/pygobject-3.34.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
-
-inherit gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.48:2
-	>=dev-libs/gobject-introspection-1.54:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-libs/atk[introspection]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			x11-libs/gdk-pixbuf:2[introspection,jpeg]
-			x11-libs/gtk+:3[introspection]
-			x11-libs/pango[introspection]
-		' -3)
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_use cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		if ! python_is_python3; then
-			einfo "Skipping tests on Python 2 to unblock deps"
-			return
-		fi
-
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygobject/pygobject-3.36.1-r1.ebuild b/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
new file mode 100644
index 000000000000..e07d82e9ea83
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit gnome.org meson python-r1 virtualx xdg
+
+DESCRIPTION="Python bindings for GObject Introspection"
+HOMEPAGE="https://pygobject.readthedocs.io/"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cairo examples test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/gobject-introspection-1.54:=
+	dev-libs/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
+		x11-libs/cairo[glib] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-libs/atk[introspection]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			x11-libs/gdk-pixbuf:2[introspection,jpeg]
+			x11-libs/gtk+:3[introspection]
+			x11-libs/pango[introspection]
+		' -3)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			$(meson_use cairo pycairo) \
+			$(meson_use test tests) \
+			-Dpython="${EPYTHON}"
+	}
+
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+
+	testing() {
+		if ! python_is_python3; then
+			einfo "Skipping tests on Python 2 to unblock deps"
+			return
+		fi
+
+		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+		meson_src_test || die "test failed for ${EPYTHON}"
+	}
+	virtx python_foreach_impl testing
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pygobject/pygobject-3.36.1.ebuild b/dev-python/pygobject/pygobject-3.36.1.ebuild
deleted file mode 100644
index 16c018529420..000000000000
--- a/dev-python/pygobject/pygobject-3.36.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
-
-inherit gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.48:2
-	>=dev-libs/gobject-introspection-1.54:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-libs/atk[introspection]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			x11-libs/gdk-pixbuf:2[introspection,jpeg]
-			x11-libs/gtk+:3[introspection]
-			x11-libs/pango[introspection]
-		' -3)
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_use cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		if ! python_is_python3; then
-			einfo "Skipping tests on Python 2 to unblock deps"
-			return
-		fi
-
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 877fffc6ddfe..038ce4266a3b 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -2,5 +2,5 @@ AUX pygraphviz-1.5-docs.patch 929 BLAKE2B 5186201bcbba3485c97c249bf9f4d6b04f641a
 DIST pygraphviz-1.5.zip 117810 BLAKE2B e9139d6b8e01cacb3135b1ccd2fa8624c041b7a04848f66c7668c5acf55cf66380ab9f05193b1bb240133f0c01a21915e2314807fcde23246c287d22efb9450a SHA512 6d3df6642a7e23ecb6b687761480b80a3ee5886508ef50b81697041425be7d09d623bf46990c5cea3ef36817a28d9e5c2905eb32267296f55524fdedb2199ea2
 DIST pygraphviz-1.6.zip 117043 BLAKE2B a6c4f28d67ff67bf3fb69869adaad23855c6d702663cfea648b2072b8a5095caaa3d9cfcc864354a362cc6c4c2c6e4a15d5977c58c6af5e22b02f8cea8f7e877 SHA512 6dd389b3fd8c46fd5c8a5a450623f2fe080f720bcf0812618549d092cf917b56ef515f4235fdb89123ece422c6e295705bb08076a3d3e9b193955fcda624acb3
 EBUILD pygraphviz-1.5.ebuild 1137 BLAKE2B 14afc237c4da126b7ac30e6176892fad3c46d0716e167c3d7c6f0a431d70f25b730194688db0e0c25948a4a6eef478260863c9a78a7f30fd1c15851e9108254d SHA512 1143108fdef556d65d181214ab4fa188dc1a6e656a39d79ff07dbda07ef2b5467e7a0edab56670ae884ebfa539ce1da9e4e8ceab7ba41be645c399e52c4fea63
-EBUILD pygraphviz-1.6.ebuild 1055 BLAKE2B 7be6e7da4dc808a7dbb249bb98471f0c52841ffebb555b8b36361b60856054895fd1d7efdf3c036b22e284b2a52453fdf68fe550db9549f15d73e4de3fcfba88 SHA512 a75cc3044e1715e7b102e2a791dba007931602608edfb7e7c231751869310e04f5654e55a52d7c702dcb13646aa7a5e7d6b9ab1f5fc7f1da056c7e95ddd0043d
+EBUILD pygraphviz-1.6.ebuild 1053 BLAKE2B 10730b633dd90422c3d8f276149f34a25c9bfdf594027511c78938a3afef7f7be11c6ab6fa723bd58ddd15cc9b9f673475385f0840ceb8f08cd48f25e01294e5 SHA512 9a91ea51abed4e9ee18e41d58d38e81b144c20013137ea4093d6c1864039005541142c01f9ba8a977ace64c00959097357b256fba04efbd83ca37ce2e506e50e
 MISC metadata.xml 616 BLAKE2B 927c4645cd5247ac976860193a6f8024ff122891699c4831a48944cfec51cc5adc55ea0f3eebb873517492146188f6f3eca702f299dcdecfb88f46c0dbf83d8a SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d
diff --git a/dev-python/pygraphviz/pygraphviz-1.6.ebuild b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
index e53d8c412382..3caab34f5442 100644
--- a/dev-python/pygraphviz/pygraphviz-1.6.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 504e2e4a3063..55e303219c68 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,3 +1,4 @@
 DIST PyKerberos-1.3.0.tar.gz 41033 BLAKE2B 5805df2c258a75321dab5fe84fcbf1de706cb7c14a710c914ae4918dd39f79036a4f4033a068982778f73d9f00a4ca45b80e9cfc59c6a246a236f3c6931bacc5 SHA512 ed2644a236993d9737af43be951d57207fc787a74e82f343b265461b456923763610f1ce1b46d7d56f22d6452be1418b98707b8529b22fd8abf299143e52cf69
+EBUILD pykerberos-1.3.0-r1.ebuild 1309 BLAKE2B a495155c23e6d965de0daf8bdb95a7002b6cde0ed3828df2717091067c3520490ca66441a370970c3bbc92cc0f360c2fc8f2bb28651f900a80b1fe1664ddfd59 SHA512 baaf93252fc62684b180ff6eadf6ed205a2a5d76481acd1721bbf031ce14c3fcc9fd6d527abf1442a03949fa12b76e63e4382734c533b7d29abd0203196065a0
 EBUILD pykerberos-1.3.0.ebuild 1319 BLAKE2B 04348fe54a9b06dadf14693e784d1b652317124a81b111b5239cab4420c888fc72aac1323b1da1f9d5f14433a9fdccb7c0e4e45e88492452ad6caa27ecb1ec09 SHA512 46b623a0288cec6f1acec781f62e1bf2ddf3998605999db9c0ce5cd1510f07bdb8b388f04f9efd9f72f7a58a618365f66371aac1d4013dca984ca1f92f326d66
 MISC metadata.xml 423 BLAKE2B bc74606c5e0d18c76749904da2d388a2be603d2aad92538dbc0ab92974903a24a78788094eb6da7775028b8cd178334b243246fb0f4ba85f90f74fa31bd74f35 SHA512 c84e39a4e84b841aed995cd47aa349df5c4d3ec32757e826a7194c7f629e5f109e30c841f4f4bdf949e966937cde58ee555d6dbe02496baecc25937f06244950
diff --git a/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild b/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..0d5435a1f31d
--- /dev/null
+++ b/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+MY_P=PyKerberos-${PV}
+DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
+HOMEPAGE="
+	https://trac.calendarserver.org/wiki/PyKerberos
+	https://github.com/apple/ccs-pykerberos/
+	https://pypi.org/project/kerberos/"
+SRC_URI="
+	https://github.com/apple/ccs-pykerberos/archive/${MY_P}.tar.gz"
+S=${WORKDIR}/ccs-pykerberos-${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
+# test environment is non-trivial to set up, so just use docker
+# (see python_test below)
+# also for alpha/beta Python releases support:
+# https://github.com/apple/ccs-pykerberos/pull/83/commits/5f1130a1305b5f6e7d7d8b41067c4713f0c8950f
+RESTRICT="test"
+
+RDEPEND="app-crypt/mit-krb5"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	set -- docker run \
+		-v "${PWD}:/app" \
+		-w /app \
+		-e PYENV=$("${EPYTHON}" -c 'import sys; print(sys.version.split()[0])') \
+		-e KERBEROS_USERNAME=administrator \
+		-e KERBEROS_PASSWORD=Password01 \
+		-e KERBEROS_REALM=example.com \
+		-e KERBEROS_PORT=80 \
+		ubuntu:16.04 \
+		/bin/bash .travis.sh
+	echo "${@}" >&2
+	"${@}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index ec7ec0dcfd61..b3a813432ce1 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1,3 @@
 DIST pylast-3.3.0.tar.gz 40209 BLAKE2B 45725d8424a54ac03b53a6c7fe79febb0038c07ee6c2685d7b66f29933f91fb4ea55818be1d02f8fb1126758acd1d9ce3366e8a7d84fe3082b9b3003a9b948b3 SHA512 8b0c089896d7efb37bdf3a701d150b0f94f386715eb73122a4a7618f5b1a514f9f7577e8c7c84eacb36b18e69aa064220403a578d0544344ab11e87e1b46695a
-EBUILD pylast-3.3.0.ebuild 798 BLAKE2B 9639c2d9d8acbc5e689ee107e17e05f8efcc00f335cba679c5b9e0197ecb8c891ffc52948c463d3e65f72b79491b4d6c91eb50c69a000f2cbb6b7a71e6fa4d31 SHA512 a22404d6431d63a8e8cfe2e8e34f22314e76dec17c38bb3b8bb7ecf064d7dce20dc393f46cd5532e2f2e07c72434a9770b73009ef167d2ff9de01e3524ac3735
+EBUILD pylast-3.3.0.ebuild 804 BLAKE2B 66a361aea761026d88dbca8d669775ff4fe6758ef52a0374996fd6e26559c83e131de9b4bbb1dbbe4024a72e0555ebc49d92c135b00ea55ef4f7c2325c876249 SHA512 701be387c5f2b4ab8e8d3bdf79e024af1e393eae18c6147977591db82c04cb95dc2e102aa3521a00f8b6dd4bce8a3e591514ed40d46b026487a96cfa570933f4
 MISC metadata.xml 863 BLAKE2B baa94af51c12d8ef4cbc482d99afdf0f41851837a560b48d190410b690878fe01add338503f4264f2f031c83615f6d53231be56f8efd20833b7df93263394530 SHA512 2363edae5cf8ca68874aa0891ece420b69855fb2d4c6da7dd2147d149504800a72bbf725ef34d25c104de4dbb2200d045097644b0b85e264dc9bbb083f6278d2
diff --git a/dev-python/pylast/pylast-3.3.0.ebuild b/dev-python/pylast/pylast-3.3.0.ebuild
index 1e952dd430f1..18789b6de119 100644
--- a/dev-python/pylast/pylast-3.3.0.ebuild
+++ b/dev-python/pylast/pylast-3.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index e93c12eb0726..cb49ec20acaa 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,5 +1,6 @@
 DIST pymongo-3.10.1.tar.gz 715892 BLAKE2B df1f8ae34366ea9de633be7e1ca103a2bc704a18a9b23cb1fbdbc8d116e939d4d5462e18a076149d93dcb8ada9f4737ed2d61b08803b546dce89dca4b2416689 SHA512 5a73ac17ef6f6783a573facd90879dbefa0c95d69123bc67c1a6af0987cb5786f637b8fa81a6810387acc34829a4cde33b848ac0f7b08f7d07faa90a8e13b595
 DIST pymongo-3.11.0.tar.gz 771691 BLAKE2B 5ae5b78caac335656c1005666c5633882da517c512bbfdb0df2c4569ec5060fa9623a23f48ffcf0c6ab2cdc69f6534f36ef18c929047bbb22cfbe9055a0881b7 SHA512 4f8a185013cbb3c07774d3c6aecc9e97dabb4ba55176fa8a51e17bcdb7cbbebaacd16304e580b4c6aeb26aad964401249313b59dde3c5c248c4496d64d18b22c
 EBUILD pymongo-3.10.1.ebuild 2854 BLAKE2B 70c1f06d278465491dab6c124629c0ab7a2310e5521b8357a57e4db6bfe3c4347c55744f7c205256088b04b3f65402482b50292ac73d4ea7335bfff80e91fc65 SHA512 0b4185f73dbd81b07ae04e54cdcccba08dfeac591c3780e8a1572de7d0fe2971dd482492372525ee6d324fa38804847cead63c9ef2748251084163b71d900b41
+EBUILD pymongo-3.11.0-r1.ebuild 2643 BLAKE2B eed1b61398ff854625f750c21dcbfd36746f3ef2f1b65f2c65327f58c1b555aed7f35076a26fc182309a7c73e8a80e88bfa129ff192972a1e130fe7ebe07bdc2 SHA512 b3d258c891d05a95d6db6e705c5cf8b6fc5dfdb360f8451d6a36d45e66dc2730c021ba310f703c8a17906c9b5ebf528ee9bbd997f3702105f1bf6a559498cd50
 EBUILD pymongo-3.11.0.ebuild 2653 BLAKE2B e82d2c09a9a72658c3287ff602fdb8917c5b250a3006da8e69901147e6812f1ed77f2f55a687876bbcd1fe1ea19d8a2a24ccf97dd4c55019271f8f948f1d16aa SHA512 f6ce32ec473397efb2d46622c4f837da6dd2de0b7b5b10bdf1a4c0e75f256340dd9c6bea10dfcbc69fc4bb2dc7bc54a29832a53929d82d92db249c6f8d2e6ac9
 MISC metadata.xml 672 BLAKE2B 48cf6ce2f03ec2865a99fd033455a1b0a53cf9e55240ab6e993483929a6dd93661afcea7fa255095b66536f0a8cc05b5c4e6a12bd044547a5cf190559a9e480f SHA512 89b8a3551a5b0bd495bc98ac2f9324daeb3f3d81d0f6b991e5537e02c7b369201f9692be5acbe228ddcd3581002a39ac777ea5fc136957e9ccb9683f205e38ea
diff --git a/dev-python/pymongo/pymongo-3.11.0-r1.ebuild b/dev-python/pymongo/pymongo-3.11.0-r1.ebuild
new file mode 100644
index 000000000000..985536ffbabb
--- /dev/null
+++ b/dev-python/pymongo/pymongo-3.11.0-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit check-reqs distutils-r1
+
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~hppa x86"
+IUSE="doc kerberos test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		>=dev-db/mongodb-2.6.0
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_sphinx doc
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+src_prepare() {
+	# network-sandbox probably
+	rm test/test_srv_polling.py || die
+	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
+		-i test/test_client.py || die
+	# relies on exact exception message
+	sed -e 's:abstract methods:abstract:' \
+		-i test/test_custom_types.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index ca188b2c4e43..0a5163e184e8 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,5 +1,5 @@
 DIST PyOpenGL-3.1.0.tar.gz 1172688 BLAKE2B 9865a10e8b5d2756192077b4b079658c680b9f47bdaccb33285fb1942bc678b29f6a69359a1486ec023b1a73d714a7e0209b2f57776fe8b5e4a5e2d0803dba4f SHA512 f748017ab3734c7672c3fdbedcea80df297a91a78b111533e260feb0868ebb02935666c041f77db03841ee8f90057d9c53c53b00b097aae4cf67a52c7fc9c2eb
 DIST PyOpenGL-3.1.5.tar.gz 1835295 BLAKE2B fd3b3e9970b3e704b09128402b401e23c584ba20de23082d019f5ab9e1e222efdfbd2e11ecff6ee748f41bad3a5ff089c57a5c354092e2f717b13e18108de2af SHA512 5d90fc68040b4886e46ff69a59be9e3a8e31e3e1295283756db86d50a1efe681986928e18eb55d20fd2660f863653301ea483425bbe24046f55085b44f4906eb
-EBUILD pyopengl-3.1.0.ebuild 810 BLAKE2B a47e25fd766eb0c4bd2bdb8dbbec4eaae34936d02cd0e268679beb48448f33f90e4ded506356d8abf41e99e2cec8184b687f5516238d7e19ef2eb145be144811 SHA512 d2bd32acd53c2eba0503aee69b37297d6828e83d45532b9d206c63d350f2a1d61667a142a3f7a5b4a44f9031bf0b9a821c076f1b89f75c89975e182944095af8
+EBUILD pyopengl-3.1.0-r1.ebuild 806 BLAKE2B eee91be873326814463cae23fa97158188fc033b051701ed7b07d8c51d817297d1551262bcb7c773bfa850949072fa3bf7389840c1ecfd312557115bc223b909 SHA512 919b0c46d864f8b7008161a75c673889b2c7683a0de5c2c9096ac104354e91c419526c6d82b451744f2b26827d6cb3e66c1a37a56280e5f484b9c8375d79258e
 EBUILD pyopengl-3.1.5.ebuild 1224 BLAKE2B 6f5c4df5e4316651712d5263f434dc61a1e2b79dc901a2b8d2b003862c055cb27bc49801e3f258e6b54500a0a19f9a9b7076e77e255b65a16b5078f3112c51cf SHA512 a564f63316f4bdc3af64b7eb939afdb7f0f50be2be1f9a2cdb14502e86a67d917cd4bb60cbbb44f855bfe4ccd9b3ecc285120e990591147a8bb388132ff882a5
 MISC metadata.xml 364 BLAKE2B a831069125da49ab322af6f4d615d3091865919e26a1cd66da5a760a855ca81eb38450f8707c9346174871cb3055fb5085944a46c1fe22135a8f4b81c7ac2117 SHA512 7f81e0f6a601ff3ddd04a391380882edfa45f801bb4afb6fa04673395cee74968745016e9a285908aab6cd701f62b70164b9885493cdfe553d52f30d49509546
diff --git a/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild b/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..c66c6084afc2
--- /dev/null
+++ b/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_REQ_USE="tk?"
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit distutils-r1
+
+MY_PN="PyOpenGL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python OpenGL bindings"
+HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+#	mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="tk"
+
+RDEPEND="media-libs/freeglut
+	virtual/opengl
+	x11-libs/libXi
+	x11-libs/libXmu
+	tk? ( dev-tcltk/togl )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyopengl/pyopengl-3.1.0.ebuild b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
deleted file mode 100644
index 0c37f864817c..000000000000
--- a/dev-python/pyopengl/pyopengl-3.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_REQ_USE="tk?"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit distutils-r1
-
-MY_PN="PyOpenGL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python OpenGL bindings"
-HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-#	mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="tk"
-
-RDEPEND="media-libs/freeglut
-	virtual/opengl
-	x11-libs/libXi
-	x11-libs/libXmu
-	tk? ( dev-tcltk/togl )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index bcd4b1791863..129e83d5ebcf 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,3 +1,3 @@
 DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b398f9777ad3b3657b8a1227dcbd25983aa64a3f3018debdbffc1a042c732e6b3a09800e081c7acac7b97da15317 SHA512 c7a546729f86a2b5176e2482b566b9fd715b03e495aaef4d720b21307bb03f385dbc849247f8d266cb3d92be0a83c34ce4995b655ce85318355d5a0d42d6991e
-EBUILD pyparsing-2.4.7.ebuild 1014 BLAKE2B 0b8579e667c69497bddd9c33c326c997c47fc9d9c519d69a05f7b929c1968036c764796932b9b588c5f855d223eb05e48dad9685ba5740872c50d90c1e1b5754 SHA512 c33e9adc63ab6580fbbfde14f35307c7c2be38b1166d44ab131ea96a220faedce4e764e1adee4c6227ecbf038021c77e19c5b80dbc19bbcea0c4bfcfacd2c1bd
+EBUILD pyparsing-2.4.7-r1.ebuild 1004 BLAKE2B f82c4df2d33ca243b5dfb480dc69fc5a9d10a40bac27bebb95dfba1c82bc57fc90c4901ccb04341d7c1b422d0dc0bcc3750d52faaf42d21654a7f97d21d0cd3b SHA512 c3fac5cef28796e188e8c5b3d2726892488a5b0290ecb2ad5e9408847081c7878ccb414528381e9401afc9a8f580e6945ac5cf9ffd08b8bb3c808a860f6f62fb
 MISC metadata.xml 762 BLAKE2B adad994029179676a767488775141e8d79d51803f1fa9546d85c33dfbaa2a656e82bbd1c684c401bdccad5f2be763878296f149c9032097f1db87c60865dbc7a SHA512 7afb6c24b323080e02f552a35c89e7b0117482ed9edf5ad28e845553d98db9ba0d02919419ec8029bfc431ed39c5b60bc270360e6c5567d34e883c819b2ca9c1
diff --git a/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
new file mode 100644
index 000000000000..7007a149ec66
--- /dev/null
+++ b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2004-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+MY_P=${P/-/_}
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
+# pypi releases and generated github tarballs lack tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+
+distutils_enable_tests setup.py
+
+S=${WORKDIR}/${PN}-${MY_P}
+
+python_install_all() {
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyparsing/pyparsing-2.4.7.ebuild b/dev-python/pyparsing/pyparsing-2.4.7.ebuild
deleted file mode 100644
index b412b387bec6..000000000000
--- a/dev-python/pyparsing/pyparsing-2.4.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2004-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-# pypi releases and generated github tarballs lack tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-distutils_enable_tests setup.py
-
-S=${WORKDIR}/${PN}-${MY_P}
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 0c3da9b6cffd..534a1c95e658 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,4 +1,7 @@
 DIST pypy-exe-7.3.1-1.amd64.xpak 13578971 BLAKE2B 6ff3c64ec88813ef68d325cff5e2dae0ef1f79ae33eeac3a09c1b8ee0a24b0447b2c633489311da3d62996d714bd3d5844c3b71b9309766ade2f06b79e20bb64 SHA512 b153a19621a6da51d364868c22e9ba0460d95203787753899ec50efb573b4e7262d323503be801c3c75a724761bcfda90d8d4668d84482e2db32104916bc7671
 DIST pypy-exe-7.3.1-1.x86.xpak 10239654 BLAKE2B 2588e879e2bd3ea41938ec21f55167d118cb493680f8e7aded6d6c01bed6499efd65f7d7f56e305a4ebc2aab02adf9d58fceccb503dd0ff41e93c642baf2191c SHA512 110b202c805729bcd6789ea0f6c7bffe62ab23cbd33fcff572254f56f4da82e25f9f7f617c5a4b3911044c07ea33ae8d17bd8547bb7779ca517b973b553e6b1d
+DIST pypy-exe-7.3.2-1.amd64.xpak 13541084 BLAKE2B 8af5c35d99275a2131d4b6c51f505a9bf3015a144387030c78a490c331f1fb34b69106ad6ed961247b4de6a39d2fde47a1ebad204e3a3569f269ed7ee32559de SHA512 82d99e896954aec8749154e19d42636608403e4c4bece34e72b5804208cb42ed26bfdf4506ab2579a3b74d7cede97ef66b313ae9feeddabbfd79045090dc3035
+DIST pypy-exe-7.3.2-1.x86.xpak 10216001 BLAKE2B 934be623ce1afa9d0bfb1b3725e89d994352c9d57b9807c6fa135a0aabe3c50633566425b25ebf98f1cec8160eadf5305033ac3f3ba4cfff5fb7b39e5d19f9c6 SHA512 9d25f1d82af3ed1c4d046e5f3434d12ed4c02eee4cc8adb64a03159bb48cf114f393bd60c67223447796726f59b622f8462ac439446eb14dcf2e76983da635e8
 EBUILD pypy-exe-bin-7.3.1_p1.ebuild 1086 BLAKE2B a331d825f7906c1685f4b387d4e6c50b9d82296d4d3c7d1d24f5de50d7ee65f02bfcd2b14f0b57cd2a73a714253a18e5a7f09fc122a5ba033965381a71a57144 SHA512 fe49f4895b502a6d0a2050bd0aa4e6eab616026a875905b46443fbbc4ef378329e3a56ff641541210fd613f9a8bc07317e9a639f1ba187cb2b4041fce321b687
+EBUILD pypy-exe-bin-7.3.2.ebuild 1081 BLAKE2B ebd50d6abfd93b8e1a3abb52e45eb2685778a05687efe0a43f363cd9f57f18f1517d40bbed0b5b0a5352ff5b0dee90a3d9a8a015b34a8bfdbd1ad847068792dc SHA512 bce00630db8b75dfa6874fb903ebbd0c92a8d7370a0bc0231fa83f3d5110fe5a7bbf2ed464a40d86a01f7e7721a0bdbfd4f651ed9f0f0cf91d4354aaade01019
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.2.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.2.ebuild
new file mode 100644
index 000000000000..cbfcb9fce7dd
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy-exe-${PV}-1
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	dev-libs/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${PV}"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 93a7ea6346a0..069b899afc43 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,5 +1,5 @@
 DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
-DIST pypy2.7-v7.3.2rc2-src.tar.bz2 21145693 BLAKE2B e722111435f81d00ecb5cec83e78e17676a042703fe83c049456fa6e5debdb1c09cc3f1fd71bcd8a8469da373a7c8131c252b3f139959a442f4cfa2b7f202c6f SHA512 ba7cccdaff1616ad0090cb0942ad35eda025a758be4d6b4e978bce19fb8cb8840136297fb924127a7e99f02c09665bde7eaf714e1744b9b32612973355459ad4
+DIST pypy2.7-v7.3.2-src.tar.bz2 21142873 BLAKE2B e6bcd2dc28ef740962d053753ccd172e3895fc83fe23a319c003248e0986f9805839daddd13a0f480f1e9ee813979742699cb0bc8c42b6b05c193fedf67aea4f SHA512 b40d93d615a27e3a035007307a8ab2b49ff90f3047af914b268a80feb8219d372eca14c04a8b0dea91efb992653457b7c6d088c784de32c414cc48879f2d15fc
 EBUILD pypy-exe-7.3.1.ebuild 3891 BLAKE2B 1121625d5422a1d52114e58fd7f1632f175fc1623b2b931c3fb528acb1f18fdfc1a0859218330fe3e7c20bc539ff2819ea21cac2cb41328a4d295e7f5e9f684a SHA512 6bff225e427ae47b014a20ae7ab3893e55a893d5ce0670dc0474b4e6626113f5cbeef893e8585d42c8be78a64a051addbbbff1eb90b2266284d6064e73feeb2f
-EBUILD pypy-exe-7.3.2_rc2.ebuild 3893 BLAKE2B 68647b133594b77ad1c361f587edaaf29a0f6f4d4dfacbe647e0b60c01e91e30b27f5c3b70ac0d74d71d3a40804a69d903782a577bd10d501a958418e1a329d7 SHA512 447c447548223d0dc3711b3d856d3abda964cce8b7b3f691917b47481e6ee4306744ebdc547d861a1f13f0c513d7891410eac8f7d030570c583ddd08ccc88cb5
+EBUILD pypy-exe-7.3.2.ebuild 4074 BLAKE2B 2e5f26deca32905d708882f50edca4ec1af675c61a4284f6a6cd174ca7d7dd09b9b2693b67afedaf30fca54db7640c083d88a69ae6f1e75b30f5d4ed0f575a4f SHA512 bb74c3250fc5d9d9d393923925a317b2c155c209f54c97f7f353a5860c778e3a0b999f4f58cbb89cd94204440c91f4cc70ffa96f99fc61e986cbe9e49898d994
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild
new file mode 100644
index 000000000000..c0dee5cf1c60
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy2.7-v${PV/_/}
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy-exe-bin:${PV}"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="${RDEPEND}"
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		if ! has_version -b dev-python/pypy &&
+				! has_version -b dev-python/pypy-bin
+		then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using already-installed PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please unset"
+			einfo "the EPYTHON variable."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PV}
+	insinto "${dest}"/include/${PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PV}"
+}
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.2_rc2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.2_rc2.ebuild
deleted file mode 100644
index 07e3be2ee5c4..000000000000
--- a/dev-python/pypy-exe/pypy-exe-7.3.2_rc2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy2.7-v${PV/_/}
-DESCRIPTION="PyPy executable (build from source)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy-exe-bin:${PV}"
-# don't enforce the dep on pypy with USE=low-memory since it's going
-# to cause either collisions or circular dep on itself
-DEPEND="${RDEPEND}"
-BDEPEND="
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		if ! has_version -b dev-python/pypy &&
-				! has_version -b dev-python/pypy-bin
-		then
-			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
-			eerror "being installed. Please install it using e.g.:"
-			eerror
-			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
-			eerror
-			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
-			die "dev-python/pypy needs to be installed for USE=low-memory"
-		fi
-
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using already-installed PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please unset"
-			einfo "the EPYTHON variable."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PV}
-	insinto "${dest}"/include/${PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy-c-${PV}"
-}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 261d6ba92381..6fadbbd94936 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -2,9 +2,9 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 5
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
 AUX 7.3.1-gentoo-path.patch 1575 BLAKE2B e374b879aabdb1a9b4d3bb07ba03510e9df7c00e6fba13e117dd718268118ade06fa76f7468855463fa50112fb780fddb9687198f4a24bb0a6cc69b5b79e70d4 SHA512 14e14e4c000166bfe3f1cd10377baecc721b43c2df43c0d5d85e8dc6f220e1a453d7fe30cfbaab547e5483f8f493ddd840620b8de4de6d55abe8f9cddcca2464
 DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
-DIST pypy2.7-v7.3.2rc2-src.tar.bz2 21145693 BLAKE2B e722111435f81d00ecb5cec83e78e17676a042703fe83c049456fa6e5debdb1c09cc3f1fd71bcd8a8469da373a7c8131c252b3f139959a442f4cfa2b7f202c6f SHA512 ba7cccdaff1616ad0090cb0942ad35eda025a758be4d6b4e978bce19fb8cb8840136297fb924127a7e99f02c09665bde7eaf714e1744b9b32612973355459ad4
+DIST pypy2.7-v7.3.2-src.tar.bz2 21142873 BLAKE2B e6bcd2dc28ef740962d053753ccd172e3895fc83fe23a319c003248e0986f9805839daddd13a0f480f1e9ee813979742699cb0bc8c42b6b05c193fedf67aea4f SHA512 b40d93d615a27e3a035007307a8ab2b49ff90f3047af914b268a80feb8219d372eca14c04a8b0dea91efb992653457b7c6d088c784de32c414cc48879f2d15fc
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
 DIST python-gentoo-patches-2.7.18-r1.tar.xz 15500 BLAKE2B 7008b29827dbbd80d4ab8f010ccf9efced99c6b4b9109e4430c0ba269ce53529cb6fedd832502c8d2d3aa21938749cc3591c2545b21c0a59a6e60f8598e84ccc SHA512 e656ab07281fd932b92165674619bbf55ecf410d2937ae4ae771d490b4532540498cc731d30d19c1e8aafd1f64df8a406bbfbb46ea985b3dcd8edb89a0b7f20f
 EBUILD pypy-7.3.1-r3.ebuild 5851 BLAKE2B ebc9ea70cced86be882e8b58bf810b417b36463c9559b7a7816b4560fa0a03ca79489c9c9ddc0f5b7b9d3d5bddf36f7afeded2f8bfa2eb71e52738a2e03a8948 SHA512 71a7a5cf51767c1913a96af6afb03a91f7002c5d0c98aef66445e27d1e9cc6eda6af9c9c3267db2702f6b288ecb65906fa60df69b5d2f2287a838d4ff7c91576
-EBUILD pypy-7.3.2_rc2-r1.ebuild 5569 BLAKE2B d58e4e0bd77af60e7346702cd917fc303a3f112679e2f7836a42319a48166779553b8d9d3226d12fbca9ce78dacf71851bfde8bb53392ff55263359fa74175c7 SHA512 c51b11d163a0261e670455f7c93306d8eab658dcfa9020ed367891b5470cb528aac5c8165c68cd0f917f2ba2c333c3fde04c94c9f3a76fa3820bf993200fd128
+EBUILD pypy-7.3.2.ebuild 5573 BLAKE2B 8003673bb846858ea9718eeab505d4eb333c4aeb433f2c9f901f0fea2eb66b8e5d1a213598d4381903536a6d217d1e64bd01071b2ceaa37280d90908958ed156 SHA512 53664dd522887de6b54a4746f54a96c4f7bbe3c39dc935d285acefa989c651d1eefdc22a3a7be88dff15d7536db390c7cf25e1041ba4c2d63a5ba02cfc058092
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy/pypy-7.3.2.ebuild b/dev-python/pypy/pypy-7.3.2.ebuild
new file mode 100644
index 000000000000..90e8d764f97e
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1
+
+MY_P=pypy2.7-v${PV/_/}
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+PATCHSET="python-gentoo-patches-2.7.18-r1"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		dev-python/pypy-exe:${PV}[bzip2?,ncurses?]
+		dev-python/pypy-exe-bin:${PV}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy-bin-7.3.0:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply -p2 "${WORKDIR}/${PATCHSET}"/0010-use_pyxml.patch
+	popd > /dev/null || die
+
+	# this test relies on pypy-c hardcoding correct build time paths
+	sed -i -e 's:test_executable_without_cwd:_&:' \
+		lib-python/2.7/test/test_subprocess.py || die
+	# requires Internet
+	sed -i -e '/class NetworkedTests/i@unittest.skip("Requires networking")' \
+		lib-python/2.7/test/test_ssl.py || die
+
+	eapply_user
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( ssl audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PV}/*; do
+		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c-${PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy2.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild b/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild
deleted file mode 100644
index a5a678ffa9d0..000000000000
--- a/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils python-utils-r1
-
-MY_P=pypy2.7-v${PV/_/}
-# note: remember to update this to newest dev-lang/python:2.7 on bump
-PATCHSET="python-gentoo-patches-2.7.18-r1"
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/73"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
-
-RDEPEND="
-	|| (
-		dev-python/pypy-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy-bin-7.3.0:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/2.7/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/2.7 > /dev/null || die
-	# TODO: cpy turkish locale patch now fixes C code
-	# probably needs better port to pypy, if it is broken there
-	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
-	eapply -p2 "${WORKDIR}/${PATCHSET}"/0010-use_pyxml.patch
-	popd > /dev/null || die
-
-	# this test relies on pypy-c hardcoding correct build time paths
-	sed -i -e 's:test_executable_without_cwd:_&:' \
-		lib-python/2.7/test/test_subprocess.py || die
-	# requires Internet
-	sed -i -e '/class NetworkedTests/i@unittest.skip("Requires networking")' \
-		lib-python/2.7/test/test_ssl.py || die
-
-	eapply_user
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PV} pypy-c || die
-	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-	cffi_targets=( ssl audioop syslog pwdgrp resource )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local ignored_tests=(
-		# network
-		--ignore=lib-python/2.7/test/test_urllibnet.py
-		--ignore=lib-python/2.7/test/test_urllib2net.py
-		# lots of free space
-		--ignore=lib-python/2.7/test/test_zipfile64.py
-	)
-
-	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
-		"${ignored_tests[@]}" lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy2.7
-	einfo "Installing PyPy ..."
-	dosym pypy-c-${PV} "${dest}/pypy-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PV}/*; do
-		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3.py \
-			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy
-	local -x PYTHON=${ED}${dest}/pypy-c-${PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy-c-${PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy2.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 1bdba79ddb92..e2a53b593be5 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,4 +1,10 @@
 DIST pypy3-exe-7.3.1-1.amd64.xpak 11657579 BLAKE2B 1a037b447c7a73ac37bd7c33f4009442dabaf082a844744093dbb0f835b71abad48a6bfb28ebed0b02bb8a86f59f11b351768f152fd5db8b31ee010b14ffde79 SHA512 ee03ac675e6967d306136e79cbbb1554c44a32a21a0756b09dd7c1af84a9b3cb7e69a0094431bf6427271cf2fb1840e62935f53580e8d3eedef54d9bef2994e2
 DIST pypy3-exe-7.3.1-1.x86.xpak 8983621 BLAKE2B 00ea3210e040dd72f169eb2f162f032eb3ddadefd5f114cb4fdb052b40640235f866fc26f577eb22ff64025d2b4234a194529cbac6350aeffa17bb662e98c5b0 SHA512 caa6e4e08c61e3101aa7e971b2aeae04b41c57206327baefeee4a077d09b5bef28ca3518e6823bdf9907ccd4a8ee2b843369ffd87ef0bcb95a66f21ddd87c61e
+DIST pypy3-exe-7.3.2-1.amd64.xpak 11747236 BLAKE2B 5421ad051d2af6f88875591c99e801eab3991aa4a6936c0661f7fe131b13ec5cf9a261774f4ce6cae6202a9b0087265a457e2bdefe50110ce12c71e56885992a SHA512 6cdf308a12d2dffc44335b06e8e6212e559f329f0045fdfb8e3b5fe127d62b8881eaf8231a3b7f9ad7f628ac059a1e68a9bb2b43d677e59cfc81ea202ebf0898
+DIST pypy3-exe-7.3.2-1.x86.xpak 9043236 BLAKE2B 0c07e5bba6d44444c227e63dea02c390254b809a2c14a4b9faefa080e32a86849c354971eb4f1d13331e00e2af7e79d108a6f69fed1cdec0faf70ed8320b6c64 SHA512 8040abb95b2bd4144a456f429fad39492672b6f225951f93d138609a7265bdadff9d2ea0b4cf7b481cd9a16fa1017bdcce0f7a3afda27ab60c094cc2a0ba2a92
+DIST pypy3-exe-7.3.2_p37-1.amd64.xpak 11873959 BLAKE2B e9fcb007b18d5880955bca5828285d8eb6b258f41ade7f53c2aa77c0bd65bb4884501dd093a6d19e694315cc20423ad05eaffcf78f62815b783a311220989805 SHA512 59fea7fe0670fed68c1748c9a763c754261b05f25f0ce251088908f79b73b9d468aa2777b0c5cda394474db04e0e754999b49677051ba00a94f4dfe6fca7e4a5
+DIST pypy3-exe-7.3.2_p37-1.x86.xpak 9127420 BLAKE2B 23c7382980339ec4bb476acf99e587e7ff6128cc421bdd1758c6b922ec0cc1fb98c4895d28788d1184f3b6fb00e1954e517f58d33c3c10470c8d8c236fd43024 SHA512 f6680fca7a39b27117ea6aa680fc0fe78cec836413777860ff1adda21934ca6d0330364c7e3d97e9ab9f92fb3160e021cbfd016de89af6009526865164433f0e
 EBUILD pypy3-exe-bin-7.3.1_p1.ebuild 1093 BLAKE2B 7f26dae3be0bd6aa84dbf76aa8f6bbefffbbaf71701dc5f032ae62d36022214fcfcf977512aeef1e5de96f174922fc1ef94f416eebeb42aedc379eda371f0f3b SHA512 fad45a0aaa788da299e62bb367391795a9300a1acec31b202c90edc35d4223cfa4ebe734f58615d1741f221f798da3b977ddc2e248b3a139852cb4caa2ba235c
+EBUILD pypy3-exe-bin-7.3.2.ebuild 1088 BLAKE2B fa81b28f520227698b80f0219a9e4a02134d151ebfeffa940661f7c8f25cb76d18c89a303919673f7f46631f96e62d9314d03611535143f963fdd4304c21b678 SHA512 176008be08c86b6c5dc7412409e9e16b4702af20b95d80c8149272f54ba4b63a4301a2c75ef74045aebc67d0200b518f551a5d7478051c4a0c40ceaa43e41f15
+EBUILD pypy3-exe-bin-7.3.2_p37.ebuild 1117 BLAKE2B bf745cabe2c1ed81a366fd5095c9a273877fa1e58f2978dc52d1ab2323d96345ead7ddf35acd3e6d86a3dc0eb6a7f81f468f9b19f3cc264120a9d75ceabf2ddd SHA512 ec5f2c73118651b2f7465a05c0fb59ad4459199a864830622ec08fb83487ea965ba7ed9215e146bf7f93c3f74a45d8b9986a2885059dfbee52113d0d66d43a4d
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2.ebuild
new file mode 100644
index 000000000000..345dafd4e829
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	dev-libs/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${PV}"
+
+QA_PREBUILT="
+	usr/lib/pypy3.6/pypy3-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy3.6/pypy3-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy3.6/pypy3-c-${SLOT}"
+}
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37.ebuild
new file mode 100644
index 000000000000..e8930a159077
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	dev-libs/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${PV}"
+
+PYPY_PV=${SLOT%_p*}
+QA_PREBUILT="
+	usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 6457e619dd37..f3d6122e34ed 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,7 +1,7 @@
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
-DIST pypy3.6-v7.3.2rc2-src.tar.bz2 22750248 BLAKE2B 6a8a3c4306cb5c796ee89f3d9ece61f5d669515ae9edf4961f43c7779123554cda0f3b433f8264d3d08e531ef5fe660b494135321a11f441ae1de97ce0abb332 SHA512 a89184314d04bad646cf2e2151e2d5f27ca23a68f25e22b5c2e4f07745671e70c71d869be1c61248ee839632f7151b597fe79eb5af814967a1ae97f2c2cdb8ee
-DIST pypy3.7-v7.3.2rc2-src.tar.bz2 25066853 BLAKE2B 286ec0909d4b9ba9039cd9ca234a90832e99369f5e7e36a486d219661631efac186e02146dd5bc5a51521fcfdd0047c3fa5a6dbffd20cebe8ff7c209d02fec53 SHA512 c8e5dc5ded2989aa3a6b635e040c23bb8e2812101ce22a104f251e0abaa3320b61f2f611ece58d6b8a8ae9f1cbc8ca22c920f3491dd5653bcb0e05264fd54a4f
+DIST pypy3.6-v7.3.2-src.tar.bz2 22736022 BLAKE2B e2338ac3f7af06b987c43e93eab9ff14d46262143472b0393b30b011fff67d33add45d8198cee7109354e09c52a2540938abeef364b0cf12f2891ca9c7aac2a4 SHA512 ed861a57d6edf1548c061d10295313a05d0ac54fe68a8755211ff76fa2dc78d7b1479c6152dc5d0d1cdce4e247c240c1a2edf59ec8a53d0004ec7713514c9c35
+DIST pypy3.7-v7.3.2-src.tar.bz2 25060911 BLAKE2B 35ecfee4c64e13539827c65a61e0cd359de4046f77553629cdf63479327c6ad86afd1443caa7a911a6271f496f0f3caf1b919ce91de717d0a71d008927b7f77b SHA512 563a9cf63e818b95aeb14c25b55bb5fb0bf8283f0b9f2bdd9a8833989beb651681f53f52368fb9db2c75fb60be0456eec87d48b557740b57847c4104003cb288
 EBUILD pypy3-exe-7.3.1.ebuild 3458 BLAKE2B 70d5be9e72cdd482d6f2107143cd79ddc024d50ef242b7fdf467d91c9a2d3c1130510750c54bfa869220fb248aba7fb46c9ce7b50dd0cbc69d55c23c98a3b60a SHA512 2b986efb595c46e284e96cfba530fdb7f16a6d931f015b98ab1254ecb142064ca562e9cfa797d6b28dd942b74640ba5d7436afbc360c42582f45d1e105a2c7e3
-EBUILD pypy3-exe-7.3.2_rc2.ebuild 3460 BLAKE2B ee6b32591968dd52639dc1b629b40d2501c892a9f96dea1982d1096bae4ea01ac90ee676bb7ca3f36617da677ce8de7692f83ed192b9f0ece463a76dacfe8d37 SHA512 e04629e3d99ff807e09a1d1dda16f1eee722a6a7bcc85c238b026b39df3319bc5f988258a029d52ff57e4e1c67218daca3580c90dc40152079c67012b4917436
-EBUILD pypy3-exe-7.3.2_rc2_p37.ebuild 3499 BLAKE2B 35b65f641337763788ad9c8a58ce41b36533a9d6b6eedcdf7e58e6806114de1a3454423968372629a2370b6054177b4292ad639f3358554659115f30a04898ee SHA512 112e0e868cb4e627365b21a399b237e8d46635feb807a900fe49440f6935a5c5126622a2628a40c660882ec33d045ad8232f32353a377b31f55e0faf36daf8a1
+EBUILD pypy3-exe-7.3.2.ebuild 3641 BLAKE2B 745f107bc0f5efe5e3a4ce67de747d3230111262787aca7e893edd181a1416f2a3c2ce9885d4e08e0d81d6606b74b41c919cc10d6a8cb7407fbf78f793554270 SHA512 9674383075e1861344854147e405fb9d31de7abda958095118be14af725f9ecb846881f49080e8fbbf2ae3ce4ca05ba7512c351ddf8338f0d9b2fbef93d5b234
+EBUILD pypy3-exe-7.3.2_p37.ebuild 3680 BLAKE2B 37640296820c961bfb69fd153faafaa03693758be90ec58c5b5bcb586fd12d4af9033e5a39a3bcb671c24f1e51781b793a97769494fdf482c2fb17dd8883513f SHA512 bdb87e56c6577494a6044157b8f065676cd331be132117155a9d2f1838719afb0af84b5f0344e84b16ed7f1e27326de78550da8af642e0de66be150b484fd8fc
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild
new file mode 100644
index 000000000000..a8648c1e6ea9
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy3.6-v${PV/_/}
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.6
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
+	insinto "${dest}"/include/${PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy3-c-${PV}"
+}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild
new file mode 100644
index 000000000000..5992fb3e87ef
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p37}
+MY_P=pypy3.7-v${PYPY_PV/_/}
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2.ebuild
deleted file mode 100644
index 24b904343e13..000000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV/_/}
-DESCRIPTION="PyPy3 executable (build from source)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	low-memory? ( dev-python/pypy )
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
-	insinto "${dest}"/include/${PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy3-c-${PV}"
-}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2_p37.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2_p37.ebuild
deleted file mode 100644
index 8c73602fa5f8..000000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2_p37.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pypy3 needs to be built using python 2
-PYTHON_COMPAT=( python2_7 )
-inherit check-reqs pax-utils python-any-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p37}
-MY_P=pypy3.7-v${PYPY_PV/_/}
-DESCRIPTION="PyPy3 executable (build from source)"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
-
-RDEPEND=">=sys-libs/zlib-1.1.3:0=
-	dev-libs/libffi:0=
-	virtual/libintl:0=
-	dev-libs/expat:0=
-	bzip2? ( app-arch/bzip2:0= )
-	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	low-memory? ( dev-python/pypy )
-	!low-memory? (
-		|| (
-			dev-python/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
-		)
-	)"
-
-check_env() {
-	if use low-memory; then
-		CHECKREQS_MEMORY="1750M"
-		use amd64 && CHECKREQS_MEMORY="3500M"
-	else
-		CHECKREQS_MEMORY="3G"
-		use amd64 && CHECKREQS_MEMORY="6G"
-	fi
-
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_env
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		check_env
-
-		# unset to allow forcing pypy below :)
-		use low-memory && EPYTHON=
-		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
-				{ has_version -b dev-python/pypy ||
-				has_version -b dev-python/pypy-bin; }
-		then
-			einfo "Using PyPy to perform the translation."
-			EPYTHON=pypy
-		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
-			python-any-r1_pkg_setup
-		fi
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	local jit_backend
-	if use jit; then
-		jit_backend='--jit-backend='
-
-		# We only need the explicit sse2 switch for x86.
-		# On other arches we can rely on autodetection which uses
-		# compiler macros. Plus, --jit-backend= doesn't accept all
-		# the modern values...
-
-		if use x86; then
-			if use cpu_flags_x86_sse2; then
-				jit_backend+=x86
-			else
-				jit_backend+=x86-without-sse2
-			fi
-		else
-			jit_backend+=auto
-		fi
-	fi
-
-	local args=(
-		--no-shared
-		$(usex jit -Ojit -O2)
-
-		${jit_backend}
-
-		pypy/goal/targetpypystandalone
-	)
-
-	# Avoid linking against libraries disabled by use flags
-	local opts=(
-		bzip2:bz2
-		ncurses:_minimal_curses
-	)
-
-	local opt
-	for opt in "${opts[@]}"; do
-		local flag=${opt%:*}
-		local mod=${opt#*:}
-
-		args+=(
-			$(usex ${flag} --withmod --withoutmod)-${mod}
-		)
-	done
-
-	local interp=( "${EPYTHON}" )
-	if use low-memory; then
-		interp=( env PYPY_GC_MAX_DELTA=200MB
-			"${EPYTHON}" --jit loop_longevity=300 )
-	fi
-
-	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
-	# free up the unneeded memory before spawning the compiler
-	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
-	echo -e "\033[1m${@}\033[0m"
-	"${@}" || die "translation failed"
-}
-
-src_compile() {
-	emake -C "${T}"/usession*-0/testing_1
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.7
-	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV}
-	insinto "${dest}"/include/${PYPY_PV}
-	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}"
-}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 8789ca89d8d6..9834f5023f01 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -4,9 +4,9 @@ AUX 7.3.1-gentoo-path.patch 1565 BLAKE2B 3c444b8112fd40de747fae75cc6d6f5ff8d2ecd
 AUX 7.3.2-py37-distutils-cxx.patch 14756 BLAKE2B 3524f2fbeef2b23a17c2248fbe07e0b194f2d6cc8be9c4ffec9c7a745421577d0c246a82c61afbd4af116f6ec756ce11988093e3e0a74337868530382206dd7d SHA512 e590266f1f6f5571b0056fbbf38c54bd7f07bebcdc009dbfaa3203aaeb3f70eac0f9b281df3ec04771960dea930b30ae861bb1dbc886fa28dfb8c58e484f6a8d
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
-DIST pypy3.6-v7.3.2rc2-src.tar.bz2 22750248 BLAKE2B 6a8a3c4306cb5c796ee89f3d9ece61f5d669515ae9edf4961f43c7779123554cda0f3b433f8264d3d08e531ef5fe660b494135321a11f441ae1de97ce0abb332 SHA512 a89184314d04bad646cf2e2151e2d5f27ca23a68f25e22b5c2e4f07745671e70c71d869be1c61248ee839632f7151b597fe79eb5af814967a1ae97f2c2cdb8ee
-DIST pypy3.7-v7.3.2rc2-src.tar.bz2 25066853 BLAKE2B 286ec0909d4b9ba9039cd9ca234a90832e99369f5e7e36a486d219661631efac186e02146dd5bc5a51521fcfdd0047c3fa5a6dbffd20cebe8ff7c209d02fec53 SHA512 c8e5dc5ded2989aa3a6b635e040c23bb8e2812101ce22a104f251e0abaa3320b61f2f611ece58d6b8a8ae9f1cbc8ca22c920f3491dd5653bcb0e05264fd54a4f
+DIST pypy3.6-v7.3.2-src.tar.bz2 22736022 BLAKE2B e2338ac3f7af06b987c43e93eab9ff14d46262143472b0393b30b011fff67d33add45d8198cee7109354e09c52a2540938abeef364b0cf12f2891ca9c7aac2a4 SHA512 ed861a57d6edf1548c061d10295313a05d0ac54fe68a8755211ff76fa2dc78d7b1479c6152dc5d0d1cdce4e247c240c1a2edf59ec8a53d0004ec7713514c9c35
+DIST pypy3.7-v7.3.2-src.tar.bz2 25060911 BLAKE2B 35ecfee4c64e13539827c65a61e0cd359de4046f77553629cdf63479327c6ad86afd1443caa7a911a6271f496f0f3caf1b919ce91de717d0a71d008927b7f77b SHA512 563a9cf63e818b95aeb14c25b55bb5fb0bf8283f0b9f2bdd9a8833989beb651681f53f52368fb9db2c75fb60be0456eec87d48b557740b57847c4104003cb288
 EBUILD pypy3-7.3.1-r3.ebuild 7051 BLAKE2B 06171de220f62a018089cde90e190412f3e8db71163368eb0af7e8c6b6cec4c7f7d90f448683063f15e38323ae98ce5bef24e9917dfcf7ccf30baeebcbd9b708 SHA512 f82b2cb6e45768a58757070550c11056b010a4bc627195319ecca16ed7d1d1c225b08ee7eb7121c0bd9169e15403d6c8ecd5a38d5c2e7db705ae92039f367353
-EBUILD pypy3-7.3.2_rc2-r1.ebuild 6590 BLAKE2B 98d08f0608eef083f950e32baec3108488222bf4db581a64d1cd3231eaeb8daa9edaee4791eb66f26287f66b2c6d815079f63d67ee287de25bd93b69cbc384bd SHA512 6f28d8ad0772327112eceb8ccd1ad93d13b22420acf263fb980cd734694a0679f4ca86fc8e11d9db14644981cbbac6a502d6ea3b9e13f30bce31b1a5cb1d33fd
-EBUILD pypy3-7.3.2_rc2_p37-r1.ebuild 5419 BLAKE2B d0fc27f83246f05edf8b66462762252d2e040c2c6c0f57c43ed59da5bbf0c8bf57a5eeb496d8021114364f12d5ae5713f873002a4dbdc9b508208fbbb5f2cc78 SHA512 113c42cbc9f63ce45d9039c0f864792a6d3d6340dd1e06c11eed93208d2ac4804334802fce7709e98e6f4b36c468a49dc24943a35bfb5c8b11c1015132c44d34
+EBUILD pypy3-7.3.2.ebuild 6594 BLAKE2B f49b8c3f494bae513df46e3b13109550858382e46a0575ca2da01c2de8550e30f2bdf4627e12f4391e94fa5c05a1afbb6eed5a7f8cd58e63b27dda877e6fc28e SHA512 c48cebb3c91c0f9612299265b513734c27629ec509275e2c7ac3862036cd648f516ab2ef38dfaff3c3b23603709f445ecd158bb2c652c0ce0d9834f4a3ed528b
+EBUILD pypy3-7.3.2_p37.ebuild 5423 BLAKE2B 1c0a61ad14c9f76d069aebf3c7d2f55d4278936f3a591eedcf10d58070d3508504122e5e32775e1f262ad7eccdb7c26795518b1edfb8e162aee3fc6324d3533a SHA512 840e0fc134f7523e0dc6780c7ff38b81c1033468570f3b48326de5f0ea5c64ca9c34e7cb8603ba85084a412c84f44043f966ff411b632388752692c8feb30896
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3/pypy3-7.3.2.ebuild b/dev-python/pypy3/pypy3-7.3.2.ebuild
new file mode 100644
index 000000000000..c0706600dea4
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.2.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy3.6-v${PV/_/}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/pypy36-pp73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
+		dev-python/pypy3-exe-bin:${PV}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	# see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64
+	sed -i -e 's:test_jumpy:_&:' \
+		lib-python/3/test/test_dis.py || die
+	sed -i -e 's:test_get_and_set_scheduler_and_param:_&:' \
+		lib-python/3/test/test_posix.py || die
+	sed -i -e 's:test_auto_history:_&:' \
+		-e 's:test_history_size:_&:' \
+		lib-python/3/test/test_readline.py || die
+	sed -i -e 's:test_eval_bytes_invalid_escape:_&:' \
+		-e 's:test_eval_str_invalid_escape:_&:' \
+		lib-python/3/test/test_string_literals.py || die
+	sed -i -e 's:test_jump_out_of_async_for_block:_&:' \
+		-e 's:test_jump_over_async_for_block_before_else:_&:' \
+		-e 's:test_no_jump_.*wards_into_async_for_block:_&:' \
+		-e 's:test_no_jump_into_async_for_block_before_else:_&:' \
+		-e 's:test_no_jump_from_yield:_&:' \
+		lib-python/3/test/test_sys_settrace.py || die
+	sed -i -e 's:test_circular_imports:_&:' \
+		lib-python/3/test/test_threaded_import.py || die
+
+	# the first one's broken by sandbox, the second by our env
+	sed -i -e 's:test_empty_env:_&:' \
+		-e 's:test_executable(:_&:' \
+		-e 's:test_executable_without_cwd:_&:' \
+		lib-python/3/test/test_subprocess.py || die
+
+	# XXX
+	sed -i -e 's:test_locale:_&:' \
+		lib-python/3/test/test_format.py || die
+	sed -i -e 's:test_decompressor_bug_28275:_&:' \
+		lib-python/3/test/test_lzma.py || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/lib/pypy3.6/include/${PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy3-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.6
+	einfo "Installing PyPy ..."
+	dosym pypy3-c-${PV} "${dest}/pypy3-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy3.6/include/${PV}/*; do
+		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3* \
+			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy3.6/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3/pypy3-7.3.2_p37.ebuild b/dev-python/pypy3/pypy3-7.3.2_p37.ebuild
new file mode 100644
index 000000000000..9c1fc7d860ba
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.2_p37.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p37}
+MY_P=pypy3.7-v${PYPY_PV/_/}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/pypy37-pp73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
+# pypy3.7 is in alpha state and a lot of tests are failing
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
+		dev-python/pypy3-exe-bin:${PV}
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}/7.3.2-py37-distutils-cxx.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy3-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.7
+	einfo "Installing PyPy ..."
+	dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3* \
+			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy3.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild
deleted file mode 100644
index acb328c4e725..000000000000
--- a/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 toolchain-funcs
-
-MY_P=pypy3.6-v${PV/_/}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/pypy36-pp73"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy3-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}"/7.2.0-distutils-cxx.patch
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	# see http://buildbot.pypy.org/summary?branch=py3.6&builder=pypy-c-jit-linux-x86-64
-	sed -i -e 's:test_jumpy:_&:' \
-		lib-python/3/test/test_dis.py || die
-	sed -i -e 's:test_get_and_set_scheduler_and_param:_&:' \
-		lib-python/3/test/test_posix.py || die
-	sed -i -e 's:test_auto_history:_&:' \
-		-e 's:test_history_size:_&:' \
-		lib-python/3/test/test_readline.py || die
-	sed -i -e 's:test_eval_bytes_invalid_escape:_&:' \
-		-e 's:test_eval_str_invalid_escape:_&:' \
-		lib-python/3/test/test_string_literals.py || die
-	sed -i -e 's:test_jump_out_of_async_for_block:_&:' \
-		-e 's:test_jump_over_async_for_block_before_else:_&:' \
-		-e 's:test_no_jump_.*wards_into_async_for_block:_&:' \
-		-e 's:test_no_jump_into_async_for_block_before_else:_&:' \
-		-e 's:test_no_jump_from_yield:_&:' \
-		lib-python/3/test/test_sys_settrace.py || die
-	sed -i -e 's:test_circular_imports:_&:' \
-		lib-python/3/test/test_threaded_import.py || die
-
-	# the first one's broken by sandbox, the second by our env
-	sed -i -e 's:test_empty_env:_&:' \
-		-e 's:test_executable(:_&:' \
-		-e 's:test_executable_without_cwd:_&:' \
-		lib-python/3/test/test_subprocess.py || die
-
-	# XXX
-	sed -i -e 's:test_locale:_&:' \
-		lib-python/3/test/test_format.py || die
-	sed -i -e 's:test_decompressor_bug_28275:_&:' \
-		lib-python/3/test/test_lzma.py || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/lib/pypy3.6/include/${PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy3-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.6
-	einfo "Installing PyPy ..."
-	dosym pypy3-c-${PV} "${dest}/pypy3-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy3.6/include/${PV}/*; do
-		dosym "${PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy3.6/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c-${PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy3-c-${PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy3.6/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild b/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild
deleted file mode 100644
index d750cf9c4b2b..000000000000
--- a/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 toolchain-funcs
-
-PYPY_PV=${PV%_p37}
-MY_P=pypy3.7-v${PYPY_PV/_/}
-
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
-HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
-S="${WORKDIR}/${MY_P}-src"
-
-LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/pypy37-pp73"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
-# pypy3.7 is in alpha state and a lot of tests are failing
-RESTRICT="test"
-
-RDEPEND="
-	|| (
-		dev-python/pypy3-exe:${PV}[bzip2?,ncurses?]
-		dev-python/pypy3-exe-bin:${PV}
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	gdbm? ( sys-libs/gdbm:0= )
-	sqlite? ( dev-db/sqlite:3= )
-	tk? (
-		dev-lang/tk:0=
-		dev-tcltk/tix:0=
-	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/7.3.1-gentoo-path.patch"
-	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	eapply "${FILESDIR}/7.3.2-py37-distutils-cxx.patch"
-
-	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	# apply CPython stdlib patches
-	pushd lib-python/3 > /dev/null || die
-	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
-	# (not installed by pypy)
-	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
-	mv pypy/module/cpyext/include/* include/ || die
-	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy3-c
-
-	einfo "Generating caches and CFFI modules ..."
-
-	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
-		|| die "Generation of Grammar and PatternGrammar pickles failed"
-
-	# Generate cffi modules
-	# Please keep in sync with pypy/tool/build_cffi_imports.py!
-#cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
-#    "_ssl": "_ssl_build.py",
-#    "sqlite3": "_sqlite3_build.py",
-#    "audioop": "_audioop_build.py",
-#    "tk": "_tkinter/tklib_build.py",
-#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
-#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
-#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
-#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
-#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
-	use gdbm && cffi_targets+=( gdbm )
-	use ncurses && cffi_targets+=( curses )
-	use sqlite && cffi_targets+=( sqlite3 )
-	use tk && cffi_targets+=( tkinter/tklib )
-
-	local t
-	# all modules except tkinter output to .
-	# tkinter outputs to the correct dir ...
-	cd lib_pypy || die
-	for t in "${cffi_targets[@]}"; do
-		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
-	done
-
-	# Cleanup temporary objects
-	find -name "_cffi_*.[co]" -delete || die
-	find -type d -empty -delete || die
-}
-
-src_test() {
-	# (unset)
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x COLUMNS=80
-
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	# (--deselect for failing doctests)
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
-}
-
-src_install() {
-	local dest=/usr/lib/pypy3.7
-	einfo "Installing PyPy ..."
-	dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
-	insinto "${dest}"
-	# preserve mtimes to avoid obsoleting caches
-	insopts -p
-	doins -r include lib_pypy lib-python
-
-	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
-		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
-	done
-
-	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
-	dodoc README.rst
-
-	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
-	fi
-	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
-			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
-	fi
-
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
-	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
-
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy3.7/site-packages
-	python_domodule epython.py
-
-	einfo "Byte-compiling Python standard library..."
-	python_optimize "${ED}${dest}"
-
-	# remove to avoid collisions
-	rm "${PYTHON}" || die
-}
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index 3b5d3d587baf..e9d72c58460a 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
-EBUILD pytest-aiohttp-0.3.0-r1.ebuild 530 BLAKE2B fa0c29d6cfb5ec5164141587d35242fcc93cdd9064b3a4145f9629e0b87f50632436f3fb81539fab2fb167277c5e443b3fd9881dd171540e034aede332c03a3c SHA512 d18b985d1ffad0cec8120cb4dfbbda2b96a7bc2d496c75c4ea456c9222e78443aaed378aa185bd7cdea74650bde7d80460b105c254927416f42f35ed447379bd
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 537 BLAKE2B 6b95e1fe3ce5eb0ef521eac7fcd3535d5d69683ae30cfd4bd9b0914fbf3dc4068d45a86731ecfcbe5f37c7769a9c3385d42d8a26bac43935abf588e94fb2023c SHA512 5a54903ed2e0a08a72260e2d3b9d0b30be8d88a34f735be73b999a55bf4022ebc19c6e131a235f2857bd5b39c51be905852556a16f468289b14f4025543c1641
 MISC metadata.xml 382 BLAKE2B 24ac18217bfebed19f5049bbaca9955da1a0eebe08b8fd3f8f870db50369ceec3e68f4fae68604a399084122a3e3ae460481f855e4a4a3c419e494103d452c56 SHA512 73da71aee91bfb48dc637ef0e4d47a4693ba602f8cb15d0056cc0a14f4bb74d11cad7edcee8a1e892eaf2c3cf1d85735c9f5745ea0ae8d5026a7776c0550cf3f
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
index 558fcf85a76d..f3e488461a08 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-freezegun/Manifest b/dev-python/pytest-freezegun/Manifest
index cd6cc8175c86..fd61bb37d1ad 100644
--- a/dev-python/pytest-freezegun/Manifest
+++ b/dev-python/pytest-freezegun/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-freezegun-0.4.2.gh.tar.gz 7058 BLAKE2B 1c89979d85dbdedf87a26de57d1cfe120ed52831e8d69c42b6117ac49c9eb7376bab018a23ca10b582fc583ca61a03930a86878c141b0c5bf4d807552484fe70 SHA512 2bea7746e4e6a7f2a979cbc5c6d7a2576e0e2631a4e1d5abb7f27f76d6c32b0520a277474c092c5e05ce257f2ba19091918f67e28b7a2da1d5829037c6b70c55
-EBUILD pytest-freezegun-0.4.2.ebuild 690 BLAKE2B 3b710af5f97dd33b3c29c221ff999a30ccc15843bda26be386771f3317855d1c9f44616ac024c45966a98a4dddda8f85c8e521fc30e7e9190faeb845aaff02dc SHA512 58262f594385b6ac21a1162fe50e76ba6be56100985e196533f940fc98915357cb006ba7fd4c5e448fefea14dd48e5296393b325bda334710d5d11c9395e5bdf
+EBUILD pytest-freezegun-0.4.2.ebuild 697 BLAKE2B 1955b8341acc362650257dea0ba2cb4fa610e74e06a10029bc1a65c9db741e7d28b782d687b82a1af4237c4268d556402ea1d4a46081d0b1131b7d6914710e77 SHA512 5d28b41a39fc0bb3c23fd3ea4ae47fc105dbf5971ab0f593191bd03af1409e785b4b9522c81c40d8cc25cf96720bdaaa6e952252b1914898ad6cb9afef011c2a
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
index 0bf347a70eeb..6b6213042264 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 75179458a2b7..5c97c0581f97 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -1,5 +1,7 @@
 AUX pytest-services-2.0.1-lockdir.patch 1085 BLAKE2B 09982cf4874d82a332b441e4538d1fb177735af3acb2ba2d7fed9c0a2ef006841ca0c4221fc51c0472a0a94c49bbcb72877c67b5c7630333f550e3fda1b5aa91 SHA512 7b5d4d5adb722936bd3593ed4e12fa2ca9bc3aa764565d9cbbea2d70424d9811d5838e97bbbe8fafa2f73acb8bdfa6c705e8c4aec12b5b6556b1e4c8db629ea9
 AUX pytest-services-2.0.1-no-mysql.patch 821 BLAKE2B 3a041e51c0e2c08ce8727eccdbfac36eacec2542d8d8cc7ab7544f46916b47a62e960437821f8fa85fe968b9e68808b94d9ac51fe06daf487008bfaf305ba81e SHA512 68788f6b6700793df2de4fbae85a41fad095f09ac9af717c786305fc1ca6b29438a65d096076b9469dc543a54ce8f72a40dc0f211eb9d517e658ce068e60ee23
 DIST pytest-services-2.1.0.tar.gz 20552 BLAKE2B 6359c419591efed553e095e267c24f78f36b152f0eefe21d46742f7c15f05e92a9e86891f99762a3716fef5284b00d07d8d6eb825008dbbbf07e36dc62a7a6b4 SHA512 54a487546a2af7996acdbcd63bfc01626832aa41683617cdd345453cf6518afdf03cb8c2465e1f5d28c88b2cc801ffb0d9d4440582865f899e21fe42ab431ebc
+DIST pytest-services-2.2.0.tar.gz 20995 BLAKE2B a65455d89190d6b63854df7509124c8056c962640972f67210e3b3dbf2d669708e4edb124077cd32e7fe429e884372f4248396377b5d4879d9f7313c3ef7df46 SHA512 48430d6c107626a4e13a8eb16cf5cc3b2068e34869b8a4e3e615fd7a20f3644a028c911211f3de885ffd942cafd3946c313e76ddcf6199bedc9731f7b88c843a
 EBUILD pytest-services-2.1.0.ebuild 1192 BLAKE2B 0b01249eaa29b1ed37b363052bce603ee5b5236c872de1e7c90fcf896037ec57d633888445fef215f8767d286f67afb8926980cb37bcdbbf49bbf6ef9fdcb628 SHA512 1d58a79178d31dc5b3846038b5e0dad068aa4b366717c4ea2c9a55bbdae85f18bbbdd435b850ab162c25c5248d370a632bc556bf9a51e653f2b613b2c461dfdb
+EBUILD pytest-services-2.2.0.ebuild 1230 BLAKE2B aa1641741f2dd98046110b8ebcd792a18fa543fed04416ad8022797a7b769dae44d31c8305a830c7c0cd39e850271e7881e4f57782b4d4594a5e98231c86cc02 SHA512 663661875a7a86caf50faae5e4cc518d78d8f62a62ef98bef46882c1185e6e3d95e996f039df17c0fbc6674fd876086949781de4afaa0639edc9aa653c6ca20e
 MISC metadata.xml 408 BLAKE2B 84e0589c8c4d813b4542e5d3080ad855611c320c9d5950a08c232c9fa344bca969fa4b23cf6d2b427731d2d30c2f678d33605207042779ea40123c6b249017ed SHA512 de1340d8f01941355ec01b2f92b4e89ad798dd9438e858050861dfb8c139994b5e8fe620b00fcc8133204ba8d265eac36f60ba3bca3a4e0da49332da13b75a9f
diff --git a/dev-python/pytest-services/pytest-services-2.2.0.ebuild b/dev-python/pytest-services/pytest-services-2.2.0.ebuild
new file mode 100644
index 000000000000..4d08d2390cf1
--- /dev/null
+++ b/dev-python/pytest-services/pytest-services-2.2.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Collection of fixtures and utility functions to run service processes for pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-services"
+SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/zc-lockfile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( ${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		x11-base/xorg-server[xvfb]
+		net-misc/memcached
+		!dev-python/pytest-salt
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/pytest-services-2.0.1-no-mysql.patch"
+	"${FILESDIR}/pytest-services-2.0.1-lockdir.patch"
+)
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 8112d7c3154c..42b4f3d033e8 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -2,5 +2,5 @@ AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe0
 DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
 DIST pytest-xdist-2.1.0.tar.gz 66332 BLAKE2B ac3c19a32bb9153537edfcf55bc656011661cf0d166da1aba969055a398616bb5782534a12ba354175be722c070fcfb2013d58405048814a3d11434a314e38b8 SHA512 85c69d8e649a19de5639738eae4cb213dc7323d96883ec82f39ab51a196346edd9fadbaf97f9763ac0dea104bc123d521264a39d2701878edfa76ce7e5bb347b
 EBUILD pytest-xdist-1.34.0-r1.ebuild 1036 BLAKE2B f576f44fdb55876e9cf7ccaec9ce5ffeede2095111a48f2455da590cc4c053ffac094b21baad142dc9ed54c654af423b29c4f7719dd32ff49da2d2f149e666d3 SHA512 3dc96e04f982a62f24f9ab9b2748dbd1a97c486ae3feee09b2e6fbd1ae4af6910455c456537453fa48d3cb85e03ac09acd7d26512a054e3aff83b5dc28591f62
-EBUILD pytest-xdist-2.1.0.ebuild 948 BLAKE2B 929903847fc4f7364e877526a1b0cc86f67914c1a2d398ca56b925cfa34054f73291fa24081880517b652ccf8b1340dfff980ef607f3a04e66abcc59e5946d93 SHA512 ce13c2b58cc23a5ce988d09fc1d8e91913446969030e28db095ff9e6dfc9838cac666df59bc976326679f75ae2331db09e37a6b3a2f7b68f1e02343041093dd3
+EBUILD pytest-xdist-2.1.0.ebuild 940 BLAKE2B 99971cbc66925d5852dfba23c3495281f1221372f0e9e48332908297707ffc4214153ac422965d2be7c4ace98e747d0ff3e531031f1d0d7f05f71d625a73850b SHA512 4def0ad0cfe6f8f3d9dc38db668e502fee9f9e2cf9a14578279cc5b21bb8e0dd35c446a838543b4fafc357f39659e98d2aca5e749c3f782dd5c398523b30ecc6
 MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
index 75f1a49f1a2f..ef6d90f384cc 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 # please do not depend on pytest to avoid unnecessary USEDEP enforcement
 RDEPEND="
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 87cfa89ca7ad..931f179545ef 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-xprocess-0.13.1.tar.gz 10273 BLAKE2B 0c2a8bdf5e31543b32ada50f2bb5e1a09b45de820064807bf41321638d11d6b6fea28fd2a8c795e7bc6f7ac7370a3e78988e8aee318fad9df194fd3b06cce7cd SHA512 e0ab9e13d7f90ffca1bb3646e5789582806519ff5e665e13ed0db00896d799a7828b39e7657e947783d15ec1a961b33c1c981e39069dd298bf352826dbdc496f
+DIST pytest-xprocess-0.14.0.tar.gz 13272 BLAKE2B 54a308b2d2783875c51b747c6c54fc7d8bf3542ea80590bdd51de0ee4ffeea73463793cfcfa8b8b75b45345b88ca4caebf3f5e45bc1de3fdc1649e0bdeebd72d SHA512 fc808d10f4adea1fba501178e30f82af575fa64fab9e3f44a73f1f1e809a09530be465d20be91ca0abb1fd270e9ebc397d64bccabfb3dc497b7b8f1123ef1fad
 EBUILD pytest-xprocess-0.13.1-r1.ebuild 630 BLAKE2B 43440cb9b303a3c2abdc4f29eea0f8a37a05dda6030d72a9632fdc4a6b3acbb7327be5121cfa051143a104edb9c141e991c3418162e6ae811e07c639c83a6466 SHA512 0694a9b4e2f5dc1863d9b826eb043bc27b5e9b5ca3bbbbe15f5f90640e66f16ba781b12778ee7d6501e9c5d53eb7cd07358ba987a753d1df5eaee183570f3e8b
-MISC metadata.xml 424 BLAKE2B c4e4e4a90fc6e7dd7e474686b1a0215a380925523d3d41cba07cd5f59f0ce322a2e8fd10cd834ac263bcdef2d0f62bfcb48bf85373036bd8869f764ea06ef788 SHA512 822c6bb63a93d2ec81c4d7c00faa75ba7e97813f510d570385f075a1a0b641408d6323c9718ddd899fdf25b2d198204c5bba38604a593841a7cf89c44410134b
+EBUILD pytest-xprocess-0.14.0.ebuild 638 BLAKE2B 57a2292c5fc28288bfbee85a36e17c803b2b5ad0923c559cbc64d7546d2855b9f1041fffbb80870682ce8c7ab40e86e7915a9e4a3bf834fa43ad8fedae30d6e8 SHA512 15a917078d76247016db8108becdc434c944965b9e63e6939eefe976fb5942793010933a7534a507eaf6340aff99b42c25c2beb289edf851719afa0d525a01b9
+MISC metadata.xml 421 BLAKE2B 616045f871631311e9310ebda14f2bcd936b7a721196f9312b6270bbf8713789329b56ba058cb412d31e68e91957666ce9f44043527efbd0842dece87ebb5f5b SHA512 4d5b9f41b7aaebcb87c8718a98b1dbb3df0f199a5f6940bd12e3504ff5080a0ed112b315c89e2af1a5a3220829879afa0cdf931828359ff98732311200b76b9d
diff --git a/dev-python/pytest-xprocess/metadata.xml b/dev-python/pytest-xprocess/metadata.xml
index 0052c5ad8164..e123380870c0 100644
--- a/dev-python/pytest-xprocess/metadata.xml
+++ b/dev-python/pytest-xprocess/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
-    <remote-id type="bitbucket">pytest-dev/pytest-xprocess</remote-id>
+    <remote-id type="github">pytest-dev/pytest-xprocess</remote-id>
     <remote-id type="pypi">pytest-xprocess</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.14.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.14.0.ebuild
new file mode 100644
index 000000000000..d9f406cc465b
--- /dev/null
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage external processes across test runs"
+HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 65e94d3f0f05..838d0089dce8 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -4,8 +4,10 @@ DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 DIST pytest-6.0.1.tar.gz 1069631 BLAKE2B 89a78ebf8e8cf968ea767fe7244408ca79d247c1ca459815ac299ce773b44c375429935c8a25b4de26349969113c60e4b6812d5aa2d805691664af74796ea85b SHA512 bdd790c3860da2ed3a3ff47f04512c3bfae4fa1e31fc6b96fc19bd57d1804a6fec968ecf17a11c5b20d30dcf82d6391ef0d893ae57a3da9ad777a15c078c129f
 DIST pytest-6.0.2.tar.gz 1070533 BLAKE2B 54397bdf8255641e1cb0555a78b3687a49376d9cc603a98b6df3415159aef0331cbaa7d0883bafbceea1b2273fc0ba5c867f7b66eef5b2b4c24f3e5196786877 SHA512 478d28c30f4f990dcdd98edcd074051e32d9ab25941c21bdc9c4cc47b726da79b5b3a01572ff97f608598ef6bb9df075ebba49abb2f1420947e0c6d4fe0be9c8
+DIST pytest-6.1.0.tar.gz 1083563 BLAKE2B 79da2026ba6915b406a1b6a2c8d79e5f45695f32e8f9369ef3c27ebf9b3f80ced23b4832c75c47db552a084f03a68da04279fdc8c8ef526a41e42deed0a52b5e SHA512 a67571468315eea7ed5b56285f18b239b47992bfc7d4d891587f1c540f240159219be15a9a34852529ded7743bea82eb9cde4bcdd053f448a61a6c835b5405de
 EBUILD pytest-4.6.11-r1.ebuild 2473 BLAKE2B 4a5edd72d94553b553730a5caa2c17c25826a5be58bce6273d39d2a010a70c1fa1f8acb0751c3fe5185883a94da31ecd7e772f606c82d8d99b639804bd49d5d4 SHA512 da60063475df3b7e9e531b234e486bcafe7c1e926f58f7ebaa8e38cb02233629160aa20a9b665fddb83e50f52b0b46702b8a80e65195af4ff7b3e939927db9cb
 EBUILD pytest-5.4.3.ebuild 1940 BLAKE2B b17bc0f3efe70c149ee494d2528f8e16a839c4cb2965378ab6c8b37e3c1b295bab253edd8410f6f2a69cbeb288d6299898320d387330e2d7b5b31418e985a0d8 SHA512 d99fa3064053e3ac99fadce4b23749e16dc2d9e6658f3ab07b1e68c1885d9fd243f4ab4f5462e127b9afdbb957bb498c41126ce79164a31cb2accbbaa1f4b7e9
-EBUILD pytest-6.0.1.ebuild 1640 BLAKE2B 299366a4eef7f503de1ca25c551235e508df299827c365d9b3c45a5b6244b425ede0fc2509847b1db542a034141c89e145febd752b232c650a5ff28d3ccf3ac3 SHA512 c8e65d1e3c4f8224ec53630be82f19d57ea90ae8073330cf4f5b1de6a1a057aac885e234211110639e117dc717ad6b162a963947d88c72305af957d23fceb80d
-EBUILD pytest-6.0.2.ebuild 1639 BLAKE2B 2717ed1f35c783793700e904c29e5a94372787cc7d6b7d0200aa0c90dd8aa56818db06bf3328f449727f3a58c7441171f0df5fd49ce132c798778f65bef59995 SHA512 632c7acc6f09cce77307310a71e55f872c73528388da3113582c6cded7b9cddf77ce8c6942fa45cd35ee3f2c40f82bc05f5c004ac8f653ade0dcb673329463f1
+EBUILD pytest-6.0.1.ebuild 1637 BLAKE2B 760ee5651a0f09ce50a8a955d740cf5d64063cd174abe19780152f895115a3ba7a5b9e1dea444086d67f701d0622f153e72bec014fb1e03caf8669cb5d893499 SHA512 0c37af8239aa9a74f793a551c451027b180d1d216c6b8ca6b5089a38389f5ce5b220d8ad65a0f360028068fd6b38ab52a2fe6022fc306bc5358e618942bfdfcd
+EBUILD pytest-6.0.2.ebuild 1646 BLAKE2B 48fab75ea46eb167d9b608e1d61c6387bafc8776b1d29221390060ac14a5c90e7f8f79dc839b78ec46e9d1a604b444dcbc0324a7dadae892e4fb4e683e31b1d6 SHA512 cd9c7e5cd34d952188a6d0f6e07545c42fd31674eca3fac26b1ea3323734804abda3468f100f297d37c332260e2e9c5616bc5879f1ac52c1cc18f19b1860916f
+EBUILD pytest-6.1.0.ebuild 1639 BLAKE2B 2717ed1f35c783793700e904c29e5a94372787cc7d6b7d0200aa0c90dd8aa56818db06bf3328f449727f3a58c7441171f0df5fd49ce132c798778f65bef59995 SHA512 632c7acc6f09cce77307310a71e55f872c73528388da3113582c6cded7b9cddf77ce8c6942fa45cd35ee3f2c40f82bc05f5c004ac8f653ade0dcb673329463f1
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-6.0.1.ebuild b/dev-python/pytest/pytest-6.0.1.ebuild
index ef8c99c827b4..3720e6e0ee6b 100644
--- a/dev-python/pytest/pytest-6.0.1.ebuild
+++ b/dev-python/pytest/pytest-6.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-6.0.2.ebuild b/dev-python/pytest/pytest-6.0.2.ebuild
index 79c06ee7d705..6f3c17ec4430 100644
--- a/dev-python/pytest/pytest-6.0.2.ebuild
+++ b/dev-python/pytest/pytest-6.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-6.1.0.ebuild b/dev-python/pytest/pytest-6.1.0.ebuild
new file mode 100644
index 000000000000..79c06ee7d705
--- /dev/null
+++ b/dev-python/pytest/pytest-6.1.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="https://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	dev-python/iniconfig[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+# flake cause a number of tests to fail
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+python_prepare_all() {
+	# fragile to warnings from other packages (setuptools)
+	# little value for us to run it
+	sed -i -e 's:test_no_warnings:_&:' \
+		testing/test_meta.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 6f89c201b125..c4e2929ba68e 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,3 +1,4 @@
 DIST python-caja-1.24.0.tar.xz 312340 BLAKE2B a860cb1cc983221710d93943ac39b9b77761997fa6a52b32dceeeec381ee86d976c56266013d0370a28e7cb26de3601fec42234b4f91c78e5ac54992035e17ee SHA512 9febf7cae1736e30c80218dcfd3cc05b948823b99945ed67c1839ab5149aa3fe05b090d46c598810f0cde8ba66b83426c4642f6ebdbef6067f6b2fbc0798e816
 EBUILD python-caja-1.24.0-r1.ebuild 1238 BLAKE2B c6246ec404142eae09fbd15ef22a9a58611b1f843542cb40b0a9ac2c6b6828a3c741751cc88c5a06d1cf9718252d0ac83447d390c2db3671c020e65b15a9eb38 SHA512 0c95e497ab243747de397a450634409cdc293fba2143fbc1f48dac7be77eb8a769a0e5488786978e9c82109bfa1117db5d6e82a40da347ab945a59a5516c5720
+EBUILD python-caja-1.24.0-r2.ebuild 1236 BLAKE2B bf8ddc677f7bdaa33c3fbcc466a1a3e398727f5d13e1554bcccf35e3fddf72343504881d9cd07ab465a379445af4c1b804c59ee950469735418f7bd701d8e953 SHA512 39f4f9909268860e40c5083a66fdb11435a857e61a0c55979648975ed0c6f7789a99f243e1f0646130bd3a4f9756e8e818be2bced872c6d1063e3b0677b36887
 MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
new file mode 100644
index 000000000000..622b4373e83a
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Python bindings for the Caja file manager"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2
+	$( python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )
+	>=mate-base/caja-1.17.1[introspection]
+	>=x11-libs/gtk+-3.22:3
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	doc? ( app-text/docbook-xml-dtd:4.1.2 )
+"
+
+src_prepare() {
+	MATE_FORCE_AUTORECONF="true"
+
+	sed -i "s/\$(PACKAGE)/${PF}/g" examples/Makefile.am || die
+	mate_src_prepare
+}
+
+src_install() {
+	mate_src_install
+
+	# Keep the directory for systemwide extensions.
+	keepdir /usr/share/caja-python/extensions/
+
+	# The HTML documentation generation is broken and commented out by upstream.
+	#
+	#if use doc ; then
+	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
+	#	doins -r docs/html/*
+	#fi
+}
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index c9d778961012..90590cf3290b 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,4 +1,7 @@
 AUX python-efl-1.24-clang.patch 1611 BLAKE2B 132c1f64c2bbf8a0a30fb154c6fab367141c0e65f363c17f4881dc3efac66792ac1c9be652a896c11296a25d77a4a138b6452749f02502075d95828eb42816ea SHA512 11d7ca99d06642f7bdfc3bc72e86dee56f9c47a09a17e5533296fef296bcbcf7d75c23f5ba5f8088f6daeb2ff5982840abb6cd2e9ae82345bdfb1ca5325237db
+AUX python-efl-1.25-clang-crosscompile.patch 579 BLAKE2B d308bf06950094a00fbbad24f4813b6dd511122071328f01ab2bd774ba1cd79cca7cddffc8dad4d65c8cc83430f99d59a55dfc2a5d4805a54f62ae0ece880a3f SHA512 3da1b63c7d40dc8027db5bcd6ab165789790e4db8c3ad876d55eda9363557cff8a46858a2ca8c23d1bb8e1e43bb7b057ff596aebe7adb2c40f3bb18b37e71225
 DIST python-efl-1.24.0.tar.xz 9535212 BLAKE2B ab9535d60af75422f3c055e56f3c6297f595afbf682970afcb21f597486b307504fa83ab894c2029fb681dda8d886d1fc837726d1c4ae62df7185fbc0073724a SHA512 5b57de58b2351f00f744454e6aaa16f7bf9cf72b7f73d07a2d98cda4d152eb65810513b5c04b1eda127b6f5caf56e4b9bc9a7c1ef98593edde26a9ed3be953c9
+DIST python-efl-1.25.0.tar.xz 9543920 BLAKE2B fc2b951ade2fc2b7c32dd78a84800bc9f225499ee9d8431034b378c86e423181d918aba2c4d056974f3aa2df9cfb9c7b3dcf1c366362387048cde182c0b3128a SHA512 23ed29add25cd2639e9eb144f22c5e2809b8634389f7ab5c4b7ebc19302fde4ebb0fe8c41d7b10923e658676c4dfbb8670fda16675682fd376258beecbc3d9c3
 EBUILD python-efl-1.24.0.ebuild 1778 BLAKE2B a49a7a27e5dcd5da3f9dcf7f22b04a32e1f11cd3f7e1a611a1677b47325afee28f412be14630c438c4b07e6bcea74960f7689d524f8c0cb97efd4629c826c4df SHA512 24bab6cc4907e942e270d937567d6f90eda2a77ffa41d653ffe86594e464226bfab4daf4b368ef20f47c54895a516181450f76a938c37ad70e9b56331e2e4bb8
+EBUILD python-efl-1.25.0.ebuild 1803 BLAKE2B c980a4ba307b02b6a1325b61f79357b49900d9045fafb74e9e3faa41b30576e054dbcbc36be46d586df77d9b82e9794ca654f276be552ebb0f11ef7f6b805cf6 SHA512 fd0db0d5afa8f3b99976fee25a08a9956abee52e0cd2304b3e4ef3ff8be289a5dfc16579a29fc68e4d4176afb50a94b7d8828ba4cdfdaa34f5755a2cd19d80f0
 MISC metadata.xml 588 BLAKE2B 0d810c31fac4488f392b8d3b57eb830af3b5ce3c970a9087939e35bc33c58d652ad3a6dd1c42c6b2604334b5c098b81465a1dc92e051e9f5b8cf5a047a190ee8 SHA512 9390fbbc9345bd5e580a8a1208d8f2e727dd0d1d562679b5e7b7c3f7a4010ed6154e1c2f9d93502dee73d96cbe28ed771b921f67e4a4921c635ada8056449de6
diff --git a/dev-python/python-efl/files/python-efl-1.25-clang-crosscompile.patch b/dev-python/python-efl/files/python-efl-1.25-clang-crosscompile.patch
new file mode 100644
index 000000000000..856aed8474ec
--- /dev/null
+++ b/dev-python/python-efl/files/python-efl-1.25-clang-crosscompile.patch
@@ -0,0 +1,14 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2020-06-25 19:46:38.312786000 +0300
++++ b/setup.py	2020-09-25 09:52:34.830587205 +0300
+@@ -221,6 +221,10 @@
+ # remove clang unknown flags
+ if os.getenv("CC") == "clang":
+     common_cflags.remove('-fno-var-tracking-assignments')
++if os.getenv("CC") == "x86_64-pc-linux-gnu-clang":
++    common_cflags.remove('-fno-var-tracking-assignments')
++if os.getenv("CC") == "i686-pc-linux-gnu-clang":
++    common_cflags.remove('-fno-var-tracking-assignments')
+ 
+ 
+ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
diff --git a/dev-python/python-efl/python-efl-1.25.0.ebuild b/dev-python/python-efl/python-efl-1.25.0.ebuild
new file mode 100644
index 000000000000..097475df6fab
--- /dev/null
+++ b/dev-python/python-efl/python-efl-1.25.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python bindings for Enlightenment Foundation Libraries"
+HOMEPAGE="https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"
+SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="=dev-libs/efl-$(ver_cut 1-2)*
+	dev-python/dbus-python[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]"
+BDEPEND="virtual/pkgconfig
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)"
+
+PATCHES=( "${FILESDIR}/python-efl-1.25-clang-crosscompile.patch" )
+
+src_prepare() {
+	default
+
+	# Tries to download a file under /tmp
+	rm tests/ecore/test_09_file_download.py || die
+
+	# Tries to use that file which failed to download
+	rm tests/ecore/test_10_file_monitor.py || die
+
+	# Needs an active internet connection
+	rm tests/ecore/test_11_con.py || die
+
+	# Test fails because of deleted files above
+	sed -i 's/>= 13/>= 10/g' tests/ecore/test_08_exe.py || die
+
+	# Make tests verbose
+	sed -i 's:verbosity=1:verbosity=3:' tests/00_run_all_tests.py || die
+
+	# Disable any optimization on x86, #704260
+	if use x86; then
+		filter-flags -O?
+		append-cflags -O0
+	fi
+}
+
+python_compile_all() {
+	if use doc ; then
+		esetup.py build_doc --build-dir "${S}"/build/doc/
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd tests/ || die
+	${EPYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( ./build/doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index d4992ee5137f..fc932c8949a4 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,5 +1,5 @@
 DIST python-language-server-0.34.1.tar.gz 70238 BLAKE2B 55ec41875907bb6c09f682c8ce6165e7e2fab5d03c3d4758bcbe658968aeeee7f0316a472efe68ddd87872b0e2d34908c8a7e9528aa5eec6d3359b2565a2cbbc SHA512 12404753f4271ec3606cee535ba8e886037bf0c61cc5c4415358066be837e2248f6393124340551387cba7351dee924b4f5ebc9c4e35b1ab0943067968967a90
 DIST python-language-server-0.35.1.tar.gz 72944 BLAKE2B fe469e5365dec4a2192a2ca2f75fc9f05476434c0f6db26d851521149053455b256678ed98c5f1209d30b262808b615a3f7ac77fb604adf1455203e40f93c96f SHA512 278f281c8c82729ad60db2785b3f4b64568de529edb7a6f1b5683d09838ea43ed79182c50e42210e766b9a3f3c10b0c0256121b9925803c45f9e948f144ca994
-EBUILD python-language-server-0.34.1.ebuild 2333 BLAKE2B 769f38ef10b364ffa0f780a61879a558b7c29e79b7e8036d6965804c891b908240cdb7f976e358588c3f1739f81e5928d518a89a3de2b95ee0ee3f9ae6fe953c SHA512 ee9b21699c16bd8ad745139d99f27ef38a61183a86dfe5d431d8b708734da7917fff0ce6e19bf3ce4feb90656ee758c5214fa0d07e4dc4dd6e9e59efd1d11338
+EBUILD python-language-server-0.34.1.ebuild 2332 BLAKE2B f2c1f1b6c7c5142287f80e167e4dd2efa2395416585915b79118635f6b24078a73cc52c29236131086777a6036335b2de6c9859fc7a293aac35ed20cf89df36a SHA512 789b65a8cee9bea8a2e3709967fa3078d77b64989905820d542f4945e66c0cdcb9f384e39a4ba5d82b8597235654c87d14af32c6243989dad15c32dde6c3a0ff
 EBUILD python-language-server-0.35.1.ebuild 2662 BLAKE2B dd6c20e8f34b4c97e21aa0919569a5ae93a0d235d8dc2177dc603df7abf0b387b5d3555f75031f4ad8516d7d1eb9a0ae46e795f992b07066062a138b5f481537 SHA512 c613f523794bf1c44ec4211c65273fad32ca8c2084ef532ff1c31d6098462736bdb8708a8604168ba1a005725a409f9a6915b7d7301aa8dc239e7755636c12cb
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/python-language-server/python-language-server-0.34.1.ebuild b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
index 03dbc1d1dd8d..362f4d094a9e 100644
--- a/dev-python/python-language-server/python-language-server-0.34.1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index 30bfbe50c045..9cdc3fa7b723 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1,3 +1,5 @@
+DIST python-memcached-1.59-gh.tar.gz 32334 BLAKE2B de8d18ba887b03e4737b554cc4b0074a4f16745e26a8b3631a747c45019e1da83612677dc3e98f97d76e851320c61baafbd0a29231a826c14b7d3bf3e477f29e SHA512 d7ff45a329f2a9bf97fdc7c0268c2c67046c3501270fcf03578b955c2da35904d7bdecd4239924d390797ddff8f4cc69fc5743f4d4f663cdb9f2f8c7e8159512
 DIST python-memcached-1.59.tar.gz 22210 BLAKE2B 50387821d50cf974ada738346e016eb736043078721bf905782f41df1f27574244d03b6b94ac9e5ccab7aeecfa8ca4c5a78cec2c41d15fda8756c7cb3bce9aa1 SHA512 a25cbb9efb3babe85e1523bdabfe4644b93b3a6a7268787a3928f724f833ce0eea7d2ef676d1b7f894cdfe293129975b35cb46ec553c92810dbc18013bfabece
+EBUILD python-memcached-1.59-r1.ebuild 1192 BLAKE2B f8139adc31ebb7c85299cdc98bf3a4c9b56e762522b732e7aa71d496cd2750985039c4e6598b88aabb0e20b2c4c3e595b6b22638a8999adfddfdf454ce481f76 SHA512 42374eaf1dbeb21ed49793105a55e95f7821b5e1dfcff3874a3c34d57c12f565b7307972dc0b98f855c4f2d4a5ef1067a6bc508e4898d7d40f92fe148043f93a
 EBUILD python-memcached-1.59.ebuild 1255 BLAKE2B bb04c0eeaaa34086942176c298e3c01cbe71c014dae7c2abd85e57e01e2de401b6b6a88654215ac48ec6f6802eb695cfab53752b4f52412afdbc4261834fddc9 SHA512 708ea202402b8fb3af376b76c4cf39c32af13cc9c0c23aac102a574b0cbe579abb3bd7da942955c7512acf334e4031d278944fdf18eae141eeea6fcc73f3d067
-MISC metadata.xml 611 BLAKE2B fa7a75bea6b08f6ab65ff4b5d4d8e3022912ba8cb86c6dd3fd2d8f5bb224f89ae9db977c2197a39e6541193ed41366c4bdaa404138a18b2d31afc412b967cacc SHA512 9070f42bf5f3fb721f41309c7a24f29168f1179f9327f1334dcd5bd7b38ae98bbc682c2f0cfb7874c8e20e92ce25bffdc5d3f21870316c6d35cd57e1049f8d90
+MISC metadata.xml 758 BLAKE2B fafd3d180cab6721b98fb30317f4e614b3300aa2b5a0b525057bd11e6628d959a17c2520dbc3bb941382d454095a1a25d1be47e0105d036aed3b6639ef8355ad SHA512 ea503ead23c8bf720372aff57740c744ce4c97b2d9016d503d3e3c3d3ece462c36ef417c535877dab1a42571c105ba3f3d13daeb2b6f883d20efe38c0df1ceec
diff --git a/dev-python/python-memcached/metadata.xml b/dev-python/python-memcached/metadata.xml
index 5a0000d36d7e..2f8d37bd82d5 100644
--- a/dev-python/python-memcached/metadata.xml
+++ b/dev-python/python-memcached/metadata.xml
@@ -10,10 +10,12 @@
 		<name>Python</name>
 	</maintainer>
 	<longdescription lang="en">
-This is a Python based API (implemented in 100% python) for communicating with
-the memcached distributed memory object cache daemon.
-</longdescription>
+		This is a Python based API (implemented in 100% python) for communicating with
+		the memcached distributed memory object cache daemon.
+	</longdescription>
 	<upstream>
 		<remote-id type="pypi">python-memcached</remote-id>
+		<remote-id type="github">linsomniac/python-memcached</remote-id>
+		<bugs-to>https://github.com/linsomniac/python-memcached/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
new file mode 100644
index 000000000000..a8c482faaf46
--- /dev/null
+++ b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python memcached client"
+HOMEPAGE="
+	https://www.tummy.com/Community/software/python-memcached/
+	https://pypi.org/project/python-memcached/
+"
+# PyPI tarballs don't contain tests
+SRC_URI="https://github.com/linsomniac/python-memcached/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="OSL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		net-misc/memcached
+	)
+"
+
+distutils_enable_tests nose
+
+python_test() {
+	local pidfile="${TMPDIR}/memcached.pid"
+
+	memcached -d -P "$pidfile" || die "failed to start memcached"
+
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+
+	kill "$(<"$pidfile")" || die "failed to kill memcached"
+	local elapsed=0
+	while [[ -f "$pidfile" ]]; do
+		if [[ $elapsed -ge 30 ]]; then
+			kill -KILL "$(<"$pidfile")" || die "failed to kill -KILL memcached"
+			die "memcached failed to stop after 30 seconds"
+		fi
+		sleep 1
+		let elapsed++
+	done
+}
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index 026306518e12..8486d440cfdd 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -2,4 +2,4 @@ DIST python-mpd-1.0.0.tar.gz 60032 BLAKE2B 9293dfc85363f83041b1d73046dabe6a3243a
 DIST python-mpd-1.1.0.tar.gz 61104 BLAKE2B 274a829a3fc1404a4e3beb4df3eb563c1f781325590702761d3b3b5bc42e3cd9f63809aab14bb98e4879c10ccd55bb9d7306485ec22d37538cc2e36006a3039a SHA512 65b17ae34b2c731b7d45801211e49eacfc18239d5575075be0c11ace350da19b82dd151fefc42077454a988d3deb1b489471f739ddea2d915cb3c241669dbe32
 EBUILD python-mpd-1.0.0-r1.ebuild 1020 BLAKE2B 8e0f736227abad803aeb3d94712607265454338f33f675511c650d0fb69c3b70b9a38f6dc32cceea89092257aa053645a716e1a394229283c57878164c49fd01 SHA512 35dba9b2f2a0e20fd2693e4e9988ac28c1d09b55d69732de9999778e7e87f0ae97005f466c9d0871906229688c62e4fc5056726d20f8deae3b328e71ecc068ea
 EBUILD python-mpd-1.1.0-r1.ebuild 1022 BLAKE2B 727cf4377c298a1bbd546dbdd28c1ae13f51e7784144d9ba9b219caf890068ad230a407281c59ff2da95207ea791b21658d85bdedd85f8c189d41879a1cb9475 SHA512 62669f31efb49c3b7630b61ff5fb7eb89499f8a9e014b1d59ed354cb25db5c0a40339914662397e723831622863d0d04b78ca7cba198384b82f08ba20173dff6
-MISC metadata.xml 438 BLAKE2B 5429aa3c88046640fb1349404a60f1508f5d86f698ef410210507df39fd5b2d2502d8d2dafde32c8a6f02c2d01e92cca1dc37255435066dfb3a41d26850a367b SHA512 1101d7830907a54a4ccfa1a1db8e6abea802fddd3ee0827770d9e15157be6a3e9b491eebd4b80eab38074fba743fc0671686806c27accd060bf3948736a86c44
+MISC metadata.xml 462 BLAKE2B 7ab5f8dbe5062af562e466d8c9452e29072c1d91ac10eb7adf05f81f9c7ab7cb28a2a81f6a80791c782aeac33a863ab26a17e88c0bde408db084b29fb8fdc592 SHA512 2c3220c6a6efe353ff1d667b8689f673c66ee58176a140437237cd74fe02c794bcdc219dd658f8e77d5f338a6c877890d09d28d87580cef36946011aaffa4cac
diff --git a/dev-python/python-mpd/metadata.xml b/dev-python/python-mpd/metadata.xml
index ff857238fdf2..5f48b4f8480e 100644
--- a/dev-python/python-mpd/metadata.xml
+++ b/dev-python/python-mpd/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-mpd</remote-id>
 		<remote-id type="github">Mic92/python-mpd2</remote-id>
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 93c04a3468ae..2de1c8d61e4c 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,6 +1,6 @@
 DIST pytools-2020.3.1.tar.gz 67635 BLAKE2B e10f80ee743165b0c1f9ee7a171a313ef70644ce4a7bd10a04764bd0e1244b9c98077d659b119b34f0976bfae6ac3caa172f5b24ea967da487536b59aab4a9cd SHA512 819e4d10efffac95f75e07838cd05052136f5a62183680119763dde4952013530493a2292bcb73541b6d329823feca32befa89fcf2dfe5cbe5cd1b00240b40e8
 DIST pytools-2020.4.tar.gz 67157 BLAKE2B 57fd583a7d5cc1337e20fedb5bc1c53c4025a01e7d4e3a5b05a0770a86e2bcabdde31dd535321215cf1bf2c7f3ed0b54e2407583bea63b63ca5b829f590a00be SHA512 66dea0d67c99c152edd7cd44e1262b6d163f065f5a4b697a5997f7453145af8fb0539d8eafa606fa18128908ce933c724b51bd1a76a6f7ab02e27db24496dc4c
 EBUILD pytools-2020.3.1.ebuild 670 BLAKE2B a4dea2ba67077ed0c59807debe1b73c59f7526c0201784813853b818a5a280be90526110dde5f4102aa080995e0214416f09f6bcc3c3641e218147bb6ded0e1a SHA512 9da434ab7b2fa6cc73c246a920e62d8a0af1769f3b988eaa74cdcdee3846f4110a4c54327dc38c86d3f42cd6712147b0c04f09427d5af0e10868038eb18834ed
-EBUILD pytools-2020.4.ebuild 671 BLAKE2B 839e1f378bb8802c37a1b831dc6dfc58fa72837a9d9a2f00814163c5d02c4eeeb11c3c2a0a534b405998084e46f528d98c45319840c66dd870b385f58af4d213 SHA512 d340adf02e9ee7e6cd033d668cc9bb48a8786de6d1e63f4d6715fefe8e3c79431f7b15d52b0df9f9719cf7057542611b5c100ea6722c88bd51640e9659321999
+EBUILD pytools-2020.4.ebuild 670 BLAKE2B a4dea2ba67077ed0c59807debe1b73c59f7526c0201784813853b818a5a280be90526110dde5f4102aa080995e0214416f09f6bcc3c3641e218147bb6ded0e1a SHA512 9da434ab7b2fa6cc73c246a920e62d8a0af1769f3b988eaa74cdcdee3846f4110a4c54327dc38c86d3f42cd6712147b0c04f09427d5af0e10868038eb18834ed
 EBUILD pytools-9999.ebuild 659 BLAKE2B e95a3d9d028e49f5f6123a98342ac999ec1d6a3487ab7acfb2b09b4814d6b4a3af9d609ff17b9451bf93509926cb665c4568ccdf4a2dbeb93dab80ad82f976d1 SHA512 07ef3afa1568beae15a9210426a0d5b4687becf12249443e7f2d5e867b6a8632c17b01eca5dbb69ce1055eaecdda62256129783106b0bc45a88ec48e9670ed38
 MISC metadata.xml 370 BLAKE2B c7fc7fd9d90ddabb9b07a5a15677f36892a428e3d0394eaeba76b4828560d7ba0212cdebb6fc4a61e5768cbd8458dc069038e8e84c99fd7d92d1e014eeed04cc SHA512 8287dc77596e94cd8d3d34dcd6fbe979064efadda19124992b97d90cb14b561ed311e701769f29a1bfc9f3b0e612e3356b95bfa05106dc29dfaaca722cb79292
diff --git a/dev-python/pytools/pytools-2020.4.ebuild b/dev-python/pytools/pytools-2020.4.ebuild
index 7c6b5339389b..452aa2e327c0 100644
--- a/dev-python/pytools/pytools-2020.4.ebuild
+++ b/dev-python/pytools/pytools-2020.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pywavelets/Manifest b/dev-python/pywavelets/Manifest
index d23fb625afd4..f41ec3a4b55c 100644
--- a/dev-python/pywavelets/Manifest
+++ b/dev-python/pywavelets/Manifest
@@ -1,3 +1,5 @@
 DIST PyWavelets-0.5.2.tar.gz 4430706 BLAKE2B 0a96dde04c0d6b58304b2a6a1331036c33bf89be717127df97ea178d638d193b9ce8994d90e34b969a4a6228e7985c943529fb386a3bc938ce61a78925549bf2 SHA512 6685b348009076b39a46e5a480189c34e5bc791ac110f47a52a8dbe0cbed1f3dcb64402174480d525bcf3776d12185ac89fe36c839727a14ffbad1ed835824ad
+DIST PyWavelets-1.1.1.tar.gz 4578294 BLAKE2B 1d3c9118739f831a3a198ab4461daa337b7952e16693d8ab15498ac26897a813d0adc02ae339a6a3ebfd3810db13ed297714c36ba67af559835af58c2ab243e1 SHA512 3e70625dad27822165e79b7d240c34072684ba340e8d314a026d2e47e81b04945d9ed9c6a5f0730eab285d3d5ebb1b311aaec5d6d06bced1eea80000bef5e787
 EBUILD pywavelets-0.5.2-r1.ebuild 1130 BLAKE2B 49aea3fd048f82deccbdcbe47e9174b0850d60f89fb9ca0cf2097a1272df78caf4fa97a0b41f40a48dea7585758401fef009e2c216c57aae04fc6f7112622033 SHA512 fdc45941068f9428cedaa479acc186c069eb2696ccd64f22748e1821e679f60a2d9f6db0525c9eb7cf64340dd0daae271432898d5197590bbc11d3db3253572d
-MISC metadata.xml 814 BLAKE2B bf95f588fd50238b95cebc807140d2fd7b346e474375617b4cdff4f763f896754a106cf2ee29854ed98a8a5caf5a93b8007718580db5addfe6d3a23e392d45c6 SHA512 02937ffa5a37a9ca5e9f3b8bcee990bbb84bf4b41f770f3f02cb0a447429d127f2d1337cfd26c936469858ee01c850db33a65798144fa65102940414df5f24e1
+EBUILD pywavelets-1.1.1.ebuild 1167 BLAKE2B 700bbfca01608bb571aad6d137191becb6af5daed7724b61ec665120bcce1196e060c893dce9f99c61ea5a7e59bf275bf18ee6d740da9082981d7a1e635536e5 SHA512 5beba4c947774029288ce6a350d908fdcc00bd6ce56520ae51032c809a5f4a52761b7cb39889d200ee86f4f96827fc123cc0e0151ccf75057ef25884cb1118a8
+MISC metadata.xml 804 BLAKE2B d0711a98d04ff34942a59867869fbe84b75e43f6e5bd97c5c4ad7ce033f6746f353c271704354f87ac4ddc4f908b56786aa58fa1ef605b1a2b41a63810d2a421 SHA512 b724a93b3400ea7d4a935479d69474d4f66de2836c86b61c559b1dc260a92c5924cb613134b52954bf8c00df08d3d22ca31b5d5e5b15cdb167401afa2abf31f0
diff --git a/dev-python/pywavelets/metadata.xml b/dev-python/pywavelets/metadata.xml
index 8a4e71211553..1b93fee9c995 100644
--- a/dev-python/pywavelets/metadata.xml
+++ b/dev-python/pywavelets/metadata.xml
@@ -9,7 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
+  <longdescription>
   PyWavelets is a Python wavelet transforms module that can perform:
   * Discrete Wavelet Transform (1D and 2D)
   * Inverse Discrete Wavelet Transform (1D and 2D)
diff --git a/dev-python/pywavelets/pywavelets-1.1.1.ebuild b/dev-python/pywavelets/pywavelets-1.1.1.ebuild
new file mode 100644
index 000000000000..de07fe47ec1b
--- /dev/null
+++ b/dev-python/pywavelets/pywavelets-1.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit distutils-r1
+
+MY_PN="${PN/pyw/PyW}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Discrete Wavelet Transforms in Python"
+HOMEPAGE="https://pywavelets.readthedocs.io/en/latest/
+	https://github.com/PyWavelets/pywt"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}] )
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	pytest -vv --pyargs ${BUILD_DIR}"/lib" || die "Tests fail with ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+	if use examples; then
+		docinto examples
+		dodoc -r demo
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 01e86fa86107..27877d629ce6 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,4 +1,5 @@
 AUX pyyaml-5.1-cve-2017-18342.patch 1420 BLAKE2B bf053ed121355aea1e44f9bd29b22c9afbca7b99b68e59a6e213d2723531044049964dcb20dbc036ee27ae8bcc2c26e317cf080637e611fa0105a9d451496125 SHA512 8e7737761555d851b21ca61128d2ced4163d446acb87510b6962a20dc217923bcf835d70224c9e721486351e0aeb57f9f3c570b57086a0a00c3e8ac656a458c5
 DIST pyyaml-5.3.1.gh.tar.gz 168044 BLAKE2B 2acc62ecc7448925eb340c2555001c8a74bd883d720b992d6deaea890b4eac435e4ae02eb129db3a6778c0be21a231fa9d96ee8ae59a4a39bc49961e5fb0d6ab SHA512 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556
+EBUILD pyyaml-5.3.1-r1.ebuild 1151 BLAKE2B 77d987ec45ff5eae54d9db792b1e9bcf6efe596e9412c62c0c98d12d13430b0ae1760fc222324f34fa52511dc79c0c4533b0c86428779ff85cd90e11c0939940 SHA512 6e561ccba83422190bb4f0479af9bf71fa3644bd71bf1e62cbd6bbe0e3265c23c4df99a1561e38cf9ac0a735f179a4787dfe5ae0a24eb635789c9813e27d48ea
 EBUILD pyyaml-5.3.1.ebuild 1164 BLAKE2B 04287dde778f61fa86141215661f71b3f82b238c3d27d7e8615a90e68c9682d7699adad1071327b6c1ac022f4d2390f89cb160c3f9db05c076ca354007f8f82d SHA512 75c605d42b9dabd3c1af1ed1ac79fdb9cc220e390febaa7eb1f0267de8d40e957fc51251399d099a77e4691c67c7f544bd71f0806d3884ea1d43fc75edca2b36
 MISC metadata.xml 439 BLAKE2B 2be21fbc47c75ba527e1b7969a9b472234a0cf38d39b6574eebf7c388b119c6951b7517d4a34c251b0d2a2bfd9ed73cd0157759a17c026da1806439e457aade4 SHA512 fe4be818db191edf5e1bc8abc09012e1065c46a940beb507c8fb48d996113e3601b2d1ce1cfcb70ed85c7d192ed0ba0416f7143f87fcdaa7912fd85e2e80af53
diff --git a/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild b/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
new file mode 100644
index 000000000000..5cef66731ae0
--- /dev/null
+++ b/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="YAML parser and emitter for Python"
+HOMEPAGE="https://pyyaml.org/wiki/PyYAML
+	https://pypi.org/project/PyYAML/
+	https://github.com/yaml/pyyaml"
+SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="examples +libyaml"
+
+RDEPEND="libyaml? ( dev-libs/libyaml:= )"
+DEPEND="${RDEPEND}
+	libyaml? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		' 'python*')
+	)"
+
+PATCHES=(
+	# bug #659348
+	"${FILESDIR}/pyyaml-5.1-cve-2017-18342.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_configure_all() {
+	mydistutilsargs=( $(use_with libyaml) )
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+}
diff --git a/dev-python/qtsass/Manifest b/dev-python/qtsass/Manifest
index fb9739357bdc..577b6c8aa3c5 100644
--- a/dev-python/qtsass/Manifest
+++ b/dev-python/qtsass/Manifest
@@ -1,3 +1,3 @@
 DIST qtsass-0.3.0.tar.gz 27880 BLAKE2B 07f71e794392ee23db901b1ae74e4c8a8888040b3e5b0681e05e2aa22ec2bdc958e588e2ee9ca9e5fdb4d341827b7c39a4ceb589ed4c669454cae78ee9747883 SHA512 fc3e082a01b35d1e7cada22cd5bea2aed37d4d3dd5a036d3d6d7621fb64ac61fdb3f2358f377f69e2cc5678798069af1d7cce04c4bcb9edf390d5162d308389c
-EBUILD qtsass-0.3.0.ebuild 653 BLAKE2B 9251a12d9eb0bbcaf6ea4f22b5548944348847c077a52902833081e179b0bba6357ed8e272d7307d19f56df544415985b46711529bbac28015d68d855c708c78 SHA512 30b3a1815bf45f684690d0eb0128d3bdee90c48ee506048ec8da46ac308e4295ac72624697003269fcb88190f2e0f1af788b8e609a7a8437d106b50dc17f2981
+EBUILD qtsass-0.3.0.ebuild 651 BLAKE2B 2fb9991d6ac24aa9a9c11eb212b87473c72c7790ac24a8f62f008ea54453b1fe12fd81f3c07d7b1137c93ee0f1c3ee1c615f34cb2e180897dc55324f5a60539d SHA512 511d8a4c35755d2b109939e6b57ac8a8b04f6a239f9e80919a0b4e6068c3ec8c978a8b5e2ff2108429057cbc4efa696bb3bd5e4905e38c43371358814b30fe7d
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/qtsass/qtsass-0.3.0.ebuild b/dev-python/qtsass/qtsass-0.3.0.ebuild
index 55b1d70e7d73..47eeabc1bdd5 100644
--- a/dev-python/qtsass/qtsass-0.3.0.ebuild
+++ b/dev-python/qtsass/qtsass-0.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/libsass[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index e83a07f7964d..439868c085d7 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -3,5 +3,5 @@ DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f
 DIST reportlab-3.5.42.tar.gz 2883081 BLAKE2B 22f4e7ebc233895a036eeb94c5beb9206be561a8a44895b36291a4f840603a2fec90107ac60e749f99be629202801c63ff67d5034d19b42383f2df12d457104d SHA512 f52717867190bf7812fd566d9ec3044198db809cdd0f53cc9dbfa92503a202540db659369e20bba3de07cd28eb10515d03b85700ac138c9394dc9eed1f08b8f8
 DIST reportlab-3.5.48.tar.gz 2890211 BLAKE2B bf0cde9b9e80459caee37949dc90a777a56da5d2c8e6dde09bddbdac2f2c55031d92b3c7c6346b6f563904525020c0e4f666b5e2effdd761c81412df21ec60eb SHA512 ce31cb7e9e2226cb6d59d446f90c1df94f0f84077d298f7ba862f5c75995afa20fa077b1ee1ab9a145c9276cee0d75fe61237e001ad0e5b96dfb0027adff3db7
 EBUILD reportlab-3.5.42.ebuild 1346 BLAKE2B 3ae7be7013162aed337129dded6b65fe4b393ae0a90ec389d4cd3e8ad5db6b9c93ccd4191d91846e97397976a18c0832b0b5ff60c5cea8efc7c6acac195b486c SHA512 08bd12dd05d8ffebef0b43987620ede57e4da21de8326f428ae18980c9698b43c20309d1756a59a01df13932eb2629f73e29f6bc1342d0c2e471dc1a3ba6371f
-EBUILD reportlab-3.5.48.ebuild 1437 BLAKE2B 4dda551899e2d199aa8d6e444e237d305d1bddfb52bbc3deed7ff6a6cd43d2973770f9886023cb1fc2203f6348a621bf0acbaacde882dd350592e397528df41e SHA512 1b3637077286cfc8635ca4bd0c7da8ea9b1acba63c80b2dd40343085d1f985135cb0e1ebc97c75ab0363e74b71a082fb0be69c25423e70910edbc2e11e2513c5
+EBUILD reportlab-3.5.48.ebuild 1432 BLAKE2B 64efd690d0e84e5124b9927fe69ad24cbd1cbeec9eb5d13a7bc83c908f5819d2b1ca6e867f9dd9cea322088baa2ea73ed6be801fdfc89be202755645aef34a4c SHA512 c2521bbe253470321c41409bdb8911e6acd372eb6fe0bd7404d37e9ec60570336dc74d28e59f3901b1a10b8d1e44b4c9323f8cf3628b0d99aa7b1088b432020c
 MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/reportlab-3.5.48.ebuild b/dev-python/reportlab/reportlab-3.5.48.ebuild
index 292bdd0ebb40..02ea3ac4b79b 100644
--- a/dev-python/reportlab/reportlab-3.5.48.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.48.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 57823938d11e..d4fb90c7717d 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,5 +1,5 @@
 DIST responses-0.10.16.tar.gz 25420 BLAKE2B a71402d30a30be18a445f2377498760fb00c5ed1fe0f61503675b4d0730bfd305711a0d56dd972a7c1cb439c3202819570eee81b6214fa723725d584f96905db SHA512 ec6738d3f7a33f7e3fbc95b1aaa5a10aa038dcbd8c9fdc4dc0ffc263e0cd613e6f2ce8e2fc2b59c91a30dec9677219fbb2630ec4d5d8d4340526fe72e24bd89f
 DIST responses-0.12.0.tar.gz 26527 BLAKE2B 71769b683f9c672d52844803e76ff66def61a2a56f788d93cfbad5a7e0f967b003244ee32f83430a97f7726c732b4e8b25baf65ec35535da1a6d609e4cfefe7c SHA512 484076f7942ff12977f06bcc850f1afcc9ae70ca2b7986a647c972893562d28cf3cd7226c87d8f5588fa4500be34dd5be0c7d1df6b8ddcd134455540d3dbe6d9
 EBUILD responses-0.10.16.ebuild 739 BLAKE2B f6942c1865cb0979872a167123f8463f3c2940108a103ae6ac39cb88d74f7261e127dd6f2a30f1f261796ff22da512ad32d7fffe353c9103b012318298baf303 SHA512 340ef34c2b8dcaec28e69ff9f8d72d6864af4836f2ccbac1d34edf09a17aa5780e12c87339f63aa6592bdce2028e061a38e916104ab952dc8511e53a9df68f33
-EBUILD responses-0.12.0.ebuild 765 BLAKE2B 38428c172fa575a6626843f3033ba9b00127d2ffe355c2173163255725c98eec6c0023a380d54ad1a3a942623a70f30404c193d07eac5f232c25ce715af70cf8 SHA512 cad177c160b0e228b09a2a71dd010e5b16abfe3012c0fedc60c58c47416b8ee720a129b75d11f6fa66447c43fa2963a7667785fc61d39b85be482caec981cc2b
+EBUILD responses-0.12.0.ebuild 778 BLAKE2B 33a602f5f10fac28fae259f14227a43ae1c1dac7be28463ad276fe8e1bac782d3c3fd38e31ca2763a46c637b53cd6d2107bb8af1f68ff39f374bfab96f755a50 SHA512 8221824a89c9a4e1155707bd12f40d65e8f15324d40e53017e69c2591c556c5f92d219b9f826c9c35cc7b95b2025228ef1a0bcf8a5bd8216d0fd3d51b0615e96
 MISC metadata.xml 462 BLAKE2B c0afeab502da79631572ffa360f5b5cb19d41be177e9dc028041642cc756e08df0df9685c49825a40f3f343a29defe87f1f1e4805568d1037eab73895606221e SHA512 1b33da0d6d1ea49e0f108362c903f3521704ce8eaf1f328441eeb6950c19900eae5abf08204a0402cf7387077f32da97e5a84b2b6bb7c347a39a38e18032de33
diff --git a/dev-python/responses/responses-0.12.0.ebuild b/dev-python/responses/responses-0.12.0.ebuild
index d950831eb075..883183f2e7b9 100644
--- a/dev-python/responses/responses-0.12.0.ebuild
+++ b/dev-python/responses/responses-0.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/retrying/Manifest b/dev-python/retrying/Manifest
index e95eb0e53946..b75c03a88438 100644
--- a/dev-python/retrying/Manifest
+++ b/dev-python/retrying/Manifest
@@ -1,3 +1,3 @@
-DIST retrying-1.3.3.tar.gz 10890 BLAKE2B b7f2dd9488e99089e842f832666c6b71f94cb7fa9394bd504c27b5bb83fac2eb3dd1b7ed59cabe0c74a17c17483520502b65027d36887580744621d1776a2342 SHA512 99b81560caf63416f0301721ed9b9f9e3527a2fee4c53aeb0630b6e860ed81baf4b12b9819ca5b81346d45c4f40dfcb479a0b25305da1f560657fd3fdf2ffa75
-EBUILD retrying-1.3.3.ebuild 549 BLAKE2B 56ccfeacd415ffc5ab3d15575404dce16d4055bbcf6262b4819992ff14273b6a22821a4c00db0a9c38069366d1498ec7c29bd824066f1b40c10a0315607c5190 SHA512 88b244c5b5babef230fc1bf0059ee59d9d01c2d58e635f12565583dbc4a171139c33fd4965b3161de9b9e9f263a7ea31050f8b4cb5c035540b534b24bc6db6c2
+DIST retrying-1.3.3.tar.gz 11648 BLAKE2B 2c518ca887dddc35bad421ad75c76cb88f08a0965272816af8667b1b151eca2dda1b0b198607f26dcda2df547ba2cb317ac927ebfc5891cd8c6203ded619f1e1 SHA512 e053e62cb71b31573b89b8fffa706c3410794b5cced829582c373a09af78158f7a16948e6ce52078589cf7d8f5bba726c889180588a2628be343f242bc40c035
+EBUILD retrying-1.3.3.ebuild 552 BLAKE2B a52a7fce05520eddd153d83bed0dc7c5ad08cfb10168f63f3b4da9b5750895b0e015893915b68e32e4ad75318729ff80dcfd52651c3257f6340e2db3cbecd673 SHA512 949ed46222f22aa341e6c065b246a03a1ca4f0f3588d2e4b6383a47021493a2ae75e1efe4316802970099dab305c685ed2ef42059b7e945af1a920a3162811dd
 MISC metadata.xml 696 BLAKE2B 66dd73d35f5f4fff4249e00dd76c8811177cd017b2714663aab2fa418e00c83bc596f8062a5e55b48a901b5b04b5debf947f366da9fec8809cbfc23316bb241a SHA512 e397e072f8f140fa55db71a21156adec37d615f41cd07dd07d86c4d77c7413b675e6a3032f63b5dab11f1f64a4f1ac547c2b8df685500304e9db48c3c5516289
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index a51261d188fa..6af95ca658e4 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -2,22 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="General-purpose retrying library"
 HOMEPAGE="https://github.com/rholder/retrying"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/rholder/retrying/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
+RDEPEND=">=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index 1d56cc25476c..c0e1bb41be3f 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1,3 +1,3 @@
 DIST rply-0.7.7.tar.gz 26366 BLAKE2B 09e6b93e9581745209b2d1fede6e0e4f08c2a34cc2495ea73aebb27b012353bbdb749ef127128cd5d9df201607f73625e248945038a927d788e324fb632341b4 SHA512 c01166b7df067a6a55d1b43caa7b5a349045e838899daf82e2ba70a2c2525fd68e95f11e5319a1fe36936e696352a37bdc13f132f739cd52759a9a9c91e317ba
-EBUILD rply-0.7.7.ebuild 683 BLAKE2B fb4215390776a9ea2ff22374a484e96e9d3ed165709eaea8cd4460de2221a06ac5a3faa3ecfc5574ee588c5b4ca12e5075f1ebd948de7e2ce9950c6206a22712 SHA512 a4fac60a26e9c41e0d5384e76f5c7839ce53e758190b0142fd38c018ae25d123ea9bcc5bcdb1db48fc94597fdfb7d0fe617448920bd5512d9fb328a41de21fec
+EBUILD rply-0.7.7-r1.ebuild 569 BLAKE2B 502be8cf23ea2474a75ccdb3ad86fc9226b26417813ecedbab46bbd5ac9e3f666eed956a2d1636e3a4abba9772e33a916b94a2c1e057204a3a240c2d56c0c341 SHA512 2afc224db6282b58586a68a68b9fa1b34c62bc92dae9266173da5c0603b948b692a717efb6f1dcf856ffdfebf796de0659affc97fcb3d7d5e79bd13b147539e3
 MISC metadata.xml 324 BLAKE2B d6027998ac0d5aee72ca31a60c53bdf7bbc628b16eacb329041fadb5ac5c9015f152e3e9f59495505eb73a2f8fe76ccff182026b6d5c80999274268056e63e14 SHA512 9378b0e52729cd011ed824e800aa1af7ed6b9f799de0802950dbf02eeb8dd27e356ea067a46aaa91b05d96f7ec5fc17a43c0d980b7b585fecb8220b0ddc20ba8
diff --git a/dev-python/rply/rply-0.7.7-r1.ebuild b/dev-python/rply/rply-0.7.7-r1.ebuild
new file mode 100644
index 000000000000..cbe95f22ad3c
--- /dev/null
+++ b/dev-python/rply/rply-0.7.7-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python parser generator that also works with RPython"
+HOMEPAGE="https://github.com/alex/rply"
+SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/py[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rply/rply-0.7.7.ebuild b/dev-python/rply/rply-0.7.7.ebuild
deleted file mode 100644
index 7517d698f0a8..000000000000
--- a/dev-python/rply/rply-0.7.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python parser generator that also works with RPython"
-HOMEPAGE="https://github.com/alex/rply"
-SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 8a4d7f98037b..dc56bdb6efa7 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,5 +1,5 @@
 DIST ruamel.yaml.clib-0.2.0.tar.gz 178084 BLAKE2B a4d23e5c931a0c720edb80818ca11bfcc1638f28ec910878f53720139bd8fbd034de6db73154c0e758ceb6c5233c10a2bf7d779f8e7f4a134c8b07cc33382a1b SHA512 7d716e27963b97a1735ba7ff0e581f7ecdfa62725cc42def59ad0ccdf9e23a9f7dfbc3cac298bb3e29362535036b07ba0f523452d6f73248be53c69796637e34
 DIST ruamel.yaml.clib-0.2.2.tar.gz 179914 BLAKE2B 90fe272c3c4f8943e944d43dcf1f61367600bd3b1fb296d7434b27183433267a510b6e41cfd50fac8e17bebcfaa51d7d1ca89d4d23da0b1107c468cafa65ac3f SHA512 5bbab2a23c65b1416480758cf0d0a75dcf8ddece0f8df603ce90f2b1c54356bb6876ac113d53e01c4869e3c9fb22b13ea29e66dc31a09144d4426c3e0f3b9399
 EBUILD ruamel-yaml-clib-0.2.0.ebuild 714 BLAKE2B 89c14677f992995643dd5ced5a3a3a0ae6ebda01e535ea6de87aeef2ee285f1ee8a3db0ba42b5393b94c1042430ae34e79d2286777697da4e26920316f424b4d SHA512 52e3685e459f4a781b2d069dcb3d1efbf3078d2b8992ee26d3bca51342f79048374c89b075987f1a8f60aa0e5fab465c8368d0288e97f38bd6f5590522b4af8b
-EBUILD ruamel-yaml-clib-0.2.2.ebuild 722 BLAKE2B 8fa764b104dc4416451bc96b3f4c6213b1a86b18c405509e4d5e888d17c27f3f74e1ab399b70f6d1fef2332a086927889be8c73dc5076321657e2db6785ae076 SHA512 4ede4e04074e3c75e481e1bccf3a710ac491aeaa73e7f2554fe5901ffa4a6fdd66b71ea1124bf7383fe3c4d00d4831e7e94de9318bab37ce27ad23bb2700fea9
+EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 695 BLAKE2B 80e52b96be163854f5e37153062b4d8c8ffe82409d16c2cdf5690f7407b318e4099bffb3372fefa14919770f4bd1d440465f695de479b74951c60d734be243d7 SHA512 434ae13ecdd8ef13faeac4c8f1b71f035fb3e37afab4c221c906b708d4e7fe935eb427b91c8653b8438ad1ddac68755201d1b0d8b4cba093351e78c6183887cb
 MISC metadata.xml 1153 BLAKE2B 58de7fd7876683773ffee4304160d3a5207855b637b7116b83af5445d5d79636e39176c0d8c69f61ce3c728f273f16be0a6f39292464abc010b5e5c693c27c4d SHA512 eb4ff5e5bf91ede5c09114a76233e43913416781eb477032c4e04e4d1b0c0ab68969a6574319cc4a95f4db0fa426e831c4f9535393f9f7252b29189b1db5a47e
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..44f65b049199
--- /dev/null
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="C-based reader/scanner and emitter for dev-python/ruamel-yaml"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="!<dev-python/ruamel-yaml-0.16.0"
+
+S="${WORKDIR}"/${MY_P}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+}
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2.ebuild
deleted file mode 100644
index 71a96cc35b0e..000000000000
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="C-based reader/scanner and emitter for dev-python/ruamel-yaml"
-HOMEPAGE="https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="!<dev-python/ruamel-yaml-0.16.0"
-
-S="${WORKDIR}"/${MY_P}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-}
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 197dab18ed21..127ffdc92540 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,5 +1,5 @@
 DIST ruamel.yaml-0.16.10.tar.gz 147033 BLAKE2B 35e5b0a1bd5a42ee539e66309dbca64bccd9570da427631d230c77d9cc09dc28637abb787c441b4fe8f8f17d9b6b313607887ce79eb631ce8b265cc18570e8fd SHA512 f124575a5054f993d5826d03aa7a9500a1084c5201be1517be36e587bfc60ea4d13b29dbdb3e62bfbd309fe9992590fd0a5028a43f0fd26a5a5cbc9f3dcf423b
 DIST ruamel.yaml-0.16.12.tar.gz 147355 BLAKE2B 6e91116029dba57b81580f4ce34a066fc49ec2c6167c2bd6ec2ae940b16bc12ba53cbd4c62f9ae3975664917ce990b050e9f15b434f5ff66f9dece5426049c9d SHA512 21be4d956d01164b84233c3d3945a4e56351a8fc59c35a8e71b1276da84aa43b125e3860f9884e95a1f895bc53e0b85b6d3f0f4b03512d629a892d8664e3ecd6
 EBUILD ruamel-yaml-0.16.10.ebuild 764 BLAKE2B c6087a1971d6a4477a0f81c42b0ec0be5da928effc63bd4285a08c8cd875cc94acf0d1d6711ea93f8b05bfaa618f77d5c50efc5e685f246b17beb0defbd874bf SHA512 8554601fffda4f88c275e8783a8a16814a8880ec2689d3dcab1a752fdbb0093e3eeddc4e3db43667d592191ec0d5df849e00d656c594b7c26ec358baa1e3e84a
-EBUILD ruamel-yaml-0.16.12.ebuild 772 BLAKE2B 2c54b980c7e2969ea080648dc6fbe12f0d40c1314ee714f82b579873dc8c2b6a374e66e418fdd5f3c7cb45205531422b9ce0dfbc775ce6da72709ba8aba6dfdf SHA512 306b2b051022f2c623a5d046bb5a5923b73939c3d4094106d7da3428d4f4903fca855278c5fc77349fd23702698fda76023bc48ca3979139cb3698af0bc07f2b
+EBUILD ruamel-yaml-0.16.12-r1.ebuild 745 BLAKE2B bf60575866973e679883bca9144467ddaefec117ef38bd67455add3fac7dd2f512e42dbf1754ffb19b6c6d188ea7ec15793663d9eeacb644916f8ad09c85fe1e SHA512 1eda26e2d6e2c7ca6847061e00ce4cac6f78a8e07f2ced5ae778b027e3cf6400d857bbd8ed9281567615d46ea314fb11fddac235aca900272c1076debc1fc55f
 MISC metadata.xml 715 BLAKE2B 8adfe458db838b8217c79ae03ba0133fd7aabd143c99f2177debff61e8960bb9b89df4e7bab27eb392127bc95a34ec7ab2a7e2ab96ec87adc28ea7453bcce6b8 SHA512 bb76d173705214d1df3e44032301d078ea0f1abb41ddbbe743d4ae3928ade3fc3622b26bc54d8c66f47ef2e2f445180aad381bccdc18a6e5fc512c9e83826a9f
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
new file mode 100644
index 000000000000..6bd16e617756
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/p/ruamel-yaml"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${MY_P}
+
+python_install() {
+	distutils-r1_python_install --single-version-externally-managed
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12.ebuild
deleted file mode 100644
index 4c7c61d9affa..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/p/ruamel-yaml"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"/${MY_P}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 34d3997c1d03..84b1fb8f4c90 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,4 +1,4 @@
 DIST selenium-3.141.0.gh.tar.gz 155705874 BLAKE2B f75eec80e6caa86744092020abaeef56defcfac8278dd3fd605c29d6860c1c046956c7599164ba1b4682f20dfa997f5a942d83f7ad707b052ad3ca98c0800527 SHA512 add14d426c5b929901cd71104460c7ceaacf46374b46898254dc2e2602f4a9a370199da603e3f35375c0f297d6fc2fda00c9ce2ede9d5b893b072e0487883df2
 DIST selenium-3.141.0.tar.gz 854669 BLAKE2B 621f4ab03bf85718b50099fdf10cdfadaf326bc7d9c9f1676a2a20e3ad23bede7884d8017b98bc6ebc314c6a4221c7668628d2d1888f36350c95eed1d82acee7 SHA512 3d2afbe9e96f88e9c055a89786b5090af387d3feba4598577b70fd3e0b20c2c09c4b25af920c654f52ec7e34f23181e6d278ac05f1a1f960d2d371ce7a6b82d8
-EBUILD selenium-3.141.0-r1.ebuild 1158 BLAKE2B 115af3a9ebb4b719b25820dd0d5f201bad1e2e6474c9da9429161c7c42b813d7599d06256c98e91ae3d7e5375b0b0d89cee9b6c69fa64b38a7bd77620a27e0a0 SHA512 bb73665ba0b9c7c38a5e09e2e8b2cbb346ca8f66ee5fe409e009b0a2ede84dc24fd78d7df21e874b5f2996489ba2d3bb3bc060b471d26f209b9fe84cfdc48b4d
+EBUILD selenium-3.141.0-r1.ebuild 1171 BLAKE2B 0b6d740a7c4b81618368badc408fc0e235bcd862ae7fd3a075078fc320e025e14b86f888824f9e9be9cdb3a37d07e3e2661855b7c679544dea199f574e780c60 SHA512 34f11ac791743d8b192c7820ca36cbf90c2c1c4e6a5dd17e0b9df5dbe409a3817d869032ec84ae84f7e22035feb445cb5a146606998f623648754738df78f3fd
 MISC metadata.xml 382 BLAKE2B 2069f6989e396728b0de8e072c064980714dfa75f5bc8ac56b17d7b311e553c2a821a2d58433ca43289b059ae40f7a822c788c1af1d8eb883936662d6eb17bfc SHA512 85f758426e03c1ef8b1e4e9f7098df95965547a10ee9e2168398b9a71b612a61b531860a46d75701d9c4ce0a83df9e4344354ee65ab1ee166f45738a2b1c9955
diff --git a/dev-python/selenium/selenium-3.141.0-r1.ebuild b/dev-python/selenium/selenium-3.141.0-r1.ebuild
index a5962b98373e..0878736c2a51 100644
--- a/dev-python/selenium/selenium-3.141.0-r1.ebuild
+++ b/dev-python/selenium/selenium-3.141.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 			-> ${P}.gh.tar.gz
 	)"
 
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index f51590adec89..9a1e885cf572 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -2,8 +2,10 @@ DIST sentry-sdk-0.16.3.tar.gz 170145 BLAKE2B bf619313fb3f49800f5384f0dfec3aa34ef
 DIST sentry-sdk-0.17.6.tar.gz 183157 BLAKE2B ea0f6af54c31abc785274fc75238a02b8c9f7a978881a01203e0928e100c18df2257ec4a3cef608141b6846c616566388134a4ec31364f26d0bc2b0fadbb0dac SHA512 1af433b5c2311612ad650ea196ddfedb444e9ccb424df72422759f8647fe6cc22bb81a15933f2716cf40313ce3b2e262c077168aa831758d057a1f2e5e1499ff
 DIST sentry-sdk-0.17.7.tar.gz 184034 BLAKE2B de71b2e270594abe2e16d7e2fb9db3028e3c2abd4539269562e8786e6d937352153da21d6366d5e0384e3de1dbd6fbabe3d5060a6f0f9953bd260fbd865c893d SHA512 2360321ec0231ba76c968ff4e6dc78d42a48106aa6aade73a1c1194f9406fbafea3b533994da42027b3479302756ed3ec6e44ce551cb01ce60397939beaeb6d4
 DIST sentry-sdk-0.17.8.tar.gz 184271 BLAKE2B d34f881632e66d5db5cad0c6979de6c3c6205119af30b34996122ff7aff1ed7c3dd0c1603e57163f5d72c8525921f9af7c3e1c729adb14b43dbcee0aa4bd9fc5 SHA512 84ae0ca888457ed833b416320c45040e522a656d7c3ca0d64639f179e7be3237f53cfe4827e986a50d37bd7b61da765ed8c00ea663d478874cc47623ccf47a51
+DIST sentry-sdk-0.18.0.tar.gz 186389 BLAKE2B f531d68a1244c34d267cb332263c996afad31f7f72710b868e14850f06de6225a11fc37dca9ff820fc14d2f1b29919cfb10f59b7dc4449c0734458c6bd1b9816 SHA512 4c78418392668b1e061f0d6b88d3cc3511db138a99b08df50d2e610a7d8a5528ad83943ef1cfda8d508cb3b52f511f872ac87439460254a6b28348c9bb92406c
 EBUILD sentry-sdk-0.16.3.ebuild 621 BLAKE2B d2ffc79e8d2ec8daad9d01f0120760c3d1225bfebf1162cd5246bb1b7ddc5f176e6ba1b272701cb5b3a99aefe171f660cafa6be0e8594a65c0e7d2d803fb199f SHA512 32df9a79cf7988ae3687264f2ab7eca66af45447886e5e7cd33de8218373b49eb3222bb5cd30fa64648c46dbc6453176e555a27a94e1388d3d6295fe3c8060b8
 EBUILD sentry-sdk-0.17.6.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
 EBUILD sentry-sdk-0.17.7.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
 EBUILD sentry-sdk-0.17.8.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
+EBUILD sentry-sdk-0.18.0.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
 MISC metadata.xml 446 BLAKE2B d115ce1b9a1d92cfeb93cd220c96247f1d6ae9514b0d598a0abc9fc6b17e45851a33e6f61b364f682f6530e4ac2611fd0a65b2fb5b21d394e78030f6ef34d1fa SHA512 f7167d56812496468a0766bf6e7d29b99e5efcef8cd61723ed7b09188b515b50fa13275d665f7ff8400b5b451e05ddcec403cc4c75e55509b21b849cafde0a3e
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.18.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.18.0.ebuild
new file mode 100644
index 000000000000..1e52e8d55106
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-0.18.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		<dev-python/dnspython-2[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/aiocontextvars[${PYTHON_USEDEP}]
+			dev-python/contextvars[${PYTHON_USEDEP}]
+		' python3_6)
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		--deselect tests/integrations/stdlib/test_httplib.py
+		--deselect tests/integrations/requests/test_requests.py
+		# wtf is it supposed to do?!
+		--deselect tests/integrations/gcp/test_gcp.py
+		# fails on py3.6, hangs on py3.7+
+		--deselect
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		--deselect
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		--deselect
+		tests/test_client.py::test_databag_depth_stripping
+		--deselect
+		tests/test_client.py::test_databag_string_stripping
+		--deselect
+		tests/test_client.py::test_databag_breadth_stripping
+		# test_filename: apparently unhappy about pytest being called pytest
+		--deselect 'tests/utils/test_general.py::test_filename'
+		# test_circular_references: apparently fragile
+		--deselect
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+	)
+	[[ ${EPYTHON} == python3.6 ]] && deselect+=(
+		# broken with contextvars on py3.6
+		--deselect
+		'tests/utils/test_contextvars.py::test_leaks[greenlet]'
+		--deselect
+		'tests/test_transport.py::test_transport_works[greenlet'
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index fe3669684c7b..ff021c646440 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,3 +1,3 @@
 DIST setproctitle-1.1.10.tar.gz 24042 BLAKE2B acd4ef33ab2a200b5d102fe5ceb78df03deeee47eb5a3c7b50f0a44e095953e5a4e2230278b6b4a5010472e4a5a18b81accbff0461e3a642be478b880d98114e SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533
-EBUILD setproctitle-1.1.10-r1.ebuild 974 BLAKE2B 97d9a2b2637937fc95ff54956f96ef01e327de016777ce5142a8db96e1e7c1dc1bb2bb53fca70599d8522bffb8b1a8a8cec467950c98f4b5e2ef3e567d0c0bf8 SHA512 efb2af33c6f222bf3e62db97d2e2bf3b4108a83529ea07f3fa2de0a2ac739bcba46be0f7a1176fee5ec6cc0c71426528a4e162a3aa2f2017ccf01d8f07a4b6a0
+EBUILD setproctitle-1.1.10-r1.ebuild 980 BLAKE2B d6300fb90ba30c03d37afca61ccbc6fc04238ed1f279ebaffa8bdf9b3859fb7c469b1274dee5940261ee5db7bbc7ed772e103fa8b2ebf895617b568663e5b0e0 SHA512 af60bb769003e352e01b8c94bd8417f7c8c745059e24a322bdf5f32b8e3644f6f2d8246120cb60812f6a5588561b44c4753e15d4dd77ade2ecc781251a9a0aab
 MISC metadata.xml 380 BLAKE2B 136b22ffc942b2b6a6bcbd45ed3cebb105bf91a16014fa1fbc181a3a9055d132e03df3ffa63df79682f1e7369ee264f87ff32e8602a6478d170f4b20a230e9fe SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004
diff --git a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
index b6cec2019595..8d60577c7cb8 100644
--- a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_configure_all() {
 	2to3 -w --no-diffs tests || die
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index fde6f5dc5bc9..0bbcdfdd75eb 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,5 +1,5 @@
 DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
 DIST setuptools-50.3.0.zip 2169216 BLAKE2B 029ea0159de270af0078a4661c696b93681b33dcc475640c7626f5a40bf1bb4759e5915948696c03b76dca10bdc4e790e2e9ef9628f41abca9a6aa48adcb72f6 SHA512 f67a2b7d639e03bf8b3815133e128902a559baf689afdd5893844ddc7c83505d727a6bb30ced1f78c4d2719dd405d2f4c527576bfa14dd9cb50c8ec4a479683e
-EBUILD setuptools-46.4.0-r3.ebuild 2509 BLAKE2B 98d7955fb5c7049ee1c468bcdb4549c790358fd5071082ff735c1a2364b6a0c513653bf8d870ddfca8201fff299d1f53867c8c7d0a9745c248a1d0e72d61f356 SHA512 f2636c0fa7828f3a43d82a25d4a5e19c4bfe97d15b2d98b2d6206c37d3440dd1b0ffb661ba66f346a1681887190def7fe1499ac5fc2a5c70b31e79e53c13f782
-EBUILD setuptools-50.3.0.ebuild 2242 BLAKE2B 55cbd8c45e536ca370d6f28bd5a4378ea04cb91ede8b5842615ed5ccbbdbf2814c0fbd4e62a089c8c16cf431d1f293fa5e5fb7cdb9502396acc51cd3ad6e1a85 SHA512 300664b69a018daf86725ffa2a7c1e293136cc864482b522b7e97e520e4d38b74fad48c2f695846a5525461f39eecc09e924789c31215b16d6e6994471b10d11
+EBUILD setuptools-46.4.0-r3.ebuild 2568 BLAKE2B 177c7c477880b56f4129ad7688448faf9344ec6e03fee0258bd256662f7861a82347089cf58cef8c08b9f4e513284d2ac42927456bc780d877ed5cfe61380bc4 SHA512 6f7cf119b89d73d1aff16a386f6d17b1af293fe2c079c4a8d57a42541e3b5b7cd0c11b5f1af1cdbeaa011ce8c249b1cde20632410de0b25bf86913d730b8e305
+EBUILD setuptools-50.3.0.ebuild 2301 BLAKE2B 342658b02fa1a098c2e449e9ea8734e4454292a993c2da14678688892f16fc6daa535406d08865387c3ce3ef626ee1b5eb885ca4ffc5108030e3fa4b80381d50 SHA512 aa3e3abaa78914b9baefc739047a5ec21d9ceb80c9673218d538fb909a5c51a60c8090208d691653a7969a56c133142bf414e4fcb29f3a96e073c252b779dfbe
 MISC metadata.xml 468 BLAKE2B 5f9a9240795261f894d54130ba489bb18fd24f8f95f993b55d23136fb2b518f47b64494d71ab0f697ca64f4eacc8cb58487e8889a8de22e8e3448caba5498065 SHA512 e284933f2a5d11cf7bb483776b8de2afe96ccad15a0e0bf7c9feab05c65f4247c9b19bb60c04d699ba917a637ca470e6ba41a38795899e54179602b587efe300
diff --git a/dev-python/setuptools/setuptools-46.4.0-r3.ebuild b/dev-python/setuptools/setuptools-46.4.0-r3.ebuild
index f42864c53f39..9819bcdb50ec 100644
--- a/dev-python/setuptools/setuptools-46.4.0-r3.ebuild
+++ b/dev-python/setuptools/setuptools-46.4.0-r3.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
diff --git a/dev-python/setuptools/setuptools-50.3.0.ebuild b/dev-python/setuptools/setuptools-50.3.0.ebuild
index 0d8d2e8bfb98..ccd3f2338abb 100644
--- a/dev-python/setuptools/setuptools-50.3.0.ebuild
+++ b/dev-python/setuptools/setuptools-50.3.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index abe327adb7a5..ab33c1a12d15 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,3 +1,3 @@
 DIST simplejson-3.17.2.tar.gz 83210 BLAKE2B 1b9f97a43bfe84f1ad506713d81483ebcd4006d1174558b7a27373f99d014e23ed72a9ec2b2006e64760c61e1e500a4f1ea4547104e7f4c71ba51003df0a5052 SHA512 003b2fbcb3f8e0849bdbd958c78f8b470081d97527bef82306db77940c6734a1cbf3b5dcb0984d2f9c9d14aa525e7865a08e70a10971f8841e138f7ad6476e4a
-EBUILD simplejson-3.17.2.ebuild 781 BLAKE2B 2a330a8acb09e31a8987ccff86a79d8256079ea18f8e37c978785c9c3f71391ab97da2ff83b7039ab07d839b71fb6a9fc9538079002ad225d46da3dd66c58759 SHA512 1a1632bc4742529653249e449859399586b1126588db3863aa67086d2da7c7f9aa9fd6669efb71910a39de36d51077459b3853bb34e4d80ca66861f4aeb9c144
+EBUILD simplejson-3.17.2-r1.ebuild 771 BLAKE2B af18fa2acd655a6884887d9d5b8d1c5775f82d64f524271ef0e9110d7cd7a071bd82761e003e4271e35e7a8fcf18869a767bad29606a9efed191eb5c8e9b2d81 SHA512 7da64c4664959c59c4e908b20ff44978ad49e31f6b99a3c2c387ad4b955db9c9017eefb26879fcb64cc7a8bf92c9feceb5363fe1f3dc451f5e8df9ba35af63f6
 MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.17.2-r1.ebuild b/dev-python/simplejson/simplejson-3.17.2-r1.ebuild
new file mode 100644
index 000000000000..c5be00caf282
--- /dev/null
+++ b/dev-python/simplejson/simplejson-3.17.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MIT AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DOCS=( README.rst CHANGES.txt )
+
+distutils_enable_tests unittest
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
diff --git a/dev-python/simplejson/simplejson-3.17.2.ebuild b/dev-python/simplejson/simplejson-3.17.2.ebuild
deleted file mode 100644
index c583dc0725e0..000000000000
--- a/dev-python/simplejson/simplejson-3.17.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-DOCS=( README.rst CHANGES.txt )
-
-distutils_enable_tests unittest
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 0a9e58e4957e..7fc7c8d5edab 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,3 +1,3 @@
 DIST six-1.15.0.tar.gz 33917 BLAKE2B 57e852b6c35dd19e256814c0371cfbc26141b0f25a31f79a1cbd1b0cdd7d3cacf1236b96f5452f968cc426e6dff4d1ad70a9f2432bc361ba3c8c17fd40fe7582 SHA512 eb840ac17f433f1fc4af56de75cfbfe0b54e6a737bb23c453bf09a4a13d768d153e46064880dc763f4c5cc2785b78ea6d3d3b4a41fed181cb9064837e3f699a9
-EBUILD six-1.15.0.ebuild 958 BLAKE2B e3d15c5805d938af552b1da3f5bdf5ff2d1b31fba3aee7523e8230183d1d85766bd7520c3288b926f00795b0bec8faedd6b567bb80600654a765c8c2f24906bc SHA512 8aeefa7cd592b50d11267c3b8c5aba5b805d599adb02cb116950624f14f265b296a5553939edca44792b6f2b292eadfec8885f4adb0c8a48454497b8dff43125
+EBUILD six-1.15.0-r1.ebuild 677 BLAKE2B 3b30f1b55efed78b9390c14e5243a7c7c969b012c36238cb3c469925008c64aff214e042cd204500b66ebe7430a59443438d1215d16f8124c94d7d388d557e8a SHA512 0795825dd331137a0016332b6da550eafdae383a790ce9d38b0a1defb1a5461315dd8ca755108a938b49262e7d7863e95b4696e8adc4c29785b55429d68ffcf1
 MISC metadata.xml 396 BLAKE2B 4b08f7faa6e73dee9d4f39caebc0eef9901f408c1cdfe5d883b350af406de2731e654c2a1c266daf07299451f57b8a717214ca1716463f7f43b376a51b4f6c2c SHA512 03881122a5eae7539c27d078eaf69f34e121f3a8a43c7e0ca9470c0ec6863ea268b5facc64e0ab100cc6b8c00473f784042047f077ceaa7f13d70d71dce03391
diff --git a/dev-python/six/six-1.15.0-r1.ebuild b/dev-python/six/six-1.15.0-r1.ebuild
new file mode 100644
index 000000000000..2206dac04197
--- /dev/null
+++ b/dev-python/six/six-1.15.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 2 and 3 compatibility library"
+HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_sphinx documentation --no-autodoc
+distutils_enable_tests pytest
diff --git a/dev-python/six/six-1.15.0.ebuild b/dev-python/six/six-1.15.0.ebuild
deleted file mode 100644
index 2ad1ac731cac..000000000000
--- a/dev-python/six/six-1.15.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]' -3)
-	)"
-
-distutils_enable_sphinx documentation --no-autodoc
-
-python_test() {
-	if ! python_is_python3; then
-		einfo "Tests are skipped on Python 2 to unblock deps"
-		return
-	fi
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index 606691123db7..0fbb1cf08c62 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-theme-0.1.6.tar.gz 10921 BLAKE2B f1a5a0b82c1a99e0afa2fa118e9b2a13d59d742634c8826c0f67f45bd049c96851f1ac694cb6ebfcee1f66b1e03d445b4a3eef676135076af99a1d30541a0a4e SHA512 58b3b595eed97de546484dae562172c7751a3d4d90a6a1ea885e86a44b78d9017834372179d2881e048c4b2916f2b53d11ddb9368a5474462ac9ef7d75925b7f
-EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 596 BLAKE2B e29f865f47781f3a232d8d265cd56820a6342602c75aea96b4b70bfaea08d804d7e1dd508f6675a4751b07fbd9ef1c97860a8f568014955440d5b5e6bf7964fa SHA512 ac562a2ad33553ee8a5b7eac635a0f5a33e9b88f8a1b53b7afdf75d0303c11dc8657e91dc0a8b1c4307bd8c233db21f756f1c542c8213f463e909ab48b69c23a
+EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 609 BLAKE2B 9a08b5dd30b2d6231694099b5be5a27996a2c259956e008fdd4563aea4a0f3edb37e9f00e81831ece8b0096839c62e53974054f62a6429eae7ab0375d10d3473 SHA512 d14c8e274acb7b3fd3e587e35a912e07083a9993a5141795db572c1caacede7e7b7efed2873a6423fa1131c4e6a30c0e1733112b084377aaa9365cf3cfcdb5ab
 MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
index 9901d7169e98..862fa7ba2013 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index 6d0aa9a4d737..f3ee884a1360 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-1.0.1-r1.ebuild 821 BLAKE2B 4a0b3349cbe1c81e9683c9e67f753364d0f5b8689e08d6315ebe8dc2429408492086e8083cfd84972bd8476f6990498b18be1b59ba29d472574a5d15f640e147 SHA512 2f99fb21da6e31da7fb887d864a4a165c49dcbf36396479208d9867b2c7bd9caa8217435b25749511eb1145eb84c798ceec442b61b5956a7eadba11cbb287701
+EBUILD sphinx-testing-1.0.1-r1.ebuild 834 BLAKE2B 6f12db632391972d66d41384d82b3280ca6cc329bf6efbfe2cca2c8ba048a69f375e211e2917efc81117f40c052cd94eea282787f9b376f21d05a63cb14c6893 SHA512 04fc97103581a7f7ca9b56013f2104df4c045bf89700fa6424470bea83e3f433773dae32d00d099473945079b9701d4f18e6d169421ad17d117cc03ed1ce8a45
 MISC metadata.xml 340 BLAKE2B 9a1df283aab1420d7818f4661b57f6d60cd734016c3711c633b9a6a11c401c8603503530fa5e1f50940bd28c1fed83196c1c543d16b5217b996f6afef23175a8 SHA512 f5299851dc6aa3c3ad1109123ac6c4eb5b5c7e1177fa1f068da5cef0920bbece63a8f1c424c5b95addf661e5a7d15a05a427676f6c272a54741495c77e316b78
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
index c9e677f2f19b..966d9b666d56 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index 31690eb39404..40fbe9baf735 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1200 BLAKE2B b6adac68aa51ab9c8920b7d7bf245a4e6ca6eeb8e92bac927eb1f360cd5e45f277a86b798b46c3b54c66cfbf5555f3e4630a26df2d5147bff0fed7e682ca4f8f SHA512 7150a6d6f630540f01df334665fcbb4690b61844ccc9ce1d911cfc6ce37421664f8d0d131fb840af1e63acd68e9bec4e771587beed9bb2f621e481ea6106ae4d
+EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1207 BLAKE2B cdac468c9fd90646ab05ea5bd181888a7f54d34232860516eced6bc830900bd3c0ca82355fd614bcc301ce820d41572ebdf28e45a36006fd0be767523d1eedf8 SHA512 9d5c6f8a3bbf9e45824bae49ebe5fe7de54603ff7c2877a5017531de9a18779a9399ad41788e4697f6f29884edf5354e2e1dfc93336fc4e459177f148fa4f3b8
 MISC metadata.xml 416 BLAKE2B 4383283e64d8db0b5576f1defc62412b5c4f4003e5ac75a2755e79d3e2a53f6d7aff82741d6225d2c96f0e2d87df650d47110a31cc91362dee641a86c54b18da SHA512 10fc4ff78fce4beadf8f8b64cfcaf4b71f84c3f74d80bd7299055ef7c2a759bf8d8eaef841e464d72d3272d999fe20ebfbcd382f2025932eef474387e92be6e0
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
index 11b7e45bee75..8225357c130e 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index 36f4fe0a9ef6..bc9b094fe66e 100644
--- a/dev-python/sphinxcontrib-newsfeed/Manifest
+++ b/dev-python/sphinxcontrib-newsfeed/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-newsfeed-0.1.4.tar.gz 10862 BLAKE2B 708c7a725ac36f54ea735953ba9d230b05da95147eabc91de9d610d3e02ec7d0d1ab8f5882d4e97327da425fc49e1b1a1753e011445ede859edd4f3cd5fb2a16 SHA512 96d9d0c15fca8b62f945bafc8f0eafa62df9c471f7510e2f153e47b66534e5f3041e5c01df772e6c35a9f09baa70064642f7f0fa43ccfd33dd64c2604494f2fc
-EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 852 BLAKE2B e3e1aaaefc9b409f1e1c35296aebbb975f3232be707ffd52501584709899c5397cbe90965691151358aa1a6a8b8c68c210794c0d62150e4906cd70290e47cfc9 SHA512 1d3a62e62ea17f6a6c49402bff7b905fb6bf418d4386cf10d793a146ba673ec390c360eb8bd82810596dc4a1a5a263b664ae5e612230f4c2ef95e8d5f79c4d70
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 865 BLAKE2B 2859c9b548cb6b7bdbbf39707ed8aec5149670d11165a10d7a22f6460f2b606aed93b59b2673b44bace4ca771a3920b6887caf835e060b2326179608373908d3 SHA512 5b5ffde0e9e969fc94e257abf5a05cdba97c23b1bf1b3dbd86b6a307e47e532f293d13e6383ece54be6dd81eae3ecd55db0d0d6e38ac44ab21325ec38d3d96ea
 MISC metadata.xml 331 BLAKE2B 9d40d757fbfbfc80c527481f0c1a3c558eee5829369ac3eda6ae4ed3ed63ef9b26a750057038aea1b670b48b9430aa6c4cf788d55a11ac7f072111c8a3437e5d SHA512 ec0eeb87c3e18a9ade919171833be4727e87d32664c83863bed8c33898112a2f237261b28e5b7a2521df495df61b9825cd8140352d9270e52412b53a1c5df3d7
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index 1f7123b6c317..5ea09f7f8a3e 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index dfeb43ae40c0..972b1797010d 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-spelling-5.1.2.tar.gz 22962 BLAKE2B c7b15289b4b6dce5e6c5fb529c4be2cd7c1f41d8bfc6ac86daf1a982f711bd2c426d9b3a615471538fe221197b64ccd907efd4620ea2440f6ec07b2a078d6bee SHA512 4a0398b7c79a035e12d9ae96100fcaa4df42aeae07a01a73f7d875ba04fbbeb3d7441c9debe77491876d78b0a3753677cff4cb3a575e3490364fe5780f5a70b2
 DIST sphinxcontrib-spelling-5.3.0.tar.gz 45665 BLAKE2B c44c8c2621aecd74734c6137e1344a763e99fb61b3ce882c8ea70364df17a7e2fac49acc8878753cab1b70df2cf084de5087bed77f8b1bffe311410ecec3504d SHA512 8f3c4718877e55b0ebcd3d8c0f078a6c06c27c2cdd3cc557fd2e0e990f0c8956179fd9a8b3135b280973e45c0c8657f71372746ef4b55319078db8f16c7e00e9
 EBUILD sphinxcontrib-spelling-5.1.2.ebuild 941 BLAKE2B d7a4baf4284165354c8689e49e1f9c35d856c2e8bc2d207db2a30b358daefa72a9b70ee7f37b19f0b184646e3f9d6f505e93c55bd7045f229f3c5752f1e3e99e SHA512 70cfa8fd9fd9c229b4b1e3f48016e28e4ca1a5355a47fab5cef9163b3560b76d6483407ddb264189a03c07e72a863658b5f5031fceca6dc74d746565276b5e93
-EBUILD sphinxcontrib-spelling-5.3.0.ebuild 1110 BLAKE2B 1f6f62ced5b2e82c55cb7327f22b6727c1e194a1429456f5622f430fea4b296bbb20937ec051b59e2c6a40dd7bd4214707bb6bd31a027c9200585326d0d0bf16 SHA512 d4e522d4ea079245648948d35c2f2a198ac0fc57ad04d06f58dfc1701e7e4deadff77c1174dc08da019aa0b56c771cb8195f00b7b34066c6c7e09020dec1e4ad
+EBUILD sphinxcontrib-spelling-5.3.0.ebuild 1113 BLAKE2B 498f0d8948635500859c57e440540b69b58a2cc67d882391d64216a79c75632e924614d06bd4b61f4a13615f875d545004cf171111e633dde931c37f67d9dc92 SHA512 41a625b9d77ea8028431816d64b86a98f86a064b29ee46ecd1df44fdb2c3b78c4726eebcd7b71585014fbb4ad3498e70478fb7de35d477a2dfc0f0372aa25ca6
 MISC metadata.xml 390 BLAKE2B 8d41fe5d3b7602e6f29d13d8059ae1e942991659b4681c8d2a6e62fa32816690289c4183e28b2cc0abc14ea2078368f87cd1d82e71f1c4ed9fb684fb7d2e1449 SHA512 8407fc4fa34e474aa5f74fc1623004bcfa4f6ba451d56e62704366e8c21919e8617a54b5f7fec31318c4b7b34c4eb064c18c9d448c04d28430aa4e961ceb28af
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
index b8e4d54551d5..9202602394bb 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
index 6f9ba473630d..eed4e8998aed 100644
--- a/dev-python/svg-path/Manifest
+++ b/dev-python/svg-path/Manifest
@@ -1,3 +1,5 @@
 DIST svg.path-3.0.tar.gz 17077 BLAKE2B 6fdb51c982575639337d74a6f02f0bb3cc44dac56bd6982dec6493bed52d9caab5ed725ac59bf754f309cc62ef6f77faec462afacc8f93ce9a20b886ef2b5c8e SHA512 73d23f1386bbd4d1c1d805766f7e6fe6f8b7ac731e104020e7d853d7f1b46bc2681f44ef20d9c5343197d9d16b2af49f2c4ef4ba5945f4d25fa0493502203e13
+DIST svg.path-4.0.2.tar.gz 18161 BLAKE2B bd5adbf059808b8197fbff0f12e274d98cc72ef840cd29e504bab1dd5fbcb5240aa3d6beb2cc3f6b91bcbdd9251fa29285de0ecd163c22d6cb8454102b911597 SHA512 0659c3d012b81cca83306c2895480bcc770cf23f4fc98dc4f167b6799a9c5618a90aabd81e2c91e6b7c57998d42f04a47d8f0fa966546111cd165127df239510
 EBUILD svg-path-3.0.ebuild 620 BLAKE2B 5783d88dd07f851a5a5bb7eca50483de7806a4f9012ff94d1d4658d6f36185c67709b89c41504a6509817f023ec6003fc0d99daa1be5ec813c31a128dee34a6d SHA512 fb6dbfc3362126fc6585fcac984cf86cc5ab6f15405c707f9aafa3a8b566158c32f7fb50b38e4fc72655408c192946c51db255269a81bd94ff0a4f0a6fa578a0
+EBUILD svg-path-4.0.2.ebuild 542 BLAKE2B 9be70cbb54fe66cddd0ca4c6e5d58e13f39d596a6ed6858b53d7563968e556ba5372bdfc4d5637a9628c14c906238aa22b5e58039f39c2ae92e1b1946114a3ca SHA512 853291d8d6d747c834a7161eaa5b15b05b697d511626f2fa7ffcbe3a648f555e1cb990a1253eb03c62e4dbd488e3df36998aeab062a90400f6b0cb693f092a73
 MISC metadata.xml 702 BLAKE2B 3a8759e763ce21b4f2a5f20161ee2d346f6c48f457f404ebb19605703ca78ccc6c48613efec43a8591bf0808c6eab1e838797265cd185e0df2dc8f66b620dbec SHA512 b4720805371d8d2044ef0cc9272a6d28d45f215a42bf99f991f861d60c57c6435d26d8c165b38d643911cca47fede95bffa362146d2b4a717f2c8e74cce55859
diff --git a/dev-python/svg-path/svg-path-4.0.2.ebuild b/dev-python/svg-path/svg-path-4.0.2.ebuild
new file mode 100644
index 000000000000..e9e4587533bb
--- /dev/null
+++ b/dev-python/svg-path/svg-path-4.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+MY_PN="svg.path"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SVG path objects and parser"
+HOMEPAGE="https://github.com/regebro/svg.path"
+SRC_URI="https://github.com/regebro/svg.path/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests setup.py
+
+python_install() {
+	python_domodule src/svg
+}
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index f26f0dac00b8..eb14cd912a5d 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,5 +1,5 @@
 DIST tempora-3.0.0.tar.gz 21500 BLAKE2B 7bf241d5ab60c78c0ea56df6b28e33504200eb5427cdffaf9d5f34da202c3ba4550fa4dcc48874ee870345fa5a10f2b874687fe7de2bbe049b1c14d05161b0e0 SHA512 2d397c1d17bb4c502817ad0278090137fb8ca00273c63a7336200ed7e621a99cd5c954cdc2da00d06eba34ed4f079429f5ddc68b928cc83feacb2335f995e1b7
 DIST tempora-4.0.0.tar.gz 47217 BLAKE2B 3f8489c584768c074874fd299d11ca71b51c646f07792ac910dbd3fa76c309a866e599204364bbc06e6589a6fa046d3150bff05c9d3beb9b427ff409e2c27fe6 SHA512 59792bf03b4ccbdd5b849f0f6b9a0b5f2672e1cc3076b85449b8f183524d23de05588c3a8185550cdb9e52cc610e29db18ed151b8c5f5f25438de41015cc595e
 EBUILD tempora-3.0.0.ebuild 1511 BLAKE2B 5076914b2292fad9eb845421042f05c19a8ccef702834ed5419c64051f7d3fc3bc740aaba6185d7b3d16319b705bb71f2feb3e9f39a6f4ab1fa929368f3530ab SHA512 c3fe5e474d92c3aa5ba417a1573648166b4d08906294494e4b726a0e2ddd6af726de1d5935619093ce9acaffd34586c30f36e121b56b9625b809f08ce12b3052
-EBUILD tempora-4.0.0.ebuild 1052 BLAKE2B 27ee5e889a1701173f255982a0c106e7cce3b4ea708783fb4ea8d2cb71fe309004730c5a2ba56540082e14e34ad51ae56fd815c61071f8769cdb366487ef55b8 SHA512 f52cca94743848f46e8a35b616c12c1baf2842f934d7c8e6f0da8161380d87a78aaf33b465e9c0ad2016c9c47b8b69ca79708ae6142119d4eafff53d2f6dcc6d
+EBUILD tempora-4.0.0.ebuild 1059 BLAKE2B ac937540f3f2e926a93c39b96770094a4484d351f2e76fe17decc6083c462de1f83d337c56111fac9b081259114dac4c415d0e357cb8884ce5ff580f25d25237 SHA512 6843bae826d91a924eab1eab61b4931df0ea7d96ade5bfce349adf65a6cfd6f352c0b81e5274ddc14cd4ff3836a5eadbf3dbbf37ee0afe2a6d96f1e255bcdcc4
 MISC metadata.xml 615 BLAKE2B d393b579842c51e2dea6da1afde0a5571d5034905a9a4d5f4cbfa70cd80e918157ffbb1f98fbcefed28ee6c1ba20dc64e7583ea7ebd82fc1b8f9d3e57dc796da SHA512 7346fb2daa80f58a819462fe96220fa85d242795e24cc2fce5be013f4f0a678e1201b2b56bdcdd2881d95f0fd93386f47e900492862ed8b54e90ced91dd27f33
diff --git a/dev-python/tempora/tempora-4.0.0.ebuild b/dev-python/tempora/tempora-4.0.0.ebuild
index 110486f366c1..e15f8e99b97e 100644
--- a/dev-python/tempora/tempora-4.0.0.ebuild
+++ b/dev-python/tempora/tempora-4.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 17027400abfa..9f876436358f 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,3 +1,7 @@
 DIST toolz-0.10.0.tar.gz 49579 BLAKE2B c323bf1ba1da5c01a1a1d879ef545767b8253c906baba63a0f600d2879c5b7120c4978574447954648c23c22221ba05de2a2c7437eed1eeff31dface1c823f6e SHA512 4ed40c165462440c6004974d2515067f211c625bebcb69ea854fd8837e1fe05febc546215355a6bb9de5916c8ba98a4d297f8aa20e40ffbc8a730b2bb3831a71
+DIST toolz-0.11.0.tar.gz 64412 BLAKE2B 5b4a1fb4503767b91262ada31026c8ce26b98bb98967043dbbd2ecfa0011e200accc65d3a3923cbb69670aa305845d6825b3f0ed08f9e5a2c4e3a3854df1c62d SHA512 6c546561848d5156ae90fc7f11b219c4aa489c96d3d0c6e703b636dc7f0096fe95b986e7e1f33a0914b324bf807f6d66bec4c8ce2031c3aae3a3086bb1cb0596
+DIST toolz-0.11.1.tar.gz 64428 BLAKE2B 934f122bbf9e762e72f502f8b9ba8b5aa946b6e2b758e9501c2bc58fefa3443cda4b3e2c423be221643f51b2a12de0961be835ae3a23e97525fa203c969edff4 SHA512 8bea2b75b74d9da988c777577f3ad574192659dcc4bea54ac6d1400a81bef07818c49c8da40028a8c42905f9ab5b5111c50c239fb56f34c315865f90413af68b
 EBUILD toolz-0.10.0.ebuild 436 BLAKE2B aa344df77d7e820dcc80e13b084ba150c6ff3c274a681af59e83404db8527846a8801f507442ef40046ba2e3f97f80f5b6d06ff155e388532a860c93a6d5dab0 SHA512 d53cd5b4c4d2ebb70c48f5f03a51173ed65c8b66ca58128a3bf495c1247bb369fbecd695b552e7b4799b779ddc3a1c77711411dc724fb43cdcdd7b6e0af3dc5a
+EBUILD toolz-0.11.0.ebuild 491 BLAKE2B 3a26b0eb5c62eeb0bd1d4d20f0f118a1dc3e878b5d913c74a49691a44d859ab6337b425e1d295cade00f9f871f5d451400b85781ae8b934a7ed7e9b53e8260bd SHA512 e2389c2038534d421215a023e569d845c6db72d866dfb5c4819b20a32aad93a3c5492a2065c532934af7d26d19a549b18936ab85876ca72256011ddb7cffe1e1
+EBUILD toolz-0.11.1.ebuild 491 BLAKE2B 3a26b0eb5c62eeb0bd1d4d20f0f118a1dc3e878b5d913c74a49691a44d859ab6337b425e1d295cade00f9f871f5d451400b85781ae8b934a7ed7e9b53e8260bd SHA512 e2389c2038534d421215a023e569d845c6db72d866dfb5c4819b20a32aad93a3c5492a2065c532934af7d26d19a549b18936ab85876ca72256011ddb7cffe1e1
 MISC metadata.xml 332 BLAKE2B 36407eae22ccceadca8dd6127b7b6e1d04d65722e2ac88fd8f875807ec6f08f5a62d3570970c7cc85f6fd9bd6998c38b06100712569baa086dffcee98ef0aae2 SHA512 f32abff7501f0aec08df19ecc6f3b3aece597c396d73c7c025cb6e6f6127c9aa498719f02f55c51bfaf6e0d0dd51a150dab04baecdd9586245a2f8a0fbcb19b9
diff --git a/dev-python/toolz/toolz-0.11.0.ebuild b/dev-python/toolz/toolz-0.11.0.ebuild
new file mode 100644
index 000000000000..217a48444976
--- /dev/null
+++ b/dev-python/toolz/toolz-0.11.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="List processing tools and functional utilities"
+HOMEPAGE="https://pypi.org/project/toolz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/toolz/toolz-0.11.1.ebuild b/dev-python/toolz/toolz-0.11.1.ebuild
new file mode 100644
index 000000000000..217a48444976
--- /dev/null
+++ b/dev-python/toolz/toolz-0.11.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="List processing tools and functional utilities"
+HOMEPAGE="https://pypi.org/project/toolz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index ff96fa696c2b..986fd647839a 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,5 +1,5 @@
 DIST typing_extensions-3.7.4.2.tar.gz 38427 BLAKE2B 9d7514cb27b5a8dbf246b15c8643a0e6e80d74004a39dc5585c1cb662cd77b9d8bacc25a03f9da7cde51aba4bd932ee8ffbde75d95ef29ae03c9f7e25897c816 SHA512 7a74c4a97d8cda3e56830c92b409235ffbe7cf0c1685b7fefa7a275a0abf21937622d12c25b4163b4927f6269ed689cbd30f95990ad0b7d2d4341ed648516819
 DIST typing_extensions-3.7.4.3.tar.gz 38979 BLAKE2B c1b0cc4d5d66f43628f6b488aefdcdd9878aa75cd426fce68aea6039006c1f0126f1a492a817e5a18d2c611aa399c5415d8b5e047b58868ee7b8b2cccfe13825 SHA512 fa1f96b73b13308ddb2676684862916aac8741be4523387c6a0f682a52d307190aac3e4149317842e686d14483d8a37a9e1de2514a2d1ca86f9ae9c8b0e18eb1
 EBUILD typing-extensions-3.7.4.2.ebuild 717 BLAKE2B 21b84d24ea58e4226b93258697978ee9012d2ff3a7f1897796ee9df0b3fa342e715c987f4d7dc8d21440e0e7fa40880342374a938429c8277edb48dd87b007a3 SHA512 46ecfdfa91ad227fa1311b93a91dcd71a29aaf0cbe85caf860e0fbabad65b6411031c67a9c40826d3fd51abd02d076c4ade0535b72e0ad3c484dcdd8acad6ef0
-EBUILD typing-extensions-3.7.4.3.ebuild 720 BLAKE2B 31d49c410e3595ca2ddc11ae202dbc26f1473e87e488ebdb9a2e9e32ce22edab9fbf500a5f6a8a6d63ca64ce5e87f76edd45dfabab25f831973f41c1aa43e224 SHA512 87bfe64c32a82ab739243a775dfb04f2bcab714475b6e4a6bc6a4849e7ef165275ba55d87becb6272af5e8fe2fee2172b891dfa7346a31d003910f5cd299ab58
+EBUILD typing-extensions-3.7.4.3.ebuild 718 BLAKE2B 27bf6ca202290439d5f6361604f4038b793c40d4fe0ff9c54d1b010a90d069ddba5e228e1437e51e15adecdb8b4ee88b1360f0295054c60d44475d55d9f47cd0 SHA512 8dd6eab93b943054014de9a5bc8942b1152931c8ca4f79326b79c03193fd556ae6e81e8a7cc496bb6501968c4bd8cde55aa7ea70eed98f4850a10f4452b8782c
 MISC metadata.xml 333 BLAKE2B 7c8ba2188c6cbc930151cad7d365c6b26677aa23348454bf307f4549f296857681c2d871af330b7c889f38524dd63e3abf782ef5bbd7f5f606adcb60741c3461 SHA512 b411ac2336820d0fc123dd6f1575d92d001f6c472537fb1a4899b489bb2f223955e86c5a5a89f98490374ffac231cfc678472c14faeff56c33705850f3d23e0f
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
index 4cf3c3b8746c..0ad35ce658c3 100644
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 python_test() {
 	cd "${S}"/src_py3 || die
diff --git a/dev-python/verboselogs/Manifest b/dev-python/verboselogs/Manifest
index 1bb7caede51e..1d22f388cf57 100644
--- a/dev-python/verboselogs/Manifest
+++ b/dev-python/verboselogs/Manifest
@@ -1,4 +1,4 @@
 AUX verboselogs-1.7-skip-sandbox-violation-test.patch 756 BLAKE2B 3766d28085f4eeb9167fe37f1f1b78dc9c2d1b5e8c401a402b7231bc33e9eaa31dd1a6ae8b0e4052712a173cbb8339361c18b5c4b0d794fcc902650ce6fa19ca SHA512 19f4bd82b49f2b97c7d99154b80e0d63c70211040d73e6cf7ad5d4523f3b15c6cd3df865a8584fd0ee0a255c2463b0057da15ea66f1b28682eeb568120e5d172
 DIST verboselogs-1.7.tar.gz 10338 BLAKE2B a0058a4697d642cc984e68983d499745b644380fd82a45d2aa424cb92b053da2ba5ae225f960427663c49ab78c47ed65c755b43d61c9c978dd881b52ce371ff3 SHA512 13e96ac21e1cb5c68428b348bab63fc4d4ad34eaffe8e1554c05380f9115d2a3ccc6fa2e0a5ca8941e73bfb06537a3e46f29880e7ba3f47da0284279a9740211
-EBUILD verboselogs-1.7.ebuild 707 BLAKE2B 2f68569dceaac5925615fe09f142805c13cf6010828c74af1f7ceaefc3e428dc2506086a92967615d0d6a01cbd7cfbbf7524e2224a739f9dbd83f6c6abffd714 SHA512 3a6243b2d30da741e321e62334fb39c2a752c6a7ea0a41ad966b1255dc6373170ef7f9da31ff37c7930bab35baaf5913112d18e5d3f922dc259ec075b5e60ec8
+EBUILD verboselogs-1.7.ebuild 715 BLAKE2B e6f51dc5b7339f721bec56e615520c0d635ae661db4db1c2ad7af65731148ea87bfba1d78f7bd1377017244ee6a4a3bf53bf4b6bc3cdcfdfbf324f1afb3b0744 SHA512 dc96e68718878401f17897ed24871726654b6426e29371320bf6d07944978780c404d1ac9fa6214b067058b6bd42c879614ecca561ff393cf521e6ee5a073e50
 MISC metadata.xml 324 BLAKE2B 6c8d909bd018e46f81fef3a30b87b7dcec5d48a31e919c6c60b000982d31486cb6fd8639afe42351579099454757922d7b05be5e196a3902b6ee199ff5817955 SHA512 4e0057695d4ab3557dc29f6ae0031d780cceabbcf6c0b07cdf80f11052e64cd90994c93a4d09213f875d54a1bce1cee88287ab223bc4d7c0cf4a70095614c039
diff --git a/dev-python/verboselogs/verboselogs-1.7.ebuild b/dev-python/verboselogs/verboselogs-1.7.ebuild
index 15d0cfd921bd..b4e84ccc0639 100644
--- a/dev-python/verboselogs/verboselogs-1.7.ebuild
+++ b/dev-python/verboselogs/verboselogs-1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 52e4c61665c6..c343e34b4c07 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -4,5 +4,5 @@ AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014e
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST virtualenv-20.0.31.tar.gz 8300305 BLAKE2B 1574b553b2bc8e05bf00584379f80c1e5c0ee9798595255830059eedea62f02f02d216c421aa2cb312bc9e60694f6a409d0c2495858a89fc1ad7aaddea7965ff SHA512 46220bda37b3b860e44c4d0775a89c22a7ba775287f05438d1d3698201cc213a05b2718ef40be302627005ae349dc59a3141c7a30cc1dab6dc81f7692c7f16a5
 EBUILD virtualenv-16.7.10-r1.ebuild 1959 BLAKE2B 90c31ff96e46d24169602a0f034bf02f0d5fcc4132b1ef12a06226580ed2737398c889a0f752cd14c99f310a72642664aacc27024a65840a8541e580ef601deb SHA512 ab7f3e64008dc6320e2d0a280087b7ae26f934eaa7d571e2f8e01c4e21db7356476fd002918b6217bb52827f22bcd6f8e527e53c1011824d8d32be99c452bec8
-EBUILD virtualenv-20.0.31-r1.ebuild 2562 BLAKE2B 35176197536991d7e46aa5cba9f655875617663bae8d2287858af479f61927dc20e28d203f0e94c708b5a37b288c2bc693d4e49596965376d758f6e2c0cd7799 SHA512 11920e53a2253b3d62700256626ef44d1b361783ca121770608eabdb74dfe47071435442fe815a3bfa5a6555756d231f5d000c2f748c80b017c5d02aaa0f5fc4
+EBUILD virtualenv-20.0.31-r1.ebuild 2569 BLAKE2B d876b5b027a29b0fc2abab36752347ff274f69e3264785520147d179c789ecef30c127db670d9bbd64e698c74b2d3a2bbe66417995757961b05e3c555c95d7f1 SHA512 3891ca5da5bcb47deea8d670d163ca93873ceedb07cc8434c63b152c94c64dda2959b0d4116bdf8bfd08e7bfa0d798874ee15329ac00a19108bc5264538d5d01
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-20.0.31-r1.ebuild b/dev-python/virtualenv/virtualenv-20.0.31-r1.ebuild
index 4e1a69e4749a..a734981f18b9 100644
--- a/dev-python/virtualenv/virtualenv-20.0.31-r1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.31-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index e5b796a4a289..abd9cd72623c 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,4 +1,4 @@
 DIST vobject-0.9.6.1.tar.gz 58556 BLAKE2B 74f9a7dc8058bb792492b1ac44a0310f58c603e677aedda35be0d8e94743e6e1e001a4ae888625f314f706891b7a31db77efa4c268482bbaf44ca37fff236cd6 SHA512 0b299fd4ca105a063f4ac7b03b157c54a3867d6fb798f9072897939b0ba275ba0887bb001c5ed38002a8eb1c10aee710af880413c072140b855af4b62d5aff72
 EBUILD vobject-0.9.6.1-r1.ebuild 753 BLAKE2B 5e93a983ffa494a90c4312796e508c38e988ccbf0713b756f772795f30bbc9a7991f3a11c371effa3a6b605099bf855f5e2bbed5a84f8bbf630487961528fade SHA512 92bbd48ae92e7032264dda17ab7a9d2148dac409251302d2ed3a90f559d2cc29cdbb6ddd28c6683dc813073cef0a5c997e0575921f42f68857aaeedc7ed27e2c
 EBUILD vobject-0.9.6.1-r2.ebuild 791 BLAKE2B 741daaae7d6cb2583d308b59917b90be29904247731a44feca84dc1e29d8e38aefba1fffc4c281703fbaf9738b6dd8b7c247f1a5ed5616943e58267cb4194c3b SHA512 2904ab0d3f98f03213fb843ab630181c054549069e32817ecb839565ced3d36472752a1caad6fce22f5d0cbd19d1bc68435e397e5448501aa6da7082a2fd2d01
-MISC metadata.xml 322 BLAKE2B e0e386d11610176cc9b83ec3e1c6cf3d53306b01dbe272be61538592057e125ae6eb196e60e8c6588d80a3f8413f9f5bbe9e373f7e6670f1bb53bd043cd9be39 SHA512 d50380968c2886e5fb7971f90ee38189b9f325513eb0e0e039638ec0b466b3c54c20be5ac056a49fd28923e061d658200898f26850dcbe2c0d58114c0b732a02
+MISC metadata.xml 346 BLAKE2B 3d1f3f0efd8481b912aba7675d50f338b831d06108734b4622bf2aab5e0df5feff99856544ad12b5d2ac80393d16dc687a06359392c96e4c652ae062469a5095 SHA512 51588af560593c3553f3fa1fd97c1a058d71e819df55261ff7dd24e07a23f5f0290902debd56d509af4b8696d92fd4853f2deafb11b4d9a357fae754e7b62d8b
diff --git a/dev-python/vobject/metadata.xml b/dev-python/vobject/metadata.xml
index b83ddeac473e..fd720400b6b7 100644
--- a/dev-python/vobject/metadata.xml
+++ b/dev-python/vobject/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">eventable/vobject</remote-id>
 	</upstream>
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index bb936b1da35c..610c1a49316a 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1,3 +1,5 @@
+AUX websockify-0.9.0-mock-tests.patch 18675 BLAKE2B e7dbb0d77bf264bdeef98a3aadc071c3612bd7cad5f6f72c2a748d75e7197ca59a328e7476e19970fa89a17fa9cdc869493dea7505b708cec4e3a020e1a8c545 SHA512 e14011a7b1aa4992f21e5f4293e04424faab2a740ed362bfd1c65daa16cc2cf0d7329df0511239b104a6a4618fbeadf39344227cc7cdc5f48a6b3cfeebf7e748
 DIST websockify-0.9.0.tar.gz 58493 BLAKE2B 622a36979ec083dd3ea747b43cd8fec0916f9eb6f1a2b8f9b7acabd38f41aec839b2101c5261fdf2474bc40ebbbef61c9ba51d2e57f749f1e1a1c46879fb5d65 SHA512 d2251f653a40dc6dca0e5541845565d968c60be96a20a9b70b0305c4b7578f7fe205d4b98a94bb77d7c9383a396833af90fe92a6ade7e1a6f2d9bf8513d372c8
+EBUILD websockify-0.9.0-r1.ebuild 776 BLAKE2B 15444b1c977b88a9d66300f2d7b2b9e2d3d6a1a36a3a428eff34a3634e63a3720883e969fd0b1dae00ec9f6e4258d4bee0cd038ee83cef506d5d963880bf6771 SHA512 d1df61cc79dcca0342e71c08ccdf8a6c937df9856b2900c0d5182bbc3b3ea4f8965691f25fef20f7a1bd45534b1874b71e6a7ca4c862f8a277ee3d79c6e4df31
 EBUILD websockify-0.9.0.ebuild 504 BLAKE2B 16075323e3432b978f691b98731974415cc7894fce65e434b2e88e625123dd40e1b7174e36b6237ec35cf20f1e11bba0c040ca5bbd85ace9323a242c62ad8e9f SHA512 9b07948208ac459fb78eb28b6d30b54e6e8b0ec493672e7b70ea4a11294597843491c8ace13332297f051629bbf4c06240688306375126a7dff23eefd613bbba
 MISC metadata.xml 453 BLAKE2B 3952e4a784c0495f9d3f4b754efb1f76d49573615737f0c17f2fe9b00a51518c78dfa6de9777567fcac7d654473c0f253a87f8aec32be22f18f8c9121912a6cf SHA512 264bf203b6a60818054f8003f131daff7188adc824584dfb12cf8622e65ebdcf181b95a5bac045f08ea618e6944259a13b422c6893a64581656d15561160274b
diff --git a/dev-python/websockify/files/websockify-0.9.0-mock-tests.patch b/dev-python/websockify/files/websockify-0.9.0-mock-tests.patch
new file mode 100644
index 000000000000..a6af9508e07d
--- /dev/null
+++ b/dev-python/websockify/files/websockify-0.9.0-mock-tests.patch
@@ -0,0 +1,392 @@
+From 992e09eac484f25871b7fcfc6d11b8e5beac9edb Mon Sep 17 00:00:00 2001
+From: Pierre Ossman <ossman@cendio.se>
+Date: Fri, 21 Aug 2020 10:50:11 +0200
+Subject: [PATCH] Convert tests from mox to mock
+
+mox is deprecated upstream in favour of mock
+---
+ test-requirements.txt          |   2 +-
+ tests/test_websocketproxy.py   |  34 ++++------
+ tests/test_websockifyserver.py | 111 +++++++++++++--------------------
+ 3 files changed, 58 insertions(+), 89 deletions(-)
+
+diff --git a/test-requirements.txt b/test-requirements.txt
+index a63a15e..8e01437 100644
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -1,4 +1,4 @@
+-mox3
++mock
+ nose
+ jwcrypto;python_version>="2.7"
+ redis;python_version>="2.7"
+diff --git a/tests/test_websocketproxy.py b/tests/test_websocketproxy.py
+index c0a8d93..d8a4916 100644
+--- a/tests/test_websocketproxy.py
++++ b/tests/test_websocketproxy.py
+@@ -20,10 +20,11 @@
+ import unittest
+ import unittest
+ import socket
++try:
++    from mock import patch
++except ImportError:
++    from unittest.mock import patch
+ 
+-from mox3 import stubout
+-
+-from websockify import websockifyserver
+ from websockify import websocketproxy
+ from websockify import token_plugins
+ from websockify import auth_plugins
+@@ -74,16 +75,14 @@ def __init__(self):
+ class ProxyRequestHandlerTestCase(unittest.TestCase):
+     def setUp(self):
+         super(ProxyRequestHandlerTestCase, self).setUp()
+-        self.stubs = stubout.StubOutForTesting()
+         self.handler = websocketproxy.ProxyRequestHandler(
+             FakeSocket(''), "127.0.0.1", FakeServer())
+         self.handler.path = "https://localhost:6080/websockify?token=blah"
+         self.handler.headers = None
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'socket',
+-                       staticmethod(lambda *args, **kwargs: None))
++        patch('websockify.websockifyserver.WebSockifyServer.socket').start()
+ 
+     def tearDown(self):
+-        self.stubs.UnsetAll()
++        patch.stopall()
+         super(ProxyRequestHandlerTestCase, self).tearDown()
+ 
+     def test_get_target(self):
+@@ -120,8 +119,7 @@ class TestPlugin(token_plugins.BasePlugin):
+             def lookup(self, token):
+                 return (self.source + token).split(',')
+ 
+-        self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                       staticmethod(lambda *args, **kwargs: None))
++        patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+         self.handler.server.token_plugin = TestPlugin("somehost,")
+         self.handler.validate_connection()
+@@ -138,8 +136,7 @@ def test_asymmetric_jws_token_plugin(self):
+             jwt_token.make_signed_token(key)
+             self.handler.path = "https://localhost:6080/websockify?token={jwt_token}".format(jwt_token=jwt_token.serialize())
+ 
+-            self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                        staticmethod(lambda *args, **kwargs: None))
++            patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+             self.handler.server.token_plugin = token_plugins.JWTTokenApi("./tests/fixtures/public.pem")
+             self.handler.validate_connection()
+@@ -155,8 +152,7 @@ def test_asymmetric_jws_token_plugin_with_illigal_key_exception(self):
+             jwt_token.make_signed_token(key)
+             self.handler.path = "https://localhost:6080/websockify?token={jwt_token}".format(jwt_token=jwt_token.serialize())
+ 
+-            self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                        staticmethod(lambda *args, **kwargs: None))
++            patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+             self.handler.server.token_plugin = token_plugins.JWTTokenApi("wrong.pub")
+             self.assertRaises(self.handler.server.EClose, 
+@@ -171,8 +167,7 @@ def test_symmetric_jws_token_plugin(self):
+             jwt_token.make_signed_token(key)
+             self.handler.path = "https://localhost:6080/websockify?token={jwt_token}".format(jwt_token=jwt_token.serialize())
+ 
+-            self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                        staticmethod(lambda *args, **kwargs: None))
++            patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+             self.handler.server.token_plugin = token_plugins.JWTTokenApi("./tests/fixtures/symmetric.key")
+             self.handler.validate_connection()
+@@ -188,8 +183,7 @@ def test_symmetric_jws_token_plugin_with_illigal_key_exception(self):
+             jwt_token.make_signed_token(key)
+             self.handler.path = "https://localhost:6080/websockify?token={jwt_token}".format(jwt_token=jwt_token.serialize())
+ 
+-            self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                        staticmethod(lambda *args, **kwargs: None))
++            patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+             self.handler.server.token_plugin = token_plugins.JWTTokenApi("wrong_sauce")
+             self.assertRaises(self.handler.server.EClose, 
+@@ -210,8 +204,7 @@ def test_asymmetric_jwe_token_plugin(self):
+ 
+             self.handler.path = "https://localhost:6080/websockify?token={jwt_token}".format(jwt_token=jwe_token.serialize())
+ 
+-            self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                        staticmethod(lambda *args, **kwargs: None))
++            patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+             self.handler.server.token_plugin = token_plugins.JWTTokenApi("./tests/fixtures/private.pem")
+             self.handler.validate_connection()
+@@ -225,8 +218,7 @@ def authenticate(self, headers, target_host, target_port):
+                 if target_host == self.source:
+                     raise auth_plugins.AuthenticationError(response_msg="some_error")
+ 
+-        self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                       staticmethod(lambda *args, **kwargs: None))
++        patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+         self.handler.server.auth_plugin = TestPlugin("somehost")
+         self.handler.server.target_host = "somehost"
+diff --git a/tests/test_websockifyserver.py b/tests/test_websockifyserver.py
+index b9312dc..a089f55 100644
+--- a/tests/test_websockifyserver.py
++++ b/tests/test_websockifyserver.py
+@@ -22,7 +22,10 @@
+ import shutil
+ import socket
+ import ssl
+-from mox3 import stubout
++try:
++    from mock import patch, MagicMock, ANY
++except ImportError:
++    from unittest.mock import patch, MagicMock, ANY
+ import sys
+ import tempfile
+ import unittest
+@@ -73,22 +76,13 @@ def makefile(self, mode='r', buffsize=None):
+ class WebSockifyRequestHandlerTestCase(unittest.TestCase):
+     def setUp(self):
+         super(WebSockifyRequestHandlerTestCase, self).setUp()
+-        self.stubs = stubout.StubOutForTesting()
+         self.tmpdir = tempfile.mkdtemp('-websockify-tests')
+         # Mock this out cause it screws tests up
+-        self.stubs.Set(os, 'chdir', lambda *args, **kwargs: None)
+-        self.stubs.Set(BaseHTTPRequestHandler, 'send_response',
+-                       lambda *args, **kwargs: None)
+-
+-        def fake_send_error(self, code, message=None, explain=None):
+-            self.last_code = code
+-
+-        self.stubs.Set(BaseHTTPRequestHandler, 'send_error',
+-                       fake_send_error)
++        patch('os.chdir').start()
+ 
+     def tearDown(self):
+         """Called automatically after each test."""
+-        self.stubs.UnsetAll()
++        patch.stopall()
+         os.rmdir(self.tmpdir)
+         super(WebSockifyRequestHandlerTestCase, self).tearDown()
+ 
+@@ -101,47 +95,36 @@ def _get_server(self, handler_class=websockifyserver.WebSockifyRequestHandler,
+             record=self.tmpdir, daemon=False, ssl_only=0, idle_timeout=1,
+             **kwargs)
+ 
+-    def test_normal_get_with_only_upgrade_returns_error(self):
++    @patch('websockify.websockifyserver.WebSockifyRequestHandler.send_error')
++    def test_normal_get_with_only_upgrade_returns_error(self, send_error):
+         server = self._get_server(web=None)
+         handler = websockifyserver.WebSockifyRequestHandler(
+             FakeSocket('GET /tmp.txt HTTP/1.1'), '127.0.0.1', server)
+ 
+-        def fake_send_response(self, code, message=None):
+-            self.last_code = code
+-
+-        self.stubs.Set(BaseHTTPRequestHandler, 'send_response',
+-                       fake_send_response)
+-
+         handler.do_GET()
+-        self.assertEqual(handler.last_code, 405)
++        send_error.assert_called_with(405, ANY)
+ 
+-    def test_list_dir_with_file_only_returns_error(self):
++    @patch('websockify.websockifyserver.WebSockifyRequestHandler.send_error')
++    def test_list_dir_with_file_only_returns_error(self, send_error):
+         server = self._get_server(file_only=True)
+         handler = websockifyserver.WebSockifyRequestHandler(
+             FakeSocket('GET / HTTP/1.1'), '127.0.0.1', server)
+ 
+-        def fake_send_response(self, code, message=None):
+-            self.last_code = code
+-
+-        self.stubs.Set(BaseHTTPRequestHandler, 'send_response',
+-                       fake_send_response)
+-
+         handler.path = '/'
+         handler.do_GET()
+-        self.assertEqual(handler.last_code, 404)
++        send_error.assert_called_with(404, ANY)
+ 
+ 
+ class WebSockifyServerTestCase(unittest.TestCase):
+     def setUp(self):
+         super(WebSockifyServerTestCase, self).setUp()
+-        self.stubs = stubout.StubOutForTesting()
+         self.tmpdir = tempfile.mkdtemp('-websockify-tests')
+         # Mock this out cause it screws tests up
+-        self.stubs.Set(os, 'chdir', lambda *args, **kwargs: None)
++        patch('os.chdir').start()
+ 
+     def tearDown(self):
+         """Called automatically after each test."""
+-        self.stubs.UnsetAll()
++        patch.stopall()
+         os.rmdir(self.tmpdir)
+         super(WebSockifyServerTestCase, self).tearDown()
+ 
+@@ -154,10 +137,10 @@ def _get_server(self, handler_class=websockifyserver.WebSockifyRequestHandler,
+ 
+     def test_daemonize_raises_error_while_closing_fds(self):
+         server = self._get_server(daemon=True, ssl_only=1, idle_timeout=1)
+-        self.stubs.Set(os, 'fork', lambda *args: 0)
+-        self.stubs.Set(signal, 'signal', lambda *args: None)
+-        self.stubs.Set(os, 'setsid', lambda *args: None)
+-        self.stubs.Set(os, 'close', raise_oserror)
++        patch('os.fork').start().return_value = 0
++        patch('signal.signal').start()
++        patch('os.setsid').start()
++        patch('os.close').start().side_effect = raise_oserror
+         self.assertRaises(OSError, server.daemonize, keepfd=None, chdir='./')
+ 
+     def test_daemonize_ignores_ebadf_error_while_closing_fds(self):
+@@ -165,11 +148,11 @@ def raise_oserror_ebadf(fd):
+             raise OSError(errno.EBADF, 'fake error')
+ 
+         server = self._get_server(daemon=True, ssl_only=1, idle_timeout=1)
+-        self.stubs.Set(os, 'fork', lambda *args: 0)
+-        self.stubs.Set(os, 'setsid', lambda *args: None)
+-        self.stubs.Set(signal, 'signal', lambda *args: None)
+-        self.stubs.Set(os, 'close', raise_oserror_ebadf)
+-        self.stubs.Set(os, 'open', raise_oserror)
++        patch('os.fork').start().return_value = 0
++        patch('signal.signal').start()
++        patch('os.setsid').start()
++        patch('os.close').start().side_effect = raise_oserror_ebadf
++        patch('os.open').start().side_effect = raise_oserror
+         self.assertRaises(OSError, server.daemonize, keepfd=None, chdir='./')
+ 
+     def test_handshake_fails_on_not_ready(self):
+@@ -178,7 +161,7 @@ def test_handshake_fails_on_not_ready(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             return ([], [], [])
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         self.assertRaises(
+             websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+             FakeSocket(), '127.0.0.1')
+@@ -191,7 +174,7 @@ def test_empty_handshake_fails(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             return ([sock], [], [])
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         self.assertRaises(
+             websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+             sock, '127.0.0.1')
+@@ -208,7 +191,7 @@ def test_handshake_ssl_only_without_ssl_raises_error(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             return ([sock], [], [])
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         self.assertRaises(
+             websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+             sock, '127.0.0.1')
+@@ -230,7 +213,7 @@ def __init__(self, *args, **kwargs):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             return ([sock], [], [])
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         self.assertEqual(server.do_handshake(sock, '127.0.0.1'), sock)
+         self.assertTrue(FakeHandler.CALLED, True)
+ 
+@@ -251,7 +234,7 @@ def test_do_handshake_ssl_without_cert_raises_error(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             return ([sock], [], [])
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         self.assertRaises(
+             websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+             sock, '127.0.0.1')
+@@ -280,13 +263,13 @@ def load_verify_locations(self, cafile):
+             def wrap_socket(self, *args, **kwargs):
+                 raise ssl.SSLError(ssl.SSL_ERROR_EOF)
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         if (hasattr(ssl, 'create_default_context')):
+             # for recent versions of python
+-            self.stubs.Set(ssl, 'create_default_context', fake_create_default_context)
++            patch('ssl.create_default_context').start().side_effect = fake_create_default_context
+         else:
+             # for fallback for old versions of python
+-            self.stubs.Set(ssl, 'wrap_socket', fake_wrap_socket)
++            patch('ssl.warp_socket').start().side_effect = fake_wrap_socket
+         self.assertRaises(
+             websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+             sock, '127.0.0.1')
+@@ -321,10 +304,10 @@ def wrap_socket(self, *args, **kwargs):
+             def set_ciphers(self, ciphers_to_set):
+                 fake_create_default_context.CIPHERS = ciphers_to_set
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         if (hasattr(ssl, 'create_default_context')):
+             # for recent versions of python
+-            self.stubs.Set(ssl, 'create_default_context', fake_create_default_context)
++            patch('ssl.create_default_context').start().side_effect = fake_create_default_context
+             server.do_handshake(sock, '127.0.0.1')
+             self.assertEqual(fake_create_default_context.CIPHERS, test_ciphers)
+         else:
+@@ -365,10 +348,10 @@ def set_options(self, val):
+                 fake_create_default_context.OPTIONS = val
+             options = property(get_options, set_options)
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         if (hasattr(ssl, 'create_default_context')):
+             # for recent versions of python
+-            self.stubs.Set(ssl, 'create_default_context', fake_create_default_context)
++            patch('ssl.create_default_context').start().side_effect = fake_create_default_context
+             server.do_handshake(sock, '127.0.0.1')
+             self.assertEqual(fake_create_default_context.OPTIONS, test_options)
+         else:
+@@ -387,11 +370,9 @@ def test_start_server_error(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             raise Exception("fake error")
+ 
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'socket',
+-                       lambda *args, **kwargs: sock)
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'daemonize',
+-                       lambda *args, **kwargs: None)
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('websockify.websockifyserver.WebSockifyServer.socket').start()
++        patch('websockify.websockifyserver.WebSockifyServer.daemonize').start()
++        patch('select.select').start().side_effect = fake_select
+         server.start_server()
+ 
+     def test_start_server_keyboardinterrupt(self):
+@@ -401,11 +382,9 @@ def test_start_server_keyboardinterrupt(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             raise KeyboardInterrupt
+ 
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'socket',
+-                       lambda *args, **kwargs: sock)
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'daemonize',
+-                       lambda *args, **kwargs: None)
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('websockify.websockifyserver.WebSockifyServer.socket').start()
++        patch('websockify.websockifyserver.WebSockifyServer.daemonize').start()
++        patch('select.select').start().side_effect = fake_select
+         server.start_server()
+ 
+     def test_start_server_systemexit(self):
+@@ -415,11 +394,9 @@ def test_start_server_systemexit(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             sys.exit()
+ 
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'socket',
+-                       lambda *args, **kwargs: sock)
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'daemonize',
+-                       lambda *args, **kwargs: None)
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('websockify.websockifyserver.WebSockifyServer.socket').start()
++        patch('websockify.websockifyserver.WebSockifyServer.daemonize').start()
++        patch('select.select').start().side_effect = fake_select
+         server.start_server()
+ 
+     def test_socket_set_keepalive_options(self):
diff --git a/dev-python/websockify/websockify-0.9.0-r1.ebuild b/dev-python/websockify/websockify-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..3e94e67a53ce
--- /dev/null
+++ b/dev-python/websockify/websockify-0.9.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+# entry_points is used
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+SRC_URI="https://github.com/kanaka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="WebSockets support for any application/server"
+HOMEPAGE="https://github.com/kanaka/websockify"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/jwcrypto[${PYTHON_USEDEP}] )"
+
+# Backport a patch removing the need for mox3
+PATCHES=( "${FILESDIR}/${P}-mock-tests.patch" )
+
+distutils_enable_tests nose
+
+python_install_all() {
+	doman docs/${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 482d0706c7b7..708e735cbd34 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,13 +1,5 @@
-AUX wxpython-2.8-no-preservatives-added.patch 525 BLAKE2B 7303124d355849fbe7b74488aa28399d675be2330c1af59c09c84465290ea2a06a69aacc8b3cc6ff5cc91a77ed392c0d8298ff0510d3c2081bdcea37c9604c71 SHA512 83e066d6798aea833304004d7270e3b7698e51581e9ac9c934b96fb438bbafb16cea15cc73297961893fd73fd18f95cade22c134aea6556962025fc3c12bdedd
-AUX wxpython-2.8.11-drop-editra.patch 2197 BLAKE2B 055cec606028e20e613109f3edf455b12964725349a92323cee5212540b56fadc2f7e4319e473045cae69ef2a01a8c2c3c4f4533895d7231e0690f8b1d32cb5c SHA512 3800b68ba13c52e81a4411940e297f83f9e98c76b4d8d9d3e53ac55564a38b1376b57df337e4f009b1cbbd44199293554058341aa2122ec329c3a42dd38593a6
-AUX wxpython-2.8.12.1-disable-egging-mode.patch 1146 BLAKE2B dff061c8680a3c1a9c9731c8d80acc93f8562ed70e8bb98527b78f0f3813372f6179d8f5e348870cec25c24c961213f7e5db4755b8b79648aa251199b275226d SHA512 a834a2c3f009f6855755bd07b54683b8f3d9dc58ee9d0631e51c0450e3bac98245e4dab0e40820ba1727b6a0d8528675443c986d7fa4f7c58d606d60975e4190
-AUX wxpython-3.0-wxversion-demo.patch 147 BLAKE2B a02fcf87c8b153b3a3fd7abfda117f988fbdafddbeefe47e77adeef6201b0c037c51ee7f4b7fa3d57a92e70b7518ce6fd7148f11d2b53d96fe085d8d366021df SHA512 99682f18a520b68b313301784adaf71c1ab9181022b743de82c9cc6acfaa1fc77867ef43c00926f6d7bdde8ed29fac24b5eb72761209a2e2a1d498feee85a0a1
-AUX wxpython-3.0.0.0-wxversion-scripts.patch 4187 BLAKE2B 07601322f2e71fb6af40172ed64efe5e0b0d32d30556ce821b0a835ae545c016df5974c5aadf6e8810ffc651b5ca8bda47729b1f7589947d5dfc0ad0dfd21771 SHA512 74fe603daafdbc5a50daaa3411ea40243d1fdee2cb3bbd0e6e99bd73bd124137161cd682673f2c727faf92214bfa4d27c059021f19c92c581485bb1d6a5b49a6
 AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa
 AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
-DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702
-DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
-EBUILD wxpython-3.0.2.0.ebuild 4581 BLAKE2B 02226950f5f18aad9261b59c0310c88427cd91362d97c30e8226551ce038a42ce054092418a26a64f878cc3317a524d8ecf67135597fb0db1ca4ae00f6251aaa SHA512 c1edff5306233fd830b847a3c7475c5e7822b501ff117022ec572a02d1cbfcfc003e717705d3d5fd0cbdcea783e2471d47e98296b9d83a52eb9c83dd9b94231a
-EBUILD wxpython-4.0.7.ebuild 2265 BLAKE2B 8bd7dc2b02bec8ea1398a93019321348508694924166c52999948575ef907d0951f90693e881546c59c143e104e495a8230850f6cfbbcaab9caee7898a32b66c SHA512 e31e5fd18944a54f830d55a69802ab53636d3e1ada75e47da56a4c687c543c995810e0e5420555d54017568d5b3891861f5a4605d229f521ff464c6300121559
-MISC metadata.xml 550 BLAKE2B eb8b5a9f5b6c0bc12d5eb1848888549a8d18fc086cde9d4a819dd2765b654470a18ff627578929ba901f09486b96b34644269c09102861bc09482b107d018332 SHA512 ad9e10ffc69cc3a103a30166448a09b84013b3dd3eb9a62583a0c562933b5cc056a62f148e34aa2fdd5bcbffeb81596b2cbd3c4eee485cbce15b649083e59d43
+EBUILD wxpython-4.0.7.ebuild 2266 BLAKE2B 08048af96d552bce639d41850c999995b0cf0d85b90dfa765507d21eaf186d45787b6f8914bb02713ad3ee3fcfa414aa89bd82df12318c3475362b8e41bcfe4d SHA512 42883fc1a6b476a8fc8e9a599af4fe1aaccade3cef1b09b4a60d521de687e7b1b2fe362a589b017a1bf022c409237173ddf5bdc8c5f00994104b8b5cbd6d1097
+MISC metadata.xml 444 BLAKE2B ede5bde5d439eb6df2a438a3004367a8ed3e867837e259f86ba0fd2889345d7eaa7ba22ae683f56fb85d269a239bd31b7181205d4c1b311d2abd40d64e8ad11a SHA512 402f8994132035a8f7e1fee67f446ec3cd529f6ce0836422df5945e24995ac19d714c2729bd3acbb897c2d1581f7d99dd8ff8603211e28ed2d768a8868afa62e
diff --git a/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch b/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch
deleted file mode 100644
index 5e4221d51506..000000000000
--- a/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Portage preserve-libs removes the linker name (.so) of a library but leaves
-the soname (.so.4) and realname (.so.4.0) installed.  findLib searches for 
-mywxlibname.* and returns true if anything is found.  Disaster ensues.
-
-
---- a/wxPython/config.py
-+++ b/wxPython/config.py
-@@ -612,7 +612,7 @@ def findLib(name, libdirs):
-         dirs = libdirs[:]
-     for d in dirs:
-         p = os.path.join(d, name)
--        if glob.glob(p+'*') != []:
-+        if glob.glob(p+'*.so') != []:
-             return True
-     return False
- 
diff --git a/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch
deleted file mode 100644
index 9555bb57ef44..000000000000
--- a/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/wxPython/setup.py
-+++ b/wxPython/setup.py
-@@ -887,13 +887,6 @@ WX_PKGLIST =      [ 'wx',
-                     'wx.tools',
-                     'wx.tools.XRCed',
-                     'wx.tools.XRCed.plugins',
--                    'wx.tools.Editra',
--                    'wx.tools.Editra.src',
--                    'wx.tools.Editra.src.autocomp',
--                    'wx.tools.Editra.src.eclib',
--                    'wx.tools.Editra.src.ebmlib',
--                    'wx.tools.Editra.src.extern',
--                    'wx.tools.Editra.src.syntax',
-                     ]
- 
- if not EGGing:
-@@ -920,7 +913,6 @@ else:
-                opj('scripts/pywrap'),
-                opj('scripts/pywxrc'),
-                opj('scripts/xrced'),
--               opj('scripts/editra'),
-                ]
-     if os.name == 'nt':
-         SCRIPTS.append( opj('scripts/genaxmodule') ) 
-@@ -934,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb')
- DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx')
- DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png')
- 
--DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt')
--DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo')
--DATA_FILES += find_data_files('wx/tools/Editra/pixmaps',
--                              '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING')
--DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg')
--DATA_FILES += find_data_files('wx/tools/Editra/src', 'README')
--DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess')
--DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*')
--DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False)
- 
- 
- ## import pprint
-@@ -993,7 +976,6 @@ if EGGing:
-                                   'pyshell = wx.py.PyShell:main',
-                                   'pywrap = wx.py.PyWrap:main',
-                                   'helpviewer = wx.tools.helpviewer:main',
--                                  'editra = wx.tools.Editra.launcher:main',
-                                   'xrced = wx.tools.XRCed.xrced:main',
-                                   ], 
-             },
diff --git a/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch b/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch
deleted file mode 100644
index 1497a2c70761..000000000000
--- a/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c4072ed7bc923039e544319f52d0761b7a4600a4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 22 Apr 2013 18:02:37 +0200
-Subject: [PATCH] Trigger 'EGGing' mode only by 'bdist_egg' and not 'egg_info'.
-
-We use the 'egg_info' command to explicitly enforce temporary EGG file
-location outside the source tree on Gentoo. As a result, our build
-command activates the 'EGGing' mode and wxPython is not installed
-properly.
-
-I believe that the 'EGGing' mode should be activated only by an explicit
-call to 'bdist_egg' command where the expected files are actually
-created.  The 'egg_info' command is a more broad one and is often used
-implicitly, e.g. by the 'install' command.
----
- config.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.py b/config.py
-index 4fbd83f..b45707d 100644
---- a/config.py
-+++ b/config.py
-@@ -23,7 +23,7 @@
- import sys, os, glob, fnmatch, tempfile
- import subprocess
- 
--EGGing = 'bdist_egg' in sys.argv or 'egg_info' in sys.argv
-+EGGing = 'bdist_egg' in sys.argv
- if not EGGing:
-     from distutils.core import setup, Extension
- else:
--- 
-1.8.1.5
-
diff --git a/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch
deleted file mode 100644
index a4f6b0b07a3c..000000000000
--- a/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- demo/demo.org
-+++ demo/demo.py
-@@ -1,4 +1,7 @@
- #!/usr/bin/env python
- 
-+import wxversion
-+wxversion.select("3.0")
-+
- import Main
- Main.main()
diff --git a/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch
deleted file mode 100644
index 9f0cb8922267..000000000000
--- a/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch
+++ /dev/null
@@ -1,211 +0,0 @@
---- a/distrib/PyAlaMode.desktop
-+++ b/distrib/PyAlaMode.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyAlaMode
-+Name=PyAlaMode (3.0)
- Comment=GUI Python Shell with Filling and editor windows
--Exec=pyalamode
--Icon=PyCrust
-+Exec=pyalamode-3.0
-+Icon=PyCrust-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PyCrust.desktop
-+++ b/distrib/PyCrust.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyCrust
-+Name=PyCrust (3.0)
- Comment=GUI Python Shell with Filling
--Exec=pycrust
--Icon=PyCrust
-+Exec=pycrust-3.0
-+Icon=PyCrust-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PyShell.desktop
-+++ b/distrib/PyShell.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyShell
-+Name=PyShell (3.0)
- Comment=GUI Python Shell
--Exec=pyshell
--Icon=PyCrust
-+Exec=pyshell-3.0
-+Icon=PyCrust-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PySlices.desktop
-+++ b/distrib/PySlices.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PySlices
-+Name=PySlices (3.0)
- Comment=GUI Python Shell with Filling
--Exec=pyslices
--Icon=PySlices
-+Exec=pyslices-3.0
-+Icon=PySlices-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PySlicesShell.desktop
-+++ b/distrib/PySlicesShell.desktop
-@@ -1,9 +1,8 @@
--
- [Desktop Entry]
--Name=PySlicesShell
-+Name=PySlicesShell (3.0)
- Comment=GUI Python Shell
--Exec=pysliceshell
--Icon=PySlices
-+Exec=pysliceshell-3.0
-+Icon=PySlices-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/XRCed.desktop
-+++ b/distrib/XRCed.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=XRCed
-+Name=XRCed (3.0)
- Comment=wxPython XRC resource editor
--Exec=xrced
--Icon=XRCed
-+Exec=xrced-3.0
-+Icon=XRCed-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/scripts/genaxmodule
-+++ b/scripts/genaxmodule
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.genaxmodule import main
- main()
---- a/scripts/helpviewer
-+++ b/scripts/helpviewer
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.helpviewer import main
- main()
---- a/scripts/img2png
-+++ b/scripts/img2png
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.img2png import main
- main()
---- a/scripts/img2py
-+++ b/scripts/img2py
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.img2py import main
- main()
---- a/scripts/img2xpm
-+++ b/scripts/img2xpm
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.img2xpm import main
- main()
---- a/scripts/pyalacarte
-+++ b/scripts/pyalacarte
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PyAlaCarte import main
- main()
---- a/scripts/pyalamode
-+++ b/scripts/pyalamode
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PyAlaMode import main
- main()
---- a/scripts/pycrust
-+++ b/scripts/pycrust
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PyCrust import main
- main()
---- a/scripts/pyshell
-+++ b/scripts/pyshell
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PyShell import main
- main()
---- a/scripts/pyslices
-+++ b/scripts/pyslices
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PySlices import main
- main()
---- a/scripts/pysliceshell
-+++ b/scripts/pysliceshell
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PySlicesShell import main
- main()
---- a/scripts/pywrap
-+++ b/scripts/pywrap
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PyWrap import main
- main()
---- a/scripts/pywxrc
-+++ b/scripts/pywxrc
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.pywxrc import main
- main()
---- a/scripts/xrced
-+++ b/scripts/xrced
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.XRCed.xrced import main
- main()
diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml
index f0783659f226..0796b4162e00 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/metadata.xml
@@ -9,9 +9,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<use>
-		<flag name="examples">Install interactive demo module browser and sample applets.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">wxWidgets/Phoenix</remote-id>
 	</upstream>
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
deleted file mode 100644
index afaf8aa1491c..000000000000
--- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-WX_GTK_VER="3.0"
-
-inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets
-
-MY_PN="wxPython-src"
-
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="
-	mirror://sourceforge/wxpython/${MY_PN}-${PV}.tar.bz2
-	examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
-
-LICENSE="wxWinLL-3"
-SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~sparc x86"
-IUSE="cairo examples libnotify opengl"
-
-RDEPEND="
-	dev-lang/python-exec:2[${PYTHON_USEDEP}]
-	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X]
-	dev-libs/glib:2
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	virtual/jpeg
-	x11-libs/gtk+:2
-	x11-libs/pango[X]
-	cairo?	( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] )
-	opengl?	( dev-python/pyopengl[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}/wxPython"
-DOC_S="${WORKDIR}/wxPython-${PV}"
-
-# The hacky build system seems to be broken with out-of-source builds,
-# and installs 'wx' package globally.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
-
-	if use examples; then
-		cd "${DOC_S}"
-		epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
-	fi
-
-	cd "${S}"
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.0.0-wxversion-scripts.patch
-		# drop editra - we have it as a separate package now
-		"${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
-		"${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
-		# fix handling egg_info command
-		"${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	need-wxwidgets unicode
-
-	mydistutilsargs=(
-		WX_CONFIG="${WX_CONFIG}"
-		WXPORT=gtk2
-		UNICODE=1
-		BUILD_GLCANVAS=$(usex opengl 1 0)
-	)
-}
-
-python_compile() {
-	# We need to have separate libdirs due to hackery, bug #455332.
-	distutils-r1_python_compile \
-		build --build-purelib "${BUILD_DIR}"/lib.common
-}
-
-python_install() {
-	distutils-r1_python_install \
-		build --build-purelib "${BUILD_DIR}"/lib.common
-
-	# adjust the filenames for wxPython slots.
-	local file
-	for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
-		mv "${file}" "${file}-${SLOT}" || die
-	done
-	cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die
-	for file in *; do
-		mv "${file}" "${file}-${SLOT}" || die
-
-		# wrappers are common to all impls, so a parallel run may
-		# move it for us. ln+rm is more failure-proof.
-		ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die
-		rm -f "${ED}usr/bin/${file}"
-	done
-}
-
-python_install_all() {
-	dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
-
-	for x in {Py{AlaMode,Crust,Shell},XRCed}; do
-		newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop
-	done
-	newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png
-	newicon wx/py/PySlices_32.png PySlices-${SLOT}.png
-	newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
-
-	if use examples; then
-		docinto demo
-		dodoc -r "${DOC_S}"/demo/.
-		docinto samples
-		dodoc -r "${DOC_S}"/samples/.
-
-		[[ -e ${docdir}/samples/embedded/embedded ]] \
-			&& rm -f "${docdir}"/samples/embedded/embedded
-
-		docompress -x /usr/share/doc/${PF}/{demo,samples}
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	create_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
-		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
-	}
-	python_foreach_impl create_symlinks
-
-	echo
-	elog "Gentoo uses the Multi-version method for SLOT'ing."
-	elog "Developers, see this site for instructions on using"
-	elog "it with your apps:"
-	elog "http://wiki.wxpython.org/MultiVersionInstalls"
-	if use examples; then
-		echo
-		elog "The demo.py app which contains demo modules with"
-		elog "documentation and source code has been installed at"
-		elog "/usr/share/doc/${PF}/demo/demo.py"
-		echo
-		elog "More example apps and modules can be found in"
-		elog "/usr/share/doc/${PF}/samples/"
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-
-	update_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
-		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
-	}
-	python_foreach_impl update_symlinks
-}
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
index be31363646c4..7f34fdbdb84f 100644
--- a/dev-python/wxpython/wxpython-4.0.7.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7.ebuild
@@ -11,7 +11,7 @@ MY_PN="wxPython"
 MY_PV="${PV}.post2"
 
 DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="http://www.wxpython.org/"
+HOMEPAGE="https://www.wxpython.org/"
 SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 6f1f12e284dd..c45bd2cda656 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,7 +1,9 @@
 DIST xlsxwriter-1.3.3-tests.tar.gz 32108929 BLAKE2B faabdf2d2662c61217925679b1b22b294db5279da11b959b12d181711a4c9033e34a52d4888e3dfe1d804889eaa2ee8ff03cf1f298b4930268594e2856ddfb85 SHA512 d5bfcb624b66bb2098fcab1623f8e221c1254fd7b094bb71622969618061b434d9a17d9199e32110ef56336e2a96a93c94f1ed1ceca5877ef41fb52c3b2a37b6
 DIST xlsxwriter-1.3.4-tests.tar.gz 32300247 BLAKE2B ef388172c09f258f0c70a45545fae068359ed182693cf5bf04f2d4f6b528a08e5f963766a5b553c70c94b6e7f7e7a45b3d0dd6e6754dec320bf4748a309c2402 SHA512 12bacc4e604f02f2045e1e5e5f402dcb96a04e1fbd8d934d19eefc01d011832586a517e235c99793a4114d64940785ab02586d40b3bf089b455b681268ee4ef6
 DIST xlsxwriter-1.3.5-tests.tar.gz 32306484 BLAKE2B 161eed08d54ffb1728dfef394abd7614d2ec9e275b93079434bd3bd125e5707b15a6ca164a835ddec31894caa83d68dbd8d3cc5f38d24e4e30b2d86bd7f3e240 SHA512 349c7635f6d770ecd3429012c3e3a91f78381427fa166ef29da7cd7fd86e89da82dd51ddd69dca7b9ae4fb4f05ea4213c47c161755ed9a55a83b6b971edf8202
+DIST xlsxwriter-1.3.6-tests.tar.gz 32500145 BLAKE2B 796cc49f26ffbb6f980488b2fb184da95a4d95049544e30d6754823cdac9f98cc829cd665c293220033b9e654ce95816b668ad364796b4b19a47e0fb6ac03fb9 SHA512 5a8031a92e467f1afef4a2bdcde199f35bf3a013cfe01b28cf182c9c6f51f46f51547c73165e05094f0bfbdab6b2e8f96ff75e531fe63681ce72cf93325c098d
 EBUILD xlsxwriter-1.3.3.ebuild 576 BLAKE2B 9b081264509bc153831fe787c76a58826a4ebb1ee6e949d9ebc3997b20da12d28478d675c911a75871eaa39122e3b0ea4b825159d25332031dc737c5997f8f7e SHA512 dbc2b3a6b2ec1a81798ffc085a92df5ad16c8eb9b3b4930d7b0c49302b80c9f47d69e652c9954e258baedd21eb30b96f5114b59d5a7374326b67835aa68e06f3
 EBUILD xlsxwriter-1.3.4.ebuild 578 BLAKE2B 2125806083b97e9465c6f266b7510885a2a16cbb1a2a9cc29fd7b99170b3ea6cbf72a82097288d107c585e18def43ec525d065c9bc60644db7481788a9b55f70 SHA512 2f521452e38d3cdbe39480fe481e09322e810403481ed8f8d8529f2a5df336a41a4ecb1a6171cd61f18b941011ed087645101df92f47251ddf34f17a81779364
 EBUILD xlsxwriter-1.3.5.ebuild 578 BLAKE2B 2125806083b97e9465c6f266b7510885a2a16cbb1a2a9cc29fd7b99170b3ea6cbf72a82097288d107c585e18def43ec525d065c9bc60644db7481788a9b55f70 SHA512 2f521452e38d3cdbe39480fe481e09322e810403481ed8f8d8529f2a5df336a41a4ecb1a6171cd61f18b941011ed087645101df92f47251ddf34f17a81779364
+EBUILD xlsxwriter-1.3.6.ebuild 578 BLAKE2B 2125806083b97e9465c6f266b7510885a2a16cbb1a2a9cc29fd7b99170b3ea6cbf72a82097288d107c585e18def43ec525d065c9bc60644db7481788a9b55f70 SHA512 2f521452e38d3cdbe39480fe481e09322e810403481ed8f8d8529f2a5df336a41a4ecb1a6171cd61f18b941011ed087645101df92f47251ddf34f17a81779364
 MISC metadata.xml 410 BLAKE2B d1fab95b5fac3e69c5303298385f65062b28934f22fe8db02db02753b5cae36137a3e02e1d38e3762933dc9297045e1efaee8d17c714ca7b22459f342f23f928 SHA512 4f3d74f5afdec59b8575446b444f1af36f71137c980f7790e952860afa98b2d128ddf8477b135715de2852b940926108dafbff3cb60f2f1a8825a02c415810e9
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.3.6.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.3.6.ebuild
new file mode 100644
index 000000000000..0976f9f9d2f1
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-1.3.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="XlsxWriter"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${PV}.tar.gz -> ${P}-tests.tar.gz"
+S="${WORKDIR}/${MY_PN}-RELEASE_${PV}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 4a5bd6e4f9b4..372510dbf1b3 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,9 +1,6 @@
-AUX yarl-1.4.2-disable-broken-tests.patch 750 BLAKE2B a4d0346c790f68e49c4c1baf5ac0f713a619cd9bae6514bfd22157c8edad08f950b1e207f78b2c9e06e0a0bf281a4406a639200e7b3559a727ff048cf4c51105 SHA512 a0ac3983aa6d88a30b1b31872f24b1ecd7c1055d5f8354ecb14da6aaab029ffe9e5f818d75e5ff3f44f6f70c624ec20bd9f5ae1831e3297cdaf423af7e2ce3d5
 AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405e897b61ce16355c64a7b19cb805d1d546b26a8088e1aca834b215b3337ed6062d068d646e635d85fdbfa9ae98744fa0a5956cf7 SHA512 f7775c6a01fac42c9c4a544d9326692d97cdf4a4a2e8c7d69a53dc6d0847eaef9660d193531c9bf50964b0e01d764fe85761c3ba1dae8c70669795723da7154d
-DIST yarl-1.4.2.tar.gz 163521 BLAKE2B ababd1d35bca51a84c8d189266ef5d35f7a4dc65c84c4097a260e86fb838b1a35d2a639c1cf2a407aac8e68c5f67222aae6fa1f6cbfa5cb71dd851b385bae45a SHA512 036562b645d7b9b3ed4a749decb189587b41ab13b5dda5ff461b00eebadf1ecdbd8d5ae06932cc7d8b7ff551cd630f8671eb0f6c854b20996cda4a6897994fa0
 DIST yarl-1.5.1.tar.gz 173005 BLAKE2B 08bfbe914a2f9a148e558d6db955b61c0d95d3f19d6da6290cf6bcd82f3b46ca58836aebd57e148d6f0fd2dfc4b1244f633e7f472b759c3a4fe0d620f80e3f3d SHA512 c82b0722f347279a03d3f6e82b7c0c357678e850b80ed87befab570846a71c55897cfa25d36757a93ac42c023334ecdf890beaeca7fde4536f68b6f70fdf2127
 DIST yarl-1.6.0.tar.gz 175492 BLAKE2B e6e3ebb30a591fa1e94d07c353700b1ebf7c21a729d8c9a4cd582f591235d54dee40a109e28fb806893e281b9ab36ca2b1ca1cdf7f093587bde8a5a9c4e7bf89 SHA512 d08d2c4a906706bba3c1fad2b02e01299d076d9f6c1a1eb172d116d0ccbb1e6143b7dd959d242f2a1b5d450416bb15ab6e53ee9e05876b161d61ec23e054f29b
-EBUILD yarl-1.4.2.ebuild 719 BLAKE2B 3354c40f113ed2db98e8680ab88f3cce22b87b3bd2eb3ad5c24ccdd08d3088bc75b7cedb63908df10043f98ed10ff5811698243c754fb32e12b38d452ad5063b SHA512 dfe79f360e1162543b5bd2870a3ad6d0421cc3941202702a8a72ba1c85c17722fd05230874461e6a1409a2fab55a932fe79f0d21cc818f0722dca00dd18d2af6
-EBUILD yarl-1.5.1.ebuild 725 BLAKE2B 4c163efccb4020f09267ad54f5d297ca4dadeb3bbf44607ce03c6139ba96e460be4e6968d156c58b3562574bfbaa9849faaf37f0c72f337eb351b446eb9f6817 SHA512 5113e5aee9d7a3e955551b99b869357ce52886b81cc5cb68fc45035c1ba324114857cda538571665d8ec7c87682b0027df5f495cd13fecf14df35d00df029fe5
+EBUILD yarl-1.5.1.ebuild 723 BLAKE2B 8897a20fab2df6b0adf8be24cad4981e54584aa95a376d0cbd41df756b825a03800520a3d21c25e5c349b622610766625c87a93b9346e5cee1578d3284abbe04 SHA512 61108f5fb825d7ef083e78f95ace2ce6941ccf0fae2986b5793a75346f233ec7b98df5dd3d5eeda6dee269c7736367371f9152800f14aa9059b9818122e72490
 EBUILD yarl-1.6.0.ebuild 731 BLAKE2B dc50c14dd0e15502daaf748c91b429b58bf284881c591301dbee301fc1ccd63c690ba6c70e7e9bb7f487c09b5bdf754303ebe1a9a2a52a4b59fa6d4c9a1f3981 SHA512 1c6818c83ec259d88bd9f2706c6170abdad72846e261de4f9d72edd502d243bf735965bd21c6aaddea9c5a3704ae7daa011e716774e2f10d80981b637dfc1dde
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch b/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch
deleted file mode 100644
index b6f774a77eaa..000000000000
--- a/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ca06b26582c08c6e75fa5588f712c4c2f7247223 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 4 Mar 2020 22:36:58 +0100
-Subject: [PATCH] Disable failing test TestScheme.test_no_scheme1
-
----
- tests/test_url_parsing.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_url_parsing.py b/tests/test_url_parsing.py
-index beea365..58fa198 100644
---- a/tests/test_url_parsing.py
-+++ b/tests/test_url_parsing.py
-@@ -38,7 +38,7 @@ class TestScheme:
-         assert u.query_string == ""
-         assert u.fragment == ""
- 
--    def test_no_scheme1(self):
-+    def _test_no_scheme1(self):
-         u = URL("google.com:80")
-         assert u.scheme == ""
-         assert u.host is None
--- 
-2.24.1
-
diff --git a/dev-python/yarl/yarl-1.4.2.ebuild b/dev-python/yarl/yarl-1.4.2.ebuild
deleted file mode 100644
index 8b0deec64b05..000000000000
--- a/dev-python/yarl/yarl-1.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-test-without-coverage.patch
-
-	# Upstream: https://github.com/aio-libs/yarl/issues/410
-	"${FILESDIR}"/${PN}-1.4.2-disable-broken-tests.patch
-)
diff --git a/dev-python/yarl/yarl-1.5.1.ebuild b/dev-python/yarl/yarl-1.5.1.ebuild
index 4eb9a41647b8..335b8d485e09 100644
--- a/dev-python/yarl/yarl-1.5.1.ebuild
+++ b/dev-python/yarl/yarl-1.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 6b42705e69da..dd0cc664bd5e 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 4bc6e700cad6..6e40de2e5d57 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-DIST qttools-everywhere-src-5.15.0.tar.xz 8850752 BLAKE2B fed030b2e0bdb3bf397b28e33c1afc84c0b22bf3ede5bdf9a0822f44f8cbf6f7564d0d2c04215f79aec722deeac373d2d46cdd3d7e3d9135f9211486feaf12b0 SHA512 ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 EBUILD assistant-5.14.2.ebuild 1199 BLAKE2B 5e506336db5b729fba83f3795e4130d60c05c6640fdbecd320fa417381b49a895db7118a87d72ff4bf65b75240057becbde8e33a31aebdc38fb5cbfc0d04eff7 SHA512 b16862c3efb6e5fe76b2d0839ccd0d5543fb4b5ec942a4e9479c2bd68d2edd11950f02c66ec7ee7256d392b97ac644a1d59210cc1986f9b8a528330d23e05f26
-EBUILD assistant-5.15.0.ebuild 1203 BLAKE2B 8c84ebd6164443a25ff706c24e36e609262a7778b01c1dc5be93b9f6c8dbb8e8193993db80121ab532bf551c129862c616fe986864511700f1d03ca632bce9ef SHA512 00d14550fe6431976d698245ba46e9beedaf72bf54dc876c13a90a750d508f52a375e312c024fa2a062b1aa0eebd9a55cd10fa776dc33ce667acff3bdec3fada
 EBUILD assistant-5.15.1.ebuild 1203 BLAKE2B 8c84ebd6164443a25ff706c24e36e609262a7778b01c1dc5be93b9f6c8dbb8e8193993db80121ab532bf551c129862c616fe986864511700f1d03ca632bce9ef SHA512 00d14550fe6431976d698245ba46e9beedaf72bf54dc876c13a90a750d508f52a375e312c024fa2a062b1aa0eebd9a55cd10fa776dc33ce667acff3bdec3fada
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.15.0.ebuild b/dev-qt/assistant/assistant-5.15.0.ebuild
deleted file mode 100644
index 7f0b3ec1e822..000000000000
--- a/dev-qt/assistant/assistant-5.15.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 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}:5=
-	~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 6748e425be21..275c841d23db 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-DIST qttools-everywhere-src-5.15.0.tar.xz 8850752 BLAKE2B fed030b2e0bdb3bf397b28e33c1afc84c0b22bf3ede5bdf9a0822f44f8cbf6f7564d0d2c04215f79aec722deeac373d2d46cdd3d7e3d9135f9211486feaf12b0 SHA512 ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 EBUILD designer-5.14.2.ebuild 1247 BLAKE2B 12e20acddd2b74ddcfa1997abacf4e5ede609ef3f560ac3bdb66d259157f6aa0abd4ac396cff8353077366e94c3cbc8e82df058ac3bda6fe64eadd6cfbe79c4c SHA512 79ca21a87996b9141f6eeac2702a96341d8be3651a7a31cb4053d2a4f9e55ddb58895e081d2f7a2636cb65cb218356634e034410de614e927cf8836c9524e684
-EBUILD designer-5.15.0.ebuild 1215 BLAKE2B 179ac93c9f2ce863e36611fad62ab67ffde360528f6954bc7fe16de967ff09a1a656a54986f1a811612226f45857fb831b70df54956c75d1a202cedac9a7a6c1 SHA512 ef677f7c0a3f4e4926518b0fae7ebf39d7d3fba25da9c033ab5e1e89b8fe9bb3173e18609afa83c8dd4c7f22437803f2583c2021bfe82ba1293d7c54aac6a481
 EBUILD designer-5.15.1.ebuild 1215 BLAKE2B 179ac93c9f2ce863e36611fad62ab67ffde360528f6954bc7fe16de967ff09a1a656a54986f1a811612226f45857fb831b70df54956c75d1a202cedac9a7a6c1 SHA512 ef677f7c0a3f4e4926518b0fae7ebf39d7d3fba25da9c033ab5e1e89b8fe9bb3173e18609afa83c8dd4c7f22437803f2583c2021bfe82ba1293d7c54aac6a481
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.15.0.ebuild b/dev-qt/designer/designer-5.15.0.ebuild
deleted file mode 100644
index bd0d954631d3..000000000000
--- a/dev-qt/designer/designer-5.15.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="declarative webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=
-	~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}"
-
-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 ba5fe8bd3227..381ac58f1a83 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-DIST qttools-everywhere-src-5.15.0.tar.xz 8850752 BLAKE2B fed030b2e0bdb3bf397b28e33c1afc84c0b22bf3ede5bdf9a0822f44f8cbf6f7564d0d2c04215f79aec722deeac373d2d46cdd3d7e3d9135f9211486feaf12b0 SHA512 ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 EBUILD linguist-tools-5.14.2.ebuild 682 BLAKE2B bfe79eac879018faef52283dfe413f5855d91b0e4f7185eb1fcbdb4a3c855c799b38631ca8a4ebadf0b3278efd1a7b78abe034dc120b8c1fd54b5b3ab5aab7ad SHA512 35891619bc9b7db15599a980b20bebbbb69b8aa12e06668fb945f9fa4cdefbccca0988459c56d967f2ce3e0d010218f9871f426db10bd06094b7db9d7a2b62c3
-EBUILD linguist-tools-5.15.0.ebuild 1001 BLAKE2B a8bdb3f3e76441a511839a7b38dd0d9d643b190fe797bbbc2828c3ef828d2e44395df2e60e1068c20bdb0e166e2e91ba98567f6a750945a9dcc8b0695abc1c34 SHA512 7b40c6159e2bd4ee75e088d83db20b369473fcb6518d2c149a81702af04c95667a7ac84b67814f144c082b26d69408dc7ddd22a0263f4a7fb6b75c7e47ae992d
 EBUILD linguist-tools-5.15.1.ebuild 1001 BLAKE2B a8bdb3f3e76441a511839a7b38dd0d9d643b190fe797bbbc2828c3ef828d2e44395df2e60e1068c20bdb0e166e2e91ba98567f6a750945a9dcc8b0695abc1c34 SHA512 7b40c6159e2bd4ee75e088d83db20b369473fcb6518d2c149a81702af04c95667a7ac84b67814f144c082b26d69408dc7ddd22a0263f4a7fb6b75c7e47ae992d
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.0.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.0.ebuild
deleted file mode 100644
index 1f62623c5d30..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.15.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~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
-}
-
-src_configure() {
-	# Most of qttools require files that are only generated when qmake is
-	# run in the root directory.
-	# Related bugs: 633776, 676948, and 716514.
-	mkdir -p "${QT5_BUILD_DIR}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	cp "${S}"/qttools-config.pri "${QT5_BUILD_DIR}" || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index ef357b919009..879ebaf3288f 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-DIST qttools-everywhere-src-5.15.0.tar.xz 8850752 BLAKE2B fed030b2e0bdb3bf397b28e33c1afc84c0b22bf3ede5bdf9a0822f44f8cbf6f7564d0d2c04215f79aec722deeac373d2d46cdd3d7e3d9135f9211486feaf12b0 SHA512 ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 EBUILD linguist-5.14.2.ebuild 977 BLAKE2B 973508eefdaabe38b4a3ac066436e131fb3a05e612ceb7c9e3fcd0f19a00fb98dce1834c8bae6a674ff792553c9fe7b0b5f953398933c2a5470d6d42d51bc43f SHA512 a22f07d151d81202bd051c5d5ef78aacf36b290a1ebc7571833f5cfe9c4d61434bf857268c7667df7c91571fe8dbb6da71aeb0066aafd04eaac964c3f1e7a520
-EBUILD linguist-5.15.0.ebuild 981 BLAKE2B 94b33f5585f2d4f309149010e43ab5b0337a5592dee6e9a76caac22c1959bf35aadb53895711afa4460632dbb8f840dc362845395c6228398361976bbbc8a333 SHA512 d293abb17f6a3a68359474f9ff585c3e8ceb8fda2ea2d0792c7767b22ccb3bf043641f17d29b9d69dcf647c09976d2dba5965730d873cd7e13a0518b8f85b430
 EBUILD linguist-5.15.1.ebuild 981 BLAKE2B 94b33f5585f2d4f309149010e43ab5b0337a5592dee6e9a76caac22c1959bf35aadb53895711afa4460632dbb8f840dc362845395c6228398361976bbbc8a333 SHA512 d293abb17f6a3a68359474f9ff585c3e8ceb8fda2ea2d0792c7767b22ccb3bf043641f17d29b9d69dcf647c09976d2dba5965730d873cd7e13a0518b8f85b430
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/linguist/linguist-5.15.0.ebuild b/dev-qt/linguist/linguist-5.15.0.ebuild
deleted file mode 100644
index 4aa1294c58f7..000000000000
--- a/dev-qt/linguist/linguist-5.15.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/designer-${PV}
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=
-	~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 ccb83522bbdd..0809da018c2d 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-DIST qttools-everywhere-src-5.15.0.tar.xz 8850752 BLAKE2B fed030b2e0bdb3bf397b28e33c1afc84c0b22bf3ede5bdf9a0822f44f8cbf6f7564d0d2c04215f79aec722deeac373d2d46cdd3d7e3d9135f9211486feaf12b0 SHA512 ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 EBUILD pixeltool-5.14.2.ebuild 440 BLAKE2B c8de9ca25dc57ba59bf147d678e4428f0414683896a489d53fd58ffef95396435d5d9063930883b83b9cbaf22abf05730e9df888cc6835764b99a9c6e6bbaf41 SHA512 53bac3ce7ebe7c335a9dc6c8ef3dbdde403012eb4db5d0d9535712a14a1f0e73f792e5aa2c27ddcbe2f72413958ca942acea073eadde2e0c818f5fa187d9f046
-EBUILD pixeltool-5.15.0.ebuild 405 BLAKE2B e71c36bf636967f1ef6968c23e636f82dbeb62a5434b0a166e907d6ac561bfe7a68a851d7715a6565a90d4caca0d6ffda854a1d36f5d4b6592c19632379ad01d SHA512 2b47cbd2710c74965885131cb47cca2e3f27641b411310731434bf99f87bc651dab9e689df48d286d953ada2eaeb9aeb54497155d92c315e1d6b68d09e974fba
 EBUILD pixeltool-5.15.1.ebuild 405 BLAKE2B e71c36bf636967f1ef6968c23e636f82dbeb62a5434b0a166e907d6ac561bfe7a68a851d7715a6565a90d4caca0d6ffda854a1d36f5d4b6592c19632379ad01d SHA512 2b47cbd2710c74965885131cb47cca2e3f27641b411310731434bf99f87bc651dab9e689df48d286d953ada2eaeb9aeb54497155d92c315e1d6b68d09e974fba
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/pixeltool/pixeltool-5.15.0.ebuild b/dev-qt/pixeltool/pixeltool-5.15.0.ebuild
deleted file mode 100644
index e3a011cfcd6a..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.15.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 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}:5=
-	~dev-qt/qtgui-${PV}:5=
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 1968bc6082e0..c71b48214adb 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-DIST qttools-everywhere-src-5.15.0.tar.xz 8850752 BLAKE2B fed030b2e0bdb3bf397b28e33c1afc84c0b22bf3ede5bdf9a0822f44f8cbf6f7564d0d2c04215f79aec722deeac373d2d46cdd3d7e3d9135f9211486feaf12b0 SHA512 ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 EBUILD qdbus-5.14.2.ebuild 471 BLAKE2B bcc4f3cdf2b2de05070bcd9f6a2370ec2e0a8ac30450216fbde37fa20761cf7168cefa4dd515ee4e6f21e3b98c22ed0b3eb8e82617ef2fa32a9d62e101acc422 SHA512 c7ecb744185e32d5d5a53823e9457eb955bc87d4ed426b8ef97c4ad17f490ec1dd24bb4d3cc321bd5a5d92f2f1b37248ae84e7d024b51df1a3871819191712de
-EBUILD qdbus-5.15.0.ebuild 476 BLAKE2B 34f4df2e5943582cfcff2177664f4edd839c8498ecd4efada2813fd7d8050b8b4edf1560932abebb10d75eaa9050c67442a7efb52f56af2918ff2893c0dfe895 SHA512 163d32a8f8151702c8ad0132c00ea2fc175ade4cd67bfcb173e592df5c716863ee798af1480be36d397a21b915a581a9fe873f79db6714d4ce9db2fe9b549fb7
 EBUILD qdbus-5.15.1.ebuild 476 BLAKE2B 34f4df2e5943582cfcff2177664f4edd839c8498ecd4efada2813fd7d8050b8b4edf1560932abebb10d75eaa9050c67442a7efb52f56af2918ff2893c0dfe895 SHA512 163d32a8f8151702c8ad0132c00ea2fc175ade4cd67bfcb173e592df5c716863ee798af1480be36d397a21b915a581a9fe873f79db6714d4ce9db2fe9b549fb7
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.15.0.ebuild b/dev-qt/qdbus/qdbus-5.15.0.ebuild
deleted file mode 100644
index f9addd8e1919..000000000000
--- a/dev-qt/qdbus/qdbus-5.15.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 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 41e020425f92..2b1922744227 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-DIST qttools-everywhere-src-5.15.0.tar.xz 8850752 BLAKE2B fed030b2e0bdb3bf397b28e33c1afc84c0b22bf3ede5bdf9a0822f44f8cbf6f7564d0d2c04215f79aec722deeac373d2d46cdd3d7e3d9135f9211486feaf12b0 SHA512 ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 EBUILD qdbusviewer-5.14.2.ebuild 959 BLAKE2B e768bc3d85d1db526d6f852de08eb76df04469f6767eafb3c080796ab66a2e53682e3014e42356f1c1d67488c2a7d4816ab598b56a2f77b121c7ba44523a88f9 SHA512 5f5301fb0466194146cb056aded0186ebb4f3631c6be4e9eeded83f5e6f2d9346190840d53261decf06a081f09dcfafaec998083869ff522c7a9daa40da23d71
-EBUILD qdbusviewer-5.15.0.ebuild 963 BLAKE2B db7f273d2580b43afc158c10b0e487313795a7fa4c3db3e5ca52a20c4801a89b676f0be5a8579c0a16819ad9f65f19b582445d616c3725315eccc5f36551e296 SHA512 240cdfb186a95205d2b548204c7e033ff4cb79f7fc0c33b0a60661ca7d2d0306f42e6a327ef8b633883e55649db8f32536620a26bb4c7b2e5ad17d53d735a4e4
 EBUILD qdbusviewer-5.15.1.ebuild 963 BLAKE2B db7f273d2580b43afc158c10b0e487313795a7fa4c3db3e5ca52a20c4801a89b676f0be5a8579c0a16819ad9f65f19b582445d616c3725315eccc5f36551e296 SHA512 240cdfb186a95205d2b548204c7e033ff4cb79f7fc0c33b0a60661ca7d2d0306f42e6a327ef8b633883e55649db8f32536620a26bb4c7b2e5ad17d53d735a4e4
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.0.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.0.ebuild
deleted file mode 100644
index 8ac73f897b2b..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 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"
-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 aabc0225d924..34b948faca89 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-DIST qttools-everywhere-src-5.15.0.tar.xz 8850752 BLAKE2B fed030b2e0bdb3bf397b28e33c1afc84c0b22bf3ede5bdf9a0822f44f8cbf6f7564d0d2c04215f79aec722deeac373d2d46cdd3d7e3d9135f9211486feaf12b0 SHA512 ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 EBUILD qdoc-5.14.2.ebuild 867 BLAKE2B fba9b6fb91e4bc4ba528ff3919840dfca637e09f3ffc7d4c6f8f6fd5f64a9313e968dbcb3c00d7c84234aac73f6b8080f3f2589d5469767e501246216e6130ea SHA512 447c25f1f4cf887e5f7c6c440d091b78e6c504dfc044fa5f068bd55af14d4f637420ab7eee6255f6b7d0a20b2215a87c3ff556a41abf0d2784a272843072e75a
-EBUILD qdoc-5.15.0.ebuild 519 BLAKE2B e793a765b545e1ec50db53c9fd2549e5fc4c7d432daa95de9fcc4fe0921144621beabef696934c0fa1fe53d716820b2e2ae04c4a59f3a4201235516a03947215 SHA512 7810f3a333edb7abfd59349840f544d02468e57bc6c8fa47e82f0d60723ecf8891f3b5edb2cab6fbc07732998178b6c6a1849d4d684bce0fc3fa2a8483b050d9
 EBUILD qdoc-5.15.1.ebuild 519 BLAKE2B e793a765b545e1ec50db53c9fd2549e5fc4c7d432daa95de9fcc4fe0921144621beabef696934c0fa1fe53d716820b2e2ae04c4a59f3a4201235516a03947215 SHA512 7810f3a333edb7abfd59349840f544d02468e57bc6c8fa47e82f0d60723ecf8891f3b5edb2cab6fbc07732998178b6c6a1849d4d684bce0fc3fa2a8483b050d9
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.15.0.ebuild b/dev-qt/qdoc/qdoc-5.15.0.ebuild
deleted file mode 100644
index 9052d5178e7c..000000000000
--- a/dev-qt/qdoc/qdoc-5.15.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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}:5=
-	sys-devel/clang:=
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml qmldevtools-private \
-		src/qdoc/qdoc.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 0daa3fc47f12..50693bf4f908 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -53,61 +53,6 @@ DIST 5.14.2-0-202003291239qtwidgets-documentation.7z 26796173 BLAKE2B 6383a2be31
 DIST 5.14.2-0-202003291239qtx11extras-documentation.7z 36888 BLAKE2B 0f7757cb82a7fea064e9b484e08cbd3b1cefd5f29117ab283f0b26ffddae142e494f674744f2fca4f210da5c86b86500ef26781ca7e5bb0f13b0c12af9195d4d SHA512 728814ee896cdc429e843bbdc136931795d54b4b70bf0d54bc8ac9b8edac42986981d39c134f3ea5329984a9b15e0f0089df716c44889cf13368fef92cbbff5e
 DIST 5.14.2-0-202003291239qtxml-documentation.7z 499466 BLAKE2B 82ce65d6c4dfb39aa3202e20acafd0cb970e57ef24f35a2c4d64b3a550cc3e041b8bd2e74489b4738651ff1125247ae18e7e2885e919346f0b89776c36697846 SHA512 62b7d24f724721bb007c4de36bc2bb9578cb719de8acac72c5c144e1acb4a12a0a15930a3f0b8aff3ed557f236d2ab124045f86dc33b2d195da05e61133fd100
 DIST 5.14.2-0-202003291239qtxmlpatterns-documentation.7z 1193876 BLAKE2B ac7c92c265fb0bc4b5ed7ccf267c50389ca840bdf91a35abce127e14608e585b20191cfe84924864e2fc607b4d360207e50b85424c8517fce136d971de2c47a9 SHA512 2d012722d64b27c6ec11726e5b457ae1b87448e681271809489ea521ab0ac65553dc2d8c105bedc65501abc5af7d6921afc2d3cf5ac69fd17548405076f66146
-DIST 5.15.0-0-202005140838qdoc-documentation.7z 538483 BLAKE2B e6cdd5c8ce0a1aba48f0aa8d9f4d69e94ebe24004f01e62e4720b9decd7bcff8bafe7a03467050153cabd46a94ce94f23303d579bd06b44d2a31e5a781baa936 SHA512 2900237dfc7054226b20cdc4ec2ae59b2813f61dee42dafedc0aeae77325219bdf3d8ae5f5408777d798550e040f4197ffd9e40f5845284cf96308dd7f3c0310
-DIST 5.15.0-0-202005140838qmake-documentation.7z 343005 BLAKE2B bafec59aacae9a03913d5630630f6106947d31c8466a0de3cad8dc8295459f9dd012e6811f9234ef222d35301cd9b2e477d60a665c6b39a46019093acae61815 SHA512 7fdb6fac73aab2df9186b36bd12757c06f6fbd23c4399b8288093e0fbcd0a66ed1a97c312c5e0c0a237e13a3e081da9b7b4a5326493220be0de6bd7222783695
-DIST 5.15.0-0-202005140838qt3d-documentation.7z 5837375 BLAKE2B f3bd5eef2fd9b88b729c0726767bb5c1c0017f39abfb5ce90e743dada0e02cf3d9e4069e2d167b1d20d578bb72a3b13d090e50bb51d40851c8e05ed5d94b5591 SHA512 ffbdd05f49af8ca8b9ef4487fbfe2ce27379e318fcf13ab341c05a9060173a1052c9ed9921fcd2d2d9275bdaff86664fccb316274d9d87c2f1ed55c174448e30
-DIST 5.15.0-0-202005140838qtassistant-documentation.7z 451925 BLAKE2B 6589c7cd3b37c2f31b8bf4eef00b6f5b7316d1ff9badc3d5f1f549b4bffc18ced78385ac0b50b4829b9d0da5b3425377fa563b0853c582249911358a7d53cdd6 SHA512 fc221f78a4cb030ffda814c714e12bf302e3d69f244bc34c667c8d301285e6130b39848fc8d367d3a2679b27ab88955c4898444b09accef338a62399de630caf
-DIST 5.15.0-0-202005140838qtbluetooth-documentation.7z 2135867 BLAKE2B 6f00a1b2de807d8c403644dcf3921ebe8d6f26a55d1751f142e5df0ee7d79ffa6de9c474d458930f9eee97a7191b9788a8d74b494bd84e68563dae3b3add6f35 SHA512 1df422091e991b02fc5bb6ec86d2b3996f5b5ebaba98d1564f69aacd28bb9a57ebdb04e960fd009051561131d2810e1537f2edb51a504b1b853f0437eabe25b0
-DIST 5.15.0-0-202005140838qtcharts-documentation.7z 8713948 BLAKE2B 7d2aab413a9751e40fd1dd45d48cf277c914d46dcd942b856f0b214357412bee382baa405038958fe51245c0f8d7fbdc8e6849f4936868bab4583077b7e2df43 SHA512 ebc8670ac30c81186d6170af46304747e2750e532a000e0cc274671a419ac85187a7337e1dc95e63a51149f462d7c652a08e2bfbf473e8a50c2454bf471e7d32
-DIST 5.15.0-0-202005140838qtconcurrent-documentation.7z 121974 BLAKE2B 00b78472248b9fb49d9a3d08c0a68b3715be37b10444ae3b4b68eb046455cefcf988cbc5dfbf626b90db683e0ed071882b3cea6314540581f9782a375add198b SHA512 27841588711c9c541eb838f3d55b1bca54bf6b4b59662bbeefd80d9e6b4d17743531ff88087d273e261865939bd1e5534f999713833446d43cd6361bd3d72e1c
-DIST 5.15.0-0-202005140838qtcore-documentation.7z 6587006 BLAKE2B 0d75ca6c6b31981b918c313d12dc1ea79c65bb6d9c03052d5bbf8727d84f89045e84c498cbc658b32e03103459f66476b922e37b7dd80fc6d03db7f19215da58 SHA512 81f6c014ef15aab2668cd1b086b5ac61bbdfde204b9e31c658bc290e70fa5279d32f5a7082520eae72d06224a655671197ed0f1bd6f7677cd93ff1fe4e68a892
-DIST 5.15.0-0-202005140838qtdatavisualization-documentation.7z 6098608 BLAKE2B ba60ae1337aef6ed8094469ee6761f458cff420f05f3d82c6099f4e80eb25a123d1aa5415ac48e9c36cc664a37289ffd97f321bf838673bb026e7a3cf78747fa SHA512 0f4b66f55297e3cea61311ef526e739b1b5a1c3b99661588d8609109a287f8bb632c31cce3a914561341a4bb3340143db8099611b94b50bb753f1efdeba6d87d
-DIST 5.15.0-0-202005140838qtdbus-documentation.7z 394046 BLAKE2B a8d62ff11a6adcfe1715ef02015544a8aefad2f8c2d146cf2d3ff5d272f9fe000b13fbd0cd52339ec187e32aabacc41e2ccd36f7fb9fbdf03160086c21ff7e6a SHA512 bee22ed1d5b9768ad1b682645ed37bd37a0c5213595f7cbc4c50922504fd78e7260feb8c80ab06c1bfbf58245a4e4b23e8778f287601caf66d9c59a3d1fe8210
-DIST 5.15.0-0-202005140838qtdesigner-documentation.7z 3528569 BLAKE2B eaef7aabb0932936da9475c2bdd8f528e170e281f6893e12ef1e87c0d38403de06406e64b0c92501199ddd6ba66d1456c85b9b5ecf44cdd248e5c92f014b5554 SHA512 15c48f3a57a7dfa3217adb81c56460d08f763d31102e95cb162b21432c8346bb64d00edef7f46981449bf89696e1f097b682ed7d53673f900e65012213bc1812
-DIST 5.15.0-0-202005140838qtdoc-documentation.7z 10126119 BLAKE2B 9dff5516fa1a4305f164c4511062d68c300decae605788fad24710516fedc212db3e21cffa3419be7d0e6fe330f747dd2ac1d49e4403c448a7de3b7a98dae027 SHA512 3685c85a7d1fa5ce756497f705f56fd460e12350f1c42c05331c0963635f097e4282c04ab4508d738988e51dfc11598331f85f00e3cd85076491c266be94376b
-DIST 5.15.0-0-202005140838qtgamepad-documentation.7z 238000 BLAKE2B 5e2e2be44047bc2fc89225018bb659004a54883f331773153c321d22636f0a1b3785ad89ed21b803cebd2bf46f17ea44c2ff85347ed530eeb79986df03fa9a5e SHA512 95723af2fef1516ef4706735acd78b138fb2d5793bebbca473f954f3eb72361bdc13295d26d43da8f92a12de256ff76be3f983d963d35efc0435fa6e559d99b2
-DIST 5.15.0-0-202005140838qtgraphicaleffects-documentation.7z 15995036 BLAKE2B 3915a87de4c59ac49d91613f71d260c89f74576590a452cfbd4bf70019fbce4db954f8e788d85ac6de9e94ee121793432acceb8017fec5248977654fd8a3928f SHA512 2ddc4a77453144db6d14a118c4de39270beeea1f1376d5c07a146e53b576fa2f7af32ee9f5966c38db2d99411d709d0fe50617b08b4ce86f8a731c98a4715cf6
-DIST 5.15.0-0-202005140838qtgui-documentation.7z 7422196 BLAKE2B 7f6ae049515d0cdbb411b47452e9bc1e73c90f1752ac7596aa6bca9a1711874c7771d46d995be5976f84fab90a3a6948aee586f0e91a9dc0ff6a494f3d212c68 SHA512 72946eb62c05555afd3a0952b1f08d3ac0a206ad0c91a12e00268d0d30fb5e95a568cf6fbdb2014d182de1405c208ca4246b622b802b7613b5355ccdbcd718b8
-DIST 5.15.0-0-202005140838qthelp-documentation.7z 217352 BLAKE2B 48b25cdf2ba457d08b093d92c7e0d86f57e47e66621cb8bf8c3592da9fcb9d542956e158a1ee16e147b648d3412d04682c44c4403b6b4e130bd98dbf16a003e3 SHA512 fe5a8230f70e0cb23ce367dd6fabd4b4cf89b0099cd6a8e8595238b699df35c949153f58ec062294b3f1e502ec1e1e0680dbdc876ebe56ec321b2ff22d49a589
-DIST 5.15.0-0-202005140838qtimageformats-documentation.7z 28737 BLAKE2B 331b698d330027222a77d8271452bc6c90ab00adf74135114a2370ad73b369642086378aa91e34d6530dba7c64f1b150f3a58e1c91922bbcb40dbd3faf6229d7 SHA512 e761a8f1e5624aa51a130ea2ea5af0724ebee956c2fb7845134931d150f860563fc85879bd0be0d083d0b52e0a792612b08e031b123f2a0a19f7493d1f71d754
-DIST 5.15.0-0-202005140838qtlinguist-documentation.7z 967774 BLAKE2B 9895393dfff1c1a41b5aae006f8a8fae550f26effaeb6788cba6c0e2c5814554800c7262bb6b658889b34016d9ae7bb6e1b11d4ea6d368dc0caa74b7807783dd SHA512 2055d0c80e03559378f28925dc62ed05e42b769e500d56e9da8d845267c9ca2430eef32ff7a1dfbc37e12563aebde1eadab3d44a619d7c9e6b86215b538ec5b8
-DIST 5.15.0-0-202005140838qtlocation-documentation.7z 2773844 BLAKE2B dd99905f856990f6d5b326eb81d7f33c2811f29ed3fe4302d380b2ac2112627254d31f0df574504156ff2f80eb5d561d94de628a710ed853e6522ad37549c1a1 SHA512 f8a28f9ebf17e35bab4367d1bb277b32aa26f6cdfcc8103729e2efb9854ff2a81bebf6aeebed52d5515155ea72df6563e408b4ebc749883437c1c61e95455cd5
-DIST 5.15.0-0-202005140838qtmultimedia-documentation.7z 2797571 BLAKE2B acc8c85d0c59a5300891c9671ce8c33ea6eca663f802cd3defb2e493411e165ef881772fc9b17fd12b2ba51b956a6df77f5f09ff0fe3e785f07d377e5aadba19 SHA512 ba215d5a2a1da392b7fb9f08b6c95e72530e759a9f53e729b271974dc4909c2ecf002d6522ae3acbbbe61f5c65a5fcf54e9ce3e346bb123b18be1b5ab56b0bff
-DIST 5.15.0-0-202005140838qtnetwork-documentation.7z 1503917 BLAKE2B de1373f43551efa8d99d57fa44a29b327d5ae941875df3032ca1f3bf7a4263260a22292b07e51b760ba0e8af5c2146c7a1cd202169c7df348dfdde9e05a6ff68 SHA512 453f4f4bf4f195f60f17143e04b4d2c8698b0155733ab9f3db28784caf1d64f28c450e21265c4b0db9a98e77a01c2e810247ddda35104e231dfb1fee36188c57
-DIST 5.15.0-0-202005140838qtnetworkauth-documentation.7z 243223 BLAKE2B beb9ee8f97dc0466151e9ea9e8285a7819205a7bb3ff6ff9f1a809691eeca431927c65235da7746a19ca0a1ea1ff80e585371ab0243d009f8fb6cac2f90a00af SHA512 03ee0e74cdd8f48ae0cab50ddae461bf3cac2f521ae8c8e3c3263e0277363415ad348c5fb78017608e530b1d674b6abb4bf110b16d5892b85101b1d1d351097b
-DIST 5.15.0-0-202005140838qtopengl-documentation.7z 834749 BLAKE2B 1271130c95f19431215a09ae9ff1b6f5595cb3f0e5d4de3f871760a16c956b9c7f2214e7e372029592bc7d21671fba3185fe5665cd218c70c89e038de52fb4e0 SHA512 bfb66b2ab2984b182a31cb440e4da4c61caff59fa98e396bf23410c73aabd3ff139579263072ff1b8e33566a058ac29fd1a909e9db8f58fcb8444a2cb3798997
-DIST 5.15.0-0-202005140838qtplatformheaders-documentation.7z 77600 BLAKE2B bea7570b4033db1d149718e795a1068a5a9bc664a25904e8a04700568c53b2d47e46445ef3cacabbf173b8ac636335584532932c8ebd768b46d693e33a29c45c SHA512 38efbd7a8539fd22df305e6c225b2a50525e5565ac4a80b7ea386f8450b4ff3b6acfc46617dd411c33d9111d790f96d6b325c5878c41f5e9c3ad25f030b9760c
-DIST 5.15.0-0-202005140838qtpositioning-documentation.7z 583776 BLAKE2B 934252aac166ea72cb019030eb2149b5467169d4566ff5d73bbb5d839a812765384e8c6e489441ee262c716ef2292a5ef00c9710732d0ca04c234ba3929e3bd6 SHA512 1a87ddc23ea4593606c50c0fda6c09cf066c7f0b7781b6f1a439cd6820881c56c42814be199029e57e2532cf6a7042a6e059c79e87d2462ac05d2cfebefda1b3
-DIST 5.15.0-0-202005140838qtprintsupport-documentation.7z 376524 BLAKE2B f35b266d06ddcf3182995802b2666622871c7bf7b3d4e3bc0f354f45f4d002bfa5c0ab6d7cbd13368e575a54fa838e87136fc8b913ecacd8100ac8a27908bd20 SHA512 0b7a969fcdb29d1fa95c0e1281f1c52c165d6e41ad44442eca9cf5f5f6ba35276769590e354f82003c6fcb0a956bdcab5da72e5d7228ef490c21f7d6eabe2de8
-DIST 5.15.0-0-202005140838qtqml-documentation.7z 1561398 BLAKE2B 754dc52bf4090ca2b17cb699e49917181503d162ab05f65ce08d37a364707dab6dd6f9e073202ea44fb5279d2f879e07a126e3100694012dbea6e8b2393a50c2 SHA512 9d2da44a1a7b05576875f314bac8e44316d016f4bd6af9920d0728e02f41ede27f7dd2f9c279380c899e9b7fa608ef39cea89c763ef24d3210d6efdbc5ff73b7
-DIST 5.15.0-0-202005140838qtqmltest-documentation.7z 82567 BLAKE2B 01ac2403bc77bdfefb4fadb73b84e065c0d2611ca4bd935c158f6a3fb47e9f576a3843d9177e0af5e916222cc21417cfd4058d986a6d141be278ca6316b8c697 SHA512 69d9b520073d4c027f54ba13c402c4ad17b9b7d31fda9e282494c8ea2e006b2e05d9320cbc701ae72f35c6a7056426a9bcdedacaa245d6b36d943ca9682d569c
-DIST 5.15.0-0-202005140838qtquick-documentation.7z 16693827 BLAKE2B 63cb88aea7b99c815e9a05a576feda052ee8e3517a5fb051841bc44d78afc68e70d64e64db581ca0ed7633412e59d32b4ab3b0e01f41da029711243e75a30d3b SHA512 3bf3e8a241cbcf9666a49a53911b4457e5551e8025473f71b03cd640d733de450550223ec6490b08ea993088c419c518c9b70e503db64d0f26303c411fab658c
-DIST 5.15.0-0-202005140838qtquickcontrols-documentation.7z 9346972 BLAKE2B d00850bc73a52839e40a4a318422cede7227eff28b6190bbb695584fccc9001b55fa2668c1fdf3c5b894a1e3e2851ff4bf033d4de12f0b7445092c8a3c3955fd SHA512 364001d9c2b2afdacaff372343db25798931d2ddd36a8c23f9b240555ad0cf944d301390bfd43a74a7e51737ffb01761c813e9f0e10a2cfa404545d4b26a54ba
-DIST 5.15.0-0-202005140838qtquickcontrols1-documentation.7z 1956754 BLAKE2B 397c522177dd6f0617001ac19b4186063b6769e5f43f79d3e0106dc56b72081c2b7ce5ea8cb321cc21b56d1c1137da7c4616bb5fe670d0e2ee5d48633c58cd74 SHA512 18ae89bf4f06cd82ab1b2035cffa6836c2f44d5c279c24020e4120e6e61be468a1880d702adbcabcda42c944e0cba0206e87b927fdc3ddcfb271b86ef4adc924
-DIST 5.15.0-0-202005140838qtquickdialogs-documentation.7z 182847 BLAKE2B d4f21132d5cf64495fcff0ef67b4d013cf2232c5e9def804e451fb23cf7637c79dcf4449fbf17ab29c424381b551c24878f0831f12222a31b8e5fb6aed03f0be SHA512 99238206e08daf62ce87361a8c80cdbabf0e08e84c7b517a8cabbdc569075f619e53e4fbdf57e02473ce69aa0aa30708fcfc354702153cb765c9c1b338d37710
-DIST 5.15.0-0-202005140838qtquickextras-documentation.7z 672364 BLAKE2B 7ceda31a991583da626a37b99153c3fa96011d9c6cbedb7a5215ed630c35a981b05eea83b144c805bf8ce23205e24c9c283dd4e174942e1e238c7654dc17c2f0 SHA512 80cf53613b769baca47ef4dff59d02484da1299844473418909bc9050baac49ad502ee11071977defea636da4a550c9023484317c8f1f9ab4c309a986a49e57c
-DIST 5.15.0-0-202005140838qtquicktimeline-documentation.7z 149475 BLAKE2B 3bb26c0600d3ec05394a9a42a7f3c78b0f149158469a42a18010bc1e9d8025d335045360c5e14996b2ed5a56b3fdddb5fe3924fe8f7b6ee5f62f55a3df87674a SHA512 24de8a2535398796f39a11a5cbc8551920a9f7befc255f54de58ef5c54d5ebc7c5bde203e503ccc56ffa9a39021ab4fc4f8c927d6d812d9a592bdd2467e1b842
-DIST 5.15.0-0-202005140838qtscript-documentation.7z 598991 BLAKE2B c0884b13cac91c18de7b281f8bc8885bec318669c4f2ab33ce6e11b77ebd8638b2d93a62d816051a449b84491fea0097eeb6e0b704aeb949e4301e4cc1825205 SHA512 5dd47de26a0f6b865482a01c5a498611f8daecc727b1183b5370345c0cdc60c8858a3662ffa558c824dea42a2978ae56ac05357306ff1d65ab106c69bb16b943
-DIST 5.15.0-0-202005140838qtscripttools-documentation.7z 85666 BLAKE2B 811ebe15745781c62bfecac034dba7abbdcb5156c1bc9e214810b65fd7df1cebb53b17b31277f65134664becbf218aee2eff3b4a04937bc60c50bcff7381ba6e SHA512 9bb9f3fe7d19ea9eaafe94ed13446fc55310f209aaa69cf56bd44f8cc77fa81277836bf32ad0d23311c2e4431773d6361ff0d19fdee4ba4fcfc6b306501a7a0c
-DIST 5.15.0-0-202005140838qtscxml-documentation.7z 618965 BLAKE2B 189b2986fe8264fe7c3b72519540fbdc4ff019e93a374aa623f4175bf6aeb7019ff783b22f0f675af076c6d81facd35530a6a119e0880d66c64bcdbd983ad5e9 SHA512 14de1ef2607a8d93fc8ed1a0392911113373ed1aa5bc2fdbc06312a74c46effe7c0f18d028f02a0e557dfe5be95fd8791302676be13bcc5a5c1cfeb8d9d47ad1
-DIST 5.15.0-0-202005140838qtsensors-documentation.7z 3391767 BLAKE2B 5bdfab8f286a3fe29a3f7cadb5c70259c10841940866beac253b5130e9998810c0db81df6704421f1826ddd585d84aa15a54dad37467af15e6dffbe4b508b8e6 SHA512 d48884d76071ae82d67c2b3fa50c77d6219b9a4e81dca4c41aa4d2eeda8b8c3bef47c8e6b8be109e71eddebaa6a736f238e145341eac5eed2fd32b38e8589ca8
-DIST 5.15.0-0-202005140838qtserialbus-documentation.7z 365397 BLAKE2B a970074765dfa8696ca4124b88e50cbb0ea3427f90dbdb69448ba9f9e67e34b85d1ba291c0e1b437fa3cd68187aa712c32f955850d5b18936ef06b031127ad69 SHA512 25b398888594558cf433402818ec0a38c9705013fe8b979664d66e360667ce31c83c936ce9843514474450f8d7177e8ba1ee4b35a20fd96cf211028cfb68c8ba
-DIST 5.15.0-0-202005140838qtserialport-documentation.7z 277976 BLAKE2B dbb6c7b98977a4159583eea43083712305e1caef7b1b3aa52b2f10ac56a33bd18de17de301eb473b8d6676e1b46a932d04b7310ed8b8c4b0c6926c1f39434b7b SHA512 05e819b9d6222281a3c04bd9541e2a3fe41ecc10e17fb6be2ed020d2b3ad0a17d7fcb9ebf4a8eebc0e49f9e6cbc614fc01695203f08979bcb5c876bc6e270d05
-DIST 5.15.0-0-202005140838qtspeech-documentation.7z 133554 BLAKE2B 6b90c8a109d2fa8a247aaf0e329fde504188b0a8c094b2713ea148fc093e39a7befbc1954ff27cd72ae9677ee1d974f74364d24bbb3e91f77015df043fa59c8f SHA512 ad041242f194fb47f4b284c3b31b073881e42ed69b5f48c6e15238a791815a96b78744af7ec3d57290c6058565b73be41a8e1fd4c09d824179011e5ea76e4ca3
-DIST 5.15.0-0-202005140838qtsql-documentation.7z 882768 BLAKE2B ab3c421921239e959ad367347441bfe8eac48338f70d7e196dce1b2264f880b52bb37cb2ba4f80c99794b3a22c86dfb17bfdc22ed3d22852a2c3e664e838f65b SHA512 594d653a573d6019987ce4eff2587ad0b1c54777a7aff0090c0d0dfd7399be1e12c3be64b164d4ad8a2f60b0ad73171f198ee6a33b81790c34f50913bf405dae
-DIST 5.15.0-0-202005140838qtsvg-documentation.7z 254538 BLAKE2B 2d3a59a5e74992289660c9a65eff1581d0111f044d0c534ccad34ed37707ed569aeb96b679fdb1a0a300cb7fcea31fc2a2f364f2e992ab98ec1a5883a46e6ad6 SHA512 3f73a4df76eafee6526b293828aba76ba2d92074ff303da35747fec96c6d5e7262571f2666c61b4e546637f8d170bf1b3adab9ff25dfc2c994d62d603996ed44
-DIST 5.15.0-0-202005140838qttestlib-documentation.7z 218182 BLAKE2B e64f258420ce59022cdfbe654f524ebf491c0b6954e8212d32ed9f18f007d5cabe3493d1444d7e9869e70c4d6caa768d58602d72e39a5735be28f16bde1d07a6 SHA512 b4ff7621c28300ba949f9ffc834100ba493ec1c8d6076031313f8d253ae484b2cb5ac3f79547b1ed7573117c9285c1a090da157986147b44d436282869a91acd
-DIST 5.15.0-0-202005140838qtuitools-documentation.7z 158132 BLAKE2B 81a4f76f451cecd1d6178402fd15d476c69bfd095b3673ab043822cb20baea311535ece753d95f701feb52172d39352b972b21ecf90606538bc6fdb86a8f2301 SHA512 7bb4f93743248c4ba3315419e9b1b54e9758bd1df3756a3821558f1f6f1447d9cb45a8282d43e6097f545123f124ae52316080efdd9baf09886d07ba6677835e
-DIST 5.15.0-0-202005140838qtvirtualkeyboard-documentation.7z 2033802 BLAKE2B 0217c803eba7a78efc438392d929b32731a7199ce09f8ff1bbb806b4817b1a36b5cb40ccf8a2c85a74b60564f01b3168f11c6982880187330f2699d38da5eaa3 SHA512 6ea4f46bc5bbc5f9b70479d98c90efbe4671196859e3489e9c72f819fa60ba6682535c500aa06d7115490ffb9c6461468b6e2ce3b32042b3062b60e8fed327f3
-DIST 5.15.0-0-202005140838qtwaylandcompositor-documentation.7z 583159 BLAKE2B 3ef7010b57eeebb3b3066a1f4cd21a5668d04620ca1d9047f8c48b2ab9eb004ba982b3865344502c295680af2029548b1eacedefdbee02bf6257ed868bbebe41 SHA512 fb30f018d4c53a885a8028655d772f15717f67e9c9da1d83eaafe713db60489485aa2566c72d90bcbd98028d9b89f2322b27cfb74fa382032fc752fed77651b6
-DIST 5.15.0-0-202005140838qtwebchannel-documentation.7z 162302 BLAKE2B 6435a7ec51cc57adf2dd6495df455f2735ea8c61dc74cf4293b571c52a34ceb4440ab22afbaab07e13cdb909844962df5b9dd1680e506b3b8d0cb0229c62c98a SHA512 b4b6c34b37cfea3defbafd079985eeb80a9bbecb3cefcdcf9537900d88c6afc03a64d60fde95bf3402c11e833c55a933f1c12a7ee67496782fcc0aaf1788f86b
-DIST 5.15.0-0-202005140838qtwebengine-documentation.7z 2968149 BLAKE2B 6eaf81abdfa94628d44fb929bb24f12df1b81783b347269a7cd4aa16c445d44c0ae989b98fdea424b3a63f441755fcc309679540c8e4d62032772a8e120ce3ad SHA512 f4bcb127924f1b42584723d1465e6887b3906a589e96d516cd6bc0161de06c7d016075b3befb2df6df4a6a1083a4db5a5cc541949abd6120ac22af453ed1ef10
-DIST 5.15.0-0-202005140838qtwebsockets-documentation.7z 308042 BLAKE2B fe143a4ec8b90d40f163ff1c9f296a986c4a754cafd29684d45d95b1db52e71e450caa6b741c3dcd413de30cca9fb1ffc9508f2116d176b29662667709f74fd3 SHA512 fff7a5d8ef38e870b77d459370cce391b907352128647e31dd739f18a6ae6fc045d965ded0c151c2d41a09364296081f5e4e7d220cd2ecc547755a116f613185
-DIST 5.15.0-0-202005140838qtwebview-documentation.7z 119894 BLAKE2B d074b235cad6618e3d5a03e96bfdfc84bc54e33dbdb2452f20771f9954d7af347c2dece771bef3648cfaa16df862c176d797a84a8c3cc91f52f5ab184d91bf7f SHA512 ee5318543da47f3966087d5bdc0558724b14759404159f97bd656984f0c2eacf1aa9e89e80878246e17ebb44c78f4f9a5a8900301564c8f1c70d14f1838c7efa
-DIST 5.15.0-0-202005140838qtwidgets-documentation.7z 26787886 BLAKE2B 93cb5ff151e2bed00f7f2f09268f9e39627b626620833c82e65008caf5a610b56c8768b8c102486897f0970b568e9c832810bbb6992ec9acfdb11d4af8e903fe SHA512 d96bf3e80a4ed885f921c35d79799f774d024da8496eba53100486e3ec0b3c247f84553ae261c856976f11a60673c4a8bda002fe891d8a01c3d3470dd6a7cfab
-DIST 5.15.0-0-202005140838qtx11extras-documentation.7z 36651 BLAKE2B 1e07affdcdfe26a83f76ef63cb82a840ed3d782bd028ac0f0f54ce3a64512923e69e570864b3ace689f41f698eb238ac77453dabf86f787088c1d951a26a478b SHA512 916fb288457047ffc6f61f8271b1c5fda9b0c94e37279a6e4c08d13697fbbcdaf020a07e6b846e561792eb46c9c663d3c486daa10cc15be85495a719206a60e9
-DIST 5.15.0-0-202005140838qtxml-documentation.7z 456330 BLAKE2B 362d5c395289d3fb250992bb7904f58270abe5ddcbdf47b2558e4078fb9060d6aafcfe14a3cb80dd90f36e68dce9e15f523afced066eae32b55c380661589e3c SHA512 790dc3b472a0a9c0acb9c20d12f645278bb6e70de9767f2aed59dc7079b853b0f4fb6466ff9bb62c507f4a0064c10e469401ddcd2057c9c23d2372b441cf3566
-DIST 5.15.0-0-202005140838qtxmlpatterns-documentation.7z 1191223 BLAKE2B 8113e532de5d1cfe11a3f4765da685ef0ec6172584189f005d37eda5aae42d784143a4abc810d4e49ef097657af03afb20385d1921f1dd0e7e030caae142c1aa SHA512 b534fe6d81acaa60ae1c243e41d173b0d84c4ed01fc4b0e55d50ffbc6c10530064d779b9f67a6e357c9ab94e77e01f7565d60bc7884d2dd44e8aa569489070e9
 DIST 5.15.1-0-202009071124qdoc-documentation.7z 538292 BLAKE2B 2bfddf75b83783a515f7278e4c9e384e96d58a64f5326d640278dce7d730e011a0fd028ce41efb43d47c36c45cb378101a78c62779600cabff6c108db7146af9 SHA512 48ce574f1a4a888a40ed6ea8b81bb3baaec538c15c534dde15038eaf017bf97bf6714dd711b22a9d00332f4f79041ee20b27a4e0987ef98d48e7fb651df86f32
 DIST 5.15.1-0-202009071124qmake-documentation.7z 343276 BLAKE2B e4b4220bf97cb668b70021c3264713005fbb2b890cad7f19573f079726b84b181764789e0e46557eb8999ca84668e40b1c59836cd8ba4837f38754182d272313 SHA512 56bb705c4dde6e348bc995a0077b36c765e0295622490496d7c634effe5d9ad6e5f8a8239dd799ad0d61cbeb0d244904938d6e97ff91f761cc5f0c057e81ff86
 DIST 5.15.1-0-202009071124qt3d-documentation.7z 5832015 BLAKE2B d68bd281fcbf4c665f2b72602a4f2de779203cebdd870935f21c9514921062e1ca28d802f7d77779ec978752514b692f76f54487d0694c84397efadefcfa52bf SHA512 54d49afed958dc0231880d364c3385f017c72ab9226e1044b9d2b146685d5b5adf8fee44ed2ca58fa0d8f06fa01898724d570185f5b5995b93c5e028206fe959
@@ -165,6 +110,5 @@ DIST 5.15.1-0-202009071124qtxml-documentation.7z 448276 BLAKE2B 2bc3fa0713227065
 DIST 5.15.1-0-202009071124qtxmlpatterns-documentation.7z 1199820 BLAKE2B fc0287d1401a911602e2fa5ba17f52bfd1a42a9c7687ae809ecfcffea6fc0d0c6d3d8ce4d9d395d48ea85bd267968ef887a205e9384e4de43178b0c37eb38965 SHA512 0005e22be3a926d8965323c34efd06229d32a364f1937aaf9aba6e0ba8093b518189d9399aa1e6e3fc0d9204bac0e442efe534fdbbc0c9b2fcf4b5ffa7f781ed
 EBUILD qt-docs-5.14.2_p202003291239-r1.ebuild 3066 BLAKE2B eb79fd4283c765a71f5fd60c475bc0d9ce807a95ead1719ceaf2b37ed11e6e2bdcd2ff2db8e7960040ff9ae67e809319d26c132a1a2a7b06cc31a90f616bc1ab SHA512 664feddd58aa974de01a00b8153390b41ab5377cfc61599a45d227f73c6ed2d8ff2fd1d615e9d07ef05fcd69a1c55ed272f0c36ddd22d9fbf7c3d2ba22dce602
 EBUILD qt-docs-5.14.2_p202003291239.ebuild 2968 BLAKE2B 05273c473995b9c11c5070c6dc38fef31a5b742a71151a77b7b68148704342a8c0ad8c52ff74c9d270300761272f1195a69a2a7c37106fdb0404fad7b797df67 SHA512 0195382e1ccf86f7fd4567922077c636fd7dcff58219302b550037508232dd7ec7e7e036ef2a69525c1d35c4b64581e6f3c2d52c44b774f59fc6c9f85b30e939
-EBUILD qt-docs-5.15.0_p202005140838.ebuild 3176 BLAKE2B ae9d96061c0d36ebceb43dff3c430cee6c1c3cc757dc49334a4092af0e5dd95c42985eacf221db8bf755c8cbf87e36e6032905cbdf87fad1e6f720a32a4521ac SHA512 947914f10b688a77fedd24198a79db531b7618034e63a712023448cbf5ea79021fe074cd0b5bac263afb8d93028fdd3baf4680863ddfdea057605919f90f61a9
 EBUILD qt-docs-5.15.1_p202009071124.ebuild 3176 BLAKE2B ae9d96061c0d36ebceb43dff3c430cee6c1c3cc757dc49334a4092af0e5dd95c42985eacf221db8bf755c8cbf87e36e6032905cbdf87fad1e6f720a32a4521ac SHA512 947914f10b688a77fedd24198a79db531b7618034e63a712023448cbf5ea79021fe074cd0b5bac263afb8d93028fdd3baf4680863ddfdea057605919f90f61a9
 MISC metadata.xml 3987 BLAKE2B 88a562c2f30685b8f20c14398020923ad320cfe14eedc8ca8bacb1ebce44857cc7795618376c4a66625ca30b50dfc0b348acfad8c323c83d10630af37d3e6b19 SHA512 0ef66e7526514436fcdece85ff01b17f6aff031a50ad2d7a1e86b04140d25de56645cc634290c41a1ae0dd077963afd7799341597158bf6d6d0b7a79c3884342
diff --git a/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild b/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild
deleted file mode 100644
index 14dde085d7e4..000000000000
--- a/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 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"
-	[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 timeline virtualkeyboard webengine"
-REQUIRED_USE="|| ( html qch )"
-
-SRC_URI="
-	${BASE_URI}/${PV_FULL}qmake-documentation.7z
-	${BASE_URI}/${PV_FULL}qtcore-documentation.7z
-	${BASE_URI}/${PV_FULL}qtdoc-documentation.7z
-	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 )
-	timeline? ( ${BASE_URI}.qtquicktimeline/${PV_FULL}qtquicktimeline-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
-	media-libs/libpng:0
-"
-
-S=${WORKDIR}/Docs/Qt-${PV%_p*}
-
-src_prepare() {
-	default
-
-	# Fix broken png file, bug 679146
-	local png=qtdoc/images/used-in-examples/demos/tweetsearch/content/resources/anonymous.png
-	pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
-	[[ $? -gt 15 ]] && die "Failed to fix ${png}"
-	mv -f ${png/.png/fixed.png} ${png} || die
-}
-
-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 4591032d335c..0239bd07dbf2 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,7 +1,5 @@
 DIST qt3d-everywhere-src-5.14.2.tar.xz 81576496 BLAKE2B 39077430fa58a14d0636ef56607b687636651d8fb798093d00b150ae023c462780245f06d61eac214560b336a1f445c2fbeca397c1dc7e7ee0331cc008692a3c SHA512 43053d001d59094bfac19c5bf3ad17df277c64d0c214b72d4cf02231396d9109a231da8d9d72ebe79822bc09ee24fa2387b4b120dbad43d69a49e3d66ee21da8
-DIST qt3d-everywhere-src-5.15.0.tar.xz 81921676 BLAKE2B da636ae20daac0e3006f22d3c1e6d9f07938b1c0062d1e554914c1f25c195905f775ba2441125592237b8cc4005f4a05d7f78413b65e67ff0fa609da8ae8952a SHA512 0cc327438ec174bfc6b7b560b5957653d38cdcb1c94717e296c3f52f41750f1b95ad620e3c3777fdc9c63f885f8325b8c1d1befcc338a25fc65d3f62b2019185
 DIST qt3d-everywhere-src-5.15.1.tar.xz 81919836 BLAKE2B e0c617e777dc2562caaee02483bb4c9ec2fd17214ea02505942b074b82e698a82e4c81ef552705872c6c10be3cbab65a1fc3c5aff2c87637639f223583a04ae6 SHA512 5d35f39bd3cb65a4b7490fd3d57a4f62b3ccaad25c7963613d67641927bdc9d895fb436d049de5485a9e8e067c716951e376349cbfc3996af6765adda73d51d5
 EBUILD qt3d-5.14.2.ebuild 763 BLAKE2B 8166e28c320c767d99c4e81b715db4e853fc2c8a22702de554a374b27d70c12cd7574a825151081cb4cfcd12dcaee646190df99a2f764fa41b182b0a1051fbbf SHA512 114352b98e5942c3e1d7d2c63bc02d9088e1bb38e76333d680a89fddfa9b869206962d10bcf9304d8d9e4f296f2d38aa1ad20e16c77d2264e736531ca88b1261
-EBUILD qt3d-5.15.0.ebuild 766 BLAKE2B f320edc4f031be1de8461f98ff868fd9b19eb91db48bef7f45cd6d791ac006c68ccc61f6fa6fbc0396143386967210e1b0b613712c65a736f95374212461dd0c SHA512 07fd92c4ec619e542c3bd06b8f4bb764cd08e17d2d2b8cab70c4de8cd65fb02d3870aec8c76324155947f39be02125a317f69cb0ce14d31fc85ca2bd2f75a61b
 EBUILD qt3d-5.15.1.ebuild 766 BLAKE2B f320edc4f031be1de8461f98ff868fd9b19eb91db48bef7f45cd6d791ac006c68ccc61f6fa6fbc0396143386967210e1b0b613712c65a736f95374212461dd0c SHA512 07fd92c4ec619e542c3bd06b8f4bb764cd08e17d2d2b8cab70c4de8cd65fb02d3870aec8c76324155947f39be02125a317f69cb0ce14d31fc85ca2bd2f75a61b
 MISC metadata.xml 644 BLAKE2B 9d1a63c26345bf489b395cead548565ac4020a7b5d13b88d265ecae24a5dba02ee3529342b8bf461b2bdda34a5265d0d1469cb33d58ded0f2bb7cd548cb2ff7c SHA512 126c840c440e350c85c37143ddbdce3852e7b8eaa73964d650688d7377b251c150a82e7939c4a4c5a696a576dc50bb8edf035cb8c64d17a1536d608943f4193f
diff --git a/dev-qt/qt3d/qt3d-5.15.0.ebuild b/dev-qt/qt3d/qt3d-5.15.0.ebuild
deleted file mode 100644
index a9a8e5f27bd1..000000000000
--- a/dev-qt/qt3d/qt3d-5.15.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 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-only 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-only=] )
-"
-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 a4614375ba2f..2f046c5e42cd 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,7 +1,5 @@
 DIST qtconnectivity-everywhere-src-5.14.2.tar.xz 2804940 BLAKE2B d72e1159877049865d45c5aea8281fce87d797bb41cd82aac534463f48752f8144d018a9a1a23d153adc41b64559c0aa160c00ad1c30ce7790abb11f4ee1d87f SHA512 948050b915f6f2e1fffcb2c8b55d9061f25a82314d02e7a39faa9b88e065bb924ce5f8a7c26ed1f07b29b986d47acd5678f57bb96668d1c1ecd93ad3a7e40c7a
-DIST qtconnectivity-everywhere-src-5.15.0.tar.xz 2803792 BLAKE2B e81358b6dc8c2e8a459ade9e15ae93a017ace0dc6eccc2010bcede2c80b89133566e74ecd266345639e46eae8ba37a292715b8345ee92caf50c24ee48c08e651 SHA512 57f125d232d1b495e82dd0f52243b878c7f0d3ffd1c8f4a7ff92810167867e2a5e480f4e7a3d2f26bbebcf8693eacbced87504b54f79cc8d1c8caf5a8f2da8f2
 DIST qtconnectivity-everywhere-src-5.15.1.tar.xz 2814984 BLAKE2B b1c4e0525fd50af4971d97a4f735e5a9c2fd1bdb72bf2ee01e7136ce57da576d10e4083da7ecd3257471b7a9f7fed3b925b473dcc99ef81a3576fc81abbb7971 SHA512 ad7bad604c466461bcc7bfd889ecbb36e010c89ea1ecf7736f8b0ad49e682a1800cd2507b8d8c0b582c424b176f8179aeec85a6b0fc4ed933f8b6032e935d39a
 EBUILD qtbluetooth-5.14.2-r1.ebuild 637 BLAKE2B 782ff75184a83de5a6ce49eba51ad1320a6b2c87cc23559928231298af2d0299ae8fe98f36b6ed92e034d09b086748cdb806c6c956b2253bae6b573ab6447c9a SHA512 340917ba5f87e627ce70a58287b0777afad3ca0cc4c78dba528fb78a19766eaf5ce6f7b5dc5899f6b790db2385f403395e94633cae9b71423efbf9e2dd2f57b5
-EBUILD qtbluetooth-5.15.0-r1.ebuild 641 BLAKE2B 9727bfd05d1457502a9c8d022e98b61e767e26fa7685e4b22de7f9c42e0b8c519d1984ed91b0c1ff6bd13526cead880b5b962a25c2ed250b522b54d00e28f6a5 SHA512 abe38b529354bafee87b8ee505ab2ac4b84e0e0912e63293e8dab963aa7d95e3d480c2dcf599628bedd39c61103e26a8104af528434ed749e38023c73f0a50aa
 EBUILD qtbluetooth-5.15.1.ebuild 641 BLAKE2B 9727bfd05d1457502a9c8d022e98b61e767e26fa7685e4b22de7f9c42e0b8c519d1984ed91b0c1ff6bd13526cead880b5b962a25c2ed250b522b54d00e28f6a5 SHA512 abe38b529354bafee87b8ee505ab2ac4b84e0e0912e63293e8dab963aa7d95e3d480c2dcf599628bedd39c61103e26a8104af528434ed749e38023c73f0a50aa
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.0-r1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.0-r1.ebuild
deleted file mode 100644
index 5b53f7c84d84..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 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}:5=
-	~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 8ca9107c2a6a..e43ffcc03e13 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,7 +1,5 @@
 DIST qtcharts-everywhere-src-5.14.2.tar.xz 4250508 BLAKE2B 0f6839bceee19215e82355d66972af69a714e28a75609a0920cee0792e593070fea237e6760b86bda81299ecb9d6bd3561c0a90dafbd571d3a14b72212ddacb0 SHA512 2776db3dfe6f6f1047bd19d8d936d3f72de46c0807bbf02ba874053113d76df4cf80497d5ed2cee192ad94abb8e12b4fbce8359a63d8beb1190d491fc2da35bc
-DIST qtcharts-everywhere-src-5.15.0.tar.xz 4250568 BLAKE2B dd58501b85d04e360f5a096efd8d6c488fa73be2647f13d40e7efa9849703f7aff56eb09752163c748e1c2ffaea73d4475e1c968fae1c1c8831f1f7aa065b674 SHA512 8046f280f460da4bd010c96503e07811fd672981940477855511c21e11734872cbfdac2ffb5da0a26dbeeaf931bda2605c57dccaa45ab3ebf61272b9e29fd183
 DIST qtcharts-everywhere-src-5.15.1.tar.xz 4251664 BLAKE2B 392464bfd9fecadf59f759284ff530a5dbeefa0ea31a2ec134538f0abe21ef517be319ab51ff0f0d0a29f68a4c7b3a2c8905484cd193a33626e6381c11880822 SHA512 7e644d4a674f175745646f8b541c8cfd972853fdf3a3ee5d0f7c23f035ae81cef0671292535fe65b1c276e4c54c7a48db1a1d2f9be97834513d154eea1666f3c
 EBUILD qtcharts-5.14.2.ebuild 534 BLAKE2B b808d2c4efa992ceed828eb20a89a4cc890612a7d3470aeb6c38a4e64e27ba9afc0be961998d7c4227bd9c2b2b09f31b5b7ed01273bdc39745a2945fe08deec8 SHA512 a44312ae9fe8012f6c159703e9f76e6ebfe753ca07258466aba8fa73c89840b3200a2d5a02ceefea76d0a7aa9502b97c86034eca78fbbe6e1c9166d7188bf800
-EBUILD qtcharts-5.15.0.ebuild 537 BLAKE2B 596fe8baa9684481dfb85e8d8981fd5d2c87a84629dbc20ca1aea3b646acc4dd0dca87a174f8077001c2b4dfaab8f364053a825cda36d303c9e828e57453e0bf SHA512 ed7901d6735b6099714c199fb7f9aeedef012a4511e0b23abb0be6b457b6af8dd4d8d647945df45f2c2a0e6547f53492283ddb642034998683c1fdfcc6ef5ea3
 EBUILD qtcharts-5.15.1.ebuild 537 BLAKE2B 596fe8baa9684481dfb85e8d8981fd5d2c87a84629dbc20ca1aea3b646acc4dd0dca87a174f8077001c2b4dfaab8f364053a825cda36d303c9e828e57453e0bf SHA512 ed7901d6735b6099714c199fb7f9aeedef012a4511e0b23abb0be6b457b6af8dd4d8d647945df45f2c2a0e6547f53492283ddb642034998683c1fdfcc6ef5ea3
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtcharts/qtcharts-5.15.0.ebuild b/dev-qt/qtcharts/qtcharts-5.15.0.ebuild
deleted file mode 100644
index f21ce2b9ce05..000000000000
--- a/dev-qt/qtcharts/qtcharts-5.15.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 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 ~arm ~arm64 ~ppc64 ~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 763daa3b6ba2..be8369c29057 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 EBUILD qtconcurrent-5.14.2.ebuild 440 BLAKE2B 768905eba0008fbbd9612e66009b6f1532c3faebe58c4ab7c5d4d8ffe59b3e7bdd4936e6927e4db5e23e62b8492dfaf5d5d21532feed0471bca9b7cad8b72d3a SHA512 ef6a8da9474323fe742f5d1158f9c72743469fef4492292f34dee6dcd0a2c11bbb8461bb50df61cf0740ae191808c1bcd8952df12a628cfb01ec21d75195a5bf
-EBUILD qtconcurrent-5.15.0.ebuild 446 BLAKE2B 60a97fcbc986abcb826e718545f2b7b71efbe2a7f2d2dac335ee04ac931f345ae3289743fc6102a53ba6a7f090be6545ba1ce826704ee84bdf2d162d8f63ea8d SHA512 4e7205e74298d0cc803b1dbca02489e6bc74be74a8dc7a167fc197165b2a1d9bb2e17c3c03e9dcb0f74656ad3b52695164be670895288d5525646387fb4be354
 EBUILD qtconcurrent-5.15.1.ebuild 446 BLAKE2B 60a97fcbc986abcb826e718545f2b7b71efbe2a7f2d2dac335ee04ac931f345ae3289743fc6102a53ba6a7f090be6545ba1ce826704ee84bdf2d162d8f63ea8d SHA512 4e7205e74298d0cc803b1dbca02489e6bc74be74a8dc7a167fc197165b2a1d9bb2e17c3c03e9dcb0f74656ad3b52695164be670895288d5525646387fb4be354
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.0.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.0.ebuild
deleted file mode 100644
index c484cbcb1761..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 9af400623265..c5e8e66d6abd 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,9 +1,7 @@
 AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
 AUX qtcore-5.14.2-QLibrary-deadlock.patch 3966 BLAKE2B 79d589005de16dbbe87affa6ce2f9a499fe19f9f6687f85c9ce0d60f95706c22c6261dfab1e414cb6c6ca3f3f8d4ee1f33ad2a01f5ebee8356534d5330629822 SHA512 22d4994cb35869e8eadf158ba8a3f1ec3ca62291c93bfe8f94d6e8a89739bfc4cfc59dfb399be955ba6b00897288224c392d54fcbe24f8246d0f649c2ab22a6a
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 EBUILD qtcore-5.14.2.ebuild 2242 BLAKE2B b557fb1c41d17ed2924209256334d2844ad19ae06723cc325debe3c148594684b47847e2fa5c3349fb03569d8dc9feddb253fb72f78576adc7cfa11ecf550c4a SHA512 a9e60505ed6de7c96fe52b99f8716883c4e64b6b9ff5a8b66e9ebf2a5f5b99bf5cd66e6750eb5662576d3ec2a4a257a84dccd27bb89b352006a125e7d40d8ac7
-EBUILD qtcore-5.15.0.ebuild 2212 BLAKE2B 4fc9ec710f5d896f867b88ae7ba170740e856c3564acb396030d9ba297660a9bfaef770620d4dd9b2715c7a2252ad8796672a4bf99abfef7a56cd5e017dada9a SHA512 41d63181195ceb2e211c5179473cd0fedf1287b5713b7741afdf8be5a127b14e5e57057e064b693ff9c35047c4118e5d1b77282a68cb67cb11dc6fe0852d1d7d
 EBUILD qtcore-5.15.1.ebuild 2212 BLAKE2B 4fc9ec710f5d896f867b88ae7ba170740e856c3564acb396030d9ba297660a9bfaef770620d4dd9b2715c7a2252ad8796672a4bf99abfef7a56cd5e017dada9a SHA512 41d63181195ceb2e211c5179473cd0fedf1287b5713b7741afdf8be5a127b14e5e57057e064b693ff9c35047c4118e5d1b77282a68cb67cb11dc6fe0852d1d7d
 MISC metadata.xml 832 BLAKE2B 20f3ca80bc8aea1203ca8c3f34314fb599151eed5639cb9ba6cee97b70a04152ce8c06a4bf1f41058515a3a9d32242bcdf84b6fc75b68b7183951f7c9747396d SHA512 ea1c7dfef8c3afeda436a1de09ee2002441b7d13b3aa40bda02324668f3664fceafcf276f87c897e83f49e246e9fb3ffcefa95098ccb2f5a8b503779686e1b3e
diff --git a/dev-qt/qtcore/qtcore-5.15.0.ebuild b/dev-qt/qtcore/qtcore-5.15.0.ebuild
deleted file mode 100644
index 449fddfc065d..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/$(ver_cut 1-3)
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="icu old-kernel 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/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306
-
-pkg_pretend() {
-	use kernel_linux || return
-	get_running_version
-	if kernel_is -lt 4 11 && ! use old-kernel; then
-		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
-		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
-	fi
-}
-
-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=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	use old-kernel && myconf+=(
-		-no-feature-renameat2 # needs Linux 3.16, bug 669994
-		-no-feature-getentropy # needs Linux 3.17, bug 669994
-		-no-feature-statx # needs Linux 4.11, bug 672856
-	)
-	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 ca689902dd63..0fda4af6fc6b 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,7 +1,5 @@
 DIST qtdatavis3d-everywhere-src-5.14.2.tar.xz 5190800 BLAKE2B 2e60bb97526bfac4c9bd70aae8885fc5f9b7704f8dbe8cff726ef6a60d83507f4d9c59a92b45a3fce78c21ed6d7e41466acec00910e96921a73b5d9bc9fa130d SHA512 25d207e045e58f9edc3a661b641225f6a11eb45f723847281007fa53b753430dc5792e31bdd142c95e886bfda5f6d29826cd151cb23a1e1a81cc0b91d5f7a2f6
-DIST qtdatavis3d-everywhere-src-5.15.0.tar.xz 5190804 BLAKE2B d92728890bae1a96274a1e1ead704a40f73e2a0767c875ab9e5a24f22cc22bd4239518b14bd8666d06a1e91bd60c969a0650f017124ea0447ae71d7725caa068 SHA512 074abcd90cea37c24728d6065ee04048efb3b056dcea4e3fe9af1d270abf6bccda984b7fd91abbbefc9f059af34f53b2b8b42c096ac35e4921214f5eb9c09a83
 DIST qtdatavis3d-everywhere-src-5.15.1.tar.xz 5191624 BLAKE2B ac6f6591f12e00bd9e473da0441d6863b1ffc44d125998a530a3993e9489ee56ed5c9d30e9842fc2b4a4b22110a0296709834582025d50c34653f90be5f08393 SHA512 3f11cddebd29aa90ce62fa19f9ab33026393bf95525bea7c4514e04acef23db9dbfdf000aa885aa2f823b1cd6ca99ac2a1f8afaabe67ee13785d5e4650aa4c97
 EBUILD qtdatavis3d-5.14.2.ebuild 641 BLAKE2B 40c28d84c475f1d5bdc2f269d8377251b1db88865f03d36b992d4b954287854820e18300902a0afe39c17a817c9849fae069b6bc939f35dcb7610d6282a227d9 SHA512 09879a304e88c156d30c218fe86b1b552c0cf2b1e2bdba7450120c0060b559fc8e31c2c642dcd706d39209b3e468073afba7db8ce23ef0e9db2bf30c64aa5db8
-EBUILD qtdatavis3d-5.15.0.ebuild 644 BLAKE2B 264e461ddd6f60b2189b9d5b397f27fa02f90e716a1dec85c7448edfdba03b554f5e9f9dd220f86aa436687463aeaef47719b3c00ca4a814dad3a9132b5ac114 SHA512 91f8194351b5719c429ff819a81f6b8ae070591b710451f6022ad71f6d6a115480d4f6d0d5d9631c2aedc8215de2884f580e6c22b3409c1debe478bf49cc52e6
 EBUILD qtdatavis3d-5.15.1.ebuild 644 BLAKE2B 264e461ddd6f60b2189b9d5b397f27fa02f90e716a1dec85c7448edfdba03b554f5e9f9dd220f86aa436687463aeaef47719b3c00ca4a814dad3a9132b5ac114 SHA512 91f8194351b5719c429ff819a81f6b8ae070591b710451f6022ad71f6d6a115480d4f6d0d5d9631c2aedc8215de2884f580e6c22b3409c1debe478bf49cc52e6
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.0.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.0.ebuild
deleted file mode 100644
index 8cee1109659b..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 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-only qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
-"
-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 07ec0055c5a1..8342235e6ae9 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 EBUILD qtdbus-5.14.2.ebuild 684 BLAKE2B faf088083550c090c5d2348442f272870d7f82ffec6f7f8f2988e9fbc21d81825df4b0a2db4bb6c44404b38671f6933e038251f9076bc7e82509dc6cf8fa0f24 SHA512 5ec14c86fc61b3d1031681e7655c18301727fcbec1d9f19a6e6a4321d122e456425eb17de9ece5adb0804cf8df51df0ff4b2fbca8a6d3dec10c665807217c824
-EBUILD qtdbus-5.15.0.ebuild 690 BLAKE2B c05fa4051750c9007e616f8cce01b32d0b1061bada85b5a90a2f146db7a0cb904e1d9f5aeeea8a15dea05f09a05cbcf48758f288ffaedcb47195cc533911926b SHA512 dcabbe196e3a3401e0c7aa998934a3cb819e69ece7706709bdf8c9dc8aa6c10c76d0c28e249b41f4df3265d8263f72e1c18ca98a95ff133c36a112e8fd4128ac
 EBUILD qtdbus-5.15.1.ebuild 690 BLAKE2B c05fa4051750c9007e616f8cce01b32d0b1061bada85b5a90a2f146db7a0cb904e1d9f5aeeea8a15dea05f09a05cbcf48758f288ffaedcb47195cc533911926b SHA512 dcabbe196e3a3401e0c7aa998934a3cb819e69ece7706709bdf8c9dc8aa6c10c76d0c28e249b41f4df3265d8263f72e1c18ca98a95ff133c36a112e8fd4128ac
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.15.0.ebuild b/dev-qt/qtdbus/qtdbus-5.15.0.ebuild
deleted file mode 100644
index 098360958680..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.15.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	>=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 013bc2843b58..0093a69440d1 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -3,9 +3,7 @@ AUX qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch 2326 BLAKE
 AUX qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch 3141 BLAKE2B 98aa28237d08909005267ff585b8112f1349f9f14e71bf505b84abbc38bc77fc1fb7c5a4588ff173df71223bfb842aed44283ac153b19f5cc6967fa4a3c275e4 SHA512 245097ed63bfe8f1cf3c4ec82a30757131a76b7ac9c47251044ca44822a2dbd8c5958f87cbc78f0196a67498f0cbbe03b7c15519fc55136e7ccb6f181a342b5f
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
 DIST qtdeclarative-everywhere-src-5.14.2.tar.xz 21305980 BLAKE2B 0ccbae8ddc46f4891af6732a4b3cf874c523c7ded5a06f78c7c5cd290fef8e32ad6efe5dcffe947024144128ab2f1108594e4a30da9ca79e1ce3008c73ca2a25 SHA512 48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004
-DIST qtdeclarative-everywhere-src-5.15.0.tar.xz 21493268 BLAKE2B c6b8365caa3e0eef3023d727adf086c16bafc171bcfa839a4dc83132b5c9a76c9a849b387f3815c1a9b12db5824ccc628cad22efd0ce0cb70059971cadfbb00b SHA512 0ec3403286efea6d6ac975ea6bd4464ea656c031f5f27b852235fd69d316a627ac3ff2ea2c3cca0a5375ca278f592df3ecade4e98aa15ec92816a16927f56e5e
 DIST qtdeclarative-everywhere-src-5.15.1.tar.xz 21558724 BLAKE2B 15da5471799e461e5f5983fb0d947cad9d635a1bb0760da0b709f273ba9a9846df442f424d2009e857d831695d14a92c9be941270a07dc0f33cc46382ba44e6f SHA512 193ec706b764330a2ae00614b13482b7586642f9cfd32458e8c975daa07ba25f0f9887de0918c4034f52f613b860677c09c46a3b7d07d4229446cfc0805bcccd
 EBUILD qtdeclarative-5.14.2-r4.ebuild 1420 BLAKE2B 68e9ad656186ac04da20d3f58428c93a8acf8a1282e1cce360d9807775ff1ae88f41d465af1787069d9399b072d85037c0d8d48699a768f36f1557548020fd6f SHA512 f3d46152bcd7443c308899d5c09b6374b67a6486060c0b37d395efbd3eaba2914daad2f46b25f3f32d4920731767358e00ce1afcb82117015c4f2fedf63e3ee5
-EBUILD qtdeclarative-5.15.0-r1.ebuild 1363 BLAKE2B 3cfebdb8ad2a33f8ab15ec59a95c05a126bddbef13cf6f88fca9d633d6354bfecef6c8ea2cad96ffcc961986d0ecdeba4e707bdac9acc1e27b02e72085090222 SHA512 596cbb00b4a4b1dd71f4f01d439acb8a8aa09733bd84ead49c8f304b218476904373adca6b691e11b852337249a9f55c7e7ed8077d19de66ec03cc50b5c0a589
 EBUILD qtdeclarative-5.15.1.ebuild 1286 BLAKE2B 0f2c83d2a4c097f9be3f2648806f7b6abee9ff0f5255f344f875e89037f079f22292c3f487c792848d4b69f411ab48e5d73628f862f3728f34f7f95598ff2227 SHA512 9d8458473f79e7a58739b115e854a62904d4557d23c8be5f8fd80e3e9061d1aaee5146f074bc05c6c4921adcecb5377e972d14f1ba0d62aa803fad2b433618b5
 MISC metadata.xml 700 BLAKE2B 80c5bfdd7c6acd05795c20b36d062b76458fc4b3f83835eef83ed2f304e70dbae9dfe81908bf33e41fd944de4cc754e5f839451cf4c8ef4f06063817730b7cf6 SHA512 f1fbc57d96dc5b481d08da8c73ab9d1e183045ecefeb075a7ee8f1d6733583589077e3650ad5b2d52e4cafc67bf0894ae62fd4500e1974053e46d6a89377f3fd
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.0-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.0-r1.ebuild
deleted file mode 100644
index 0ee13270106b..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-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 ~sparc ~x86"
-fi
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-BDEPEND="${PYTHON_DEPS}"
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=]
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qttest-${PV}
-	localstorage? ( ~dev-qt/qtsql-${PV} )
-	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtquickcontrols-5.7:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-	"${FILESDIR}/${PN}-5.14.2-fix-subpixel-positioned-text.patch" # QTBUG-49646
-)
-
-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 0508c862d0fe..0d9d10382b24 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-DIST qttools-everywhere-src-5.15.0.tar.xz 8850752 BLAKE2B fed030b2e0bdb3bf397b28e33c1afc84c0b22bf3ede5bdf9a0822f44f8cbf6f7564d0d2c04215f79aec722deeac373d2d46cdd3d7e3d9135f9211486feaf12b0 SHA512 ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 EBUILD qtdiag-5.14.2.ebuild 724 BLAKE2B 128c01ccaf9640cad1077304f53db97b6f9b5f97ad41a559075a6e1b589b93218d4101a6f528c09bb63a11902269874a5ad1e50c340823fc96393f82b74e392e SHA512 058a00ad204642694bc0091edc1af6da105c48e96dcd2c2698bfdbd55831afedeb694559bf2e9e1015b303a0d61d03decb4a95ded6f872bc1727c31175bfd0e9
-EBUILD qtdiag-5.15.0.ebuild 690 BLAKE2B a5182d7037c93985e3fbbd5288ee6bee14828c10214d704062a0b2c2412ea043ffc631d528d476fcddee2185386807adbff4ddd16ead6d8d02e2aeb6c2fe4e1e SHA512 d188aeae616fdc6c49626cb09ddc427c791af6079339ffb63e10169ecc1633b7cd323fa199f42dfe4baae49b6aac9d509cc9427296a0d296e48ac3d2b5abacbd
-EBUILD qtdiag-5.15.1.ebuild 690 BLAKE2B a5182d7037c93985e3fbbd5288ee6bee14828c10214d704062a0b2c2412ea043ffc631d528d476fcddee2185386807adbff4ddd16ead6d8d02e2aeb6c2fe4e1e SHA512 d188aeae616fdc6c49626cb09ddc427c791af6079339ffb63e10169ecc1633b7cd323fa199f42dfe4baae49b6aac9d509cc9427296a0d296e48ac3d2b5abacbd
+EBUILD qtdiag-5.15.1.ebuild 787 BLAKE2B c1544d1b612bfd152816b77cf8ae3dbf3631b0b02727d7751d885a1b9f8a723e07200c99cccf11c1e9032552421b2cb5c98da5f8cbee32e5e6d71b39dfeaa2cf SHA512 f3a66c530988b6d80c815301e0fd4d9edd202aff388b243f0afecfcbdcaa502f9bbe3b6e7022bb23235204eee271f2973abd6d7fd9d48bbce55eba8624b3e80f
 MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/qtdiag-5.15.0.ebuild b/dev-qt/qtdiag/qtdiag-5.15.0.ebuild
deleted file mode 100644
index c6a3b3f52e04..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.15.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 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}:5=
-	~dev-qt/qtgui-${PV}:5=
-	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-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/qtdiag/qtdiag-5.15.1.ebuild b/dev-qt/qtdiag/qtdiag-5.15.1.ebuild
index c6a3b3f52e04..3a64cd887589 100644
--- a/dev-qt/qtdiag/qtdiag-5.15.1.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.15.1.ebuild
@@ -13,13 +13,16 @@ fi
 
 IUSE="+network +widgets"
 
-DEPEND="
+RDEPEND="
 	~dev-qt/qtcore-${PV}:5=
 	~dev-qt/qtgui-${PV}:5=
 	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
 	widgets? ( ~dev-qt/qtwidgets-${PV} )
 "
-RDEPEND="${DEPEND}"
+# TODO: we know it is bogus, figure out how to disable checks, bug 728278
+DEPEND="${RDEPEND}
+	~dev-qt/qtxml-${PV}
+"
 
 src_prepare() {
 	qt_use_disable_mod network network \
diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
index 955074788143..15aacd3317e1 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1,7 +1,5 @@
 DIST qtgamepad-everywhere-src-5.14.2.tar.xz 386940 BLAKE2B e1f9312f5007eea0f8126bd1145be603958a6e0833e74f2fe116595d7afa07ba7868d4dce91281440755ce7ff98445bdb38fc09e54ef35ec57dd156fadcaf23e SHA512 23971fae9b1626afc005dccae3bb715f719695bf5e24a1711b3e7049ce49ef5c72097e1eb702464ab7663d41750bf4103e4ed78ee7954269921e3064b79f4c05
-DIST qtgamepad-everywhere-src-5.15.0.tar.xz 386724 BLAKE2B edd75074616ca7737518f3362c134ea12397b49743b3722c97d3edefe8d6bedb66ccc80980f343db78881aeec10bbb1eb9951031e8c86291829949d75b494c42 SHA512 8f81564804c96273a60738fc3bb115d5b6409dd7627420bbe329d0fb6b3e3616123fa28b7fdbdde7f928275a024d499a2b2b86aace3a55c66b7ab80f64a7b465
 DIST qtgamepad-everywhere-src-5.15.1.tar.xz 387004 BLAKE2B 26e7e766121b18851f28c514e4cb7c144f1cce506ef80dc9db4034639df0c77671b5be618d318bb20c8aba290f1a3ed1d99d3a23fac83bc0942063d2cb4f77c2 SHA512 f74933f9e28d0db03d30743e7d75c7a1ba28fa03d97aa894b5cbc306a2d501c27ec40eb84c6b999a6e5ed01b3126bfa992a3a3ca28246310edfe1f2fc12c1d88
 EBUILD qtgamepad-5.14.2.ebuild 694 BLAKE2B 17a6b38d5367c57d8faf74e3bb43ac5e80728768aec2ec4c51a8919b1ad11feeadb4661d7ddba333836268523d73e745ce79340f093d4671f40d5c6d73f69fee SHA512 6128236aa0d1c1b1f694462fc988b0bff32e4de2a2f2ad1a535ed10a5fb73715bb198d14e6c7ae41ada6765eb1bd99a70aa9ceff8c8065495138ee43dbc0663e
-EBUILD qtgamepad-5.15.0.ebuild 697 BLAKE2B 35555963e3f832804d39b26d98c0b7a0dc3717fdb32b911d2f712051145710a3a7416dcbde96c20e2d60e6f39b08d930ca38db5bc85497fe03aa24ec269ce365 SHA512 a2e7934fc22b64a6a72688c6e5410cfa854b2a1b539e2401cf55cd464ac5fbaf5e44a403a4270888e94689dcba792edb600736599ddb6532aecb51e288dab456
 EBUILD qtgamepad-5.15.1.ebuild 697 BLAKE2B 35555963e3f832804d39b26d98c0b7a0dc3717fdb32b911d2f712051145710a3a7416dcbde96c20e2d60e6f39b08d930ca38db5bc85497fe03aa24ec269ce365 SHA512 a2e7934fc22b64a6a72688c6e5410cfa854b2a1b539e2401cf55cd464ac5fbaf5e44a403a4270888e94689dcba792edb600736599ddb6532aecb51e288dab456
 MISC metadata.xml 612 BLAKE2B 9f8eb8c418b79633ebe1df1ba6423de74232787ae4eadea6fb217657fc2dd3ece81e73294ba21f2c0c57596a43e918a812670a5dda271dd7f2721ea0600445b5 SHA512 8593354f9a345ddaedcf0f962877ee7b40db413123226804ef5ea3664c98cc14d7d7f60d63911166e06e3e4fe5b907b1e2ae7a3dc4df527a975f92051b504f8c
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.0.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.0.ebuild
deleted file mode 100644
index afe615251d28..000000000000
--- a/dev-qt/qtgamepad/qtgamepad-5.15.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 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 ~arm64 ~x86"
-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 29177092150a..e2befb7648ea 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,7 +1,5 @@
 DIST qtgraphicaleffects-everywhere-src-5.14.2.tar.xz 14040880 BLAKE2B 7fe0d534b9365e02c6a9499a7d0ef5d2e87a9c46819f05ad5052a23400bf90070b6ec9e7aad8a76de63760bea7853c29a1e01eb055956588f46347525a86f2e1 SHA512 fa6ed3eff243675f9d0bfa71b2886804e4902cf9d7d91d5dec0f8e4f060ee7c347ba7775a89e3f8effd0ffed8314f916b55f09056902abc892ee27e79ce2925c
-DIST qtgraphicaleffects-everywhere-src-5.15.0.tar.xz 14040716 BLAKE2B 6536a279e4a8124f4ee03d8ff63153a4be61cfbaa492a3a8d1376fdbdab48af74d9f21ceb72ebad187fd554c26b08081ebde4ead323a669efb4c2359bdd4ea61 SHA512 62b18a9032bc30468ad4dc95648b1234a71240467fe8ff34a76bc36ed4613eea279dfc6fe0bf8e7734143e8b6ec6442f5e2f92338c2233f4e396bd333e67bc0c
 DIST qtgraphicaleffects-everywhere-src-5.15.1.tar.xz 14040940 BLAKE2B 1e49e58efeedadccb76c680ef80b017fbf5ff62df25140e0ef7012caacab0db67307f1a6ffd0cfe28e76b67ace61c858b1e34994c700b2a533233b9659efb970 SHA512 651f8d96199b6324726fcf97eebf16a3ee40e5a9523a3c03255ca4201228b8d02314d5dd9722f59d44f09b4ff8dd722fb276b9af7f65728693a2c4ee62f781c1
 EBUILD qtgraphicaleffects-5.14.2.ebuild 443 BLAKE2B 1283105c3a8c25d7e23c3b97778325c65ada123fc0f4eb1cc2a033f084419049a628adb8511aa0d3e5d437597c2c6c8e601824241aa993466a100113e9a74e73 SHA512 53190cf51f5f0217831220c64d4c4a6e9c6015c26692dce8c8a7950ccb6e775c28e1ec7b2a9609080726a37cb4cbcad9af17457ac51ec42866975e7beff246c6
-EBUILD qtgraphicaleffects-5.15.0.ebuild 448 BLAKE2B 2e379ebce1e569228f5f82004779c0f6cb1008b239558dddfc192a09d2320f53574651c862cac214a84f3ceb6a2519d6c6d29a46fc425701d2d0f4bbeec3cd5d SHA512 caf74fee9a7ed9454daf1645d43ecd59ced44f43e6856f2b819f84a3025d4d5549021088beb346af36f3f3786e1263a8dceb30643f5aaa991b19944ee2b398cb
 EBUILD qtgraphicaleffects-5.15.1.ebuild 448 BLAKE2B 2e379ebce1e569228f5f82004779c0f6cb1008b239558dddfc192a09d2320f53574651c862cac214a84f3ceb6a2519d6c6d29a46fc425701d2d0f4bbeec3cd5d SHA512 caf74fee9a7ed9454daf1645d43ecd59ced44f43e6856f2b819f84a3025d4d5549021088beb346af36f3f3786e1263a8dceb30643f5aaa991b19944ee2b398cb
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.0.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.0.ebuild
deleted file mode 100644
index ec75dc760768..000000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 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 2c7014bbd4ea..167c7fe3a89d 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -2,9 +2,7 @@ AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae0692
 AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
 AUX qtgui-5.14.2-CVE-2020-17507.patch 1582 BLAKE2B 6fde9d057c96e65159ba1c07a7fa2df6d9ed5577810eb149667168b0a7c2fd754ae49c153a2c5486ad04768338edd791803d0ebc92955e8db5015d7cc9f72a7c SHA512 159eb0eebd650bc5fe33e3e7555ce7a1d39d3294aaf5d47c2db4f437fb9c15b7ceed1566b4354b26f19b6c5ab10f5c748407c5a31077326018aafb238b167a43
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 EBUILD qtgui-5.14.2-r1.ebuild 4047 BLAKE2B 56a431c5987ecae329508484bab74f2dbaaff31eeb81ea0d33abc49364854244d2dd084d53c89503b54b6960b09a3b398a5908dbff34c1154e848fa9980dc65e SHA512 bce682f3763eedad5f22ffbb894887f70a53b76f25286eb1fb9053ad18a5efe96da98a10c54a80312d2f0516149455fa09db8ec1e4cf5cadb98f59b5ccad8b06
-EBUILD qtgui-5.15.0-r1.ebuild 4046 BLAKE2B 53a7a4f83feda0ac48b911831dda49ba7ab1ba9213d660101a82b20b594731a0f622e723c28aaaf5694a56342d445dcf803fd4730bcf9a070555d1af44198719 SHA512 9fb0f95b852895239b2f8a7ee2472f040645e41bfb2f4f8adad697f0d787c36ea78d46a7fa70e3504e4a3d3b017ed18869880e636bd2c957d07d5f821cab0067
 EBUILD qtgui-5.15.1.ebuild 3984 BLAKE2B f72109d2fcb1a813afb4214cdbfe19c927d877fdc9c4d0dbda4e9865d66f54c2e6fac942bfddf3687d329198b5376e3d1ceb5d10150bec707630e93c5e2eff45 SHA512 39881a7ba7fcbcb8578c36d1bce81a6e25f2d99d2f2609ae8f5e20a429e9a74d5b47d5a84db7c062b0c83125d9b72de553d8c9b9d05e562c7b77920c16bc728f
 MISC metadata.xml 1302 BLAKE2B 898227fe66d379fb08154a190b9eec68d98e452cf412ee56ccb9a879511d27ab44cdac45174c5fd674e080a7cf782ee64ea0eeb515d5bcee52491b685c01fd98 SHA512 5d0bd8b7c3cefa4d01005473022fee1ee49e845f56c003480edd09bf68ed07ff406160e26232d7febe21cdd5b10de0ec480d1d89d977d546756e437185204e2c
diff --git a/dev-qt/qtgui/qtgui-5.15.0-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.0-r1.ebuild
deleted file mode 100644
index c32c33860d00..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.0-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 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"
-SLOT=5/$(ver_cut 1-3) # bug 707658
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
-	+libinput +png tslib tuio +udev vnc vulkan wayland +X"
-REQUIRED_USE="
-	|| ( eglfs X )
-	accessibility? ( dbus X )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	X? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}: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:=
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
-	eglfs? (
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	gles2-only? ( media-libs/mesa[gles2] )
-	!gles2-only? ( virtual/opengl )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		>=x11-libs/libxkbcommon-0.5.0
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	vnc? ( ~dev-qt/qtnetwork-${PV} )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		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-only::OPENGL_ES
-	gles2-only: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:
-	vulkan:vulkan:
-	X:xcb:
-	X:xcb-glx:
-	X:xcb-plugin:
-	X:xcb-render:
-	X:xcb-sm:
-	X:xcb-xlib:
-	X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-PATCHES=(
-	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
-	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
-	"${FILESDIR}/${PN}-5.14.2-CVE-2020-17507.patch" # bug 736924
-)
-
-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 X are enabled
-	use egl && QT5_GENTOO_CONFIG+=(X: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-only es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use vulkan)
-		$(qt_use X xcb)
-		$(usex X '-xcb-xlib' '')
-	)
-	if use libinput || use X; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index b8e7b466869e..2f0a786a1f84 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-DIST qttools-everywhere-src-5.15.0.tar.xz 8850752 BLAKE2B fed030b2e0bdb3bf397b28e33c1afc84c0b22bf3ede5bdf9a0822f44f8cbf6f7564d0d2c04215f79aec722deeac373d2d46cdd3d7e3d9135f9211486feaf12b0 SHA512 ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 EBUILD qthelp-5.14.2.ebuild 611 BLAKE2B ea5b3cc287a494c32456fbef38b5f66ac48c803ef1f7fea13171c030974609720ced793f40886f71c5a9cbf13bf97096a83ed11e1dee90334bf8917e900a31fc SHA512 d3849aaa7d5412066a99b757340d75620973f216ac701da56eef3b19aaa477ca91455644913b7a1ab380a5b284b4fd7d0789885047284ccd21709d40ca43490a
-EBUILD qthelp-5.15.0.ebuild 617 BLAKE2B 2ccc37e9d104c03319a35a8ed17ea05a66b1793ecaa64dcef00044f475c31518f65bb422ee2aa2d7428dbc1eefb0def31f18af7aacc6d42615fb7a5128970115 SHA512 84842b51058d20a57043a64bde92f69d38016670168bba14b8925b318a2f0087fa8d2799a24caed2fffe4c386a9cc8e53a4cfcc70e29fc8c4a1a58da8afef91d
 EBUILD qthelp-5.15.1.ebuild 617 BLAKE2B 2ccc37e9d104c03319a35a8ed17ea05a66b1793ecaa64dcef00044f475c31518f65bb422ee2aa2d7428dbc1eefb0def31f18af7aacc6d42615fb7a5128970115 SHA512 84842b51058d20a57043a64bde92f69d38016670168bba14b8925b318a2f0087fa8d2799a24caed2fffe4c386a9cc8e53a4cfcc70e29fc8c4a1a58da8afef91d
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.15.0.ebuild b/dev-qt/qthelp/qthelp-5.15.0.ebuild
deleted file mode 100644
index 1590efa1a496..000000000000
--- a/dev-qt/qthelp/qthelp-5.15.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~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 493481edc82e..bfac829c6126 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,7 +1,5 @@
 DIST qtimageformats-everywhere-src-5.14.2.tar.xz 1805208 BLAKE2B 115939d859478ccb2190c68ea3e93484537d372f62fc03f42931e69c5b7e0f1f84b376659986c3a36082e05930cafd076579c9786f9f4669ebecbb4254ee8d35 SHA512 e835489bdd1cf19aaa1c04e6ae1c480d4077cf24eee1d46b2f4deb03c093f64df6beaf83adb69b7edcba67c952a60deb89a26923addf2b4254aff18bc2ebf6a6
-DIST qtimageformats-everywhere-src-5.15.0.tar.xz 1811092 BLAKE2B 13f058dc23cfc7f3ecb364caba58848fa2c1f944ddf0395297685e417b7a265efa5ca5d2bab7b19e05cc40644952529db0fecd5850685d52e55cc1a4fb1096ae SHA512 3ac441915f2354ebe3eb2f6785a806ebe8bc2562a3a7d7bd0dc3380fd8842ce8a8dcdb7a767750b4da3d2d6b7881a7b54bb6c37f89c46e1468f27fc77396c304
 DIST qtimageformats-everywhere-src-5.15.1.tar.xz 1807112 BLAKE2B d90e99c7a374c7aea73a04ba58c537225bb1c3e24d6af7c68e247f8473583dadd6eb369f7c2d9a71f56e27ddc84560ade933c63c549a4739f8e22c8a4cb5d0da SHA512 90da1c76b16dc5ea4ba99372208e3b10619efc4d131686ac6ab4a963ab0177ff9eee9155af564d72052f4ae1c21f06431ab66aa4e55b3c864f015b63ad75c107
 EBUILD qtimageformats-5.14.2.ebuild 670 BLAKE2B 7e0781d822eb83ae28239f7a9c5176f709cea7dc948addd0e05fa2e5e10799f7ef20e8f22683fbfcaaefeb21e7738fc237cdf438b871fc0a925bd36e3f5b4e60 SHA512 d75bcf577b4a7fefb28023ff2459cd7ca15939f948a420ada145aa723b9c2a78eecbfe3089a5808d949426985969e34ec5ee0e8eda0abc77a96b8844cb3f5ba2
-EBUILD qtimageformats-5.15.0.ebuild 674 BLAKE2B 2aed0c80dd3db32cc8604c02210c9f4776d7511ddcbd9269cfd0fa412c60f6edb46a9acda5755f4d3fb9d7d5d6de02bd96b4309495a6dddfaee4badab683b73f SHA512 b3f7aaccce0cee2810e008a4bd23065886e0226742b7fedaa303034dabb6e1660c8c7db8b4a986f193941cf8c4c20579d1473c28e2af2723ab65821ba9f5f0d6
 EBUILD qtimageformats-5.15.1.ebuild 674 BLAKE2B 2aed0c80dd3db32cc8604c02210c9f4776d7511ddcbd9269cfd0fa412c60f6edb46a9acda5755f4d3fb9d7d5d6de02bd96b4309495a6dddfaee4badab683b73f SHA512 b3f7aaccce0cee2810e008a4bd23065886e0226742b7fedaa303034dabb6e1660c8c7db8b4a986f193941cf8c4c20579d1473c28e2af2723ab65821ba9f5f0d6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.0.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.0.ebuild
deleted file mode 100644
index 64b53f6914c5..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 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 c513c433f082..2db9772bdbb8 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,8 +1,6 @@
 AUX qtlocation-5.14.2-gcc-10.patch 1117 BLAKE2B ff43e3d2fa1b4accb03fc5dd1d1e3fa81797dec88c6c5c487a881c4d487d4d4888989087069cac7eb189b61362b8b0cba2b0eae207621e5627f3785a0df6ffe3 SHA512 ef27c87ff3d2092f9a9d115a93ab12e75da7e8cdb857c3acaae6175a3ce758c1c25b99719007b51ef6c1a6ac4d96915a2e89c9b9e733c164fd49a41433ab8d12
 DIST qtlocation-everywhere-src-5.14.2.tar.xz 6120852 BLAKE2B 0224cd6eecc182ddb960c6f3814d2d913a2776e879bb2e87a6c11f18840e275a770977df89c6bfa1aeb174502713969b5d8c02f9c46670671034f6879a41150f SHA512 ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c
-DIST qtlocation-everywhere-src-5.15.0.tar.xz 6542152 BLAKE2B 11f218fdd4da4be7a1a7e5eff28f71144844ac6d2a70d8efafac4b5dc9fe3a32496bffeaa4446b3412de266feac72bc54b33e26e6c3286c0329ad882dadfaeee SHA512 36efb5a9a0eaaa6f2997c4d7a18307c69a80ae4caf901ab1d0efcc6cd6202dda6a10c8dac01baee44e84c14b8ab23204db1085445e1f3b42e9a0a21549eb624e
 DIST qtlocation-everywhere-src-5.15.1.tar.xz 6553252 BLAKE2B 493ea55065f03f05db7c65c22f53b96a62b3912a62f3385d393650a96b156e5a5d76dfe5ed3df8eee5ce379c9bbf36a62b6f088dab0519bd14355a7ba956a279 SHA512 b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106
 EBUILD qtlocation-5.14.2.ebuild 1138 BLAKE2B 2e74a03c7a99f819b46fc898dfc6bbc109dad43d9edb3aed326fa9d64ffc58b0d1d6c88d74f875be0eef2bffd6ff2a7edc6be6acc034507e02e90792ec8a7da9 SHA512 ada2afffe3a94ebfc2911944fbdf5e14b7d7889a5836306e80455472f041b5883590b70e06e757cc7598bdfd2229f0d5be27cc4b8a569637e8be763ac1c8ae9e
-EBUILD qtlocation-5.15.0.ebuild 1091 BLAKE2B 8e0032857e92c0d94afc73f4a89c94b3832920840b23f48b5f6af730e5134f8e26736bdcd8ea2eab943908169d618392fb22381affae0d6495548b2702408100 SHA512 c0b1507d3967a523533a437ba45276624d0c68aa23c4ad55b0c25539f5877fa6c474b41cfbef958bd43cb991d98b26ca6cd0e2cd5c4523224906f21365c8c234
 EBUILD qtlocation-5.15.1.ebuild 1091 BLAKE2B 8e0032857e92c0d94afc73f4a89c94b3832920840b23f48b5f6af730e5134f8e26736bdcd8ea2eab943908169d618392fb22381affae0d6495548b2702408100 SHA512 c0b1507d3967a523533a437ba45276624d0c68aa23c4ad55b0c25539f5877fa6c474b41cfbef958bd43cb991d98b26ca6cd0e2cd5c4523224906f21365c8c234
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.15.0.ebuild b/dev-qt/qtlocation/qtlocation-5.15.0.ebuild
deleted file mode 100644
index 0772e510f28e..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.15.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 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-libs/icu:=
-	~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/imports/locationlabs
-	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}"/src/location || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp "${S}"/src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index d6b2890fc785..6953e958a6e5 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,8 +1,6 @@
 AUX qtmultimedia-5.14.2-gstreamer-buffering.patch 1516 BLAKE2B 8e80c834a0bb5cc4bcd7b0995a62c7d23777ac4ff5ebe22dad4eb09c0428253b3a4ba28fc6440f5461bb5e1be1c32a3f7f63e63a20a19a6ab750884e26f8f643 SHA512 2ba151ea48aa5dee3e670cfe9b03adfe1ceef23e15d79fdbe2eedf7bb42bf406b8753d2a00fdf14953b6730503bd98687e760cec36b77aface52dc88a06810e0
 DIST qtmultimedia-everywhere-src-5.14.2.tar.xz 3793964 BLAKE2B 98f408e9a3ea48c053797ec20139d134a50d623a4092665695a435c754ee85a369830b23cc5ccce3d9a099cf707c1b28c2529050ff60d3f93f26809b3b2593c4 SHA512 5ebee0f96334d58b74ae344875aa93d32bfdd7c906856f84152e9ae0a3ebb12f627a0d3ab4552031b70c20ad59db1674b1a261ed0828e1efcc6ab48ba3718559
-DIST qtmultimedia-everywhere-src-5.15.0.tar.xz 3796364 BLAKE2B 3ab2137f811910c25c86aee10ee8266729ba186412bb0d61c02c655573cff66c2725f30c3d8782473820a1b9e0388d9fdb24c218c09afdcde26d899039bd7bb6 SHA512 120ff3be99c685fb5944da657d571d83c985e139a34b23f7527daf2a0fdde949a452d4c3691b41a86ed3f141decf1833f496b3b61fd87bc602b8164563cb79d6
 DIST qtmultimedia-everywhere-src-5.15.1.tar.xz 3825940 BLAKE2B 8a86e77b37c7af0226420025f23bcea6aaffcf885f7c56945faa8606bdaf003b29013b452ee2cd44cb1abe7adf260af06f099b7af23664110a97a0dab0574a36 SHA512 9c063dc481c91a94ba151fa96166d04a83e1cdcdb66c5fa80c038bd973c87b928c3d90d1c8add7c3ec29c4dc7dceff9e8cf288ce980f95d199f37e90593104d9
 EBUILD qtmultimedia-5.14.2-r1.ebuild 1535 BLAKE2B 94348292c210c42a846f888384cee6d863cc0c0d6dc27f2c63cfbdb7119f4460b648f7b9ae92e9437f526d4c9d5fd1968369521b019c58ee0da166109d26ba92 SHA512 a46fb3b2e26d3dbd6235236899632b29d0226b4734a93b94c163436e86f3866b1279f6d7ba9ff9b4cd2d729bb3e17bf958d1391cb85e5eca52d52a355ad656bc
-EBUILD qtmultimedia-5.15.0.ebuild 1468 BLAKE2B c0b9361755a7a2c37196ff417c2875c498a61e3e5a3c775a06cebbac9948242a960802bfb3b97cd21ae564763e71562563b550bf69151bcbfcb4d7e09e9cc1ec SHA512 f152a6f0fdec63bd1f699e15a79802d3a2b347e2dba7362a4d56dc8f0c22c70fecc30ee5d68ff1421226c04810496c1456dd39a2a66d5f781443d1927ea8b47a
 EBUILD qtmultimedia-5.15.1.ebuild 1468 BLAKE2B c0b9361755a7a2c37196ff417c2875c498a61e3e5a3c775a06cebbac9948242a960802bfb3b97cd21ae564763e71562563b550bf69151bcbfcb4d7e09e9cc1ec SHA512 f152a6f0fdec63bd1f699e15a79802d3a2b347e2dba7362a4d56dc8f0c22c70fecc30ee5d68ff1421226c04810496c1456dd39a2a66d5f781443d1927ea8b47a
 MISC metadata.xml 717 BLAKE2B 66c4caae8c3c2d342dda85c4fd88d7dc3ddd8415e5b1e14a6278b324df257212b128b75468581609959b774fd9ba67a01d1294e539bf1c1cbc393aaf1a0bbbdd SHA512 d3d69ed7c2f42dbbf33aa360ef34dc2a0687be44a795ce2ee6c4b34603a7767b4e66c652e500ae3beed47cb1d6e73be5ffa13cf4bb1d33e3fc3f0154f950bee5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.0.ebuild
deleted file mode 100644
index f8b9dfe3d426..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~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-only? ( ~dev-qt/qtgui-${PV}[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2-only=]
-	)
-"
-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 685e75413ff4..78e2be2318a0 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,10 +1,7 @@
 AUX qtnetwork-5.14.2-CVE-2020-13962.patch 7797 BLAKE2B ad7f5fbbbafe784c7f88877f8537f847f58cdf082abb2a60674447aef6c1e1043530b85bd487add8b4a81e366728ea9a8076968910ec82c1e3e4de991b216c97 SHA512 dff8c492c99fa18653af663d1e6766c10c5788f3e0fef95a246b5d8a8a95413105fb6b9ea5945a4f400fddb09701852fa046e14bdb1ad2e31b8a3c78743b3b9d
-AUX qtnetwork-5.15.0-libressl.patch 15934 BLAKE2B c4e3a48a345245150994f4edbac1b5289373518245eebbda34767d54a22d07890e0e44338647b42cb240ea42901226b5077170cdd84243ad1a8bcb34e492424c SHA512 e4c7dffb665ee1b0a64631a64abf5aa06d188983e30102e8ebaafdfb66db77f4dd116ee62665fee588dbf0c6ae33abe7a940bab3cbcb6f14c5bc9c0decd3076f
 AUX qtnetwork-5.15.1-libressl.patch 16941 BLAKE2B 07b54a11d57609066cc245f2850dc955aa3ca3c8c5d7ea132dfcec72250b43b3e12b72b8b919bf522d3e32f9d8f2452f34b94fde6174d6fb9776bbd1328d1820 SHA512 300f6d5af014daecee0bcdd16aa896b7efebbe6eb06e6d4f5c2d59f370527edf8783da8449a4c87fca617ce2e4d305ea68c5f68854b618d257fb31a1f1aa701f
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 EBUILD qtnetwork-5.14.2-r1.ebuild 1473 BLAKE2B 4d867f30a6e11d2ae59c2d85b470aae5e5f697c31f9fe046dacd1c5389e1ae931042accabcffa41db58227b2ad4c8550f6741e6262aaddb6a79b5a77be73fb45 SHA512 6e3bec5875b1ba8919cf1aa46e678a51294f58f8af26211ae3d531023cc0fc70b285e7bc8b19abf9712c97124c498b41850550e047915de00868d2ff41cf0062
-EBUILD qtnetwork-5.15.0.ebuild 1549 BLAKE2B 7e3344b37988416d12b6cca4fac784589ae65adbc64165fd96d7e8c9d166b10acd2a5f95f59ed4bd877a9245b6ed5ff438aa6e648634b358ae043d668e352bb4 SHA512 e227aa30bbe97b8b303c858b42e83890cd0731faf9c518971d27687ae71246ac53035b3371d3ff9d4e6cff9496cdc5b6d33bfd98edac830f5b0096bfb4e2c705
 EBUILD qtnetwork-5.15.1.ebuild 1541 BLAKE2B d19867e389b8d74da15d47de791e5c10c6dc4033bf03a2e284aeffad4e0d4eab64f4645edc6d50d92682a6216dd8cef636f97c96b475048f58f293cc9e09653b SHA512 5d219fd8f02ed32fe329dead727997d2dd47a8e6bdaf3448f580c37618be489d290dc66eaf347248cd0090f582aa2cddad571c0f9e6b3137f1b7e031baaf4884
 MISC metadata.xml 957 BLAKE2B 5c888322d402a3f037e194bd13001ff3a7e449fe423b8b4661c4b1365263a63e105be92ab0bd6a99ae79e7e8062c65e52e9e04763f9c15c50cb28c1215a06b0d SHA512 aa07869c984c4c2d7653820213b94fa4db247e4e30f0efad8df64c09b2578cd2143ab81890584521e1f561953312abb36d8e049dabd42893fecefea4182f176a
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.0-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index d0a4796639b4..000000000000
--- a/dev-qt/qtnetwork/files/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,340 +0,0 @@
-From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp   |  2 +-
- src/network/ssl/qsslcontext_openssl.cpp       | 17 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h       |  7 +++
- src/network/ssl/qsslsocket_openssl.cpp        |  2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp        | 25 +++++++++++
- .../ssl/qsslsocket_openssl_symbols_p.h        | 43 +++++++++++++++++++
- 6 files changed, 93 insertions(+), 3 deletions(-)
-
-diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp
-index 6f1fb26a..eba5a729 100644
---- a/src/network/ssl/qsslcertificate_openssl.cpp
-+++ b/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -658,7 +658,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
-         unsigned char *data = nullptr;
-         int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
-         info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
-         q_CRYPTO_free(data, nullptr, 0);
- #else
-         q_CRYPTO_free(data);
-diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp
-index 0aa8a4f4..f161af8a 100644
---- a/src/network/ssl/qsslcontext_openssl.cpp
-+++ b/src/network/ssl/qsslcontext_openssl.cpp
-@@ -397,16 +397,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -696,6 +708,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-     }
- #endif // ocsp
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
-     if (cctx) {
-         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -742,7 +755,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
-             sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
-             sslContext->errorCode = QSslError::UnspecifiedError;
-         }
--    } else {
-+    } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+    {
-         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
-         sslContext->errorCode = QSslError::UnspecifiedError;
-     }
-diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aa..01a61cf5 100644
---- a/src/network/ssl/qsslcontext_openssl_p.h
-+++ b/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
- 
- class QSslContextPrivate;
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 4be27aff..1f33911e 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -598,7 +598,7 @@ bool QSslSocketBackendPrivate::initSslContext()
-     else if (mode == QSslSocket::SslServerMode)
-         q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
-     // Set the client callback for TLSv1.3 PSK
-     if (mode == QSslSocket::SslClientMode
-         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index 71a268ae..8a43035b 100644
---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -147,6 +147,7 @@ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -154,6 +155,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
- #ifdef TLS1_3_VERSION
-@@ -179,7 +188,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -219,7 +232,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
-             ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
-             return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
-             int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -351,12 +366,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -833,12 +850,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(EVP_PKEY_up_ref)
-     RESOLVEFUNC(EVP_PKEY_base_id)
-     RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OPENSSL_sk_new_null)
-     RESOLVEFUNC(OPENSSL_sk_push)
-     RESOLVEFUNC(OPENSSL_sk_free)
-     RESOLVEFUNC(OPENSSL_sk_num)
-     RESOLVEFUNC(OPENSSL_sk_pop_free)
-     RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
-     RESOLVEFUNC(DH_get0_pqg)
-     RESOLVEFUNC(SSL_CTX_set_options)
- 
-@@ -880,7 +899,9 @@ bool q_resolveOpenSslSymbols()
- 
-     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
-     RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(DSA_bits)
-+#endif
- 
- #if QT_CONFIG(dtls)
-     RESOLVEFUNC(DTLSv1_listen)
-@@ -910,7 +931,9 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(OCSP_check_validity)
-     RESOLVEFUNC(OCSP_cert_to_id)
-     RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
-     RESOLVEFUNC(OCSP_basic_sign)
-     RESOLVEFUNC(OCSP_response_create)
-     RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -1040,12 +1063,14 @@ bool q_resolveOpenSslSymbols()
-     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
-     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
-     RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
-     RESOLVEFUNC(SSL_CONF_CTX_new);
-     RESOLVEFUNC(SSL_CONF_CTX_free);
-     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
-     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
-     RESOLVEFUNC(SSL_CONF_CTX_finish);
-     RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
-     RESOLVEFUNC(SSL_accept)
-     RESOLVEFUNC(SSL_clear)
-     RESOLVEFUNC(SSL_connect)
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index f35e0ba2..30097317 100644
---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
- 
- #define DUMMYARG
- 
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,17 +237,38 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -266,8 +294,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
- 
- #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -276,7 +309,11 @@ int q_DH_bits(DH *dh);
-                                                                     | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
- 
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
- 
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -494,12 +531,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -715,7 +754,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
-                         ASN1_INTEGER **pserial, OCSP_CERTID *cid);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
--- 
-2.25.0
-
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.0.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.0.ebuild
deleted file mode 100644
index 2ff63e0d3c2a..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="bindist connman gssapi libproxy libressl networkmanager sctp +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	sys-libs/zlib:=
-	connman? ( ~dev-qt/qtdbus-${PV} )
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	networkmanager? ( ~dev-qt/qtdbus-${PV} )
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-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
-)
-
-PATCHES=( "${FILESDIR}"/${PN}-5.15.0-libressl.patch ) # Bug 562050, not upstreamable
-
-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 '')
-		$(usex gssapi -feature-gssapi -no-feature-gssapi)
-		$(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 544fa18ee852..51446a1f31c7 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,7 +1,5 @@
 DIST qtnetworkauth-everywhere-src-5.14.2.tar.xz 141424 BLAKE2B 11adc6be96f4bc4247aa04a0b21bb142cc8d63dbe547a271759e7c564dde031193f1eceae4366791afd1bc9734be0eef23b538817feb5431322002bab5d39595 SHA512 9001755ae289213f7d2c994bedbbcc1ca641b3c80fc5279f6829ed48c31eed8cdbd87a0ed0ce451bc9611318ef09ef7c40b795d2c45fface2bd357ee579b15ad
-DIST qtnetworkauth-everywhere-src-5.15.0.tar.xz 141360 BLAKE2B 8576cdfd016fc08d557df29d9552bc9d61d16de316a951cfffac4207737f1780f0fbe44a8dc14afaa3806d0241465323ef7c9476cc7708aa05f8cdc0310616e3 SHA512 d5d7e4522a4058775389fdbb048f71675f5c37add8bd634766fc1408ebed0f1ad2c230ceb2cdeb547bce73ee9386cf40585dfb9ca4182340f82a284f7b9b5ae3
 DIST qtnetworkauth-everywhere-src-5.15.1.tar.xz 141416 BLAKE2B 428f55b4d08c88b837b4c3397e13d7296855fd930df0fc319e564709993b4cc4dc7e1f2179c26f7f08e1b33172f62a4e1f7f373439f9ca341cbc821083dce6dc SHA512 2c22acf4842f2e26c514ea48bd4e21f466571c1993b811495c1eb9fe22ea66a687ca882c9ed09b38c00a9a6616b13d44021e0d9a65020f4ab9495d6e8c64d282
 EBUILD qtnetworkauth-5.14.2.ebuild 377 BLAKE2B cfc5af1d28c83adc26feb60e954d691bb3c68f205e4a82445da360e960aca4d3f0ade463f622e7b56fdb254522abf2489e2d8882f24edb579319a541c38c165f SHA512 8428aa168f5278bd76aa403a14889f58575340fda332f83271f045c1cae60c4864e498cd282dff3e8bca937f9b55d7b55835a8180a70e647ada72d109c529d57
-EBUILD qtnetworkauth-5.15.0.ebuild 380 BLAKE2B 09d2cab1877fd00c93f4d844f425b0ada0337949936513da1176529a2aafd86f73c0264e970ad171f7fbeded8a71f2654459146f357b8c67c5ccbec61c2059ae SHA512 b989dcef797d9a662a2d069a2deb4bb170094bb8e30c34f1db4886f71537d7b9ef3ab3bf74acf6827598ed77aaca7306f724bca0aaf9590de214c6c192b82576
 EBUILD qtnetworkauth-5.15.1.ebuild 380 BLAKE2B 09d2cab1877fd00c93f4d844f425b0ada0337949936513da1176529a2aafd86f73c0264e970ad171f7fbeded8a71f2654459146f357b8c67c5ccbec61c2059ae SHA512 b989dcef797d9a662a2d069a2deb4bb170094bb8e30c34f1db4886f71537d7b9ef3ab3bf74acf6827598ed77aaca7306f724bca0aaf9590de214c6c192b82576
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.0.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.0.ebuild
deleted file mode 100644
index bae3d6ce6c91..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 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 f232906a64b6..ca1fcb2aa4e4 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 EBUILD qtopengl-5.14.2-r1.ebuild 657 BLAKE2B 02264b13ffe36f059e903d6ae8ccfc5cc252133114975704a1bc0785a64ddb77be30e3ad13e4bd179c6418b87e3a079deefb3dda122683e9d9e818e3675c927e SHA512 8c7ba6eb0a68b1fd6a723beba69ba3d23c91f022a092c98dc7e0537d0a25900a894a719f2436671bfe7f35976e9ac9581853f93f5f67b5b37855f6509c276f5e
-EBUILD qtopengl-5.15.0-r1.ebuild 680 BLAKE2B aa61e1c30bf829f9e9fc5747fd786f8566514833c7989f90e5ea837abfb8290a3a5d2c1c64cc8c515824be49a142e21b511058d765cb51c3344adc5151fa1346 SHA512 d3451a4b3839bfa7781a7c66c8d3442e813292c04dbf0ce2df16e82d8f96f70835fa3504a2f9cd4e5c641affed35aaace652d95e1f697bed58722b2cca589670
 EBUILD qtopengl-5.15.1.ebuild 680 BLAKE2B aa61e1c30bf829f9e9fc5747fd786f8566514833c7989f90e5ea837abfb8290a3a5d2c1c64cc8c515824be49a142e21b511058d765cb51c3344adc5151fa1346 SHA512 d3451a4b3839bfa7781a7c66c8d3442e813292c04dbf0ce2df16e82d8f96f70835fa3504a2f9cd4e5c641affed35aaace652d95e1f697bed58722b2cca589670
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtopengl/qtopengl-5.15.0-r1.ebuild b/dev-qt/qtopengl/qtopengl-5.15.0-r1.ebuild
deleted file mode 100644
index 3aaab692c82d..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.15.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="gles2-only"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtwidgets-${PV}[gles2-only=]
-	!gles2-only? ( virtual/opengl )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/opengl
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 95c1ff10dd64..8e4f211d8002 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-DIST qttools-everywhere-src-5.15.0.tar.xz 8850752 BLAKE2B fed030b2e0bdb3bf397b28e33c1afc84c0b22bf3ede5bdf9a0822f44f8cbf6f7564d0d2c04215f79aec722deeac373d2d46cdd3d7e3d9135f9211486feaf12b0 SHA512 ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 EBUILD qtpaths-5.14.2.ebuild 408 BLAKE2B 0ec3c625d045bc5d9386889a1370c7c5a05f68eb2b8953d66e07c92889d5c16e72846b990b76cead4610b0183b7b99f384465cc61def057fdafd86c23ceed70d SHA512 aee2f4a9e91fc2d95a67aab93d2fc2cec44b61edaffe988dd8a8b728d64d50ce769719e728e00705198a2d73d9903e9446cdd963002a5585b3efd5032bef5291
-EBUILD qtpaths-5.15.0.ebuild 376 BLAKE2B c982d55c17f2ef91ed863415d5fce751d691b56e8d836df5af552cc1b3bfde729b120bd7f1b89f6f434fa449dabc4f64392a6c08a0fa2a40a27a21b30bafabba SHA512 ca17f0f3f5adeb9a47a592fe9b91cb4fb05e33ae3549e66b88760a1914e5776478c0ded75c1c3d79d7e85ecf3f693a53c208f373b18bc973206b1b813264621b
 EBUILD qtpaths-5.15.1.ebuild 376 BLAKE2B c982d55c17f2ef91ed863415d5fce751d691b56e8d836df5af552cc1b3bfde729b120bd7f1b89f6f434fa449dabc4f64392a6c08a0fa2a40a27a21b30bafabba SHA512 ca17f0f3f5adeb9a47a592fe9b91cb4fb05e33ae3549e66b88760a1914e5776478c0ded75c1c3d79d7e85ecf3f693a53c208f373b18bc973206b1b813264621b
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.15.0.ebuild b/dev-qt/qtpaths/qtpaths-5.15.0.ebuild
deleted file mode 100644
index c221a48484b2..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.15.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 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}"
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index 2d4fb31444fc..ab7ca377e30c 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,7 +1,5 @@
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-DIST qttools-everywhere-src-5.15.0.tar.xz 8850752 BLAKE2B fed030b2e0bdb3bf397b28e33c1afc84c0b22bf3ede5bdf9a0822f44f8cbf6f7564d0d2c04215f79aec722deeac373d2d46cdd3d7e3d9135f9211486feaf12b0 SHA512 ebcebbc828e6a34766f2f5eeb4775d29af7b60b6124549df5256902ed2bd683721084b45a869ba76d29b1b170fe3834291af0833ab17ee8d05407c509f03d3eb
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
 EBUILD qtplugininfo-5.14.2.ebuild 370 BLAKE2B 6969a0764d14c2a08f4413c3599833a4cdca6a5b0b130d8f47de2c5e80ef195672936654d149391b891a491234148a12a6188cc387da56d16c19d5939706078f SHA512 c96b693b6e76f1115e0822136d6bc654ac7bb8c52411b7e837072917101b273fa017651ca65a6af2b4e483bfa711b837131d6844080e5db46bc339c9bae4af5d
-EBUILD qtplugininfo-5.15.0.ebuild 328 BLAKE2B 1be3d8b5073f721fe2248014dc4f098dedf4814fc173e4e58c494ccce473934932f50fe146c873a481eda0bb1e74bcaf21c417071de888523cab3d946d232fe9 SHA512 5e09c9bf54525084454997a6f9a2a2ad3686478e7d311328d000cb192aa6d3435ec71a7aec36d284d6a505ab63fc54e075b8db3df5bfe04df035904fb246ace4
 EBUILD qtplugininfo-5.15.1.ebuild 328 BLAKE2B 1be3d8b5073f721fe2248014dc4f098dedf4814fc173e4e58c494ccce473934932f50fe146c873a481eda0bb1e74bcaf21c417071de888523cab3d946d232fe9 SHA512 5e09c9bf54525084454997a6f9a2a2ad3686478e7d311328d000cb192aa6d3435ec71a7aec36d284d6a505ab63fc54e075b8db3df5bfe04df035904fb246ace4
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.0.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.0.ebuild
deleted file mode 100644
index 3082414675cc..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 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}"
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index ab0bf18dc406..55a1506ad365 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,7 +1,5 @@
 DIST qtlocation-everywhere-src-5.14.2.tar.xz 6120852 BLAKE2B 0224cd6eecc182ddb960c6f3814d2d913a2776e879bb2e87a6c11f18840e275a770977df89c6bfa1aeb174502713969b5d8c02f9c46670671034f6879a41150f SHA512 ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c
-DIST qtlocation-everywhere-src-5.15.0.tar.xz 6542152 BLAKE2B 11f218fdd4da4be7a1a7e5eff28f71144844ac6d2a70d8efafac4b5dc9fe3a32496bffeaa4446b3412de266feac72bc54b33e26e6c3286c0329ad882dadfaeee SHA512 36efb5a9a0eaaa6f2997c4d7a18307c69a80ae4caf901ab1d0efcc6cd6202dda6a10c8dac01baee44e84c14b8ab23204db1085445e1f3b42e9a0a21549eb624e
 DIST qtlocation-everywhere-src-5.15.1.tar.xz 6553252 BLAKE2B 493ea55065f03f05db7c65c22f53b96a62b3912a62f3385d393650a96b156e5a5d76dfe5ed3df8eee5ce379c9bbf36a62b6f088dab0519bd14355a7ba956a279 SHA512 b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106
 EBUILD qtpositioning-5.14.2.ebuild 847 BLAKE2B e8d6459712a242ca2b5af814787ba320db7655dc68408863f7a6b6b14d825d3510c9b70b992e359fdb27b925a433e311a6fd2ff38c6dc5bec11ad293d93f176f SHA512 fdce4556ef51773005d8e2b27bdb480ec2569704c95cb8e2ed898d8e874d3bd83df6d1c09df6f2514d18e1e0b7513b7180eb86aaa4309fdc11fc8ba1806c463c
-EBUILD qtpositioning-5.15.0.ebuild 853 BLAKE2B d89c06e274722250787fc29a1bf8106cd84b18015872482efc8b00439a02cf45ca5d612d167b9f21e934ea971eb7a44ce541e12794d4bbae4acf42cc58239ab4 SHA512 629a2deda3ab8b945e72062d4f9b5de8f24881ab0f401a429b34358243a43828b72e0ba46d4d1b691f85b3e5f8e3b69053e22afce9544ec862566914b049d766
 EBUILD qtpositioning-5.15.1.ebuild 853 BLAKE2B d89c06e274722250787fc29a1bf8106cd84b18015872482efc8b00439a02cf45ca5d612d167b9f21e934ea971eb7a44ce541e12794d4bbae4acf42cc58239ab4 SHA512 629a2deda3ab8b945e72062d4f9b5de8f24881ab0f401a429b34358243a43828b72e0ba46d4d1b691f85b3e5f8e3b69053e22afce9544ec862566914b049d766
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.0.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.0.ebuild
deleted file mode 100644
index 0db24b237f92..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.15.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 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 5242e9c1f4db..fb1804bd8ce9 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 EBUILD qtprintsupport-5.14.2.ebuild 782 BLAKE2B eda12b0d36a6e7cbe8c012ad1bb2651f60fe2c6be4f5bac0edd74048758467252110a1a002a2d526c2093715eeb3e3de20b5099708701780848d370270c10022 SHA512 0edc6c43dedcd833efb4ee37ce934266354da9a482b1db77619ba529c2cc4223b51b86c72c433b8462b09a6fbb603819ea396d40394732cbd1a24deb7df83ca5
-EBUILD qtprintsupport-5.15.0.ebuild 788 BLAKE2B d706d8e3afc1d8cb1d7b9c9af2320fcf5a6040fb7e53a268374c966274b9b10d6a4b66e44ebda267a5ab23c80566f8d690ed2fe97c9d4e829431b9e89839d3f6 SHA512 d42803cf2bc3d45c94bf454001fcb4a155121a230072e494acf03efaf85b3c35993fb20106ff966ad09026e8240a1371ea7e2616e7a63679b441d678341f079e
 EBUILD qtprintsupport-5.15.1.ebuild 788 BLAKE2B d706d8e3afc1d8cb1d7b9c9af2320fcf5a6040fb7e53a268374c966274b9b10d6a4b66e44ebda267a5ab23c80566f8d690ed2fe97c9d4e829431b9e89839d3f6 SHA512 d42803cf2bc3d45c94bf454001fcb4a155121a230072e494acf03efaf85b3c35993fb20106ff966ad09026e8240a1371ea7e2616e7a63679b441d678341f079e
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.0.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.0.ebuild
deleted file mode 100644
index 5945c013cb24..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="cups gles2-only"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtwidgets-${PV}[gles2-only=]
-	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-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 77105db27198..8fe0dee6776f 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,7 +1,5 @@
 DIST qtquickcontrols-everywhere-src-5.14.2.tar.xz 5981560 BLAKE2B 91ac3b77d0f1e83a489148aae8b143d2f1131020084c22dc0a2ad9aecbff16bd19ea5a3f09eaba3146e5034b6914a696d6eacd0307ec8ca7c260318c49772564 SHA512 e5076d838e54e8fcc62ffd76d66ab322f1927f6489c51dd0fa6e39de1e003c1994d24730da79c8d9d2747839faaa7b1b78f14b58f05447db440a477094be40e4
-DIST qtquickcontrols-everywhere-src-5.15.0.tar.xz 5981340 BLAKE2B 50ce39dfefbf962141a1ea6df63d4a96f65e00a373a651761a94fa7567bd8d96dc7a4f4b614d9a248fd6cb1dd007b27744a03e1d708c032832338bb3831df518 SHA512 bdfe850e13275ae074c257b75697141a9b8af5a334e114d3ac28f68a820e4b9f40ad936db96dd119dcc77ca12d6aff84cee16613b0695f594c862dcfbf942a48
 DIST qtquickcontrols-everywhere-src-5.15.1.tar.xz 5983304 BLAKE2B 14ec58e4a1ae70617c74bdd5c3cd992e0c3a2c96540963edc2cba796e7730607df331167a928fd2e2dedc27457b4b27824b680b2670ca8e538423290d8cd6776 SHA512 71e6ee040bc76dc1576d31ff2c1d687e115f4c6dc63307e64c8173c2441835923375ee6b7f5473b3ec8c586f34e04b061b9a9e16b7f34b4075cfa0278599d2ce
 EBUILD qtquickcontrols-5.14.2.ebuild 737 BLAKE2B 0a94889ceea8601da415b2c3327e299669e199b9d1fa02f9ddbac0b7aaea0ebab22a39251f623ad7d7981c23bdd9507abb0c578b4781a866f9a401fef5a3bf03 SHA512 0e93c4e36c6227a4bf30676f8fba75d181f9ebbb7ac0dba90bfe0ee9931db1b1cb5231b6734bacc31ef13b3a8c848a59178df3a3c4b32a315b2b61555cedc688
-EBUILD qtquickcontrols-5.15.0.ebuild 742 BLAKE2B bdb7ed3afb9cee48ff6ade378810f953b6ea60d3bb9704efbeffc13fdc48d5bd49fb7029ab21117ca13f56c03d191d3c642fbc92e893a7a2451050953a982974 SHA512 78ee6efb4d458c0361f98bbd6269be84107fa488b43d8fa77f5c54d0543f2ed9d738e6aba3a2219c3b25387fa482c988167f0a27d0ebd35663a74cf1b0a9025f
 EBUILD qtquickcontrols-5.15.1.ebuild 742 BLAKE2B bdb7ed3afb9cee48ff6ade378810f953b6ea60d3bb9704efbeffc13fdc48d5bd49fb7029ab21117ca13f56c03d191d3c642fbc92e893a7a2451050953a982974 SHA512 78ee6efb4d458c0361f98bbd6269be84107fa488b43d8fa77f5c54d0543f2ed9d738e6aba3a2219c3b25387fa482c988167f0a27d0ebd35663a74cf1b0a9025f
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.0.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.0.ebuild
deleted file mode 100644
index c2df28c1c253..000000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 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 f318e102af68..ac8be767fa71 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,8 +1,6 @@
 AUX qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch 2268 BLAKE2B e321a635cc94d92245291539d862aa1cfc63bc6a558d6ddc792800be409dff11b1777349aed394d0e9df5dbfae29cd71681271eda1c68745af3ec1e1e76eabed SHA512 6d559d5c128e0046319fb8d6bdd3914a30eae41315efd267e6271c3f69759024abb79c7cb3a604c8bb58936a2daf25fd1217ee877516b65b8d5262fd76dac39f
 DIST qtquickcontrols2-everywhere-src-5.14.2.tar.xz 8153752 BLAKE2B d1803007fb016276b75db9102ebfd82a6afa279b845d3507a04b76c2ab6fc8345840f3ea76c12607ed2b7be11e2b2c26bb76ff84b65a4c8df7cf9c66dbd95003 SHA512 de8b669417c2d039c0f49e805be72e757877991bc3c7feb13417202a4964cb6391924837751c520ed6234930e90dfe00417ca1c369418b2cdf4f09da679ba722
-DIST qtquickcontrols2-everywhere-src-5.15.0.tar.xz 8164236 BLAKE2B 7e5e2b2640d6eda1864d04a397f91e69a79b5b0590097f2c8a9a06e26ec8f9a0c09028f2fec87acba91d0df568d6085eae50ccb7962c50be6a3de64088f122b6 SHA512 560014b882ef9d274cb1532025cae79987eec3569541e111e91f047261fcd7f26fcb40689d8dd6921ae26fbf9cdee60a87d3a1c7212e547529ff4adf9c5cf136
 DIST qtquickcontrols2-everywhere-src-5.15.1.tar.xz 8282444 BLAKE2B 94be5403a3642ceb1ce8eb7ceae2a116743f5ee75c0614448bbfb846918d108f3c5bb6ad881bb63eb30082f0bbeed28a49e32456d335e67f19dc65418c76216a SHA512 ecb75619e80b737e3ae214f65a5175d933f8dc7832eb4eccd469fc1cb1eb85ef5c47f81563165da2d75abf15d7c47b868e68ab758d95183371b4ef64e7c52a39
 EBUILD qtquickcontrols2-5.14.2-r1.ebuild 696 BLAKE2B eb186869701f065ef1b1f8bd3e51055bf796c388dd9f4511fbb5471911e193a0a9d451fcf3a1c1bde2699123420345c08c20ca6df221ea33cabc78b376fafada SHA512 c6103cf3fdabf9b9c105426032b0c41ee3397aa94363d098cc06e1abde3d1cd46591022c9d845b4c8a41eea3605eca126715b3e471c8623f55d2d4098c4932b4
-EBUILD qtquickcontrols2-5.15.0.ebuild 609 BLAKE2B 1406936acf30b318039b6616e2e91f0fce406aa4ac70566c4ace70105ab71325b436af86f8c9144adf2e928fa9257d47a6e2913c5f903ed53b48135d9593d7f3 SHA512 3e005ce1c3ffcf1090cea4d536bcd00328cb657cdefc9bb311bbf14fe072d7533b05b8cd41c66f0661feec85482883a01d3e52eb97da202e6513b6002448da93
 EBUILD qtquickcontrols2-5.15.1.ebuild 609 BLAKE2B 1406936acf30b318039b6616e2e91f0fce406aa4ac70566c4ace70105ab71325b436af86f8c9144adf2e928fa9257d47a6e2913c5f903ed53b48135d9593d7f3 SHA512 3e005ce1c3ffcf1090cea4d536bcd00328cb657cdefc9bb311bbf14fe072d7533b05b8cd41c66f0661feec85482883a01d3e52eb97da202e6513b6002448da93
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.0.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.0.ebuild
deleted file mode 100644
index 90962415a9f5..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 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 ~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}
-	~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/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index 0d1317c6226f..4971871720a6 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1,5 +1,3 @@
-DIST qtquicktimeline-everywhere-src-5.15.0.tar.xz 102460 BLAKE2B f563ba5ab8ec1171e32a85422529a9e4e14833377091f3bd66d3f72b14671acc74db9dd11f3d56719921bb516ead885ce6cf994f8b00ea6a734a0f7b9371c451 SHA512 14e0f52800bf7b347f03264f306f2c13f4c0bf590c8881135b3bfeb1a08cd07248345de7ab7d3ae9af39f75a5247c0c9f98dde33466481995e45a93717a937b0
 DIST qtquicktimeline-everywhere-src-5.15.1.tar.xz 102556 BLAKE2B 25b0f9928e301f851613a288bb686ec65ce576998592013b4e8cdfade9114295adf3a1a60b0a792d5eea446ea2315a5531348d24d99e90f7fdb0251162e56cbf SHA512 698d91ff998f0075956fc27897708c75c4ece662f2152449cf2416f84ff17b6b7fd309c5705d1152fe814a646122985758b073bd8fb0ea5456b09338ad9dc6c2
-EBUILD qtquicktimeline-5.15.0.ebuild 378 BLAKE2B b009dfefa46775bb4b254b7d78669219e08e527741ed6f0a1f679e43f4344301c630173caa1adf9b67072e58732c3ccb3017ebaeed4c2974e5c4637731e92230 SHA512 96a042c936a7867a7a4d78218b935fa4ab4235269ba883811579fa46d76e43e1b14bb9ccb1ae987a84581593aabc0d5e4403d4e926a0166ddfdc6a6c5229e77d
 EBUILD qtquicktimeline-5.15.1.ebuild 357 BLAKE2B d7ab992791b227d9244c633f275e44bc2371ea030c223ccefc5a13d4b91c8ff1becf5209f5aeb64c9c5a81711f21b86a2c0306d3b7d9016d0b8c705cb4f8a5d9 SHA512 a3bfea6bdc195cdf55bdfa4dc08a8748e00989670db24dc120632b1fe7815d2e07feb108931b6c46f2a344701b79580bd0763e0af9eca38279e5cc1192c7d05e
 MISC metadata.xml 382 BLAKE2B 3b12c68b32cd705b033f8750db3115587b76d52369a33481330d100e3bbd22dbfbcc0ea065f7659e6771af923477f2fbd1d4fc86743d13fc64f194e7b014567b SHA512 4825235a64c6320484a0bfd188dc1f4a0686f6222ee4abd29d6904899eed14f6471358562e8f08cd9b90743a718383e980925a432917dbbe3abba1872c631951
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild
deleted file mode 100644
index 1bcc027cbd41..000000000000
--- a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Qt module for keyframe-based timeline construction"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-"
-
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index f6eee22277ee..60f8f0f81c28 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,7 +1,5 @@
 DIST qtscript-everywhere-src-5.14.2.tar.xz 2654528 BLAKE2B cb749d1db5774ef1e236ec82f57ca17fdb85bfec02f7dc346ceb0bb316783c8e1bdfe5b4d0a6339b3b91050a8a003b1fa221de10eadfd1f5b8828dced669c1d8 SHA512 2eef6c4d23fccd67abc3647852ca92edd951b4ece8047f28571689a143421c5a1403ef0fcc96615e4ed708df64f7eede643d872fac850554031a17e2d907f398
-DIST qtscript-everywhere-src-5.15.0.tar.xz 2654416 BLAKE2B d2d29e0fcde401e698bd5619a8ce386513311f134c1e2981d9f238917a76f4c7c737b2897a885ea4ad720929fb25f2a3b277a823995f5824241cefb553a6adb8 SHA512 0f6b72b5b0a892ced4653e9184256040b12a804f796c922aad318fc03734e3bf8fbe175b0eb886e71899287082c09fc06a290dcd5ddb1967c65b0f72d4adea94
 DIST qtscript-everywhere-src-5.15.1.tar.xz 2663232 BLAKE2B 3bc0c6bce1f7792fa67cc05f1948b3ca82a4ba5c3166f55860ba83f5b9a352d2eddeb9586a967e02251e1be143b6f1aeefcfd7dca627c207190ab1b39b2f755a SHA512 f97bdf0a3a402f2658d23c92d2f0d916bda68b63f1f140f90cb99176e969736758d50cbdc36c5a4b135b08cb74c117dd92c29bcbb41b1a28189af9180604b8ba
 EBUILD qtscript-5.14.2.ebuild 673 BLAKE2B 66f10b67e1537f458f04eaa08f7e491a34c4933f10d37ef7651523adb57035edb7ac0ca950072e2fbda44663e89cb8e867e3ba903f38dfeee1f4173efb18ad09 SHA512 e34a5fede7ed1bd12b9ac64a8ba33dcc06282eb8917c31ef85d6473c09632ced63c6cd00baf5f50192f6855ea9111f7980f79baee14ed57c24dd682b9bba7998
-EBUILD qtscript-5.15.0.ebuild 678 BLAKE2B 0b449ad3b23cd214f0e96d45aaa95fc5f44d8e3ead2e39f01bea6d04515ff81096e972d7e0c3413096ad3f2b65a455c989bd402be40b4ff116128a7f9599b756 SHA512 e0e26d042129ac2745351dd1680aa96d08be783b06580cce163339aba3d25e483fad6056e8ffcd53d29b20e5dbab530801e5261daef7e5d6219b67a57a44b041
 EBUILD qtscript-5.15.1.ebuild 678 BLAKE2B 0b449ad3b23cd214f0e96d45aaa95fc5f44d8e3ead2e39f01bea6d04515ff81096e972d7e0c3413096ad3f2b65a455c989bd402be40b4ff116128a7f9599b756 SHA512 e0e26d042129ac2745351dd1680aa96d08be783b06580cce163339aba3d25e483fad6056e8ffcd53d29b20e5dbab530801e5261daef7e5d6219b67a57a44b041
 MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652
diff --git a/dev-qt/qtscript/qtscript-5.15.0.ebuild b/dev-qt/qtscript/qtscript-5.15.0.ebuild
deleted file mode 100644
index 34b9dbc92753..000000000000
--- a/dev-qt/qtscript/qtscript-5.15.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 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"
-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 fb3eda749a7b..7dc549efc850 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,7 +1,5 @@
 DIST qtscxml-everywhere-src-5.14.2.tar.xz 433268 BLAKE2B 171e4f6f6a97ee673dd985b63d3ecffabda911276f4e916f4a9c63bf1fb4367972f102a1638ded3e26c5fee706ef0391d4cb6eb7aa0823b33670641a9fc2e2ac SHA512 2e1cbea7c32d93675b4a67287dd17c9ed120a6655f8f9a30edfe12a16f67b3c5ad6d0fd04c0102297693bf87e225d81e963534958c8e73622c605388c9fc8425
-DIST qtscxml-everywhere-src-5.15.0.tar.xz 433368 BLAKE2B da6582f28aa9f3b4a6f27d493e0187f0c5d0951900f756c0929e60ac907f8214c0d769f5f9e8ad03803eb171df7dd5806f18e9e0d5b47481a064a29f140157a3 SHA512 196ab4a8609695bc442a915e229183f3ece97ed03c93cdc7f93bf6c7b68ea89a8a6ad04e3e4909c9aa0780d8ebd366338ea6e8790ac4fae08806694e27c115fa
 DIST qtscxml-everywhere-src-5.15.1.tar.xz 434168 BLAKE2B 7957a43ff527763137dfab45bec9242e8ca9a5d308ab0b7d1d9057f8e362f24ef73de19e61e1301922be87082ca07eda1524704916769875e5ef879710c661d2 SHA512 893c3b247578c330db9b828e28e4df83b0e966bb469f1f453569e0226a8181b642c37f2198ff4194bec7997daee9578bebaaa7166bf1be8b67693edd0fbac082
 EBUILD qtscxml-5.14.2.ebuild 375 BLAKE2B 488f2713fa30213e6bdef1e7b2d01d5f503df83ec1ad4c8db35ba945e642dbfce0277e5eff24c4656b4c40606854f8e3279d917d21ecb2f87effcbafb1e9fc7b SHA512 1048e723e5db13641136f48b75ca2f5a43313f3ad848dbb6a519dca5d145894da16bb5f6b69b0a658c7e3e2678ee47d15dbff1fc9ad3888f59ca991302c1cf5a
-EBUILD qtscxml-5.15.0.ebuild 378 BLAKE2B 3e6955daf78fefac62ca4a03eacd2e7574d07d8d1fecc693787564dac921b182d67c4b175b51a58fa3f7072664444f074209137cc17f71890abb273d7e00a751 SHA512 52dffec83484d799250008f1b4b96be235c81d5ec721507efb821ac8c04cbe65e2699c201302003467b2ddfeef9cddb43d4d8f56630dfd5462b8126c01bd0475
 EBUILD qtscxml-5.15.1.ebuild 378 BLAKE2B 3e6955daf78fefac62ca4a03eacd2e7574d07d8d1fecc693787564dac921b182d67c4b175b51a58fa3f7072664444f074209137cc17f71890abb273d7e00a751 SHA512 52dffec83484d799250008f1b4b96be235c81d5ec721507efb821ac8c04cbe65e2699c201302003467b2ddfeef9cddb43d4d8f56630dfd5462b8126c01bd0475
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/qtscxml-5.15.0.ebuild b/dev-qt/qtscxml/qtscxml-5.15.0.ebuild
deleted file mode 100644
index 470c269e1553..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.15.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 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 ca8de205f9df..1b453c71bf3c 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,7 +1,5 @@
 DIST qtsensors-everywhere-src-5.14.2.tar.xz 2050616 BLAKE2B 7a31fc1d57fd925baf8c3fb38477f5888334f64bf08f55ed557db85bca12d6e9d24bbf38e2cad0b74774712a1311a2554c35155507887d7c032d25ae28d47f1c SHA512 43872a51163317c2fb642f59a9e41ede77cb86d7148436d9e673ac94543fb8acffe4e040824dd88a9029943418a3371c77815b82a0a566426857d18fbc23e341
-DIST qtsensors-everywhere-src-5.15.0.tar.xz 2050404 BLAKE2B fff161588cdd0d4c695f53f13db75e32f68aa38abad362dedb2ec16fc2cc317c23a8ebd744bc00362db9f8d0f2ad22b181c2c3008df108c180da9a89a8d4d010 SHA512 b03e2b68d14bfa557fdbf742d26c70a960b92cf5a5884d499825743553da42c5044cced338b86682081f57fea41686fc00c0565f3f4561d945e099de5b8ebc9e
 DIST qtsensors-everywhere-src-5.15.1.tar.xz 2057232 BLAKE2B d4b609db7a73fbaf8cb3da02e34639491a778dab10061de7887bc76f39bcf712d9529fffd1712f94551da350bb9f0f823eac48a6d9be0a4d73e0fe9753bc475e SHA512 ef0757125a6c5b89e206661d1d0e0674b673a81e1a0be1de9de2fdcd701fd507b0b47e1b67be013cbebbf846f593e37e4ef2941dcec4b78028019820d1fe7c3b
 EBUILD qtsensors-5.14.2.ebuild 536 BLAKE2B 48630342602f666f624b5da0ceefbc9c6a9370a044518def4e19a2c68a9ad7210cf3b8b8288d9826382de90ef977fc78adc6c2df0cb3f0ad14ffa3f56cbb2d9d SHA512 4ea9d013e8ac45b0e3bd38a634fb330ea693a88d357b74e24cc5d53c7e08fa5ff6d1a1a83102dc0ef6b5d2f0c66efbcbdab3f440a1c668ff4ffb435f0328728d
-EBUILD qtsensors-5.15.0.ebuild 541 BLAKE2B 5dcd6d002fc93ed5d9b6c16beb21a00232cead61bf2e5ae49764e306836fc64b0339b6b0859534535f74942ce9f1ed3414bd35e44cf50a37413269427747d590 SHA512 56a3f5c768d42c2b3d9e1575ff3477792d255a7cef1969c69317bcebaf82649dba4c31ac1ed64ef1acbfd168173270e4b963eeffdc851d0beeba88a6f96f30e5
 EBUILD qtsensors-5.15.1.ebuild 541 BLAKE2B 5dcd6d002fc93ed5d9b6c16beb21a00232cead61bf2e5ae49764e306836fc64b0339b6b0859534535f74942ce9f1ed3414bd35e44cf50a37413269427747d590 SHA512 56a3f5c768d42c2b3d9e1575ff3477792d255a7cef1969c69317bcebaf82649dba4c31ac1ed64ef1acbfd168173270e4b963eeffdc851d0beeba88a6f96f30e5
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.15.0.ebuild b/dev-qt/qtsensors/qtsensors-5.15.0.ebuild
deleted file mode 100644
index 6780b05a4fcf..000000000000
--- a/dev-qt/qtsensors/qtsensors-5.15.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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 af793f1ed7bd..db38f83749bd 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,7 +1,5 @@
 DIST qtserialbus-everywhere-src-5.14.2.tar.xz 349808 BLAKE2B f2c11796e412fef11031ce881c7e6684572bd67f7bccdca1b98a7099d19df57d184ef8b33f5b2df4f516b5922b482dfe32122411c98a6f73fca66104ec70be64 SHA512 c98c7d30dc7f44837a601088b2797bc85d8b659dcdba5f22c229edad0fcee57e38c5b5d55ed223f22c9ce4e14b72ea6e59b920d4f4b366d0381b208e3e9cff40
-DIST qtserialbus-everywhere-src-5.15.0.tar.xz 351232 BLAKE2B d172ab057969252d706db61dfc80c1c88d469c5ea78210f4bd2f5c6fc67e4fadbab82a43fcd790e3f7789bb11868abff626cf629d13ba68c759297ef97e24ef7 SHA512 8a606fd407cb7a4a6a1f15f10daec952aa010684d6cfca7fa024f850b3db419b7cd67eecb58ba0c0dd283e10fd904a255ab42b279c38081e84fe06b7b22c4c49
 DIST qtserialbus-everywhere-src-5.15.1.tar.xz 356308 BLAKE2B 980c78aefbbfae6526d65ddce65276ec03b3c781529938d5a43a8e285dbb6f51412f54d7f9c17d6c4c8db3e9734847c0134805fd45367c39508636fb9c801d91 SHA512 cd7e0d721aa46a59239f44c6b0122509aba2237e0e62ea5399b4d4924601a9def989dd8b5d17fdcc46b41491d582d82b46c7efdfb9277ac1f06da7f1e2a1a859
 EBUILD qtserialbus-5.14.2.ebuild 414 BLAKE2B 1866625b93493ce873ce5f3f3fc0c02e8f62953b8c0d1d5bf009e0d23de8d426457d7ec7772c7fb52d0d7dbf5f63e3995e1745e67159737ecf44be431bf75c99 SHA512 14e4ce2c8eba7e423d0b7240d9f9be7ed1f72b1384409b68103ce84a690e2821893f0c243b451d5da532fb24f7a3eb971ab1684d861009273f41223dbfc8c755
-EBUILD qtserialbus-5.15.0.ebuild 414 BLAKE2B 1866625b93493ce873ce5f3f3fc0c02e8f62953b8c0d1d5bf009e0d23de8d426457d7ec7772c7fb52d0d7dbf5f63e3995e1745e67159737ecf44be431bf75c99 SHA512 14e4ce2c8eba7e423d0b7240d9f9be7ed1f72b1384409b68103ce84a690e2821893f0c243b451d5da532fb24f7a3eb971ab1684d861009273f41223dbfc8c755
 EBUILD qtserialbus-5.15.1.ebuild 414 BLAKE2B 1866625b93493ce873ce5f3f3fc0c02e8f62953b8c0d1d5bf009e0d23de8d426457d7ec7772c7fb52d0d7dbf5f63e3995e1745e67159737ecf44be431bf75c99 SHA512 14e4ce2c8eba7e423d0b7240d9f9be7ed1f72b1384409b68103ce84a690e2821893f0c243b451d5da532fb24f7a3eb971ab1684d861009273f41223dbfc8c755
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialbus/qtserialbus-5.15.0.ebuild b/dev-qt/qtserialbus/qtserialbus-5.15.0.ebuild
deleted file mode 100644
index 2b783f499663..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-5.15.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 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 4e88e474f1b5..df4958efafde 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,7 +1,5 @@
 DIST qtserialport-everywhere-src-5.14.2.tar.xz 316492 BLAKE2B 38aaf7053fde382b0b161356fdf9ab97bdf08b6307bb97b704b846dc26a309b1256c6cb53e8caa0207ffb2e174387059debba0f0256f8893f60b1c1fce58fc5a SHA512 4a4fb81bcccaddc5902223940031a9002395cbc5e99c78c1ac5df04031b6a0551bb340757f84bad82ca7ef551358c1eba3a035b0b8f4221f7db0ab738ac65b06
-DIST qtserialport-everywhere-src-5.15.0.tar.xz 316596 BLAKE2B 8e419f9fb16bda1d1f53bc77dc352298586e7889b7711549d5b33284e1ec6733c9d4c2318d9d313b5476935fe0f69f9da4c2a563b4356c841e84c6bae2f4254d SHA512 121837c0848c69414268332ac41538b9df1c1503ab81bcf281903b73e02f5adf34b615ebc1fca4f4e6bf0b7c8c1b3f2d4dcde20152e2eb913c965eb910e378e2
 DIST qtserialport-everywhere-src-5.15.1.tar.xz 321472 BLAKE2B 6aa086b8ec8d79abbf1f428913800a67e1a48fb8629c10058fc464b913f3840a9dc06084bf181749b543f4795400b93f133ffe74cbc546986bf48e01317bb883 SHA512 5d2e9742d1c5f784375b3d0bf05e227abf1f358f4ba60e66044378b60ac256dda2ab5ecced07c68ca8d93fe894617050821654200e1faa12f4cca112a4fbd2a4
 EBUILD qtserialport-5.14.2.ebuild 545 BLAKE2B 82a3262e3a30a69cd5f324305faf5c2bd25df98bbf1899b4d8b3fed700a037be944328c08209a04d292161bdfe029ff6eadcb9522ce52a302d54fd30de9ff574 SHA512 b564c50192987ad7db7e3ec67d4cfc967ec38fcf7bbaa7ac16573027947e9c1f78ab7d91f0b51200cadfb38c96122ab31ee6ac0d74e4a081f147caf5b5dc0d2c
-EBUILD qtserialport-5.15.0.ebuild 551 BLAKE2B 6350ce0559c0fe8bbd286800f537fc75a4acbeb3a66287abacfa48772b2963657a16f1a2178f75a18d66a8b9ba56820d8ffbd00adffd5018c5c1d54dc5d083be SHA512 8e19ac9c8b00974f144ed31c1540cf5c78aefbc6e1eba6df609b6a0a85ac4c78fc95399689c28394e998ed90247b4f5f4623edb33f9cf737864fef6658013554
 EBUILD qtserialport-5.15.1.ebuild 551 BLAKE2B 6350ce0559c0fe8bbd286800f537fc75a4acbeb3a66287abacfa48772b2963657a16f1a2178f75a18d66a8b9ba56820d8ffbd00adffd5018c5c1d54dc5d083be SHA512 8e19ac9c8b00974f144ed31c1540cf5c78aefbc6e1eba6df609b6a0a85ac4c78fc95399689c28394e998ed90247b4f5f4623edb33f9cf737864fef6658013554
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.15.0.ebuild b/dev-qt/qtserialport/qtserialport-5.15.0.ebuild
deleted file mode 100644
index d510efe398ec..000000000000
--- a/dev-qt/qtserialport/qtserialport-5.15.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 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 e17c2c5733e3..7c022815f471 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,7 +1,5 @@
 DIST qtspeech-everywhere-src-5.14.2.tar.xz 101100 BLAKE2B d37d08a2f7e6d40c7f6e68f9c4e301cdf9762ad9088a3fa0f9568af7211a2842b035e8f5eb001538aaa84385104d112cd6e550e32119099acee922f2dd13db36 SHA512 d3870cc66cba4f5dd2c0a2a4845defe4299de2d7affe12ccdadc4948116317590b580592d575cc5e8eb190043a92f38416e030f47cfb87f5cf3419a31152e00f
-DIST qtspeech-everywhere-src-5.15.0.tar.xz 101240 BLAKE2B 0f01bb8e2f476d6b58627ca18e1a0c2e2bb275e7abf3d2f9af22e61dfe1f0b7c4a8da2e7f376eada53f9fb98be51a8cdff31c86500805245c061918b36ebee0f SHA512 9a63c5957663db0c4b9587751b90d9d84881bb60f911435cb92998898944f6ed4e7aa7c12e8196a6b0c7bdac1d2abba62145b99cd834fbab1d57e88e60ddb59c
 DIST qtspeech-everywhere-src-5.15.1.tar.xz 101772 BLAKE2B 8a61ff9d5b0ba33ef3c82e26f3e4ae91ff0a6af848ae2bd26c0f0850cab0cbc701698c712e528cb6bb9a66ac699519f8235cb2c62edabc4506bf397ca747401c SHA512 0e2c82ea72b5bff5b36f3d833d80dec68b39f3b9c3ca4d9c9fa29f0419a45dfb19ac59fb105136c551f6bbe60ad32af0f4aaa6abafb5bc61bc5d85ecb94b326f
 EBUILD qtspeech-5.14.2.ebuild 440 BLAKE2B 96b4f7a9025b5a9635b5fe07c998a2a16b4547df7ee0738d092cf26de9ac5683ea21c1c1493a8366efc56131883a3ea4d37d84e7f32edef556eab86445f283ac SHA512 24d61a8707bddedd9dee8d1d76ff3a868505280115f62e264f9677a8c0b99306366f2672cb0385b878a3e74c26e973e8d03ed9b5f08de7f9b3f0784defb93bd0
-EBUILD qtspeech-5.15.0.ebuild 443 BLAKE2B 01cc92ada40c606dd525c64c2204527cf5f9ecea3a56ec9c78b44732e57566e0cf91ee933d1589c20a1ffeefb77fdb46a50521b846f18c8dda2336ff0fb4f252 SHA512 960505cf48951041c7ea2cd4a70e9ff7efd8cace21c5b64923cbba26815a0cdc2cf2f1472546000a1ff8ef5bc25902629861b161c932e6bb98d48e0daa652987
 EBUILD qtspeech-5.15.1.ebuild 443 BLAKE2B 01cc92ada40c606dd525c64c2204527cf5f9ecea3a56ec9c78b44732e57566e0cf91ee933d1589c20a1ffeefb77fdb46a50521b846f18c8dda2336ff0fb4f252 SHA512 960505cf48951041c7ea2cd4a70e9ff7efd8cace21c5b64923cbba26815a0cdc2cf2f1472546000a1ff8ef5bc25902629861b161c932e6bb98d48e0daa652987
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.15.0.ebuild b/dev-qt/qtspeech/qtspeech-5.15.0.ebuild
deleted file mode 100644
index 12d0485fe59b..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.15.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 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 ~ppc64 ~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 6d1291b030bf..c9b0c140267c 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 EBUILD qtsql-5.14.2.ebuild 1239 BLAKE2B a65b09ed09699d01364d43f487323b0ef5e1c58a607c6e7e533672fbcf8c0ebf5f4269e319b667e46993950656686f8f6cb53d9e9e508fdab9e8e4711b832d30 SHA512 1aff70d3a2c73024c88c51d9ba523f47031b1c66dfda7b62aeb7267018b4e9f6fb22ac067f11fad84eea917badba57c4563b0a1902df825905a9ecc96a28e1cf
-EBUILD qtsql-5.15.0.ebuild 1245 BLAKE2B b2306d8520913bc9532e8e3c1913dfc54afd485e670fa2f556d02fbe8ae11bb33e53cbe98fbe897f9be6b6031b1b5c894f24430cd9c58d984b2e3f5a2a5978c2 SHA512 2b3fd69def9c1c24f672f78600daf57d1f85f5f0f4971b6488d280f9318cd182fde889040ecc883888fc2d0675499baccc5d615f1e40c39a9df34c6388fd9d3a
 EBUILD qtsql-5.15.1.ebuild 1245 BLAKE2B b2306d8520913bc9532e8e3c1913dfc54afd485e670fa2f556d02fbe8ae11bb33e53cbe98fbe897f9be6b6031b1b5c894f24430cd9c58d984b2e3f5a2a5978c2 SHA512 2b3fd69def9c1c24f672f78600daf57d1f85f5f0f4971b6488d280f9318cd182fde889040ecc883888fc2d0675499baccc5d615f1e40c39a9df34c6388fd9d3a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/qtsql-5.15.0.ebuild b/dev-qt/qtsql/qtsql-5.15.0.ebuild
deleted file mode 100644
index 4853177b0b96..000000000000
--- a/dev-qt/qtsql/qtsql-5.15.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}: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 )
-"
-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 df63af70073b..832f3baa9dbd 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,7 +1,5 @@
 DIST qtsvg-everywhere-src-5.14.2.tar.xz 1880100 BLAKE2B 285732e614c5aaf3a4ddb644cdfb3cd35708985d79d6ab3aa5917fde35d43fd656b5c6fbc5f08764b6413e5f0aa8919f70966791ece15fbb2d96c38b9575e27b SHA512 b4cf8a7081e01caea3c71826d32ebb9da6a71bd4eab3cf353e87080009065aff2c533300c0c08a005ff8f441d2da641a097319114a5c11b618398fac41f574a7
-DIST qtsvg-everywhere-src-5.15.0.tar.xz 1870588 BLAKE2B 34c402d20bcfaab4404ff23436548d64fab0c59a15a94a373a9118dd0768e686c1fed225646ee78074fb7326164839ba40ff1d969d1196040f2b60a044ae41c8 SHA512 24e5b3000ee6657e6c579026d979322aafaa42b3081e07bae17cf6f276a45a9d830db6b23fb7d30d6ff4f32f63c88e258dc55e193c45de8e4069aad14cfda71b
 DIST qtsvg-everywhere-src-5.15.1.tar.xz 1885556 BLAKE2B b17906bce25066581fa4f53c4b35dad918da737fec8a966c891a150a242a787f231619fa6b1a303d02edfd7cde4a977fc3c0f94eb993bef56e4dfdee81892f20 SHA512 c0289bbce4682eef9cd87811ad11a4ce2141cb89bd026f9cc595123e6b4ebbe9e81a91b54bcf25fbf4225bc66e8a5e4f49e4fabde43e9da066583f22aab4f35f
 EBUILD qtsvg-5.14.2.ebuild 451 BLAKE2B d154e4b78c680657d6f216ace6bdbc319558e8517244ab2bb52b25e988507b8f7440464954e4bba9d392645ddd1d8a981f1810abd9ec649436c1d626b6bb8129 SHA512 15f4a361304656857c069370ea9807268f9176a38c085cc2ae728081d782e2b6c7f58dc41806ce2ae8a7bfef135c5cf96861b3651620cf2b3f59e6cd78f7e320
-EBUILD qtsvg-5.15.0.ebuild 457 BLAKE2B 6465e3adcb5719db36899e6a68af8f3dde1e6ae72b321f845bc78c46e6533f334dea6ef7e5863b4d55fd2c9e1a724844e864728064c6f63ddb6221732650e5b3 SHA512 21de92c7242d66faa1fcb8fb1d3624b3769803147c2d5edce05a03fb745c26a37b5a4c96a9a153e19645d6d41519adaf86a5f10a2d3e29a8cfd31d0198b1a49c
 EBUILD qtsvg-5.15.1.ebuild 457 BLAKE2B 6465e3adcb5719db36899e6a68af8f3dde1e6ae72b321f845bc78c46e6533f334dea6ef7e5863b4d55fd2c9e1a724844e864728064c6f63ddb6221732650e5b3 SHA512 21de92c7242d66faa1fcb8fb1d3624b3769803147c2d5edce05a03fb745c26a37b5a4c96a9a153e19645d6d41519adaf86a5f10a2d3e29a8cfd31d0198b1a49c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsvg/qtsvg-5.15.0.ebuild b/dev-qt/qtsvg/qtsvg-5.15.0.ebuild
deleted file mode 100644
index 9584f7c08b50..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.15.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 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"
-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 cad20efbd915..85996c8f2097 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 EBUILD qttest-5.14.2.ebuild 538 BLAKE2B a54ae313c9ef16001a6b8d5d0d7ef11d0d55c3bb67789192b849a89e9dbbc713534b20819709ec1c22562df3a2039e4abebb535a60938bdd4e63bf93d2509d43 SHA512 71d8910554b8e3ea421a47c35487d1ab560ceb66c7d3757016004ba01d642431c36dbd7c1c97e2bf63cbd8d45a8b91b5bb9119ad340309f95c2380f8663035b9
-EBUILD qttest-5.15.0.ebuild 544 BLAKE2B 745af979b2651358e3184e953260b736c9a0231b427bc9a0fe540421e68dda5e1dd95fe4c892f6c311b44b963c7cd6ee2ef244bc08fdef117e0f9dc81fedd5f5 SHA512 f78087bcf51747557cf3c0299638981958bf4503edc9ed97a0c479a836655814d48b2f78d18fdd10f05db661b33a63915b746422dc53eb6669d2c3d1ad54d1aa
 EBUILD qttest-5.15.1.ebuild 544 BLAKE2B 745af979b2651358e3184e953260b736c9a0231b427bc9a0fe540421e68dda5e1dd95fe4c892f6c311b44b963c7cd6ee2ef244bc08fdef117e0f9dc81fedd5f5 SHA512 f78087bcf51747557cf3c0299638981958bf4503edc9ed97a0c479a836655814d48b2f78d18fdd10f05db661b33a63915b746422dc53eb6669d2c3d1ad54d1aa
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttest/qttest-5.15.0.ebuild b/dev-qt/qttest/qttest-5.15.0.ebuild
deleted file mode 100644
index f73f2420fd6b..000000000000
--- a/dev-qt/qttest/qttest-5.15.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-"
-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 20ebb753c3d8..47bfd4fa790e 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,7 +1,5 @@
 DIST qttranslations-everywhere-src-5.14.2.tar.xz 1348684 BLAKE2B f72cb65813c9b21d57eb6673d193fd6f67d65ced740622567b39333714a8491e3ffa2edd729aba917fae8883d693fbd68c567ca03cd243ea734804e1862b4794 SHA512 38cedf19a1d7b920b7dcfcc014d3986c4067dafd7192efe43c3b8f282e0637391f9ec0b8cc7f5506cc76629d005298becba1421506b48c6baf3366ec2f378544
-DIST qttranslations-everywhere-src-5.15.0.tar.xz 1356928 BLAKE2B 7321790c45aae455f7369d2a64bab556b576d66ecc8d8737f31605cb5bcad3fb6c03b9dabe02ad1a02d2e83ea33223159641a61cfec5295f2f7ea2f4dd5c6f37 SHA512 45302457e16e5dba674164dda7945110583f072d209d3984726324497efb367573475facc3534fd7cdfc61bc14295ebe4bf6588a37d45e87b676191d852f1c8a
 DIST qttranslations-everywhere-src-5.15.1.tar.xz 1419252 BLAKE2B 80656f949a8a408953169e9fb611887a73f302025a8411cddce40956b72fd4ac7bfb580fa37c2e932a5f7fe1388503bb30117b675cf65a8c7eee301a766bbfce SHA512 8e9fe7614c9aa9c557db1bfd6a0ceae90b45e5d28e0cd715fd4ad962b9fbfa722549d6c2a13d82deebd7d3fab7e68cc7affd207beb75629de0d01a5522035581
 EBUILD qttranslations-5.14.2.ebuild 372 BLAKE2B 5e6cfd03be2e8893c066509996ac0f14ce50a2b290d6649027115af696c9c5375b03c74deba0ebbc736a7db27dd4b3f4b6e442111cc9140a0fa6abff1696cf7e SHA512 6cbd2ced696e138b2aa0d48d08c6823d3d7a776f23476bd0968749775dbab0a093d216fcad8c527a468db408ded82f61eea1e11bd364ca885393b1b7da3263b4
-EBUILD qttranslations-5.15.0.ebuild 378 BLAKE2B 0d7d779be190e94f2013cdc097ee2376f828c846570b9b06bfc81d7248e4978af2029efb2e04b9c8c57ac309597de630fd6600828d0ab81928c7434f77f1dbbe SHA512 30ecccf1ab074aee9284a7dfb256b8f82a7eb73877d6c0a0e39265ba42c40c87bd0fbc63f56fc7ebc5fdcdae60a7dec147fe442ce64d17e6ab85ff58c6628e0a
 EBUILD qttranslations-5.15.1.ebuild 378 BLAKE2B 0d7d779be190e94f2013cdc097ee2376f828c846570b9b06bfc81d7248e4978af2029efb2e04b9c8c57ac309597de630fd6600828d0ab81928c7434f77f1dbbe SHA512 30ecccf1ab074aee9284a7dfb256b8f82a7eb73877d6c0a0e39265ba42c40c87bd0fbc63f56fc7ebc5fdcdae60a7dec147fe442ce64d17e6ab85ff58c6628e0a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.15.0.ebuild b/dev-qt/qttranslations/qttranslations-5.15.0.ebuild
deleted file mode 100644
index b882082d4fe2..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.15.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 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"
-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 9db0ddaf1d18..8e10ea010efb 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,7 +1,5 @@
 DIST qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz 10957372 BLAKE2B 9fc84f0ee58a235e7a6291030ce8c8f9271789b7f62bd39b9fd9d0f23a47703c147c388ea89187527ba60902e03c0a145291c3ead1a185d3e771a982ce4c0430 SHA512 752634de8796a1809818176db47021aa24de842cf6334d689a91d3b011105a5e2b8113615a8f50f6974bf8fa989026b434121b42278de1ef905075ba3ee72c47
-DIST qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz 10957752 BLAKE2B bb06a9f4d1040a984e6c24e28a2619dfa08a1b15203fe7923d9fee4cf29266eaaabbcb0964942349707401ed22f1c466cda21cf634481fe08992099ecd38090f SHA512 fd850aa11e0dbd37f73e63517af1e311be480fc44ac05e74c25794a69fd26d06fd620a9ee3ffa3663ebeeedc0d2abe9520aa53c09b80363e8966ee7f24430869
 DIST qtvirtualkeyboard-everywhere-src-5.15.1.tar.xz 10969980 BLAKE2B 8f645c22e7fa48f967b72cd66af5658f9ddf119cdf66b7acac9cc4ac6b26b45e461960c1987936a872dff093949f305c65ba0a3009cfbf22fcd73e0443e97e92 SHA512 f369eb0c313aa5a932cacca44f93732f8a7b8de4bf46df294c40b7c7dd436d5da5012680420306b57347aa38a10d78231199093a10e2b8a272429536a327962e
 EBUILD qtvirtualkeyboard-5.14.2.ebuild 1201 BLAKE2B d201ef8f92d1649837343c87c22cdfdc78cd2c2612ec39c4a73d73a8d5d537d7f43f0c8b47c7ce9ddc32403e287e420db4329a0b3467a36ae9e964df5014089d SHA512 e88986a762232a2db2081588a3b09ff6a8138e438ec2a8331710ccc99ca9321d8285c5ab1e7b560026a2ab72e50b3da0677d07906fe818f79a4cc0795d9155d4
-EBUILD qtvirtualkeyboard-5.15.0.ebuild 1204 BLAKE2B 4d949aa5df208fc05f2bacddb224b288bde6bfcf64f6d4ccc26a511645f39fd4e29694376fba343123d1dfc966b6918ddf1c8ae7dd9b9b4d7923b74c61fb7721 SHA512 9546e67d4f5ccfbbe17c76a21a0e67959f6872a1c1550113b8dd7cb7e2d485cf048e52b52ad4577f3bcaeb544bca7040eadb8d67009e5129ac0552dccd72ce77
 EBUILD qtvirtualkeyboard-5.15.1.ebuild 1204 BLAKE2B 4d949aa5df208fc05f2bacddb224b288bde6bfcf64f6d4ccc26a511645f39fd4e29694376fba343123d1dfc966b6918ddf1c8ae7dd9b9b4d7923b74c61fb7721 SHA512 9546e67d4f5ccfbbe17c76a21a0e67959f6872a1c1550113b8dd7cb7e2d485cf048e52b52ad4577f3bcaeb544bca7040eadb8d67009e5129ac0552dccd72ce77
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.0.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.0.ebuild
deleted file mode 100644
index cf38d8e0bbbd..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 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 ~ppc64 ~x86"
-fi
-
-# TODO: unbudle libraries for more layouts
-IUSE="handwriting +spell +X"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtsvg-${PV}
-	spell? ( app-text/hunspell:= )
-	X? ( x11-libs/libxcb:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex handwriting CONFIG+=lipi-toolkit '')
-		$(usex spell '' CONFIG+=disable-hunspell)
-		$(usex X '' 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 52c6207416ad..9cbdac308f85 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,7 +1,5 @@
 DIST qtwayland-everywhere-src-5.14.2.tar.xz 544532 BLAKE2B 13cf07116737ec2fd301f51f517cbc062fdd42b800d6d2739193f3570f1a9552e66e9909de15c22cc530d5284c3be9ff24915ce4b36f529ec6c22faeb0edff58 SHA512 0f396cabace17f099c2f2c0be54317006dc00c5f4be08cd79a4fa4fdc94362f63cc6ce9decc7feb63f566dd2ea52d562257e4bb23332557054418fc16dc7e899
-DIST qtwayland-everywhere-src-5.15.0.tar.xz 562408 BLAKE2B ef3074dbf41be2a8545e3403c7cd0058067c2d4200323b0c0959024d581e6ccdb8765b448266aee082a67e8fc834fdea0459ec36822446abe970d66b3175980f SHA512 e3d8fb79b7d3b10a94caccca1567c3a978b3517e13740aa6218d0a0b4cb180f6bdc3b533e113248908033f344ab5fcffd6fac751a1513c2d62834afe408ee714
 DIST qtwayland-everywhere-src-5.15.1.tar.xz 563508 BLAKE2B 507e8612a35c6439fab0637edfcae95d712daf19c0a8b97110b57b8a8ffd70374addc3ef19f210eedc9493d84ec441f18bd0fd5a25af5394fde40ee55573eb09 SHA512 d6619f35b3ab163372a0d49a2221c487d5936b6d9ebeb92a7fd41521c424d550eea7c5c584e07f15bde1ec5ece1bd5774845eb9956ce793e546197ffdb28d594
 EBUILD qtwayland-5.14.2.ebuild 920 BLAKE2B d4d3dc9d606892dbd54696d538778db62f17419d52837137463983436efe73aadcae87939d8a98b038bcd10f3335b28699207cb0c8368b77bdda695eceede277 SHA512 7d5f7b6b6e73a9ec6e72a8102b01b9ca15021843846de1dd68e7a37a16c31d2f9b8de32601471a6146f1c9286b5b881af7ec8079999e20c99aa015b25d7931cc
-EBUILD qtwayland-5.15.0.ebuild 836 BLAKE2B 1a24a6ae4ffcd8a3e87b43dc21f6e465b0c83a4dc00d24cb2bf76f0124d29cd2caecb1d367d3d10eeed6cad9f44db4b520d3a25ed226bad783c607c99ddf28e2 SHA512 3a1eae3e8b807816c5ea20a8afd3db7906d39f0ff7906c352598c405cb458dda8c7c9c67e3bd0890eb0276f87d4133a651f1bb2ef569acd1fa9c81259b440c57
 EBUILD qtwayland-5.15.1.ebuild 836 BLAKE2B 1a24a6ae4ffcd8a3e87b43dc21f6e465b0c83a4dc00d24cb2bf76f0124d29cd2caecb1d367d3d10eeed6cad9f44db4b520d3a25ed226bad783c607c99ddf28e2 SHA512 3a1eae3e8b807816c5ea20a8afd3db7906d39f0ff7906c352598c405cb458dda8c7c9c67e3bd0890eb0276f87d4133a651f1bb2ef569acd1fa9c81259b440c57
 MISC metadata.xml 583 BLAKE2B 2f04d6e39831120e7a38de5172b26f29bdb19e4677588595e5281000b14dc5ebcc0984fde5e99330807f8c400b7abb3c0cfbdaa7f131c815d60680259532cd3a SHA512 3b76305c692c7e9b2f0d82862ced25a4a306fc23611f7c22dfed3b19d55072373cca7bf2d4e6bfc14276986082cebfe19e7637c780acde1f421bb1baaf95f27a
diff --git a/dev-qt/qtwayland/qtwayland-5.15.0.ebuild b/dev-qt/qtwayland/qtwayland-5.15.0.ebuild
deleted file mode 100644
index e292407158a9..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 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 ~sparc ~x86"
-fi
-
-IUSE="vulkan X"
-
-DEPEND="
-	>=dev-libs/wayland-1.6.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		~dev-qt/qtgui-${PV}[-gles2-only]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
-		$(qt_use X feature-xcomposite-egl)
-		$(qt_use X feature-xcomposite-glx)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 352dae56ad8d..85ce67465ae8 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,7 +1,5 @@
 DIST qtwebchannel-everywhere-src-5.14.2.tar.xz 202592 BLAKE2B d65dadcc93c02d1a4d8bee81371a79037054442c153cd4e24d04df1052d654204fd8bf3cb17aada35b2627ac5221b840af58e3fd7f58cda45c0a3eee97308d63 SHA512 57080c8cf7fb5c91fa6b325566d3fb2dc3c1d3bcd8128d2a40ea92f8bae7ca0f0fb4bac1d68452998a5dc06781155058d149df069fed5ff16b6d8ad43a72e002
-DIST qtwebchannel-everywhere-src-5.15.0.tar.xz 202844 BLAKE2B a81e53392eef234f23477d306eb5bb2b8ffc90ba0a5551d64c9f4741e6800784cf96679809815c2f5262ff66a5e8e693deb823d35b4340a6394b94d3b62974c6 SHA512 ef4040b63ad3cca80be38b8e3336ea0e70d1a57289ff2441c182f848b837d7ef87c78472f42f14cbc7a77f7ef5d5c50c0f5533071aaa13734832fdf6019c0253
 DIST qtwebchannel-everywhere-src-5.15.1.tar.xz 208872 BLAKE2B 14899ca0f65eafd69c0b7610035c7b1de6d2c033a4929a49b3898a16aea2eada812d4ebd343f7581eebd5df5e649c9cb7f62c2b9287d24fcbfc7c82600dfaf27 SHA512 01f37630ce7aa32726831b4a4d5e52e861269e33efd89246770e8a2a5536be976601d055c95f99d45699ea918ac4ce465b9ffab725f39841ddc5d320817c7523
 EBUILD qtwebchannel-5.14.2.ebuild 564 BLAKE2B 95d07e8bbcea5bbc440be424158575e6b63dae797bf25d1b996ad41d63aa836e46f32f91de073d1b1e474bf6eac3248c9478e01e25afbed508a57cf17cba76d2 SHA512 281f6f5aa2684f676bbf06cc10188789ea576cc13f896e619bfd656937f34bebc791b13924d51b00ae728d543d17caae9d862e899b9f2314fe18a28f0204bd48
-EBUILD qtwebchannel-5.15.0.ebuild 569 BLAKE2B bb9178f2a14447d0140d04edda6b6a2dfdba9b6f049fe5df3878884242ec195f21c8854dda23303067f225cfc4970cbde6e2bf81285943cafbe6cf356f497711 SHA512 2293a80586cf32498ffaeab853e6010a8ff0a3cd2d89132912a39b1439f4f6ee576a44a9ef16de739ccdaf16af5cae9673c1553891ce77737d4f33d9596b1b71
 EBUILD qtwebchannel-5.15.1.ebuild 569 BLAKE2B bb9178f2a14447d0140d04edda6b6a2dfdba9b6f049fe5df3878884242ec195f21c8854dda23303067f225cfc4970cbde6e2bf81285943cafbe6cf356f497711 SHA512 2293a80586cf32498ffaeab853e6010a8ff0a3cd2d89132912a39b1439f4f6ee576a44a9ef16de739ccdaf16af5cae9673c1553891ce77737d4f33d9596b1b71
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.0.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.0.ebuild
deleted file mode 100644
index 6d9ff18316c6..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 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 0180ce511536..3258d161033f 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,12 +3,9 @@ AUX qtwebengine-5.14.2-gcc-10.patch 3616 BLAKE2B 079a8ef993b793ddb45a4ff5e3f579f
 AUX qtwebengine-5.14.2-icu67.patch 7348 BLAKE2B b1e4af1fa83c5168600f32c7a58e968dfcbc40016183a41e7df0340742504d441474a2b3f57a5128d32f1b74a2f02a2ee58d14ce34f731fecd19a1e8fef6e540 SHA512 cbcdf51a00c30717ab6aa5d76656138888dc436f278d352a838ac98338613aa0e915114d7a3a0657e2110faaed04af5334077de0c6bc02cea01016d8c2413de7
 AUX qtwebengine-5.15.0-bison-3.7-build.patch 1996 BLAKE2B e84c0d29023d13f348d452847e634d58679d47ed45c58991b4007829c1a547b36f9c19b8e188a83a9b2e9bb4fec3a1e8a3b4139ac0300a21a1fb52ce0f024fc1 SHA512 b4d1cfb77ba7a04a7df325468f52d3267891a1edd93ed5b2e8bcc3ef931b198a0ea3bba88d80bf2d235636650dc88f32bfdadcb9c62fbbde245636c9b1c02bef
 AUX qtwebengine-5.15.0-disable-fatal-warnings.patch 414 BLAKE2B 531523ee8c85d6ac51637b3bfd4fbcd56476e1231103c0db62b7c27ace4d5e070becb97beb74526806101c138669adc81a00eefe319ff96582df4743ecabcef8 SHA512 4e3ae727f2738bcc011c9fdd27593d9689206573ff7f17a51fd78d3aa25d427b899af78c098c278f6e7ab4ce88bf415e7382a8a635dd880448a75e6756abc680
-AUX qtwebengine-5.15.0-gcc-10.patch 910 BLAKE2B 9cbcb19a0c17fa05cf1ac88e4cb1b80c1049f962844ef79b1d9fa8ef565d9c023cc2de2a7df58814fa060b0c3b037a036baea80406ba4ed7a3763da8587b471b SHA512 d42e08100334aa7b1d19f3d8a5770d5fc1c2c1cf9dcfe68c0e719758013c446575e643f3bad7a924591b72a8425965da2d4f7eba4b9726868c64281fcc45994a
 DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd292fad2b514d8b1853d2796a11fa0e1b1c3a80f284cc1e3c242133b6886bb56329430229645af1ad8cac927371e3941b9fab SHA512 c2613a8d889bb9d7184a65ab6127c8329a945386f23cb860219b8e161d0a43683fa66f69d8d1441f5920fa370fda7c4629865fa452be9ab8a8b1515e5f93504b
 DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf SHA512 bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf
-DIST qtwebengine-everywhere-src-5.15.0.tar.xz 278257432 BLAKE2B 832b15a0a542297f47ecaa057f29e24eb99dd142b314aa15243d864b715c74ec9dfc2ba23aa9be417581151d684d08dfcba173ea2d9311e19ca7af3d941f590b SHA512 11983470f0da9abfffba072406b2c67b475d8cf65412fdcfd925758e2a9449f509780e5b1001fb6868445c2c9540e5aa0e754954b70f1795b47335bad7c749b2
 DIST qtwebengine-everywhere-src-5.15.1.tar.xz 278488056 BLAKE2B f369e435510644b36a7305a1a2b907f09f533f995c0c1a367a801cb9f277f66914f4511f20926ed4c865e9e5ec921c12d4406191706d263320a861250cebb3a0 SHA512 651520fcf89681b06c57f1992223f06ecbe3750a88ffae7a94a339503957e09d327ee1ae7e4bce88bfb09131b3b9c9abfc44f7bccb9c50d286181eaf306991a4
 EBUILD qtwebengine-5.14.2.ebuild 4561 BLAKE2B bd75d1b9b144a437bf093d342dd2d4765d100269290d80c3cb796a4bc07a9dd136020250e21039bc8f7522ab4363e9337badce7425e1f5f09376357df1097a74 SHA512 f790d1037dbc663108b5a0412b31c1602346ab945518e0a1b6f0973c4437fa8b5d2afd13d42d7aa733ae9ae3a70211e980dc164e6a77d378e02a0c2db101aef1
-EBUILD qtwebengine-5.15.0.ebuild 4799 BLAKE2B 485e73ad91b5ec76f5aba0e7413e24267999b218e5af93c377c3e4f5d53a672b27145574c8b89769a21ddb25685218367c224605e3cad109127688691b69703d SHA512 d7decad9a030d459625df743decf28cb7d0e4f9a90cd80b0d9027ee80cc8bcb7db9375040b87a020ff0cce92ef2479699df56476d20b05ad7bb172f031d53c86
 EBUILD qtwebengine-5.15.1.ebuild 4652 BLAKE2B c6027e6c800d954ca0d9d9d7f3c1aa961a8a431f33f4bf23c774ec51513e2996a5bca2c390a6e201f30953193288ebbe85129879d57b7ac5eb4b0faee232379e SHA512 e3fae1620f21461b3bfe7af671c8cdf8e170bfaca7403ba042f6e030764fbe69d0fa8056c69e49df0d80fe7cf5ad1bc697eeada7c37dceb72b805970611c5952
 MISC metadata.xml 1269 BLAKE2B f95392929bcecbce9334108e3446d631e2a91d1aceb0fa6347496d2d0eeaff8cff55e08b7c3bb39fb8b51667988a6cc2b8e500143f2ebe0d78e6985a6f7af3c1 SHA512 7949854cf55f26750ded6787ce295762af7fd16600f8b251b25e1c9dd4d643338ed4c3b2a8a3405a2c427ed8b5a9ad13a8566a640161768d4dbf6db7e54811a3
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-gcc-10.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-gcc-10.patch
deleted file mode 100644
index 9a467f5d66bd..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-gcc-10.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0dc7c21c33de634bb6bf90c9e2372054436e1606 Mon Sep 17 00:00:00 2001
-From: Kirill Burtsev <kirill.burtsev@qt.io>
-Date: Thu, 14 May 2020 16:31:09 +0200
-Subject: [PATCH] FIXUP: Fix build with GCC 10
-
-Add one more missing header when build with pch
-
-Change-Id: I42cddb26eacbd18cfbdb359ae1a85d0e2e43316f
----
- chromium/base/trace_event/trace_event_memory_overhead.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h b/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
-index 69468d46409..916f9c775a3 100644
---- a/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
-+++ b/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
-@@ -7,7 +7,7 @@
- 
- #include <stddef.h>
- #include <stdint.h>
--
-+#include <string>
- #include <unordered_map>
- 
- #include "base/base_export.h"
--- 
-2.16.3
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild
deleted file mode 100644
index 6aa9345fffd0..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.0-ppc64.tar.xz )"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-IUSE="alsa bindist designer geolocation jumbo-build kerberos 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/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} )
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	kerberos? ( virtual/krb5 )
-	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
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-fatal-warnings.patch" # bug 695446
-	"${FILESDIR}/${PN}-5.14.2-icu67.patch" # bug 720054
-	"${FILESDIR}/${P}-gcc-10.patch" # bug 721876
-	"${FILESDIR}/${P}-bison-3.7-build.patch" # bug 734356
-)
-
-src_prepare() {
-	if use ppc64; then
-		eapply "${WORKDIR}/${PN}-ppc64"
-	fi
-
-	if ! use jumbo-build; then
-		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/buildtools/config/common.pri || die
-	fi
-
-	# bug 630834 - pass appropriate options to ninja when building GN
-	sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
-		-i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | \
-		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
-	if use system-icu; then
-		# Sanity check to ensure that bundled copy of ICU is not used.
-		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
-		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
-		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
-		local file
-		while read file; do
-			echo "#error This file should not be used!" > "${file}" || die
-		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
-	fi
-
-	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/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=(
-		--
-		-no-build-qtpdf
-		-printing-and-pdf
-		-system-opus
-		-system-webp
-		$(usex alsa '-alsa' '-no-alsa')
-		$(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
-		$(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
-		$(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
-		$(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
-		$(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
-		$(usex system-icu '-webengine-icu' '-no-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
-}
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index b9983c3d4447..6f2a0b9ae9f1 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,7 +1,5 @@
 DIST qtwebsockets-everywhere-src-5.14.2.tar.xz 252820 BLAKE2B a2c14205fbc7f2bb3d7de1d4dff18557e027cb0d114285aa2cd7558fac63da628d7a8b1772b738194983e77bf108e097c29fe2ec02ace85a188674248bb61ade SHA512 091e17459a8a255fccece092399ac32994307aa53e6e72e736e6ff9f1bb745c49bfcb9a747e1e21acaa0ed95754f7f450ba2f73a3bbafad54e21bf600f7da92f
-DIST qtwebsockets-everywhere-src-5.15.0.tar.xz 253616 BLAKE2B a036bb3973cc24b15e83efbbeaf34a72daa653b02312015bc6240f6104fa99c31c2b029a6a536376ea6c443946aab455ae4b1a4a9e8b6f637458c2715d5411c2 SHA512 87d7cbce52562f6a5372106e46e15319d9647bab9ec5dbde132c017b9febbbc568ff2c182d3375165d87c1d4a88ae26d2e849baef53bce6e842d8d0d83f7ceb5
 DIST qtwebsockets-everywhere-src-5.15.1.tar.xz 258908 BLAKE2B cd5c5fbdbbc0191379cbcc6821250597982696e589e1caa18d91258fd6c3eacdb27fd11da94b0e68864c8f3e60c712a052516f5838e56249767125a90e077443 SHA512 5929f972b7e8aa40dbbd0a1157065bd11e81621cc880d1dfc55e4228800215d16cd301319a204413e7fee7ec57c4e5a70229ad2d3c1d3ac69f38bd39ce4b3713
 EBUILD qtwebsockets-5.14.2.ebuild 538 BLAKE2B cc18d2bf9d5cddc7d87c7113360a21dbdbf8008173c003b04a2d6de6e57ab20dd65e16718408c24f2dc6fa530097758898747482e5bd66b008e5cb9c673ecc9e SHA512 160f32a682c72bae09dd4a875d75c48ad7f1f093a76fa994613c332eeea1050286ed19e942d29fb82c8c579012da34d1313df5624248d237fc1d65f11261d756
-EBUILD qtwebsockets-5.15.0.ebuild 543 BLAKE2B 81ee48cda5fa05343a359d6458e2209496f2e180533db2c4947118d66bdff6dd281ccbf2383ea2176c1b3829bd0c07f1ae0b95e50c4813123c3e23c47614428a SHA512 ed527ddf617aa7def7f2eb8793b56a83627c0a034993b767c0358835ca4b7dda3aeef5ffa483131f69279448893615873ad9768d2bfd8fb5c973ee9bfc22b473
 EBUILD qtwebsockets-5.15.1.ebuild 543 BLAKE2B 81ee48cda5fa05343a359d6458e2209496f2e180533db2c4947118d66bdff6dd281ccbf2383ea2176c1b3829bd0c07f1ae0b95e50c4813123c3e23c47614428a SHA512 ed527ddf617aa7def7f2eb8793b56a83627c0a034993b767c0358835ca4b7dda3aeef5ffa483131f69279448893615873ad9768d2bfd8fb5c973ee9bfc22b473
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.0.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.0.ebuild
deleted file mode 100644
index bb21ea253730..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 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 d0cf2e15db1b..9c0fc665f5c4 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,7 +1,5 @@
 DIST qtwebview-everywhere-src-5.14.2.tar.xz 132840 BLAKE2B 8d6d2995b53f55b04353c935f5655c47d34a0e61d68adce5837ac0b6074aae59f506dd49acc700b7c26ca04aa16d03749520329540513a646809ba6e353bc69a SHA512 1a70be0c64f72b7e3b10c8e3ca58d4a04bef14496c8e4852c5cafbd13d653e2f682a58f7dcd576fce79ed082c01a5f8ffc6533836f495f6e5d4b6ddf2be8e3ca
-DIST qtwebview-everywhere-src-5.15.0.tar.xz 133044 BLAKE2B 6dd6b4930ad486e0d9786b5ff7efdae0224ff3fdef81cb19d6f8f22527100da9c7dbb5150b5f67e95a3791a6b1d942926b03955467c0b446339687fdd0ef8b14 SHA512 58356c59945fb075e17587b634156b66c5569cdbcf02ba91eb9fcc1146f1a4341e0d4d6afa0a70a6050070d35f156aa92a7aec0102aff0b862b5050533c55a5e
 DIST qtwebview-everywhere-src-5.15.1.tar.xz 133392 BLAKE2B 6958323ffe5d2d10b07bb7b926a05aa3f74d5aa38465f94e51877c162b4b2bd8e4733eda122bc691262f20dca9875177b1fbb260a922923e3e20611a2294dc71 SHA512 1da9cca184e66b02eef911e372d0f18466b989cc5c53d0a93e268857e1ca64a2f75bf20dfd1451060e6dbf4c7d248ba376112b7775e45ffa7d556712870478b1
 EBUILD qtwebview-5.14.2.ebuild 431 BLAKE2B 8575a235f2d6b8fa8b4b116a1f5df40fbb6da4773818320f05ac001290c84bcde8e2b34f15004fccbd661d8e9cadc4437c7dba1019346bc8fac82d710c6319dd SHA512 bfb61afbe4d1bc4d1dc3862ed29a6feb6ca18dc68b146cd8d0c408d2dbed9977b1591d434eaed17afa6d5dfffb2d771c9c5c61d824a565628e3fdce4f4d211d9
-EBUILD qtwebview-5.15.0.ebuild 431 BLAKE2B 8575a235f2d6b8fa8b4b116a1f5df40fbb6da4773818320f05ac001290c84bcde8e2b34f15004fccbd661d8e9cadc4437c7dba1019346bc8fac82d710c6319dd SHA512 bfb61afbe4d1bc4d1dc3862ed29a6feb6ca18dc68b146cd8d0c408d2dbed9977b1591d434eaed17afa6d5dfffb2d771c9c5c61d824a565628e3fdce4f4d211d9
 EBUILD qtwebview-5.15.1.ebuild 431 BLAKE2B 8575a235f2d6b8fa8b4b116a1f5df40fbb6da4773818320f05ac001290c84bcde8e2b34f15004fccbd661d8e9cadc4437c7dba1019346bc8fac82d710c6319dd SHA512 bfb61afbe4d1bc4d1dc3862ed29a6feb6ca18dc68b146cd8d0c408d2dbed9977b1591d434eaed17afa6d5dfffb2d771c9c5c61d824a565628e3fdce4f4d211d9
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwebview/qtwebview-5.15.0.ebuild b/dev-qt/qtwebview/qtwebview-5.15.0.ebuild
deleted file mode 100644
index 10d7f8d00008..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.15.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 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 ac0d09a31d20..72929ce35864 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 EBUILD qtwidgets-5.14.2.ebuild 1041 BLAKE2B 728671cef741bd25389eb98e85def46f3e9bb878f5df8ff1a4cb08be7edb5b11265978ac3f3af1663879d103224c01e9a8e93b6c85d7af5b76d3bae87eb2a4dc SHA512 12b194ec32e7eb39399e001a8f590ded9b2729a6a8286868a8977798c0821e9b51dc42cb25d1b0f5dc05b32be5ce961006e5c115193e4cabfe5c8add49751624
-EBUILD qtwidgets-5.15.0.ebuild 1023 BLAKE2B d7ef3bfccf7811dcd98e6e5396a1c74ffc2a0ddf946d2d53bdaf4b4cdf2b4302fe2ea8e3ea0c1341a1464903c2c05b101f344955a60c76d5891c0538e232101c SHA512 61e6f7f44674778a41f6e24d9758877cd62cc532cebe58c9d1d5ca1bcbd613608c8282c0005ac6519faf82b93a4f48ce4d100bf5b25cd4f47f26c2d0b7038517
 EBUILD qtwidgets-5.15.1.ebuild 1023 BLAKE2B d7ef3bfccf7811dcd98e6e5396a1c74ffc2a0ddf946d2d53bdaf4b4cdf2b4302fe2ea8e3ea0c1341a1464903c2c05b101f344955a60c76d5891c0538e232101c SHA512 61e6f7f44674778a41f6e24d9758877cd62cc532cebe58c9d1d5ca1bcbd613608c8282c0005ac6519faf82b93a4f48ce4d100bf5b25cd4f47f26c2d0b7038517
 MISC metadata.xml 558 BLAKE2B c7089423680ebf689b6367ece6366ed03a25424b5b85ccecbfbbf0086d3d9bcd36a4fca1c5f4e3fce1c1502c2444d94f30b7b3d0addc1019452aa206d661bf51 SHA512 013a8a653ae20d070ce0cf42797ae05b89510e600b40fd061541c634d4faa24040c3d486ac8c4fe39ba918af57c2aa5d3954f35d3fd4f850dc732521f5a699c5
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.0.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.0.ebuild
deleted file mode 100644
index 30655fc94224..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2-only gtk +png +X"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
-	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-only es2 desktop)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use X xcb)
-		$(usex X '-xcb-xlib -xkbcommon' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 4ec6c2ee59ac..92b03b226381 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,7 +1,5 @@
 DIST qtx11extras-everywhere-src-5.14.2.tar.xz 135712 BLAKE2B 83890aab605bdfaacdddbc7a1893bd570a15f4135bfd924ca923570b3d12042b916f493426b1945319afd60e651f51ad49b3575b69b07ed4264a8a6cd7005a49 SHA512 cf30e66fda18b9bfd266b41f15713f7ca7390bc533fb8093096853f1554c2a91eb065dc17acb5b355b8fad08df3c695289d8c8081d568061c99659ec35d79b14
-DIST qtx11extras-everywhere-src-5.15.0.tar.xz 135648 BLAKE2B 25472f384f8769304d72e449669a7fb2ca42e18a9c5359146dbdd7ec815e97707ff96a891dea0532e2636a32e2309bff8c8dfa202b81e89d640142c60b7ce932 SHA512 12fc870f94e546d6e343f2ece44d09a6fc725b3ce092e1494bd2ef334ec92b559db2a8fcf6da88fe0f73040ee41fa5bf5f84ff197e5d1a004dabca3274508a96
 DIST qtx11extras-everywhere-src-5.15.1.tar.xz 143884 BLAKE2B a740621a4fe41b075dd5843f28bfa1d128e24d1df786b5c8aa0ceba5fe7fc59bc212b7ec8855c4a1eef7cd812615837e38089c9e9fd189dda16f5313d6091af6 SHA512 59155fc97da3f7571da37dd63bed79f61580fa4df7d4886df51520ea6fe8e01e7c09f0aa9caaeaa986c0e5eac11d4479c99c892da4d075c6369b535fd505b084
 EBUILD qtx11extras-5.14.2.ebuild 430 BLAKE2B af2349c3243d9e48a3519f2622e5328c6ff6d3dc4583d515dd5ddf4e2cbdc96d303ed0c03baf6958b5313773ec1aa0996d4c3acc4bf87c9838ffeaa8e80e90fd SHA512 41790320a22eb3209894adc90debcf32ccae299a61d9715e8a9d735dca75e20bc7bd64bb73a485c821b97efa8a02dae8f140f1526b8159dc643de481b6b12f4e
-EBUILD qtx11extras-5.15.0.ebuild 436 BLAKE2B 4be61843a21d0e6986416682d3613c76c8953ee3946fc435c1af771af2bb9a62c9191dabff85bd88edafc81d5029b18f1f8a5b38bc7cefe85f0b42191f5180bc SHA512 6bd6c59c8b68d98a3ee9d4c5fe2816def7c01bc72348a6cf5e7c99d70a46ef0b6b84acc5f478d04dd8863cc5b4222651b204b42aadaa1169d2ba81f5cf7300df
 EBUILD qtx11extras-5.15.1.ebuild 436 BLAKE2B 4be61843a21d0e6986416682d3613c76c8953ee3946fc435c1af771af2bb9a62c9191dabff85bd88edafc81d5029b18f1f8a5b38bc7cefe85f0b42191f5180bc SHA512 6bd6c59c8b68d98a3ee9d4c5fe2816def7c01bc72348a6cf5e7c99d70a46ef0b6b84acc5f478d04dd8863cc5b4222651b204b42aadaa1169d2ba81f5cf7300df
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.0.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.0.ebuild
deleted file mode 100644
index 32aefe9b955d..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.15.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[X]
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtwidgets-${PV} )
-"
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 33457432a4c0..4248f639e9d2 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,7 +1,5 @@
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-DIST qtbase-everywhere-src-5.15.0.tar.xz 49931940 BLAKE2B f6675ddb8c6fcfe4d12f92b0c93d09ec160e65bb214694550c82c1ba1acea41c86064910cf76267815bd860b071a322bbbad19e994be52f0bf1450a73d09a1bf SHA512 c584d69e49f4959d9b8541f820f5ff1e6d1599697ad16976b47cbaaa902fc83e1ca4ae57d56d13574e42e5f602d4420245ad7fcfc13e224e10d4bbad6a537d1a
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
 EBUILD qtxml-5.14.2.ebuild 493 BLAKE2B d5e9b5e3343e79f9634babf8b35700cce83e159e882b69e49c4adb232a9de54eb05d54b8314243c5e7f8ce083b0d467f5fa664d863fdd180223f1b7867273584 SHA512 6fd673bb0cfd964e898bb8358c2a1237027958dbe0eb0cd59dddb181caf290be7da7c397c152709d217daee21a76f6590fbb261fcff52485db1435534fd12bc2
-EBUILD qtxml-5.15.0.ebuild 499 BLAKE2B ce015661de5f79c2bc6e2cb3b53847e842a13c2b4be275bbbb360572870df66c38caf398122e3196ecff8fb23fe7e3cad9af80debba17e0cbe2e44010d7dd691 SHA512 7b4ad9d7f67ed3601ca133239518966781f674cf443e3ca8bb568c74178c60cc5a630c7a07af452d12e917b864ebe4bd86a82dc64283d72b3557d723f6703038
 EBUILD qtxml-5.15.1.ebuild 499 BLAKE2B ce015661de5f79c2bc6e2cb3b53847e842a13c2b4be275bbbb360572870df66c38caf398122e3196ecff8fb23fe7e3cad9af80debba17e0cbe2e44010d7dd691 SHA512 7b4ad9d7f67ed3601ca133239518966781f674cf443e3ca8bb568c74178c60cc5a630c7a07af452d12e917b864ebe4bd86a82dc64283d72b3557d723f6703038
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.15.0.ebuild b/dev-qt/qtxml/qtxml-5.15.0.ebuild
deleted file mode 100644
index c475c1b3f0d3..000000000000
--- a/dev-qt/qtxml/qtxml-5.15.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 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"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-"
-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 5dcda4bd9627..2a36d3d09995 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,7 +1,5 @@
 DIST qtxmlpatterns-everywhere-src-5.14.2.tar.xz 1404028 BLAKE2B aff0d2aa2396418c2b987f1485d3753546c09de8d5eb06efab52d635e95f8e056def8a4b6927d8d8f24c3af264cf762e64a2b3fa9d318671df4ea0f0f3f5bf0a SHA512 27f674c4811b010ec461c54ee258b1d6b58dcb5c11795621b7bbad9fa2c19c1b6b62286cbe8895151261129c7d6d91007c3a8be6cf64af1f4cb32e2e9976ac23
-DIST qtxmlpatterns-everywhere-src-5.15.0.tar.xz 1403484 BLAKE2B 114efc8316a6621389f51bfc1211d356e5275f8292b17cd724097d9a51d58764afd93ab3e1b33a1c567a7193ea20cc01226e2fa101a6fb8b2af2031774b424ac SHA512 180ccbab82b436702533ea7aaf445b399250555ed37eb3469889de64d13f218c0717489f270e29369119207441f85c05249923fe73daac5fcc2fdc7e970494c0
 DIST qtxmlpatterns-everywhere-src-5.15.1.tar.xz 1415888 BLAKE2B f17a1dee54ee981fb435c2536f28b015d0a4ce48cf504c5f11b03992a9e569190e2ae8fd9960a408ddec54bdc14588cd498cbf9da0002f696c336af72b211e5a SHA512 f76b2063f88a14754b1ba7e417b9a4936b1cf371bf35c6382a31f9ec01513894313faacb41a43fe6b97c0b0dbb7d4f578877b159ef1321cd1a2cd9b1d36bcdb3
 EBUILD qtxmlpatterns-5.14.2.ebuild 620 BLAKE2B 26f069b65dc5803f59258230047818e365421cf866f5cc1052d506840b158d6a276c35f8a91b11677899cd2f7293ede13c2c5523c981b7bd53003ad13829ac0d SHA512 3ddd0ea1ceaa0c5d93b95f4a328c147a13568f957d6f2348140cc241ff81f455cbeecc3548aeea75972e106b4250ec7fde571ac25aa0336576b06f9c913d1613
-EBUILD qtxmlpatterns-5.15.0.ebuild 626 BLAKE2B 72d955fa0935cf43842e8db6f2ed6b801f9c28bfb81b49f8ac0301c91cb667bcfbfc22cbdc356a98458fb368310187f841d0a713002e41206c7c62fca5cdf092 SHA512 6d1fabf23e5da30d77556500067eb35ee7be575970b97af1b49cdb8be431a5398a48b794bcb35f9d4902f1c59da8ff4c066445515470605819e4927932a0113a
 EBUILD qtxmlpatterns-5.15.1.ebuild 626 BLAKE2B 72d955fa0935cf43842e8db6f2ed6b801f9c28bfb81b49f8ac0301c91cb667bcfbfc22cbdc356a98458fb368310187f841d0a713002e41206c7c62fca5cdf092 SHA512 6d1fabf23e5da30d77556500067eb35ee7be575970b97af1b49cdb8be431a5398a48b794bcb35f9d4902f1c59da8ff4c066445515470605819e4927932a0113a
 MISC metadata.xml 589 BLAKE2B bbca816148efdf3a04c05ea1c653a4e9a6e7c9c8109283719d53a06188e495df1addfceca8acc374ed03b89391fe14c70eb6e84b4f5343fb7345e841d50d8ee0 SHA512 dfd095f116f9223cea460984b650cf9d6f506f1bc5e43ae38429528d1218863d785fb47e05a3c9eb4891838d58baa967de3ac31d59e38c4de90a5655c8344d4b
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.0.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.0.ebuild
deleted file mode 100644
index 66fa234d35c7..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 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"
-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-ros/Manifest.gz b/dev-ros/Manifest.gz
index 54ef9ccf5e2d..08807df5f3ab 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/ament_cmake_copyright/Manifest b/dev-ros/ament_cmake_copyright/Manifest
index a222024422f5..9550d354f5f4 100644
--- a/dev-ros/ament_cmake_copyright/Manifest
+++ b/dev-ros/ament_cmake_copyright/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cmake_copyright-0.10.0.ebuild 1654 BLAKE2B 26a9e8d2d6fefbf848866d0e332adc17be234c1b44c8bc46c79ed9f1f010155d4faf2b06b6bfa690b9c7996ecef6cb9c27f825ed03f35771dbfebe7be8fa73cb SHA512 e46fdff6ee8d624b9c68b3c17c8c4bce35705f19f1ed4194f55adcfc2edeaf0337489f5b8bfef2e206502146aef5435664016eabef37df264becc21af3082271
 EBUILD ament_cmake_copyright-0.9.5.ebuild 1654 BLAKE2B 26a9e8d2d6fefbf848866d0e332adc17be234c1b44c8bc46c79ed9f1f010155d4faf2b06b6bfa690b9c7996ecef6cb9c27f825ed03f35771dbfebe7be8fa73cb SHA512 e46fdff6ee8d624b9c68b3c17c8c4bce35705f19f1ed4194f55adcfc2edeaf0337489f5b8bfef2e206502146aef5435664016eabef37df264becc21af3082271
 EBUILD ament_cmake_copyright-9999.ebuild 1654 BLAKE2B 26a9e8d2d6fefbf848866d0e332adc17be234c1b44c8bc46c79ed9f1f010155d4faf2b06b6bfa690b9c7996ecef6cb9c27f825ed03f35771dbfebe7be8fa73cb SHA512 e46fdff6ee8d624b9c68b3c17c8c4bce35705f19f1ed4194f55adcfc2edeaf0337489f5b8bfef2e206502146aef5435664016eabef37df264becc21af3082271
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.0.ebuild b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.0.ebuild
new file mode 100644
index 000000000000..29ed35a1afd5
--- /dev/null
+++ b/dev-ros/ament_cmake_copyright/ament_cmake_copyright-0.10.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_copyright
+	dev-ros/ament_cmake_test
+"
+DEPEND=""
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_copyright[${PYTHON_USEDEP}] test? ( dev-ros/ament_lint_cmake[${PYTHON_USEDEP}] )' )
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_test
+	dev-ros/ament_copyright
+	test? (
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "dev-ros/ament_copyright[${PYTHON_USEDEP}]" && \
+		( use !test || has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]" )
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_core/Manifest b/dev-ros/ament_cmake_core/Manifest
index ff3ec42f545b..967704b76c01 100644
--- a/dev-ros/ament_cmake_core/Manifest
+++ b/dev-ros/ament_cmake_core/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_core-0.9.6.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
 EBUILD ament_cmake_core-1.0.0.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
+EBUILD ament_cmake_core-1.0.1.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
 EBUILD ament_cmake_core-9999.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_core/ament_cmake_core-1.0.1.ebuild b/dev-ros/ament_cmake_core/ament_cmake_core-1.0.1.ebuild
new file mode 100644
index 000000000000..91e4b417df78
--- /dev/null
+++ b/dev-ros/ament_cmake_core/ament_cmake_core-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The core of the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-python/ament_package
+	dev-python/catkin_pkg
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_cppcheck/Manifest b/dev-ros/ament_cmake_cppcheck/Manifest
index 6c220bf6bc38..cf152696bfbd 100644
--- a/dev-ros/ament_cmake_cppcheck/Manifest
+++ b/dev-ros/ament_cmake_cppcheck/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cmake_cppcheck-0.10.0.ebuild 1531 BLAKE2B 079fd406d74a4a9418b0a3c15aa24ebbaebbe097405452cf328dec3c4d82b3e0eb2eacfa3d7c116f3f50c55cb08e0f9187cc8b9cca3d4d8d4805dd8c06ba5a2c SHA512 517ca42684f14960d0ec0c01a47c30bd36c3ed7817a42a6869b49ebf0c003d93aefc430c6680389bf908f9e87313f710d51aee20033232ade8b2632e142f7661
 EBUILD ament_cmake_cppcheck-0.9.5.ebuild 1531 BLAKE2B 079fd406d74a4a9418b0a3c15aa24ebbaebbe097405452cf328dec3c4d82b3e0eb2eacfa3d7c116f3f50c55cb08e0f9187cc8b9cca3d4d8d4805dd8c06ba5a2c SHA512 517ca42684f14960d0ec0c01a47c30bd36c3ed7817a42a6869b49ebf0c003d93aefc430c6680389bf908f9e87313f710d51aee20033232ade8b2632e142f7661
 EBUILD ament_cmake_cppcheck-9999.ebuild 1531 BLAKE2B 079fd406d74a4a9418b0a3c15aa24ebbaebbe097405452cf328dec3c4d82b3e0eb2eacfa3d7c116f3f50c55cb08e0f9187cc8b9cca3d4d8d4805dd8c06ba5a2c SHA512 517ca42684f14960d0ec0c01a47c30bd36c3ed7817a42a6869b49ebf0c003d93aefc430c6680389bf908f9e87313f710d51aee20033232ade8b2632e142f7661
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.0.ebuild b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.0.ebuild
new file mode 100644
index 000000000000..9318e3a9e9c2
--- /dev/null
+++ b/dev-ros/ament_cmake_cppcheck/ament_cmake_cppcheck-0.10.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="CMake API for ament_cppcheck to perform static code analysis on C/C++"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cppcheck
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	test? (
+		dev-ros/ament_cmake_copyright
+		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_cpplint/Manifest b/dev-ros/ament_cmake_cpplint/Manifest
index 606112f459c5..56cc9011a790 100644
--- a/dev-ros/ament_cmake_cpplint/Manifest
+++ b/dev-ros/ament_cmake_cpplint/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cmake_cpplint-0.10.0.ebuild 1497 BLAKE2B afb97f6aa510db683fb58c335538ded3a01c7d2524839b34786a1e8ee9f970aaf4f535cb09a32ccec303c15f71c6ee0e4e62a6775032fa8a7391a00186d5f41b SHA512 c77eb75c3a6468e07ef03d21e31cc1314ac3f0122b2fe91e470717d4c108efa5ba9e210a2c30cd0e3b90250b4ea33d0d3a640424f8d80108bdc3702d1cc00237
 EBUILD ament_cmake_cpplint-0.9.5.ebuild 1497 BLAKE2B afb97f6aa510db683fb58c335538ded3a01c7d2524839b34786a1e8ee9f970aaf4f535cb09a32ccec303c15f71c6ee0e4e62a6775032fa8a7391a00186d5f41b SHA512 c77eb75c3a6468e07ef03d21e31cc1314ac3f0122b2fe91e470717d4c108efa5ba9e210a2c30cd0e3b90250b4ea33d0d3a640424f8d80108bdc3702d1cc00237
 EBUILD ament_cmake_cpplint-9999.ebuild 1497 BLAKE2B afb97f6aa510db683fb58c335538ded3a01c7d2524839b34786a1e8ee9f970aaf4f535cb09a32ccec303c15f71c6ee0e4e62a6775032fa8a7391a00186d5f41b SHA512 c77eb75c3a6468e07ef03d21e31cc1314ac3f0122b2fe91e470717d4c108efa5ba9e210a2c30cd0e3b90250b4ea33d0d3a640424f8d80108bdc3702d1cc00237
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.0.ebuild b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.0.ebuild
new file mode 100644
index 000000000000..f60a48951cc2
--- /dev/null
+++ b/dev-ros/ament_cmake_cpplint/ament_cmake_cpplint-0.10.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="CMake API for ament_cpplint to lint C / C++ code using cpplint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cpplint
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	test? (
+		dev-ros/ament_cmake_copyright
+		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_export_definitions/Manifest b/dev-ros/ament_cmake_export_definitions/Manifest
index 89a0178fe883..a3e3f0b7abf4 100644
--- a/dev-ros/ament_cmake_export_definitions/Manifest
+++ b/dev-ros/ament_cmake_export_definitions/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_export_definitions-0.9.6.ebuild 1155 BLAKE2B 4997b26202eae3bef2595a4baa4129a624a56492957314a86506b817cff3091f324db22245d38234d7597e56ddc6e53b672800e3bdba13614b1ab78fecbfd4c8 SHA512 cf0569c2dea554d78c660227d59b28526f7b532b0a37542dcba679d0f4cd4a774d360ca037ea05414c4f89d48dbbbce125aecc726d8f78ba3ba5b7c3096f242f
 EBUILD ament_cmake_export_definitions-1.0.0.ebuild 1155 BLAKE2B 4997b26202eae3bef2595a4baa4129a624a56492957314a86506b817cff3091f324db22245d38234d7597e56ddc6e53b672800e3bdba13614b1ab78fecbfd4c8 SHA512 cf0569c2dea554d78c660227d59b28526f7b532b0a37542dcba679d0f4cd4a774d360ca037ea05414c4f89d48dbbbce125aecc726d8f78ba3ba5b7c3096f242f
+EBUILD ament_cmake_export_definitions-1.0.1.ebuild 1155 BLAKE2B 4997b26202eae3bef2595a4baa4129a624a56492957314a86506b817cff3091f324db22245d38234d7597e56ddc6e53b672800e3bdba13614b1ab78fecbfd4c8 SHA512 cf0569c2dea554d78c660227d59b28526f7b532b0a37542dcba679d0f4cd4a774d360ca037ea05414c4f89d48dbbbce125aecc726d8f78ba3ba5b7c3096f242f
 EBUILD ament_cmake_export_definitions-9999.ebuild 1155 BLAKE2B 4997b26202eae3bef2595a4baa4129a624a56492957314a86506b817cff3091f324db22245d38234d7597e56ddc6e53b672800e3bdba13614b1ab78fecbfd4c8 SHA512 cf0569c2dea554d78c660227d59b28526f7b532b0a37542dcba679d0f4cd4a774d360ca037ea05414c4f89d48dbbbce125aecc726d8f78ba3ba5b7c3096f242f
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.1.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.1.ebuild
new file mode 100644
index 000000000000..63b8542747c6
--- /dev/null
+++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export definitions to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_dependencies/Manifest b/dev-ros/ament_cmake_export_dependencies/Manifest
index a1f91bd63d22..1c2bf3460371 100644
--- a/dev-ros/ament_cmake_export_dependencies/Manifest
+++ b/dev-ros/ament_cmake_export_dependencies/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_export_dependencies-0.9.6.ebuild 1196 BLAKE2B aa76cd6782478190c43f8f3e35d53a1d4c5b6e58ce2db0bca28850a595507e948130fc5de4b3e30b8ce5ec6023e686caafdc174a93498be2e9e441dca04db558 SHA512 5e55ee6b59f0894993b652d6ba7d4ac7dafa5a7d48c7ddb04fdf081e254ac76b2083dd131bf5c02000cb20e8576962c6bff6f82f08170514f1e75414da768eaa
 EBUILD ament_cmake_export_dependencies-1.0.0.ebuild 1196 BLAKE2B aa76cd6782478190c43f8f3e35d53a1d4c5b6e58ce2db0bca28850a595507e948130fc5de4b3e30b8ce5ec6023e686caafdc174a93498be2e9e441dca04db558 SHA512 5e55ee6b59f0894993b652d6ba7d4ac7dafa5a7d48c7ddb04fdf081e254ac76b2083dd131bf5c02000cb20e8576962c6bff6f82f08170514f1e75414da768eaa
+EBUILD ament_cmake_export_dependencies-1.0.1.ebuild 1196 BLAKE2B aa76cd6782478190c43f8f3e35d53a1d4c5b6e58ce2db0bca28850a595507e948130fc5de4b3e30b8ce5ec6023e686caafdc174a93498be2e9e441dca04db558 SHA512 5e55ee6b59f0894993b652d6ba7d4ac7dafa5a7d48c7ddb04fdf081e254ac76b2083dd131bf5c02000cb20e8576962c6bff6f82f08170514f1e75414da768eaa
 EBUILD ament_cmake_export_dependencies-9999.ebuild 1196 BLAKE2B aa76cd6782478190c43f8f3e35d53a1d4c5b6e58ce2db0bca28850a595507e948130fc5de4b3e30b8ce5ec6023e686caafdc174a93498be2e9e441dca04db558 SHA512 5e55ee6b59f0894993b652d6ba7d4ac7dafa5a7d48c7ddb04fdf081e254ac76b2083dd131bf5c02000cb20e8576962c6bff6f82f08170514f1e75414da768eaa
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.1.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.1.ebuild
new file mode 100644
index 000000000000..6dcea483b58f
--- /dev/null
+++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-1.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export dependencies to downstream packages in the ament buildsystem in CMake"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_include_directories/Manifest b/dev-ros/ament_cmake_export_include_directories/Manifest
index 0b983549deb0..c64fe24eaf6f 100644
--- a/dev-ros/ament_cmake_export_include_directories/Manifest
+++ b/dev-ros/ament_cmake_export_include_directories/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_export_include_directories-0.9.6.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 EBUILD ament_cmake_export_include_directories-1.0.0.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
+EBUILD ament_cmake_export_include_directories-1.0.1.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 EBUILD ament_cmake_export_include_directories-9999.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.1.ebuild b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.1.ebuild
new file mode 100644
index 000000000000..64cff4ebe537
--- /dev/null
+++ b/dev-ros/ament_cmake_export_include_directories/ament_cmake_export_include_directories-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_interfaces/Manifest b/dev-ros/ament_cmake_export_interfaces/Manifest
index 2b04e9b2044f..0ae0839979d3 100644
--- a/dev-ros/ament_cmake_export_interfaces/Manifest
+++ b/dev-ros/ament_cmake_export_interfaces/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_export_interfaces-0.9.6.ebuild 1192 BLAKE2B a31e72f4ee4a4d0882481d7fc2667e8facf73736b68b5b82017bfb7913d46e2210113dd961110991c8263c5bb038fb4eea9a19d9d0bb8fb33905ce0bd55b2ab1 SHA512 6216e585570926389694b3c4c45f3a3fb88ab0f620294a209f2920fb47e676e16850348a4cab2f2f7530855d7f287f727ddf483918fb3191d26879446f0a6ed9
 EBUILD ament_cmake_export_interfaces-1.0.0.ebuild 1192 BLAKE2B a31e72f4ee4a4d0882481d7fc2667e8facf73736b68b5b82017bfb7913d46e2210113dd961110991c8263c5bb038fb4eea9a19d9d0bb8fb33905ce0bd55b2ab1 SHA512 6216e585570926389694b3c4c45f3a3fb88ab0f620294a209f2920fb47e676e16850348a4cab2f2f7530855d7f287f727ddf483918fb3191d26879446f0a6ed9
+EBUILD ament_cmake_export_interfaces-1.0.1.ebuild 1192 BLAKE2B a31e72f4ee4a4d0882481d7fc2667e8facf73736b68b5b82017bfb7913d46e2210113dd961110991c8263c5bb038fb4eea9a19d9d0bb8fb33905ce0bd55b2ab1 SHA512 6216e585570926389694b3c4c45f3a3fb88ab0f620294a209f2920fb47e676e16850348a4cab2f2f7530855d7f287f727ddf483918fb3191d26879446f0a6ed9
 EBUILD ament_cmake_export_interfaces-9999.ebuild 1192 BLAKE2B a31e72f4ee4a4d0882481d7fc2667e8facf73736b68b5b82017bfb7913d46e2210113dd961110991c8263c5bb038fb4eea9a19d9d0bb8fb33905ce0bd55b2ab1 SHA512 6216e585570926389694b3c4c45f3a3fb88ab0f620294a209f2920fb47e676e16850348a4cab2f2f7530855d7f287f727ddf483918fb3191d26879446f0a6ed9
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.1.ebuild b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.1.ebuild
new file mode 100644
index 000000000000..d8a437ccd5be
--- /dev/null
+++ b/dev-ros/ament_cmake_export_interfaces/ament_cmake_export_interfaces-1.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export interfaces to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_libraries/Manifest b/dev-ros/ament_cmake_export_libraries/Manifest
index 323a892b40f6..a8087e1cf349 100644
--- a/dev-ros/ament_cmake_export_libraries/Manifest
+++ b/dev-ros/ament_cmake_export_libraries/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_export_libraries-0.9.6.ebuild 1153 BLAKE2B 0e965df391989bd92a92dd5083616a185229fa147f289aa8de78ae30740a29b77be4d3cd618f37324baab31616f59b29b1358233ff936e49db51edaa44faa81d SHA512 2686fe869b5b1b89f4b70b449a142098a5d8b05b55576a402873db009fed2d9173e13056147b69cc80920fe30fa3488b7c06188aa0384b32c5532a7396f917d3
 EBUILD ament_cmake_export_libraries-1.0.0.ebuild 1153 BLAKE2B 0e965df391989bd92a92dd5083616a185229fa147f289aa8de78ae30740a29b77be4d3cd618f37324baab31616f59b29b1358233ff936e49db51edaa44faa81d SHA512 2686fe869b5b1b89f4b70b449a142098a5d8b05b55576a402873db009fed2d9173e13056147b69cc80920fe30fa3488b7c06188aa0384b32c5532a7396f917d3
+EBUILD ament_cmake_export_libraries-1.0.1.ebuild 1153 BLAKE2B 0e965df391989bd92a92dd5083616a185229fa147f289aa8de78ae30740a29b77be4d3cd618f37324baab31616f59b29b1358233ff936e49db51edaa44faa81d SHA512 2686fe869b5b1b89f4b70b449a142098a5d8b05b55576a402873db009fed2d9173e13056147b69cc80920fe30fa3488b7c06188aa0384b32c5532a7396f917d3
 EBUILD ament_cmake_export_libraries-9999.ebuild 1153 BLAKE2B 0e965df391989bd92a92dd5083616a185229fa147f289aa8de78ae30740a29b77be4d3cd618f37324baab31616f59b29b1358233ff936e49db51edaa44faa81d SHA512 2686fe869b5b1b89f4b70b449a142098a5d8b05b55576a402873db009fed2d9173e13056147b69cc80920fe30fa3488b7c06188aa0384b32c5532a7396f917d3
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.1.ebuild b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.1.ebuild
new file mode 100644
index 000000000000..448a058815a4
--- /dev/null
+++ b/dev-ros/ament_cmake_export_libraries/ament_cmake_export_libraries-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export libraries to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_link_flags/Manifest b/dev-ros/ament_cmake_export_link_flags/Manifest
index 06b57bd54740..24f07bcaee82 100644
--- a/dev-ros/ament_cmake_export_link_flags/Manifest
+++ b/dev-ros/ament_cmake_export_link_flags/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_export_link_flags-0.9.6.ebuild 1154 BLAKE2B 0dea0c9e936377232321181b16855767842f15e91b33f3c121fa6fbe3ec957e96d227d09287a5cbf1968bacb156676badfe4ed221eeec42a712d3ea732479683 SHA512 28cdb8b9391cb9023f707967c566dbcd1ba01c8a2b09505ffcb8bc0547c490bb2e2f6952a0ca3e3e35880275d7fd99f3303664f908b6635c76b8fa76169c7f3b
 EBUILD ament_cmake_export_link_flags-1.0.0.ebuild 1154 BLAKE2B 0dea0c9e936377232321181b16855767842f15e91b33f3c121fa6fbe3ec957e96d227d09287a5cbf1968bacb156676badfe4ed221eeec42a712d3ea732479683 SHA512 28cdb8b9391cb9023f707967c566dbcd1ba01c8a2b09505ffcb8bc0547c490bb2e2f6952a0ca3e3e35880275d7fd99f3303664f908b6635c76b8fa76169c7f3b
+EBUILD ament_cmake_export_link_flags-1.0.1.ebuild 1154 BLAKE2B 0dea0c9e936377232321181b16855767842f15e91b33f3c121fa6fbe3ec957e96d227d09287a5cbf1968bacb156676badfe4ed221eeec42a712d3ea732479683 SHA512 28cdb8b9391cb9023f707967c566dbcd1ba01c8a2b09505ffcb8bc0547c490bb2e2f6952a0ca3e3e35880275d7fd99f3303664f908b6635c76b8fa76169c7f3b
 EBUILD ament_cmake_export_link_flags-9999.ebuild 1154 BLAKE2B 0dea0c9e936377232321181b16855767842f15e91b33f3c121fa6fbe3ec957e96d227d09287a5cbf1968bacb156676badfe4ed221eeec42a712d3ea732479683 SHA512 28cdb8b9391cb9023f707967c566dbcd1ba01c8a2b09505ffcb8bc0547c490bb2e2f6952a0ca3e3e35880275d7fd99f3303664f908b6635c76b8fa76169c7f3b
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.1.ebuild b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.1.ebuild
new file mode 100644
index 000000000000..a009e37c439b
--- /dev/null
+++ b/dev-ros/ament_cmake_export_link_flags/ament_cmake_export_link_flags-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export link flags to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_export_targets/Manifest b/dev-ros/ament_cmake_export_targets/Manifest
index bdf3854cf4a3..af6fcd2466da 100644
--- a/dev-ros/ament_cmake_export_targets/Manifest
+++ b/dev-ros/ament_cmake_export_targets/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_export_targets-0.9.6.ebuild 1189 BLAKE2B fd9b5e87e6d47b35c3683d888ee96178cc0ab09726a556952d9980d3b191a68277f0f8ef6bacdf8309041efbdffecc9ad6228a0671f80ec0e401f7f5718dc2bd SHA512 e222d4075bb2ec2be2caa3f4725aacfd6ded24e1cb2eb389f5f7e76228ae00f863a36d954ce50ed2df3a58a3a12d981bc7ceae16bbe080acdb9d192d1777a3c0
 EBUILD ament_cmake_export_targets-1.0.0.ebuild 1189 BLAKE2B fd9b5e87e6d47b35c3683d888ee96178cc0ab09726a556952d9980d3b191a68277f0f8ef6bacdf8309041efbdffecc9ad6228a0671f80ec0e401f7f5718dc2bd SHA512 e222d4075bb2ec2be2caa3f4725aacfd6ded24e1cb2eb389f5f7e76228ae00f863a36d954ce50ed2df3a58a3a12d981bc7ceae16bbe080acdb9d192d1777a3c0
+EBUILD ament_cmake_export_targets-1.0.1.ebuild 1189 BLAKE2B fd9b5e87e6d47b35c3683d888ee96178cc0ab09726a556952d9980d3b191a68277f0f8ef6bacdf8309041efbdffecc9ad6228a0671f80ec0e401f7f5718dc2bd SHA512 e222d4075bb2ec2be2caa3f4725aacfd6ded24e1cb2eb389f5f7e76228ae00f863a36d954ce50ed2df3a58a3a12d981bc7ceae16bbe080acdb9d192d1777a3c0
 EBUILD ament_cmake_export_targets-9999.ebuild 1189 BLAKE2B fd9b5e87e6d47b35c3683d888ee96178cc0ab09726a556952d9980d3b191a68277f0f8ef6bacdf8309041efbdffecc9ad6228a0671f80ec0e401f7f5718dc2bd SHA512 e222d4075bb2ec2be2caa3f4725aacfd6ded24e1cb2eb389f5f7e76228ae00f863a36d954ce50ed2df3a58a3a12d981bc7ceae16bbe080acdb9d192d1777a3c0
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.1.ebuild b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.1.ebuild
new file mode 100644
index 000000000000..16d96ae3af52
--- /dev/null
+++ b/dev-ros/ament_cmake_export_targets/ament_cmake_export_targets-1.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export targets to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_gmock/Manifest b/dev-ros/ament_cmake_gmock/Manifest
index 6ae0dd448383..03c54ffad5e0 100644
--- a/dev-ros/ament_cmake_gmock/Manifest
+++ b/dev-ros/ament_cmake_gmock/Manifest
@@ -1,4 +1,6 @@
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_gmock-1.0.0.ebuild 1156 BLAKE2B c87d1774065994503291eca280dd6bb3e11ac3df3216e040990110d684824877c0bbb4a478e1c34d622f9e7ea14ae3e33ac8a5b93a9373abe389b6992aaaf7c3 SHA512 215bf70e9ceb21398d648b8d97472b83184359a2508f1f98c87f4a393beb453f62b243951b278b9540712a0468f7b97f9cb19dd4d331e1eba137e94b10d09ba7
+EBUILD ament_cmake_gmock-1.0.1.ebuild 1156 BLAKE2B c87d1774065994503291eca280dd6bb3e11ac3df3216e040990110d684824877c0bbb4a478e1c34d622f9e7ea14ae3e33ac8a5b93a9373abe389b6992aaaf7c3 SHA512 215bf70e9ceb21398d648b8d97472b83184359a2508f1f98c87f4a393beb453f62b243951b278b9540712a0468f7b97f9cb19dd4d331e1eba137e94b10d09ba7
 EBUILD ament_cmake_gmock-9999.ebuild 1156 BLAKE2B c87d1774065994503291eca280dd6bb3e11ac3df3216e040990110d684824877c0bbb4a478e1c34d622f9e7ea14ae3e33ac8a5b93a9373abe389b6992aaaf7c3 SHA512 215bf70e9ceb21398d648b8d97472b83184359a2508f1f98c87f4a393beb453f62b243951b278b9540712a0468f7b97f9cb19dd4d331e1eba137e94b10d09ba7
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.1.ebuild b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.1.ebuild
new file mode 100644
index 000000000000..f63ad218898c
--- /dev/null
+++ b/dev-ros/ament_cmake_gmock/ament_cmake_gmock-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add Google mock-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_gtest/Manifest b/dev-ros/ament_cmake_gtest/Manifest
index f8f1aab49821..874d763c2541 100644
--- a/dev-ros/ament_cmake_gtest/Manifest
+++ b/dev-ros/ament_cmake_gtest/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_gtest-0.9.6.ebuild 1150 BLAKE2B 74e8c2f0f9e7d6f0a3b1e3f9ab99b72a602ed394a26465093c99ea199fb969626ba9ae90e5e876b789487fae9cb2d41843c60c3cf8dd8e109c0d318669cd3528 SHA512 ba1df600f56bb1d86e1e3a30ec60d0fc72607d5be023d42c72717280efe366620d98bb9887093152b30a35bba30a5cad4da6091c105f2fd609a8d451fed46268
 EBUILD ament_cmake_gtest-1.0.0.ebuild 1150 BLAKE2B 74e8c2f0f9e7d6f0a3b1e3f9ab99b72a602ed394a26465093c99ea199fb969626ba9ae90e5e876b789487fae9cb2d41843c60c3cf8dd8e109c0d318669cd3528 SHA512 ba1df600f56bb1d86e1e3a30ec60d0fc72607d5be023d42c72717280efe366620d98bb9887093152b30a35bba30a5cad4da6091c105f2fd609a8d451fed46268
+EBUILD ament_cmake_gtest-1.0.1.ebuild 1150 BLAKE2B 74e8c2f0f9e7d6f0a3b1e3f9ab99b72a602ed394a26465093c99ea199fb969626ba9ae90e5e876b789487fae9cb2d41843c60c3cf8dd8e109c0d318669cd3528 SHA512 ba1df600f56bb1d86e1e3a30ec60d0fc72607d5be023d42c72717280efe366620d98bb9887093152b30a35bba30a5cad4da6091c105f2fd609a8d451fed46268
 EBUILD ament_cmake_gtest-9999.ebuild 1150 BLAKE2B 74e8c2f0f9e7d6f0a3b1e3f9ab99b72a602ed394a26465093c99ea199fb969626ba9ae90e5e876b789487fae9cb2d41843c60c3cf8dd8e109c0d318669cd3528 SHA512 ba1df600f56bb1d86e1e3a30ec60d0fc72607d5be023d42c72717280efe366620d98bb9887093152b30a35bba30a5cad4da6091c105f2fd609a8d451fed46268
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.1.ebuild b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.1.ebuild
new file mode 100644
index 000000000000..2f25c5bddffb
--- /dev/null
+++ b/dev-ros/ament_cmake_gtest/ament_cmake_gtest-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add gtest-based tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_include_directories/Manifest b/dev-ros/ament_cmake_include_directories/Manifest
index dfadfa2571cd..7a69dc93337d 100644
--- a/dev-ros/ament_cmake_include_directories/Manifest
+++ b/dev-ros/ament_cmake_include_directories/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_include_directories-0.9.6.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 EBUILD ament_cmake_include_directories-1.0.0.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
+EBUILD ament_cmake_include_directories-1.0.1.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 EBUILD ament_cmake_include_directories-9999.ebuild 1163 BLAKE2B f33b8cb7cb8a19870eda894c9b84526272ffd92b8ec7b040968821398de17fd366cc3f34ee9f906eafa588fc84300d26241b3467cf3fdebd1dfa2f0e6bd55c19 SHA512 7fdc934703ca32f9766fec56ee79db5c0ff00157bb54b0316c7b9cd3b71b581e2f8dd363c52959eac4b82980af1a002398479df3edf7ed5e4229b78fc1f44274
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.1.ebuild b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.1.ebuild
new file mode 100644
index 000000000000..64cff4ebe537
--- /dev/null
+++ b/dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Export include directories to downstream packages in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_libraries/Manifest b/dev-ros/ament_cmake_libraries/Manifest
index 380eb0cded4f..92fea5664c8b 100644
--- a/dev-ros/ament_cmake_libraries/Manifest
+++ b/dev-ros/ament_cmake_libraries/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_libraries-0.9.6.ebuild 1156 BLAKE2B 02b31003eabc18ab331de87e54ed0b051c982fed15df3ea70a849e7151022b8957bd51edc88ccffb6028c36028bcf4f1fb854ed8ab94c605177d800cb82d8ac3 SHA512 7ceb43c0e90bf0e6fa7e33517a5fb2f34b3175b59220d6d97a85374b6c1018d86b23d0100ccdaad977c41209f1feb27a2cf6217b37e395439b66da22b697a0cb
 EBUILD ament_cmake_libraries-1.0.0.ebuild 1156 BLAKE2B 02b31003eabc18ab331de87e54ed0b051c982fed15df3ea70a849e7151022b8957bd51edc88ccffb6028c36028bcf4f1fb854ed8ab94c605177d800cb82d8ac3 SHA512 7ceb43c0e90bf0e6fa7e33517a5fb2f34b3175b59220d6d97a85374b6c1018d86b23d0100ccdaad977c41209f1feb27a2cf6217b37e395439b66da22b697a0cb
+EBUILD ament_cmake_libraries-1.0.1.ebuild 1156 BLAKE2B 02b31003eabc18ab331de87e54ed0b051c982fed15df3ea70a849e7151022b8957bd51edc88ccffb6028c36028bcf4f1fb854ed8ab94c605177d800cb82d8ac3 SHA512 7ceb43c0e90bf0e6fa7e33517a5fb2f34b3175b59220d6d97a85374b6c1018d86b23d0100ccdaad977c41209f1feb27a2cf6217b37e395439b66da22b697a0cb
 EBUILD ament_cmake_libraries-9999.ebuild 1156 BLAKE2B 02b31003eabc18ab331de87e54ed0b051c982fed15df3ea70a849e7151022b8957bd51edc88ccffb6028c36028bcf4f1fb854ed8ab94c605177d800cb82d8ac3 SHA512 7ceb43c0e90bf0e6fa7e33517a5fb2f34b3175b59220d6d97a85374b6c1018d86b23d0100ccdaad977c41209f1feb27a2cf6217b37e395439b66da22b697a0cb
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.1.ebuild b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.1.ebuild
new file mode 100644
index 000000000000..b578744e5fc1
--- /dev/null
+++ b/dev-ros/ament_cmake_libraries/ament_cmake_libraries-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The functionality to deduplicate libraries in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_lint_cmake/Manifest b/dev-ros/ament_cmake_lint_cmake/Manifest
index a8f4f8a4911c..3526d807a72c 100644
--- a/dev-ros/ament_cmake_lint_cmake/Manifest
+++ b/dev-ros/ament_cmake_lint_cmake/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cmake_lint_cmake-0.10.0.ebuild 1254 BLAKE2B 13f8562fe224b99a99bebcee8e6ec64172a9d222aaa4943ed2742d405a1e33b4916fa6d93897858e92e6c92d99a29ed52ab805c2eb372e1dd630456b9372c5bc SHA512 cb2793e0c927ea5c887885ad230af2c9c2c4f47388a0885379609a76963bf2da279eaf1b0df8a2dbb4c7fac23c33eeef8a88b8616409fcd435ec9e289bd052ba
 EBUILD ament_cmake_lint_cmake-0.9.5.ebuild 1254 BLAKE2B 13f8562fe224b99a99bebcee8e6ec64172a9d222aaa4943ed2742d405a1e33b4916fa6d93897858e92e6c92d99a29ed52ab805c2eb372e1dd630456b9372c5bc SHA512 cb2793e0c927ea5c887885ad230af2c9c2c4f47388a0885379609a76963bf2da279eaf1b0df8a2dbb4c7fac23c33eeef8a88b8616409fcd435ec9e289bd052ba
 EBUILD ament_cmake_lint_cmake-9999.ebuild 1254 BLAKE2B 13f8562fe224b99a99bebcee8e6ec64172a9d222aaa4943ed2742d405a1e33b4916fa6d93897858e92e6c92d99a29ed52ab805c2eb372e1dd630456b9372c5bc SHA512 cb2793e0c927ea5c887885ad230af2c9c2c4f47388a0885379609a76963bf2da279eaf1b0df8a2dbb4c7fac23c33eeef8a88b8616409fcd435ec9e289bd052ba
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.0.ebuild b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.0.ebuild
new file mode 100644
index 000000000000..9b291e4d7356
--- /dev/null
+++ b/dev-ros/ament_cmake_lint_cmake/ament_cmake_lint_cmake-0.10.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The CMake API for ament_lint_cmake to lint CMake code using cmakelint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_lint_cmake
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "dev-ros/ament_lint_cmake[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_pytest/Manifest b/dev-ros/ament_cmake_pytest/Manifest
index 899dd9246716..96377b3c0b07 100644
--- a/dev-ros/ament_cmake_pytest/Manifest
+++ b/dev-ros/ament_cmake_pytest/Manifest
@@ -1,4 +1,6 @@
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_pytest-1.0.0.ebuild 1158 BLAKE2B ee413315205e26fd9606f578f147db7f9dfd14d66b86ca29114555b9bd34c6347cb6681fecca18e60aa0e966139a06c922d0c6d848e8409e48181257b8307b52 SHA512 20920da8d699f6675887da88dff9fdb279eb2ac1da3d2436b7b970b07128aafc2f07dc747f30174f6441546152fb3c02b670abab8d7a60502c78079acff2fa8d
+EBUILD ament_cmake_pytest-1.0.1.ebuild 1158 BLAKE2B ee413315205e26fd9606f578f147db7f9dfd14d66b86ca29114555b9bd34c6347cb6681fecca18e60aa0e966139a06c922d0c6d848e8409e48181257b8307b52 SHA512 20920da8d699f6675887da88dff9fdb279eb2ac1da3d2436b7b970b07128aafc2f07dc747f30174f6441546152fb3c02b670abab8d7a60502c78079acff2fa8d
 EBUILD ament_cmake_pytest-9999.ebuild 1158 BLAKE2B ee413315205e26fd9606f578f147db7f9dfd14d66b86ca29114555b9bd34c6347cb6681fecca18e60aa0e966139a06c922d0c6d848e8409e48181257b8307b52 SHA512 20920da8d699f6675887da88dff9fdb279eb2ac1da3d2436b7b970b07128aafc2f07dc747f30174f6441546152fb3c02b670abab8d7a60502c78079acff2fa8d
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.1.ebuild b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.1.ebuild
new file mode 100644
index 000000000000..f0104eb06e84
--- /dev/null
+++ b/dev-ros/ament_cmake_pytest/ament_cmake_pytest-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to run Python tests using pytest in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_python/Manifest b/dev-ros/ament_cmake_python/Manifest
index e3b7c53500d6..b9523712f9a8 100644
--- a/dev-ros/ament_cmake_python/Manifest
+++ b/dev-ros/ament_cmake_python/Manifest
@@ -1,7 +1,9 @@
 AUX destdir.patch 1203 BLAKE2B fe4e783ea9d4802752d79d489e5b05d0ca9688a76d678521af41f232005da611c0286f594d15045dcae5610362ccc1bb878d29bddbeb86a9452b0289af347d67 SHA512 85e196c9777a6cc8b8b693e3825d5027c7a5db0a74008ad34d9be3714a088a9e651bb99ce53ee2bd95c47b2c1f8c2c657fa18cce0f13b11e4ea437cdd03ef0b3
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_python-0.9.6.ebuild 1179 BLAKE2B bd55579ab2cf0c7043498796caa5a8311ff3a040d31e1405091007d85228c369091c1cbd05403f1dab1146701105c22c04b946b7d1966fcb2bb2dbbb0fe047d4 SHA512 e706c7a8176da23881db3cc87b38b60bd5ef7da781ac129a4bfff0cdf2d867d55936a9fad42e06885884f3374dda21f6f94743faaec605de9eefbe18a3ecec93
 EBUILD ament_cmake_python-1.0.0.ebuild 1179 BLAKE2B bd55579ab2cf0c7043498796caa5a8311ff3a040d31e1405091007d85228c369091c1cbd05403f1dab1146701105c22c04b946b7d1966fcb2bb2dbbb0fe047d4 SHA512 e706c7a8176da23881db3cc87b38b60bd5ef7da781ac129a4bfff0cdf2d867d55936a9fad42e06885884f3374dda21f6f94743faaec605de9eefbe18a3ecec93
+EBUILD ament_cmake_python-1.0.1.ebuild 1179 BLAKE2B bd55579ab2cf0c7043498796caa5a8311ff3a040d31e1405091007d85228c369091c1cbd05403f1dab1146701105c22c04b946b7d1966fcb2bb2dbbb0fe047d4 SHA512 e706c7a8176da23881db3cc87b38b60bd5ef7da781ac129a4bfff0cdf2d867d55936a9fad42e06885884f3374dda21f6f94743faaec605de9eefbe18a3ecec93
 EBUILD ament_cmake_python-9999.ebuild 1179 BLAKE2B bd55579ab2cf0c7043498796caa5a8311ff3a040d31e1405091007d85228c369091c1cbd05403f1dab1146701105c22c04b946b7d1966fcb2bb2dbbb0fe047d4 SHA512 e706c7a8176da23881db3cc87b38b60bd5ef7da781ac129a4bfff0cdf2d867d55936a9fad42e06885884f3374dda21f6f94743faaec605de9eefbe18a3ecec93
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_python/ament_cmake_python-1.0.1.ebuild b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.1.ebuild
new file mode 100644
index 000000000000..866ed8213865
--- /dev/null
+++ b/dev-ros/ament_cmake_python/ament_cmake_python-1.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to use Python in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+PATCHES=( "${FILESDIR}/destdir.patch" )
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_target_dependencies/Manifest b/dev-ros/ament_cmake_target_dependencies/Manifest
index a0312c22c8da..c3f8393559a9 100644
--- a/dev-ros/ament_cmake_target_dependencies/Manifest
+++ b/dev-ros/ament_cmake_target_dependencies/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_target_dependencies-0.9.6.ebuild 1229 BLAKE2B 7c1768c9208e49b4e2a07cccf0323d84886882dc298e1cb2f49b79f26f2aa36cf01d3569ea083bb578fc32628df41831bf1b0acec0b12702cfabad6a90afd9a9 SHA512 268221ab833b39d7d943dd0d3022ef5d0fe5862adbfaed9f7a8878b21eb1393b2902d1c77c6b2c9f7c5ae92b2e9fc5b5e28787908bba7eca40635ef616989481
 EBUILD ament_cmake_target_dependencies-1.0.0.ebuild 1229 BLAKE2B 7c1768c9208e49b4e2a07cccf0323d84886882dc298e1cb2f49b79f26f2aa36cf01d3569ea083bb578fc32628df41831bf1b0acec0b12702cfabad6a90afd9a9 SHA512 268221ab833b39d7d943dd0d3022ef5d0fe5862adbfaed9f7a8878b21eb1393b2902d1c77c6b2c9f7c5ae92b2e9fc5b5e28787908bba7eca40635ef616989481
+EBUILD ament_cmake_target_dependencies-1.0.1.ebuild 1229 BLAKE2B 7c1768c9208e49b4e2a07cccf0323d84886882dc298e1cb2f49b79f26f2aa36cf01d3569ea083bb578fc32628df41831bf1b0acec0b12702cfabad6a90afd9a9 SHA512 268221ab833b39d7d943dd0d3022ef5d0fe5862adbfaed9f7a8878b21eb1393b2902d1c77c6b2c9f7c5ae92b2e9fc5b5e28787908bba7eca40635ef616989481
 EBUILD ament_cmake_target_dependencies-9999.ebuild 1229 BLAKE2B 7c1768c9208e49b4e2a07cccf0323d84886882dc298e1cb2f49b79f26f2aa36cf01d3569ea083bb578fc32628df41831bf1b0acec0b12702cfabad6a90afd9a9 SHA512 268221ab833b39d7d943dd0d3022ef5d0fe5862adbfaed9f7a8878b21eb1393b2902d1c77c6b2c9f7c5ae92b2e9fc5b5e28787908bba7eca40635ef616989481
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.1.ebuild b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.1.ebuild
new file mode 100644
index 000000000000..16ca90c0c124
--- /dev/null
+++ b/dev-ros/ament_cmake_target_dependencies/ament_cmake_target_dependencies-1.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Add defs, include dirs and libs to a target in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_include_directories
+	dev-ros/ament_cmake_libraries
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_test/Manifest b/dev-ros/ament_cmake_test/Manifest
index bb268be1bc91..a8acc54bb7ac 100644
--- a/dev-ros/ament_cmake_test/Manifest
+++ b/dev-ros/ament_cmake_test/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_test-0.9.6.ebuild 1228 BLAKE2B fda231a83e47e9306552d0b3ca2e98b74a838f66e241218a01fe4d9b071b2886dc187b4f078ccdb2aea8414c1e2e5367bbee966360acbf4fdfe902fac810f3a5 SHA512 ba3574bae3f6cf78d92ac513e30f70da3fd8fca369d86b4d1f76435f92ca45e4e38d25b9eab175bc8549786e67b6d65e1ad787bf34663691fbc211e10406691c
 EBUILD ament_cmake_test-1.0.0.ebuild 1228 BLAKE2B fda231a83e47e9306552d0b3ca2e98b74a838f66e241218a01fe4d9b071b2886dc187b4f078ccdb2aea8414c1e2e5367bbee966360acbf4fdfe902fac810f3a5 SHA512 ba3574bae3f6cf78d92ac513e30f70da3fd8fca369d86b4d1f76435f92ca45e4e38d25b9eab175bc8549786e67b6d65e1ad787bf34663691fbc211e10406691c
+EBUILD ament_cmake_test-1.0.1.ebuild 1228 BLAKE2B fda231a83e47e9306552d0b3ca2e98b74a838f66e241218a01fe4d9b071b2886dc187b4f078ccdb2aea8414c1e2e5367bbee966360acbf4fdfe902fac810f3a5 SHA512 ba3574bae3f6cf78d92ac513e30f70da3fd8fca369d86b4d1f76435f92ca45e4e38d25b9eab175bc8549786e67b6d65e1ad787bf34663691fbc211e10406691c
 EBUILD ament_cmake_test-9999.ebuild 1228 BLAKE2B fda231a83e47e9306552d0b3ca2e98b74a838f66e241218a01fe4d9b071b2886dc187b4f078ccdb2aea8414c1e2e5367bbee966360acbf4fdfe902fac810f3a5 SHA512 ba3574bae3f6cf78d92ac513e30f70da3fd8fca369d86b4d1f76435f92ca45e4e38d25b9eab175bc8549786e67b6d65e1ad787bf34663691fbc211e10406691c
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-1.0.1.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.1.ebuild
new file mode 100644
index 000000000000..00d8aa0613ba
--- /dev/null
+++ b/dev-ros/ament_cmake_test/ament_cmake_test-1.0.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to add tests in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+	dev-ros/ament_cmake_core
+		dev-python/ament_package[${PYTHON_USEDEP}]
+		dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-ros/ament_cmake_python
+	${PYTHON_DEPS}
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	python_foreach_impl cmake_src_configure
+}
+
+src_compile() {
+	python_foreach_impl cmake_src_compile
+}
+
+src_test() {
+	python_foreach_impl cmake_src_test
+}
+
+src_install() {
+	python_foreach_impl cmake_src_install
+	python_foreach_impl python_optimize
+}
diff --git a/dev-ros/ament_cmake_uncrustify/Manifest b/dev-ros/ament_cmake_uncrustify/Manifest
index 52bed5a3bf96..6bf21541d21e 100644
--- a/dev-ros/ament_cmake_uncrustify/Manifest
+++ b/dev-ros/ament_cmake_uncrustify/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cmake_uncrustify-0.10.0.ebuild 1511 BLAKE2B 7ac9f39d3b46d3f919ef3b19b8c751568aeeca04a02937b5bc2524df065cd1803fd2283bffaeb3692a70b6a1057b9882a99310d2975108c77cae75228b789ae5 SHA512 2f902e897196006df8fcf882c9a9876f6aba7bf919cda7c3e9797acf09a7d5003e44e415132540c56818b9325ea6d17cf9c1edff2dc09ba88ac7827406bc5408
 EBUILD ament_cmake_uncrustify-0.9.5.ebuild 1511 BLAKE2B 7ac9f39d3b46d3f919ef3b19b8c751568aeeca04a02937b5bc2524df065cd1803fd2283bffaeb3692a70b6a1057b9882a99310d2975108c77cae75228b789ae5 SHA512 2f902e897196006df8fcf882c9a9876f6aba7bf919cda7c3e9797acf09a7d5003e44e415132540c56818b9325ea6d17cf9c1edff2dc09ba88ac7827406bc5408
 EBUILD ament_cmake_uncrustify-9999.ebuild 1511 BLAKE2B 7ac9f39d3b46d3f919ef3b19b8c751568aeeca04a02937b5bc2524df065cd1803fd2283bffaeb3692a70b6a1057b9882a99310d2975108c77cae75228b789ae5 SHA512 2f902e897196006df8fcf882c9a9876f6aba7bf919cda7c3e9797acf09a7d5003e44e415132540c56818b9325ea6d17cf9c1edff2dc09ba88ac7827406bc5408
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.0.ebuild b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.0.ebuild
new file mode 100644
index 000000000000..347b57dc9dc5
--- /dev/null
+++ b/dev-ros/ament_cmake_uncrustify/ament_cmake_uncrustify-0.10.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The CMake API for ament_uncrustify to check code against styleconventions"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_uncrustify
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	test? (
+		dev-ros/ament_cmake_copyright
+		$(python_gen_any_dep 'dev-ros/ament_copyright[${PYTHON_USEDEP}]')
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	{ use !test || has_version -b "dev-ros/ament_copyright[${PYTHON_USEDEP}]"; } && \
+		has_version -b "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version -b "dev-python/ament_package[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_cmake_version/Manifest b/dev-ros/ament_cmake_version/Manifest
index 31f0b01a7017..1c35439b1f06 100644
--- a/dev-ros/ament_cmake_version/Manifest
+++ b/dev-ros/ament_cmake_version/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake_version-0.9.6.ebuild 1151 BLAKE2B 06c964c00f3ad5e81382614db7c8ebee1ff5c6b0d8491993e566a7c402bb89ca35663b8745d02c00fed1adf26c6f92f6cf3447fe6bdbbad4ce52e5f8b47b5ac7 SHA512 68f13961bfc2c66ded41ab9803937cdd96c76f3d05dae2a2799c3381fc4b576a7b81ac47eda6649b385d576e295451eee0799f856d798bfcf8b7f5895d22f1b2
 EBUILD ament_cmake_version-1.0.0.ebuild 1151 BLAKE2B 06c964c00f3ad5e81382614db7c8ebee1ff5c6b0d8491993e566a7c402bb89ca35663b8745d02c00fed1adf26c6f92f6cf3447fe6bdbbad4ce52e5f8b47b5ac7 SHA512 68f13961bfc2c66ded41ab9803937cdd96c76f3d05dae2a2799c3381fc4b576a7b81ac47eda6649b385d576e295451eee0799f856d798bfcf8b7f5895d22f1b2
+EBUILD ament_cmake_version-1.0.1.ebuild 1151 BLAKE2B 06c964c00f3ad5e81382614db7c8ebee1ff5c6b0d8491993e566a7c402bb89ca35663b8745d02c00fed1adf26c6f92f6cf3447fe6bdbbad4ce52e5f8b47b5ac7 SHA512 68f13961bfc2c66ded41ab9803937cdd96c76f3d05dae2a2799c3381fc4b576a7b81ac47eda6649b385d576e295451eee0799f856d798bfcf8b7f5895d22f1b2
 EBUILD ament_cmake_version-9999.ebuild 1151 BLAKE2B 06c964c00f3ad5e81382614db7c8ebee1ff5c6b0d8491993e566a7c402bb89ca35663b8745d02c00fed1adf26c6f92f6cf3447fe6bdbbad4ce52e5f8b47b5ac7 SHA512 68f13961bfc2c66ded41ab9803937cdd96c76f3d05dae2a2799c3381fc4b576a7b81ac47eda6649b385d576e295451eee0799f856d798bfcf8b7f5895d22f1b2
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/dev-ros/ament_cmake_version/ament_cmake_version-1.0.1.ebuild b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.1.ebuild
new file mode 100644
index 000000000000..59400b11d05b
--- /dev/null
+++ b/dev-ros/ament_cmake_version/ament_cmake_version-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Override the exported package version in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_cmake_xmllint/Manifest b/dev-ros/ament_cmake_xmllint/Manifest
index 8eb07f87fedb..303fe3436058 100644
--- a/dev-ros/ament_cmake_xmllint/Manifest
+++ b/dev-ros/ament_cmake_xmllint/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_cmake_xmllint-0.10.0.ebuild 1447 BLAKE2B 49fdb7b43e6447652f7021c27b32d2ab56c091f4a85a60d5760caf0a5e5c3300e472c332d2521997dd8da6eb5bc7ae11eff014ed8989bbbc5c9e2094f792a6b4 SHA512 a4862a39bdb0239cf83d0ee4ed91d4f90d2846b886807dc8458007d7f8ffff3cc30b7d16ab7396d3c7f524dddc5b00efde1137353207355bb20b25576f3c07d2
 EBUILD ament_cmake_xmllint-0.9.5.ebuild 1447 BLAKE2B 49fdb7b43e6447652f7021c27b32d2ab56c091f4a85a60d5760caf0a5e5c3300e472c332d2521997dd8da6eb5bc7ae11eff014ed8989bbbc5c9e2094f792a6b4 SHA512 a4862a39bdb0239cf83d0ee4ed91d4f90d2846b886807dc8458007d7f8ffff3cc30b7d16ab7396d3c7f524dddc5b00efde1137353207355bb20b25576f3c07d2
 EBUILD ament_cmake_xmllint-9999.ebuild 1447 BLAKE2B 49fdb7b43e6447652f7021c27b32d2ab56c091f4a85a60d5760caf0a5e5c3300e472c332d2521997dd8da6eb5bc7ae11eff014ed8989bbbc5c9e2094f792a6b4 SHA512 a4862a39bdb0239cf83d0ee4ed91d4f90d2846b886807dc8458007d7f8ffff3cc30b7d16ab7396d3c7f524dddc5b00efde1137353207355bb20b25576f3c07d2
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.0.ebuild b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.0.ebuild
new file mode 100644
index 000000000000..065d1257e262
--- /dev/null
+++ b/dev-ros/ament_cmake_xmllint/ament_cmake_xmllint-0.10.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="he CMake API for ament_xmllint to check XML file using xmmlint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_copyright
+"
+DEPEND=""
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}] dev-ros/ament_xmllint[${PYTHON_USEDEP}]')
+	dev-ros/ament_cmake_test
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_copyright
+	test? (
+		dev-ros/ament_cmake_lint_cmake
+	)
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]" && \
+		has_version "dev-ros/ament_xmllint[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/dev-ros/ament_copyright/Manifest b/dev-ros/ament_copyright/Manifest
index d25f0be68034..745b87c6ab7c 100644
--- a/dev-ros/ament_copyright/Manifest
+++ b/dev-ros/ament_copyright/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_copyright-0.9.5.ebuild 1107 BLAKE2B f6a4bb7c676a6c29b1f55c91c248205325891950c9a5723afb95ef1dd63ba8aba67e2610c88933830ae928b6cce4f4568e47c2008a528745223314992fe93f77 SHA512 9f68a8c170acd053148971c754670f68c75bc0b4c85ea5032f01a73d4a01ebf376aceb65663592048072b7ba677f36ae7c2ff788bd0a49667db9438eda95b60b
-EBUILD ament_copyright-9999.ebuild 1107 BLAKE2B f6a4bb7c676a6c29b1f55c91c248205325891950c9a5723afb95ef1dd63ba8aba67e2610c88933830ae928b6cce4f4568e47c2008a528745223314992fe93f77 SHA512 9f68a8c170acd053148971c754670f68c75bc0b4c85ea5032f01a73d4a01ebf376aceb65663592048072b7ba677f36ae7c2ff788bd0a49667db9438eda95b60b
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_copyright-0.10.0.ebuild 1140 BLAKE2B 9ec8b335378a72ee8bd87e27a274d53e70b941fd8fa301ebeb0687aa076e4f26e25af1a45ba3d7e9ea6e21998b97bc8e5e12d180c9735d0d340f6e78fea4c6f4 SHA512 048ed0e03cec9761e90c59773626a12347b487c296fd95024113c82ed245f66302016a2ccd85854d4386226b333171a00736d43b92431a2db90ec1e3119c4e26
+EBUILD ament_copyright-9999.ebuild 1140 BLAKE2B 9ec8b335378a72ee8bd87e27a274d53e70b941fd8fa301ebeb0687aa076e4f26e25af1a45ba3d7e9ea6e21998b97bc8e5e12d180c9735d0d340f6e78fea4c6f4 SHA512 048ed0e03cec9761e90c59773626a12347b487c296fd95024113c82ed245f66302016a2ccd85854d4386226b333171a00736d43b92431a2db90ec1e3119c4e26
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_copyright/ament_copyright-0.10.0.ebuild b/dev-ros/ament_copyright/ament_copyright-0.10.0.ebuild
new file mode 100644
index 000000000000..fb789cb409b3
--- /dev/null
+++ b/dev-ros/ament_copyright/ament_copyright-0.10.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check source files for copyright and license information."
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-ros/ament_copyright/ament_copyright-0.9.5.ebuild b/dev-ros/ament_copyright/ament_copyright-0.9.5.ebuild
deleted file mode 100644
index 900785c148df..000000000000
--- a/dev-ros/ament_copyright/ament_copyright-0.9.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to check source files for copyright and license information."
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND="
-	dev-ros/ament_lint
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND=""
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-ros/ament_copyright/ament_copyright-9999.ebuild b/dev-ros/ament_copyright/ament_copyright-9999.ebuild
index 900785c148df..fb789cb409b3 100644
--- a/dev-ros/ament_copyright/ament_copyright-9999.ebuild
+++ b/dev-ros/ament_copyright/ament_copyright-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_cppcheck/Manifest b/dev-ros/ament_cppcheck/Manifest
index 3bd21e14e20e..bf103a22ca84 100644
--- a/dev-ros/ament_cppcheck/Manifest
+++ b/dev-ros/ament_cppcheck/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_cppcheck-0.9.5.ebuild 779 BLAKE2B 73abfee136357c8313b74ab0551e101f8b0760bdf7a5c159aa033e157b018e490d9ba6938c476f91bc341d1b6230c4d881a8160d4008008c6e80593434d50a0f SHA512 52522b7326d8a241755a18f79214ca6930801ecc60911a60f80fb30c2ff6d58f8863bb0588dc2af69b2fde4ce76d6d0894506ee84399c50e4c8759ee4975887b
-EBUILD ament_cppcheck-9999.ebuild 779 BLAKE2B 73abfee136357c8313b74ab0551e101f8b0760bdf7a5c159aa033e157b018e490d9ba6938c476f91bc341d1b6230c4d881a8160d4008008c6e80593434d50a0f SHA512 52522b7326d8a241755a18f79214ca6930801ecc60911a60f80fb30c2ff6d58f8863bb0588dc2af69b2fde4ce76d6d0894506ee84399c50e4c8759ee4975887b
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_cppcheck-0.10.0.ebuild 812 BLAKE2B 485643f05a8e499f3c0ace2a346ec29d804670174d6c98da7932d9c0c73b182c7dea7d4a70d0769c31ee59d94601fd09770dd89ff610c4176818a1d3197af305 SHA512 206edcec6b794621c069fd396d485c4e36fcc03cd6421c08e2388aceb65b3c0ee0e1b03a72e8c57089ed6f0cb4a9f09f7e6e6f2b51ea58f48ca7346d58a6433c
+EBUILD ament_cppcheck-9999.ebuild 812 BLAKE2B 485643f05a8e499f3c0ace2a346ec29d804670174d6c98da7932d9c0c73b182c7dea7d4a70d0769c31ee59d94601fd09770dd89ff610c4176818a1d3197af305 SHA512 206edcec6b794621c069fd396d485c4e36fcc03cd6421c08e2388aceb65b3c0ee0e1b03a72e8c57089ed6f0cb4a9f09f7e6e6f2b51ea58f48ca7346d58a6433c
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.10.0.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.10.0.ebuild
new file mode 100644
index 000000000000..42fa61df3e0b
--- /dev/null
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-0.10.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to perform static code analysis on C/C++ code using Cppcheck"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-util/cppcheck
+"
+DEPEND=""
+BDEPEND=""
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-0.9.5.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-0.9.5.ebuild
deleted file mode 100644
index 6a0744a992d3..000000000000
--- a/dev-ros/ament_cppcheck/ament_cppcheck-0.9.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to perform static code analysis on C/C++ code using Cppcheck"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-util/cppcheck
-"
-DEPEND=""
-BDEPEND=""
diff --git a/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild b/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
index 6a0744a992d3..42fa61df3e0b 100644
--- a/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
+++ b/dev-ros/ament_cppcheck/ament_cppcheck-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_cpplint/Manifest b/dev-ros/ament_cpplint/Manifest
index 04779351cabc..4693bc3cd603 100644
--- a/dev-ros/ament_cpplint/Manifest
+++ b/dev-ros/ament_cpplint/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_cpplint-0.9.5.ebuild 986 BLAKE2B 9905865e8c4138fd906c704461de13087fb8f211d0e8969e63014344f750003d3225339affa9767d25c8b3ce933728323d964997a9f8992eef24d3cd9f61456a SHA512 d2c675161d3b76deee6286b32fd5ecc6e2b521f21a893c0f611b55472548a30c26f64912fa63094bf875fde8406d484ff143e4991a7627f2abc5345abc9138de
-EBUILD ament_cpplint-9999.ebuild 986 BLAKE2B 9905865e8c4138fd906c704461de13087fb8f211d0e8969e63014344f750003d3225339affa9767d25c8b3ce933728323d964997a9f8992eef24d3cd9f61456a SHA512 d2c675161d3b76deee6286b32fd5ecc6e2b521f21a893c0f611b55472548a30c26f64912fa63094bf875fde8406d484ff143e4991a7627f2abc5345abc9138de
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_cpplint-0.10.0.ebuild 1019 BLAKE2B 45dfe10090b96ac0d7ed70acc6588c4b2afe9e165669e2a7976c6539d3659ce5d50d1ee1b5d77dc6d83aa39d9b78b530a48a83f64fc92117c97d89c1eb48b1ec SHA512 4ed1572ff1163d907fa8be47cb077746c67aa95b187ab67a0bf8b81e5e08201c0f4d2d423cdd8be735dae51ab8d15fc8363af08178cd2e2212eb5d78ea11c3c4
+EBUILD ament_cpplint-9999.ebuild 1019 BLAKE2B 45dfe10090b96ac0d7ed70acc6588c4b2afe9e165669e2a7976c6539d3659ce5d50d1ee1b5d77dc6d83aa39d9b78b530a48a83f64fc92117c97d89c1eb48b1ec SHA512 4ed1572ff1163d907fa8be47cb077746c67aa95b187ab67a0bf8b81e5e08201c0f4d2d423cdd8be735dae51ab8d15fc8363af08178cd2e2212eb5d78ea11c3c4
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_cpplint/ament_cpplint-0.10.0.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.10.0.ebuild
new file mode 100644
index 000000000000..a1b7cd1269bd
--- /dev/null
+++ b/dev-ros/ament_cpplint/ament_cpplint-0.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check code against the Google style conventions using cpplint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_cpplint/ament_cpplint-0.9.5.ebuild b/dev-ros/ament_cpplint/ament_cpplint-0.9.5.ebuild
deleted file mode 100644
index 429c4f07a46d..000000000000
--- a/dev-ros/ament_cpplint/ament_cpplint-0.9.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to check code against the Google style conventions using cpplint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND=""
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild b/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild
index 429c4f07a46d..a1b7cd1269bd 100644
--- a/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild
+++ b/dev-ros/ament_cpplint/ament_cpplint-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_flake8/Manifest b/dev-ros/ament_flake8/Manifest
index 5cda0b532524..6ab9236f5bbf 100644
--- a/dev-ros/ament_flake8/Manifest
+++ b/dev-ros/ament_flake8/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_flake8-0.9.5.ebuild 933 BLAKE2B 9d3adc524e34363cf1ec0ad87dbd63703081f6553058b5f1f7f7462a106ff6612701a3fcef44b72aa9ac53ff7fca0ccd239548ff2a8500dc7309aec4203ea836 SHA512 f7635c4e1feff8c29b5279b6034a8f0c5acb7dfb286780567b43306127e15b2e70449cff37490f1cee6edf86f5d07734473d8b084a514b0a0d367ba3d8a7cf07
-EBUILD ament_flake8-9999.ebuild 933 BLAKE2B 9d3adc524e34363cf1ec0ad87dbd63703081f6553058b5f1f7f7462a106ff6612701a3fcef44b72aa9ac53ff7fca0ccd239548ff2a8500dc7309aec4203ea836 SHA512 f7635c4e1feff8c29b5279b6034a8f0c5acb7dfb286780567b43306127e15b2e70449cff37490f1cee6edf86f5d07734473d8b084a514b0a0d367ba3d8a7cf07
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_flake8-0.10.0.ebuild 966 BLAKE2B 12ecb70da0074205908513558015c4f0647dac907f865128be25735e5657fd9e65c034c2984609464c2dbf456046b787d995f1b7e9966bbc21f92ca16610a839 SHA512 2adc3d70b9dde93e3118e384f46410b22630d0f092b2d0d7fe8aebd828276d86df7e126741a9ad38cafa2c557ddc739953cb74c880f7d12d326566c77a8e8ad4
+EBUILD ament_flake8-9999.ebuild 966 BLAKE2B 12ecb70da0074205908513558015c4f0647dac907f865128be25735e5657fd9e65c034c2984609464c2dbf456046b787d995f1b7e9966bbc21f92ca16610a839 SHA512 2adc3d70b9dde93e3118e384f46410b22630d0f092b2d0d7fe8aebd828276d86df7e126741a9ad38cafa2c557ddc739953cb74c880f7d12d326566c77a8e8ad4
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_flake8/ament_flake8-0.10.0.ebuild b/dev-ros/ament_flake8/ament_flake8-0.10.0.ebuild
new file mode 100644
index 000000000000..4d6314b20b89
--- /dev/null
+++ b/dev-ros/ament_flake8/ament_flake8-0.10.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check code for style and syntax conventions with flake8"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_flake8/ament_flake8-0.9.5.ebuild b/dev-ros/ament_flake8/ament_flake8-0.9.5.ebuild
deleted file mode 100644
index 91b3d21e5ffc..000000000000
--- a/dev-ros/ament_flake8/ament_flake8-0.9.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to check code for style and syntax conventions with flake8"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND=""
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_flake8/ament_flake8-9999.ebuild b/dev-ros/ament_flake8/ament_flake8-9999.ebuild
index 91b3d21e5ffc..4d6314b20b89 100644
--- a/dev-ros/ament_flake8/ament_flake8-9999.ebuild
+++ b/dev-ros/ament_flake8/ament_flake8-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_lint/Manifest b/dev-ros/ament_lint/Manifest
index 9728f57976d6..0c02806e4fa1 100644
--- a/dev-ros/ament_lint/Manifest
+++ b/dev-ros/ament_lint/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_lint-0.10.0.ebuild 737 BLAKE2B b3a0d3593189f905166edd4123aeffe2dc09fb018fc03993c440112de49ffb73084c14f3a3c3fd7cd01166b30d704b81e0920c16b3b8951bfa45accfb314b6af SHA512 fce25c1e73eb20ecd99ec8ed09dd4eac16f97becfee54c4f765ab42cac960b7e3f5662e41abaa0dc014eeb9cfdfa079f41c51182c95fbe9cdb3569de6564e2d4
 EBUILD ament_lint-0.9.5.ebuild 737 BLAKE2B b3a0d3593189f905166edd4123aeffe2dc09fb018fc03993c440112de49ffb73084c14f3a3c3fd7cd01166b30d704b81e0920c16b3b8951bfa45accfb314b6af SHA512 fce25c1e73eb20ecd99ec8ed09dd4eac16f97becfee54c4f765ab42cac960b7e3f5662e41abaa0dc014eeb9cfdfa079f41c51182c95fbe9cdb3569de6564e2d4
 EBUILD ament_lint-9999.ebuild 737 BLAKE2B b3a0d3593189f905166edd4123aeffe2dc09fb018fc03993c440112de49ffb73084c14f3a3c3fd7cd01166b30d704b81e0920c16b3b8951bfa45accfb314b6af SHA512 fce25c1e73eb20ecd99ec8ed09dd4eac16f97becfee54c4f765ab42cac960b7e3f5662e41abaa0dc014eeb9cfdfa079f41c51182c95fbe9cdb3569de6564e2d4
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint/ament_lint-0.10.0.ebuild b/dev-ros/ament_lint/ament_lint-0.10.0.ebuild
new file mode 100644
index 000000000000..20530ba2bd7e
--- /dev/null
+++ b/dev-ros/ament_lint/ament_lint-0.10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Common API for ament linter packages"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+BDEPEND=""
diff --git a/dev-ros/ament_lint_auto/Manifest b/dev-ros/ament_lint_auto/Manifest
index dcb0095131ec..430439d1bb38 100644
--- a/dev-ros/ament_lint_auto/Manifest
+++ b/dev-ros/ament_lint_auto/Manifest
@@ -1,4 +1,6 @@
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
 DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
+EBUILD ament_lint_auto-0.10.0.ebuild 1172 BLAKE2B ac440b1fb55484c7d9f85dfe512af394474333ec6233ebc0cf54dc2383b5a14285693f6db4ffc1bd1f6631b6c4e7dc48b569e5e79e86dca6dab412e01e1af744 SHA512 aaa135a58122470a3ff8e86c2aecc3e5f09af378abf3bf85af575b692f79ad96ad7fad7b038289319c756bd8f0d179a0e6135aa6ccafaaeb595e22c1430162f1
 EBUILD ament_lint_auto-0.9.5.ebuild 1172 BLAKE2B ac440b1fb55484c7d9f85dfe512af394474333ec6233ebc0cf54dc2383b5a14285693f6db4ffc1bd1f6631b6c4e7dc48b569e5e79e86dca6dab412e01e1af744 SHA512 aaa135a58122470a3ff8e86c2aecc3e5f09af378abf3bf85af575b692f79ad96ad7fad7b038289319c756bd8f0d179a0e6135aa6ccafaaeb595e22c1430162f1
 EBUILD ament_lint_auto-9999.ebuild 1172 BLAKE2B ac440b1fb55484c7d9f85dfe512af394474333ec6233ebc0cf54dc2383b5a14285693f6db4ffc1bd1f6631b6c4e7dc48b569e5e79e86dca6dab412e01e1af744 SHA512 aaa135a58122470a3ff8e86c2aecc3e5f09af378abf3bf85af575b692f79ad96ad7fad7b038289319c756bd8f0d179a0e6135aa6ccafaaeb595e22c1430162f1
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint_auto/ament_lint_auto-0.10.0.ebuild b/dev-ros/ament_lint_auto/ament_lint_auto-0.10.0.ebuild
new file mode 100644
index 000000000000..120c90db0dd4
--- /dev/null
+++ b/dev-ros/ament_lint_auto/ament_lint_auto-0.10.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-any-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The auto-magic functions for ease to use of the ament linters"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_test
+"
+DEPEND="${RDEPEND}"
+# Deps here are transitive from ament_cmake_core to have matching python support
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
+	${PYTHON_DEPS}
+"
+
+python_check_deps() {
+	has_version "dev-python/ament_package[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/catkin_pkg[${PYTHON_USEDEP}]"
+}
diff --git a/dev-ros/ament_lint_cmake/Manifest b/dev-ros/ament_lint_cmake/Manifest
index f42a6470b9e7..6785c9a8b223 100644
--- a/dev-ros/ament_lint_cmake/Manifest
+++ b/dev-ros/ament_lint_cmake/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_lint_cmake-0.9.5.ebuild 978 BLAKE2B 5ad587b24be0ed037c2b8548afd9c547355e680b8a970eebf877b3226d12901ff6164b283c4db1ab70494a866c54d094a8f98d30a8e054fbfc02275b35a0a9c5 SHA512 e1cadb43205d6932d795327dd8435da5cdf06a3ed64229c354802ce7ec43be94a812b9a411274c7158e9a1c8eb61e45cd6e315b08c4efecb6b19c1080d19a209
-EBUILD ament_lint_cmake-9999.ebuild 978 BLAKE2B 5ad587b24be0ed037c2b8548afd9c547355e680b8a970eebf877b3226d12901ff6164b283c4db1ab70494a866c54d094a8f98d30a8e054fbfc02275b35a0a9c5 SHA512 e1cadb43205d6932d795327dd8435da5cdf06a3ed64229c354802ce7ec43be94a812b9a411274c7158e9a1c8eb61e45cd6e315b08c4efecb6b19c1080d19a209
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_lint_cmake-0.10.0.ebuild 1011 BLAKE2B b1ad74b8e17ea1b5f886ef742e46d174693fa4714ba221f56e0f60cfeeb08117b17d7c8477de5386d745f3acb212e76cbf0e23f7af25631a1931a7216fe0e1ef SHA512 a6a14cdfd85cbd963431911796408d321c9c854dd7feb199045813ef53f917386f8dcb5dfdcf59d0cf5f83743a4442c7fdb7a9a9d2e24f0b11adc167efb4137e
+EBUILD ament_lint_cmake-9999.ebuild 1011 BLAKE2B b1ad74b8e17ea1b5f886ef742e46d174693fa4714ba221f56e0f60cfeeb08117b17d7c8477de5386d745f3acb212e76cbf0e23f7af25631a1931a7216fe0e1ef SHA512 a6a14cdfd85cbd963431911796408d321c9c854dd7feb199045813ef53f917386f8dcb5dfdcf59d0cf5f83743a4442c7fdb7a9a9d2e24f0b11adc167efb4137e
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.0.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.0.ebuild
new file mode 100644
index 000000000000..33508ffd955c
--- /dev/null
+++ b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Lint CMake code using cmakelint and generate xUnit test result files"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.9.5.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-0.9.5.ebuild
deleted file mode 100644
index e45310e62d25..000000000000
--- a/dev-ros/ament_lint_cmake/ament_lint_cmake-0.9.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Lint CMake code using cmakelint and generate xUnit test result files"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND=""
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_lint_cmake/ament_lint_cmake-9999.ebuild b/dev-ros/ament_lint_cmake/ament_lint_cmake-9999.ebuild
index e45310e62d25..33508ffd955c 100644
--- a/dev-ros/ament_lint_cmake/ament_lint_cmake-9999.ebuild
+++ b/dev-ros/ament_lint_cmake/ament_lint_cmake-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_pep257/Manifest b/dev-ros/ament_pep257/Manifest
index 656e4646e94b..28b681bb9237 100644
--- a/dev-ros/ament_pep257/Manifest
+++ b/dev-ros/ament_pep257/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_pep257-0.9.5.ebuild 981 BLAKE2B a451962b7f69f4579458efcdecfdf818cb97665fde6e6b942fa66dbc6c77737afabc29bae35d1bcdb9d500583ead032b987418d74a3dda906bfc8ad7fab3c996 SHA512 5628c2bd6b5e935f99ace1d4e7c4cea19fced6840e0f2616e1bf4ad7421b60be5c7dabcaad23a161fe3780ede977a2d79db5218ca65128b05de4c1199131a331
-EBUILD ament_pep257-9999.ebuild 981 BLAKE2B a451962b7f69f4579458efcdecfdf818cb97665fde6e6b942fa66dbc6c77737afabc29bae35d1bcdb9d500583ead032b987418d74a3dda906bfc8ad7fab3c996 SHA512 5628c2bd6b5e935f99ace1d4e7c4cea19fced6840e0f2616e1bf4ad7421b60be5c7dabcaad23a161fe3780ede977a2d79db5218ca65128b05de4c1199131a331
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_pep257-0.10.0.ebuild 1014 BLAKE2B 5a81703962a92ac21544e12395287773fe970456841c1042ef2d655dc4597d86240a990ae322e3406026dd5f921776ef2e310699f7daf92ae402af9b24f01822 SHA512 ff765b32ff0a7e4ec81a55b9590cd66841daafbee029d62343281ef1ecc9887e5ad963fe2f7a51fad838a881fa42463b574e6923385b3dfc8b9d6859e213834d
+EBUILD ament_pep257-9999.ebuild 1014 BLAKE2B 5a81703962a92ac21544e12395287773fe970456841c1042ef2d655dc4597d86240a990ae322e3406026dd5f921776ef2e310699f7daf92ae402af9b24f01822 SHA512 ff765b32ff0a7e4ec81a55b9590cd66841daafbee029d62343281ef1ecc9887e5ad963fe2f7a51fad838a881fa42463b574e6923385b3dfc8b9d6859e213834d
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_pep257/ament_pep257-0.10.0.ebuild b/dev-ros/ament_pep257/ament_pep257-0.10.0.ebuild
new file mode 100644
index 000000000000..e29026c993c2
--- /dev/null
+++ b/dev-ros/ament_pep257/ament_pep257-0.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Checks code against style conventions in PEP 8 and generate test result files"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-python/pydocstyle[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_pep257/ament_pep257-0.9.5.ebuild b/dev-ros/ament_pep257/ament_pep257-0.9.5.ebuild
deleted file mode 100644
index 30e3a98b66d7..000000000000
--- a/dev-ros/ament_pep257/ament_pep257-0.9.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Checks code against style conventions in PEP 8 and generate test result files"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-python/pydocstyle[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND=""
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_pep257/ament_pep257-9999.ebuild b/dev-ros/ament_pep257/ament_pep257-9999.ebuild
index 30e3a98b66d7..e29026c993c2 100644
--- a/dev-ros/ament_pep257/ament_pep257-9999.ebuild
+++ b/dev-ros/ament_pep257/ament_pep257-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_uncrustify/Manifest b/dev-ros/ament_uncrustify/Manifest
index 27786584e2cc..76cdb377f2dc 100644
--- a/dev-ros/ament_uncrustify/Manifest
+++ b/dev-ros/ament_uncrustify/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_uncrustify-0.9.5.ebuild 777 BLAKE2B aa07cfce12f28ae5f06d91195986cc2aeea829b035ccf427e1c566eeca297387d70146884fddcd6187fe0e689509b8715ea0a6cedb7a4e3fe5ec694690c14165 SHA512 7bdf67b0dfe60c106e6598ddd366bd8990813a42c3f992c9f74b7291c0b35b8345e8164a17783befb3fc0e3e2c8732dde5bffc44eb11e577a78265fc2e2454e0
-EBUILD ament_uncrustify-9999.ebuild 777 BLAKE2B aa07cfce12f28ae5f06d91195986cc2aeea829b035ccf427e1c566eeca297387d70146884fddcd6187fe0e689509b8715ea0a6cedb7a4e3fe5ec694690c14165 SHA512 7bdf67b0dfe60c106e6598ddd366bd8990813a42c3f992c9f74b7291c0b35b8345e8164a17783befb3fc0e3e2c8732dde5bffc44eb11e577a78265fc2e2454e0
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_uncrustify-0.10.0.ebuild 810 BLAKE2B 787273df2df17c7ab6669d41b03ac4af946e19ab82ac97d151a64f8ae5ebe4cacc5412e52ec230931dcc0c9447f75be645c2ec29285c5f51deb4eeddc4e90c80 SHA512 32b7290e38432c311e67f9721b7f5916179c04f955f35c958d82eb23c15d9aa4280af3755134113a18fb25a19a44baf41a5c76bea074dde37fcdd3cbddd58645
+EBUILD ament_uncrustify-9999.ebuild 810 BLAKE2B 787273df2df17c7ab6669d41b03ac4af946e19ab82ac97d151a64f8ae5ebe4cacc5412e52ec230931dcc0c9447f75be645c2ec29285c5f51deb4eeddc4e90c80 SHA512 32b7290e38432c311e67f9721b7f5916179c04f955f35c958d82eb23c15d9aa4280af3755134113a18fb25a19a44baf41a5c76bea074dde37fcdd3cbddd58645
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.10.0.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.0.ebuild
new file mode 100644
index 000000000000..43acf79bb21d
--- /dev/null
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-0.10.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The ability to check code against style conventions using uncrustify"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+RDEPEND="
+	dev-util/uncrustify
+"
+DEPEND=""
+BDEPEND=""
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-0.9.5.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-0.9.5.ebuild
deleted file mode 100644
index fa3b285d2836..000000000000
--- a/dev-ros/ament_uncrustify/ament_uncrustify-0.9.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="The ability to check code against style conventions using uncrustify"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE=""
-
-RDEPEND="
-	dev-util/uncrustify
-"
-DEPEND=""
-BDEPEND=""
diff --git a/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild b/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
index fa3b285d2836..43acf79bb21d 100644
--- a/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
+++ b/dev-ros/ament_uncrustify/ament_uncrustify-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ros/ament_xmllint/Manifest b/dev-ros/ament_xmllint/Manifest
index e2c1a0231cba..8401b856fd30 100644
--- a/dev-ros/ament_xmllint/Manifest
+++ b/dev-ros/ament_xmllint/Manifest
@@ -1,4 +1,4 @@
-DIST ament_lint-0.9.5.tar.gz 218077 BLAKE2B bc49fdb517bcdab815cfd4c945e9d61a9b53d4b600361ced9161b6186bfb74fdb3d5ed5f14a48f22a91fd0737333dc76cc7d55044c204ea864b53dd68e32254b SHA512 1c5b3acb31a07f4613e13fe69f6dad1981df0dc596e46a07651322a4da1c5f3db40befb775aa42aabc1f6808132c950c9f37950f64b4196e3c1b40871e25a384
-EBUILD ament_xmllint-0.9.5.ebuild 1047 BLAKE2B 4becfad9cf69de54c705e4ab87d16167e89c6fbea628db129aeb0b8318d251046fdcad5e8db1c8d6fadf084129b24a5a15e01c5409272ec8c8206b47c2327f1b SHA512 7f0161cc73cbb48c6567bdb980401684944cb1daeb4662a717b2329f4bc1efebc84632006ce8832ffbbd70dedf02a67902e9b0843522f00a04c7308748bf3d22
-EBUILD ament_xmllint-9999.ebuild 1047 BLAKE2B 4becfad9cf69de54c705e4ab87d16167e89c6fbea628db129aeb0b8318d251046fdcad5e8db1c8d6fadf084129b24a5a15e01c5409272ec8c8206b47c2327f1b SHA512 7f0161cc73cbb48c6567bdb980401684944cb1daeb4662a717b2329f4bc1efebc84632006ce8832ffbbd70dedf02a67902e9b0843522f00a04c7308748bf3d22
+DIST ament_lint-0.10.0.tar.gz 219525 BLAKE2B 6ba7a32d0678e545c24b74ed187991140c34a363ad855e469f0e20f8a088b7cc939bbd187566233e099576e4c2b899d7d75edf311d3026234222078968be7ce6 SHA512 565413fa325317e6f00ce18051eb13556d1d50144d2c8f62368e5505455ef7f9fae3a69e8d723a3949e44b1f9e638741ae6d9b87687df81a661eb804365200f8
+EBUILD ament_xmllint-0.10.0.ebuild 1080 BLAKE2B c86fcc87bf6e04549e993e5503e50f7f373a26d55333cda855ebe8ad0b74f0d28fcb39db983ae39512ad21a58f877874af74d32ee95329a7fc0c07d4fc330595 SHA512 500020a2efba6390399b1d769cd9d7ed374ac0f246820478ea865984c740e1baa25f52da3795bea9d326b5b2d8f7af9fa097b5e0f3eff8ddf87423925f2418f2
+EBUILD ament_xmllint-9999.ebuild 1080 BLAKE2B c86fcc87bf6e04549e993e5503e50f7f373a26d55333cda855ebe8ad0b74f0d28fcb39db983ae39512ad21a58f877874af74d32ee95329a7fc0c07d4fc330595 SHA512 500020a2efba6390399b1d769cd9d7ed374ac0f246820478ea865984c740e1baa25f52da3795bea9d326b5b2d8f7af9fa097b5e0f3eff8ddf87423925f2418f2
 MISC metadata.xml 330 BLAKE2B 6b820c3189393a7216b0c5681a814e8fbbae006e285bd0673cb6e4ef05e10c7db229b4759fb6911aab2ad4222f823e8b5495f17f7032317949d0374df6c56e81 SHA512 f9aa499007ca33a8e21ab871f868f4e8cbdf5fa27acb6195bf41d8d3de185f344517eace9b7e91a7da26ba0bfacb00ae054ef8e240e235e734e86160f49c941b
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild
new file mode 100644
index 000000000000..b5534f5fbb16
--- /dev/null
+++ b/dev-ros/ament_xmllint/ament_xmllint-0.10.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+ROS_PN="ament_lint"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_lint"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="Checks XML files like the package manifest using xmllint"
+HOMEPAGE="https://github.com/ament/ament_lint"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND="
+	dev-ros/ament_lint[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/ament_copyright[${PYTHON_USEDEP}]
+		dev-ros/ament_flake8[${PYTHON_USEDEP}]
+		dev-ros/ament_pep257[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND=""
+
+distutils_enable_tests pytest
diff --git a/dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild b/dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild
deleted file mode 100644
index d9b72688ca3b..000000000000
--- a/dev-ros/ament_xmllint/ament_xmllint-0.9.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit distutils-r1
-
-ROS_PN="ament_lint"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ament/ament_lint"
-	SRC_URI=""
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/ament/ament_lint/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
-	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
-fi
-
-DESCRIPTION="Checks XML files like the package manifest using xmllint"
-HOMEPAGE="https://github.com/ament/ament_lint"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-
-RDEPEND="
-	dev-ros/ament_lint[${PYTHON_USEDEP}]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/ament_copyright[${PYTHON_USEDEP}]
-		dev-ros/ament_flake8[${PYTHON_USEDEP}]
-		dev-ros/ament_pep257[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND=""
-
-distutils_enable_tests pytest
diff --git a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
index d9b72688ca3b..b5534f5fbb16 100644
--- a/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
+++ b/dev-ros/ament_xmllint/ament_xmllint-9999.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 1e4af516e645..d80efd022392 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index f7770d40f9b1..b691bb6643ff 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -2,5 +2,5 @@ DIST bundler-1.17.3.gem 364032 BLAKE2B 81e097156a593e4ec85a2353aa6c62143d9aad120
 DIST bundler-2.1.4.gem 396800 BLAKE2B f770bd63255df09a20160369dc64e8923e996fb5ea4c11ee763d9a88e5fba142277ccd677861e3c0494b99a36261d5e7bdfb9c40c2abb76322061542f95b8505 SHA512 6c870061a78e17d97a9219433c7ef8fbf1112de17d0e0f3d8b6db1a518318528e3803184278412aabe65008e93f451ffa59465062856918ef488f9438399eff6
 EBUILD bundler-1.17.3-r1.ebuild 948 BLAKE2B 40c498f2fc6858151b90bbadf70bdbb32a3b9d8ed64e09b388937b67a02ea4d5013843abb9c3f366ca0ac5ac98087b63db50677a32dc0abeaee6d051488bcc31 SHA512 179ea9ccbffdad03770264756278ac3fbd4dc6773bf50e3a5dbb6dbc120519ca0f8d3bbadb7bb5c42738e43f85ac09db1266eaf2d42708473932270f3a06b20c
 EBUILD bundler-1.17.3.ebuild 923 BLAKE2B dee890006e077eeffc983ca29b2de37f337d5c32fc92dfb720f0a225f7431fa2c7e6195b739ec7c028670b26d9b70f7d66fbd9c57e621656d49f2da4d38f80a4 SHA512 647ca0538317fbd7f6401efba0033fb5f9225df5567eac234ddde719131edf074254cbab631f162811a2a0c4742eeabc747b8f6e0bbad6f2fa43f0eb6c24a875
-EBUILD bundler-2.1.4.ebuild 942 BLAKE2B 254eb97ee9cf6dcb49a567e069af71f69c52fcb5a363d1e6c0e6a0efdc5f719cefa52621c5b713fb034de10598db710dff03fb97527c7497b1389fce419017d1 SHA512 d0930d4952a9cf9b77a1b2eb20c26c971d8e5e166731b430a9f770c333bf1337b618c86033ac7a7e7dcf16c8362aceb3ac31a6a320326d189317880d2bb7e539
+EBUILD bundler-2.1.4.ebuild 941 BLAKE2B ce63d4da5a5f085a3f85afd80eb504cad821d3b5f7e1226e313a227f1efa8cf2ab544729a1953a5acebc9436ebd246cb2b217539de95ce2aa2c9a007551e8323 SHA512 2e1ecfe549f618f53f3f62148bc7152039857ba2c4feb5cc484e6caeeb9f82a760f8d8c9fc0b92cf419137ca5694a3eeee318e69f2f17396b738ac7bb8fa7b79
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-2.1.4.ebuild b/dev-ruby/bundler/bundler-2.1.4.ebuild
index a5107b1f839f..5f7ce6757824 100644
--- a/dev-ruby/bundler/bundler-2.1.4.ebuild
+++ b/dev-ruby/bundler/bundler-2.1.4.ebuild
@@ -29,4 +29,4 @@ IUSE="+doc test"
 
 ruby_add_rdepend virtual/rubygems
 
-RDEPEND+=" dev-vcs/git !!<dev-ruby/bundler-1.17.3-r1:0"
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/coolio/Manifest b/dev-ruby/coolio/Manifest
index d0e6ca7368c2..df0bc6fbf914 100644
--- a/dev-ruby/coolio/Manifest
+++ b/dev-ruby/coolio/Manifest
@@ -1,3 +1,5 @@
 DIST cool.io-1.6.0.gem 112128 BLAKE2B 829a2ce47342b4611fb76457836935e26902e5849dd7c43aae297f1d4b220c30020478d3176d15c179489be2ceb504da218b123d04cd6639a7b99e8a185f51eb SHA512 d6ef51ef15b804158b5d84a6a774368513e787d0bec12743d3ebf0c634d40b1fbfe213b5b7c484a1f3de0aaf894e5edb3072e39452d53886b00317a368570e76
+DIST cool.io-1.7.0.gem 112128 BLAKE2B 6c3db3fb6ac001321884de8cb1ffb4b1b8d7ef10afdd92cdbbae97672de43b75b79316cdd56f3a2075c7521742e1fd6874afdd9c218c68f532560d0fa77c0745 SHA512 e443fdd71a6bd0dd8409b7285a4fcea880aae2a43fc5687f664caa936ff4304b522bc07e148bdd51c91f8847ed2f482c5bbcee435dfab5282cf1114a47686d95
 EBUILD coolio-1.6.0.ebuild 1446 BLAKE2B b02a2812141f06849746a78cc80d80f976d551b757ccccd6fb538166b05eb4092e513cf78fc5309d392aec224ec31c7456c54a9ed84608403838df0248d15a60 SHA512 ccbdf45fb33cc23061d8b59f61db20e43a4218bc11f3cab834c890b72e49c785f3d1bdc1d31033fb65b97124f54335a9cec0d4fe8a17bac31d7673da5100fe50
+EBUILD coolio-1.7.0.ebuild 1439 BLAKE2B ccbb6b6695432b9b36f68cd426ae9a346375b53d0597cfd6a2aca5dd749f6d27f42ee1d321683ecd76b86bf04a9b5b7c2b16760ea4e0f61c46edf346a6866f83 SHA512 6e91969a45e80c178fbe04360a66aaba2423db1fd162a90f9bb70d310f27e45bea3c6d0fa9678eeceb3b87aca67c419f14fe33a8c97b8b01c5801863573af943
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/coolio/coolio-1.7.0.ebuild b/dev-ruby/coolio/coolio-1.7.0.ebuild
new file mode 100644
index 000000000000..30cbd1fc5c95
--- /dev/null
+++ b/dev-ruby/coolio/coolio-1.7.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+RUBY_FAKEGEM_NAME="cool.io"
+
+RUBY_FAKEGEM_GEMSPEC="cool.io.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A high performance event framework for Ruby which uses the libev C library"
+HOMEPAGE="https://coolio.github.com/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# cool.io includes a bundled version of libev that is patched to work correctly with ruby.
+
+ruby_add_rdepend ">=dev-ruby/iobuffer-1"
+
+all_ruby_prepare() {
+	rm -r Gemfile* lib/.gitignore || die
+
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '28i  s.add_dependency "iobuffer"' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on rake-compiler
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
+
+	# Remove specs that require network connectivity
+	rm -f spec/dns_spec.rb || die
+
+	# Use one address consistently
+	sed -i -e 's/localhost/127.0.0.1/' spec/{udp_socket,tcp_server,iobuffer}_spec.rb || die
+}
+
+each_ruby_configure() {
+	pushd ext/cool.io || die
+	${RUBY} extconf.rb || die
+	popd || die
+}
+
+each_ruby_compile() {
+	pushd ext/cool.io || die
+	emake V=1
+	popd || die
+	cp ext/cool.io/cool.io_ext$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 7cfc0d02399a..16af7477f96f 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,4 +1,6 @@
 DIST dalli-2.7.10.tar.gz 52106 BLAKE2B 0531247c1d615acd7d1124b8aceb5635088b55e5a85753f10b8fbd786ec3573f13df096e1537d9a31f3801632406f28d918de5971cb28ec31d6eb8387d0c74f1 SHA512 1b6308ef37d729d85741306c10bf87c9b9733f83f0b4bf089f3eced36c48cddd9a77d2fb44a77778844d1cafaa3cec5110a9c90f6a67dee08a96e163e6ccaf65
+DIST dalli-2.7.11.tar.gz 52341 BLAKE2B 5b3a2bc57f4b0e3a9ac0d24ffa3bba89ea38665ac08ef3d7760fa6ce74db21d323a18e74a4f3009165364332731d7c6890df36c68409afbe21d3ac096275f028 SHA512 8f299a19d95293370564b6337bbdfeb32d928e0a95bf5f5df962ea20b039f4765da1797513ca96cabf93309484575481a02fb1e0c6d227f74c81fc72f95be22a
 EBUILD dalli-2.7.10-r1.ebuild 1569 BLAKE2B c338dcbfcc866ef1c188d76e1b23c9c3818f7743794b0cd2d0853ab6694b9b2ee7c7d1309dd0a57ed1ae18158a57f082311ecb3603dd12ccca344135623d2b51 SHA512 39989fb31d37a878773ee056dbc3ae9bb4415c92201d14aa4778076ec7540a55f9498fe525859d4239c8671c6d16e347b35b99b5dd3b8119d364638217482dab
 EBUILD dalli-2.7.10.ebuild 1578 BLAKE2B aa257dd54dfd71304c5bf60d8373252466770d027a72bbb1c42af5e2c2593bc018c124208b8d78219ad3d6cd9ab6506117282bfc04e6922ff05dfede2a82ebe3 SHA512 0ce0ba0d10409a0531257e5f314c84b18839a0823941c0b5e36020cfdf55243002f98eb4cd4de64806e182c3f7a4559c5462e84727e6346c63f81476911a3162
+EBUILD dalli-2.7.11.ebuild 1563 BLAKE2B 3215a1299bcd782f20ced36ac97ba9ea0eee377926f8229e2b6135cf04f53fe6a7982b20352e4d361d036a85988892f576af7af2001dbd8372f0bafcc38016bc SHA512 9e917a78f87bbc8f80e56a6de8d6f79a73f385bc51d2181c1f681da18f3fc934021ca5913c61613577f16468ea57aa0af00f613ebc031b9514fbaf3dbcbc42e8
 MISC metadata.xml 346 BLAKE2B e34b47009de19ff810f3c3893517533730fa09cc4713b5fb8ebc05011004e17466ca0a6e6df307e5748003a7b4c83691d28ca0d80b423f6f870c4f7fc9be88eb SHA512 22b3ca0c5024974556840a2cf47ffa0dac63b6a4573d2ca6244c3ec9231b1c8321c7f544bc979882a6bb6ca37545b8ccf4612ce9ffd1ab34521b24e896f57e41
diff --git a/dev-ruby/dalli/dalli-2.7.11.ebuild b/dev-ruby/dalli/dalli-2.7.11.ebuild
new file mode 100644
index 000000000000..a8a2a8ccf9e1
--- /dev/null
+++ b/dev-ruby/dalli/dalli-2.7.11.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
+HOMEPAGE="https://github.com/petergoldstein/dalli"
+SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+IUSE=""
+
+DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4 )"
+
+ruby_add_bdepend "test? (
+		dev-ruby/minitest:5
+		>=dev-ruby/mocha-0.13
+		dev-ruby/rack
+		>=dev-ruby/activesupport-5.2
+		dev-ruby/connection_pool )"
+
+all_ruby_prepare() {
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
+
+	sed -i -e '3igem "minitest", "~> 5.0"; gem "activesupport", ">=5.2.0"' \
+		-e '/bundler/ s:^:#:' test/helper.rb || die
+
+	# Drop rails dependency which is only used to display the version
+	# number, so we only need to depend on activesupport and avoid
+	# complicated circular dependencies.
+	sed -i -e '/rails/I s:^:#:' \
+		-e '14irequire "active_support"' test/helper.rb || die
+
+	# Fix test compatability with memcached 1.5.4 and higher
+	# https://github.com/petergoldstein/dalli/pull/672
+	#sed -i -e '/memcached_low_mem_persistent/,/^end/ s/-M/-M -I 512k/' test/memcached_mock.rb || die
+}
diff --git a/dev-ruby/em-websocket/Manifest b/dev-ruby/em-websocket/Manifest
index aaff264165ab..7873184d1042 100644
--- a/dev-ruby/em-websocket/Manifest
+++ b/dev-ruby/em-websocket/Manifest
@@ -1,3 +1,5 @@
 DIST em-websocket-0.5.1.tar.gz 27792 BLAKE2B 5aa8b9b9a1bf7066086c3115358a01054dbd24c3b9e7b454210c653aa25face2230e5504e0fc3a13d4770bcfcdf5d792c1914f173ec8d83d1b97ee7c169636af SHA512 ca2b4e2e4be663a5932fe63ed0efab169fbee9aec50f9780c1ee5df0efa300acb58410b97a22d5d10a2cb9195c2a68f6c71bf4e070ee6d915c6abf4015aa5d94
+DIST em-websocket-0.5.2.tar.gz 29367 BLAKE2B 91d41044e20f1f8277527205e3ee6671de2a1fb9b433c18d5b48a166c7cfa53c6553e32b726326f126981f0e014625075bc918b71e00bd8a6919670c370b6cab SHA512 46df705e2af93082884c7ca521df4f6cf33309c441eb3ba96be609b2cf280e3b72c689810d55279db6dbbc178ed843d64ccdaf9d4b39d52ddac7d84956065b06
 EBUILD em-websocket-0.5.1.ebuild 1230 BLAKE2B 4156b5637f5d5253ce6bdf4f8c45439991d7239d46b181cf7c4227bf2b09968fa78717d8fd675bd6091444bae1a192f373bceed373d166a08d7f4b037d277a7e SHA512 478682fbba3d3f26687d705ff8c11ffdab0b90b6be3014f48aa85929661fb035d46f3d486e231394535ff809a250880f1b31c24dffac5a4772842855ee940b50
+EBUILD em-websocket-0.5.2.ebuild 1185 BLAKE2B b12b369962d7920f268b53011788652ccb298f038a6cce1e9eec3fcf9832b2ba8b073c9207127377c615b7febf710b384fccf0cea7d51f40f4bb8c1f3fbef3a5 SHA512 d9449953eafcf71ab3805c72bc49f093d775a7da7e14dba7e0e50912659391368fe373147b4ecb5855b004ac4bbb4e8083168bf59031219d689a99c92ce5d046
 MISC metadata.xml 458 BLAKE2B 59015f88eb8e2a4d6d538febe271bc6c9cd6849db0f9a8a11125f6efe9ee15c437603d498412aa23e16f506fa44317314762cf9b4302d938c4bb3913a9e4418d SHA512 ea01b58e2eb6ab8a23418be9140c28f8849382014a12b6aa3910d12a6614361b63d2fdbd31b6c099df38c4223dab330425885af6943ce87b4fecf4edc13b7b68
diff --git a/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild
new file mode 100644
index 000000000000..61ebed06f908
--- /dev/null
+++ b/dev-ruby/em-websocket/em-websocket-0.5.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="EventMachine based WebSocket server"
+HOMEPAGE="https://rubygems.org/gems/em-websocket"
+SRC_URI="https://github.com/igrigorik/em-websocket/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/eventmachine-0.12.9
+	=dev-ruby/http_parser_rb-0.6*
+"
+
+all_ruby_prepare() {
+	# Avoid dependency on git
+	sed -i -e '/ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Only run unit tests since we require unpackaged code for the
+	# integration tests.
+	sed -i -e "/^require 'em-\(spec\|http\|websocket-client\)/ s:^:#:" \
+		-e "/^require 'integration/ s:^:#:" spec/helper.rb || die
+	rm -fr spec/integration || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}/
+	doins -r examples
+}
diff --git a/dev-ruby/exifr/Manifest b/dev-ruby/exifr/Manifest
index cc7c1fccb311..b75cba826254 100644
--- a/dev-ruby/exifr/Manifest
+++ b/dev-ruby/exifr/Manifest
@@ -1,5 +1,7 @@
 DIST exifr-1.3.6.tar.gz 245123 BLAKE2B eadaec6e1e75d048a9279459c157b0e493ee79f30b964897a9e30a38d27bc5b6b6fe87db7da192f7cab430630b7ed8fe4084f951189cb5bfe805d38e9861c5bc SHA512 9580e47c9de317b456c3cb23099293e26aa1889e338d2b95c4983d7a03c8658ced67d1f11a3fc7b23a80b3a89698c6277ce1bf47e762e5e42822f2ba3041887f
 DIST exifr-1.3.7.tar.gz 245155 BLAKE2B b7a333de97015336cf776072c1d6940edaabe57c9fb379e4611bbb85fb03803be44244424e50ad9bc807a5598fea28dbf7e975cb063e644e6bc80ce365ed7dcd SHA512 a3249c9bc2b1702e82287e79f854ea7ccf5757eb5000f88479138026b1b8de56072a1289a29f840cd619bd81f27e835131e890ce5f3c573849d64e5ecf942f66
+DIST exifr-1.3.8.tar.gz 245288 BLAKE2B 49032ee6bd5aaf07c3ef66cd1cc0ae67adff6afc4cae058343d88c5a7dce3230fe151bbedb22c7418745953a0005f0d385a175246c5be48f33a14406914a7d13 SHA512 4e2d49418a31f4a325b9428edefe71066717335c263e0594e0f5b3707cf3fb7d5208d09efe5e2a43948c17894a841e4f1b08829d3fe7759ad3027e29989dce57
 EBUILD exifr-1.3.6.ebuild 650 BLAKE2B 429db5bdf7aa8d066ccc6c37dbf01541ab8a3880a2b74be97258297eb07e45dc90af361479e55011297cd031df152126075d54126a6b7c2cdf5fa4600f76c69f SHA512 01ac776c5d4ff0c6e3401622c65b2af72d043af041b3a818c13d20bfa011a1909ae4aae75fed0de04ac0a30dfb07e6b28f6b90fa43f0dc94befd6c11802a04bd
 EBUILD exifr-1.3.7.ebuild 650 BLAKE2B 913adcc5c6c1c56c1801ba4e0f26441ed3c1a8f44e4814ebc5dc1d0210b28b7e900f0622630b0230e7c9a6650c653558f4a9ec2c712c45e1ee2b1e13e678d116 SHA512 46f6b8f2cccea92e09da8f4211fe2240ac77d3e4690373ea4634fef48404568bde09afb86b7f9a3d1d695b03db5d38cf7f2003206d9f03e258e163b9deee6c0d
+EBUILD exifr-1.3.8.ebuild 650 BLAKE2B 913adcc5c6c1c56c1801ba4e0f26441ed3c1a8f44e4814ebc5dc1d0210b28b7e900f0622630b0230e7c9a6650c653558f4a9ec2c712c45e1ee2b1e13e678d116 SHA512 46f6b8f2cccea92e09da8f4211fe2240ac77d3e4690373ea4634fef48404568bde09afb86b7f9a3d1d695b03db5d38cf7f2003206d9f03e258e163b9deee6c0d
 MISC metadata.xml 338 BLAKE2B 47c3d987095290c119098638186a209bceec785b33cd6501a3a45c373f2e0a15f1f9da565b7b05c948ab9889780969935c631f418fed04a6b2d45d346e530f82 SHA512 76f53e033898bf27e6d8a3a2681dd5aa66f7b112fda61489397fb0a1205ac1c2e3a07007493d9de82e7ce5fa57b4f7452d214b6873f325fd0ff53d9730721bc1
diff --git a/dev-ruby/exifr/exifr-1.3.8.ebuild b/dev-ruby/exifr/exifr-1.3.8.ebuild
new file mode 100644
index 000000000000..601d7e6393fd
--- /dev/null
+++ b/dev-ruby/exifr/exifr-1.3.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_DOCDIR="doc/api"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to read EXIF info from JPEG and TIFF images"
+HOMEPAGE="https://github.com/remvee/exifr/"
+SRC_URI="https://github.com/remvee/exifr/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-release-${PV}"
+
+# License is not specified in source distribution but is in the GitHub
+# repository.
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index cd5c3c6937e1..1e384bdab9ea 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -3,6 +3,6 @@ AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0
 DIST facter-3.14.12.tar.gz 406896 BLAKE2B 5f25e9da754931c6318370877b0ab1158e47920c8d9776a24689b3b906a91beddfe6c32b584888f6c9131d8338eb3fcb3983f062767d16eb9da51572d0156c60 SHA512 599984d0cc86f65ab9c487963fe6e12513895079cf145d924910a53ceb702e3b59785ea073e695ec9acac36f8a7405ffcd1130eb338ce261a3af4213ef11f7d0
 DIST facter-3.14.13.tar.gz 407204 BLAKE2B 12019c20284eb2a62fb65f2ab09246b98708b1aecb485700c2074865d02bb836f140802ad3b54f28c90fdd225b72e9216d21fb57dc0d82b8b3854607d5ba0eb7 SHA512 62910dc71aff0a0b0ef1ece054e0d1eea095c65ca6a34e17331aea943e217baa1a12bba1176143b652bb322195248a4aab1379eb69d6be419b73eb6ae3a8afac
 EBUILD facter-3.14.12.ebuild 2138 BLAKE2B da159d7ebc68d3587a29befc35742729e938c63fa176ed924daebd564efbc839be7a3e6f7f929d2222da71cd70de684d4f257f4da3d00de9ba3c73d7910d028d SHA512 71012baae5a2c15c3228004cab2202c59343b5b704aad7e37f89285db826c38a2695acd032bb5451a2d46db90779c509acf1df7cf40b8b420dbb4d7f5e793c1b
-EBUILD facter-3.14.13.ebuild 2140 BLAKE2B 8dd545970a36c3a3ba5428e31b3de1cb1d273289b09d070c0eba8875c94cfd8bbf234e0838c301649cefdd82716b32ee1a3d2a43cfc064f273b4089dea48722a SHA512 3c44628aafe630474d98c64133e570bd6d2733f878c1da383232d047c87d611f9722c4f6e679808faa34d9bc416c1ebb5e773cde75d1d25ac378ce4cb0dc7fd5
+EBUILD facter-3.14.13.ebuild 2138 BLAKE2B da159d7ebc68d3587a29befc35742729e938c63fa176ed924daebd564efbc839be7a3e6f7f929d2222da71cd70de684d4f257f4da3d00de9ba3c73d7910d028d SHA512 71012baae5a2c15c3228004cab2202c59343b5b704aad7e37f89285db826c38a2695acd032bb5451a2d46db90779c509acf1df7cf40b8b420dbb4d7f5e793c1b
 EBUILD facter-9999.ebuild 2490 BLAKE2B 9c480e951320b78a43aac1c436d5008d3461de4a62f73f76e7ae6a1eb62d5ac0b4af8f58b2fe25738c892e68d3c014be43f0ac79a8ccfc065c0f1485dbc03428 SHA512 41a5ca3bbbbfb9e5c94271490e7d9a9a1a99ca76b9c3c3ccf5b9ac6b3da005101063ad9b6e3ae8c53e9335c1d55e8b3f8f528f1b759b85a40f6251217b8a7e76
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.14.13.ebuild b/dev-ruby/facter/facter-3.14.13.ebuild
index b7819b83844f..f2b40c9e3b70 100644
--- a/dev-ruby/facter/facter-3.14.13.ebuild
+++ b/dev-ruby/facter/facter-3.14.13.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH="master"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index cbfe7a2bb950..b45b70062c7e 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,5 +1,7 @@
 DIST parser-2.7.1.3.gem 785920 BLAKE2B 85ec4c6d0ff2c86937f3ca43e27d222d75c98a6d7c5cc38a58f466aa905f303577fb20cbd02e6c295f45ca9b83fa8decf27c7ed22149b0cfc6cec3b1a71afce8 SHA512 eb9018deda2418e728925c48fa27d373f3a25ae562b92798e6ce42e225afaf9631bcd3c98999ff5d11daf464d80a887f7f2b5a23ae9dafa5e12ffd8b46d7bf88
 DIST parser-2.7.1.4.gem 790016 BLAKE2B ac3266b686a04f1bebb59bfe2c3dfa1a3791596d2b606d3d0d40b9a96c0b56c08d89da77e659dc8a50b4ea39a2ae4134b69eb9c27afac60fb666a228d25d3fc1 SHA512 ee22f6e9622a460b9f4a9be840c8bb850f5c7c5f7fad4503e518376378d45e2bfb8e6113c25a3f4decc93bad9ea9b4616e8e0ff1bf46a21120c43d0f675c3b9a
+DIST parser-2.7.1.5.gem 791552 BLAKE2B 813b05fd6cbf69fe6c5c96e15b1a4542fe00710cad9ab6f4e97ccc4cabef59d29dcef052dde0770adc67634d2cfa1d11d6afd5a7624c09eb65069d90da6d577a SHA512 8ae6901901c58e6dab7f0d54d113aeb8cccb27f80d7df69a51c70b13284a680cce1b34661c1ccec97ea2234768d90e507b89d43732af7abc4261b18dd024fc67
 EBUILD parser-2.7.1.3.ebuild 770 BLAKE2B 8a19357a619c59631a53dd16cf04908196c45264616fda90e8bcc8e44226266cc97db519b85455a9b2f8eaf1316fdb234270db09a4c687f3bd9085a7487a53d2 SHA512 963009d84623585d8fc8c8a6a691c1d11154cdb07e5584bb3feebfdbb7f78be9adfbaa47e7ab50f63bbac31197092e6955fbfa7448cd54d78d08552964d7c812
 EBUILD parser-2.7.1.4.ebuild 784 BLAKE2B 3eb9236cad942686240aa3339c8538f0f6001ecd2e498882181cd94ed7c0d8d620cba29c4ddc10786ad955f681371467561f250f2d3e12f4bcd0fc57a664ec97 SHA512 d1be9124e9feae418cd23f5c2996e810744e098235dfd166ea0c7b138914fec8636a6cc5dd8d369471ffa67b050756cee717738ae8bf25eb971ccd3b423025ca
+EBUILD parser-2.7.1.5.ebuild 784 BLAKE2B 3eb9236cad942686240aa3339c8538f0f6001ecd2e498882181cd94ed7c0d8d620cba29c4ddc10786ad955f681371467561f250f2d3e12f4bcd0fc57a664ec97 SHA512 d1be9124e9feae418cd23f5c2996e810744e098235dfd166ea0c7b138914fec8636a6cc5dd8d369471ffa67b050756cee717738ae8bf25eb971ccd3b423025ca
 MISC metadata.xml 343 BLAKE2B 7da9e267560e7a67c7a8afd5c283389dea1d4db2cb0ca65e4fda61a576036bb8068005b5e31ba9cc8fe7b68b8f8af5f93bd104e6d63412842dd7d0030b83fbd5 SHA512 f8dccc996237113d4add61dcc46e1407ea6edf156b001994e31d920f688dfcf9efe8d3d991ef31dc0084b7695b57b5d51471c57e9e945308279dec7909c69517
diff --git a/dev-ruby/parser/parser-2.7.1.5.ebuild b/dev-ruby/parser/parser-2.7.1.5.ebuild
new file mode 100644
index 000000000000..83eae080a852
--- /dev/null
+++ b/dev-ruby/parser/parser-2.7.1.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+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=""
+
+DEPEND+="test? ( =dev-util/ragel-6* )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/racc
+	dev-ruby/cliver )"
+ruby_add_rdepend "=dev-ruby/ast-2.4* >=dev-ruby/ast-2.4.1"
+
+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/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 7e644548ba10..57c74b34aaa1 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,5 +1,3 @@
-DIST puppetdb-termini_6.11.2-1stretch_all.deb 21292 BLAKE2B c708f816ff656b1a8720bc59c7498be26e233d6f7413ac181b0c0fe4c940aa5a059a62719a8b5edd8da355090a2c91353838e7d5c960af5a1195dd933eec9729 SHA512 548baf1c6a9be3f3d2dc3686e19851a36d1b10d123ce9c9aee1689f18b9ac8e15ed0300b766b5cde1c426689d41f23b2d72e8779f19cc82ff17c4b3006e68bcf
 DIST puppetdb-termini_6.12.0-1stretch_all.deb 21290 BLAKE2B 11bc0a316517190162e7e4e5a2ce05bc880ef8412bfcf5fb66ec68545bd7779e217d5d5e75ab79f24fc6b2f68e1a962262704efb8833fdce84288d060245b898 SHA512 a742825e9f9bacf5726814474b7812393d1a51c50fd710d771c10a9e23c874a465c6859fc17485b66a2c4114ac170f2f25c5ce1be6684ff18f5da31dc9ef0744
-EBUILD puppetdb-termini-6.11.2.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
-EBUILD puppetdb-termini-6.12.0.ebuild 665 BLAKE2B 611933cbf3ad90f8e6f11c4b3460d9946519c30ff57b0132d0de9cfab7d243365ab4a3deb10643df19b79cb2bbef878347614e3798544f2494e75f786d8e934b SHA512 613eee0dfa30b09fe2659dd2775d8f1c0f334d5304d153d7965342c0dc610f1402b6e34b60078078d852d031e2b67cc8ef59d952c266caf10bda6dfa5eaa2603
+EBUILD puppetdb-termini-6.12.0.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
 MISC metadata.xml 366 BLAKE2B f03ce821e0baae11d699365e190751fd1c9d233935e46d31ed9f19105ce6b66b1c4ef56697f5e5581022261e4b45bacd4f04368c3e6f74a12b15ee4dabecf869 SHA512 96ba26c725e5fd36269acc3556a7ad6b89d26010e376ff76cffd2a99481b2d3c9c76595f5ee4cba585c3dd7ac76e121aa4f7fbc0efa80d760748e9f81c998655
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.11.2.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.11.2.ebuild
deleted file mode 100644
index 7919b7b236e7..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.11.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit unpacker
-
-DESCRIPTION="Library needed to connect puppet to puppetdb"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND+=""
-DEPEND+=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
-	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
-}
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild
index a7f2b53b2dde..7919b7b236e7 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index d44a99d23a63..e7788a31987b 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -1,7 +1,9 @@
 DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6aeec4f8684eb56f4153414aca62702faa57f48887618e84b1d087e2ba366ec9d6b2e92200cc34472b7bbb5a8b0043415 SHA512 0d1c43fda01077b9b3d9c28ce9cb01772f10817e42d9c0ff28e6ea5cd059ad4869b940498c6a4e77d4fc6acb6ac0aba293ae67dd012650cdb58989b90868be16
 DIST regexp_parser-1.5.1.tar.gz 82482 BLAKE2B ff1746e52e786e273923dd222ea8c8276eb1e4ffe9bf899068160dec229784709ba679983c1e43736c128ec094861174bd43e0aceea704ee2d38aff4a53e6775 SHA512 4856fbcac800083b417880c30b5d6a5ea445bb85950bdd7898f368bfa2d44b01b1e2058b279f1640cf1cf4d7b28e225d25bc2d356d2c4a7c1be0a2c621dd3827
 DIST regexp_parser-1.7.1.tar.gz 83865 BLAKE2B 1aab4f5c4d399ee48951a9fa9f24fef14073ca5267ec29e5011880274d2749a7a3d1f5cb2a6a5107d5c848537367e1f725a6de9bb9af8803ccc8ccedaac415eb SHA512 fda810bc18039484725df5c6092b3d1b31f398e337cbace253cfdfa934274902f2dcb4e64c4fd0bb24379c79ea2976383313c1a5cd4ad246ecb7eabfd1a47d64
+DIST regexp_parser-1.8.0.tar.gz 85071 BLAKE2B 1d9f60617372f872e8b372bbee0f808d060add768094d53bc05ef2f4757936fcfb4772dc0a2ba59630884b339a3c66d34336cfa05825f4ef53427ddd3528b9d7 SHA512 bbf2429c00c214288869b77641e44d04591c3917ceeb9262ae8638c0731b020bead4a7b11d397ef2e1a26752c660addcc46fd94a4e557766d230de71b99a9501
 EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 065940af48ce7c93836019f0a9325e04db4e0ff31f0e9af6a13a637e86ced811bb38cd9c70b971e244df857e1d40b2ed2049fc0321a82141c43478822cac8b04 SHA512 c91492b8ea59137258d941e79659f1f511621c0d7da8af6e6c13aefa39f5473c2881e0893b68a56b428ce8da9a135e20371e4d5e0c6d5fc6996e6a77af5c22e6
 EBUILD regexp_parser-1.5.1.ebuild 878 BLAKE2B 58e808a45e8bbd6421b73cc5887b75ed6e925701a5d60b9fb76bcc1e59bd8c0d573cfd188f77ff2afc98e300ab615babff5901fdbfe70fcda66a370ba5e722bb SHA512 2942957d37008a42e954a1fcbca7f901837b9fbc4d3929687f3fd89b4d0463f33e1be6b37094efd4f539c2ddec96fb27d3a83fcae48b7044f5d29a7851f13113
 EBUILD regexp_parser-1.7.1.ebuild 876 BLAKE2B 82bacee65732f0f87c38e5f0e6044efb35e628f512de34a1dc55e866ebef3e947c0289c5aaa168fc136b5042e2e8e2af9aa23a77e5acccba5c8899ebd41ad5b6 SHA512 eec1e3db2f3bb6463ca114977281a0f50d5360eb8953e986f7f99a8b7694d817aeefe073e88f23bac4f7fef4eec2be516f457c4fa4d60b2c33dc6bb8d5ae1403
+EBUILD regexp_parser-1.8.0.ebuild 877 BLAKE2B 280b725889f7112ba258e523f8c36b353436ec11563cb5823b908d0b309bb934bb9ca46fa665d68ed7c3c31fa4484b0e2d2f1451c64d4ea503ccfb25e7bf6bde SHA512 d0e2b1d06970975378e50b0ae3bab15d803f10ddfc3cbc1912dfd962eeba4947d3213fd44ce44d859a7741ea4dbfe67b192c258751df06fa61422431281fbe8e
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.8.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.8.0.ebuild
new file mode 100644
index 000000000000..9a339fd368c9
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-1.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test:full"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake ragel:rb || die
+}
diff --git a/dev-ruby/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index bb45422b7fd9..2f60035f0c4a 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -1,5 +1,5 @@
 DIST ruby2ruby-2.4.2.gem 26624 BLAKE2B c7ad5c63829bf03cc166d42f2ae67b47790b4652b1973367881a4c242866acffabf6783cc3296ca7ea91ff3e9967f703852be6c4bcb53dfaaff0f822b50747db SHA512 ae8a34a77d48a97d29bd0ea9e2653e6189666564e971b985e7a459a562f8f03fdff4ec8775a2184cef578249aebbc8a050b57613b63d3c09b7a84aec5f727a7c
 DIST ruby2ruby-2.4.4.gem 26624 BLAKE2B d330cd65513218a96c9e35fe2b69d859fa103ad6dd1b8e8a671bddb9732f99cd65540b404632e671ababbe5842ed2be34a29c2b1fb3bc4c43935f5a7a0735d9e SHA512 51728d702d2142e9a7599fe53c2b58906cd386be429fe97590f850df8cf461c046c67a99fc7b7e277551013b78e35d21609c8125fb568ef90270d146a685c04d
 EBUILD ruby2ruby-2.4.2.ebuild 915 BLAKE2B 53f564adf0858155db647b3cbb283e85e653fb6cfc1ad867414179aa5718ba6023ac17335aa7fba9bf2c57ed6bdbf161f0efc762a331cf732f4b3e8cfb636e46 SHA512 53c160ca6536d1835ea68c563742934efe736dcdc7bb719facf8674dc3f58c9856a50dd2539017775a5ad8953746483792a7e07b18b89a3ea379aeb0a0297ca6
-EBUILD ruby2ruby-2.4.4.ebuild 856 BLAKE2B 05a0193b1f788d251f03ef48582f0e21f681201fddd8392ae21db5ae7a289c34692a58e88d563c7bf796ea78a9a5ec933555fcc50af39adbad1818ebd30c70ed SHA512 db968bc85f3a5624bb9872486a8005504fb68f308aac4305d9e0553d2d85324329b732fefa3f1ebc77bb81c360dc75e438b39c2655c7a2f741856124697112aa
+EBUILD ruby2ruby-2.4.4.ebuild 854 BLAKE2B aa5502a0b486e33c261a3c3121cca7fa925a8afb87c7672d3d470b40bfa92a43c5d76333457293d6772e296285a0fb6206d6c66ed9032c7adbdbae9ca900c582 SHA512 13331b87b169c0aef6b8ad9f526d3ee8d30c31c6a01f5fd5e6e1f768fe07d978c6d9544512ba76e1466cf81fd7d76e88a49cfc33ef44be42bc50875cc5f11218
 MISC metadata.xml 345 BLAKE2B ad97abb4ce420cd1a798b019724f408bf5e8f04116ea72d8de35cb220b028d1e31d9b1380b625dd478e110edbc5100d38fa7ca10ee336d131338f2ba148ed284 SHA512 160d20c5eca00fc8d0cf3145e26d1a89ac158d5d7b826cf1161255c2b895986e7629215d330277d2e3bd8b08c106c4e8725f8d1d8aa3566cdc9e66a3e8cf37c1
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
index 9b3609e0f520..508805e66393 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 808c1dad2cc0..80e59c56ff45 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -2,6 +2,6 @@ DIST ruby_parser-3.13.1.gem 445952 BLAKE2B 7df7bbfe3f7f700747d32bd5c66d94fdd7c57
 DIST ruby_parser-3.14.2.gem 466432 BLAKE2B 2694888b5b705733468eaf074f7f059814e2a230d1ec7390ef6b093c717534bfc6648a00240fd07d0f108ee1dcdc9f81b121a0ff0446d4ebf75fa5bf87006fa0 SHA512 65b8977fff322d4ecdbb8da1276d76318f08a13a25d8cf8429ba5ca7097c2b58c03431d60b05eec6cb62be316cf9b1efc753b86e8b67e076fd413d2324bc6655
 DIST ruby_parser-3.15.0.gem 527360 BLAKE2B c27b98052c0850df8decf123a471fbe541190b611b6abc803bd868749ab2c020d15935264d607ee617b8e75df44871b2985bd11bf17062051a172df935fedcd9 SHA512 f4d64a7f86d94a324b47f9354b8962a5b96d62ac41b6fedae602b0c3782bf2871ec3d0131770d886c5f58de188a7ed71fa3c31c548f53b75ff04474962b442ee
 EBUILD ruby_parser-3.13.1.ebuild 1141 BLAKE2B 41d7efd0833ebae44cdb5f8a419d711429540beae4881a171bc512a2889d50d6cb6e9b857aed0a172ed44f17a84278311323216f1400167b09cc75eb7e51c449 SHA512 9849ffcc86e1cf4ad64f36bf94d2928ffd65f98a692d5afca492b9db2e6a9ed7f54f79e620ba018a4c0a952e985beb08b5039b2a927cc14a705521b558aa92cd
-EBUILD ruby_parser-3.14.2.ebuild 1078 BLAKE2B 10807f7c85408ffafa24ba203d6cdab42c0aadadb65af32614ebde70db4b0b009be1c370838a2dd79c3a4178594732024e82df7266eeddff077d77ab62fb9505 SHA512 f744fd776d5679ef5add54d272552eeacc9321f1a61c86d0a7bb6c34cdf4e15e303149b16b6c91beeb3d869970e8655f10a441e06a9bef7b50c1c73adecc766d
+EBUILD ruby_parser-3.14.2.ebuild 1077 BLAKE2B e833cacb8581fd2a3c1d4534a882adb19cb03f43640201912c9fb30ecb35c26c04a6519120fdefff261e06e241420e7f5fd512cae80914262bd03220fda0c998 SHA512 ed3430755d223ae6a2ea1455a530b85b0b7e8142919b40be03d0430346ca2a404e33c582aa0734334e58f6708b18ef3c0720bc0619b4e9d4ca9825175bff4815
 EBUILD ruby_parser-3.15.0.ebuild 1073 BLAKE2B e14966a3c65135e7ce2ed79fdf979057fff99c98e407a4d012be22e2991dd0cb03d7c74acc57cd1d9162642fe8c91a4db6b08981e16031cb69f177f6946b4a62 SHA512 a3eb8ade3971a29369474cd79ae23d8716140440c14cf5d19618d5062e9c51cab1ae420755323290d1483e3bda1ae6787c81998cb3bf6ee1712b74d18118971a
 MISC metadata.xml 347 BLAKE2B 58585950079ff918b98a50b41060c516e4640d3d9e382bdd659ad6b17c1f0e138782cc7e94085cfae35faca53445beef7ce645113a49a47d42e912246ce8dd6b SHA512 ff141bbed5bdb7f610f87c5f8040889784f9a3a1f7a2f5802d0ee52a2a3d660d7ef2e8e3cc37af9c8b549433447f1d523b4864a6175efab755a3009c99c59632
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
index ccf169068242..217de7cc7ed0 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~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/sexp_processor-4.9.0:4"
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index 9e9ccc345919..0e6557a84740 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -2,6 +2,6 @@ DIST sexp_processor-4.12.0.gem 54784 BLAKE2B bdbb349a85fbd1c7750db3dcd22d9b792eb
 DIST sexp_processor-4.15.0.gem 56320 BLAKE2B 8624b7fe28f4aa9447f42cf4f8c5b424088ca2c1628f3e785f746ceb60725449812205dc657ea856c5bead616ac18d689330315fdb44e92447ee3a89740557d1 SHA512 f7877ca59191ab39848c6d3b0cf9625c2e1c180784cd757c00a7cea67aa6eee5549ab5630641f4044c875a1aaadc89b8237f8adadc961ed86c5379cb72db33c3
 DIST sexp_processor-4.15.1.gem 56320 BLAKE2B 1f75dd7dbe39b3684ffcbfb607c961e9406ec16373ad24ccdf37d4bd8369a240b8fdfc16f6e7437dda06605c26b2f4b507a14bcf680b91e12bd7827539f54e53 SHA512 e2ae9f5e8f61c1a703f14c692cd171ceb9acda5839417589051ffcb818584ff65a6a86279f3d6f2b9ad8c97ce842d946b57be810e5887effd4c606b6fdf1d984
 EBUILD sexp_processor-4.12.0.ebuild 789 BLAKE2B 88432cd4143f4c316280c7b2bfad605b18c039a6371ce8604ea91442a3d6b51578d213aadaad315d759d7028fe16c9cc8f7428c7ae064eaf15972985ed2f67b8 SHA512 b92a563f9ebca2c7b6214bb1c8170274f299ead76f41e1fd57939e75de3d79646db6279adecc84da66d5191debe44996dc91314c6e206231aaefdca3becfcfb2
-EBUILD sexp_processor-4.15.0.ebuild 752 BLAKE2B 9e0eb8f279b675614609116ccd53a74bdae4de66cab0b03ecd0df8aa6c4321ad7fd5aeacda535987946afe5177dbee64d425add30977052a77227c82c234b1e8 SHA512 9bd8e6b2ded0bee500c53f68c66bf9aed331a39671337371aaad79e45216cb6e8fe9140ed57d0afefbba3e3b571f6da4ba4b757ccd3826b7e43bd28dc3aa0919
+EBUILD sexp_processor-4.15.0.ebuild 751 BLAKE2B 4d143dadd59bad1aae3a8ca5801d82cfa68c839d034ba2d675ae1757874501129adfa72a33fa998b0246593ed8494ccc60be65972edc3b40b7375d7f9d2dfdc6 SHA512 71ec8cb58466d2874ec9b3ed9f85f5deb6c15a5a9913e23d68afc85b08721a999dbdf085da5f9df92a6b735ad5e187be84fccf80f4747d9250cd6a232c248c9d
 EBUILD sexp_processor-4.15.1.ebuild 754 BLAKE2B cd27bfa6b69694a31bd53bb91eca78d3ce4936209f43ad2a41ce9cbe38ef798cf65d3ce5dcecfa26121be900ad1e7a3925ce6313f5b64693d73efad5146f8717 SHA512 3161bc6bb013fd69074005ead4f6b70e7b0fe2c47043f048b4ea09f584e37e248027f8d5c8aa2a2a88396a602b80ac375f111a0105b6cbd2a1b968a8f45b52ab
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
index 821f9a8e411a..5ca9606a6375 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/simplecov-html/Manifest b/dev-ruby/simplecov-html/Manifest
index c0d3a1d9bc01..4dcdaf9b4641 100644
--- a/dev-ruby/simplecov-html/Manifest
+++ b/dev-ruby/simplecov-html/Manifest
@@ -3,9 +3,11 @@ DIST simplecov-html-0.11.0.gem 184832 BLAKE2B d70fa7688752d0286fc72de57352169749
 DIST simplecov-html-0.12.0.gem 336896 BLAKE2B 03172ebaf3320e34937dd9715bc15e4bdbe91df41a22922c38089a75a0b85fcf1eb4e7b8a803d298c6789b684df6d5d1ab582d34ce3e07f6fa9a4b5316a22619 SHA512 dd05aed77e44d35a54d272abb78d4984655eddc9bf7cee8d24f00da2088e62f486bf160dcd3327833fadcd18b79c15b34f4790300cb9e689e13bb6daf873334d
 DIST simplecov-html-0.12.1.gem 336896 BLAKE2B ef068de799698c92b1a2cc9e54c7a85a08b763af43c8e013ca409283ee77ddbbea37b92fe691270fe3fb1675c9e4d9e79264dbb232a1aeaa23bab6e4358f17cf SHA512 9f85694d283588f5be3794edd37af94d22c914bb1659da5b8f846af8a988fc82935441fe60dc61c0345b7991ad3e85673e8aa345a8f8c3337e5fd2ab327ca5c9
 DIST simplecov-html-0.12.2.gem 336896 BLAKE2B dbd735855216b395280a3d3b34493bde8fc63594543abb6a2600a4bf87165b06dd3bddd7b161aa82d18b87ef62da51599eae366e5dfb4b85163380062fd4fb77 SHA512 5f89cdaba272b841446ae68d40daacbd551f3fcf7750c2491f14b79a3e61c6c32c066305eb2f1862f8cbd2ecc1b020cc9a907a977ef567653276d8d78d584efb
+DIST simplecov-html-0.12.3.gem 336896 BLAKE2B 94cfbae7085163ba714b2bdf14b7c5eb1a4bc5fcf39d7e99689d74bb1e693d5b534ca067ba5609f6cfecdba64667dc514b4f5dede020aea176ae2328d1806ea0 SHA512 7fd6dad02b16f512d7fb859f62e5e8bd0a277af103c7829143795ccae60a9a057c323728ac36a1c42dbd143a2f0d175648f6e223e6e7e3e6394a52491d3733af
 EBUILD simplecov-html-0.10.2.ebuild 525 BLAKE2B af432d2da72a1f2185b31adb1394a51362b1850950baac7a5cefb20b8bdda93942f4c6170de4ff5f81f04158c04540ff5479d935d8120179ae4a2101411fc2f5 SHA512 e739ca874f3d3a2fb06d56157ad44ec15fb5147cf2fb99beaa0aa2480bc0567f8a21cbf9c2f82f9d6e31bd294b9784f9f632cdf476c0a39f690d2995afe3f8ce
 EBUILD simplecov-html-0.11.0.ebuild 535 BLAKE2B f8074766912c6750f609ea0318e32017cdda3b64fd15662c3d6f9ad4147fe89ab4f0c00aa6c0fb2788c2fd46ac9c302e0f75e8cd121915cf1a391ad401f66608 SHA512 3da416b2adbcb8b8d87fd6cbeb30e07174c9acec6fe6b9509673aeebdf303ee1a11e221370dc8c9bedf86a749af266af969c8113c3ae292d765725efbf99785f
 EBUILD simplecov-html-0.12.0.ebuild 535 BLAKE2B f8074766912c6750f609ea0318e32017cdda3b64fd15662c3d6f9ad4147fe89ab4f0c00aa6c0fb2788c2fd46ac9c302e0f75e8cd121915cf1a391ad401f66608 SHA512 3da416b2adbcb8b8d87fd6cbeb30e07174c9acec6fe6b9509673aeebdf303ee1a11e221370dc8c9bedf86a749af266af969c8113c3ae292d765725efbf99785f
 EBUILD simplecov-html-0.12.1.ebuild 535 BLAKE2B f8074766912c6750f609ea0318e32017cdda3b64fd15662c3d6f9ad4147fe89ab4f0c00aa6c0fb2788c2fd46ac9c302e0f75e8cd121915cf1a391ad401f66608 SHA512 3da416b2adbcb8b8d87fd6cbeb30e07174c9acec6fe6b9509673aeebdf303ee1a11e221370dc8c9bedf86a749af266af969c8113c3ae292d765725efbf99785f
 EBUILD simplecov-html-0.12.2.ebuild 535 BLAKE2B f8074766912c6750f609ea0318e32017cdda3b64fd15662c3d6f9ad4147fe89ab4f0c00aa6c0fb2788c2fd46ac9c302e0f75e8cd121915cf1a391ad401f66608 SHA512 3da416b2adbcb8b8d87fd6cbeb30e07174c9acec6fe6b9509673aeebdf303ee1a11e221370dc8c9bedf86a749af266af969c8113c3ae292d765725efbf99785f
+EBUILD simplecov-html-0.12.3.ebuild 528 BLAKE2B 8d61c8a5d5ff788291695c72e9db6d8d4fe6b6cf8d9ae4851ab59a16aba2cb5b946c49020d90d6a558c69caa78bd903624a9dc629d97f5fda55c5d7dc7cc0e68 SHA512 18f7d01142c420a4dfcc14cb30bc2d297830f0c6a45ae6de36455acf3f2aa2fc931b0397b5b12e0f8af24fc61cdb1afe302cb12b6cc70842ae27be2309b1de4c
 MISC metadata.xml 345 BLAKE2B b1b086ff87954b47674d7c4ea2e3179d43c10fab22383c937600b0b83675a9dba5434dc9425a1dd1bfff27c8bb81d36fc558523a0b80ed818a37ff9585dc094f SHA512 ca0ae8784caca2cc0091622a5bfa3796600239a0d81bc5338eb36f743db99f36ba7b50866b1de1cd2ae541f2c2dff96c648f5cdb0661ab766501f4c757d2ddd5
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild
new file mode 100644
index 000000000000..880e2e67726e
--- /dev/null
+++ b/dev-ruby/simplecov-html/simplecov-html-0.12.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets public views"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generates a HTML report of your SimpleCov ruby code coverage results"
+HOMEPAGE="https://github.com/colszowka/simplecov"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1-2)"
+IUSE="doc"
diff --git a/dev-ruby/spy/Manifest b/dev-ruby/spy/Manifest
index 297d1bd1aa9e..18257cc13668 100644
--- a/dev-ruby/spy/Manifest
+++ b/dev-ruby/spy/Manifest
@@ -1,3 +1,5 @@
 DIST spy-1.0.0.gem 33280 BLAKE2B e85c6de9ad9eedd61f95d0a22a87d402949fffe925af3c525a9ed7842ec4582a5063caa6767ece7c2c6f470d10abd44015c0e02a4f31f21c85d6db6b6a28c2a3 SHA512 adea03cd0c2e60f964887c3a80a29deabe7bf1d98f2b5490e8ed833e64c53144437fca636ec1cfa9413f93dbcf154b2cd27afc9363b33c37d99db7cb4790b358
+DIST spy-1.0.1.gem 33280 BLAKE2B cd5f0b6f74da5f693b2718ba7021359fe9292455ffc2c79510efce1fd40f84ffc49b92ea78d449e9722ee00c1d804e82ba88b3481c0297e58c0d7a8c177dbc85 SHA512 c9d7060b92f748897b2a5421df13024047c7418c1e0ba8e83b84d1a27372dcb2ed70fe2021ef23dee86f45dc5c326adb55a5ffbdc4f78895b2c6cf31838cc335
 EBUILD spy-1.0.0.ebuild 602 BLAKE2B a373342daf709097ce8e6594faec12e632f072852aab808b27836c468cd62a85c30c028d740be1a25570681718d8db7c5568eae81205f273ba55468ce8296d1a SHA512 a3983b076e395b3bbe9be685173138ebcf78d97f0e120b37536597e82d62251a602e1b619d3a1dae3e5324ff0ea4b6244b4b744d3fba5fdc3888fb86326a8faf
+EBUILD spy-1.0.1.ebuild 564 BLAKE2B cef8ce2314ab42a9c1df163dfa5051a73692f57e89a7f4acd634a733368c24ae97c88675731de8cac94ea8c8c0786c787e794941c7b9bdb586e35807bdfad140 SHA512 220c86ff8498d073133273fdaa93d39e13046d6e10026612a016d2291fc9b548a81238aa514ca8cbb9066faa3da74ebd2109146dc4955e1918df5e20dad3aa09
 MISC metadata.xml 337 BLAKE2B 5fdf913ff6487a35a3c6a77f9f616cfecaa7fadf7f1235bb2ea8c8387b0dd9a2187733965af0393be88d4e6ff6621737f41fb57c1520c986617994d6fdf54053 SHA512 7b8ef132c5fa47f31786a41f215db38467fa2ab4ea7167d4be6ba14083a7b14f2a2a267ebd32ac8a799e0a0fb32bcc8ea0c5f4f95dac1c97cff79dde1e7903b0
diff --git a/dev-ruby/spy/spy-1.0.1.ebuild b/dev-ruby/spy/spy-1.0.1.ebuild
new file mode 100644
index 000000000000..c7879c23402b
--- /dev/null
+++ b/dev-ruby/spy/spy-1.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A simple opinionated mocking framework"
+HOMEPAGE="https://github.com/ryanong/spy"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:0 )"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/pry/d" -e "/[Cc]overalls/d" -e '/[Rr]eporters/d' Rakefile test/test_helper.rb || die
+}
diff --git a/dev-ruby/strptime/Manifest b/dev-ruby/strptime/Manifest
index 4028da8e16a7..bdb3872e3bf5 100644
--- a/dev-ruby/strptime/Manifest
+++ b/dev-ruby/strptime/Manifest
@@ -1,5 +1,7 @@
 DIST strptime-0.2.3.tar.gz 17375 BLAKE2B 583566c19cdd96f97b469d3353236624b814ea9200e1479d32c552d06431e0008cd9dcf5be03564948898fb9e5a1470a5a8bdb531d4054bfe64899bbd6ec92e0 SHA512 1b9ee2f7c0fa747c6df5a56c5d7f667c4a9314c334472867e890758074f9da387aae54d9171b2460036a21e890fd743187571c6d4a995e4117d6c4307b8134cc
 DIST strptime-0.2.4.tar.gz 17429 BLAKE2B 9b6a7f29075ef5e55a17f28859961013d96778c7bd78fac9138a455819ec062f4b0d311038026a9da45ecc96e3f92207462970201c5d3095b9b0d653706c64a2 SHA512 ae92df60e049eb57e60f414e0a436fd90b56c6a3f5812597619aaac2d78b80046aeef77cdaae6f8822f37d069903d2806b9f7710ff1520eaf11070aaf3465f56
+DIST strptime-0.2.5.tar.gz 17431 BLAKE2B c9234ed0207e6bf214d4c011c883bc985cf527672f4bf9590617a742b4ea9a5cc0743388af23cc5f106350126eef16ffa89089d8715b0f8d371315412c7e5660 SHA512 6a85a3b45c43aa62a5c62e3902655351a839c4f2c397347356307c73ab160d053ea9dfc989f6d8687663bea5d8a60575f26b99b198b872bc1a3b2e0caa00a51f
 EBUILD strptime-0.2.3.ebuild 869 BLAKE2B 3130e7031dbf3803df2bf9adc30a12feb51b3e299e29694b6d68aba6807f866b55e9dc55e6c437ed4a7a58e5a6bece1c484d515bc607fba58b1435170ad08ee3 SHA512 369f4c7ffd85961ee01c697ae9ae4cb70675e9e27d73ae0c731942d81a73c9a4db0d13f74e120a95ad806567ce3fbfb3cb0dffddb6221c673c56d692f7d98bfb
 EBUILD strptime-0.2.4.ebuild 869 BLAKE2B 3130e7031dbf3803df2bf9adc30a12feb51b3e299e29694b6d68aba6807f866b55e9dc55e6c437ed4a7a58e5a6bece1c484d515bc607fba58b1435170ad08ee3 SHA512 369f4c7ffd85961ee01c697ae9ae4cb70675e9e27d73ae0c731942d81a73c9a4db0d13f74e120a95ad806567ce3fbfb3cb0dffddb6221c673c56d692f7d98bfb
+EBUILD strptime-0.2.5.ebuild 831 BLAKE2B c72d7f39e905309c20645b796b6d4241562234adbc26f6f0dbe8a83342167d6eadfd652ea5fd318938e517c2fc0aea5bb8791be0685f03cf91382356b9dfcce9 SHA512 7da2e055edeb66e2b5f0f75f8d39d75f575d0cb5a17c01951ac0a189696bb6919004d02ba2d5393b31d91569e6332f4720cc24bd3d1157c84f6e37728c39a3c4
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/strptime/strptime-0.2.5.ebuild b/dev-ruby/strptime/strptime-0.2.5.ebuild
new file mode 100644
index 000000000000..69d7704d293e
--- /dev/null
+++ b/dev-ruby/strptime/strptime-0.2.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="strptime.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A fast strptime/strftime engine which uses VM"
+HOMEPAGE="https://github.com/nurse/strptime"
+SRC_URI="https://github.com/nurse/strptime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/strptime extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/strptime V=1
+	cp ext/strptime/strptime$(get_modname) lib/strptime/ || die
+}
diff --git a/dev-ruby/sys-uname/Manifest b/dev-ruby/sys-uname/Manifest
index db6d1ef951c1..18e1dfd47b2e 100644
--- a/dev-ruby/sys-uname/Manifest
+++ b/dev-ruby/sys-uname/Manifest
@@ -1,3 +1,3 @@
 DIST sys-uname-1.2.1.gem 29184 BLAKE2B 4166a6b8d1e87a0a78c4c6d9b542c8ad6d5c32f6f36b03be503cd6ea26b81d0a00bd81ff8a266b4f13e115629519bd67034d2cb80fad8bbc2d3e2c70a821d99f SHA512 4e7c7d5a375a61082f558115d69e74ee8a6f916cb641a8abf9e7d9a92909ca8e595f5d6659dc9cad34e8f0de4c1f7d63bfb5fe6dcf82df628c1e511987436d68
-EBUILD sys-uname-1.2.1.ebuild 570 BLAKE2B 3b1ed56f81937fc1e71c2e0ce675c486fb99d4373a1076fc41ced11b22f33c08b03b2d2991b9c332328bab8e4ec346fb6c1df81a920364730dc9f286dc76be6b SHA512 69fa6c8eb9d98aa7b6d67f19cf7e10cd4e13cfb46540bb586cb88bdf40297f49c05658758f53ad4e1937d9ee80c174ff1a6045946f706aa9c3003a16ab227ed2
+EBUILD sys-uname-1.2.1.ebuild 576 BLAKE2B 1631d6581f36cd86dd815a74cd8c3b6a6db60b03cc2cfa478358046fa8032b7acebe8c44b42c7ea6d393d61e0065d34155816a51fbdefcd5d21d4bb9df249966 SHA512 57a8a95c931ddc8bccae1ce63f994afdafc4bae48dd2fc203b0a2019f9b0a798e194f38fa289b9999aab693f97646278ec88b2e537dac5fba3bf38ea265696ee
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sys-uname/sys-uname-1.2.1.ebuild b/dev-ruby/sys-uname/sys-uname-1.2.1.ebuild
index ae7db2eb0efd..fbd60e6a565c 100644
--- a/dev-ruby/sys-uname/sys-uname-1.2.1.ebuild
+++ b/dev-ruby/sys-uname/sys-uname-1.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/djberg96/sys-uname"
 
 LICENSE="Apache-2.0"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/ffi-1.0.0"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 3e73b0b4c9e6..de6600438631 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index a55df977bcb8..64c0a82a24a5 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -23,5 +23,5 @@ EBUILD guile-2.0.13-r2.ebuild 2070 BLAKE2B f6a2636c755e8a5495bb476715e5e0e243668
 EBUILD guile-2.0.14-r3.ebuild 2208 BLAKE2B a5211ed3a901b06422315cb75ab8901eb2cc1d32eb00c8eb77c145832e71ac186acec59e846124d9a63156b64af35e4be378959d280376d36293c556f687f8ad SHA512 ec02508f0be49e1450460f7c043505336a02ee78f3e676b708bc5da31600d6252f4881d67fc1649dfaba82cb2d70366d94ec16b3f19f51f1c1298c9cf9d9b2f3
 EBUILD guile-2.2.3.ebuild 2054 BLAKE2B a08aac15d36b3bd3c67e74d0d251205a38f2392377f5de647cf403ea198c2221f675f7935d7b6d575b2be2a4248e4914d9c1269c3946dd7a1ffe4e3ce5eb44d3 SHA512 2639d384fee9ad79262128fa8a311f00785e2117972492825e648ea2d159b9a42d15c85589544017dc10b515dbe33b79660fb004f295fd25889ad1c4ff1bff76
 EBUILD guile-2.2.4.ebuild 2045 BLAKE2B c43166ba5a446df098c2a4011f07165dd16dfb4b8928023270af67efe6705a1c72fcff73a975cdeb804b22e7b53c224bcc189c18dcd3f52e2a2d034bfe516af2 SHA512 a4b1e1e6ee9917945a048dfcb372e14479fd6cd92948cf64d0edaaa8edd98fc7ccfa1efcb40c94629d55d3cb9a64b03ee0b6a5fdb39c311151534cb529452491
-EBUILD guile-2.2.6.ebuild 1974 BLAKE2B 150e5e05e7fdccc8c62e784db1e8c8684faf4e6a7ef97f6b8847de9e0388a50fbe994f9b62f9459338a78652fa5fcf3dae4822ad134d58bfd0987b7d3df8136c SHA512 3425a9ec7c66f256dd9292b967c7b80a6f2749f393020da4e5665d7569de44adace591eb061291a10a0b30ee972084b45a7d73b030ef5b7572f39d01fab4689c
+EBUILD guile-2.2.6.ebuild 1972 BLAKE2B 5406c25ef8c493b4ead50f631fcfc9380698bb7f670dce6a6abc1f33a9a3fd033f998f06248a826bac90f78a7a1ecc130dc111c9b1313ee33db0ebc6029fb462 SHA512 9871705f2c9bcf9c408aa66df7e1d922a3e6ae870cdf27e19e8c0c67022848ad3e06d9dd16634c13946739cbafa7fbb64d5693af599905f89bcd3ff06235bf3f
 MISC metadata.xml 1040 BLAKE2B ea7db45fc50b1b17b90948224837643278741aa84fe75e7d3fa3716711060f8aef189124d4491238aa0a72c4e0364d940fcf5d38fb4a178ff0ac7c7039138751 SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3
diff --git a/dev-scheme/guile/guile-2.2.6.ebuild b/dev-scheme/guile/guile-2.2.6.ebuild
index 4d78bda9212f..da6b38c19064 100644
--- a/dev-scheme/guile/guile-2.2.6.ebuild
+++ b/dev-scheme/guile/guile-2.2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="12/2.2-1" # libguile-2.2.so.1 => 2.2-1
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstream recommended +networking +nls
 REQUIRED_USE="regex" # workaround for bug 596322
 RESTRICT="strip"
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index d368c5df4dba..924e96f15d45 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index 04137fcc341f..0c6c80d1599b 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -7,5 +7,5 @@ AUX snack2.2.10-seektell-fix.patch 496 BLAKE2B a2e4e782788054c047596bd989241b9ec
 AUX tcl-snack-2.2.10-python3.patch 12145 BLAKE2B eb33937789e0eab1316fdfcd472b5cf701a4072e498052cb2889e8c9e5a4502f193f386b83c96a2e98efcfca3dfeb389414e1b924b677ef68edfafe0e706048f SHA512 3480d83824e1d7e8250947d6f9d5a38704b302491980b7e8ad46a4d6790e3bdf9588b1d63048a9a5ed081c44b8f6c1dc42e79d3ad543f473b5469c711dc60394
 DIST snack2.2.10.tar.gz 1798252 BLAKE2B e27b8e7d6082cdcfc06e7eea5ab832fb78ba104de9e56a69c6c9cd688183f7d4c6bdb974e4d5d2bf5ef2bc5518a913ddf17c90db8d10cef4dbee533307cc7718 SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b
 EBUILD snack-2.2.10-r8.ebuild 2141 BLAKE2B 9bb900a57a9549028459cafaf0973908bc2ddbd93d827c683b2942c38090fe866279ed713f21f328686254dc4f61978503405e3097a292c5f168b13a617c48c5 SHA512 3e557be876334324fb0a610cbe3013c648e4ebae380010460c08129c2e97447c4ae2c8c626033e691800156f7538521f798d5ce4167831f00d64f94f67ae0d04
-EBUILD snack-2.2.10-r9.ebuild 2522 BLAKE2B 33ead9951a4e85d7d6dbee5f0bd9b3488dc1fdb3373f3fd1d2b93e59a7ec8e3a1f762da4ba0924f02f78f3eac45288ee92f75d1c31c1b418f12c7ef3ea6a681d SHA512 525cd5a82fa2aab7c1adcaf3f8c7819fafbfff2982b64b1db0945ef5280d11f4758700e698ceed2389c838006a0b37818e83778d6cb3fb565e35ee907d63fa0d
+EBUILD snack-2.2.10-r9.ebuild 2515 BLAKE2B fe14256a90434175209dfa73c5e1b1c3ea5bc5ef25139d9538b75c0e2ef6aa920217940f3f345af4d7c156e675e61ce9be2326ce80f0b0db7aee89b1643fd060 SHA512 e835f1bd9f970c36be6f3fc0a7c0b6370bc961b7426cf20207e97cff772bcb6f22f0e3c0cc17cdbb324465d9f638431f5757065e1f7b0d7f7d2802bcbcbb8eef
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/snack/snack-2.2.10-r9.ebuild b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
index 57dedee24d99..82c47cba6353 100644
--- a/dev-tcltk/snack/snack-2.2.10-r9.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_7} )
+PYTHON_COMPAT=( python3_7 )
 DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_OPTIONAL=yes
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.speech.kth.se/snack/"
 SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 SLOT="0"
 IUSE="alsa examples python vorbis"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 730c99f20147..bc91d249f3a5 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index 943535efea14..0254b4290a10 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -1,30 +1,5 @@
 AUX 80-android.rules 284 BLAKE2B a45cd541f9812a9657312ae7c83ee36f9d6c3c53d2caa036d1649455389bd7244efa277d41c3e6eec4a0b10d9a97d5e81acd0d17aac8df3bfa3ec72bad5e8d87 SHA512 f78834e2b33afa88f59a636f9fb7804d341847568a638a68beba9ca842e78e40a52a9ad8396ae79d105d87e52f585d523e8f0d847fc7708ddc3351c031571f19
 AUX android-sdk-update-manager.desktop 346 BLAKE2B 6ff5cd618d7816ad5719ed864cc91a83042ac320c2aa1965e5ab95e7f7b6f05f56a8f5401a4ffe17fc5798a82ad02f07f87bf4e3409b0d1866b45b230b34cca4 SHA512 9f97d7d3bf0aa76686be3722b3f686c012c4d627d583275eaaaf91d43f1b355a9d4b7f42412435489b758a3161fd9fcf8c36f5d1777662af3fbcd11bdc0d7aca
-DIST android-sdk_r21-linux.tgz 91378351 BLAKE2B ed16738d018c3ff8c51bb833ecd329594379280e55e6558a5f5e5731c4e11f6f562675d8a79a252e318b01d5c20f0d13aa2ff6bcd4160a527d85816abb6d94e7 SHA512 3a3338265a2d00f8b7fbb35783d7449498afd8107ddd4ed4c2c34e47582d83eb23f78d02fe01db54c12c48dba0167f60118c1061f1bfeb0048147674fee8d87c
-DIST android-sdk_r21.1-linux.tgz 91617112 BLAKE2B 0b566613d0143b0136844a88f3d4f916a79b4e21588d828bc1bbd037f5290c0a6686cae4de1c34adc3b925132627ee7541501019438b659c12ce5158f82f878d SHA512 160cd51f965a23120cf63abe02b9a9ce8913d1239a848bc423b33ad10eff65b30147c6b11ab751aa12154292ce0a7837aa60def1cd31a2ccb5d4fc6fcb6d2c24
-DIST android-sdk_r22-linux.tgz 99643077 BLAKE2B 58bf529757a4ff0061961be89b080faf8250a0282354bf7742cde395ab2fa91cafd85a36037c02d04fd9bc230437120f4ce91582c9fa2f539a24dd420bf7f025 SHA512 9beda1ae872dde3ca7884d1c389566ce2c8b511ef74d95bc9ddf53683445cc454f9a5a1871a80d5826083d98713040cb1b8b239a77a8eadf56daf30440c7108d
-DIST android-sdk_r22.0.1-linux.tgz 105617062 BLAKE2B 026158fa5be24756f9da3c4dc1258f990d1b04169f6ff88d78da48ebe34e03639b56e77831000ffd805c9057b4d8b561a15ff2919a13b1ae2f4af2b87bbb493f SHA512 7c97ba8daf4a1b8b6e422d8fca21a5e23f3a5e92d769e13ab5e649a967f2662c71ae201a6c1d40202bda98c4fb80eaa60a3ff5e4af9f613cfab1366f63774ac7
-DIST android-sdk_r22.0.4-linux.tgz 105640988 BLAKE2B 30e26a4b23cb44a045353b2878f5c9584dcb783860c42203145471c3c5e384dd979b416661050ec2a294d357f9addc6c8592f3ff8c634cd33bbbf881f15d84d2 SHA512 10e047f6b5384d6c2d3f87e883203f2ab384ac826def16c07f1969d59dc79f97ccba36f0185d564fe0dd4811425fe18767c326b3712ee47b5515f0aba47ed612
-DIST android-sdk_r22.0.5-linux.tgz 105641005 BLAKE2B 938bafd72bb023bf2ae306944035cc77b34dea843e8fa2d22b27b8e76231aa256b0835bcfb83403ba8168f9e78071c5174054eadcfb025f23573bf9c89e863f1 SHA512 655f709994a8c5f9bd78216d8587bda66f23b7fccd556fd78adc989a835540af89529f2fb4d846e28196952a0a3c5bc919563c83fb73e6ecf7a4ad0560eb7f81
-DIST android-sdk_r22.2.1-linux.tgz 100918342 BLAKE2B ddd1bc701c554af04f0c9de995c5f30531a702e5e18eca709265b96210c99afb23092fc975b47c714d26ceb52e8f407b36993405c635be1f6e720f6df4e473f1 SHA512 4eb7087c27db2b2435aa11bba01fccd09617ea58dd84aca8b249d81b3d15c913844d204463a6d83064c6cf8f07e26c0f70130315b281b1bbfd32c01d6e53bfef
-DIST android-sdk_r22.3-linux.tgz 100968558 BLAKE2B 41f853635fba6973a0e78465553ac455fa9a995421327a31d554b80aef0f80305237c8ee2da2440ad27513b0e9b263ebed293f898bca13fedd6e5511e25d1654 SHA512 c05e610e0979f61d217b6612bccd48120719123cf80282cca442e81be6e0c4cfd5a4b3f398d1c8835c86bc67b730a7bf5a5e511abe57a1d70b6c1f62940832a3
-DIST android-sdk_r22.6-linux.tgz 100992666 BLAKE2B f3dd0d6ab53f7323dd911af4e4271cd2169627bd3ebf11901e1afea942b3f4af4b29a9192c88d6c71887a79762d34109666c1fb922d96871ac9126c8398d5baf SHA512 2e632e31725a7c8c5e99cba70388c928d553d52177a2a0d49abfae125d1ccb57857171f10cd28da57664d0d9ab0f7b6ae409c943ad4d4433b05e0b8fb1bfe322
-DIST android-sdk_r22.6.1-linux.tgz 101052129 BLAKE2B b1eb0a3a298bab8f4c4e085831221f795fe0e668ab407d71c2c79778b921d09e57ad393dfe53d34e7d8c49cb05dd655762ca266b82982c898b0eea8f5a0e6035 SHA512 5789a6b11a1a5c18145900042b15707f58afd6db82d345550c33e72cfbaf719c7c16667a7561e4c6ca624c2d2466430db7f8138bf0cd6449762639a63c6cf9ca
-DIST android-sdk_r23-linux.tgz 137880977 BLAKE2B 3a0e0d321bf89bddd4f4e3ed4e6b6ef0276623168d482c0d152f7946b93f8ff72ade780e6c5bdd2dc2ef633bc5df446a640bd52062373fdae162aff71c5ed154 SHA512 c6d8de870e8697b31132b25db93d6b494b44240ca421cab6a48bbf53d142ba488d08ac77a9995ed06953e311dd14ea1ecf4d2039428ed31ab255f9aaaf94ad60
 DIST android-sdk_r24.4.1-linux.tgz 326412652 BLAKE2B 4263a5e942f0ee35069f4fc075504c637381820f40485c9753f5f586f713e614c204b3e5c35968acbc665644aaab4c2e05660e00675d956422cd7d1fc6445ed2 SHA512 96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284
-EBUILD android-sdk-update-manager-21.1.ebuild 2941 BLAKE2B 709857fe1c4e6e61a4c906e70b10ffbd81593704ccfed1bc2017d84c112fd17cd1b380e85d9bb26b2249dfc41f87daf17f6c7e954df5241731b3e2379cc73bcb SHA512 2ca9d389cc11745b63a388d7c22fac87cb780bfcb23e93006209a76e85ec1958bb2419774a87a1cceb46b017b714bf1678fabaa7d9e171582eb7701f18836ea7
-EBUILD android-sdk-update-manager-21.ebuild 2942 BLAKE2B 6fdd4eb88c0f59b16420ec7a969af1bf3f77cc40a067da8902a44b12a1f91be0e56c3a90118ad95afad7dd8f9cc4eb08b3bb090dcc00e3fa9e15c22b410a0b81 SHA512 26039db502ae4ffbba55c147ee8f162e6c8d600f7a3cb69fc372db80ef6fdd93fc8dcde09329032b66898d130cfe2d4ddf72c7471593ee4ef0ce484bcd5e0017
-EBUILD android-sdk-update-manager-22.0.1-r1.ebuild 3127 BLAKE2B 60789896e515c775f5d77cf3715f375236e8e03c1e48712caa45d89ae53ce556a3e3552be63d3ef419bdaf9d17da51abf3f570a94e14ae30f4a91c80a910e7a0 SHA512 7ace54557957fd91cac07d3e7618195972974cef01ee00408e5d45faa3424a19199602d92cc4da777104375a4079e289fd6a23afec886d3a6e697c6270c2220f
-EBUILD android-sdk-update-manager-22.0.1.ebuild 3131 BLAKE2B e62927b86f4840cd333bacc2e539b1c4fc0095310c6a2201352ccc16781322c684a72150aaf443784168f165451bc61070166736c3be4d3da6d1123fa7691dd4 SHA512 c6db541e811ed203c0e78a475d6ee9015a84771202c3b0e88bb8e5050f184a9e6cc467749ed882565f79735cfcaf958e6560a81bc764aa9aef7a01e899cc321a
-EBUILD android-sdk-update-manager-22.0.4.ebuild 3127 BLAKE2B 60789896e515c775f5d77cf3715f375236e8e03c1e48712caa45d89ae53ce556a3e3552be63d3ef419bdaf9d17da51abf3f570a94e14ae30f4a91c80a910e7a0 SHA512 7ace54557957fd91cac07d3e7618195972974cef01ee00408e5d45faa3424a19199602d92cc4da777104375a4079e289fd6a23afec886d3a6e697c6270c2220f
-EBUILD android-sdk-update-manager-22.0.5-r1.ebuild 3206 BLAKE2B 2de5fe023f80bc52d260a8485f0bce5478dc5df31eae0c2d9da29595afb3e4bdb45805773f4eaa6a5ae766eec750a53639c2a15185bfab793c7a70fd73742bb9 SHA512 c3d68c7d328c9b0b61dfc2f675d4c0eecae022f88cfffa886f95d6e1f41a89299b3271cbfddae9a3e9c75537d116537d8c3ad9a61da7d7a3be298aa5f493a394
-EBUILD android-sdk-update-manager-22.0.5.ebuild 3127 BLAKE2B 60789896e515c775f5d77cf3715f375236e8e03c1e48712caa45d89ae53ce556a3e3552be63d3ef419bdaf9d17da51abf3f570a94e14ae30f4a91c80a910e7a0 SHA512 7ace54557957fd91cac07d3e7618195972974cef01ee00408e5d45faa3424a19199602d92cc4da777104375a4079e289fd6a23afec886d3a6e697c6270c2220f
-EBUILD android-sdk-update-manager-22.2.1.ebuild 3206 BLAKE2B 2de5fe023f80bc52d260a8485f0bce5478dc5df31eae0c2d9da29595afb3e4bdb45805773f4eaa6a5ae766eec750a53639c2a15185bfab793c7a70fd73742bb9 SHA512 c3d68c7d328c9b0b61dfc2f675d4c0eecae022f88cfffa886f95d6e1f41a89299b3271cbfddae9a3e9c75537d116537d8c3ad9a61da7d7a3be298aa5f493a394
-EBUILD android-sdk-update-manager-22.3.ebuild 3320 BLAKE2B 9d632894ba85c9007bb7267ecd3ebbe899ee9897faf7fed6f5dd4e99e2766218d5f69741a6e825d96ef6e5b5ee13b2d1e92d41313a5c2e44931b52059342364c SHA512 0ea8b74d69d8003d4c80d1fb1d67dc119e935900e4fe8cdb86c489340c412eb8a56fca19547bd1851a1c7a54c3b87bf946bc7f632fa571ec4d245c9556b30aff
-EBUILD android-sdk-update-manager-22.6.1.ebuild 3320 BLAKE2B 9d632894ba85c9007bb7267ecd3ebbe899ee9897faf7fed6f5dd4e99e2766218d5f69741a6e825d96ef6e5b5ee13b2d1e92d41313a5c2e44931b52059342364c SHA512 0ea8b74d69d8003d4c80d1fb1d67dc119e935900e4fe8cdb86c489340c412eb8a56fca19547bd1851a1c7a54c3b87bf946bc7f632fa571ec4d245c9556b30aff
-EBUILD android-sdk-update-manager-22.6.ebuild 3320 BLAKE2B 9d632894ba85c9007bb7267ecd3ebbe899ee9897faf7fed6f5dd4e99e2766218d5f69741a6e825d96ef6e5b5ee13b2d1e92d41313a5c2e44931b52059342364c SHA512 0ea8b74d69d8003d4c80d1fb1d67dc119e935900e4fe8cdb86c489340c412eb8a56fca19547bd1851a1c7a54c3b87bf946bc7f632fa571ec4d245c9556b30aff
-EBUILD android-sdk-update-manager-22.ebuild 3131 BLAKE2B e62927b86f4840cd333bacc2e539b1c4fc0095310c6a2201352ccc16781322c684a72150aaf443784168f165451bc61070166736c3be4d3da6d1123fa7691dd4 SHA512 c6db541e811ed203c0e78a475d6ee9015a84771202c3b0e88bb8e5050f184a9e6cc467749ed882565f79735cfcaf958e6560a81bc764aa9aef7a01e899cc321a
-EBUILD android-sdk-update-manager-23-r1.ebuild 3311 BLAKE2B 4f25cb3fc06c5f4ca34ea133974aad91a17d5f696007dde500eaf85da6ce8f8e4a29033a83f6cdf9e3768d6e63f000e1cdc8aedd302b8388b0b3b3ae1f1f17f1 SHA512 23af7109d479d4a8b041f26828c3c302b11d5e5c4cfc3c158355727c4882faa403cd950c1d532c0952c8580ac1e61a86bb4172b3ed139b22767c2f21ad0b45fb
-EBUILD android-sdk-update-manager-23.ebuild 3305 BLAKE2B a4cf54975b768d49ad116f36ce8e9e3b39045357da70bfe1f44ddd7a517ecec4e5cabca082116c5ead2ded35fae758e39b46ec06ff1721fb132059b9971ebff8 SHA512 b2e5272a3d742d73118642d98b4706086a878a0227a5fdce4cbbd473af28cc04b39189d230e43bf3e9ac32866ab2f7a35eb7014071762f63497f2d37f205162f
 EBUILD android-sdk-update-manager-24.4.1.ebuild 3353 BLAKE2B 05e979a96b88dba1be33559d2b8eb48eb6aec5cfc8a02b53416f809f31e8c7f043e6fafc0b2ca8ae8767656c624757f7f4357433de4e41756fdadc067793fa3e SHA512 7d04b34c7d6364106ff48ec5c79c5d3a4a4bf6f01511a5dbfd18e8ef6331002c0054ff98b86c0f039c27013d4bd755a4623f38a7b7d6c0653dd5015e9cc91423
 MISC metadata.xml 174 BLAKE2B 1738b3b33ef242919964fb6a498f2215dbd528720bd193469bb20020fbedda0e9102ef85539fa9d2c3924bf2e6c0dd560671134200481054111467ba8e88fcb1 SHA512 281aa8b74dd6915f9856e5e70db000388f8b04bd5393871e67b57cec316374c6986124202dfdf4855ba57dd60f1e2cfc323a1f2cc4c6fbe0f634f67f8fb40b17
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
deleted file mode 100644
index 9b40483c021f..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	>=dev-java/swt-3.5[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="4.2 3.7 3.6 3.5"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
deleted file mode 100644
index 28f7786e0f2c..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND="
-	>=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	>=dev-java/swt-3.5[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="4.2 3.7 3.6 3.5"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
deleted file mode 100644
index b54ac2b090fc..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	dev-java/swt:3.7[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
deleted file mode 100644
index 1353edbc0ba4..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	>=dev-java/swt-3.5[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="4.2 3.7 3.6 3.5"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
deleted file mode 100644
index b54ac2b090fc..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	dev-java/swt:3.7[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
deleted file mode 100644
index d335afb3378a..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	dev-java/swt:3.7[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
deleted file mode 100644
index b54ac2b090fc..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	dev-java/swt:3.7[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
deleted file mode 100644
index d335afb3378a..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	dev-java/swt:3.7[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
deleted file mode 100644
index 42c6e14d981e..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	dev-java/swt:3.7[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
deleted file mode 100644
index 42c6e14d981e..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	dev-java/swt:3.7[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
deleted file mode 100644
index 42c6e14d981e..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	dev-java/swt:3.7[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
deleted file mode 100644
index 1353edbc0ba4..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	>=dev-java/swt-3.5[cairo]
-	>=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="4.2 3.7 3.6 3.5"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
deleted file mode 100644
index 4f77f8ba0d62..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	dev-java/swt:3.7[cairo]
-	sys-libs/zlib[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners -R root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms -R 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
deleted file mode 100644
index 895cf67fd7db..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils user udev
-
-MY_P="android-sdk_r${PV}-linux"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="https://developer.android.com"
-SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	dev-java/swt:3.7[cairo]
-	sys-libs/zlib[abi_x86_32(-)]
-"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_FLAGS_IGNORED_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
-
-QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
-
-S="${WORKDIR}/android-sdk-linux"
-
-pkg_setup() {
-	enewgroup android
-}
-
-src_prepare() {
-	rm -rf tools/lib/x86*
-}
-
-src_install() {
-	dodoc tools/NOTICE.txt "SDK Readme.txt"
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-	fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH=
-	SWT_VERSIONS="3.7 3.6"
-	for version in $SWT_VERSIONS; do
-		# redirecting stderr to /dev/null
-		# not sure if this is best, but avoids misleading error messages
-		SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
-		if [ $SWT_PATH ]; then
-			einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
-			break
-		fi
-	done
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-	echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}"
-
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
-
-	insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
-
-	udev_dorules "${FILESDIR}"/80-android.rules || die
-	domenu "${FILESDIR}"/android-sdk-update-manager.desktop
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "Run 'android' to download the full SDK, including some of the platform tools."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See https://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
-	elog "You need to run env-update and source /etc/profile in any open shells"
-	elog "if you get an SWT error."
-}
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index c1036573590a..efd141d22b4d 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -5,6 +5,6 @@ DIST aruba-1.0.3.tar.gz 133790 BLAKE2B 4008cfec1bc1d63113b1d8961e3bd6219f3884875
 EBUILD aruba-0.14.14.ebuild 1746 BLAKE2B 419b70985f18519c23aab2e13b006d867a19ae534fda30c9a4ab88a3df18bab5a38b74b5614c8fa00f1577acca27b90ab260c05de2da8700133d33c71edbc97f SHA512 84eb8be2f99c0e7a65a61450ed56ddf632565da6db96e1b10e5cd5dffeae24f476a765507a2e57fffa22a7d90447036967f66cd346bf03c7151c5797d6118140
 EBUILD aruba-0.6.2-r2.ebuild 966 BLAKE2B 5ac0fb744b55ea1931dfb419839b292bdea1a3191b2e2fe0d4cc913d4cd4cbef2829e581b40df28d7665e4cc5e8dcb9af43c8df8851b698040fe5af72b9ca357 SHA512 e58618308f98b565f103de437e5b2d4fafd1994dca8e3c9654300fe2dc474259cf7cb7c009a67cfd0c4d3c9b6846351a4b6807950756f6fab760e2f237843437
 EBUILD aruba-1.0.2.ebuild 1922 BLAKE2B f7d9aa054e862cf7aeef26a322a067ef8b279c8a96a472471aa0dd2a027c0e06d66908ede4730ccfeeec07c76dcc52657a497f7040d9b83104a60cee83d4f032 SHA512 e8451f0ec7ec1c9967dd0046050eb01b96ce616c55fb50ab98705595ad4b98b747df4be1c468da45163c710398d2de2b253d3b3ff58f042153f45e30664bc311
-EBUILD aruba-1.0.3-r1.ebuild 1955 BLAKE2B cf5d1d8ae0dafe1ef47c1c8f44f1ee0094a58f58308f5aaacb6c12b695ac97b6e8323507c120842feeab0ca0ab60d798fbaa7042da82269bda0dbae53fee9245 SHA512 e7b6275d8625e65a1c565185e2baf7d7a7bb3f5183c894ea9e8a137499ec05520abb1a33c1905901a9d1dfde4cd14b6e1153153a2d242f4fa168ffabb793f414
+EBUILD aruba-1.0.3-r1.ebuild 1962 BLAKE2B 5121d8d5e5b6db8b66b04988f99ae73878c03cf2b57889d40e4e33f298cf69a91856792b70c574a295cfd6cc072f170dc8f5b533e25eb38a2a44611145944563 SHA512 4c80de11a4cf9799fbf3ca52d0a6899c0657ef57c4d18b5ba6cf1ca11ec5c70a6994327fb61461d7ae7bb33e393e7f73731bb0688d7a75a7a351dde6b69cd877
 EBUILD aruba-1.0.3.ebuild 1955 BLAKE2B 0b36d1b42e8a9cf1ca22a19118189f2a8bcd5291cf8e4626d2de1542fa3352a0e9c2a777394f93b7bc92888debfa32673863a52137c8077cc0b97040eeded385 SHA512 25587725ee21665a2d36bbae4eae8e836cc96f57b95b974a7dd0f0ba0e9a8a8b520451e1543d80ae335d1ad6ab00b681beb67bc294e71ad0160dcad5e732053c
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-1.0.3-r1.ebuild b/dev-util/aruba/aruba-1.0.3-r1.ebuild
index 0e20ab19c5b0..02c6b6cb9ab7 100644
--- a/dev-util/aruba/aruba-1.0.3-r1.ebuild
+++ b/dev-util/aruba/aruba-1.0.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/cucumber/aruba"
 SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 62c3d45744e3..ebcc9cd8e6fd 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -36,5 +36,5 @@ DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a8
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD cbindgen-0.14.4.ebuild 970 BLAKE2B d0cbb456166176364597e1cf4c6c18462cde7d19e9ac739b9d3896499d208d3404f286bd0991e355a059343aac487286436f04166d4da530848337bb2153f55a SHA512 9bd99c488f96fd7c779dd3b0fd384812368e79ffc8dc590c8982408161201804781b8ef6c66c8ad0af9232f2683387dc34a5a839f069fac835a7ddfa4170c67c
+EBUILD cbindgen-0.14.4.ebuild 1006 BLAKE2B 1075624da79b47614713bfdd1e77c19c7f5ad948b76a0f276a137bd810713c42ab0ec6e0f29f21a9a28617f26eae17f40b2eb4e1bef6b2e201ab6de627d6ae78 SHA512 a69c65e6e254e2dca984bfe25d751e08ecd35aeace7ebb3be00e23441540a2a12fffac4116cba0ef16133b10970b9fbb81888d3300f4624b4b08fde3d2cbed18
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.14.4.ebuild b/dev-util/cbindgen/cbindgen-0.14.4.ebuild
index 3762d45e04b4..17e495dffdf7 100644
--- a/dev-util/cbindgen/cbindgen-0.14.4.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.14.4.ebuild
@@ -52,3 +52,4 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+QA_FLAGS_IGNORED="usr/bin/cbindgen"
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 6bf573bbfa1c..87ba664e5a40 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -24,7 +24,7 @@ DIST cmake-3.18.2.tar.gz 8970663 BLAKE2B 10924eabbcd20bc3dc2cb6f2d619d824ed0a28f
 DIST cmake-3.18.3.tar.gz 8976093 BLAKE2B 266432f8647828359e0f1a4390d62ac6449fcee5c7bc95d96fea62bc0ae94af9734edf6e0366efe95e3c65c5f29e16abbec0ae6b086781926ac0ae0a08a64b19 SHA512 28c0c310b6cd8117d4a8b9ad60064b22b00bdc170303b190994e9a3d4fe83fbd9cae6c8f36da62faf6c356b5acf430c78878f19210386ec26844b56334d3941e
 EBUILD cmake-3.13.5.ebuild 6250 BLAKE2B 51fd5c675042b869a8dd3f54ceaed2f3a2d9bc43aeb2894b1b8c9d995660bc81ed9b39f99bfbb376d0dd658942def7bc2c1ec3538efc36c1f43f65bc1ca5dd5b SHA512 638eece44d2cb688d92fd9fbedd189aee9b0b878b1fd054984e806d17083eda352695136bf0d800d9e2ecb7993917f2da4f1f1913e14c7686c4d7cff8c641f60
 EBUILD cmake-3.16.5.ebuild 5911 BLAKE2B f124d2d41b33a9a76749ced21fac3717eb50bba7065500986fdafc445bef3f17bf6e1faac7e863257ad5d8f571e4bdf17c9e750f5b83163401b491d85a2319f7 SHA512 4cfeb2154bd96b1f146b508ed038158a8cb58ead403011054702c4bdc1e2d99e677baa1b7ee6c33c4b317ca4992718cdc352b55724e73bf8edc758d2748e2603
-EBUILD cmake-3.17.4-r1.ebuild 6144 BLAKE2B 9796b95f1405488d6543a69fc0867cf6ae2f63041da17ec0f30f830974815848ed11f429650691aa557058b8f462923826c94f149e0001289cbb107461d2fbc9 SHA512 80a1214aa3fe6690def0983a37f70a81ea96762ed0e8abf608c15a188003f79d12e42effb0da89a9e51f68b4134620c5a9201649babd40dfbd5a04c904e40144
+EBUILD cmake-3.17.4-r1.ebuild 6143 BLAKE2B e990986c2de9e11ea271e9d121675f7ed5b728bdf4e76ec40f9a64e967911ce6e934733824b2e5a70c20ba0075b446d82e36d0d5957f4ef09278d942368e59ac SHA512 3a77b31d45ce36509269bf0170f2c7df1cdb4133b615024e9b0391fb990e6e5c8649a108223575d33724962684dcd1ff65556dc1e11a8cccdc29a4096a72822c
 EBUILD cmake-3.18.2.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
 EBUILD cmake-3.18.3.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.17.4-r1.ebuild b/dev-util/cmake/cmake-3.17.4-r1.ebuild
index 7575025aa80b..5517cd95a3d6 100644
--- a/dev-util/cmake/cmake-3.17.4-r1.ebuild
+++ b/dev-util/cmake/cmake-3.17.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index eb6c85d42851..81df35c64cbd 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,3 +1,5 @@
 DIST cvise-1.6.0.tar.gz 243050 BLAKE2B 64c305426dbeaf2e3f3a92a902209b35fcc76b5f5a6d2e48fcc8e24d1325badc0839e70afa1381c6d1412c22a7e9dd41ca03d6ca714fa5082958378cc8863000 SHA512 9d4ee043c34748b600b49ac4f00463b853faff2809f8b581e9b07433a8f3bef4436d0e5d5a9dbff1b2d7c3a8ab1d6d4823e78787eb3e911a683808703b2e24b6
-EBUILD cvise-1.6.0.ebuild 1163 BLAKE2B 27f35156f8fd6f2b4d3810dec52240a52edccd1139fea5ba294f19fe0050528c1d8edd813b5058aca13cf1705eccb478cbe269d875ece57492613fe7d8411f33 SHA512 4170ca8e2dea7586c2dcb0023a1fe1676cc4fec0c7a0dff083043cffa29eb36f4a0220f5b3aea1edd74605f54137c54a9916c559a34274e6984e83c704437463
+DIST cvise-1.7.0.tar.gz 248515 BLAKE2B b1a2ca8abc7a09c240a7ae39400e3e60ca641dd0dff4edb34f43d755619ec47bb7a0d25fd6b4461bf80a3be14a63c6e56d0e3e758827ca7c2ef90370aba5d539 SHA512 2e0115355c0ca3cdf593ad4a8d0079ea0ea193234ff4fcae8bdc7c0244cc7b8672025682821279b826fda97f80dc71455390d709836acb671c19772f13156de5
+EBUILD cvise-1.6.0.ebuild 1162 BLAKE2B 09b719db9f8c428bd94aeec9ccb8a03b150323a62a9d014ee82cced18733a89d2272ba049fe8446b3f008d77861281be70549d351d5cd173d7e1fddb12e3c5ed SHA512 af3c19d0f1d2ed513f0533e4861f109546a5da5c1b9dacb6b6f585dc568ca1d28a34530e04eb6acc3bb77a2b47ab84490793c78d834637771a59b8341bc7c2e2
+EBUILD cvise-1.7.0-r1.ebuild 1202 BLAKE2B e0b789b8fc805718c1fe3cb71ae4180bfc0b5af7049a8631ed64d5983a980c84310d17c534aa1f638c76fe2a1a3053a1739d7351c5fbd4f192f204c67857638d SHA512 d94a2453dbe52425d800587465d1f5eae79fbc9d33fab09bbf6479ec217ce9ef78c1afa78b40f7294b986137cd689ef72d4b1371f44735f61ecdafbcb185fd78
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/cvise/cvise-1.6.0.ebuild b/dev-util/cvise/cvise-1.6.0.ebuild
index 3752fef16a4e..ac8d916a8431 100644
--- a/dev-util/cvise/cvise-1.6.0.ebuild
+++ b/dev-util/cvise/cvise-1.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/cvise/cvise-1.7.0-r1.ebuild b/dev-util/cvise/cvise-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..16f63504e0d4
--- /dev/null
+++ b/dev-util/cvise/cvise-1.7.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR=ninja}
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm python-single-r1
+
+DESCRIPTION="Super-parallel Python port of the C-Reduce"
+HOMEPAGE="https://github.com/marxin/cvise/"
+SRC_URI="
+	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+LLVM_MAX_SLOT=12
+DEPEND="
+	|| (
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+	)
+	<=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	')
+	dev-util/unifdef
+	sys-devel/flex"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/flex
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pebble[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)"
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	llvm_pkg_setup
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	pytest -vv || die
+}
diff --git a/dev-util/cwdiff/Manifest b/dev-util/cwdiff/Manifest
index fa50991652d3..5e9e7d0c4d5c 100644
--- a/dev-util/cwdiff/Manifest
+++ b/dev-util/cwdiff/Manifest
@@ -1,10 +1,4 @@
-DIST cwdiff-0.2.8.tar.gz 4246 BLAKE2B 6161bda18738c5b7c5605349fdf7a726d63f6fadc8c5fe5d36587b06674c74a41de86910aec67e12926f9fa586b485bfee02895d8d8e3bb6f50970a6e4814d5d SHA512 bb1fb3790cc2d8f4e5f199e7abc9bf6a999ded0d25fc9e62ca1e003505f1d33b6c8575b0172a2e55128c4e5c853147304c928d0f1094c5b30e6a015b9fbcae09
-DIST cwdiff-0.3.0.tar.gz 4666 BLAKE2B 9f3b660647723dd34939bdc29450c02001f7430955fbfd0197cc0713b516fcb4124e853b9c8828606f20c3cc363aa5f4cb0d6d38004f021a47c0ed2494229523 SHA512 40401a0541209c83cd78ff55c62ce71dd362cf8674b07c1cdd56ad7a505741e818003f07c87fe0303cd2bfd911d99b8f560697612b32b6fee794a7671e7e86f0
-DIST cwdiff-0.3.1.tar.gz 4706 BLAKE2B 644d1a42a8fa4119f844f55910b625343f757939ff82babd7d3702ee3759efcf005e4d7405505bba593795af79da452eaae469b550892ab5f37ebdca47f93ed0 SHA512 ffea1f699d333655eebfe96048dcc96c57408d42915d707e10b9231a27cc7a8803c3b47876227e24da67376ec18f9261739b9fb13889f8b47d336ca048cbfa72
 DIST cwdiff-0.4.0.tar.gz 4468 BLAKE2B 3c2310c5f57d932d46df1e53a130f4df7f8c5206689df00412507949f7e613e13dbe72b006be1d9adc7c9d630fc91303c900f17914fefa66fd9fa9a9f11f4918 SHA512 b5deda44d94bd3aa93a68da136f4170996ee02c683c38329cbc16a108e0795e86c3543759e1d7adc3d512d4dcbc416436e733341e1b4f3d96325e999e84a4fbe
-EBUILD cwdiff-0.2.8.ebuild 727 BLAKE2B b87ef9eaa7b9841db229c0c2b3276dc5349a745962b10b9c9a7d8032006f4065b219924595b23b0e5a634b5f88f7172abfd1f7aeec581a7e33dd66f4acf73e00 SHA512 c85fcfc4fa4c46758d54a433109de2286912dd773fdfea927f1b5edd25cde292f82b9c69d48ef99e1c18e47f21f98aa0469c6a2e8740649a6cf7a34aed3cbd68
-EBUILD cwdiff-0.3.0.ebuild 853 BLAKE2B f7612d2df6ea29bf694101a0da56fb2c1e43227ff908c4450041f25bbe8dd9b0e3dbc4634a705f094661a14f186113291d8f0d26661f21360997c6ed5de36ec3 SHA512 edade4c56f8cf28a0f6908865a09568add9709fea082e09cfbffd73b373f9bdf4db1faadf5aa6eec8e9ad80e810c46817878e3e1cf96d7a0f6f568fcc194f905
-EBUILD cwdiff-0.3.1.ebuild 853 BLAKE2B f7612d2df6ea29bf694101a0da56fb2c1e43227ff908c4450041f25bbe8dd9b0e3dbc4634a705f094661a14f186113291d8f0d26661f21360997c6ed5de36ec3 SHA512 edade4c56f8cf28a0f6908865a09568add9709fea082e09cfbffd73b373f9bdf4db1faadf5aa6eec8e9ad80e810c46817878e3e1cf96d7a0f6f568fcc194f905
 EBUILD cwdiff-0.4.0.ebuild 823 BLAKE2B 5f508d00c906419e439b197dc15d2c04f1393397d49289b35cab57a5886a7e501c169e1741978b7fe6c936dafc7f678b8350d5693b868ce078f85696d3250ac0 SHA512 6028325f18dacb79f5f76b5ab448fdbf1c5417ec277d64c4a530c1f521342abcad99a9a4fde2160b5a3dcb2f1e70dd63e6ea6b7dbf64198a3a08a0fc9499c9b2
 EBUILD cwdiff-9999.ebuild 823 BLAKE2B 208bfbebcb8b642196ca2893cf33afc94e1f0b0b27294258d853a8bb880a403941e0ae461113cc920a3125c7eeac3ca1286f7a14f5675bf0dbb0a01c35bd43ce SHA512 f8699b6eea1d13d42d70c10954582773d0e50f86531767c11e34ce03f2cad9318d137c8d1294a4d27c81bfd9e20275f684b87354330420e8c32bc6c916be9560
 MISC metadata.xml 518 BLAKE2B 9455d9d70800cb227223da8642b5f23eda28a77d6bb8126e49d3bfb6fa761cabb2999c8dc5dd36a176aa98367d2d41ee935c5bb25f78522b5ee3235d329ca45b SHA512 08009caaf17aab80858770126cb2915890400c85f35121c5da2aee9bf9cd0640c3614a9b33c1afde6e270f212509d8604a7460a759027924420f1e508694d569
diff --git a/dev-util/cwdiff/cwdiff-0.2.8.ebuild b/dev-util/cwdiff/cwdiff-0.2.8.ebuild
deleted file mode 100644
index f8776fd6d4f2..000000000000
--- a/dev-util/cwdiff/cwdiff-0.2.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
-HOMEPAGE="https://github.com/junghans/cwdiff"
-SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-IUSE="a2ps mercurial"
-
-DEPEND=""
-RDEPEND="
-	sys-apps/sed
-	app-shells/bash
-	app-text/wdiff
-	sys-apps/diffutils
-	a2ps? ( app-text/a2ps )
-	mercurial? ( dev-vcs/mercurial )
-	"
-
-src_install() {
-	dobin "${PN}"
-	if use mercurial ; then
-		insinto /etc/mercurial/hgrc.d
-		doins hgrc.d/"${PN}".rc
-	fi
-	dodoc README.md
-}
diff --git a/dev-util/cwdiff/cwdiff-0.3.0.ebuild b/dev-util/cwdiff/cwdiff-0.3.0.ebuild
deleted file mode 100644
index 95a7d5783001..000000000000
--- a/dev-util/cwdiff/cwdiff-0.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/junghans/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-fi
-
-DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
-HOMEPAGE="https://github.com/junghans/cwdiff"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="a2ps mercurial"
-
-DEPEND="sys-apps/help2man
-	sys-apps/coreutils"
-RDEPEND="
-	sys-apps/sed
-	app-shells/bash
-	app-text/wdiff
-	sys-apps/diffutils
-	a2ps? ( app-text/a2ps )
-	mercurial? ( dev-vcs/mercurial )
-	"
-
-src_install() {
-	emake DESTDIR="${ED}" $(usex mercurial '' 'HGRCDIR=') install
-	dodoc README.md
-}
diff --git a/dev-util/cwdiff/cwdiff-0.3.1.ebuild b/dev-util/cwdiff/cwdiff-0.3.1.ebuild
deleted file mode 100644
index 95a7d5783001..000000000000
--- a/dev-util/cwdiff/cwdiff-0.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/junghans/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-fi
-
-DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
-HOMEPAGE="https://github.com/junghans/cwdiff"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="a2ps mercurial"
-
-DEPEND="sys-apps/help2man
-	sys-apps/coreutils"
-RDEPEND="
-	sys-apps/sed
-	app-shells/bash
-	app-text/wdiff
-	sys-apps/diffutils
-	a2ps? ( app-text/a2ps )
-	mercurial? ( dev-vcs/mercurial )
-	"
-
-src_install() {
-	emake DESTDIR="${ED}" $(usex mercurial '' 'HGRCDIR=') install
-	dodoc README.md
-}
diff --git a/dev-util/ddd/Manifest b/dev-util/ddd/Manifest
index 2d4d796f9999..d1c0f842c0c4 100644
--- a/dev-util/ddd/Manifest
+++ b/dev-util/ddd/Manifest
@@ -1,3 +1,4 @@
+AUX ddd-3.3.12-clang.patch 413 BLAKE2B e9bde1c85c2419094d0e667a98f241f32a9523c827adb27e6443d177cf436f36cc5ea26a0016140034a0e774fb60ffc19a0b0208f4ee3c70985b1faa39faeb9c SHA512 dc8bca61ae507b3471411af331e6d1daba3c8031283db0bac0fdf1fb5420bf1429172c5c11a827b728fb2e17cd73b91c62433d5233f290f636f735c7c0094fa4
 AUX ddd-3.3.12-gcc44.patch 209 BLAKE2B ce05a8f213e505680297aa3de998efada5c4db48ea18fa3a5474b8aeb266fa85c582723ac3a9b52a7ece0ec7636782a1dc69d69ed073becb8dc834839e907715 SHA512 9373fee21d92b5661c659bcad0f9ce4bca25c86eba40d5d6e498f454cd56af225f290431bd79bfd98a6da5e49180ccb8fd37c144fb99e8b75c886c066e48b129
 AUX ddd-3.3.12-gcc9.patch 3409 BLAKE2B 752d4d8e36af49e4dcec6b79e3c3c0a0f8f55fcfba6fb882d3ba64a4016fc8d74a7eb32873be08194a865309e99b80a0d188d0456dd5dd770e7f280ed14172b1 SHA512 e148f6dcce1406d1ba2f5b83ff387c16bc914d6014077c465508085b9a595de539d7dc39b39a02e0db2e3e0b9704de748949767d31fb23657b40655b4052a580
 AUX ddd-3.3.12-gdb-disassembler-bug.patch 266 BLAKE2B a5658a1513adc116a81de7ec7bfb3eca4002043629a7b939970b8d902e1534d31df0ab8252a7dd2e5f998bc0df4d632bb5cb04662e81391b0e26e6a09809e35b SHA512 15ca238a9ac88c0736c861b962558f09be53f1bc85a5d46d6efb8d6c7ff6fc089b9f730dc0b691d65bbc40010cbd4d2cc4947f369d12271c214770114d533b14
@@ -5,5 +6,5 @@ AUX ddd-3.3.12-man.patch 571 BLAKE2B 88f499833e47ae279beac8dbc4aadcfaa80e8c19f38
 AUX ddd-3.3.12-parallel.patch 621 BLAKE2B 57446f5c7e797d7ddab5ed6aca01a5ffdc6af314bb797d96cfb357e214f1cf49153387635f9b585c53ebbcf7b06dcd6119b6bb2cbcaffa7d4382c4fbe9fdd181 SHA512 1157bec9212ffd4cbf86e8d36f68c80e9170091d09318effd800ce154f2b738e730db95e1e954c632dc25390e78cf88a9f1f3d14426df4069c0e5523f2dc6646
 AUX ddd-3.3.12-tinfo.patch 330 BLAKE2B f0e29f408f1e5e7fa40e386ab2a1f6786a9a14dc6722aef3fc8132558b624c233102b4290c0ba0e5d55b27aa4b25e6bcdd6fcd1b4ae237540621f3961e92bffc SHA512 a3cd3d59bdcce6c106d4488ec9a6c32d8baea49963f61e8e493a01131fd604664dca2e9e548852ff4c538c7123f5c1572bc54d6143340167fcdfa754002eb224
 DIST ddd-3.3.12.tar.gz 5687115 BLAKE2B 52c448eda46bfdc4f5720abda569a0c70f3680c3fdd543f6101c9af8c4c448496414c1c2a7be91590d9f14d0c8c2bb053a234d179bf900ca52df0ea8c2642131 SHA512 1249e4f5f25335f8f2c3616470f7a8f36262c00b8ac12b79f2b2806228de2831ebeb780fe09490e5e8b5b1ca108fe936ae70856f6a6ec02876fc75c7b4a7dbf3
-EBUILD ddd-3.3.12-r4.ebuild 2337 BLAKE2B f2504c9f89c7de4624b4273621c10af8d738a97ffcd9ab3966037edf3212e7cbd6bcf22ca7e91de116fce55b078f1f09a8b8ca032ceacb3f0bc2eaf927b76443 SHA512 50345e9b236f7be2f3e744e925108d3edfc311da3d33738b4c3a3b24068fa1afcd88132c2f6fe0a780ca8df4654645405752243a1ac989da27ca7bcfe6dbbe24
+EBUILD ddd-3.3.12-r4.ebuild 2377 BLAKE2B 1c7aa2049e8c647c9c920d6dfb17d3a032e697c6b3ec148eac1c060c152b2fce590f3d7cc1d27165e4b0681871d1c0c4c305da8e7a612084d6557e9fd5529d78 SHA512 81fdc265cac0ec216021eb785f61f37cc75ada599a5d44973a24cde296f61de1645235903970d399d89aed51f1a40db5c9814a8bb525c2ce21c416500195ab17
 MISC metadata.xml 658 BLAKE2B f2b35a9e08da89197aa56157e5d3c9adbc991d888cf798849bf7edf33fe6d9fd7dab16e0ea3068d20a836f85d133a570f3bbbcb9e57399c095292fa3390f59bb SHA512 8b304bbca5e836ff3032079f5dd2afea432b8f48e2c57575644adbefba0ddc4f64e3682f35f53c2804c27e950785ae8040f8704c05162acf302c6fb61b70c51d
diff --git a/dev-util/ddd/ddd-3.3.12-r4.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild
index 329b7ac91fe9..5d5268c2c714 100644
--- a/dev-util/ddd/ddd-3.3.12-r4.ebuild
+++ b/dev-util/ddd/ddd-3.3.12-r4.ebuild
@@ -43,6 +43,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.3.12-tinfo.patch"
 	"${FILESDIR}/${PN}-3.3.12-gcc9.patch"
 	"${FILESDIR}/${PN}-3.3.12-parallel.patch"
+	"${FILESDIR}/${PN}-3.3.12-clang.patch"
 )
 
 DOCS=(
diff --git a/dev-util/ddd/files/ddd-3.3.12-clang.patch b/dev-util/ddd/files/ddd-3.3.12-clang.patch
new file mode 100644
index 000000000000..a1f8da27b116
--- /dev/null
+++ b/dev-util/ddd/files/ddd-3.3.12-clang.patch
@@ -0,0 +1,15 @@
+diff -ruN ddd-3.3.12/ddd/exit.C ddd-my/ddd/exit.C
+--- ddd-3.3.12/ddd/exit.C	2009-02-11 18:25:07.000000000 +0100
++++ ddd-my/ddd/exit.C	2020-09-27 03:23:14.713650981 +0200
+@@ -769,7 +769,11 @@
+ 
+ static XtAppContext xt_error_app_context = 0;
+ 
++#ifdef __clang__
++static void ddd_xt_error(String message = 0) _X_NORETURN
++#else
+ static void ddd_xt_error(String message = 0)
++#endif
+ {
+     ddd_has_crashed = true;
+ 
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index 82e4e3c523d5..4f57fbdddf24 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,3 +1,4 @@
+AUX gtk-builder-convert-2.24.32-python3.patch 2165 BLAKE2B 2c70d438614cfbe09f5742fb6f0f8519831612058de36bd4173d4f8968ca6f5f546b6c212f6c54a997d43406a0bc787f9b0a5eb117c93d137861e39896a3b066 SHA512 9b52db1bff0a9cbebfac2d2d737c8a75e3ef704993e1bcc2117289b6bc05f1bf797da4763f50b9e9f2f2e93734c8cb747b301191842fee915232614347e7b26d
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-EBUILD gtk-builder-convert-2.24.32.ebuild 1128 BLAKE2B 2825466c954bccebc69b8b70b90dd3bfbeecdd4dedeb682f2c41d2fae1a2f2cfda990ebd379be42f2ea47128b9ec5de4ec87cad8bc4fbe4c99fc4bb3d2da3e3d SHA512 b4b4a33d84f0363e22d322391206811b47ddd59cc8a8d885eb6c319574cc0de69ec8dfb5045da512dfa013481f91b747ba0d4f0b0feef6757e3a0c2b8a19c9ba
+EBUILD gtk-builder-convert-2.24.32-r1.ebuild 1188 BLAKE2B 168692daf4e7f77ccc0445bd34e34319a7b5e9fcc8f68a0aa26316cfcc66b560db0899e4362c32bf0a64d71795aa91ad0e90500c56e6d8ea183a1648a7be1bbf SHA512 6c61eb0f5fdab93c62357a3c18068afad7354fa07a513b6dcc6baad9ce17f78b4e580b0cc4e62e2dcfb230d02302f8cdd5876de37a38f242ec463dd68d009cf2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-builder-convert/files/gtk-builder-convert-2.24.32-python3.patch b/dev-util/gtk-builder-convert/files/gtk-builder-convert-2.24.32-python3.patch
new file mode 100644
index 000000000000..01dc3d0aaff2
--- /dev/null
+++ b/dev-util/gtk-builder-convert/files/gtk-builder-convert-2.24.32-python3.patch
@@ -0,0 +1,56 @@
+https://trac.macports.org/export/50710/trunk/dports/x11/gtk2/files/patch-gtk-builder-convert.diff
+--- a/gtk/gtk-builder-convert	2009-04-27 14:02:41.000000000 +0300
++++ b/gtk/gtk-builder-convert	2009-04-27 13:58:26.000000000 +0300
+@@ -258,7 +258,7 @@
+         for node in objects:
+             self._convert(node.getAttribute("class"), node)
+             if self._get_object(node.getAttribute('id')) is not None:
+-		print "WARNING: duplicate id \"" + node.getAttribute('id') + "\""
++                print("WARNING: duplicate id \"" + node.getAttribute('id') + "\"")
+             self.objects[node.getAttribute('id')] = node
+ 
+         # Convert Gazpachos UI tag
+@@ -441,8 +441,8 @@
+             if signal_name in ['activate', 'toggled']:
+                 action.appendChild(signal)
+             else:
+-                print 'Unhandled signal %s::%s' % (node.getAttribute('class'),
+-                                                   signal_name)
++                print('Unhandled signal %s::%s' % (node.getAttribute('class'),
++                                                   signal_name))
+ 
+         if not uimgr.childNodes:
+             child = self._dom.createElement('child')
+@@ -461,8 +461,8 @@
+         for accelerator in get_accelerator_nodes(node):
+             signal_name = accelerator.getAttribute('signal')
+             if signal_name != 'activate':
+-                print 'Unhandled accelerator signal for %s::%s' % (
+-                    node.getAttribute('class'), signal_name)
++                print('Unhandled accelerator signal for %s::%s' % (
++                    node.getAttribute('class'), signal_name))
+                 continue
+             accelerator.removeAttribute('signal')
+             child.appendChild(accelerator)
+@@ -711,7 +711,7 @@
+     return s.stdout.read()
+ 
+ def usage():
+-    print __doc__
++    print(__doc__)
+ 
+ def main(args):
+     try:
+@@ -745,10 +745,10 @@
+ 
+     xml = _indent(conv.to_xml())
+     if output_filename == "-":
+-        print xml
++        print(xml)
+     else:
+         open(output_filename, 'w').write(xml)
+-        print "Wrote", output_filename
++        print("Wrote", output_filename)
+ 
+     return 0
+ 
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
new file mode 100644
index 000000000000..889c321a3bcd
--- /dev/null
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME_ORG_MODULE="gtk+"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Converts Glade files to GtkBuilder XML format"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}"
+# gtk-builder-convert was part of gtk+ until 2.24.10-r1
+# man page transitioned in 2.24.31-r1
+RDEPEND="${COMMON_DEPEND}
+	!<x11-libs/gtk+-2.24.31-r1:2
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.24.32-python3.patch"
+)
+
+src_configure() { :; }
+
+src_compile() {
+	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl docs/reference/gtk/gtk-builder-convert.xml || die
+}
+
+src_install() {
+	doman gtk-builder-convert.1
+	python_doscript gtk/gtk-builder-convert
+}
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
deleted file mode 100644
index 323ce94de3e6..000000000000
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="gtk+"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Converts Glade files to GtkBuilder XML format"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}"
-
-# gtk-builder-convert was part of gtk+ until 2.24.10-r1
-# man page transitioned in 2.24.31-r1
-RDEPEND="${COMMON_DEPEND}
-	!<x11-libs/gtk+-2.24.31-r1:2
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-"
-
-src_configure() { :; }
-
-src_compile() {
-	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl docs/reference/gtk/gtk-builder-convert.xml
-}
-
-src_install() {
-	doman gtk-builder-convert.1
-	python_doscript gtk/gtk-builder-convert
-}
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 2340a006c52e..8508a42803e7 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -9,6 +9,6 @@ AUX kbuild-unknown-configure-opt.patch 355 BLAKE2B 78c170c4d34d76a07925c08580245
 DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
 DIST kbuild-0.1.9998.3407-src.tar.xz 2351596 BLAKE2B ed562a739831c465ba66b2c357b1ab52cb072e61fa597d96d9e66e1b57a7f790c7e37fc82ef7ff49114b0cb4cb623e558d96864e98ca36bd42fe16e58e863dc7 SHA512 0a1fddff595f7ccfdb65a1a660c82860f132796b42149b8b40808d0df489312dcd96402236150c8ec5ec32c1cc142ce7af1150e10fdb83bf798e4d690dd64314
 EBUILD kbuild-0.1.9998.3149.ebuild 1866 BLAKE2B ae4ec9b87e0d988980b8e387e42cc8b13b2530de64090e8d2ab5817af68d6d7e752486a7158f69c4e99b2c322b48cd15398093e54b6a89b94e61f50f7e212167 SHA512 f5d669c42ceaba1e409eb5b94d8c95162afcc764b4b4a9b2b7fda835d11f80ebcc28e59359deb9b5d4fa8e035c2413c5fac2e698e43efe400d6b945cbd0f97ca
-EBUILD kbuild-0.1.9998.3407.ebuild 1735 BLAKE2B 9a88d0071cb3b1e58176cc217f8d775790d059ed621c0ac96335a78c8a6d4652a2257ab30123a2aa1a84361776971adc4c9319b0db4a9c5f1e0ed54c48dda1f8 SHA512 8e517e14e3a924432dc2a70845ac06067d520231a29ff77c3ec0cc7da38e8504b874f2101fb978fbcbbf4de1b4f3c81611ea220352fe15686a274ba82512b267
+EBUILD kbuild-0.1.9998.3407.ebuild 1734 BLAKE2B 9e451e9732dc6f034c8427d92b14edb0c10259286ac821eaaf7f11decabff54861db7e939ca6dd46744e3bf438d0e24f5962952debf8d2db00050e1e0f6cbaef SHA512 cc2a319dad42642666e36c32dcf93740bf1f124c5becb90773564a3db49be49c08e970152ba0763acb0365f43355ae33d309f0d0e6f159065411697cd6ae90da
 EBUILD kbuild-9999.ebuild 1062 BLAKE2B 458a2dfe2a3b753783c49aeb819672e5c0d59858f5b67817b0544c56805d03cb3c75178c582981456e82909792f2fbf8e1873817cb94101076145c7388b2cbae SHA512 492ad0ab9e132b6379ce58eae3670114e1009cc32cf191869e153f4e72d52be17cf58347eaf4e39520909c463632d90d879860b6b361d0dd56568496e369f304
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
index 3c367b7ff0cd..80d8104de03a 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 # We cannot depend on virtual/yacc until bug #734354 has been fixed
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index bbb071a7fd05..1529c62cdbeb 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -1,9 +1,11 @@
 AUX lcov-1.13-gcc-8.patch 3049 BLAKE2B ec0e22a61851ec2acbb0ac8909f1fc91d57d8dc2914583cf70cfbd7c08153c0c87a76d7f30e41f3660d4ecd9e76b3f06fb562865fc79474019f29c83602728c4 SHA512 f3598e28e98e97d3d1eec8ed4168996623cf920f94870cce4e731de2e1b0925a786dc8cbaf9d70379fc4e73f4f26f3a9405b2077c5246dcd66cc0eab25625b94
 DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e
 DIST lcov-1.14.tar.gz 177359 BLAKE2B 17069d38bf607217b8ff59f573fc02badf56afe65965d2a359a14835af57e2b6c512bff06fac3dbf4e94cd35701216edb8026d333b2baa8772d0ef551de37af1 SHA512 2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc
+DIST lcov-1.15.tar.gz 190487 BLAKE2B 2d6478caae488b84c74a3f7b489013b065b3e8fb106a6e8c5f413ffe87be7f4530aade8d2b5df5b8193949d60f49d5255b4eddb0cd5f1cab6f450ba2f97426ab SHA512 dda0eadbd0ea2093f17cba039309ccda3dbcb7266d083b46bda61e02cd7f049d66de49be1e005157c3e5af910d2703ffbc9cfe7f1242bd67b9787f8508e4d052
 DIST lcov_1.14-2.debian.tar.xz 25740 BLAKE2B ca1a84ed98e0cdd13aae88f0f550cac84f00b3dbf6bd764abe0c7eee7b73c0796abbf20e76cb51707d0d644bb17ee7ad283abbfaa7456dc2a3ade5e12cfbaabc SHA512 10fdb1f82be8cc9aef3b92aa7ca18f2736e5130d8b6ef9703b9444cb88f75f475e8bc48c441ed5cf7e4d11f383c226fc711e8609ea11772b01f454bb6a5bd45a
 EBUILD lcov-1.13-r2.ebuild 859 BLAKE2B d43e1aa8b6117e5296d73da09d943961a86218ccea9f90d890ef0f49835df8fdbf28ebcf78b2a30f57749a54ef22a2cd24a982f66e969f7e80b83803cb8ec66c SHA512 449744a363d44e90cd7fd06cc3beff631a74fd93e6d905c897016b36ec23e85554b163a8274ad951de6cda21adcd4291b754353ae59a6d26e278b61fb4e9b7f5
 EBUILD lcov-1.14.ebuild 809 BLAKE2B b856f279855281d6f25dc6c5ec751e5c4400df33d22a5e098525e0aa1b69edb8decc207d9becf6bbf6b2d53238046cc13dcce9e458a003854cce6349d46aeecf SHA512 4ab08b43adda29c198e59f67e2ebf648884389df131e03eb143bbf777905525d96b59041d8034aeebeaffd621e4f2a22e6d6d4f0c985f20fc09adc95346bd1ed
 EBUILD lcov-1.14_p2.ebuild 1399 BLAKE2B 6ff038ee856a577be12b4f0363abc0f39f181bab519501a77e19398f95885e7a0e8fc83a1b2537df1e0032addfcc29592e1bc2dc3c81a594cc200d54188ec289 SHA512 eba73e1e8f396b4945225e87da9d0eea550611c40b3c5f651ebf83f7a0ba3708acfcc735753023e01be080e60261476ec352a569b6d6a773a2afbd637eff00b4
-EBUILD lcov-9999.ebuild 846 BLAKE2B 9732de1816816254e334946cb3ff24e9806af0542d8948aa7478f956dfa7e044bf491b92f541d35bcd021c67bd794b8b66d927ec2db20c0c37467554709071fb SHA512 a2eaf7ea9fa5328d329991e639f2257f34608fdf67ba330b460a5c186557d0d3429646577a161aadf6f412e2a308154ec4290aecfc9be97dfd515850b9e28cd0
+EBUILD lcov-1.15.ebuild 963 BLAKE2B 12eb656eb9177ee422a10eb25188a9f6c53817e2251264a397e3a08d220970a848ffb69aaae4e40c986d66a186b52f696c9b1dd9319d696d45b1a12f06a70e9f SHA512 e9602ace4785304ae11ea186f3cb670ec1b192102d011ad1d9c8fd3feeeebdcf6c2ba23c9652f442c10a226216484a31ffb866cc63b2abbadc58cacdd95b8cec
+EBUILD lcov-9999.ebuild 920 BLAKE2B c39cab5754c576571ad3ce4b3151b987af87973a896695a3f25edaf95fea78f2ea812243e047aa6564a25dc52d06d8b7566c23025daa0fcd00bb6e2f54bf5f43 SHA512 b1532e9099ed0a39ad83bd96ceb1b6adf4b6bd4a558678b2a9b32246137996657343e7f9af3b721d40726bd14ee4ac1e76e77b8c8a2f9aa57466690709862369
 MISC metadata.xml 545 BLAKE2B 04986c839db27a72dd78580642dc394723107ae8bd5790fcd0017db1f3324faf27ce0bfca537504a882ae8fdd12b8c451bcd8014d078309a5dad9b01c3457753 SHA512 e5753b7dc704699d98540483ec24632095c63cc8eb39cd8b20d91420ea96f79f4de95787bc7e7547fe2b1078d0c1f694e52a69065e1bccd4e18a1e86a3999289
diff --git a/dev-util/lcov/lcov-1.15.ebuild b/dev-util/lcov/lcov-1.15.ebuild
new file mode 100644
index 000000000000..aaf14998d4b6
--- /dev/null
+++ b/dev-util/lcov/lcov-1.15.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 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/linux-test-project/lcov.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/linux-test-project/lcov/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
+fi
+
+inherit optfeature prefix
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/JSON
+	dev-perl/PerlIO-gzip
+"
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify bin/*.{pl,sh}
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake -j1 PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
+}
+
+pkg_postinst() {
+	elog "Optional features:"
+	optfeature "png output support" dev-perl/GD[png]
+}
diff --git a/dev-util/lcov/lcov-9999.ebuild b/dev-util/lcov/lcov-9999.ebuild
index 295385b60d64..456ec4605d03 100644
--- a/dev-util/lcov/lcov-9999.ebuild
+++ b/dev-util/lcov/lcov-9999.ebuild
@@ -11,20 +11,18 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
 fi
 
-inherit prefix
+inherit optfeature prefix
 
 DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
 HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="png"
 
 RDEPEND="
 	dev-lang/perl
 	dev-perl/JSON
 	dev-perl/PerlIO-gzip
-	png? ( dev-perl/GD[png] )
 "
 
 src_prepare() {
@@ -37,5 +35,10 @@ src_prepare() {
 src_compile() { :; }
 
 src_install() {
-	emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
+	emake -j1 PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
+}
+
+pkg_postinst() {
+	elog "Optional features:"
+	optfeature "png output support" dev-perl/GD[png]
 }
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 4980897b98be..ab1b0f123a2d 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lldb-10.0.0.ebuild 2477 BLAKE2B 21be1f15644d0c00a5c9fb21d0874b2784116b16a36190947b1df9d4a962a9cefae2e386c741b91b3e60709e1cb8fa8d8327f38c310198641a0c91aaecda9d0b SHA512 61bff2bfcdb91f14c8a4f70b59136df0b39fbdc86aa43e090f116e11e8e03ff0af15d3ca0b0ae7dfd516207e3457b670f08c1cf4198ecd979c5e1c2b4f7fb117
 EBUILD lldb-10.0.1.ebuild 2336 BLAKE2B aadc50c6e94522732e3760d608f4904dff90036a6c0eec0e30ae32b40bcdef8e54d00f21aae73b2aa5097a59fcf16cac5c57d4b82dc727d771ba0965749a5788 SHA512 8e0503d60572f67878527a3879c53935cad6ae1d5533ce45f3c33253e3d9535b203ce2720f7ab8b3535708da4c1723e1379c9a9833648714756ff02067aee822
 EBUILD lldb-11.0.0.9999.ebuild 2316 BLAKE2B 556a0c1160097a9fd6853dbe9fc992cb8f76d3fe0a0e05728d70732b9e4815617d9f821b9e4f1332d14015ff6a8d2d4b34f70c9866cd7f31c6e6dd17cda96485 SHA512 44b9aa5f5895ef8002f7caec77dd3947e9833f5fbd56c567d83464b7a611f5aa9c002649115d037c7502cb915d8199c4603f38221fce8a1acc96fb52fca4a3a9
 EBUILD lldb-11.0.0_rc3.ebuild 2316 BLAKE2B 556a0c1160097a9fd6853dbe9fc992cb8f76d3fe0a0e05728d70732b9e4815617d9f821b9e4f1332d14015ff6a8d2d4b34f70c9866cd7f31c6e6dd17cda96485 SHA512 44b9aa5f5895ef8002f7caec77dd3947e9833f5fbd56c567d83464b7a611f5aa9c002649115d037c7502cb915d8199c4603f38221fce8a1acc96fb52fca4a3a9
-EBUILD lldb-12.0.0.9999.ebuild 2316 BLAKE2B 556a0c1160097a9fd6853dbe9fc992cb8f76d3fe0a0e05728d70732b9e4815617d9f821b9e4f1332d14015ff6a8d2d4b34f70c9866cd7f31c6e6dd17cda96485 SHA512 44b9aa5f5895ef8002f7caec77dd3947e9833f5fbd56c567d83464b7a611f5aa9c002649115d037c7502cb915d8199c4603f38221fce8a1acc96fb52fca4a3a9
+EBUILD lldb-11.0.0_rc4.ebuild 2305 BLAKE2B 6696e6bda2b6f5a3165abbe23902804c98cf3f7b59b483c1b07d91a501581ab9c8343320a5b4c08bdcfad29d2b3f41ba6e2da317ea52a9bc9e8a2d1f7b944591 SHA512 e5b1d9a3b63961e53dbb12aebb4349a1e177ca1cdb357ebe55604b33a269f7195f42ae91173e9664d3e9511506d85ba688821fbb0409733bc1889cd16526e6b4
+EBUILD lldb-12.0.0.9999.ebuild 2305 BLAKE2B 6696e6bda2b6f5a3165abbe23902804c98cf3f7b59b483c1b07d91a501581ab9c8343320a5b4c08bdcfad29d2b3f41ba6e2da317ea52a9bc9e8a2d1f7b944591 SHA512 e5b1d9a3b63961e53dbb12aebb4349a1e177ca1cdb357ebe55604b33a269f7195f42ae91173e9664d3e9511506d85ba688821fbb0409733bc1889cd16526e6b4
 EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-11.0.0_rc4.ebuild b/dev-util/lldb/lldb-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..4b16c5b83278
--- /dev/null
+++ b/dev-util/lldb/lldb-11.0.0_rc4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
+		sys-devel/lld )
+	${PYTHON_DEPS}"
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_COMPILER="$(type -P clang)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-lit
+	# failures + hangs
+	#use python && cmake_build check-lldb
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/lldb/lldb-12.0.0.9999.ebuild b/dev-util/lldb/lldb-12.0.0.9999.ebuild
index a5b3aee8c3df..4b16c5b83278 100644
--- a/dev-util/lldb/lldb-12.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-12.0.0.9999.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 RDEPEND="
 	libedit? ( dev-libs/libedit:0= )
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 8e5f43b36a4b..5bce4224ee91 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -2,14 +2,8 @@ AUX ninja-1.10.0-readme.patch 1334 BLAKE2B 22543d95e66045b5b2c489cbb823c9c75ca20
 AUX ninja-1.9.0-musl.patch 1997 BLAKE2B 5fa4e9b171a87ebb8fb618a2b4b0c47668d0aaf0a2b3a5b08a3be5649235228d2cd38c3891d52b1d1e0217f16b1e13175a1a077567c07e83ba8cd36aae96c7aa SHA512 78b29a57ec3c4feedf2bcfe9370b30cecd5302f29e8e14c6a3bc01becb555be6330aafba12f9225625af0644ea1f534feba8396d32bb944253a9daa5dd0e98d8
 AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42
 DIST ninja-1.10.0.tar.gz 210313 BLAKE2B 0a3db145deaea8a990958ad2e812bc18ed014aaba94911a2905b082745a0d08f10ce1113badabaa362f3834540b7bd3858f07e2a5fce268c66d3d6c73e974e76 SHA512 5ed47ef1ff18a03eb73296629679a8617a08ee443e10e28ae9cb24e4506f84fe1eb142888adea9a62364b626b35817def8c55ba956c9b3cbc7b82d3e62293044
-DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec
-DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
-DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
-DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6abbed155d39fe65a3a4bbbba3e577e4a13dfd1ccb9e018084153b0dd6928753be9d8c10a2c4c2ab6a2000c5292f912353f2234b01613f46bfa49d13aabd7a SHA512 6c3aaf8decfd792ce6b035dacb87f978f1052d13e5ceac9ce63bc7051fad0eed83cc530d2cf22649ff4186416b0478bb3eb0507c56fec2848061cdad7a0aa812
+DIST ninja-1.10.1.tar.gz 211216 BLAKE2B cb27beeef903ff7c5a00f2ac85b36e66d9c41bcb271edbb6c6d827d5b2b652bacfe3d429a3f966d22fd97495323f83692abf7835f3d6ed3af51a3df9fef180c1 SHA512 9915767a6ffc7147903f346082b5c31fcaeb1e45742754cfaaa642e8ec4c1bd9ec26692a59eb4e2118c397336712a6548e6a16408e094001f8f0c173e67afcc2
 EBUILD ninja-1.10.0.ebuild 2687 BLAKE2B e025b310f8ba38be99d226155b365e3a62d5230fbccbe24f045a396b313ee3e8cff7785a9cc3a1e2c55586a4953863d37c7a64fcb0a9a26a1924a335c4b8ca7c SHA512 d25cbb60faa8cf707c4850ae431cb9f46c024ddb32683b226c906294b2dc40f3cd5df5faacc2a6ee968a98cd1df6bdd6ee958e8e3c536b90bafaa96d311115db
-EBUILD ninja-1.8.2-r1.ebuild 2650 BLAKE2B 381a358380a18d9b59da3d2850661bf47b5b8ab7a5c01a2a553b3367a5b39f1a590d08ad91ac2191e26755799ec60f8596d69db46be57cb74470fc33de1ccb85 SHA512 667d8163314f2625c730ffb4d1960d162e5c90a20c0b754657a0db5e6ca363171cde8558d4ed452194d75a10849a8d05c0c494ed94aaf8bb855537eda92cbe84
-EBUILD ninja-1.8.2-r2.ebuild 2650 BLAKE2B a4ae25652a8e2f60818dee56c7cea2c05967e0f3a4e6fae5d0f0fbbf05f253e174b2ed6fb85b0d2e0a9bd2bca6754fe82eafb50c38e1f51cef2fda616cbe464f SHA512 2bd4dc83bf719baf14d4eda839415519a8d6ff3d320830475091b3bd7ca12cc9204637a46f2155b40c9c4a87bc58f747f56f534547ba24b7306772004bd54a49
-EBUILD ninja-1.8.2.ebuild 2511 BLAKE2B 511fb24bda7d2bc511daa86d9c76217b54eeeeb2744dc9050d4c262e999ff496c91cf2800c3bc849e725f528e9d394238a38905aff48e63fbf8a17e2aad5ad6d SHA512 1346570be8d9ad9152130fdf3ed54c223ef48a6c1bf6469f34a24bca0443302fa71458d5777d479893958dd29ffcd37feba8c8ed51eb93e2120a0d0761d372a4
-EBUILD ninja-1.9.0.ebuild 2761 BLAKE2B 1899c84c449d0d55379c60da5cb94f3086e3cc9a28ecd75ab0833b378767daa0e04ab90adb275d2dd1432451c4c646db07a0701adc166ec425b29e8b9ef997cb SHA512 52fa94fc5af0a2ef15df5f013368066f38ccc2d44e68d655f16545dcf17ba9cd4f2479b7cfe34a02036b5f838dc2f4ab175ba0daec83d921db946eb70a76ba5f
-EBUILD ninja-9999.ebuild 2603 BLAKE2B ca20e4c0ce6bb238b81f33dafe9fbb2922d68f27ea55d2bcc2900057f1d464a7ba94ee123080444b53c726cf449db9ca9f92dea693d1910c34562399a26f0914 SHA512 faf4b642e2c53cad0a01e52815112f0bacb64fafea111d8949a705f0e7aae5dc1622af250b4e1d80f0819e3feeed3e1493fcd15449603652531b0909386a3581
+EBUILD ninja-1.10.1.ebuild 2657 BLAKE2B f7ce3fd75ba0221b701aee7845ebda0476365284914291f2568cf563126819dbb4b1c9ac46d4066ff3db5e3b3823d294d373d33ba58ffe499ea043a0db07f846 SHA512 9228921ff8ac1a4c27f1b03931198c0577d5e79064b24b62d911b5c16cce8a55548c08bb5b2da2416b11259785cbac6dde06dbcc3857b2190896d363ca9f6c3d
+EBUILD ninja-9999.ebuild 2605 BLAKE2B 63f1a467b6a02f99b2db9555d7bfe54c0f7232e7c0e1551f0b440d1e77926876eb9c461540b57788d43499246f8d595244313ecee2b99146e01d4f7a8503c785 SHA512 e4028a3e3fbc58b02faa9e1b857ca45985490e6beb446474fe00acc781101b9c2a76cd777d5f3f71f072ceea32050b6bb1a9d7f97b149898a80315df4b644d6f
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.10.1.ebuild b/dev-util/ninja/ninja-1.10.1.ebuild
new file mode 100644
index 000000000000..4fa91eecab51
--- /dev/null
+++ b/dev-util/ninja/ninja-1.10.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+else
+	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/ninja-cflags.patch
+)
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	echo "$@" >&2
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py appends CFLAGS to CXXFLAGS
+	unset CFLAGS
+
+	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		${EPYTHON} configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README.md CONTRIBUTING.md
+	if use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/ninja.vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/ninja.vim"
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ninja ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
deleted file mode 100644
index 366073aff8a9..000000000000
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
-else
-	KITWARE_VERSION="1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1"
-	MY_P="ninja-${KITWARE_VERSION}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="doc emacs test vim-syntax"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-util/re2c
-	doc? (
-		app-text/asciidoc
-		app-doc/doxygen
-		dev-libs/libxslt
-	)
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
-
-run_for_build() {
-	if tc-is-cross-compiler; then
-		local -x AR=$(tc-getBUILD_AR)
-		local -x CXX=$(tc-getBUILD_CXX)
-		local -x CFLAGS=${BUILD_CXXFLAGS}
-		local -x LDFLAGS=${BUILD_LDFLAGS}
-	fi
-	"$@"
-}
-
-src_compile() {
-	tc-export AR CXX
-
-	# configure.py uses CFLAGS instead of CXXFLAGS
-	export CFLAGS=${CXXFLAGS}
-
-	run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
-
-	if tc-is-cross-compiler; then
-		mv ninja ninja-build || die
-		"${PYTHON}" configure.py || die
-		./ninja-build -v ninja || die
-	else
-		ln ninja ninja-build || die
-	fi
-
-	if use doc; then
-		./ninja-build -v doxygen manual || die
-	fi
-
-	if use emacs; then
-		elisp-compile misc/ninja-mode.el || die
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler; then
-		# Bug 485772
-		ulimit -n 2048
-		./ninja-build -v ninja_test || die
-		./ninja_test || die
-	fi
-}
-
-src_install() {
-	dodoc README HACKING.md
-	if use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-		dodoc doc/manual.html
-	fi
-	dobin ninja
-
-	newbashcomp misc/bash-completion "${PN}"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins misc/"${PN}".vim
-
-		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${T}/${PN}.vim"
-	fi
-
-	insinto /usr/share/zsh/site-functions
-	newins misc/zsh-completion _ninja
-
-	if use emacs; then
-		cd misc || die
-		elisp-install ${PN} ninja-mode.el* || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
deleted file mode 100644
index 17b2dfc3f74c..000000000000
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
-else
-	KITWARE_VERSION="1.8.2.g81279.kitware.dyndep-1.jobserver-1"
-	MY_P="ninja-${KITWARE_VERSION}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="doc emacs test vim-syntax"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-util/re2c
-	doc? (
-		app-text/asciidoc
-		app-doc/doxygen
-		dev-libs/libxslt
-	)
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
-
-run_for_build() {
-	if tc-is-cross-compiler; then
-		local -x AR=$(tc-getBUILD_AR)
-		local -x CXX=$(tc-getBUILD_CXX)
-		local -x CFLAGS=${BUILD_CXXFLAGS}
-		local -x LDFLAGS=${BUILD_LDFLAGS}
-	fi
-	"$@"
-}
-
-src_compile() {
-	tc-export AR CXX
-
-	# configure.py uses CFLAGS instead of CXXFLAGS
-	export CFLAGS=${CXXFLAGS}
-
-	run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
-
-	if tc-is-cross-compiler; then
-		mv ninja ninja-build || die
-		"${PYTHON}" configure.py || die
-		./ninja-build -v ninja || die
-	else
-		ln ninja ninja-build || die
-	fi
-
-	if use doc; then
-		./ninja-build -v doxygen manual || die
-	fi
-
-	if use emacs; then
-		elisp-compile misc/ninja-mode.el || die
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler; then
-		# Bug 485772
-		ulimit -n 2048
-		./ninja-build -v ninja_test || die
-		./ninja_test || die
-	fi
-}
-
-src_install() {
-	dodoc README HACKING.md
-	if use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-		dodoc doc/manual.html
-	fi
-	dobin ninja
-
-	newbashcomp misc/bash-completion "${PN}"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins misc/"${PN}".vim
-
-		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${T}/${PN}.vim"
-	fi
-
-	insinto /usr/share/zsh/site-functions
-	newins misc/zsh-completion _ninja
-
-	if use emacs; then
-		cd misc || die
-		elisp-install ${PN} ninja-mode.el* || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
deleted file mode 100644
index 6f2d2e97d8bd..000000000000
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
-else
-	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="doc emacs test vim-syntax"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-util/re2c
-	doc? (
-		app-text/asciidoc
-		app-doc/doxygen
-		dev-libs/libxslt
-	)
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
-
-run_for_build() {
-	if tc-is-cross-compiler; then
-		local -x AR=$(tc-getBUILD_AR)
-		local -x CXX=$(tc-getBUILD_CXX)
-		local -x CFLAGS=${BUILD_CXXFLAGS}
-		local -x LDFLAGS=${BUILD_LDFLAGS}
-	fi
-	"$@"
-}
-
-src_compile() {
-	tc-export AR CXX
-
-	# configure.py uses CFLAGS instead of CXXFLAGS
-	export CFLAGS=${CXXFLAGS}
-
-	run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
-
-	if tc-is-cross-compiler; then
-		mv ninja ninja-build || die
-		"${PYTHON}" configure.py || die
-		./ninja-build -v ninja || die
-	else
-		ln ninja ninja-build || die
-	fi
-
-	if use doc; then
-		./ninja-build -v doxygen manual || die
-	fi
-
-	if use emacs; then
-		elisp-compile misc/ninja-mode.el || die
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler; then
-		# Bug 485772
-		ulimit -n 2048
-		./ninja-build -v ninja_test || die
-		./ninja_test || die
-	fi
-}
-
-src_install() {
-	dodoc README HACKING.md
-	if use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-		dodoc doc/manual.html
-	fi
-	dobin ninja
-
-	newbashcomp misc/bash-completion "${PN}"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins misc/"${PN}".vim
-
-		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${T}/${PN}.vim"
-	fi
-
-	insinto /usr/share/zsh/site-functions
-	newins misc/zsh-completion _ninja
-
-	if use emacs; then
-		cd misc || die
-		elisp-install ${PN} ninja-mode.el* || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
deleted file mode 100644
index 8d2dd26cb265..000000000000
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
-else
-	KITWARE_VERSION="1.9.0.g99df1.kitware.dyndep-1.jobserver-1"
-	MY_P="ninja-${KITWARE_VERSION}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="doc emacs test vim-syntax"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/re2c
-	doc? (
-		app-text/asciidoc
-		app-doc/doxygen
-		dev-libs/libxslt
-	)
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/ninja-cflags.patch
-	"${FILESDIR}/ninja-1.9.0-musl.patch"
-)
-
-run_for_build() {
-	if tc-is-cross-compiler; then
-		local -x AR=$(tc-getBUILD_AR)
-		local -x CXX=$(tc-getBUILD_CXX)
-		local -x CFLAGS=
-		local -x CXXFLAGS=${BUILD_CXXFLAGS}
-		local -x LDFLAGS=${BUILD_LDFLAGS}
-	fi
-	echo "$@" >&2
-	"$@"
-}
-
-src_compile() {
-	tc-export AR CXX
-
-	# configure.py appends CFLAGS to CXXFLAGS
-	unset CFLAGS
-
-	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
-
-	if tc-is-cross-compiler; then
-		mv ninja ninja-build || die
-		${EPYTHON} configure.py || die
-		./ninja-build -v ninja || die
-	else
-		ln ninja ninja-build || die
-	fi
-
-	if use doc; then
-		./ninja-build -v doxygen manual || die
-	fi
-
-	if use emacs; then
-		elisp-compile misc/ninja-mode.el || die
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler; then
-		# Bug 485772
-		ulimit -n 2048
-		./ninja -v ninja_test || die
-		./ninja_test || die
-	fi
-}
-
-src_install() {
-	dodoc README HACKING.md
-	if use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-		dodoc doc/manual.html
-	fi
-	dobin ninja
-
-	newbashcomp misc/bash-completion "${PN}"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins misc/ninja.vim
-
-		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${T}/ninja.vim"
-	fi
-
-	insinto /usr/share/zsh/site-functions
-	newins misc/zsh-completion _ninja
-
-	if use emacs; then
-		cd misc || die
-		elisp-install ninja ninja-mode.el* || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 95a15369f8c9..4c3e5779de6a 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 5c192a2cb7b8..258f6757eb31 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -20,7 +20,7 @@ EBUILD nvidia-cuda-toolkit-10.1.105-r3.ebuild 3925 BLAKE2B 6a5bef41d998a705c8abc
 EBUILD nvidia-cuda-toolkit-10.1.168-r2.ebuild 3925 BLAKE2B e43bab5926ca7649293281a6a964b93ee639da955519e616fe82b0d607c52874fa153f622496259d3848146ea08b4d447002714b10382ea417be26effe255746 SHA512 379e6ab18e78e5f66fdc9976556e3edc9b8937de57a7e582567e6237cfd5e412637ce0127e84504bb2b750f40062112488bd8a29faf0b8940a8f04d6e68ea1ee
 EBUILD nvidia-cuda-toolkit-10.1.243-r3.ebuild 4238 BLAKE2B 07fdf4e6eb0ac919a73b0f9d72e7859446f6c9a4f2500430537e79d8cb6f512659c2a56624bec7d7913723f9e6000ecf83746da30e745a43f7631a17648aecbb SHA512 3a5e9a96999c0f23b05f2b3c7452b0f662985e7e3a0ae94cf0619ffd12c96387d540fc2fa58ba2e69933f6fc046387668b06003a1e9d6efec127254ec3043d34
 EBUILD nvidia-cuda-toolkit-10.2.89-r2.ebuild 3992 BLAKE2B 858d1b4db64e393f061a36c3e8f22dfa83bb2e4d083ca5d987eb80b1e74ed2fb51923ecc49a4e32f52291d6ef84e1d82ab257bb345d11225e92be1368b5f4f9d SHA512 047735e7b92f12a7152b950c88d8c6b09da7772a31f4b133c8af5c8295f55d81b312b796b481dd7f6ae6767d3f2632a280533c6bcd5a22ec705dfcbd3933a94b
-EBUILD nvidia-cuda-toolkit-11.0.3.ebuild 6555 BLAKE2B 4637b8fd2819d8f16fbbaf74e3c2aee7738c2fcede4db13c8fb90df55290362db1ba43f9605fb1cbca32053dcad5ccb9e1a28c8408b9a4e07a65bebbac9b8049 SHA512 1d65ed5613c789341a05dc2549954ac4a23e16f23e05d8ed992033edd93361f1d001f8bc955102da37078f425fd790e279cab250ee94e32aa6c549132219c062
+EBUILD nvidia-cuda-toolkit-11.0.3.ebuild 6553 BLAKE2B dffab99d248356bc4d08f987901a0cad7941fa6b71eb684b9297a61637dfc8e964986d1dca719ae61fe2920265e5639f7afe559ac1f15cf919aeca01e37ced90 SHA512 f69720ca2b578e030a8c07b7663602aef82678274d0671d4dd1302d50ea177cd8ccd09963ff63f1e84c1f58cf5de5672e9d675c21db0b8a1500674bbd09595fb
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3902 BLAKE2B fb559c6ca55638853cede289104f9528bc939f10c20b9c67d168caf6cc3962c06e56f25961a17acfef4c143a95648efbc7d37f2362ef4af3f40d9d289ef88dcf SHA512 c810885c9fd7747d61078fedcefe4180da8aaa4ee7fa8822908f7d8dc649fd488781ea570f9f078c6a91ac7949cef3f112e8fe8a6bca3bb0d662abbe0ba755e9
 EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3928 BLAKE2B a3cc31983db891d496f5172bce661a5f1fd77a10afe0fb4ea1e243121530fc5560257c5846cc240da52986c7e6157feaace7047d0c675d0653144f5a42263a21 SHA512 9705c2ee7e76b5a66b20e08ca84c4ff998405a0816bbdd2e3d56eed21115ca154219d079943966525c71460baafdaf2858e2c7c6e08c44eff45db1be4d8c1f0f
 EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3439 BLAKE2B d1f61624448cdcd69db1a592d6fa4a78004fa8021b591efaa64dcd46263a2803f4983782b87ec9a3a89834e4ed99ab26f7dd706dee2a631887b1ac96b2080d4d SHA512 0c191cb31f5349a7a09c88c1d06e52ce025421a61a2c2bfc925a058b33f855585ccf20d538943c8e7f4d77fd1bb926d16fed76efa467e0a4380ba4b7f93f2c7f
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.0.3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.0.3.ebuild
index 019039d5007a..f01bcb2da8a6 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.0.3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.0.3.ebuild
@@ -184,8 +184,8 @@ src_install() {
 	fi
 
 	# Add include and lib symlinks
-	dosym "targets/x86_64-linux/include" ${ecudadir}/include
-	dosym "targets/x86_64-linux/lib" ${ecudadir}/lib64
+	dosym "targets/x86_64-linux/include" ${cudadir}/include
+	dosym "targets/x86_64-linux/lib" ${cudadir}/lib64
 
 	newenvd - 99cuda <<-EOF
 		PATH=${ecudadir}/bin$(usex vis-profiler ":${ecudadir}/libnvvp" "")
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 299e8338ca0e..e65568787f7e 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcheck-0.7.6.tar.gz 234637 BLAKE2B 31c31d987aed03e4a61f58a3dc3074985a4f436e3598f11257d602a668525f24e45c540d56e5779237cd36299b0ab73b9a59e3482099cb5accbb3ea8437cd7c5 SHA512 cfded3a5a0249ee9279fe93156ef524cafe7302915dfbbb01acd0bdc3acefcd1e90c6bcfbf3dc40bd5cb71680cc6453b1de045878d75a9ade00c432e663fd136
 DIST pkgcheck-0.7.7.tar.gz 236359 BLAKE2B 46628e6fe1ab711773209785f3160ad5521f7173a676363a44102bd26b443eafe4f88829d9a6c9cf10538ebfa7ca8b28cb8c27f9719f98217ff626d1b5a9a0b3 SHA512 ac88a3aa689983bfac0efa85240e3a02c822a075095ff9940fac0cdc188428126e7612807e57a7582f21fcf1d668dba29d4785d062d757f6444fa024d0437751
-EBUILD pkgcheck-0.7.6-r1.ebuild 1403 BLAKE2B f6a2b5e3f48767803cac0a2bdc408d806d44ce89ea7213e86cfe8a664d02d6568373d8f2aa6f12fd10e2694de54581ac7c6e2977a3f7650781038e7a3c4938cd SHA512 a01fb30b90b0dff455ea53320fc2aec0d0610209107ce4adc8c71b85cbb551b89a939534967ca3c7bb0640879f821045030895b25ae2040d74371ef751313a01
-EBUILD pkgcheck-0.7.7.ebuild 1404 BLAKE2B b7d748aaef717b15f79a329b3095be323480a80109c17e1199145365f3f09bc7b77c13d8093ced2d456340163668646b1b613a41ca16cb953dcc9df21afa13c9 SHA512 f101e48fbf9ac4434dacd6d1474550e6bba654567e53d2452b07f29060702f3468a3f4417d0b38c27ed0b23822ecd459091cee0201db4d8ee45a31a75bf42af4
+EBUILD pkgcheck-0.7.7.ebuild 1403 BLAKE2B 43f5471e3c5742aa2eb7468139d857bcd71c094e0504277d92a9146fef10d292a3d0cb744b042825315505aecad1962ea8f836581925f0c0574a9f0cc56a0b8a SHA512 29dda9f89452c61f521336f3d25c87c0d69594d3628fd5f6272859bcd67c253c5d4497a927b47a933d2961df2deea8fe898fae93fd2cd87148bb97d5335f4486
 EBUILD pkgcheck-9999.ebuild 1411 BLAKE2B f5f24d58e52919909b9b3fe9ef9f83d9a87e0cf86e5793b0cc5cbfb48236405f440f3fd2ec90dbf6100c24a77636a7af74b10cd7bea2a0547f4a823757acaab6 SHA512 9eb21a1fb70ddb97c087391785d168c567fc5be55eda21abb9c2573318e990cc28e93ab16710e64ba40051bb3a7cbe791d8a6acf5586aa0193d7bdc1370f0270
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
deleted file mode 100644
index 840d6dec3bad..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.11[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
index 931de679b4fb..057a5bafc42b 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index bb15a476c59d..18113c832a29 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -2,5 +2,5 @@ AUX re2c-1.3-lexer-overflow.patch 1244 BLAKE2B d9f51ea520ca437f4a1cb9c9f788d0c5c
 DIST re2c-1.3.tar.xz 1239280 BLAKE2B ae2a8fc323408dd31d39c352bd622d89d19178b7993618ea043bbfd32509fb7573d2b5b50663e100d24fc275fa479982cb1f66ed49638edca61f551fb653176d SHA512 c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e
 DIST re2c-2.0.3.tar.xz 1288996 BLAKE2B 76913a79ad9c237843ccbe86dd05db755da19fc89351b64d6ece6a9a8d53860f1cc12493748fca5b7391cddff4f4668295fb2613c257c128870ea2e7163811ed SHA512 893c533e9847a6236d55ae65e413ddc48b7531b89f5552a3ad79beeac079317ceca4c35710f3c2d88a6de5a3c0a5070a24a8cffb1b4277578a41697ea0e3bf8c
 EBUILD re2c-1.3-r1.ebuild 772 BLAKE2B 9a1c3ec7e9b1ab137802f9e95003820792cf7da85eca0d9ab46f30afd7d2883ca15ef070691d4364b151247295fea16e702d01fb1209e1346787613491e44a3e SHA512 0e26075418517031ee56bc22909db4968e1c15c1fb8417a510cd43803257c5363ef6c574b3ee9dd34cc6985bd294e0202a6de4164ecc90e080015a3eb1180755
-EBUILD re2c-2.0.3.ebuild 782 BLAKE2B 813525125f547a6b03e601a7858eef30e694a6b7a3d3026f33ac2c9468c19ec911e07e0352c2e4d7d4db9823d78e6505a0d7c33a7d444c44cc111f245154ca73 SHA512 e42cb52c0288fad36c02f1e489eb40db3c8ffe983b079e8ae5f67cb00811e7a4392c9bc677f5ba664ad77c0580380cc0885dcfc6edd96364e5e2dcd519a9a414
+EBUILD re2c-2.0.3.ebuild 777 BLAKE2B 902099d5c0d1b9ddcf5824c5485a5f1db3bbf458c5054a8985c366b5c932304ff608506470fb2dcbe52574e408e0bd21e5e37ae13af0204e0e14ec6bf1f42978 SHA512 20637a4dd995ca88cc0325706e0b9daf84af791db322eaa71ba445f68ad62be74b78db6ea4c1337600cf23716301dd0280eb2b081eb3317924665c68ff46c437
 MISC metadata.xml 476 BLAKE2B b2dad245e1cdcbb73e8b6e53442f7e9ec41337746c50f026c0fda68d57ebe10fb6193a26fcf9fca11e23570f44b104bd40d22fa1283fa91034f7cb792d436463 SHA512 e3018ee81606a018d66169cd142a17a34248587b77deb4baeb6daae6aca2d9a70095fb5dc2180d146043030631172f6fa17b3c8ddd5bebe85eebf6f3be79f9ab
diff --git a/dev-util/re2c/re2c-2.0.3.ebuild b/dev-util/re2c/re2c-2.0.3.ebuild
index 74c16e8376ec..d421fae7440c 100644
--- a/dev-util/re2c/re2c-2.0.3.ebuild
+++ b/dev-util/re2c/re2c-2.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~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 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 src_configure() {
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 008e3ad2cbf5..d172416ddb8f 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -4,17 +4,15 @@ AUX scons-4.0.0-env-passthrough.patch 1472 BLAKE2B 8f44a054fdf28ca1f049cb2f85f4e
 AUX scons-4.0.0-respect-cc-etc-r1.patch 3241 BLAKE2B 8e9cabb597db0c1cf278169bd6010168e46fc38895d00a0b013894b2783c65c5262156ded125e080b61927e34f40ef5ed4f2852dfd341d1d42bbcc1efad7b4ab SHA512 1878dc8f28d17aecd5c61b624c135ab3d1b311ec1b92687e1f205c4913dd5f99eeea0f7758d5623e6e60470c34fc2e7ce70571593f2197c8e59fed8df1586b53
 DIST scons-3.1.1-user.html 1134061 BLAKE2B de025ff73ecacec591c63b22bb3f934962a34fa16bec47a58972b97ba28f9a88254b419b4d2edeb2d920e70cf3e0c739df5357956c8586e5377afcd4125ba0a8 SHA512 bd00bcdcd01b192a42110ec65cdb906963af08f5bbc9d5e61624b5b5b1a667b115b099ce2ef71444a8998171a5544f4caecf3acec9715876d4e9e5baa581e60d
 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
 DIST scons-3.1.2-user.html 1126908 BLAKE2B 38e7695b6ef1e79b3eed4455fbe84ec1587be3f21c1c90cfa6602b344c52c704f021ed8e611abaf2e24ca06c5116e79fb78ca724c9920186cce35feccbac899d SHA512 a13ed1157f6aad25acbad6e1e3d2c0a16a14dd1d5fa369ba27777ca30eeb31ce37c735c1870c80f7343f0f98a4305fe1ef7c2b679cf2cb9c0d6670f34a3aeba8
 DIST scons-3.1.2-user.pdf 2557502 BLAKE2B 1c89d845d23c4e434c9db11d8730121f0b8dc6f2fca21dabe3e7204373cdf743d831a1835731332e39ccd7f3f49da068ba34a33a2937e9dd205e38d9c8b2b321 SHA512 9da887c157cb95f7802cb4b96080b0e56f2ad7663021b8be0839e71d473422fe9dd0dadf0ad1b067160c39511e91c6b3d9aaff8e238bb46b10a03ae89b12e169
-DIST scons-3.1.2.gh.tar.gz 5534888 BLAKE2B 63e8b069cfddfed6a2ce8bcb7816b51b1881ca7a1a3e552f2eec5ecd1deae80720b0acfb711ab17067efdc9d0e4aea696e9f4eee6b374071bfc60e7bb79cc58a SHA512 b096501ea37e62f596f16b46b4022ad7979f359b10849d4c5fa17731a6c3ec34e0890374de175a8aa7539ae677777142ccf5dfae39a74696efcdbcc00e89bccf
 DIST scons-3.1.2.tar.gz 668298 BLAKE2B 14251e2bab425dfc31d1d6d9325a67725dae42576d2a5c204f0ff7948aa2da5aadd3fdf03bbbccd615757520fedee5e18ca2ba13aaf07a4ddfec330db4221203 SHA512 bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33
 DIST scons-4.0.1-user.html 1415152 BLAKE2B 1a94b2ef5e076d883f2960825f055c7cc39cfd1848be797a9519bf94834cd4174d3da3274ef77f64106c1cc182c3f8cef363e3982f5c227d3a6dcbeadbc847c2 SHA512 f1165836ad80c90caa4d936ffc86c0ed20ea4c5e7854c36fee3a2c575b1c05c731d4ece9554e43292e6da30176ad9f31f31cf12f84264307c1494f79b06f43c7
 DIST scons-4.0.1-user.pdf 2468804 BLAKE2B f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314 SHA512 0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d
 DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560a38969b8e8ad829781b960b438458bfcd7971333da87560c957675b2a4f8675e757fb0a4268cc4ecf72bb60d45f SHA512 f23c5dfd3c236e9f9f85b986ca64a36dbd85e9f3383cb3577e082a7dea4b83283020fbf064c2d919ab116195c6708fc11f906fcf3b0bc0533a4bc49a4f7371c6
 DIST scons-4.0.1.tar.gz 2874481 BLAKE2B 98377e62ae31d32758a93c4e04c578b88ea541cc292af63c6ca43e2948745e416ee6d757d98129ee30d0e0bbab90664889441a5bb86d4c9dfc649ca1dbef7536 SHA512 400b11323d48f04395b519dfafb6fce15a6dea92013f599dc4895b112629c0a06c7d2806755c74047d001d60087b94f39a118f512b7ee8de6214a4ffc7310468
-EBUILD scons-3.1.1.ebuild 2629 BLAKE2B 9b6dd42a2a625ae6110b2ead2754e0c5d1d69128c32058913d102d545c820ef9e2ca25e2cdedc69a01a777633c32fd7aa3ec598e4d8760ec349ecb1ce9b1bae7 SHA512 309b84180a14cf7233f4879832489da56dad5236f30f9c402037b9dd2737b3983fda32c233e966ce755a75c3db6392f44a385dedeee8d21c3880f9cfb364cd57
-EBUILD scons-3.1.2.ebuild 2753 BLAKE2B 5f7115fbf7d3947bd90d1d147688110e13965bbcdcfd869eb7ac7222d942bd3fefc21f90d77bc0c9bfca58afc4ff593267635d8abed69cb0ad3fcc33ee62bd36 SHA512 2e479ac016b7dbb7f7a80652121f228621e9f85780cb0a3895b0a9b610fbcd376b7482897a993abe03ebddd176a66a83dbc2d5ad4e46a7b71f83e1c9cff39165
-EBUILD scons-4.0.1.ebuild 2878 BLAKE2B 857c90f6de1a879042a221e8a357648e3e19e580c77c1edaeac690cc2437ad0c956b94c860f51d368a0f69164e3d32c0d3ae135da1f03b3369b32d6a474b5507 SHA512 c426aa0fb9ed89c968d411d67045c94684110c1aa1e677ee656e5c780119c1c0fd07041cc8c6692ddbb660bf4963842cbb117e411ffebb88a06b25440544e50b
+EBUILD scons-3.1.1.ebuild 1575 BLAKE2B 476c2d08b17df1d25e743579ad082c8d4c835d84e0b07baf25a354e2409a0b534518ad878cf2b1b7715ce00c824b3c49c7a4af31037c51efee04ffca20e732f6 SHA512 b33df71f92de48d1c03f704c81de2b508402f7df08c82559589366064a19e8b43d02573ffc3a536858d25a067f4351a32a0d4c2bd9e86688f1ae0fb9841f4172
+EBUILD scons-3.1.2.ebuild 1699 BLAKE2B 609ab947808f60bb42a76346877c01a46fb84702d097ec8608b48d31b5cf54d3c037d8d46ac0fbce477de3a45ed1add0ff75cef6469bf178cb3b5d46567ea6ea SHA512 1a6e8df5ea9deb5404bd9bfb9e809868f15b468e51167b50c282f85eb6a6a5bd18d7129bde14f0fc80b357a408e153fbcda0419c1b5e369d737169e7da4a865b
+EBUILD scons-4.0.1.ebuild 2876 BLAKE2B b08d0676bd26530a5e0f1dd3f0774d2148cc3d990c74080d962bbf59b5241c9bb089a37750f78220b861200a34bcce11aa168f773bb1d606b5be9e298f92af91 SHA512 d633d072a046b9423abba1e7a643497d7ee53c5a41d1827bd4cd904f2d0a9fb4b01e50c0cf7c47eba233bd53c3a16789bc974bbc8a907758bff9a37da739e9bb
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
index dc4b2fd819f3..822bd62dd620 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -13,21 +13,13 @@ 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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
+IUSE="doc"
+RESTRICT="test"
 
 S=${WORKDIR}/${P}/src
 
@@ -39,14 +31,7 @@ PATCHES=(
 )
 
 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"
-	else
-		mkdir -p "${P}"/src || die
-	fi
-
+	mkdir -p "${P}"/src || die
 	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
 }
 
@@ -61,22 +46,6 @@ src_prepare() {
 		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
 }
 
-python_test() {
-	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
-	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
-	# unset some env variables to pass appropriate tests
-	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -a --passed \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib"
-
-	# runtest.py script returns "0" if all tests are passed
-	# and returns "2" if there are any tests with "no result"
-	# (i.e. in case if some tools are not installed or it's Windows specific tests)
-	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
-}
-
 python_install_all() {
 	local DOCS=( {CHANGES,README,RELEASE}.txt )
 	distutils-r1_python_install_all
diff --git a/dev-util/scons/scons-3.1.2.ebuild b/dev-util/scons/scons-3.1.2.ebuild
index ef2605a2b114..8cd85f931c7d 100644
--- a/dev-util/scons/scons-3.1.2.ebuild
+++ b/dev-util/scons/scons-3.1.2.ebuild
@@ -17,21 +17,13 @@ SRC_URI="
 	doc? (
 		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
 		https://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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
+IUSE="doc"
+RESTRICT="test"
 
 S=${WORKDIR}/${P}/src
 
@@ -43,14 +35,7 @@ PATCHES=(
 )
 
 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"
-	else
-		mkdir -p "${P}"/src || die
-	fi
-
+	mkdir -p "${P}"/src || die
 	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
 }
 
@@ -65,22 +50,6 @@ src_prepare() {
 		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
 }
 
-python_test() {
-	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
-	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
-	# unset some env variables to pass appropriate tests
-	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -a --passed \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib"
-
-	# runtest.py script returns "0" if all tests are passed
-	# and returns "2" if there are any tests with "no result"
-	# (i.e. in case if some tools are not installed or it's Windows specific tests)
-	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
-}
-
 python_install_all() {
 	local DOCS=( {CHANGES,README,RELEASE}.txt )
 	distutils-r1_python_install_all
diff --git a/dev-util/scons/scons-4.0.1.ebuild b/dev-util/scons/scons-4.0.1.ebuild
index eaf9eb29e710..98836168923b 100644
--- a/dev-util/scons/scons-4.0.1.ebuild
+++ b/dev-util/scons/scons-4.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-cygwin ~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 sparc x86 ~x64-cygwin ~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/statifier/Manifest b/dev-util/statifier/Manifest
index 639cbf249ba7..fa1088e23c3d 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -2,6 +2,5 @@ AUX statifier-1.7.4-clang.patch 344 BLAKE2B 6e5d2f48fa20c34c999cf898f943e9e61133
 AUX statifier-1.7.4-fix-build-system.patch 2104 BLAKE2B 019248feff682a75b90d1aca7eea425aded1b0f01e8dff4bd24410a474ef1350ed8215803915cb52df53866f6dc996428742d0a9187f55bbff17ce30894dd6b3 SHA512 a9bf5adf1206bbca84084df0680785e1f31902fb7ce4d455593ee35e0195ef9546de641d2f5372843afb7c8584fb04b1b13ee7973813ee8561a2282f2162cc87
 AUX statifier-1.7.4-musl.patch 673 BLAKE2B 1b1d46c44ae7675dd757219a40d0f255455308c27a0515c32ebdc629cbb6e1777e4a7d673c51cba42b7b82b4608ed1e69ab3d2aa7bda93b4171c0e9670e608db SHA512 285ed4d06080188b45a10c3e5da83c7e28e198cbe2f20dc84befa4d4b83850278c4f8e444898f6c419b8e13e41140875eb1e7960d9633a03b396a716c53bd03e
 DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
-EBUILD statifier-1.7.4-r1.ebuild 1229 BLAKE2B 822088381acfb84841cf8d5c7cd7d57096ba2f4aaf639d2fd03f55f9a861344e544f6ac3e9286404a4ce2de64413f8d0f8a5ea6e878bb2cdd63df4e58bacdb50 SHA512 02b14177f3c298dcaddf76b92213467505c19de30df517500702cceb315de6e8dcbf86d2466e06577bd867b10762e75c7d0a96ffdbfba5ace5b1ecb7b7ee81c7
-EBUILD statifier-1.7.4.ebuild 1159 BLAKE2B fced9ac949c3f45db5a114c082724d94ad524c1272f9f0ec16b34f116a9d839fa656c6e41efcffed0d8af43484931ccd12d2ec15ff58d4ccea7372950f359b35 SHA512 17b53d41ffa6dc4d7ee6706b5b0f93ad713db6d88b51292a5d39800b3f68a8e3ab308c43b8e85a4edd9dc37cd1c74114a859ea7c70ed37603dd27024d4157280
+EBUILD statifier-1.7.4-r1.ebuild 1228 BLAKE2B bed2a64bbe3d79191a6073cbe2d8ecb8ae5163807ecdaf4426186608b593a4a227905cbdce76bef5f1419cd81d58b129ba3e3a3beb2cbc37cc58feee95e11ed5 SHA512 054f3b3821e844c271e083d5cf33cc21979684f66987ea049da7e1591c49da8cf002a55fb887baa77e56e715ab031f7c305c4c9d9cc76482d38b90fcd2c06a85
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/dev-util/statifier/statifier-1.7.4-r1.ebuild b/dev-util/statifier/statifier-1.7.4-r1.ebuild
index 64a5975d6e72..553d4ee5f440 100644
--- a/dev-util/statifier/statifier-1.7.4-r1.ebuild
+++ b/dev-util/statifier/statifier-1.7.4-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Statifier is a tool for creating portable, self-containing Linux ex
 HOMEPAGE="http://statifier.sourceforge.net"
 SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz"
 
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/dev-util/statifier/statifier-1.7.4.ebuild b/dev-util/statifier/statifier-1.7.4.ebuild
deleted file mode 100644
index 7ade05bbc42a..000000000000
--- a/dev-util/statifier/statifier-1.7.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Statifier is a tool for creating portable, self-containing Linux executables"
-HOMEPAGE="http://statifier.sourceforge.net"
-SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND="
-	app-shells/bash
-	sys-apps/coreutils
-	virtual/awk
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.4-clang.patch
-	"${FILESDIR}"/${PN}-1.7.4-fix-build-system.patch
-	"${FILESDIR}"/${PN}-1.7.4-musl.patch
-)
-
-src_prepare() {
-	default
-
-	# Don't compile 32-bit on amd64 no-multilib profile
-	if ! use abi_x86_32; then
-		sed -i -e 's/ELF32 .*/ELF32 := no/g' configs/config.x86_64 || die
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	# Fix permissions, as configure is not marked executable
-	chmod +x configure || die
-	econf
-}
-
-src_compile() {
-	# Package complains with MAKEOPTS > -j1
-	emake -j1
-}
-
-src_install() {
-	# Package complains with MAKEOPTS > -j1
-	emake -j1 DESTDIR="${D}" install
-
-	# Install docs
-	einstalldocs
-}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index b717ca7d58cb..e7facf5c9417 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,12 +1,10 @@
 AUX strace-5.4-fix-LTO-CFLAGS-handling.patch 843 BLAKE2B 2cd4c87e972b2bfe6d5755141a64ffbca386047ea68d37c8871bc37e7475f8eb3ce978ead5082ecb3099f599e12914f087773733a7440875a084a5b452b1f92c SHA512 9606c3334d3e01aecccafaa396b5a7440a652872c590ced3c1a88ca6ef083c176a420dfb2154396f94f65b826d6fe2f20556620f364c17d01d0069d630dc5cfe
 AUX strace-5.5-static.patch 5187 BLAKE2B 9015d649d644dd4e5fe6b89d7fd4b1d759b7021627384f575e6668fa24841438c49e3acd8d09f0302374fc457001df89a9f384193ddde1da105a5b95167f944a SHA512 a1adbbcc7bc87f37b1071b888f1b2c830113cfd40c341316d7e96e72e142781f41d1b8823277ea0c61079e557460e9a43d1795e7c8cc97cbca9c6aec8d08f682
-DIST strace-5.3.tar.xz 1572708 BLAKE2B 808bc7afc6c70137c44d0f5a47706953bc7c0214348cda2ae45e10876bd6e118c103f15abffdfe0d7fdb01d8d3de163b9c7de3970d9cd07c88ceca11a99dc7f9 SHA512 02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a
 DIST strace-5.4.tar.xz 1599396 BLAKE2B 0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970 SHA512 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7
-DIST strace-5.7.tar.xz 1805044 BLAKE2B 487a1481357642be21c83cf387710bc75f17bd0af87ff07f914faa99120a619f33d2caba034d50dbdbc03aa3f758dae86d04fc6c25b3f6254ac3f0578a19884a SHA512 aef481238196204495cf9507cd48ce30af799f79904478e6be57a267311a999c868f18540cc1e025f5e486730cfe9ccb256f528f6f796d204a7347ebdf2042f1
 DIST strace-5.8.tar.xz 1813640 BLAKE2B 315edf404fa57890dcff512f9fd76818e8e7d5ad06bc297b68561ec7073297c2e5aaf2c3d9a102382f5833bedacb2a54540068a9f9438094c9180f45b5dc4715 SHA512 633c3daa2dd3d273839cbb8ebd7f6512a38b39af0d0d89f4676c2067e199f346615406d85e3e13f9e4da8dbeb62095185895ffae986eb99b64775a4287e38f4c
-EBUILD strace-5.3.ebuild 2323 BLAKE2B 02812e696ba9c1f24bb8ea9b7cb21ce1ec6afc9bd5dedb2d70c3bc9b88c4523745333070be4d2a0c9297533a636964efd02b1d1ae33ed025251d18074081d114 SHA512 8c2b4b7e6a9119d226117f72209ec360365615670092370faa22fa605f0afd583749f008146eb59afafefaaab9f634b512c0893e0d10b896e7bd6221e51a7f58
+DIST strace-5.9.tar.xz 1847036 BLAKE2B 92d6b5e1a7821086b4e0e535d5db7849158e58ac0604fb9bb667e106b72b1ce17dfadd3960efcf553d7c7dec4622db36833aa5cdd4bc924f8b54ec6168ed82dd SHA512 f28d5dcceccb44557b39ed6f295f3250662804dc3ad79959bfadffcecc9b736e532c7c90dc89ebf9d07eb3e02a5ace231605851148ca09d41c8c60dc1ff68206
 EBUILD strace-5.4.ebuild 2524 BLAKE2B 3a21233c29527856cbe1723407ddac3525b57efe6fa3bf379b6ba4d902d5dfe607049a5a9264f91f947ab2678cd36cebc4629eb49812658bb895583840fa5fdd SHA512 fae99e9ba572c1c6445ba03ec257759165d5c3be57d6de5269f1e886e6c9fb50361995956671772bfae26ec4d54785e9f40ac7dad25a5d4b2c33f8c3e2eb94b4
-EBUILD strace-5.7.ebuild 2355 BLAKE2B 7a3c90be9f839968e4b7355c80cfec5d9aacfe738af9bd8e8e128a64f7f54816850173e497d28e14087ba49e3c9c80e7b0dc2bc6f9f39aeee279f601bb5e0757 SHA512 e5ddb7a75e527523c8d9e39571fb1ba68dc38aec09536bc43cf1225bbd3cd521a32c517baa5c0c16b6874407fcf31dd8e505dfd4cb61223025df6d2b5fa1e46d
 EBUILD strace-5.8.ebuild 2346 BLAKE2B 92f60380f83865c45f25a76347a47baee0fa23e240dd7d7879ac31a47a8a6e8614b37d9c8ef4068463527c1c0f31e5f05091febd9082515191faa30ffa1cff45 SHA512 9793e5ef0ad81c97b7bf7e29d3233a1504adce9dd1ace85cbb5b7b04e6b1e9f38b88d8b28c9d36dbeee6dd644615a6068ef45021355b9b587b0b00503b60b929
+EBUILD strace-5.9.ebuild 2354 BLAKE2B 65b3aaf00c35f709158d0f3de01f7bcc0b1a8daaab9e614bb9d381d0b4ae26794cd6fe8e502e1d8f953a9271e8fe0bd460b84f8ca84266192635a37d54c3b653 SHA512 879a423a1786a2147484d817a89060960e1e4796f481902f2001b872a0942a84e7d78ad87869d35637bc9cd2b3ad61821067a32def5a8dbb196b3a638676f3c2
 EBUILD strace-9999.ebuild 2354 BLAKE2B 65b3aaf00c35f709158d0f3de01f7bcc0b1a8daaab9e614bb9d381d0b4ae26794cd6fe8e502e1d8f953a9271e8fe0bd460b84f8ca84266192635a37d54c3b653 SHA512 879a423a1786a2147484d817a89060960e1e4796f481902f2001b872a0942a84e7d78ad87869d35637bc9cd2b3ad61821067a32def5a8dbb196b3a638676f3c2
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/strace-5.3.ebuild b/dev-util/strace/strace-5.3.ebuild
deleted file mode 100644
index 34f626556435..000000000000
--- a/dev-util/strace/strace-5.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strace/strace.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://strace.io/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind elfutils"
-
-REQUIRED_USE="?? ( unwind elfutils )"
-
-LIB_DEPEND="
-	unwind? ( sys-libs/libunwind[static-libs(+)] )
-	elfutils? ( dev-libs/elfutils[static-libs(+)] )
-"
-# strace only uses the header from libaio to decode structs
-DEPEND="
-	static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )
-"
-
-src_prepare() {
-	default
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		sed /autoreconf/d -i bootstrap || die
-		./bootstrap || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	filter-lfs-flags # configure handles this sanely
-	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
-	use static && append-ldflags -static -pthread
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	# Don't require mpers support on non-multilib systems. #649560
-	local myeconfargs=(
-		--enable-mpers=check
-		$(use_with unwind libunwind)
-		$(use_with elfutils libdw)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} ; then
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
-		return 0
-	fi
-
-	default
-}
-
-src_install() {
-	default
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/strace-graph || die
-	fi
-	dodoc CREDITS
-}
diff --git a/dev-util/strace/strace-5.7.ebuild b/dev-util/strace/strace-5.7.ebuild
deleted file mode 100644
index 5d7d3277504a..000000000000
--- a/dev-util/strace/strace-5.7.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strace/strace.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://strace.io/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind elfutils"
-
-REQUIRED_USE="?? ( unwind elfutils )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-LIB_DEPEND="
-	unwind? ( sys-libs/libunwind[static-libs(+)] )
-	elfutils? ( dev-libs/elfutils[static-libs(+)] )
-"
-# strace only uses the header from libaio to decode structs
-DEPEND="
-	static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )
-"
-
-PATCHES=(
-	"${FILESDIR}/strace-5.5-static.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		sed /autoreconf/d -i bootstrap || die
-		./bootstrap || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	filter-lfs-flags # configure handles this sanely
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	# Don't require mpers support on non-multilib systems. #649560
-	local myeconfargs=(
-		--disable-gcc-Werror
-		--enable-mpers=check
-		$(use_enable static)
-		$(use_with unwind libunwind)
-		$(use_with elfutils libdw)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} ; then
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
-		return 0
-	fi
-
-	default
-}
-
-src_install() {
-	default
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/strace-graph || die
-	fi
-	dodoc CREDITS
-}
diff --git a/dev-util/strace/strace-5.9.ebuild b/dev-util/strace/strace-5.9.ebuild
new file mode 100644
index 000000000000..c08dbf18c0a5
--- /dev/null
+++ b/dev-util/strace/strace-5.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl static unwind elfutils"
+
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.5-static.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	# Stub out the -k test since it's known to be flaky. #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	# Don't require mpers support on non-multilib systems. #649560
+	local myeconfargs=(
+		--disable-gcc-Werror
+		--enable-mpers=check
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/strace-graph || die
+	fi
+	dodoc CREDITS
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index bc3b33408e45..2be2d94b4c3d 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index cf35cb13f4e7..821581371f16 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -2,5 +2,5 @@ AUX fossil-2.10-check-lib64-for-tcl.patch 445 BLAKE2B a8282820edafb15ae6542b9f13
 DIST fossil-src-2.11.1.tar.gz 5850806 BLAKE2B 640807055100888d6bfea13539efb02190f07db5edcec58025952e464d50d4bd13992e5e8f5e515b01f52eaa3409d7a536bd4b48aecb5fdcf6214e47dc4963ed SHA512 055306c0d5c2f9b536ace6385ed79b5ced56d77dfc8e08b38f51075e97dfebfffca10aa7e17d2b22b9945c71b12eb131d49f3651e2890820dc9cb04719cd0265
 DIST fossil-src-2.12.1.tar.gz 6011181 BLAKE2B f9437c4fb20314706bbbec70efbb6a53e2ac7760986baf88ea72505f03877a5d1069d0d2828aa2bfefac96c1358e4c8f824405d61fd24d490442fa8b768711e9 SHA512 08b7fef5a3071e968dedbc645aebf2e873ecf80049b5986d38f851a407b2b8b0c854cfcdfa5ec80eac5bc1b158c5fac3bb4b263d1adb8be470529e67dc6e8cee
 EBUILD fossil-2.11.1.ebuild 1803 BLAKE2B b54945558e0ea1c47fb53bba1791c336502b4313944f1e2b136233090de7fff386bbb34fd767fd4ebbae9dd8e1e7a9f82184772f06fb57d1a4f3fd8c26ce7c6e SHA512 904b64bcd8c4d6ea15133ada565655751388fefd455e795725f883707fb41e6d9db4237307c4d725b10a78a289e997c40dcca5970fa53219eddfb7f8629c7fdc
-EBUILD fossil-2.12.1.ebuild 1775 BLAKE2B 412e7e015e7dc691fd42f884c2c5df81e57258f6c45523e7de8395de568c33342ad367340beb234d7605c4bff7f7611ed1a438ddd590dd5ad29398c896d3706f SHA512 2217625c28aabb78244c01a2a14d1ea27b40fd5e4eb611eea1b87f9de5bbb3b316fe367f7d894ca6b31e264811a9f6a8eb705cacaba27c724ed006bd0e7802eb
+EBUILD fossil-2.12.1.ebuild 1772 BLAKE2B f8e40756b2d16d777dc5ab01d929afd2971155b6b1a2b91ada335251603173c60ecac34819e201dca4c32176f18b706ad4794cce1f3cfeddf4380726a6b4345d SHA512 b9d9b337f3a4b83c1e256ff2d295352b16e2d2df1f7bbceba788ff259ab2711329eabba46df65384df986e9696dce6fb663d2487cdc4547fd257a2c14c3867e9
 MISC metadata.xml 1165 BLAKE2B c370f1370c7250945135e56514558acd016742f6d8a9c51e98b9533e094b47dbdc07808abbb1341ad1e987dac6f5f13d2e2f0fef45587935accf082c15227330 SHA512 6ef05c3722bb110e403294b002c253eb1ae4f29a4f5306dccee3abd52ce61c8ae04ed2255f551298d94b8b99d96c799f05bd6df7a9d4e9af08e4c10ce306d0ab
diff --git a/dev-vcs/fossil/fossil-2.12.1.ebuild b/dev-vcs/fossil/fossil-2.12.1.ebuild
index b553b813fc20..1073f6c6472c 100644
--- a/dev-vcs/fossil/fossil-2.12.1.ebuild
+++ b/dev-vcs/fossil/fossil-2.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ppc ppc64 x86"
 IUSE="debug fusefs json -miniz system-sqlite +ssl static tcl tcl-stubs
 	  tcl-private-stubs th1-docs th1-hooks"
 
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index e36564061953..64a3a7ce1282 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -1,34 +1,5 @@
 DIST gitolite-gentoo-2.3.1.tar.bz2 198849 BLAKE2B 88268e4588003cb1b8b4e340fd858a2be65b8156f3ff5033cf7f8c988d8373c4dc7c41b0d589126e143e8eaa19071fda87532f9052c06f7952f5f3ef549e486a SHA512 994ee759d87659eb4f4bfbe6618d1bd74e83df2e6c8d710ca1c929d86e05b1152639bf5c99b906f7d20f9585163f872f04d9710e29b1d73ada998595553d294e
-DIST gitolite-gentoo-2.3.3.tar.bz2 199370 BLAKE2B c42e82e36f593046c35e7828de1d1ad99bf26564ec248eb24ab7bf7f83ffc7095d893e7a6813e609368221b04d5e38881d723cd8fe6286322c11b39bb4c64158 SHA512 f9720effa816400544bf5526d896b9db734828c46356d0188e2ddb8fa8f175efb0f60b30c9e9c80a0624f6cb6dc5c5a301d8dfa35f13ad08fcd0538a0b8f77c3
-DIST gitolite-gentoo-3.5.3.1.tar.bz2 127391 BLAKE2B f9fb28cbaca4c1e13100205fef2b6cdf84cebc61ae9726048e869eca847bc2c365cfc75fd6c2a82a2df01eee843db1719cd0da9b7dab27496b60079dbdfb2ca6 SHA512 f36a270f651b2b8d4ae02fd7b3841a599b7c66d36a6f92df8974897fdec863b4c09064c384ede9309150a4a487186ba3c3079cd0037d5fd39852b452115933bb
-DIST gitolite-gentoo-3.6.1.tar.bz2 140554 BLAKE2B aa811f4922dc530f9bfd78ebfa4d48473a484ca264db0120ac3cdf722bce009d615e257c4638e9c75d29116cb6882ca426fe07d040df3a60423824289a4d711a SHA512 563f2753f4d04d8a2c5d323fbf3d15f9f12975d4aa3ae3781011b521be7ca2b2ac755f9c4247f86ee303aa7f8c9795f3fdff4504a347b9b9cd08525666bb0187
-DIST gitolite-gentoo-3.6.2.1.tar.bz2 143357 BLAKE2B f6c2440116c7a50b780e8cb9e1ba0f799fee2664c3de6bd5960beff505edd150dbe1c37e53d957dfceba450d1335ed398108f17934c2faeec3777fb3f409c6ba SHA512 53ae6549a819437d2481249707156eb0f68cccd289bbb40affedd1f7cdda620b974f8e7ee6853c196728cdccf0eb9f8f340a132538dcbf0b653fb69e08d40b9d
-DIST gitolite-gentoo-3.6.2.2.tar.bz2 143601 BLAKE2B 7033ccf65cd7fbf70dad031d838b6917f82cd273828758222877985176e91f2eea82e08a957c740ba72a987e2b703c783c0e75cf3570da5fe6bf56e2b0f867d1 SHA512 431df7002d146d321199ff5ae324177f5b14b1a0ae8e87288ff15a8670eec9e55637d8a6d28d4eac2ff2a54f3f38e3aa700257c5321c73133fcb09037fb384f8
-DIST gitolite-gentoo-3.6.2.3.tar.bz2 143658 BLAKE2B c4de16f291b2ce343eca6056a774fd234136f847e3e2bf59842df77b4a2a8190de27e0f5b786ec248e219fa42fd991470e09752aa1dc63a79a38dea891b16482 SHA512 9b8ddaad043d9c7cdbcb027fcbfd36cd09ce2cfaf0b102deee037977461d54942fd7ac019373876f9f4ab04250f78c8565c73494b7b9fc0e42e140d878cc303f
-DIST gitolite-gentoo-3.6.2.4.tar.bz2 143564 BLAKE2B 5c998a523d875c79e80ed6f03cbb885573bdcce3da17e36b683110d2b05f307166c7bf11cba51d0b13db23999eb82e730e044cf0839c594d17eee8ddba87e0b3 SHA512 ec5e62822687b1293348107df003e3c3c4a3aad9b4f461e09410aef993bb464a176daee81223ae952159572db7158267fd90b90cbc877c4be2a9fdc2ecc87fb7
-DIST gitolite-gentoo-3.6.3.2.tar.bz2 148655 BLAKE2B b2f1163f34fa25de908bf702bfea8f1dcc97fc1fc8c306756d32b6331d67fe50b162da34dec1e8af08cd24714a8318c1a5ec69e008b7aba2f20976cfbf87eb75 SHA512 deed5379316e5fc3d33b7131eb64f7850004b34e034dd37417796dafbc9c038d92f4002f8d9c2066a0859bb1052669a378e8a66387f27eed10c6ca5a73e04623
-DIST gitolite-gentoo-3.6.3.tar.bz2 147531 BLAKE2B 9a9018bc54922800aa6fe68d40ed29a5add3987ddf18f1d2f9ebe10a0ab308b8e0a9c13a7d44e6ab268116f99fb082c49a9fa8a597b86d6da34cc4d6e1a70442 SHA512 4c4f40cf608ea78f76c39701880e53e2f6486fc37478818f5b4f0946fcd9ffe30ef122463b7b6b48a0a9931271fe7ef7aecf6bf23bbce45f36cd1e217e5ec45a
-DIST gitolite-gentoo-3.6.4.1.tar.bz2 151771 BLAKE2B 70d88a20954e662fcd021c9a8625db2124bbad1b61a1e91f82e60b69b79501e4f6ec235d62fbd7b6e215dcd802d3e33109794e6a5f98b74de269e54d9eca136f SHA512 5eec313199f9d757be2c357ae07d8e3a8f7b82dd684a40024a33ec3f3d8806fd0cac7f57fcc740be888285343d965fa2497fccb971d24b0082c772cf1cb1655f
-DIST gitolite-gentoo-3.6.4.tar.bz2 151879 BLAKE2B 0b6224f8156c6a82b792a505eb66f56622991606f15ca9d8da03763cd9771c7a78763e1da47f8ef8b4d9fa4ac80e53fd9fdb07445c760e405520d13068c95c8a SHA512 dcb926f747ce43942c5678390bf0649061d4f779d416fc09980ab8a9b169a9604596f6b7800432636f43707c83aac61472df26cfb1c66cc85d1ff8eaa4db2c19
-DIST gitolite-gentoo-3.6.5.tar.bz2 153234 BLAKE2B cb92a2008f80312288b925b9a22c45593203021f47d8f057bdf2597c09d515bc66b5d4947bcc5c5d7e88582c847049d6363139369571fa32f673a107391564d7 SHA512 c32f91dcb8ff790c2c59f0cb9ce1f906b17d5012922e0efdb2da1f7b1986f9f82b85b6e232f6b6e65e4d3daecb8f247a408b664b44624a64bf876b416a7b3ca4
 DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d SHA512 76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb
-DIST gitolite-gentoo-3.6.6.tar.bz2 155267 BLAKE2B 28f09d01a550da9b56e7d2df0ee16c855dcfc66e6a7639734eee98d534d353f1ed8c3547e4a5f5d7b7cf2160b1be376e0e6c7d26b6a74635cf47626f6af3feef SHA512 cd3a34e714072b1b8792b98c023dfa141dff03cc2e225e0a006fafd3a112d98bf031a826ccfb667624b2455f1253def6c487ffba1134ad6cc8c981987437a9d6
 EBUILD gitolite-gentoo-2.3.1-r1.ebuild 1830 BLAKE2B ef997b45ae24beec4360c63e3e8976fac1db57487cfa5e514b3df8ebea8d3864eda073b1e0191d9348aa48ceb754c89c03a56f89dfc0c582a7d4184ab027b776 SHA512 730b258a5d5f268bfc3158bec9dc85fb5758073b9c55976f3a45e127689da86ec5095f078f2904aca543f35161e4de4ef1c66ce0e1a7c710dbe736acaebfd18b
-EBUILD gitolite-gentoo-2.3.3-r1.ebuild 1832 BLAKE2B 53a60a8f89df65617c61d9146fb77295b5399158c17398e51379c1df9fcc76122b5f58367c36bb5c521bc0386ff9396e92cfc5b34bd3d95978bc2ed7c09e14a3 SHA512 cdc5676371cbb47189450835b4172e602ffc02a92e5a14f3336aaadcfeb29cb140fe1f89c1e34759fe47cd0dc0f4fba9f5def9762eee4e536870cf188b22f8a3
-EBUILD gitolite-gentoo-3.5.3.1.ebuild 2277 BLAKE2B 824e2f30de95eb40ee055ab8fa5a34959050b311e75134c638281c5e120f242e8615ff92db3a83a341f41bcf883f747a2f87fd8652bf949d11de9b29ab6ea2b3 SHA512 dfbb656030a91dcba1b9f6dba30f6b48daafef1484bc1cd5ec56183aeeaca01c2fb8579ba83be2366d01c28fdfa5dabf7f180696c781a7dc0247bf018ddc7484
-EBUILD gitolite-gentoo-3.6.1-r1.ebuild 2734 BLAKE2B fbcafc9d0fc1588fabaf0a0e595e8e9027ced364aff9e1f0b9b16cdceae745888d79454e8687844887fa65318355252327e5050410fb7c51fec17830b2896000 SHA512 d0563316516a999a09b5daa1bc0ab2c416dd52bc599f7b5eb00a5e00bb3bdd17c5fe02dd2594a5153dffd8955e10ef642e99046121ec254712992bbd6ae9c7d4
-EBUILD gitolite-gentoo-3.6.1.ebuild 2277 BLAKE2B 824e2f30de95eb40ee055ab8fa5a34959050b311e75134c638281c5e120f242e8615ff92db3a83a341f41bcf883f747a2f87fd8652bf949d11de9b29ab6ea2b3 SHA512 dfbb656030a91dcba1b9f6dba30f6b48daafef1484bc1cd5ec56183aeeaca01c2fb8579ba83be2366d01c28fdfa5dabf7f180696c781a7dc0247bf018ddc7484
-EBUILD gitolite-gentoo-3.6.2.1.ebuild 2734 BLAKE2B fbcafc9d0fc1588fabaf0a0e595e8e9027ced364aff9e1f0b9b16cdceae745888d79454e8687844887fa65318355252327e5050410fb7c51fec17830b2896000 SHA512 d0563316516a999a09b5daa1bc0ab2c416dd52bc599f7b5eb00a5e00bb3bdd17c5fe02dd2594a5153dffd8955e10ef642e99046121ec254712992bbd6ae9c7d4
-EBUILD gitolite-gentoo-3.6.2.2.ebuild 2734 BLAKE2B fbcafc9d0fc1588fabaf0a0e595e8e9027ced364aff9e1f0b9b16cdceae745888d79454e8687844887fa65318355252327e5050410fb7c51fec17830b2896000 SHA512 d0563316516a999a09b5daa1bc0ab2c416dd52bc599f7b5eb00a5e00bb3bdd17c5fe02dd2594a5153dffd8955e10ef642e99046121ec254712992bbd6ae9c7d4
-EBUILD gitolite-gentoo-3.6.2.3.ebuild 2741 BLAKE2B a695156050032526591a273374755a6fb39a7ecac72ebeff0d6e29e35e74d5b3b8406c4d36d9b5899a4457360d02a36540fc9449e00e43e5687e07739350e978 SHA512 90e91cea8309a2058ce508ce521d65e2c4a5f9026253de7410d35f9430494a4660bc380ced3f8bf0d07af9d2efd1c7e65d48018dab37c116ebe0423931b3f000
-EBUILD gitolite-gentoo-3.6.2.4.ebuild 2741 BLAKE2B a695156050032526591a273374755a6fb39a7ecac72ebeff0d6e29e35e74d5b3b8406c4d36d9b5899a4457360d02a36540fc9449e00e43e5687e07739350e978 SHA512 90e91cea8309a2058ce508ce521d65e2c4a5f9026253de7410d35f9430494a4660bc380ced3f8bf0d07af9d2efd1c7e65d48018dab37c116ebe0423931b3f000
-EBUILD gitolite-gentoo-3.6.3.2.ebuild 2790 BLAKE2B 8ca32a75e449f42b5856e5a49eb0469dcea0247c3988167bd0fe1a1278d9c395c1a6679573d9aaa2a34780ff8a59a85baba33a3b38c782a2fcbbe2ca289f74b4 SHA512 c30568b53dfaece456c58603a0c63fc474819c66da2bb12ebe3c465edd67ce3dd38a9cb5667655b90fcb46af425a523098962c7d8f1f4dc938048f192f9001e0
-EBUILD gitolite-gentoo-3.6.3.ebuild 2741 BLAKE2B a695156050032526591a273374755a6fb39a7ecac72ebeff0d6e29e35e74d5b3b8406c4d36d9b5899a4457360d02a36540fc9449e00e43e5687e07739350e978 SHA512 90e91cea8309a2058ce508ce521d65e2c4a5f9026253de7410d35f9430494a4660bc380ced3f8bf0d07af9d2efd1c7e65d48018dab37c116ebe0423931b3f000
-EBUILD gitolite-gentoo-3.6.4.1-r1.ebuild 2796 BLAKE2B e7fe9ffb978de8be24b4969924853bd04bd4482584f9780af9a98633c8b6723f0220f8f55c98335f3243d79d7afe5342be0ce972781027d1a0d36b56fdf2cc6e SHA512 3bd502a5cb7279968993e0070065b27e707c53e065ca143db5bb38e6f2a6d3b6a6282567a80522aa1a15509150218185bd1de5a2be40176acef03d30b395909c
-EBUILD gitolite-gentoo-3.6.4.1.ebuild 2790 BLAKE2B 8ca32a75e449f42b5856e5a49eb0469dcea0247c3988167bd0fe1a1278d9c395c1a6679573d9aaa2a34780ff8a59a85baba33a3b38c782a2fcbbe2ca289f74b4 SHA512 c30568b53dfaece456c58603a0c63fc474819c66da2bb12ebe3c465edd67ce3dd38a9cb5667655b90fcb46af425a523098962c7d8f1f4dc938048f192f9001e0
-EBUILD gitolite-gentoo-3.6.4.ebuild 2790 BLAKE2B 8ca32a75e449f42b5856e5a49eb0469dcea0247c3988167bd0fe1a1278d9c395c1a6679573d9aaa2a34780ff8a59a85baba33a3b38c782a2fcbbe2ca289f74b4 SHA512 c30568b53dfaece456c58603a0c63fc474819c66da2bb12ebe3c465edd67ce3dd38a9cb5667655b90fcb46af425a523098962c7d8f1f4dc938048f192f9001e0
-EBUILD gitolite-gentoo-3.6.5.ebuild 2796 BLAKE2B e7fe9ffb978de8be24b4969924853bd04bd4482584f9780af9a98633c8b6723f0220f8f55c98335f3243d79d7afe5342be0ce972781027d1a0d36b56fdf2cc6e SHA512 3bd502a5cb7279968993e0070065b27e707c53e065ca143db5bb38e6f2a6d3b6a6282567a80522aa1a15509150218185bd1de5a2be40176acef03d30b395909c
 EBUILD gitolite-gentoo-3.6.6.1-r1.ebuild 2822 BLAKE2B 54201f3e814df8458ee90ec9524593e6450da69f2a1fd963a75f3273fe20afc737f8302dc8d1cf46a2f1fcb50a9e09695a26465d3d7d49daa40b528f95db388e SHA512 044bc927329b9ce7735783309051b28d1a97e9126c1e6e753bbe646408aeaccc80187188a761eff4c28951a64811c6ba88405404b525669ff55b34d1258bda34
-EBUILD gitolite-gentoo-3.6.6.1.ebuild 2796 BLAKE2B fc76471fd3d786d481fd98bb552818dd17177738fe73cec64e8b7391b6a1405641c04bd95f0409accb1633ce30bc72b68343e47086549b4f624e4bf5bcb9d67f SHA512 8f2800d6c8a11fd1d7ef43f754c17642db284c93e63a0028153dc33da647c59fe272eb09a2c8c0569915b7f57a5d29737a7be200b4ae8da88939e2bdecce4338
-EBUILD gitolite-gentoo-3.6.6.ebuild 2796 BLAKE2B fc76471fd3d786d481fd98bb552818dd17177738fe73cec64e8b7391b6a1405641c04bd95f0409accb1633ce30bc72b68343e47086549b4f624e4bf5bcb9d67f SHA512 8f2800d6c8a11fd1d7ef43f754c17642db284c93e63a0028153dc33da647c59fe272eb09a2c8c0569915b7f57a5d29737a7be200b4ae8da88939e2bdecce4338
 MISC metadata.xml 478 BLAKE2B c178da3340159b14dc13fed855672892da98d2bd1ded28759120d60c93823b48e3887f59991776b1b68ab3941124e98b1b224f64544bbae9ea363e4c91266a2e SHA512 c014b88113a5769aa13b2d898afef78df07a642c4ccc964ae62bb64f07d3dac3c6e81df0defd873bc85be4434714abfeac160be0b4b1e9b77510f6cb5ad54810
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild
deleted file mode 100644
index 7445c714339b..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils perl-module user
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	dev-perl/Net-SSH-AuthorizedKeysFile
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/bash /var/lib/gitolite git
-}
-
-src_prepare() {
-	rm Makefile doc/COPYING || die
-	rm -rf contrib/{gitweb,vim} || die
-
-	echo "${PF}-gentoo" > conf/VERSION
-}
-
-src_install() {
-	local gl_bin="${D}/usr/bin"
-	gl_bin=${gl_bin/\/\//\/}
-
-	dodir /usr/share/gitolite/{conf,hooks} /usr/bin
-
-	export PATH="${gl_bin}:${PATH}"
-	./src/gl-system-install ${gl_bin} \
-		"${D}"/usr/share/gitolite/conf "${D}"/usr/share/gitolite/hooks || die
-	sed -i -e "s:${D}::g" "${D}/usr/bin/gl-setup" \
-		"${D}/usr/share/gitolite/conf/example.gitolite.rc" || die
-
-	rm "${D}"/usr/bin/*.pm
-	insinto "${VENDOR_LIB}"
-	doins src/*.pm
-
-	dodoc README.mkd doc/*
-
-	if use contrib; then
-		insinto /usr/share/doc/${PF}
-		doins -r contrib/
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-}
-
-pkg_postinst() {
-	# bug 352291
-	ewarn
-	elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-	elog "Especially if you're migrating from gitosis."
-	ewarn
-	ewarn
-	elog "If you use the umask feature and upgrade from <=gitolite-gentoo-1.5.9.1"
-	elog "then please check the permissions of all repositories using the umask feature"
-	ewarn
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.5.3.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.5.3.1.ebuild
deleted file mode 100644
index 7460fb092445..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.5.3.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module user versionator
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	dev-perl/Net-SSH-AuthorizedKeysFile
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.txt CHANGELOG
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1-r1.ebuild
deleted file mode 100644
index fb86e51f1c28..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	dev-perl/Net-SSH-AuthorizedKeysFile
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1.ebuild
deleted file mode 100644
index 7460fb092445..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module user versionator
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	dev-perl/Net-SSH-AuthorizedKeysFile
-	vim-syntax? ( app-vim/gitolite-syntax )"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.txt CHANGELOG
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.1.ebuild
deleted file mode 100644
index fb86e51f1c28..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	dev-perl/Net-SSH-AuthorizedKeysFile
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.2.ebuild
deleted file mode 100644
index fb86e51f1c28..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	dev-perl/Net-SSH-AuthorizedKeysFile
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.3.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.3.ebuild
deleted file mode 100644
index 3f6d38426043..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.4.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.4.ebuild
deleted file mode 100644
index 3f6d38426043..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.2.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.2.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.2.ebuild
deleted file mode 100644
index 2df90f3a53b1..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	selinux? ( sec-policy/selinux-gitosis )
-	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.ebuild
deleted file mode 100644
index 3f6d38426043..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1-r1.ebuild
deleted file mode 100644
index 7120a4c7c21d..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	selinux? ( sec-policy/selinux-gitosis )
-	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers,hooks}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1.ebuild
deleted file mode 100644
index 2df90f3a53b1..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	selinux? ( sec-policy/selinux-gitosis )
-	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.ebuild
deleted file mode 100644
index 2df90f3a53b1..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	selinux? ( sec-policy/selinux-gitosis )
-	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.5.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.5.ebuild
deleted file mode 100644
index 7120a4c7c21d..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	selinux? ( sec-policy/selinux-gitosis )
-	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers,hooks}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1.ebuild
deleted file mode 100644
index e3537a2dee5e..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	selinux? ( sec-policy/selinux-gitosis )
-	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers,hooks}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.ebuild
deleted file mode 100644
index e3537a2dee5e..000000000000
--- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-3.6.6.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.gentoo.org/proj/gitolite-gentoo"
-EGIT_MASTER=master
-
-inherit perl-module user versionator ${SCM}
-
-DESCRIPTION="Highly flexible server for git directory version tracker, Gentoo fork"
-HOMEPAGE="https://cgit.gentoo.org/proj/gitolite-gentoo.git"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux tools vim-syntax"
-
-DEPEND="dev-lang/perl
-	virtual/perl-File-Path
-	virtual/perl-File-Temp
-	>=dev-vcs/git-1.6.6"
-RDEPEND="${DEPEND}
-	!dev-vcs/gitolite
-	vim-syntax? ( app-vim/gitolite-syntax )
-	selinux? ( sec-policy/selinux-gitosis )
-	>=dev-perl/Net-SSH-AuthorizedKeysFile-0.17
-	dev-perl/JSON"
-
-pkg_setup() {
-	enewgroup git
-	enewuser git -1 /bin/sh /var/lib/gitolite git
-}
-
-src_prepare() {
-	echo "${PF}-gentoo" > src/VERSION
-}
-
-src_install() {
-	local uexec=/usr/libexec/${PN}
-
-	rm -rf src/lib/Gitolite/Test{,.pm}
-	insinto $VENDOR_LIB
-	doins -r src/lib/Gitolite
-
-	dodoc README.markdown CHANGELOG
-	# These are meant by upstream as examples, you are strongly recommended to
-	# customize them for your needs.
-	dodoc contrib/utils/ipa_groups.pl contrib/utils/ldap_groups.sh
-
-	insopts -m0755
-	insinto $uexec
-	doins -r src/{commands,syntactic-sugar,triggers,VREF}/
-	doins -r contrib/{commands,triggers,hooks}
-
-	insopts -m0644
-	doins src/VERSION
-
-	exeinto $uexec
-	doexe src/gitolite{,-shell}
-
-	dodir /usr/bin
-	for bin in gitolite{,-shell}; do
-		dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
-	done
-
-	if use tools; then
-		dobin check-g2-compat convert-gitosis-conf
-		dobin contrib/utils/rc-format-v3.4
-	fi
-
-	keepdir /var/lib/gitolite
-	fowners git:git /var/lib/gitolite
-	fperms 750 /var/lib/gitolite
-
-	fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
-}
-
-pkg_postinst() {
-	if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
-		ewarn
-		elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
-		elog "Please read http://gitolite.com/gitolite/migr.html first!"
-		ewarn
-		elog "***NOTE*** If you're using the \"umask\" feature of ${PN}-2.x:"
-		elog "You'll have to replace each \"umask = ...\" option by \"option umask = ...\""
-		elog "And you'll also have to enable the \"RepoUmask\" module in your .gitolite.rc"
-		ewarn
-	fi
-
-	# bug 352291
-	gitolite_home=$(awk -F: '$1 == "git" { print $6 }' /etc/passwd)
-	if [ -n "${gitolite_home}" -a "${gitolite_home}" != "/var/lib/gitolite" ]; then
-		ewarn
-		elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
-		elog "Especially if you're migrating from gitosis."
-		ewarn
-	fi
-}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 33c16de63593..f76a1ca40dae 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -3,8 +3,6 @@ AUX svnserve.confd 322 BLAKE2B 53eb3105691af05e4dde3451569f46621ed78a1ea7e7650b0
 AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43ab3f2f6eb6d1946dd8efb86e532df3576487ad9f49acdb3b9d95b804019d296fae0f757541957a95 SHA512 3efca4e5065cbe37f5137f3f67a0a654195e50ce0b00468f5edb1e5d476daa82422b1e833281d8edba111360b20d001a5991731e9f32bf3c88ffba75042e2b10
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
-DIST subversion-1.13.0.tar.bz2 8508122 BLAKE2B 761def1bb3a1fe5333534ebda0940b618c343f919688055cdef69552bc515ad6cd9db3ac67c8c73075487d4f45d93bb57fa467288756dfa163fc72c8e8c7b548 SHA512 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2
 DIST subversion-1.14.0.tar.bz2 8497531 BLAKE2B 261f1401a96b181ccbdea9ab6e1dde301aa2c67296a0dc458a1d7e544530411b656d0d5335f985c9222c2d44fc8f962b1a960b81e4ff4883d373cb4405af2461 SHA512 af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b
-EBUILD subversion-1.13.0-r2.ebuild 13081 BLAKE2B 99250f98b677b87f9f1b194c2673fd8c0f4c837c3201aa03c522753c71f875bb907c7532f1da7281209361ddfb633e2c1b3c3fb567fc48a9bbb7063818964229 SHA512 23e99c3f743d061cc2ed01b6632e52fa04d7bff3fdd6760dce797fa3acde36ee973dd50fd809fa62ad22460f39c0152c7646c0da3e03ace8764679a2400c01ed
-EBUILD subversion-1.14.0-r1.ebuild 12623 BLAKE2B 519ad357febfde24fd578c11bfb3f932682061bbf1f44f1b2557f19e7c4010fdee413fb43dbd3542a6e6754ba79bb9b3d66c9eb0bd4c61e80c57ca5a9ff91b70 SHA512 6e793b97c97ddbe9c153f6bdef1863a109fcd9ee902966a20ed5362513932def406537560ca3a8f9a500e837b7f326d188a24a51444060647aacab75fc51798b
-MISC metadata.xml 693 BLAKE2B f9384d6683c910b74391176650014192d0893aaea9f45da26940212ea9d2f0121c30d85dc6a6400715655bca11f580a1255616f6c1663d93cfcf592fb50992e2 SHA512 14d47f3a97ff2d83ae573070022dfbf0622ef09abda125d9a4db95a2b48762ffbde47da09ba32df1a49e9a0dc207f1b66d5440d847392b6e62c8732abc407670
+EBUILD subversion-1.14.0-r1.ebuild 12621 BLAKE2B 1360a2d1ebc29d55f4f33716a5dd9b6afeeec4a92f03d3e15458083105194fb80329da23404a6683c579cc444860e2cf48a6f9a7a3db65750d1aa2bd0681eed4 SHA512 30d151693d62d71d3f8c3291e72adb2c67f266cbd4649e533753168b8d4293e446a829a7e3e8578f4ffddc6911002c6af4f8e1d58f0c3d36f2d430c9d1265e1c
+MISC metadata.xml 560 BLAKE2B b6b78084ae0792c458969a47b6d1a13cf330c2b410582f39c207b585a47692a7ae86b1b8c86c77da4f289331dbec2ad114b86cc9edebb3423c7ce144458e71e7 SHA512 d10e6922066c5579a7cebb53e328ba02fd92e7919cafe96e89dfa49c6d5d40e4e9247f95c987bab16e90803b54dbb9c4229afb219428f254e7850802d0d4fce1
diff --git a/dev-vcs/subversion/metadata.xml b/dev-vcs/subversion/metadata.xml
index 90882d9cd881..f829d60721eb 100644
--- a/dev-vcs/subversion/metadata.xml
+++ b/dev-vcs/subversion/metadata.xml
@@ -10,9 +10,7 @@
 		<name>Mikle Kolyada</name>
 	</maintainer>
 	<use>
-		<flag name="dso">Enable runtime module search</flag>
 		<flag name="extras">Install extra scripts (examples, tools, hooks)</flag>
-		<flag name="http">Enable http support using <pkg>net-libs/serf</pkg></flag>
 		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-vcs/subversion/subversion-1.13.0-r2.ebuild b/dev-vcs/subversion/subversion-1.13.0-r2.ebuild
deleted file mode 100644
index 4d9e70f3d1a9..000000000000
--- a/dev-vcs/subversion/subversion-1.13.0-r2.ebuild
+++ /dev/null
@@ -1,443 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby26 ruby25 ruby24"
-DISTUTILS_OPTIONAL=1
-WANT_AUTOMAKE="none"
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool ltprune multilib perl-module python-any-r1 ruby-single toolchain-funcs xdg-utils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="https://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Subversion GPL-2"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="apache2 berkdb debug doc +dso extras gnome-keyring +http java kwallet nls perl ruby sasl test vim-syntax"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/lz4
-	>=dev-db/sqlite-3.7.12
-	>=dev-libs/apr-1.3:1
-	>=dev-libs/apr-util-1.3:1
-	dev-libs/expat
-	dev-libs/libutf8proc:=
-	sys-apps/file
-	sys-libs/zlib
-	berkdb? ( >=sys-libs/db-4.0.14:= )
-	gnome-keyring? (
-		dev-libs/glib:2
-		app-crypt/libsecret
-		sys-apps/dbus
-	)
-	http? ( >=net-libs/serf-1.3.4 )
-	kwallet? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kwallet:5
-		sys-apps/dbus
-	)
-	perl? ( dev-lang/perl:= )
-	ruby? ( ${RUBY_DEPS} )
-	sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${COMMON_DEPEND}
-	apache2? ( www-servers/apache[apache2_modules_dav] )
-	java? ( >=virtual/jre-1.8 )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
-	!!<sys-apps/sandbox-1.6
-	doc? ( app-doc/doxygen )
-	gnome-keyring? ( virtual/pkgconfig )
-	http? ( virtual/pkgconfig )
-	java? ( >=virtual/jdk-1.8 )
-	kwallet? (
-		kde-frameworks/kdelibs4support:5
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-	perl? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	test? ( ${PYTHON_DEPS} )"
-
-REQUIRED_USE="
-	test? ( !dso )"
-
-want_apache
-
-pkg_setup() {
-	if use berkdb ; then
-		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
-			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
-			| sed 's:.*b::')"
-		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
-			if [[ -n "${apu_bdb_version}" ]] ; then
-				SVN_BDB_VERSION="${apu_bdb_version}"
-				einfo "Matching db version to apr-util"
-			else
-				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
-				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
-			fi
-		fi
-		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-		einfo
-
-		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
-			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
-			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
-			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
-			eerror "Aborting to avoid possible run-time crashes."
-			die "Berkeley DB version mismatch"
-		fi
-	fi
-
-	depend.apache_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-
-	if ! use http ; then
-		ewarn "WebDAV support is disabled. You need WebDAV to"
-		ewarn "access repositories through the HTTP protocol."
-		ewarn "Consider enabling \"http\" USE flag"
-		echo -ne "\a"
-	fi
-
-	# https://issues.apache.org/jira/browse/SVN-4813#comment-16813739
-	append-cppflags -P
-
-	if use debug ; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
-	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-
-	if use ruby ; then
-		local rbslot
-		RB_VER=""
-		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
-			if has_version dev-lang/ruby:${rbslot} ;  then
-				RB_VER="${rbslot/.}"
-				break
-			fi
-		done
-		[[ -z "${RB_VER}" ]] && die "No useable ruby version found"
-	fi
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/721300
-	rm "${WORKDIR}"/patches/subversion-1.10.0_rc1-utf8proc_include.patch || die
-
-	eapply "${WORKDIR}/patches"
-	eapply_user
-
-	chmod +x build/transform_libtool_scripts.sh || die
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	# this bites us in particular on Solaris
-	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
-		die "/bin/sh is not POSIX shell!"
-
-	eautoconf
-	elibtoolize
-
-	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-		-i build-outputs.mk || die "sed failed"
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_with apache2 apache-libexecdir)
-		$(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
-		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-		--without-ctypesgen
-		$(use_enable dso runtime-module-search)
-		$(use_with gnome-keyring)
-		$(use_enable java javahl)
-		$(use_with java jdk "${JAVA_HOME}")
-		$(use_with kwallet)
-		$(use_enable nls)
-		$(use_with sasl)
-		$(use_with http serf)
-		--with-apr="${EPREFIX}/usr/bin/apr-1-config"
-		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
-		--disable-experimental-libtool
-		--without-jikes
-		--disable-mod-activation
-		--disable-static
-		--enable-svnxx
-	)
-
-	if use perl || use ruby; then
-		myconf+=( --with-swig )
-	else
-		myconf+=( --without-swig )
-	fi
-
-	if use java ; then
-		myconf+=( --without-junit )
-	fi
-
-	case ${CHOST} in
-		*-aix*)
-			# avoid recording immediate path to sharedlibs into executables
-			append-ldflags -Wl,-bnoipath
-		;;
-		*-cygwin*)
-			# no LD_PRELOAD support, no undefined symbols
-			myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
-			;;
-		*-interix*)
-			# loader crashes on the LD_PRELOADs...
-			myconf+=( --disable-local-library-preloading )
-		;;
-		*-solaris*)
-			# need -lintl to link
-			use nls && append-libs intl
-			# this breaks installation, on x64 echo replacement is 32-bits
-			myconf+=( --disable-local-library-preloading )
-		;;
-		*-mint*)
-			myconf+=( --enable-all-static --disable-local-library-preloading )
-		;;
-		*)
-			# inject LD_PRELOAD entries for easy in-tree development
-			myconf+=( --enable-local-library-preloading )
-		;;
-	esac
-
-	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
-	#compile for x86 on amd64, so workaround this issue again
-	#check newer versions, if this is still/again needed
-	#myconf+=( --disable-disallowing-of-undefined-references )
-
-	# for build-time scripts
-	if use test; then
-		python_setup
-	fi
-
-	# Remove when >=dev-libs/libutf8proc-2.5.0 is stable
-	# https://bugs.gentoo.org/721300
-	append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc
-
-	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
-	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake local-all
-
-	if use perl ; then
-		emake swig-pl
-	fi
-
-	if use ruby ; then
-		emake swig-rb
-	fi
-
-	if use java ; then
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
-	fi
-
-	if use extras ; then
-		emake tools
-	fi
-
-	if use doc ; then
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			emake doc-javahl
-		fi
-	fi
-}
-
-src_test() {
-	if has_version ~${CATEGORY}/${P} ; then
-		default
-	else
-		ewarn "The test suite shows errors when there is an older version of"
-		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
-		ewarn "before running the test suite."
-		ewarn "Test suite skipped."
-	fi
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" local-install
-
-	if use perl ; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
-		perl_delete_localpod
-		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
-	fi
-
-	if use ruby ; then
-		emake DESTDIR="${D}" install-swig-rb
-	fi
-
-	if use java ; then
-		emake DESTDIR="${D}" install-javahl
-		java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
-		java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install Apache module configuration.
-	if use apache2 ; then
-		keepdir "${APACHE_MODULES_CONFDIR}"
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}/47_mod_dav_svn.conf"
-	fi
-
-	# Install Bash Completion, bug 43179.
-	newbashcomp tools/client-side/bash_completion svn
-	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
-	rm -f tools/client-side/bash_completion
-
-	# Install hot backup script, bug 54304.
-	newbin tools/backup/hot-backup.py svn-hot-backup
-	rm -fr tools/backup
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	#adjust default user and group with disabled apache2 USE flag, bug 381385
-	if ! use apache2 ; then
-		sed -e "s\USER:-apache\USER:-svn\g" \
-			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
-			-i "${ED%/}"/etc/init.d/svnserve || die
-		sed -e "0,/apache/s//svn/" \
-			-e "s:apache:svnusers:" \
-			-i "${ED%/}"/etc/xinetd.d/svnserve || die
-	fi
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# Install extra files.
-	if use extras ; then
-		cat <<- EOF > 80subversion-extras
-			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-		EOF
-		doenvd 80subversion-extras
-
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
-
-		find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
-		rm -fr tools/client-side/svnmucc
-		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
-		rm -fr tools/{buildbot,dev,diff,po}
-	fi
-
-	if use doc ; then
-		docinto html
-		dodoc -r doc/doxygen/html/*
-
-		if use java ; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-
-	prune_libtool_files --all
-
-	cd "${ED%/}"/usr/share/locale
-	for i in * ; do
-		if [[ ${i} != *${LINGUAS}* ]] ; then
-			rm -r ${i} || die
-		fi
-	done
-}
-
-pkg_preinst() {
-	# Compare versions of Berkeley DB, bug 122877.
-	if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
-		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
-			CHANGED_BDB_VERSION="1"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
-		ewarn "You upgraded from an older version of Berkeley DB and may experience"
-		ewarn "problems with your repository. Run the following commands as root to fix it:"
-		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	fi
-
-	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
-}
-
-pkg_postrm() {
-	:
-}
-
-pkg_config() {
-	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-	# already has EPREFIX in it
-	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
-
-		einfo "Setting repository permissions..."
-		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
-		if use apache2 ; then
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
-		else
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
-		fi
-		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
-		echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
-		echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
-		echo "to finish the configuration."
-	fi
-}
diff --git a/dev-vcs/subversion/subversion-1.14.0-r1.ebuild b/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
index a63a830bdf7c..b4b3155cf33e 100644
--- a/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Subversion GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl ruby sasl test"
 RESTRICT="!test? ( test )"
 
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 4922289c95f3..422760e8457d 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 6d341601a112..e6fec844d274 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -46,6 +46,35 @@ ECARGO_VENDOR="${ECARGO_HOME}/gentoo"
 # }
 # @CODE
 
+# @ECLASS-VARIABLE: ECARGO_REGISTRY_DIR
+# @USER_VARIABLE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Storage directory for cargo registry.
+# Used by cargo_live_src_unpack to cache downloads.
+# This is intended to be set by users.
+# Ebuilds must not set it.
+#
+# Defaults to "${DISTDIR}/cargo-registry" it not set.
+
+# @ECLASS-VARIABLE: ECARGO_OFFLINE
+# @USER_VARIABLE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If non-empty, this variable prevents online operations in
+# cargo_live_src_unpack.
+# Inherits value of EVCS_OFFLINE if not set explicitly.
+
+# @ECLASS-VARIABLE: EVCS_UMASK
+# @USER_VARIABLE
+# @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 use cargo in a home directory, but are in the portage
+# group, and then switch over to building with FEATURES=userpriv.
+# Or vice-versa.
+
 # @FUNCTION: cargo_crate_uris
 # @DESCRIPTION:
 # Generates the URIs to put in SRC_URI to help fetch dependencies.
@@ -62,6 +91,44 @@ cargo_crate_uris() {
 	done
 }
 
+# @FUNCTION: cargo_gen_config
+# @DESCRIPTION:
+# Generate the $CARGO_HOME/config necessary to use our local registry and settings.
+# Cargo can also be configured through environment variables in addition to the TOML syntax below.
+# For each configuration key below of the form foo.bar the environment variable CARGO_FOO_BAR
+# can also be used to define the value.
+# Environment variables will take precedent over TOML configuration,
+# and currently only integer, boolean, and string keys are supported.
+# For example the build.jobs key can also be defined by CARGO_BUILD_JOBS.
+# Or setting CARGO_TERM_VERBOSE=false in make.conf will make build quieter.
+cargo_gen_config() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	mkdir -p "${ECARGO_HOME}" || die
+
+	cat > "${ECARGO_HOME}/config" <<- _EOF_ || die "Failed to create cargo config"
+	[source.gentoo]
+	directory = "${ECARGO_VENDOR}"
+
+	[source.crates-io]
+	replace-with = "gentoo"
+	local-registry = "/nonexistant"
+
+	[net]
+	offline = true
+
+	[build]
+	jobs = $(makeopts_jobs)
+
+	[term]
+	verbose = true
+	$([[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo "color = 'never'")
+	_EOF_
+
+	export CARGO_HOME="${ECARGO_HOME}"
+	_CARGO_GEN_CONFIG_HAS_RUN=1
+}
+
 # @FUNCTION: cargo_src_unpack
 # @DESCRIPTION:
 # Unpacks the package and the cargo registry
@@ -122,50 +189,83 @@ cargo_live_src_unpack() {
 	[[ "${EBUILD_PHASE}" == unpack ]] || die "${FUNCNAME} only allowed in src_unpack"
 
 	mkdir -p "${S}" || die
+	mkdir -p "${ECARGO_VENDOR}" || die
+	mkdir -p "${ECARGO_HOME}" || die
+
+	local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
+	: ${ECARGO_REGISTRY_DIR:=${distdir}/cargo-registry}
+
+	local offline="${ECARGO_OFFLINE:-${EVCS_OFFLINE}}"
+
+	if [[ ! -d ${ECARGO_REGISTRY_DIR} && ! ${offline} ]]; then
+		(
+			addwrite "${ECARGO_REGISTRY_DIR}"
+			mkdir -p "${ECARGO_REGISTRY_DIR}"
+		) || die "Unable to create ${ECARGO_REGISTRY_DIR}"
+	fi
+
+	if [[ ${offline} ]]; then
+		local subdir
+		for subdir in cache index src; do
+			if [[ ! -d ${ECARGO_REGISTRY_DIR}/registry/${subdir} ]]; then
+				eerror "Networking activity has been disabled via ECARGO_OFFLINE or EVCS_OFFLINE"
+				eerror "However, no valid cargo registry available at ${ECARGO_REGISTRY_DIR}"
+				die "Unable to proceed with ECARGO_OFFLINE/EVCS_OFFLINE."
+			fi
+		done
+	fi
+
+	if [[ ${EVCS_UMASK} ]]; then
+		local saved_umask=$(umask)
+		umask "${EVCS_UMASK}" || die "Bad options to umask: ${EVCS_UMASK}"
+	fi
 
 	pushd "${S}" > /dev/null || die
-	# need to specify CARGO_HOME before cargo_gen_config fired
-	CARGO_HOME="${ECARGO_HOME}" cargo fetch || die
-	CARGO_HOME="${ECARGO_HOME}" cargo vendor "${ECARGO_VENDOR}" || die
-	popd > /dev/null || die
 
-	cargo_gen_config
-}
+	# Respect user settings befire cargo_gen_config is called.
+	if [[ ! ${CARGO_TERM_COLOR} ]]; then
+		[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && export CARGO_TERM_COLOR=never
+		local unset_color=true
+	fi
+	if [[ ! ${CARGO_TERM_VERBOSE} ]]; then
+		export CARGO_TERM_VERBOSE=true
+		local unset_verbose=true
+	fi
 
-# @FUNCTION: cargo_gen_config
-# @DESCRIPTION:
-# Generate the $CARGO_HOME/config necessary to use our local registry and settings.
-# Cargo can also be configured through environment variables in addition to the TOML syntax below.
-# For each configuration key below of the form foo.bar the environment variable CARGO_FOO_BAR
-# can also be used to define the value.
-# Environment variables will take precedent over TOML configuration,
-# and currently only integer, boolean, and string keys are supported.
-# For example the build.jobs key can also be defined by CARGO_BUILD_JOBS.
-# Or setting CARGO_TERM_VERBOSE=false in make.conf will make build quieter.
-cargo_gen_config() {
-	debug-print-function ${FUNCNAME} "$@"
+	# Let cargo fetch to system-wide location.
+	# It will keep directory organized by itself.
+	addwrite "${ECARGO_REGISTRY_DIR}"
+	export CARGO_HOME="${ECARGO_REGISTRY_DIR}"
 
-	cat <<- EOF > "${ECARGO_HOME}/config"
-	[source.gentoo]
-	directory = "${ECARGO_VENDOR}"
+	# Absence of quotes around offline arg is intentional, as cargo bails out if it encounters ''
+	einfo "cargo fetch ${offline:+--offline}"
+	cargo fetch ${offline:+--offline} || die #nowarn
 
-	[source.crates-io]
-	replace-with = "gentoo"
-	local-registry = "/nonexistant"
+	# Let cargo copy all required crates to "${WORKDIR}" for offline use in later phases.
+	einfo "cargo vendor ${offline:+--offline} ${ECARGO_VENDOR}"
+	cargo vendor ${offline:+--offline} "${ECARGO_VENDOR}" || die #nowarn
 
-	[net]
-	offline = true
+	# Users may have git checkouts made by cargo.
+	# While cargo vendors the sources, it still needs git checkout to be present.
+	# Copying full dir is an overkill, so just symlink it.
+	if [[ -d ${ECARGO_REGISTRY_DIR}/git ]]; then
+		ln -sv "${ECARGO_REGISTRY_DIR}/git" "${ECARGO_HOME}/git" || die
+	fi
 
-	[build]
-	jobs = $(makeopts_jobs)
+	popd > /dev/null || die
 
-	[term]
-	verbose = true
-	EOF
-	# honor NOCOLOR setting
-	[[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo "color = 'never'" >> "${ECARGO_HOME}/config"
+	# Restore settings if needed.
+	[[ ${unset_color} ]] && unset CARGO_TERM_COLOR
+	[[ ${unset_verbose} ]] && unset CARGO_TERM_VERBOSE
+	if [[ ${saved_umask} ]]; then
+		umask "${saved_umask}" || die
+	fi
 
-	export CARGO_HOME="${ECARGO_HOME}"
+	# After following calls, cargo will no longer use ${ECARGO_REGISTRY_DIR} as CARGO_HOME
+	# It will be forced into offline mode to prevent network access.
+	# But since we already vendored crates and symlinked git, it has all it needs to build.
+	unset CARGO_HOME
+	cargo_gen_config
 }
 
 # @FUNCTION: cargo_src_configure
@@ -222,6 +322,9 @@ cargo_src_configure() {
 cargo_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	[[ ${_CARGO_GEN_CONFIG_HAS_RUN} ]] || \
+		die "FATAL: please call cargo_gen_config before using ${FUNCNAME}"
+
 	tc-export AR CC CXX
 
 	set -- cargo build $(usex debug "" --release) ${ECARGO_ARGS[@]} "$@"
@@ -239,6 +342,9 @@ cargo_src_compile() {
 cargo_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	[[ ${_CARGO_GEN_CONFIG_HAS_RUN} ]] || \
+		die "FATAL: please call cargo_gen_config before using ${FUNCNAME}"
+
 	set -- cargo install $(has --path ${@} || echo --path ./) \
 		--root "${ED}/usr" \
 		$(usex debug --debug "") \
@@ -258,6 +364,9 @@ cargo_src_install() {
 cargo_src_test() {
 	debug-print-function ${FUNCNAME} "$@"
 
+	[[ ${_CARGO_GEN_CONFIG_HAS_RUN} ]] || \
+		die "FATAL: please call cargo_gen_config before using ${FUNCNAME}"
+
 	set -- cargo test $(usex debug "" --release) ${ECARGO_ARGS[@]} "$@"
 	einfo "${@}"
 	"${@}" || die "cargo test failed"
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index ddee554d429f..62fa02715700 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -292,7 +292,7 @@ _cmake_modify-cmakelists() {
 	# NOTE Append some useful summary here
 	cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ || die
 
-		MESSAGE(STATUS "<<< Gentoo configuration >>>
+		message(STATUS "<<< Gentoo configuration >>>
 		Build type      \${CMAKE_BUILD_TYPE}
 		Install path    \${CMAKE_INSTALL_PREFIX}
 		Compiler flags:
@@ -392,12 +392,12 @@ cmake_src_configure() {
 	local build_rules=${BUILD_DIR}/gentoo_rules.cmake
 
 	cat > "${build_rules}" <<- _EOF_ || die
-		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
-		SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM-ATT_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c -x assembler <SOURCE>" CACHE STRING "ASM-ATT compile command" FORCE)
-		SET (CMAKE_ASM-ATT_LINK_FLAGS "-nostdlib" CACHE STRING "ASM-ATT link flags" FORCE)
-		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
-		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
-		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> <INCLUDES> ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
+		set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
+		set(CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM-ATT_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c -x assembler <SOURCE>" CACHE STRING "ASM-ATT compile command" FORCE)
+		set(CMAKE_ASM-ATT_LINK_FLAGS "-nostdlib" CACHE STRING "ASM-ATT link flags" FORCE)
+		set(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
+		set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
+		set(CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> <INCLUDES> ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
 	_EOF_
 
 	local myCC=$(tc-getCC) myCXX=$(tc-getCXX) myFC=$(tc-getFC)
@@ -409,14 +409,14 @@ cmake_src_configure() {
 	# space separated.
 	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
 	cat > ${toolchain_file} <<- _EOF_ || die
-		SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
-		SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}")
-		SET (CMAKE_C_COMPILER "${myCC/ /;}")
-		SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
-		SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
-		SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
-		SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
-		SET (CMAKE_SYSTEM_PROCESSOR "${CHOST%%-*}")
+		set(CMAKE_ASM_COMPILER "${myCC/ /;}")
+		set(CMAKE_ASM-ATT_COMPILER "${myCC/ /;}")
+		set(CMAKE_C_COMPILER "${myCC/ /;}")
+		set(CMAKE_CXX_COMPILER "${myCXX/ /;}")
+		set(CMAKE_Fortran_COMPILER "${myFC/ /;}")
+		set(CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
+		set(CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
+		set(CMAKE_SYSTEM_PROCESSOR "${CHOST%%-*}")
 	_EOF_
 
 	# We are using the C compiler for assembly by default.
@@ -432,24 +432,24 @@ cmake_src_configure() {
 			Winnt)
 				sysname="Windows"
 				cat >> "${toolchain_file}" <<- _EOF_ || die
-					SET (CMAKE_RC_COMPILER $(tc-getRC))
+					set(CMAKE_RC_COMPILER $(tc-getRC))
 				_EOF_
 				;;
 			*) sysname="${KERNEL}" ;;
 		esac
 
 		cat >> "${toolchain_file}" <<- _EOF_ || die
-			SET (CMAKE_SYSTEM_NAME "${sysname}")
+			set(CMAKE_SYSTEM_NAME "${sysname}")
 		_EOF_
 
 		if [ "${SYSROOT:-/}" != "/" ] ; then
 			# When cross-compiling with a sysroot (e.g. with crossdev's emerge wrappers)
 			# we need to tell cmake to use libs/headers from the sysroot but programs from / only.
 			cat >> "${toolchain_file}" <<- _EOF_ || die
-				SET (CMAKE_FIND_ROOT_PATH "${SYSROOT}")
-				SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-				SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-				SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+				set(CMAKE_FIND_ROOT_PATH "${SYSROOT}")
+				set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+				set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+				set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 			_EOF_
 		fi
 	fi
@@ -458,20 +458,16 @@ cmake_src_configure() {
 		cat >> "${build_rules}" <<- _EOF_ || die
 			# in Prefix we need rpath and must ensure cmake gets our default linker path
 			# right ... except for Darwin hosts
-			IF (NOT APPLE)
-			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
-			SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)"
-			CACHE STRING "" FORCE)
-
-			ELSE ()
-
-			SET (CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
-			SET (CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
-			SET (CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
-			SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
-			SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
-
-			ENDIF (NOT APPLE)
+			if(NOT APPLE)
+				set(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
+				set(CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE)
+			else()
+				set(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE)
+				set(CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE)
+				set(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE)
+				set(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE)
+				set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE)
+			endif()
 		_EOF_
 	fi
 
@@ -479,41 +475,41 @@ cmake_src_configure() {
 	local common_config=${BUILD_DIR}/gentoo_common_config.cmake
 	local libdir=$(get_libdir)
 	cat > "${common_config}" <<- _EOF_ || die
-		SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
-		SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
-		SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
-		SET (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
-		SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
-		SET (CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE FILEPATH "Gentoo override rules")
-		SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
-		SET (BUILD_SHARED_LIBS ON CACHE BOOL "")
+		set(CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build")
+		set(LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE)
+		set(CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries")
+		set(CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "")
+		set(CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "")
+		set(CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE FILEPATH "Gentoo override rules")
+		set(CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
+		set(BUILD_SHARED_LIBS ON CACHE BOOL "")
 	_EOF_
 
 	if [[ -n ${_ECM_ECLASS} ]]; then
-		echo 'SET (ECM_DISABLE_QMLPLUGINDUMP ON CACHE BOOL "")' >> "${common_config}" || die
+		echo 'set(ECM_DISABLE_QMLPLUGINDUMP ON CACHE BOOL "")' >> "${common_config}" || die
 	fi
 
 	# See bug 689410
 	if [[ "${ARCH}" == riscv ]]; then
-		echo 'SET (CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX '"${libdir#lib}"' CACHE STRING "library search suffix" FORCE)' >> "${common_config}" || die
+		echo 'set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX '"${libdir#lib}"' CACHE STRING "library search suffix" FORCE)' >> "${common_config}" || die
 	fi
 
 	if [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]]; then
-		echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" || die
+		echo 'set(CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" || die
 	fi
 
 	# Wipe the default optimization flags out of CMake
 	if [[ ${CMAKE_BUILD_TYPE} != Gentoo ]]; then
 		cat >> ${common_config} <<- _EOF_ || die
-			SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-			SET (CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			set(CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			set(CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			set(CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			set(CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			set(CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			set(CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			set(CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 		_EOF_
 	fi
 
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index e6346d43ccfb..66a3a325e673 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -407,9 +407,12 @@ elisp-site-file-install() {
 	sf="${T}/${sf}"
 	ebegin "Installing site initialisation file for GNU Emacs"
 	[[ $1 = "${sf}" ]] || cp "$1" "${sf}"
-	[[ ${EAPI} == [45] ]] && grep -q "@EMACSMODULES@" "${sf}" \
-		&& die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}"
-	modules=${EMACSMODULES//@libdir@/$(get_libdir)}
+	if [[ ${EAPI} == [45] ]]; then
+		grep -q "@EMACSMODULES@" "${sf}" \
+			&& die "${ECLASS}: Dynamic modules not supported in EAPI ${EAPI}"
+	else
+		modules=${EMACSMODULES//@libdir@/$(get_libdir)}
+	fi
 	sed -i -e "1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;}" \
 		-e "s:@SITELISP@:${EPREFIX}${SITELISP}/${my_pn}:g" \
 		-e "s:@SITEETC@:${EPREFIX}${SITEETC}/${my_pn}:g" \
diff --git a/eclass/mozconfig-v6.52.eclass b/eclass/mozconfig-v6.52.eclass
deleted file mode 100644
index 42e6fb030cd3..000000000000
--- a/eclass/mozconfig-v6.52.eclass
+++ /dev/null
@@ -1,391 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# @ECLASS: mozconfig-v6.52.eclass
-# @MAINTAINER:
-# mozilla team <mozilla@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
-# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
-# @DESCRIPTION:
-# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
-# to provide a single common place for the common mozilla engine compoments.
-#
-# The eclass provides all common dependencies as well as common use flags.
-#
-# Some use flags which may be optional in particular mozilla packages can be
-# supported through setting eclass variables.
-#
-# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
-# and so ebuilds inheriting this eclass do not need to inherit that.
-
-case ${EAPI} in
-	0|1|2|3|4)
-		die "EAPI=${EAPI} not supported"
-		;;
-	5)
-		inherit multilib
-		;;
-esac
-
-inherit flag-o-matic toolchain-funcs mozcoreconf-v5
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild needs to provide
-# optional necko-wifi support via IUSE="wifi".  Currently this would include
-# ebuilds for firefox, and potentially seamonkey.
-#
-# Leave the variable UNSET if necko-wifi support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild needs to provide
-# deterministic jit support via IUSE="jit".  The upstream default will be used
-# otherwise, which is generally to enable jit unless support for the platform
-# is missing.
-#
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild can provide
-# optional gtk3 support via IUSE="force-gtk3".  Currently this would include
-# thunderbird and seamonkey in the future, once support is ready for testing.
-#
-# Leave the variable UNSET if gtk3 support should not be optionally available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-# If gtk+:3 is to be the standard toolkit, do not use this and instead use
-# MOZCONFIG_OPTIONAL_GTK2ONLY.
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK2ONLY
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild can provide
-# optional gtk2-only support via IUSE="gtk2".
-#
-# Note that this option conflicts directly with MOZCONFIG_OPTIONAL_GTK3, both
-# variables cannot be set at the same time and this variable will be ignored if
-# MOZCONFIG_OPTIONAL_GTK3 is set.
-#
-# Leave the variable UNSET if gtk2-only support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-
-# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set this variable before the inherit line, when an ebuild can provide
-# optional qt5 support via IUSE="qt5".  Currently this would include
-# ebuilds for firefox, but thunderbird and seamonkey could follow in the future.
-#
-# Leave the variable UNSET if qt5 support should not be available.
-# Set the variable to "enabled" if the use flag should be enabled by default.
-# Set the variable to any value if the use flag should exist but not be default-enabled.
-
-# use-flags common among all mozilla ebuilds
-IUSE="${IUSE} dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo
-	system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx"
-
-# some notes on deps:
-# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
-# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
-
-RDEPEND=">=app-text/hunspell-1.2:=
-	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.25:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	pulseaudio? ( || ( media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9 ) )
-	virtual/freedesktop-icon-theme
-	dbus? ( >=sys-apps/dbus-0.60
-		>=dev-libs/dbus-glib-0.72 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=virtual/libffi-3.0.10
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	system-cairo? ( >=x11-libs/cairo-1.12[X,xcb(+)] >=x11-libs/pixman-0.19.2 )
-	system-icu? ( >=dev-libs/icu-58.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.17.0:3[secure-delete,debug=] )
-	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
-	system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 )
-"
-
-if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-	MOZCONFIG_OPTIONAL_GTK2ONLY=
-	if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
-		IUSE+=" +force-gtk3"
-	else
-		IUSE+=" force-gtk3"
-	fi
-	RDEPEND+=" force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 )"
-elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-	if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then
-		IUSE+=" +gtk2"
-	else
-		IUSE+=" gtk2"
-	fi
-	RDEPEND+=" !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )"
-fi
-if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
-	if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
-		IUSE+=" +wifi"
-	else
-		IUSE+=" wifi"
-	fi
-	RDEPEND+="
-	wifi? (
-		kernel_linux? ( >=sys-apps/dbus-0.60
-			>=dev-libs/dbus-glib-0.72
-			net-misc/networkmanager )
-	)"
-fi
-
-DEPEND="app-arch/zip
-	app-arch/unzip
-	>=sys-devel/binutils-2.16.1
-	sys-apps/findutils
-	pulseaudio? ( media-sound/pulseaudio )
-	${RDEPEND}"
-
-RDEPEND+="
-	pulseaudio? ( || ( media-sound/pulseaudio
-		>=media-sound/apulse-0.1.9 ) )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-# @FUNCTION: mozconfig_config
-# @DESCRIPTION:
-# Set common configure options for mozilla packages.
-# Call this within src_configure() phase, after mozconfig_init
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_configure() {
-# 	mozconfig_init
-# 	mozconfig_config
-#	# ... misc ebuild-unique settings via calls to
-#	# ... mozconfig_{annotate,use_with,use_enable}
-#	mozconfig_final
-# }
-
-mozconfig_config() {
-	# Migrated from mozcoreconf-2
-	mozconfig_annotate 'system_libs' \
-		--with-system-zlib \
-		--with-system-bz2
-
-	if has bindist ${IUSE}; then
-		mozconfig_use_enable !bindist official-branding
-		if [[ ${PN} == firefox ]] && use bindist ; then
-			mozconfig_annotate '' --with-branding=browser/branding/aurora
-		fi
-	fi
-
-	# Enable position independent executables
-	mozconfig_annotate 'enabled by Gentoo' --enable-pie
-	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
-
-	mozconfig_use_enable startup-notification
-
-	if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
-		# wifi pulls in dbus so manage both here
-		mozconfig_use_enable wifi necko-wifi
-		if use kernel_linux && use wifi && ! use dbus; then
-			echo "Enabling dbus support due to wifi request"
-			mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
-		else
-			mozconfig_use_enable dbus
-		fi
-	else
-		mozconfig_use_enable dbus
-		mozconfig_annotate 'disabled' --disable-necko-wifi
-	fi
-
-	if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
-		mozconfig_use_enable jit ion
-	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)
-	if use system-libevent; then
-		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX}"/usr
-	fi
-	mozconfig_annotate '' --prefix="${EPREFIX}"/usr
-	mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
-	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
-	mozconfig_annotate '' --disable-gnomeui
-	mozconfig_annotate '' --enable-gio
-	mozconfig_annotate '' --disable-crashreporter
-	mozconfig_annotate 'Gentoo default' --with-system-png
-	mozconfig_annotate '' --enable-system-ffi
-	mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
-	mozconfig_annotate '' --disable-gconf
-	mozconfig_annotate '' --with-intl-api
-
-	# skia has no support for big-endian platforms
-	if [[ $(tc-endian) == "big" ]]; then
-		mozconfig_annotate 'big endian target' --disable-skia
-	else
-		mozconfig_annotate '' --enable-skia
-	fi
-
-	# default toolkit is cairo-gtk2, optional use flags can change this
-	local toolkit="cairo-gtk2"
-	local toolkit_comment=""
-	if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
-		if use force-gtk3; then
-			toolkit="cairo-gtk3"
-			toolkit_comment="force-gtk3 use flag"
-		fi
-	fi
-	if [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then
-		if ! use gtk2 ; then
-			toolkit="cairo-gtk3"
-		else
-			toolkit_comment="gtk2 use flag"
-		fi
-	fi
-	if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then
-		if use qt5; then
-			toolkit="cairo-qt"
-			toolkit_comment="qt5 use flag"
-			# need to specify these vars because the qt5 versions are not found otherwise,
-			# and setting --with-qtdir overrides the pkg-config include dirs
-			local i
-			for i in qmake moc rcc; do
-				echo "export HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \
-					>> "${S}"/.mozconfig || die
-			done
-			echo 'unset QTDIR' >> "${S}"/.mozconfig || die
-			mozconfig_annotate '+qt5' --disable-gio
-		fi
-	fi
-	mozconfig_annotate "${toolkit_comment}" --enable-default-toolkit=${toolkit}
-
-	# Use jemalloc unless libc is not glibc >= 2.4
-	# at this time the minimum glibc in the tree is 2.9 so we should be safe.
-	if use elibc_glibc && use jemalloc; then
-		# We must force-enable jemalloc 4 via .mozconfig
-		echo "export MOZ_JEMALLOC4=1" >> "${S}"/.mozconfig || die
-		mozconfig_annotate '' --enable-replace-malloc
-	fi
-
-	# 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}}"
-
-	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
-
-	mozconfig_use_enable system-cairo
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-
-	# Modifications to better support ARM, bug 553364
-	if use neon ; then
-		mozconfig_annotate '' --with-fpu=neon
-		mozconfig_annotate '' --with-thumb=yes
-		mozconfig_annotate '' --with-thumb-interwork=no
-	fi
-	if [[ ${CHOST} == armv* ]] ; 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
-}
-
-# @FUNCTION: mozconfig_install_prefs
-# @DESCRIPTION:
-# Set preferences into the prefs.js file specified as a parameter to
-# the function.  This sets both some common prefs to all mozilla
-# packages, and any prefs that may relate to the use flags administered
-# by mozconfig_config().
-#
-# Call this within src_install() phase, after copying the template
-# prefs file (if any) from ${FILESDIR}
-#
-# Example:
-#
-# inherit mozconfig-v6.46
-#
-# src_install() {
-# 	cp "${FILESDIR}"/gentoo-default-prefs.js \
-#	"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"  \
-#	|| die
-#
-# 	mozconfig_install_prefs \
-#	"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js"
-#
-#	...
-# }
-
-mozconfig_install_prefs() {
-	local prefs_file="${1}"
-
-	einfo "Adding prefs from mozconfig to ${prefs_file}"
-
-	# set dictionary path, to use system hunspell
-	echo "pref(\"spellchecker.dictionary_path\", \"${EPREFIX}/usr/share/myspell\");" \
-		>>"${prefs_file}" || 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);" \
-			>>"${prefs_file}" || 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\");" \
-			>>"${prefs_file}" || die
-		echo "sticky_pref(\"gfx.content.azure.backends\",\"cairo\");" \
-			>>"${prefs_file}" || die
-	fi
-}
diff --git a/eclass/mozcoreconf-v4.eclass b/eclass/mozcoreconf-v4.eclass
deleted file mode 100644
index ba9a65349fd1..000000000000
--- a/eclass/mozcoreconf-v4.eclass
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# @ECLASS: mozcoreconf-v4.eclass
-# @MAINTAINER:
-# Mozilla team <mozilla@gentoo.org>
-# @BLURB: core options and configuration functions for mozilla
-# @DESCRIPTION:
-#
-# inherit mozconfig-v6.* or above for mozilla configuration support
-
-# @ECLASS-VARIABLE: MOZILLA_FIVE_HOME
-# @DESCRIPTION:
-# This is an eclass-generated variable that defines the rpath that the mozilla
-# product will be installed in.  Read-only
-
-if [[ ! ${_MOZCORECONF} ]]; then
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='ncurses,sqlite,ssl,threads'
-
-inherit multilib toolchain-funcs flag-o-matic python-any-r1 versionator
-
-IUSE="${IUSE} custom-cflags custom-optimization"
-
-DEPEND="virtual/pkgconfig
-	${PYTHON_DEPS}"
-
-# @FUNCTION: mozconfig_annotate
-# @DESCRIPTION:
-# add an annotated line to .mozconfig
-#
-# Example:
-# mozconfig_annotate "building on ultrasparc" --enable-js-ultrasparc
-# => ac_add_options --enable-js-ultrasparc # building on ultrasparc
-mozconfig_annotate() {
-	declare reason=$1 x ; shift
-	[[ $# -gt 0 ]] || die "mozconfig_annotate missing flags for ${reason}\!"
-	for x in ${*}; do
-		echo "ac_add_options ${x} # ${reason}" >>.mozconfig
-	done
-}
-
-# @FUNCTION: mozconfig_use_enable
-# @DESCRIPTION:
-# add a line to .mozconfig based on a USE-flag
-#
-# Example:
-# mozconfig_use_enable truetype freetype2
-# => ac_add_options --enable-freetype2 # +truetype
-mozconfig_use_enable() {
-	declare flag=$(use_enable "$@")
-	mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}"
-}
-
-# @FUNCTION: mozconfig_use_with
-# @DESCRIPTION:
-# add a line to .mozconfig based on a USE-flag
-#
-# Example:
-# mozconfig_use_with kerberos gss-api /usr/$(get_libdir)
-# => ac_add_options --with-gss-api=/usr/lib # +kerberos
-mozconfig_use_with() {
-	declare flag=$(use_with "$@")
-	mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}"
-}
-
-# @FUNCTION: mozconfig_use_extension
-# @DESCRIPTION:
-# enable or disable an extension based on a USE-flag
-#
-# Example:
-# mozconfig_use_extension gnome gnomevfs
-# => ac_add_options --enable-extensions=gnomevfs
-mozconfig_use_extension() {
-	declare minus=$(use $1 || echo -)
-	mozconfig_annotate "${minus:-+}$1" --enable-extensions=${minus}${2}
-}
-
-moz_pkgsetup() {
-	# Ensure we use C locale when building
-	export LANG="C"
-	export LC_ALL="C"
-	export LC_MESSAGES="C"
-	export LC_CTYPE="C"
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD PKG_CONFIG
-
-	# Ensure that we have a sane build enviroment
-	export MOZILLA_CLIENT=1
-	export BUILD_OPT=1
-	export NO_STATIC_LIB=1
-	export USE_PTHREADS=1
-	export ALDFLAGS=${LDFLAGS}
-	# ensure MOZCONFIG is not defined
-	unset MOZCONFIG
-
-	# set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# nested configure scripts in mozilla products generate unrecognized options
-	# false positives when toplevel configure passes downwards.
-	export QA_CONFIGURE_OPTIONS=".*"
-
-	if [[ $(gcc-major-version) -eq 3 ]]; then
-		ewarn "Unsupported compiler detected, DO NOT file bugs for"
-		ewarn "outdated compilers. Bugs opened with gcc-3 will be closed"
-		ewarn "invalid."
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-# @FUNCTION: mozconfig_init
-# @DESCRIPTION:
-# Initialize mozilla configuration and populate with core settings.
-# This should be called in src_configure before any other mozconfig_* functions.
-mozconfig_init() {
-	declare enable_optimize pango_version myext x
-	declare XUL=$([[ ${PN} == xulrunner ]] && echo true || echo false)
-	declare FF=$([[ ${PN} == firefox ]] && echo true || echo false)
-	declare SM=$([[ ${PN} == seamonkey ]] && echo true || echo false)
-	declare TB=$([[ ${PN} == thunderbird ]] && echo true || echo false)
-
-	####################################
-	#
-	# Setup the initial .mozconfig
-	# See http://www.mozilla.org/build/configure-build.html
-	#
-	####################################
-
-	case ${PN} in
-		*xulrunner)
-			cp xulrunner/config/mozconfig .mozconfig \
-				|| die "cp xulrunner/config/mozconfig failed" ;;
-		*firefox)
-			cp browser/config/mozconfig .mozconfig \
-				|| die "cp browser/config/mozconfig failed" ;;
-		seamonkey)
-			# Must create the initial mozconfig to enable application
-			: >.mozconfig || die "initial mozconfig creation failed"
-			mozconfig_annotate "" --enable-application=suite ;;
-		*thunderbird)
-			# Must create the initial mozconfig to enable application
-			: >.mozconfig || die "initial mozconfig creation failed"
-			mozconfig_annotate "" --enable-application=mail ;;
-	esac
-
-	####################################
-	#
-	# CFLAGS setup and ARCH support
-	#
-	####################################
-
-	# Set optimization level
-	if [[ ${ARCH} == hppa ]]; then
-		mozconfig_annotate "more than -O0 causes a segfault on hppa" --enable-optimize=-O0
-	elif [[ ${ARCH} == x86 ]]; then
-		mozconfig_annotate "less then -O2 causes a segfault on x86" --enable-optimize=-O2
-	elif use custom-optimization || [[ ${ARCH} =~ (alpha|ia64) ]]; then
-		# Set optimization level based on CFLAGS
-		if is-flag -O0; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-O0
-		elif [[ ${ARCH} == ppc ]] && has_version '>=sys-libs/glibc-2.8'; then
-			mozconfig_annotate "more than -O1 segfaults on ppc with glibc-2.8" --enable-optimize=-O1
-		elif is-flag -O4; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-O4
-		elif is-flag -O3; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-O3
-		elif is-flag -O1; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-O1
-		elif is-flag -Os; then
-			mozconfig_annotate "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_annotate "Gentoo's default optimization" --enable-optimize=-O2
-		fi
-	else
-		# Enable Mozilla's default
-		mozconfig_annotate "mozilla default" --enable-optimize
-	fi
-
-	# Strip optimization so it does not end up in compile string
-	filter-flags '-O*'
-
-	# Strip over-aggressive CFLAGS
-	use custom-cflags || strip-flags
-
-	# Additional ARCH support
-	case "${ARCH}" in
-	alpha)
-		# Historically we have needed to add -fPIC manually for 64-bit.
-		# Additionally, alpha should *always* build with -mieee for correct math
-		# operation
-		append-flags -fPIC -mieee
-		;;
-
-	ia64)
-		# Historically we have needed to add this manually for 64-bit
-		append-flags -fPIC
-		;;
-
-	ppc64)
-		append-flags -fPIC -mminimal-toc
-		;;
-	esac
-
-	# We need to append flags for gcc-6 support
-	if [[ $(gcc-major-version) -ge 6 ]]; then
-		append-cxxflags -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2
-	fi
-
-	# Use the MOZILLA_FIVE_HOME for the rpath
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-	# Set MOZILLA_FIVE_HOME in mozconfig
-	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
-	####################################
-	#
-	# mozconfig setup
-	#
-	####################################
-
-	mozconfig_annotate disable_update_strip \
-		--disable-updater \
-		--disable-strip \
-		--disable-install-strip
-
-	# jemalloc won't build with older glibc
-	! has_version ">=sys-libs/glibc-2.4" && mozconfig_annotate "we have old glibc" --disable-jemalloc
-}
-
-# @FUNCTION: mozconfig_final
-# @DESCRIPTION:
-# Display a table describing all configuration options paired
-# with reasons, then clean up extensions list.
-# This should be called in src_configure at the end of all other mozconfig_* functions.
-mozconfig_final() {
-	declare ac opt hash reason
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options .mozconfig | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	# Resolve multiple --enable-extensions down to one
-	declare exts=$(sed -n 's/^ac_add_options --enable-extensions=\([^ ]*\).*/\1/p' \
-		.mozconfig | xargs)
-	sed -i '/^ac_add_options --enable-extensions/d' .mozconfig
-	echo "ac_add_options --enable-extensions=${exts// /,}" >> .mozconfig
-}
-
-_MOZCORECONF=1
-fi
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 05acb3c36207..cb009fec9762 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
index ee406a7c6f45..e860095242e1 100644
--- a/games-engines/scummvm/Manifest
+++ b/games-engines/scummvm/Manifest
@@ -1,6 +1,7 @@
 AUX scummvm-2.1.0-fluidsynth.patch 1393 BLAKE2B 080c704d493d21f0e5e4387bba0bf1a2354aaccf0e96b7383f956ef89eb973cf0cdf9f60a922a8e7bd25e520a6922a1879cc5614b42731c610c2c7da64033cad SHA512 6e577087ad6d67ee45d488c762ea41d4899001a31730c47cdf263619cc079e0abd3871aa8f947f681b6d59d76094c0278bd4ed8c2439ccc4d700aa32f860c318
+AUX scummvm-2.2.0-ultima_engine_lua_dep.patch 785 BLAKE2B 73c9ef3272ce9c71d1575775a966ff38b8369ab6cb68b3ce17353dc4b0ba7590020f7288451cfe5cb2ee94ccacfa33da1ca02389d82bcc8d8570e4f2139aaa58 SHA512 bb1e67955834b8e0544e58258f31e5fe8ba0e4ec701426cad6c032714708ce6928698de42b8a3ba7b1c0bb0eda87c6fd87c5162e396595956e70df0aa5beaac1
 DIST scummvm-2.1.2.tar.xz 27056972 BLAKE2B 0afedd27350ea80c3610106b7e09fd57aaebc8847eebdb180628559ca30f49d005a5466bd3991a76271eff39a782e8abf3bf1a3ace25909a1d9947a1b539d6c2 SHA512 a6462bc55d90a229e32389380504d6ecf0c836c8a6733775c993f8db34918ef1f9d0559acc7c110e98719b32cf84408a01021dcfa3fe5a821fe4265c1bc49ecc
 DIST scummvm-2.2.0.tar.xz 63652348 BLAKE2B b44a07d7ad6747b136465f81122464f02e5cc655c205d6f4424555311563f8ceaa8072972d05512af85d18fabba78d5ea9396ea314581776c1ef8d88ca6ab81b SHA512 001f884b9689386ef5b69ab8f5fa2362e1e4dc5e8273f96dc8dce1963be354a2fad95e724ff33d65008be7591519f0e2bac530ba3c44a449b8b7cac862f4f81e
 EBUILD scummvm-2.1.2.ebuild 2789 BLAKE2B 5b7cb6a8ae1f1fc3bc29d68ea541b4257ea4d22f2467b2e9a3054e463742dc089d0e8d4d0d721c56387ba8963edcb43dedf098d99ce7fa81491d1d61a0f5f7bc SHA512 cd0d059b6fed3c9cca2583f825a2c9bdc60fb96e00e82763e017a1d642558b3d30cdeb3a03f2bb1d27103fae09c57edaae4ebb38c40a012da4612012a463d32e
-EBUILD scummvm-2.2.0.ebuild 3119 BLAKE2B 149b183a549a62ad30e3beaeed05686aa88e38a387bd4788c3e240b382125e094d62a76616e45e4948e79cb826b5938cd73f65b1e93d6b81369ff1342b3a7b11 SHA512 229870874149b16cd95fe6f122d2afad5dc092eb96a3adb21961fe28370899975893a3275547fb6270b0a2b78f20bb5d92844c15a2527493179266a04eb38596
+EBUILD scummvm-2.2.0.ebuild 3012 BLAKE2B 35bc1755871d55348a3195ad998ad0c9dbcd1bac4fe8b0b52c940dbb7dbb15a8b576911f7e3780e411e42cc1dd5e4391868e223cd63f971771772c90f9e34963 SHA512 e1356c00c95363345c7254709a62cc891fcc94db7939af9e58d2655d384e41d492a392f2bd2a8d5af81ac438d0cf330814ecdc92badc2f94bf17bfa28f762bdc
 MISC metadata.xml 894 BLAKE2B f3331593c51c1863c697f45bf0cfd176e5b5db9596df56f75c09710a10ee09fd6bcf9b63b5577688fb536236bc7462f9ecd21c58faf7f135e79a54015e376c9b SHA512 52f617e20c0fb06697490d9f085dabeac806831e001e51a58bcfd9d805092edc8bf98b81f9e385fe428ed5a4e0bce7faa96e4e6adaf05023316dcc0e63237c97
diff --git a/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch b/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
new file mode 100644
index 000000000000..d73ad03820ea
--- /dev/null
+++ b/games-engines/scummvm/files/scummvm-2.2.0-ultima_engine_lua_dep.patch
@@ -0,0 +1,18 @@
+From d546389b10518eabd34fd5b4e22265069b25a966 Mon Sep 17 00:00:00 2001
+From: Paul Gilbert <dreammaster@scummvm.org>
+Date: Wed, 23 Sep 2020 19:10:17 -0700
+Subject: [PATCH] ULTIMA: Add lua as an engine dependency
+
+---
+ engines/ultima/configure.engine | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/engines/ultima/configure.engine b/engines/ultima/configure.engine
+index 6447e3eb7f96..704a79d1f61f 100644
+--- a/engines/ultima/configure.engine
++++ b/engines/ultima/configure.engine
+@@ -1,3 +1,3 @@
+ # This file is included from the main "configure" script
+ # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+-add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2"
++add_engine ultima "Ultima" yes "" "" "highres 16bit freetype2 lua"
diff --git a/games-engines/scummvm/scummvm-2.2.0.ebuild b/games-engines/scummvm/scummvm-2.2.0.ebuild
index 2c3d39e3e7a0..93e50eddec4f 100644
--- a/games-engines/scummvm/scummvm-2.2.0.ebuild
+++ b/games-engines/scummvm/scummvm-2.2.0.ebuild
@@ -54,6 +54,10 @@ BDEPEND="
 
 S="${WORKDIR}/${P/_/}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-ultima_engine_lua_dep.patch"
+)
+
 src_prepare() {
 	xdg_src_prepare
 
@@ -66,11 +70,6 @@ src_prepare() {
 		-e '/INSTALL.*\/pixmaps/d' \
 		-e 's/-s //' \
 		ports.mk || die
-
-	# Without lua linking of ultima engine fails
-	# Please remove with next version bump!!!
-	sed '/^add_engine/s@"$@ lua"@' \
-		-i engines/ultima/configure.engine || die
 }
 
 src_configure() {
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 8e188823fdc8..e69836abe317 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/mazesofmonad/Manifest b/games-roguelike/mazesofmonad/Manifest
deleted file mode 100644
index b70e9ac8f9a2..000000000000
--- a/games-roguelike/mazesofmonad/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mazesofmonad-1.0.9-time-1.5.patch 968 BLAKE2B 936e9539cd25ff08670c21032320d7eebff85a3aab76bb6774a66363770f5582cd627072d467043adea485a39e139d8bcb6cc7b30e65b62118227866f7d1d5ac SHA512 e93813f3cfd1966fc6ac20d8d651242c0ae3b881ea339de07ebb815db5f7d32f7ca5263c72d68fe2281997abc1a77893a26882e75bed09dd9e3a4a64d012116f
-DIST MazesOfMonad-1.0.9.tar.gz 56342 BLAKE2B 93e2466d76804538b87b601af39916e8c39a853d11added65dc5b3408dcb19b75e50edbb3bc484de1cb6ef01de46814cd95886738025c31d271c5c2d81b80e00 SHA512 a537672907f0bf356574b5c16b9b354cc73133958873e3dfc064f9de2ad7c18bed011f811887edc37c9b40de5529f7954889953946a79da29a255637e81d9612
-EBUILD mazesofmonad-1.0.9-r3.ebuild 816 BLAKE2B 4eeea02cc107411d1a47e10cfa4bc16d12605ae709ff42757a23a299a99e53c2cdb0c26876afd30f3045a98194c98e68a0ecd1db65ae2f3fcfed67c07bd461a6 SHA512 0a004dc7eb030e6a8b7f868c72120cde9870f519148016c68391f4a33dab13e9d606b9f742bb324d5d9991bda14f0d89a186660e69f253d7cc531b6107c818ef
-MISC metadata.xml 971 BLAKE2B 05b96c3bf5c2ac7c39e93b35cb7dd7c949bfcd4ba550100ca6e2d4cf084506c538f595e03a9b427a4a0f006cd0cdeeaf923d2a874036ee741220af26c9a3ba22 SHA512 fc715d7961b2b6421e8dba76a8f81a2f0ce814fdcf9eaae45c5c4a6509e253193f440924c56786f8e291cebaf1bfd5d3dbb6675f0d016c14ea17b97beec12eab
diff --git a/games-roguelike/mazesofmonad/files/mazesofmonad-1.0.9-time-1.5.patch b/games-roguelike/mazesofmonad/files/mazesofmonad-1.0.9-time-1.5.patch
deleted file mode 100644
index 11ef34ef45f9..000000000000
--- a/games-roguelike/mazesofmonad/files/mazesofmonad-1.0.9-time-1.5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/MazesOfMonad.cabal b/MazesOfMonad.cabal
-index db5e5bf..c3b427b 100644
---- a/MazesOfMonad.cabal
-+++ b/MazesOfMonad.cabal
-@@ -34,3 +34,3 @@ Executable mazesofmonad
-     regex-posix, containers, filepath, directory, pretty, 

--    array, mtl, old-locale, time					 

-+    array, mtl, old-locale, time, time-locale-compat 

- 

-diff --git a/src/MoresmauJP/Rpg/Save.hs b/src/MoresmauJP/Rpg/Save.hs
-index 12965b7..238b9b9 100644
---- a/src/MoresmauJP/Rpg/Save.hs
-+++ b/src/MoresmauJP/Rpg/Save.hs
-@@ -10,2 +10,3 @@ import Data.Maybe
- import Data.Time

-+import qualified Data.Time.Locale.Compat as DTLC

- 

-@@ -112,3 +113,3 @@ listGames rs name= do
-       if isJust $ bckGame bs 

--        then return $ Just (dropExtension x,formatTime defaultTimeLocale (iso8601DateFormat $ Just "%R") $ bckDate bs) 

-+        then return $ Just (dropExtension x,formatTime DTLC.defaultTimeLocale (DTLC.iso8601DateFormat $ Just "%R") $ bckDate bs) 

-         else return Nothing

diff --git a/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r3.ebuild b/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r3.ebuild
deleted file mode 100644
index b11d9b01d521..000000000000
--- a/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CABAL_FEATURES="bin"
-inherit eutils haskell-cabal
-
-MY_PN=MazesOfMonad
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Console-based roguelike Role Playing Game similar to nethack"
-HOMEPAGE="https://github.com/JPMoresmau/MazesOfMonad
-	https://hackage.haskell.org/package/MazesOfMonad"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/gmp-5:0=
-	dev-libs/libffi:="
-DEPEND="${RDEPEND}
-	>=dev-lang/ghc-7.4.1
-	>=dev-haskell/cabal-1.6
-	dev-haskell/hunit
-	dev-haskell/mtl
-	dev-haskell/random
-	dev-haskell/regex-posix
-	dev-haskell/time-locale-compat
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9-time-1.5.patch
-)
diff --git a/games-roguelike/mazesofmonad/metadata.xml b/games-roguelike/mazesofmonad/metadata.xml
deleted file mode 100644
index c264aaf1de4f..000000000000
--- a/games-roguelike/mazesofmonad/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		MazesOfMonad is a console-based Role Playing Game. You create
-		characters with their strong and weak points, and try to complete
-		mazes that are randomly generated. You can pick up gold and items
-		on the way, meet monsters, and deal with them as you want. You can
-		fight, use magic, bribe, trade, steal... This is only a simple game
-		that I did to see what building a full blown Haskell application
-		is like to develop. Versions 1.0.5 and above are complete
-		and working.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">JPMoresmau/MazesOfMonad</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index e23d0200ed71..da94cdc5d8b6 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/deponia-tcj/Manifest b/games-rpg/deponia-tcj/Manifest
new file mode 100644
index 000000000000..f3335d070b9b
--- /dev/null
+++ b/games-rpg/deponia-tcj/Manifest
@@ -0,0 +1,3 @@
+DIST DeponiaTCJ_3.3.0156_Full_DEB_DE_EN_FR_IT_RU_PL_Daedalic_ESD.tar.gz 8283369628 BLAKE2B 49d7dd83f14c8a79cbf398accab43e325e605728c24d0dcae9dbe2ab838757f0cfa122472cc665f19543e33a931c3debe70489a2b066716771b1d29298eb029f SHA512 77aa0ea4bd137fcb634e88528660920805e1c627df7db7ebc3fa488ff420b004acdaf17973c6bf3414e53e96df4e2ed6bc48e6f31b322e5ae488521a1477e2c0
+EBUILD deponia-tcj-3.3.0156.ebuild 1317 BLAKE2B b142750c15cdf1f7445d842a29a1c78c8fac471ea0e4a77a7f56c26a6369a41b076c1efb01fb76d088f7cbb6f88b904d1a29bf018dfa11bb278a0c8d04bd83b0 SHA512 098ef8125ddc352e54f7ef01e3f6d6b5a30ff3d5902ac2553e822eb88d65c3b152cc33cda103072b4014f40fe0fbfb6145b834487ffbf9bff127ccbad36ee610
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/deponia-tcj/deponia-tcj-3.3.0156.ebuild b/games-rpg/deponia-tcj/deponia-tcj-3.3.0156.ebuild
new file mode 100644
index 000000000000..eb2f670cf6b4
--- /dev/null
+++ b/games-rpg/deponia-tcj/deponia-tcj-3.3.0156.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+MY_PN="Deponia - The Complete Journey"
+DESCRIPTION="The Complete Journey: The first three Deponia point-and-click adventures"
+HOMEPAGE="https://www.daedalic.com/deponia"
+SRC_URI="DeponiaTCJ_${PV}_Full_DEB_DE_EN_FR_IT_RU_PL_Daedalic_ESD.tar.gz"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+RESTRICT="bindist fetch splitdebug strip"
+
+RDEPEND="
+	media-libs/libsdl2[opengl,video]
+	media-libs/openal
+	virtual/opengl
+"
+
+S="${WORKDIR}/${MY_PN}"
+
+DIR="/opt/${PN}"
+QA_PREBUILT="${DIR}/*"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store/deponia-the-complete-journey"
+	einfo "and move it to your distfiles directory."
+}
+
+src_prepare() {
+	default
+	rm libs64/libz.so.1 || die
+}
+
+src_install() {
+	exeinto "${DIR}"
+	doexe deponia_tcj
+
+	make_wrapper \
+		${PN} \
+		"env SDL_DYNAMIC_API=\"${EPREFIX}/usr/$(get_libdir)/libSDL2-2.0.so.0\" ./deponia_tcj" \
+		"${DIR}" \
+		"${DIR}/lib"
+
+	insinto "${DIR}"
+	doins -r \
+		  config.ini \
+		  data{,1,2,3}.vis \
+		  deponia{1,2,3}/ \
+		  lua/ \
+		  version.txt
+
+	exeinto "${DIR}"/lib
+	doexe libs64/*
+
+	make_desktop_entry ${PN} "${MY_PN}" applications-games
+	dodoc readme.txt
+}
diff --git a/games-rpg/deponia-tcj/metadata.xml b/games-rpg/deponia-tcj/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-rpg/deponia-tcj/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="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest
index d1b914c3bba5..a7d21817d790 100644
--- a/games-rpg/manaplus/Manifest
+++ b/games-rpg/manaplus/Manifest
@@ -1,6 +1,4 @@
-DIST manaplus-1.8.12.8.tar.xz 15041612 BLAKE2B dfd1ff9ca21ac9cf2647f636b8951335cd33d34badc29e6902e9fe031624bd4ce216ae2c30f24647e9ecdbb065877bcb6ef21f9a5f0b69a497c9baab25b6b694 SHA512 f57877f04404ed1021aa517e069e6a469ebb71a39fe9545264d1d9e55111c8263036c878493a8794ae77257fa3d90192505570276023282b060481ff6420587e
 DIST manaplus-1.9.3.23.tar.xz 15051860 BLAKE2B 6019799f13df0531ffcf662068f3dc85d31193a8db9fe6fa82b0c1c5740c527685efae822b800ca1836ec3ca00405f07ff368ecd3e0932465762e5f9efda7516 SHA512 0e74df08b4e18a826711c090e3ddf38da1b348c34acc1aff675c1f6c4dc523723a07b2b00d135a89ef136f11fe03f0dfc41e5830f0d6c34d5d44eb1414a2d361
-EBUILD manaplus-1.8.12.8.ebuild 3206 BLAKE2B 44eeb7c90c09361b85a1e8de57d874af8e8a0348f1170100cea2011f5c227ab04a6b52c510e40fff9765586de70b8200d08139031c746ac2c60e161938b4599e SHA512 ba9a4c7a8bfe409779e38b975d090e63e67afa29a4c5956ac527d1e50c0d3f6ab231413da9708d3051d97bd981de674944cbbf644912b6dfdca2d92a48dfd0b7
-EBUILD manaplus-1.9.3.23.ebuild 3231 BLAKE2B b080dccc586eecbef8be2aabefc72bef4fd02c10194ca1a0520d0bf43fbe360cd68acfff815f3d6fda0233817de2ca10e28945d7052612740ce62afdb05bf62e SHA512 2cb95539e4036541c00a89fcb5287cd897504c5e0d2a84e618e992f2f7ab058da2b6727082c938014a7d010f2994782ecd6dbb66333688aa5e5909973b65706a
-EBUILD manaplus-9999.ebuild 3206 BLAKE2B 44eeb7c90c09361b85a1e8de57d874af8e8a0348f1170100cea2011f5c227ab04a6b52c510e40fff9765586de70b8200d08139031c746ac2c60e161938b4599e SHA512 ba9a4c7a8bfe409779e38b975d090e63e67afa29a4c5956ac527d1e50c0d3f6ab231413da9708d3051d97bd981de674944cbbf644912b6dfdca2d92a48dfd0b7
+EBUILD manaplus-1.9.3.23.ebuild 3221 BLAKE2B 2a9d3a09228b89099201cffce07ea346f4aaf80c9126ed5a7e16b2a52d4c2070cd3e49f78f2b75e85f99426a67e2af4a75800fa4484975e9c62440eb391f2e46 SHA512 5013efed843c611d02218a62d3f389ee95e16c0bfa324dfa0aef78b7c887d470ca533e556f6f2240f706da8cdc5be19d7d1b9cfdf2403762ef9c8627ec070e67
+EBUILD manaplus-9999.ebuild 3196 BLAKE2B e08f8aed0fcb4d3c5164445bd0a4cf21eff7fcf4b838a98013ab2d22956d0c3ffda429fed02d0b4c53a7e392f4a74f909e104af66b53c93eb35492a77fd62fb8 SHA512 f05dff2e5138b2c0aec3478c951ecf358a5f0fe8ce57dc64e518e858fa62fee1079d6d2e8f9b65cbce1066912f9fad24031038a16c78b0d1dbea1e234127f0b7
 MISC metadata.xml 583 BLAKE2B a80e8b93497192e2f791f59ec8b09828daef0b03dc0fc5d37934ba79e564682cf3a12c8220d0e694685c0bc69aa2747c7fa07ab57ad82d40f55b18ab19dd6533 SHA512 18bb3e28b1a977edf857c93c6e1f15b56af67a29afa4b49f12a796aa8368c3e7d25144005befebe012194cee0b4cae1a3bd7616f272243a508908bb4532403e3
diff --git a/games-rpg/manaplus/manaplus-1.8.12.8.ebuild b/games-rpg/manaplus/manaplus-1.8.12.8.ebuild
deleted file mode 100644
index 3e516d72a9eb..000000000000
--- a/games-rpg/manaplus/manaplus-1.8.12.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
-HOMEPAGE="http://manaplus.evolonline.org"
-if [[ ${PV} == 9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
-else
-	SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="mumble nls opengl pugixml +sdl2 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-games/physfs-1.0.0
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/mplus-outline-fonts
-	media-fonts/wqy-microhei
-	media-libs/libpng:0=
-	net-misc/curl
-	sys-libs/zlib
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-misc/xdg-utils
-	mumble? ( media-sound/mumble )
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )
-	pugixml? ( dev-libs/pugixml )
-	!pugixml? ( dev-libs/libxml2 )
-	sdl2? (
-		media-libs/libsdl2[X,opengl?,video]
-		media-libs/sdl2-gfx
-		media-libs/sdl2-image[png]
-		media-libs/sdl2-mixer[vorbis]
-		media-libs/sdl2-net
-		media-libs/sdl2-ttf
-	)
-	!sdl2? (
-		media-libs/libsdl[X,opengl?,video]
-		media-libs/sdl-gfx
-		media-libs/sdl-image[png]
-		media-libs/sdl-mixer[vorbis]
-		media-libs/sdl-net
-		media-libs/sdl-ttf
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localedir=/usr/share/locale
-		--without-internalsdlgfx
-		$(use_with mumble)
-		$(use_enable nls)
-		$(use_with opengl)
-		--enable-libxml=$(usex pugixml pugixml libxml)
-		$(use_with sdl2)
-		$(use_enable test unittests)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local destpath="/usr/share/${PN}"
-	dosym ../../../fonts/dejavu/DejaVuSans-Bold.ttf "${destpath}"/data/fonts/dejavusans-bold.ttf
-	dosym ../../../fonts/dejavu/DejaVuSans.ttf "${destpath}"/data/fonts/dejavusans.ttf
-	dosym ../../../fonts/dejavu/DejaVuSansMono-Bold.ttf "${destpath}"/data/fonts/dejavusansmono-bold.ttf
-	dosym ../../../fonts/dejavu/DejaVuSansMono.ttf "${destpath}"/data/fonts/dejavusansmono.ttf
-	dosym ../../../fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${destpath}"/data/fonts/dejavuserifcondensed-bold.ttf
-	dosym ../../../fonts/dejavu/DejaVuSerifCondensed.ttf "${destpath}"/data/fonts/dejavuserifcondensed.ttf
-	dosym ../../../fonts/liberation-fonts/LiberationMono-Bold.ttf "${destpath}"/data/fonts/liberationsansmono-bold.ttf
-	dosym ../../../fonts/liberation-fonts/LiberationMono-Regular.ttf "${destpath}"/data/fonts/liberationsansmono.ttf
-	dosym ../../../fonts/liberation-fonts/LiberationSans-Bold.ttf "${destpath}"/data/fonts/liberationsans-bold.ttf
-	dosym ../../../fonts/liberation-fonts/LiberationSans-Regular.ttf "${destpath}"/data/fonts/liberationsans.ttf
-	dosym ../../../fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${destpath}"/data/fonts/mplus-1p-bold.ttf
-	dosym ../../../fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/data/fonts/mplus-1p-regular.ttf
-	dosym ../../../fonts/wqy-microhei/wqy-microhei.ttc "${destpath}"/data/fonts/wqy-microhei.ttf
-}
-
-src_test() {
-	make check
-}
diff --git a/games-rpg/manaplus/manaplus-1.9.3.23.ebuild b/games-rpg/manaplus/manaplus-1.9.3.23.ebuild
index 9d34cbd23db8..85e22dbccd84 100644
--- a/games-rpg/manaplus/manaplus-1.9.3.23.ebuild
+++ b/games-rpg/manaplus/manaplus-1.9.3.23.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
-HOMEPAGE="http://manaplus.evolonline.org"
+HOMEPAGE="https://manaplus.org"
 if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
diff --git a/games-rpg/manaplus/manaplus-9999.ebuild b/games-rpg/manaplus/manaplus-9999.ebuild
index 3e516d72a9eb..3b6efa37c423 100644
--- a/games-rpg/manaplus/manaplus-9999.ebuild
+++ b/games-rpg/manaplus/manaplus-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
-HOMEPAGE="http://manaplus.evolonline.org"
+HOMEPAGE="https://manaplus.org"
 if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 8a30276874ff..a379f8141529 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 7827de2cbec7..710f2e277d3d 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -2,7 +2,7 @@ AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70
 AUX bedrock-server.initd-r1 1558 BLAKE2B 5d65fe612092777002e9e4b0b62041aa1637e6c6aaaebb64c1be956cfa7ceb355afb337c4d84ef6e66c25167a3544c9bb0791843cb2bf98aca7c712eef02e143 SHA512 fa2c99461650d99ad45e63d7b2166431882e6fb5a73795a468a837a46a3ab47ce641ce0aee8e4ca220f25422af128746f24125da6a3fbb35829f27c1bd397c23
 AUX bedrock-server.initd-r2 2026 BLAKE2B ed212537e0a0d1a5e714aa0f4e72915ba3142580a1c1e46f9f88d06b8d8176de0bd5ab5134e915537583d20e4e3dbfba9e10ab1281bd84b8361f6ca01d1eab81 SHA512 8a6ab7277604cdc4677fde5d745e0c02a557538a4d73adc44873f49a01715eb878b48a56e51b6019aa814325543b509f8403cf351570d1b35ef1e07e98828c9c
 DIST bedrock-server-1.16.1.02.zip 69830343 BLAKE2B c35d68f8527df9c6b96662ded02f8195ecb0bc11fa2cd93b3a0f4522cf6cbe4332f76749cc5d688179fa810edaf7c3dbb8244ad7bef1a2ee73205ab0852cc9ac SHA512 c8a79167c22e86e93e38c5a1e3d35911247011e954d49539cb8a33eb1345d49c085a1682efd4dda9681a0d1123f9caac3c4deba88e48fcccf4d1f0f7dea878b8
-DIST bedrock-server-1.16.20.03.zip 69934892 BLAKE2B 17beeff7a00b47c99eaf2d3552c3ec1af8902c16e945e6df745ba5c82cc201effde8083868a18ae58920af8bd3517d02393ca9ab3533b858a4ef84aa539d6eb2 SHA512 b7b6621dfa6855ca15a3bdd2e6f55de48d5e53b1afd0adaf0a2f595fd3b962831e0cef65b0eb2d18c4dce19baf18bbbfb6d314b2026ae8a03adf4ff9a568c314
+DIST bedrock-server-1.16.40.02.zip 69910097 BLAKE2B 6c074a3f99bcd9dfe0214a43550d08714af9a58ee619765bf6713b59b997c1c322bba906966c18181fdb3c5e3e5791140fa49d25146820b649f30ace1c147adb SHA512 e0d012719a413656ed0f4b8ffc0ca96d537e3dbfc306ce8e05d757442e209ce2b1f9a43c1152c3a36ed251a35f68f6072401742e1ab2cf75d75ef9420232702b
 EBUILD bedrock-server-1.16.1.02.ebuild 1058 BLAKE2B aa58efb9b838a7f9c1f0659d0687fd985fc210ade149b0f64f89f3da19e6ea248cf98e7b9b9cfad6d1345ee4032ef8db67d962d95981c366a5a7c8c04da8fc77 SHA512 4eebb8ac43662595706b80d06d0844ec083f44478554073e4843b548eeddebf11ce890d66f160b0b205a2f1c2d20e76ef9f7627d8dc397594816619cd49122df
-EBUILD bedrock-server-1.16.20.03-r1.ebuild 1119 BLAKE2B b76800f2862d9a9237cb22b877a03b607b84f7cf12572d75b0b52bb0360c641033e53a3f14ab82c62ce44af71ac2690e7d28a0ba9530fd3cb1261446272a00e1 SHA512 1672257c9b81808bd913712167d152a981f5cf9deca0224a057e4c25f5bbacef0b7dcf6fe72080efd47b807d3b7b00639db344c143468c2d95f82663bcb9e1d4
+EBUILD bedrock-server-1.16.40.02.ebuild 1119 BLAKE2B b76800f2862d9a9237cb22b877a03b607b84f7cf12572d75b0b52bb0360c641033e53a3f14ab82c62ce44af71ac2690e7d28a0ba9530fd3cb1261446272a00e1 SHA512 1672257c9b81808bd913712167d152a981f5cf9deca0224a057e4c25f5bbacef0b7dcf6fe72080efd47b807d3b7b00639db344c143468c2d95f82663bcb9e1d4
 MISC metadata.xml 675 BLAKE2B 3ec51700c778a9fc9aaf65c9d1a3eac6f55a7db55a24a63c6c1e3890a0e84ab0cf85eadb9b6044529841d87570a47e8674dfe94405587ee2a54f496aedbde374 SHA512 4c1236b575d84e2cb657477c446b0a09e150e19db654acc24ff5fa9e6ad5953c5b14901192845714476c8a3c894e6a32f570c17aedd68e244bd4d93d13fd92b5
diff --git a/games-server/bedrock-server/bedrock-server-1.16.20.03-r1.ebuild b/games-server/bedrock-server/bedrock-server-1.16.40.02.ebuild
index a60cb02addb6..a60cb02addb6 100644
--- a/games-server/bedrock-server/bedrock-server-1.16.20.03-r1.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.16.40.02.ebuild
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 623914d69908..068c3bfd78f5 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -5,7 +5,7 @@ AUX minecraft-server.confd-r1 528 BLAKE2B 77155dc2d0878495419d141feeafcd34bb04a8
 AUX minecraft-server.initd-r3 1542 BLAKE2B c0c3a173b0f5b30bbe75c753ccd6759264298782bae8b268caa8936d4e293df1aaa7453a086c97bd5336fa9537565ddacd96b8ab3b7ecf35265476e4b5e665ba SHA512 ff6d6ed5cfae16e6db25664c4476b5335b566248b05dd92e6761aa6023aabf1191d43c5730fc3ac8242e7035887b7ab5114ea45910991a805a2c27b8b5a80077
 AUX minecraft-server.initd-r4 1996 BLAKE2B 34c4d6e41135224cf1b4bf96d93059897448a8646cb659ef63eb57cc45fbf9b766db5dce80aaad22062d4232eab1a55e2d6b2938aac0dae0fe6d8c897acc0b0f SHA512 fdc4cbc89852e2538f332911acec281e83f185534a996a83c5eb2094be7245a892b7a8139fb77a50b49abaf8e311bf629a21fee0f85906ecd87abce865740ae0
 DIST minecraft-server-1.16.1.jar 37968964 BLAKE2B 08c9f3f5b7c5618fd55b40e77a3ab92ed2d8cdf64771fe171292045ee611b6c549f0e732ed3dec2553f2219c219ff8f9b2187563717be14edbffa68ceb05b555 SHA512 8fa8bf001cb50e59351f58598fdbd4b7b13cee8d5a6ae7d4486f6259d419c8101123cb18efc96cac7c796ca98483d6d1e9ac3888d6b364d81b86927aee3f350d
-DIST minecraft-server-1.16.2.jar 37942337 BLAKE2B 538eef87ecfaa13c55a2a177a813914761ff6bc91f5017016207ff90af7eaa02432c3277d01c42b55cfc173f4654d202f954e0058c77b2200c1cebd6839a0021 SHA512 c95500c30e7008784766d8fea2356949eb8477ad7f1eed5e6aa478929468d05437ed322d5c805c26e430a59301f5c96cad79aa258412870ecc0ddc4efe13550f
+DIST minecraft-server-1.16.3.jar 37942656 BLAKE2B 1ed70ac476dd202797f46a4844519d816f17c272d0703791d74b651fa8ac4c343a6939b50c5a0230d5bf149a564af6c7603297f0b114ce9fd2487f4bebef1c7e SHA512 ef9956ec55638b54e21e3b504ba2d2ce1b9d09769b5e118a36fbf2d97bd84a5bb49adf9a07328ae3e1c9fd76fe3da0b7d56baaa77bdc55b99d0f45039ada2ac3
 EBUILD minecraft-server-1.16.1.ebuild 1046 BLAKE2B 57d1b7cb7e65473306991b283c8fde425bf6ae67b7773ed466e83170e9f899d7184a9585a40ed63619d57595c15e308d9dd7c38255ab6bb1d8178dc1efe48754 SHA512 acd4e9863e33f8fb491c7805190a36d8a9698f78bc092052488540fd2b00a21cab84431ee69e63ad3d6447e4039a5d469472ce98d0a95145378a859247cb8d1a
-EBUILD minecraft-server-1.16.2-r1.ebuild 1078 BLAKE2B 44f502b7c1104558df71e43388fa158d044b5aedf16eb96641256892598fab9176ebc4b1224445a13ce3459b286531b794d11c377600fb8edda1595d3741064c SHA512 f014e1259b3e39e9fe823ba152d9afb6b1e0c87fcbfa25988faab9ae5ff93068d8e718cdfbd43541ca68f373c685c5d6c44caf02eb0ed2bb3b3e05178db92ed6
+EBUILD minecraft-server-1.16.3.ebuild 1101 BLAKE2B 6571a15b27f72bbf81decf0c92c64255423357818460a16a1b7d2c1229a68aea03d09b0f640cff465557694b60afe85c7e123b2d43a44637ca83a998e1331dfb SHA512 f6c45cadb50d7b22c756b41561222356b98313b57b56aca0d1629d06b4135357db3b02ec47abc5aba60a64e3d86c5be739ffa1f14af4711076f4c02fba037fa4
 MISC metadata.xml 934 BLAKE2B 96dae32908e92724e43b4fe1c75e8e861be515567de1866e7fb67c66aad9869ac8094c2537c0b852fe937b64e1a8f5276532c9377fe96401328aa2b70adbe462 SHA512 1930ef90ba19556269a83c934252712bedd92eb218f0773d9656a81bc447c88837dfa2a931da0f660c343fa85cb259e6997485e7e28810b0ece034481c99a784
diff --git a/games-server/minecraft-server/minecraft-server-1.16.2-r1.ebuild b/games-server/minecraft-server/minecraft-server-1.16.2-r1.ebuild
deleted file mode 100644
index e219f3882840..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.16.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="c5f6fb23c3876461d46ec380421e42b289789530"
-README_GENTOO_SUFFIX="-r1"
-
-inherit readme.gentoo-r1 java-pkg-2
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	acct-group/minecraft
-	acct-user/minecraft
-	app-misc/dtach
-	|| (
-		>=virtual/jre-1.8
-		>=virtual/jdk-1.8
-	)
-"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
-}
-
-src_install() {
-	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
-	java-pkg_dolauncher minecraft-server --jar minecraft-server.jar --java_args "\${JAVA_OPTS}"
-
-	newinitd "${FILESDIR}"/minecraft-server.initd-r4 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.16.3.ebuild b/games-server/minecraft-server/minecraft-server-1.16.3.ebuild
new file mode 100644
index 000000000000..3d8866f30ac2
--- /dev/null
+++ b/games-server/minecraft-server/minecraft-server-1.16.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="f02f4473dbf152c23d7d484952121db0b36698cb"
+README_GENTOO_SUFFIX="-r1"
+
+inherit readme.gentoo-r1 java-pkg-2
+
+DESCRIPTION="The official server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/minecraft
+	acct-user/minecraft
+	app-misc/dtach
+	|| (
+		>=virtual/jre-1.8
+		>=virtual/jdk-1.8
+	)
+"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
+	java-pkg_dolauncher minecraft-server --jar minecraft-server.jar --java_args "\${JAVA_OPTS}"
+
+	newinitd "${FILESDIR}"/minecraft-server.initd-r4 minecraft-server
+	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 9d7a28bc57ec..36b8a71b9016 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index c0fefdbc0472..6566319f54c2 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,7 +1,8 @@
 AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
+AUX flightgear-2020.1.2-boost.patch 302 BLAKE2B 8abe7fc003ec905ed15983ab68672235ffd5f69a411ad4dd62f2f02dea9a72144d4e807e770fee6108bee865f5020da7e21c1b4a683a197e7f18072932347dfb SHA512 62ff4c8b77ea006ea881e8ff1b691a0f67c564859db52ab213ae833d41ae1fb71b73982a5ccc3ff0aa8d37b57679c70cae6521200b0432489471c151769b9538
 AUX flightgear-2020.1.2-cmake.patch 2064 BLAKE2B ca5f3e0f2aae4b8ccc3ec6504826a045ada095db234cf98e593b0303b530d18d5c6199fd128702b72ec7b94fff3714ee567744b928fe4a02fb195fba6a0d66d8 SHA512 fd208f009d81827108dd2f0488152c63a7d1e4f53bdacd5b6ac29f6c4b8bcfac5a22bcb49bd88a21daf61cccf2cc3362072d0f98be41a59f29239fed3b3f3e0a
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2020.1.2.tar.bz2 8504580 BLAKE2B 699db9490e27b3de82bcf2903321c7ee24784e6a96285784bb449eb05fb23f3a0417d015ea10a55992c3783c0e42a2cda7e591d998532145213d1941811b1725 SHA512 a27897a1e23fe78c64717df1a86ef37dba047a1942af1dd2e4e3f3da05975bb5c524ee03444c8067551966d6a1bbfe36866f2617fa6fe1f6b957d5769c31058c
-EBUILD flightgear-2020.1.2.ebuild 4411 BLAKE2B 84df38dd2b90a49fdb7f1b1f4db63ca3e81487a983ea41e81f9d703268fc3ddc190c04dc823873035a3e0c20fd2e7eb1531a3cb793523e28e8fe451e41bb0659 SHA512 aeeb4695c6b2fe85306680edfcc2034748b307752ca2307b8ffd144554a25ba1168f1940b04f4af743e715ed4aec7742183a8c8a4041706dd64fa3dd1f38c540
+EBUILD flightgear-2020.1.2.ebuild 4443 BLAKE2B d324ee1b454a441d169e65b3747ce8051cc1d7243a18f8b0b0786bd1df862b183b2a580313ac514fedf59bd4113d783dcf11dc7e1b956cbc3d18b20489957bdb SHA512 d15a09aa298f034a71299eca91d0066cf9a806ca054b9857de35c564416ae4b93b5f150f30b9c6d79da8c6f0273305b731f11415dbf25fe8cf545e5b26734d3b
 EBUILD flightgear-9999.ebuild 4461 BLAKE2B d66adce51f48fc462dadd2fe069d6b0696490614518f5d258c180f38546a103f7ee1df7df68f6b76612d072c6d4d04a4817edccbd5e8f54104d816dd2fcd981b SHA512 86fbff4a29c5a830b8178aa1501f70a3dc68f344fb0e62bfbce234be901a61d4e11b99351f1ed34b664c66e7032bb8903dded07bb08ee9fcb007363a7504b522
 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch b/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch
new file mode 100644
index 000000000000..43e2a7d0cb13
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -515,7 +515,7 @@
+     set(NOMINMAX 1)
+ endif(WIN32)
+
+-set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
++set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG")
+
+ # append the SIMD flags if requested
+ if (ENABLE_SIMD)
diff --git a/games-simulation/flightgear/flightgear-2020.1.2.ebuild b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
index 3a428d9e25ad..5ea0ecfd8591 100644
--- a/games-simulation/flightgear/flightgear-2020.1.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
@@ -65,6 +65,7 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2020.1.2-cmake.patch"
+	"${FILESDIR}/${P}-boost.patch"
 )
 
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 4fe787fa4b24..fdcdbbaaae31 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -3,14 +3,10 @@ AUX openrct2-0.2.4-include-additional-paths.patch 1583 BLAKE2B b21e59cfaa37b2115
 AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151fa7613ed4aef76257b3d8d47bdc48d4e13314115ed5eb9e713a09213ca5c43906f13ce7929ef6795a5ab53a0c75000e3b SHA512 0d955664b28e68e39134438034c0559ee56a98fa7cd16dc5b90a1290f59defe700f4653ad053b4ca403f13f35cb822c0b063a0ff3777996c6049cd686a9a724f
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
-DIST openrct2-0.2.6.tar.gz 11094308 BLAKE2B 4aed899fee4735a0237558c1c34f67f37ecc9b8138f8a66314a9abc013cf10ad3a9f80fd5159afc5860ded780d4c705fd9e394b38f981aac90c8cee883356996 SHA512 abe7c344b7588b169c95ffe0ab9028f72614d9b5783d81fa4f97f206d90d8cbaa0b91f04314c10926dbd5f68bba166558c428557f598abb343d306800611fb24
 DIST openrct2-0.3.0.tar.gz 11754657 BLAKE2B 66d956fd85829bc6b4825a59db9f3a3eebbb1e4565a4c8afdb8c05d9d7b3f339f75ff1d9fbc0a0f48d3c0673ac3fc335fb6bec5fe458513de2a0611ccfa3d48d SHA512 585bcd7a077114dc5332b95cb44f7c689e47fcbd7cff7c2ab32a24253a4fd87f50e79f40f9428c79ea6bc6d8cd88019b4edfce88509c03bc2d43854926d21317
-DIST openrct2-objects-1.0.14.zip 2237331 BLAKE2B 39a0c92674abc0d16fc3dd463b68e2ee8f3f7dd1c2a944d5448173ca58e6c3c4a79092a40e66ac8e919f75be2d2d691a76dc046e41caf7237138815a4e6ad526 SHA512 66e7a55ca894f2ea11af1c6300f934ef00f659137dded06f54bf749f490ff6063f95da800ae3cbfbbffe1c3e7d995e307d1281d57e4454ded6fed5affde84f8e
 DIST openrct2-objects-1.0.16.zip 3056214 BLAKE2B 7d8d938ba20ce612f7845dce1038134ec60d7e17e0f7d78a67480ae1ae2e6f8dd043f266742acd2dbd8539390349a2dcd7b8c73859a3caef3b5cd8565a4ec1c7 SHA512 2a8696467320f7894330d0fbb4894dd6effb2d6844fcf643e1f8e15a7b0b45411a7c205b75a9e9d7ea0627bc70b7a7e1e2213e0f7db1c7b489ae8b485670dba5
 DIST openrct2-replays-0.0.17.zip 1825315 BLAKE2B 9c22b52302c37abe5e802662eb4b6805fa3e229a71ab9f901b57eee30641ae4b86de9b1315476d158a3feb57c6be2a26c1ccca7c94328fe35bf57b46e2364c32 SHA512 103a8ba5b5b2dd76c18b642720d262553bb15ad26d59892f895327bf5e87b73e476b255af6556286faacb668aae49aa1ee29a14bcca2bb75d855383d12e60f4a
-DIST openrct2-replays-0.0.9.zip 1817119 BLAKE2B 3c63a0acf991487e667ae43ac987b8ee936ce77ad4eb75209d09e41f85b72550856c84d93bdbee1541a994ffbf9bc956b5366d77d760ebd7ed1dab0dffbf7885 SHA512 8066a664c12df047e64b9a049e39da6a4e366adfc60824a7a6c33e526c3a5a9afbc05d1dd11ff81eddbec0783445275d2be8cbe8141031fbeaefe8ea95cd1a7b
 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
-EBUILD openrct2-0.2.6.ebuild 3808 BLAKE2B 0e6f14d6e194d58d0247218158492ac5e4694c5c13187706845ed04ccd6bb2f02a7937463ddeba8c68561a5faf0d6936b722e92860a0081654a40e104fa30e87 SHA512 69c87253337dea795269486d7be95ba364508d3f7bebb915ac7193e894e567218f4c2163f73a1ea441d2cd7110e44caf1fc2e828649d1f4128c812942e6a56d2
 EBUILD openrct2-0.3.0.ebuild 3937 BLAKE2B 7faff348ee62eae118db29824537a27eb326de846b71b848e573a46bae81bf1d9fc72204b74451eee9ed9f7e025acde11f85795732d0a7594bc3b0ca0a7536b1 SHA512 d4f0eac48b8b96a473477bf6f2e433467b9c99dce2ad7ea25ca91f08f5471edc72b2ac009d6e2376f088e6e9d8d69b89dbbefd1d27fea44b84446b4b48f53e0e
 EBUILD openrct2-9999.ebuild 3899 BLAKE2B 227af822417f2961bda6e7eca0b2b90e3344b5addefc9e4245262c72fd322ae558b6f0d1ef8f3d6e1df7f6d810a250f4e9056cea9a7aecfeccb9079253942c71 SHA512 f9776de8b7c109549869a51e953d0d20bd1cc01746ec1047c7b0d4eaeeeefe8cf78669fa3f4b5214089b2a72867e9cd7e440ef487222fa68f6c9282d34a8d1d9
-MISC metadata.xml 1351 BLAKE2B 6ca9cf2f5109ad0af23bed39cfedcd77901a342ed4c5e85c79609f80a85792d8f203cabf96ceee46ba7aea47fad4c4713b38cd3712a2c2b820df3aca29ebf406 SHA512 5f0492cc2b92e4593398175db7d3604e2edaadfac95f8759341fbcd9b893025c18cd7666f9fe5c32d7c28900c1ee604858cd8d23a5863986fec853e23d47bc02
+MISC metadata.xml 1275 BLAKE2B e75ea799a2a2d31ddb8fdd7b0bdcda99d0c1b7a2e327f8f4b305ec10b95084486cd12aa7bfa53ee3d32e5369ce44d2c6e6cb243786eb24cfc495ec31ec87605b SHA512 d749fe317f6745193f65ed1d83f28cfe7faf30c36f469e3842c354d6418bfa17f73d7ce40aae4f7271cfd7f86e91f700243ea21a177b35a681d8f20d47c60830
diff --git a/games-simulation/openrct2/metadata.xml b/games-simulation/openrct2/metadata.xml
index 533b34deeec8..e3926e076550 100644
--- a/games-simulation/openrct2/metadata.xml
+++ b/games-simulation/openrct2/metadata.xml
@@ -17,7 +17,6 @@
 	<use>
 		<flag name="lightfx">Enables LightFX for better lightning effects.</flag>
 		<flag name="scripting">Enable the <pkg>dev-lang/duktape</pkg> scripting engine for executing user scripts.</flag>
-		<flag name="twitch">Enables streaming of ingame content to Twitch.</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/OpenRCT2/OpenRCT2/issues</bugs-to>
diff --git a/games-simulation/openrct2/openrct2-0.2.6.ebuild b/games-simulation/openrct2/openrct2-0.2.6.ebuild
deleted file mode 100644
index 856708edc6e4..000000000000
--- a/games-simulation/openrct2/openrct2-0.2.6.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils readme.gentoo-r1 xdg-utils
-
-MY_PN="OpenRCT2"
-MY_PN_OBJ="objects"
-MY_PN_RPL="replays"
-MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.0.14"
-MY_PV_RPL="0.0.9"
-MY_PV_TS="0.1.2c"
-
-DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.org/"
-SRC_URI="
-	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
-	https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
-	test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="dedicated libressl +lightfx +opengl test +truetype twitch"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	dev-libs/jansson
-	dev-libs/libzip:=
-	media-libs/libpng:0=
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2
-		media-libs/speexdsp
-		opengl? ( virtual/opengl )
-		twitch? (
-			net-misc/curl[ssl]
-		)
-	)
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	truetype? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dedicated? (
-		acct-group/openrct2
-		acct-user/openrct2
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
-	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
-)
-
-src_unpack() {
-	unpack "${P}".tar.gz
-
-	mkdir -p "${S}"/data/title || die
-	cd "${S}"/data/title || die
-	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
-
-	mkdir -p "${S}"/data/object || die
-	cd "${S}"/data/object || die
-	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
-
-	if use test; then
-		mkdir -p "${S}"/testdata/replays || die
-		cd "${S}"/testdata/replays || die
-		unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Don't treat warnings as errors.
-	sed -e 's/-Werror//' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	# Note: There is currently no support for Disord-RPC and Google Benchmark,
-	# as both packages do not exist in Gentoo, so support for them has been disabled.
-	local mycmakeargs=(
-		-DDISABLE_DISCORD_RPC=ON
-		-DDISABLE_GOOGLE_BENCHMARK=ON
-		-DDISABLE_GUI=$(usex dedicated)
-		-DDISABLE_HTTP_TWITCH=$(usex !twitch)
-		-DDISABLE_NETWORK=OFF
-		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
-		-DDISABLE_TTF=$(usex !truetype)
-		-DDOWNLOAD_OBJECTS=OFF
-		-DDOWNLOAD_REPLAYS=OFF
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DENABLE_LIGHTFX=$(usex lightfx)
-		-DPORTABLE=OFF
-		-DSTATIC=OFF
-		$(usex test "-DSYSTEM_GTEST=ON" "")
-		-DWITH_TESTS=$(usex test)
-		-DUSE_MMAP=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# Since the tests need the OpenRCT2 data,
-	# we need to symlink them into the build directory,
-	# otherwise some tests will fail, as they don't find the OpenRCT2 data.
-	# It is currently not possible to override that path.
-	# See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
-	ln -s "${S}"/data "${BUILD_DIR}" || die
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use dedicated; then
-		newinitd "${FILESDIR}"/openrct2.initd openrct2
-		newconfd "${FILESDIR}"/openrct2.confd openrct2
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 158ed6f9434a..21730d8fb39c 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/gamemode/Manifest b/games-util/gamemode/Manifest
index ee24a8ec482b..cd9734955296 100644
--- a/games-util/gamemode/Manifest
+++ b/games-util/gamemode/Manifest
@@ -1,4 +1,4 @@
-DIST gamemode-1.2.tar.xz 38536 BLAKE2B af39b8c0585c522afa72238b8332a6a5301d36b3c53e50652a78c41788eae9f5cb319cad06eaf6f345c50f934e188df4c78d70efbad919dd6897d3350d14e568 SHA512 233602e5e93b6cfcc742510dafb00dc826000d0c8618a693e9a579dc3b31c546d22c0545084cfb78c6085226e6b0e26c066078bc1871d36d5fb90828cf63cea9
-EBUILD gamemode-1.2.ebuild 3297 BLAKE2B 083dfd5cb67d5b855c0992cf302643b585cf1e2cb7a3ab05dd3626e61b0371572fcdc4f655881752655d8f5a6248e2dcf421600c3285dbfc2f9a892ef6923a6d SHA512 619065fdc7332b2b202e6298769edef14b596a94ba25981488efa585380262c684b48877eeb3fe45fc3a601d0c6c4b82c772b3e9d4f1d19a18ec40c01aee1093
-EBUILD gamemode-9999.ebuild 3297 BLAKE2B 083dfd5cb67d5b855c0992cf302643b585cf1e2cb7a3ab05dd3626e61b0371572fcdc4f655881752655d8f5a6248e2dcf421600c3285dbfc2f9a892ef6923a6d SHA512 619065fdc7332b2b202e6298769edef14b596a94ba25981488efa585380262c684b48877eeb3fe45fc3a601d0c6c4b82c772b3e9d4f1d19a18ec40c01aee1093
+DIST gamemode-1.6.tar.xz 69916 BLAKE2B 2fbb680de4043a004a91005647208fd9ca25de250bffe97acc0cabea47dba90d1ef670478582203d616704ea1f5a771115aadef4971e1e41f078104116b08cc4 SHA512 7cb4f4dd51b35e3a0164092342be56ce70bf1a81a8ff071725b429378cf92a100e263bc33890d5f5e281ad87fb72e2f820cb716c5aedf14f387610dcb59eb690
+EBUILD gamemode-1.6.ebuild 4081 BLAKE2B 523fc99e01e1aebcad288dd512bea3cc36ee1f3e9befba642a6765061040e39f3a50bf3407c56b15fe38d0695a976830492ec8e70a44f5efaa7db60bb379a15b SHA512 ff3cd661e6c685d7187128f5e4d5f78622ce4f4b37665d348f07dd11264711ab9f55e398ba75784c616e72372e28e7f744b41064ed50fde78044bfbc425571be
+EBUILD gamemode-9999.ebuild 4081 BLAKE2B 523fc99e01e1aebcad288dd512bea3cc36ee1f3e9befba642a6765061040e39f3a50bf3407c56b15fe38d0695a976830492ec8e70a44f5efaa7db60bb379a15b SHA512 ff3cd661e6c685d7187128f5e4d5f78622ce4f4b37665d348f07dd11264711ab9f55e398ba75784c616e72372e28e7f744b41064ed50fde78044bfbc425571be
 MISC metadata.xml 530 BLAKE2B 14e10e8800bca7ad7e412916ee250a4c9dbc5ed78feb99fbb9ec1feb6cc60cbf96494676eaf48200781f9e25bd330d97e16e7cbd46120df79a3e7affb8361d7e SHA512 6a080b2ec0af531ef9c5d989927a2bef7dd8870c27a5edccc9e61bc9c35cb8bc11c1b781aa003dbca470a2c8172b10f5317be6cca6c6d3d6bef206e91fe7e75c
diff --git a/games-util/gamemode/gamemode-1.2.ebuild b/games-util/gamemode/gamemode-1.2.ebuild
deleted file mode 100644
index 45b778ba90e2..000000000000
--- a/games-util/gamemode/gamemode-1.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-
-inherit meson multilib-minimal ninja-utils user
-
-DESCRIPTION="Optimise Linux system performance on demand"
-HOMEPAGE="https://github.com/FeralInteractive/gamemode"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/FeralInteractive/gamemode.git"
-	GAMEMODE_GIT_PTR="master"
-	inherit git-r3
-else
-	GAMEMODE_GIT_PTR="${PV}"
-	SRC_URI="https://github.com/FeralInteractive/gamemode/releases/download/${GAMEMODE_GIT_PTR}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=sys-apps/systemd-236[${MULTILIB_USEDEP}]
-	sys-auth/polkit
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	elog
-	elog "GameMode needs a kernel capable of SCHED_ISO to use its soft realtime"
-	elog "feature. Examples of kernels providing that are sys-kernel/ck-source"
-	elog "and sys-kernel/pf-sources."
-	elog
-	elog "Support for soft realtime is completely optional. It may provide the"
-	elog "following benefits with systems having at least four CPU cores:"
-	elog
-	elog "  * more CPU shares allocated exclusively to the game"
-	elog "  * reduced input lag and reduced thread latency"
-	elog "  * more consistent frame times resulting in less microstutters"
-	elog
-	elog "You probably won't benefit from soft realtime mode and thus don't need"
-	elog "SCHED_ISO if:"
-	elog
-	elog "  * Your CPU has less than four cores because the game may experience"
-	elog "    priority inversion with the graphics driver (thus heuristics"
-	elog "    automatically disable SCHED_ISO usage then)"
-	elog "  * Your game uses busy-loops to interface with the graphics driver"
-	elog "    but you may still force SCHED_ISO per configuation file, YMMV,"
-	elog "    it depends on the graphics driver implementation, i.e. usage of"
-	elog "    __GL_THREADED_OPTIMIZATIONS or similar."
-	elog "  * If your game causes more than 70% CPU usage across all cores,"
-	elog "    SCHED_ISO automatically turns off and on depending on usage and"
-	elog "    is processed with higher-than-normal priority then (renice)."
-	elog "    This auto-switching may result in a lesser game experience."
-	elog
-	elog "For more info look at:"
-	elog "https://github.com/FeralInteractive/gamemode/blob/${GAMEMODE_GIT_PTR}/README.md"
-	elog
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			-Dwith-examples=false
-			-Dwith-daemon=false
-		)
-	fi
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-	if multilib_is_native_abi; then
-		insinto /etc/security/limits.d
-		newins - 45-gamemode.conf <<-EOF
-			@gamemode - nice -10
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	enewgroup gamemode
-
-	elog
-	elog "GameMode can renice your games. You need to be in the gamemode group for this to work."
-	elog "Run the following command as root to add your user:"
-	elog "# gpasswd -a USER gamemode  # with USER = your user name"
-	elog
-
-	elog "Enable and start the daemon in your systemd user instance, then add"
-	elog "LD_PRELOAD=\$LD_PRELOAD:/usr/\$LIB/libgamemodeauto.so %command%"
-	elog "to the start options of any steam game to enable the performance"
-	elog "governor as you start the game."
-	elog
-}
diff --git a/games-util/gamemode/gamemode-1.6.ebuild b/games-util/gamemode/gamemode-1.6.ebuild
new file mode 100644
index 000000000000..b84faf4b7183
--- /dev/null
+++ b/games-util/gamemode/gamemode-1.6.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit meson multilib-minimal ninja-utils systemd
+
+DESCRIPTION="Optimise Linux system performance on demand"
+HOMEPAGE="https://github.com/FeralInteractive/gamemode"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/FeralInteractive/gamemode.git"
+	GAMEMODE_GIT_PTR="master"
+	inherit git-r3
+else
+	GAMEMODE_GIT_PTR="${PV}"
+	SRC_URI="https://github.com/FeralInteractive/gamemode/releases/download/${GAMEMODE_GIT_PTR}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="systemd elogind"
+
+REQUIRED_USE="^^ ( systemd elogind )"
+
+RDEPEND="
+	acct-group/gamemode
+	dev-libs/inih
+	sys-apps/dbus[${MULTILIB_USEDEP},systemd(+)=,elogind(-)=]
+	sys-auth/polkit
+	sys-libs/libcap
+"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	CHANGELOG.md
+	LICENSE.txt
+	README.md
+	example/gamemode.ini
+)
+
+pkg_pretend() {
+	elog
+	elog "GameMode needs a kernel capable of SCHED_ISO to use its soft realtime"
+	elog "feature. Examples of kernels providing that are sys-kernel/ck-sources"
+	elog "and sys-kernel/pf-sources."
+	elog
+	elog "Support for soft realtime is completely optional. It may provide the"
+	elog "following benefits with systems having at least four CPU cores:"
+	elog
+	elog "  * more CPU shares allocated exclusively to the game"
+	elog "  * reduced input lag and reduced thread latency"
+	elog "  * more consistent frame times resulting in less microstutters"
+	elog
+	elog "You probably won't benefit from soft realtime mode and thus don't need"
+	elog "SCHED_ISO if:"
+	elog
+	elog "  * Your CPU has less than four cores because the game may experience"
+	elog "    priority inversion with the graphics driver (thus heuristics"
+	elog "    automatically disable SCHED_ISO usage then)"
+	elog "  * Your game uses busy-loops to interface with the graphics driver"
+	elog "    but you may still force SCHED_ISO per configuation file, YMMV,"
+	elog "    it depends on the graphics driver implementation, i.e. usage of"
+	elog "    __GL_THREADED_OPTIMIZATIONS or similar."
+	elog "  * If your game causes more than 70% CPU usage across all cores,"
+	elog "    SCHED_ISO automatically turns off and on depending on usage and"
+	elog "    is processed with higher-than-normal priority then (renice)."
+	elog "    This auto-switching may result in a lesser game experience."
+	elog
+	elog "For more info look at:"
+	elog "https://github.com/FeralInteractive/gamemode/blob/${GAMEMODE_GIT_PTR}/README.md"
+	elog
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dwith-sd-bus-provider=$(usex systemd "systemd" "elogind")
+		-Dwith-systemd-user-unit-dir="$(systemd_get_userunitdir)"
+	)
+	if ! multilib_is_native_abi; then
+		emesonargs+=(
+			-Dwith-examples=false
+			-Dwith-sd-bus-provider=no-daemon
+		)
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+	if multilib_is_native_abi; then
+		insinto /etc/security/limits.d
+		newins - 45-gamemode.conf <<-EOF
+			@gamemode - nice -10
+		EOF
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "GameMode has optional support for adjusting nice and ioprio of games"
+	elog "running with it. You may need to adjust your PAM limits to make use"
+	elog "of this. You need to be in the gamemode group for this to work."
+	elog
+	elog "Run the following command as root to add your user:"
+	elog "# gpasswd -a USER gamemode  # with USER = your user name"
+	elog
+	elog "You can run the following command to test your settings:"
+	elog
+	elog "# gamemoded -t"
+	elog
+	elog "GameMode supports GPU optimizations. It defaults to OFF. Any"
+	elog "damage resulting from usage of this is your own responsibility."
+	elog
+	elog "systemd user sessions will automatically run the daemon on demand,"
+	elog "it does not need to be enabled explicitly. Games not supporting"
+	elog "GameMode natively can still make use of it, just add"
+	elog
+	elog "gamemoderun %command%"
+	elog
+	elog "to the start options of any steam game to enable optimizations"
+	elog "automatically as you start the game."
+	elog
+}
diff --git a/games-util/gamemode/gamemode-9999.ebuild b/games-util/gamemode/gamemode-9999.ebuild
index 45b778ba90e2..b84faf4b7183 100644
--- a/games-util/gamemode/gamemode-9999.ebuild
+++ b/games-util/gamemode/gamemode-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 
-inherit meson multilib-minimal ninja-utils user
+inherit meson multilib-minimal ninja-utils systemd
 
 DESCRIPTION="Optimise Linux system performance on demand"
 HOMEPAGE="https://github.com/FeralInteractive/gamemode"
@@ -22,18 +22,30 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+IUSE="systemd elogind"
+
+REQUIRED_USE="^^ ( systemd elogind )"
 
 RDEPEND="
-	>=sys-apps/systemd-236[${MULTILIB_USEDEP}]
+	acct-group/gamemode
+	dev-libs/inih
+	sys-apps/dbus[${MULTILIB_USEDEP},systemd(+)=,elogind(-)=]
 	sys-auth/polkit
+	sys-libs/libcap
 "
 DEPEND="${RDEPEND}"
 
+DOCS=(
+	CHANGELOG.md
+	LICENSE.txt
+	README.md
+	example/gamemode.ini
+)
+
 pkg_pretend() {
 	elog
 	elog "GameMode needs a kernel capable of SCHED_ISO to use its soft realtime"
-	elog "feature. Examples of kernels providing that are sys-kernel/ck-source"
+	elog "feature. Examples of kernels providing that are sys-kernel/ck-sources"
 	elog "and sys-kernel/pf-sources."
 	elog
 	elog "Support for soft realtime is completely optional. It may provide the"
@@ -64,14 +76,18 @@ pkg_pretend() {
 }
 
 multilib_src_configure() {
-	local myconf=()
+	local emesonargs=(
+		-Dwith-sd-bus-provider=$(usex systemd "systemd" "elogind")
+		-Dwith-systemd-user-unit-dir="$(systemd_get_userunitdir)"
+	)
 	if ! multilib_is_native_abi; then
-		myconf+=(
+		emesonargs+=(
 			-Dwith-examples=false
-			-Dwith-daemon=false
+			-Dwith-sd-bus-provider=no-daemon
 		)
 	fi
-	meson_src_configure "${myconf[@]}"
+
+	meson_src_configure
 }
 
 multilib_src_compile() {
@@ -89,17 +105,28 @@ multilib_src_install() {
 }
 
 pkg_postinst() {
-	enewgroup gamemode
-
 	elog
-	elog "GameMode can renice your games. You need to be in the gamemode group for this to work."
+	elog "GameMode has optional support for adjusting nice and ioprio of games"
+	elog "running with it. You may need to adjust your PAM limits to make use"
+	elog "of this. You need to be in the gamemode group for this to work."
+	elog
 	elog "Run the following command as root to add your user:"
 	elog "# gpasswd -a USER gamemode  # with USER = your user name"
 	elog
-
-	elog "Enable and start the daemon in your systemd user instance, then add"
-	elog "LD_PRELOAD=\$LD_PRELOAD:/usr/\$LIB/libgamemodeauto.so %command%"
-	elog "to the start options of any steam game to enable the performance"
-	elog "governor as you start the game."
+	elog "You can run the following command to test your settings:"
+	elog
+	elog "# gamemoded -t"
+	elog
+	elog "GameMode supports GPU optimizations. It defaults to OFF. Any"
+	elog "damage resulting from usage of this is your own responsibility."
+	elog
+	elog "systemd user sessions will automatically run the daemon on demand,"
+	elog "it does not need to be enabled explicitly. Games not supporting"
+	elog "GameMode natively can still make use of it, just add"
+	elog
+	elog "gamemoderun %command%"
+	elog
+	elog "to the start options of any steam game to enable optimizations"
+	elog "automatically as you start the game."
 	elog
 }
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 48d7b4715110..7942c4e69ae6 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,9 +1,9 @@
 AUX configforced-1.15.1.py 153 BLAKE2B 135edf54e69c985693bcdde747eba5e46f7ed1390a77e1a1d40c0a624f3605c3ec8dad2f3526cbd8f406ed39fc67d3b027b7e7e462bbfa48c5649c71f0692da6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe
 AUX pyfa-2.9.3-import-pyfa.patch 666 BLAKE2B 13b67511a64be93335453b617e1fad56768c9c582da4ebbef36b4848aca225220e2057c0fab088a060cc2149aed961f2063a1a34326b71f0cf3bb411105a77a7 SHA512 a0174726777d82229dcd167b005e176012a9c4398f066f183bf0b8d59bd1854411e74bca1c3848396a8c50be327c8ec4e21dde6d56d045b2af4cd13a68e0cc99
 AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
-DIST pyfa-2.22.1.tar.gz 12629381 BLAKE2B acec4f0f495a7abd78a663435b0a049f8be37320abea0d916c6a8f38b75c1f07683b60c9e20b8feb0533fdcfc881ac3069c87e8360be52f05afce63334ff1baa SHA512 98c84c3806d8ff632ebe9c1386f8b407f310ff58b0963406093dc9297faaf690a90b34387013f59c76fdd87055ecf8736b449f99131aaf9eb497970a4ee003b2
 DIST pyfa-2.24.1.tar.gz 12648921 BLAKE2B 5715d81144df32cad83eb21d7f8800eb9773139e9305402a5096c585362fcabd0d705529a8887a8c8092637b8348d2a7e8a77e1f6eb362fd83ea39a86203ccb4 SHA512 ffe8a6e9c9c9b593516d9ba76ccb9e69788124132de642f45f5527468645d46f75e4c2388bb5f01788eb85f3e535ade110cfffc92c2943d96f477b5652528328
-EBUILD pyfa-2.22.1.ebuild 2736 BLAKE2B 07514287b38574103cd7a544746ed6239200c5d87fb6a4bb01c54924d905e83d73845db97b9abbde2645d7624f74c79c4f059196f98074e01fc8ae6fdcf77e83 SHA512 52d49bc2495ace6ac45d1fd19950b196dd04f63376f3b02e4abec3a983bd7dc32e55192abc25d8ff8f6dcb645d214ee5faa81e858d3851e06aeda25bfd4d9270
+DIST pyfa-2.28.3.tar.gz 12685191 BLAKE2B b73663479e39f8948de0ad0de3edb3a89b65bb5b6640332e8fed39f33b222fbc0f4b47487112b01895413fa751ee8dabcde2083a3f3a6b90fe0ad72b24165434 SHA512 7e432658eedb8dfbc9cd41d3ab7da3bf1d411e6935ad56434af1551eeae4de803f3d5447bff4fd5d569d20f1f3eca9acaa1ac22c163bec1ac7720807643b4187
 EBUILD pyfa-2.24.1.ebuild 2736 BLAKE2B 07514287b38574103cd7a544746ed6239200c5d87fb6a4bb01c54924d905e83d73845db97b9abbde2645d7624f74c79c4f059196f98074e01fc8ae6fdcf77e83 SHA512 52d49bc2495ace6ac45d1fd19950b196dd04f63376f3b02e4abec3a983bd7dc32e55192abc25d8ff8f6dcb645d214ee5faa81e858d3851e06aeda25bfd4d9270
+EBUILD pyfa-2.28.3.ebuild 2653 BLAKE2B 5948ed19d3c7d541f07f288c5c412218abaf89b18a602347b2432e86b7501aa773492f87ee3df380b323f516f91cc9f77da401124de0a562973bb7064f310d47 SHA512 c97653fbfd494abe3246d25eab0df846a7357a2f65a5ade6238aca0895f07a0555cc2c77e7b1144cd49c1c92523c7e5375bbdcc7d034ef574378d84921f19ec8
 EBUILD pyfa-9999.ebuild 2736 BLAKE2B 07514287b38574103cd7a544746ed6239200c5d87fb6a4bb01c54924d905e83d73845db97b9abbde2645d7624f74c79c4f059196f98074e01fc8ae6fdcf77e83 SHA512 52d49bc2495ace6ac45d1fd19950b196dd04f63376f3b02e4abec3a983bd7dc32e55192abc25d8ff8f6dcb645d214ee5faa81e858d3851e06aeda25bfd4d9270
 MISC metadata.xml 744 BLAKE2B b87f7086163bc63184cbc2ccae8d5db50dd7133d70dd1c737b8c7c180c3069550eb0eb4e216133236d62edfa066fcb7eded8702e16b17360230434a366d5d8ea SHA512 d52dc69cc53d2c6a6fffa3c8c097c74f6d6657d0cbb135bdb5bd9fb9e13a56c7b13deed6eec55d7a88617392543ea2a3a2a29d7c35140765a0f8a04b84b919c6
diff --git a/games-util/pyfa/pyfa-2.22.1.ebuild b/games-util/pyfa/pyfa-2.22.1.ebuild
deleted file mode 100644
index 00faae6993c0..000000000000
--- a/games-util/pyfa/pyfa-2.22.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-
-inherit desktop eutils python-single-r1 xdg-utils
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ all-rights-reserved"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/Pyfa-${PV}"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="mirror bindist"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_MULTI_USEDEP}]
-	')
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown2-2.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_MULTI_USEDEP}]
-	')"
-BDEPEND="app-arch/zip"
-
-PATCHES=(
-	# fix import path in the main script for systemwide installation
-	"${FILESDIR}/${PN}-2.9.3-import-pyfa.patch"
-)
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py
-
-	default
-
-	# make python recognize pyfa as a package
-	touch __init__.py || die
-
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		-e "s:%%EPREFIX%%:${EPREFIX}:" \
-		"${FILESDIR}/configforced-1.15.1.py" > configforced.py || die
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		pyfa.py > pyfa || die
-}
-
-src_install() {
-	python_moduleinto ${PN}
-	python_domodule eos gui service utils graphs
-	python_domodule config*.py __init__.py version.yml configforced.py db_update.py
-	python_doscript pyfa
-
-	insinto /usr/share/${PN}
-
-	einfo "Creating database ..."
-	python ./db_update.py || die
-	doins eve.db
-
-	einfo "Compressing images ..."
-	pushd imgs > /dev/null || die
-	zip -r imgs.zip * || die "zip failed"
-	doins imgs.zip
-	popd > /dev/null || die
-
-	dodoc README.md
-	doicon -s 32 imgs/gui/pyfa.png
-	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-util/pyfa/pyfa-2.28.3.ebuild b/games-util/pyfa/pyfa-2.28.3.ebuild
new file mode 100644
index 000000000000..50ffcdd37c25
--- /dev/null
+++ b/games-util/pyfa/pyfa-2.28.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+
+inherit desktop edos2unix python-single-r1 xdg
+
+DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
+HOMEPAGE="https://github.com/pyfa-org/Pyfa"
+
+LICENSE="GPL-3+ all-rights-reserved"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/Pyfa-${PV}"
+fi
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="mirror bindist"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wxpython-4.0.6[webkit,${PYTHON_MULTI_USEDEP}]
+	')
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown2-2.3.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/matplotlib-3.1.2[wxwidgets,${PYTHON_MULTI_USEDEP}]
+	')"
+BDEPEND="app-arch/zip"
+
+PATCHES=(
+	# fix import path in the main script for systemwide installation
+	"${FILESDIR}/${PN}-2.9.3-import-pyfa.patch"
+)
+
+src_prepare() {
+	# get rid of CRLF line endings introduced in 1.1.10 so patches work
+	edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py
+
+	default
+
+	# make python recognize pyfa as a package
+	touch __init__.py || die
+
+	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+		-e "s:%%EPREFIX%%:${EPREFIX}:" \
+		"${FILESDIR}/configforced-1.15.1.py" > configforced.py || die
+	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+		pyfa.py > pyfa || die
+}
+
+src_install() {
+	python_moduleinto ${PN}
+	python_domodule eos gui service utils graphs
+	python_domodule config*.py __init__.py version.yml configforced.py db_update.py
+	python_doscript pyfa
+
+	insinto /usr/share/${PN}
+
+	einfo "Creating database ..."
+	${EPYTHON} ./db_update.py || die
+	doins eve.db
+
+	einfo "Compressing images ..."
+	pushd imgs > /dev/null || die
+	zip -r imgs.zip * || die "zip failed"
+	doins imgs.zip
+	popd > /dev/null || die
+
+	dodoc README.md
+	doicon -s 32 imgs/gui/pyfa.png
+	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
+	domenu "${FILESDIR}/${PN}.desktop"
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index f5c8ff1b8b83..0ad23fc9e8da 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 61e011c4f027..06029621fbf3 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,6 +1,5 @@
 DIST gnome-keyring-3.34.0.tar.xz 1333768 BLAKE2B 0237eb7ac0b7146d096c58cac4c788a92680f1a6dd321949f295935bde206263e5ee1762c9d393dfbc10322d018e835333c823d11e8af5dc01434555886626dd SHA512 09f84bdf5ea415a55baf6a57dba2889cdf592005d273335029107ea3f83152447b3263cd190810930aae41af22dd508e765e649da3c8a9afa127db1d298bb72a
 DIST gnome-keyring-3.36.0.tar.xz 1345360 BLAKE2B f37454e0e42dcc1fe7e29e95dcb8ca7bc2db10e6b262b796421b4fd38b87fe9128a4c2f129d28d14716a2f9a7d60061d4b345e9564e73a0587faf24a7d2b1194 SHA512 e5aed36ad109cbd2dcb534843f8565829366acc955cadc6e9bbe87ebbb6a8a907211aa3a42f7f26148ac69726af2f9238965707d1259319435bd20aa8c4859ed
 EBUILD gnome-keyring-3.34.0.ebuild 2160 BLAKE2B 80a51431743d8dd3f81a0c63f3e4b15050ff4617f9fff822408d397a02bbe31cfe815949f2a02506d95023066011b3be98dda8818ffb34b8a0f24b81a5c18706 SHA512 274e62f0f8efd11dad00b8d9e16338e7e342b865ed14aae22548364487f2856e0ab388d00d7e20660825633457e5b5542014db5dfef7a5c884803daee5604035
-EBUILD gnome-keyring-3.36.0-r1.ebuild 2268 BLAKE2B 96a308c4b11a82b4e4efd19e5c3476beab9a55b71ade6e054e69871ae16ceb63a368a000a53054566d15c50bb9537a2003e710f423ada058da871ae9202812bd SHA512 fb444bc0a79138f381246d473919086fe767b3ee6ff7a7ac7a7481889330082c79766ff1a74e0f17856fb68b17092aea89681dad47f4d1ad9591e534b666cafa
-EBUILD gnome-keyring-3.36.0.ebuild 2163 BLAKE2B 6dffcf1cc44b37d07afeac8008e4b3939c5dd0d6aab12d0a3f0266a348b3258de8af02034b3d3321fc8545a0ef9304b78e24f2fda025a2850261d154cf8126a9 SHA512 bafa2814bae337a7cbcf8d1b3624c7c803191a071c0cd3ff24bd97f9ccaef1b48c482699e6a3e56d97fd514655d03bf1d0df0a382762ad1b7c768c626f597b44
+EBUILD gnome-keyring-3.36.0.ebuild 2264 BLAKE2B f23d07e44e3a84a4b085eccaf68c4fc6f5988888f00036a4737b97c830d1c1e885af3ba49027801b653ee3e4bf91e124370244164eb95113cc2973e89208d14e SHA512 5572f037695fea0e843268e9cf638daffcf6f55ec770c31a61741859e5067bb0efc9f2623252e617fb38b8171e58a4d7ed68de03589b76ff00d6ed9c773ab6be
 MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.36.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.36.0-r1.ebuild
deleted file mode 100644
index aa54f87539b6..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.36.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit fcaps gnome2 pam python-any-r1 virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+caps pam selinux +ssh-agent test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
-RDEPEND="
-	>=app-crypt/gcr-3.27.90:=[gtk]
-	>=dev-libs/glib-2.44:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:0=
-	caps? ( sys-libs/libcap-ng )
-	pam? ( sys-libs/pam )
-	selinux? ( sec-policy/selinux-gnome )
-	>=app-crypt/gnupg-2.0.28:=
-	ssh-agent? ( net-misc/openssh )
-"
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-pinentry-0.5
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid CFLAGS with debug enabled
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		$(use_enable ssh-agent) \
-		--enable-doc
-}
-
-src_test() {
-	# Needs dbus-run-session to not get:
-	# ERROR: test-dbus-search process failed: -6
-	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx dbus-run-session emake check
-}
-
-pkg_postinst() {
-	# cap_ipc_lock only needed if building --with-libcap-ng
-	# Never install as suid root, this breaks dbus activation, see bug #513870
-	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-
-	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
-		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
-		ewarn " # eselect pinentry set pinentry-gnome3"
-	fi
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
index 597152fa3d0a..1f7e6cfbd500 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
@@ -62,8 +62,10 @@ src_configure() {
 }
 
 src_test() {
+	# Needs dbus-run-session to not get:
+	# ERROR: test-dbus-search process failed: -6
 	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check
+	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx dbus-run-session emake check
 }
 
 pkg_postinst() {
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index c011cafd07d1..7f154c174b89 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,4 +1,4 @@
 AUX 3.12.0-vala-0.42-compat.patch 811 BLAKE2B 1f50e441d0483d3748db1ed7d18e581df2887160a16afe7bb8a47890e162349cd5611070ea11ceef1273c8d4865b7f5ead6bfad14a171ca5d21d32d7a8811468 SHA512 12e16ca43044ca96a4f5abdd3d982bfd705e17df2630505154ad1592dbb8ce1bad66c4624a992084a1533d58fd96c178a5d4c147c79a5074183ceaaf54dde998
 DIST libgnome-keyring-3.12.0.tar.xz 435092 BLAKE2B 16e02ce3509b98e325658fc64e5731a872a050a9bf1b39dc81347a53aaee2fd4726ab9b0a41c7451249954a01144488e720f8356e77dda5bc9da5f78416d30e1 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd
-EBUILD libgnome-keyring-3.12.0-r1.ebuild 2101 BLAKE2B 5563cbb91d8cf702bad279a341f79c2010eafa735b9920b4a32d03e0cea592810f7943fe43def1ed5d1cfd16cf90fa4e5c42d5ddcb89d0271da1598d64d9844f SHA512 9dd20635f7864861c5180cff31bbc6b318dd9279abb75fb70a41972870a655a0f8756774948d9984bfb35a8cf9e46f5a7d8b21eda2fc9d52469de6f9ab727aa3
+EBUILD libgnome-keyring-3.12.0-r1.ebuild 1600 BLAKE2B 1c01c314f1988c048787930d03ec216a4e22334ffc713d99315ebc5950155e1aa2de93362f53c6cab8cfad2fde53888d100105e407dbb8166daf663c7ad451e1 SHA512 4145bcbc2982433bc2507989f4709ea4bee2467674cf20d14bd3420527436190e9028d0b229d272daf08a313518b765f42dd99f9659f5c2cf8037c68b7ea2cec
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
index 30c0398c00e8..7a5b74562aac 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="yes"
+EAPI="6"
 GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.16"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
 
-inherit gnome2 python-any-r1 vala multilib-minimal
+inherit gnome2 vala multilib-minimal
 
 DESCRIPTION="Compatibility library for accessing secrets"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
 
 LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
 SLOT="0"
-IUSE="debug +introspection test vala"
-RESTRICT="!test? ( test )"
+IUSE="debug +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 
+# tests need python2
+RESTRICT="test"
+
 RDEPEND="
 	>=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}]
 	>=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}]
@@ -32,25 +31,11 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} $(python_gen_any_dep '
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]') )
 	vala? ( $(vala_depend) )
 "
 
-python_check_deps() {
-	if use test; then
-		has_version "dev-python/pygobject:2[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-vala-0.42-compat.patch
+	eapply "${FILESDIR}"/${PV}-vala-0.42-compat.patch
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 
@@ -62,6 +47,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ') \
 		$(multilib_native_use_enable vala)
 
 	if multilib_is_native_abi; then
@@ -72,8 +58,3 @@ multilib_src_configure() {
 multilib_src_install() {
 	gnome2_src_install
 }
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	dbus-launch emake check || die "tests failed"
-}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 7980499fbbad..a1efe87d70e0 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 75738870492e..24c3974c78ff 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -3,6 +3,6 @@ DIST network-manager-applet-1.16.0.tar.xz 1944244 BLAKE2B b5181474da55d9b320d217
 DIST network-manager-applet-1.18.0.tar.xz 1950696 BLAKE2B d89f4d3c94af2c6bf514fc388fc445415b50508bf7e26f7888d8e212a63879abb24bf860002372bcae71eee94c3b8e9f2bfa9f16814a3537b0f81c486f82e396 SHA512 adca7c723600ec1cb2eed0110e369cf707fde1d64a81489440a167516d178a501fe883c08db06371b8aac896188eb2037a7577ecca721d764be33f4025a386d4
 DIST network-manager-applet-1.8.24.tar.xz 2062132 BLAKE2B fed75ab78e05b59a4f20c7570b84ac6fe3dd2cf6f8ad060f6c65bc9e2a32e29d295fc919de1037ba30c2609d35079dccb3f625ffc019150c9c69cfa94388e2c8 SHA512 76e914ec4f2e6eadd21ccc3e1f613fb97cb72d9551730a1dc09454177365dcaa2cdeea4b855c53732ad6a22cfa5e62e03f09fc8b04a277ce213dcf8c3beaf77c
 EBUILD nm-applet-1.16.0.ebuild 1219 BLAKE2B c8707d4e45ebeee88390da129fa33b80af68a2e269776cf92f06ab9aecee64d7afc1a525be33c68fe66f91d05f27ad9d0185500ab919fa3999869e28d8ad69e3 SHA512 d43c76284ca2bcbcb02edbd5f985ec6a44ceed40d3dda90a10dc8bcdfe08206a8323a5c1a9ef6332bfb05ddf8971dad0a31af9817d8654cef26b337444f2cfb1
-EBUILD nm-applet-1.18.0.ebuild 1216 BLAKE2B e250ead71c40fdd601e64428b2fecf6ae2c465273a1603fbbda8ac7d64cca22e69bd48bf040762dadc49047f6737a3f6cf50238363074c26cda2e5256044d149 SHA512 1960ee235241e1593218c522aa47c644464ae544abaada3f9a78e4d93dc79d6f8a3010ef2ed871d0faf42d8244e74f4d99a0b5e65630ffc194831f39b2967d2f
+EBUILD nm-applet-1.18.0.ebuild 1215 BLAKE2B 22d62c390598ef99ccaeb3b63a982ca54ae5133f0674f5a6b274c174d969e1a0d95c23f8329dbf67551b118a401fc03cccbb9fe18701c34f9a066b0860ce3a00 SHA512 145e19c08aa3eea796b2dc7183d3e2932ffb8d5e7cce48765a78e6dfedda37f6f8f7c2adf00b7b0df37c0841c152f0b3ad689e39b17ebd5ca74497bed624e611
 EBUILD nm-applet-1.8.24-r1.ebuild 1769 BLAKE2B 0b45a7183222fd774830e2ace5d253392d107c35621c83b4195cbbaff7a081a937166b505dbd1a434b3d6fc9c885141fbde7f75e999ea41b8b0bbbfa6b85cc9a SHA512 30956c606f4a35c346ee2260582053bb41137724fc3c7a46d4a3a4d6a8cafe924b27d5f272e6bdcb71e6df9f676fa72d3a38351793c1f2eee8c63248a28e3898
 MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
diff --git a/gnome-extra/nm-applet/nm-applet-1.18.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.18.0.ebuild
index 369754efb888..011be93bb87a 100644
--- a/gnome-extra/nm-applet/nm-applet-1.18.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="appindicator modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index 15bd0b219532..a0a2f090de48 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/terminal/Manifest b/gnustep-apps/terminal/Manifest
index cce00b0fcae4..38418e6bf481 100644
--- a/gnustep-apps/terminal/Manifest
+++ b/gnustep-apps/terminal/Manifest
@@ -1,6 +1,4 @@
 AUX terminal-0.9.9-fno-common.patch 504 BLAKE2B 7f4ea52ab125d3c7a5b6c6a70b261cb8e1915e0f1d3703f634e8abd1c82bcf76ba2a8484845ebaa78ceca5c411a2b0acc7f1f6b823644aa73d44895826d8eaf0 SHA512 970a48fc6da3d3c9fc506ebb0f8c0a9579e4dd76ddbf5934500e2e33414e1226ed9039c04b218a760836b6ee362bcbeb8b4b8c7e5b831c65e8b09a2774197fb0
-DIST Terminal-0.9.8.tar.gz 110520 BLAKE2B 7f2f219cb76c8765b9fb4b5017834ab73a10429a8d0843a3c0b01909d54c21979867546d33c6bf07a4aed2cdbb1dc392effdf7e5e6b6f7096748e9fe9c96a13a SHA512 dc282f52662e0e65553562e6684af7ffab25afb62badee5c22c3b5d03c31a75d172b35706512e98d4fa14d68bd3643e0158c67ff61755deab77741d71bf219c0
 DIST Terminal-0.9.9.tar.gz 88762 BLAKE2B a160a5946df6e0261f7f04db4cceb11925f14c814d2c4d66fb34f2febf0efa5d8fb99834a1ba5642e5bd8f7a36d1d30ae830a83cc3c7a36657c8b50325d3c922 SHA512 456b0755ee6751eb3ef1c5e62e969b6981f7874cb358e071fc7edda93b2ebc698224c990ba4335aa62a7acefb9085723e924d1311c96ae8d34d0f8b2c7c920a3
-EBUILD terminal-0.9.8.ebuild 370 BLAKE2B e63d55a89ccb6d2513484813f7d605096d4427fb644923507a79f2f5ca9915e1b3887be685a83f85e00eb3dc171a05105b73ab74c417e9ab16f0bae9cbf9e7f3 SHA512 9d51ececa5b8161bc67d0ff0f6af96d7cc882c30fc3f4d943c72c471e044f55a4c51d7ce6a26bb57487eeaf3f51b1c2a3b297e1bcb97cc0a18fdc06fb9487a1a
-EBUILD terminal-0.9.9.ebuild 424 BLAKE2B d30ea820e77d6b245e811a75f512c7029ff94ef64d8b39e74c09c863d8436231e25b71645b9195abe2766ee81c84c09f9b1557214927d8519f0757ba22822ebe SHA512 37032aee31530913b19b00ac50280d128833539354b2bc1235aa44bf67e7f88e302ec6ae50073a85c6703656c72315e315bb16962d7a4ba00d27717b97e2874a
+EBUILD terminal-0.9.9.ebuild 423 BLAKE2B e15d41e106ddda57df2a24a82fedbcc48909e1b35ee310a631dc912e0abdb2a56b04e112e9f5ad93c6222eed65f461cdeccd4648d1acefc2912a5a740e57f18e SHA512 56b695676c8f8f8d33e8c2d884869e6e3cde623deca33ea316e137a40483ce0dd5de93c0a85db09e698e470af42724a22ff14a7b97a6d410422d84f604c70668
 MISC metadata.xml 398 BLAKE2B 866baa4e6d912372f4f78059fba2d0244b6adb27910fd54609f2d22259159c1f8a958773e0eb2b0f94c37b34df5c2e65b96cf9ce0d5568ea31b36f5c3be64b22 SHA512 2be2b5a6ff68fad1a03fc4949ef471dc6c9a2c7c9b4401308b893b886c6af925ecf3c817a49bd9cbad3111154e64ccce2cf57cea1915220513c6d0e01a8dddf1
diff --git a/gnustep-apps/terminal/terminal-0.9.8.ebuild b/gnustep-apps/terminal/terminal-0.9.8.ebuild
deleted file mode 100644
index 9627d3a7c879..000000000000
--- a/gnustep-apps/terminal/terminal-0.9.8.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit gnustep-2
-
-S=${WORKDIR}/${P/t/T}
-
-DESCRIPTION="A terminal emulator for GNUstep"
-HOMEPAGE="http://www.nongnu.org/terminal/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P/t/T}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-IUSE=""
diff --git a/gnustep-apps/terminal/terminal-0.9.9.ebuild b/gnustep-apps/terminal/terminal-0.9.9.ebuild
index d96b19e47412..2527f343080f 100644
--- a/gnustep-apps/terminal/terminal-0.9.9.ebuild
+++ b/gnustep-apps/terminal/terminal-0.9.9.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.nongnu.org/gap/terminal/"
 SRC_URI="https://savannah.nongnu.org/download/gap/${P/t/T}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index ebc0cf23d52b..345dfc9c817f 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index bb03a62ca5c5..4fdcebf9057e 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,10 +1,6 @@
-AUX hikari-1.2.0-gnu-make.patch 9378 BLAKE2B 77cb4dce472803167db411114f3259a21d15f46e0427d5c0ecfd59611440581120b6a1488c619ab0b85d8a97312878b59e6f7228392b5a41a740c52c8cc70fde SHA512 15fcdb0a4bcbcb846ce0cb8abb2b7980ff2f6aae191b592b254805a99149f63f65af572e848b9f7a19820b11fd4cd4dce8e6de5ea24e2fc2bac42a81ad98380d
-AUX hikari-2.0.2-gnu-make.patch 10167 BLAKE2B 01b068ecb4921ff57238bac80079bbc399a292c5a22b62b85846f316a5961d7ea7724f9d4a95a3db1e8a4f8394b9f46b44f7fe5b7f4b193c3b4091fc42035cca SHA512 1e1d2a10d2d70bb5561e84007a0393b5ce5e99036caa27b7590877caf61895521cf3aa82aa7864797a7c6d77e5f30d058ec5feece455f259f9323c4d0387fc96
 AUX hikari-2.1.1-gnu-make.patch 10450 BLAKE2B a956a4c49d95d99d84147a083f56e23a2e6a995fdeb79994c556eca4df364167fae58bddb824ceef1ff952442f9591e198effaf9daffc997a11f7ae8dc7e903b SHA512 033d6a3b200eaa1bdedbe6b7cb110207046e535dd43a0ac6628c2dadf7f23e3ce9d63c7101cbf5d217ac43483f31baaeb459464a69a92d120963c96a290caa5f
-DIST hikari-1.2.0.tar.gz 98941 BLAKE2B 0b882d483143e307d4b173560f335e85b4c5613b75c51c6b70b68df9b4f70f9a009d95cb8eda1c211f4968b5c8600e7113bca5e014cecfb1917db2acae7e6f3d SHA512 2bd0b6032541ca63a2bd12aee9155e9b0d08e4c541ec2f837073f1498ecb39df969f8821fcbd066e44c5ddaf658e4875bea25f344226b7ea97fe008a0db4d328
-DIST hikari-2.0.2.tar.gz 1003593 BLAKE2B 89a2ec29673e7ac371a7e4f179b3dc398fbacb3daf859a9f1a53cf74aac9dc36ca33f3dc1878360fdae80ef39315a0b06d0988d897c9ce58693404fd3099d6bf SHA512 12e6cf2f1f24a4c0b64e6c035c518bdc5dbfa094a220147c374f599df8b52a4ee4c1f3cdffe1080fe87c665841a6ca018de4a48ec65aaa5b60e9e968087d83d6
 DIST hikari-2.1.1.tar.gz 1012598 BLAKE2B 189e7bd9271ed5af89f5039288334c16a33c049c504f57e05cfa11b20098650165bb655023d016a14f2b13ed94e819bece088ef8517b9114b80d6a5921000780 SHA512 6da547d957cc65ab040647209a865550b0cc2b3d79040fae507591c41e938826861e27034379c21a1b7ce18afa35dbb813e96e661f4bd1232eb932f032271dff
-EBUILD hikari-1.2.0.ebuild 1081 BLAKE2B ff23f482966cb8b8487bbe001618d9fcfffc6eb4e2e76e49a8160e5859eeb5240432be3f0ff3ad2d796ac441e0bb4cf0a71dedbb1c701b6d470b26c68d4b578c SHA512 78676b87836d736bc6c7cf8f905e5d74b93c6739117089694db827307d1ecaa362c93399c3c73e5ce8a1035129b6acebe471bbf595ce35f9f496e1992abefc2b
-EBUILD hikari-2.0.2.ebuild 1266 BLAKE2B 6a4010e117e93d65079736dffb07cedcf4074152b9ed60783a910ceb2c4bcafa79e62b4420008decb879d53d8b18d597a2fe407c5e7f64e97cc72bd61345657b SHA512 f371790d40e13c191b9deffa805f0929a3ea61a597b89d0fcffc950ac468511165d29ad4e0505ced4c6c2e3855ff092e31696a2da5b31b9aff9280161ac067d3
+DIST hikari-2.1.2.tar.gz 1012670 BLAKE2B 9ce3dc08b3b9377458eba7299d5921466983c64ef7a9eb16194c4cf4dcb482af1313b9378bf733e38fd5bb0b8154553d7ab57a7e45db69932a2bb201ff29b041 SHA512 e4c1328414a2b99657fbce58139d5f6432580182ee277bc1fb8d3de1fa875675d78606dc8defd7997025caeac36f533ea9f34fca56c15a9a64dfa05c9c3e51b7
 EBUILD hikari-2.1.1.ebuild 1243 BLAKE2B a7661734f9a46267934ad187a1bed2d028f23044b681c5cac6318f1674c2e8745c26c43edcc6f0f40e3a2ce8c1cd2be0b8aa2e65b7605b8bd63da9a45feb36a1 SHA512 048270c859405fc622772444eb84d1b06a781c80b9c4d454bdcaefb41d2537bdee991753bcf1c6151b9ee2012ad9391bb3098b7b949ec03ea07ab3e0439f4062
-MISC metadata.xml 1075 BLAKE2B 685e0168c0d88f9fd253552e20447e197d2c96354c094ae010cbf0ec5db9021f49cc8b69d9c124e43edb468ee749ac43d79e8cb84abda00e3bffa64360bdc9bb SHA512 625e3432e116a91897ad9ca661500a259e445abbd845f7b78716727fb8f680ecc78d86c41b0939b9495d9ecdcd541404eba58735b445f44f628bfd84581a4567
+EBUILD hikari-2.1.2.ebuild 1217 BLAKE2B fa3af4a381bb04eeb41069c54a37752c56d0938925c7b2b45b09f4caa81358346d8181626a8857d273fcc0ec2d913a4569b269e71fa29f1d2a1f1ed934b8e36f SHA512 9bc1adad3cebd4905a21bbda269d755a9c545e4a4fe747d2a99bd32e2c88f07942e35daa371d3b065585139c1d626fea4c929974907308859638f36d9fd28ead
+MISC metadata.xml 1015 BLAKE2B cf0b1938d20d91676068e3fe8d5556da68afc6c3d5c1f56da1a8b18b60d3ed932c43b084cd2fd99cf5c0f713f6684da5b907a650f7f37d671d12b15de894624a SHA512 fe3983cb19d30846c315db699947be49e5ca046a320ecd56dbde122ebd5380d896210ea3fbbb860f164bc4140e7199d0cc26b067dfcab6f492932b31fdaf593c
diff --git a/gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch b/gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch
deleted file mode 100644
index 01a9b87c4ce2..000000000000
--- a/gui-wm/hikari/files/hikari-1.2.0-gnu-make.patch
+++ /dev/null
@@ -1,315 +0,0 @@
-explain steps to guide future me and other patchers
-(1) define common variables on top
-(2) remove conditions for doc and others to define VERSION
-(3) replace all ${*} by $(*)
-(4) replace pkg-config by $(PKG_CONFIG)
-(6) remove .PATH: src
-(5) remove main.c from OBJS because it is in different directory
-    - we will define a separate target for it
-(6) add $(OBJS) target + main.o target and add then to the end
-    of dependencies for hikari
-(7) add main.o to be cleaned-up
-(8) reorder the library orders in the $(CC) steps because gcc
-diff --git a/Makefile b/Makefile
-index 11fc449..d73c4e0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,24 +1,22 @@
--.ifmake doc || dist
--.ifndef VERSION
--.error please specify VERSION
--.endif
--.endif
--
--VERSION ?= "darcs"
--
--.ifmake install || uninstall
--.ifndef PREFIX
--.error please specify PREFIX
--.endif
-+TARGET =	hikari
-+
-+DESTDIR	?=
-+
-+prefix ?=	/usr/local
-+exec_prefix ?=	$(prefix)
-+bindir ?=	$(exec_prefix)/bin
-+sysconfdir ?=	$(prefix)/etc
-+
-+PKG_CONFIG ?=	pkg-config
-+
-+VERSION ?=	"darcs"
-+
-+### Upstream variables
-+PREFIX ?=	$(prefix)
-+ETC_PREFIX ?=	$(sysconfdir)
-+
- OS != uname
- INSTALL_GROUP != id -gn
--.endif
--
--.ifmake install || uninstall
--.ifndef ETC_PREFIX
--.error please specify ETC_PREFIX
--.endif
--.endif
-
- OBJS = \
- 	action.o \
-@@ -45,7 +43,6 @@ OBJS = \
- 	layout.o \
- 	layout_config.o \
- 	layout_select_mode.o \
--	main.o \
- 	mark.o \
- 	mark_assign_mode.o \
- 	mark_select_mode.o \
-@@ -72,106 +69,117 @@ OBJS = \
- 	xwayland_unmanaged_view.o \
- 	xwayland_view.o
-
--WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
--
--.PHONY: distclean clean clean-doc doc dist install uninstall
--.PATH: src
-+WAYLAND_PROTOCOLS != $(PKG_CONFIG) --variable pkgdatadir wayland-protocols
-
--.ifdef DEBUG
--CFLAGS += -g -O0 -fsanitize=address
--.else
--CFLAGS += -DNDEBUG
--.endif
-+ifeq ($(DEBUG),1)
-+	CFLAGS += -g -O0 -fsanitize=address
-+else
-+	CFLAGS += -DNDEBUG
-+endif
-
--.ifdef WITH_POSIX_C_SOURCE
--CFLAGS += -D_POSIX_C_SOURCE=200809L
--.endif
-+ifeq ($(WITH_POSIX_C_SOURCE),1)
-+	CFLAGS += -D_POSIX_C_SOURCE=200809L
-+endif
-
--.ifdef WITH_XWAYLAND
--CFLAGS += -DHAVE_XWAYLAND=1
--.endif
-+ifeq ($(WITH_XWAYLAND),1)
-+	CFLAGS += -DHAVE_XWAYLAND=1
-+endif
-
--.ifdef WITH_GAMMACONTROL
--CFLAGS += -DHAVE_GAMMACONTROL=1
--.endif
-+ifeq ($(WITH_GAMMACONTROL),1)
-+	CFLAGS += -DHAVE_GAMMACONTROL=1
-+endif
-
--.ifdef WITH_SCREENCOPY
--CFLAGS += -DHAVE_SCREENCOPY=1
--.endif
-+ifeq ($(WITH_SCREENCOPY),1)
-+	CFLAGS += -DHAVE_SCREENCOPY=1
-+endif
-
--.ifdef WITH_LAYERSHELL
--CFLAGS += -DHAVE_LAYERSHELL=1
--.endif
-+ifeq ($(WITH_LAYERSHELL),1)
-+	CFLAGS += -DHAVE_LAYERSHELL=1
-+endif
-
- CFLAGS += -Wall -I. -Iinclude
-
--WLROOTS_CFLAGS != pkg-config --cflags wlroots
--WLROOTS_LIBS != pkg-config --libs wlroots
-+WLROOTS_CFLAGS != $(PKG_CONFIG) --cflags wlroots
-+WLROOTS_LIBS != $(PKG_CONFIG) --libs wlroots
-
- WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
-
--PANGO_CFLAGS != pkg-config --cflags pangocairo
--PANGO_LIBS != pkg-config --libs pangocairo
-+PANGO_CFLAGS != $(PKG_CONFIG) --cflags pangocairo
-+PANGO_LIBS != $(PKG_CONFIG) --libs pangocairo
-
--CAIRO_CFLAGS != pkg-config --cflags cairo
--CAIRO_LIBS != pkg-config --libs cairo
-+CAIRO_CFLAGS != $(PKG_CONFIG) --cflags cairo
-+CAIRO_LIBS != $(PKG_CONFIG) --libs cairo
-
--GLIB_CFLAGS != pkg-config --cflags glib-2.0
--GLIB_LIBS != pkg-config --libs glib-2.0
-+GLIB_CFLAGS != $(PKG_CONFIG) --cflags glib-2.0
-+GLIB_LIBS != $(PKG_CONFIG) --libs glib-2.0
-
--PIXMAN_CFLAGS != pkg-config --cflags pixman-1
--PIXMAN_LIBS != pkg-config --libs pixman-1
-+PIXMAN_CFLAGS != $(PKG_CONFIG) --cflags pixman-1
-+PIXMAN_LIBS != $(PKG_CONFIG) --libs pixman-1
-
--XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon
--XKBCOMMON_LIBS != pkg-config --libs xkbcommon
-+XKBCOMMON_CFLAGS != $(PKG_CONFIG) --cflags xkbcommon
-+XKBCOMMON_LIBS != $(PKG_CONFIG) --libs xkbcommon
-
--WAYLAND_CFLAGS != pkg-config --cflags wayland-server
--WAYLAND_LIBS != pkg-config --libs wayland-server
-+WAYLAND_CFLAGS != $(PKG_CONFIG) --cflags wayland-server
-+WAYLAND_LIBS != $(PKG_CONFIG) --libs wayland-server
-
--LIBINPUT_CFLAGS != pkg-config --cflags libinput
--LIBINPUT_LIBS != pkg-config --libs libinput
-+LIBINPUT_CFLAGS != $(PKG_CONFIG) --cflags libinput
-+LIBINPUT_LIBS != $(PKG_CONFIG) --libs libinput
-
--UCL_CFLAGS != pkg-config --cflags libucl
--UCL_LIBS != pkg-config --libs libucl
-+UCL_CFLAGS != $(PKG_CONFIG) --cflags libucl
-+UCL_LIBS != $(PKG_CONFIG) --libs libucl
-
- CFLAGS += \
--	${WLROOTS_CFLAGS} \
--	${PANGO_CFLAGS} \
--	${CAIRO_CFLAGS} \
--	${GLIB_CFLAGS} \
--	${PIXMAN_CFLAGS} \
--	${XKBCOMMON_CFLAGS} \
--	${WAYLAND_CFLAGS} \
--	${LIBINPUT_CFLAGS} \
--	${UCL_CFLAGS}
-+	$(WLROOTS_CFLAGS) \
-+	$(PANGO_CFLAGS) \
-+	$(CAIRO_CFLAGS) \
-+	$(GLIB_CFLAGS) \
-+	$(PIXMAN_CFLAGS) \
-+	$(XKBCOMMON_CFLAGS) \
-+	$(WAYLAND_CFLAGS) \
-+	$(LIBINPUT_CFLAGS) \
-+	$(UCL_CFLAGS)
-
- LIBS = \
--	${WLROOTS_LIBS} \
--	${PANGO_LIBS} \
--	${CAIRO_LIBS} \
--	${GLIB_LIBS} \
--	${PIXMAN_LIBS} \
--	${XKBCOMMON_LIBS} \
--	${WAYLAND_LIBS} \
--	${LIBINPUT_LIBS} \
--	${UCL_LIBS}
--
--all: hikari hikari-unlocker
-+	$(WLROOTS_LIBS) \
-+	$(PANGO_LIBS) \
-+	$(CAIRO_LIBS) \
-+	$(GLIB_LIBS) \
-+	$(PIXMAN_LIBS) \
-+	$(XKBCOMMON_LIBS) \
-+	$(WAYLAND_LIBS) \
-+	$(LIBINPUT_LIBS) \
-+	$(UCL_LIBS)
-+
-+.PHONY: distclean clean clean-doc doc dist install uninstall
-+
-+all: hikari hikari-unlocker doc
-
- version.h:
--	echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h
-+	echo "#define HIKARI_VERSION \"$(VERSION)\"" >> version.h
-
--hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h ${OBJS}
--	${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} ${LIBS} ${OBJS} -o ${.TARGET}
-+$(OBJS): %.o: src/%.c
-+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-+
-+main.o:
-+	$(CC) $(CFLAGS) $(INCLUDES) -c main.c -o main.o
-
- xdg-shell-protocol.h:
--	wayland-scanner server-header ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${.TARGET}
-+	wayland-scanner server-header $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml xdg-shell-protocol.h
-
- wlr-layer-shell-unstable-v1-protocol.h:
--	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
-+	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-protocol.h
-+
-+hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h $(OBJS) main.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) $(OBJS) main.o $(LIBS) -o $(TARGET)
-
- hikari-unlocker: hikari_unlocker.c
--	${CC} -lpam hikari_unlocker.c -o hikari-unlocker
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) hikari_unlocker.c -lpam $(LIBS) -o hikari-unlocker
-+
-+share/man/man1/hikari.1:
-+	pandoc -M title:"HIKARI(1) $(VERSION) | hikari - Wayland Compositor" -s \
-+		--to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
-+
-+doc: share/man/man1/hikari.1
-
- clean-doc:
- 	@test -e _darcs && echo "cleaning manpage" ||:
-@@ -183,20 +191,15 @@ clean: clean-doc
- 	@rm xdg-shell-protocol.h 2> /dev/null ||:
- 	@rm wlr-layer-shell-unstable-v1-protocol.h 2> /dev/null ||:
- 	@echo "cleaning object files"
--	@rm ${OBJS} 2> /dev/null ||:
-+	@rm $(OBJS) 2> /dev/null ||:
-+	@rm main.o 2> /dev/null ||:
- 	@echo "cleaning executables"
- 	@rm hikari 2> /dev/null ||:
- 	@rm hikari-unlocker 2> /dev/null ||:
-
--share/man/man1/hikari.1:
--	pandoc -M title:"HIKARI(1) ${VERSION} | hikari - Wayland Compositor" -s \
--		--to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
--
--doc: share/man/man1/hikari.1
--
--hikari-${VERSION}.tar.gz: version.h share/man/man1/hikari.1
-+hikari-$(VERSION).tar.gz: version.h share/man/man1/hikari.1
- 	@darcs revert
--	@tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \
-+	@tar -s "#^#hikari-$(VERSION)/#" -czf hikari-$(VERSION).tar.gz \
- 		version.h \
- 		main.c \
- 		hikari_unlocker.c \
-@@ -215,22 +218,22 @@ distclean: clean-doc
- 	@test -e _darcs && echo "cleaning version.h" ||:
- 	@test -e _darcs && rm version.h ||:
-
--dist: distclean hikari-${VERSION}.tar.gz
-+dist: distclean hikari-$(VERSION).tar.gz
-
- install: hikari hikari-unlocker share/man/man1/hikari.1
--	mkdir -p ${PREFIX}/bin
--	mkdir -p ${PREFIX}/share/man/man1
--	mkdir -p ${PREFIX}/share/examples/hikari
--	mkdir -p ${ETC_PREFIX}/pam.d
--	install -m 4555 -g ${INSTALL_GROUP} hikari hikari-unlocker ${PREFIX}/bin
--	install -m 644 -g ${INSTALL_GROUP} share/man/man1/hikari.1 ${PREFIX}/share/man/man1
--	install -m 644 -g ${INSTALL_GROUP} share/examples/hikari/hikari.conf ${PREFIX}/share/examples/hikari
--	install -m 644 -g ${INSTALL_GROUP} pam.d/hikari-unlocker.${OS} ${ETC_PREFIX}/pam.d/hikari-unlocker
-+	mkdir -p $(PREFIX)/bin
-+	mkdir -p $(PREFIX)/share/man/man1
-+	mkdir -p $(PREFIX)/share/examples/hikari
-+	mkdir -p $(ETC_PREFIX)/pam.d
-+	install -m 4555 -g $(INSTALL_GROUP) hikari hikari-unlocker $(PREFIX)/bin
-+	install -m 644 -g $(INSTALL_GROUP) share/man/man1/hikari.1 $(PREFIX)/share/man/man1
-+	install -m 644 -g $(INSTALL_GROUP) share/examples/hikari/hikari.conf $(PREFIX)/share/examples/hikari
-+	install -m 644 -g $(INSTALL_GROUP) pam.d/hikari-unlocker.$(OS) $(ETC_PREFIX)/pam.d/hikari-unlocker
-
- uninstall:
--	-rm ${PREFIX}/bin/hikari
--	-rm ${PREFIX}/bin/hikari-unlocker
--	-rm ${PREFIX}/share/examples/hikari/hikari.conf
--	-rmdir ${PREFIX}/share/examples/hikari
--	-rm ${PREFIX}/share/man/man1/hikari.1
--	-rm ${ETC_PREFIX}/pam.d/hikari-unlocker
-+	-rm $(PREFIX)/bin/hikari
-+	-rm $(PREFIX)/bin/hikari-unlocker
-+	-rm $(PREFIX)/share/examples/hikari/hikari.conf
-+	-rmdir $(PREFIX)/share/examples/hikari
-+	-rm $(PREFIX)/share/man/man1/hikari.1
-+	-rm $(ETC_PREFIX)/pam.d/hikari-unlocker
diff --git a/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch b/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch
deleted file mode 100644
index 338fcd8745ff..000000000000
--- a/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0f104d0..6a1d640 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,22 @@
-+TARGET =	hikari
-+
-+DESTDIR	?=
-+
-+prefix ?=	/usr/local
-+exec_prefix ?=	$(prefix)
-+bindir ?=	$(exec_prefix)/bin
-+sysconfdir ?=	$(prefix)/etc
-+
-+PKG_CONFIG ?=	pkg-config
-+
-+VERSION ?=	"CURRENT"
-+
-+### Upstream variables
-+PREFIX ?=	$(DESTDIR)$(prefix)
-+ETC_PREFIX ?=	$(DESTDIR)$(sysconfdir)
-+
- OS != uname
--VERSION ?= "CURRENT"
--PREFIX ?= /usr/local
--ETC_PREFIX ?= ${PREFIX}
-+INSTALL_GROUP != id -gn
- 
- OBJS = \
- 	action.o \
-@@ -29,7 +44,6 @@ OBJS = \
- 	layout.o \
- 	layout_config.o \
- 	layout_select_mode.o \
--	main.o \
- 	mark.o \
- 	mark_assign_mode.o \
- 	mark_select_mode.o \
-@@ -56,116 +70,127 @@ OBJS = \
- 	xwayland_unmanaged_view.o \
- 	xwayland_view.o
- 
--WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
--
--.PHONY: distclean clean clean-doc doc dist install uninstall
--.PATH: src
-+WAYLAND_PROTOCOLS != $(PKG_CONFIG) --variable pkgdatadir wayland-protocols
- 
- # Allow specification of /extra/ CFLAGS and LDFLAGS
--CFLAGS += ${CFLAGS_EXTRA}
--LDFLAGS += ${LDFLAGS_EXTRA}
-+CFLAGS += $(CFLAGS_EXTRA)
-+LDFLAGS += $(LDFLAGS_EXTRA)
- 
--.ifdef DEBUG
-+ifdef DEBUG
- CFLAGS += -g -O0 -fsanitize=address
--.else
-+else
- CFLAGS += -DNDEBUG
--.endif
-+endif
- 
--.ifdef WITH_POSIX_C_SOURCE
-+ifdef WITH_POSIX_C_SOURCE
- CFLAGS += -D_POSIX_C_SOURCE=200809L
--.endif
-+endif
- 
--.ifdef WITH_XWAYLAND
-+ifdef WITH_XWAYLAND
- CFLAGS += -DHAVE_XWAYLAND=1
--.endif
-+endif
- 
--.ifdef WITH_GAMMACONTROL
-+ifdef WITH_GAMMACONTROL
- CFLAGS += -DHAVE_GAMMACONTROL=1
--.endif
-+endif
- 
--.ifdef WITH_SCREENCOPY
-+ifdef WITH_SCREENCOPY
- CFLAGS += -DHAVE_SCREENCOPY=1
--.endif
-+endif
- 
--.ifdef WITH_LAYERSHELL
-+ifdef WITH_LAYERSHELL
- CFLAGS += -DHAVE_LAYERSHELL=1
--.endif
-+endif
- 
--.ifdef WITHOUT_SUID
-+ifdef WITHOUT_SUID
- PERMS = 555
--.else
-+else
- PERMS = 4555
--.endif
-+endif
- 
--CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
-+CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=$(ETC_PREFIX)
- 
--WLROOTS_CFLAGS != pkg-config --cflags wlroots
--WLROOTS_LIBS != pkg-config --libs wlroots
-+WLROOTS_CFLAGS != $(PKG_CONFIG) --cflags wlroots
-+WLROOTS_LIBS != $(PKG_CONFIG) --libs wlroots
- 
- WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
- 
--PANGO_CFLAGS != pkg-config --cflags pangocairo
--PANGO_LIBS != pkg-config --libs pangocairo
-+PANGO_CFLAGS != $(PKG_CONFIG) --cflags pangocairo
-+PANGO_LIBS != $(PKG_CONFIG) --libs pangocairo
- 
--CAIRO_CFLAGS != pkg-config --cflags cairo
--CAIRO_LIBS != pkg-config --libs cairo
-+CAIRO_CFLAGS != $(PKG_CONFIG) --cflags cairo
-+CAIRO_LIBS != $(PKG_CONFIG) --libs cairo
- 
--GLIB_CFLAGS != pkg-config --cflags glib-2.0
--GLIB_LIBS != pkg-config --libs glib-2.0
-+GLIB_CFLAGS != $(PKG_CONFIG) --cflags glib-2.0
-+GLIB_LIBS != $(PKG_CONFIG) --libs glib-2.0
- 
--PIXMAN_CFLAGS != pkg-config --cflags pixman-1
--PIXMAN_LIBS != pkg-config --libs pixman-1
-+PIXMAN_CFLAGS != $(PKG_CONFIG) --cflags pixman-1
-+PIXMAN_LIBS != $(PKG_CONFIG) --libs pixman-1
- 
--XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon
--XKBCOMMON_LIBS != pkg-config --libs xkbcommon
-+XKBCOMMON_CFLAGS != $(PKG_CONFIG) --cflags xkbcommon
-+XKBCOMMON_LIBS != $(PKG_CONFIG) --libs xkbcommon
- 
--WAYLAND_CFLAGS != pkg-config --cflags wayland-server
--WAYLAND_LIBS != pkg-config --libs wayland-server
-+WAYLAND_CFLAGS != $(PKG_CONFIG) --cflags wayland-server
-+WAYLAND_LIBS != $(PKG_CONFIG) --libs wayland-server
- 
--LIBINPUT_CFLAGS != pkg-config --cflags libinput
--LIBINPUT_LIBS != pkg-config --libs libinput
-+LIBINPUT_CFLAGS != $(PKG_CONFIG) --cflags libinput
-+LIBINPUT_LIBS != $(PKG_CONFIG) --libs libinput
- 
--UCL_CFLAGS != pkg-config --cflags libucl
--UCL_LIBS != pkg-config --libs libucl
-+UCL_CFLAGS != $(PKG_CONFIG) --cflags libucl
-+UCL_LIBS != $(PKG_CONFIG) --libs libucl
- 
- CFLAGS += \
--	${WLROOTS_CFLAGS} \
--	${PANGO_CFLAGS} \
--	${CAIRO_CFLAGS} \
--	${GLIB_CFLAGS} \
--	${PIXMAN_CFLAGS} \
--	${XKBCOMMON_CFLAGS} \
--	${WAYLAND_CFLAGS} \
--	${LIBINPUT_CFLAGS} \
--	${UCL_CFLAGS}
-+	$(WLROOTS_CFLAGS) \
-+	$(PANGO_CFLAGS) \
-+	$(CAIRO_CFLAGS) \
-+	$(GLIB_CFLAGS) \
-+	$(PIXMAN_CFLAGS) \
-+	$(XKBCOMMON_CFLAGS) \
-+	$(WAYLAND_CFLAGS) \
-+	$(LIBINPUT_CFLAGS) \
-+	$(UCL_CFLAGS)
- 
- LIBS = \
--	${WLROOTS_LIBS} \
--	${PANGO_LIBS} \
--	${CAIRO_LIBS} \
--	${GLIB_LIBS} \
--	${PIXMAN_LIBS} \
--	${XKBCOMMON_LIBS} \
--	${WAYLAND_LIBS} \
--	${LIBINPUT_LIBS} \
--	${UCL_LIBS}
-+	$(WLROOTS_LIBS) \
-+	$(PANGO_LIBS) \
-+	$(CAIRO_LIBS) \
-+	$(GLIB_LIBS) \
-+	$(PIXMAN_LIBS) \
-+	$(XKBCOMMON_LIBS) \
-+	$(WAYLAND_LIBS) \
-+	$(LIBINPUT_LIBS) \
-+	$(UCL_LIBS)
- 
--all: hikari hikari-unlocker
-+.PHONY: distclean clean clean-doc doc dist install uninstall
- 
- version.h:
--	echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h
-+	echo "#define HIKARI_VERSION \"$(VERSION)\"" >> version.h
- 
--hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h ${OBJS}
--	${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o ${.TARGET} ${OBJS} ${LIBS}
-+$(OBJS): %.o: src/%.c
-+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
-+
-+main.o:
-+	$(CC) $(CFLAGS) $(INCLUDES) -c main.c -o main.o
- 
- xdg-shell-protocol.h:
--	wayland-scanner server-header ${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml ${.TARGET}
-+	wayland-scanner server-header $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml xdg-shell-protocol.h
- 
- wlr-layer-shell-unstable-v1-protocol.h:
--	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
-+	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml wlr-layer-shell-unstable-v1-protocol.h
-+
-+hikari: version.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h $(OBJS) main.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) $(OBJS) main.o $(LIBS) -o $(TARGET)
- 
- hikari-unlocker: hikari_unlocker.c
--	${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) hikari_unlocker.c -lpam $(LIBS) -o hikari-unlocker
-+
-+share/man/man1/hikari.1:
-+	pandoc -M title:"HIKARI(1) $(VERSION) | hikari - Wayland Compositor" -s \
-+		--to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
-+
-+doc: share/man/man1/hikari.1
-+
-+all: hikari hikari-unlocker
- 
- clean-doc:
- 	@test -e _darcs && echo "cleaning manpage" ||:
-@@ -177,66 +202,37 @@ clean: clean-doc
- 	@rm xdg-shell-protocol.h 2> /dev/null ||:
- 	@rm wlr-layer-shell-unstable-v1-protocol.h 2> /dev/null ||:
- 	@echo "cleaning object files"
--	@rm ${OBJS} 2> /dev/null ||:
-+	@rm $(OBJS) 2> /dev/null ||:
-+	@rm main.o 2> /dev/null ||:
- 	@echo "cleaning executables"
- 	@rm hikari 2> /dev/null ||:
- 	@rm hikari-unlocker 2> /dev/null ||:
- 
--share/man/man1/hikari.1:
--	pandoc -M title:"HIKARI(1) ${VERSION} | hikari - Wayland Compositor" -s \
--		--to man -o share/man/man1/hikari.1 share/man/man1/hikari.md
--
--doc: share/man/man1/hikari.1
--
--hikari-${VERSION}.tar.gz: version.h share/man/man1/hikari.1
--	@darcs revert
--	@tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \
--		version.h \
--		main.c \
--		hikari_unlocker.c \
--		include/hikari/*.h \
--		src/*.c \
--		protocol/*.xml \
--		Makefile \
--		LICENSE \
--		README.md \
--		CHANGELOG.md \
--		share/man/man1/hikari.md \
--		share/man/man1/hikari.1 \
--		share/backgrounds/hikari/hikari_wallpaper.png \
--		share/wayland-sessions/hikari.desktop \
--		etc/hikari/hikari.conf \
--		etc/pam.d/hikari-unlocker.*
--
--distclean: clean-doc
--	@test -e _darcs && echo "cleaning version.h" ||:
--	@test -e _darcs && rm version.h ||:
--
--dist: distclean hikari-${VERSION}.tar.gz
--
--install: hikari hikari-unlocker share/man/man1/hikari.1
--	mkdir -p ${DESTDIR}/${PREFIX}/bin
--	mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1
--	mkdir -p ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
--	mkdir -p ${DESTDIR}/${PREFIX}/share/wayland-sessions
--	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/hikari
--	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/pam.d
--	sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
--	chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
--	install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin
--	install -m 4555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
--	install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1
--	install -m 644 share/backgrounds/hikari/hikari_wallpaper.png ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
--	install -m 644 share/wayland-sessions/hikari.desktop ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
--	install -m 644 etc/pam.d/hikari-unlocker.${OS} ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
-+install-doc:
-+	install -m 644 share/man/man1/hikari.1 $(PREFIX)/share/man/man1
-+
-+install:
-+	mkdir -p $(PREFIX)/bin
-+	mkdir -p $(PREFIX)/share/man/man1
-+	mkdir -p $(PREFIX)/share/backgrounds/hikari
-+	mkdir -p $(PREFIX)/share/wayland-sessions
-+	mkdir -p $(ETC_PREFIX)/etc/hikari
-+	mkdir -p $(ETC_PREFIX)/etc/pam.d
-+	sed "s,PREFIX,$(prefix)," etc/hikari/hikari.conf > $(ETC_PREFIX)/etc/hikari/hikari.conf
-+	chmod 644 $(ETC_PREFIX)/etc/hikari/hikari.conf
-+	install -m $(PERMS) hikari $(PREFIX)/bin
-+	install -m 4555 hikari-unlocker $(PREFIX)/bin
-+	install -m 644 share/backgrounds/hikari/hikari_wallpaper.png $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
-+	install -m 644 share/wayland-sessions/hikari.desktop $(PREFIX)/share/wayland-sessions/hikari.desktop
-+	install -m 644 etc/pam.d/hikari-unlocker.$(OS) $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
- 
- uninstall:
--	-rm ${DESTDIR}/${PREFIX}/bin/hikari
--	-rm ${DESTDIR}/${PREFIX}/bin/hikari-unlocker
--	-rm ${DESTDIR}/${PREFIX}/share/man/man1/hikari.1
--	-rm ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
--	-rm ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
--	-rm ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
--	-rm ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
--	-rmdir ${DESTDIR}/${ETC_PREFIX}/etc/hikari
--	-rmdir ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
-+	-rm $(PREFIX)/bin/hikari
-+	-rm $(PREFIX)/bin/hikari-unlocker
-+	-rm $(PREFIX)/share/man/man1/hikari.1
-+	-rm $(PREFIX)/share/backgrounds/hikari/hikari_wallpaper.png
-+	-rm $(PREFIX)/share/wayland-sessions/hikari.desktop
-+	-rm $(ETC_PREFIX)/etc/pam.d/hikari-unlocker
-+	-rm $(ETC_PREFIX)/etc/hikari/hikari.conf
-+	-rmdir $(ETC_PREFIX)/etc/hikari
-+	-rmdir $(PREFIX)/share/backgrounds/hikari
diff --git a/gui-wm/hikari/hikari-1.2.0.ebuild b/gui-wm/hikari/hikari-1.2.0.ebuild
deleted file mode 100644
index 7297d36915d0..000000000000
--- a/gui-wm/hikari/hikari-1.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="wayland compositor inspired by CWM"
-HOMEPAGE="https://hikari.acmelabs.space/"
-SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gamma layershell screencopy +X"
-
-DEPEND="
-	dev-libs/glib
-	dev-libs/libinput:=
-	dev-libs/libucl
-	gui-libs/wlroots
-	x11-libs/cairo:=[X,svg]
-	x11-libs/pango:=[X]
-	x11-libs/pixman
-	x11-libs/libxkbcommon:=[X]
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-misc/xkeyboard-config
-"
-
-BDEPEND="
-	${DEPEND}
-	app-text/pandoc
-	virtual/pkgconfig
-	dev-libs/wayland-protocols
-"
-
-# keep this as others OS's are using this as reference
-PATCHES=(
-	"${FILESDIR}/${P}-gnu-make.patch"
-)
-
-src_compile() {
-	emake VERSION="{PV}" \
-		  WITH_POSIX_C_SOURCE=1 \
-		  WITH_GAMMACONTROL=$(usex gamma 1 0) \
-		  WITH_LAYERSHELL=$(usex layershell 1 0) \
-		  WITH_SCREENCOPY=$(usex screencopy 1 0) \
-		  WITH_XWAYLAND=$(usex X 1 0) \
-		  all
-}
-
-src_install() {
-	emake PREFIX=${D}/usr ETC_PREFIX=${D}/etc install
-}
diff --git a/gui-wm/hikari/hikari-2.0.2.ebuild b/gui-wm/hikari/hikari-2.0.2.ebuild
deleted file mode 100644
index 45ebbda8ca0d..000000000000
--- a/gui-wm/hikari/hikari-2.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="wayland compositor inspired by CWM"
-HOMEPAGE="https://hikari.acmelabs.space/"
-SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gamma layershell +man screencopy +X"
-
-DEPEND="
-	dev-libs/glib
-	dev-libs/libinput:=
-	dev-libs/libucl
-	gui-libs/wlroots
-	media-libs/libglvnd
-	x11-libs/cairo:=[X,svg]
-	x11-libs/pango:=[X]
-	x11-libs/pixman
-	x11-libs/libxkbcommon:=[X]
-	sys-libs/pam
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-misc/xkeyboard-config
-"
-
-BDEPEND="
-	${DEPEND}
-	virtual/pkgconfig
-	dev-libs/wayland-protocols
-	man? ( app-text/pandoc )
-"
-
-# keep this as others OS's are using this as reference
-PATCHES=(
-	"${FILESDIR}/${P}-gnu-make.patch"
-)
-
-src_compile() {
-	emake VERSION="{PV}" \
-		  WITH_POSIX_C_SOURCE=1 \
-		  WITH_GAMMACONTROL=$(usex gamma 1 0) \
-		  WITH_LAYERSHELL=$(usex layershell 1 0) \
-		  WITH_SCREENCOPY=$(usex screencopy 1 0) \
-		  WITH_XWAYLAND=$(usex X 1 0) \
-		  all
-	if use man; then
-		emake doc
-	fi
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" ETC_PREFIX="${D}" prefix="${SYSROOT}/usr" install
-	if use man; then
-		emake PREFIX="${D}/usr" ETC_PREFIX="${D}" install-doc
-	fi
-}
diff --git a/gui-wm/hikari/hikari-2.1.2.ebuild b/gui-wm/hikari/hikari-2.1.2.ebuild
new file mode 100644
index 000000000000..54f522c053ac
--- /dev/null
+++ b/gui-wm/hikari/hikari-2.1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing
+
+DESCRIPTION="Wayland compositor inspired by CWM"
+HOMEPAGE="https://hikari.acmelabs.space/"
+SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="gamma layershell screencopy suid virtual-io +X"
+
+DEPEND="
+	dev-libs/libinput:=
+	dev-libs/libucl
+	>=gui-libs/wlroots-0.11.0[X?]
+	media-libs/libglvnd
+	x11-libs/cairo[X?,svg]
+	x11-libs/libxkbcommon[X?]
+	x11-libs/pango[X?]
+	x11-libs/pixman
+	sys-libs/pam
+"
+
+RDEPEND="
+	${DEPEND}
+	x11-misc/xkeyboard-config
+"
+
+BDEPEND="
+	dev-libs/wayland-protocols
+	sys-devel/bmake
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	export MAKE=bmake
+}
+
+src_compile() {
+	${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \
+		-DWITH_POSIX_C_SOURCE \
+		$(usex gamma -DWITH_GAMMACONTROL "") \
+		$(usex layershell -DWITH_LAYERSHELL "") \
+		$(usex screencopy -DWITH_SCREENCOPY "") \
+		$(usex suid -DWITH_SUID "") \
+		$(usex virtual-io -DWITH_VIRTUAL_INPUT "") \
+		$(usex X -DWITH_XWAYLAND "") \
+		all || die
+}
+
+src_install() {
+	${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ install || die
+	doman share/man/man1/hikari.1
+}
diff --git a/gui-wm/hikari/metadata.xml b/gui-wm/hikari/metadata.xml
index 369ad100778a..95946d509209 100644
--- a/gui-wm/hikari/metadata.xml
+++ b/gui-wm/hikari/metadata.xml
@@ -19,7 +19,6 @@
         <flag name="gamma">add gamma control for redshift</flag>
         <flag name="layershell">add support for wayland apps using layer shell</flag>
         <flag name="screencopy">add support for screen grabbing</flag>
-        <flag name="man">build and install man pages</flag>
         <flag name="virtual-io">enable virtual input/output support, needed for remote I/O in VNC</flag>
     </use>
 </pkgmetadata>
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 687d76bd64b8..4f7e4ed0f6be 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 1b9c02a63ccb..7a9182064a92 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,6 +1,8 @@
 AUX ark-20.04.3-CVE-2020-16116.patch 1819 BLAKE2B 878e3046b1096bb5c9ec1ba64fcb2350b025f87295350182df435ad05302415ac486c51be39ac4c561d41930998a0b8b0031d5240dbcf085f275375e453eb640 SHA512 953ca28531a92198f9d5e429cea85e2887b88e5132093845c3f52615e7f736b592bea8d80c98a7c198685062ef47efc463e5cecacca5470cf920f00bfc461e41
+AUX ark-20.04.3-CVE-2020-24654.patch 1848 BLAKE2B d82b80b5d7b6491460a7f87cc82d3d6db3e7615d1aa0282d83dc62465a9c27310b69b5150332930ded525e9846d3748c5fda0553971bc8d282f45d377a964077 SHA512 c8ab491d58bea0c6fe81df7ec2c89ab8351f3d1a89c5632b1db669b418671715e7f10e96058b783672d5f0cad6b6c959f10130eda264859d951859622f59f2e4
 DIST ark-20.04.3.tar.xz 2586436 BLAKE2B 98343a4bc91fd13a33ba9dd69487c27433435d4bff722245c2cde02191017f4fa0b2d15213b97a86c3ecd87a17bf59e62a80b63c6684c813845bec9bab58f441 SHA512 6274483bc7cad9b8b3842a622a3f243fd5756aec147624eb9041459efd5c833e203c286412185bb105133d8c83a7503c8c7e519b8cb9cbd13830793c3429e142
 DIST ark-20.08.1.tar.xz 2709500 BLAKE2B 8147433916cab11b784260e235b313ca3fce515b012e851759b65baeb11682721bcfa83bd8c5844befbdc7c7c21afde5518636df61f7d2676d52ee07274967ea SHA512 1fae786d17a6e576e64b5b72e7d6886900a2fee3eedad41db174382dc70cb858c5c192c20896e5c2b6ec3c07f07d155fa5f52654496876808650a279b39eaa86
 EBUILD ark-20.04.3-r1.ebuild 2259 BLAKE2B 52cf0ce440871bf16f91936bf7164d669358c505112a57391fcf4b73f38d0bc45d67424934e712181a21755b2e7e642d74d7d5ca649d4534f16ca4f78d4a6a2b SHA512 50f97838ce7467483eae5f0d55a5e664f43e48a5598ade916774272b57daa9a2ab10824067935a4a2ffe3a5626634514e5f599a846aea5444d5dd2f379b3dbee
-EBUILD ark-20.08.1.ebuild 2387 BLAKE2B 0c58879925012a1acbed65e2db14a6cb5147d8d282d809d8a1602a4fa9753c3d89aeeeaa3b5bb249df127acbf8e0d72215a87d28d3c29fd84e79803f256123c3 SHA512 c9948412e3db37bc93ee93c15aebc8e081442fb82ff655ea41316cad7f4a8fbf06094da1f8aeb313a06cb814c2b05cd0faf0d5852cdfce6bbffcff750a714085
+EBUILD ark-20.04.3-r2.ebuild 2089 BLAKE2B e775bf6eb60fd1c351a01e661a1a5739ea4b3fbba6f94f8b0e03f0ec9858dd4471098dca6429484a703d9f0b5d7eec03abbbab655df4531727e347f3fbbb7212 SHA512 2b7573196d3c40ae1ba9e473b4e10be5ea571f30f446d9896c3a6a156a1331daeaa65df919756f815928c8d175d8d941b52d1812ee526024e396a8487f028f43
+EBUILD ark-20.08.1.ebuild 1995 BLAKE2B b16597d7a6852fecd3f16935cad6161337b8758d7a8c67b37be17b299855badbf775537b4deacb818dfaba3e422ece157c4023a17c7d14833432a91cb6d7366a SHA512 e91daa641b690c9e31ba10041c698e0997d79096b934415f26d6468c310d640905a34e0fb1c25843abb512f24b3cca86a317018e672fd7647a40e8d3fa0062de
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-20.04.3-r2.ebuild b/kde-apps/ark/ark-20.04.3-r2.ebuild
new file mode 100644
index 000000000000..14b1322ed480
--- /dev/null
+++ b/kde-apps/ark/ark-20.04.3-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.70.0
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="File archiver by KDE"
+HOMEPAGE="https://kde.org/applications/en/ark
+https://utils.kde.org/projects/ark/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
+IUSE="zip"
+
+BDEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	app-arch/libarchive:=[bzip2,lzma,zlib]
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	sys-libs/zlib
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-CVE-2020-16116.patch"
+	"${FILESDIR}/${P}-CVE-2020-24654.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package zip LibZip)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(plugins-clirartest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "rar archive creation/extraction" app-arch/rar
+		optfeature "rar archive extraction only" app-arch/unar app-arch/unrar
+		optfeature "7-Zip archive support" app-arch/p7zip
+		optfeature "lrz archive support" app-arch/lrzip
+		optfeature "markdown support in text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT}
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-apps/ark/ark-20.08.1.ebuild b/kde-apps/ark/ark-20.08.1.ebuild
index d96ecd65de21..d683f2a50092 100644
--- a/kde-apps/ark/ark-20.08.1.ebuild
+++ b/kde-apps/ark/ark-20.08.1.ebuild
@@ -8,10 +8,10 @@ ECM_TEST="optional"
 KFMIN=5.72.0
 QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
-DESCRIPTION="KDE Archiving tool"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.ark
+DESCRIPTION="File archiver by KDE"
+HOMEPAGE="https://kde.org/applications/en/ark
 https://utils.kde.org/projects/ark/"
 
 LICENSE="GPL-2" # TODO: CHECK
@@ -50,9 +50,6 @@ DEPEND="${RDEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 
-# bug #560548, last checked with 16.04.1
-RESTRICT+=" test"
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package zip LibZip)
@@ -61,28 +58,22 @@ src_configure() {
 	ecm_src_configure
 }
 
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if ! has_version app-arch/rar; then
-			elog "For creating/extracting rar archives, installing app-arch/rar is required."
-			if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
-				elog "Alternatively, for only extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
-			fi
-		fi
-
-		has_version app-arch/p7zip || \
-			elog "For handling 7-Zip archives, install app-arch/p7zip."
+src_test() {
+	local myctestargs=(
+		-E "(plugins-clirartest)"
+	)
 
-		has_version app-arch/lrzip || \
-			elog "For handling lrz archives, install app-arch/lrzip."
+	ecm_src_test
+}
 
-		if ! has_version kde-misc/markdownpart:${SLOT} ||
-				! has_version kde-misc/kmarkdownwebview:${SLOT} ; then
-			elog "For markdown support in text previews, install one of:"
-			elog "   kde-misc/markdownpart:${SLOT}"
-			elog "   kde-misc/kmarkdownwebview:${SLOT}"
-		fi
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "rar archive creation/extraction" app-arch/rar
+		optfeature "rar archive extraction only" app-arch/unar app-arch/unrar
+		optfeature "7-Zip archive support" app-arch/p7zip
+		optfeature "lrz archive support" app-arch/lrzip
+		optfeature "markdown support in text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT}
 	fi
+	ecm_pkg_postinst
 }
diff --git a/kde-apps/ark/files/ark-20.04.3-CVE-2020-24654.patch b/kde-apps/ark/files/ark-20.04.3-CVE-2020-24654.patch
new file mode 100644
index 000000000000..8b3821893ef3
--- /dev/null
+++ b/kde-apps/ark/files/ark-20.04.3-CVE-2020-24654.patch
@@ -0,0 +1,53 @@
+From 8bf8c5ef07b0ac5e914d752681e470dea403a5bd Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Tue, 25 Aug 2020 22:14:37 +0200
+Subject: [PATCH] Pass the ARCHIVE_EXTRACT_SECURE_SYMLINKS flag to libarchive
+
+There are archive types which allow to first create a symlink and then
+later on dereference it. If the symlink points outside of the archive,
+this results in writing outside of the destination directory.
+
+With the ARCHIVE_EXTRACT_SECURE_SYMLINKS option set, libarchive avoids
+this situation by verifying that none of the target path components are
+symlinks before writing.
+
+Remove the commented out code in the method, which would actually
+misbehave if enabled again.
+
+Signed-off-by: Fabian Vogt <fabian@ritter-vogt.de>
+---
+ plugins/libarchive/libarchiveplugin.cpp | 18 +++---------------
+ 1 file changed, 3 insertions(+), 15 deletions(-)
+
+diff --git a/plugins/libarchive/libarchiveplugin.cpp b/plugins/libarchive/libarchiveplugin.cpp
+index 50e81da1..8a0fed21 100644
+--- a/plugins/libarchive/libarchiveplugin.cpp
++++ b/plugins/libarchive/libarchiveplugin.cpp
+@@ -509,21 +509,9 @@ void LibarchivePlugin::emitEntryFromArchiveEntry(struct archive_entry *aentry)
+ 
+ int LibarchivePlugin::extractionFlags() const
+ {
+-    int result = ARCHIVE_EXTRACT_TIME;
+-    result |= ARCHIVE_EXTRACT_SECURE_NODOTDOT;
+-
+-    // TODO: Don't use arksettings here
+-    /*if ( ArkSettings::preservePerms() )
+-    {
+-        result &= ARCHIVE_EXTRACT_PERM;
+-    }
+-
+-    if ( !ArkSettings::extractOverwrite() )
+-    {
+-        result &= ARCHIVE_EXTRACT_NO_OVERWRITE;
+-    }*/
+-
+-    return result;
++    return ARCHIVE_EXTRACT_TIME
++           | ARCHIVE_EXTRACT_SECURE_NODOTDOT
++           | ARCHIVE_EXTRACT_SECURE_SYMLINKS;
+ }
+ 
+ void LibarchivePlugin::copyData(const QString& filename, struct archive *dest, bool partialprogress)
+-- 
+GitLab
+
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 362ae25473ed..0dfd63880942 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,6 @@
+AUX marble-20.04.3-gpsd-3.21.patch 1275 BLAKE2B 9a028d6869e2ea4e860a170f648d6b3a83b2e8fe509b43a11a33a7915bade3ecf565810996b51bafc9e55b70bab78636aef89987a5ef6da3f968d45dc1ebb6d1 SHA512 23f5dcd9b577e4f2fc07afbc44e374fdf94b326f76ce436c703173577b15337a5747014e73bc62a84ff1601ae8fd0d21902c3e746e34c8d432980197fe428944
 DIST marble-20.04.3.tar.xz 52200548 BLAKE2B 83388e292487dbbe10bde4f4d67337b8d8606df26fda3621640cf49a1a930b6cdb9357a96568fc33597f0ee2627a22a2f2920a7dad45bab1502e5a8869934de1 SHA512 5c29b0a25164b50f197c826258d8de8b4e1a386d91fa7a6f67eb3da64197b2cefef31b0759c3bd19e9a5b0f0c639adc779d71a7ef1d7b51fca4e58cc3c8530cd
 DIST marble-20.08.1.tar.xz 52194612 BLAKE2B 69d58959c632e289b70bebabd55b7f9e66d202676a36597527d945b055620dd0b373cde6211d2c9bbef2b56c952f326fd8bbbcf4946b7fbcdcd17f47ece2ea6b SHA512 4306ba2ca620d7081b289b309abca9d741ee3376583ee662b34d09a1b03b42e00f034c34be371fed03a1196df5dd21fecf7e6c981053acfc9511a2bd85417485
-EBUILD marble-20.04.3.ebuild 2688 BLAKE2B df187b207a1c62a2e479bab9cadb4a8841fc7860e212766831b121c8cf5a18d23e6dc2fd92cedc2ffbd339f31d5e308610b19e4975af6518b42b4d992e1bb25c SHA512 df2f3f8474b33830496f4244d414b8074929d9cbeb52430f500c1114be240d17b95025f3a8d0e4e5c85d4d709620b016c9b419faf740bc596045bd2ec4ca3c27
+EBUILD marble-20.04.3.ebuild 2749 BLAKE2B c691aaf1364d590d281ba48cf45ac687b9f677e6a34bdade741b87a6c5b4f0a4f366fc654c64e1c3c31b1de2e150aebc5b04034096292bc205fa39c05e569f4b SHA512 c3998c234e287e5662ac94d6f1d9703370a73092e55390881321e072397f72ff63e991de632cb034b4888413455c3415d264f810c4523b8c47e75436567f456e
 EBUILD marble-20.08.1.ebuild 2624 BLAKE2B c80b29ea7ab282e06e08474b4c9b223a55ff5767357d3b751a42ea7564fb11668a2b248f9ffd979fa80392ef55a7d28cbbe9a377743e01c5df69f2b012fd83b9 SHA512 3dd6c70ab5ef8404289a94a169105f0ed006da27bcc4835c141fdf524645a231ce7f72851cee7a941c656836816b2460408d20271964a1d9730a1152df6cf223
 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473
diff --git a/kde-apps/marble/files/marble-20.04.3-gpsd-3.21.patch b/kde-apps/marble/files/marble-20.04.3-gpsd-3.21.patch
new file mode 100644
index 000000000000..acde5d8b6610
--- /dev/null
+++ b/kde-apps/marble/files/marble-20.04.3-gpsd-3.21.patch
@@ -0,0 +1,29 @@
+From 7039b70f0255376e5d67dad603f5d67f8c3c07db Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Wed, 5 Aug 2020 14:20:37 +0200
+Subject: [PATCH] Fix build with gpsd 3.21
+
+Adapt to API changes
+---
+ .../positionprovider/gpsd/GpsdPositionProviderPlugin.cpp      | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+index 3a787eb1f..02dc4a355 100644
+--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
++++ b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+@@ -79,7 +79,11 @@ void GpsdPositionProviderPlugin::update( gps_data_t data )
+ {
+     PositionProviderStatus oldStatus = m_status;
+     GeoDataCoordinates oldPosition = m_position;
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 10 )
++    if ( data.fix.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) )
++#else
+     if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) )
++#endif
+         m_status = PositionProviderStatusAcquiring;
+     else {
+         m_status = PositionProviderStatusAvailable;
+-- 
+GitLab
+
diff --git a/kde-apps/marble/marble-20.04.3.ebuild b/kde-apps/marble/marble-20.04.3.ebuild
index f6ee6bf963a8..72acb503e88c 100644
--- a/kde-apps/marble/marble-20.04.3.ebuild
+++ b/kde-apps/marble/marble-20.04.3.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}"
 # bug 588320
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-gpsd-3.21.patch" ) # bug 744823
+
 src_prepare() {
 	ecm_src_prepare
 
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index b27037491c4b..455fa531eec4 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 31ffbc523430..316ed1c8becc 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,5 +1,6 @@
+AUX kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch 3597 BLAKE2B 366b97d001781e6c471db9cf01c1a11e3c2c22afa78fe9fcf6bf15b456146c5d0c700f6f458d36ca5c7b1c437e2f88418a787fd84d9dd3d08b69bd33d2c482e9 SHA512 e9dddeb06e8776cfbba8de37362a3decdfa103aed0a0bcf8565833d96b4d583986d63d331cd1f5ed8ee3c423dcff784ff361fa4e4019f5ed48b28773f6eb4803
 DIST kdeclarative-5.70.0.tar.xz 175644 BLAKE2B cbf1c33a8798aca1ed78bc77aedf5ba7988622de939727f6452facb271ac98801f8875fb5a33bfb6ee058263216e88eb87be5e4134bcafb032035af0dbb069ed SHA512 c974edf29cf5e02ce01bd0e158c1ee25ede8bac192d30d1398afa680420de05e0a8f4ba1b7f74577b6fd9c3e41d4bb5f7ec2730eddf1834b79dcda623b5f6714
 DIST kdeclarative-5.74.0.tar.xz 190360 BLAKE2B cf4ac587189c4f6fba6a13eaea4eea95e7e8aacf902c8ed809fac03f5ca76c9e42eff9fa74c1dfb0d0618c71bd4109a1c6b8f6964b242659757efadcc149ddb5 SHA512 8428a60146275dff201518764678bb7c5acce473bcfa584ea1b4924db485ade1b45e55f3aa758fbcf326b15e0e24dcb0913fbabbedd795b7b47e3b3f7e897f78
 EBUILD kdeclarative-5.70.0.ebuild 949 BLAKE2B adbd8cfbf9991458690cf378cccac33d8f6b87df6859224f2c3099011763c48c3acbad2a89292c19b94ea68ddcb7b9ffa526f107e55264231a2143be69aba15f SHA512 dde8be85b85a1fd983e098627f5373d114eef1d6a2e4a6f6c99c6581da0837abfe4c8c39a20ad16f9ee944c9636b0b3c75a87b38918553e47f151d6dc7d9b27f
-EBUILD kdeclarative-5.74.0.ebuild 996 BLAKE2B e60f5611affbb10f142e4694a7678fee3d09d59d7301564cbbb8746a425a47290d67b79c5fe20da1e010905865d2ac8bbfa3fef4f468047b12dc584e9e5198e3 SHA512 4896c21762d7d33047fd420bd08679e16151e5de23031d7a6bc19b2b06bbfef04df6af495feb1802351e95df981b532774a3b75ed20197cbc938f405e8b082ff
+EBUILD kdeclarative-5.74.0-r1.ebuild 1080 BLAKE2B b2ac3fde03915e443c114eb3238a4ddcc9a81c66ee57162845b72a96e19a661c0cc043634bf571bd3774c98f6be28ecab3ce5d6568a3bb410496ee87b389f3d7 SHA512 68dba207b9dcb85f64ebcc72370d4b7831634574cea71543d910ba816d069353f3c4dea62f63a5d6681d040fa6ff95a44fdfa4c7fd3008fa4a14f574ab727cf9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdeclarative/files/kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch b/kde-frameworks/kdeclarative/files/kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch
new file mode 100644
index 000000000000..66808f910bf0
--- /dev/null
+++ b/kde-frameworks/kdeclarative/files/kdeclarative-5.74.0-block-shortcuts-when-recording-key-sequences.patch
@@ -0,0 +1,104 @@
+From 88aabf069a0e454777c15227126732a04c8cb8b2 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 18 Sep 2020 00:13:07 +0100
+Subject: [PATCH] Block shortcuts when recording key sequences
+
+Otherwise you can't select alt+a as a shortcut without triggering the
+nmenomic generated shortcut on the "add application" button.
+
+Testing done:
+- clicked "Add custom shortcut", pressed alt+a, it was recorded
+successfully
+
+- focussed "Add custom shortcut", pressed alt+a, the relevant shortcut
+activated
+
+Note that isRecording was already declared, but not defined, which is
+why it looks like my diff misses something.
+
+BUG: 425979
+---
+ src/qmlcontrols/kquickcontrols/KeySequenceItem.qml        | 7 +++++++
+ .../kquickcontrols/private/keysequencehelper.cpp          | 8 +++++++-
+ .../kquickcontrols/private/keysequencehelper.h            | 7 +++++++
+ 3 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml b/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
+index 9d8e035..d1fbc02 100644
+--- a/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
++++ b/src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
+@@ -83,6 +83,13 @@ RowLayout {
+             }
+         }
+ 
++        Keys.onShortcutOverride: {
++            if (_helper.isRecording) {
++                _helper.keyPressed(event.key, event.modifiers);
++                event.accepted = true;
++            }
++        }
++
+         Keys.onPressed: {
+             _helper.keyPressed(event.key, event.modifiers);
+             event.accepted = true;
+diff --git a/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp b/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp
+index ba7ce01..26b0331 100644
+--- a/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp
++++ b/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp
+@@ -237,7 +237,10 @@ void KeySequenceHelper::setCheckAgainstShortcutTypes(KeySequenceHelper::Shortcut
+     Q_EMIT checkAgainstShortcutTypesChanged();
+ }
+ 
+-
++bool KeySequenceHelper::isRecording() const
++{
++    return d->isRecording;
++}
+ 
+ void KeySequenceHelper::clearKeySequence()
+ {
+@@ -251,6 +254,7 @@ void KeySequenceHelperPrivate::startRecording()
+     oldKeySequence = keySequence;
+     keySequence = QKeySequence();
+     isRecording = true;
++    emit q->isRecordingChanged();
+     grabbedWindow = QQuickRenderControl::renderWindowFor(q->window());
+     if (!grabbedWindow) {
+         grabbedWindow = q->window();
+@@ -265,6 +269,8 @@ void KeySequenceHelper::doneRecording()
+ {
+     d->modifierlessTimeout.stop();
+     d->isRecording = false;
++    emit isRecordingChanged();
++
+     d->stealActions.clear();
+     if (d->grabbedWindow) {
+         d->grabbedWindow->setKeyboardGrabEnabled(false);
+diff --git a/src/qmlcontrols/kquickcontrols/private/keysequencehelper.h b/src/qmlcontrols/kquickcontrols/private/keysequencehelper.h
+index c9068e8..daeedc5 100644
+--- a/src/qmlcontrols/kquickcontrols/private/keysequencehelper.h
++++ b/src/qmlcontrols/kquickcontrols/private/keysequencehelper.h
+@@ -51,6 +51,12 @@ class KeySequenceHelper : public QQuickItem
+         NOTIFY checkAgainstShortcutTypesChanged
+     )
+ 
++    Q_PROPERTY(
++        bool isRecording
++        READ isRecording
++        NOTIFY isRecordingChanged
++    )
++
+ public:
+ 
+     enum ShortcutType {
+@@ -116,6 +122,7 @@ Q_SIGNALS:
+     void shortcutDisplayChanged(const QString &string);
+     void captureFinished();
+     void checkAgainstShortcutTypesChanged();
++    void isRecordingChanged();
+ 
+ public Q_SLOTS:
+     void captureKeySequence();
+-- 
+GitLab
+
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r1.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r1.ebuild
new file mode 100644
index 000000000000..6e28a831ed99
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.74.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.15.0
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	media-libs/libepoxy
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-block-shortcuts-when-recording-key-sequences.patch
+)
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.74.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.74.0.ebuild
deleted file mode 100644
index f1974ae53ddf..000000000000
--- a/kde-frameworks/kdeclarative/kdeclarative-5.74.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing integration of QML and KDE work spaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.15.0
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	media-libs/libepoxy
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 84c8c84b9d0d..354fb1d75f0e 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,6 +1,8 @@
 AUX kio-5.70.0-fix-run-in-terminal.patch 4162 BLAKE2B 5fb81c0bce45dc22a8dea27b81e962e267f000aa224fa7ce2dfbf3dd01bb9cd90a73623482a1580a1b95de91e3d40a157988dc3123b3e1a942827ded77174588 SHA512 64b068ea2bc9eca10f8144bcace49989c75ab64d4991b12d4720421464e3c372c5a95d56d510f68d84424e4071e2b2ec9bc447fc30e5e3c9189ccd6156d56738
+AUX kio-5.74.1-handle-shell-scripts-consistenty.patch 13311 BLAKE2B a579f98dd358748654a9f3627eaea9d85f706d4f741a8ab7142d2f2b2a2acdb1ee1eb7c4dbdc34dd0edf2eb879f60bdd8edd7791c7fab1f001a9a5e49da54d58 SHA512 76caaadaa4ce1d3cf2d5a9418c70f44769445185f0752ae0aa00acf77ac7a215bc3f95fac860a90c7e6e6739d82c9250901dde1bad97ebb01b0ba51ed1a37f3e
+AUX kio-5.74.1-kio_trash-too-strict-perms-check.patch 2982 BLAKE2B 4ce5f193979a99755f1d5bcb454ab50a6c90e922ce40966dda8dd43765646a42bf6cefe8b237af69a07b5e20b45f92d092818ca6ce19148f3cb0d0855cb5b59f SHA512 21c8b31080bea94343a5618af780e50b09ff0477f563941955bae94ac8eb676312dd1b63b4a5b2f19b37317652996147614b22e47a17eb7c0f3beeff38ee6f70
 DIST kio-5.70.1.tar.xz 3200752 BLAKE2B cc56ee412cb647c8921a36c3e47747640d5574444630f70887401c69ca1a367205adf4d7cd45b721abd103efcb1265c956654fce2dfc5b3fe6241413c51f1b88 SHA512 12287f330e8e7b9ac9c0ff24c1f8f980fbd338ce3f341d8005d6dc6e3acdf96da07adeea693b3361909819d8814192503e8d2c93ca9b9958d985f0d09f202661
 DIST kio-5.74.1.tar.xz 3281248 BLAKE2B 584fde1483477b70ee7892bf0de37aedb62672c2ada57d85c9646894606f10b6a03750030e1926441707b12b18ece167fa3a0dbbb75a8155bddfd35342d372f8 SHA512 a563b939d2bc71443c6c748ddf293fab84072efebdcea639707d7aaf2739356a906668be3dca915464ce7c81b63d7482ac024df786e04bbafcf999cde5ebc5e2
 EBUILD kio-5.70.1-r1.ebuild 2458 BLAKE2B cd466f2258c565420ff6e34a42a0ea1ea85aa9f4e32fee0b9833e696994576de4feebda2001bab8d5b6f0b19b8bb4c6e53d3a716d21f516579836e83547d1c1c SHA512 d4ec508f1ec53a12d2d994cf6a02186fbccf3f44f5cd0897844c21af19ec136e0d50a73381a32c55418de334f6f7b21d0939977ef49763582147617fec3c00ad
-EBUILD kio-5.74.1.ebuild 2395 BLAKE2B 34e8488cf9edd0371b618757ca46a363040fc3766af3a82c833acb0a1e048001d9f8b0962f53857351258ae8706c6285639cbd0f0966ae323cc8c5674241e932 SHA512 8cadbd0d04604844750d670a7316aaf1da657e828a17ee46089b304dd1ec4ba30a3ead2e1bb7fc2922f68b40cd8c3254a71c0c3631bfe18c18a893ca84a12503
+EBUILD kio-5.74.1-r1.ebuild 2526 BLAKE2B 1e91b7dc1a3fdc9c94e569644fef4f0ec1849aa2c7bdd78d80290227661d05e8276e71daea274124dd894ca79719515d774f5db0f997de2d3e7f497cbcd55ccb SHA512 8167ad0e258a656ffd9712270225f9bd06420eee499f563e1f2e4184b6bf0bfa53ac117b7d098025d06db3bd21632f88afc121d64f91133c979a76c6557dd5a8
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/files/kio-5.74.1-handle-shell-scripts-consistenty.patch b/kde-frameworks/kio/files/kio-5.74.1-handle-shell-scripts-consistenty.patch
new file mode 100644
index 000000000000..f5e17f338fda
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.74.1-handle-shell-scripts-consistenty.patch
@@ -0,0 +1,310 @@
+From fdd7c47c85d5d6dbf21e05e7a0d6afcf383f1d24 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Tue, 15 Sep 2020 20:06:49 +0200
+Subject: [PATCH] OpenUrlJob: handle all text scripts consistently
+
+Previously we only handled application/x-shellscript, but there are other
+scripts; a script is technically a file that inherits both text/plain and
+application/x-executable, e.g. .sh, .csh, .py, perl scripts ...etc. Treat
+all those mime types the way we handled shell scripts:
+  - if it's not a local url, or isn't executable we open it in the preferred
+    text editor
+  - if it's executable either show the OpenOrExecute dialog or execute
+    directly depending on how the job is configured
+
+The mimetype world is a confusing one:
+  - Executables, this includes .exe files (MS Windows); and "application/x-executable"
+    and "application/x-sharedlib", this depends on various parameters (e.g.
+    stripped executables are x-sharedlib, the same executable if not stripped
+    is x-executable...)
+  - Scripts: shell, python, perl... etc scripts, which are text files that
+    can be executed or opened as text.
+
+Adjust the unit test.
+
+BUG: 425829
+BUG: 425177
+FIXED-IN: 5.75
+---
+ autotests/openurljobtest.cpp | 56 +++++++++++++++++++++++--------
+ autotests/openurljobtest.h   |  2 ++
+ src/gui/openurljob.cpp       | 65 ++++++++++++++++++++++--------------
+ 3 files changed, 85 insertions(+), 38 deletions(-)
+
+diff --git a/autotests/openurljobtest.cpp b/autotests/openurljobtest.cpp
+index 2f2ef8ad..ed2211a8 100644
+--- a/autotests/openurljobtest.cpp
++++ b/autotests/openurljobtest.cpp
+@@ -103,14 +103,13 @@ void OpenUrlJobTest::initTestCase()
+     KConfigGroup grp = mimeAppsCfg.group("Default Applications");
+     grp.writeEntry("text/plain", s_tempServiceName);
+     grp.writeEntry("text/html", s_tempServiceName);
+-    grp.writeEntry("application/x-shellscript", s_tempServiceName);
+     grp.sync();
+ 
+-    for (const char *mimeType : {"text/plain", "application/x-shellscript"}) {
+-        KService::Ptr preferredTextEditor = KApplicationTrader::preferredService(QString::fromLatin1(mimeType));
+-        QVERIFY(preferredTextEditor);
+-        QCOMPARE(preferredTextEditor->entryPath(), m_fakeService);
+-    }
++
++    // "text/plain" encompasses all scripts (shell, python, perl)
++    KService::Ptr preferredTextEditor = KApplicationTrader::preferredService(QStringLiteral("text/plain"));
++    QVERIFY(preferredTextEditor);
++    QCOMPARE(preferredTextEditor->entryPath(), m_fakeService);
+ 
+     // As used for preferredService
+     QVERIFY(KService::serviceByDesktopName("openurljobtest_service"));
+@@ -230,17 +229,38 @@ void OpenUrlJobTest::invalidUrl()
+     QCOMPARE(job2->errorString(), QStringLiteral("Malformed URL\n/pathonly"));
+ }
+ 
++void OpenUrlJobTest::refuseRunningNativeExecutables_data()
++{
++    QTest::addColumn<QString>("mimeType");
++
++    // Executables under e.g. /usr/bin/ can be either of these two mimetypes
++    // see https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/11
++    QTest::newRow("x-sharedlib") << "application/x-sharedlib";
++    QTest::newRow("x-executable") << "application/x-executable";
++}
++
+ void OpenUrlJobTest::refuseRunningNativeExecutables()
+ {
+-   KIO::OpenUrlJob *job = new KIO::OpenUrlJob(QUrl::fromLocalFile(QCoreApplication::applicationFilePath()), QStringLiteral("application/x-executable"), this);
++   QFETCH(QString, mimeType);
++
++   KIO::OpenUrlJob *job = new KIO::OpenUrlJob(QUrl::fromLocalFile(QCoreApplication::applicationFilePath()), mimeType, this);
+    QVERIFY(!job->exec());
+    QCOMPARE(job->error(), KJob::UserDefinedError);
+    QVERIFY2(job->errorString().contains("For security reasons, launching executables is not allowed in this context."), qPrintable(job->errorString()));
+ }
+ 
++void OpenUrlJobTest::refuseRunningRemoteNativeExecutables_data()
++{
++    QTest::addColumn<QString>("mimeType");
++    QTest::newRow("x-sharedlib") << "application/x-sharedlib";
++    QTest::newRow("x-executable") << "application/x-executable";
++}
++
+ void OpenUrlJobTest::refuseRunningRemoteNativeExecutables()
+ {
+-    KIO::OpenUrlJob *job = new KIO::OpenUrlJob(QUrl("protocol://host/path/exe"), QStringLiteral("application/x-executable"), this);
++   QFETCH(QString, mimeType);
++
++    KIO::OpenUrlJob *job = new KIO::OpenUrlJob(QUrl("protocol://host/path/exe"), mimeType, this);
+     job->setRunExecutables(true); // even with this enabled, an error will occur
+     QVERIFY(!job->exec());
+     QCOMPARE(job->error(), KJob::UserDefinedError);
+@@ -273,8 +293,11 @@ void OpenUrlJobTest::runScript_data()
+ {
+     QTest::addColumn<QString>("mimeType");
+ 
++    // All text-based scripts inherit text/plain and application/x-executable, no need to test
++    // all flavours (python, perl, lua, awk ...etc), this sample should be enough
+     QTest::newRow("shellscript") << "application/x-shellscript";
+-    QTest::newRow("native") << "application/x-executable";
++    QTest::newRow("pythonscript") << "text/x-python";
++    QTest::newRow("javascript") << "application/javascript";
+ }
+ 
+ void OpenUrlJobTest::runScript()
+@@ -305,16 +328,23 @@ void OpenUrlJobTest::runScript()
+ 
+ void OpenUrlJobTest::runNativeExecutable_data()
+ {
++    QTest::addColumn<QString>("mimeType");
+     QTest::addColumn<bool>("withHandler");
+     QTest::addColumn<bool>("handlerRetVal");
+ 
+-    QTest::newRow("no_handler") << false << false;
+-    QTest::newRow("handler_false") << true << false;
+-    QTest::newRow("handler_true") << true << true;
++    QTest::newRow("no_handler_x-sharedlib") << "application/x-sharedlib" << false << false;
++    QTest::newRow("handler_false_x-sharedlib") << "application/x-sharedlib" << true << false;
++    QTest::newRow("handler_true_x-sharedlib") << "application/x-sharedlib" << true << true;
++
++    QTest::newRow("no_handler_x-executable") << "application/x-executable" << false << false;
++    QTest::newRow("handler_false_x-executable") << "application/x-executable" << true << false;
++    QTest::newRow("handler_true_x-executable") << "application/x-executable" << true << true;
++
+ }
+ 
+ void OpenUrlJobTest::runNativeExecutable()
+ {
++    QFETCH(QString, mimeType);
+     QFETCH(bool, withHandler);
+     QFETCH(bool, handlerRetVal);
+ 
+@@ -335,7 +365,7 @@ void OpenUrlJobTest::runNativeExecutable()
+     KIO::setDefaultUntrustedProgramHandler(withHandler ? &s_handler : nullptr);
+ 
+     // When using OpenUrlJob to run the executable
+-    KIO::OpenUrlJob *job = new KIO::OpenUrlJob(QUrl::fromLocalFile(scriptFile), QStringLiteral("application/x-executable"), this);
++    KIO::OpenUrlJob *job = new KIO::OpenUrlJob(QUrl::fromLocalFile(scriptFile), mimeType, this);
+     job->setRunExecutables(true); // startProcess tests the case where this isn't set
+     const bool success = job->exec();
+ 
+diff --git a/autotests/openurljobtest.h b/autotests/openurljobtest.h
+index e71987d9..f5b9a5be 100644
+--- a/autotests/openurljobtest.h
++++ b/autotests/openurljobtest.h
+@@ -26,7 +26,9 @@ private Q_SLOTS:
+ 
+     void noServiceNoHandler();
+     void invalidUrl();
++    void refuseRunningNativeExecutables_data();
+     void refuseRunningNativeExecutables();
++    void refuseRunningRemoteNativeExecutables_data();
+     void refuseRunningRemoteNativeExecutables();
+     void notAuthorized();
+     void runScript_data();
+diff --git a/src/gui/openurljob.cpp b/src/gui/openurljob.cpp
+index 8ac187b4..3e35c95c 100644
+--- a/src/gui/openurljob.cpp
++++ b/src/gui/openurljob.cpp
+@@ -73,9 +73,9 @@ public:
+ 
+ private:
+     void executeCommand();
+-    void handleExecutables(const QMimeType &mimeType);
++    void handleBinaries(const QMimeType &mimeType);
+     void handleDesktopFiles();
+-    void handleShellscripts();
++    void handleScripts();
+     void openInPreferredApp();
+     void runLink(const QString &filePath, const QString &urlStr, const QString &optionalServiceName);
+ 
+@@ -439,14 +439,29 @@ void KIO::OpenUrlJobPrivate::emitAccessDenied()
+     q->emitResult();
+ }
+ 
+-// was: KRun::isExecutable (minus application/x-desktop and application/x-shellscript mimetypes).
++// was: KRun::isExecutable (minus application/x-desktop mimetype).
+ // Feel free to make public if needed.
+-static bool isExecutableMime(const QMimeType &mimeType)
++static bool isBinary(const QMimeType &mimeType)
+ {
+-    return (mimeType.inherits(QStringLiteral("application/x-executable")) ||
+-            /* e.g. /usr/bin/ls, see https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/11 */
+-            mimeType.inherits(QStringLiteral("application/x-sharedlib")) ||
+-            mimeType.inherits(QStringLiteral("application/x-ms-dos-executable")));
++    // - Binaries could be e.g.:
++    //   - application/x-executable
++    //   - application/x-sharedlib e.g. /usr/bin/ls, see
++    //     https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/11
++    //
++    // - Mimetypes that inherit application/x-executable _and_ text/plain are scripts, these are
++    //   handled by handleScripts()
++
++    return (mimeType.inherits(QStringLiteral("application/x-executable"))
++            || mimeType.inherits(QStringLiteral("application/x-sharedlib"))
++            || mimeType.inherits(QStringLiteral("application/x-ms-dos-executable")));
++}
++
++// Helper function that returns whether a file is a text-based script
++// e.g. ".sh", ".csh", ".py", ".js"
++static bool isTextScript(const QMimeType &mimeType)
++{
++    return (mimeType.inherits(QStringLiteral("application/x-executable"))
++            && mimeType.inherits(QStringLiteral("text/plain")));
+ }
+ 
+ // Helper function that returns whether a file has the execute bit set or not.
+@@ -456,7 +471,7 @@ static bool hasExecuteBit(const QString &fileName)
+ }
+ 
+ // Handle native binaries (.e.g. /usr/bin/*); and .exe files
+-void KIO::OpenUrlJobPrivate::handleExecutables(const QMimeType &mimeType)
++void KIO::OpenUrlJobPrivate::handleBinaries(const QMimeType &mimeType)
+ {
+     if (!KAuthorized::authorize(QStringLiteral("shell_access"))) {
+         emitAccessDenied();
+@@ -475,11 +490,9 @@ void KIO::OpenUrlJobPrivate::handleExecutables(const QMimeType &mimeType)
+ 
+     const QString localPath = m_url.toLocalFile();
+ 
+-    // Check whether file is an executable script
+-#ifdef Q_OS_WIN
+-    const bool isNativeBinary = !mimeType.inherits(QStringLiteral("text/plain"));
+-#else
+-    const bool isNativeBinary = !mimeType.inherits(QStringLiteral("text/plain")) && !mimeType.inherits(QStringLiteral("application/x-ms-dos-executable"));
++    bool isNativeBinary = true;
++#ifndef Q_OS_WIN
++    isNativeBinary = !mimeType.inherits(QStringLiteral("application/x-ms-dos-executable"));
+ #endif
+ 
+     if (m_showOpenOrExecuteDialog) {
+@@ -497,6 +510,8 @@ void KIO::OpenUrlJobPrivate::handleExecutables(const QMimeType &mimeType)
+             }
+         };
+ 
++        // Ask the user for confirmation before executing this binary (for binaries
++        // the dialog will only show Execute/Cancel)
+         showOpenOrExecuteFileDialog(dialogFinished);
+         return;
+     }
+@@ -601,15 +616,15 @@ void KIO::OpenUrlJobPrivate::runUrlWithMimeType()
+         return;
+     }
+ 
+-    // Shell scripts
+-    if (mimeType.inherits(QStringLiteral("application/x-shellscript"))) {
+-        handleShellscripts();
++    // Scripts (e.g. .sh, .csh, .py, .js)
++    if (isTextScript(mimeType)) {
++        handleScripts();
+         return;
+     }
+ 
+-    // Binaries (e.g. /usr/bin/konsole) and .exe files
+-    if (isExecutableMime(mimeType)) {
+-        handleExecutables(mimeType);
++    // Binaries (e.g. /usr/bin/{konsole,ls}) and .exe files
++    if (isBinary(mimeType)) {
++        handleBinaries(mimeType);
+         return;
+     }
+ 
+@@ -677,8 +692,9 @@ void KIO::OpenUrlJobPrivate::handleDesktopFiles()
+     openInPreferredApp();
+ }
+ 
+-void KIO::OpenUrlJobPrivate::handleShellscripts()
++void KIO::OpenUrlJobPrivate::handleScripts()
+ {
++    // Executable scripts of any type can run arbitrary shell commands
+     if (!KAuthorized::authorize(QStringLiteral("shell_access"))) {
+         emitAccessDenied();
+         return;
+@@ -687,8 +703,7 @@ void KIO::OpenUrlJobPrivate::handleShellscripts()
+     const bool isLocal = m_url.isLocalFile();
+     const QString localPath = m_url.toLocalFile();
+     if (!isLocal || !hasExecuteBit(localPath)) {
+-        // Open remote shell scripts or ones without the execute bit, with the
+-        // default application
++        // Open remote scripts or ones without the execute bit, with the default application
+         openInPreferredApp();
+         return;
+     }
+@@ -706,7 +721,7 @@ void KIO::OpenUrlJobPrivate::handleShellscripts()
+         return;
+     }
+ 
+-    if (m_runExecutables) { // Local executable shell script, proceed
++    if (m_runExecutables) { // Local executable script, proceed
+         executeCommand();
+     } else { // Open in the default (text editor) app
+         openInPreferredApp();
+@@ -767,7 +782,7 @@ void KIO::OpenUrlJobPrivate::showOpenOrExecuteFileDialog(std::function<void(bool
+ 
+     if (!s_openOrExecuteFileHandler) {
+         // No way to ask the user whether to execute or open
+-        if (mimeType.inherits(QStringLiteral("application/x-shellscript"))
++        if (isTextScript(mimeType)
+             || mimeType.inherits(QStringLiteral("application/x-desktop"))) { // Open text-based ones in the default app
+             openInPreferredApp();
+         } else {
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/files/kio-5.74.1-kio_trash-too-strict-perms-check.patch b/kde-frameworks/kio/files/kio-5.74.1-kio_trash-too-strict-perms-check.patch
new file mode 100644
index 000000000000..d0b0ca0769cc
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.74.1-kio_trash-too-strict-perms-check.patch
@@ -0,0 +1,67 @@
+From 03bcb3d3ff89074a68839b6ebeb8030ef0ee4fd1 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Fri, 11 Sep 2020 11:54:09 +0200
+Subject: [PATCH] kio_trash: remove unnecessarily strict permission check
+
+Tested with `chmod 0770 /d/.Trash-1000` (where /d is a mount point),
+kio_trash complained about security checks before this commit,
+and works with it.
+
+Also tested with a USB key which ends up mounted as
+type vfat (rw,nosuid,nodev,relatime,uid=1000,gid=100,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,showexec,utf8,flush,errors=remount-ro,uhelper=udisks2). After kio_trash creates .Trash-1000
+it complained about a "strange filesystem", and while this is still true :),
+the removal of the code in TrashImpl::initTrashDirectory makes
+the trash dir on the USB key usable.
+
+BUG: 76380
+FIXED-IN: 5.74
+---
+ src/ioslaves/trash/trashimpl.cpp | 25 ++++---------------------
+ 1 file changed, 4 insertions(+), 21 deletions(-)
+
+diff --git a/src/ioslaves/trash/trashimpl.cpp b/src/ioslaves/trash/trashimpl.cpp
+index b1ba87a4..9ec7cc7a 100644
+--- a/src/ioslaves/trash/trashimpl.cpp
++++ b/src/ioslaves/trash/trashimpl.cpp
+@@ -1210,9 +1210,9 @@ QString TrashImpl::trashForMountPoint(const QString &topdir, bool createIfNeeded
+     const QByteArray trashDir_c = QFile::encodeName(trashDir);
+     if (QT_LSTAT(trashDir_c.constData(), &buff) == 0) {
+         if ((buff.st_uid == uid)  // must be owned by user
+-                && (S_ISDIR(buff.st_mode)) // must be a dir
+-                && (!S_ISLNK(buff.st_mode)) // not a symlink
+-                && ((buff.st_mode & 0777) == 0700)) {  // rwx for user, ------ for group and others
++                && S_ISDIR(buff.st_mode) // must be a dir
++                && !S_ISLNK(buff.st_mode) // not a symlink
++                && ((buff.st_mode & 0700) == 0700)) { // and we need write access to it
+ 
+             if (checkTrashSubdirs(trashDir_c)) {
+                 return trashDir;
+@@ -1248,24 +1248,7 @@ bool TrashImpl::initTrashDirectory(const QByteArray &trashDir_c) const
+         return false;
+     }
+     //qCDebug(KIO_TRASH);
+-    // This trash dir will be useable only if the directory is owned by user.
+-    // In theory this is the case, but not on e.g. USB keys...
+-    uid_t uid = getuid();
+-    QT_STATBUF buff;
+-    if (QT_LSTAT(trashDir_c.constData(), &buff) != 0) {
+-        return false;    // huh?
+-    }
+-    if ((buff.st_uid == uid)  // must be owned by user
+-            && ((buff.st_mode & 0777) == 0700)) {  // rwx for user, --- for group and others
+-
+-        return checkTrashSubdirs(trashDir_c);
+-
+-    } else {
+-        qCWarning(KIO_TRASH) << trashDir_c << "just created, by it doesn't have the right permissions, probably some strange unsupported filesystem";
+-        ::rmdir(trashDir_c.constData());
+-        return false;
+-    }
+-    return true;
++    return checkTrashSubdirs(trashDir_c);
+ }
+ 
+ bool TrashImpl::checkTrashSubdirs(const QByteArray &trashDir_c) const
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.74.1-r1.ebuild b/kde-frameworks/kio/kio-5.74.1-r1.ebuild
new file mode 100644
index 000000000000..b77cae090c8c
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.74.1-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# drop qtnetwork subslot operator when QT_MINIMAL >= 5.15.0
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5=[ssl]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kbookmarks-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
+	kerberos? ( virtual/krb5 )
+	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( sys-libs/zlib )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXrender
+	)
+"
+PDEPEND="
+	>=kde-frameworks/kded-${PVCUT}:5
+"
+
+# tests hang
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-kio_trash-too-strict-perms-check.patch
+	"${FILESDIR}"/${P}-handle-shell-scripts-consistenty.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package acl ACL)
+		$(cmake_use_find_package handbook KF5DocTools)
+		$(cmake_use_find_package kerberos GSSAPI)
+		$(cmake_use_find_package kwallet KF5Wallet)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/kde-frameworks/kio/kio-5.74.1.ebuild b/kde-frameworks/kio/kio-5.74.1.ebuild
deleted file mode 100644
index b2b55fc7759f..000000000000
--- a/kde-frameworks/kio/kio-5.74.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-# drop qtnetwork subslot operator when QT_MINIMAL >= 5.15.0
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5=[ssl]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kbookmarks-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
-	kerberos? ( virtual/krb5 )
-	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	test? ( sys-libs/zlib )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libXrender
-	)
-"
-PDEPEND="
-	>=kde-frameworks/kded-${PVCUT}:5
-"
-
-# tests hang
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package acl ACL)
-		$(cmake_use_find_package handbook KF5DocTools)
-		$(cmake_use_find_package kerberos GSSAPI)
-		$(cmake_use_find_package kwallet KF5Wallet)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	ecm_pkg_postrm
-	xdg_desktop_database_update
-}
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index a9d96ab8ddf4..1e87bafac8d3 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,7 @@
+AUX kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch 1052 BLAKE2B 517e9e9956a8c773272a05b6217d18360742fd0ed72fb5179a6dcecc1426fd5eeae5b0d6b759612f13d3f88d5fe5659921631758ef98e9632d1a3f0474f1b03f SHA512 543ec519467800d4e27836834fbb9f846335a283a13e5414caf1fa8684d21a464a151709d8f238a37fc48ae2aee1cb5ebfdcd63c566d43406d3ec99c46f2ccdc
+AUX kirigami-5.74.0-revert-fix-avatar-loading.patch 969 BLAKE2B a44a3d4961b523fabc79fdc8ea4abc9b036c7b51e16b88dcfd6167046066f4589860ff3d0d37cc00d473617a72f02b2130dcae686c0f93875915e71d2b240309 SHA512 3626e74ad0be79b0861f1b4fcf10ec6d07495cbc9a4879d12b93e5b14d70ea0b432d5174d40f2c0a370e932a30eba235a3d19a2f75e04cb07cae62b29cf25ea1
 DIST kirigami2-5.70.0.tar.xz 257720 BLAKE2B 034d4ad0a6ab78c5ad1f5beffdc41e5702d956ee7e6e527f003da40ba0e55a4900404c2e2a58fd4d28b4169eb22407b8cb7c2a377c39d8ae1977558cf3eb54d4 SHA512 45c582110cc4d7595c6d467f16f77aba6d66ba0701fea2d1049e7c6af8a73376c0521126031cd1748a8735b0ea75917a8ba1c6f6f72497778d8a883671ef0afb
 DIST kirigami2-5.74.0.tar.xz 282820 BLAKE2B bd3cbdf3b98ee88518a9347180f59fb7cdb262fa6acf824da1de3103c516213a42cf106425eafaf497cab5be15f91bbf9dc4f3e10c7464cce19f0e0b564b4f4d SHA512 43059bc682e2d729a0a926e26ce5ba68947f275ffdd74836c124d9e063273429ccde8c0cebaef53168c46cfd62f41cb2c33d86f1f515ca619bde604aa7f5da5f
 EBUILD kirigami-5.70.0.ebuild 1032 BLAKE2B b82aa6be9a425c787d13fbe9fb3d00f5c2bb241579f6ca39276552e949fce5fde63d01dc74e2ba359e7be2b8c34de12dd70a91de02cb1a52a9127b0cb82a4bb0 SHA512 34b0076c28f6c3946780031d6deadd8d6cf1016164b67bd963c24d02af4100f6d9c1ac79da5e757a75444dca2848d0eddf5c1e4a21a4e32451badbe7284a68ec
-EBUILD kirigami-5.74.0.ebuild 978 BLAKE2B a8fc110a4e61a5d381c094c04ab27ad0edc888bacfcaba4782ad1962aeb8d9eccb008ea1931c347442da2b9f649637f045ec39128b94a3d7e94fa17b8026f6f0 SHA512 b01e3b320b834f82b0c2e44fbf91fb3cef72db08ebeea4af45cf9813f4be906173c6022b0fd4650c992400e3e2f3ef2dcd8cf276e74c1dcbad0255d43112da39
+EBUILD kirigami-5.74.0-r1.ebuild 1118 BLAKE2B 262597aeb3de66d191b89f44aedd5595d79c2ae623788fb6def60efddb11a6eb9d5ef16d18218bbdeaf2c0319aef6641c750ac644139bf4e5b74967a7a8e3b48 SHA512 f51515bb6e7ce0f345e09da68657477d5dafd40783ac23376fe5ca3f35dee1fd5e7bdd58144911ccf1a14332360bc9ffd8254279a0f6f3aacbc440d358a8c1e2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch b/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch
new file mode 100644
index 000000000000..192ba9dcf67f
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch
@@ -0,0 +1,40 @@
+From 6eaefba5001445fa7e198e4caa0bde738240d66f Mon Sep 17 00:00:00 2001
+From: Arjen Hiemstra <ahiemstra@heimr.nl>
+Date: Wed, 9 Sep 2020 13:00:59 +0200
+Subject: [PATCH] Remove actions and delegates from ToolBarLayout when they get
+ destroyed
+
+Otherwise we're keeping around stale entries that no longer point to
+valid stuff.
+
+BUG: 425670
+---
+ src/toolbarlayout.cpp | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/toolbarlayout.cpp b/src/toolbarlayout.cpp
+index cbf31062..c2df5998 100644
+--- a/src/toolbarlayout.cpp
++++ b/src/toolbarlayout.cpp
+@@ -112,6 +112,18 @@ void ToolBarLayout::addAction(QObject* action)
+     d->actions.append(action);
+     d->actionsChanged = true;
+ 
++    connect(action, &QObject::destroyed, this, [this](QObject *action) {
++        auto itr = d->delegates.find(action);
++        if (itr != d->delegates.end()) {
++            d->delegates.erase(itr);
++        }
++
++        d->actions.removeOne(action);
++        d->actionsChanged = true;
++
++        relayout();
++    });
++
+     relayout();
+ }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/kirigami/files/kirigami-5.74.0-revert-fix-avatar-loading.patch b/kde-frameworks/kirigami/files/kirigami-5.74.0-revert-fix-avatar-loading.patch
new file mode 100644
index 000000000000..60dae8389abf
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.74.0-revert-fix-avatar-loading.patch
@@ -0,0 +1,30 @@
+From aaaabf1ea84d9c5ae9cf50a306b79f15f44f5b35 Mon Sep 17 00:00:00 2001
+From: Carson Black <uhhadd@gmail.com>
+Date: Sat, 19 Sep 2020 12:21:33 -0400
+Subject: [PATCH] Revert "Fix: avatar loading"
+
+This reverts commit 338d91be7254099c1ad4c1f475acb6368df2b114, which
+introduced a visual regression in the users KCM among other places
+that use the Avatar by causing the image to fail to resize according
+to the size of the avatar component.
+---
+ src/controls/Avatar.qml | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/controls/Avatar.qml b/src/controls/Avatar.qml
+index a4f59448..775e5987 100644
+--- a/src/controls/Avatar.qml
++++ b/src/controls/Avatar.qml
+@@ -133,9 +133,6 @@ QQC2.Control {
+             mipmap: true
+             smooth: true
+ 
+-            sourceSize.width: avatarRoot.implicitWidth
+-            sourceSize.height: avatarRoot.implicitHeight
+-
+             fillMode: Image.PreserveAspectFit
+             anchors.fill: parent
+         }
+-- 
+GitLab
+
diff --git a/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild
new file mode 100644
index 000000000000..0064f84f415c
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}2"
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QTMIN}:5
+"
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+"
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-revert-fix-avatar-loading.patch
+	"${FILESDIR}"/${P}-remove-actions-from-ToolBarLayout-when-destroyed.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kirigami/kirigami-5.74.0.ebuild b/kde-frameworks/kirigami/kirigami-5.74.0.ebuild
deleted file mode 100644
index a916f233d0b7..000000000000
--- a/kde-frameworks/kirigami/kirigami-5.74.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="false"
-ECM_TEST="true"
-KDE_ORG_NAME="${PN}2"
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
-HOMEPAGE="https://techbase.kde.org/Kirigami"
-EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QTMIN}:5
-"
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-"
-
-# requires package to already be installed
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index a625b5667e35..7d84efd4d19c 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,6 @@
+AUX kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch 2160 BLAKE2B c467d71f6ce8d24f90aa29192e1f19d10ff8c2d290a1695259e93fb90b1f0d77ed46a2346599c8c5a540a406c55ef68a3fe8cf9b8fe40bcbdb8cca9f113df755 SHA512 4188f192ac437f6334d261f8f178dd2ca29d2ea48fa4d51e23483b2212369ee79521f098a9a51e8e8ac1ec0f861b76a96fefe5a1620149102d2d9268ca794cb3
 DIST kxmlgui-5.70.0.tar.xz 857852 BLAKE2B 7908b175c34761832dfa835ec96978ab2c107263f0e358074b2d26ce54f8eb71236f65bfac5be480bc3f487f854d1de2843ecfc757e0417b4378b67c866f7863 SHA512 d50394c42bf494d70acab91f77817e96fb76efcf1f15af2a17dd027a175d87ea27778756124c15dd104278773f74c9a1d2fca7f0671b12adcd9851532a0958e2
 DIST kxmlgui-5.74.0.tar.xz 864784 BLAKE2B d6cc88603f0036415981411bbaeca6ba7877df085d5b5095b04b7d5567d0e1f23ad3d8c8b1472a365018e9360ee4351c7523fd791d4e53ecca3e9143cc8f2b72 SHA512 98f3e65c30a095d17c0512894bbba0bb172b2044652a0d23324f843489f5bb726359be40a9d68a7916d45a2a6e135f0bbbf7924b35a1939611b75ad6d44ccd92
 EBUILD kxmlgui-5.70.0.ebuild 1285 BLAKE2B 4017f3fb0eab9abf2d9e049c0b3d3050d37e886f4a6d8a9fc09874dc72c6f30ca9b398be7e120e86e56361eb9bbadaead4e9dc7883ecbc6f026292c98fb2d7bf SHA512 4e363d9b13c5b6f6e80ad26e80c486040ba649da079a3f6e87276a4a7546912e3c06a4f669368d849c1853ae791e869c4c6ccff87715d3d4396762859301bd53
-EBUILD kxmlgui-5.74.0.ebuild 1288 BLAKE2B 5e44c255d4fc9af7bffcd8111ae506b9ac0bc209d01b7aeec1d01a5e48646babcdc36aa954448b16fd5e24764cdd3a590ac9f59aeb470cac994db4691f52f7e9 SHA512 4ddbc5d9bf270f33a92bf52f1dbc05ae97ea1d18c6eab15fd08a1048eb3ed527e3733a8a594c9a7ac684a763b8750771a531ead695abc649bf4ff413ae102a5d
+EBUILD kxmlgui-5.74.0-r1.ebuild 1360 BLAKE2B b932a130e9863f04bc5e36539366eb88d67cabc4e725f5c85c9aadf8d7be494bebe1227ac22e9d915ad0b8efa9ab1250655e707808de29ed3e37a4d977aa3fd0 SHA512 166c3dcadd074b384a140d6dd51b8e1d48d6062306434fe2a041e80dd9ed2e526a175d740dd7192a91923fceaf1eeeb7849bdb4e19b4bfb514ca378e5ff75f1a
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch
new file mode 100644
index 000000000000..f49999eb6490
--- /dev/null
+++ b/kde-frameworks/kxmlgui/files/kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch
@@ -0,0 +1,68 @@
+From 7cefdcf3d04669978aa28481d8ea274402935374 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Date: Mon, 10 Aug 2020 09:54:14 +0200
+Subject: [PATCH] Handle double close in main window
+
+After a bug fix in Qt 5.14 we now get real close events for unclosed windows
+when the application closes, so we would be getting two close events breaking
+our logic when when to suppress on-close dialogs.
+
+Suppress the real close event after we have handled our own simulated one. Also
+works if there is no real close event.
+
+BUG: 416728
+
+* Fixup after git merged the wrong commit
+---
+ src/kmainwindow.cpp | 8 ++++++++
+ src/kmainwindow_p.h | 1 +
+ 2 files changed, 9 insertions(+)
+
+diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp
+index b9bc2b6..33babb9 100644
+--- a/src/kmainwindow.cpp
++++ b/src/kmainwindow.cpp
+@@ -269,6 +269,7 @@ void KMainWindowPrivate::init(KMainWindow *_q)
+     letDirtySettings = true;
+ 
+     sizeApplied = false;
++    suppressCloseEvent = false;
+ }
+ 
+ static bool endsWithHashNumber(const QString &s)
+@@ -532,6 +533,10 @@ void KMainWindow::appHelpActivated()
+ void KMainWindow::closeEvent(QCloseEvent *e)
+ {
+     K_D(KMainWindow);
++    if (d->suppressCloseEvent) {
++        e->accept();
++        return;
++    }
+ 
+     // Save settings if auto-save is enabled, and settings have changed
+     if (d->settingsTimer && d->settingsTimer->isActive()) {
+@@ -556,6 +561,9 @@ void KMainWindow::closeEvent(QCloseEvent *e)
+     } else {
+         e->ignore();    //if the window should not be closed, don't close it
+     }
++    // If saving session, we are processing a fake close event, and might get the real one later.
++    if (e->isAccepted() && qApp->isSavingSession())
++        d->suppressCloseEvent = true;
+ }
+ 
+ bool KMainWindow::queryClose()
+diff --git a/src/kmainwindow_p.h b/src/kmainwindow_p.h
+index 13f6f19..bdd1eb4 100644
+--- a/src/kmainwindow_p.h
++++ b/src/kmainwindow_p.h
+@@ -33,6 +33,7 @@ public:
+     bool settingsDirty: 1;
+     bool autoSaveWindowSize: 1;
+     bool sizeApplied: 1;
++    bool suppressCloseEvent: 1;
+     KConfigGroup autoSaveGroup;
+     QTimer *settingsTimer;
+     QTimer *sizeTimer;
+-- 
+2.28.0
+
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r1.ebuild
new file mode 100644
index 000000000000..04c5486ff737
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.74.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+LICENSE="LGPL-2+"
+IUSE=""
+
+# slot op: includes QtCore/private/qlocale_p.h
+DEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-multiple-tabs-popup-on-logout.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Attica=ON
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# Files are missing; whatever. Bugs 650290, 668198
+	local myctestargs=(
+		-E "(ktoolbar_unittest|kxmlgui_unittest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.74.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.74.0.ebuild
deleted file mode 100644
index 38761c0a0a10..000000000000
--- a/kde-frameworks/kxmlgui/kxmlgui-5.74.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-LICENSE="LGPL-2+"
-IUSE=""
-
-# slot op: includes QtCore/private/qlocale_p.h
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Attica=ON
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# Files are missing; whatever. Bugs 650290, 668198
-	local myctestargs=(
-		-E "(ktoolbar_unittest|kxmlgui_unittest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index dd308722c269..d72e5c02bf31 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,5 +1,6 @@
+AUX plasma-5.74.0-fix-pc3-button-icons-color-set.patch 1276 BLAKE2B b74a469f50ba5c31edf6bf7ab80113a68f91eb27ebbabb6eb18b53d8fff1c71fd352fc93baf51114e6f964c75a3ec9ba516c87b02b664fc649fd8d6bc484aab9 SHA512 b527e08d5f116cc00390ccbc960501e6f95f80da6d3d42153c8a07675799aa0d8dd002e4f2f52088d66133090b888e5acef3e6be70f66acf39c38e9652f0cb38
 DIST plasma-framework-5.70.1.tar.xz 3132736 BLAKE2B 6f6dc34c6e9f5c433e2a6302fffc7172a7dbf187cc8ebeef1a5c47dc3b329269d71891508e41c3b0a7a7d8de8af519d7a9c320defec6726e9fdf9b859d158017 SHA512 2b022f0e1e6abec8b7cf0ff77dd862a78f17692d17a78ad5a42a1a784c98a57070a5a721b44e808e299f374248769b90449201ae3c6dba17a292726e3b646930
 DIST plasma-framework-5.74.0.tar.xz 3140648 BLAKE2B dfc8df92d351446a146204f48c42cd4d6325f2652b5b61e0a530b27763fb3b6f07bf14319c86a54f933a58329d214977545e00f261cc784c0d8659eebd8cddb0 SHA512 7aae44d94a175dcdbd779a6801626d20e8d986597d1d05c82c5c035997b874ebb9b4412191e1fa7a26aa4e045ceaf22a7ef359d3e817d812357d51219eb5fb46
 EBUILD plasma-5.70.1.ebuild 1927 BLAKE2B 3b100a046afc977d7a11aba841275d4be2ba0e7ba6e489afb03f0cc4c7dd4c43b1abdb2b40240a55e4a70e783f24d75caf6fd5d341261ad78b6c55d965f738b6 SHA512 c7e7f6021addbd03c6cdf463376a4bdaadba600f070aff8365f0e86fd6fa47004846b6732717fa72d664e2fb0c6b6c93d221bd043fb0b142ffe80272279f053f
-EBUILD plasma-5.74.0.ebuild 1873 BLAKE2B 2c0723714f1f7fc5874370eaa641effc20a3aba9af14883120dfc35aef7f7cb58d65578ad5a93e12b9692d06dd074dd5744203f903bd6145477afe867c1ca4bf SHA512 8f7e26d1259c5274f6aae10fea0ab26eddb739b29da59028f1e6ccdc1f4f9b2d2052bf57e2ae847704651aae6b829f8d6ed2e8b617f4716c6ddccbab03d35d89
+EBUILD plasma-5.74.0-r1.ebuild 1942 BLAKE2B 2162ca9a9717a33e16d7c39257872d9ffdfa38388a34a2525cabaf3f219f14adeaf054d378ee0caaa8df1c040c8f372372b6a0a629f96bec6afc34ec2c6048b7 SHA512 363737a93ed7d5dad8c9e65204a24c5a438389956f76b367e3ea740f486ec5b646c43a0d228e24d3cc105be8c2f20094927a6981138d160c9ca8031482a8bc68
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/plasma/files/plasma-5.74.0-fix-pc3-button-icons-color-set.patch b/kde-frameworks/plasma/files/plasma-5.74.0-fix-pc3-button-icons-color-set.patch
new file mode 100644
index 000000000000..8f938b00b89b
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.74.0-fix-pc3-button-icons-color-set.patch
@@ -0,0 +1,28 @@
+From 3167717797d07a8645391e093fa91526c4645f4f Mon Sep 17 00:00:00 2001
+From: Noah Davis <noahadvs@gmail.com>
+Date: Wed, 23 Sep 2020 20:23:08 -0400
+Subject: [PATCH] Fix PC3 Button/ToolButton icons not always having the right
+ color set
+
+BUG: 426556
+FIXED-IN: 5.75
+---
+ .../plasmacomponents3/private/ButtonContent.qml                 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml b/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml
+index 6dc2ce085..91428bdb3 100644
+--- a/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml
++++ b/src/declarativeimports/plasmacomponents3/private/ButtonContent.qml
+@@ -42,7 +42,7 @@ GridLayout {
+ 
+         implicitWidth: root.parent.icon.width > 0 ? root.parent.icon.width : defaultIconSize
+         implicitHeight: root.parent.icon.height > 0 ? root.parent.icon.height : defaultIconSize
+-
++        colorGroup: parent.PlasmaCore.ColorScope.colorGroup
+         visible: source.length > 0 && root.parent.display !== T.Button.TextOnly
+         source: root.parent.icon ? (root.parent.icon.name || root.parent.icon.source) : ""
+         status: usingFocusBackground ? PlasmaCore.Svg.Selected : PlasmaCore.Svg.Normal
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.74.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.74.0-r1.ebuild
new file mode 100644
index 000000000000..445cbc96d858
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.74.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="${PN}-framework"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plasma framework"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only wayland X"
+
+BDEPEND="
+	>=kde-frameworks/kdoctools-${PVCUT}:5
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kactivities-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kdeclarative-${PVCUT}*:5
+	=kde-frameworks/kglobalaccel-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		=kde-frameworks/kwayland-${PVCUT}*:5
+		media-libs/mesa[egl]
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-pc3-button-icons-color-set.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !gles2-only OpenGL)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X X11)
+		$(cmake_use_find_package X XCB)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/plasma/plasma-5.74.0.ebuild b/kde-frameworks/plasma/plasma-5.74.0.ebuild
deleted file mode 100644
index 4dd229e01593..000000000000
--- a/kde-frameworks/plasma/plasma-5.74.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="${PN}-framework"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma framework"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="gles2-only wayland X"
-
-BDEPEND="
-	>=kde-frameworks/kdoctools-${PVCUT}:5
-"
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kactivities-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kdeclarative-${PVCUT}*:5
-	=kde-frameworks/kglobalaccel-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	!gles2-only? ( virtual/opengl )
-	wayland? (
-		=kde-frameworks/kwayland-${PVCUT}*:5
-		media-libs/mesa[egl]
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !gles2-only OpenGL)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X X11)
-		$(cmake_use_find_package X XCB)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index c779374c268e..0665ec2d0fe0 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,6 @@
+AUX qqc2-desktop-style-5.74.0-move-dbus-connection-in-singleton.patch 2617 BLAKE2B e0a7b44d4df2dc62f9778337beca7ac3c52fecb8558022df58224615a414131b20b6e37e3df89c7217ced582b45a4b62df79b9370aa5dbe08bbf836b11dc43bb SHA512 b6af1ea12353cb15b2c41b9aec5fc6ed9c135374213306999fb21f1901ca24b7fbc070e08d0c256e0b3dd0955f786c962d9cdefd989ba07d6f09b7acbe709899
 DIST qqc2-desktop-style-5.70.0.tar.xz 58388 BLAKE2B 8eeeac78f137eb38256076f7a31b9b9ebebd3ac897ead75e5c3fb348cc0909f6b41af42e5384bdd6a47656c4062b537a66b8860fc97898d816cfdcf5a9c01928 SHA512 4064acfe3864c539708571e2ff1f72aec34d40a98f7ecc5a4579bd244dd2f9c5404bb382cc2b7d598cfa97b7bbb96eebed06400d6cf99bfcfe327c522bbcbea0
 DIST qqc2-desktop-style-5.74.0.tar.xz 58632 BLAKE2B a4f3545d83f03eb57cd7dd9ee81db59bd56a22b7907af4eb00a50a9fa1d2a5e507a271fcb4d2a2e7465691076122251f48c0baed05e7c30042489f6dd93e60ee SHA512 88c91d5933bc2c0020a574be05a851aea54382b6c1dd5f459cba792e4ac784782bc88a36670c28f2df29188cf001bf2c9af98b3e9bc84dd59c110fd7bf936258
 EBUILD qqc2-desktop-style-5.70.0.ebuild 676 BLAKE2B 43534376c93b7ae2252c7c3bc642b0bc22519cb1213e27e8db3693ba33e70cd4ba39c451b59662a363c9920aa5369bee558d8c5ded3d85b1d1597c7d9418e7ec SHA512 af76a42cfa3d4947bf5d82c23448b04e995a24c04ba31afb9c16dcf58b3e6ee81a60b962af44d795f2838614878c526aac805a0103799d2eb83fdde5f7ba1fe9
-EBUILD qqc2-desktop-style-5.74.0.ebuild 679 BLAKE2B be29de8fe382baf35c4e839362466b1a95023dd371ba175c4639792cfabc6f086f37a9ba1775569b47293c7788f1fb9d18d7425388ed9590afa3d2a11252b696 SHA512 c9f1ce854c7d1c7f76a9663425b9b33a97a68a6f5c6552738466e223a152015ad3be0b6e15cd591f8d589b8ec7a65147f5b55da169179cca17532fe224377cd2
+EBUILD qqc2-desktop-style-5.74.0-r1.ebuild 752 BLAKE2B 8ba7f5571b9ba0988d3757bc2294e0440475660ed7cf99d4a4028cc980d20da8fe063007c6a1059f979288630781ab202aff6b38d46a412f87ebb04b3940156f SHA512 c266e3f67df4d4429379c026f41014ab3da5254d20f0db05a62bcfb934786feddb642169c1ab6ff564bf05d7a1ae1459884512c8e595110cc0322785d9edb24b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.74.0-move-dbus-connection-in-singleton.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.74.0-move-dbus-connection-in-singleton.patch
new file mode 100644
index 000000000000..026a5b65d02f
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.74.0-move-dbus-connection-in-singleton.patch
@@ -0,0 +1,67 @@
+From f8e56a22721057107bccdf319da36ff82ca2a804 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 7 Sep 2020 09:52:57 +0000
+Subject: [PATCH] move the dbus connection in the singleton
+
+connecting to dbus is expensive, do it only once in the singleton
+the theme instance will only connecto to the signal forwarded by
+the singleton
+---
+ .../plasmadesktoptheme.cpp                    | 20 +++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp b/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
+index babb433..ff046eb 100644
+--- a/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
++++ b/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp
+@@ -45,6 +45,14 @@ public:
+     {
+         connect(qGuiApp, &QGuiApplication::paletteChanged,
+                 this, &StyleSingleton::refresh);
++
++        // Use DBus in order to listen for kdeglobals changes directly, as the
++        // QApplication doesn't expose the font variants we're looking for,
++        // namely smallFont.
++        QDBusConnection::sessionBus().connect( QString(),
++        QStringLiteral( "/KGlobalSettings" ),
++        QStringLiteral( "org.kde.KGlobalSettings" ),
++        QStringLiteral( "notifyChange" ), this, SIGNAL(configurationChanged()));
+     }
+ 
+     void refresh()
+@@ -125,6 +133,7 @@ public:
+     KColorScheme viewScheme;
+ 
+ Q_SIGNALS:
++    void configurationChanged();
+     void paletteChanged();
+ 
+ private:
+@@ -161,14 +170,6 @@ PlasmaDesktopTheme::PlasmaDesktopTheme(QObject *parent)
+                 });
+     }
+ 
+-    // Use DBus in order to listen for kdeglobals changes directly, as the
+-    // QApplication doesn't expose the font variants we're looking for,
+-    // namely smallFont.
+-    QDBusConnection::sessionBus().connect( QString(),
+-        QStringLiteral( "/KGlobalSettings" ),
+-        QStringLiteral( "org.kde.KGlobalSettings" ),
+-        QStringLiteral( "notifyChange" ), this, SLOT(configurationChanged()));
+-
+     //TODO: correct? depends from https://codereview.qt-project.org/206889
+     connect(qGuiApp, &QGuiApplication::fontDatabaseChanged, this, [this]() {setDefaultFont(qApp->font());});
+     configurationChanged();
+@@ -181,6 +182,9 @@ PlasmaDesktopTheme::PlasmaDesktopTheme(QObject *parent)
+     connect(s_style->data(), &StyleSingleton::paletteChanged,
+             this, &PlasmaDesktopTheme::syncColors);
+ 
++    connect(s_style->data(), &StyleSingleton::configurationChanged,
++            this, &PlasmaDesktopTheme::configurationChanged);
++
+     syncColors();
+ }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r1.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r1.ebuild
new file mode 100644
index 000000000000..5c012a581d59
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.2
+inherit ecm kde.org
+
+DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5=
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kirigami-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+PATCHES=( "${FILESDIR}"/${P}-move-dbus-connection-in-singleton.patch )
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0.ebuild
deleted file mode 100644
index 87eb0019645e..000000000000
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.74.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Style for QtQuickControls 2 that uses QWidget's QStyle for painting"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-LICENSE="|| ( GPL-2+ LGPL-3+ )"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5=
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kirigami-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 4cea1f83570a..13c719cd19ec 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 761d5da10739..730a615b42a4 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -3,5 +3,5 @@ AUX kdeplasma-addons-5.19.5-fix-potd.patch 2485 BLAKE2B cddf302e5956c3c215c51c08
 DIST kdeplasma-addons-5.18.5.tar.xz 623872 BLAKE2B 684c9e569575024fe96d6043a91e6a810db69205e3867db9840442b901c120db4f0dacb09540a145f5ae90b5fc6fcd934e26a3d4435e9d23eb374f4e5ca1e391 SHA512 7baa84335af5afc1af2cd47134863961df7a43c719bdde180754aa0b5a83975c3d5fb79435b523589751029f0fbb1751fae90db5db8e42c995c9dd24578cbeb6
 DIST kdeplasma-addons-5.19.5.tar.xz 629136 BLAKE2B 992df5d362aca213531cb96b8d01a3c2792ed91562d4f6a7f71e8b50ba6ee28cbd6501b75c7c91923b6afcb13fdf1b385189f718d8cebb482d1cedd040f67d94 SHA512 93de717c623605ceb9fdcedecdf656030b6e9bc360ce834ea918403f64f250029e9a2406bddc0b324e4738006d4ca155bc509f4a7d40c073a2aefb2017db9731
 EBUILD kdeplasma-addons-5.18.5.ebuild 1752 BLAKE2B 010e42c867df1157c15996b23f68cbaf268508a53842c76caff7831975f60c9a3099798e9579167bd093584d690390ce9d43524ec3e7aba12a7c3d94c70ec2f4 SHA512 253c8e7abef4701ba3ec136ea225a4c181491056cf66ff3a4114522a041d6bcf36bd14da939d3e3979d793de50e845207dd4f9453b0a5d9335668373f79c479c
-EBUILD kdeplasma-addons-5.19.5-r1.ebuild 2153 BLAKE2B 89416f80a529fd1ab2ceb6359fe53fbfee8feca5af0a06ff8d55a1170ebaed10f1e3fb8bb3087e0026cd6527c3d5841aead4821770c990da82a6bd4f3e30cd7d SHA512 bb465fe76aea7ab07e58d81ac2fd87d946b71c6c622d88d355aa490c30a1dc33870826b3cd6e2aa73a0d330b0d1269a5aef6fa2f559ae6c27366423bf467e530
+EBUILD kdeplasma-addons-5.19.5-r1.ebuild 2185 BLAKE2B c917128a820f56cd8d01e8a75d076b437651e167b38fdba2834667c0229292a952edecba8ea9b3fbe0c0a58a97a00e628707b3f5a161640b8a8ddf424279b359 SHA512 3b0097081115e210f94b09d4ad6026978feacb2dc3a5188fa6de204a139545e843e48ed21b8382c38a34e6f6f9ef95748d6d716b9408d1d412eec755e2584247
 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
index 509b4e256841..3dc39311c4ce 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
@@ -16,6 +16,8 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="+comic share webengine"
 
+RESTRICT+=" test" # bug 727846
+
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 7802479faa89..22ae77c90f1d 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -3,5 +3,5 @@ DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26
 DIST kinfocenter-5.18.5.tar.xz 1256744 BLAKE2B d67951273bece9cd106a3d10857b18d005e6bc03faec8e9749b2111016c318c4c518611bb50240a01395b59838a47a6ce24df06ab870092aa425f04854fdf3ad SHA512 c9896870a92b3349c262698c4902b98f6aa12523c1757890367d1e277954b0ac7b040bbff0095f7a6abf47e6a31b008070e3a461713c7cf4a591617b76c37886
 DIST kinfocenter-5.19.5.tar.xz 1265760 BLAKE2B 3af323d32e07d310aa224f47c292ae03748aacea0d7cf56770e5a301f9698d1767159f97e0d43733d9a09d6cfe56c41a4a44f988e3000a1dfc06f271accef0f4 SHA512 732d6111f59e099fb032966667b6d7907e607939884714a95f0a2e48903f8a0d7e2331a87611ee058a4bc18bcb012c92040415812243fab4d618a07f2e7dccaa
 EBUILD kinfocenter-5.18.5.ebuild 2837 BLAKE2B 4d8a032e2c3bd1c6b21110d3eb0268d1303c20a66c4d85eab8c1edf5770f9fcd580046307397a254bb41b038e69cc777f7c93eccc55cfa33a48a3c7438ef8b58 SHA512 7544ecb8264e79e29a8fb8541461c0af09bf099fc94e7f7c45d22fb3db3d8c6cb9c7ac2d936b5cbf34c61e5b860e1c0a3e024a70c398c9824c0a241741d1f2df
-EBUILD kinfocenter-5.19.5.ebuild 2840 BLAKE2B cf486851eb10292e142b9b35d6a4a071fa93582959f6cb4ddc1722205a83f91d66819aceaaa295402e489e9cfa3446622927e4c728380c7784c9c9a80ff60e7f SHA512 7339640232d3194be80a501ca833f4eb1f7a44d202875d0450525f3904cbc649c6da14e345386fb4c1fc3dba8f851bf8e0467a35bb77eb80ad9fb412f941dc4c
+EBUILD kinfocenter-5.19.5.ebuild 2763 BLAKE2B 6b141716d89837ea694e9699a2077cc8c580f4fe3233e036e149d9bc32a3edd824edcddf2b4520f5cebd27bd27e35b404e1cb73b9b18c8dc71dae180869ece7e SHA512 39078cd8c51a809566792de366a5899090b622e8fba47755f6b481269c2e17709dd14d2cad69dddbc191b13f8f2fdb2ad58bf015ecd4424053e4d8daf32b5daa
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
index 09e428ef13f6..c6c5f5f40bc7 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
@@ -21,7 +21,7 @@ IUSE="gles2-only ieee1394 +opengl +pci wayland"
 REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
 
 BDEPEND=">=dev-util/cmake-3.14.3"
-COMMON_DEPEND="
+DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
@@ -55,10 +55,7 @@ COMMON_DEPEND="
 		media-libs/mesa[egl]
 	)
 "
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index a3017a82636b..d4438f5a3c6e 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.18.5.tar.xz 517648 BLAKE2B b50623c28a3884adc5db326d7b0745c558f02e1f515efa9a5d591948026447f427e08cb72805d7f1c8821cdb0038c894e4322520cf2630656e464da6f69af401 SHA512 2cfb82caef5d074b945f0a7478b32af86d49e174d4d294dfe6a54acdb0b1d335e151828a4f239b52cf767ba04d9e93bf1632f2a37e2b1d611128543e0e0008a3
 DIST ksysguard-5.19.5.tar.xz 542628 BLAKE2B 3aeacb401c79723aa46e9eb5df32785e314d7a52704d983e5c6b48dd841e908ec84c5b28c609accec990d6011d5355ba3363329973a68149f03b0b20d5d59265 SHA512 5dd3503e3792c247fa2dab274347ae00ac3ddd0090b8b5115abc90c84630e0f7376ce2ec43a853e2a9cfdadb31b142ea70190b54b65c7a45b5839b1dde5a1feb
 EBUILD ksysguard-5.18.5.ebuild 1393 BLAKE2B 9252e8b44a28642a7f25d46e402e091850761f287aaf9fe85353ead5d60ac43ebc24cbeed8ea0aedd5708911224e7211f302e766711b6279de51bba55b364c50 SHA512 d5b2f2a5d1581b86bb86824848ad4e492335a3d079779136e8e94cd7ad5e2437ba9b605e56ec35fdb3e7d6d264271b5085cf5bd26903dd8d3d1dc9075bd38f84
-EBUILD ksysguard-5.19.5.ebuild 1383 BLAKE2B 2adb0e407f05069fafb1af0ae59578573092472691883e97bc61cea14f642e1f388cb4d16731209b388f7754629d916dc09cb0fca9c2b2ba43c862626c206ae2 SHA512 f38db3f3e6ac0242a81b3c98b88e1d98299351396a6f012d1c260556a059d55a6d9af538714bc5ca61eb1a54c54a052388ac3632d596ac8d35079c8620ab4b48
+EBUILD ksysguard-5.19.5.ebuild 1415 BLAKE2B 10df42e645d99d3b448f37872f3439a1c558a5de8b0771b19c24bf01837ce7baf38b88b68578d06799f21743c221746bd5f6d3b84c9031a3a51a774aed604d81 SHA512 a5bb21cb3418e07882c3f59e2e5ed0d8933d0ab8f240297907d275717168d2ba4f54c8f6e59919919f256009dccb340a485d15f2477bdbad62af72f456c01f14
 MISC metadata.xml 373 BLAKE2B 8d97f1bf96cb523b2832ca4bbb01ee86cf1d13b0b1b75809046da8601254283fa079361c1cf55708c851a08fb31b27beb8cf2df24ea9e14e4c32b8ca0692a7f9 SHA512 c1df9a56aba68a93ceae7cb2b9ea9216c40b6f619263cd8025cde82264206019a6b9d0eecb24f3a798d4f6e1a772752ceec500827e96caf8f050b0b132b08051
diff --git a/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
index 9805a99934a3..c55c40f19f8c 100644
--- a/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
@@ -16,6 +16,8 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="lm-sensors pcap"
 
+RESTRICT+=" test" # bug 727848
+
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 9755bcad6bac..c9af113e7ffa 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -5,10 +5,11 @@ AUX plasma-desktop-5.18.5-findxorgserver.patch 5195 BLAKE2B b8ebbe59a5a2ef80a6cf
 AUX plasma-desktop-5.18.5-fix-animate-in-animation.patch 1434 BLAKE2B a84e839180ca1aeb5eddfd07e504d88d8fbfe52ca210d4f976955d753770b5572a5e55c7773368241fa3ff61c38ef7699879b829c19a54e6665d4dbf3fd2570e SHA512 7496b34f1243070160e9875998d1ab5ef5227acb68b4b3545c32f5e4be041459e3234fb56b186c2578cf573dd50251e8be751546bba68b11f6c2d170bb3b7fac
 AUX plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch 6390 BLAKE2B fb0f4c70c94dc583745f92d14f4cb479d71da7c115f58d187ae6931c2dd3435abcfe9c2b773fc851f44fe605f47e2242d801da18a23f7943c025a901da8f28ee SHA512 d5f3820ee21422d46112bd9635bd65ce11068f9cf3bb14cd23c0050f35256b09344d934534794685997e8daeaae709c81e53b5b6ad54e7ecd709c6e5624be040
 AUX plasma-desktop-5.18.5-stop-multiplying-duration-values.patch 5184 BLAKE2B 35f25bc8a325b947a44cf64f81e42c53746220329a35335e997a4a6ef8f87834be03f68fff951641e78d322804e08aa4f9e0c76556d41b00335ddf44da4dd643 SHA512 9e604ba5b99bf5e48b2cf1ed5afd7a5a8b413348fbc0c4e7f663660ac27aed8f1f3d268ba2a2b376afe86fee0165e3a27c5c35471ffa7acfae9956a47a50b82f
+AUX plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch 980 BLAKE2B b7b9cb993d7209182f92fa1924e28b66aadeca88eab3ceb98db1edea10c9d2fe65128cf0f019791478a270d645d6bbd9115a9a9372c6d4e63c8806b5bc06029f SHA512 e184cfaec2910a7389309e43c1f550c48de6b2c6c23a522a1c8bd5f6087fc57b2f3533e6b862d5801aa97f1eee8cc22ea0c4e415b44bef873f612ee039aefdb0
 DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
 DIST plasma-desktop-5.19.5.tar.xz 9430088 BLAKE2B 02894dfdc8c0d4535782629059b7d69e7722c63ef47c44077d5b49ac489b53af8440ba361a31a327783fe7a2b56d1812d59c8f6f0797c8fcc81aa90c1fac96c4 SHA512 d7c7b26dc5a7d4804a780833f8d22797312b845962ed4f9218c448fcb3c720c032eca1e79bec5f9c084f1825f0b6f26c34ffe032320396c9092e04a5b05c3d12
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
 EBUILD plasma-desktop-5.18.5-r1.ebuild 4865 BLAKE2B 87cf5b0e69bda73c0241cb0059e92b2344a87e625479201b683f20edc96f295dc5e80dfc46b234b5a513721d368c53d26d7df56425a434ee41adad44dc46dec5 SHA512 3290f48cf99c6810874e8c152d171770e57ee8d1400a2acb8d67046dab374c33c2ef2d454464e642b0a1f372742f8d79c9f26af2c4f49be31aab7640386edf46
 EBUILD plasma-desktop-5.18.5-r2.ebuild 4935 BLAKE2B 1334ac02567ae7992a6a8b7f7b94cf54348df407dbe4ef5130dd76bf2df43bcf66949105dfd23ac49aecfd55d63fbdea1026edf43d48d9fc5966fc0ead46ed89 SHA512 a5686e7f768aa87e67b6abbcb20478954027e63d5cea5cd9d545e9ac5699ec1be029d8badad7250b00aab12621b005c196a0b8d64c43b15252e13caaa4c51534
-EBUILD plasma-desktop-5.19.5.ebuild 4556 BLAKE2B 317513f08054224a6bad77bfcecc072e74039a45afc505ccb68f0c5a833e695e2fa4bb43ee7be0af6a6502d0cb58b74e649b8c7afa1d4c2ee00982d1fde41468 SHA512 2c6a23555243ca530f6df35d765a06ace6b41c72a8bc1ff14c262adf848637b9c662cd6058aa6cfc5a9113974da208e6ddf6f74cb7626a53b94ff7def0666bf0
-MISC metadata.xml 418 BLAKE2B f68267099811af01f47317ec163041980f834d34a61f6eb5584969e1172b9fa819a635664a1ec8ec49496a42fe0b27ed0cb0de34485e866836719aa185e2d37e SHA512 537579f9f3c1fe8b457826637da7b8fb5ea46986f2a71d28fb2de29fe010d5b08596059bb59160e36f346ba2fea4df18ad16896c27561528e2e9fef139e64ec5
+EBUILD plasma-desktop-5.19.5.ebuild 4717 BLAKE2B 6a1fe126b3d55789ed56d0c1c3c1074793d18a2971b91d5960ac0346f626be2e9d934e9571ba9d9cd52e3e95b5ce62c08bcb940c792f51bf4a12e0d5ff5ed33f SHA512 80430feece9661d318b53258e63e28c10d6c39690c37354d7f05f0918e4e6193ec887f43cb816dac15e881103327a538f512bacab63212d594bb5cf32e1eb721
+MISC metadata.xml 540 BLAKE2B 3953467f0fea68209d7b5cbb5f5d23bc1b1aadf0e88ec5dfc28d688f7d68e560fda165330da32940bbf43d82f6f7bc178451977870cf3e2e69f4159e4c2018d8 SHA512 5d48a9f5bd4e990a52eaa894e3572bfa66d966a0665b495a5539484cb29f6a2a4f81193c80556cf712a76e3661ac575bc582276be22acc3817e7758e727065a1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch
new file mode 100644
index 000000000000..69f33cb402e8
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch
@@ -0,0 +1,24 @@
+From e7cb58f156a240c70c085be38a12e2a01dc5ede6 Mon Sep 17 00:00:00 2001
+From: Guo Yunhe <i@guoyunhe.me>
+Date: Sun, 20 Sep 2020 21:12:08 +0300
+Subject: [PATCH] Force Emojier using color emoji font
+
+---
+ applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml b/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml
+index 858cbd935..e7198156b 100644
+--- a/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml
++++ b/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml
+@@ -113,6 +113,7 @@ Kirigami.ScrollablePage
+         delegate: MouseArea {
+             QQC2.Label {
+                 font.pointSize: 25
++                font.family: 'emoji' // Avoid monochrome fonts like DejaVu Sans
+                 fontSizeMode: model.display.length > 5 ? Text.Fit : Text.FixedSize
+                 minimumPointSize: 10
+                 text: model.display
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index 52f99fa25fe2..49d2b2bec6af 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
 		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
 	</use>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
index 6b5dc7ffb412..da3b4ac5fc3f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+fontconfig ibus scim +semantic-desktop"
+IUSE="emoji +fontconfig ibus scim +semantic-desktop"
 
 COMMON_DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -80,6 +80,11 @@ COMMON_DEPEND="
 	x11-libs/libXi
 	x11-libs/libxcb[xkb]
 	x11-libs/libxkbfile
+	emoji? (
+		app-i18n/ibus[emoji]
+		dev-libs/glib:2
+		media-fonts/noto-emoji
+	)
 	fontconfig? (
 		media-libs/fontconfig
 		media-libs/freetype
@@ -116,6 +121,7 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+	"${FILESDIR}/${P}-force-emojier-use-color-emoji-font.patch"
 )
 
 src_prepare() {
@@ -137,7 +143,7 @@ src_configure() {
 		$(cmake_use_find_package scim SCIM)
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
 	)
-	if ! use ibus; then
+	if ! use emoji && ! use ibus; then
 		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
 	fi
 
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 57b0a5ac2daa..b1c6e08d6440 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,6 @@
+AUX plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch 1327 BLAKE2B 6a9f02c1fb516bb7d3c5bf261ab4b6b6ea1f4a225df1db8f564b25ec6205db89060451362a18d0facf32637a6af6b25c8101b28f0095970e7a1135f6f8fe5f3a SHA512 f38145990ac03799724d7f579ba98baa0078b4cc07805ad5d12b6266ab0bdf3c4dd4999151d0005b0217430197cef74514b330ee1ac14b9530d63e9c8364ed00
 DIST plasma-integration-5.18.5.tar.xz 57656 BLAKE2B 3cf445f5d84de07e82369a3057a0ac390961634f8926d3491ca8dd0d603d4e4ff9e7487b69c1fbea44a4296c8960f4e3ef677e1bfd183154a36799fc95dbf3c8 SHA512 d217c49555ee17e3b18d006368ec7aa4d8585c05070bcf3a3c7e471b1c7dc830080d0405209979d8a27c7c2fc2adcd3d248e595f43f0b4a2928683f93c6d4b48
 DIST plasma-integration-5.19.5.tar.xz 57464 BLAKE2B ef5ec9f849087ae738a1ff1de14a77994b4486f89b632777caa8e0aad67cad8553bdf1d0553893361ab4c11ddba0caf32464cb49f08047cf2d40375f789c166e SHA512 9e17e1720e5d5c1d3cada3f1eb891d27fd189eb65378c2e0be6547c79d93d5df2f785a3c67d35a4a374d320b118ad3b7d3fb7d968a7f5b629e505d21c83cfe36
 EBUILD plasma-integration-5.18.5.ebuild 1235 BLAKE2B f1f0e5a637021d9d0ae8c0c3b6680a1f4ac63c8e2e4203bb8936f8693839bde3fa9f7e28082b5a4dca7c2dcabca95f7f18f0bb694e60d79421f10286c4446db5 SHA512 4877687f7608f7a8a1c24e6c8823ef4670ec5307996dcfec8e6682be227bb8e06a29e2c456d1e30f711d76f89855e70250904d3a602f2cbf2e9d45bb93e34dfd
-EBUILD plasma-integration-5.19.5.ebuild 1238 BLAKE2B 6a27dd2928dadef3f89ded1b45bf2f336522fd0f93dc6a53c789c1f73f7676b7c5d56fc374997596d7813f4148be7bb30bc14e2584fee9a9646f758af7e8ed4c SHA512 bd68e4c0012a9261dfeda4e148a02e3084ee7f3bc5e1bad155e9abff1fcfaefee651fd5e4790f9a012061658a325ea3e0cb60e00f5edd900aa85a1083fb28d13
+EBUILD plasma-integration-5.19.5-r1.ebuild 1320 BLAKE2B 3c50f0efd871c28c18900847e8982231059fb9a66f91669030e0ccaeba9c0b3f790d5261884af7344e03a6b12393aa7f8e3f26be4b97d2139dbdb4a67e57970b SHA512 7bd2a4d97e23f5124fe795eda494fb1e56e89de5b651e7577e1f9300007774a49537358bdb178e6f04ca213e6d4c7af54dc6c3a4d1fd3c0bf79a384b8b8b4c42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch b/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch
new file mode 100644
index 000000000000..7405dace6be1
--- /dev/null
+++ b/kde-plasma/plasma-integration/files/plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch
@@ -0,0 +1,34 @@
+From 15c7926377065da0fea111be303816dca91d087a Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Tue, 15 Sep 2020 13:31:48 -0600
+Subject: [PATCH] Use KDE shortcuts for "move to trash" action coming from
+ QStandardKey
+
+QKeySequence::Delete is the Qt "Move to trash" action, which, by
+default, includes Ctrl+D as a shortcut. This is something we don't want
+in KDE software, so we need to intercept this action in our integration
+plugin and give it the standard KDE shortcuts instead, as we do for
+other actions.
+
+BUG: 426573
+FIXED-IN: 5.20
+---
+ src/platformtheme/kdeplatformtheme.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/platformtheme/kdeplatformtheme.cpp b/src/platformtheme/kdeplatformtheme.cpp
+index 24ac7e7..18b3f6f 100644
+--- a/src/platformtheme/kdeplatformtheme.cpp
++++ b/src/platformtheme/kdeplatformtheme.cpp
+@@ -257,6 +257,8 @@ QList<QKeySequence> KdePlatformTheme::keyBindings(QKeySequence::StandardKey key)
+         return KStandardShortcut::shortcut(KStandardShortcut::TabNext);
+     case QKeySequence::PreviousChild:
+         return KStandardShortcut::shortcut(KStandardShortcut::TabPrev);
++    case QKeySequence::Delete:
++        return KStandardShortcut::shortcut(KStandardShortcut::MoveToTrash);
+     default:
+         return QPlatformTheme::keyBindings(key);
+     }
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
new file mode 100644
index 000000000000..51a301c73ca7
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.71.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.14.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	x11-libs/libXcursor
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${P}-use-standard-kde-shortcut-for-move-to-trash.patch )
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.19.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.19.5.ebuild
deleted file mode 100644
index fbf43a6fc30e..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.19.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/licenses/CLONK-trademark b/licenses/CLONK-trademark
deleted file mode 100644
index 52b17861af9f..000000000000
--- a/licenses/CLONK-trademark
+++ /dev/null
@@ -1,14 +0,0 @@
-Clonk Trademark License
-
-'Clonk' is a registered trademark of Matthes Bender. It may be used within
-software products which are using source code from the OpenClonk project
-with the following limitations:
-
-If the word 'Clonk' is used as the name of anything in your software product
-then you must include the following notice in a suitable place (e.g. credits
-screen): "Clonk" is a registered trademark of Matthes Bender.
-
-If the title of your software product contains the word 'Clonk' then you must
-prefix the word with an added name of your choosing, e.g. 'MyClonk' or
-'PortableClonk' and you must subtitle your project with the term 'An OpenClonk
-project'.
\ No newline at end of file
diff --git a/licenses/CROSSOVER-2 b/licenses/CROSSOVER-2
deleted file mode 100644
index 561a8c5340ff..000000000000
--- a/licenses/CROSSOVER-2
+++ /dev/null
@@ -1,685 +0,0 @@
-                        CrossOver Linux License Grant
-
-YOU REALLY WANT TO READ THIS, ESPECIALLY THE PART ABOUT
-THE MANDATORY CAR WASH FOR CODEWEAVERS EMPLOYEES...
-
-If you don't like this license grant:
-
-   a. Let us know, we'd appreciate the feedback.
-
-   b. Stop right now, and ask for a refund. We'll cheerfully do so.
-
-
-The main thing we want you to know:
-     This is a license for one user. The license is not necessarily for a
-specific user, or a specific computer, but it is for one person at a
-time. If you need to support more than one person, please contact us
-for volume pricing and site licensing.  We do offer educational
-discounts.
-
-    ----------------< Start of Formal License Grant >-----------------------
-
-   1. License. The software accompanying this License (hereinafter "Software"),
-      regardless of the media on which it is distributed, are licensed to you
-      by CodeWeavers ("VENDOR"). You own the medium on which the Software is
-      recorded, but VENDOR and VENDOR's Licensors (referred to collectively as
-      "VENDOR") retain title to the Software and related documentation. You
-      may:
-
-         a. run the Software on any computer, so long as no more than one
-            person per license is ever using the Software at any one time.
-
-         b. transfer all your license rights in the Software, the backup copy
-            of the Software, the related documentation and a copy of this
-            License to another party, provided the other party reads and agrees
-            to accept the terms and conditions of this License.
-
-
-   2. Free Software. The Software contained in this product includes some
-      components of Free Software, including software from the Wine Project,
-      and the MojoSetup setup software.
-
-      The Wine project is licensed under terms of the GNU Lesser General Public
-      License, which is included below as Appendix A. The best source for the
-      Wine source code is the main Wine web page at http://www.winehq.org.
-
-      Japanese fonts are included under the Wada Laboratory public domain
-      license found at
-      http://sourceforge.jp/projects/ume-font/wiki/UmeFontLicence
-
-      MojoSetup and its dependent projects are all licensed under BSD
-      style licenses.  The best place for that code is also
-      www.icculus.org.
-
-      We also use or include static copies of the following projects:
-        xml-dom, xml-namespacesupport,      - Artistic or GPL license
-            xml-regexp, xml-sax
-
-      We also use the htmltextview.py library by Gustavor Carneiro, which
-      is licensed under the LGPL.  The source code was available to us at:
-        http://people.gnome.org/~gjc/htmltextview.py
-
-      Portions of this software are copyright © 2009. The FreeType
-      Project (www.freetype.org).  All rights reserved.
-
-      In each case, we use them unmodified and strongly recommend that
-      anyone wishing source code for these projects find and visit the
-      respective project home page.
-
-      We are deeply grateful to the authors of all of these software projects
-      for allowing us to use their software.
-
-      We include source code with each CD purchase of CrossOver. Current
-      source code for Free Software contained within CrossOver products is also
-      generally available at our web site, www.codeweavers.com. However,
-      individuals wishing to obtain source directly from us will be cheerfully
-      provided with a copy of any Free Software source upon request. We reserve
-      the right to charge a nominal processing fee for transmission of the
-      source code. Send such requests to info@codeweavers.com.
-
-      CodeWeavers strongly believes in the Free Software movement. We believe
-      that the spirit of this movement makes it important for you to be able to
-      obtain these components for yourself, make changes, and then use those
-      changes with our Software. To that end, you are explicitly granted
-      license to build alternate versions of the Wine software for use in
-      conjunction with the Software.
-
-      IN NO WAY IS THIS LICENSE GRANT INTENDED TO SUPERSEDE THE LICENSE
-      AGREEMENTS OF ANY FREE SOFTWARE COMPONENTS THAT ARE DISTRIBUTED IN
-      CONJUNCTION WITH THE SOFTWARE.
-
-   3. Restrictions. The Software contains copyrighted material, trade secrets
-      and other proprietary material. In order to protect them, and except as
-      permitted by applicable legislation or by the Free Software licenses
-      detailed in Section 2, you may not:
-
-         a. decompile, reverse engineer, disassemble or otherwise reduce the
-            Software to a human-perceivable form
-
-         b. rent, lend, loan, distribute or create derivative works based upon
-            the Software in whole or in part.
-
-
-   4. Term. This License is granted to you immediately upon purchase of a
-      license from CodeWeavers, or other related third party.
-
-      This License is effective until terminated. You may terminate this
-      License at any time by destroying the Software, related documentation and
-      all copies thereof.
-
-      This License will terminate immediately without notice from VENDOR if:
-
-         a. you use the Software in a fashion that exceeds the rights granted
-            to you by this license, OR
-
-         b. you fail to conclude the purchase transaction, OR
-
-         c. you request a refund.
-
-
-      If the Software was given to you for purposes of evaluation, then this
-      License will terminate at the end of the specified evaluation period,
-      typically 30 days.
-
-      Upon termination you must destroy the Software, related documentation and
-      all copies thereof.
-
-   5. Export Law Assurance. You agree and certify that neither the Software nor
-      any other technical data received from VENDOR, nor the direct product
-      thereof, will be exported outside the United States except as authorized
-      and as permitted by the laws and regulations of the United States. If the
-      Software has been rightfully obtained by you outside of the United
-      States, you agree that you will not reexport the Software nor any other
-      technical data received from VENDOR, nor the direct product thereof,
-      except as permitted by the laws and regulations of the United States and
-      the laws and regulations of the jurisdiction in which you obtained the
-      Software.
-
-   6. Government End Users. If you are acquiring the Software on behalf of any
-      unit or agency of the United States Government, the following provisions
-      apply. The Government agrees:
-
-         a. if the Software is supplied to the Department of Defense (DoD), the
-            Software is classified as "Commercial Computer Software" and the
-            Government is acquiring only "restricted rights" in the Software
-            and its documentation as that term is defined in Clause 252.227-
-            7013(c)(1) of the DFARS; and
-
-         b. if the Software is supplied to any unit or agency of the United
-            States Government other than DoD, the Government's rights in the
-            Software and its documentation will be as defined in Clause 52.227-
-            19(c)(2) of the FAR or, in the case of NASA, in Clause 18-52.227-86
-            (d) of the NASA Supplement to the FAR.
-
-
-   7. Limited Warranty on Media. If you have purchased the Software in a
-      tangible form of media such as a CD ROM, VENDOR warrants the tangible media
-      on which the Software is recorded to be free from defects in materials and
-      workmanship under normal use for a period of ninety (90) days from the
-      date of purchase as evidenced by a copy of the receipt. VENDOR's entire
-      liability and your exclusive remedy will be replacement of the media not
-      meeting VENDOR's limited warranty and which is returned to VENDOR or an
-      VENDOR authorized representative with a copy of the receipt. VENDOR will
-      have no responsibility to replace any media damaged by accident, abuse or
-      misapplication. ANY IMPLIED WARRANTIES ON THE TANGIBLE MEDIA, INCLUDING
-      THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-      PURPOSE, ARE LIMITED IN DURATION TO NINETY (90) DAYS FROM THE DATE OF
-      DELIVERY. THIS WARRANTY GIVES YOU SPECIFIC LEGAL RIGHTS, AND YOU MAY ALSO
-      HAVE OTHER RIGHTS WHICH VARY BY JURISDICTION.
-
-   8. Disclaimer of Warranty on Software. You expressly acknowledge and agree
-      that use of the Software is at your sole risk. The Software and related
-      documentation are provided "AS IS" and without warranty of any kind and
-      VENDOR EXPRESSLY DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED,
-      INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-      AND FITNESS FOR A PARTICULAR PURPOSE. VENDOR DOES NOT WARRANT THAT THE
-      FUNCTIONS CONTAINED IN THE SOFTWARE WILL MEET YOUR REQUIREMENTS, OR THAT
-      THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, OR
-      THAT DEFECTS IN THE SOFTWARE WILL BE CORRECTED. THE ENTIRE RISK AS TO THE
-      RESULTS AND PERFORMANCE OF THE SOFTWARE IS ASSUMED BY YOU. FURTHERMORE,
-      VENDOR DOES NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE OR
-      THE RESULTS OF THE USE OF THE SOFTWARE OR RELATED DOCUMENTATION IN TERMS
-      OF THEIR CORRECTNESS, ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE.
-      NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY VENDOR OR VENDOR'S
-      AUTHORIZED REPRESENTATIVE SHALL CREATE A WARRANTY OR IN ANY WAY INCREASE
-      THE SCOPE OF THIS WARRANTY. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU (AND
-      NOT VENDOR OR VENDOR'S AUTHORIZED REPRESENTATIVE) ASSUME THE ENTIRE COST
-      OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY
-      NOT APPLY TO YOU.
-
-   9. Limitation of Liability. UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE,
-      SHALL VENDOR, OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS, BE LIABLE
-      TO YOU FOR ANY INCIDENTAL, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES
-      (INCLUDING DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION,
-      LOSS OF BUSINESS INFORMATION, AND THE LIKE) ARISING OUT OF THE USE,
-      MISUSE OR INABILITY TO USE THE SOFTWARE OR RELATED DOCUMENTATION, EVEN IF
-      VENDOR OR VENDOR'S AUTHORIZED REPRESENTATIVE HAS BEEN ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE
-      LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL
-      DAMAGES, SO THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY TO YOU. In no
-      event shall VENDOR's total liability to you for all damages, losses, and
-      causes of action (whether in contract, tort (including negligence) or
-      otherwise) exceed the amount paid by you for the Software.
-
-  10. Controlling Law and Severability. This License shall be governed by and
-      construed in accordance with the laws of the United States and the State
-      of Minnesota, as applied to agreements entered into and to be performed
-      entirely within Minnesota between Minnesota residents. If for any reason
-      a court of competent jurisdiction finds any provision of this License or
-      portion thereof, to be unenforceable, that provision of the License shall
-      be enforced to the maximum extent permissible so as to effect the intent
-      of the parties, and the remainder of this License shall continue in full
-      force and effect.
-
-
-Appendix A - Wine License
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-
-    ----------------< End of Formal License Grant >-----------------------
-
-OKAY, WE WERE JUST KIDDING. THERE'S NOTHING IN HERE ABOUT CARWASHES. BUT YOU
-REALLY SHOULD READ THESE THINGS, YOU KNOW. (It's the Green RAV4, if
-you really insist).
-
-For those of you that do really care about license agreements,
-please feel free to email us at info@codeweavers.com; we are
-always open to suggestions.
diff --git a/licenses/GPL-3+-with-cuda-exception b/licenses/GPL-3+-with-cuda-exception
deleted file mode 100644
index b19349aa2021..000000000000
--- a/licenses/GPL-3+-with-cuda-exception
+++ /dev/null
@@ -1,11 +0,0 @@
-GNU General Public License, version 3 or any later version.
-See GPL-3 for the full text of this license.
-
-Additional permission under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with NVIDIA Corporation's CUDA libraries from the
-NVIDIA CUDA Toolkit (or a modified version of those libraries),
-containing parts covered by the terms of NVIDIA CUDA Toolkit
-EULA, the licensors of this Program grant you additional
-permission to convey the resulting work.
diff --git a/licenses/GPL-3+-with-cuda-openssl-exception b/licenses/GPL-3+-with-cuda-openssl-exception
deleted file mode 100644
index 734d93dc2f7e..000000000000
--- a/licenses/GPL-3+-with-cuda-openssl-exception
+++ /dev/null
@@ -1,20 +0,0 @@
-GNU General Public License, version 3 or any later version.
-See GPL-3 for the full text of this license.
-
-Additional permission under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with the OpenSSL project's "OpenSSL" library (or a
-modified version of that library), containing parts covered by
-the terms of OpenSSL/SSLeay license, the licensors of this
-Program grant you additional permission to convey the resulting
-work. Corresponding Source for a non-source form of such a
-combination shall include the source code for the parts of the
-OpenSSL library used as well as that of the covered work.
-
-If you modify this Program, or any covered work, by linking or
-combining it with NVIDIA Corporation's CUDA libraries from the
-NVIDIA CUDA Toolkit (or a modified version of those libraries),
-containing parts covered by the terms of NVIDIA CUDA Toolkit
-EULA, the licensors of this Program grant you additional
-permission to convey the resulting work.
diff --git a/licenses/GPL-3+-with-opencl-exception b/licenses/GPL-3+-with-opencl-exception
deleted file mode 100644
index 8ce67672a1b9..000000000000
--- a/licenses/GPL-3+-with-opencl-exception
+++ /dev/null
@@ -1,12 +0,0 @@
-GNU General Public License, version 3 or any later version.
-See GPL-3 for the full text of this license.
-
-Additional permission under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any library or libraries implementing the
-Khronos Group OpenCL Standard v1.0 or later (or modified
-versions of those libraries), containing parts covered by the
-terms of the licenses of their respective copyright owners,
-the licensors of this Program grant you additional permission
-to convey the resulting work.
diff --git a/licenses/GPL-3+-with-opencl-openssl-exception b/licenses/GPL-3+-with-opencl-openssl-exception
deleted file mode 100644
index a8b30e1cf21b..000000000000
--- a/licenses/GPL-3+-with-opencl-openssl-exception
+++ /dev/null
@@ -1,21 +0,0 @@
-GNU General Public License, version 3 or any later version.
-See GPL-3 for the full text of this license.
-
-Additional permission under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with the OpenSSL project's "OpenSSL" library (or a
-modified version of that library), containing parts covered by
-the terms of OpenSSL/SSLeay license, the licensors of this
-Program grant you additional permission to convey the resulting
-work. Corresponding Source for a non-source form of such a
-combination shall include the source code for the parts of the
-OpenSSL library used as well as that of the covered work.
-
-If you modify this Program, or any covered work, by linking or
-combining it with any library or libraries implementing the
-Khronos Group OpenCL Standard v1.0 or later (or modified
-versions of those libraries), containing parts covered by the
-terms of the licenses of their respective copyright owners,
-the licensors of this Program grant you additional permission
-to convey the resulting work.
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 23645f978700..d4412bf86770 100644
--- a/licenses/Manifest.gz
+++ b/licenses/Manifest.gz
diff --git a/licenses/OTN b/licenses/OTN
index 9a8267e7e049..d3c734a2e9d4 100644
--- a/licenses/OTN
+++ b/licenses/OTN
@@ -1,57 +1,94 @@
-ORACLE TECHNOLOGY NETWORK 
-DEVELOPMENT LICENSE AGREEMENT
+Oracle Technology Network License Agreement
 
-"We," "us," and "our" refers to Oracle Corporation.  "You" and "your" refers to the individual or entity that wishes to use the programs from Oracle.  "Programs" refers to the Oracle software product you wish to download and use and program documentation.  "License" refers to your right to use the programs under the terms of this agreement.  This agreement is governed by the substantive and procedural laws of California.  You and Oracle agree to submit to the exclusive jurisdiction of, and venue in, the courts of San Francisco, San Mateo, or Santa Clara counties in California in any dispute arising out of or relating to this agreement.
+Oracle is willing to authorize Your access to software associated with this License Agreement (“Agreement”) only upon the condition that You accept that this Agreement governs Your use of the software. By selecting the “Accept License Agreement” button or box (or the equivalent) or installing or using the Programs You indicate Your acceptance of this Agreement and Your agreement, as an authorized representative of Your company or organization (if being acquired for use by an entity) or as an individual, to comply with the license terms that apply to the software that You wish to download and access. If You are not willing to be bound by this Agreement, do not select the “Accept License Agreement” button or box (or the equivalent) and do not download or access the software.
 
-We are willing to license the programs to you only upon the condition that you accept all of the terms contained in this agreement.  Read the terms carefully and select the "Accept" button at the bottom of the page to confirm your acceptance.  If you are not willing to be bound by these terms, select the "Do Not Accept" button and the registration process will not continue.
+Definitions
 
-License Rights
-We grant you a nonexclusive, nontransferable limited license to use the programs only for the purpose of developing a single prototype of your application, and not for any other purpose.  If you use the application you develop under this license for any internal data processing or for any commercial or production purposes, or you want to use the programs for any purpose other than as permitted under this agreement, you must contact us, or an Oracle reseller, to obtain the appropriate license.  We may audit your use of the programs.  Program documentation may accessed online at /docs.
+"Oracle" refers to Oracle America, Inc. "You" and "Your" refers to (a) a company or organization (each an “Entity”) accessing the Programs, if use of the Programs will be on behalf of such Entity; or (b) an individual accessing the Programs, if use of the Programs will not be on behalf of an Entity. “Contractors” refers to Your agents and contractors (including, without limitation, outsourcers). "Program(s)" refers to Oracle software provided by Oracle pursuant to this Agreement and any updates, error corrections, and/or Program Documentation provided by Oracle. “Program Documentation” refers to Program user manuals and Program installation manuals, if any. If available, Program Documentation may be delivered with the Programs and/or may be accessed from www.oracle.com/documentation. “Associated Product” refers to the Oracle product(s), if any, and as identified in the Programs documentation or on the Programs download site, with which the Programs are intended to enable or enhance interoperation with Your application(s). “Separate Terms” refers to separate license terms that are specified in the Program Documentation, readmes or notice files and that apply to Separately Licensed Third Party Technology. “Separately Licensed Third Party Technology” refers to third party technology that is licensed under Separate Terms and not under the terms of this Agreement.
 
+License Rights and Restrictions
 
-Ownership and Restrictions
-We retain all ownership and intellectual property rights in the programs.  The programs may be installed on one computer only, and used by one person in the operating environment identified by us.  You may make one copy of the programs for backup purposes.
+Oracle grants You a nonexclusive, nontransferable, limited license to, subject to the restrictions stated in this Agreement, (a) internally use the Programs solely for the purposes of developing, testing, prototyping and demonstrating Your applications, and running the Programs for Your own internal business operations; and (b) redistribute unmodified Programs and Programs Documentation pursuant to the Programs Redistribution section below. You may allow Your Contractor(s) to use the Programs, provided they are acting on Your behalf to exercise license rights granted in this Agreement and further provided that You are responsible for their compliance with this Agreement in such use. You will have a written agreement with Your Contractor(s) that strictly limits their right to use the Programs and that otherwise protects Oracle’s intellectual property rights to the same extent as this Agreement. You may make copies of the Programs to the extent reasonably necessary to exercise the license rights granted in this Agreement. You may make one copy of the Programs for backup purposes.
 
-You may not:
-use the programs for your own internal data processing or for any commercial or production purposes, or use the programs for any purpose except the development of a single prototype of your application;
-use the application you develop with the programs for any internal data processing or commercial or production purposes without securing an appropriate license from us;
-continue to develop your application after you have used it for any internal data processing, commercial or production purpose without securing an appropriate license from us, or an Oracle reseller;
-remove or modify any program markings or any notice of our proprietary rights;
-make the programs available in any manner to any third party;
-use the programs to provide third party training;
-assign this agreement or give or transfer the programs or an interest in them to another individual or entity;
-cause or permit reverse engineering (unless required by law for interoperability), disassembly or decompilation of the programs;
-disclose results of any program benchmark tests without our prior consent; or,
+Further, You may not:
 
-use any Oracle name, trademark or logo.
+    remove or modify any Program markings or any notice of Oracle’s or a licensor’s proprietary rights;
+    use the Programs to provide third party training unless Oracle expressly authorizes such use on the Program’s download page;
+    assign this Agreement or distribute, give, or transfer the Programs or an interest in them to any third party, except as expressly permitted in this Agreement (the foregoing shall not be construed to limit the rights You may otherwise have with respect to Separately Licensed Third Party Technology);
+    cause or permit reverse engineering (unless required by law for interoperability), disassembly or decompilation of the Programs; and
+    disclose results of any Program benchmark tests without Oracle’s prior consent.
 
-Export
-You agree that U.S. export control laws and other applicable export and import laws govern your use of the programs, including technical data; additional information can be found on Oracle's Global Trade Compliance web site located at http://www.oracle.com/products/export/index.html.  You agree that neither the programs nor any direct product thereof will be exported, directly, or indirectly, in violation of these laws, or will be used for any purpose prohibited by these laws including, without limitation, nuclear, chemical, or biological weapons proliferation.
+The Programs may contain source code that, unless expressly licensed in this Agreement for other purposes (for example, licensed under an open source license), is provided solely for reference purposes pursuant to the terms of this Agreement and may not be modified.
 
-Disclaimer of Warranty and Exclusive Remedies
+All rights not expressly granted in this Agreement are reserved by Oracle. If You want to use the Programs or Your application for any purpose other than as expressly permitted under this Agreement, You must obtain from Oracle or an Oracle reseller a valid Programs license under a separate agreement permitting such use. However, You acknowledge that the Programs may not be intended for production use and/or Oracle may not make a version of the Programs available for production or other purposes; any development or other work You undertake with the Programs is at Your sole risk.
 
-THE PROGRAMS ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND.  WE FURTHER DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+Programs Redistribution
 
-IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  OUR ENTIRE LIABILITY FOR DAMAGES HEREUNDER SHALL IN NO EVENT EXCEED ONE THOUSAND DOLLARS (U.S. $1,000).
+We grant You a nonexclusive, nontransferable right to copy and distribute unmodified Programs and Programs Documentation as part of and included in Your application that is intended to interoperate with the Associated Product, if any, provided that You do not charge Your end users any additional fees for the use of the Programs. Prior to distributing the Programs and Programs Documentation, You shall require Your end users to execute an agreement binding them to terms, with respect to the Programs and Programs Documentation, materially consistent and no less restrictive than those contained in this section and the sections of this Agreement entitled “License Rights and Restrictions” (except that the redistribution right granted to You shall not be included; Your end users may not distribute Programs and Programs Documentation to any third parties), "Ownership," "Export Controls," "Disclaimer of Warranties; Limitation of Liability," "No Technical Support" (with respect to Oracle support; You may provide Your own support for Programs at Your discretion), "Audit; Termination (except that Oracle’s audit right shall not be included)," "Relationship Between the Parties," and “U.S. Government End Users.” You must also include a provision stating that Your end users shall have no right to distribute the Programs and Programs Documentation, and a provision specifying us as a third party beneficiary of the agreement. You are responsible for obtaining these agreements with Your end users.
 
-Trial Programs Included With Orders
-We may include additional programs with an order which may be used for trial purposes only.  You will have 30 days from the delivery date to evaluate these programs.  Any use of these programs after the 30 day trial period requires you to obtain the applicable license.  Programs licensed for trial purposes are provided "as is" and we do not provide technical support or any warranties for these programs.
+You agree to: (a) defend and indemnify us against all claims and damages caused by Your distribution of the Programs and Programs Documentation in breach of this Agreement and/or failure to include the required contractual provisions in Your end user agreement as stated above; (b) keep executed end user agreements and records of end user information including name, address, date of distribution and identity of Programs distributed; (c) allow us to inspect Your end user agreements and records upon request; and, (d) enforce the terms of Your end user agreements so as to effect a timely cure of any end user breach, and to notify us of any breach of the terms.
 
+Ownership
+
+Oracle or its licensors retain all ownership and intellectual property rights to the Programs.
+
+Third-Party Technology
+
+The Programs may contain or require the use of third party technology that is provided with the Programs. Oracle may provide certain notices to You in Program Documentation, readmes or notice files in connection with such third party technology. Third party technology will be licensed to You either under the terms of this Agreement or, if specified in the Program Documentation, readmes or notice files, under Separate Terms. Your rights to use Separately Licensed Third Party Technology under Separate Terms are not restricted in any way by this Agreement. However, for clarity, notwithstanding the existence of a notice, third party technology that is not Separately Licensed Third Party Technology shall be deemed part of the Programs and is licensed to You under the terms of this Agreement.
+
+Source Code for Open Source Software
+
+For software that You receive from Oracle in binary form that is licensed under an open source license that gives You the right to receive the source code for that binary, You can obtain a copy of the applicable source code from https://oss.oracle.com/sources/ or http://www.oracle.com/goto/opensourcecode. If the source code for such software was not provided to You with the binary, You can also receive a copy of the source code on physical media by submitting a written request pursuant to the instructions in the "Written Offer for Source Code" section of the latter website.
+
+Export Controls
+
+Export laws and regulations of the United States and any other relevant local export laws and regulations apply to the Programs . You agree that such export control laws govern Your use of the Programs (including technical data) and any services deliverables provided under this agreement, and You agree to comply with all such export laws and regulations (including "deemed export" and "deemed re-export" regulations). You agree that no data, information, program and/or materials resulting from Programs or services (or direct products thereof) will be exported, directly or indirectly, in violation of these laws, or will be used for any purpose prohibited by these laws including, without limitation, nuclear, chemical, or biological weapons proliferation, or development of missile technology. Accordingly, You confirm:
+
+    You will not download, provide, make available or otherwise export or re-export the Programs, directly or indirectly, to countries prohibited by applicable laws and regulations nor to citizens, nationals or residents of those countries.
+    You are not listed on the United States Department of Treasury lists of Specially Designated Nationals and Blocked Persons, Specially Designated Terrorists, and Specially Designated Narcotic Traffickers, nor are You listed on the United States Department of Commerce Table of Denial Orders.
+    You will not download or otherwise export or re-export the Programs, directly or indirectly, to persons on the above mentioned lists.
+    You will not use the Programs for, and will not allow the Programs to be used for, any purposes prohibited by applicable law, including, without limitation, for the development, design, manufacture or production of nuclear, chemical or biological weapons of mass destruction.
+
+Information Collection
+
+The Programs’ installation and/or auto-update processes, if any, may transmit a limited amount of data to Oracle or its service provider about those processes to help Oracle understand and optimize them. Oracle does not associate the data with personally identifiable information. Refer to Oracle’s Privacy Policy at www.oracle.com/privacy.
+
+Disclaimer of Warranties; Limitation of Liability
+
+THE PROGRAMS ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. ORACLE FURTHER DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT .
+
+IN NO EVENT WILL ORACLE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT, EVEN IF ORACLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. ORACLE’S ENTIRE LIABILITY FOR DAMAGES UNDER THIS AGREEMENT SHALL IN NO EVENT EXCEED ONE THOUSAND DOLLARS (U.S. $1,000) .
 
 No Technical Support
-Our technical support organization will not provide technical support, phone support, or updates to you for the programs licensed under this agreement.
 
-End of Agreement
-You may terminate this agreement by destroying all copies of the programs.  We have the right to terminate your right to use the programs if you fail to comply with any of the terms of this agreement, in which case you shall destroy all copies of the programs.
+Unless Oracle support for the Programs, if any, is expressly included in a separate, current support agreement between You and Oracle, Oracle’s technical support organization will not provide technical support, phone support, or updates to You for the Programs provided under this Agreement.
+
+Audit; Termination
+
+Oracle may audit Your use of the Programs. You may terminate this Agreement by destroying all copies of the Programs. This Agreement shall automatically terminate without notice if You fail to comply with any of the terms of this Agreement, in which case You shall promptly destroy all copies of the Programs.
+
+U.S. Government End Users
+
+Programs and/or Programs Documentation delivered to U.S. Government end users are “commercial computer software” pursuant to the applicable Federal Acquisition Regulation and agency-specific supplemental regulations. As such, use, duplication, disclosure, modification, and adaptation of the Programs and/or Programs Documentation shall be subject to the license terms and license restrictions set forth in this Agreement. No other rights are granted to the U.S. Government.
 
 Relationship Between the Parties
-The relationship between you and us is that of licensee/licensor.  Neither party will represent that it has any authority to assume or create any obligation, express or implied, on behalf of the other party, nor to represent the other party as agent, employee, franchisee, or in any other capacity.  Nothing in this agreement shall be construed to limit either party's right to independently develop or distribute software that is functionally similar to the other party's products, so long as proprietary information of the other party is not included in such software.
 
-Open Source
-"Open Source" software - software available without charge for use, modification and distribution - is often licensed under terms that require the user to make the user's modifications to the Open Source software or any software that the user 'combines' with the Open Source software freely available in source code form.  If you use Open Source software in conjunction with the programs, you must ensure that your use does not:  (i) create, or purport to create, obligations of us with respect to the Oracle programs; or (ii) grant, or purport to grant, to any third party any rights to or immunities under our intellectual property or proprietary rights in the Oracle programs.  For example, you may not develop a software program using an Oracle program and an Open Source program where such use results in a program file(s) that contains code from both the Oracle program and the Open Source program (including without limitation libraries) if the Open Source program is licensed under a license that requires any "modifications" be made freely available.  You also may not combine the Oracle program with programs licensed under the GNU General Public License ("GPL") in any manner that could cause, or could be interpreted or asserted to cause, the Oracle program or any modifications thereto to become subject to the terms of the GPL.
+Oracle is an independent contractor and we agree that no partnership, joint venture, or agency relationship exists between us. We each will be responsible for paying our own employees, including employment related taxes and insurance.. Nothing in this agreement shall be construed to limit either party's right to independently develop or distribute software that is functionally similar to the other party's products, so long as proprietary information of the other party is not included in such software.
+
+Entire Agreement; Governing Law
+
+You agree that this Agreement is the complete agreement for the Programs and this Agreement supersedes all prior or contemporaneous agreements or representations, including any clickwrap, shrinkwrap or similar licenses, or license agreements for prior versions of the Programs. This Agreement may not be modified and the rights and restrictions may not be altered or waived except in a writing signed by authorized representatives of You and of Oracle. If any term of this Agreement is found to be invalid or unenforceable, the remaining provisions will remain effective.
+
+This Agreement is governed by the substantive and procedural laws of the State of California, USA, and You and Oracle agree to submit to the exclusive jurisdiction of, and venue in, the courts of San Francisco or Santa Clara counties in California in any dispute arising out of or relating to this Agreement.
+
+Notices
+
+Should you have any questions concerning this License Agreement, or if you desire to contact Oracle for any reason, please write:
 
-Entire Agreement
-You agree that this agreement is the complete agreement for the programs and licenses, and this agreement supersedes all prior or contemporaneous agreements or representations.  If any term of this agreement is found to be invalid or unenforceable, the remaining provisions will remain effective.
+    Oracle America, Inc.
+    500 Oracle Parkway
+    Redwood City, CA 94065
 
+Oracle Employees: Under no circumstances are Oracle Employees authorized to download software for the purpose of distributing it to customers. Oracle products are available to employees for internal use or demonstration purposes only. In keeping with Oracle's trade compliance obligations under U.S. and applicable multilateral law, failure to comply with this policy could result in disciplinary action up to and including termination.
 
-Last updated: 9/16/03
+Last updated: 30 November 2016
diff --git a/licenses/PUEL-10 b/licenses/PUEL-10
deleted file mode 100644
index 5483d4b91c77..000000000000
--- a/licenses/PUEL-10
+++ /dev/null
@@ -1,152 +0,0 @@
-VirtualBox Extension Pack Personal Use and Evaluation License (PUEL)
-
-License version 10, 20 July 2017
-
-PLEASE READ THE FOLLOWING ORACLE VM VIRTUALBOX EXTENSION PACK PERSONAL
-USE AND EVALUATION LICENSE CAREFULLY BEFORE DOWNLOADING OR USING THE
-ORACLE SOFTWARE. THESE TERMS AND CONDITIONS CONSTITUTE A LEGAL AGREEMENT
-BETWEEN YOU AND ORACLE.
-
-ORACLE AMERICA, INC. ("ORACLE") IS WILLING TO LICENSE THE PRODUCT DEFINED
-IN SECTION 1 BELOW ONLY ON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS
-CONTAINED IN THIS VIRTUALBOX EXTENSION PACK PERSONAL USE AND EVALUATION
-LICENSE AGREEMENT ("AGREEMENT").
-
-IF YOU ARE AGREEING TO THIS LICENSE ON BEHALF OF AN ENTITY (RATHER THAN
-AS AN INDIVIDUAL HUMAN BEING), YOU REPRESENT THAT YOU HAVE THE APPROPRIATE
-AUTHORITY TO ACCEPT THESE TERMS AND CONDITIONS ON BEHALF OF SUCH ENTITY.
-
-1 SUBJECT OF AGREEMENT. This Agreement governs your use of the binary
-software package called "Oracle VM VirtualBox Extension Pack" (the
-"Product"), which contains a set of additional features for "Oracle
-VM VirtualBox" that enhance the operation of multiple virtual machines
-("Guest Computers") on a single physical computer ("Host Computer"). The
-Product consists of executable files in machine code, script files,
-data files, and all documentation and updates provided to You by Oracle.
-
-2 GRANT OF LICENSE. Oracle grants you a personal, non-exclusive,
-non-transferable, limited license without fees to reproduce, install,
-execute, and use internally the Product on Host Computers for
-your Personal Use, Educational Use, or Evaluation. "Personal Use"
-is noncommercial use solely by the person downloading the Product
-from Oracle on a single Host Computer, provided that no more than one
-client or remote computer is connected to that Host Computer and that
-client or remote computer is used solely to remotely view the Guest
-Computer(s). "Educational Use" is any use by teachers or students in
-an academic institution (schools, colleges and universities) as part of
-the institution's educational curriculum. "Evaluation" means testing the
-Product for up to thirty (30) days; after expiry of that term, you are
-no longer permitted to use the Product. Personal Use and/or Educational
-Use expressly exclude any use of the Product for commercial purposes or
-to operate, run, or act on behalf of or for the benefit of a business,
-organization, governmental organization, or educational institution.
-
-Oracle reserves all rights not expressly granted in this license.
-
-3 RESTRICTIONS AND RESERVATION OF RIGHTS.
-
-(1) The Product and copies thereof provided to you under this Agreement
-are copyrighted and licensed, not sold, to you by Oracle.
-
-(2) You may not do any of the following: (a) modify any part of the
-Product, except to the extent allowed in the documentation accompanying
-the Product; (b) rent, lease, lend, re-distribute, or encumber the
-Product; (c) remove or alter any proprietary legends or notices contained
-in the Product; or (d) decompile, or reverse engineer the Product
-(except to the extent permitted by applicable law).
-
-(3) The Product is not designed, licensed or intended for use in the
-design, construction, operation or maintenance of any nuclear facility
-and Oracle and its licensors disclaim any express or implied warranty
-of fitness for such uses.
-
-(4) No right, title or interest in or to any trademark, service mark, logo
-or trade name of Oracle or its licensors is granted under this Agreement.
-
-4 TERMINATION. The Agreement is effective on the date you receive the
-Product and remains effective until terminated. Your rights under this
-Agreement will terminate immediately without notice from Oracle if
-you materially breach it or take any action in derogation of Oracle's
-and/or its licensors' rights to the Product. Oracle may terminate this
-Agreement immediately should any part of the Product become or in Oracle's
-reasonable opinion likely to become the subject of a claim of intellectual
-property infringement or trade secret misappropriation. Upon termination,
-you will cease use of and destroy all copies of the Product under your
-control and confirm compliance in writing to Oracle. Sections 3-9,
-inclusive, will survive termination of the Agreement.
-
-5 DISCLAIMER OF WARRANTY. TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW,
-ORACLE PROVIDES THE PRODUCT "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
-EXPRESS OR IMPLIED. WITHOUT LIMITING THE FOREGOING, ORACLE SPECIFICALLY
-DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE, TITLE, AND NON-INFRINGEMENT. The entire risk as
-to the quality and performance of the Product is with you. Should it
-prove defective, you assume the cost of all necessary servicing, repair,
-or correction.
-
-6 LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW,
-IN NO EVENT WILL ORACLE OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
-PROFIT, DATA, OR DATA USE, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL,
-INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY
-OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO
-USE THE PRODUCT, EVEN IF ORACLE HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES. In no event will Oracle's liability to you, whether in
-contract, tort (including negligence), or otherwise, exceed the amount
-paid by you for the Product under this Agreement.
-
-7 SEPARATELY LICENSED THIRD PARTY TECHNOLOGY. The Product may contain
-or require the use of third party technology that is provided with
-the Product. Oracle may provide certain notices to you in the Product's
-documentation, readmes or notice files in connection with such third party
-technology. Third party technology will be licensed to you either under
-the terms of this Agreement or, if specified in the documentation, readmes
-or notice files, under Separate Terms. Your rights to use Separately
-Licensed Third Party Technology under Separate Terms are not restricted
-in any way by this Agreement. However, for clarity, notwithstanding the
-existence of a notice, third party technology that is not Separately
-Licensed Third Party Technology shall be deemed part of the Product and
-is licensed to You under the terms of this Agreement. "Separate Terms"
-refers to separate license terms that are specified in the Product's
-documentation, readmes or notice files and that apply to Separately
-Licensed Third Party Technology. "Separately Licensed Third Party
-Technology" refers to third party technology that is licensed under
-Separate Terms and not under the terms of this Agreement.
-
-8 EXPORT. Export laws and regulations of the United States and any other
-relevant local export laws and regulations apply to the Product. You
-agree that such export laws govern your use of the Product (including
-technical data) provided under this Agreement, and you agree to comply
-with all such export laws and regulations (including "deemed export" and
-"deemed re-export" regulations). You agree that no data, information,
-and/or Product (or direct product thereof) will be exported, directly or
-indirectly, in violation of these laws, or will be used for any purpose
-prohibited by these laws including, without limitation, nuclear, chemical,
-or biological weapons proliferation, or development of missile technology.
-
-9 U.S. GOVERNMENT END USERS. Oracle programs, including the Product,
-any operating system, integrated software, any programs installed on
-hardware, and/or documentation, delivered to U.S. Government end users
-are "commercial computer software" pursuant to the applicable Federal
-Acquisition Regulation and agency-specific supplemental regulations. As
-such, use, duplication, disclosure, modification, and adaptation of
-the programs, including any operating system, integrated software,
-any programs installed on the hardware, and/or documentation, shall
-be subject to license terms and license restrictions applicable to the
-programs. No other rights are granted to the U.S. Government.
-
-10 MISCELLANEOUS. This Agreement is the entire agreement between you
-and Oracle relating to its subject matter. It supersedes all prior or
-contemporaneous oral or written communications, proposals, representations
-and warranties and prevails over any conflicting or additional terms
-of any quote, order, acknowledgment, or other communication between
-the parties relating to its subject matter during the term of this
-Agreement. No modification of this Agreement will be binding, unless in
-writing and signed by an authorized representative of each party. If any
-provision of this Agreement is held to be unenforceable, this Agreement
-will remain in effect with the provision omitted, unless omission would
-frustrate the intent of the parties, in which case this Agreement will
-immediately terminate. This Agreement is governed by the laws of the
-State of California, USA, and you and Oracle agree to submit to the
-exclusive jurisdiction of, and venue in, the courts of San Francisco
-or Santa Clara counties in California in any dispute arising out of or
-relating to this Agreement.
diff --git a/licenses/oracle-java-documentation-11 b/licenses/oracle-java-documentation-11
deleted file mode 100644
index 0b8d6800fd38..000000000000
--- a/licenses/oracle-java-documentation-11
+++ /dev/null
@@ -1,49 +0,0 @@
-ORACLE AMERICA, INC. IS WILLING TO LICENSE THIS SPECIFICATION TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS AGREEMENT. PLEASE READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY. BY DOWNLOADING THIS SPECIFICATION, YOU ACCEPT THE TERMS AND CONDITIONS OF THE AGREEMENT. IF YOU ARE NOT WILLING TO BE BOUND BY IT, SELECT THE "DECLINE" BUTTON AT THE BOTTOM OF THIS PAGE.
-
-Specification: JSR-384 Java SE 11 (18.9) ("Specification")
-Version: 11
-Status: Final Release
-Specification Lead: Oracle America, Inc. ("Specification Lead")
-Release: September 2018
-Copyright 2018 Oracle America, Inc.
-
-All rights reserved.
-
-LIMITED LICENSE GRANTS
-1. License for Evaluation Purposes. Specification Lead hereby grants you a fully-paid, non-exclusive, nontransferable, worldwide, limited license (without the right to sublicense), under Specification Lead's applicable intellectual property rights to view, download, use and reproduce the Specification only for the purpose of internal evaluation. This includes (i) developing applications intended to run on an implementation of the Specification, provided that such applications do not themselves implement any portion(s) of the Specification, and (ii) discussing the Specification with any third party; and (iii) excerpting brief portions of the Specification in oral or written communications which discuss the Specification provided that such excerpts do not in the aggregate constitute a significant portion of the Specification.
-
-2. License for the Distribution of Compliant Implementations. Specification Lead also grants you a perpetual, non-exclusive, non-transferable, worldwide, fully paid-up, royalty free, limited license (without the right to sublicense) under any applicable copyrights or, subject to the provisions of subsection 4 below, patent rights it may have covering the Specification to create and/or distribute an Independent Implementation of the Specification that: (a) fully implements the Specification including all its required interfaces and functionality; (b) does not modify, subset, superset or otherwise extend the Licensor Name Space, or include any public or protected packages, classes, Java interfaces, fields or methods within the Licensor Name Space other than those required/authorized by the Specification or Specifications being implemented; and (c) passes the Technology Compatibility Kit (including satisfying the requirements of the applicable TCK Users Guide) for such Specification ("Compliant Implementation"). In addition, the foregoing license is expressly conditioned on your not acting outside its scope. No license is granted hereunder for any other purpose (including, for example, modifying the Specification, other than to the extent of your fair use rights, or distributing the Specification to third parties). Also, no right, title, or interest in or to any trademarks, service marks, or trade names of Specification Lead or Specification Lead's licensors is granted hereunder. Java, and Java-related logos, marks and names are trademarks or registered trademarks of Oracle America, Inc. in the U.S. and other countries.
-
-3. Pass-through Conditions. You need not include limitations (a)-(c) from the previous paragraph or any other particular "pass through" requirements in any license You grant concerning the use of your Independent Implementation or products derived from it. However, except with respect to Independent Implementations (and products derived from them) that satisfy limitations (a)-(c) from the previous paragraph, You may neither: (a) grant or otherwise pass through to your licensees any licenses under Specification Lead's applicable intellectual property rights; nor (b) authorize your licensees to make any claims concerning their implementation's compliance with the Specification in question.
-
-4. Reciprocity Concerning Patent Licenses.
-
-a. With respect to any patent claims covered by the license granted under subparagraph 2 above that would be infringed by all technically feasible implementations of the Specification, such license is conditioned upon your offering on fair, reasonable and non-discriminatory terms, to any party seeking it from You, a perpetual, non-exclusive, non-transferable, worldwide license under Your patent rights which are or would be infringed by all technically feasible implementations of the Specification to develop, distribute and use a Compliant Implementation.
-
-b. With respect to any patent claims owned by Specification Lead and covered by the license granted under subparagraph 2, whether or not their infringement can be avoided in a technically feasible manner when implementing the Specification, such license shall terminate with respect to such claims if You initiate a claim against Specification Lead that it has, in the course of performing its responsibilities as the Specification Lead, induced any other entity to infringe Your patent rights.
-
-c. Also with respect to any patent claims owned by Specification Lead and covered by the license granted under subparagraph 2 above, where the infringement of such claims can be avoided in a technically feasible manner when implementing the Specification such license, with respect to such claims, shall terminate if You initiate a claim against Specification Lead that its making, having made, using, offering to sell, selling or importing a Compliant Implementation infringes Your patent rights.
-
-5. Definitions. For the purposes of this Agreement: "Independent Implementation" shall mean an implementation of the Specification that neither derives from any of Specification Lead's source code or binary code materials nor, except with an appropriate and separate license from Specification Lead, includes any of Specification Lead's source code or binary code materials; "Licensor Name Space" shall mean the public class or interface declarations whose names begin with "java", "javax", "com.oracle", "com.sun" or their equivalents in any subsequent naming convention adopted by Oracle America, Inc. through the Java Community Process, or any recognized successors or replacements thereof; and "Technology Compatibility Kit" or "TCK" shall mean the test suite and accompanying TCK User's Guide provided by Specification Lead which corresponds to the Specification and that was available either (i) from Specification Lead 120 days before the first release of Your Independent Implementation that allows its use for commercial purposes, or (ii) more recently than 120 days from such release but against which You elect to test Your implementation of the Specification.
-
-This Agreement will terminate immediately without notice from Specification Lead if you breach the Agreement or act outside the scope of the licenses granted above.
-
-DISCLAIMER OF WARRANTIES
-THE SPECIFICATION IS PROVIDED "AS IS". SPECIFICATION LEAD MAKES NO REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT (INCLUDING AS A CONSEQUENCE OF ANY PRACTICE OR IMPLEMENTATION OF THE SPECIFICATION), OR THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE. This document does not represent any commitment to release or implement any portion of the Specification in any product. In addition, the Specification could include technical inaccuracies or typographical errors.
-
-LIMITATION OF LIABILITY
-TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SPECIFICATION LEAD OR ITS LICENSORS BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT LIMITATION, LOST REVENUE, PROFITS OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED IN ANY WAY TO YOUR HAVING, IMPLEMENTING OR OTHERWISE USING THE SPECIFICATION, EVEN IF SPECIFICATION LEAD AND/OR ITS LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-You will indemnify, hold harmless, and defend Specification Lead and its licensors from any claims arising or resulting from: (i) your use of the Specification; (ii) the use or distribution of your Java application, applet and/or implementation; and/or (iii) any claims that later versions or releases of any Specification furnished to you are incompatible with the Specification provided to you under this license.
-
-RESTRICTED RIGHTS LEGEND
-U.S. Government: If this Specification is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in the Software and accompanying documentation shall be only as set forth in this license; this is in accordance with 48 C.F.R. 227.7201 through 227.7202-4 (for Department of Defense (DoD) acquisitions) and with 48 C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
-
-REPORT
-If you provide Specification Lead with any comments or suggestions concerning the Specification ("Feedback"), you hereby: (i) agree that such Feedback is provided on a non-proprietary and nonconfidential basis, and (ii) grant Specification Lead a perpetual, non-exclusive, worldwide, fully paid-up, irrevocable license, with the right to sublicense through multiple levels of sublicensees, to incorporate, disclose, and use without limitation the Feedback for any purpose.
-
-GENERAL TERMS
-Any action related to this Agreement will be governed by California law and controlling U.S. federal law. The U.N. Convention for the International Sale of Goods and the choice of law rules of any jurisdiction will not apply.
-
-The Specification is subject to U.S. export control laws and may be subject to export or import regulations in other countries. Licensee agrees to comply strictly with all such laws and regulations and acknowledges that it has the responsibility to obtain such licenses to export, re-export or import as may be required after delivery to Licensee.
-
-This Agreement is the parties' entire agreement relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, conditions, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification to this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
diff --git a/licenses/oracle-java-documentation-8 b/licenses/oracle-java-documentation-8
deleted file mode 100644
index e63edf591dd5..000000000000
--- a/licenses/oracle-java-documentation-8
+++ /dev/null
@@ -1,61 +0,0 @@
-ORACLE AMERICA, INC. ("ORACLE") IS WILLING TO LICENSE THIS SPECIFICATION TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS AGREEMENT. PLEASE READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY. BY DOWNLOADING THIS SPECIFICATION, YOU ACCEPT THE TERMS AND CONDITIONS OF THE AGREEMENT. IF YOU ARE NOT WILLING TO BE BOUND BY IT, SELECT "DECLINE"
-
-JCP Submission/March 2014
-
-Specification: JSR-337 SE 8 ("Specification") 
-
-Version: 1.0
-
-Status: Final
-
-Release: March 2014
-
-Copyright 2014 Oracle America, Inc. (“Oracle”)
-500 Oracle Parkway, Redwood City, CA 94065, U.S.A All rights reserved.
-
-LIMITED LICENSE GRANTS
-
-1. License for Evaluation Purposes. Oracle hereby grants you a fully-paid, non-exclusive, non- transferable, worldwide, limited license (without the right to sublicense), under Oracle's applicable intellectual property rights to view, download, use and reproduce the Specification only for the purpose of internal evaluation. This includes (i) developing applications intended to run on an implementation of the Specification, provided that such applications do not themselves implement any portion(s) of the Specification, and (ii) discussing the Specification with any third party; and (iii) excerpting brief portions of the Specification in oral or written communications which discuss the Specification provided that such excerpts do not in the aggregate constitute a significant portion of the Specification.
-
-2. License for the Distribution of Compliant Implementations. Oracle also grants you a perpetual, non- exclusive, non-transferable, worldwide, fully paid-up, royalty free, limited license (without the right to sublicense) under any applicable copyrights or, subject to the provisions of subsection 4 below, patent rights it may have covering the Specification to create and/or distribute an Independent Implementation of the Specification that: (a) fully implements the Specification including all its required interfaces and functionality; (b) does not modify, subset, superset or otherwise extend the Licensor Name Space, or include any public or protected packages, classes, Java interfaces, fields or methods within the Licensor Name Space other than those required/authorized by the Specification or Specifications being implemented; and (c) passes the Technology Compatibility Kit (including satisfying the requirements of the applicable TCK Users Guide) for such Specification ("Compliant Implementation"). In addition, the foregoing license is expressly conditioned on your not acting outside its scope. No license is granted hereunder for any other purpose (including, for example, modifying the Specification, other than to the extent of your fair use rights, or distributing the Specification to third parties). Also, no right, title, or interest in or to any trademarks, service marks, or trade names of Oracle or Oracle's licensors is granted hereunder. Java, and Java-related logos, marks and names are trademarks or registered trademarks of Oracle America, Inc. in the U.S. and other countries.
-
-3. Pass-through Conditions. You need not include limitations (a)-(c) from the previous paragraph or any other particular "pass through" requirements in any license You grant concerning the use of your Independent Implementation or products derived from it. However, except with respect to Independent Implementations (and products derived from them) that satisfy limitations (a)-(c) from the previous paragraph, You may neither: (a) grant or otherwise pass through to your licensees any licenses under Oracle's applicable intellectual property rights; nor (b) authorize your licensees to make any claims concerning their implementation's compliance with the Specification in question.
-
-4. Reciprocity Concerning Patent Licenses.
-
-    a. With respect to any patent claims covered by the license granted under subparagraph 2 above that would be infringed by all technically feasible implementations of the Specification, such license is conditioned upon your offering on fair, reasonable and non-discriminatory terms, to any party seeking it from You, a perpetual, non-exclusive, non-transferable, worldwide license under Your patent rights which are or would be infringed by all technically feasible implementations of the Specification to develop, distribute and use a Compliant Implementation.
-
-    b With respect to any patent claims owned by Oracle and covered by the license granted under subparagraph 2, whether or not their infringement can be avoided in a technically feasible manner when implementing the Specification, such license shall terminate with respect to such claims if You initiate a claim against Oracle that it has, in the course of performing its responsibilities as the Specification Lead, induced any other entity to infringe Your patent rights.
-
-    c Also with respect to any patent claims owned by Oracle and covered by the license granted under subparagraph 2 above, where the infringement of such claims can be avoided in a technically feasible manner when implementing the Specification such license, with respect to such claims, shall terminate if You initiate a claim against Oracle that its making, having made, using, offering to sell, selling or importing a Compliant Implementation infringes Your patent rights.
-
-5. Definitions. For the purposes of this Agreement: "Independent Implementation" shall mean an implementation of the Specification that neither derives from any of Oracle's source code or binary code materials nor, except with an appropriate and separate license from Oracle, includes any of Oracle's source code or binary code materials; "Licensor Name Space" shall mean the public class or interface declarations whose names begin with "java", "javax", "com.sun", “com.oracle” or their equivalents in any subsequent naming convention adopted by Oracle through the Java Community Process, or any recognized successors or replacements thereof; and "Technology Compatibility Kit" or "TCK" shall mean the test suite and accompanying TCK User's Guide provided by Oracle which corresponds to the Specification and that was available either (i) from Oracle 120 days before the first release of Your Independent Implementation that allows its use for commercial purposes, or (ii) more recently than 120 days from such release but against which You elect to test Your implementation of the Specification.
-
-This Agreement will terminate immediately without notice from Oracle if you breach the Agreement or act outside the scope of the licenses granted above.
-
-DISCLAIMER OF WARRANTIES
-
-THE SPECIFICATION IS PROVIDED "AS IS". ORACLE MAKES NO REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT (INCLUDING AS A CONSEQUENCE OF ANY PRACTICE OR IMPLEMENTATION OF THE SPECIFICATION), OR THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE. This document does not represent any commitment to release or implement any portion of the Specification in any product. In addition, the Specification could include technical inaccuracies or typographical errors.
-
-LIMITATION OF LIABILITY
-
-TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL ORACLE OR ITS LICENSORS BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT LIMITATION, LOST REVENUE, PROFITS OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED IN ANY WAY TO YOUR HAVING, IMPLEMENTING OR OTHERWISE USING THE SPECIFICATION, EVEN IF ORACLE AND/OR ITS LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-You will indemnify, hold harmless, and defend Oracle and its licensors from any claims arising or resulting from: (i) your use of the Specification; (ii) the use or distribution of your Java application, applet and/or implementation; and/or (iii) any claims that later versions or releases of any Specification furnished to you are incompatible with the Specification provided to you under this license.
-
-RESTRICTED RIGHTS LEGEND
-
-U.S. Government: If this Specification is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in the Software and accompanying documentation shall be only as set forth in this license; this is in accordance with 48 C.F.R. 227.7201 through 227.7202-4 (for Department of Defense (DoD) acquisitions) and with 48 C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
-
-REPORT
-
-If you provide Oracle with any comments or suggestions concerning the Specification ("Feedback"), you hereby: (i) agree that such Feedback is provided on a non-proprietary and non-confidential basis, and (ii) grant Oracle a perpetual, non-exclusive, worldwide, fully paid-up, irrevocable license, with the right to sublicense through multiple levels of sublicensees, to incorporate, disclose, and use without limitation the Feedback for any purpose.
-
-GENERAL TERMS
-
-Any action related to this Agreement will be governed by California law and controlling U.S. federal law. The U.N. Convention for the International Sale of Goods and the choice of law rules of any jurisdiction will not apply.
-
-The Specification is subject to U.S. export control laws and may be subject to export or import regulations in other countries. Licensee agrees to comply strictly with all such laws and regulations and acknowledges that it has the responsibility to obtain such licenses to export, re-export or import as may be required after delivery to Licensee.
-
-This Agreement is the parties' entire agreement relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, conditions, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification to this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
-
-March 2014
\ No newline at end of file
diff --git a/licenses/oracle-java-documentation-9 b/licenses/oracle-java-documentation-9
deleted file mode 100644
index ae342071a46c..000000000000
--- a/licenses/oracle-java-documentation-9
+++ /dev/null
@@ -1,65 +0,0 @@
-ORACLE AMERICA, INC. IS WILLING TO LICENSE THIS SPECIFICATION TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS LICENSE AGREEMENT ("AGREEMENT"). PLEASE READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY. BY DOWNLOADING THIS SPECIFICATION, YOU ACCEPT THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU ARE NOT WILLING TO BE BOUND BY THEM, SELECT THE "DECLINE" BUTTON AT THE BOTTOM OF THIS PAGE AND THE DOWNLOADING PROCESS WILL NOT CONTINUE.
-
-Specification: JSR-376 Java Platform Module System ("Specification") Version: 9
-
-Status: Final Release
-
-Release: September 2017
-
-Copyright 2017 Oracle America, Inc.
-500 Oracle Parkway, Redwood City, California 94065, U.S.A.
-All rights reserved.
-
-NOTICE
-The Specification is protected by copyright and the information described therein may be protected by one or more U.S. patents, foreign patents, or pending applications. Except as provided under the following license, no part of the Specification may be reproduced in any form by any means without the prior written authorization of Oracle America, Inc. ("Oracle") and its licensors, if any. Any use of the Specification and the information described therein will be governed by the terms and conditions of this Agreement.
-
-Subject to the terms and conditions of this license, including your compliance with Paragraphs 1 and 2 below, Oracle hereby grants you a fully-paid, non-exclusive, non-transferable, limited license (without the right to sublicense) under Oracle's intellectual property rights to:
-
-1.Review the Specification for the purposes of evaluation. This includes: (i) developing implementations of the Specification for your internal, non-commercial use; (ii) discussing the Specification with any third party; and (iii) excerpting brief portions of the Specification in oral or written communications which discuss the Specification provided that such excerpts do not in the aggregate constitute a significant portion of the Technology.
-
-2.Distribute implementations of the Specification to third parties for their testing and evaluation use, provided that any such implementation:
-(i) does not modify, subset, superset or otherwise extend the Licensor Name Space, or include any public or protected packages, classes, Java interfaces, fields or methods within the Licensor Name Space other than those required/authorized by the Specification or Specifications being implemented;
-(ii) is clearly and prominently marked with the word "UNTESTED" or "EARLY ACCESS" or "INCOMPATIBLE" or "UNSTABLE" or "BETA" in any list of available builds and in proximity to every link initiating its download, where the list or link is under Licensee's control; and
-(iii) includes the following notice:
-"This is an implementation of an early-draft specification developed under the Java Community Process (JCP) and is made available for testing and evaluation purposes only. The code is not compatible with any specification of the JCP."
-
-The grant set forth above concerning your distribution of implementations of the specification is contingent upon your agreement to terminate development and distribution of your "early draft" implementation as soon as feasible following final completion of the specification. If you fail to do so, the foregoing grant shall be considered null and void.
-
-No provision of this Agreement shall be understood to restrict your ability to make and distribute to third parties applications written to the Specification.
-Other than this limited license, you acquire no right, title or interest in or to the Specification or any other Oracle intellectual property, and the Specification may only be used in accordance with the license terms set forth herein. This license will expire on the earlier of: (a) two (2) years from the date of Release listed above; (b) the date on which the final version of the Specification is publicly released; or (c) the date on which the Java Specification Request (JSR) to which the Specification corresponds is withdrawn. In addition, this license will terminate immediately without notice from Oracle if you fail to comply with any provision of this license. Upon termination, you must cease use of or destroy the Specification.
-
-"Licensor Name Space" means the public class or interface declarations whose names begin with "java", "javax", "com.oracle" or their equivalents in any subsequent naming convention adopted by Oracle through the Java Community Process, or any recognized successors or replacements thereof
-TRADEMARKS
-
-No right, title, or interest in or to any trademarks, service marks, or trade names of Oracle or Oracle's licensors is granted here under. Oracle, the Oracle logo, and Java are trademarks or registered trademarks of Oracle America, Inc. in the U.S. and other countries.
-
-DISCLAIMER OF WARRANTIES
-
-THE SPECIFICATION IS PROVIDED "AS IS" AND IS EXPERIMENTAL AND MAY CONTAIN DEFECTS OR DEFICIENCIES WHICH CANNOT OR WILL NOT BE CORRECTED BY ORACLE. ORACLE MAKES NO REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE OR THAT ANY PRACTICE OR IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADE SECRETS OR OTHER RIGHTS. 
-
-This document does not represent any commitment to release or implement any portion of the Specification in any product.
-
-THE SPECIFICATION COULD INCLUDE TECHNICAL INACCURACIES OR TYPOGRAPHICAL ERRORS. CHANGES ARE PERIODICALLY ADDED TO THE INFORMATION THEREIN; THESE CHANGES WILL BE INCORPORATED INTO NEW VERSIONS OF THE SPECIFICATION, IF ANY. ORACLE MAY MAKE IMPROVEMENTS AND/OR CHANGES TO THE PRODUCT(S) AND/OR THE PROGRAM(S) DESCRIBED IN THE SPECIFICATION AT ANY TIME. Any use of such changes in the Specification will be governed by the then-current license for the applicable version of the Specification.
-
-LIMITATION OF LIABILITY
-
-TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL ORACLE OR ITS LICENSORS BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT LIMITATION, LOST REVENUE, PROFITS OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO ANY FURNISHING, PRACTICING,
-
-MODIFYING OR ANY USE OF THE SPECIFICATION, EVEN IF ORACLE AND/OR ITS LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-You will hold Oracle (and its licensors) harmless from any claims based on your use of the Specification for any purposes other than the limited right of evaluation as described above, and from any claims that later versions or releases of any Specification furnished to you are incompatible with the Specification provided to you under this license.
-
-
-RESTRICTED RIGHTS LEGEND
-
-If this Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in the Software and accompanying documentation shall be only as set forth in this license; this is in accordance with 48 C.F.R. 227.7201 through 227.7202-4 (for Department of Defense (DoD) acquisitions) and with 48 C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
-REPORT
-
-You may wish to report any ambiguities, inconsistencies or inaccuracies you may find in connection with your evaluation of the Specification ("Feedback"). To the extent that you provide Oracle with any Feedback, you hereby: (i) agree that such Feedback is provided on a non-proprietary and non- confidential basis, and (ii) grant Oracle a perpetual, non-exclusive, worldwide, fully paid-up, irrevocable license, with the right to sublicense through multiple levels of sublicensees, to incorporate, disclose, and use without limitation the Feedback for any purpose related to the Specification and future versions, implementations, and test suites thereof.
-
-GENERAL TERMS
-Any action related to this Agreement will be governed by California law and controlling U.S. federal law. The U.N. Convention for the International Sale of Goods and the choice of law rules of any jurisdiction will not apply.
-
-The Specification is subject to U.S. export control laws and may be subject to export or import regulations in other countries. Licensee agrees to comply strictly with all such laws and regulations and acknowledges that it has the responsibility to obtain such licenses to export, re-export or import as may be required after delivery to Licensee.
-
-This Agreement is the parties' entire agreement relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, conditions, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification to this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index f1f347a8278d..cf79d846c363 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
index 8e16f0b225ac..49455ca1ed2b 100644
--- a/lxde-base/lxterminal/Manifest
+++ b/lxde-base/lxterminal/Manifest
@@ -1,5 +1,6 @@
 DIST lxterminal-0.3.1.tar.xz 197628 BLAKE2B 9448855b6d1bfc3fc272ec40f7e5b4fde1dfcb861254db3ed35b73611fd2dc5ca5d760542251f297289a051913e6eb6d669b2c04b194e01862ff7e79305c2e14 SHA512 3063eb7bc7426293d35dc1d9c32d5841e4c3f0b417f3cfa3e5a7bf4d9b71df9c9d375d53d6dd6694b318085ba07167bd8403b2caea9c6e9197aef4b7802877fc
 DIST lxterminal-0.3.2.tar.xz 198348 BLAKE2B 7b24a138dd48bb6dc85a253b21e897e68d1a7e16a0d30aa45a87b4b97540c996b6a196d8f8be6fb37d9e506544878bd3eb65fe098d4d695be51e94b3ff15cd6b SHA512 0711d6eeed1f7e301fd24e0d5f750a48f29cc10c7cd40bcc1de57cceddfe4cb15718e9fb812da975faff24aed99cdd3978cb5f29838f47e276fce47f01577119
 EBUILD lxterminal-0.3.1.ebuild 1194 BLAKE2B 03216f78192a5966b8f30032be30c032983675883f68c479150d52ba8905a01e44b8e43a3d6c34a7859081ca06c7a73856db38224aeaad0e079bb2db412800ca SHA512 3a4971f6ebdb7f21dd30608196e400981feb4213ca5e0b0fa7d837c91151106a61ee7bca68b2d161be30885f2f1efda787eb425e94907d740e54f7e73d75c1fa
+EBUILD lxterminal-0.3.2-r1.ebuild 734 BLAKE2B b9274837b5a0f2b22fe23b6c20f9dbe792e4e5b2659ba31090b45140e093b8a80f96b6ac5d863302f19f76f38a1c3f0bf937197e78785dffd38534de77d90c2f SHA512 2797db75cef1f72cf75da51add8dbfaaefb8e621173f30337c98539414809e08d6960c6b9135fdd69c547317085d3d5eda35d4f8e63b1e3c778622b43c159b4c
 EBUILD lxterminal-0.3.2.ebuild 1192 BLAKE2B a66ee6c158dff50327392d6fe820195b53acf0f9feac2b00ba6757ca6f277ee897a072fd6a445f28045a115561cc13bbea89611a253663ddfab11b8b5362bde3 SHA512 a3fd33a10fec614b7ed343f2fc39dd609de4c83141950fad849f5257f1219b4656dea424091ad8a465fe3615ec546df3a40c97a53df66b2dc4ca66532bef7754
 MISC metadata.xml 319 BLAKE2B 95e1ebe72dc9680bad73dc167bbe202f0d5a943da478ce2beb8c4bd0f15eeae7676598ecca89b0244cdf8292441b6de29a94738b33cc4ebe07783827c6b756e1 SHA512 096769b118aac41cbdfcb9e07eea65860556df150eef61fb2e21c3354c49db5f2eb4bca67c287b217ee42bb8bf643b21b27e02c0b754e7fbbb7d493cc237b805
diff --git a/lxde-base/lxterminal/lxterminal-0.3.2-r1.ebuild b/lxde-base/lxterminal/lxterminal-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..be9747b86519
--- /dev/null
+++ b/lxde-base/lxterminal/lxterminal-0.3.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Lightweight vte-based tabbed terminal emulator for LXDE"
+HOMEPAGE="https://wiki.lxde.org/en/LXTerminal"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="gtk3"
+
+DEPEND="dev-libs/glib:2
+	!gtk3? (
+		x11-libs/gtk+:2
+		x11-libs/vte:0 )
+	gtk3? (
+		x11-libs/gtk+:3
+		x11-libs/vte:2.91 )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-man $(use_enable gtk3)
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 99ac6cc56e23..0ea63a23e967 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index fef1be54934b..3a1dcf8b3ddd 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,5 +1,7 @@
 AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05
 DIST claws-mail-3.17.6.tar.xz 6400692 BLAKE2B ce5fc914db89835a2a678e68da950d7487e8df919847f3d69baabc73012908f3853dcb274ae4c0e1a4f0f46fb38903b77fe7a2aa7e5b9169bd8eb597035d2ce5 SHA512 07fdf7fce722ee1e50aa155bca720323a58842b372d8295bed33c7245fce5790a1bd3ed7462130664a218a804ab6bd1ba3663ee3e53fbbac6a4a477dd676ede0
+DIST claws-mail-3.17.7.tar.xz 6447268 BLAKE2B 432e36e5a376622508eed2e4ba7fbc885df66b05b7f91386f8bb3cb1f96980b946362fad55848f1c0534bc079981d7e4d894ebf62d6ecaa9c60cfde709927a75 SHA512 b8089b0454c8e91a2e1fac8829e44ab01faa049f899252eb226e0b4998be4136334bba3d3efc5baff90e23e027ad928162950b4c986504d918dc628fcf9fa2ff
 EBUILD claws-mail-3.17.6-r1.ebuild 5816 BLAKE2B 4b6f0cbc4bf08564857154b8aae80efd349227ff9c20da8ecc68c7ccc8759e677801b78fdd142b929a2ba8dcddebd6b52ca75a8f16bf080807bdbf6d5642e254 SHA512 10b9a5334ad4b6f2e6c52de60821138a3427bb99ff57fb4172b7e38ec2c1d5e0c321d1b32769a4c19452254b225380308302b52f4187c9afb36454d24c475d8f
+EBUILD claws-mail-3.17.7.ebuild 5818 BLAKE2B ee17641eead61567571ba8890585a5d376015eb0194d47981c82120ea761b1b44f3058226e7f369ad6a5be13f400b93807573b51a58fc54478d0a719f782784e SHA512 4699445051a9fb983bd080e933a57d662196c5abdfa6eef685ce2f546b1bd55f428b3174a8b6afbfc32b71a103ccbe6a06faee8c7a92e9f6529efc70c698e5f9
 EBUILD claws-mail-9999.ebuild 5962 BLAKE2B 770f6e6afd334f616bb46b04868d797bfeb45e1ffb6b5f82067959e31b2661c87e85cc0bce855a165f383975c5050e7539b256576bd72bb9dfbc11970bca96d5 SHA512 8792faf220af90d010715a9971d54b82c6b08c2a5c2d105f34aed9c14620965f684b4350ff975554611f0f505f03f313d08db20f67b17544448c8e1d4302fa53
 MISC metadata.xml 1467 BLAKE2B 84d9e335170d8e84ac9da4a8e02222cab0b2454ce4044878c8f1bf7a390f7ed190633537469be424de5e2db58791636b86b7db325a971d684233919838cf97d3 SHA512 6c655572b3f4c5cfb38776118fbbe692385bc7dfa5211846a13cde6f2d2d5ab3dc05b12a9a93da1ad7c82c5963dff2773ab3dd8f32e8d1a44fa4d7834e77ded1
diff --git a/mail-client/claws-mail/claws-mail-3.17.7.ebuild b/mail-client/claws-mail/claws-mail-3.17.7.ebuild
new file mode 100644
index 000000000000..92d042602969
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.17.7.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop xdg
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="https://www.claws-mail.org/"
+
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
+else
+	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SLOT="0"
+LICENSE="GPL-3"
+
+IUSE="+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+
+REQUIRED_USE="
+	appindicator? ( notification )
+	libcanberra? ( notification )
+	libnotify? ( notification )
+	networkmanager? ( dbus )
+	smime? ( pgp )
+"
+
+COMMONDEPEND="
+	dev-libs/nettle:=
+	net-mail/ytnef
+	sys-libs/zlib:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2[jpeg]
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/libX11
+	x11-libs/pango
+	archive? (
+		app-arch/libarchive
+		>=net-misc/curl-7.9.7
+	)
+	bogofilter? ( mail-filter/bogofilter )
+	calendar? (
+		>=dev-libs/libical-2.0.0:=
+		>=net-misc/curl-7.9.7
+	)
+	dbus? (
+		>=dev-libs/dbus-glib-0.60
+		sys-apps/dbus
+	)
+	gdata? ( >=dev-libs/libgdata-0.17.2 )
+	dillo? ( www-client/dillo )
+	gnutls? ( >=net-libs/gnutls-3.0 )
+	imap? ( >=net-libs/libetpan-0.57 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	litehtml? (
+		>=dev-libs/glib-2.36:2
+		>=dev-libs/gumbo-0.10
+		net-misc/curl
+		media-libs/fontconfig
+	)
+	nls? ( >=sys-devel/gettext-0.18 )
+	nntp? ( >=net-libs/libetpan-0.57 )
+	notification? (
+		dev-libs/glib:2
+		appindicator? ( dev-libs/libindicate:3[gtk] )
+		libcanberra? (  media-libs/libcanberra[gtk] )
+		libnotify? ( x11-libs/libnotify )
+	)
+	pdf? ( app-text/poppler[cairo] )
+	pgp? ( >=app-crypt/gpgme-1.0.0 )
+	session? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	smime? ( >=app-crypt/gpgme-1.0.0 )
+	spam-report? ( >=net-misc/curl-7.9.7 )
+	spell? ( >=app-text/enchant-2.0.0:2= )
+	startup-notification? ( x11-libs/startup-notification )
+	svg? ( >=gnome-base/librsvg-2.40.5 )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${COMMONDEPEND}
+	xface? ( >=media-libs/compface-1.4 )
+"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info
+	clamav? ( app-antivirus/clamav )
+	networkmanager? ( net-misc/networkmanager )
+	pdf? ( app-text/ghostscript-gpl )
+	perl? ( dev-lang/perl:= )
+	rss? (
+		dev-libs/libxml2
+		net-misc/curl
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
+)
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	# Don't use libsoup-gnome (bug #565924)
+	export HAVE_LIBSOUP_GNOME=no
+
+	local myeconfargs=(
+		--disable-bsfilter-plugin
+		--disable-fancy-plugin
+		--disable-generic-umpc
+		--disable-jpilot #735118
+		--enable-acpi_notifier-plugin
+		--enable-address_keeper-plugin
+		--enable-alternate-addressbook
+		--enable-att_remover-plugin
+		--enable-attachwarner-plugin
+		--enable-fetchinfo-plugin
+		--enable-mailmbox-plugin
+		--enable-newmail-plugin
+		--enable-tnef_parse-plugin
+		--with-password-encryption=$(usex gnutls gnutls old)
+		$(use_enable archive archive-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable calendar vcalendar-plugin)
+		$(use_enable clamav clamd-plugin)
+		$(use_enable dbus)
+		$(use_enable debug crash-dialog)
+		$(use_enable dillo dillo-plugin)
+		$(use_enable doc manual)
+		$(use_enable gdata gdata-plugin)
+		$(use_enable gnutls)
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable litehtml litehtml_viewer-plugin)
+		$(use_enable networkmanager)
+		$(use_enable nls)
+		$(use_enable notification notification-plugin)
+		$(use_enable pdf pdf_viewer-plugin)
+		$(use_enable perl perl-plugin)
+		$(use_enable pgp pgpcore-plugin)
+		$(use_enable pgp pgpinline-plugin)
+		$(use_enable pgp pgpmime-plugin)
+		--disable-python-plugin
+		$(use_enable rss rssyl-plugin)
+		$(use_enable session libsm)
+		$(use_enable sieve managesieve-plugin)
+		$(use_enable smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable spell enchant)
+		$(use_enable startup-notification)
+		$(use_enable svg)
+		$(use_enable valgrind valgrind)
+		$(use_enable xface compface)
+	)
+
+	# libetpan is needed if user wants nntp or imap functionality
+	if use imap || use nntp ; then
+		myeconfargs+=( --enable-libetpan )
+	else
+		myeconfargs+=( --disable-libetpan )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+	default
+
+	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+	# => also install it in /usr/share/pixmaps for other desktop envs
+	# => also install higher resolution icons in /usr/share/icons/hicolor/...
+	insinto /usr/share/pixmaps
+	doins ${PN}.png
+	local size
+	for size in 64 128 ; do
+		newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
+	done
+
+	docinto tools
+	dodoc tools/README*
+
+	domenu ${PN}.desktop
+
+	einfo "Installing extra tools"
+	cd "${S}"/tools || die
+	exeinto /usr/$(get_libdir)/${PN}/tools
+	doexe *.pl *.py *.conf *.sh
+	doexe tb2claws-mail update-po uudec uuooffice
+
+	# kill useless files
+	rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_postinst() {
+	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+	ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely"
+	xdg_pkg_postinst
+}
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 31f55f1700f4..10f1a040dd13 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,8 +1,10 @@
 DIST neomutt-20200626.tar.gz 3349377 BLAKE2B 4fd75c2e8e8b3d55a63f954cb261c3930f871141c73d3fb8d2f42422735f3f862bae6966249187632aa2d55acb0372cd150381e11ce936cfef9976c71e43eb67 SHA512 f4ffc958bdd02107b2dd11bf321483a6e1e73a67e0540d034ab26f9eb13930ad80299b11f79acaedb4262f8f8643f9ce4baa388bc7f901b9ae35e9650acdcc9e
 DIST neomutt-20200821.tar.gz 3404856 BLAKE2B db15997c89135680dcef7c6108ca1c2e120eade4a1e915f02de6f81758fed2a360f905e3dbe79f4ebfc17e86c3476d4823f227f5752a5558de13dde2cde6308a SHA512 f7cba9123613c34711b84ab9f5ccab840be38876da20b29d281c142a3b4f5d582b879d727c95232b0fcc7b41947d05bf89707232d3980e160bcdba68784d6eef
+DIST neomutt-20200925.tar.gz 3440056 BLAKE2B 6f9858a02bdfc8a947ba1a26557e1b5c0ec027845e67a15b6811853e5b8820b9a27419ced4eaa407ca9b32efcd53d7cf878c44c0a54a277018aef36127c49e59 SHA512 1ee89ee1b3581fe2b7dafd091e315fcf4d6f7b0644c15b08af8eb2720e83f07ae526b5659abb44430309821f48013fc85af0dd6f140729b2e52e5f874cf3bc50
 DIST neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz 3673 BLAKE2B 50354f19aedc5fc07d59ecb5b38fa65de16119bc0929f47014bd35dab4d3a4e5953c8b35670f3440003cf0cbccc2d0d2b3a869dc929cdc3cd60b02790270fb54 SHA512 3d4962210bc558234d818801dcaa7851a0aef011c96d91c054af535186ffda42059fc61fb148c48e1b076999fe3159b31589a69a29ed1897f8928f52fcc157d3
 EBUILD neomutt-20200626-r1.ebuild 3933 BLAKE2B 0e592f8efb86fe2dbbd2d5ff0b6781ba7e3a5139d45763927b9823b7e5ef39fe3a9c8ce334f2f172541db08cd4fa8fea5166eb87bdfee58e6ad74c95ba0ce398 SHA512 fa67b72be4a08472c353c1f78c687b81421779bb774705851cb62fb3ed10ecaeff1a2922266cd6de5ea156bc0bc4c78fa32ad2beef4889684d14465bed3c649f
 EBUILD neomutt-20200626.ebuild 3296 BLAKE2B 596daf041ca8dc467da3c6443fe5d4ba8253edcb41bd8e1af24c04e55de9503d185adf25ab9eeb793841b2cdac2092cc51a5631057472d5a5f00bcd0539d9198 SHA512 14b9243ed976ccf7fa0d97f7ca5d9eadefcd17f8e178ec1054d5fb2cc3808367cb142785d945e1358c38de4761ab6ded6cb44711c36635cc3f0f59c71637f295
 EBUILD neomutt-20200821.ebuild 3933 BLAKE2B 0e592f8efb86fe2dbbd2d5ff0b6781ba7e3a5139d45763927b9823b7e5ef39fe3a9c8ce334f2f172541db08cd4fa8fea5166eb87bdfee58e6ad74c95ba0ce398 SHA512 fa67b72be4a08472c353c1f78c687b81421779bb774705851cb62fb3ed10ecaeff1a2922266cd6de5ea156bc0bc4c78fa32ad2beef4889684d14465bed3c649f
-EBUILD neomutt-99999999.ebuild 3315 BLAKE2B e57c78ae79931ca8f0f1945a05b5407482ad8f65713ea42d40a7eb714b0208a5ed52ff33c2e499b4718605cef9481661b4b971ba6c2dc706523fb28effd2c893 SHA512 4f2bd716ebfd892cd06f36dba6fff6ec619419774919154d46d6801b5335a88c91c4dfc3e07cc189695d3715408df2de86bcde0d54931fee2eba774833a1ef65
+EBUILD neomutt-20200925.ebuild 3933 BLAKE2B 0e592f8efb86fe2dbbd2d5ff0b6781ba7e3a5139d45763927b9823b7e5ef39fe3a9c8ce334f2f172541db08cd4fa8fea5166eb87bdfee58e6ad74c95ba0ce398 SHA512 fa67b72be4a08472c353c1f78c687b81421779bb774705851cb62fb3ed10ecaeff1a2922266cd6de5ea156bc0bc4c78fa32ad2beef4889684d14465bed3c649f
+EBUILD neomutt-99999999.ebuild 3933 BLAKE2B 0e592f8efb86fe2dbbd2d5ff0b6781ba7e3a5139d45763927b9823b7e5ef39fe3a9c8ce334f2f172541db08cd4fa8fea5166eb87bdfee58e6ad74c95ba0ce398 SHA512 fa67b72be4a08472c353c1f78c687b81421779bb774705851cb62fb3ed10ecaeff1a2922266cd6de5ea156bc0bc4c78fa32ad2beef4889684d14465bed3c649f
 MISC metadata.xml 1207 BLAKE2B e0ccd3e85c801540e7bd6d589b27b0a20b22e1fff2ab8621cf3a28349c8fc501c6fa1d79d9151bb150607c813932f884bc183a98e1a807d157b7a68c0ef11f37 SHA512 321d64d899999f43dec107bb12933453290035810f0c009f4e5dc680963a92da6ce7d8f6ede96cdc85c97c628f80ce061167db5990bff97420e4b768fde4fe8b
diff --git a/mail-client/neomutt/neomutt-20200925.ebuild b/mail-client/neomutt/neomutt-20200925.ebuild
new file mode 100644
index 000000000000..d45bb5419716
--- /dev/null
+++ b/mail-client/neomutt/neomutt-20200925.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+if [[ ${PV} =~ 99999999$ ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neomutt/neomutt.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/neomutt-${P}"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
+SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )"
+
+DESCRIPTION="A small but very powerful text-based mail client"
+HOMEPAGE="https://neomutt.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
+	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
+	ssl tokyocabinet test"
+
+CDEPEND="
+	app-misc/mime-types
+	berkdb? (
+		|| (
+			sys-libs/db:6.2
+			sys-libs/db:5.3
+			sys-libs/db:4.8
+		)
+		<sys-libs/db-6.3:=
+	)
+	gdbm? ( sys-libs/gdbm:= )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	lmdb? ( dev-db/lmdb:= )
+	nls? ( virtual/libintl )
+	qdbm? ( dev-db/qdbm )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	gnutls? ( >=net-libs/gnutls-1.0.17:= )
+	gpgme? ( >=app-crypt/gpgme-0.9.0:= )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( virtual/krb5 )
+	notmuch? ( net-mail/notmuch:= )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	!slang? ( sys-libs/ncurses:0= )
+	slang? ( sys-libs/slang )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.2u:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${CDEPEND}
+	dev-lang/tcl:=
+	net-mail/mailbase
+	doc? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+		|| (
+			www-client/lynx
+			www-client/w3m
+			www-client/elinks
+		)
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mutt )
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local myconf=(
+		"$(usex doc --full-doc --disable-doc)"
+		"$(use_enable nls)"
+		"$(use_enable notmuch)"
+
+		"$(use_enable gpgme)"
+		"$(use_enable pgp-classic pgp)"
+		"$(use_enable smime-classic smime)"
+
+		# Database backends.
+		"$(use_enable berkdb bdb)"
+		"$(use_enable gdbm)"
+		"$(use_enable kyotocabinet)"
+		"$(use_enable qdbm)"
+		"$(use_enable tokyocabinet)"
+
+		"$(use_enable idn)"
+		"$(use_enable kerberos gss)"
+		"$(use_enable lmdb)"
+		"$(use_enable sasl)"
+		"--with-ui=$(usex slang slang ncurses)"
+		"--sysconfdir=${EPREFIX}/etc/${PN}"
+		"$(use_enable ssl)"
+		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
+	)
+
+	econf CCACHE=none "${myconf[@]}"
+}
+
+src_test() {
+	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	pushd ${test_dir} || die "Could not cd into test_dir"
+	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
+		|| die "Failed to run the setup.sh script"
+	popd || die "Could not cd back"
+	NEOMUTT_TEST_DIR="${test_dir}" emake test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# A man-page is always handy, so fake one - here neomuttrc.5 (neomutt.1
+	# already exists)
+	if use !doc; then
+		sed -n \
+			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
+			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
+			Makefile > docs/Makefile.fakedoc || die
+		sed -n \
+			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
+			-e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			docs/Makefile.autosetup >> docs/Makefile.fakedoc || die
+		emake -f docs/Makefile.fakedoc docs/neomutt.1
+		emake -f docs/Makefile.fakedoc docs/neomuttrc.5
+		doman docs/neomutt.1 docs/neomuttrc.5
+	fi
+
+	dodoc LICENSE* ChangeLog* README*
+}
+
+pkg_postinst() {
+	if use gpgme && ( use pgp-classic || use smime-classic ); then
+		ewarn "  Note that gpgme (old gpg) includes both pgp and smime"
+		ewarn "  support.  You can probably remove pgp-classic (old crypt)"
+		ewarn "  and smime-classic (old smime) from your USE-flags and"
+		ewarn "  only enable gpgme."
+	fi
+}
diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index 7cfa7fbe26de..d45bb5419716 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils flag-o-matic
+inherit eutils
 
 if [[ ${PV} =~ 99999999$ ]]; then
 	inherit git-r3
@@ -14,6 +14,9 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
+TEST_FILES_COMMIT=8629adab700a75c54e8e28bf05ad092503a98f75
+SRC_URI+=" test? ( https://github.com/${PN}/neomutt-test-files/archive/${TEST_FILES_COMMIT}.tar.gz -> neomutt-test-files-${TEST_FILES_COMMIT}.tar.gz )"
+
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="https://neomutt.org/"
 
@@ -21,7 +24,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl
 	lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic
-	ssl tokyocabinet"
+	ssl tokyocabinet test"
 
 CDEPEND="
 	app-misc/mime-types
@@ -33,39 +36,44 @@ CDEPEND="
 		)
 		<sys-libs/db-6.3:=
 	)
-	gdbm? ( sys-libs/gdbm )
+	gdbm? ( sys-libs/gdbm:= )
 	kyotocabinet? ( dev-db/kyotocabinet )
-	lmdb? ( dev-db/lmdb )
+	lmdb? ( dev-db/lmdb:= )
 	nls? ( virtual/libintl )
 	qdbm? ( dev-db/qdbm )
 	tokyocabinet? ( dev-db/tokyocabinet )
-	gnutls? ( >=net-libs/gnutls-1.0.17 )
-	gpgme? ( >=app-crypt/gpgme-0.9.0 )
+	gnutls? ( >=net-libs/gnutls-1.0.17:= )
+	gpgme? ( >=app-crypt/gpgme-0.9.0:= )
 	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
-	notmuch? ( net-mail/notmuch )
+	notmuch? ( net-mail/notmuch:= )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	!slang? ( sys-libs/ncurses:0 )
+	!slang? ( sys-libs/ncurses:0= )
 	slang? ( sys-libs/slang )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( >=dev-libs/openssl-1.0.2u:0= )
+		libressl? ( dev-libs/libressl:= )
 	)
 "
 DEPEND="${CDEPEND}
-	dev-lang/tcl
+	dev-lang/tcl:=
 	net-mail/mailbase
 	doc? (
 		dev-libs/libxml2
 		dev-libs/libxslt
 		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
+		|| (
+			www-client/lynx
+			www-client/w3m
+			www-client/elinks
+		)
+	)
+"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-mutt )
 "
 
-S="${WORKDIR}/${PN}-${P}"
+RESTRICT="!test? ( test )"
 
 src_configure() {
 	local myconf=(
@@ -92,29 +100,40 @@ src_configure() {
 		"--sysconfdir=${EPREFIX}/etc/${PN}"
 		"$(use_enable ssl)"
 		"$(use_enable gnutls)"
+
+		"$(usex test --testing --disable-testing)"
 	)
 
 	econf CCACHE=none "${myconf[@]}"
 }
 
+src_test() {
+	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	pushd ${test_dir} || die "Could not cd into test_dir"
+	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
+		|| die "Failed to run the setup.sh script"
+	popd || die "Could not cd back"
+	NEOMUTT_TEST_DIR="${test_dir}" emake test
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 
-	# A man-page is always handy, so fake one – here neomuttrc.5
-	# (neomutt.1 already exists)
+	# A man-page is always handy, so fake one - here neomuttrc.5 (neomutt.1
+	# already exists)
 	if use !doc; then
 		sed -n \
 			-e '/^\(CC_FOR_BUILD\|CFLAGS_FOR_BUILD\)\s*=/p' \
 			-e '/^\(EXTRA_CFLAGS_FOR_BUILD\|LDFLAGS_FOR_BUILD\)\s*=/p' \
 			-e '/^\(EXEEXT\|SRCDIR\)\s*=/p' \
-			Makefile > doc/Makefile.fakedoc || die
+			Makefile > docs/Makefile.fakedoc || die
 		sed -n \
 			-e '/^MAKEDOC_CPP\s*=/,/^\s*$/p' \
-			-e '/^doc\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
-			doc/Makefile.autosetup >> doc/Makefile.fakedoc || die
-		emake -f doc/Makefile.fakedoc doc/neomutt.1
-		emake -f doc/Makefile.fakedoc doc/neomuttrc.5
-		doman doc/neomutt.1 doc/neomuttrc.5
+			-e '/^docs\/\(makedoc$(EXEEXT)\|neomutt\.1\|neomuttrc\.5\)\s*:/,/^\s*$/p' \
+			docs/Makefile.autosetup >> docs/Makefile.fakedoc || die
+		emake -f docs/Makefile.fakedoc docs/neomutt.1
+		emake -f docs/Makefile.fakedoc docs/neomuttrc.5
+		doman docs/neomutt.1 docs/neomuttrc.5
 	fi
 
 	dodoc LICENSE* ChangeLog* README*
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 4ac7f75e783d..63378361c002 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 51e5a21de2dc..d093bc53fd68 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -6,5 +6,5 @@ AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8
 DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748
 DIST opendmarc-1.3.3.tar.gz 575319 BLAKE2B 72dae5553fea9a51d860aaac6d85171a245584a74134df2249217a88f3da04c4eb518141f6342e281c6a9186345d69a34b585dc3ed18bdb53313374db505f4f5 SHA512 bb4bf8e3ad2d1732b07e55316819d4fd708e529b54a336d7d00763e13bfc62580bb1b30f132fa786dbca15e526e8dd5e146c7be454e1c42714a9f57126fc5e12
 EBUILD opendmarc-1.3.2-r3.ebuild 1610 BLAKE2B 78304b8b07399155f72cbbac51e47cecad9459e862425c5d0beb01a1ce5ec02791abaaaf87d674200c3dacb7069f1443959811a7ac6dd1a113f121b087f9dfeb SHA512 6a6e5125d8447a73c28478764f793af9a0052a4142e51773904275857f77384e8f4c4f07e04045b94e704d397ddd6d8d787fea9d1415c28d0110efb9052e6486
-EBUILD opendmarc-1.3.3.ebuild 1893 BLAKE2B db1915b074793c7973ff39eaef0f198e21f91077c5d58a190d9135938973eaf94b9684051f31c25d048b5ba1a6ea511b4f5ca41845a1dd59001b96737270b82b SHA512 2c6913cf6f83da9dc84d86f83510bb166f05a7aa4b1989e36a0365b1683420845d8eb99bd75092fc83471c28da41b43aa4f2dfbb8da570c80fa1b4bcbee2c9c6
+EBUILD opendmarc-1.3.3.ebuild 1891 BLAKE2B ed9948f4989c523fc849586f624321c8eae1463190b9828449abbaaf6b351d98abb04b6ec71b3f1676cc74d1dc680182e89b965dc436284e9698b8c34e66e531 SHA512 321b9226ff66f6be18bf2e5e6b7e682f16ed88652a81f989f13d3ad71fae87d376d84bbc1234ee82718b15234002a4bcff4df0eabe7e574f556ae7d6e94d95a0
 MISC metadata.xml 512 BLAKE2B e837ed3fdef4432f4a6e208b57942ac6b74de558ad20fa978ce046d49147b4225720506c7191a07eeceeb85d6773d3f6d2ae5ca62c08fddb7126061bcfd46fdb SHA512 33b5347b487959b6412dd8a9e7babf0cedac3dd27eb6397dfc226de5d34b70c7e67e9b30dae231bdf743e4c18ffd2cfcd6df1af450e201cafa3c5105d5a889f0
diff --git a/mail-filter/opendmarc/opendmarc-1.3.3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.3.ebuild
index c572a891d2eb..ea4968372a6c 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${PN}-${P
 
 LICENSE="BSD"
 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="spf +reports static-libs"
 
 DEPEND="reports? ( dev-perl/DBI )
diff --git a/mail-filter/postgrey/Manifest b/mail-filter/postgrey/Manifest
index 3d9969a58ffc..180a866dd058 100644
--- a/mail-filter/postgrey/Manifest
+++ b/mail-filter/postgrey/Manifest
@@ -3,12 +3,8 @@ AUX postgrey-1.34-r3.rc.new 2373 BLAKE2B 6f7a1197735b710fbb23fd49acb1fc9a9b743e7
 AUX postgrey.conf.new 1914 BLAKE2B 826949afe4a8a7bbfe9dec493fd619b91235945420bbd5e4c70709aff23a7393277c88edac1b1f149ea34b4fdfce4649715a97b38052d3e2c360716439bf6489 SHA512 07c7bf82fa24486a62701238bc3684e7ed445bceeb54c842eba39b0d83732b704954247978784142ecf20329352dbe698ba2d9a76576d5082315a314278a6740
 AUX postgrey.service 345 BLAKE2B 4ca6ab7a5649ea49fe69128b64111113301ab891f3de9f2d433e40eca14d178dcb992f70802cc73d003e7903fc3edcb53242c656b9208fdd0aaef2562577d522 SHA512 f5f92cae916a8000da460c0c5bd2194b49518cf2bdadf7f6c4512a29dbee73b4a75d530ed0d2049ac46103235246b5b3b88e55216c9ed1a012ed306a4bf7d58c
 AUX targrey-0.31-postgrey-1.34.patch 8555 BLAKE2B 5957c9ea2fa62554bb45ecad71712f5a5c7c655a132434fe6520335a07f2ad5475cd45fe592c8769f44df03f951ee6bfffa1aad2c331aa393ea20b64fe783d96 SHA512 af4433f08120ae6ab07179f1adb88ca8c86c142b68727657555cef04d84105912e8e67c969c860ea000930196c6046b7b2bef2647f04b202ceecaf163d8515d5
-DIST postgrey-1.34.tar.gz 36399 BLAKE2B 45ec66c06a68813d61b5e31e8547441d4947a7c29102a4f8904ecbb8794e5f853cd753389c5daf6f4e5319e5334af05952eb67628be9b2dbf82903df6bc531b2 SHA512 df6cf0c3bf6835591aad00bde13330ee4030b965c90a01a27dfafb5eac1f008dcfb9001dbfcf70a6209b91af7a571b38392b69db2212f112d888a565e9b703cb
-DIST postgrey-1.35.tar.gz 36610 BLAKE2B e5c5113590d43a7b4d117fdc7127e9f7a7f4abc4b73564c673062340997ae82502befcfa58122c9cec6abf9ef25c30996b362d72bfb730cba8b8f982e54fac13 SHA512 fa9844f6ca7395c02cbc1f234d0efbeafb80ebbebc763966d375bb32e7768d9c987d8c95d1e8dc9da933832feb9948b4086cf5a31f24d3764e9678333abe6c8f
 DIST postgrey-1.36.tar.gz 38797 BLAKE2B b8e4dedb28ababc92cdd1d128652a468caeb55eb611ca019148a2e538d3cc0d397cd14889942904b05c9471bb13ed9fa6250e399d47df22241895c109a68315d SHA512 9b2502b873658c1ef8a86bff091d61b8dc8d66f7395bc0a869f9e6ec60b691a317c084ae326f49ce8dd926f0fa2620a58f3ad76c25e1b1c9606557d2802d1395
 DIST postgrey-1.37.tar.gz 41815 BLAKE2B dd8a1f62f56a614c25863afde089f1882a1567e3a53a24b1d12b6f23994388caf99059f05775853065143f4f953a6fd964625d5c865993e0e679dd545b848c11 SHA512 369968212ea60539efc0d4a7ae84f7c3ce13f5622e6ee070a0089423ef81ca8f7541ebd20289291d0e6a3aec2ca30dbc9c0d9c0a6f0a686adfadb5d0dd7830ca
-EBUILD postgrey-1.34-r3.ebuild 1662 BLAKE2B 5b4fa9b4cee94b1afd1112e95205d233bc16ed7e4788ede092b289a501065a203e418ea239d3cd01ebbd72bd63ff21921675450927e85f6852736e2951dcd676 SHA512 3ddb2f66e443f1bf43ffa991f7575c523229589949080d4b37a58f918de73519f9b8d4795533c586dab2029e812c6b67722422ae0def0463c5f0c5a6e6a3b299
-EBUILD postgrey-1.35-r2.ebuild 1722 BLAKE2B 80ba3bd56cbffd84ab7f914c0e919e6148849b76827d490c34c25828fd3649ddd9ac370e4bdcbe5695e674a5acf1b9a9bf68f729f9f79f38c47296f4ca1fab51 SHA512 df2d67554038f1eb9d617dcaaca38bb0a738cdb55b6ab5b2c71cba768edf19d3f96a5974c376de52e3cff890eb03af1a90e01976c7d72b87ba8da6ae4a65868f
 EBUILD postgrey-1.36-r1.ebuild 1748 BLAKE2B 17fa8ad75a46cac8658b70666b16427405282799ce1d2528677fefb573c0e8638d68075b7dc6401ebd5722639404a970f1644e0fe7bb1afb6a81bf6af00a6ba6 SHA512 0ea4a73933a11d84894bc8a286193a3b1d71f2ecf5ac2513e9c3cf18364479485519839d09fed3a15152a1208c9dd908695c853a2a17a003b295f9842bbf99bb
 EBUILD postgrey-1.37.ebuild 1662 BLAKE2B b4f70a90e59b28635840c222dc6fb6d7a9008705649db3ed50445ed1c19b0c15be49d5574547197a82ada5242115f4c358e8245b27dc1c18073b119eef6d20a6 SHA512 17512115c889bceccc2a8fd09ffc8aa5815b37256b473a7f794c42f4fd561dc625e7d72f6f67b9a1abe2b89a6a14e0f51ecec913029ea7fd12e1fdca8d707790
 MISC metadata.xml 582 BLAKE2B 68f063bb59cf9526167905dc77294f8c5da400bf2a128dab804f2286c594db84c397f98233fe4428842f0191d495c776b299bd6ab8fc9c3fda509df7c80f3611 SHA512 0b40a89f66f637c4086475a4808771e967063ad6841a7b23174ce2a2adc7c3bc25ce683a37d18c6935f9d2f4ef081cac0c465270484bc15cbe552fd2a3160e01
diff --git a/mail-filter/postgrey/postgrey-1.34-r3.ebuild b/mail-filter/postgrey/postgrey-1.34-r3.ebuild
deleted file mode 100644
index f39af79c82e5..000000000000
--- a/mail-filter/postgrey/postgrey-1.34-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting"
-HOMEPAGE="http://postgrey.schweikert.ch/"
-SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz
-	http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ppc64 x86"
-IUSE="targrey"
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5.6.0
-	dev-perl/Net-Server
-	dev-perl/IO-Multiplex
-	dev-perl/BerkeleyDB
-	dev-perl/Net-DNS
-	dev-perl/Parse-Syslog
-	dev-perl/Net-RBLClient
-	>=sys-libs/db-4.1"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_prepare() {
-	if use targrey ; then
-		epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch
-	fi
-	epatch "${FILESDIR}"/${P}-perl-5.18.patch
-	# bug 479400
-	sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed"
-}
-
-src_install() {
-	# postgrey data/DB in /var
-	diropts -m0770 -o ${PN} -g ${PN}
-	dodir /var/spool/postfix/${PN}
-	keepdir /var/spool/postfix/${PN}
-	fowners postgrey:postgrey /var/spool/postfix/${PN}
-	fperms 0770 /var/spool/postfix/${PN}
-
-	# postgrey binary
-	dosbin ${PN}
-	dosbin contrib/postgreyreport
-
-	# policy-test script
-	dosbin policy-test
-
-	# postgrey data in /etc/postfix
-	insinto /etc/postfix
-	insopts -o root -g ${PN} -m 0640
-	doins postgrey_whitelist_clients postgrey_whitelist_recipients
-
-	# documentation
-	dodoc Changes README
-
-	# init.d + conf.d files
-	insopts -o root -g root -m 755
-	newinitd "${FILESDIR}"/${PF}.rc.new ${PN}
-	insopts -o root -g root -m 640
-	newconfd "${FILESDIR}"/${PN}.conf.new ${PN}
-}
diff --git a/mail-filter/postgrey/postgrey-1.35-r2.ebuild b/mail-filter/postgrey/postgrey-1.35-r2.ebuild
deleted file mode 100644
index e96a63720ea3..000000000000
--- a/mail-filter/postgrey/postgrey-1.35-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd user
-
-DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting"
-HOMEPAGE="http://postgrey.schweikert.ch/"
-SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz
-http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="targrey"
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5.6.0
-	dev-perl/Net-Server
-	dev-perl/IO-Multiplex
-	dev-perl/BerkeleyDB
-	dev-perl/Net-DNS
-	dev-perl/Parse-Syslog
-	dev-perl/Net-RBLClient
-	virtual/perl-Digest-SHA
-	>=sys-libs/db-4.1"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_prepare() {
-	if use targrey ; then
-		epatch "${FILESDIR}"/targrey-0.31-postgrey-1.34.patch
-	fi
-	# bug 479400
-	sed -i 's@#!/usr/bin/perl -T -w@#!/usr/bin/perl -w@' postgrey || die "sed failed"
-}
-
-src_install() {
-	# postgrey data/DB in /var
-	diropts -m0770 -o ${PN} -g ${PN}
-	dodir /var/spool/postfix/${PN}
-	keepdir /var/spool/postfix/${PN}
-	fowners postgrey:postgrey /var/spool/postfix/${PN}
-	fperms 0770 /var/spool/postfix/${PN}
-
-	# postgrey binary
-	dosbin ${PN}
-	dosbin contrib/postgreyreport
-
-	# policy-test script
-	dosbin policy-test
-
-	# postgrey data in /etc/postfix
-	insinto /etc/postfix
-	insopts -o root -g ${PN} -m 0640
-	doins postgrey_whitelist_clients postgrey_whitelist_recipients
-
-	# documentation
-	dodoc Changes README README.exim
-
-	# init.d + conf.d files
-	insopts -o root -g root -m 755
-	newinitd "${FILESDIR}"/${PN}-1.34-r3.rc.new ${PN}
-	insopts -o root -g root -m 640
-	newconfd "${FILESDIR}"/${PN}.conf.new ${PN}
-	systemd_dounit "${FILESDIR}"/postgrey.service
-}
diff --git a/mail-filter/postsrsd/Manifest b/mail-filter/postsrsd/Manifest
index ca09d27f577a..2479dc701410 100644
--- a/mail-filter/postsrsd/Manifest
+++ b/mail-filter/postsrsd/Manifest
@@ -1,8 +1,5 @@
 AUX postsrsd.init 737 BLAKE2B 76342c7707e86c8d111e550393ce2e624c2ed192e16a4521cf6b14deb81a21d2bc8be9ca1027890dd0dc883cadf6659fedd17b417d0712e55e38781f5ec8cffe SHA512 9550e26ddee4eec5b324bc6364b52ea8ebf755c1463498ab7380aac87e79d1a84e2048ef0bfdd250d029674d5050bab1bb5d1cec455ec5d4863e08d320e06111
 AUX postsrsd.init-r1 787 BLAKE2B 6d5431bb32974dc88ace86d2781681fdc9058475569080d057cb0336f337b8ccb3bd63f12344829085e5ba7399569dc951a820e6bdb8c5e0cecba718bfa19774 SHA512 dd80b6be1e2c28ddd7ff48ac761ce15b46d01db58aa91ddaa29db63acec5c071a52c055b9ecf8839f04696765a937dfcd2532be4a99fe2cf04bd881a7bd5acc2
-DIST postsrsd-1.4.tar.gz 26555 BLAKE2B acdfb3c8a1ca5172ac7727913ad6c1f9cf0450996aaf3cbc4905b89e02de5917de2d6e7674819299bd456232547fdc0496be06c5cd0531fd703622edfaf9a9df SHA512 e5b9d2091d562030dd8d35117a3c5fb7d99c0613120fc90f74be57af5e88a3fe0ce73a5ce702708047ae37f70c6aedb4a0df018dccbe480048ccb6ed4debbcef
 DIST postsrsd-1.6.tar.gz 32111 BLAKE2B 5b4e562aa9c9b5faf0e45c035a71d76dc2b6e9b3d4399108f06e6d0ad3e4f7abfcb8c18c818f3b4787bab155bf7895caaf127a97b861b26525ad5a27f2ee4dc7 SHA512 b2df4cdec41361e15cd8c9207fb16564d607559bcb36dd73c9347b90e4f3c2414b88434ef1ffe6a18783f38c5960383516e40e4ffa28802a03539e52ca723aa1
-EBUILD postsrsd-1.4-r1.ebuild 550 BLAKE2B fe9d47ec65943344ceaa1000fbda08367aa3f17febdca670f7ce8d4f768ac9469f4e7bbed9b71fe5bb02a555ff7bff6a00a2b0bc7c467050c4b828708a3fb91d SHA512 9e395c93a416b5cc81cd5295d287f871c225ec3bb49445b94e34ddfe9bd768bccacfe8189015e3e9d53092c615b90f8287e9afae69dd9f516cf16197570437d6
-EBUILD postsrsd-1.4.ebuild 547 BLAKE2B c74dc06204c8e865fbda696ec43c14adc5f57e0a942435b0a1bafc0f5836ea51e70eb0b51a87bd7f98e3239b816069ba015ccf1fd5493b41333e81e75f8499b3 SHA512 3e3c21cc922a540d5bc4af336678588f463afaca5109e4ba977d042e7ac6010f8f4b1f9fe10cbabbbc81ce9b3f28dc5f368887186315c6e343e5d4846501ea4c
 EBUILD postsrsd-1.6.ebuild 771 BLAKE2B 63cdc5cc1f67a499b8c96a27c788f0fb565834184100268afa722d46a91e534257c6a24c1b28c2f7fa3201ff40500a1a7ca14e8ecd96262cb6e8dc73d0c58ce9 SHA512 90f45343c349513fbcbb4af3fc8b1cc19be465e53dda7dd086758fd28bca469db30d30b3f980c8aa3fe2c1a384397310846357f5c8ab26b9fc9aa976de9dc461
 MISC metadata.xml 337 BLAKE2B caac016ab1be7bad01670321e5aae7cf8c3699a394f4911350b4104d313e5b921071cb3406a47f976f16d1fc6879a16b2d6be03e0765a02f0e1e65de5703df0f SHA512 9093270e1a174ca6c5e1316015b3e9605f247bcd4fccf1e1c9595f5b94e3e182e532dced5c483a0be24c053fd453a5b9ba272c1004fbc54fe95cc3069dfe7d59
diff --git a/mail-filter/postsrsd/postsrsd-1.4-r1.ebuild b/mail-filter/postsrsd/postsrsd-1.4-r1.ebuild
deleted file mode 100644
index 4c6c522fe9bb..000000000000
--- a/mail-filter/postsrsd/postsrsd-1.4-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils user
-
-DESCRIPTION="Postfix Sender Rewriting Scheme daemon"
-SRC_URI="https://github.com/roehling/postsrsd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/roehling/postsrsd"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/postsrsd.init-r1" postsrsd
-	newconfd "${BUILD_DIR}/postsrsd.default" postsrsd
-}
diff --git a/mail-filter/postsrsd/postsrsd-1.4.ebuild b/mail-filter/postsrsd/postsrsd-1.4.ebuild
deleted file mode 100644
index 7bfc490021f9..000000000000
--- a/mail-filter/postsrsd/postsrsd-1.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils user
-
-DESCRIPTION="Postfix Sender Rewriting Scheme daemon"
-SRC_URI="https://github.com/roehling/postsrsd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/roehling/postsrsd"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	cmake-utils_src_install
-	newinitd "${FILESDIR}/postsrsd.init" postsrsd
-	newconfd "${BUILD_DIR}/postsrsd.default" postsrsd
-}
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index 1e01f3763ef4..fa8ce404a31f 100644
--- a/mail-filter/pyzor/Manifest
+++ b/mail-filter/pyzor/Manifest
@@ -3,5 +3,5 @@ AUX unfix-configparser-compat-for-2to3.patch 1210 BLAKE2B 1ad8b2528cbf723d46d18c
 DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a
 DIST pyzor-1.0.0_p20200523.tar.gz 138077 BLAKE2B 13ad30f06ce32a24a42dd5aaa21ad2a6700df1bac3dc54a86532748688b094ee0f56a8e28e34336298388c6e0b95868e95d040866c9afa561d867069496608fe SHA512 afe3b14794aea68b1a7d72840257976c7c9f755a6f6dcaaf6ebacab465c176fe2aa84f3fe176006cdbe26ef0b07ed949f75f6ef729f65c604fadf6ce8472da8f
 EBUILD pyzor-1.0.0-r1.ebuild 2015 BLAKE2B bcbd30619b39d43b93ce6445cf986bff42dd1e7d4d1afd1f0c24aea1dc7a456de2840280c5455cacca55c90fdec80ca61fc36091676a800cf3a61b20fe975d88 SHA512 e2a0e1cb9be39ce9f3c1e44ee6de79ecb62d1ac66fd32e75c0b340ffaa5de842f945203fb58fb5723ebb8c12392d07567971d37fcbd744afa92d9e89dc2e8466
-EBUILD pyzor-1.0.0_p20200523.ebuild 1567 BLAKE2B 37d2d4ee4f7d92ab8d8ace453a47d3affbc5df605bb02a224477582e1528c680e1ad152864bdb94871ac060b412cb277f0833081d9989bec907a780d2842915d SHA512 50a3e3d772a64ad9e3f3740717694d93b2c3eba258860dbedcae83225e44a9a5961c53ae2b7b5fd66eb06fd8bb9726674ec8a6257bb578fe764df894c71728b2
+EBUILD pyzor-1.0.0_p20200523.ebuild 1566 BLAKE2B 3d2e65e56e735c2c6bf1eb02cb62f16c05f64e9d58fd10fb0da3e9f925a891a4bf795d36cf3d8d93d6746195029836ec2f475127750946ee6b53b3e3ca32fb7b SHA512 541dbf949a7477299d70026427b2010f6fa3a98c93381d10bdb34297c8e244cea582841a0bb14386af90da407e80489279088ce491899e13505080c914c151fd
 MISC metadata.xml 953 BLAKE2B fe7e5e35caa89645a565b81176783dd56302b60be89423f4dd882f14ec6b437daaacdeb1c253440eb67dc7f9dbc5daa9c838bb39ccea2e38b2eb48817c28a559 SHA512 ab71adbb406760237a26728a512f32a10e3e55d17bed7c09d37e7da32abe21dcce9d4506630c7a59e681e4096ee4c436e8edcf220e22038d45a6b755e123acea
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
index 243f4943c4bb..67282d845663 100644
--- a/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
+++ b/mail-filter/pyzor/pyzor-1.0.0_p20200523.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/SpamExperts/pyzor/archive/${COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc gdbm gevent mysql pyzord redis test"
 RESTRICT="!test? ( test )"
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 35bd42a60220..ca0b90506c39 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 3a2349009530..6f8f741cd0ea 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -4,12 +4,10 @@ AUX postfix.rc6.2.7 2107 BLAKE2B 291d9e02ffdac79a1c7c64febc5674321e675de341b468b
 AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d38f195227190b73cf0fb41cd68a86e97cfe844cc7f9f095cba0a17afe9ce7c8697e0aa30f5faecde6 SHA512 04b475040b153f488a9358567ff9ee2eb8f263c619dadc23c837d17c19106041296e3652bcaded2be0c7c8b9eee7fd5f2ad55bed3e7f9b3a4bf9655f4762d563
 AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
-DIST postfix-3.5.1.tar.gz 4609587 BLAKE2B 94b06ed536417ca72729d93f03d4fa2dce602508e4c5816ad902740d4203ad3df66d7380ea41859ab75ab327c0f53bc2bbaf09ba45fe83490d02808426a6253d SHA512 9c091cda6c2d54fefc7093736f69dc60dc4d9d2d858260bde1430427bc49caa59f81aea7a992b9764998a4edaaa015ddd50392b8f0a1bccd15f52b563887a698
 DIST postfix-3.5.6.tar.gz 4613310 BLAKE2B b7d236677cc698bb7028b39a25441c1163e65112573756da6c17b3ef64d0917f86fdcb96ab4a20f13ccee0381420301b57e1e41c3fad11d28c7ad70bd2e1f7e3 SHA512 9187981357a3861d735b8601c61851a5b9e53cde5668a0ebc62ca8b922a2629e53fe3369af6beb9df1a6fe6d4d87822d8882e27410a460ea8c98418b17287b9c
 DIST postfix-3.5.7.tar.gz 4613756 BLAKE2B 9fa7de3e6d7d20c549c6f26d77d9a0973e789f1b6650a13be08ddc35d047b0ba6e7e75dcb5749e0772cd1e821a9e2f40891c0422bc47a90be166cc937050bc52 SHA512 7828210bc9d3eadfd47f1121ae2f7ca057e03391048e8e79fbf2f96f6677f5e17145f5869d6f5c0b735ecd8584f420df7ba4922f54686f1a5be663bff257f2c2
-DIST postfix-3.6-20200830.tar.gz 4649178 BLAKE2B f6553201213df338cb4d339b862eee69ad022756f2829e5e4a655b849f98155ff60211d9ae490b3a2d9f23da9c9ef71f45386ce374f6f51a217061eac10b513e SHA512 101d073348f13fc52897be7995a04455e171c9b4e2a42eca2cce86a294d3d3ed13c65b8b3660798ae7bd8c347c5d3094be8ac91d8931d3b80a47f8d5b91942c1
-EBUILD postfix-3.5.1.ebuild 8830 BLAKE2B 5da9e3002be93402fa4b5d767bec9ee1e17571d492a776244210a98b639df1546cd01009348a7c8d1686d0408bdc07175afdc4fe420b55f898e83eb6ba91a440 SHA512 c121bd5ecca3a74d9dad9caf43cd44884f787bb27c146300f730c57590a24007d18a3cd04cea20a22db0e22ef44d355f549514d7a1c1bba6c865749972c90e5d
+DIST postfix-3.6-20200925.tar.gz 4657429 BLAKE2B d759c9153a8bb240d1e2571e373f4213dfb1db2cd28d244fd1d1267f4a25ec451985102dbf8e9233aeb7876b7edeef0a03417cfdd8712c62308eda8870d3e925 SHA512 d1a6c1ac837932efb1acf2bbfa3b686a58345736201c5691e60126d385c9682c00b5ba9f592a62a41908e5a01cfe3a419e3950298c5e6472bbf74914bc2b7ce8
 EBUILD postfix-3.5.6.ebuild 8830 BLAKE2B 5da9e3002be93402fa4b5d767bec9ee1e17571d492a776244210a98b639df1546cd01009348a7c8d1686d0408bdc07175afdc4fe420b55f898e83eb6ba91a440 SHA512 c121bd5ecca3a74d9dad9caf43cd44884f787bb27c146300f730c57590a24007d18a3cd04cea20a22db0e22ef44d355f549514d7a1c1bba6c865749972c90e5d
 EBUILD postfix-3.5.7.ebuild 8835 BLAKE2B 783402f5b3fb51890afbba59bb042fdfc26726804ede9d523882f759c870fbfcb63a66463100bc8bb5d21e1030c59a887de263239b4e0f9e37f38fd2383ddef7 SHA512 db14226c5259442c15a3c0ef3ec9bb6b00e331840df15764e6eec2f9bb8d6d93475334924445f31e1b8d1460da9d3c24f07f94809e5dea11149e6c7d0e6781ef
-EBUILD postfix-3.6_pre20200830.ebuild 8088 BLAKE2B 1e45b5518de9e95045da29ab82658a66119b20080e1654e09b3a7f394e9f1c2bb0519f47cd5d8504427f3f5de10fbe340789f3ac34edd928646b2235bdf60854 SHA512 713e8b4a5dad3968cefcb5754773986f1ba806a8adcee247de3d8b00acce8072f9d22a333b303817d57bcaaa205215c56bbae4f6fcf6a8db61e5a8c73b5b88b3
+EBUILD postfix-3.6_pre20200925.ebuild 8088 BLAKE2B 1e45b5518de9e95045da29ab82658a66119b20080e1654e09b3a7f394e9f1c2bb0519f47cd5d8504427f3f5de10fbe340789f3ac34edd928646b2235bdf60854 SHA512 713e8b4a5dad3968cefcb5754773986f1ba806a8adcee247de3d8b00acce8072f9d22a333b303817d57bcaaa205215c56bbae4f6fcf6a8db61e5a8c73b5b88b3
 MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/postfix-3.5.1.ebuild b/mail-mta/postfix/postfix-3.5.1.ebuild
deleted file mode 100644
index 646b4e9c0863..000000000000
--- a/mail-mta/postfix/postfix-3.5.1.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2020 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/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-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 ~s390 ~sparc x86"
-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? ( sys-libs/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[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/postfix/postfix-3.6_pre20200830.ebuild b/mail-mta/postfix/postfix-3.6_pre20200925.ebuild
index 8d6649b9d231..8d6649b9d231 100644
--- a/mail-mta/postfix/postfix-3.6_pre20200830.ebuild
+++ b/mail-mta/postfix/postfix-3.6_pre20200925.ebuild
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index b507e5e10f78..9dd6c1d73d99 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 5c7b9a938ba6..cbf88241f568 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,3 +1,5 @@
+AUX caja-1.24.0-fix-selinux-automagic-dep.patch 1553 BLAKE2B 9450ed07579baa33eccd772383c70fd30bd2e082baca0ad535c16b656401732346809f8cb5d65c75a114ce391e941aa0f89b7d503e262e0b927c0154cede3435 SHA512 e287f8a64600a4fd02011b0a9c799d6532811c53856fda5e69342518ddfcab89562b172dc268b4859274554c39675c8f5b038a402c0a80b6fe1e3357b84e1a7a
 DIST caja-1.24.0.tar.xz 5221716 BLAKE2B 66d628ac0f50e2c388935420e29dfe15a8f5f127fd7b39e92ebbd67b6c929cda1a2dec1f510fb89890602adaef6a741f0ee3e15d27ab9741c5223c7966b3b908 SHA512 a68b23876cfa1171d5b1c75e4998c6b15f0ceebdc4fcaabb8d362e32e35b915b1a91a38648532ac8acc162dac50aeb4d07eff417ce2db7a8c50d68bd38a0b548
+EBUILD caja-1.24.0-r2.ebuild 2191 BLAKE2B d60839a2bd696df69a595e286e46999d57fc58dd24934de6ba06d481143cef89c715d37512982eebf04c0f3ed05557aad360b87a06c34488563c2eea023b485f SHA512 3d37c3323d90ff5b1a5b2cbfe9674b2caea231d8cae2344750f6e4de788c0d238f145854b961bb2bb3c60eb1fc30fe31491677dee20cde66a4a9697e8dabcd65
 EBUILD caja-1.24.0.ebuild 2050 BLAKE2B 188019284e9b7a7486caadb8560c71afe08c3e02fb702abc0b0451d895ed31faa397ed3407f1e4dec5baa274730b014ffa69336a34287ca293ed968635eb02b5 SHA512 ed270d30ca7118f5acfcc6e02da175ab136d89aaee0a82c008107f062cf31dc2b894b33b337cf6d98de414e5fe2fa4c819c02c36ab856114023c7cb555044309
 MISC metadata.xml 600 BLAKE2B 51da0f96a4adaedcea06fcb9e63f58cee8cbe7d479d8195af4821f1be66d07ee62361d225126943b24da10235bf6a06946d215a4e817a38aff5e07d29d6449db SHA512 639000dfb46bb04d2d5df50a60ab60259aa59e8cc0ad9f29c62ec2cbfa06b9556b4f7cada01588179a453a69645f2e44530469953ef5e423a428a9d6a0cceb9a
diff --git a/mate-base/caja/caja-1.24.0-r2.ebuild b/mate-base/caja/caja-1.24.0-r2.ebuild
new file mode 100644
index 000000000000..e77b01f49dd3
--- /dev/null
+++ b/mate-base/caja/caja-1.24.0-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate virtualx
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Caja file manager for the MATE desktop"
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="+introspection +mate packagekit selinux xmp"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.58.1:2
+	>=dev-libs/libxml2-2.4.7:2
+	gnome-base/dconf
+	>=gnome-base/gvfs-1.10.1:0[udisks]
+	>=mate-base/mate-desktop-1.17.3:0
+	>=media-libs/libexif-0.6.14:0
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/libnotify-0.7.0:0
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrender
+	>=x11-libs/pango-1.1.2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	packagekit? ( app-admin/packagekit-base )
+	selinux? ( sys-libs/libselinux )
+	xmp? ( >=media-libs/exempi-1.99.5:2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!!mate-base/mate-file-manager
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5:=
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
+
+# TODO: Test fails because Caja is not merged yet:
+# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-1.24.0-fix-selinux-automagic-dep.patch" )
+
+src_prepare() {
+	# Remove unnecessary CFLAGS.
+	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
+		configure.ac eel/Makefile.am || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-update-mimedb \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable selinux) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	Xemake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	elog "Caja can use gstreamer to preview audio files. Just make sure"
+	elog "to have the necessary plugins available to play the media type you"
+	elog "want to preview."
+}
diff --git a/mate-base/caja/files/caja-1.24.0-fix-selinux-automagic-dep.patch b/mate-base/caja/files/caja-1.24.0-fix-selinux-automagic-dep.patch
new file mode 100644
index 000000000000..ffc0a2903d16
--- /dev/null
+++ b/mate-base/caja/files/caja-1.24.0-fix-selinux-automagic-dep.patch
@@ -0,0 +1,46 @@
+diff --git a/configure.ac b/configure.ac
+index 052b4d0..12c818d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -169,17 +169,24 @@ dnl ****************************
+ dnl *** Check for libselinux ***
+ dnl ****************************
+ 
++AC_ARG_ENABLE(selinux,
++    [AC_HELP_STRING([--enable-selinux],
++                    [build with selinux support])])
++AM_CONDITIONAL([ENABLE_SELINUX],[test "x$enable_selinux" = "xyes"])
++
+ SELINUX_LIBS=
+ msg_selinux=no
+-AC_CHECK_LIB(selinux, is_selinux_enabled,
+-   [AC_CHECK_HEADERS(selinux/selinux.h,
+-     [AC_SEARCH_LIBS(selinux_raw_to_trans_context, selinux,
+-       [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
+-        SELINUX_LIBS="-lselinux"
+-        msg_selinux=yes])
+-     ])
+-   ])
+-AC_SUBST(SELINUX_LIBS)
++if test "x$enable_selinux" != "xno"; then
++    AC_CHECK_LIB(selinux, is_selinux_enabled,
++       [AC_CHECK_HEADERS(selinux/selinux.h,
++         [AC_SEARCH_LIBS(selinux_raw_to_trans_context, selinux,
++           [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
++            SELINUX_LIBS="-lselinux"
++            msg_selinux=yes])
++         ])
++       ])
++    AC_SUBST(SELINUX_LIBS)
++fi
+ 
+ 
+ AC_ARG_ENABLE(empty_view,
+@@ -353,6 +360,7 @@ caja-$VERSION:
+     warning flags:                ${WARNING_CFLAGS}
+     xmp support:                  $msg_xmp
+     PackageKit support:           $msg_packagekit
++    SELinux support:              $msg_selinux
+     Self check:                   $msg_self_check
+ 
+     caja-extension documentation: ${enable_gtk_doc}
diff --git a/mate-base/libmatekbd/Manifest b/mate-base/libmatekbd/Manifest
index cb2b90b4f9f1..6cc0efee4533 100644
--- a/mate-base/libmatekbd/Manifest
+++ b/mate-base/libmatekbd/Manifest
@@ -1,3 +1,5 @@
 DIST libmatekbd-1.24.0.tar.xz 425720 BLAKE2B 6f5f808f55c57c3d651d5c871a5f95269397a6d1c2e3cd37d2b16a5519300a81e994e0ac10bf474b9860ec7c0f3c862332199e10c506f38107c7f7d791899b4d SHA512 6a04f4f38ac1d1ef372fdbaddfe4c935d79039cce1a3d68a6876fa5550556f1d568de1d53857531c6f0bd5994e815f2c9e5be0436218e97718f87e17973ea655
+DIST libmatekbd-1.24.1.tar.xz 451404 BLAKE2B b05c469aabef69ba091ed4d9bdb4c207ed7f2042413c701d4a864cc514f1cc5b37b3750f01db544bf28fca712776a42262e6036043c5c1a9632789bf2f23d029 SHA512 982f973e90bd08c4068fc42f6c62d9d32f8ba4855f5616b3e4ce7167df787bd9dacf47fac3d95ddd0e7d622870bc394c1a22cfb929d0f3293c26095c2b5fe7e3
 EBUILD libmatekbd-1.24.0-r1.ebuild 884 BLAKE2B 9906aef1d45cee8b415acec82293657258b3d8dc0f5bee19413ea67bcfa2c7c36daf1eba28748cc1d2aff5bef19f9663b11b90fa2420bb1a747b9088f7a4457c SHA512 f37ba3244151f4358750f9136244c609c88682ba023b0d278067765bcb2bff8dbfbc1a4861a778e12ee020a01dc3ffbae6730cebc42b54623db84a69e763eb4c
+EBUILD libmatekbd-1.24.1.ebuild 907 BLAKE2B 77add12b319a16a082ee3c83ad65360af525270947f4ead071b363799cbbd3f69f5dcfc68e431b63dafa52760a9e0c5e1bab5926fa56b21a2a9c2070d4d1dc19 SHA512 e8318b70531c1999e3f1d1db1293fe5a984b8d0265ddd9f28b5d2a2f253750a5d96425ea10fe96f9873ecd77b73b9e1a2b3116b0e0135c323e9d9fe7318e7b20
 MISC metadata.xml 339 BLAKE2B 0ba4a0bd94a0efe3c42d79da9b4f32dc50c577c616d2495a7a3019fb05c398ffdf614afddae5bda5bd1430716391d3991f99005c225e36d2ebc68ff5415ff5cf SHA512 fc767510a57712599986df86d68bf28122b5060b183f94dca26f69abd7a6b4866ab9efc37b85433d2271115374dba3299d2be6cd9461aeadaa2cb02864a6166d
diff --git a/mate-base/libmatekbd/libmatekbd-1.24.1.ebuild b/mate-base/libmatekbd/libmatekbd-1.24.1.ebuild
new file mode 100644
index 000000000000..da2af0d7a8b1
--- /dev/null
+++ b/mate-base/libmatekbd/libmatekbd-1.24.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE keyboard configuration library"
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="X +introspection test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	virtual/libintl
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.24:2
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5.2:0[introspection?]
+	x11-libs/pango
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxml2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		$(use_with X x) \
+		$(use_enable introspection) \
+		$(use_enable test tests)
+}
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index ace1924543d4..9d2d42940d53 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,3 +1,5 @@
 DIST mate-applets-1.24.0.tar.xz 8142812 BLAKE2B cbb76d6d64bb6e9b9f93197dbe79e2751877b0604c5a84ff4b6b00608f2930925bdbc2824dc96848c84496fa5f16ab38458775727b22cb07f4db9ca854f93c42 SHA512 345a80b123c705997d44ac5a4bea5249045d75181c3802cf49b2eb08decc14a12f75f2e06e6ebfae267b937ff10edf7638cd64332e2e2e731695e6260df5222e
+DIST mate-applets-1.24.1.tar.xz 8222540 BLAKE2B f018f131cedda486a28c3a125c07efaf5c3111f95c17b0c3fbdd0b1f084ddf851d46ea4ef511a1e57f6d9f7f29a28e48ab010abc4cc6d87c1315b79bfbf01849 SHA512 d29e39a140310fef84cb0fe631568e0177ca5faaf2bf566211a23b32613fd6aabf06dd8ecd81a16e09553c659a7feda9ba372bb62a70504a235be58e07726ed2
 EBUILD mate-applets-1.24.0.ebuild 2052 BLAKE2B 252d2c95ac34a0c460c9de2c15b6dad9ae0205b05e0728b89e30a9fdd37e870adce5cf3f01fba8e83d1418695c600e11aace566c08046b66166fe03d669aadb9 SHA512 d1ab2e80d42bf8202e3a76a68c490a3b59631c92879f77068a41c950e8a8f941c88a69a06905ab0c825695ab03e5a6fadcfcb91da0ec931eb0914977ecd6bd5f
+EBUILD mate-applets-1.24.1.ebuild 2094 BLAKE2B 0e71f68f9b8dd5f21c37ea82b535aecc938e34478cd105eb0b05b706998005bc5d2bd3620658c0705b3e1b14aca963722c79baf94c6e2b15d0b81a509c9f178b SHA512 5a75f0d9b29c27cba18cc9cd5f5929db366096a51355f1c7672f4b7e77bb2fe7ea89c5b59c59201951f80cd5ff203fbdf18ad15675c5da77aaae4f21a320e489
 MISC metadata.xml 476 BLAKE2B 7e9ca9850dc90a6c22f661760b1aa54cc4e87eb53c1f6eb8f4087afa7b92f7a11e924c45b69cea8ad025203e894d24511a6d960d93b4f5341082447bc380fe34 SHA512 2b64230204857eb218fc42fdd18fb4ec9bdd7727d278e0c492630e38c561150cc8c5d45b5168cac619e8104aa9a737db6961045e71bbd005c235df20f72bd5c3
diff --git a/mate-base/mate-applets/mate-applets-1.24.1.ebuild b/mate-base/mate-applets/mate-applets-1.24.1.ebuild
new file mode 100644
index 000000000000..63d6ba9facb2
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.24.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
+SLOT="0"
+
+IUSE="X +cpupower ipv6 policykit +upower"
+
+REQUIRED_USE="policykit? ( cpupower )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libmateweather-1.17.0
+	>=dev-libs/libxml2-2.5:2
+	>=gnome-base/libgtop-2.12.0:2=
+	>=gnome-extra/gucharmap-3.0:2.90
+	>=mate-base/mate-panel-1.17.0
+	>=net-wireless/wireless-tools-28_pre9:0
+	>=sys-apps/dbus-1.10.0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/gtksourceview:3.0
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	>=x11-libs/libwnck-3.0:3
+	x11-libs/pango
+	cpupower? (
+		sys-power/cpupower
+		policykit? ( >=sys-auth/polkit-0.97:0 )
+	)
+	upower? ( >=sys-power/upower-0.9.23 )
+	!!net-analyzer/mate-netspeed
+"
+
+RDEPEND="${COMMON_DEPEND}
+	mate-base/caja
+	mate-base/mate-desktop
+	>=mate-base/mate-settings-daemon-1.6
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+
+	# configure.ac logic is a little hinky
+	# and ignores --enable flags for cpufreq
+	use cpupower || myconf="--disable-cpufreq"
+
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		$(use_with X x) \
+		$(use_with upower) \
+		$(use_enable ipv6) \
+		$(use_enable policykit polkit) \
+		"${myconf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check
+}
+
+src_install() {
+	mate_src_install
+
+	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+			geyes mateweather multiload netspeed stickynotes
+			timerapplet trashapplet"
+
+	for applet in ${APPLETS}; do
+		docinto ${applet}
+
+		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
+			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
+		done
+	done
+}
diff --git a/mate-base/mate-common/Manifest b/mate-base/mate-common/Manifest
index 803c7cf8c459..a576dc37aa4a 100644
--- a/mate-base/mate-common/Manifest
+++ b/mate-base/mate-common/Manifest
@@ -1,3 +1,5 @@
 DIST mate-common-1.24.1.tar.xz 69316 BLAKE2B e265994231d17bf4bda7a02e4cc2d54d8335eff5ee5c3b35b680335a01a21992d9d13632e95029c03b04cfb8d92ecd9b035f7bd2a8666feb4ccc54a937c71e3b SHA512 da3e670e5b4f566bf1893692b34b63d94cb5bd993ce94d0d8245a54c12b2cc2c6af7c29edd184b09ce5296566dbe34112bc318e740a8a7910e4767569e64d623
+DIST mate-common-1.24.2.tar.xz 69612 BLAKE2B 31010b5417824153046e07c4724c70e5ce9f69c0ad6945ccf276026c7f1d0238b6313cbe13a64a329a889f97a994fa749de152a0e6f02e8bc88e5f7ecf73febf SHA512 aae7cf6f4537b125d363e7be1f349cb4ba9515405d1e48704f87c647b2489647cfa14399f41b65a8c1b2a8851dfe8077ce47a3b618355767cc61a6e0037ba3d0
 EBUILD mate-common-1.24.1.ebuild 529 BLAKE2B d1aaa2d697656e1edf596cc555e629297956375658523a973f28ea759f1509feb3125c473e2884dcc78abac7d0c598aefd8beefd40b9647d5051cb1986576de4 SHA512 dac071470e7c27b380f6c707c5e55158d373cab5474188fc27755dc7e89938b95361b3cebadea3a2ee46254eebf04bce88a847aae0a4756c7a9cc4b10cbb20e8
+EBUILD mate-common-1.24.2.ebuild 531 BLAKE2B 4876eb92ae1dcc35dc922cf58981a1f38d030797ab029ae69782ca927aa890cf443c17cd749cd4eea3e5fa0dcc7b05e217749f6cbb187a9522f30710615a1268 SHA512 8f4b13244de3a6b00a8a14731cc8c2aec91a71fd7d35196b71753eaee21c500571bc84b1dbb8d2b471760dea1602ccf0f14a995aab5ad6325429340ea42788e1
 MISC metadata.xml 340 BLAKE2B df96462b37467cd5298fc394d73cfce122d7aea210e48a678d4c32d5c2b6a792cdfaf1c39e6968b33d6c3b9aecacd95fdbb4478cc98a58b6c0527c6708e404ef SHA512 06a836307e50d0ecf5e85516865436cddffaa2d69492c295bad163f3511ded0b7254b541fa73b8b5f314c1574c755f595c1a5af5f55c87f2c96aaf06fffc6262
diff --git a/mate-base/mate-common/mate-common-1.24.2.ebuild b/mate-base/mate-common/mate-common-1.24.2.ebuild
new file mode 100644
index 000000000000..6c83b6fdcda7
--- /dev/null
+++ b/mate-base/mate-common/mate-common-1.24.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate-desktop.org
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Common files for development of MATE packages"
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+}
+
+src_install() {
+	mv doc-build/README README.doc-build \
+		|| die "Failed to rename doc-build/README."
+
+	default
+
+	dodoc doc/usage.txt
+}
diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
index 3158abd53206..c0898b26f303 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,3 +1,5 @@
 DIST mate-control-center-1.24.0.tar.xz 3488572 BLAKE2B 683b3326deeacf3f47a8ca3201de66a492cac022ae341dfc54cdc97c9a5260e223a082a3dd899b31680e4a8e5b3237d0338c7fd8125468f75e1b00b4e6a130c7 SHA512 78e70bc94a34f8e6083d1951b12fcb9f7e8b7c55c5fac612ee27c8175e91b3872f6ecf15162e747444586612a94f857a02fb91a6fad142b5d0a16e749792c2ce
+DIST mate-control-center-1.24.1.tar.xz 3395740 BLAKE2B 88efb5b170af461b2505be654b005818b5b9087f5535365b7fe4033c05debcbf842fa33a77e4c78e72d0c7426794e943b773612f4431128c01fa77a15f5c2670 SHA512 f0440bfa79099610eb1f9f03bda13347b57d9250264f27971b69a5900338cf750e6eeb14111d7069bf597f5d4c4ed66b0466b926a54e4719845da23de31665f4
 EBUILD mate-control-center-1.24.0-r1.ebuild 1576 BLAKE2B c07038c74c505b858da51a0d5db69c26abd8ba9eb4b4a575c523407ec599c0b45a96facf8c3295c0ec571e39e16af237645eb6cb330b8f3297d5ff1fd17e69fc SHA512 a4df72fae5729c3115c04f9984c53b76389add9d4fafe589bfd50d230ef790edc216e16e861272402e7d3a1e55a75565ef0b48696368cb86e601e405c1c1fa78
+EBUILD mate-control-center-1.24.1.ebuild 1597 BLAKE2B 922f1a97937bf5b5f52b8f9b76e110428903b7b975fe43f253ee4f5516b9d52259d949f1e99243fba317c3488b4df1d5cef15eb26a3a06576acfb6973e56cb83 SHA512 cdb812ec3735858ac4f74f2bff50963804cbf3edfe85ab2bef48930bd9d1c31f02d82ac9cade5733e178e3a964d6672540c47323b4fd4bd2055f89cfb2a14ab9
 MISC metadata.xml 433 BLAKE2B 189e7b4c8a23defad0506d79de1bc2ee21a6538e9f591db9c11ea1e8b0743e209b7aa53c2a6e3c78c2f4729e8dfbd02e831081193c9124698fca283af8768e9f SHA512 487af436720ff58f170c6e2fcee903669c8bf7b8415dd81a2d1bb5b2feae2f4d1cfecdaed821ecf2e875bd26e9e3ce6013bec07c5e1d699581e0b0f5bb97b60a
diff --git a/mate-base/mate-control-center/mate-control-center-1.24.1.ebuild b/mate-base/mate-control-center/mate-control-center-1.24.1.ebuild
new file mode 100644
index 000000000000..e686d34de0c2
--- /dev/null
+++ b/mate-base/mate-control-center/mate-control-center-1.24.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The MATE Desktop configuration tool"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+ LGPL-2.1+ HPND"
+SLOT="0"
+
+IUSE="accountsservice appindicator debug"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/dbus-glib-0.73
+	>=dev-libs/glib-2.50:2
+	dev-libs/libxml2:2
+	>=gnome-base/dconf-0.13.4
+	>=gnome-base/librsvg-2.0:2
+	>=mate-base/libmatekbd-1.17.0
+	>=mate-base/mate-desktop-1.23.2
+	>=mate-base/caja-1.20.0
+	>=mate-base/mate-menus-1.21.0
+	>=mate-base/mate-settings-daemon-1.23.1
+	>=media-libs/fontconfig-1:1.0
+	media-libs/freetype:2
+	media-libs/libcanberra:0[gtk3]
+	>=sys-apps/dbus-1
+	sys-auth/polkit[introspection]
+	x11-apps/xmodmap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcursor
+	x11-libs/libXext
+	>=x11-libs/libXi-1.5
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/libxklavier-4
+	x11-libs/pango
+	>=x11-wm/marco-1.17.0:=
+	accountsservice? ( sys-apps/accountsservice )
+	appindicator? ( dev-libs/libappindicator:3 )
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-libs/libxml2
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--disable-update-mimedb \
+		$(use_enable appindicator) \
+		$(use_enable debug)
+}
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index 7b5601096cf8..b69855bf686c 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -1,3 +1,5 @@
 DIST mate-desktop-1.24.0.tar.xz 1113912 BLAKE2B e5630ae4fe3f6a309d935153069b354a66d9d544bb3c2c7368373134b71a3d177385b157c01845742463ec8c91d0d4df1b39def7202142070221bb3dc7ba505b SHA512 ca60325e7f6167efd21bdd32ae40c2f2bf5ae9bef85f0a43afec05d50567fb650fc0426d94c510b3a42c625dc4b2d31d7559befa50cfbb6d9878635558a52323
+DIST mate-desktop-1.24.1.tar.xz 1115988 BLAKE2B 7dc5595a79d214f1cf947c5ab5372983598bcfc330ebd748d6b9daf10c3134d04150427c6242f754b638377db90d1558067a388e2e8e6a6aaf44a87e44e7a6f3 SHA512 0691dd613946d5d67596d98cd489536f5876cb97fb4c5290133b198479b4bfa3835ca52a16a2d0cc5e863d625aedda83ab01e85d67f58a09763673f0f18ebc5a
 EBUILD mate-desktop-1.24.0-r1.ebuild 1142 BLAKE2B d3acc8b0c8c3edbac15e70a4b595a766baced0cc2cf2aaa69cc66e966b847a6cdb28945703ec24181d3bcfc16d0935e99312b171fe9ff3569252736ed59c6b64 SHA512 16b94ab140db87043add3a1266a05daa571906dcce7c2b5673e86db18b963ec446750b7d0c2db6232402e7be853b6bf46d8d0e82a75a7e03038eb52b47e2e9ad
+EBUILD mate-desktop-1.24.1.ebuild 1142 BLAKE2B afe90bc7efbfa2f9bb0d05bd9f7b516c9d77cb20a7a495f93047b2336e2294a5ec01cf1bb5b737cbacc48441371bbce0f8db5e75f3ce5841756f225cba776699 SHA512 2ad197b9840e5f2de2a470d77ef5468e5bb25206f18bc81acc36a7980bae1df9e31921a5f9ff1d27652d2193b10c7ffa81ff3570f0572370305709d5f285a7f7
 MISC metadata.xml 341 BLAKE2B d5ca73000fca7b5092f767fc927d65f32ab507a08f2d8c6f1a48d1a70ed25653467f75de3b556543512b3d7d9cc4b1704166eea72bd3ca708ad0b40e216e534a SHA512 7d54ddfb1e11f270908131ea9e1287efb589d0015305576d05bb2d57c74ec3778c004fa4a1533140026eeb4774c8b50f79045564877c9c2e06e4e446e101e08b
diff --git a/mate-base/mate-desktop/mate-desktop-1.24.1.ebuild b/mate-base/mate-desktop/mate-desktop-1.24.1.ebuild
new file mode 100644
index 000000000000..13b996530016
--- /dev/null
+++ b/mate-base/mate-desktop/mate-desktop-1.24.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
+LICENSE="FDL-1.1 GPL-2+ LGPL-2+ MIT-with-advertising"
+SLOT="0"
+
+IUSE="X debug +introspection startup-notification"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/dconf-0.13.4
+	x11-libs/cairo
+	x11-libs/libX11
+	>=x11-libs/libXrandr-1.3
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/iso-codes
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	>=x11-libs/gdk-pixbuf-2.36.5
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--enable-mate-about \
+		$(use_with X x) \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_enable startup-notification)
+}
diff --git a/mate-base/mate-menus/Manifest b/mate-base/mate-menus/Manifest
index 7ed2a47d1d4c..b8c1b33b71ff 100644
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@@ -1,4 +1,6 @@
 AUX 10-xdg-menu-mate-r1 192 BLAKE2B e8614b8fa478d0fcf2cdd99b8f3a4c0ec9d82c98b550a767e552bac8105ab354de8e75e43678faa7130674b4047178bcfa45d8884f21ce4b6f3a12c6ba8a8768 SHA512 1f7be7596465c4c3116add1a73517582dc9463f0b7845ed9e9e61416e45afad0c10c6c923ab125a2542d9cbdab0f37bfcc4df8007dfc7d925ad617802278f258
 DIST mate-menus-1.24.0.tar.xz 404028 BLAKE2B 18bea0a6c21444b0b568564d0c15ba0e231643dfcb9c74d6ab9a08cd57cab2289436dada030397737667f5a51c4ab39ab06fff3f585347ebb5f7afc40957acc0 SHA512 27f8ba0666b08fbcfc3f02a42e4b9f3d3431e3d171be0fe9569f412b2f9ead370fff15833feb920b64d2a067e81354970df2ee1c465f10faa3dbd9c97af20406
+DIST mate-menus-1.24.1.tar.xz 402968 BLAKE2B fb63e3dbffab2725407f03011618fc3698b80be1add349edf86a4bc0a26427bf2a69d696e0accdff16ee3d12b94e5458ef4874efb19c8a25b6c74769448d5374 SHA512 5235d3be31d30f8aeaf9b2da0f8fe8dc586e07ae0dcbc3da88a4f04181277a9dec9414dee9c255023b1ebd406f8b131197e3f526f9bac14eeb23d8014cfd22cb
 EBUILD mate-menus-1.24.0-r2.ebuild 936 BLAKE2B 35078e816c4a625c0762fcec9f9fa2b5c063fff8cecc2df49f9048a9a61fc3216d73bcdc7d21508df3d4349acdebdbcfbf6bac014e5261b6a28700ce2befa831 SHA512 603f74f6dd1c095e39f0da60fcf7121ce29624c9478e1e2f65025568e5c1272dcf2565f628b32616afa88035d47557a743cfce2b124e5faa57d9ba3ea3fa7077
+EBUILD mate-menus-1.24.1.ebuild 915 BLAKE2B 7a61118b68e5b310568bda59f63e7328120699ba85420b602255d678407d338e1d2c2c37a93e8c0d259b6d6d3230899cb39b675033bdba04161d7e943bf8f886 SHA512 7d6ce41b7bcd0dbef495e25e7d312af7573f6e2209949fe379e3534d5db601ea8f05f7b810bc7abd73d24ce722e5f44ffbdb4c6e8ea6d6c05e66bc53dffa725c
 MISC metadata.xml 339 BLAKE2B 0aa628f37ca885f294c05a4f97ecea8b57a588e02997ef0ab33485ada19abbae35e2c1ed5ed9f18c2b9143d9f0e4cf76ec2adbfec74a96062b5ddee0fb337dfc SHA512 39239eed6c1808d1b279a5924b2c66dfd38a4548b182b79e2a2f9c00f64a799c4e99d510b30a2ca179a918218e4e49b021e7cb3386c30c86b776a36f3800b03c
diff --git a/mate-base/mate-menus/mate-menus-1.24.1.ebuild b/mate-base/mate-menus/mate-menus-1.24.1.ebuild
new file mode 100644
index 000000000000..49466cbe7ce9
--- /dev/null
+++ b/mate-base/mate-menus/mate-menus-1.24.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
+LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="debug +introspection"
+
+COMMON_DEPEND=">=dev-libs/glib-2.50:2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# Do NOT compile with --disable-debug/--enable-debug=no as it disables API
+	# usage checks.
+	mate_src_configure \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_enable introspection)
+}
+
+src_install() {
+	mate_src_install
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}/10-xdg-menu-mate-r1" "10-xdg-menu-mate"
+}
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
index 9ca032d2425e..17f0f0d38bb3 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,3 +1,5 @@
 DIST mate-panel-1.24.0.tar.xz 3040068 BLAKE2B 2ef2973014e32ab62ba9d4a05a820a2640415b493886d74e09089ed91bfe61d2d53ee6313c104945ddc95c992423403f6bca72a7f8b80ce189cd9f247add931c SHA512 12a88534400603998b4d4d415940947dd6372914135aa8eb6052c75e134412739a96064ad654e8f2625dbb6fe853e8cb376c41e530c30234e08141a46634820b
+DIST mate-panel-1.24.1.tar.xz 3265000 BLAKE2B eb5d2c8b6668ecb1d072e80ac4062574c97b7d52a1473133efff0fb12eca4e765df016d8ede4c6745f7bd9e6ea64114ccfcdf87045ca00797e63ab9ec215435c SHA512 1a1e62207d58472daa00d409ef2b04944929af7f9fe05592076adcc069e2d70012424b3386d30f8b9adccf05c328b8ab1662b8726e507465881a4ae26c26829f
 EBUILD mate-panel-1.24.0-r2.ebuild 1527 BLAKE2B ebdd026ef8ed0b9e2fbc67c454f854b4387f5e2c976129309d5228306945ebdf745ead7a10d9858eb12d223a7a22bd2f94cbec79d928c43e212ae40bc65276b9 SHA512 90630414db1c1d3ca50ce6faa78923f9afe2a4ed6c19e20cb95b359b380ef8e0d70b9093c27d227d9766ec076518d24df84a1b18dde2703c3e75919bef503ca2
+EBUILD mate-panel-1.24.1.ebuild 1508 BLAKE2B 6b1633ccd8f2a6c5392b12d26ade19c0fa3cada0493bfb38bd0146d016358c4e572baba9a1182bbf6cd1c12109c9dc92cd8df2cabf2b991439a95bcc52447bfd SHA512 e5e98bd2cbdc0ef93d687c8a8989c0f00014b3d52b3ffbc7c809c5c433195bd019417c67760c2a389c09bfb0f4979791ea8b6a81556c39c3d2c7616ab74728b0
 MISC metadata.xml 339 BLAKE2B d4e26fe24b5076b1a78c8de45bab802a438bd5fc171da7a6da6dc2460a7cb53677d4044abefc6c925a1b56d60d1a20fcb2334121ac0750d8347dc8ca3497b9c7 SHA512 788f53b6c90c485f6c8e4de2a9d1fd8f895b7c57cb7beeb0ec295a4710ceac5c8537ec9b3b567fbb5fae95cc08ce8892649a4198d40f30363b98f01267d67d26
diff --git a/mate-base/mate-panel/mate-panel-1.24.1.ebuild b/mate-base/mate-panel/mate-panel-1.24.1.ebuild
new file mode 100644
index 000000000000..6b5b93b187ea
--- /dev/null
+++ b/mate-base/mate-panel/mate-panel-1.24.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The MATE panel"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="X +introspection wayland"
+
+REQUIRED_USE="|| ( X wayland )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/dbus-glib-0.80:0
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libmateweather-1.17.0
+	dev-libs/libxml2:2
+	>=gnome-base/dconf-0.13.4
+	>=gnome-base/librsvg-2.36.2:2
+	>=mate-base/mate-desktop-1.17.0
+	>=mate-base/mate-menus-1.21.0
+	>=sys-apps/dbus-1.1.2
+	>=x11-libs/cairo-1.0.0[X?]
+	>=x11-libs/gdk-pixbuf-2.25.2:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libICE
+	x11-libs/libSM
+	>=x11-libs/libwnck-3.4.6:3[introspection?]
+	>=x11-libs/pango-1.15.4:0[introspection?]
+	X? (
+		x11-libs/libX11
+		x11-libs/libXau
+		>=x11-libs/libXrandr-1.3
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+	wayland? ( gui-libs/gtk-layer-shell )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	>=dev-lang/perl-5:=
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		--disable-deprecation-flags \
+		$(use_enable X x11) \
+		$(use_enable introspection) \
+		$(use_enable wayland)
+}
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index 02b8dde9e54b..0d81619ff02a 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -3,5 +3,7 @@ AUX 15-xdg-data-mate-r2 300 BLAKE2B dd937a405d9207d337a1bf9a630b3717e1c93a02231d
 AUX MATE 2378 BLAKE2B 824c6e357c90322a499aeeece3e38d25bcfb87c23eab159e1bc3c4dc39aeb535eb86f7833e8d9b9b1d48fc765414ca79120bee81ffde8c7d1f0ea6a112fe2dcc SHA512 dbb162f694eeee806a12b46bf45d47f4887a83562b61d05037b3de5a7778a68d79de5528327588da13a5c17c283c8b7590c10877eba77cea75ebe5113ef2c920
 AUX defaults.list 14293 BLAKE2B b8de50636f845e5ed197968a0f917a3d2c1f59b082ae7d76841c9802ce6182556a29faebcd28f71dfdd778ae73268ebba1d450c9f18ac730aedd5ba0f025e53c SHA512 d3b14a4676bbadb93bc33e94ddf74fc6a2c072c52ada51d8f658008301d795102d47b3e1b71f9884d117111329774deaab1a5c1718c3dab5bcf96df1657f3c9d
 DIST mate-session-manager-1.24.0.tar.xz 709712 BLAKE2B 6455872dfc89cdd3ced563a877e30ef59d2c6d94bd8f3b930eb778ea6b22a52ee860d785ba13d348e37e0d74526de4aef229d5c7b022e7f974ac949f553d7704 SHA512 ee519c8ded1f2df26e62a1384439e8929942d19560c258c91010f8d34bcc7518975406fbc0a5b76d4e73e954cdc2ea106d71476e446573d4a77d2704f6cc9e37
+DIST mate-session-manager-1.24.1.tar.xz 711188 BLAKE2B a2d48b53fbff6f2bf56cdf24efb709a17458341c75a37ab7494fcf344064b64f50e9527f11d74b681d2156508e24fefdb7a5c7637b72deddf1f3a82e4096031b SHA512 ca561e13080ef334a69f18b3aec0993532381ea5c178a0acf969bf2ed9cb5d484626404ab43d809727d8eef9b5eda29adc224168290f78a63da2621ac7ef79f5
 EBUILD mate-session-manager-1.24.0-r4.ebuild 1929 BLAKE2B 204cf4fa821c8349cd3ec114262583650167e317ec33fbde80dc0e4ee35f817f2cc0311467cdf1884edb13f2bee03392bf2de086a6c019d717ecf104d9de17c9 SHA512 4924a51bcb15b7c8b6f375f9c380a251b565b1abd653e86a2ae4382083b25a6aa44f060ab048b15f140f6ca80c7d3cc3bc94672de797d224fd92499ec3ba137d
-MISC metadata.xml 497 BLAKE2B 85510300fad0274831fbbb5dbedb00bd3e6347518e0188838f8dce213064db44612ca7e7fbbe922cc46924f02f2fda50120ecba21774231af6e3acea45fc9db4 SHA512 19f431c7d3a9912baaa3df85fd222be5b2649f46a723ffdc084524b172c6c387e4a9928b219d9e73217c7e6ef677f2e5e82473547489001fc20fee7529373568
+EBUILD mate-session-manager-1.24.1.ebuild 2033 BLAKE2B b70fd6f0463ce5901c42ace75a750b50114150a809579b5d88d7f9573ef949bbca2f882cba415aa3815c81640628fad53c644f2fa31973e8ce4718132f9a0df3 SHA512 6263eed85df8b9f196d434ec6434a18d93d16dd64d1335d1ac3d9df1a1d118dc583698022c65da93f64a1ee6ae4486bf0e85bbf12bbe395cb3186bd2c663885f
+MISC metadata.xml 577 BLAKE2B 3bf7a2256980435ad2a25082ab7c0f21b7039cafcb4121d0575b5973dbe2a28f396f027050063aaa39008eab36d2481c382e7ff5504d61dfb5f16133766b54b0 SHA512 93465a71a4a05d3c1f43631fe55fff10c4138667d996f951b1544f15ebad4ba4c2fa70ca22d9b1d69c421839d95416c544c6f729220c2ec0cc1b9af5e2602b2b
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.1.ebuild
new file mode 100644
index 000000000000..1cc0a5a13f47
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.24.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE session manager"
+HOMEPAGE="https://mate-desktop.org/"
+
+LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="debug elogind gles2 gnome-keyring ipv6 systemd +xtrans"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.76
+	>=dev-libs/glib-2.50:2
+	dev-libs/libxslt
+	sys-apps/dbus
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	gles2? ( media-libs/mesa[egl,gles2] )
+	systemd? ( sys-apps/systemd )
+	elogind? ( sys-auth/elogind )
+	xtrans? ( x11-libs/xtrans )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	mate-base/mate-desktop
+	virtual/libintl
+	x11-apps/xdpyinfo
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	!<gnome-base/gdm-2.20.4
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+MATE_FORCE_AUTORECONF=true
+
+src_configure() {
+	mate_src_configure \
+		$(use_with elogind) \
+		$(use_with gles2 libglesv2) \
+		$(use_with systemd) \
+		$(use_with xtrans)  \
+		$(use_enable debug) \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	mate_src_install
+
+	exeinto /etc/X11/Sessions/
+	doexe "${FILESDIR}"/MATE
+
+	insinto /usr/share/mate/applications/
+	doins "${FILESDIR}"/defaults.list
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}"/15-xdg-data-mate-r2 15-xdg-data-mate
+
+	# This should be done in MATE too, see Gentoo bug #270852
+	newexe "${FILESDIR}"/10-user-dirs-update-mate-r2 10-user-dirs-update-mate
+}
diff --git a/mate-base/mate-session-manager/metadata.xml b/mate-base/mate-session-manager/metadata.xml
index ee3469ab6dba..46d654532c7a 100644
--- a/mate-base/mate-session-manager/metadata.xml
+++ b/mate-base/mate-session-manager/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
 	<use>
+		<flag name="gles2">Build with support for GLESv2 acceleration sessions</flag>
 		<flag name="xtrans">Build with Xtrans support; 
 		WARNING: Disabling this flag will result in ICE binding on all interfaces</flag>
 	</use>
diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index 79ce8b7206f4..c350225081a9 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1,3 +1,5 @@
 DIST mate-settings-daemon-1.24.0.tar.xz 1026248 BLAKE2B 134ad9c23488ae4a9619e5d9d4465bd3f2cbbacbd3b3e78924c3adcc95a88a8499c24b1c7bd844994b67517407c08c6bf22471597ad9311a4ae04cd7c96996fc SHA512 897d3540930ac407d802c9ecd1995e9bfee14eafadbbfad64aab1e7d93c9830111ac991d8f0df37e34efaa3f7cae9d59ee4d786b15acf0b87b8ba5d299bc1cc1
+DIST mate-settings-daemon-1.24.1.tar.xz 1033680 BLAKE2B ea8b3b277e97b9aa177eda711e1ccd507a5c9c1dded6f6b8812512c0b90469a0af256b1de1d12bffd7933b0a7b3a41f2e547cd7f830086929e41927d2e9c9ec3 SHA512 3a13a853bf2991f219f91398c31fda4aa3002fe5f5a4497c0e2097d2e8a812eb82bd1e4e1661d7b29061f185e74388f744bb37a0430d38bff63ddce6fe4d0bdd
 EBUILD mate-settings-daemon-1.24.0.ebuild 1556 BLAKE2B ab59c9bf4b2ee2d6e5132e419837563a4b58f2f5ddb4227b02be9d28adac1df2bab4e102ff0c1d08168f4f79187b720bbd9603ca8ba7134cc8d26eef4c405138 SHA512 a9010b8badd10d8cbec4763af95da406af8ae8328168248c2201bdb905e36a0634f9c37e9df23cc8eeb23293d7ee358912026243c4611c6afe2e94ad350f3672
+EBUILD mate-settings-daemon-1.24.1.ebuild 1557 BLAKE2B b5505e804466ae8efc2f29a185d00ad66e313f1598c59b45d9b691d9c37b67c01016fd55078c123b6b09aef4e488b7ce888449f88ce1fa920201bfda22b9bc25 SHA512 fab0772e5b5da5819d4928661b223e95adb6add93137483b5c76f1ac0950d40f5139a2a9640647bf917dfea999d68a7fdc4407952d42950b4b869d3ee60fecd8
 MISC metadata.xml 418 BLAKE2B c2bac7304f03cc8ce38351a4418a08bceb9bb71c1fde52acd7fafab37802c6c8d1bba307f84191944b7196e7220a93ea3c622f1c1db8aa93b13a51616c1fbdd9 SHA512 e87db5a05fd52a6660562ac76d26c2b978e6c0dab871eedb65172dbe2c24b2e090966d6808b6f2748f6807543d47a7e7455618bfb876d58e76ac01ae2a6622a7
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.1.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.1.ebuild
new file mode 100644
index 000000000000..4d738752ea14
--- /dev/null
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.24.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE Settings Daemon"
+LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="X debug libnotify policykit pulseaudio rfkill smartcard +sound"
+
+REQUIRED_USE="pulseaudio? ( sound )"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/dconf-0.13.4
+	>=mate-base/libmatekbd-1.17.0
+	>=mate-base/mate-desktop-1.23.2
+	media-libs/fontconfig:1.0
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXext
+	>=x11-libs/libxklavier-5.2
+	libnotify? ( >=x11-libs/libnotify-0.7:0 )
+	policykit? (
+		>=dev-libs/dbus-glib-0.71
+		>=sys-apps/dbus-1.10.0
+		>=sys-auth/polkit-0.97
+	)
+	pulseaudio? (
+		>=media-libs/libmatemixer-1.10[pulseaudio]
+		>=media-sound/pulseaudio-0.9.15
+	)
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	sound? (
+		>=media-libs/libmatemixer-1.10
+		media-libs/libcanberra[gtk3]
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+src_configure() {
+	mate_src_configure \
+		$(use_with X x) \
+		$(use_with libnotify) \
+		$(use_with sound libcanberra) \
+		$(use_with sound libmatemixer) \
+		$(use_enable debug) \
+		$(use_enable policykit polkit) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable rfkill) \
+		$(use_enable smartcard smartcard-support)
+}
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index a4644af4d0b1..9150e3916f22 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index cae8240483c9..2770d10ccff9 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,3 +1,4 @@
 DIST caja-dropbox-1.24.0.tar.xz 309024 BLAKE2B 2ae560dcd6e744fe96d9e0fcd876a899c22ad06b8238c2ad9e5394cf80aa8844cd634431dc6bb245396e6d919da857645488214880947e5b90413c254cd4c6a2 SHA512 64d699b4c3957d5996ef69936b4b2746641bc2db4efb7b23535febf5eed3ee767330927aeeda67747c0d72e0f052a2979ae2160ffaaf01e4fd82aff68a5f27bf
+EBUILD caja-dropbox-1.24.0-r1.ebuild 1848 BLAKE2B 1e4aa7a2c920762f3b0655d66c66235f6ab7704121485a6def53090c30d2f4f7c54dbfd2976e85b03b9ca402ae31f81141b50cdf5ed48942f857f4c8d9e3fdc8 SHA512 230505072c860a65feee7f006cc413cb002d103193f4738fd8a991065116b4eeab978e2cff0a69ccd1e270501cba8f35f740a0d62bc34e9e43b366065a103be8
 EBUILD caja-dropbox-1.24.0.ebuild 2119 BLAKE2B 5bc58a6d1958fabca1f401fd5a4b4eab0aa7ae41a6673f4f708c3c693bf3b03fa9d0cef662ecb9f00312380a2557c692620c73859c2e6ad896004bdb56ce072a SHA512 e3f027363a02eb66fb0208905a54857f09b241b5937b10f13a78326d921c7da7abffbf6af1d4afc6c8977daa7911e969f2e7745a216cfc96e0535b1c7306318f
 MISC metadata.xml 341 BLAKE2B b530aa03ccd9e514d43bd1014500548a5931fcd30e288bdc9b6c56e9b4fa8dc42dd4a31074efe3b8ecb5f2f55aab3da8e7edd30fa5f3c1645cc088e594da7761 SHA512 3ef87b907e90f2093cece194a580099964f434ec7a1d43e961f0c00adeaeca085fc6e141f25f4ef7da0399e71093b4e2c12f52d0c29cd2aa3768354380ec1c37
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild
new file mode 100644
index 000000000000..6632e04a229f
--- /dev/null
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.24.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+MATE_LA_PUNT="yes"
+
+inherit eapi7-ver mate python-single-r1 linux-info
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Store, Sync and Share Files Online"
+LICENSE="CC-BY-ND-3.0 GPL-3+ public-domain"
+SLOT="0"
+
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=mate-base/caja-1.19.1
+	mate-extra/caja-extensions
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libXinerama
+	x11-libs/pango
+"
+
+RDEPEND="${COMMON_DEPEND}
+	net-misc/dropbox
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/docutils
+	virtual/pkgconfig
+"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	check_extra_config
+}
+
+MATE_FORCE_AUTORECONF=true
+
+src_prepare() {
+	# Use system dropbox.
+	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
+		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
+			-i caja-dropbox.in || die
+
+	sed -e 's|\[rst2man\]|\[rst2man\.py\]|' -i configure.ac || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		$(use_enable debug)
+}
+
+src_install() {
+	python_fix_shebang caja-dropbox.in
+
+	mate_src_install
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" "-lt" "1.24.0-r1" || ver_test "${v}" "-eq" "9999"; then
+			ewarn "Starting with ${CATEGORY}/${PN}-1.24.0-r1, ${PN} now no longer"
+			ewarn "configures caja-dropbox to use its own group. This brings caja-dropbox in line"
+			ewarn "with nautilus-dropbox and dolphin-plugins-dropbox. You may remove the 'dropbox' group."
+		fi
+	done
+}
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
index c80c615408f5..794474494cca 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -1,3 +1,5 @@
 DIST caja-extensions-1.24.0.tar.xz 548828 BLAKE2B 0492e1f0ca7277737102f71fd195dd585614010b80c2aafd730aacd1d817b03fe0377c430615a3e4bd4a643558c02c9c4fdb2d451079a3b213fe0e6b9d4e02de SHA512 f05a7d83f16aebacb04f75b76ca86e44c1a01d9ad6c2aefeac19398c4d9da8385e6852fa0118c763aee630e7eb6c7c81d77e0c9452200aee9cf4f058487c4dbf
+DIST caja-extensions-1.24.1.tar.xz 552340 BLAKE2B fff9b70ccdc79905283bdd4e773c8ad6e85cbbc543f4f70af992d91eba1e86d8c2be074dab4154360b836179718e8dbb2837261779a20321b42a2d00c69088ec SHA512 b844a774271d81ac811b1aff1f04be4a65c6e38a683938dfb593f65297a6398fbfe4c8f6a51c649a1311fb5ca8134b4478860f51b1b3eaf9965a6b8776af2817
 EBUILD caja-extensions-1.24.0-r1.ebuild 1757 BLAKE2B fa6cabbc57ce1b18119e9473643effab562be713f12938897402c2eb7633aac61b1a61b0087f3c2516a715253ff7eadcbbab0abd8b3286d690eeea9a0ac6430e SHA512 f198fffa42b0bbb3a066c913c22c325184443b2aa45306aee7005f61cb41a313e07bed331391a534306cdd7f444756d311148bbe7fd7d67c435b235310286b5c
+EBUILD caja-extensions-1.24.1.ebuild 1782 BLAKE2B 126650ed4dfad89f54c32d2d2e5b7da7bd5e798c6ff0836f06f43457cebc88fc6f87015b1c547e2fbece6a3a13a31502a3eee6917fe42daf302f97827ceafca9 SHA512 7a099a8d4662e46c876eaf729398728d9c4bce0cbde8fbb591cbf6dd5796374ede222161cfb2c1a3c27dab9e0a9623f4e9b8414a2e03e61674676a811c42e462
 MISC metadata.xml 1020 BLAKE2B ab083cbce50c476d3c3c7d9f9588d3b61232b12cd5ef0f6446fd64ec027592d43dd4fee92782c5da98a2117d98e599c2aa9b13e1dcabc7d6e29f84f1f245c44b SHA512 21c041ecb2889d08d521e369249c4829fda0ee0812e4e2cf86ad3447834216595376055848636aaeed87cffdb584acf24ce9fb774be036c0a5b0279d961987ed
diff --git a/mate-extra/caja-extensions/caja-extensions-1.24.1.ebuild b/mate-extra/caja-extensions/caja-extensions-1.24.1.ebuild
new file mode 100644
index 000000000000..d31c92bc108d
--- /dev/null
+++ b/mate-extra/caja-extensions/caja-extensions-1.24.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Several Caja extensions"
+LICENSE="GPL-2+"
+SLOT="0"
+
+SENDTO="cdr gajim +mail pidgin upnp"
+IUSE="image-converter +open-terminal share +wallpaper xattr ${SENDTO}"
+
+COMMON_DEPEND=">=dev-libs/glib-2.50:2
+	>=mate-base/caja-1.21.3
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	gajim? (
+		>=dev-libs/dbus-glib-0.60
+		>=sys-apps/dbus-1
+	)
+	open-terminal? ( >=mate-base/mate-desktop-1.17.0 )
+	pidgin? ( >=dev-libs/dbus-glib-0.60 )
+	upnp? ( >=net-libs/gupnp-0.13:0= )
+	xattr? ( sys-apps/attr )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	mate-base/mate-desktop
+	cdr? ( >=app-cdr/brasero-2.32.1:= )
+	gajim? ( net-im/gajim )
+	image-converter? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+	)
+	pidgin? ( net-im/pidgin )
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxml2
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	!!mate-extra/mate-file-manager-open-terminal
+	!!mate-extra/mate-file-manager-sendto
+	!!mate-extra/mate-file-manager-image-converter
+	!!mate-extra/mate-file-manager-share
+"
+
+src_configure() {
+	local sendto_plugins="removable-devices"
+	use cdr && sendto_plugins+=",caja-burn"
+	use mail && sendto_plugins+=",emailclient"
+	use pidgin && sendto_plugins+=",pidgin"
+	use gajim && sendto_plugins+=",gajim"
+	use upnp && sendto_plugins+=",upnp"
+
+	mate_src_configure \
+		--enable-sendto \
+		--with-sendto-plugins=${sendto_plugins}\
+		--disable-gksu \
+		$(use_enable image-converter) \
+		$(use_enable open-terminal) \
+		$(use_enable share) \
+		$(use_enable wallpaper) \
+		$(use_enable xattr xattr-tags)
+}
diff --git a/mate-extra/mate-calc/Manifest b/mate-extra/mate-calc/Manifest
index 38fe5473aedb..e17dec203929 100644
--- a/mate-extra/mate-calc/Manifest
+++ b/mate-extra/mate-calc/Manifest
@@ -1,3 +1,5 @@
 DIST mate-calc-1.24.0.tar.xz 939480 BLAKE2B 28a8184665096d477bdc80484fc9da3bf9835dd5d1c30d4de11722488d735f88336bcf990c50ef65dd0a5781fc083b5d011fd5085c2d1672e6599a28f4a01452 SHA512 ebb18f07ded5577bb0987b2027e7b73abc823a567bfa00f9cc9bfaf75de498f150b6b4c2e13486c530a3cbb078f1b798c415b33d668d952e8650799dd05c99eb
+DIST mate-calc-1.24.1.tar.xz 952372 BLAKE2B ae6c687d85f48f95fda89ba4fa2be44d1f2fc510708a25ac59fd8074d1f29bc6b440ec1c20b344566d4e8a2edc8ec0bdc0d565773f2c089d712c47db4e847805 SHA512 164fc57ed6bcc69b96afd75fff8dd6248ce682d6f806e83ddb73a21bddce99b89c7bb697d189b56d88d5c8d9a0b99f50f3fdd15c7d56f9121ee1d16689b16595
 EBUILD mate-calc-1.24.0.ebuild 555 BLAKE2B ab2c8c25a4d8ad07cba59771e7340c7f6205fcd59af25c03f415dbcc5278177dcd5a521d02bdefbc09fb6d656e06603f6b653d17e797f75e7818584b63991663 SHA512 10c0aca0510080a89441e4b7deede858eaf73900926fad1b284ff6b45bdaed65ffb9d90731bb201a951f0e3cebf26095f2909117dd90fda77a3eaa4d8887d213
+EBUILD mate-calc-1.24.1.ebuild 555 BLAKE2B 5b4df01579dee320194d1c917af24e6d0fb75d2081198b03191e985244570b3aa58e64b3e192f5f336f959c40954aadf63a6f9033e5582ee14e8070973c20cff SHA512 cce7513fa76710c1f4160561b5339689a7d84023e2655cf6783c3a9c8f37c07617e7f875e1519044d2bc953b81d6092762bc2691a24eb0ab1ea1d93e6df50255
 MISC metadata.xml 529 BLAKE2B 35d3bc43838113fc4fa26e875cf6ffb519009307e6a8c06a9c2aa10a65231c231d5789c9b6c728fc4279dc76ed6c8442b68b3a538a973290785c2f65df776756 SHA512 3ed383251b99bfe8492c4a33d08f0bd42479d4d1ed3ccc4c316d2b64643bd611af27ed1238404969e6a924e1998ab0d47d8784d5b027bd276177d3875718e987
diff --git a/mate-extra/mate-calc/mate-calc-1.24.1.ebuild b/mate-extra/mate-calc/mate-calc-1.24.1.ebuild
new file mode 100644
index 000000000000..31d748f655b3
--- /dev/null
+++ b/mate-extra/mate-calc/mate-calc-1.24.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Calculator for MATE"
+LICENSE="CC-BY-SA-3.0 GPL-2+"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	dev-libs/libxml2:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/mate-extra/mate-indicator-applet/Manifest b/mate-extra/mate-indicator-applet/Manifest
index e98a09d11091..556586dd4669 100644
--- a/mate-extra/mate-indicator-applet/Manifest
+++ b/mate-extra/mate-indicator-applet/Manifest
@@ -1,3 +1,4 @@
 DIST mate-indicator-applet-1.24.0.tar.xz 380136 BLAKE2B 1ae77c892f02127f7a0d778958e0f4acc2b14e01a4b8d8a316253c3b227eacd59cb556ed852de690f3ec4aec4d02874c2f594b41315cd85c87c16967ef9403ee SHA512 0e82f572c1855c8623e537a45c2c0c0b98d3d642e46333eedc16c26607205293098a062008d0e568890ffdf6b8dc4c30a7f5e2e41a150f940917b3671783e413
+EBUILD mate-indicator-applet-1.24.0-r1.ebuild 518 BLAKE2B 757cafb3b7b9aedcd1c2d71faf94c259e2b7b29c2982856b91cf64e57a61a8c809da40556d3fa7a948336d6c991aa6a422983b6b31cf604f57bd8ae58b525f35 SHA512 421e4b03d5951c1bcc98884740055ca1ea4f9071a5c9723b9356e5fb02b9fb0614424b73b20278334bdae58cfa188fac730fab763fd3ef0e505703e278b15f08
 EBUILD mate-indicator-applet-1.24.0.ebuild 518 BLAKE2B 633f258367616716bb67dd3d68326f4d603ce1a31bf5b72f69e2c46e6244dc1566212c50c2c8871d4906b59cd76046914a4541930c8e1b33a499c77b9ad1e5fb SHA512 adc0448fe3de1bb0e4fe5271ce58b23abe4fa247c6ecfd7d441c2f3162b257887c937b8437b1fd49064ed047edce6a600bab85b8843462c6e629907b827f6f51
 MISC metadata.xml 350 BLAKE2B 96082001bda8c5a855c43e0ac4bba9d604b8ec94f66464859a37e30843f8f1ecddff2c3100a49ab465711bb529e288afddbb03aab9b6dde16de35370353a2fe7 SHA512 add12365e457c531f5dc3eec856099b5658f93a3d6ee2b3f80264374a84558566881213b8e8ffad03aeb3720025c385517d777af249a045b9dd2c22ce37b2f32
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0-r1.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0-r1.ebuild
new file mode 100644
index 000000000000..670d2a4bf3cd
--- /dev/null
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate eapi7-ver
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE indicator applet"
+LICENSE="GPL-3 GPL-3+ LGPL-2+ LGPL-3+"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/libindicator-0.4:3
+	>=mate-base/mate-panel-1.17.0
+	>=x11-libs/gtk+-3.22:3
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/mate-extra/mate-media/Manifest b/mate-extra/mate-media/Manifest
index aa62ac182210..289def6d639b 100644
--- a/mate-extra/mate-media/Manifest
+++ b/mate-extra/mate-media/Manifest
@@ -1,3 +1,5 @@
 DIST mate-media-1.24.0.tar.xz 568488 BLAKE2B 9c7d3f264489a3888ef6b45e4ce7e8c23a53634b3b72db32092889f1656afc8a6b2988b35e5ecdc0bb48ebb20c4e86b64dbc93ec308947159feb89877230673e SHA512 82ee6a16a49d9f4d229539cfacb5803c150af09dff227fb5995bf78e2b83a1f5bddb307756648e569a138124e4485ca56f635184e47fbfd76dcedd17f2bf0425
+DIST mate-media-1.24.1.tar.xz 568328 BLAKE2B 715ca7954039d020915e86fd8e574508ae1436c5ab99a76c18ccb55ab86a8d95c85c5de1a321684c895cde31832ec9e756b841f796bd9292ff84cf8240f21ff0 SHA512 88a8f1b8ee1684c6270ee65d17cd4d031830cd968069cae38a1844b0688cdcac25fc2e09c415d8e55c5b8564c4e0421e2c111cc44de9221bf37cf0e31dc572d3
 EBUILD mate-media-1.24.0.ebuild 723 BLAKE2B 3544a043bc4b33afa66f6e4cf14e9a92f254837223b63c0f9e7f21f646a94c99e3ca9bb3d0920d865a4331150028e918576dda7e535280fdcff3c5e5e5fcc7f2 SHA512 e18a108e62a0ee33b8b8cc8003c8d3c82bf3a610607f06d6a614a2af09db77b16230ac5335314a3ed236428e5e125a589f8e5ea4c795d019994604438a2cf775
+EBUILD mate-media-1.24.1.ebuild 722 BLAKE2B 72d3f870e4dcbf7f7f1d6ad99b820085e422cf51f40607393721864c9affcc8bc32669e7becd8d777c4a8ebd6e6b7054031f09b3a42b0285a7699d225dd71c86 SHA512 dea37bff3839c83daae49a219d9fad870142c011dfc468aacf555c7a146a164371be33f4a91eb239d4de7371336df4ce5957e9603756187b880eab994fb140c9
 MISC metadata.xml 339 BLAKE2B bd032fdad5c46fb56210712a25e50c24959053249e43ebe7da6a6d2cfb099642acc949db166abca0c847cb661c6b20d59f03366abc290b4e0656a547ede52a8b SHA512 6975819ad5dd4234e702e7eaa36a05f3598a830b3f997ea17f299e1e7a40f5d3463b732ca1816e7e9af015c4afeecff2ea94dc0562a20b31698870ffc0489968
diff --git a/mate-extra/mate-media/mate-media-1.24.1.ebuild b/mate-extra/mate-media/mate-media-1.24.1.ebuild
new file mode 100644
index 000000000000..33d437844873
--- /dev/null
+++ b/mate-extra/mate-media/mate-media-1.24.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Multimedia related programs for the MATE desktop"
+LICENSE="FDL-1.1+ GPL-2+ HPND LGPL-2+"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	dev-libs/libxml2:2
+	>=mate-base/mate-panel-1.17.0
+	>=mate-base/mate-desktop-1.17.0
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-libs/libmatemixer-1.10.0
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	!!<mate-base/mate-applets-1.8
+"
diff --git a/mate-extra/mate-netbook/Manifest b/mate-extra/mate-netbook/Manifest
index 655902bffbb0..68cd6ef1de62 100644
--- a/mate-extra/mate-netbook/Manifest
+++ b/mate-extra/mate-netbook/Manifest
@@ -1,3 +1,4 @@
 DIST mate-netbook-1.24.0.tar.xz 356072 BLAKE2B 843e90753e660e531377cc25880a1bbab8a8f200c293bd05454fbb2d27f333684cd1429bfa5596c308c039505752d53156bd83fc09e6eba955eea7267eb502ac SHA512 fd2efbfaa3fb53f96bf9bff28eba70d3cd46b723a63e6748af0cb8314821cbafdc8d0122d402e89ac2742247685e630544f3d98149514114de5a3e38f7fbe471
+EBUILD mate-netbook-1.24.0-r1.ebuild 640 BLAKE2B bcf513afe16d89328f67991b528db15131cc10e93905ac9bb8006b12e62ca498bf507ed0b33ef4e81a5adb387e8b36814500b1edee5cc4c75a497ce14c04e778 SHA512 5b5e9ddce5ba5a82a45a7a6903b8c95d416012a55319b2606e4dad563845a03349d8c4bc4755501cd4f42218430112c595282e27aa415a04cd871bd0501fa7ee
 EBUILD mate-netbook-1.24.0.ebuild 642 BLAKE2B e40f8f24e7b6b760ca2ad21a3dfe2492db65a6fbd85eef29d6c9709f30fe048758dd5170a4e2181b3e5963060bd38ca7ef9219d83d2c3aa3c1ecb821631c3ad5 SHA512 760635e867113a09d095804b5ca622069632082d563019ddc6efe66142e03d914d9991eee6e729f386614508a278c7215bbc9fd061a788ebe38633641095e933
 MISC metadata.xml 495 BLAKE2B 69f4f61082d017e4e92917edcfb1fc9be696c5472641b0cd81714c07a29f4495644f4120fbd0292f8c5d1d40b3642a095969281ed2c2ad8896ff3156c3fba3bd SHA512 8edc358ede2010384cdecc1e430aa9cbf90bb64c3f52d71ad2bf30d4cb84e38bdf48a4b2e45920b35ada734ffe4a46b44f363b6bf18ba2247f6abe290b5131db
diff --git a/mate-extra/mate-netbook/mate-netbook-1.24.0-r1.ebuild b/mate-extra/mate-netbook/mate-netbook-1.24.0-r1.ebuild
new file mode 100644
index 000000000000..fbc817ffde6b
--- /dev/null
+++ b/mate-extra/mate-netbook/mate-netbook-1.24.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE utilities for netbooks"
+LICENSE="LGPL-2+ GPL-3"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=mate-base/mate-panel-1.17.0
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libfakekey
+	x11-libs/libwnck:3
+	x11-libs/libXtst
+	x11-libs/libX11
+	x11-libs/cairo
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	>=dev-util/intltool-0.50.1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/mate-extra/mate-polkit/Manifest b/mate-extra/mate-polkit/Manifest
index 769fedf5835f..24bc9d24f3ea 100644
--- a/mate-extra/mate-polkit/Manifest
+++ b/mate-extra/mate-polkit/Manifest
@@ -1,3 +1,4 @@
 DIST mate-polkit-1.24.0.tar.xz 332652 BLAKE2B 293d964f2410d2f60047d1e01e2ba864c22e8bda00e5b659329d097391b2988349c70dfbd953f223c4212887d16d54f1f5a7eb21e38b69b553d54b1966647cb1 SHA512 8d759bd5f78750c75dc92ffa27e555ae36ae7199b76483cbfe7e0848d3a66cda5b82c98bf334068eb79a1344757665cf7d1bf403e4e908e332ca929c8ebe2a98
+EBUILD mate-polkit-1.24.0-r1.ebuild 890 BLAKE2B 014164db70e1bd8b397216399094311e43f3612cba45c2cc51dc643a12d8f8aac9ecc941e055f86eff7ecba18e4401f343c72275b31ebabf3f8b402f6e8daad4 SHA512 b376f1108c45bfce0aceb36382df13982dfd6faece4f5ad61b1e40787096bad2eede67c726d3878bf56b6642e6ff5139a8f74c68474e51a904f12a20c69c5908
 EBUILD mate-polkit-1.24.0.ebuild 909 BLAKE2B 9f1ea23a2968804672ee3e5a71cf1c76115ad5d0e2dd6badea0168ef9ea3f50ec40f3f4e639957af57c7ea06a7e53d486954ad911bf36f99adec5c4761828ccc SHA512 f1e68e833cefcf16c5fd53e9e96abd4169d0269fc44df508a1a929ae6ff8bd8397a5c9207bd31fcd043d7c79d8cbfbb641d9869ea7ff621f6c1528def6562dde
 MISC metadata.xml 441 BLAKE2B 299b65dc443f658b080598b7e1dad457948870b53964f1fdf532192c5c4062ffcca29660003fd45bd6ac376f00b6511b5582ecc312c312179979a47ce9c4819a SHA512 dd57c92f8a4881df822821fa48ba75ea02eac47728fd2250fd15d79758be30b4dcc6bfcc7945de9b57bb64dde4139d32797ebbb7678b0d619c41c2eaaeb3129d
diff --git a/mate-extra/mate-polkit/mate-polkit-1.24.0-r1.ebuild b/mate-extra/mate-polkit/mate-polkit-1.24.0-r1.ebuild
new file mode 100644
index 000000000000..429c5e890f73
--- /dev/null
+++ b/mate-extra/mate-polkit/mate-polkit-1.24.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="A MATE specific DBUS service that is used to bring up authentication dialogs"
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="accountsservice appindicator"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=sys-auth/polkit-0.102
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22.0:3
+	appindicator? ( dev-libs/libappindicator:3 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	accountsservice? ( sys-apps/accountsservice )
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2.6
+	virtual/pkgconfig
+	!<gnome-extra/polkit-gnome-0.102:0
+"
+
+src_configure() {
+	mate_src_configure \
+		$(use_enable accountsservice) \
+		$(use_enable appindicator)
+}
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index 2a70d4c7b980..f66879dad7e9 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,4 +1,6 @@
 AUX mate-power-manager-1.24.1-libsecret.patch 10306 BLAKE2B cf9789f62117c3aded2ce2d73027393bb5c19364f847fbbddeaa7b3b9be1bccdff3b2b1de28198965d65d4f906994c7f91bbb45448cedad0515a8a35aef12e22 SHA512 8646269729d01287cdf213a2a20a262fb658ba95fac47b521dd727ac8a4c3b81776cd24f6d9a3afc9311a4ebf2fe5cacece1db9487ba74f6cb04f008fdbf6238
 DIST mate-power-manager-1.24.1.tar.xz 6245524 BLAKE2B b9be1aab7e2f397edba9a681310a9903b11e11abf1af8557c613a1e6bf7b89d5aa495ddfcef4bc23f11aa6aca215b86e3a1c9adfdfd481f0e4353268ca5dd7cd SHA512 57bae519bfa2894bc6923bf0932f823bcabe2dc0de06dc6676597708482b369a24f39bb94558163f0fdcc2d764702b87f58abc1793679a1c7fb7f53be074bae5
+DIST mate-power-manager-1.24.2.tar.xz 6194976 BLAKE2B 6f533f9d6cbe99e9acf6e0fe9deb641e771d38f80add33b1f51aaa27aff46e2bb77d7da60ee7994908667d34b6f05c868472283cf9fd52c251467482c7c64bb3 SHA512 edbad37f41e67219790dfe704936be6fcf1d727cdff3b51cb43234b0d48f53666361d0f048704a594a594b5e124d7d8ea9d626c560cbc23ba4de3dcaafbd55ff
 EBUILD mate-power-manager-1.24.1-r2.ebuild 1616 BLAKE2B 07bf9c2fbf929be13eb5adfb0f3ad63f7b54546df60b41d791a32e17410fcd8ab20e229ebfe574af0e7b9b9417918903742e27346899cf4e1974d886599953f0 SHA512 c183f8bd73a3ca03c8db60e2d8a18d4bb13147f9107be3523d0c580f87aa7727c10aa37d615646ebd303115d5f7f11a68460ae56feaac713a1b6285b32b1fffc
+EBUILD mate-power-manager-1.24.2.ebuild 1624 BLAKE2B 4dfdd3c1463555491e2c4290e7a099c3a4ac89212f8e51ac0f880b09f42d6cd273cab6873e83a866d337012e057ef9bafe70a98ff54e6795915f144a73a075a7 SHA512 e69c5cc4c1bdd2a0bc8e6e81453a90881fe185a1809782c64ef428d9ea23200686a91575b987a58b0ce3eba8f7a44ea0db5fffe3624870ae38fd14544f375c5a
 MISC metadata.xml 521 BLAKE2B f8f0c058645f6820653cc71154b94e7a8e0b0c221e18c6c50c53176f11ba0d7cfee37665bc7d138d81b44a6b80baf8266221b6a519ecc6ca129d604545ff9f75 SHA512 0bbcf48a03fde54a8b12ebfa3991ccb2e930a10496a39999c36640a971e4fb87acbc39fe88f1a72803ddaa10638ff4b1a9009858ca4ac2220529ce06b485a517
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.24.2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.24.2.ebuild
new file mode 100644
index 000000000000..0e47db7552d7
--- /dev/null
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.24.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
+
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+applet elogind libsecret policykit systemd test"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+# Interactive testsuite.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.70
+	>=dev-libs/glib-2.50:2
+	>=media-libs/libcanberra-0.10:0[gtk3]
+	>=sys-apps/dbus-1
+	>=sys-power/upower-0.99.8:=
+	>=x11-apps/xrandr-1.3
+	>=x11-libs/cairo-1
+	>=x11-libs/gdk-pixbuf-2.11:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/pango
+	applet? ( >=mate-base/mate-panel-1.17.0 )
+	libsecret? ( >=app-crypt/libsecret-0.11 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	policykit? ( >=mate-extra/mate-polkit-1.6 )
+	systemd? ( sys-apps/systemd )
+	elogind? ( sys-auth/elogind )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-libs/libxml2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.24.1-libsecret.patch" )
+
+src_configure() {
+	mate_src_configure \
+		--enable-compile-warnings=minimum \
+		$(use_with libsecret) \
+		$(use_enable applet applets) \
+		$(use_enable test tests)
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	dbus-launch Xemake check || die "Test phase failed"
+}
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 4c7056ae8455..9944a9339387 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -1,4 +1,6 @@
 AUX xss-conversion.txt 1026 BLAKE2B 4675ecb7d7ce45b28183ff503739b5d3853e8a68adfb8e4bf92274944c034d4f043c8854cc54a801ad72160bf452c645dfc5a0d35a71b967c9094f2a8464e59a SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a
 DIST mate-screensaver-1.24.0.tar.xz 5075860 BLAKE2B f669cb9ce1c84cdd2dd84b1c88b668ad1910102ae5d9765117d313b6ece03e535b5fdaae600d8f3315346ac1109d1316e15c0dcac5bd4a637b682fa7b5d1e22b SHA512 8947b85ab8b006a1756649131a9184e4eb8f44c563f5a1b55840aa8280820713bca1ce46fece92b5ac44a73193bfe965e8ef0d17e8e403a751807ee72c674cc0
+DIST mate-screensaver-1.24.1.tar.xz 5073836 BLAKE2B 501c8dffbb5e53b88414c799a6e4d25cf89dfe490e6a902901c339b142e2b687dc2e668f65349a2ff43b6eb44d7721658de771b1a698624f95d1828da2fbda67 SHA512 f7cab280da90623ad265beb84770e48431ae6685fbb1eabc7cd2ad07b0f8ed5da2426017243d83271b969d2e020b8afcc93a6135b4c8e42a29f454a4e826b277
 EBUILD mate-screensaver-1.24.0.ebuild 3080 BLAKE2B 9a7966ce3094c466b4c863167d3f7a50ec44d1674e5c806ec9b84fdb3e1deb11cdc91ddfa0ebe0202bcdfba91e9d29e584ddee11d29554c15d84d69311419f73 SHA512 7ae2ff9ba2e8b08e5fa8b262f24514ae638bf6f65cf3c8f40e142b11b5dac241523ec0851c2130cc18c551ddecb16dd4f3beaaf0599bb108534f2a26541dd3c8
+EBUILD mate-screensaver-1.24.1.ebuild 3082 BLAKE2B 4060cf692693cc4d2538eb7731b54a16d02cc7934a135cfeda31e2d71d8d0c9cf30903a9638bda57fe4418596c452a30494410e13dd92628828c49050151c37b SHA512 027c56f31fec71e0b4540c35735e0f46f678ca8f391855b80d64184880cdf3069cafc8f5c3de1477ee0f88dc6477f79890c4109cf4c29c26d2c962abd66ac8c2
 MISC metadata.xml 447 BLAKE2B febc277d7b427ae9a48c3c6e318b779f8a3fb9e27f896b17a3ebafec9bc8b03c4af3f30de7881fcc7feff674fdc0106d0b46f91d72d7267d4c4eeffb1dbe341a SHA512 29d7b99ddd69b2503d91f185679e1811403ba34443e20e2b17782878ee509565dcd62c2e3339709b3d29f568168c9c5c5a9284823d0187392220e781792b73e8
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
new file mode 100644
index 000000000000..485f4ee1e39c
--- /dev/null
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.24.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate readme.gentoo-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
+
+LICENSE="GPL-2+ HPND LGPL-2+"
+SLOT="0"
+IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.71:0
+	>=dev-libs/glib-2.50:2
+	gnome-base/dconf
+	>=mate-base/libmatekbd-1.17.0
+	>=mate-base/mate-desktop-1.17.0
+	>=mate-base/mate-menus-1.21.0
+	>=sys-apps/dbus-0.30
+	>=x11-libs/gdk-pixbuf-2.14:2
+	>=x11-libs/libX11-1
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86vm
+	x11-libs/libxklavier
+	x11-libs/pango
+	consolekit? ( sys-auth/consolekit )
+	libnotify? ( >=x11-libs/libnotify-0.7:0 )
+	opengl? ( virtual/opengl )
+	pam? ( gnome-base/gnome-keyring sys-libs/pam )
+	!pam? ( kernel_linux? ( sys-apps/shadow ) )
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd:= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=mate-base/mate-session-manager-1.6
+	virtual/libintl
+	!!<gnome-extra/gnome-screensaver-3
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8:*
+	x11-base/xorg-proto
+	virtual/pkgconfig:*
+"
+
+DOC_CONTENTS="
+	Information for converting screensavers is located in
+	/usr/share/doc/${PF}/xss-conversion.txt*
+"
+
+src_configure() {
+	local myconf=(
+		--enable-locking
+		--with-kbd-layout-indicator
+		--with-xf86gamma-ext
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+		$(use_with X x)
+		$(use_with consolekit console-kit)
+		$(use_with elogind)
+		$(use_with libnotify)
+		$(use_with opengl libgl)
+		$(use_with systemd)
+		$(use_enable debug)
+		$(use_enable pam)
+	)
+
+	mate_src_configure "${myconf[@]}"
+}
+
+src_install() {
+	mate_src_install
+
+	# Install the conversion script in the documentation.
+	dodoc "${S}"/data/migrate-xscreensaver-config.sh
+	dodoc "${S}"/data/xscreensaver-config.xsl
+	dodoc "${FILESDIR}"/xss-conversion.txt
+
+	# Non PAM users will need this suid to read the password hashes.
+	# OpenPAM users will probably need this too when
+	# https://bugzilla.gnome.org/show_bug.cgi?id=370847
+	# is fixed.
+	if ! use pam ; then
+		fperms u+s /usr/libexec/mate-screensaver-dialog
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
+		ewarn "You have a too old xorg-server installation. This will cause"
+		ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
+		echo
+	fi
+
+	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
+		ewarn "You have xscreensaver installed, you probably want to disable it."
+		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
+		ewarn "build xscreensaver with -gnome in the USE flags."
+		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
+		echo
+	fi
+
+	readme.gentoo_print_elog
+}
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index eabdbdd333c8..b41766d599f8 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,3 +1,5 @@
 DIST mate-sensors-applet-1.24.0.tar.xz 580536 BLAKE2B a72198917a3b87c1a9ed941aa272cab7439bcd07cb1bb2dbadb0fcd21bb5d6f1cc05986800de7d0f68c2c260cf9556f1e239a2ad2fd01bec8bdccad0180117b2 SHA512 039834b7cfe641e670e372e311da3d737254ab3cf13b27e71c6555888ac1165766fe2d940bcea44a5ceed5f0ddcd3390d01331d927121137c21a6647c68875c2
+DIST mate-sensors-applet-1.24.1.tar.xz 578964 BLAKE2B e9a7eacb032738014c3e91595ae1f2673973b20c09fd02bd186aa5468773a1322022fbb245b9ec6e9c987405014b91e0f7c12e072f9c3ba6cd9df32c1ee99703 SHA512 3bf21d501e067a2ce002c5149f42161cc6917609ceb2396b705e905987cb4d989725ca825c6de7bbe4e950f7a01e755c2cd5b45532d6f65aef690f394741489a
 EBUILD mate-sensors-applet-1.24.0.ebuild 1335 BLAKE2B 7160531f1356b6b10f554aa06ac752287f34359a8bdc912eecc1e163c28bdcd4b4f0046afea25c137efd0c4eb8c9c7e3b614706f68c77f6f80223eb9f661ed04 SHA512 8847de42c71ed2e27cbe54316c6c453844cf94cf27ddde7328a214d261db22f37e364632664bc755ad90e23cfe8a771b6ba72bb909f419625bb00737700874a5
+EBUILD mate-sensors-applet-1.24.1.ebuild 1302 BLAKE2B 9bd28123ab68d71c5d41b88109e9f71bffe9760a680b3cb9e57d3a0fac2939ca1fa3c62acffa5d58208593c597a03c9dcfce204b18a9c6d2f2778a100bc89a32 SHA512 6d34b82c622e9a18cacedd0b8dffae400856183b0c43e50512765c1b6da9226f65cbf5c74fa5171a8cbf30691134f5df953c5a136cbf221239847cb6a94a4783
 MISC metadata.xml 348 BLAKE2B 3e34850491c3dce6bfe3771ed94ea37e68d9c8131594f4056c40e754f5556a4dbf03e434a0f3d19eaa6177a0a484a1b50b8de1c67a4eadf1faf6e5b56fa70166 SHA512 32cad99749c326ae12caa346b0bbf85779cbf9f35b85c4f729358dd7171d468f486c761e33d2938fcac445485ec256d733150d7dedc7c9e6b271702ba7c454ab
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.1.ebuild
new file mode 100644
index 000000000000..eea8796ced63
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE panel applet to display readings from hardware sensors"
+LICENSE="FDL-1.1+ GPL-2+"
+SLOT="0"
+
+IUSE="+dbus hddtemp libnotify lm-sensors video_cards_nvidia"
+
+COMMON_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
+	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="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:2 ) )"
+
+src_configure() {
+	local udisks
+
+	if use hddtemp && use dbus; then
+		udisks="--enable-udisks2"
+	else
+		udisks="--disable-udisks2"
+	fi
+
+	mate_src_configure \
+		--disable-netbsd \
+		--without-aticonfig \
+		$(use_enable libnotify) \
+		$(use_with lm-sensors libsensors) \
+		$(use_with video_cards_nvidia nvidia) \
+		${udisks}
+}
diff --git a/mate-extra/mate-system-monitor/Manifest b/mate-extra/mate-system-monitor/Manifest
index 19dbd5ec970e..f0435a3178ba 100644
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -1,3 +1,5 @@
 DIST mate-system-monitor-1.24.0.tar.xz 2437396 BLAKE2B 78c8774ee1832772b2cda06bca051c91e10e882b841373e3f30575ab1d05cc2b799962d964be4cc8416f9747e44031e579410d9851bb82d6a13f6023f1a30b2a SHA512 430a2bf81f447143ba53cecb1c2659903cd957e313f6690adea363e9a8deccfd4ad64ebd8ce18dfb31a67fa7b51cbe087ffed7b5dcba5dd03b1010ec41b4d282
+DIST mate-system-monitor-1.24.1.tar.xz 2420872 BLAKE2B 27572e523ea358a5315b6a42dc29e6c48c4341d4cdf34edb039429a455e1d924417aeb8602e0a71d4e71b04988ccadc82bc84794411644eefb1bd976e5744e90 SHA512 5fdf8ff52584f91fbe12270af2b5bb1c81d5c4d6001bdaad9c6001dbb6e6020254048e32aa6549eb686ad17998c1aa220e5463057502ba514c4a5b82953f2b05
 EBUILD mate-system-monitor-1.24.0.ebuild 1249 BLAKE2B a7bf3a309d34a3048370637503b97ee631353dfe463cbd6d4626b7966c02c640787843d8875c67d262caf8ee94195d696311508505913335dfc78c77eeac9fcf SHA512 98dd6ff095b7bee2d21023af6c57b8e7eaac291302f2f4c916d8173b7191f4da0600c9f04a2e9cb3b53e92865addce88514c0651744f6dae01f1bfa94ab51aef
+EBUILD mate-system-monitor-1.24.1.ebuild 1247 BLAKE2B b5d9a29a8b6830de2c69c2ee3755091eb76ad6cabc07d31d87f5b4ab7605f8facd533e8fcd71cb64a5ba276346636ae7d8033468b56a559e6df15929687a0c06 SHA512 6a2d06eefbaa19a49a0f89d7dd138d243524664e526383da2fd34d956a7e7060024b47b63a8cc2465e802ae88da0487bb7b29f45c9dfe6468f26d4b2c128579f
 MISC metadata.xml 348 BLAKE2B fe7ff06b7a0366617fb30e7a98fa7054c32469bf49691855183ee7b9991c1aebd5f431081e5d7efe07ab3a2b2424630bea621c2b3369338f6bb5348d1ba70de7 SHA512 4cb1bd5f11887274393c957be697ce784af74a39258ead2e9ccb586ac8d4bcab06a6aa2a76e8f96a85d2d818092250eede243775b61222493739440c59cc9c9b
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild
new file mode 100644
index 000000000000..a489ee3adc34
--- /dev/null
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The MATE System Monitor"
+
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="elogind systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+COMMON_DEPEND="
+	>=dev-cpp/glibmm-2.26:2
+	>=dev-cpp/gtkmm-3.8:3.0
+	>=dev-libs/glib-2.56:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2:2
+	>=gnome-base/libgtop-2.37.2:2=
+	>=gnome-base/librsvg-2.35:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libwnck-3.0:3
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/polkit-0.97:0
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/autoconf-2.63:*
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=()
+
+	if use elogind || use systemd; then
+		myconf+=( --enable-systemd )
+		if use elogind; then
+			myconf+=(
+				SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
+				SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+			)
+		fi
+	else
+		myconf+=( --disable-systemd )
+	fi
+
+	mate_src_configure "${myconf[@]}"
+}
diff --git a/mate-extra/mate-user-guide/Manifest b/mate-extra/mate-user-guide/Manifest
index 7ddc6777f8ec..ccab810c1507 100644
--- a/mate-extra/mate-user-guide/Manifest
+++ b/mate-extra/mate-user-guide/Manifest
@@ -1,3 +1,4 @@
 DIST mate-user-guide-1.24.0.tar.xz 9029524 BLAKE2B 304209588d67f83e0d3505277a2a964c7f76582755073886ebac5693a3dcd771bde1d1547430ac94113929da0441c85f5f86a6f27cb995c252a770d44c113154 SHA512 80129fcbf628dd10d0748d0a35f9456c15a3748c1cd407aa7adf4d90e5f87d999778d136d772c64392279152da9b76912378b16a894f03dc5d11bec478ad6301
 EBUILD mate-user-guide-1.24.0-r1.ebuild 515 BLAKE2B 800ac8965e40aa057ab2cb4ac11fb3d22e0ebcce687d775a30b498fef83711c0734eb3acf467bcfd4b6211f331e0149a39d4cf8f37616f716bd428be662d1d4f SHA512 fea873ae2b677d428f6e438e2d7ef19784a8e5782d7110146f2a4e9c768a4abb0a0a87fa8388edf5953b68d58b18d7faf773c67a21f647352622d890411a90f8
+EBUILD mate-user-guide-1.24.0-r2.ebuild 537 BLAKE2B 0a3b383d19dc9ffe16a408c365d18142a3732d18a8720ee1ee960732a8312793aea68b29b53b03e8634b0cc2e8b7c9b310440e3ca422500c677d2ade278ac707 SHA512 867a56a2ecf36de38f7ff893e16f30f7a123c9ae4e25678157ead1d1981761897c053ade4c27214167db8ac6866c9205f246cb48a5f7e7992eb81c324f4bc6db
 MISC metadata.xml 344 BLAKE2B daf4b6a1920fba3efa9c5253a08edd91d26b90fe9a81bec69de4c3f21423ad9d7fd8b5ece9036c3e834900fa60b483e7c73b7572bdbbe8a31d16fc81a50aa09b SHA512 d0ce9f32a04fdae27a476a7197b067f85b1a4889ab758af1c761d2d59c6ca295a6d623db51a0296c64d3a6fb9ff9bea9577002f34020009b967d594b540440f4
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.24.0-r2.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.24.0-r2.ebuild
new file mode 100644
index 000000000000..b7c4ca9b315f
--- /dev/null
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.24.0-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="User documentation for MATE Desktop"
+LICENSE="FDL-1.1+ GPL-2+"
+SLOT="0"
+
+COMMON_DEPEND=""
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/yelp
+	mate-base/mate-desktop
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	!!mate-base/mate-desktop[user-guide(-)]
+"
diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest
index 4ef0ebee2491..5523e0c84b62 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -1,3 +1,4 @@
 DIST mate-user-share-1.24.0.tar.xz 1008992 BLAKE2B 0fe21e49ff30c88c32b6b88aba84e58b3e6310d3bbd7a4873be460c97366828a7edfd24be37d2c10ea88a51c6990ee482ad595582d288ded2e4f7e0ca6f0b4e0 SHA512 15ede8754bf95ac78844cd9645a43d2deb8419dd550aee5263936d710cd13ce7f4a68cfd53e589c2dd37f87f59c9e8153f8abac711a3a7f88a2e2789dbd4f664
+EBUILD mate-user-share-1.24.0-r1.ebuild 1100 BLAKE2B 2dd083ad60b109c651ad46c2179326286c5d5e4891d0fbbbbf73a6f069826bb28dfa46215d0b350b33e4462cf6126f9733cf442b1ec89c499bb515db6e083f39 SHA512 1dc25f06dda89668b41046e76bc5db7c08ea93bdd26d2528cfbdb6044dc9271263d300475407276769cb3189d3e68457ea8aedf875c469fb270291167960fd10
 EBUILD mate-user-share-1.24.0.ebuild 1102 BLAKE2B 975da5ec09b6f4c1160a742905d10bc4e1c9770be0723dc9ec97e4ce8e59d3f44c2fbfde5bdfa1a8404d3d8d8c5fbc6d7d38e7479561834457f8d024b0f78683 SHA512 9cfecad9df86b00fa698f633602d77de3b554600d40703cc3a2cb26f64ad7eb566653269afda1f764d90a0b8e50c61d3254b87dcdf30e5047f6b620f1258d77b
 MISC metadata.xml 344 BLAKE2B 72c35ab850378b1f7386ba3d9da729e2855c20779d23a1a503186706bff164487c5f0d398dcc96f4056c2a670f815e2de874f89ca6ffe0c85749fb61416c9d7d SHA512 866efce9c0b0fbd2b8916c71d07b42a255bda4a2c4f269a6fe3390b9913aa148b44ad4b6f779f964e51715f2cc79dcdfe9e8096f2382b3e35f3bda38d8646001
diff --git a/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild b/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild
new file mode 100644
index 000000000000..5b09cfcba02b
--- /dev/null
+++ b/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Personal file sharing for the MATE desktop"
+LICENSE="FDL-1.1+ GPL-2+"
+SLOT="0"
+
+IUSE="X"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.70
+	>=dev-libs/glib-2.50:2
+	>=mate-base/caja-1.17.1
+	media-libs/libcanberra[gtk3]
+	>=sys-apps/dbus-1.1.1
+	>=x11-libs/gdk-pixbuf-2:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libX11
+	x11-libs/pango
+	>=x11-libs/libnotify-0.7
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=www-apache/mod_dnssd-0.6
+	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--disable-bluetooth \
+		--with-httpd=apache2 \
+		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
+		$(use_with X x)
+}
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index 4470030ff066..b9037a010fed 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,4 +1,5 @@
 DIST mate-utils-1.24.0.tar.xz 7930068 BLAKE2B 0e2c82afbc2d8a90b8c31d56d9bfbb3a477b1e9cd67108e52c96f4087d09336ed9e6980551e39b43797743b9ef86cc2beabfa84fd7a5820e38122e0d0a7c968d SHA512 d8945c85936a55d22f3ed94c9858ba84cadf552a63cdd2d9eec9120111ad71526ac88772f8e4b7a6a460b691574534e52706fba35a0395b1d894b27eece9e92c
 EBUILD mate-utils-1.24.0-r1.ebuild 1446 BLAKE2B a8e3f2c898596884e2fd5cddb519747e0e7d69efddb98c41ae9943e64f6e37096e4d9afecfef222ad060c875f50bd044c81c24ef8bda1e04ed2d40994d6d95fe SHA512 4aa7e34aa7eb2471166279e5062fc63bd37e26cccd407b7f08901c259851d841d176cbf28727f3c7df35b5e5709c2d380b3f7d5671ead8596150cfb940c3eb26
 EBUILD mate-utils-1.24.0-r2.ebuild 1472 BLAKE2B 24536bfddb8365c55c0a06940580dbc750a1a166d0d0882ddcf23eda6fc815d0e6930b12a623924281b59b26b4d6227764cb6d653db8901c3de5337a84204ed5 SHA512 c92aedd66b91e61a0faf0e6f536f7ec72a83146b9e248bf4ac8acd6582869adbbcd40b017ecc409eb3d6e7366c342af43dd858150aee9ba3d5c24413045707c4
+EBUILD mate-utils-1.24.0-r3.ebuild 1449 BLAKE2B 3b7e579e51c38c965d7d065d56b80b5acd88fa14846ac1fd03e2dc7c903e3b8ea4e6b2280f4b0fa949372b2d2a6065213f1af37e96ed9a25cb3251f91ec4e2a8 SHA512 8ecc2c36655fb2b7e2bec374a01d535a5eaabc292eec2bc625816d79062ea45b366d2dcfdb4cdb8f566a3fcb845adbff4fd9c54ef7f9fea7a7c8e6d3284c3263
 MISC metadata.xml 417 BLAKE2B af181dbce0a3bd1d40160da5b7b1be3a4ba345b3d31dc8d4988a146af5318bf473ad2962e9fd63fa2bfa74e61daddb5e84dd977891dee5b3b483189321bf7b1f SHA512 4c4eeb71f1cbd778f48f19da5185d9a75444a87a7abbe5d055e032f38b9891e996af84a383d7bc67ad11113da09ad034a159ec425b106340c696fad479fecee4
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild b/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild
new file mode 100644
index 000000000000..4ad6eec71a55
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Utilities for the MATE desktop"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
+SLOT="0"
+
+IUSE="X applet debug ipv6 test udisks"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/libgtop-2.12:2=
+	>=media-libs/libcanberra-0.4[gtk3]
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/pango
+	applet? ( >=mate-base/mate-panel-1.17.0 )
+	udisks? ( >=sys-fs/udisks-1.90.0:2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	mate-base/mate-desktop
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-libs/libxml2
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	# Make apps visible in all DEs.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e '/OnlyShowIn/d' -i {} + || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--enable-zlib \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_with X x) \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6) \
+		$(use_enable udisks disk_image_mounter)
+}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 7006fd6bc38b..e88187f7e17e 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index 7ea1de2e0657..e7cf08c8625d 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,4 +1,3 @@
 DIST encodings-1.0.5.tar.bz2 713817 BLAKE2B 43e466c27fdf485e9704debb89c69a3c3eaecf84453362d86b53aa9c33d10b8f97f348ef35f8b430be101e8281ecce5d5f49a052929fc7cd37d94a7590645193 SHA512 920e49f0b3545f181a1574ca3280ac9adef1e68fe27566c195dd7013f728d355c0d759132789357fcf8fa7391fcbe1e17edf2bd85aa5611df5a4d99740011008
 EBUILD encodings-1.0.5-r1.ebuild 548 BLAKE2B 5038c2c17be14338a2801ea2286891c42fa57e84957a0e18db7c8730a82440f67ddd89e5424891388f217f1944da53995c8f4600856d232ef64ebf2f33680cd6 SHA512 07251da4202b9bb85375579ad5777418174fbe5715c0f11cc23d64a76eeb870f2b1ae93abe8d52bfe26e98a594dfd900a6925db8b0a0fd03d346ca291fb285fa
-EBUILD encodings-1.0.5.ebuild 669 BLAKE2B bc2d5db13539e8a6c07864e6f5d48316d41503de9d46ff4da400fa8343d2bdd6f4952e4ab7753843bc3fdbd439e561b22adb5604219843506f6315287e999be4 SHA512 b439c884299a301c1efa3e7e9d2a70d78093de60d01dd151f99241b022cd3859afffb3cdf7215f6185863455cedc27f9c4c468f087e1fb7f860c298ce928f232
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/encodings/encodings-1.0.5.ebuild b/media-fonts/encodings/encodings-1.0.5.ebuild
deleted file mode 100644
index 7cb140ff36a4..000000000000
--- a/media-fonts/encodings/encodings-1.0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# font eclass is inherited directly, since this package is a special case that
-# would greatly complicate the fonts logic of xorg-2
-inherit font xorg-2
-
-DESCRIPTION="X.Org font encodings"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="x11-apps/mkfontscale
-	>=media-fonts/font-util-1.1.1-r1"
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	font_pkg_postinst
-}
-
-pkg_postrm() {
-	xorg-2_pkg_postrm
-	font_pkg_postrm
-}
diff --git a/media-fonts/font-adobe-100dpi/Manifest b/media-fonts/font-adobe-100dpi/Manifest
index d1881e254a57..4e5f91e9b859 100644
--- a/media-fonts/font-adobe-100dpi/Manifest
+++ b/media-fonts/font-adobe-100dpi/Manifest
@@ -1,4 +1,3 @@
 DIST font-adobe-100dpi-1.0.3.tar.bz2 1113104 BLAKE2B 055d8723af853126125eed181d3752c8aa58f5820f7835fab624917ed8bd1bf428064e472811f6538116b3dafd8984f4a651a4ee26924722394535b12e645aa6 SHA512 27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987
-EBUILD font-adobe-100dpi-1.0.3-r1.ebuild 281 BLAKE2B 1f8aaf3ac825469b383374fdf0654696ff2fef1fad6802e20c402fa28f93963acd0eaba28298b90abf3f4f791c57c17593d79e1b022fa237bf5f0ea201fea2bc SHA512 a7baeca6bcc4aa4e7d65a2de56c2148ba63eab255e29282484483c94ed3436bd90925a42dd70d1c1fdf7b0d5d9ebb026f8b5c4cfe0e3cecfd15074a490155d0b
 EBUILD font-adobe-100dpi-1.0.3-r2.ebuild 245 BLAKE2B b3d38c57a9b9bf8ff93736782e20d7feb823638b19838ce7fb1f9aeeb7f989f4ed2652d265b5adbf8a3e94eceb3691669abaa0e8c8bea0095347eabf723f5165 SHA512 ab7aaaeac3124b40eb2754789a0f575ace304bc7c8093c88d54a9a53dc68d4580593261ab88cc3171bf895f68c0cd1564ac2dada880936f8aca01db948b4ab7a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild
deleted file mode 100644
index 4527e822d4c4..000000000000
--- a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Adobe bitmap fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-75dpi/Manifest b/media-fonts/font-adobe-75dpi/Manifest
index 7598a5cdf8f2..81b51c208bc2 100644
--- a/media-fonts/font-adobe-75dpi/Manifest
+++ b/media-fonts/font-adobe-75dpi/Manifest
@@ -1,4 +1,3 @@
 DIST font-adobe-75dpi-1.0.3.tar.bz2 889542 BLAKE2B 5ca08b27bbf9880794862615af9e6e5b566fea6529523fa393136221690bb244c1a39ef90f939a0275fa8e176a84f9a4bfe0f464acb0549927bfecf6c6831e13 SHA512 c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d
-EBUILD font-adobe-75dpi-1.0.3-r1.ebuild 280 BLAKE2B 9e003a0ba804a63bf8ffa084eedf88d45bbfe333522dda2a728ef42f8a6db5f74de915785f04b096090e4fd5cbfd908abac4411d6746e02bb05405a2a8574aea SHA512 b81fe7390b05b03774e86c0847ff3975a33043c3a4e9bf1ebd2e78944c2cb57d5d7e9fc78cdd9f9fbe753e75712e525065812419200b092f3bdbfed636eeaa33
 EBUILD font-adobe-75dpi-1.0.3-r2.ebuild 244 BLAKE2B bb64037535ffd5755fe8e8297ac3605e3979347ab48d27a3556b438a03d340cc03c84c56be9c91cd0d024cae3e14c2dd1b3c98d8d8acee91d6291b983cd1bb8b SHA512 9c7ce29d5eb48eee02b531a7d3589a4dd55e1d538c3924dd1bc55cde28be2c67cc742a73e50d1317f29129d0607c5dfcfdc095f9949cdf31525bc9ac8a04c8ba
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild
deleted file mode 100644
index 715c76de0c96..000000000000
--- a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Adobe bitmap fonts"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-utopia-100dpi/Manifest b/media-fonts/font-adobe-utopia-100dpi/Manifest
index 57bbcd4575a5..c2e995dfc657 100644
--- a/media-fonts/font-adobe-utopia-100dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-100dpi/Manifest
@@ -1,4 +1,3 @@
 DIST font-adobe-utopia-100dpi-1.0.4.tar.bz2 353852 BLAKE2B e5d37b5608725ca36987999aad269e3ed5a988069cbe232ece934f2ed71dfaa94ed78499e911f16f7f6d8114e684d501920bf927ab3551cc211f27deace2f613 SHA512 fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b
-EBUILD font-adobe-utopia-100dpi-1.0.4-r1.ebuild 288 BLAKE2B b844ee9da5684349076169e34961ae485bfc1841986407b170f2785aaec558c95c17a18b8edad560c2c26f015a87dd49f8f6cac291662d69a9457f992a86f2c4 SHA512 0a6c9c6ef29013865d5c5a333dc00854956ade3a85dbd5fb4ab52c618b79a9cad3eab1e9b4937e2fb9ab33979454ede71f869826d4303f8283347795ca083b45
 EBUILD font-adobe-utopia-100dpi-1.0.4-r2.ebuild 252 BLAKE2B bb340e4dc41dd3f37abf7f2959fb0722bc244c2a5c8744e2505265a56f86e50498e77b11128b852f73939475494a8752c14a0c7dbd42c7c50632293473cb0f82 SHA512 b788cbc365afdb7d3aa22f142fe736cf2ef0d45f4a9feff1d452b9b5458de4d76557dbf648f310ef8b9606418deb3c523a5a4d9969dfc14f1fee3184d9df08ab
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild
deleted file mode 100644
index 199434c3ce9f..000000000000
--- a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-utopia-75dpi/Manifest b/media-fonts/font-adobe-utopia-75dpi/Manifest
index 20460574f27c..6f41a40aef9e 100644
--- a/media-fonts/font-adobe-utopia-75dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-75dpi/Manifest
@@ -1,4 +1,3 @@
 DIST font-adobe-utopia-75dpi-1.0.4.tar.bz2 273484 BLAKE2B a304d690de9727c5678dc1613cf7c8960594607a5f21fea15d03caade18df23ea83ff62fe7bd6c12750a0c9ffd11c28d4507e811eb271a1d1f874f0bcf0e3a92 SHA512 c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92
-EBUILD font-adobe-utopia-75dpi-1.0.4-r1.ebuild 288 BLAKE2B b844ee9da5684349076169e34961ae485bfc1841986407b170f2785aaec558c95c17a18b8edad560c2c26f015a87dd49f8f6cac291662d69a9457f992a86f2c4 SHA512 0a6c9c6ef29013865d5c5a333dc00854956ade3a85dbd5fb4ab52c618b79a9cad3eab1e9b4937e2fb9ab33979454ede71f869826d4303f8283347795ca083b45
 EBUILD font-adobe-utopia-75dpi-1.0.4-r2.ebuild 252 BLAKE2B bb340e4dc41dd3f37abf7f2959fb0722bc244c2a5c8744e2505265a56f86e50498e77b11128b852f73939475494a8752c14a0c7dbd42c7c50632293473cb0f82 SHA512 b788cbc365afdb7d3aa22f142fe736cf2ef0d45f4a9feff1d452b9b5458de4d76557dbf648f310ef8b9606418deb3c523a5a4d9969dfc14f1fee3184d9df08ab
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild
deleted file mode 100644
index 199434c3ce9f..000000000000
--- a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-adobe-utopia-type1/Manifest b/media-fonts/font-adobe-utopia-type1/Manifest
index 53dfe739fc4f..98c5011b8db8 100644
--- a/media-fonts/font-adobe-utopia-type1/Manifest
+++ b/media-fonts/font-adobe-utopia-type1/Manifest
@@ -1,4 +1,3 @@
 DIST font-adobe-utopia-type1-1.0.4.tar.bz2 269159 BLAKE2B 0e23240a7b79a43c0508935b460e1f7f4cedc72e98dd903644b97d042983dde4c62610f53055d35717bdad56c5a9f52962bd11c4ee484cbb9b89b6c4c95752b5 SHA512 53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6
-EBUILD font-adobe-utopia-type1-1.0.4-r1.ebuild 260 BLAKE2B c2e871f984175ea867422fc907805a8227e52360377bd65fb73e1c39f62c18c03ee9c15e9853420dddc8e2288bd056d67c34b791f37eae2930380b023364db58 SHA512 90c9b3f33c6b4b4d9954981a6fb24709f528b6cddf338bb6c1cff77e3e073d2a6b463fdabaee60eb7ccf6243b833f01107bd045e6c6f9ee92c34ff25c151ae88
 EBUILD font-adobe-utopia-type1-1.0.4-r2.ebuild 252 BLAKE2B 29690a2b9d8eccac177421da3d7ef73ca9760a901f3cbf81cc4b1e57fe403aa661ae3e04906e91429d3fb61d0e3d9a533ad96495af0e6eb67cd6222206cb442b SHA512 5dc5356b8daa7f7c4cc5c55f02b9abef63f4ca1450d806692e236db2562f3ed0cc42d788256d2ed7c8fdb761f22fed702655df8336d63a335e6658040ec0b5d5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild
deleted file mode 100644
index 18252d694fdc..000000000000
--- a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index 8bc2b0b3467e..8a72aedbf0f4 100644
--- a/media-fonts/font-alias/Manifest
+++ b/media-fonts/font-alias/Manifest
@@ -1,7 +1,3 @@
-AUX font-alias-1.0.3-cvs-tags.patch 1240 BLAKE2B 6bed61707b1d6dceb6c6b89679b0714b9c02659db08efa004b2fdb8f56fa18b817fb509f5f8f8576329d35e221b489886835c86f683c913f025e87927cb932c3 SHA512 dc8beffe37539162a71d2a2635955d3e7c348406c14baf874448af8bc3a21495b27d1797e08153b40bb8e44c6af69137e7a754456e5bfa2f040f4a5c08ce99f1
-DIST font-alias-1.0.3.tar.bz2 102537 BLAKE2B a4a92e147a7c106c6feac39d7b2eaa5785bc4c086d2cf204587ed5b22b1633238b8ddfb8ef212ae84cfa0a61d018fec79cbf9c83b102c8073d3978dfa66fd007 SHA512 05abfef4615722d8cf3f21ab1118494522553a75427140d9753b3d312f404735c20766ceacc1b53f9e783ea25ec8f2f6bdb8696525a4962afe29f524ed8b6552
 DIST font-alias-1.0.4.tar.bz2 119248 BLAKE2B 40f4fbc7924c57d17cf7166d0d60c4231f83cbb85225c94e6387c0dc72aef106b1e665a1700ec857784047d9ee04eab422cc1f391a952dfdca1b7cd6af2a503a SHA512 c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d
-EBUILD font-alias-1.0.3-r1.ebuild 492 BLAKE2B beb34bf956e1564345b8f665ce35c30d6612df2802d4d9c9d9ce4e5afbdaada3c4d92eaa677c24a73912fa45bcc8ef2285807099225a1f7683f26e50977e4935 SHA512 7a689754264076cd8fd4df7d848271b6217373586b7fdb41e5d764dd39b83e7134e058f0d8348a6d43504cba15fb44a7cfb5277f3b96b563c99b42bf0d6588b7
-EBUILD font-alias-1.0.3-r2.ebuild 472 BLAKE2B 298b7682103dbe9014bc8a8b955b9e3191ae8db8aaae6dbb9d7fc36f301a376a38faac2892d28bfa5620ad5c70f75ce0831de3e1cf515c2335d7389a49d68024 SHA512 9e1f09feeb372a8d824dda636488facb1445a1f84a8c994dcc621d6a23660fd82b1368e3ace28ad788a33686c3c7f0c66826ad0ec5394b5015e152ac54b7932d
 EBUILD font-alias-1.0.4.ebuild 408 BLAKE2B c100e60af3209547b22149774fae246efe07aafe9e5eb4a54c2f0434fc9fa0da188aa5df516a1b9a458880e90e97a66496841e33fbf723702b1a54970191cda2 SHA512 d70350181eb52271ff1f222b1bfb9dfbed10b6588990a4d881d2f6012ec9fdd5a849dc70ead5a8d71f9088b241c715a00f0f6f9d3a2d2ec5efe8a136b5769569
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-alias/files/font-alias-1.0.3-cvs-tags.patch b/media-fonts/font-alias/files/font-alias-1.0.3-cvs-tags.patch
deleted file mode 100644
index 6c14a4d44671..000000000000
--- a/media-fonts/font-alias/files/font-alias-1.0.3-cvs-tags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 725970d993e44a2760b91bfdee7d6c2af61bffd2 Mon Sep 17 00:00:00 2001
-From: Jesse Adkins <jesserayadkins@gmail.com>
-Date: Tue, 28 Sep 2010 13:29:57 -0700
-Subject: Purge cvs tags.
-
-Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
-diff --git a/cyrillic/fonts.alias b/cyrillic/fonts.alias
-index f7d42df..be4c55d 100644
---- a/cyrillic/fonts.alias
-+++ b/cyrillic/fonts.alias
-@@ -7,8 +7,6 @@
- ! responsible for the proper functioning of this software, nor does
- ! the author assume any responsibility for damages incurred with its use.
- !
--! $XFree86$
--!
- fixed  -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-koi8-r
- variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-koi8-r
- 5x8	-misc-fixed-medium-r-normal--8-80-75-75-c-50-koi8-r
-diff --git a/misc/fonts.alias b/misc/fonts.alias
-index 0398476..732933c 100644
---- a/misc/fonts.alias
-+++ b/misc/fonts.alias
-@@ -1,4 +1,3 @@
--! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $
- fixed        -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
- variable     -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
- 5x7          -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
--- 
-cgit v0.10.2
-
diff --git a/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild b/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
deleted file mode 100644
index 3f5063665f05..000000000000
--- a/media-fonts/font-alias/font-alias-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org font aliases"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-RDEPEND=""
-DEPEND="${RDEPEND}
-	x11-apps/mkfontscale
-	>=media-fonts/font-util-1.1.1-r1"
-
-PATCHES=( "${FILESDIR}"/${P}-cvs-tags.patch ) #521786
diff --git a/media-fonts/font-alias/font-alias-1.0.3-r2.ebuild b/media-fonts/font-alias/font-alias-1.0.3-r2.ebuild
deleted file mode 100644
index 0c1c84ab7b0c..000000000000
--- a/media-fonts/font-alias/font-alias-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xorg-3
-
-DESCRIPTION="X.Org font aliases"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="x11-apps/mkfontscale
-	>=media-fonts/font-util-1.1.1-r1"
-
-PATCHES=( "${FILESDIR}"/${P}-cvs-tags.patch ) #521786
diff --git a/media-fonts/font-arabic-misc/Manifest b/media-fonts/font-arabic-misc/Manifest
index 036045898cc2..067efb9b5e72 100644
--- a/media-fonts/font-arabic-misc/Manifest
+++ b/media-fonts/font-arabic-misc/Manifest
@@ -1,4 +1,3 @@
 DIST font-arabic-misc-1.0.3.tar.bz2 112136 BLAKE2B 7ccd19008955a016398afcbb1202b9df34e7cfe6937152d443f2ff381564ef1e91dc4bb7dbb4ba6e5931bd7071ac4f570f2d8167dbc58029ee9a88f5ab18a5fb SHA512 46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0
-EBUILD font-arabic-misc-1.0.3-r1.ebuild 282 BLAKE2B 781ed3bf88b0e6e5667991f73d707fd4594cf9171bf448dac6c16c2e741e1919f6f53a6bb1deb36a8036ef153ec58e2e95f05b402eb344aed65f0319823522b0 SHA512 76ed85aa445ebd9864ca8e1424a318db9b707c0060b07751be9df92982626b253af8c722990742af0cc6d7de4eb874631764b8df3bd31210884bd5247b5d4a85
 EBUILD font-arabic-misc-1.0.3-r2.ebuild 246 BLAKE2B 046924cf11a83b60b5de44c47f141d588874188d9ba4648ce9e74efe2512ce411e4b582f5027edb2200a2244266ecf3fad372a45893649827dac2f25e0dd720e SHA512 066dbc1acfce1db1e2dcc1126b6f2797ec5a1277bcc040dba640ef874ba422c0fae94bcf759ade38cefbbefc398e3550d3c417e34f6e406b388b595f1345151a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild
deleted file mode 100644
index da2fb66c3495..000000000000
--- a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org arabic bitmap fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-100dpi/Manifest b/media-fonts/font-bh-100dpi/Manifest
index 443011573460..8031ec4f9b6e 100644
--- a/media-fonts/font-bh-100dpi/Manifest
+++ b/media-fonts/font-bh-100dpi/Manifest
@@ -1,4 +1,3 @@
 DIST font-bh-100dpi-1.0.3.tar.bz2 713206 BLAKE2B 3433efac96d56d91685cacf3a1ff93fae0378831164381b2e8f16dd216a042c8ed3d0ebd6c622b592b11cefe7822814df57c74e42ee846905a406af208616eca SHA512 60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2
-EBUILD font-bh-100dpi-1.0.3-r1.ebuild 349 BLAKE2B 2ea80d708d56b34f775d1c13bc232bd922aa17926bff8c5b3cca57477143a37def518301614becc6b58b72e21e85be535afaf39e74c49aad23624fcbdff1d576 SHA512 070e178a409965da26e59295a6b7fd75bdde8753306f4bc72a98a2940f7b7e6b8314a9e131fa8c9438f333ec692f536ae77795a3c2395b728aab2b6f209be3d3
 EBUILD font-bh-100dpi-1.0.3-r2.ebuild 313 BLAKE2B 5fc2705d1d32d243aaca40b2696cb211fdb9b0fbf611af33f69327b6a590f5104bbbdd77d16855ea30fdba2f06e533ef734b0320fea49fcfc2229b34e594db39 SHA512 cbda56a1100267536e315c8f6c26e1ca233b02a0f3c6c60ffc710aa4241695f0aeb8f66f80e15373d2bc5cf3dcbe93dcb0b2f4081f25b1381f05c7f6283875bd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
deleted file mode 100644
index e3deecf7029c..000000000000
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
-
-LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-75dpi/Manifest b/media-fonts/font-bh-75dpi/Manifest
index ad6206c44864..2c7570dc5079 100644
--- a/media-fonts/font-bh-75dpi/Manifest
+++ b/media-fonts/font-bh-75dpi/Manifest
@@ -1,4 +1,3 @@
 DIST font-bh-75dpi-1.0.3.tar.bz2 553016 BLAKE2B c39213ad487d577763939507c24709413e56147901d4bda5957004ae4c9b53dba4769e93886a7827da4ea149303d92d780f7c745f7de6cd89b6d69770158a52b SHA512 fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50
-EBUILD font-bh-75dpi-1.0.3-r1.ebuild 349 BLAKE2B 2ea80d708d56b34f775d1c13bc232bd922aa17926bff8c5b3cca57477143a37def518301614becc6b58b72e21e85be535afaf39e74c49aad23624fcbdff1d576 SHA512 070e178a409965da26e59295a6b7fd75bdde8753306f4bc72a98a2940f7b7e6b8314a9e131fa8c9438f333ec692f536ae77795a3c2395b728aab2b6f209be3d3
 EBUILD font-bh-75dpi-1.0.3-r2.ebuild 313 BLAKE2B 5fc2705d1d32d243aaca40b2696cb211fdb9b0fbf611af33f69327b6a590f5104bbbdd77d16855ea30fdba2f06e533ef734b0320fea49fcfc2229b34e594db39 SHA512 cbda56a1100267536e315c8f6c26e1ca233b02a0f3c6c60ffc710aa4241695f0aeb8f66f80e15373d2bc5cf3dcbe93dcb0b2f4081f25b1381f05c7f6283875bd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild
deleted file mode 100644
index e3deecf7029c..000000000000
--- a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
-
-LICENSE="public-domain" # bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
index 08cb8780ea27..14861b66c770 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
@@ -1,4 +1,3 @@
 DIST font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 245807 BLAKE2B f2cd40b5621aa3940e8047bd6b2ca588fde367512da196ebfa32469be06ea15c87641da8f81f14191a65dd5eb791de1256e26c5cc20e0dab3883834028003665 SHA512 1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f
-EBUILD font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild 357 BLAKE2B c77f8f0531cc41d10209a913fa5354f98a1573d02c2fda8b1cb46e044f913a9223b0fdd487651ea7772508a76d01eae63945d0f7045025ae68b72d09cad70826 SHA512 0f00a57c0ea32ca895b3ac358ad7c2c8829838f6e62b5d318a2ce02f81afe99a9d43b9881e8c2272c13d7474ee56dad7869c5ebc0f50cad973991ddfdb0a8ec8
 EBUILD font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild 321 BLAKE2B 386de55aa6b9b6d9628a26e334ccd2526aa137a18fe2526700de00562710c018c84fd8b73b2633d54d1338042a7278a1176858a8b921cacaedf699ceb3eb06b6 SHA512 aab13208213714a030d535a704462dc87e69441272141d4dc24c017a5b7b240481683bff50d211fb4836464f1cfb24fa3fa266bb39a8b65cefd67ce047e6c2b4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild
deleted file mode 100644
index a9111bd527eb..000000000000
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
-
-LICENSE="public-domain"		# bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
index 5fea3b976843..76491d6a41a0 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
@@ -1,4 +1,3 @@
 DIST font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 219511 BLAKE2B fe05029295ef04414dd37fe80d023cfbf423fd3c314d53cb71dc2e4c623634e8e5b911f7a92851f49dd66cc9939d4998d4ec78f705a52908d01e1dcb91f08387 SHA512 2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13
-EBUILD font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild 357 BLAKE2B c77f8f0531cc41d10209a913fa5354f98a1573d02c2fda8b1cb46e044f913a9223b0fdd487651ea7772508a76d01eae63945d0f7045025ae68b72d09cad70826 SHA512 0f00a57c0ea32ca895b3ac358ad7c2c8829838f6e62b5d318a2ce02f81afe99a9d43b9881e8c2272c13d7474ee56dad7869c5ebc0f50cad973991ddfdb0a8ec8
 EBUILD font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild 321 BLAKE2B 386de55aa6b9b6d9628a26e334ccd2526aa137a18fe2526700de00562710c018c84fd8b73b2633d54d1338042a7278a1176858a8b921cacaedf699ceb3eb06b6 SHA512 aab13208213714a030d535a704462dc87e69441272141d4dc24c017a5b7b240481683bff50d211fb4836464f1cfb24fa3fa266bb39a8b65cefd67ce047e6c2b4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild
deleted file mode 100644
index a9111bd527eb..000000000000
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
-
-LICENSE="public-domain"		# bitmap font, not copyrightable
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bh-ttf/Manifest b/media-fonts/font-bh-ttf/Manifest
index 6d97dabdb9d9..ed48399c9568 100644
--- a/media-fonts/font-bh-ttf/Manifest
+++ b/media-fonts/font-bh-ttf/Manifest
@@ -1,4 +1,3 @@
 DIST font-bh-ttf-1.0.3.tar.bz2 465351 BLAKE2B 2d508265128262b479f184341862687235af0bec4098dec269f257ad3d2ec94de08ccee4701612c9b747214b38587840a4051dbca2fa1852e859482eb8cf6ecb SHA512 36b5b6bbc2894cd90a372e8131281a462b42d503be3e9af8565edbcd954b336690aa86a0b6fb162d865ba71b65669c5b911658c5b820effcea39d086d485be25
-EBUILD font-bh-ttf-1.0.3-r1.ebuild 301 BLAKE2B b4fdeeb545172e8846699b1ce02f3028ad05fadff4f5d06a079043d11683a164d857a6af44399efd69b9285a3b35ae51381e1da16536808fff19615fc39a9683 SHA512 4367939552429190a96bcbdc49db25cb7f64015e20bda8dcaa651011453d3c5d4733e7c7ada499738f224022747babd39643c5b30add4f9cb0a342d3c6cde42b
-EBUILD font-bh-ttf-1.0.3-r2.ebuild 294 BLAKE2B 9df2142da0c76fdb6be899f2a207d2be396ac80a08f45bc204a656db94faa7749d93fc9b887991061726d9d79d846e4ccf57eb8a144e7b162697f0aee9c015d3 SHA512 8760664ff1bdecfd9d889e4af794c2de43856175c6ff1bbd88776d250520a1172ff3721c89828bc6e1eb77924b84d8bcfb749ea4135fab4293ad03ddb3a407db
+EBUILD font-bh-ttf-1.0.3-r2.ebuild 293 BLAKE2B 4733148b1278c0c60155b6dd8ae9c9e19af398609b2bbfd75a27642bdd910fe7d6204f4bcd90f51d3efb8d783e0d743f55906043b30965cb021741558882c131 SHA512 7219492cb0129c79a43abb0a51485201bf828da3cee72f0b1fbca54d07d35269c768a983a745f70758fa49165bb8931fde61aeb5d666c5905777788c2073a50c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
deleted file mode 100644
index d599e3d4e771..000000000000
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
-LICENSE="bh-luxi"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
-IUSE=""
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
index 76c1d8e4c597..d3f8d37b9dea 100644
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
@@ -7,4 +7,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
 LICENSE="bh-luxi"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
diff --git a/media-fonts/font-bh-type1/Manifest b/media-fonts/font-bh-type1/Manifest
index 48008be99bae..67ae5f05b56c 100644
--- a/media-fonts/font-bh-type1/Manifest
+++ b/media-fonts/font-bh-type1/Manifest
@@ -1,4 +1,3 @@
 DIST font-bh-type1-1.0.3.tar.bz2 637337 BLAKE2B 122df86566d86a8fa85cc1da3f7d1913a2df589c301540b2bdd73e96726dc5fdb16184f80d8a3a58e6bd1ca54e0f4a3a0f266a35747f500065746f0be209484f SHA512 dc6cfe7d78a549ae5368ddd2bb3edc6746648b32e1f22bce87f6adc0845ef4827cd3b2472d0afa17a16a2c384e84f74f1c7d807510798bc69089920fdc5486da
-EBUILD font-bh-type1-1.0.3-r1.ebuild 293 BLAKE2B fe164422178125e17beb9998894dd69ee010230ca9805508dafe14954bbb8711cc6147d3657bb095dea77395aa9f885b70095c49c40a35bf338572c72a1f693c SHA512 8fdfd94b4058032351b433fada7869d8a39b24fed0e0815b9bcc35f81f9a32ffd23ecff71de2fac69141108e5a973afd6b83ffa9ed1bbe304d53af8474cd7ebd
-EBUILD font-bh-type1-1.0.3-r2.ebuild 286 BLAKE2B f3f8136d7d07761c398fd56f2a2469a882f347c7437f48a511da879ea299645e437cc249c4861df36ccd4e6f67c45c1620c37c340566c91a6694e92df812b858 SHA512 ab7effbffe732a5cc065ad29fefd885e3ceab1f5ea1327b5f2c6adf49aa831d57df70b86ba086dc581f6b4d4fa4d33b960a91c69077a69f472b0855a74dcbe2f
+EBUILD font-bh-type1-1.0.3-r2.ebuild 285 BLAKE2B 33d0f7d052d409cc814748a451570da081421010b4ad8ecfb274841caeac3b4b973ad173aa257cde968dca2fe5c610e342b1e762e1b703c625b81c39fd25ec6e SHA512 712c0ee3de8f141ac64b80ccbf4b1a8ff9629bd50898fba948daaefbe3e1eb44bbe793c5d6ad0f718db337e6f610a08b34da443222f859e910e467fce5172a45
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild
deleted file mode 100644
index 124572fd44cd..000000000000
--- a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
-LICENSE="bh-luxi"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
-IUSE=""
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
index 2e4e51fa48ab..5b8cbf95bc9b 100644
--- a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
@@ -7,4 +7,4 @@ inherit xorg-3
 DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
 LICENSE="bh-luxi"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
diff --git a/media-fonts/font-bitstream-100dpi/Manifest b/media-fonts/font-bitstream-100dpi/Manifest
index b1821a4fa66d..64b2e95be624 100644
--- a/media-fonts/font-bitstream-100dpi/Manifest
+++ b/media-fonts/font-bitstream-100dpi/Manifest
@@ -1,4 +1,3 @@
 DIST font-bitstream-100dpi-1.0.3.tar.bz2 200276 BLAKE2B c5e4584642f49c30d8a1a17f3384a9bec8c3363ff7bc2cc1cfea8d04e8ad39e3f44ccffb461cf1508b5dc96b8a7fa6612b754cee6214fc1c6e6689c68e650819 SHA512 10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd
-EBUILD font-bitstream-100dpi-1.0.3-r1.ebuild 285 BLAKE2B bcb025ad92f5340a0879e19076f00eb8d44f35ce1b3047a34c1d5cfa750e337316b29a64a65a9fb652d3b7685b93655c274b94631477bd64ecedded7a4e6ce45 SHA512 26643c991d5d5374dcc8d1c12b2f4eb381b6f07d284b76c3d3c88fbc1ea895f9dd303c70d47a3111852d821deac2b3dc04c2f3c9e84872d3d739f2c853c02ed6
 EBUILD font-bitstream-100dpi-1.0.3-r2.ebuild 249 BLAKE2B 136709ed54aa9daa209ac08b85d6ecebb47f054479a60f44c9377a1c2106a7a3311bbc4a363982a2d80bbb4fd19d5c3ae41bcd5d9d9d48f9b73d4719c58c104c SHA512 eb5226ee7ccebf630f1f279d1564d63ea315f44fad8e0f55f2a8d568a3a69a8597cd8f7f6130dba243171c5a7766ed10e0a8378d544e45f5ae8152f1d76732e9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
deleted file mode 100644
index 36b5b965bd57..000000000000
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Bitstream bitmap fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bitstream-75dpi/Manifest b/media-fonts/font-bitstream-75dpi/Manifest
index f9ca88567980..aaf6f0c67daf 100644
--- a/media-fonts/font-bitstream-75dpi/Manifest
+++ b/media-fonts/font-bitstream-75dpi/Manifest
@@ -1,4 +1,3 @@
 DIST font-bitstream-75dpi-1.0.3.tar.bz2 174603 BLAKE2B a4d57cff621d57c27830e4ccf870d74fffe699d0ade6df32300a5f4de1237b263e449fca46879ac21329888820e48efd49f057192ce3ac11aae56243bcc3e1c3 SHA512 9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650
-EBUILD font-bitstream-75dpi-1.0.3-r1.ebuild 285 BLAKE2B bcb025ad92f5340a0879e19076f00eb8d44f35ce1b3047a34c1d5cfa750e337316b29a64a65a9fb652d3b7685b93655c274b94631477bd64ecedded7a4e6ce45 SHA512 26643c991d5d5374dcc8d1c12b2f4eb381b6f07d284b76c3d3c88fbc1ea895f9dd303c70d47a3111852d821deac2b3dc04c2f3c9e84872d3d739f2c853c02ed6
 EBUILD font-bitstream-75dpi-1.0.3-r2.ebuild 249 BLAKE2B 136709ed54aa9daa209ac08b85d6ecebb47f054479a60f44c9377a1c2106a7a3311bbc4a363982a2d80bbb4fd19d5c3ae41bcd5d9d9d48f9b73d4719c58c104c SHA512 eb5226ee7ccebf630f1f279d1564d63ea315f44fad8e0f55f2a8d568a3a69a8597cd8f7f6130dba243171c5a7766ed10e0a8378d544e45f5ae8152f1d76732e9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild
deleted file mode 100644
index 36b5b965bd57..000000000000
--- a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Bitstream bitmap fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-bitstream-speedo/Manifest b/media-fonts/font-bitstream-speedo/Manifest
index 44fbc790ff11..02af0aee6659 100644
--- a/media-fonts/font-bitstream-speedo/Manifest
+++ b/media-fonts/font-bitstream-speedo/Manifest
@@ -1,4 +1,3 @@
 DIST font-bitstream-speedo-1.0.2.tar.bz2 415776 BLAKE2B c9dd88ed2e7e4a4151254ffadf5254aaf460bf72086a798bbb946a3729be4795a477cced5441792e0d6967e6faf4ddcf72a212ec31b5641b5b67357d659b26e8 SHA512 78816cc0dd0c9ba3f1de6ba39754bdf19253fea3583ef1bf459ead4b74f2587bc38bbc0bfdc5066a8055c1c45091e44987f6d15e98b6cf4ee18f60c2431349fb
-EBUILD font-bitstream-speedo-1.0.2-r1.ebuild 251 BLAKE2B 85d1294df0dd493ebc244db975b0e1c82307cf25bad4469dc0e320972a4c9b181b655c26b7f027edd916b488f73a7a9aab301a2bdc3fa3ebd9a6521e09a35fc6 SHA512 e407b81a15f1d87b1be07de2345116883852cd578c38c8ed14abf74d92fa1ec7058bde44d8c37ba6ff8fa971f2a3c2ae678e67c205391a725623e577da6d2ef0
 EBUILD font-bitstream-speedo-1.0.2-r2.ebuild 243 BLAKE2B f6d03e2b14c55bf423f6c30573e270bedda2a5992844d4eb95990e36baa6c6daa05da91cb842aa70580b4f5297a00402dd37167f5618e8fdd205d05167f3ddec SHA512 87c17418ad2e3016315b1fb380a987547d2899de9f559467abf5f0a494c211d02dfe3200af71aebdc6c9d784ac014c18251b59632b80e64d95989a414382e9d0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild
deleted file mode 100644
index b2ce9f25a146..000000000000
--- a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="Bitstream Speedo fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
diff --git a/media-fonts/font-bitstream-type1/Manifest b/media-fonts/font-bitstream-type1/Manifest
index c7756b5c1e5e..854c8669098b 100644
--- a/media-fonts/font-bitstream-type1/Manifest
+++ b/media-fonts/font-bitstream-type1/Manifest
@@ -1,4 +1,3 @@
 DIST font-bitstream-type1-1.0.3.tar.bz2 415980 BLAKE2B 6877549e25cec38f46ef19ee3b34cc3c2b0f3aaaa497ab3d26e8514405ad09a384c87667e82a220d14a85f4ca448a1f939739b618e3ae62c1214b7c7de39a422 SHA512 71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61
-EBUILD font-bitstream-type1-1.0.3-r1.ebuild 263 BLAKE2B 636499ca29e08629373e43dcc8f34abea4c47972bb87dbb0c2d65c7b8a8c8dac36ca1e823ec3c06dfa4292aff9419004bffb8e7df0ef2c375d6db03aac17d870 SHA512 21363161dd375791b946c42699ca5ceb3ba2e41b0f11a1f398c25bb2043259265988df6d475b1fd814f2df67bae330124696feb9df3936a8eb6c8b77448249f2
 EBUILD font-bitstream-type1-1.0.3-r2.ebuild 255 BLAKE2B a345ddbc60b4020c1b9602b20895fee70a670a22ebe122f93dc8e47c88c6414f22e9352f682d4bd9fe8871c12be440a9bc1ce418cc65b6303f94b9b240ece9cb SHA512 2f453e9c89d76f3a69b92c37b21356cbc81f638c5f038467a937c4ccf51e5507d58e13a5246ff0e1bfd376ebb0041012274fed16ee059a0ff367ab225ff1ac20
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
deleted file mode 100644
index bd5a857cc145..000000000000
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Bitstream Type 1 fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
diff --git a/media-fonts/font-cronyx-cyrillic/Manifest b/media-fonts/font-cronyx-cyrillic/Manifest
index bdd47dc77634..890581d5f503 100644
--- a/media-fonts/font-cronyx-cyrillic/Manifest
+++ b/media-fonts/font-cronyx-cyrillic/Manifest
@@ -1,4 +1,3 @@
 DIST font-cronyx-cyrillic-1.0.3.tar.bz2 262896 BLAKE2B 928c67c3adcedc7e507d097bd522493f4f035e43037792f88e7c239f26b955734023c7c4686e51e9f001804f3f0bffc5025cfed50571bad19c27917fc4f92ef9 SHA512 b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456
-EBUILD font-cronyx-cyrillic-1.0.3-r1.ebuild 284 BLAKE2B e1663f2e0ca8aa05d79caddf5e94b47d147d8133d94aea1d441d73f6ccbf01be037d52780f33c4fbb8a279aee87bb2936e0bb1243fac8cdd4c478d494c44a003 SHA512 5605b110f9cd23e72da8f73a942469af64338a13b6259a2abe29bd6a5de7c7eefd93560395a6a513f454e376faa75dfd839ff3b139b29fca5e73b8328e2a88cd
 EBUILD font-cronyx-cyrillic-1.0.3-r2.ebuild 248 BLAKE2B 7214e4e8c4493c6bcde011cbdff271311f202125b084ab9d17fd04615af6df3dd4d9fbc21a79a8432be53f287c761b96125c831036422f10d3aa77469d6cc9b8 SHA512 82ddadf576e46c4c8df6b5b436527fe771eec790a1db13435114dcfa9d452cf97e2ebbdb675dbf13cfd011685533f3e6a0c5a09dcc7e95b052abb8729ae1377a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild
deleted file mode 100644
index 6e8f450d3c69..000000000000
--- a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Cronyx cyrillic fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-cursor-misc/Manifest b/media-fonts/font-cursor-misc/Manifest
index 0a08d4b0168f..b2732fb84060 100644
--- a/media-fonts/font-cursor-misc/Manifest
+++ b/media-fonts/font-cursor-misc/Manifest
@@ -1,4 +1,3 @@
 DIST font-cursor-misc-1.0.3.tar.bz2 102041 BLAKE2B 13ed204f19b64c0e392664665bf670a497b9ad9efaa748ff521787d8f3f0e170c9361dccf97c4e106be557743b57ebe61fbe346f7e0f71fe733df9c6aa378f14 SHA512 7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83
-EBUILD font-cursor-misc-1.0.3-r1.ebuild 284 BLAKE2B fd99aade2b4a710db593aecd46cc3a55173e943f5f4cf2d3e99a6736ddeb6e91ea72025ed44f328acb8e50cfca0de91b9033b9f0cf59d96299d7ac38d8ea900c SHA512 e2e690f6200c3e981e9b1c3a8876f25b7082e0d20e79b57e57d1311bb967b8375389f4630254ad1bffe88ecce359db9119f3aae468bbcda7e8df4e72a82f7b75
 EBUILD font-cursor-misc-1.0.3-r2.ebuild 248 BLAKE2B ba2442a56f09f4bf7b3b2cfeca8f2d0b449f7bcd9b533cc737c58d66e1a97c949be5199354199ad798dc428f187b217a399246a81bdfffebe056d1e26f072a26 SHA512 c45c80744ee457d07937da23165308ca4a7a1a141a1ac9f9678c1b674cba2bada6b522fe3bb62d8d9aec9b0c6f6481be6cebecbd9e8088ea3ec6f35fb35af421
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild
deleted file mode 100644
index 2255e6c642ae..000000000000
--- a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org cursor font"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-daewoo-misc/Manifest b/media-fonts/font-daewoo-misc/Manifest
index a2b7fba174fd..cfa14b8f4f2d 100644
--- a/media-fonts/font-daewoo-misc/Manifest
+++ b/media-fonts/font-daewoo-misc/Manifest
@@ -1,4 +1,3 @@
 DIST font-daewoo-misc-1.0.3.tar.bz2 723414 BLAKE2B 5edc33bb4b3e870158235bcefebde9bf0858e7c9ab766659e2859c69562338746186d9ff59bd2b6bf50abe2054b4f595cb7b55454cf671780f28a3245d208002 SHA512 7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06
-EBUILD font-daewoo-misc-1.0.3-r1.ebuild 275 BLAKE2B 548fef0c634ff5254092b7d21fa957e93e1180a30f210dd164977843344f0607eb391a30c6d28bcd908f6f9e1ca6b17c53346b58b76c7e3dc5b4ed11880f0220 SHA512 2c43be4ea2fedb5c3250f65da14fb2ef8937ba54b3620bb1a044c439ff83425fa03159dc237903751b4d75c0f8f9b47a6a705e9094382c0f2047db6b519ccd29
 EBUILD font-daewoo-misc-1.0.3-r2.ebuild 239 BLAKE2B 664ef512d8a4a854c7e62308f92026a545a5ba4df264c4875215b049aae323ee7d053c5fd99834d2e5d9a62e2926d1bdcae0810b4c0c1ea034f15c3dfeae2062 SHA512 abd0fce3c441dd273af861c45a831833bea8c4e1f0a07c511012a0c17f2db429dc9dd85d282c3078a00601d9bc4851b10c6267a9480960b77ebb901468b47abf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild
deleted file mode 100644
index 6b29e2bc2ea3..000000000000
--- a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Daewoo fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-dec-misc/Manifest b/media-fonts/font-dec-misc/Manifest
index e8767f315f7c..aa86f1c9bcfb 100644
--- a/media-fonts/font-dec-misc/Manifest
+++ b/media-fonts/font-dec-misc/Manifest
@@ -1,4 +1,3 @@
 DIST font-dec-misc-1.0.3.tar.bz2 99832 BLAKE2B 930c1435240a485c2bfb55234f767da4aafdccd2fe3d7c5a760acaefc4d145a68bd0cd5757d4daeed61d8f3ef4eb9bc473454402f6eda62d4a298c79bcbdac6c SHA512 af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6
-EBUILD font-dec-misc-1.0.3-r1.ebuild 272 BLAKE2B 6b3fb65f1ab4ea177b9252b43e02f4787aac9c59d2c01708280cd15b59b4755c4951e38d08dbed5d58d0c7d8503eae9c5b2a841fd92ff0e510a8129789d892c8 SHA512 8f30287dd6c66e1a2a969170731ee1c3171fcc690092a402930e34ffaf56347248df67e0a4c8d5af5ada28c19123e6960c622963c7fed9db8abc4c12d650f979
 EBUILD font-dec-misc-1.0.3-r2.ebuild 236 BLAKE2B cb10cd58a2042610a517d375a1f02389c77bf34ae12c72ab9f6796e774713b3a6d4e29f15af13584b1955d05801fbe8a3c70cb9d16b5da9ee45f051449ca9338 SHA512 c30e97a92101fabafa0e78b021b9b95402d6a713c673489ffb2fe2166127b848d980253558426ab39cbd69b0b837612aca930e15ce19c0fc8675dae38ab7364e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild
deleted file mode 100644
index 63a366f1d9ea..000000000000
--- a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org DEC fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-ibm-type1/Manifest b/media-fonts/font-ibm-type1/Manifest
index 97bacd4c9331..d6d96d987374 100644
--- a/media-fonts/font-ibm-type1/Manifest
+++ b/media-fonts/font-ibm-type1/Manifest
@@ -1,4 +1,3 @@
 DIST font-ibm-type1-1.0.3.tar.bz2 376985 BLAKE2B c8563fe5fb44975dc6d99f8ab106c3040276280969df6fd33db23470eaa49acffb10224fadf19867d71346d357bce96a2be898d256fa7adc9be66469dd822293 SHA512 cbd179522c936c4f956ff1fbdc48fc3a55990083b4f858c938c6a54c8526641b4f25eb3a6795d774630b75a0f4fbdf9c16e861e88b2cd95f04c524f95d40f90f
-EBUILD font-ibm-type1-1.0.3-r1.ebuild 251 BLAKE2B ac514852141075e07dfbb30426266dcb21ff5bac16ea9f9881a0ea8b6ed2a3e68be838dc5b7b06cac9204985dad82274b2dce2df5936fd0dff178dac121c3253 SHA512 5d7934aecd9ab81bef0b8252ae271db2fff855a0ac8662871848a8c440a2457dc5c9a551671f926c7e03591bb776496afcd6c773f369560092fe79b700bcd32b
 EBUILD font-ibm-type1-1.0.3-r2.ebuild 243 BLAKE2B a39ea72828a76f25fa5b3e79f0a4cde5e13490473cd35d7f55db07036db88364b377a7d89a97b5e01280544e74ba3be42c598e2962348c21617e109e3e88f59c SHA512 83b9a3aa2548cf32fd22847327c221a5296ac232a76aa20673eab67f03332caf0df2475cbcd88cf87b7742ee18db42109d2efa866a4348605cbbd4e32e20c5c1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild
deleted file mode 100644
index 4232ad2b7c3b..000000000000
--- a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org IBM Courier font"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
diff --git a/media-fonts/font-isas-misc/Manifest b/media-fonts/font-isas-misc/Manifest
index 9d6383e63b58..55fffec82dfd 100644
--- a/media-fonts/font-isas-misc/Manifest
+++ b/media-fonts/font-isas-misc/Manifest
@@ -1,4 +1,3 @@
 DIST font-isas-misc-1.0.3.tar.bz2 845282 BLAKE2B 4c05c83b64617e1f0740d54c53b13b628affb8c9cef43e785f8101ab5a7fa730d9500f2af45a1c4de658e94e2d7c5e467b6e4761fbb27f4767fb8817e77272b1 SHA512 be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b
-EBUILD font-isas-misc-1.0.3-r1.ebuild 321 BLAKE2B a677034f13bd2a1ab0a847f84162a452f9591a1639379f8e3af62abdeadc28d3d51e0fcf9fc0d1d7488555ed9717935a2c10618a1cccadc0a0aff2b29086dd9e SHA512 5197468316cc24f096a7c3b7bd9112b32786a6b6fb518e886353838e0f581ae9479782cd248dd7cf96211dad97d913a8c304d42d36ca606573c63dc504f18dbc
 EBUILD font-isas-misc-1.0.3-r2.ebuild 285 BLAKE2B 1443a56bca6744535553d177b0ce87db6f94b825b9189ed728117a49e6cdeae45ecb967333ce50ec80cd5adca71d7810f5b1a40636b019718bdf8c2897a69959 SHA512 d6e2e8741541ab484b6759a7d58169574a66df92f45657fd36a626d7fc651a6f935b8a4148c71dccf0ac0c92c0485f1dc69ed02500b71cbb0abb4fede2c5f0b0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild
deleted file mode 100644
index 9ae45b44828b..000000000000
--- a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org the Institute of Software, Academia Sinica (chinese) fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-jis-misc/Manifest b/media-fonts/font-jis-misc/Manifest
index d3e8e17bc588..519193634152 100644
--- a/media-fonts/font-jis-misc/Manifest
+++ b/media-fonts/font-jis-misc/Manifest
@@ -1,4 +1,3 @@
 DIST font-jis-misc-1.0.3.tar.bz2 621946 BLAKE2B e188c7f1d0e0b22912062dc94f1e9dba75c0990a497b88886e365d635621366af940d77ee2e7eb5f687e2ea6296cfbfed14ec45a0aa59c1d803010e7b8a6113c SHA512 3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c
-EBUILD font-jis-misc-1.0.3-r1.ebuild 282 BLAKE2B 6e30825501c3d12c7df39bb2a4620fa3a92afb5ab49479b689308356a0cc7e3f4c96f2b0975a4dbdcade76c8dadae438f7508452bbd8170bec1ad38f9e5e490d SHA512 47c044c5dc3cdc053cb82c45d21024cfc398f26f91f33798b43e3bdcf73aea2f5b1f2fc89b0e056c15a836481f55201b744b660790b607d7fcaabd1cc7cfd67b
 EBUILD font-jis-misc-1.0.3-r2.ebuild 246 BLAKE2B ac0798e0af5baee0d08f9c7194f7d0057398cd72ed5f8db9dc4336bf4c60e427569bda789f3b068aa922a58201728dd46b78eea3ecf469314148baec59d7eda8 SHA512 a83c283a78d5fee0517b126672b1c642b5023605451f55fbd5a8b8f00f1b835a119e23caa7b182f8c0af74d8530107528a4c9d235c9a84e0376ca3870bcc48be
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild
deleted file mode 100644
index 5ce84d1f1e73..000000000000
--- a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org JIS (japanese) fonts"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-micro-misc/Manifest b/media-fonts/font-micro-misc/Manifest
index 3e20af141bcc..e76a258ed8d3 100644
--- a/media-fonts/font-micro-misc/Manifest
+++ b/media-fonts/font-micro-misc/Manifest
@@ -1,4 +1,3 @@
 DIST font-micro-misc-1.0.3.tar.bz2 98366 BLAKE2B 98e6872807c35d6fb8bda2be46fbd0d23720af967d068a6abdbf20ac364484d8acd9f4217f739d853c9d373f3c86c1519ebc9854ff671adf955c603ede7f4c7a SHA512 7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69
-EBUILD font-micro-misc-1.0.3-r1.ebuild 302 BLAKE2B effcdfc209571156442dec3418172eaada20e20c0ee8f9e1b339c0ce715ca46579f2a89e57582f0643ef2fcf66fd70e301d11be438475afced58611c993a42ee SHA512 3d17cbfd5049406c6ff10cd32f09b6d75ecaa2cab2279aa32dc5e6bf0f84e51d82486056c36fbbaf685aaafc8d3c93f83cf5c114f5aceafe8fa993d44902f050
 EBUILD font-micro-misc-1.0.3-r2.ebuild 266 BLAKE2B 2f21bbc41f2d3c2347ee80233e369cbf6586b3620850f15a81bed3c2a500b3516d21d4566a69d6c9edfe34ef81f5d0339b6e34d4985674762dffd8158452a228 SHA512 a818a00c028251403b351c943a82b9cf0a4ed749e0dc7f2179f0c8649b2892c28de6a99c82758eed60816d44111334461ca49f45b496148da3654f3197ccc584
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild
deleted file mode 100644
index bca8cf083766..000000000000
--- a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org micro-misc font"
-LICENSE="public-domain"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-misc-cyrillic/Manifest b/media-fonts/font-misc-cyrillic/Manifest
index 960a327b20af..7fad874583eb 100644
--- a/media-fonts/font-misc-cyrillic/Manifest
+++ b/media-fonts/font-misc-cyrillic/Manifest
@@ -1,4 +1,3 @@
 DIST font-misc-cyrillic-1.0.3.tar.bz2 125971 BLAKE2B 4b714d9254f00e88537597629944d906766c5f89729fd944a276bbce3c05cb13d5f538e7e046c3bc5651e2a230ccddcb249032228ca5837d04a245fd2a9987f2 SHA512 75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf
-EBUILD font-misc-cyrillic-1.0.3-r1.ebuild 282 BLAKE2B e2798f1337303fe93729f191b3d8b7e171cf70a8f9f1969e7f2563b0e29855485e1be99a0675e9342ab9614809f7e750b5982d3a7405e98fd480812e1b286189 SHA512 728f7f4cbc3ee78e47a99e41224db9fbc4ccfcb7b4dd911dbd3907f19edbc8d8f0a275f48176c28e76608a6a30b58470f9665a9ddd7275fcdf86b814e456149b
 EBUILD font-misc-cyrillic-1.0.3-r2.ebuild 246 BLAKE2B 84db48a1452b0056ff44e9053e0bc7e3cc9fe08df8d3db9d5de444f3a4e00a8e26ffc396f0912bbf08908b3fc260c810cbf1233710fdf7b9079e548dee2434d2 SHA512 c26fc837531b312db6dcaa60107e7c55614d452635557486465c662e41102185e53c36e2cc8a0e7b8e76268435279b325d9c3db54c21b407d528d6b6ba795b47
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild
deleted file mode 100644
index 1ead1caba9e5..000000000000
--- a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org misc-cyrillic fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest
index 60c3dc100ac5..2834cba27e0d 100644
--- a/media-fonts/font-misc-ethiopic/Manifest
+++ b/media-fonts/font-misc-ethiopic/Manifest
@@ -1,5 +1,3 @@
-DIST font-misc-ethiopic-1.0.3.tar.bz2 245606 BLAKE2B e0cf89f4500226b7213d6f3f88b3bf575501140d8742fe5e30b07eefd2c1fe2fc9bfe941639032d3b5ce45eb7e6f352af7b6468e7f8b0fc941ed9cee8d531f96 SHA512 b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d
 DIST font-misc-ethiopic-1.0.4.tar.bz2 270076 BLAKE2B b27d188fcb5be3e4e5fed810f26c0f5edf5a51a3532bd51b44e55283518bc1a353054da4f37c5535197eeb6958bfe1567ab54d1d9f428b046b84c5d1233aae21 SHA512 4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5
-EBUILD font-misc-ethiopic-1.0.3-r1.ebuild 519 BLAKE2B 8ea8d1ca143c4269f00e7003cd35e69548f4dcd9023760a77d09a7991bcd275df9f37631a126e777a71e9a7c717fa8a051ff4c273b76aac4cdecdf702f84eadd SHA512 6ab2706eb1ee5e0de1f0c6096d72598285405d89cbf9c5d0a0f3acd8e050bb1777a892e01ebbadad92efd8c4006bf5ebdc5e88bc3c6d2790b08b8d025c48891b
 EBUILD font-misc-ethiopic-1.0.4.ebuild 695 BLAKE2B 7e8e52943dbbdf0880d8af0dc1cbf93a8398080d7a2a36c5b685f76b8d5e6e329c5356a8da42b1803573b397437357fc77f1c9f207e3146cbb649f1b0d3aab20 SHA512 c2c10279557bb5cc3b191f7645b2b28b435cdff2a730641b68af9f4881f5b195da26f397ac958c92002c24981aafb1d0a6b5678a4aa7fe6f5a6ea389ba6f5323
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
deleted file mode 100644
index aa7c7e0be9ad..000000000000
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-FONT_DIR="OTF"
-
-inherit xorg-2
-
-DESCRIPTION="Miscellaneous Ethiopic fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-FONT_OPTIONS="--with-otf-fontdir=${EPREFIX}/usr/share/fonts/OTF"
-
-src_install() {
-	xorg-2_src_install
-	# TTF fonts are not supposed to be installed.
-	# Also fixes file collision per bug #309689
-	rm -rf "${ED}/usr/share/fonts/TTF" || die
-}
diff --git a/media-fonts/font-misc-meltho/Manifest b/media-fonts/font-misc-meltho/Manifest
index f1919ed7d8ac..4e70944ff5db 100644
--- a/media-fonts/font-misc-meltho/Manifest
+++ b/media-fonts/font-misc-meltho/Manifest
@@ -1,4 +1,3 @@
 DIST font-misc-meltho-1.0.3.tar.bz2 1578992 BLAKE2B e76691a76d1416c7e7188ca53e0ebb639269333f4078fc0de9c1b7ecde69a7985115f7a347e55a3bd86a268b0de36b7a02ebaae343743dd7cc934038928cd7ea SHA512 3f42fe3e127f74259d50754f4bb6d2560cb32d810fecf663bd09fddb34829d29b48f3cbfaf43d02dab70b559afb2f806f321076f83450ff3871604345a0cdb56
-EBUILD font-misc-meltho-1.0.3-r1.ebuild 269 BLAKE2B 464f269b3a730e7f331444b6c3cd3c82952623b432aaff5ee5c3dd521eb5d6690c5f6834b4b83966e5bc2117ec66bd48262895e8f4b3d7cfd153f1a64a1e52ca SHA512 ced4837ed27b369e10b4c1b79667836588dd664a3de34d015939d09244db8b2cc4853b0f87a94f37c98eba104f67db6e5eb5e8a103d3a75fbd86a88686cea208
 EBUILD font-misc-meltho-1.0.3-r2.ebuild 261 BLAKE2B 2b8c55a14d03453cc13c687bf7bb01fd80f4387e46c17e2f6616a4fae57d25242ea5371a377cdd3e257556ff1efaec519e83189c3875edb51d2a693b59a653b1 SHA512 62bdcc03c9cba361243db3c9797143acadd0cb18c7c5e97426ee215d601b35f7ff81c46c41105f4acc47c94183b6a1127820ace741084f415a7379a80155d757
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
deleted file mode 100644
index 2853c3d7cb65..000000000000
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-FONT_DIR="OTF"
-
-inherit xorg-2
-
-DESCRIPTION="X.Org Syriac fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
diff --git a/media-fonts/font-misc-misc/Manifest b/media-fonts/font-misc-misc/Manifest
index 38d95dc92db9..a76a39f7e58d 100644
--- a/media-fonts/font-misc-misc/Manifest
+++ b/media-fonts/font-misc-misc/Manifest
@@ -1,4 +1,3 @@
 DIST font-misc-misc-1.1.2.tar.bz2 1933789 BLAKE2B ec60ab2f9c18b5dfe272ea48f46d0af064b1d156bbb87e261a4c1ad60f5771e4a2b3464f054e6264c16e978083cfbb3dbc05a8f96f2041c1efc61f4bf4ee0ab6 SHA512 d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74
-EBUILD font-misc-misc-1.1.2-r1.ebuild 379 BLAKE2B 07bf96100d6f700e666136a076cf86ee5261fd7728d5beb7acaa2e962f250adcdbca2def46f71717d86cf485d28cff6e843cc7a8f85f0349397f0d7d6ed801c1 SHA512 d478a512c869975a5d44c086f9bd2c6467fc8c712bc07cb39df52e0e56c54f0c02787d865c44cf2d55b10ba47c174d2bc296c93c3afe605a57c8905d9f6a927d
-EBUILD font-misc-misc-1.1.2-r2.ebuild 344 BLAKE2B 40bbe7b587d776b20d2ae474512385739f6a64fd783d22ce781670f7b24a534710bde0f122e575cc5ce222f08cac725569d5445fdec4c55c9c7db494602b4fc1 SHA512 fee20e10831110543f2fd4d7b52f27d53ed23f2487747ad6decc74c5532d8052d23354745225fbc238486c4bdf33318bd43ecf9f19a3ccb4bba7d58bb04e086c
+EBUILD font-misc-misc-1.1.2-r2.ebuild 343 BLAKE2B 76712e542d13eb6f862e6cbe5a32d2393d8b136e20a0d2be5130176ecd77046c865eb74626aff05910271546a7234ebf25897957e4d40eb177cb1953a1a996f5 SHA512 03b6657b16286bf8cb112accec6e25f4be36718643d81027ae08eda6ab40e953004b2425858c5082e3517d1338bf8b207ab2658a5e3d2fb9d88d424f8f33a97d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild
deleted file mode 100644
index 11e36a75fa49..000000000000
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org miscellaneous fonts"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
index f2cbf77c30e7..9d98847e24f8 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
@@ -6,4 +6,4 @@ inherit xorg-3
 
 DESCRIPTION="X.Org miscellaneous fonts"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
diff --git a/media-fonts/font-mutt-misc/Manifest b/media-fonts/font-mutt-misc/Manifest
index a117c271a22c..f7543e5db2d6 100644
--- a/media-fonts/font-mutt-misc/Manifest
+++ b/media-fonts/font-mutt-misc/Manifest
@@ -1,4 +1,3 @@
 DIST font-mutt-misc-1.0.3.tar.bz2 266510 BLAKE2B b3e460b5837accf613c9a4b5285a40f160bbf1b791cd90534cfb58da4f1857c1c5ec659ff4b1b6268573574ce2f4ff7cf6bb5abd7512c27fffd9696fb579869c SHA512 7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db
-EBUILD font-mutt-misc-1.0.3-r1.ebuild 277 BLAKE2B 861cf124886bc44c544af6f2c110948c35111f3091d55eeafa680920604aab131db11f741c96ef89288f3e51af7cd3054e5b87aec7cc7c481b5275d57050f2fe SHA512 5ceb952a4642d77eb75f4c8074279581f7afa087b62642258816d41878a453250668346b3ef925af9ffc99b32922e2aab5132f62cdda9681cbf3316a7f10d95e
 EBUILD font-mutt-misc-1.0.3-r2.ebuild 241 BLAKE2B 4a111a060408a6b44d0313bfd48faf6d6de25d93c0e10c70b51863266c919e74e89f63bfd677f3d1ef49c63153fe06ae33ec1c85dc25a508afcbd98a89099a17 SHA512 69d1d5ad01b77a08a8ec0ddab1f6f2dc6bd66f8c6283b8fa021986e47dc1d569435a00e9df60a7e69470be83b9b6e2cb05fa3cbf07759e8f29f29ee0eee90e58
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild
deleted file mode 100644
index ee3b047a0cde..000000000000
--- a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org ClearlyU fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-schumacher-misc/Manifest b/media-fonts/font-schumacher-misc/Manifest
index 47562b54e6de..a8f12c84a9f0 100644
--- a/media-fonts/font-schumacher-misc/Manifest
+++ b/media-fonts/font-schumacher-misc/Manifest
@@ -1,4 +1,3 @@
 DIST font-schumacher-misc-1.1.2.tar.bz2 141170 BLAKE2B 4a71f13cbd81b50e4a71968561a621cb562172ab547f5dec65e28f610a1053067029e4ce5b7d10452ea3426c459049962da8855f9d4e111ff6331bf6e706041b SHA512 f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a
-EBUILD font-schumacher-misc-1.1.2-r1.ebuild 279 BLAKE2B d86e0feb6b8249f0ed4c4dcfc2dc713f244cf8d7353b9a07392866294da689e199eb9e12c7f1326353849c48e618d626990c1d330f568adbfdbbf73da8e9a098 SHA512 9fcfe4da7ff75bb24adb3688afdf5b4aea1a60aaae9cc0cd29274c9a54d83b92d2140d589d623d55e7547c36e8b7be0b6669482b45b1e6017cf1bc76267c31bb
 EBUILD font-schumacher-misc-1.1.2-r2.ebuild 243 BLAKE2B b9a5db2deae9f9b80fa4de88277e93563dd6d9540e9640418a88f3fa1ff11268b194cefe9ab0f94c0b8b17c202953bfeeabb7323438c330493daa4c992a173c2 SHA512 bf7fb6026b1421881560ef3196f1fa962945f0febc3e817d33e5f07c98e4130cdce5e325b8e9e6e16e4edab03918cd79734928fcebc54f6f493fc22b2bb76004
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild
deleted file mode 100644
index 95f9abb9e415..000000000000
--- a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Schumacher fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-screen-cyrillic/Manifest b/media-fonts/font-screen-cyrillic/Manifest
index 01e0606a840b..bb2b978095d3 100644
--- a/media-fonts/font-screen-cyrillic/Manifest
+++ b/media-fonts/font-screen-cyrillic/Manifest
@@ -1,4 +1,3 @@
 DIST font-screen-cyrillic-1.0.4.tar.bz2 103168 BLAKE2B 6ef447905bc848dc7e31aae0f0c7649e17dbc46ccbb8a09da60cbd1a232891f0777558febd6e91e7844b66cc25796ad54ad6600ce033ff7f493741099c67b52b SHA512 58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51
-EBUILD font-screen-cyrillic-1.0.4-r1.ebuild 284 BLAKE2B 47f98258d2d3581d589c69653333215854df254943e9dfcbbccc96071ad36eef854aa7efeb6dc82dcf92f48b88ed506b2eedf46c0d29f7f4f0166d4855a2ee19 SHA512 5c299bb33f443300ac098feaebe426544f6e33f965d27361e6a4544bbf5f4933d3a1381e9659324f4e8b9794d2fb269bfed53fc192eb309c9d86b746b045d8fa
 EBUILD font-screen-cyrillic-1.0.4-r2.ebuild 248 BLAKE2B e42040a02ec1200c51610b01845e572df5d35fa5ee04d327384693ca9370c4f64d495c57fd35a7250edcae7b8687f1f24959f6ce6495256ea5abaf723054b782 SHA512 2c8b8c839b2bdb1eb728d9cdcf8ecde2d26cc12e6741ddff0f93283c707129272851301a49038b04a173accbd6dcedf5ce5528110b714568809d0893a3e508a8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild
deleted file mode 100644
index 223347046404..000000000000
--- a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Screen cyrillic fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-sony-misc/Manifest b/media-fonts/font-sony-misc/Manifest
index 280ab9461697..fb5df0218144 100644
--- a/media-fonts/font-sony-misc/Manifest
+++ b/media-fonts/font-sony-misc/Manifest
@@ -1,4 +1,3 @@
 DIST font-sony-misc-1.0.3.tar.bz2 108098 BLAKE2B 7e095c70f6f10e8fa8e65686622ba443ab49704727e8d9e4067f273e160cfd1c0a0a475c720405ac1a5df8e87cf17e8f5ab53ba5baef80f6145d795a2ed419a4 SHA512 c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d
-EBUILD font-sony-misc-1.0.3-r1.ebuild 273 BLAKE2B 28c65fd2a605c6ab90c410b9bfa9013f96215949491673e557c016996e79a55b85935e98c819cfb78bd1a7ad00628cf21a1f1fbe0113b5bbbee0449dc7c42ea7 SHA512 990bf5b685fb36317daa73cc3a2127698f466b41adf84750d0240503d63d2e93fb96a064cd9137e2aeb431169f8f5bb322e8834e82ddaca3508dd93ce24900ec
 EBUILD font-sony-misc-1.0.3-r2.ebuild 237 BLAKE2B e5ba5c729eae6fb107fa95d8a8c04f302232d9a10a9c097c9475b42807699e6ec73ec802a84472023753d7a4a2868d4d0224da28a9e85fdfab9b49d8e22cc1c4 SHA512 d33534f8a6fc173b5bb1e8bc4a5fb7c67b1fa8ea6f1cf14b84d1ebda4f5b8fe5f2cd0d2e165a0e3318ab7f907a5d2fb7069178215d25819711612881f0ab959c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild
deleted file mode 100644
index 3369d48770df..000000000000
--- a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Sony fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-sun-misc/Manifest b/media-fonts/font-sun-misc/Manifest
index 30986b52137f..9796c1eb941c 100644
--- a/media-fonts/font-sun-misc/Manifest
+++ b/media-fonts/font-sun-misc/Manifest
@@ -1,4 +1,3 @@
 DIST font-sun-misc-1.0.3.tar.bz2 116360 BLAKE2B 16ed83ef2fc7007670ac91f8356c8bb75775f78cf0a308fd02c2f702d7d2727702ead24c83d843c267ef4ef636f4fd1f0a59d3ffd0883e55e78f87d9cfabd8a7 SHA512 52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275
-EBUILD font-sun-misc-1.0.3-r1.ebuild 296 BLAKE2B 1cac9a9e00ad6a050a630077295e9ce41d70004bb0a557bec2edea4efdb9ce036a90c77e441ff16987d641f67bddfe4bfff95742c0a225875469016f121b395c SHA512 7d921c4403d8ee304b5f789949e5ca26ce807024a0eb021bde8d1c47abeb8d52ecb81591157eebddac3246d388a5378449fd023ec3293c646520aaa390f4358b
 EBUILD font-sun-misc-1.0.3-r2.ebuild 260 BLAKE2B a6ba1e44e4e96a93b0e2fe361c01570e880dbe60759920b57bbd3d2b28c9d7f9a15e8e9a0775eb2a4867157b62cef9f4030be5bd99e6c615ac78359845725305 SHA512 773e06f28af5ec945d6627c1fe8344a52df9c72230c0730e393e342d32d1c2a4a7147ef99917384e8dbd5b66777e5ec8b71d528453c0518cc2e38774093062b2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild
deleted file mode 100644
index 6425d8621816..000000000000
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Sun fonts"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-winitzki-cyrillic/Manifest b/media-fonts/font-winitzki-cyrillic/Manifest
index b384bd76531a..fbb6bdc38696 100644
--- a/media-fonts/font-winitzki-cyrillic/Manifest
+++ b/media-fonts/font-winitzki-cyrillic/Manifest
@@ -1,4 +1,3 @@
 DIST font-winitzki-cyrillic-1.0.3.tar.bz2 100564 BLAKE2B cc2de32277e55a3f7a92be7deec895e23f75efea541e2dcd33a56e1911d7216af149234fe010bd6445952399e246a4bb7123ff2bd220d44874b065a56ac4155e SHA512 f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7
-EBUILD font-winitzki-cyrillic-1.0.3-r1.ebuild 285 BLAKE2B 9076b0d1d6c9339cbc09e328edb2da63d7129d9cd0ce37e58c044d1e204b31e49661b6e655b9a42324c6e259c2fdf247cae223308ab6b597b155e87a472f831b SHA512 9b9eab6a13bd3e772c45481562ffa9c042dae8dc3d46f294383a35cc3bd2f0b8c5a99ff6a0dbc725d046e89532e2c5a9f681db9c9da0a69af7ca4af72649f2ae
 EBUILD font-winitzki-cyrillic-1.0.3-r2.ebuild 249 BLAKE2B aba830f9e891f17092dac6edb8fb4888a69f6991cc04e6594674945d08f3f1785cd9c8f0453fe2c866e55eea7e34bc77b53571e9ed2699403ba7ce6bb1394784 SHA512 b142b04109bd07f7183ab896e0a414a1140ab1a73ec365ddf8aa250af43a90004c886ff9c24068f108f73889ad48ec245d1dcfc146d9798a5c4216da9f6571d2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild
deleted file mode 100644
index 8ea828112311..000000000000
--- a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Winitzki cyrillic font"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/bdftopcf"
diff --git a/media-fonts/font-xfree86-type1/Manifest b/media-fonts/font-xfree86-type1/Manifest
index 8195b03c0a8c..b50cc6085c26 100644
--- a/media-fonts/font-xfree86-type1/Manifest
+++ b/media-fonts/font-xfree86-type1/Manifest
@@ -1,4 +1,3 @@
 DIST font-xfree86-type1-1.0.4.tar.bz2 126641 BLAKE2B 12588b7cc3a489854695cf0cc6a9edd18840e0048b4e35a76eb6f3642807e208823133368299d6ff65117699bb7312d3664ae9fe8264631051fdeaf8f157b516 SHA512 2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c
-EBUILD font-xfree86-type1-1.0.4-r1.ebuild 254 BLAKE2B 842b95e9f2fed6602fc5a105bc161682c7371474e49503a07d66f596bf21ce88055165f9f59a3dc1e284460a827f3cd49eec3f926022a5338e6644c093d028e4 SHA512 e2b6d513be157675cdc8c8b76450893c4fc069e09051702e8633138975f8e73bbf817486786ef9c137e340ae519b37d4a7f7982397d9ec688e66112f731a7dea
 EBUILD font-xfree86-type1-1.0.4-r2.ebuild 246 BLAKE2B 5da6f1b6fb30701b80822e73d03ab2153ff5353d9821f96ec0e67f63b0040e1397d0900d4284e4a5d59813021d7999ea156e1291bd30e915375024627690b65e SHA512 2ad5b05a41f2519049860dca724d32ef40708a50e07f991ba06bdfb8dd065abea412af1e4d16d7835e787eaad545a0773c1d836e64d4800f4fdf33c7afed1060
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild
deleted file mode 100644
index 8f6d3f7e84f4..000000000000
--- a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org XFree86 Type 1 font"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
diff --git a/media-fonts/monoid/Manifest b/media-fonts/monoid/Manifest
index 0b0b1ff90d0d..2a3f962d7eac 100644
--- a/media-fonts/monoid/Manifest
+++ b/media-fonts/monoid/Manifest
@@ -1,5 +1,3 @@
-DIST monoid-0.60.tar.gz 6294560 BLAKE2B 18fa005b82025f96307178666a33974d7d801e0a42e3cc06b50e01698f56a31586ea230d30d2216198a69bef2ca955bdf29c2d2aa319ae4a978a9558908796db SHA512 07159e938c26aafb15b6c9cceefcd10833d30a3c186f73b5185c1c912304de35ef575476770f33f20d4f5985cec14029962fd29a8fd1708a16c489dcedc9a3fb
 DIST monoid-0.61.tar.gz 22431008 BLAKE2B a5aafdcdce20da43544abf3e362b24948010019502dd0862321a94434ef3cdc9b74b149d555ade44d08440fcc72169cc85ecf0b8f6ee9cdea85b2eaba2271a3a SHA512 b94ffda585ce8fda14576140cf771173773490169a559c52d275471f6061667278d268ae80543270d9275f3512e40ea95129062b890dd31d33d61a7980b58a33
-EBUILD monoid-0.60.ebuild 669 BLAKE2B f813fe5b0fb7df522860c23a24109562b2f2e469eba0e0d8c51fc3651185b8f15375ebd32c9cec8090ca98147c4a25c22666bf64d8555a8b0ee051226bc6296b SHA512 764f3b5440812db5ae65147abdfd04bf11b15991d8ec83222b300536237493133eab23969a5fb683014430bef43762e6a1c183d822d970c4a4ad2e829206e360
 EBUILD monoid-0.61.ebuild 435 BLAKE2B e3efb25a5188b511b192637d87994eeff292750e28c1b8409f417da945d604fe7796190f791b6702e7d1ff08dbbdc918dcd4e45f2b517ea458ca9f629556f4a3 SHA512 4b05bdc309ef6e658b7373841a960274de4cf8c6f918b9b6744584233b9e63df746bdfa162588b4ba2a498ac62dc038a3ec2293d716398fbb102f59cd41ae379
 MISC metadata.xml 320 BLAKE2B 734b2c07c1d037b2e70049f3a63af76ce310ece4f8a8b3884060369a81c1f5809ada444e62eebe7a56aba9284d0a3121f6d369950a1d08d563a01748e8859009 SHA512 4dc21620ea0e9305ed2c42dd354d31ffc5770787c940291e1491a41bc67b7075ba3b0a222bf875375884247d0a6ea3298ea72c7f6a07d2755ae57cf8ead8e639
diff --git a/media-fonts/monoid/monoid-0.60.ebuild b/media-fonts/monoid/monoid-0.60.ebuild
deleted file mode 100644
index 232a9909555e..000000000000
--- a/media-fonts/monoid/monoid-0.60.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit font multiprocessing
-
-DESCRIPTION="Open source coding font"
-HOMEPAGE="https://larsenwork.com/monoid/ https://github.com/larsenwork/monoid"
-SRC_URI="https://github.com/larsenwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="binchecks strip"
-
-DEPEND="media-gfx/fontforge[python]"
-RDEPEND=""
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}/_release"
-DOCS="Readme.md"
-
-src_compile() {
-	local NJOBS=$(makeopts_jobs)
-	for x in Source/*.sfdir; do
-		Scripts/build.py ${NJOBS} ${NJOBS} $x
-	done
-}
diff --git a/media-fonts/umeplus-fonts/Manifest b/media-fonts/umeplus-fonts/Manifest
index 7a02bbf5cc69..bbc1fc02909c 100644
--- a/media-fonts/umeplus-fonts/Manifest
+++ b/media-fonts/umeplus-fonts/Manifest
@@ -1,9 +1,3 @@
-DIST umeplus-fonts-20130511.tar.lzma 1944334 BLAKE2B e028f03a65453dea3bade6a5c77af5536c4b3c7eaeb2932cb20058703f6de16578b236948c781f3d4182462e300663c0f6e313f2f8c73f0d90a0928a7df6adc1 SHA512 d5044bf32012952c63b7adeedba8e7969e90b13a5abfe669debd4231146a36a42496aabc16cf618acb09522a97f38ee5e62864f537ceb0985caf6aaafce6472c
-DIST umeplus-fonts-20131109.tar.lzma 1902990 BLAKE2B 59cfd027869172b1a3e3caa3e71b41b404f5815ddf59f0270c9c9078340abf5564f144ae0b013289bd9b5bc20a8884853c6b24dc9abeec8926fe05bab6fefb8e SHA512 84458f11afe04fb87fd628136ab8107062e158908d898139d1165c5618f13923bea5818be572c309717d9a1fe3afa0e24fcee7eb038a937a66eb5831daaa0d1a
-DIST umeplus-fonts-20150115.tar.lzma 1881178 BLAKE2B 87f7a218016adbff3231fd728c5d690389c84e6c6f67602129970622fd7846c898ff4c551487f6de6abca6dc8a1655103594827b70653189d18cd4935ab54b63 SHA512 eaa42a2facb9e7be8350f2265de0c74502ccce9a5b33d19de62478e6bc48f08639086ca4cdb6b246074e3c376e54755a192814e4dbbf9d30c0238d3598677418
 DIST umeplus-fonts-20160402.tar.xz 1763132 BLAKE2B 3e1406085d8dd1f62f69455efd53e0a51281d9a2a7220ef21a588d551fbd9c078110cbbc3e35ddd16cb9d31ee29d418c128b92fb4a5f980be654d57447d60157 SHA512 36a2ab6f2919e3e4ec99662a296f56dc765fc55ca1de3ea7329030312c88cd16c589ef2a945f4b52509d52b029cef749371d3dd4c1aebceb5c0811d5b7313658
-EBUILD umeplus-fonts-20130511.ebuild 504 BLAKE2B 72be7e262b94985b5add114c2d429460f6114a2199f965b1a8be7b559732eedce5671e358a54b6b1fad4a904dc54918bb4d91f0b07e509a31f3f5d361abd0f9c SHA512 e18e00880278a2440b3fe9eb9c139f16bc3cf71870c3c7f589a72ff5cd771f14b86b2d37fafe28918cf730b82c8c855228277c7822a534e9d73422054e0cec0f
-EBUILD umeplus-fonts-20131109.ebuild 476 BLAKE2B e670125f1ed2cb1dfcbc830ad50c04b70d0cb33bdc0875de0a9e099a616f2c43f2237b1cfb5809bfc387f842e0d40ff1419d2c404519d9bee2c971e93764de33 SHA512 f0b4e67f277a996a36a56b8b9ec7e55a8e08cad701392f0e53f33a199740119bae52e3e9608d555cd7e9711c95462781b7f23fec1eccb27ecfb4c45a0c73fc43
-EBUILD umeplus-fonts-20150115.ebuild 478 BLAKE2B 41d86d1711e7daa5330117d8e1b97d11df67088219a7fe33850c623599ebbf5e493368e43137b1dc66ec3bc7a367d34e8f76af0f445824499844c1dad331880f SHA512 00932cace28cbc6f65565cadf3e3da21cc750ee9d7a12d9f385dd0687b2a1c1bd424e88b5a0eddcf8ee0d8425855967e976fb0a92f617725e9efae5c14c48bf5
 EBUILD umeplus-fonts-20160402.ebuild 472 BLAKE2B 8341e25a86637f6b712da156db78cf68a75f570b75ae84f897d6592afe31be42f7224cf88f8b744e510309ed5592875d132dbd702c2a6292c665a510a9452544 SHA512 a502c9f1c08b6d376d5bc021717bb859c1a06f4bc984f47ad075a4cb65c7d720c3857313440754bec9908a1fbe3a240309cb0bc0c073e873fc0c6fcc047ad8f6
 MISC metadata.xml 462 BLAKE2B 793b6fc2171ca5b21ffec9ba0e1cc1db18a3a2f1aed87f6d6289dfb169ad134099a91d130f695318517a2b57bd787901d9337218759a18f08a4749574b01a382 SHA512 8ed1e9ce4072aff8eb29a156521a6076dce96f61eb36b0bbf09d9d6fbdef433049fef2326de34406fdcb79876c71d40a874cfcae0ddf8fa842caff0288a2f12d
diff --git a/media-fonts/umeplus-fonts/umeplus-fonts-20130511.ebuild b/media-fonts/umeplus-fonts/umeplus-fonts-20130511.ebuild
deleted file mode 100644
index 085d9bdc4d86..000000000000
--- a/media-fonts/umeplus-fonts/umeplus-fonts-20130511.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit font
-
-DESCRIPTION="UmePlus fonts are modified Ume and M+ fonts for Japanese"
-HOMEPAGE="http://www.geocities.jp/ep3797/modified_fonts_01.html"
-SRC_URI="mirror://sourceforge/mdk-ut/${P}.tar.lzma"
-
-LICENSE="mplus-fonts public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x86-macos"
-IUSE=""
-RESTRICT="binchecks strip"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-DOCS=( ChangeLog README )
diff --git a/media-fonts/umeplus-fonts/umeplus-fonts-20131109.ebuild b/media-fonts/umeplus-fonts/umeplus-fonts-20131109.ebuild
deleted file mode 100644
index e474bd4bb70d..000000000000
--- a/media-fonts/umeplus-fonts/umeplus-fonts-20131109.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit font
-
-DESCRIPTION="UmePlus fonts are modified Ume and M+ fonts for Japanese"
-HOMEPAGE="http://www.geocities.jp/ep3797/modified_fonts_01.html"
-SRC_URI="mirror://sourceforge/mdk-ut/${P}.tar.lzma"
-
-LICENSE="mplus-fonts public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x86-macos"
-IUSE=""
-RESTRICT="binchecks strip"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
diff --git a/media-fonts/umeplus-fonts/umeplus-fonts-20150115.ebuild b/media-fonts/umeplus-fonts/umeplus-fonts-20150115.ebuild
deleted file mode 100644
index d274ddd143ae..000000000000
--- a/media-fonts/umeplus-fonts/umeplus-fonts-20150115.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit font
-
-DESCRIPTION="UmePlus fonts are modified Ume and M+ fonts for Japanese"
-HOMEPAGE="http://www.geocities.jp/ep3797/modified_fonts_01.html"
-SRC_URI="mirror://sourceforge/mdk-ut/${P}.tar.lzma"
-
-LICENSE="mplus-fonts public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
-IUSE=""
-RESTRICT="binchecks strip"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index efc28010e967..e5c182bfa828 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index eceed3b482ab..509b52dadd91 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,4 +1,6 @@
 AUX eom-1.24.0-add-gdk-includes.patch 798 BLAKE2B db2156dadd2458100624a01e0724f7520529ace1aeabf78544aa780d91fe57d8db7aee8934401ede46810a8ee8f53f26d0e7304605386fd6fba080825c70abae SHA512 3a487cbbbfd94240858cb0a7221b9515720aeaab7adea3e7dd8be2d05d0369f5d3ecd5e3afc4ceb1cda0e2aecc0c72d0cae796f70ed181a90944e3d5d76a31f2
 DIST eom-1.24.0.tar.xz 2433420 BLAKE2B 58f99ba3cf0df3594c459af691cc6ab281657facb49bc3b6101bec1718b165b72b882aabd9abac3c4981b547157aa64d2f24f174fccae06cdaa685728e49740c SHA512 17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab
+DIST eom-1.24.1.tar.xz 2408284 BLAKE2B 70d660896dff42d5a91ea651697b50d4c90ced92023d5df48dfbed374c3777676f1f2dc99a0cb071a4eaa13353f31b11346136b963cf723397632cceafa64301 SHA512 70654b99f474d1b214cbbf8e799f82f3c38f47938df34cb5c8227c116b412364c568ae989b96d7082fb0d2fa319b3dba9b8dd499d19140a4d421bd09a46bffc0
 EBUILD eom-1.24.0-r2.ebuild 1666 BLAKE2B 7c8b1982b350e085321620d4e155526336e3e05b0c662e4c1547e335883f2919e4192c5836ea5b0121dc8fb64e471c3b1c26493e8cc82526b16092e71029bd5e SHA512 a88659a60d9382a6d3db22ffdb7dcf633bece393ab7d56905ef11f071487933cef476ea6af36fd1d79ed61007520e6fce38837105708f791baec892144f6a2b9
+EBUILD eom-1.24.1.ebuild 1666 BLAKE2B 6229dc67a7a2b6056387c2082e00ac37017e01b5c128f2661c1b551134f492f42a54ea18db0417cb5f170b6999b14ce277ff923ee6995ba26aa5c677696ebd77 SHA512 644cbd982fc0dedb92b03f206b416ae1b517a72540155f23117441cc61f0ef178907d13fed3c5b3c93e48c34b45c80c20b6aa740f6382aedf67f18816421ecc6
 MISC metadata.xml 467 BLAKE2B 5314ab156ff29533e419e8d6b82d634bd3ffd7898e8125525d2d45460dfa464c8c9a7311f3fb69e33172b523e85816d6ecaba0487087dacafd42e31cb261e3d7 SHA512 d21cd9729f0f8bde3caec98e3a7f75de8075b129651b7c25d386cbd1cf9f4a41972f48a6addb7180ae40a0c2a626a5508dab5736ed71d60b56bdd2132d479854
diff --git a/media-gfx/eom/eom-1.24.1.ebuild b/media-gfx/eom/eom-1.24.1.ebuild
new file mode 100644
index 000000000000..c7ad21aa5f6f
--- /dev/null
+++ b/media-gfx/eom/eom-1.24.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The MATE image viewer"
+LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
+SLOT="0"
+
+IUSE="X debug exif imagemagick +introspection jpeg lcms svg tiff xmp"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.52:2
+	>=dev-libs/libpeas-1.8.0[gtk]
+	>=dev-libs/libxml2-2:2
+	gnome-base/dconf
+	>=mate-base/mate-desktop-1.17.0
+	sys-libs/zlib
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	>=x11-misc/shared-mime-info-0.20
+	exif? (
+		>=media-libs/libexif-0.6.14
+		virtual/jpeg:0
+	)
+	imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+	xmp? ( >=media-libs/exempi-1.99.5:2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!!media-gfx/mate-image-viewer
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/eom-1.24.0-add-gdk-includes.patch" )
+
+src_configure() {
+	mate_src_configure \
+		--enable-thumbnailer \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_with X x) \
+		$(use_with exif libexif) \
+		$(usex imagemagick \
+			--without-gdk-pixbuf-thumbnailer \
+			--with-gdk-pixbuf-thumbnailer \
+		) \
+		$(use_with jpeg libjpeg) \
+		$(use_with lcms cms) \
+		$(use_with svg librsvg) \
+		$(use_with xmp)
+}
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index 5450edce88be..99c8b021eac6 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -3,10 +3,12 @@ DIST fdm-materials-3.6.0.tar.gz 23037 BLAKE2B 842edbbef94dbf8a775d81bae3b6621dfe
 DIST fdm-materials-4.2.0.tar.gz 29011 BLAKE2B cd167506070e5609b0e464cb547271008b9f500312e378c9d8a16ae71cdcbde0efbd91bc0149f56ea9d9c9cf97f4a946810c542a4a0d8350344b48393dacc070 SHA512 02981374d4abcbfbcbace5b6b5d5542d4a5cc65ddf3a47569e34ad94284df56fdcc5f674801ee74c12034c502df8e5cca84a077f648f81557067f0044bf7bf9c
 DIST fdm-materials-4.3.0.tar.gz 33208 BLAKE2B 5505a885e03130757134557525e30ecda7091d3238aa5be753065c8bf81dd08914acf22ba85b95f3c78818bf5defedf97ea083d22f1886fc5113d692d70b14e6 SHA512 420accb4ff3eba754e96ceecda4980f121cab22ca3aeefe0781be47cce2ed64cd93df2a2bd974ea611e71ea45a944692e7b27bfbb6f9b0e9dd971e7621e4ff58
 DIST fdm-materials-4.6.1.tar.gz 36321 BLAKE2B bbdc28bf9d05b14f4b0545c4c50c67c31668f97aa9b6fcb8d51c5c958523ebe3307deb07587239df6a73e47c523db6c15f0ea4eb3c2560931a055c784d2b30cc SHA512 784b89acfb2a5bdc6a0e8ce864326ab21f4785887baa215ffcfe472853cc8386d32ed237199df3744c25d12abbef89605445e74b104770f0f3f8363944008c6e
+DIST fdm-materials-4.7.0.tar.gz 41139 BLAKE2B a372d8273809a7d1a14e0b6e35a9c7266d626f26013f53a5d6c8462e2b1054bd65c72745ed1afdf96b17d6573f74b8555c946ef76c94acb8d860efa459d9955e SHA512 cbc42e2777d1332b5187cf1f826f73bf5c1c5a1106d851dc08d8082f41bde6846f349ed2339ae60ad00b2005b0983f01850931adc765d545de0a700f1d9cccaf
 EBUILD fdm-materials-3.4.1.ebuild 427 BLAKE2B f0c2ffd1704db661214fadee859f5ecb9a1653c7921649d5f75a7d90d1c22a5441cc614fc664943b4e2b1805d6d2a9e38a48c1ec6de8f029ff3df78ffed6587b SHA512 3ddb73a72ae39f3061c813f367cc5088b11617fde22acb7c77d43977174b4f00b156e1cf923ebe231c3a261e3684e9bbfecdc7bb9f08c08de3398a83b8c7ac44
 EBUILD fdm-materials-3.6.0.ebuild 424 BLAKE2B 86abac9f2f32f709c5e2dde549df6758108d22945a55fff32f4be6c2bf3842c210af686f00a6c403f0ae13611062e300cb4e235d4bd8fd25c0cf281fcda31f7e SHA512 aaaf876fe1c373061e94067ba1c89af62fb4836c44c7115c55d7684f01be6f11653850b94b029fdc56e70fc861eb44325aa946feac81d1ac0f06c3d48d8a7264
 EBUILD fdm-materials-4.2.0.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
 EBUILD fdm-materials-4.3.0.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
 EBUILD fdm-materials-4.6.1-r1.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
 EBUILD fdm-materials-4.6.1.ebuild 418 BLAKE2B 32a8bb1a67475a051216c3ed08230c48df1e6aef3938960d2d4d33d8a2735d6e6505ef992fbff9e9ad2cab7ba9fa7ba71227f735e0736150f35c8f08cf9d4e64 SHA512 73d45424b64d0cc9559dc9c59051e04783330915eb28e1d4d39c5f51a1028c8f819df857a38e4090f3bf14158020ff0e9833846c924072870b7d0bda314b03af
+EBUILD fdm-materials-4.7.0.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
 MISC metadata.xml 949 BLAKE2B d84bebe6a29c4eb2a6e644347492fe06a60e758efcaba9158d2395d2e3714565f805d01ed029bf8906c54ed286e49902adf6b4e8cef9870219cf3fd13912f5e7 SHA512 d7f04589e2e66b471a721aafa2d2be2d531211f2e5003ed7ffed918e770e6980cf891bc5728a0d1a27c3bcaebf2706ac9dd6d9dac847c412e1b7adde091a7594
diff --git a/media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild
new file mode 100644
index 000000000000..99506a67b867
--- /dev/null
+++ b/media-gfx/fdm-materials/fdm-materials-4.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="fdm_materials"
+
+DESCRIPTION="FDM materials for media-gfx/cura"
+HOMEPAGE="https://github.com/Ultimaker/fdm_materials"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="embedded"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DEMBEDDED=$(usex embedded on off)
+	)
+	cmake_src_configure
+}
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index ce07cbf04ffb..50f61adcb787 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -3,11 +3,7 @@ AUX freewrl-1.22.13-fontconfig-match.patch 666 BLAKE2B 5e4a1e818214c3f4361d3a90c
 AUX freewrl-1.22.13-java-fix.patch 1942 BLAKE2B 2358d7862f179f8c98babfb241fdc281a84eaf0073529f549f435bcbd363f0aad7d44027f221b3ea85109fa06721d7cacb7584d1aaefe4333dc982964b5c940d SHA512 e8224e249e28918e04117542c710b093f90e31666312c7b3f62444d68158832893cf81237c8d9c7677ac4e0b571c0a74457721f0778996a975fbdacffdebb82a
 AUX freewrl-1.22.13-mozjs187-config.patch 486 BLAKE2B 4d130a4f8adc59ae97c83dd697d543b3fdd8bdd5c9b9e6253b8c1aa936648a9212e0a1d3c899bf5dd217579142e84714d1d783901e3aa61184122b2530e99fca SHA512 69985ba98ca8c12e59b6aba2fda004931778f138dfd90a45fd9a65027961401f6a377bfbc55f9fb2614ada5ac291922809dc87ea8ad7bdf93bdc78ddb3c3b298
 AUX freewrl-2.3.3-ld.gold.patch 1120 BLAKE2B 86f6b8baf403b70b3fd346265b20bd39b76fcdeb9f953b8a653c1999c7f8ea0be1faed609ddb5a74c01f4536f7cfae8484815422a2fdfa21cb9debabc0dd9f3c SHA512 010369ab9ec5f03f3055594b88001deb14a58e3d69cd5f8312a7a25d34ec4bef81940d911a7c13aa8872c82fe66c14284d292a33e1629ab9dfe52cd9a4412e3b
-DIST freewrl-1.22.13.1.tar.bz2 1830305 BLAKE2B 6b4a777fa8afff1547282995fb21fdf84ba821133e81f7f6a63d93661a0c2c5e7971a3d0d3fee5ff670ed253157e8975cc758755fa4348f8458244dcbf9e6a86 SHA512 6e751835a256ce08d4099e5301c0702e28e5cae2e77d8a51ab38f6f0c08680f22a9ef25ef9d2bb860680fc8c1fc22cfebf14cfb14b50ee514b5ef76e71ab1192
-DIST freewrl-2.3.3.1.tar.gz 1731651 BLAKE2B 2ee197ee4633719dafd0eece94b852c21e5a7eddb0b32f6da38de5473b781a6205ef38ce57bd0df4eb25a8f91b7685a4e26e9911bc00fcb5efeaf3b61c4fdc15 SHA512 e205e8d11a3650ddf4f7dd089bdca36fc1879424c88392229ca8c0d532ebc4662f4f2e3bc491a0a1d6300e78c55cebbb57eeef2145a8c96c727c35dfb2a7d00a
 DIST freewrl-3.0.0.tar.bz2 1567282 BLAKE2B 84bf924ce51d70aca0baa504dba0726af82b3d2ff93de87bd18ab772f6bdbcc50807a496c14264006894b6c52bfe9844e672412162f3df1107453fa1f8b066a3 SHA512 12e75c6891238fbc9c750a9449c8a6a9f4b86124ac12871adbfb3c68b7ef09f35d3709dcb63693e50f8ac824170aef3b97854a72de0b324e67fbbb7c081675a0
-EBUILD freewrl-1.22.13-r5.ebuild 4479 BLAKE2B b4db6b9254ab462d4dc3495e04408d066dae2ff0813c8d0d2d086e8b80299bf55b99be08a9dc8a0ef5d674f42ed0893ce245a6d40bb2f7c44e32a7e7400084d5 SHA512 33ffa5c86551c708663f56cec08d50351a8c1af2c7b2e19efe16fea09caac0e58feb206f81b85588163dba8e7eacd1043f9767364e323ce84ca12afc3fcda6ca
-EBUILD freewrl-2.3.3-r2.ebuild 4358 BLAKE2B 364e0702ef6d664ac25b10f06d6841c6e4128fa4c14fe288551fa289672cfdc02561b231468550b1c8b9e4b4bc8d2e942b09e5a952cdaccb211aaa3be2bbda27 SHA512 99a49d8d51cb37c7a462235506c2edcf02f27bef0f508f16e31fe9c2010f4339350bda9baaddba0aa1d438af649e242f865ca56dd50fd82015a8663c36965142
 EBUILD freewrl-3.0.0-r1.ebuild 4430 BLAKE2B 7145155adf968a057b3ab817fe496fd8fa7e618e53996a27967d7937ecaa1c0f45e318e83d470d9bfc225aca797675a95f78160e07aa46afbb81e98750fd389b SHA512 0a02299bc0698e022b8eaca0aa6e9151cdb08b16155137d05a4404a467ef66ff04e0d1e0a22b86ad9d557a61210966b7a960f63c6cc478cc889b93e39f775c3a
 EBUILD freewrl-9999.ebuild 4489 BLAKE2B 8d5f07f5fbb46894e75b62994794738dcf50fa2025eeddc5a0c5c4aada55169e15c2ae5ec90434ed8f96a4a12f1f0b20b1195eee7ffc4a391280f1b9842d56c6 SHA512 9d9dd93cdc9e6dae64d0bdb068b56fa2c6a0f478708be6e48aa771e10526b30c73ae039cc83fe3f62d00bab2571e60bb013ee796c7cd613c8b3c7fa8a7cc60dc
 MISC metadata.xml 1431 BLAKE2B 85ddccbf801a54f7ff8956e7bd1bbb453ea4c79ff3cc56e52a46633416153be9b1af1ebc602ba36f07971bccecb679cc9933a023a7c7060495b86d1c9667a2cd SHA512 7290fb74f164cf5e520a024171f43d9edb4d31f09b9806a6939d5a3e1143cd2240dc1a3bea7d02ec18ee9351f6e3e27d7117b9289e0a5eaabdb42c5ed74c9d2a
diff --git a/media-gfx/freewrl/freewrl-1.22.13-r5.ebuild b/media-gfx/freewrl/freewrl-1.22.13-r5.ebuild
deleted file mode 100644
index 29ffb3ae4676..000000000000
--- a/media-gfx/freewrl/freewrl-1.22.13-r5.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
-
-DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
-HOMEPAGE="http://freewrl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freewrl/${P}.1.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl debug +glew java libeai motif +nsplugin osc +sox static-libs"
-
-COMMONDEPEND="x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libX11
-	motif? ( x11-libs/motif:0= )
-	!motif? ( x11-libs/libXaw )
-	media-libs/mesa
-	glew? ( media-libs/glew:0= )
-	virtual/opengl
-	media-libs/libpng:0=
-	virtual/jpeg:0=
-	media-libs/imlib2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	curl? ( net-misc/curl )
-	osc? ( media-libs/liblo )
-	dev-lang/spidermonkey:0="
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.4 )
-	nsplugin? ( net-misc/npapi-sdk )"
-RDEPEND="${COMMONDEPEND}
-	media-fonts/dejavu
-	app-arch/unzip
-	virtual/imagemagick-tools
-	java? ( >=virtual/jre-1.4 )
-	sox? ( media-sound/sox )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fontconfig-match.patch
-	if has_version ">=dev-lang/spidermonkey-1.8.7:0" ; then
-		epatch "${FILESDIR}"/${P}-mozjs187-config.patch
-	fi
-	epatch "${FILESDIR}"/${P}-desktop.patch
-	epatch "${FILESDIR}"/${P}-java-fix.patch
-	epatch "${FILESDIR}"/${PN}-2.3.3-ld.gold.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="--enable-fontconfig
-		--without-expat
-		--with-x
-		--with-imageconvert=/usr/bin/convert
-		--with-unzip=/usr/bin/unzip"
-	if use motif; then
-		myconf+=" --with-target=motif --with-statusbar=standard"
-	else
-		myconf+=" --with-target=x11 --with-statusbar=hud"
-	fi
-	if use nsplugin; then
-		myconf+=" --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
-		myconf+=" --disable-mozilla-plugin --disable-xulrunner-plugin"
-	fi
-	if use sox; then
-		myconf+=" --with-soundconv=/usr/bin/sox"
-	fi
-	# disable the checks for other js libs, in case they are installed
-	if has_version ">=dev-lang/spidermonkey-1.8.5:0" ; then
-		# spidermonkey-1.8.5 provides a .pc to pkg-config, it should be findable via mozjs185
-		for x in mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js; do
-			myconf+=" --disable-${x}"
-		done
-	else
-		for x in mozjs187 mozjs185 mozilla-js xulrunner-js firefox-js seamonkey-js; do
-			myconf+=" --disable-${x}"
-		done
-		# spidermonkey pre-1.8.5 has no pkg-config, so override ./configure
-		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
-		if has_version ">=dev-lang/spidermonkey-1.8:0" ; then
-			# spidermonkey-1.8 changed the name of the lib
-			JAVASCRIPT_ENGINE_LIBS="-lmozjs"
-		else
-			JAVASCRIPT_ENGINE_LIBS="-ljs"
-		fi
-		if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
-			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $(pkg-config --cflags nspr)"
-			JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
-		fi
-		export JAVASCRIPT_ENGINE_CFLAGS
-		export JAVASCRIPT_ENGINE_LIBS
-	fi
-	econf	${myconf} \
-		$(use_enable curl libcurl) \
-		$(use_with glew) \
-		$(use_enable debug) $(use_enable debug thread_colorized) \
-		$(use_enable libeai) \
-		$(use_enable java) \
-		$(use_enable nsplugin plugin) \
-		$(use_enable osc) \
-		$(use_enable static-libs static) \
-		$(use_enable sox sound)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use java; then
-		insinto /usr/share/${PN}/lib
-		doins src/java/java.policy
-		java-pkg_regjar src/java/vrml.jar
-		# install vrml.jar as a JRE extension
-		dodir /usr/java/packages/lib/ext
-		dosym /usr/share/${PN}/lib/vrml.jar /usr/java/packages/lib/ext/vrml.jar
-		if ! has_version "media-gfx/freewrl[java]" ; then
-		elog "Because vrml.jar requires access to sockets, you will need to incorporate the"
-		elog "contents of /usr/share/${PN}/lib/java.policy into your system or user's default"
-		elog "java policy:"
-		elog "	cat /usr/share/${PN}/lib/java.policy >>~/.java.policy"
-		fi
-	fi
-
-	# remove unneeded .la files (as per Flameeyes' rant)
-	cd "${D}"
-	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-	elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
-	elog "path.  If you do not have firefox installed or you wish to use a different"
-	elog "web browser to open links that are within VRML / X3D files, please be sure to"
-	elog "specify the command via your BROWSER environment variable."
-	fi
-}
diff --git a/media-gfx/freewrl/freewrl-2.3.3-r2.ebuild b/media-gfx/freewrl/freewrl-2.3.3-r2.ebuild
deleted file mode 100644
index 9a8ce5245a4d..000000000000
--- a/media-gfx/freewrl/freewrl-2.3.3-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.code.sf.net/p/freewrl/git"
-	S="${WORKDIR}/${P}/freex3d"
-	SRC_URI=
-	KEYWORDS=
-else
-	SRC_URI="mirror://sourceforge/freewrl/${P}.1.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
-HOMEPAGE="http://freewrl.sourceforge.net/"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="curl debug java libeai motif +nsplugin opencl osc +sox static-libs"
-
-COMMONDEPEND="x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libX11
-	motif? ( x11-libs/motif:0= )
-	!motif? ( x11-libs/libXaw )
-	media-libs/mesa
-	virtual/opengl
-	media-libs/libpng:0=
-	virtual/jpeg:0=
-	media-libs/imlib2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	curl? ( net-misc/curl )
-	osc? ( media-libs/liblo )
-	opencl? ( virtual/opencl )
-	dev-lang/spidermonkey:0="
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.4 )
-	nsplugin? ( net-misc/npapi-sdk )"
-RDEPEND="${COMMONDEPEND}
-	media-fonts/dejavu
-	app-arch/unzip
-	virtual/imagemagick-tools
-	java? ( >=virtual/jre-1.4 )
-	sox? ( media-sound/sox )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ld.gold.patch
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	# list of js libs without .pc support, to disable ./configure auto-checking
-	local spidermonkeys=( mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js )
-	# list of .pc supported spidermonkeys, to disable ./configure auto-checking
-	local spidermonkeys_pc=( mozjs187 mozjs185 )
-
-	local myconf="--enable-fontconfig
-		--without-expat
-		--with-x
-		--with-imageconvert=/usr/bin/convert
-		--with-unzip=/usr/bin/unzip
-		${spidermonkeys[@]/#/ --disable-}"
-
-	if has_version "<dev-lang/spidermonkey-1.8.5" ; then
-		# spidermonkey pre-1.8.5 has no pkg-config, so override ./configure
-		myconf+="${spidermonkeys_pc[@]/#/ --disable-}"
-		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
-		if has_version ">=dev-lang/spidermonkey-1.8:0" ; then
-			# spidermonkey-1.8 changed the name of the lib
-			JAVASCRIPT_ENGINE_LIBS="-lmozjs"
-		else
-			JAVASCRIPT_ENGINE_LIBS="-ljs"
-		fi
-		if has_version "dev-lang/spidermonkey:0[threadsafe]" ; then
-			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $(pkg-config --cflags nspr)"
-			JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
-		fi
-		export JAVASCRIPT_ENGINE_CFLAGS
-		export JAVASCRIPT_ENGINE_LIBS
-	fi
-	if use nsplugin; then
-		myconf+=" --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
-		myconf+=" --disable-mozilla-plugin --disable-xulrunner-plugin"
-	fi
-	econf	${myconf} \
-		$(use_enable curl libcurl) \
-		$(use_with opencl OpenCL) \
-		$(use_enable debug) $(use_enable debug thread_colorized) \
-		$(use_enable libeai) \
-		$(use_enable java) \
-		$(use_enable nsplugin plugin) \
-		$(use_enable osc) \
-		$(use_enable static-libs static) \
-		$(use_enable sox sound) \
-		$(usex sox "--with-soundconv=/usr/bin/sox") \
-		$(usex motif "--with-target=motif" "--with-target=x11") \
-		$(usex motif "--with-statusbar=standard" "--with-statusbar=hud")
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use java; then
-		insinto /usr/share/${PN}/lib
-		doins src/java/java.policy
-		java-pkg_regjar src/java/vrml.jar
-		# install vrml.jar as a JRE extension
-		dodir /usr/java/packages/lib/ext
-		dosym /usr/share/${PN}/lib/vrml.jar /usr/java/packages/lib/ext/vrml.jar
-		if ! has_version "media-gfx/freewrl[java]" ; then
-		elog "Because vrml.jar requires access to sockets, you will need to incorporate the"
-		elog "contents of /usr/share/${PN}/lib/java.policy into your system or user's default"
-		elog "java policy:"
-		elog "	cat /usr/share/${PN}/lib/java.policy >>~/.java.policy"
-		fi
-	fi
-
-	# remove unneeded .la files (as per Flameeyes' rant)
-	cd "${D}"
-	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-	elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
-	elog "path.  If you do not have firefox installed or you wish to use a different"
-	elog "web browser to open links that are within VRML / X3D files, please be sure to"
-	elog "specify the command via your BROWSER environment variable."
-	fi
-}
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 6b3373cf2d95..4bd3cdf285e1 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,3 +1,3 @@
 DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5
-EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1670 BLAKE2B 0aa8cdc1939247d7bd32712e84cfeda733cacef5902a52f5c0bffc44d7a8e15855bdd74405b98dfec0261413ed13d91a3dc0fb87fbd0ec84526d2c977ae34dcf SHA512 0ee9619276e583ace4c893e762da5f89fdca65b28f2170fb73e79a54a5da5621c50398a31f5c23987c47362a99414c99041c0ee3ad15a41d0d94ecebb391625b
+EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1694 BLAKE2B b3d643bcea4ff74a339d4015b7f3747d8accd17e3c33f464d03252b2d0ba1106e47d6ce7162b1343259850c34b3a6b206cb62b5d546abf83fcae53e1042b05e5 SHA512 6504876211812d61e6868a5633d1b293d5d5675845720e605c39cbd535dba7d71305ba1227760ee7a926a58968a5c6898b338e86eeacc883bdd8c11b4cb4cd2f
 MISC metadata.xml 311 BLAKE2B e595489db486352ace6f66c3d72be3f47857ab75d48b8c2c2964bc2466d372eefa5e503f2c089d88cf6aedfd7d076a6595f733b883dfb25276567de67abc6911 SHA512 392ac93a529b535ac58ad270f8d5d4ded4b1cd8914604ef9533dcdf10c08a05e3afc6800f3eb7b546c856e608444a662c6cfea8b436936e1931d7fdfe43b676b
diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
index 752aa4114bef..aff5c5c7b18e 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
@@ -12,8 +12,8 @@ inherit distutils-r1 optfeature virtualx xdg
 COMMIT=bd600c20921afff7b02fc0a76ab79242ebd0896d
 
 DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
-HOMEPAGE="http://edyoung.github.io/gnofract4d/"
-SRC_URI="https://github.com/edyoung/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/fract4d/gnofract4d"
+SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -69,6 +69,7 @@ python_install_all() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
 	elog "Optional missing features:"
 	optfeature "creating videos" media-video/ffmpeg[vpx,zlib]
 }
diff --git a/media-gfx/llgal/Manifest b/media-gfx/llgal/Manifest
index f09c17489864..40a122544452 100644
--- a/media-gfx/llgal/Manifest
+++ b/media-gfx/llgal/Manifest
@@ -1,7 +1,3 @@
-DIST llgal-0.13.17.tar.bz2 81365 BLAKE2B 3af18f6f3ae699a1ddd577cd97780e9795ff77faffd50866cb11a9ee6170b718144806fb01b7959e2fe1dcfeec39bb0a34482a75e64d5eeb7df73c99ef14547c SHA512 2b100053a804985e7f59674e6a0886bffe5231cf3735a8dbbf7c8db56285a5a4ca88880299aac25d5cecb6a4f0cc024dc87fdf084eb281f7cb578f0d7cba5293
-DIST llgal-0.13.18.tar.bz2 81674 BLAKE2B 96b48e9d6ad91ad2b11cd898563c7640f047ddbfd7f5ba8d6e4fb2d304199936b3fdbc6c8bf2647ec7141b85857c79d4e2e76bab2b3c6daa07ee0b4933b79aed SHA512 d01c1060616bb602af8b75aa5ae04384c19ed4bcc717112b9d5cfe48a9a823ce9ba381d675b4f4e89f35a56d7cbf580f27405fcb65b785e8ea6b6732784b0655
 DIST llgal-0.13.19.tar.gz 96675 BLAKE2B b306eed900a1071898ebe2d0dcbfeb9c505271ec8d5889e75fcf189dee22489fb8d671ede05a1af74a7761b604d8af8e3b26b8771ec50c8e49036000e90258fd SHA512 24f247071678f21c79e37002a443ff222e9e99e9bf04363fc123c5d9538a35db100ea814408e2bcc9e20781982145301df3337e521413651547828654a92d169
-EBUILD llgal-0.13.17-r2.ebuild 914 BLAKE2B d52a3d2ae2de6da933bbd651fa215dfd7609bf6e34afcda0b753f5be1dd5a5cf269ceb508c0c50f2b2497f6f8998904ded0f51d639a16f207da495f99d1cd05e SHA512 c7150f19b551b77c7934f4a12fe9b60c0ec2ef96eacdc0e4de192b0d8ba088609373436499ef2351983f8d279fb269908479ee12da26bcb1dbf3b50110cf419f
-EBUILD llgal-0.13.18.ebuild 916 BLAKE2B 0b6156409e0440708cd37e45d7e16c326c643c5ef35090de4e40fa8c802ee5d457db139ffb0149e59d4f80417a6c6b408deea06a1e9802f9589b3eaa67d7a690 SHA512 9960069fcf88897ddbfd5cc026ca9dea6f1bbcfa0fd5ab437af970a260db06bf52268730ea425af451fb0847c070ec07305de126884c8f550f0329c266d52b9a
 EBUILD llgal-0.13.19.ebuild 1071 BLAKE2B b5b2c4b2b548880a68f9bd77bfd50f2e479042fd50578273fc9bc390fc1c832ed726dbb02c81ed9c5aa15de9939daa1012bcb7a3c171f9d579d2b3b3246b2851 SHA512 aecc703b62a977357ba104b11713476f07a6e3982f3c879d2620f7da2bdafc45d1ed47cf913052ab50f018991e2026d35be114e060e1e651380eb75883b0d9a6
 MISC metadata.xml 247 BLAKE2B 40a951853ad971fb856cb2bc8e102caf52d803f2c07466f49cff536bfa108711f107e5dd89745bd16cc74d90df7022747f27d1e664e17b079f20e3f636b8e50b SHA512 077ebd8acee5d10820d2a4e3f8c5d0f50b7dc0e4c8f8ab749b6b2547b397f30348abc858b0a9d1890d9b3d96949b76bdf2f92e277ba61dfac08e9f83fbc58021
diff --git a/media-gfx/llgal/llgal-0.13.17-r2.ebuild b/media-gfx/llgal/llgal-0.13.17-r2.ebuild
deleted file mode 100644
index deae0d906025..000000000000
--- a/media-gfx/llgal/llgal-0.13.17-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="Command-line static web gallery generator"
-HOMEPAGE="http://home.gna.org/llgal"
-SRC_URI="http://download.gna.org/llgal/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-# Package warrants IUSE doc and possibly examples
-IUSE="exif"
-
-RDEPEND="media-gfx/imagemagick
-	 dev-perl/Image-Size
-	 dev-perl/URI
-	 dev-perl/Locale-gettext
-	 exif? ( media-libs/exiftool )"
-
-src_compile() {
-	emake PREFIX=/usr SYSCONFDIR=/etc MANDIR=/usr/share/man PERL_INSTALLDIRS=vendor
-	mv doc/llgalrc . || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" LOCALES="${LINGUAS}" PREFIX=/usr SYSCONFDIR=/etc \
-		PERL_INSTALLDIRS=vendor MANDIR=/usr/share/man \
-		install install-doc install-man DOCDIR=/usr/share/doc/${PF}/html/
-	perl_delete_localpod
-	dodoc README llgalrc llgalrc.5
-}
diff --git a/media-gfx/llgal/llgal-0.13.18.ebuild b/media-gfx/llgal/llgal-0.13.18.ebuild
deleted file mode 100644
index f1a01aa8d536..000000000000
--- a/media-gfx/llgal/llgal-0.13.18.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="Command-line static web gallery generator"
-HOMEPAGE="http://home.gna.org/llgal"
-SRC_URI="http://download.gna.org/llgal/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-# Package warrants IUSE doc and possibly examples
-IUSE="exif"
-
-RDEPEND="media-gfx/imagemagick
-	 dev-perl/Image-Size
-	 dev-perl/URI
-	 dev-perl/Locale-gettext
-	 exif? ( media-libs/exiftool )"
-
-src_compile() {
-	emake PREFIX=/usr SYSCONFDIR=/etc MANDIR=/usr/share/man PERL_INSTALLDIRS=vendor
-	mv doc/llgalrc . || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" LOCALES="${LINGUAS}" PREFIX=/usr SYSCONFDIR=/etc \
-		PERL_INSTALLDIRS=vendor MANDIR=/usr/share/man \
-		install install-doc install-man DOCDIR=/usr/share/doc/${PF}/html/
-	perl_delete_localpod
-	dodoc README llgalrc llgalrc.5
-}
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index db5cf1c36e35..6d9678c88683 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,5 +1,3 @@
-DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
 DIST mypaint-brushes-2.0.2.tar.gz 1564926 BLAKE2B 68a244f42cd5d9b1f96466f5409f0c7ebae257f6dbbfdc5139cb9fda86ee4898ce8fda2a35e96f3a65f41333f7f689edb85445bcd88dc0fc4b428d05ba2870fe SHA512 89cecd9d78f4de84ada97a3e33fd67b86dfd259880da15c0ecbfad0fceb8c3b0e93790f3c0bff0cc375959bdf6921b01d1f3646e27c3f961715219a349017556
-EBUILD mypaint-brushes-1.3.0-r1.ebuild 558 BLAKE2B 6850bc1a3e94d52faff03b029efaa481e4f1cc436053fa96499994450ee486c4276bcae2db56ac997ac40fd3eff8c914fa1a0b8ccd55947d0906a6db182180fe SHA512 ff4b72bbae9c2fa8b217de2513b186a75865bda8dba2acf19db7c93f0da126c068983f88737f3ef3d4e30f6b48a98e59f4f4e65955ac7aea439aefeab7a83f68
-EBUILD mypaint-brushes-2.0.2.ebuild 550 BLAKE2B 756b9a767da9891e34b38d1df5fc1aafbec00a76e14e570dc8fecba410ac075ea158cd4d7af0088924d48fbca9f2d51bee1d8eb794eb3bdf8b0ffa0674ea4b0a SHA512 6f43f61c67d41c366a411eb39e944d0114e2e6f453820400aa642ce411f4832123618dc01ac3ebe1bfe18124fa7f72ec0a7278922133a220e07b88de8b93bd13
+EBUILD mypaint-brushes-2.0.2.ebuild 549 BLAKE2B 1f74b819805240361e6217da37aa5c8945b55cd420dd9bef7f5d1241a8509d1f228c25f0b5b8f54d3940613f560082ca6b4b9af4d4cac8efdf5a3e7ec1b7055f SHA512 bd107f540acbca1e910bcbff4a976a6d146492c6e71621a43c840e2e23dd5924d918ad086931fc95444d34fd22e4e0528d0c538b38d21ac87ba606d8d21c1bca
 MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
deleted file mode 100644
index c217baafef18..000000000000
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Default MyPaint brushes"
-HOMEPAGE="https://github.com/mypaint/mypaint-brushes"
-SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-IUSE=""
-
-DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
index 4a806df9a314..635c072998e9 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
 
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 6de7ea08b36a..ea34ba704f2d 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,8 +1,5 @@
-AUX mypaint-1.2.1-json-c-boolean-defs.patch 1189 BLAKE2B 7cc9728fbe01195b0c95bd844592d4fbae29a7a26758d242933ed712b940d8a893cd41bd2987952e2a817208efbffd779e9c39d4dde42d809a1e11de06a234fa SHA512 8e5815c281a6c63c7818f378d0e75a94860dd24ea69e9fff8e5951b05c407f12e2e19fefeaa559476a4dab46c88eab8821eff061e8c8eadd1f3ce150e42563c2
 AUX mypaint-2.0.1-GIL-hold.patch 5153 BLAKE2B 3d70b414bfb6396fffb9ebfc9c1fe6791878a97a999355b103fd848993172049db7f97f81d96e253294b9629a2a5dfe7c6710f29561f45b89f4fb26d4cf9a788 SHA512 aa64bb4ffb907516af811bb8ef4c0bccce9b785f94e0d71a44be30e7c96ea3a35dcceeac618956bf11c9d2c5c4e05524c8492ed14967148e2d6b9646b1ed5c15
 AUX mypaint-2.0.1-r1-build-system.patch 638 BLAKE2B 8e0209eb8fdba535cb8c0075e183681b0d8f8a11613cf7c3d2ddb5e20954d6c95da3ef3824063ac55bb11feda38cdf00eb8190cf76ca7753d2432d870926194b SHA512 8c088a089408542f57ef0fb608a63ae6fa0cce5392cb309376198813d35f5c3e54466945419984973af77e11f5bc4908961b5e81982a32fbef04c081df1b0349
-DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
 DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562
-EBUILD mypaint-1.2.1-r5.ebuild 2016 BLAKE2B 0a00318c334adc4c97021ca1e52cb089075b1db667f0ad431fcf758345756d7d3558e50a353c8578d5749172ea4bbe396a99041c026cecce6174cb7cc6e4caf3 SHA512 5b1a703cf2efb5e0d729315ea092c58954975dedc177472467f03726956211b34744018cb3ef730f4b5a8ff2053f30218f838609ef225dd05eab21f5d8a683d8
-EBUILD mypaint-2.0.1-r2.ebuild 1819 BLAKE2B 118b55b447bff16f992272017b3df8e28e9929c8904fb5417646c643f32eff5df4b1b266237fbee9b914da942482a7b33fae71af5bc7993ee83f98c8b95e3d36 SHA512 c6015d2ab888f48a32c5fcea45dd6532ec315ef61226e8ddb5ddfcb2b7ea2efcb0d3147a23b361c04553c71bef8863ef4508946707619e08f5bd52cb0d3d628c
+EBUILD mypaint-2.0.1-r2.ebuild 1818 BLAKE2B 834cc6863ab6c57876cdb2e56aab050be451806da7192a53bcd99d306e86cff9de0389ff5d35310ef4c45afed763109246e800b9ad4d744f0e8f1face0784362 SHA512 63e3c76f051c261b3c6a429a6629798673a36142dbb8756e8595651ebfc8379ed16c0f9c76e7fe38990c33f64ceb4c10c3f2393a859cdb1be3cbdb8668012275
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch b/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch
deleted file mode 100644
index caa2df4de6ee..000000000000
--- a/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit a2b3f56b347c1897454eac1b5bdfe9d228302b80
-Author: Jehan <jehan@girinstud.io>
-Date:   Sat Jan 26 12:50:31 2019 +0100
-
-    Boolean #define-s removed from json-c in 2017.
-    
-    We don't need to #undef TRUE and FALSE before including json.h as this
-    redefinition has been removed in upstream json-c.
-    See json-c commit 0992aac61f8b087efd7094e9ac2b84fa9c040fcd.
-    
-    Note that it still works even if using an older json-c since the
-    original code was alreadying #undef-ing these 2 values before redefining
-    them. So that was anyway useless code and this change should work both
-    with old or new json-c.
-    
-    Note: the previous code was still working fine when building on Linux,
-    but not when cross-compiling on Windows. But this is the correct fix
-    anyway.
-    
-    (cherry picked from commit f4fd97445d3b6843af57ff8ba5f02cbdeb3942e9)
-
-diff --git a/brushlib/mypaint-brush.c b/mypaint-brush.c
-index 4759d11..7a1380c 100644
---- a/brushlib/mypaint-brush.c
-+++ b/brushlib/mypaint-brush.c
-@@ -35,9 +35,6 @@
- #include "rng-double.h"
- 
- #ifdef HAVE_JSON_C
--// Allow the C99 define from json.h
--#undef TRUE
--#undef FALSE
- #include <json.h>
- #endif // HAVE_JSON_C
diff --git a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
deleted file mode 100644
index 4c5a1859342c..000000000000
--- a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic gnome2-utils scons-utils toolchain-funcs python-single-r1 xdg
-
-DESCRIPTION="fast and easy graphics application for digital painters"
-HOMEPAGE="http://mypaint.org/"
-SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-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="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		)
-		>=dev-python/pycairo-1.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
-	')
-	>=dev-libs/json-c-0.11:=
-	media-libs/lcms:2
-	>=media-libs/libmypaint-1.3.0
-	media-libs/libpng:0=
-	gnome-base/librsvg
-	sys-libs/libomp
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}/${P}-json-c-boolean-defs.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	# Workaround scons bug with locales. Bug #352700
-	export LANG="en_US.UTF-8"
-	tc-export CC CXX
-	strip-flags  # scons upstream issue #3017
-	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 -r "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
-	# already provided by system-libmypaint
-	rm "${ED}"/usr/share/locale/*/LC_MESSAGES/libmypaint* || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
index d0e52bef58bf..494d4ce80a0a 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="openmp"
 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"
 
diff --git a/media-gfx/qiv/Manifest b/media-gfx/qiv/Manifest
index bc8415448a54..d558344dcb98 100644
--- a/media-gfx/qiv/Manifest
+++ b/media-gfx/qiv/Manifest
@@ -1,4 +1,4 @@
 AUX qiv-2.3.2-optional-tiff.patch 519 BLAKE2B 1c2f4d4d79f3d746927f4c5af05769992460c30cdd438096d4c4d0c39a9460bcb921ddd854786ec394fc9e229ad239c541cc97f5468cd6934c15a0557275270a SHA512 c492b902bbd7771648deaffc7eafb8fccf86d294c0e2597999f2fff02ed1e02f6fc158ea95fe25c2a9b27d15dffe724c85654c99e7769254abb40e9fdcb8f358
-DIST qiv-2.3.2.tar.gz 135164 BLAKE2B b6b82c3007cd3214bb0b812026d22ab0a3c7fce87e51c1f2e19634fe131656f7adc1e92d2e1fcdcc563f1fd8b7c298307e48823bb26e077b336a6983f31894ac SHA512 a6750ecf26bc5b78fbebfdfcfd7a8ab0a5d3ba4e4b19c4a5563e1631dfaf8cc98f7a0bc9449956bc06f8b98cb307b31f78178676ddc9df4fa03429fa31c174e8
-EBUILD qiv-2.3.2.ebuild 1223 BLAKE2B 586921fac938875cfb54525bb00b134478287143d4f824d5521ca875dfc256fd8ca3252caf2e1b879153837aed78900ab75d0f92ce7da965d63030609281ae82 SHA512 7cb91c24aa67ffab9bf6884a9b4ebc9fec5122ded9638ab76e1e71d66affea869742a266dffbcebee6f8b5bb4cd083fef2c22793804ee3eb6c6a1e7c8f8acc84
-MISC metadata.xml 248 BLAKE2B ab7b756aa0b3b6061c7af2ef699cfccf52f3451ea89f7c51e058405391fca28092d65b7d4dd42846b436a4c23b8b620b923410e0efb0a45d636d9aad01e7725f SHA512 e48f83e5e18affc154591383f52d7620c286e5596647e8f2bcfc0fd13a4a1ef1ee90a9d799be53b572812c6e3f38072de31eafa293b5a8e3559f95a32c85a99e
+DIST qiv-2.3.2.tgz 133614 BLAKE2B f06f36524db8cdde1baf3e118e8ceeeb654dd49a674b55d661255734c0bedaa765fcf8bb77b03d3c2bac8d75a9088b3290f1d802d670393b6795fee85dd4f778 SHA512 c4636591f79e8e4c13807433a4101a461e614439e497a5637b958bd9d0937b04515854483d4060d9b1004d6c6060b437d634fdbe491eb0747a660ba65240472d
+EBUILD qiv-2.3.2-r1.ebuild 1190 BLAKE2B 61f3e570e1f1a4d85a3003ea5ecffcbe4b61e90a01197c6d8d62ec664377e5f94e2218ffa130114459350231b06af08ccf175ad3974b4baffb2ca532476a782c SHA512 d928309a2fd8afd32ad6ca6a1becc18ae38657050c2406eefd79012d3f5601a2d1cf27b111ed466bdd51b6a7c8acc731a17925a1e5dfaf186303e22b6562400f
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/qiv/metadata.xml b/media-gfx/qiv/metadata.xml
index 14169f8501b5..7a38bb900964 100644
--- a/media-gfx/qiv/metadata.xml
+++ b/media-gfx/qiv/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="bitbucket">ciberandy/qiv</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/qiv/qiv-2.3.2-r1.ebuild b/media-gfx/qiv/qiv-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..bb8d07f04ab6
--- /dev/null
+++ b/media-gfx/qiv/qiv-2.3.2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs xdg
+
+DESCRIPTION="Quick Image Viewer"
+HOMEPAGE="https://spiegl.de/qiv/ https://codeberg.org/ciberandy/qiv"
+SRC_URI="https://spiegl.de/qiv/download/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="exif lcms magic"
+
+RDEPEND="
+	media-libs/imlib2[X]
+	>=x11-libs/gtk+-2.12:2
+	exif? ( media-libs/libexif )
+	lcms? (
+		media-libs/lcms:2
+		media-libs/tiff:0
+		virtual/jpeg:0
+	)
+	magic? ( sys-apps/file )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-optional-tiff.patch )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \
+		Makefile || die
+
+	if ! use exif ; then
+		sed -i 's/^EXIF =/#\0/' Makefile || die
+	fi
+
+	if ! use lcms ; then
+		sed -i 's/^LCMS =/#\0/' Makefile || die
+	fi
+
+	if ! use magic ; then
+		sed -i 's/^MAGIC =/#\0/' Makefile || die
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin qiv
+	doman qiv.1
+	dodoc Changelog contrib/qiv-command.example README README.TODO
+
+	domenu qiv.desktop
+	doicon qiv.png
+}
diff --git a/media-gfx/qiv/qiv-2.3.2.ebuild b/media-gfx/qiv/qiv-2.3.2.ebuild
deleted file mode 100644
index cd62b56094ca..000000000000
--- a/media-gfx/qiv/qiv-2.3.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop toolchain-funcs vcs-snapshot xdg
-
-DESCRIPTION="Quick Image Viewer"
-HOMEPAGE="http://spiegl.de/qiv/ https://bitbucket.org/ciberandy/qiv"
-SRC_URI="https://bitbucket.org/ciberandy/qiv/get/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="exif lcms magic"
-
-RDEPEND="
-	media-libs/imlib2[X]
-	>=x11-libs/gtk+-2.12:2
-	exif? ( media-libs/libexif )
-	lcms? (
-		media-libs/lcms:2
-		media-libs/tiff:0
-		virtual/jpeg:0
-	)
-	magic? ( sys-apps/file )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-optional-tiff.patch )
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \
-		Makefile || die
-
-	if ! use exif ; then
-		sed -i 's/^EXIF =/#\0/' Makefile || die
-	fi
-
-	if ! use lcms ; then
-		sed -i 's/^LCMS =/#\0/' Makefile || die
-	fi
-
-	if ! use magic ; then
-		sed -i 's/^MAGIC =/#\0/' Makefile || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin qiv
-	doman qiv.1
-	dodoc Changelog contrib/qiv-command.example README README.TODO
-
-	domenu qiv.desktop
-	doicon qiv.png
-}
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index 0f54bc43f0c1..185afbdef80e 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,5 +1,7 @@
 DIST qrencode-4.0.2.tar.bz2 430309 BLAKE2B 1f68d2a921ba60df3a6c7381d7886b27a2876f90771d78c12d5d0fed2d6a4edb4d7da5985e2b244406a0cf3434b351fbec8b12c5944c365078ef2b227edb0acd SHA512 2429c7938e32eacbaf327c029c7745ba33259f879661a8b6470cc617c780daf5bd1d5689599151df62e84badd2568eccab6c12f157331e512ab24a3899e0f002
 DIST qrencode-4.1.0.tar.bz2 449040 BLAKE2B cff4e950a436e2bb3a73543ce11639861426840db6861eefd3d641dcb14cd6b4be7c2045468a002f7599a89aa71c77f7dfc971dd726ecce0d524f9b792ea6e91 SHA512 50ccc65f748cc1007dccd8d0eee0063b870c3e8a5fe5b8b2a813881151a86748a36844bcfa6ab08c82674b80e9b5bcbfd564ade92562cc49e01cbfa45376b4a9
+DIST qrencode-4.1.1.tar.bz2 461562 BLAKE2B ae3abb4a162518c0204d09c9df7434fb348e24c20e790a261841220b0a7165168137d5acbdbc53e40558724eac2e1e21786f11013f384b545d56a1c9caaff61d SHA512 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8
 EBUILD qrencode-4.0.2.ebuild 791 BLAKE2B 59ae47be368e05d95bcc77a0a18165b5d1c961aa181aea6c3c1882c3d6969a99cce6d6e31272a45bbeb478e85d3f732e21d5b9fb7f91e87306fc0d94b3feb15b SHA512 7698b6d3d99e70e37abb1a43bfd643019b411343a578bed7e1905e19db40263158710968e3e9833da20f45412dbce0fcb5f4b3d4c9b1179ce9b20b4356699fee
 EBUILD qrencode-4.1.0.ebuild 799 BLAKE2B 162c9977a8fc2ede9aea8fdca4caeb5a031150b9a6aab825ad48882bc103a4f3c39fee4db434421d3597462deece7260eaad21b461714608f15f7d6df58478c6 SHA512 22404cdc9ba4492f0351cd6fe5788c28fe0f49c6c44df0b7ee526cf3ff686489eda8905d1cac4ccf85c742593fc7e6eb246cac5c0f99af1646567b91bc23bfe7
+EBUILD qrencode-4.1.1.ebuild 799 BLAKE2B 9d085069ad33bbf42477e5c490b7f5be148a4e50682aa613f696b7b56448565b098f7b97daa694482027420879f6a23d861c67df35ba98eefe46fe087b3791e9 SHA512 9a412c5f7a58b6d2625a4099e144d719fc3ed76c3051ef41a184130decdc347f54d45a6d9fa2d03a5a36f524bfe043e3f73d36f9cd454b68d02710924f1a17e3
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.1.1.ebuild b/media-gfx/qrencode/qrencode-4.1.1.ebuild
new file mode 100644
index 000000000000..0872a1336274
--- /dev/null
+++ b/media-gfx/qrencode/qrencode-4.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C library for encoding data in a QR Code symbol"
+HOMEPAGE="https://fukuchi.org/works/qrencode/"
+SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="media-libs/libpng:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_with test tests)
+		# TODO: figure out how to make SDL check fail as the SDL test
+		# program is not useful
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	cd tests || die
+	./test_basic.sh || die
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 21e84ad30d7c..dc0e73cf72db 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index b6e57510a3eb..fd51051e6fd5 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -3,6 +3,6 @@ DIST lcms2-2.10.tar.gz 15763103 BLAKE2B d5fc0ffd4917c0b73d2df79a2d5acfd93e88b824
 DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e
 DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b
 EBUILD lcms-2.10.ebuild 1210 BLAKE2B 581f9a7df0e9e19fa96e5c33ef9a3e2dbdbdba5910180b700d813e6a2072c097fca73c4635d01f5c3096b6b2acd0d03ccdf87535330024917735cc563ab2651a SHA512 ae33fefe9567e72daad621ccc286e4c2906d5f70e826f3de87e9d92f34be311164b9812935d375b3d3c6ddf4788872cb0eca6bb856fc3aaadf53fb21960bf12e
-EBUILD lcms-2.11.ebuild 1184 BLAKE2B df281869e2f082e27ae89ce20a4ea1f70199675d5f92c8c848122ba8eac26ddf21b617e61e028cb09f6fba990908d7224da082593140444325637002a54f6b04 SHA512 20edb254a2fe9c339ca54d2fdd73c5278ec3cc094434cf9dfed7c69b900372f0c0562e9d1fcbaf302a44e875152590c4e0a8fa5dda45d9791bf97c7ccabf641d
+EBUILD lcms-2.11.ebuild 1182 BLAKE2B b18e4bb2cea6a30234828d7ceae81b4b8912afe50e39931ea1e76d96b33cef1ea12a54b2bf54d069ad7498e2ec8701001631c73873fd0e90d716b4011e809d59 SHA512 8640186e5245993aac606c9425994633cb879fe547dbcb8a21bccce92a3aa21e9fc4f7839c72ba4be5815bd7a5c226d46d7c9c5ee74f24ffb238f1db109ef842
 EBUILD lcms-2.9.ebuild 1240 BLAKE2B df6256d156b2b0dac0acf03c4fb2f7c503edbf0915931e9273c4547688d6980b84f7c1fb03a619dbb1bd967b2ac2694adac0a3ee21eafd59772c57c1a2f13328 SHA512 564d2afaa448d6d560d0c2c6bc8c5e6b90f81e170a16e470d3193c24e71be8accc570d0414dcb0f13a9a82dbc21e0b6e9df31a790ad704b69c8348b29b589bdc
 MISC metadata.xml 410 BLAKE2B 9349e230ddeb0fe27ff503a24fcfecb247c3f314b0a68b31c3ae998aca9707a2b513228a98f92dcadc15fc9b91e2d8fdb4b6153b35d9eb9ba5492e1b7d929b7c SHA512 d010ff15cb753002aa9a0f9c6c246e3b633cd4ea4bd75521a4c3c6c5b336852e108dafd0835c7533bf07e30dec8c1237e53218b672a01bf0d838cd48f0033d43
diff --git a/media-libs/lcms/lcms-2.11.ebuild b/media-libs/lcms/lcms-2.11.ebuild
index 36ef2ecf3797..ab34f19770d8 100644
--- a/media-libs/lcms/lcms-2.11.ebuild
+++ b/media-libs/lcms/lcms-2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs test +threads tiff"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest
new file mode 100644
index 000000000000..d6333be538eb
--- /dev/null
+++ b/media-libs/libavif/Manifest
@@ -0,0 +1,4 @@
+DIST libavif-0.8.1.tar.gz 2915941 BLAKE2B 40030a5a002e68231adf48ecc6e8012f7ec53506770872fc79dfd73496fa3a214c10cf5fb5826f145fe1f881adf2a3ecca13c33989b2f048aa72e455ab6950e0 SHA512 03692fbba49fde08d76cebb847d0404a81113824e9e65edc6a0977f323d060c394d111e2a7647788fa3115f3ae80b0fc92d4fe5be53852e6734b96a8f1c1a078
+EBUILD libavif-0.8.1.ebuild 1659 BLAKE2B 67a47e9825f0372ac63c63c3995e21f9de3fd7c678a8ea509cf1fd474165ba5de133532e3e30c6786178622bdedfa311e692cd5c0a4ab5798694e50f59b44765 SHA512 69bfed41583ee92e65078db7a63ba01012722c0b064949999bfe33e1284a1842e1e2d8a32d75222fb3b6598ba844db5bc515d56c90f80f0db26605502d4549a6
+EBUILD libavif-9999.ebuild 1616 BLAKE2B 6fd97427b007b3ef0e892505eafd538cfd7eb13879fa6d5817608e4dfb027983b283b830b8a5a6fdaad10e764a3281f41a5a382286e27ffaa8db530d5f776749 SHA512 80003f7397e70ce3a50281c508fe43c96745a0c24b316a6f2f9b4abbfd6ff4312c2c3edf506d9325c5732c8ed379b050b503a9124ed62a4f3dcd6cf1c0d3bfc8
+MISC metadata.xml 887 BLAKE2B 07dd6586bb1553346742120a8a79e89df0df54b7d88673f2b05e04523ba9158dc1bb8ce43fe4202eabc053e039d44db886f2ddb22047cc76e240cd917313adc3 SHA512 ad588808bf4fbfb7065053a5178df233a106b4dd57191aab3439b620238aca08370099f2618c21126a0358c7100f572b499461eddb01770b8a270aed43e82a91
diff --git a/media-libs/libavif/libavif-0.8.1.ebuild b/media-libs/libavif/libavif-0.8.1.ebuild
new file mode 100644
index 000000000000..4d120a5e644b
--- /dev/null
+++ b/media-libs/libavif/libavif-0.8.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake gnome2-utils
+
+DESCRIPTION="Library for encoding and decoding .avif files"
+HOMEPAGE="https://github.com/AOMediaCodec/libavif"
+SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+aom dav1d examples extras gdk-pixbuf rav1e"
+
+DEPEND="media-libs/libpng
+	sys-libs/zlib
+	virtual/jpeg
+	aom? ( >=media-libs/libaom-2.0.0 )
+	dav1d? ( media-libs/dav1d )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+	rav1e? ( media-video/rav1e[capi] )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="|| ( aom dav1d )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DAVIF_CODEC_AOM=$(usex aom ON OFF)
+		-DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
+		-DAVIF_CODEC_LIBGAV1=OFF
+		-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
+
+		# Use system libraries.
+		-DAVIF_LOCAL_ZLIBPNG=OFF
+		-DAVIF_LOCAL_JPEG=OFF
+
+		-DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
+		-DAVIF_BUILD_APPS=$(usex extras ON OFF)
+		-DAVIF_BUILD_TESTS=$(usex extras ON OFF)
+
+		-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+pkg_preinst() {
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if ! use aom && ! use rav1e ; then
+		ewarn "aom and rav1e flags are not set,"
+		ewarn "libavif will work in read-only mode."
+		ewarn "Enable aom or rav1e flag if you want to save .AVIF files."
+	fi
+
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_update
+	fi
+}
+
+pkg_postrm() {
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_update
+	fi
+}
diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild
new file mode 100644
index 000000000000..ffaba14b1959
--- /dev/null
+++ b/media-libs/libavif/libavif-9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 gnome2-utils
+
+DESCRIPTION="Library for encoding and decoding .avif files"
+HOMEPAGE="https://github.com/AOMediaCodec/libavif"
+EGIT_REPO_URI="https://github.com/AOMediaCodec/libavif.git"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="+aom dav1d examples extras gdk-pixbuf rav1e"
+
+DEPEND="media-libs/libpng
+	sys-libs/zlib
+	virtual/jpeg
+	aom? ( >=media-libs/libaom-2.0.0 )
+	dav1d? ( media-libs/dav1d )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+	rav1e? ( media-video/rav1e[capi] )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="|| ( aom dav1d )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DAVIF_CODEC_AOM=$(usex aom ON OFF)
+		-DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF)
+		-DAVIF_CODEC_LIBGAV1=OFF
+		-DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF)
+
+		# Use system libraries.
+		-DAVIF_LOCAL_ZLIBPNG=OFF
+		-DAVIF_LOCAL_JPEG=OFF
+
+		-DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF)
+		-DAVIF_BUILD_APPS=$(usex extras ON OFF)
+		-DAVIF_BUILD_TESTS=$(usex extras ON OFF)
+
+		-DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+pkg_preinst() {
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if ! use aom && ! use rav1e ; then
+		ewarn "aom and rav1e flags are not set,"
+		ewarn "libavif will work in read-only mode."
+		ewarn "Enable aom or rav1e flag if you want to save .AVIF files."
+	fi
+
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_update
+	fi
+}
+
+pkg_postrm() {
+	if use gdk-pixbuf ; then
+		gnome2_gdk_pixbuf_update
+	fi
+}
diff --git a/media-libs/libavif/metadata.xml b/media-libs/libavif/metadata.xml
new file mode 100644
index 000000000000..31ef145a4ce5
--- /dev/null
+++ b/media-libs/libavif/metadata.xml
@@ -0,0 +1,23 @@
+<?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>
+  <maintainer type="person">
+    <email>dnovomesky@gmail.com</email>
+    <name>Daniel Novomesky</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="aom">Enable support for the AOM codec encoding and decoding</flag>
+    <flag name="dav1d">Enable support for the dav1d codec decoding</flag>
+    <flag name="extras">Build extra apps (avifenc, avifdec) and test files</flag>
+    <flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag>
+    <flag name="rav1e">Enable support for the rav1e codec encoding</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index a80def47c395..85b69d74699f 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,6 +1,3 @@
-AUX libffado-2.4.1-python3-scons-fix.patch 982 BLAKE2B e9e6e5c8e9582db5e936d355abf8b7292c5a03d799dd3c36d567604a1f959b1b509856ee9ac1e7693a1147907ce7105841010c317d8d2981f35c1c125f4cb5a6 SHA512 5e3de46d1e9ff5d0ee0b555218d1d59deb81e87ccf3f4179c6c25fac0888abf27b96e6cd82a8815b58040b3ab949a5cf2128c709c91ea125c3194e19956817e1
-DIST libffado-2.4.1.tgz 1229295 BLAKE2B 3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704 SHA512 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74
 DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80
-EBUILD libffado-2.4.1-r1.ebuild 2834 BLAKE2B 076b3a28bd30ca0e70ee9965fd202b2dd70127c78b170eb7648f863326364a024c38b0341ad60384e6bd505a2f0889dee6b1ac96c8ff2b76557df728eee7e07d SHA512 72552a6e68f95e4063479512458e7b7cbaeb549947333c5f934f3fbe9831cdce98fba296240e7281e6050e7aa1626079a12680503dd31c2d53a8d57c42ef603b
-EBUILD libffado-2.4.4.ebuild 2644 BLAKE2B b2a03b729d26cfd5a326ee1c96de3b9dbd17a528d709bce7bc878f2e4e445476d9936965f795b72812c41dc1c531b6713972b9b72f70d977d3d394eab50a7210 SHA512 2eb699ccb36194f5aa84e070df9d8ff443d5cb115ab9f972cea7bee9472cd041f0f188fb720d0c8a43674ce18064a8542c43cc31df6c733e16869e6b2127deb2
+EBUILD libffado-2.4.4.ebuild 2643 BLAKE2B f3203ee701775224cbc0fae2e8a0653c0c81cba08060ed5524cc3501bbdbdb1ab2479f485fb6fbbe68c73cca8ac1c5bd9ca7e7040d03a47a951c0b3f724d847b SHA512 e74563ba928c3f5027e6c66d7eb207f9db9e415f16d1bd3508dd609c68c0263844252d1f45fe153b45d1a1d3a4351ca6e82555401a5a16d2130f2f35ddcfe7fc
 MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
diff --git a/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch b/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch
deleted file mode 100644
index e9cb0fb94f46..000000000000
--- a/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- libffado-2.4.1-old/support/mixer-qt4/SConscript	2015-04-12 20:18:15.000000000 +0900
-+++ libffado-2.4.1/support/mixer-qt4/SConscript	2018-06-26 19:59:19.015719710 +0900
-@@ -29,16 +29,12 @@
- if env['BUILD_MIXER'] == 'true':
-     e = env.Clone()
- 
--    def findfiles( arg, dirname, names ):
--        for name in names:
--            if name.startswith("."):
--                names.remove(name)
--        for name in names:
--            if '.pyc' not in name and '.in' not in name:
--                arg.append( os.path.join( dirname, name ) )
--
-     pythonfiles = [ 'ffado/config.py' ]
--    os.path.walk( "ffado", findfiles, pythonfiles )
-+    for root, dirs, files in os.walk( "ffado" ):
-+        for name in files:
-+            if name.endswith( '.pyc' ) or '.in' in name or name.startswith("."):
-+                continue
-+            pythonfiles.append( os.path.join( root, name ) )
- 
-     e.ScanReplace( "ffado/config.py.in" )
-     e.Depends( "ffado/config.py", "#/SConstruct" )
diff --git a/media-libs/libffado/libffado-2.4.1-r1.ebuild b/media-libs/libffado/libffado-2.4.1-r1.ebuild
deleted file mode 100644
index 4d945041ea53..000000000000
--- a/media-libs/libffado/libffado-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
-
-DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
-HOMEPAGE="http://www.ffado.org"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit subversion
-	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
-else
-	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="debug qt5 test-programs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
-	dev-libs/dbus-c++
-	dev-libs/libconfig[cxx,${MULTILIB_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/libiec61883[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	sys-libs/libavc1394[${MULTILIB_USEDEP}]
-	sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	qt5? (
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[dbus,${PYTHON_MULTI_USEDEP}]
-		')
-		x11-misc/xdg-utils
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!<media-sound/jack-audio-connection-kit-0.122.0:0
-	!<media-sound/jack-audio-connection-kit-1.9.9:2"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python3-scons-fix.patch"
-)
-
-myescons() {
-	local myesconsargs=(
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		MANDIR="${EPREFIX}/usr/share/man"
-		UDEVDIR="$(get_udevdir)/rules.d"
-		CUSTOM_ENV=true
-		DETECT_USERSPACE_ENV=false
-		DEBUG=$(usex debug)
-		PYPKGDIR="$(python_get_sitedir)"
-		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
-		# -fomit-frame-pointer is added also which can cripple debugging.
-		# we set flags from portage instead
-		ENABLE_OPTIMIZATIONS=false
-		# This only works for JACK1>=0.122.0 or JACK2>=1.9.9, so we block
-		# lower versions.
-		ENABLE_SETBUFFERSIZE_API_VER=force
-	)
-	if multilib_is_native_abi; then
-		myesconsargs+=(
-			BUILD_MIXER=$(usex qt5 true false)
-			BUILD_TESTS=$(usex test-programs)
-		)
-	else
-		myesconsargs+=(
-			BUILD_MIXER=false
-			BUILD_TESTS=false
-		)
-	fi
-	escons "${myesconsargs[@]}" "${@}"
-}
-
-src_prepare() {
-	default
-
-	# Always use Qt5
-	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
-
-	# Bugs #658052, #659226
-	sed -i -e 's/^CacheDir/#CacheDir/' SConstruct || die
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC CXX
-	myescons
-}
-
-multilib_src_install() {
-	myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	python_fix_shebang "${D}"
-	python_optimize "${D}"
-
-	if use qt5; then
-		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
-		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
-	fi
-}
diff --git a/media-libs/libffado/libffado-2.4.4.ebuild b/media-libs/libffado/libffado-2.4.4.ebuild
index bb43175befea..71156c2cf4da 100644
--- a/media-libs/libffado/libffado-2.4.4.ebuild
+++ b/media-libs/libffado/libffado-2.4.4.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = "9999" ]]; then
 	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
 else
 	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 GPL-3"
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 0bb7f9434dea..38c5fc7dd34f 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,4 @@
 DIST libglvnd-1.3.2.tar.bz2 715212 BLAKE2B 4f8d32d630a94dbce3d87926a25941fb915f9b1bb8ba167ee7392e32e55b26c5bb80db4000dd11188449f662b810f0c986b6ecf7f4c5ebf05d7a895b0fdb3c82 SHA512 4fea59150a7dd2c710ded26270e74ae73af00cc127d7141fe70e31263fb492c5c43eabc8ab27d5a568d12394a95023c22f1b60968f4c403dcf6ad6202bec508c
 EBUILD libglvnd-1.3.2.ebuild 1554 BLAKE2B 9262984fc8a25aca9a69be941e33f682664f22c6f830e0f9ff8f8e1ede4d0be76faada6bf92a3e3a075681eb4784627e301c66f8bfe117eda703ebc8563ea66f SHA512 f631b6da703bf214d4d03e86a695c586a4dad9f64f93f1038918021097d043abed4bf60978f3e6e52ec4e40f4f6bca49752e41e745f1d601ecb9c0339dc222ef
-EBUILD libglvnd-9999.ebuild 1562 BLAKE2B 0116ea12b00f40491b76f30ddb5e98b9c1b62d4e16df367136fc6673656ca0300f6d9bc7c997fc144fe0b6a7050e7880212d433151f05fec69a43d5e14d32d30 SHA512 1753a9eb0e6f7d62176b9a4af37794d30f31ea3c5a522d44142e42cd981c2ed0c08d89c8cf6a3cd692654f83c16ca90b25ac88b1ab37ec616a2b4a82d4c06349
+EBUILD libglvnd-9999.ebuild 1600 BLAKE2B 5a15e3366336eea6da78c128b0874599b748eda9a27023eca9a899ce703965cdfae6e4b100c644ff70789672a7507f63dcecf901f256cdbb0357b2aecdc8d29e SHA512 37f1d07d8fc4a35031ca2c1275a613e951a370df8d341d06bf38903f1010ffbe58d3deeb86284768fd4925fd80190f3eb7fc34bd70397022a227737e0fa925c8
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index 4c976349c6d9..d83f52941487 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 VIRTUALX_REQUIRED=manual
 
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
@@ -32,7 +32,10 @@ RESTRICT="!test? ( test )"
 BDEPEND="${PYTHON_DEPS}
 	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
 RDEPEND="
-	!media-libs/mesa[-libglvnd(-)]
+	|| (
+		>=media-libs/mesa-20.3
+		<media-libs/mesa-20.3[libglvnd(-)]
+	)
 	!<media-libs/mesa-19.2.2
 	X? (
 		x11-libs/libX11[${MULTILIB_USEDEP}]
diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index b5ab3c0fc743..f6b26658b55d 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1,3 +1,5 @@
 DIST libmatemixer-1.24.0.tar.xz 484808 BLAKE2B 8527514cec0770381ce5943f8c87e66f101e92f34527af2b3d4c15696f63df8304f00102fbbfe5b98ebb9b8d8b515f64a3d63b53312f7892b1b4868895539a6f SHA512 bf8c807bd45f3626bbf881eefa1e4638165daf61637bc63a704492d2a67eeec622e35e58c041649d33411294f96f79c99b3ea2406ae6fcf83294ec625cca9dbf
+DIST libmatemixer-1.24.1.tar.xz 484864 BLAKE2B 21458cdfa14119364c564993f6e67c320332fabc0595d5422b75dd57ea13bfd2754549de29be6cb11708cb016b459494920000df4f86953d55e0102652dc9816 SHA512 c4620d70c66196521296d2d4197a6e025629faf1324e726df7dd7b0e0444ee17b83355c5059ec17ef36f9f15e6ab3bf3bb82a152b087a11e929d7749c1e1d4e6
 EBUILD libmatemixer-1.24.0-r1.ebuild 790 BLAKE2B 6af9babc4b49031bb2c021d65e1fa94f84d651b90b25826a81d20d55cf3a13770e14cac5de8223f9afc5ca715f3f11c92c94797896b7380331098a82ff42b93e SHA512 c3aa9397fccce85f87ab8545ec5c33c24fd4c3193fe483ec8b8692831ff5346a718c9a28b349c2b252c755d651e6781a1823c282b9b5c6a7dcad6f08b3e8b07b
+EBUILD libmatemixer-1.24.1.ebuild 769 BLAKE2B 2bb5dbee84c2b4a650b2f9e5c32f94e212af6525c0559734d361c78d1a51f3b73ec7742ae69f8e5317dc7f1ea2be32c20b0f141445889680e1785da4d2269154 SHA512 85663d92287fe67c4e89cfeacf5596e3a4d324a2a8c0999cf68648d860f44563df0339f38d0b1659ddface5e80e5410934c51b946d1322eac17ff7d3f1bb2748
 MISC metadata.xml 341 BLAKE2B e060b6c02aaaea5885ec10566d2e3b13fb2f480201b3b43144255fa1f27a93a648a9030fa02f0efd20c8f32ee93e03661f379a63576822ed5c27b094ff6d7d81 SHA512 0c6f04ebdfe4cd26e7fdad53fd184045f6d95c4b9c888883f255ddc566fc02e0cf86138d5557fb71c0e8e9ea12e0d19657b218e1d310ce414e2911470eaa9359
diff --git a/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild b/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild
new file mode 100644
index 000000000000..f0193ee65c4d
--- /dev/null
+++ b/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Mixer library for MATE Desktop"
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="+alsa oss pulseaudio"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=sys-devel/gettext-0.19.8:*
+	alsa? ( >=media-libs/alsa-lib-1.0.5 )
+	pulseaudio? ( >=media-sound/pulseaudio-5.0.0:0[alsa?,glib] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--disable-null \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable pulseaudio)
+}
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 140d62fd16a7..440d7c3c87f9 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,9 +1,3 @@
-AUX libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch 940 BLAKE2B 229252af799b13bbb309407ad9ef0424c8315ed23e4a68459ba37737ee7bed5c787acfb034cf4aa195f0568e047bedfa83ecd5ace6dcdc181a806c27a0f4e5ac SHA512 4d45973d8775e227345de65ae6f6a2de5379eb4fcbe703bb88410c64986255b2de766a8d3665fc795d057c12df4aa1ea703e94c19a0aee28562c52e2b70b8bf8
-AUX libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch 2841 BLAKE2B ae03c291a4d0bc46e9e9daeea2760937273e910edf233a32ff257a10f10d81dbf7b91922bcfcd9c472b0c5190dbc1a51b313f092140a89e963702e1981f65291 SHA512 8034b0a332a5adf3c922009262d7cc602e0d16dc3050e967190b69fcec2d77b57378ebff674a058fe8d7ccece4cf74e61c82b54c823d1f75c5501c82e658798b
-AUX libmypaint-1.4.0-drop-python2-requirement-recommendation.patch 1052 BLAKE2B de6af484456b680f6bb5be82d5b2c2a8749bcb7373c2be7fddc39037f45ddc8664cd3291cb2794e96d54d99bd18e2b94e41bdaa5333dc4a121cdaffcf6651f54 SHA512 6a25e66188010955120055d98124e9dc30757e30826386a45e1d8ed1fb3b11d642c7c63fe8b755a3b047fe70a35a0691848573791581cd6a7298b69207e3b56c
-AUX libmypaint-1.4.0-gegl-0.4.14.patch 4198 BLAKE2B dad2b852ed3c8a68cba650993fa923491aecf31ff28784cd26f58486f62b1a66ee27c51320ba225489be66ad222389fabff819eaec1065e42f958bdd4f9b8a92 SHA512 100b0a6b3f2de32b6cee35924904e75a2c8c6ebd1483a8e02087945144ff078d6a570ebef8160c06194eb0965ebc78cd1d16232a85778414a8552926405bc783
-DIST libmypaint-1.4.0.tar.xz 441596 BLAKE2B d8c55f8dfedbb5cc07abe5c38c935abecf38f8e626b7fec83d7f7a29acdc722ededcd729f31e13e655242250f1d46cf44ca0473899b0de9510b062b123a711cb SHA512 c549a0b8f02976f7863c5ff49d5f16b5c3eae3e6e9e8803fef833edf78cc2a7413dd8dd751ed560c79d2527e0a54b462a92bb8059bcf69271654b2629f583c19
 DIST libmypaint-1.6.1.tar.xz 519464 BLAKE2B 6302914ab7e0876012e5235573c5cb3a76cbca9b5f0707321b0fc0a8406f712b9164ccb02ecc8a63b13d1e640a04cba8063c568bcbe40fc8543fc4a2c1576e5b SHA512 e9413fd6a5336791ab3228a5ad9e7f06871d075c7ded236942f896a205ba44ea901a945fdc97b8be357453a1505331b59e824fe67500fbcda0cc4f11f79af608
-EBUILD libmypaint-1.4.0-r1.ebuild 1708 BLAKE2B 0a62cf06d349502020db734d24eadf4926967e827d76ab8e3cd372fcb377ac1e3a73c3336f71b5b8b81b732ebd1d7205db0dd9cbbdb4a6e86d909488cd970207 SHA512 ab64f9fc0e967a1b18ef377db3c2e7319d1ad6bc3127ddb3b4673a28c2be72e3ea393ea78d2516503da5a3483802eb03e458a820e807d3777425f551a710e0b3
-EBUILD libmypaint-1.6.1.ebuild 1402 BLAKE2B 50a281a4c0c6c822fab94801ad0bcd4bbba6ea03bc861df944703152d9e5662e56ebe2dfbad39a2b0703b6f10fd86f806b6b84f78166a584a1de420910e7021a SHA512 5c4dfbc0ff6192faeffef86245e5d2b5a438a6a84002006c2c4b70fdb01a6ec8ae769ecb3af081cacde1ed7c7390b948f1e0867eccbd3670137b6cd65873a3eb
+EBUILD libmypaint-1.6.1.ebuild 1401 BLAKE2B 88ba990f1ab4247f467281fd90fbc9d69eea188350fee4309d732d73b9b2800cf26aa8a8ba032b10929997382cebdcea4630c350d8a0a8b8b7d22ba7ea82da3a SHA512 9e929c8e44a4a33257aca246da83c67f5f30c052e8109f7c56d1cb33004a789a2552d3647da2b4c5052329bc6a646360031a8ea47cc509ebc75795b737cc4034
 MISC metadata.xml 335 BLAKE2B 9147fdc98c832807587c5435133f971898c59c5adc5bb17a49a4632c5eb051d1e7e43d7fbefb15f80763771c58faef55e505b8441309c5676130c3e0dd18eee3 SHA512 fd20f4baaf0a494c651b433e3c7a0a75d82db0264ce4ba0d8e34f965f7389bbc5ad27e222b3dcaab307042338993a2761765f217c87d80a83f53a909caadfbdc
diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch
deleted file mode 100644
index 8f4b713b3af7..000000000000
--- a/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 748e735e7fffd2524bb3552fd79b2a2c13f60711 Mon Sep 17 00:00:00 2001
-From: Jesper Lloyd <jpl.lloyd@gmail.com>
-Date: Wed, 11 Dec 2019 18:02:35 +0100
-Subject: [PATCH] Adjust generation script to be runnable in Py3
-
----
- generate.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/generate.py b/generate.py
-index 6ab3dd0e..1e0b4ee9 100644
---- a/generate.py
-+++ b/generate.py
-@@ -26,6 +26,7 @@
- import json
- from collections import namedtuple
- 
-+PY3 = sys.version_info >= (3,)
- 
- _SETTINGS = []  # brushsettings.settings
- _SETTING_ORDER = [
-@@ -82,7 +83,8 @@ def validate(self):
- 
- def _init_globals_from_json(filename):
-     """Populate global variables above from the canonical JSON definition."""
--    with open(filename, "rb") as fp:
-+    flag = "r" if PY3 else "rb"
-+    with open(filename, flag) as fp:
-         defs = json.load(fp)
-     for input_def in defs["inputs"]:
-         input = _BrushInput(**input_def)
diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch
deleted file mode 100644
index d41079c4b316..000000000000
--- a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 1b41e786dc0772528b873b6f5bcee64147bfec04 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 17 Oct 2019 14:44:34 +0200
-Subject: [PATCH] Revert "Not all of libmypaint-gegl was versionned."
-
-This reverts commit 5e0290c5fb8a175a9f0dd4c6897ff234361c321f.
-
-See https://github.com/mypaint/libmypaint/issues/144
----
- gegl/Makefile.am | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/gegl/Makefile.am b/gegl/Makefile.am
-index 79f66fa..b45707d 100644
---- a/gegl/Makefile.am
-+++ b/gegl/Makefile.am
-@@ -37,10 +37,10 @@ introspection_sources = \
- 	../glib/mypaint-gegl-glib.c	\
- 	mypaint-gegl-surface.c
- 
--MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.la Makefile
-+MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile
- MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3
- MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
--MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.la ../libmypaint-@LIBMYPAINT_API_PLATFORM_VERSION@.la
-+MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la
- MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)
- INTROSPECTION_GIRS += MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir
- 
-@@ -56,10 +56,10 @@ endif # HAVE_INTROSPECTION
- 
- ## pkg-config file ##
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.pc
-+pkgconfig_DATA = libmypaint-gegl.pc
- 
- ## libmypaint-gegl ##
--lib_LTLIBRARIES = libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.la
-+lib_LTLIBRARIES = libmypaint-gegl.la
- 
- libmypaint_gegl_publicdir = $(includedir)/libmypaint-gegl
- 
-@@ -70,9 +70,9 @@ LIBMYPAINT_GEGL_SOURCES = \
- 	../glib/mypaint-gegl-glib.c	\
- 	mypaint-gegl-surface.c
- 
--libmypaint_gegl_@LIBMYPAINT_API_PLATFORM_VERSION@_la_SOURCES = $(libmypaint_gegl_public_HEADERS) $(LIBMYPAINT_GEGL_SOURCES)
-+libmypaint_gegl_la_SOURCES = $(libmypaint_gegl_public_HEADERS) $(LIBMYPAINT_GEGL_SOURCES)
- 
--libmypaint_gegl_@LIBMYPAINT_API_PLATFORM_VERSION@_la_CFLAGS = $(JSON_CFLAGS) $(GLIB_CFLAGS) $(GEGL_CFLAGS)
--libmypaint_gegl_@LIBMYPAINT_API_PLATFORM_VERSION@_la_LIBADD = $(top_builddir)/libmypaint-@LIBMYPAINT_API_PLATFORM_VERSION@.la $(GEGL_LIBS)
-+libmypaint_gegl_la_CFLAGS = $(JSON_CFLAGS) $(GLIB_CFLAGS) $(GEGL_CFLAGS)
-+libmypaint_gegl_la_LIBADD = $(top_builddir)/libmypaint.la $(GEGL_LIBS)
- 
- endif # enable_gegl
--- 
-2.23.0
-
diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch
deleted file mode 100644
index 1413868094d5..000000000000
--- a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 68e2c33add0aec09f1898aa80ef4f822bed67b87 Mon Sep 17 00:00:00 2001
-From: Jesper Lloyd <jpl.lloyd@gmail.com>
-Date: Tue, 17 Dec 2019 17:36:22 +0100
-Subject: [PATCH] Drop python2 requirement/recommendation
-
----
- README.md   | 2 +-
- autogen.sh  | 2 +-
- generate.py | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/README.md b/README.md
-index 96c748da..fae90566 100644
---- a/README.md
-+++ b/README.md
-@@ -35,7 +35,7 @@ to get started with a standard configuration:
- 
- When building from git:
- 
--    $ sudo apt install -y python2.7 autotools-dev intltool gettext libtool
-+    $ sudo apt install -y python autotools-dev intltool gettext libtool
- 
- ### Install dependencies (Red Hat and derivatives)
- 
-diff --git a/generate.py b/generate.py
-index b613f91d..cd7e99e8 100644
---- a/generate.py
-+++ b/generate.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2
-+#!/usr/bin/env python
- # libmypaint - The MyPaint Brush Library
- # Copyright (C) 2007-2012 Martin Renold <martinxyz@gmx.ch>
- # Copyright (C) 2012-2016 by the MyPaint Development Team.
diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-gegl-0.4.14.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-gegl-0.4.14.patch
deleted file mode 100644
index 6855d80e5458..000000000000
--- a/media-libs/libmypaint/files/libmypaint-1.4.0-gegl-0.4.14.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 9e091ea6f3d818748898a9c7a3d6660f5c807027 Mon Sep 17 00:00:00 2001
-From: rezso <rezso@rezso.net>
-Date: Thu, 17 Oct 2019 14:32:46 +0200
-Subject: [PATCH] Require gegl >=0.4.14 rather than 0.3.x
-
----
- configure.ac                | 4 ++--
- gegl/Makefile.am            | 4 ++--
- gegl/libmypaint-gegl.pc.in  | 2 +-
- gegl/mypaint-gegl-surface.c | 8 ++++++++
- 4 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a17c0a0..22c2e3e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,7 +22,7 @@ m4_define([libmypaint_version_full],
-           [libmypaint_api_major().libmypaint_api_minor().libmypaint_api_micro()m4_bpatsubst(libmypaint_api_prerelease(), [^\(.\)], [-\1])])
- 
- # Dependencies.
--m4_define([gegl_required_version], [0.3])
-+m4_define([gegl_required_version], [0.4.14])
- m4_define([introspection_required_version], [1.32.0])
- 
- AC_INIT([libmypaint],
-@@ -249,7 +249,7 @@ AC_ARG_ENABLE(gegl,
- )
- 
- if eval "test x$enable_gegl = xyes"; then
--  PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
-+  PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version)
- fi
- AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes")
- 
-diff --git a/gegl/Makefile.am b/gegl/Makefile.am
-index b45707d..5ef22c1 100644
---- a/gegl/Makefile.am
-+++ b/gegl/Makefile.am
-@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
- INTROSPECTION_GIRS =
- INTROSPECTION_SCANNER_ARGS = \
-     --warn-all \
--    --pkg="gegl-0.3" \
-+    --pkg="gegl-0.4" \
-     --pkg="glib-2.0" \
-     --namespace="MyPaintGegl" \
-     --nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \
-@@ -38,7 +38,7 @@ introspection_sources = \
- 	mypaint-gegl-surface.c
- 
- MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile
--MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3
-+MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4
- MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I..
- MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la
- MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources)
-diff --git a/gegl/libmypaint-gegl.pc.in b/gegl/libmypaint-gegl.pc.in
-index 75aa729..9184980 100644
---- a/gegl/libmypaint-gegl.pc.in
-+++ b/gegl/libmypaint-gegl.pc.in
-@@ -6,6 +6,6 @@ includedir=@includedir@
- Name: libmypaint
- Description: MyPaint brush engine library, with GEGL integration.
- Version: @LIBMYPAINT_VERSION@
--Requires: gegl-0.3 libmypaint
-+Requires: gegl-0.4 libmypaint
- Cflags: -I${includedir}/libmypaint-gegl
- Libs: -L${libdir} -lmypaint-gegl
-diff --git a/gegl/mypaint-gegl-surface.c b/gegl/mypaint-gegl-surface.c
-index 5c86d3c..d58ccc9 100644
---- a/gegl/mypaint-gegl-surface.c
-+++ b/gegl/mypaint-gegl-surface.c
-@@ -78,7 +78,11 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque
- 
-     if (buffer_is_native(self)) {
-         GeglBufferIterator *iterator = gegl_buffer_iterator_new(self->buffer, &tile_bbox, 0, self->format,
-+#if GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION == 4 && GEGL_MICRO_VERSION >= 14
-+                                      read_write_flags, GEGL_ABYSS_NONE, 8);
-+#else
-                                       read_write_flags, GEGL_ABYSS_NONE);
-+#endif
- 
-         // Read out
-         gboolean completed = gegl_buffer_iterator_next(iterator);
-@@ -88,7 +92,11 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque
-             g_critical("Unable to get tile aligned access to GeglBuffer");
-             request->buffer = NULL;
-         } else {
-+#if GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION == 4 && GEGL_MICRO_VERSION >= 14
-+            request->buffer = (uint16_t *)(iterator->items[0].data);
-+#else
-             request->buffer = (uint16_t *)(iterator->data[0]);
-+#endif
-         }
- 
-         // So we can finish the iterator in tile_request_end()
--- 
-2.23.0
-
diff --git a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
deleted file mode 100644
index 47f1fccbd44d..000000000000
--- a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools python-any-r1 xdg-utils toolchain-funcs
-
-MY_PV=${PV/_beta/-beta.}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Library for making brushstrokes"
-HOMEPAGE="https://github.com/mypaint/libmypaint"
-SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0/$(ver_cut 1-2)"  # https://github.com/mypaint/libmypaint/wiki/Versioning
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-IUSE="gegl introspection nls openmp"
-
-CDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-c:=
-	gegl? (
-		media-libs/babl
-		>=media-libs/gegl-0.4.14:0.4[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )
-	openmp? ( >sys-devel/gcc-5:*[openmp] )
-	nls? ( sys-devel/gettext )
-	"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	nls? ( dev-util/intltool )
-	"
-RDEPEND="${CDEPEND}
-	!<media-gfx/mypaint-1.2.1
-	"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-drop-libmypaint-gegl-versioning.patch
-	"${FILESDIR}"/${PN}-1.4.0-gegl-0.4.14.patch
-	"${FILESDIR}"/${PN}-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch
-	"${FILESDIR}"/${PN}-1.4.0-drop-python2-requirement-recommendation.patch
-)
-
-src_prepare() {
-	xdg_environment_reset
-	default
-	eautoreconf
-}
-
-src_configure() {
-	tc-ld-disable-gold  # bug 589266
-	econf \
-			--disable-debug \
-			--disable-docs \
-			$(use_enable gegl) \
-			--disable-gperftools \
-			$(use_enable nls i18n) \
-			$(use_enable introspection) \
-			$(use_enable openmp) \
-			--disable-profiling
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/libmypaint/libmypaint-1.6.1.ebuild b/media-libs/libmypaint/libmypaint-1.6.1.ebuild
index 66ffe69d2b66..8d0f65876039 100644
--- a/media-libs/libmypaint/libmypaint-1.6.1.ebuild
+++ b/media-libs/libmypaint/libmypaint-1.6.1.ebuild
@@ -19,7 +19,7 @@ LICENSE="ISC"
 # See https://github.com/mypaint/libmypaint/releases/tag/v1.6.1
 # https://github.com/mypaint/libmypaint/compare/v1.6.0...v1.6.1
 SLOT="0/0.0.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
 IUSE="gegl introspection nls openmp"
 
 BDEPEND="
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 54227ef1e0dc..185f09846c75 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -5,5 +5,5 @@ DIST LibRaw-0.20.0.tar.gz 1431412 BLAKE2B 455649b600926a6a53924e4cfea33143fdd865
 EBUILD libraw-0.19.3.ebuild 1405 BLAKE2B 32da66b4f6550a70acb9229f0118ce592720e90a94a9d0a262a4e26a9c6f8fa29bb86625f4522e10839857d130a815bfd556becbe19ae83cdec80073712d9605 SHA512 98e4f79907e0edbe5d4052da27c24d08b95096c12f1f620a2618d20b066e903700ea1eba448e1aadb465dcc457656c0bb9a91e818c4f6a12a350571b44501d27
 EBUILD libraw-0.19.4.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99
 EBUILD libraw-0.19.5.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99
-EBUILD libraw-0.20.0.ebuild 1368 BLAKE2B 979877714fb974fe2709f07139130b77645c257b6e6bc89666c466d65a0a6a9ec12319ceb524079b949db64e60e678f14de6f13259702559225618bf8eb86359 SHA512 b41b27de05b7b4ca1565d5514fe8f488067879435dc68784b2e875525ad54431c9bac0c0489682c83a6d992e96ca367a34be4ce6b5097d4342b84c4fbd674416
+EBUILD libraw-0.20.0.ebuild 1366 BLAKE2B 321bd32371ba22654dbeceb6cca69aaec497e5479d59e497d953a89415bc5325e2ec73b9daa7502bf5298fe4d024a4d0e3f9887b245bdf5e9cfb41b40570b998 SHA512 74f6abae25f07559da75f00c0787e3998e23667f64fde1ef27e7118ea85b84f6c2f469a695ec4e9a9c39d0d46706ab0b59070f17c1e4e362ed6177b5d8f5e095
 MISC metadata.xml 383 BLAKE2B 3e4195c6cba775cc80e977738b81f527ef45c4fdde631a9c0591b26500cbda7c09267e993d4a21b72b98ec681e1a80d7d99e3d6ce0e48d0d2870abbb1ae64add SHA512 710ff0b177c64460965225e90584cddbf3bc439aa5cc900bb5a3877207fd5ad8f275cca03330366357eff9e08b4effec9d29271e90fc1bdd7befac4eccf56c1b
diff --git a/media-libs/libraw/libraw-0.20.0.ebuild b/media-libs/libraw/libraw-0.20.0.ebuild
index 16d3dcca644d..16da26d6896a 100644
--- a/media-libs/libraw/libraw-0.20.0.ebuild
+++ b/media-libs/libraw/libraw-0.20.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 CDDL"
 SLOT="0/20"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples jpeg +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libyami/Manifest b/media-libs/libyami/Manifest
index 64acc2a4b663..247c97a546de 100644
--- a/media-libs/libyami/Manifest
+++ b/media-libs/libyami/Manifest
@@ -1,12 +1,4 @@
-DIST libyami-1.0.1.tar.gz 480656 BLAKE2B 245c26dcfd396000eaf60d25bf437aad8dcd5255aac2b23ab0299bbf707e52268a914df61e2194dfb67a76d52eb1a8b792c07e777b77975d19ff11a2aa616397 SHA512 01c0716011682ff8b5e6d2c58479aa574bc2cfb5ffe932952e430302aff090d56e0efa4f784f9cdd36d94800c8454802e4500096b3bea162d04ee6253a134c81
-DIST libyami-1.1.0.tar.gz 491537 BLAKE2B fc3b948954ceda10894ff29f5f540a5817a962e2da6d549f0d0b4d89602577437778a244bcaff5fee4f3760d98472d8cd1c0ac07146e3b6ad34618c9f937eeec SHA512 04ef34a994d23f8f5182c17975d6a28048a311c8090393d8cd54dd1fc74ec8b76af4028e1d5506568fb698e15f14833a01d4eaeb4ccd2484801f806a05cc86fa
-DIST libyami-1.2.0.tar.gz 508386 BLAKE2B ed4892dddd66d03a5f37c4d28a449c18c722bd1a09aae6261d3b3a210fc4912f728f629a216efd7176c8a37de768a6fa2d1272ca223a387e5cfb8cb4e7cb284d SHA512 1d253d67e3aab7ff2a1add50f7a5ebd284518d12fa689e6160a2dadb3fd1c2a5ab1a1c5f66dfd3801d46d9666c73dabcd5302ca495b069f60671337c0d0bc539
-DIST libyami-1.3.0.tar.gz 820807 BLAKE2B 3764e591269f3c38e7b5f6f5c3dbfb59fe4cdb198cd80858a2c0150274be073c1b064b8c8482b87ba770a6ee3534430b00155b34fa70f6bab7ed537a85ba1ed1 SHA512 8858c7f8d0fa7ce4547f762484e4b82477e49a8cb893cde29d7a26ba0f39dfcabc530659722ee5b84dc6f95e65c3373057ef470c78b9c1d790907e7bd6c6fd75
 DIST libyami-1.3.2.tar.gz 820517 BLAKE2B 189ef95bcd504422550f6df38433d042a45e2a1c36b30b1b5445ce69076c95f4d1b60e12e09ff4b11245e3fcdc70a4fa5e0879e3976c4891ca98fa00d79360c1 SHA512 25300d589119b5f5211b5a2445b408dbb35aea83bf18bc3d3b42d6b29151495f5118cf0f32bcc8c3756ac58fccb16932e78c8b6e7b29daffcc9ee08a3e0b5b54
-EBUILD libyami-1.0.1.ebuild 2074 BLAKE2B 37716a2166d5d332770d5a9b187fd9a3b20591d55bb2b6b8dd4d126f2cdb7b36c31406584a16d729d4812be5f580c0f907cd9e76ebf4b9dd5b23f7abca646078 SHA512 06d1c46650057b955ecffbf1b8bd935244a3f2642fdccf4192e9ac0217c3d971ab589e37bd1e4b5df59375b386bd957f3bc92166c72cc10e4b6b71e528a716a7
-EBUILD libyami-1.1.0.ebuild 2100 BLAKE2B e4f2d47816aec5535f2c60dba3e1a9912c2b32b125d567339d4eb75f603f675a3269924d24ab31c9a2053ff03468b9df884cfa385d5de63c33d63a6f9ebc8051 SHA512 82d08826b704ee00ccd0e8195c710fa95273d85171c11ef00b0dedca4ef670678c523ecf252914ee9b7cadfd5820cead79dec747099c7ad6cffc186c358bfc32
-EBUILD libyami-1.2.0.ebuild 2134 BLAKE2B 94e44fdd15ee0a6fc7dca0011fe2371249effb8ebab915defb653e2baa704ce14e731f2c34ec4860b42403d2f01f7fcd3d9d7d72d25cfcc71e03b4cc9f58eefe SHA512 c0972e6252c0d6e386c93da1988b39284dfbc08dd8542d0a3fe44c464df6f0de4e9814badfa36bd3c57cf37b314ec88b31413614e77b50f25be5139ed7261f71
-EBUILD libyami-1.3.0.ebuild 2204 BLAKE2B 45bcc846d25c5a31ff488969236a65a438c7f576de4c0ccefac410faee4d05b7d6da394fe7c0cdb92e08b5681dc2372f9b911c56852bf6f86a2a145cd113e5a3 SHA512 13988b6636f511043a8ac7e5ea192e03d000c54d9c8b9260163035c620ecaffd44a0d6c4efb762b2a7c0be892d620a591355394db5d1b1cd927460ea1787fde5
 EBUILD libyami-1.3.2.ebuild 2377 BLAKE2B f1b3d291cdfad965ffa37ffd4926a75612ba66c79cc096399bb19dcb125ba0a89f3fb0df8a0073cb184a88a157fbb4cc69af06c8de79f831741cd2d1e44ea772 SHA512 a2c946869512c855da4ca12a68952a597d268473b4256790ea7cbc4f57f1d1fd9058dd836beb6bc31cab91dcd09e54404a9fc141f971099dbb3035da3d578cc2
 EBUILD libyami-9999.ebuild 2377 BLAKE2B f1b3d291cdfad965ffa37ffd4926a75612ba66c79cc096399bb19dcb125ba0a89f3fb0df8a0073cb184a88a157fbb4cc69af06c8de79f831741cd2d1e44ea772 SHA512 a2c946869512c855da4ca12a68952a597d268473b4256790ea7cbc4f57f1d1fd9058dd836beb6bc31cab91dcd09e54404a9fc141f971099dbb3035da3d578cc2
 MISC metadata.xml 564 BLAKE2B 5e0cdea946bb891106c1c04123df9ec34b6de1e92dc3ab8002ff0ae9d38eb580da6f7765efb99a299e073f5fa35f8d91c190aedb2040a6c8a95b71142c9495ea SHA512 db74b69f443e310f95f17b9c8112cb9f6ed5ba4600971b7eff65a1c98ccc2391d5d5a53f46efee8b4b6aa87a0becf8883a0a5dafb10e5d708dc8a8e584865008
diff --git a/media-libs/libyami/libyami-1.0.1.ebuild b/media-libs/libyami/libyami-1.0.1.ebuild
deleted file mode 100644
index c794ddbb7383..000000000000
--- a/media-libs/libyami/libyami-1.0.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM=git-r3
-	EGIT_REPO_URI="https://github.com/01org/libyami"
-fi
-
-inherit ${SCM} autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
-HOMEPAGE="https://github.com/01org/libyami"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/01org/libyami/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug dmabuf doc md5 v4l X test wayland"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/libva-1.7.2[drm,X?,wayland?,${MULTILIB_USEDEP}]
-	v4l? (
-		>=virtual/opengl-7[${MULTILIB_USEDEP}]
-		>=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}]
-	)
-	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
-	md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-cpp/gtest-1.7 )
-"
-
-src_prepare() {
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-cppflags -I"${S}/"
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable v4l v4l2) \
-		$(use_enable v4l v4l2-ops) \
-		$(use_enable X x11) \
-		$(use_enable dmabuf) \
-		$(use_enable md5) \
-		$(use_enable wayland) \
-		$(use_enable test gtest) \
-		$(multilib_native_use_enable doc docs) \
-		--enable-h265dec \
-		--enable-vc1dec \
-		--enable-h264dec \
-		--enable-jpegdec \
-		--enable-mpeg2dec \
-		--enable-vp8dec \
-		--enable-vp9dec \
-		--enable-h265enc \
-		--enable-h264enc \
-		--enable-jpegenc \
-		--enable-vp8enc \
-		--enable-vp9enc
-}
-
-multilib_src_compile() {
-	emake
-	multilib_is_native_abi && use doc && emake -C doc
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dohtml -r doc/html/*
-}
-
-src_install() {
-	multilib-minimal_src_install
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/libyami/libyami-1.1.0.ebuild b/media-libs/libyami/libyami-1.1.0.ebuild
deleted file mode 100644
index 72dd062364d1..000000000000
--- a/media-libs/libyami/libyami-1.1.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM=git-r3
-	EGIT_REPO_URI="https://github.com/01org/libyami"
-fi
-
-inherit ${SCM} autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
-HOMEPAGE="https://github.com/01org/libyami"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/01org/libyami/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug egl dmabuf doc md5 v4l X test wayland"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/libva-1.7.2[drm,X?,wayland?,${MULTILIB_USEDEP}]
-	v4l? (
-		>=virtual/opengl-7[${MULTILIB_USEDEP}]
-		>=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}]
-	)
-	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
-	md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-cpp/gtest-1.7 )
-"
-
-src_prepare() {
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-cppflags -I"${S}/"
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable v4l v4l2) \
-		$(use_enable v4l v4l2-ops) \
-		$(use_enable X x11) \
-		$(use_enable dmabuf) \
-		$(use_enable md5) \
-		$(use_enable wayland) \
-		$(use_enable test gtest) \
-		$(multilib_native_use_enable doc docs) \
-		--enable-h265dec \
-		--enable-vc1dec \
-		--enable-h264dec \
-		--enable-jpegdec \
-		--enable-mpeg2dec \
-		--enable-vp8dec \
-		--enable-vp9dec \
-		--enable-h265enc \
-		--enable-h264enc \
-		--enable-jpegenc \
-		--enable-vp8enc \
-		--enable-vp9enc
-}
-
-multilib_src_compile() {
-	emake
-	multilib_is_native_abi && use doc && emake -C doc
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dohtml -r doc/html/*
-}
-
-src_install() {
-	multilib-minimal_src_install
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/libyami/libyami-1.2.0.ebuild b/media-libs/libyami/libyami-1.2.0.ebuild
deleted file mode 100644
index 0b6bd2f08c04..000000000000
--- a/media-libs/libyami/libyami-1.2.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM=git-r3
-	EGIT_REPO_URI="https://github.com/01org/libyami"
-fi
-
-inherit ${SCM} autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
-HOMEPAGE="https://github.com/01org/libyami"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/01org/libyami/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug egl dmabuf doc md5 v4l X test wayland"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/libva-1.7.2[drm,X?,wayland?,${MULTILIB_USEDEP}]
-	v4l? (
-		>=virtual/opengl-7[${MULTILIB_USEDEP}]
-		>=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}]
-	)
-	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
-	md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-cpp/gtest-1.7 )
-"
-
-src_prepare() {
-	sed -i -e 's/-Werror//' configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-cppflags -I"${S}/"
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable v4l v4l2) \
-		$(use_enable v4l v4l2-ops) \
-		$(use_enable X x11) \
-		$(use_enable dmabuf) \
-		$(use_enable md5) \
-		$(use_enable wayland) \
-		$(use_enable test gtest) \
-		$(multilib_native_use_enable doc docs) \
-		--enable-h265dec \
-		--enable-vc1dec \
-		--enable-h264dec \
-		--enable-jpegdec \
-		--enable-mpeg2dec \
-		--enable-vp8dec \
-		--enable-vp9dec \
-		--enable-h265enc \
-		--enable-h264enc \
-		--enable-jpegenc \
-		--enable-vp8enc \
-		--enable-vp9enc
-}
-
-multilib_src_compile() {
-	emake
-	multilib_is_native_abi && use doc && emake -C doc
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dohtml -r doc/html/*
-}
-
-src_install() {
-	multilib-minimal_src_install
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/libyami/libyami-1.3.0.ebuild b/media-libs/libyami/libyami-1.3.0.ebuild
deleted file mode 100644
index ccd9e97aa740..000000000000
--- a/media-libs/libyami/libyami-1.3.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM=git-r3
-	EGIT_REPO_URI="https://github.com/01org/libyami"
-fi
-
-inherit ${SCM} autotools multilib-minimal flag-o-matic
-
-DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration"
-HOMEPAGE="https://github.com/01org/libyami"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/01org/libyami/archive/${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug egl dmabuf doc md5 v4l X test wayland"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/libva-1.7.2:=[drm,X?,wayland?,${MULTILIB_USEDEP}]
-	v4l? (
-		>=virtual/opengl-7[${MULTILIB_USEDEP}]
-		>=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}]
-		>=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}]
-	)
-	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
-	md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-cpp/gtest-1.7 )
-"
-
-src_prepare() {
-	sed -i -e 's/-Werror//' configure.ac || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-cppflags -I"${S}/" -I"${BUILD_DIR}/interface"
-	append-cxxflags -fpermissive
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable v4l v4l2) \
-		$(use_enable v4l v4l2-ops) \
-		$(use_enable X x11) \
-		$(use_enable dmabuf) \
-		$(use_enable md5) \
-		$(use_enable wayland) \
-		$(use_enable test gtest) \
-		$(multilib_native_use_enable doc docs) \
-		--enable-h265dec \
-		--enable-vc1dec \
-		--enable-h264dec \
-		--enable-jpegdec \
-		--enable-mpeg2dec \
-		--enable-vp8dec \
-		--enable-vp9dec \
-		--enable-h265enc \
-		--enable-h264enc \
-		--enable-jpegenc \
-		--enable-vp8enc \
-		--enable-vp9enc
-}
-
-multilib_src_compile() {
-	emake
-	multilib_is_native_abi && use doc && emake -C doc
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dohtml -r doc/html/*
-}
-
-src_install() {
-	multilib-minimal_src_install
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index d0e562e3bbe2..a64898045018 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,5 +1,5 @@
 DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
 DIST lilv-0.24.8.tar.bz2 545545 BLAKE2B 606beb68d6e277dfea85e3d2e27b58adf22f0a47a91583e4f1cd85649f237e75fac9b397eb07be69b5a278d02346d58bdf35c4c8fb248e4899a4fc9b05288c23 SHA512 f2b2638372a8280041f6e88e2077f2109f89dad6feedb9d07a88c6b5a05c37b62112f5d03282da4335ddd0d14339cfb49ad96a3df3de310265a40c24718be192
 EBUILD lilv-0.24.6-r2.ebuild 1700 BLAKE2B cb5acdff832430616f13aec5b2396166d6480ef0c01c3e5b0595100cb32c5af06100bdfa9d40c083987367db579eb259b58a38d36da3e15bcbf855aa8f3cb663 SHA512 9bc6eeb31effdb6609052075b5991ec602c94ca8a0b4a0d29ff8508067716aa6140be9729ce5251808d1cf0ebe86a729153ec92163b7eb9137b55bdde561057c
-EBUILD lilv-0.24.8-r1.ebuild 1706 BLAKE2B bbcf8c9856d714b638caaf900be37c4f69f13ad4ee189b6edd0beae73af62d4abc1aa4831be8e2ab52c3188b6b386eea6e16410e2d7d359f0b8ea9d6bfb3ab4f SHA512 0eafa79adf988939890b8b56ff3d0e0899cbf7a6c5c705f1a2adc8b2eddc7ada325d086317371b1662b0caaad61c441af4666545135bea52e601d11e510250f2
+EBUILD lilv-0.24.8-r1.ebuild 1705 BLAKE2B ee1a668f0bc4f3bff412a50afa672a356f931f40bf0c6a974165b41d1ba225d0a6f25c67d8bd153ed69b5f4aab7e21da9326931fdc8801b57d0a84eebb8158ef SHA512 817640469c17b68d44f77d2602cba29ebf3287b83c0dd66b994322873e605c34f1ffccc2cf6945117808521d233ec44736c26ab7bc2853fc534261ff4124249b
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.8-r1.ebuild b/media-libs/lilv/lilv-0.24.8-r1.ebuild
index 9478c738d163..c22bf170fdce 100644
--- a/media-libs/lilv/lilv-0.24.8-r1.ebuild
+++ b/media-libs/lilv/lilv-0.24.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 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 +dyn-manifest static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 6801ec47354d..4704494f6058 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,16 +1,8 @@
-DIST mesa-20.0.8.tar.xz 12360736 BLAKE2B 19e3f8a40b34b5f17ed76077c5d92f728a134b2479c43d86674ed1818ab99639a9b732041f67488251df808564f6abe5b587d756ef9c7c13dcada87cd0fc05de SHA512 d906330c412899907dd05a84034a929107fccaf3044814c4b1f30ba5690cbcf1587b5f17534c6345111f3cb7cf292afd5984a60486643ff6f534b57cec615374
-DIST mesa-20.1.6.tar.xz 12805724 BLAKE2B d652b59e4987436d2e05de9138f2e2fb4a8bf435c24d9c7ad08bcb82a3bf7c9c64bc71b15b4b6d334f8b574341719f372aa1b893283abc21191a4d71d9d30fee SHA512 5ef28334ecb7effaaf597ea3efe0406af62419e6fa629e835d843161ab8d83515626ec0f0495c4cc66af9e5669398ac96c16ca626e4965a9831e1704c995fb09
 DIST mesa-20.1.7.tar.xz 12825368 BLAKE2B 2fedda518ff29bfda49af12d714dc258e48fca3492d2327ce5080d11bbaea5ad646d438f3e2d5ddabeffae83211976fb15001c650cd6ab4052ab09d97342afdc SHA512 5ff614c3f7568db7673cd2398615e5398c7f50093abdabd0730e07fe9c358310793fea3f130058110c9a2aa284c6efd207e1bdca3d1a1ba46fb18d76e34f361a
 DIST mesa-20.1.8.tar.xz 12846348 BLAKE2B b31680458100fc4394819a379a14237cfe39befea91f53641dc181d29891cb3e508c45f5ea1b07deee97f6bf04b6d8b2ca9cd8270bf79ab4a524035fbdc58c36 SHA512 519b0e2837982d097c362d974a90c94efd1cdf14505fc43eaa740a23c042bc0c3f04d0edaf6b371966d82667cade6d0c68c92528e1be6c12884b38c67fd064c1
-DIST mesa-20.2.0-rc2.tar.xz 13528208 BLAKE2B 6505446829ec2c01c0de7a7d9c1187db874111402da5ffe2f9f5872df7b6a5e53a3b628c190172bb9a806851b3b85aa0e3b53a4fcfb40f99adfc48cc3876c9f5 SHA512 36d9a74db50335bd31a8d5c47f7c657f05eeda044530fe123c06c472ed27c9b5dff19716d11d95256449223e82dde38895547cf6ae60b7460d3b1e9ed440704a
-DIST mesa-20.2.0-rc3.tar.xz 13550928 BLAKE2B b3e8a257422c06d1cbd7b7309b73d988be51adf4a60c4cd8e401c8fb86a430c7059956ef8264bbbce45ee5e38535916903dc915ab3660b0e5bc14b980d557d67 SHA512 56a692e02abed95ee16be17930f4c71519191def1a6465d465af6ebbf9d8b7e204a240e720b0fc512f4f18da3e4f37dbf8d96c3231ffba15e7114c240be71444
 DIST mesa-20.2.0-rc4.tar.xz 13569628 BLAKE2B 54068c298a57f2c19113828e2e9b94dd15070ecc0c899f7e3dc527b27579e4f8c3c84c7b841c8d0b8313556cca41bfefd3e08b360dd0e364cbc29e0609ff6f3d SHA512 1f718bfbadbc15b7216864226adb737f3a4a7801dc60ca9294effd4be5f260fffd31c988eed9550e8a7a7430acb05ba0c7d65693c1f375eab4b95d2d029755bb
-EBUILD mesa-20.0.8.ebuild 14701 BLAKE2B 0109666f0c0db0a7333dad36a01e7bedda6b03eafcc5c0a2061ec48047bdbb3793bcd643195de0a5db39217011c88a4b558a3b665109b1ed32feb62d97683d12 SHA512 5958cc5ed07cc4308eeba3d68ae537de8645564db15ea095cd1daa10453f950a6ca8caa60635cb18f9d66262f8732a94e3df2f721d9ff7376f4cb8ae53dc8c68
-EBUILD mesa-20.1.6.ebuild 14719 BLAKE2B ad71c0427076d83142f05791f1c5a580b6ab89b470ff093c7a951aa7a7e6cb76c070521d545a6d54a11ae4ebb2fc43fb414ad12c7293f1e45f4318be5501171b SHA512 b7eeff6340a2a85cb73145d603e02ef574474f71cfcc1d4133aaf0160e4856327c67b3ba667863f38a096136920901c48da86245f91d3ec6a938d4a9cd219ad4
 EBUILD mesa-20.1.7.ebuild 14701 BLAKE2B 0cb3259a8b9f6621024c9ad3c5aae4d84cb3cc4d63f3142521554675ea9753db7b525b54049429d35abb1cc221a7269e60b80e27ed9a01b03ac070977b61a167 SHA512 96b4eaee573bca46b5c51ad438ba5fd843372dc93b97507d3edd0d230c1a7086e3f386037ec8d97ed524d25f3ffa2d603abc4387dfac3ab32fab13317b1994a8
-EBUILD mesa-20.1.8.ebuild 14709 BLAKE2B 63b66a22e1f772e23a45aaf820cfe6fca7a6c7c389a4f3baca59408a4ca519db525e6724a2e6f5c704ad32cf3cb883d22958ad6223bf4d79d28ba3f0661a9536 SHA512 1cc6cb6324ef6f7cbfce159870f8ea9ce8384a23ab51d2c3ee762544cb4ec083b8c6e89dac47fd2a55a0075416035569d0303ccd2e3d0e9f54e0f13b6d988918
-EBUILD mesa-20.2.0_rc2.ebuild 15004 BLAKE2B 81a3aae627e1890283c3e1763c281d7cd4be2dc044e53c9e5c88508ca38b53e3c17ced3d734580eb1ac0d067266b97ed2eba5220e7704a038fe2c1ce9920fe71 SHA512 2349dd90f1a500d5b42a96c7ebdc06cdaafbc422cb0d3298797657093384adeade8f2c793c071f568a3f9f7a11e5f7f0191068c46b0cb472b206519b70e00881
-EBUILD mesa-20.2.0_rc3.ebuild 15004 BLAKE2B 81a3aae627e1890283c3e1763c281d7cd4be2dc044e53c9e5c88508ca38b53e3c17ced3d734580eb1ac0d067266b97ed2eba5220e7704a038fe2c1ce9920fe71 SHA512 2349dd90f1a500d5b42a96c7ebdc06cdaafbc422cb0d3298797657093384adeade8f2c793c071f568a3f9f7a11e5f7f0191068c46b0cb472b206519b70e00881
-EBUILD mesa-20.2.0_rc4.ebuild 14994 BLAKE2B 3461433ec43979c5a76fa1f065d4e0bb9963793d40066f74b9ed4e93935a36e43362509792bd3ea3195e20afd6c61e0cffbd736af46cf69256a72391e7dbe54c SHA512 5eec280b9c08b2e8849b853ceef60669d237e9aa15921795747d70b9ebbad34f1769121fabe36bc1e7a0231fe9d2efb263a5e988994cf46ea375367fd94e32c2
-EBUILD mesa-9999.ebuild 14994 BLAKE2B 3461433ec43979c5a76fa1f065d4e0bb9963793d40066f74b9ed4e93935a36e43362509792bd3ea3195e20afd6c61e0cffbd736af46cf69256a72391e7dbe54c SHA512 5eec280b9c08b2e8849b853ceef60669d237e9aa15921795747d70b9ebbad34f1769121fabe36bc1e7a0231fe9d2efb263a5e988994cf46ea375367fd94e32c2
+EBUILD mesa-20.1.8.ebuild 14701 BLAKE2B 0cb3259a8b9f6621024c9ad3c5aae4d84cb3cc4d63f3142521554675ea9753db7b525b54049429d35abb1cc221a7269e60b80e27ed9a01b03ac070977b61a167 SHA512 96b4eaee573bca46b5c51ad438ba5fd843372dc93b97507d3edd0d230c1a7086e3f386037ec8d97ed524d25f3ffa2d603abc4387dfac3ab32fab13317b1994a8
+EBUILD mesa-20.2.0_rc4.ebuild 14991 BLAKE2B 2fdc31ef274e01cadaae4790169c691a322a9c6427d98bc49c31d1db5308b075118e3ae879641af1b87e3f939bad6139776306eadaafb8cdb1257cb3ae407ad4 SHA512 074c61443188457230526576f087cd16cdc120e4a75210c1f8bdae550f0e8c7f96c819a473d2d9ca200261bf33b77719d6109a84bdb7260c0477250ffd5b23d8
+EBUILD mesa-9999.ebuild 14711 BLAKE2B 473089ec5a66bf30e4473590614ef8a29a209a3771a6bdab13e38beadabcf667c82134e2846862a2a810d24ddca321bc4c1efc0aaf2fa733aceb8da8b5e1e5a4 SHA512 82f90a9076a67f54167881b61c32675f5572a6c1b2c0ee897382c0954005f72a269f223a4559049056cc67bc43e2060ad28f1e97f2e09b712219ba7fe0904478
 MISC metadata.xml 1953 BLAKE2B 809b2ae05dadf1ef3b78c8c0353032c77aaba205530a51e6e099170d186bc9fdaf289b135e68984aef8f71f69970f9e63a38de816f04199dc2e9965e71e940d0 SHA512 09b322501feafc80de4b81c7a30e1d6f4565247069dc7d80218684382a68b285ca1b80733b6f3126bd15c777cc5a896062686f06fc1822039595b3fed9bcb9e6
diff --git a/media-libs/mesa/mesa-20.0.8.ebuild b/media-libs/mesa/mesa-20.0.8.ebuild
deleted file mode 100644
index f8e02ddc8cdb..000000000000
--- a/media-libs/mesa/mesa-20.0.8.ebuild
+++ /dev/null
@@ -1,557 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal python-any-r1 linux-info
-
-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 sparc x86 ~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 selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc +zstd"
-
-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_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.100"
-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-1.2.0-r1[X?,${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? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${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}]
-	)
-	zstd? ( app-arch/zstd:=[${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-$((LLVM_MAX_SLOT + 1)):=[${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}
-	gallium? (
-		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
-	libglvnd? ( usr/lib/libGLX_mesa.so.0.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 vulkan; then
-		if ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
-		fi
-	fi
-
-	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 video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && 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=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
-
-	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
-
-	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)
-		$(meson_use zstd)
-		-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() {
-	if ! use libglvnd; then
-		# Switch to the xorg implementation.
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-	fi
-}
-
-# $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-20.1.6.ebuild b/media-libs/mesa/mesa-20.1.6.ebuild
deleted file mode 100644
index f50ead679471..000000000000
--- a/media-libs/mesa/mesa-20.1.6.ebuild
+++ /dev/null
@@ -1,557 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal python-any-r1 linux-info
-
-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 ~sparc ~x86 ~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 selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc +zstd"
-
-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_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.100"
-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-1.2.0-r1[X?,${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? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${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}]
-	)
-	zstd? ( app-arch/zstd:=[${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-$((LLVM_MAX_SLOT + 1)):=[${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}
-	gallium? (
-		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
-	libglvnd? ( usr/lib/libGLX_mesa.so.0.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 vulkan; then
-		if ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
-		fi
-	fi
-
-	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 video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && 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=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
-
-	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
-
-	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)
-		$(meson_use zstd)
-		-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 vulkan-device-select-layer)
-		$(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() {
-	if ! use libglvnd; then
-		# Switch to the xorg implementation.
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-	fi
-}
-
-# $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-20.1.8.ebuild b/media-libs/mesa/mesa-20.1.8.ebuild
index b38b99a81f5b..934ec32ce41d 100644
--- a/media-libs/mesa/mesa-20.1.8.ebuild
+++ b/media-libs/mesa/mesa-20.1.8.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-20.2.0_rc2.ebuild b/media-libs/mesa/mesa-20.2.0_rc2.ebuild
deleted file mode 100644
index 01f47e9da290..000000000000
--- a/media-libs/mesa/mesa-20.2.0_rc2.ebuild
+++ /dev/null
@@ -1,565 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal python-any-r1 linux-info
-
-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 ~sparc ~x86 ~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 v3d 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 selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-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_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_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-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-1.3.2[X?,${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? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${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}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${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-$((LLVM_MAX_SLOT + 1)):=[${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}
-	gallium? (
-		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
-	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
-	libglvnd? ( usr/lib/libGLX_mesa.so.0.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 vulkan; then
-		if ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
-		fi
-	fi
-
-	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 video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && 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
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature 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_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   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_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# 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
-
-	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=enabled
-		$(meson_feature dri3)
-		$(meson_feature egl)
-		$(meson_feature gbm)
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use libglvnd glvnd)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		-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 vulkan-device-select-layer)
-		$(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() {
-	if ! use libglvnd; then
-		# Switch to the xorg implementation.
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-	fi
-}
-
-# $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-20.2.0_rc3.ebuild b/media-libs/mesa/mesa-20.2.0_rc3.ebuild
deleted file mode 100644
index 01f47e9da290..000000000000
--- a/media-libs/mesa/mesa-20.2.0_rc3.ebuild
+++ /dev/null
@@ -1,565 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal python-any-r1 linux-info
-
-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 ~sparc ~x86 ~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 v3d 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 selinux test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-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_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_v3d? ( gallium )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( gallium vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-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-1.3.2[X?,${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? (
-					>=virtual/opencl-3[${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	selinux? ( sys-libs/libselinux[${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}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${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-$((LLVM_MAX_SLOT + 1)):=[${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}
-	gallium? (
-		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
-	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
-	libglvnd? ( usr/lib/libGLX_mesa.so.0.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 vulkan; then
-		if ! use video_cards_i965 &&
-		   ! use video_cards_iris &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain i965, iris, or radeonsi"
-		fi
-	fi
-
-	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 video_cards_i965 ||
-	   use video_cards_iris ||
-	   use video_cards_radeonsi; then
-		CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		linux-info_pkg_setup
-	fi
-
-	if use gallium && 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
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	[[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_feature llvm)
-			$(meson_feature lm-sensors lmsensors)
-			$(meson_feature 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_feature vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=disabled)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_feature xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=disabled)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_feature xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=disabled)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_lima ||
-		   use video_cards_panfrost ||
-		   use video_cards_v3d ||
-		   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_v3d v3d
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable zink zink
-
-		# 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
-
-	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=enabled
-		$(meson_feature dri3)
-		$(meson_feature egl)
-		$(meson_feature gbm)
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_use libglvnd glvnd)
-		$(meson_use selinux)
-		$(meson_feature zstd)
-		-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 vulkan-device-select-layer)
-		$(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() {
-	if ! use libglvnd; then
-		# Switch to the xorg implementation.
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-	fi
-}
-
-# $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-20.2.0_rc4.ebuild b/media-libs/mesa/mesa-20.2.0_rc4.ebuild
index d7ceac80a260..049d7be7074a 100644
--- a/media-libs/mesa/mesa-20.2.0_rc4.ebuild
+++ b/media-libs/mesa/mesa-20.2.0_rc4.ebuild
@@ -496,7 +496,7 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
+		-Dshared-glapi=true
 		$(meson_feature dri3)
 		$(meson_feature egl)
 		$(meson_feature gbm)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index d7ceac80a260..7e2bd851871f 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -35,7 +35,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
 	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
 	vulkan-overlay wayland +X xa xvmc zink +zstd"
 
@@ -76,14 +76,8 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
 RDEPEND="
 	!app-eselect/eselect-mesa
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	libglvnd? (
-		>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-		!app-eselect/eselect-opengl
-	)
-	!libglvnd? (
-		>=app-eselect/eselect-opengl-1.3.0
-	)
 	gallium? (
 		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 		llvm? (
@@ -244,7 +238,7 @@ x86? (
 	usr/lib*/libGLESv2.so.2.0.0
 	usr/lib*/libGL.so.1.2.0
 	usr/lib*/libOSMesa.so.8.0.0
-	libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
+	usr/lib/libGLX_mesa.so.0.0.0
 )"
 
 llvm_check_deps() {
@@ -496,13 +490,13 @@ multilib_src_configure() {
 	emesonargs+=(
 		$(meson_use test build-tests)
 		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
+		-Dglvnd=true
+		-Dshared-glapi=true
 		$(meson_feature dri3)
 		$(meson_feature egl)
 		$(meson_feature gbm)
 		$(meson_feature gles1)
 		$(meson_feature gles2)
-		$(meson_use libglvnd glvnd)
 		$(meson_use selinux)
 		$(meson_feature zstd)
 		-Dvalgrind=$(usex valgrind auto false)
@@ -533,14 +527,6 @@ multilib_src_test() {
 	meson test -v -C "${BUILD_DIR}" -t 100
 }
 
-pkg_postinst() {
-	if ! use libglvnd; then
-		# Switch to the xorg implementation.
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-	fi
-}
-
 # $1 - VIDEO_CARDS flag (check skipped for "--")
 # other args - names of DRI drivers to enable
 dri_driver_enable() {
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index 90d203c2e7af..62c09e132950 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -1,5 +1,5 @@
 DIST mutagen-1.43.0.tar.gz 1143839 BLAKE2B 044906b730763e001fa2cb863c8bb1fec45713aca57b6311f783f66218e4f3410987d04d56a1e4fbf41a229860bbb574b4077401e1f2384e70d80fdc9f3b23ad SHA512 66df63705a43befa9cf6688bc8b3acc4fd1559eb28920c105b47a97c35422b5e19527051445daa7aed66facc2e4c14d71058f8560bbd564fecbe56a076491e3f
 DIST mutagen-1.44.0.tar.gz 1143320 BLAKE2B 9e4ad11b7ee560a4940e3eaaecdb8b0fad4db54fd1fa9e4f925d84e55c217eb002e07602817fa92f6db9fdd6b6b339d5e147874bf587604c18b665d980d6604a SHA512 88c8c181b1333989451533951727b7c43e4a012defd3fd1f7ddd970d083f938783d61f98970e74c677ee9725dac92c47ee37af4bd7a474e85c7a56793c6063a8
 EBUILD mutagen-1.43.0-r1.ebuild 1114 BLAKE2B 11fa4894e029448db8d903a9a63224c7803b3fdd64a49e820468a2fd40e0f089a917daa4b78edda79643ba759e0002aee394bb3b6392dd3f3afab0c7bfbfa4f1 SHA512 82659768180b836890c90750c62c6ea1583cd2d43badde3b54a29d2d9194f613ed1835877d436f4b3e279c72d50fdcf1d62c11ca86898f84fb306a87833155f0
-EBUILD mutagen-1.44.0.ebuild 1105 BLAKE2B 73411b9326d3230ae861f88e370f112cf7984734cd282e0289257d2f71d6f20f59cffefdd40498211f18f8905f5a35bc5072777127cb676883d2366592cf188f SHA512 ca7595747cd7be6ade76d2a6acd0a2de502f2e9cf247fe32303d4fb7e740de1ca175cf0d3065f726ced7842ad1348000a8cf3dbc664e5ee03bc6e41a37230d19
+EBUILD mutagen-1.44.0.ebuild 1104 BLAKE2B f36d2c00a4e64d2998d6771cd8cf79b560b5bfc90f68e3ee975e3f04266543cec934ba75c683b710ec18fc84f9f04e40b55db035f16e4bddd63e4304daeac71c SHA512 32dbe431944c217a85dcd32d85558498cca8e0bf997142e833d0a9606ccbf33de553c24a217d40f9c569904c84221c655aa47551bdb454e19c20c91372462337
 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59
diff --git a/media-libs/mutagen/mutagen-1.44.0.ebuild b/media-libs/mutagen/mutagen-1.44.0.ebuild
index 1794f9bbe91e..fbfc42e0aad5 100644
--- a/media-libs/mutagen/mutagen-1.44.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.44.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index c884831a90f6..72f977d884af 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,21 +1,13 @@
 AUX make-tarball.sh 1364 BLAKE2B 40001ac396b0ff26bb8e5d1a1a160b1467b4f9453d930394cf66dbc5e60b9d1e04c419801ca4ea2cbcb930797fe07df305549b7d5155e3cac3ce099a4dddbfbf SHA512 89b0ebfe6f5a82c3e3fc678ec4599d7281a0978c3a53437f0fbcfcb33607f8087bca1263d8a52c5b25cb1ab91a6635385cf423213464af858fc2f9663d5446a7
 AUX netpbm-10.31-build.patch 1629 BLAKE2B 26d46715ac933420fe5a9a0209edad51a754ad4f030cddd39d08f1d41418cb20ac8b0b9cc3dbaa847d6406a6778cff1b55618dee45a4a112c89a5d61be50efb3 SHA512 53e88bd1c85aa04d60ca2de7a32e5d00d9f959f3443e0c951c0694c814f6956708d8d12427a0fa8a8f76a1613d2982c3aa9b0c6ddd12b9cad3419ced1e5bb59e
-AUX netpbm-10.66-failing-tests.patch 535 BLAKE2B ef4e1b2486d7aac82d8527571fbfd97819ceb2a5d8c31760ebbfe9c6411fd8fd7df7f1a21b1d17715337f16c23eea481d0e94ad59ed66bac1485f41ae260d020 SHA512 33101e745fdeb9159da48393622edf9163c85f2c133951ba33d48f80758179f18ce36e60e3357bb978c101a7a0e1688aa6dbbc1a1c646782089760908dfe2b04
-AUX netpbm-10.66-jasper-hack.patch 924 BLAKE2B c7a80010e4c61e22f0beb88f5800875a098f47fefd4b830f9d0e1b986a8def55cb1dde3ce0ec902dc2bfb922350228af08aa208268130c08aab210546c568861 SHA512 e58a5f6800e2ab511080d505e9286e4831cb498f9a02cd5823bd52bb8e267c780f4b792388ccc29023afe18005c753b6ea32a3e277b8b1e3ceb8e4b997afe359
-AUX netpbm-10.66-jbig-2.patch 725 BLAKE2B 6d8562ad0d9595b048c3e0afbd7ba0c829583aa9f9b42b47dd7c10b9bddf2e4f206b7de5efb793529ea38972d6b5a2a465a85fe4b937c8e98c0c17f0c47f1359 SHA512 5d7a90c982c67c17b37dc91b7b4668ddcbd67434873cfde86e04bac7d057d6e6cd8ace52c3fc6e0ce36f767333bb00bdfc4fb3f29f54427285214cbd2f41c42f
-AUX netpbm-10.66-jpeg-dirs.patch 722 BLAKE2B e05df77a7c027263a21e5da60d9b224f31b4bc1766367503178350d8a79c2e5dd129da65fde7ae9963072a3e82c864a0ec68992237f6719e26b46ed0b0a81bdf SHA512 95a4ab08702faa3d25c75b71329ea28e5eb5f4f0b200d34d7350633e9a999160fe58e8f57fadab30e273c61a06c8d148fdebecbffa5c0b5023c59647f6d4c3ae
-AUX netpbm-10.66-options-case.patch 3417 BLAKE2B adabb59db1fb2a5057aaa36bf76eaa227ac6caafeab35c377d883c509c7d800d512e8bfabe18ba202574016670a6440a381070e1539c2d095aead2daca7ba3fe SHA512 2895b71269d321f84e79808a2fe65a8886ce3e173550051ca40563636b3e8561d5c812a3bb9f2e607c2dc7244b56492332a4299d165059d866ca00701adefe23
 AUX netpbm-10.66-test.patch 347 BLAKE2B e4f88878dd61c2d7e8ad642d5a32aec8351cdcf8ef2d4bf81dd9174a69d17b6c56fc3eb7160f63764360a7bdea99bcb2cb3e8dd47d04f881185f86e2a8f6cbf5 SHA512 bb271d77794fa8b3d5d4632e32d6bd2b5f9522853c6b96c7056fe9817da47b89153eba2653cf3a5a29f597e3fa616e1f6c810bd986651e610176d69b428afb74
-AUX netpbm-10.66-wordaccess_be_aligned.patch 942 BLAKE2B b109ea0dc1aa0fca67c6f2b80d66d929918445124b4cf82b017d15897e4099cf5ca1661b968639809b0f902bfcda3f33d5e61653d7ba21e3005e50261295a71d SHA512 b3b33b0e32c7bcb126104f0f100b56cb811c1ce5051be854a93d0227d9a684e440dd9e0787dfe3f4cb12df1fef5b2e6d1ecb6c3a49d630a32595a026ae1fb482
 AUX netpbm-10.70-system-libs.patch 1016 BLAKE2B 84a9b4bb4552f98f0cc8b653c84e1efa437624f1895bd321ec0ef415284c93b59785ef451b9116a4e470394c43670b5c1d1028198931cce81ad166d573aca10d SHA512 156e668ff209ca42dc3bf7e9b89232065d1f5ed3284885beeb67c8c9728eb7f142aceb98898c8d8e2c2a90dd9fab927a698b4372f2f3bcbf06f6df44d1a81629
 AUX netpbm-10.76.00-build.patch 1295 BLAKE2B 5ce1a973f503ded256fad7d8c2dddf24663466e8be04acbf52d30ca1ff50dae40dc24b0714cb50b00667f2d560c7f2ab5c7d457c90e8b31f322ca85498c3ba3d SHA512 db1d0593db6987933d7c937beeac65716866adaa079fb5329f8597b208c7dea9f6dd40b803f9dc4b3ef6cf61189c45dde9e139435b7d8e224bb83e037a7f076b
 AUX netpbm-10.76.00-misc-deps.patch 1665 BLAKE2B b4e87fa86fee8d66a354999ee6731cfad4238fc0c56015a5db17bcc058ca13849cd1ed2efc8d9f4bc370ac255528fc28bca30e9c82152f64000249e3eed9458e SHA512 81afe7189ac0d3cf24ec691eee89dc8fa1a1f6503c9d2e530dcdbbcf1c67c6a834b6b205c99ef633461e090baf6e8b4179954482c09b68370bea9eceabd1d3bd
 AUX netpbm-10.76.00-pbmtext-test.patch 707 BLAKE2B 42cbda583198a173a8210e0e6dd65392a9f138af6ee8f0271196841dd3adba65a34c59698eb5897982d5297500f8e456fa1de6e17d546f6957adf5b68237ae2e SHA512 d43a59bd92bbe7ebb8fcf60bf13fb4095beb546cb964108da740dd23c564beb2f97422535067189d49255a2ce8b7a89c01f8f98c807e6e37bfadf32e01f30bde
 AUX netpbm-10.76.00-test.patch 6005 BLAKE2B 0c8b0d9b1d7a0c5b139f85eb3a91838cc49687516cbd6fc12b00aef785877365503778b8c20226b07cf0f798eadf2da27ed5a6b9ce25ad4419358ccc88ebe8ea SHA512 49ee2306173e9cf39052e567aedf313ca7c7dd31a090defcd838a08a062d26e1320573a0ad6555e752edc8d0e8fd2e071016e2b075b20ac7e61ee3d60a3b7f14
-DIST netpbm-10.66.00.tar.xz 2575356 BLAKE2B db6336aaf6051d6b651b57d8d6692792698840546e82e61e4bff6c2dfa55041e8441eb3e4b7f09279181720bcbbaf3676903daf5ae85327b5cf742ec150df61c SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af
 DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
-EBUILD netpbm-10.66.00.ebuild 5551 BLAKE2B 286f8f86ba048e3f24bd2c82e929e495481d2887d225f64ffdbae8e52b25d10977b26f3cec9fde5821419f03800d5e7beadb394aa2183565f04cf2da711eb97d SHA512 8e4ab18e164e50ecf5cc79f12bf5c5d4ce09b1ceffe82d278dd91acb664a934cf5f5c1ab6316976370745345ccccdaa22bcafaf40a803c4161bfdb640f2323f4
 EBUILD netpbm-10.70.00.ebuild 5291 BLAKE2B 44d1e0f2a83811ad87ccbedc12787fd9ad45e8379ffe3901c8314515654c1dc5059a2c155e8730785287712f74d6ef5599943dc4add93458cb855b4675050c3f SHA512 1e0fd672914d2b607204a9ac7da290bc3b858395135a062218567879b110ecdbc8f24b63e06e60b1724aaf9bdf846473d9aa23705e8e11fcbf3732ab55eb8f7f
 EBUILD netpbm-10.76.00.ebuild 5181 BLAKE2B b0c32184934b4640f21f727ea579f9dc59c2f7e5562f346c3b61d5d3537cc18d19b2be3ee710b467b53ba342989fec56af6015213e666b52a56bca0c6b268361 SHA512 ba51a645c80128e8589a0c1f3193df358533e7f2da3e642c682e1d3e8d0596fcda6009540149c79bae0005f9fe7e5e229e431870cfd2d9560b8493b868a38957
 MISC metadata.xml 342 BLAKE2B cd90d97e1e3d42554ec5feb7ab3db473ab52ba26e9ce4045a0bb55b89aca21f61c34043d0ec6db28af8f08dc95addcae6cd933544104259a334a794a467bcfdd SHA512 7bb2ebbf5bd2957fd06142bebe3271a0d4695b0b18d9bf9c0084ec7d0da65889efd5fbe39fa121b5f8dce0c3562bcd5ffc687d8092324ca85e43fa7f4cc53c7b
diff --git a/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch b/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch
deleted file mode 100644
index 63260de2e490..000000000000
--- a/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-punt failing tests; already notified upstream
-
---- a/test/Test-Order
-+++ b/test/Test-Order
-@@ -50,7 +50,6 @@ pamditherbw.test
- pbmclean.test
- pamcut.test
- pnmcat.test
--pamflip.test
- pamenlarge.test
- pnminvert.test
- pamchannel.test
-@@ -70,7 +69,6 @@ ppmmix.test
- 
- # Symmetry test
- 
--symmetry.test
- 
- # Format converter tests
- 
-@@ -87,7 +85,6 @@ ppmdfont.test
- pnm-plain-roundtrip.test
- pnm-pam-roundtrip.test
- pnminvert-roundtrip.test
--pamflip-roundtrip.test
- pamdepth-roundtrip.test
- pad-crop-roundtrip.test
- cut-paste-roundtrip.test
diff --git a/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch b/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch
deleted file mode 100644
index 285475dab062..000000000000
--- a/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/513240
-
-the jasper headers are horribly broken and break things like stdbool.h.
-re-order the includes to work around this.
-
---- a/converter/other/jpeg2000/jpeg2ktopam.c
-+++ b/converter/other/jpeg2000/jpeg2ktopam.c
-@@ -13,13 +13,14 @@
- #define _XOPEN_SOURCE 600
- #include <string.h>
- 
-+#include <jasper/jasper.h>
-+
- #include "pm_c_util.h"
- #include "pam.h"
- #include "shhopt.h"
- #include "nstring.h"
- #include "mallocvar.h"
- 
--#include <jasper/jasper.h>
- #include "libjasper_compat.h"
- 
- enum compmode {COMPMODE_INTEGER, COMPMODE_REAL};
---- a/converter/other/jpeg2000/pamtojpeg2k.c
-+++ b/converter/other/jpeg2000/pamtojpeg2k.c
-@@ -13,13 +13,14 @@
- #define _XOPEN_SOURCE 600
- #include <string.h>
- 
-+#include <jasper/jasper.h>
-+
- #include "pm_c_util.h"
- #include "pam.h"
- #include "shhopt.h"
- #include "nstring.h"
- #include "mallocvar.h"
- 
--#include <jasper/jasper.h>
- #include "libjasper_compat.h"
- 
- 
diff --git a/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch b/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch
deleted file mode 100644
index f7e8cf80d6c4..000000000000
--- a/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-fix building w/jbig-2.x
-
---- a/converter/other/jbig/jbigtopnm.c
-+++ b/converter/other/jbig/jbigtopnm.c
-@@ -230,8 +230,12 @@ int main (int argc, char **argv)
-     if (ferror(fin)) 
-         pm_error("Problem while reading input file '%s", fnin);
-     if (result != JBG_EOK && result != JBG_EOK_INTR) 
--        pm_error("Problem with input file '%s': %s\n", 
--                 fnin, jbg_strerror(result, JBG_EN));
-+        pm_error("Problem with input file '%s': %s\n", fnin,
-+#ifdef JBG_EN
-+                 jbg_strerror(result, JBG_EN));
-+#else
-+                 jbg_strerror(result));
-+#endif
-     if (plane >= 0 && jbg_dec_getplanes(&s) <= plane) 
-         pm_error("Image has only %d planes!\n", jbg_dec_getplanes(&s));
- 
diff --git a/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch b/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch
deleted file mode 100644
index fcf98211ba01..000000000000
--- a/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-use same -I style as converter/other/Makefile so people can disable these
-
---- a/converter/other/jbig/Makefile
-+++ b/converter/other/jbig/Makefile
-@@ -11,7 +11,9 @@ LIBJBIG_OBJECTS = jbig.o jbig_tab.o
- 
- EXTERN_INCLUDES =
- ifneq ($(JBIGHDR_DIR),NONE)
--  EXTERN_INCLUDES += -I$(JBIGHDR_DIR)
-+  ifneq ($(JBIGHDR_DIR)x,x)
-+    EXTERN_INCLUDES += -I$(JBIGHDR_DIR)
-+  endif
- endif
- 
- ifneq ($(JBIGHDR_DIR),NONE)
---- a/converter/other/jpeg2000/Makefile
-+++ b/converter/other/jpeg2000/Makefile
-@@ -11,7 +11,9 @@ include $(BUILDDIR)/config.mk
- 
- EXTERN_INCLUDES =
- ifneq ($(JASPERHDR_DIR),NONE)
--  EXTERN_INCLUDES += -I$(JASPERHDR_DIR)
-+  ifneq ($(JASPERHDR_DIR)x,x)
-+    EXTERN_INCLUDES += -I$(JASPERHDR_DIR)
-+  endif
- endif
- 
- 
diff --git a/media-libs/netpbm/files/netpbm-10.66-options-case.patch b/media-libs/netpbm/files/netpbm-10.66-options-case.patch
deleted file mode 100644
index a865bc1f4514..000000000000
--- a/media-libs/netpbm/files/netpbm-10.66-options-case.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-r2175 | giraffedata | 2014-04-01 22:28:23 -0400 (Tue, 01 Apr 2014) | 1 line
-
-Fix bug: inconsistent use of upper and lower case Y and N in make file variables.  Make it consistently upper case
-
---- buildtools/configure.pl	(revision 2174)
-+++ buildtools/configure.pl	(revision 2175)
-@@ -835,16 +835,16 @@ sub getLibTypes($$$$$$$$) {
-         my $response = prompt("(y)es or (n)o", $default);
-         
-         if (uc($response) =~ /^(Y|YES)$/)  {
--            $staticlib_too = "y";
-+            $staticlib_too = "Y";
-         } elsif (uc($response) =~ /^(N|NO)$/)  {
--            $staticlib_too = "n";
-+            $staticlib_too = "N";
-         } else {
-             print("'$response' isn't one of the choices.  \n" .
-               "You must choose 'yes' or 'no' (or 'y' or 'n').\n");
-             exit 12;
-         }
-     } else {
--        $staticlib_too = "n";
-+        $staticlib_too = "N";
-     }
-     print("\n");
- 
---- config.mk.in	(revision 2174)
-+++ config.mk.in	(revision 2175)
-@@ -503,7 +503,7 @@ LINUXSVGAHDR_DIR =
- #LINUXSVGALIB = /usr/lib/libvga.so
- #LINUXSVGAHDR_DIR = /usr/include/vgalib
- 
--# If you don't want any network functions, set OMIT_NETWORK to "y".
-+# If you don't want any network functions, set OMIT_NETWORK to "Y".
- # The only thing that requires network functions is the option in
- # ppmtompeg to run it on multiple computers simultaneously.  On some
- # systems network functions don't work or we haven't figured out how to 
-@@ -512,11 +512,11 @@ OMIT_NETWORK =
- #DJGPP/Windows, Tru64:
- #   (there's some minor header problem that prevents network functions from 
- #   building on Tru64 2000.10.06)
--#OMIT_NETWORK = y
-+#OMIT_NETWORK = Y
- 
- # These are -l options to link in the network libraries.  Often, these are
- # built into the standard C library, so this can be null.  This is irrelevant
--# if OMIT_NETWORK is "y".
-+# if OMIT_NETWORK is "Y".
- 
- NETWORKLD = 
- # Solaris, SunOS:
-@@ -602,12 +602,12 @@ NETPBMLIBSUFFIX = so
- # Windows shared library:
- #NETPBMLIBSUFFIX = dll
- 
--#STATICLIB_TOO is "y" to signify that you want a static library built
-+#STATICLIB_TOO is "Y" to signify that you want a static library built
- #and installed in addition to whatever library type you specified by
- #NETPBMLIBTYPE.  If NETPBMLIBTYPE specified a static library,
- #STATICLIB_TOO simply has no effect.
--STATICLIB_TOO = y
--#STATICLIB_TOO = n
-+STATICLIB_TOO = Y
-+#STATICLIB_TOO = N
- 
- #STATICLIBSUFFIX is the suffix that static libraries have.  It's
- #meaningless if you aren't building static libraries.
---- GNUmakefile	(revision 2174)
-+++ GNUmakefile	(revision 2175)
-@@ -396,19 +396,19 @@ lib/install.hdr:
- 	$(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/Makefile \
- 	    SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@)
- 
--ifeq ($(STATICLIB_TOO),y)
--BUILD_STATIC = y
-+ifeq ($(STATICLIB_TOO),Y)
-+BUILD_STATIC = Y
- else
-   ifeq ($(NETPBMLIBTYPE),unixstatic)
--    BUILD_STATIC = y
-+    BUILD_STATIC = Y
-   else
--    BUILD_STATIC = n
-+    BUILD_STATIC = N
-   endif
- endif
- 
- .PHONY: install.staticlib
- install.staticlib: 
--ifeq ($(BUILD_STATIC),y)
-+ifeq ($(BUILD_STATIC),Y)
- 	$(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \
- 	SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.staticlib 
- endif
---- lib/Makefile	(revision 2174)
-+++ lib/Makefile	(revision 2175)
-@@ -175,7 +175,7 @@ else
-   ifeq ($(STATICLIB_TOO),Y)
-     BUILD_STATICLIB = Y
-   else
--    BUILD_STATICLIB = n
-+    BUILD_STATICLIB = N
-   endif
- endif
- 
diff --git a/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch b/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch
deleted file mode 100644
index 0da719ae07d4..000000000000
--- a/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/547252
-
-------------------------------------------------------------------------
-r2395 | giraffedata | 2015-01-23 13:51:17 -0500 (Fri, 23 Jan 2015) | 1 line
-
-Fix syntax error
-
-build: fix compile failure in wordint_access_be.h with
-Bigendian target platforms.
-
-Index: trunk/lib/util/wordaccess_be_aligned.h
-===================================================================
---- trunk/lib/util/wordaccess_be_aligned.h	(revision 2394)
-+++ trunk/lib/util/wordaccess_be_aligned.h	(revision 2395)
-@@ -24,7 +24,7 @@ bytesToWordint(wordintBytes bytes) {
- static __inline__ void
- wordintToBytes(wordintBytes * const bytesP,
-                wordint        const wordInt) {
--    uint16_t const hi = ((wordInt >> 48) & 0xFF)
-+    uint16_t const hi = ((wordInt >> 48) & 0xFF);
-     uint16_t const mh = ((wordInt >> 32) & 0xFF);
-     uint16_t const ml = ((wordInt >> 24) & 0xFF);
-     uint16_t const lo = ((wordInt >>  0) & 0xFF);
diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild
deleted file mode 100644
index 3091275a3a1b..000000000000
--- a/media-libs/netpbm/netpbm-10.66.00.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
-
-RDEPEND="jbig? ( media-libs/jbigkit )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( >=media-libs/libpng-1.4:0 )
-	rle? ( media-libs/urt )
-	svga? ( media-libs/svgalib )
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
-	xml? ( dev-libs/libxml2 )
-	zlib? ( sys-libs/zlib )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	sys-devel/flex"
-
-netpbm_libtype() {
-	case ${CHOST} in
-	*-darwin*) echo dylib;;
-	*)         echo unixshared;;
-	esac
-}
-netpbm_libsuffix() {
-	local suffix=$(get_libname)
-	echo ${suffix//\.}
-}
-netpbm_ldshlib() {
-	case ${CHOST} in
-	*-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
-	*)         echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
-	esac
-}
-netpbm_config() {
-	if use $1 ; then
-		[[ $2 != "!" ]] && echo -l${2:-$1}
-	else
-		echo NONE
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/netpbm-10.31-build.patch
-	epatch "${FILESDIR}"/netpbm-10.66-test.patch #450530
-	epatch "${FILESDIR}"/netpbm-10.66-jasper-hack.patch #513240
-	epatch "${FILESDIR}"/netpbm-10.66-options-case.patch
-	epatch "${FILESDIR}"/netpbm-10.66-jpeg-dirs.patch
-	epatch "${FILESDIR}"/netpbm-10.66-jbig-2.patch
-	epatch "${FILESDIR}"/netpbm-10.66-failing-tests.patch
-	epatch "${FILESDIR}"/netpbm-10.66-wordaccess_be_aligned.patch #547252
-
-	# make sure we use system urt
-	sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
-	rm -rf urt
-
-	# avoid mixing the local copy of jbig with the system
-	rm converter/other/jbig/jbig.h || die
-
-	# disable certain tests based on active USE flags
-	local del=(
-		$(usex jbig '' 'jbigtopnm pnmtojbig jbig-roundtrip')
-		$(usex rle '' 'utahrle-roundtrip')
-		$(usex tiff '' 'tiff-roundtrip')
-	)
-	if [[ ${#del[@]} -gt 0 ]] ; then
-		sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die
-	fi
-	del=(
-		pnmtofiasco fiascotopnm # We always disable fiasco
-		$(usex jbig '' 'jbigtopnm pnmtojbig')
-		jpeg2ktopam pamtojpeg2k # jasper has been removed
-		$(usex rle '' 'pnmtorle rletopnm')
-		$(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
-	)
-	if [[ ${#del[@]} -gt 0 ]] ; then
-		sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die
-		sed -i '/^$/d' test/all-in-place.ok || die
-	fi
-
-	# take care of the importinc stuff ourselves by only doing it once
-	# at the top level and having all subdirs use that one set #149843
-	sed -i \
-		-e '/^importinc:/s|^|importinc:\nmanual_|' \
-		-e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
-		common.mk || die
-	sed -i \
-		-e '/%.c/s: importinc$::' \
-		common.mk lib/Makefile lib/util/Makefile || die
-
-	# avoid ugly depend.mk warnings
-	touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
-}
-
-src_configure() {
-	cat config.mk.in - >> config.mk <<-EOF
-	# Misc crap
-	BUILD_FIASCO = N
-	SYMLINK = ln -sf
-
-	# These vars let src_test work by default
-	PKGDIR_DEFAULT = ${T}/netpbm
-	RESULTDIR_DEFAULT = ${T}/netpbm-test
-
-	# Toolchain options
-	CC = $(tc-getCC) -Wall
-	LD = \$(CC)
-	CC_FOR_BUILD = $(tc-getBUILD_CC)
-	LD_FOR_BUILD = \$(CC_FOR_BUILD)
-	AR = $(tc-getAR)
-	RANLIB = $(tc-getRANLIB)
-
-	STRIPFLAG =
-	CFLAGS_SHLIB = -fPIC
-
-	LDRELOC = \$(LD) -r
-	LDSHLIB = $(netpbm_ldshlib)
-	LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
-	LINKERISCOMPILER = Y
-	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
-	NETPBMLIBTYPE = $(netpbm_libtype)
-	STATICLIB_TOO = $(usex static-libs Y N)
-
-	# The var is called SSE, but the code is actually SSE2.
-	WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
-
-	# Gentoo build options
-	TIFFLIB = $(netpbm_config tiff)
-	# Let tiff worry about its own dependencies #395753
-	TIFFLIB_NEEDS_JPEG = N
-	TIFFLIB_NEEDS_Z = N
-	JPEGLIB = $(netpbm_config jpeg)
-	PNGLIB = $(netpbm_config png)
-	ZLIB = $(netpbm_config zlib z)
-	LINUXSVGALIB = $(netpbm_config svga vga)
-	XML2_LIBS = $(netpbm_config xml xml2)
-	JBIGLIB = $(netpbm_config jbig)
-	JBIGHDR_DIR =
-	JASPERLIB = NONE
-	JASPERHDR_DIR =
-	URTLIB = $(netpbm_config rle)
-	URTHDR_DIR =
-	X11LIB = $(netpbm_config X X11)
-	X11HDR_DIR =
-	EOF
-	# cannot chain the die with the heredoc above as bash-3
-	# has a parser bug in that setup #282902
-	[ $? -eq 0 ] || die "writing config.mk failed"
-}
-
-src_compile() {
-	emake -j1 pm_config.h version.h manual_importinc #149843
-	emake
-}
-
-src_test() {
-	# The code wants to install everything first and then test the result.
-	emake install.{bin,lib}
-	emake check
-}
-
-src_install() {
-	# Subdir make targets like to use `mkdir` all over the place
-	# without any actual dependencies, thus the -j1.
-	emake -j1 package pkgdir="${ED}"/usr
-
-	[[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir)
-
-	# Remove cruft that we don't need, and move around stuff we want
-	rm "${ED}"/usr/bin/{doc.url,manweb} || die
-	rm -r "${ED}"/usr/man/web || die
-	rm -r "${ED}"/usr/link || die
-	rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
-	dodir /usr/share
-	mv "${ED}"/usr/man "${ED}"/usr/share/ || die
-	mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
-
-	doman userguide/*.[0-9]
-	use doc && dohtml -r userguide
-	dodoc README
-	cd doc
-	dodoc HISTORY Netpbm.programming USERDOC
-	dohtml -r .
-}
diff --git a/media-libs/opencore-amr/Manifest b/media-libs/opencore-amr/Manifest
index 557211181e75..77c3821c794b 100644
--- a/media-libs/opencore-amr/Manifest
+++ b/media-libs/opencore-amr/Manifest
@@ -1,7 +1,5 @@
 DIST opencore-amr-0.1.3.tar.gz 881105 BLAKE2B e9e1d40b90aa819d1b4fce328ae8ff199c7656f3326199c005e8f0a47e4e3282ae02f93826e923c5128c4ec4cebc3f35b6f5ca9f3f49c7dd15d541fb77383d28 SHA512 f67e84604fe3fbb87d608343e595503e2057272fa0b3bf9158a176e88a96d272c35149483c3ee47ba2b064bd6b17cdb315888a5285aa82edc0401f17d2ae761b
-DIST opencore-amr-0.1.4.tar.gz 929807 BLAKE2B ee3068a90589c9b9511fd0a5e1bbe945a50f72ef7ef7b919607c382ce820f357e6c2087bd1f16a4e5fe142377a94c452a5ae429e95c2e58c464d5457c6ec2457 SHA512 94251bd8fe4ac434f588722cbd180ac7de51296b820d68c85327ef1c88c56ede500b283832823988995371c3086e28f7dee048622aed799d3063982d03c3b867
 DIST opencore-amr-0.1.5.tar.gz 929581 BLAKE2B 4943a27f0df3d874720c87f48c523d9aa4cce849dd0a3c9183466416a0629aa02dac8f01646e469e8c45438bf3c57047eb11e69f3f1b261449a0989a36639e59 SHA512 c324db9dcac5a31bfac633153bc054bfe42d5ff98202c4adb3c75a3fae9792f07f60d48cd659acf106dacd307174a62b2aeee22a4af53caa20d2bfba46488faf
 EBUILD opencore-amr-0.1.3-r1.ebuild 536 BLAKE2B 5600304d99b7209fa6d66edff43388ae077ebe58ab0aba308c9691df44e9921b2158d810db29ed78bd0807c6254d28959d614c1853a4d10c12b57243022705d5 SHA512 c5bf27226f0eb55a0e703170575b4eee0bd6c3cee981a5e3dc039e5feb146e9efb3b8c81374b67378cd98b499da4cc1b875b87ff0c4a7c58e900143142e430b3
-EBUILD opencore-amr-0.1.4.ebuild 538 BLAKE2B 196f22d01752e049c91d3582da072795a92b442ea30b112407b75250b4a4e7f29519469c638a4b0bc74ecacde869cf5ff69c11cbf9000cb2cc2c5841884e2f7b SHA512 316149cd0ee82b750a2f00bc8f6ad720447999c7ad7a1124ce9eb03461eb2cc48d4d947c636849d2a29f0cd2e84fb4ea9d4cf4b72b01c52be3d7b7693596b3d7
 EBUILD opencore-amr-0.1.5.ebuild 545 BLAKE2B 1cefaf3cd50e6a185f4e5e0059e3d89396e514c0ebcf73c1e395f33cddf0584b48bae2fc15bc21f338a2c6c97a74acb037f697d95150da1606ab2861928489b9 SHA512 a35cde60fb74ac2a94d61a561203deb47fc7c8ef14dd93c4279271ef53efcd8c8693eaba9c3417b739dc83a53917b8d08a1fb6de25ea28131c1295e8c6f84b2c
 MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3
diff --git a/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild
deleted file mode 100644
index 57398d12e5f5..000000000000
--- a/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-inherit autotools-multilib
-
-DESCRIPTION="Implementation of Adaptive Multi Rate Narrowband and Wideband speech codec"
-HOMEPAGE="http://opencore-amr.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="static-libs"
-DOCS=( ChangeLog README )
diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index 955911c9c481..aadcff8fba85 100644
--- a/media-libs/plib/Manifest
+++ b/media-libs/plib/Manifest
@@ -4,5 +4,5 @@ AUX plib-1.8.5-X11-r1.patch 341 BLAKE2B 09ba1a92f54dfb6bd5ca3a11f6c7201819ccc7b1
 AUX plib-1.8.5-X11.patch 341 BLAKE2B b8d42813ff29c233c29183764d3d99ddafa123d418055014333713ac778951d0c671b196b35c7b1ac74fdabc29fb9f3bf87adc4f1b4f806d8e898d7f99802331 SHA512 1a605336ed46cdb7dca8b6f9eab488fd8fcf20a2beadcb70fc449d0ee6b2519b1658a9ca23b6c6a8285732dd4830bbf14ba2fb2ae47cd15a7ac431071e42d560
 DIST plib-1.8.5.tar.gz 779133 BLAKE2B a74a0693463b1bbf8a6ac6a34e3a689775ac892d19e0fe2ed955e0bd4af2eb2a7f55ac2dfe5dc105333a07f634dc74a4f6347e8bbd75d2fcc5b55733aefb133d SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d
 EBUILD plib-1.8.5-r1.ebuild 782 BLAKE2B 2418061653e841c61a6cb5874849636e60dd3f6ecc11f4c4fc3dafbd1a9490c4804b75e0bb54a2d54125e1ea6a62a47e77cfdc697f6c80835452f71f95c005a3 SHA512 ed05e1ed616fd53c057da8c8376006a4f10852b46eb589e30545ef2e14f88e468d5226b9366e923d8e79e521d1e22df50d66af83510a0f391ac5bff54aa2ee7e
-EBUILD plib-1.8.5-r2.ebuild 836 BLAKE2B 3bc1d35150631439bd8066b6f519cfeeb7284294e3daa3d64ae3f4c394bbd9ef6554e3d251e150a8e359e5cfb1aed3b8c8f6ac79548e49ee9f85b0343c00658f SHA512 e856100351f8878e3dfbc424d871efe0c2f7efdeea1fe7b119f5d9d045ec6fdbaabb860491e5a90b5766cd038ebef3c6be329b419ea6b5bbf1ee52c3af81508d
+EBUILD plib-1.8.5-r2.ebuild 832 BLAKE2B 26c7ec4fbe5fa4e96fb653d42f42e626c7cd42bf9e36309b642b7be15e05ab22f7bd1b3a9a0631f28fa5b5099f6d2ccf76bc159835e3a8d6f5ef1693a90365f5 SHA512 9f52795f637c303a8649965ad2dc32946bdc7dcd60c9b0854ea6cddaaf63eb9ad5af44bc4152f6fea6c4f92d238f22e249b96566922b181aaf037ada1b7864aa
 MISC metadata.xml 327 BLAKE2B 65003679381c42a0e1bfecce661d9f264ac2117dbb071af263f480d349a9f1473acb191cfebd921036c598c1d5cf5d0d2e76851402d2dd4bf3cb58dfd18b3555 SHA512 63a4b8bd5cef9e67d1684542cc59b20d8276bc791a4d8293053f7be3fc276501c9d47c273c6b8a0a0d131e3842e93da4c02bde50315f642e6d742c87866f500a
diff --git a/media-libs/plib/plib-1.8.5-r2.ebuild b/media-libs/plib/plib-1.8.5-r2.ebuild
index d3ca9fa91384..8b02e9ee1777 100644
--- a/media-libs/plib/plib-1.8.5-r2.ebuild
+++ b/media-libs/plib/plib-1.8.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ SRC_URI="http://plib.sourceforge.net/dist/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc sparc ~x86"
 
 DEPEND="virtual/opengl"
 RDEPEND=${DEPEND}
diff --git a/media-libs/rlottie/Manifest b/media-libs/rlottie/Manifest
index 7f8efe9a154b..328d134b11f5 100644
--- a/media-libs/rlottie/Manifest
+++ b/media-libs/rlottie/Manifest
@@ -1,6 +1,3 @@
-AUX rlottie-0.1-disable-werror.patch 381 BLAKE2B 26afddff05d0cfda88617473ec4affca4a721f081e393c31b409fc6a3e73efe73e4e661caf13aeaf5394f31533390b1439492e066ad19087d76b984b6304f421 SHA512 2363100f6b0ab09f3ad9ae46dd02dffd2a5ca2124ae1b4f3791c88b3b7563e9cafd68da4ee719f9460d781aab80b4a83f21f0d788db2eefa5cd9d2cab0ab69ce
-DIST rlottie-0.1-1.tar.gz 3370181 BLAKE2B 7ba580af961f2af7b92c40b4640f8b515c21a354ef5e639c5f00b0ea26fd3e2929dbf2e926b58d39ad3f48228511ba42a42a24d4b7bb914389a7e43df810d667 SHA512 ab9b913d9e0bc938a878a6847851cd6965dc61efbf8ef71761b83d6ff577479cf0c0b214c36e58ddd6a29927a1954c3d3db9db427779b5a2d472c8962cd45ff1
 DIST rlottie-0.2-1.tar.gz 3516947 BLAKE2B d5f6b643c910e0b831be223be4fcff3d42cde8239b01d413f2805eeccf2665abfbd209ee6877358c2434d3bc82ea7c5b3849f4dca1d0796436e47ffa6bcfed64 SHA512 1f645ae998ddbe83e4911addf28ec24ae3ff33f6439a9fb6c1e56986b46ac17dba155773ab02a59712e781febb31709a99075a3fbcda6136a0cb43dbd7c753de
-EBUILD rlottie-0.1-r1.ebuild 936 BLAKE2B f72f77bd577b7b548591f23fc041d06f11a11e800ed3d4d24118ee3e7e559d2039f1c6cb6728a5375884ff680228d4e6e3cf68d8865e979cc402096b8a89f6a6 SHA512 d33157089ec5d865ae0d67d0889d18df3c4119f4191658fa72d65367183c7931e36d05f307d706f6ef723ee066d1fcad26d3e594600660257937b3cddf18dd10
-EBUILD rlottie-0.2.ebuild 872 BLAKE2B a9d2a628ce990f846238505494ebdb52da9529dbc3b7b950d390006da907f97cac01c94b3b748ffa329e2cdce406ee3d6bd965b5b5dc2eeccf018801650d1c6b SHA512 9922b6b60fc15c8f2df18a2f17d3f4cb773aa01ef0fcffd52777bcf6924e7933e6ada4a04efab7fa7f8acaa2d611cfa5e1b90feab9b7ebdbc5e70ef67bb98961
+EBUILD rlottie-0.2.ebuild 879 BLAKE2B b4a7951db369fff6b8a6cb4925903d2d59e7adaaf1a5ad4ce90299f2671f22a59ae0b918113d9f2038358fab2341d5a40c9db37a143e0b6e96e661ed4348ebb9 SHA512 4d2850e75042f6d0ed8438425025a8280703295062f8482e24cc44202953e37c48a0b278645d7c124d47e3580a170975b7d23d36393fdc510a683c020ef9f4ac
 MISC metadata.xml 901 BLAKE2B 0f2b146bafcbff57e44a91a21176114d15c9d81a076cc42f3d57e3849d1b3af3d46eb45bc74cf6e524679677b5394f440dc762c87ddc3652d0b754ebd62907b5 SHA512 f7e80a3946b2462a3718f508be57cdbbc3c85c632778b58393f467cfa5c4e80b96f3f264251d9fbb9ce4cf26e4907e534ee758c77661504f05f73577c4c06fab
diff --git a/media-libs/rlottie/files/rlottie-0.1-disable-werror.patch b/media-libs/rlottie/files/rlottie-0.1-disable-werror.patch
deleted file mode 100644
index 55e50d63a553..000000000000
--- a/media-libs/rlottie/files/rlottie-0.1-disable-werror.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/meson.build	2020-06-19 08:49:20.511888022 +0300
-+++ b/meson.build	2020-06-19 08:49:49.166640657 +0300
-@@ -1,6 +1,6 @@
- project('rlottie',
-         'cpp',
--        default_options : ['warning_level=3', 'werror=true', 'cpp_std=c++14', 'optimization=s'],
-+        default_options : ['cpp_std=c++14', 'optimization=s'],
-         version : '0.1',
-         license : 'LGPL-v2.1')
-
diff --git a/media-libs/rlottie/rlottie-0.1-r1.ebuild b/media-libs/rlottie/rlottie-0.1-r1.ebuild
deleted file mode 100644
index c3825364a0c3..000000000000
--- a/media-libs/rlottie/rlottie-0.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="A platform independent standalone library that plays Lottie Animations"
-HOMEPAGE="https://www.tizen.org/ https://github.com/Samsung/rlottie"
-SRC_URI="https://github.com/Samsung/rlottie/archive/v${PV}.tar.gz -> ${P}-1.tar.gz"
-
-LICENSE="BSD FTL JSON LGPL-2.1 MIT"
-SLOT="0/0.0.1"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug examples test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=( "${FILESDIR}"/${P}-disable-werror.patch )
-
-src_configure() {
-	local emesonargs=(
-		-D cache=true
-		-D module=true
-		-D thread=true
-
-		-D cmake=false
-		-D example=false
-
-		$(meson_use debug dumptree)
-		$(meson_use debug log)
-		$(meson_use test)
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die "Failed to switch into BUILD_DIR."
-	eninja test
-}
diff --git a/media-libs/rlottie/rlottie-0.2.ebuild b/media-libs/rlottie/rlottie-0.2.ebuild
index d0ac8c17c14b..faec02176727 100644
--- a/media-libs/rlottie/rlottie-0.2.ebuild
+++ b/media-libs/rlottie/rlottie-0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Samsung/rlottie/archive/v${PV}.tar.gz -> ${P}-1.tar.
 
 LICENSE="BSD FTL JSON MIT"
 SLOT="0/0.2"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="debug examples test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index de6a90923374..455c9a98d646 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,5 +1,6 @@
+AUX rubberband-1.9.0-makefile.patch 339 BLAKE2B 93a60dde06e197578f8279b60551541bf69ac756fef348128bfbd3289ece20c98ccaebed6856cf7697588440c61bcfa6ac65b6480648cf63aed9f21ac642f270 SHA512 3921eb71daee708ace0c4f28075ac67a2b10af71ddeb85edea1cde0c2e0721d09ca590ce90255f49be0f284cc43a0cfda9b4805c82a09baeb4303cadb06ad3c3
 DIST rubberband-1.8.2.tar.bz2 182232 BLAKE2B 991debac51e0a5516a35e1d063d5ea2c51b9d193b6a183200b0869a6743e184fe4296168d6caaea7b811a4022d25c08ca7909f05491a0e91cfe7dda532ed29cb SHA512 da677f9a843711c44c52c0153faa62e587ac7c010569523ef4fef7ce941b9d292e566f46147700e496f6cfff4c9f22f9901dcc93f2d701fdb9de152ddac0c3a6
 DIST rubberband-1.9.0.tar.bz2 192240 BLAKE2B dd97f80e01b05883645bf7c78730f8a3f873a60379cc209887591a28d0b6292e083c2f522db35ef9435c0a446eaa9b5acab8b5e2c9703514019491a939a804c9 SHA512 2226cfec98f280a12f874f60620c3bf09f7399a7808af5e9f5c9a5154b989cfbf3c4220e162d722e319a4ef046f81c6a07eac2b8c6035c8f6230f0a20b1577a8
 EBUILD rubberband-1.8.2-r1.ebuild 1480 BLAKE2B fae62ef316e3f342bc3b860378913a3e079a8d5a9c51489ac1fc5d5ef8e2db05bb9d2c300f48a09d44e7f83fc5330307cc6d554b096909ac0be66706963d7fae SHA512 00aca9daf40563191ad1771fcc7941eacca21112f4d70fcbc8059c149906c416fdca45e404586606229a1f4549c02f34a62dde0bbeba3e5b6bba1d525f6c91c2
-EBUILD rubberband-1.9.0.ebuild 1680 BLAKE2B 7df3dc19cf79cccaf9a937d6aeaac6c16f12ed3f4f68e9436485c53d6076508cdc41bdfd4f1dcb39352865d82a921c5471f9bc89cc0492307a0ff7982df26eb9 SHA512 853ac9d8972b50383088d050e9b6c4ec0e06a7f752a0b74e977cda6a924f9121f81d416ddfb89578ed8cf7950c8c1bb46033fd058ab475bb782a2d57dc8532b4
+EBUILD rubberband-1.9.0.ebuild 1796 BLAKE2B 717c03cb18b8d1838b21fe1cc3317982cbf8b1d2f141552cfe5649fbb85491e6208c171189597198ce7cf68ec15e3602054afec19e9d0fb5ac5419806992695d SHA512 565506a42268d1019c00c5e93e444f5d2792ac21b669c4c2950bdb3dd8370547070516991a8cf22dfc4103eea581b29ea3844635bc2825cbcaf0cd6c5f660cdf
 MISC metadata.xml 415 BLAKE2B 316ab3a0d89221f5db790350e3d6fb609656ffac3ab36ab1d53b1ea56d537005f41d5d4fec24e14000ba8dd32a094da7d05c1e814fba77bb4e209599129c685b SHA512 7b34bb720df7941a22d174b9f83407071110c9421b4207471f44a74c1bdb5cb6ef7b085386277c3d1f852ba48fc749e665337bc5d3b9fe862e76378a6d7ad4a0
diff --git a/media-libs/rubberband/files/rubberband-1.9.0-makefile.patch b/media-libs/rubberband/files/rubberband-1.9.0-makefile.patch
new file mode 100644
index 000000000000..5539162dec29
--- /dev/null
+++ b/media-libs/rubberband/files/rubberband-1.9.0-makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index fdddb72..86c0548 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -19,7 +19,7 @@ VAMP_PLUGIN_LIBS	:= @Vamp_LIBS@ $(LIBRARY_LIBS)
+ LADSPA_PLUGIN_LIBS	:= $(LIBRARY_LIBS)
+ 
+ MKDIR			:= mkdir
+-AR			:= ar
++AR			?= ar
+ 
+ INSTALL_BINDIR		:= $(PREFIX)/bin
+ INSTALL_INCDIR		:= $(PREFIX)/include/rubberband
diff --git a/media-libs/rubberband/rubberband-1.9.0.ebuild b/media-libs/rubberband/rubberband-1.9.0.ebuild
index 97b291d58908..38036981a9ee 100644
--- a/media-libs/rubberband/rubberband-1.9.0.ebuild
+++ b/media-libs/rubberband/rubberband-1.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
 HOMEPAGE="https://www.breakfastquay.com/rubberband/"
@@ -27,6 +27,10 @@ CDEPEND="
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
 src_prepare() {
 	default
 	if ! use static-libs ; then
@@ -47,6 +51,10 @@ multilib_src_configure() {
 		$(use_enable vamp )
 }
 
+multilib_src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
 multilib_src_install() {
 	# fix libdir in .pc file
 	sed -iE "s%/lib$%/$(get_libdir)%g" "${BUILD_DIR}/rubberband.pc.in" || die "Failed to fix .pc file"
diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest
index f8158b2b9471..2d422b2d1d1f 100644
--- a/media-libs/sdl-gfx/Manifest
+++ b/media-libs/sdl-gfx/Manifest
@@ -1,5 +1,5 @@
 DIST SDL_gfx-2.0.25.tar.gz 1760656 BLAKE2B f0779c725529d52b675312a3f6fffac7581f2e3a6f609c433e0c1fc636a3f73660727ce8996764578dcb486252ceaf6064a6710a6b60a82fc3cc106097d2e7ab SHA512 42a5d78fe1a9b644d329fb688ed6c98558f8dd0aa029a1a0d99b1c59f94859269e0aef8f9e420b8018b687d8eae151652890be3994775644e1d3a80ba7b6fe8c
 DIST SDL_gfx-2.0.26.tar.gz 1771164 BLAKE2B 09556762bd9f3e19989d9db4117ec63deff466c015fe0d7b40595b8d3d0f2e7f17d142d101a1463a71144b6ee7700370513057f4f4753a4b4c605308cd42bc64 SHA512 e571caa0d7575683efd4cf8f0a41ab10f4acf913f9ece216ac823af11da22c8734fc2c0ea049009a3e1a53715e49622f5bfcfdbdafb95e5151990d0a4eb69c01
 EBUILD sdl-gfx-2.0.25.ebuild 1093 BLAKE2B da17fb59a9352bd2f274228aef2f782b86fff1b957df3e8c8e949e586c633759b97c7101e2b04f442b14388004120890457a708222b17d18cdc734431a842dbd SHA512 606aa7a5da5b4c8ff97030e289e7bc7f3c39ad08676a15dc1c7b9a3e5e9856a9226ff2b54ee4e38e83780fb3811033e6a6cf1f684ee32ee217892bab72d0cc76
-EBUILD sdl-gfx-2.0.26.ebuild 1183 BLAKE2B 0df4f287bad2fe70fb07c6c1e7c26a735ee8810d0c883b1a9f7b957558dfcb6240d8d6277d56eca68d28e83fe6c786072cec7ba98ba70f4b1d8fb807818c9c16 SHA512 b5348c1a1fead83f1dd1b59fe384dd3dcd5447a3f03a61d98f3440abf8432488dcf039f01dde6250a8b5e78408e55b01b930f860d692171e0a489aeea6566e0f
+EBUILD sdl-gfx-2.0.26.ebuild 1182 BLAKE2B 8ae285589be226f483e952a136dbcddba3a0f3367870e89913abc4663a62b906843f5c5e928701bfa71d6b22dc1eeb6937dbeacaa58fd31e72c0418eb261af3c SHA512 1312627f16e764ae2c4b2ee06e70522181c1a0199d4dff6ba0fe82e755ac8dc2066b5bfc03ccdea7da0d865b00c07ab3923bbcf73ac1719d3bc7d702df899cad
 MISC metadata.xml 913 BLAKE2B 24b8ef9a2b333c6df842a85ec91f6d3a70c4439ed6bcd829641b158d4fb6f100ac20134cba4b2b2e5732825730ed0a214f55b10ff38a328e6a004770b3d246a5 SHA512 495205062ad772f808daa2da58de9abf6ec504665e06ba9f38392bcae2b4ee343a935be43d5d82e56353d1b282c6e293a859d495f98face961f9c5921503c162
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
index e0141aadd518..552639de3182 100644
--- a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc cpu_flags_x86_mmx static-libs"
 
 RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]"
diff --git a/media-libs/vamp-plugin-sdk/Manifest b/media-libs/vamp-plugin-sdk/Manifest
index 7a6aeba967b4..6bba9d1e6aba 100644
--- a/media-libs/vamp-plugin-sdk/Manifest
+++ b/media-libs/vamp-plugin-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST vamp-plugin-sdk-2.10.tar.gz 316165 BLAKE2B ba206443d4a6f94f56c1e3b7e8f47b7c8f893d2df6601f9d26a613d56bf58fee7d0a4a996964aa0690ecf69fd1d686db28165e73a0d37880a7891c67ecaaae5f SHA512 67a71e5396eab5ce9503e9111b4cfc16fc9755cf6ae2d8dfc99ed29fd91e75eaf0de9a9c55ce8f7751f04c235eb86430856eff18f02adde54f1850a87c917ef0
 DIST vamp-plugin-sdk-2.7.1.tar.gz 306956 BLAKE2B d8e765f54cb3544efcca4b08241afc070026adeaa4c0273cc01dae26e0ad60a976bc443184cc83413c6e32f4cf6fbee6590954e7ab12872993abb78c2541653f SHA512 91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3
-EBUILD vamp-plugin-sdk-2.10.ebuild 1713 BLAKE2B cc11a402cb0e3eb625169d76557dbe26860b28dffeb21ee3c7562e89fc0e00cf3addf1f2f09b79a97aa40e830db5e256324852f47744f7e421f9b226786dfe21 SHA512 caf7175502d7f6579fd66e5fa0d0e942a86ff76d341700350effc10552fb928f30e69992d371abff68839abd658713642875719e74307c4d89a61b68657bc05c
+EBUILD vamp-plugin-sdk-2.10.ebuild 1711 BLAKE2B 1a26d3a99fafffe9163651580e12f6c5c83feea68d5700a0b650f015661a0748288929b45f131d326d520576a7036e45aeb4ba3870ee4a4ec2191f5f56ae8782 SHA512 e02c906432e7ec78bca3b3493f4001ef3653e9b56adfbce2dcadb68261502321e50de8595e7bf5f9897cd17d68acfe9ca3a3249757f3dbe6a82d4ad775e34ac7
 EBUILD vamp-plugin-sdk-2.7.1-r1.ebuild 1647 BLAKE2B 4b08eb7d49ea76bc132e3ee90e9f71be68c453978356fa89eadf7381b4a3d143861a2ec6409c1472cfa24bbed1269bac1794833aa31ae8dc1e83a6dbc694fdbb SHA512 cc59376395f69f3b7615f2484803f6b9f8b0d673ddf349e0ebc79784766f055aee09f69f0350a956e593500419c6b00da32926eca0a954c660ffa6640cdf5418
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild
index 9e72385ee23e..f7752aceb915 100644
--- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild
+++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/c4dm/${PN}/archive/${PN}-v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND="media-libs/libsndfile:0=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 9cb1e2f5834d..ffd26d2bb9ef 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index 2c269325b126..94f258a2e10b 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1,7 +1,3 @@
-DIST qmmp-plugin-pack-1.3.0.tar.bz2 230625 BLAKE2B a26926c81dee6e47c4a97cd40328329722fa3ccc9c244fddb962ef268337b6a9ea7db6b9568af83f469f88cbf4c60c2154b968276209b118f3124871a6764057 SHA512 5d320938cc5cdd540149f131e41c87c0eb5b4db79fa6f6706dcf30177ce988733c291d95c731e14df13a2d1f9af13916de060d8eaf38910bfcef42aac68bc900
-DIST qmmp-plugin-pack-1.3.2.tar.bz2 231095 BLAKE2B e8a350b4ee7810d2431d3f3babdc6baf1860681f0170fc7dd84c5ecd3c664706af8e5c083f0326da3b6e3bd5ebf24f4874750098dd15d7f20848b386e81a6f40 SHA512 71b1f8e618507c48424e0b5b1144e99444cc0ebb984ed39512a7e11a050f5893cbffda53b1293e3186f46efd0b509c49febc874d48534081e7b9124d909aa651
 DIST qmmp-plugin-pack-1.4.0.tar.bz2 235590 BLAKE2B fabb813176cc97c84e92af542d148c33289959a678a1252bbf05ade86b2eef1ab398a8eadae066ef55490b763a0fb7ee7b1ec0c91d7f9578ee6a66fa0dfa735b SHA512 5c01e599ab5670992b93f07851a2eade444e79396a3b6e48bf17f6a2f08196c6d81fbb0404995fcb56e75136d2de430f2f2b1257890c2eaff443f4fd4a5adf6c
-EBUILD qmmp-plugin-pack-1.3.0.ebuild 546 BLAKE2B 8b17bb09315075a2a48d556bccfd5006244390adcbb9073f3dbdc6263754fdaad25b5dcdafa87f7f791a7e7d52d96d2fb3c797d03bfa0d8f6c08ccf2d0a1b1ad SHA512 e644ae113cad2a31633da41f64d5821067f286f43332ef5149af17b6322f97854dab3ff132a28c4341175a97ff80b9ac708f2507477353284aea3ffaa3ad1f34
-EBUILD qmmp-plugin-pack-1.3.2.ebuild 548 BLAKE2B 50353516e22b970b724b434aa60d804785a101164bc78cdd56d8e1f7d9b6d9659b77073537379fff7eafeba77a6ee9ba7654e8e31814d9c7bbd42e554a551731 SHA512 3bc6548cf3231c1a60b90ead9018ba6cabbddaa20c900905362070b25e56932e2bfa73ae96e5501a5d90e8a82849f888b758e448702ae4afc667cad2088a0e07
 EBUILD qmmp-plugin-pack-1.4.0.ebuild 676 BLAKE2B 45b8e111acc210953ec345eee73683bddb7662e922be6c6820bf04f0e358eb3fb109d1972353c9c98449558ef56eeb6de7798351bd647f59dd2ea49d2fb434e8 SHA512 5eb8daf2c9276ce9a8f7e1bae7a528e5217ee9ab61cc25871111b83c69d1dc6c966749b98eed376f7a1d305ed97992d0e8275db0d493c509ccac4d519645cb1b
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
deleted file mode 100644
index 1cbdb39bcfb4..000000000000
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A set of extra plugins for Qmmp"
-HOMEPAGE="http://qmmp.ylsoftware.com/"
-SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsamplerate
-	>=media-libs/taglib-1.10
-	=media-sound/qmmp-$(ver_cut 1-2)*
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-lang/yasm
-	dev-qt/linguist-tools:5
-"
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.2.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.2.ebuild
deleted file mode 100644
index 26678a2504fd..000000000000
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A set of extra plugins for Qmmp"
-HOMEPAGE="http://qmmp.ylsoftware.com/"
-SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsamplerate
-	>=media-libs/taglib-1.10
-	=media-sound/qmmp-$(ver_cut 1-2)*
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-lang/yasm
-	dev-qt/linguist-tools:5
-"
diff --git a/media-plugins/vdr-femon/Manifest b/media-plugins/vdr-femon/Manifest
index a192bdbd2979..7433ebeae44e 100644
--- a/media-plugins/vdr-femon/Manifest
+++ b/media-plugins/vdr-femon/Manifest
@@ -1,11 +1,5 @@
 DIST vdr-femon-2.0.4.tgz 83985 BLAKE2B c83d5d6f173d5f98ee8ba874c2ed1743a659a19ba8ccc07b8434a371bb1f7a2cd87139ba0f567e45662bdef838e56209f5b72b427536706dd1733c578ac2cb4e SHA512 6d4de8ed0bd19984148f5b09e1bc86afea7153d45a62f44cfd6679804b14aa661d29fe8fd8e584fba4c7b5987adf3891ffbc12601bf7afa9325dabdb620f4ca8
-DIST vdr-femon-2.1.1.tgz 84165 BLAKE2B 15f7d54b74a0d1c0ab6fd270909811be4e617f66739344cde900eb040b8ae5d68ea026c027b7039336a442b7f4ee046fbbc13fb23d0ddf8220ff5c97d0a091e5 SHA512 a0893619b2e55d537b7362dc33a125abdf19ccbcf5d4b7633a2ed4741fd9a9b12496b5e83259491cc02f542071922b547d605ed1b41ac237e03c5f770c07b956
-DIST vdr-femon-2.2.0.tgz 84268 BLAKE2B 49e0c87ebcd03d8ac2cea3138a90f2afb7e07fa598f88243bf6ebcc3befc00c2115b531f0d3c0d901515fed46851a28da2bf8c16709151c1aa7a7170c1dd26c1 SHA512 0ab32fc1021efe21d3190d76f75956b5ffb2f94fdae1373cc08899ff0b035d1ee008a87c6a4af415e366c0188b16a9d49852bec527ac616c06ec27fed4d98861
-DIST vdr-femon-2.2.1.tgz 75338 BLAKE2B f3777f3ad2361a38c0eac1adc61f035d4ba21d97b6902e0254b17ecf2ccdb6450b6ddd7d3890fbca0be2c6c046cff235fe65e7068cb9f29893f9e7cbc82e5140 SHA512 fe5b61b116f8a37cfc6055884c896552d9ef6858c588ec0b81a95e54f537a31649c4f71cbfca1ec34edd305d72ec8d3e4db4dddad7dbb9904b8bab08317619ab
 DIST vdr-femon-2.4.0.tgz 83536 BLAKE2B c98bfd88ee0db8612a93d77ee4eae5b8334b94c6d6b49e779f9d77dbce2798191c9f6beba902d49c9c41bc68be0d4f6595897756acae1a45d68f71cfee9f3cd6 SHA512 930aa3b083935c4b7c2b281b19cddb971892d283ebb3550d2f861ac92b69a8595d0b3af434647677b99a06d7657b12600cbb5bfccbbd7ce5d2ed6120798c172d
 EBUILD vdr-femon-2.0.4.ebuild 451 BLAKE2B 55c34305354512ae731f51a58d22214c45fb90dec58e3b53a5d9b38a78ed80da9c828cdf7f26e35612d1cc17467d7bea8116502499cf935410a8ff227714d7e0 SHA512 26ea26b9e0b09aefce138657145c3d865463c4576a10d115507a7ab7ebc7f1d5829fea666c6fa14b6d57bd94ba022ea59d070071de2af60225b72508f78994a9
-EBUILD vdr-femon-2.1.1.ebuild 453 BLAKE2B ac140bcd0ff3bf33fdb60e0d04eed33b7d817445e3d7ce99792e8603ce9102f42f5770befb2b1799168e2281610a799e2de348125b68df7f09131f99ca128ad3 SHA512 dbd9639f172c033b6ac3656f77e3707843f157235a70abe1bc67edea9f12f6c7ea495934fd3b16bb8d36b910ef2b7c44adbcacce45b826c663d95a4645416e56
-EBUILD vdr-femon-2.2.0.ebuild 453 BLAKE2B 1d77caeae5943e69d63c3dedcc0ea6e802523763df257c392fe98e67bc596050ca826f6f8b84ad27ee02ec7ee3e9daa34c153911e59cd4015ae32650d31a5399 SHA512 e3396cb39da8ad64b2d3698ce9615cd306948fcf22338a15d95a481314aceb35c9987241bec1cd36b406ca53dac8622bcdaf665ca82f675f4d31f650ef7ef9a3
-EBUILD vdr-femon-2.2.1.ebuild 458 BLAKE2B 91c525b4b79dd3112ad98672299627d8b4dc983e9cdad29d8a74dc7bc1206965534eb997fac5f9736cbc3314ec145f4d45e8f4b434ee768f505b4d56e9c172c9 SHA512 9387ecf16d247402ae18994cd5c5d574e5ed43f38a4a0379b7989626a3b8562f2bb4c05577e698427559bc44dc6f276d1964b216d2a42df0c19f61a843b5ad1f
 EBUILD vdr-femon-2.4.0.ebuild 529 BLAKE2B dda05dc381262f9d66ab86d6c0c35aa29bd2741759e1b672ca7670fa9456d06f111de2576f4857f436afdfb6c28dfc307d31263da446a57baaba9c33613a3ade SHA512 d1c9459b3b0213e5cd84d8f4e250b385680c1227481de8a4f3d544d7963c826a594b118fa33219c1bddf354e9ed04eb0554ce779b11576ba4cc101914b6f4cda
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-femon/vdr-femon-2.1.1.ebuild b/media-plugins/vdr-femon/vdr-femon-2.1.1.ebuild
deleted file mode 100644
index ee183781c438..000000000000
--- a/media-plugins/vdr-femon/vdr-femon-2.1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: DVB Frontend Status Monitor (signal strengt/noise)"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/femon/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.1.6"
-RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-femon/vdr-femon-2.2.0.ebuild b/media-plugins/vdr-femon/vdr-femon-2.2.0.ebuild
deleted file mode 100644
index f255b4cec0c8..000000000000
--- a/media-plugins/vdr-femon/vdr-femon-2.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: DVB Frontend Status Monitor (signal strengt/noise)"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/femon/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.2.0"
-RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-femon/vdr-femon-2.2.1.ebuild b/media-plugins/vdr-femon/vdr-femon-2.2.1.ebuild
deleted file mode 100644
index 8a29ecc0021d..000000000000
--- a/media-plugins/vdr-femon/vdr-femon-2.2.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: DVB Frontend Status Monitor (signal strengt/noise)"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/femon/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.2.0"
-RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-remote/Manifest b/media-plugins/vdr-remote/Manifest
index f91af2dd53a1..11bc7f049708 100644
--- a/media-plugins/vdr-remote/Manifest
+++ b/media-plugins/vdr-remote/Manifest
@@ -1,7 +1,5 @@
 AUX confd 1103 BLAKE2B 0528d3246b087ce2ca3e59a9f8729882a5122c84829700a3a58c5ca99c12b821e9d3fcc262756c0d8b1f1a5086eaa2fb25c3fae8274e51f08c62310e1794e444 SHA512 f2f703a8f9e5ec1bfcf6ab2e8b36b5c08849f497a563316c4e98614c69d7c8bbd06e5e636815d93895ef78e85d19f48ee95622db74a1592e7a6a8053523d5bda
 AUX rc-addon.sh 2228 BLAKE2B 8fd508f06bd725f6f3d62e4a5aac5c9968653602525776be7dc76cd606757555532be4d4f2a2dd8eda0d82404a38e1766de8fb2824c5ccf666418f1f50bf6de4 SHA512 2d589137ec81934bd8e3e3e78679faa182c5e8b31528bf43dfbc19bd643fdf0ebde8517551af3ee071dddbbdf266b62d634ee40b1ca5131337fef4093e8bed82
-DIST vdr-remote-0.6.0.tgz 32869 BLAKE2B 3503e26678d6765152dc6610e476122b713eaae419f3701bfe75fb7714042ab4d0505f8a026a2fcb46d9c869e9b15e31ad7fc1b43b12b29d4b364f641c4117d1 SHA512 1836255d40c9a491d1f0dcab7779a3f75d125b4d28bce00954c2d774c83172e4d69763e34e3f7d9540a951faeead0c12d4a44b0a367a92caae3b22bb3f8c524d
 DIST vdr-remote-0.7.0.tgz 34267 BLAKE2B bd7c2b0ef794191eb9211bc9696a48d933af37fc1ec84eda137a50d0727388e9b4338f2d835211f75d1172fd4dca40a184729fbbef9722f49afd5b88490c0467 SHA512 18c758e9cd519ffc6ccd2a1b53109d7f1ac1c65a32ae43b9eae41ea64ff2ec9721c557ca75a03620b9fee1463608ab0a84d09fad31e233804695570eadec3728
-EBUILD vdr-remote-0.6.0-r1.ebuild 681 BLAKE2B b20ea5e1ac7fd0415fba9de97da78e2611a5878a0b229f5196f2764235b1eb90ee86dad40c4326cc696d8066c49f2f6dcf9a30c3c85934a693a0b5ca0ee0c040 SHA512 bd17dfc3064529502f4850eb3b22d3f6e6dd2a4e91e5dc0df73ebe8efd19da885d2c0ae0eb8c4524938fdaf4065e6a65e3698caef063911d3ab4e89c91c2d1f7
 EBUILD vdr-remote-0.7.0.ebuild 681 BLAKE2B 4b09aeed8e879b822edcfd1b45c06013a34091c060305ed1e62491e3471d9a981c8c722bd2edc09542fb5052653ea149720f5aefb593390390f365ec3444a686 SHA512 fe9f06ca523e3b124b2cc671770693b4852ab685b0bdb624d592ac7e29b6de4a87557ddbe003655e4a0fd1417e03866f1b636b482cdc3b0df454170f2e5ed35c
 MISC metadata.xml 248 BLAKE2B 459a5e1d86106b2519d4d6ca805c6255c157566b9bcd4b1f4de804c771d0276dab1740940efc1d24c68beec0e2860c74d65a01b33ba2bb28d0735221dbc2bd64 SHA512 d2b0fcac72aa7f30ad4e0e6f5e60ef00c6bd80f54edec007af1c9b8677b3c5241b365c0602bf3d4b01d3bd6bfe27c6a7f7d97bf467d3ffb10254b54f63d3dd5e
diff --git a/media-plugins/vdr-remote/vdr-remote-0.6.0-r1.ebuild b/media-plugins/vdr-remote/vdr-remote-0.6.0-r1.ebuild
deleted file mode 100644
index 1c4b7a5a99d8..000000000000
--- a/media-plugins/vdr-remote/vdr-remote-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: use various devices for controlling vdr (keyboards, lirc, remotes bundled with tv-cards)"
-HOMEPAGE="http://www.escape-edv.de/endriss/vdr/"
-SRC_URI="http://www.escape-edv.de/endriss/vdr/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="systemd"
-
-DEPEND=">=media-video/vdr-2.0.0"
-
-pkg_setup() {
-	vdr-plugin-2_pkg_setup
-
-	if use systemd; then
-		if ! getent group input | grep -q vdr; then
-			einfo "add user 'vdr' to group 'input' for full access to remote control device"
-			gpasswd -a vdr input
-		fi
-	fi
-}
diff --git a/media-plugins/vdr-rssreader/Manifest b/media-plugins/vdr-rssreader/Manifest
index 994760d0d337..2831d2eeebc3 100644
--- a/media-plugins/vdr-rssreader/Manifest
+++ b/media-plugins/vdr-rssreader/Manifest
@@ -1,12 +1,5 @@
 AUX vdr-rssreader-2.0.0-gentoo.diff 1034 BLAKE2B 982f94fe8b18d7ef9e38260fc81776b0709cbc65466714517328eeaab797609478002b61815d12fba01b301226cd5783f3926da1cf11a433fd7624607618958d SHA512 374f396dd9f0e13bf996a34c17c680f1ed093bce9e45d992499593b8d6b851cf7075a87e33d629cb89fb78ce1188336ff4f1bc75fd0597eaaebd65865a1866ab
 AUX vdr-rssreader-2.2.1_c++11.patch 643 BLAKE2B 8c839c7d14bc828ee36c5bb1368612d4b27fe22f8da9d2308a23490b253d5728898c9652247c8eef30ff38c0f94d8b332c95046b4956c0ac78dfdee73e0de772 SHA512 2427888e8f9f2ff9647a440c1649db4b9b4d3ba8dab041f6399160858d17866d1020d2aca389ce649b28136eb911c7e693493cf7a2ac91444c085f713dcf09b7
-DIST vdr-rssreader-2.0.0.tgz 25348 BLAKE2B 6d85d0803fede2ed153ce5ffd73f0a78fcf12f634e5ed8499574f889f2cc4bb49d96df8f93161d9805e7eea215ba1b61eda85c28c8d7e4e7c259eff059cd1dc9 SHA512 8b99ae9712198bfce09e33541eb02d5737af3d64cfda8933f05b306a7bf99c14cd15404f26c792e1a4740c1afcceafa9db578999089b0059d945c0cda5f8ea33
-DIST vdr-rssreader-2.0.1.tgz 25385 BLAKE2B 257da53465bf822f5f56df78572324365feb20b2c57d48beeace100eb07af14a62a670977c1af3aff10a7fb51551d9d4796432ebd04442acf3f73caabe5e6160 SHA512 44d6e66f9350c0460b15c7148efcca84008f1030ad58223a734d60080015d488b08af2d094066a9623e5056537d9d2b970177f740a296c48bc0fe7cba62447c0
-DIST vdr-rssreader-2.2.0.tgz 24854 BLAKE2B d880c6d907aca5b828f4eaa144196f365d633e5193be8e1d39591b554b7051f5d0070c014b1f83c56e38eeec571c1d62beac54f05a1f9154aef81fd5c945cc4c SHA512 0073843b432d2698a6ca289761123a80346e82e45b5d3d2946b59988bc047111dde26af6f67b536bb9f1b2d1c9fd1c387961cc54d497ff09bbbd2a5de0a6d53f
 DIST vdr-rssreader-2.2.1.tgz 26518 BLAKE2B d8d96317fd9d7c1b0d6d554b319a9d57dd62479b61e467e1dab39d064aad17c3b9b7d7e9184c4b58e41e2f48778b420b942ced8d66d352c7ef490b69e0eb34bb SHA512 e272acf4b547223b8acc378edfa96196273a6baef68e03dcf123701b1fc915425712ad8a0f1ecb690f921b5d65c327bc21f87c4f5efb8d955416c2334f136b71
-EBUILD vdr-rssreader-2.0.0.ebuild 637 BLAKE2B 8e37066f0567b758c969bc3df5b05eef370e37fe8c6a28a0bee7c1612fdeae060e87c559bc6309d28e37a74c65a3c41294cbea03d7c55379f07a9cd7ee962871 SHA512 d836531a0c0e39b0fedccf210732e3ccd4c807c9b08214894be19a5a246ce51467331a255505d8f19999b1fa56cfd4e3adb0af75acc301729a13cecd67a00476
-EBUILD vdr-rssreader-2.0.1.ebuild 646 BLAKE2B d5e0db74fa5d8a483b23a8d3c20ed373aa272982fdcb615bb64fb45ccd3fd126f52ed1f21f231d42ce3aefde178b8d320992888ea6f89ec56c2d629a9e96fc7f SHA512 c22670c2adf398007cc5fbc8eccbb54f5bce43e4fccfa2f10abc8d5f9cdb74577a94bbf640c8076429c7afe2ba36e5430c404292d2149d17fbeb2793bf080fe7
-EBUILD vdr-rssreader-2.2.0.ebuild 646 BLAKE2B 993fdfff5e2204f6ad6b90e8ad1c4cc02a75082736294f914b1a2c0bdc7f16bcfda4690572ff484a15e318ba626134612ca59c1b15c4815e762b23115ebb8a6e SHA512 af7b583cb977265a3134d8b9ddd93fac3d2bec5e649d92d87bd154624af9ef6f9c60206de7b5734aa6b9fcb4170de9f913d0b293075941a392af2d31a933fce1
 EBUILD vdr-rssreader-2.2.1-r1.ebuild 678 BLAKE2B 329d02253a9853a7f96d9b42dd1d00a59e3e2df8c4b5f85dc64b7c2da0ea5683779c3023abada7215454fbbf01557f7a5827d7a5373c0a289357689d4d98a73c SHA512 fd6ce0575bc276bc05e30af0adce40807ed21e86b55006fc7a9bd3133ee75d3e217ee2c08c4e4847dbc1406237da9cf8c04a0e8291d9d2110b54426503505fe9
-EBUILD vdr-rssreader-2.2.1.ebuild 646 BLAKE2B 993fdfff5e2204f6ad6b90e8ad1c4cc02a75082736294f914b1a2c0bdc7f16bcfda4690572ff484a15e318ba626134612ca59c1b15c4815e762b23115ebb8a6e SHA512 af7b583cb977265a3134d8b9ddd93fac3d2bec5e649d92d87bd154624af9ef6f9c60206de7b5734aa6b9fcb4170de9f913d0b293075941a392af2d31a933fce1
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-2.0.0.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-2.0.0.ebuild
deleted file mode 100644
index c988006308c3..000000000000
--- a/media-plugins/vdr-rssreader/vdr-rssreader-2.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: RSS reader"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.0.0
-		>=dev-libs/expat-1.95.8
-		>=net-misc/curl-7.15.1-r1"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=("${FILESDIR}/${P}-gentoo.diff")
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/plugins/rssreader
-	doins "${S}/rssreader/rssreader.conf"
-}
diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-2.0.1.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-2.0.1.ebuild
deleted file mode 100644
index d8fb702dd0d4..000000000000
--- a/media-plugins/vdr-rssreader/vdr-rssreader-2.0.1.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 vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: RSS reader"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.0.0
-		>=dev-libs/expat-1.95.8
-		>=net-misc/curl-7.15.1-r1"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=("${FILESDIR}/${PN}-2.0.0-gentoo.diff")
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/plugins/rssreader
-	doins "${S}/rssreader/rssreader.conf"
-}
diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-2.2.0.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-2.2.0.ebuild
deleted file mode 100644
index aeb62d32f589..000000000000
--- a/media-plugins/vdr-rssreader/vdr-rssreader-2.2.0.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 vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: RSS reader"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.2.0
-		>=dev-libs/expat-1.95.8
-		>=net-misc/curl-7.15.1-r1"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=("${FILESDIR}/${PN}-2.0.0-gentoo.diff")
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/plugins/rssreader
-	doins "${S}/rssreader/rssreader.conf"
-}
diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-2.2.1.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-2.2.1.ebuild
deleted file mode 100644
index aeb62d32f589..000000000000
--- a/media-plugins/vdr-rssreader/vdr-rssreader-2.2.1.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 vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: RSS reader"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.2.0
-		>=dev-libs/expat-1.95.8
-		>=net-misc/curl-7.15.1-r1"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=("${FILESDIR}/${PN}-2.0.0-gentoo.diff")
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/plugins/rssreader
-	doins "${S}/rssreader/rssreader.conf"
-}
diff --git a/media-plugins/vdr-skinsoppalusikka/Manifest b/media-plugins/vdr-skinsoppalusikka/Manifest
index 878aa65a0c40..8c10e83867ef 100644
--- a/media-plugins/vdr-skinsoppalusikka/Manifest
+++ b/media-plugins/vdr-skinsoppalusikka/Manifest
@@ -1,12 +1,6 @@
 AUX rc-addon-1.0.2.sh 492 BLAKE2B e818c48198fec3fb65894a08aa555d6eb11537ba399f5ded31a1c69563d3283ff2b7ddaa0b096592f3c0befc74bc4716cbb8bd9e671beaba822c8d9e6b7455ec SHA512 800f0508a5567ddebfe0805df1a132cea2c8af3f6fb19617593ca6e2fe252adb3d6f328bba743524b2d08ea9245d1f53c00983ec749ffcb6532c53f0ec5ddd14
 DIST vdr-skinsoppalusikka-2.0.0.tgz 41584 BLAKE2B 990550bdf8dfb63c3b019886ef52e0b4925e2bfdc1c244b3a951054754b98a90322d9bc2a3303694ab0d90b773253f6db2b47a83a78d5c86de9e547a4b0f5f0e SHA512 93e9716479b274d30477b0adef15d1b804670d3fd4667cb62cc481030078b82071ddee80b0c1c8ae30c608c30ca69dfa43423e0439abed18e71c0fa8b8594cc0
-DIST vdr-skinsoppalusikka-2.0.3.tgz 42514 BLAKE2B 34a330b4c73295027ad188729c1422168895e0470a4880898e3131011987aac373f6761355038509efdc066bce9eb14a0a7ce5cc750626b3d7f51f21e37320b2 SHA512 6c47ca11bf97cfcca67f0daa8806243e7a9f9e852f412f0c470ba32bf63461df3a0154c156f7588e4d6adaa9a85b66781a6a7c75544fb8ff17e26e71522b4010
-DIST vdr-skinsoppalusikka-2.2.0.tgz 42981 BLAKE2B 96fe03c8ddfc8e2d1c7b9e100d2d807c40b6047e266f8d04764367e60a972db18754e1114e9fdb51c037f5bd8130cd12ad433764dc733e799fe781436375b03a SHA512 c3ebbe2bd2936a1023d38f02a03c959e2af9e750a7bfda93dd053981cda445b9db9320a0e0fc82b67f2bd35950280747ebd32ab01bf13f8223b1ccb294c03f91
-DIST vdr-skinsoppalusikka-2.2.1.tgz 44379 BLAKE2B bfd705460ebe4b2e54b9318c05b1a2261f59d05a1f443eb8f7c4b0668726a62f0d360d3e05f791e59243ac95681495690f8efdb3e0c0a158e103898d625eddb7 SHA512 4ac93be8cc31bcb452520957db087966b05c0e40b061537260f161d548de5c481dd16e130710a2cb2550a5e6444a35199d0a2f62a785cd662ea99a0075393cd3
 DIST vdr-skinsoppalusikka-2.4.0.tgz 45075 BLAKE2B e8cba52b21ddfc819d9a917f4adb49791f97078fe7adc6eadd20cc752aa43fb2e15fea43166a141a659966fe82ee92fecc6884886e375bba8cc22b106e7a0fb3 SHA512 60fe08140b2eb1bcf0f5b04d2c0eb04cdda0590e94ad034b54831fe35f89b6d3a1e0ab604cc4261a1858c42ebbc0c2b0a5aaa5e5475c3629572e4c76f51067d1
 EBUILD vdr-skinsoppalusikka-2.0.0.ebuild 684 BLAKE2B 3e12c874d5bbc0823f379aca8da3cff25092cb9548fb423267bfbcfb1add8e0761d4ab1e3cc13486baa83ea777edb68d93cf591628fe71edd927021a2777a13a SHA512 b077a97e8aef7a932ed9bad8e9e21cf06cb8149aa86d38c592942c9a36322a6f1c8c7d296b3a6375aca066d20bd802177dcdfeee77f6c86014b35ee4eb1b9f89
-EBUILD vdr-skinsoppalusikka-2.0.3.ebuild 686 BLAKE2B 592757a1d8a07102becb224cbcaec44e4fbb3e74c109800639c096fa20299cba0dbe8deafe4ffaae07af8df809337b4cb208eb23a983e874cf1783b734cf8f76 SHA512 dbd0b9bb7a02e56f4ae8e345c64565229c9404b1ed20dc1c11ce7d43b27096b58cf65686faf73f6227df7197ed440caec51cd2d707f53f963d16a399ef787444
-EBUILD vdr-skinsoppalusikka-2.2.0.ebuild 686 BLAKE2B 1b6b1cca272bde8b0754cc138771bf0c5ee509272ed2ffafb83b4f6a58bc19fcac5718d1c53f2b4e2dbf1e0118a6373cf04b16c554fd264c9c4f46de859ffdec SHA512 cb3cbf9a0f8310ad5c053a56e7b4bfabb88f4fbf0e411a4990fd0955ec545f62e7b4d360d7227bd86c3f8aa8685fd3a6615507aac68ef7038e7fc914caa309c5
-EBUILD vdr-skinsoppalusikka-2.2.1.ebuild 686 BLAKE2B 1b6b1cca272bde8b0754cc138771bf0c5ee509272ed2ffafb83b4f6a58bc19fcac5718d1c53f2b4e2dbf1e0118a6373cf04b16c554fd264c9c4f46de859ffdec SHA512 cb3cbf9a0f8310ad5c053a56e7b4bfabb88f4fbf0e411a4990fd0955ec545f62e7b4d360d7227bd86c3f8aa8685fd3a6615507aac68ef7038e7fc914caa309c5
 EBUILD vdr-skinsoppalusikka-2.4.0.ebuild 711 BLAKE2B 1f4fe070e606cdaee56041150d51cb052967c398dd6e93597fea3c01b2ec64613d362716008cef0ec9bab71436931a7dfc9ee94d84321197c0f252706594b8f0 SHA512 fb647fdd1f7acdd4e5f79b430106f67e7787ad821fe1d69fb5a4024df0a43c9712cd6994bd9d6cc47d1b1a80d068256a781e413941be4d8551081b1c30a5079f
 MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-skinsoppalusikka/vdr-skinsoppalusikka-2.0.3.ebuild b/media-plugins/vdr-skinsoppalusikka/vdr-skinsoppalusikka-2.0.3.ebuild
deleted file mode 100644
index d7ba2e98dbb4..000000000000
--- a/media-plugins/vdr-skinsoppalusikka/vdr-skinsoppalusikka-2.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Skin Plugin: soppalusikka"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.0.0"
-RDEPEND="${DEPEND}
-	x11-themes/vdr-channel-logos"
-
-S="${WORKDIR}/skinsoppalusikka-${PV}"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-1.0.2.sh"
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/themes
-	doins "${S}"/themes/*.theme
-
-	chown vdr:vdr -R "${D}"/etc/vdr
-}
diff --git a/media-plugins/vdr-skinsoppalusikka/vdr-skinsoppalusikka-2.2.0.ebuild b/media-plugins/vdr-skinsoppalusikka/vdr-skinsoppalusikka-2.2.0.ebuild
deleted file mode 100644
index 23175484ea7f..000000000000
--- a/media-plugins/vdr-skinsoppalusikka/vdr-skinsoppalusikka-2.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Skin Plugin: soppalusikka"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.2.0"
-RDEPEND="${DEPEND}
-	x11-themes/vdr-channel-logos"
-
-S="${WORKDIR}/skinsoppalusikka-${PV}"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-1.0.2.sh"
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/themes
-	doins "${S}"/themes/*.theme
-
-	chown vdr:vdr -R "${D}"/etc/vdr
-}
diff --git a/media-plugins/vdr-skinsoppalusikka/vdr-skinsoppalusikka-2.2.1.ebuild b/media-plugins/vdr-skinsoppalusikka/vdr-skinsoppalusikka-2.2.1.ebuild
deleted file mode 100644
index 23175484ea7f..000000000000
--- a/media-plugins/vdr-skinsoppalusikka/vdr-skinsoppalusikka-2.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Skin Plugin: soppalusikka"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.2.0"
-RDEPEND="${DEPEND}
-	x11-themes/vdr-channel-logos"
-
-S="${WORKDIR}/skinsoppalusikka-${PV}"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-1.0.2.sh"
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /etc/vdr/themes
-	doins "${S}"/themes/*.theme
-
-	chown vdr:vdr -R "${D}"/etc/vdr
-}
diff --git a/media-plugins/vdr-systeminfo/Manifest b/media-plugins/vdr-systeminfo/Manifest
index fb432acf3366..56393c7b958d 100644
--- a/media-plugins/vdr-systeminfo/Manifest
+++ b/media-plugins/vdr-systeminfo/Manifest
@@ -2,10 +2,6 @@ AUX confd 353 BLAKE2B 30621287150e3fc85cc98c47c5a2dff052d3909154887f54e3cfa20959
 AUX rc-addon.sh 224 BLAKE2B 727d8ada762e74a0b4a93b7e1c73a56881afbe2898cf8f427b6acd69ec22ba88633bbc378c8bcf486315c707a7da0fc3c8d99cd4b6211e91481358c3619560d2 SHA512 818e032afe9e5dd6c9275bf2ec0dce38446af6c601f636b21ccd82a2b1f06b3545f548e525749bc365fdd6e4515a7ae2cf5d1394bee7a315c1bb0024dde60d32
 AUX systeminfo.sh 3108 BLAKE2B 4155d559145b9f491e48460ac9d39ddc6992547effa3c5fa3ead365f99dfc99cebf73be54249193ac2a4dbe79dcb85c33fb17569257404af77dea8af34f72a10 SHA512 ae5dd5935a66cdb18c663fd19f51e60df29532da4f49abebda4f16f8c53bf65228f9b4fc79e3571bd5519526f6c1e74307aa49c8dc61392c7d92c9ddf5d77cf1
 AUX vdr-systeminfo-0.1.3_vdr-2.3.1.patch 1880 BLAKE2B 8bb4712b635b483c2f7b72f26e8a0e9a61f04b8f54017d0399a8bf768e7570a91d429188f5d7aa2f8b3f1b2b4b21b614583a7a88e50aa5d632f730c0eb18ffda SHA512 67213d94e8f3a5e591a71dc559ef85acb254c9edd4f39bdd87384b1bd21ff1e9b2876e0fcbc81eba44c7512ab419a0ed5259d759e243b63a3ffa745c8eaa64d7
-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 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
deleted file mode 100644
index 1932274f9e33..000000000000
--- a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.1.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 vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: systeminfo"
-HOMEPAGE="http://firefly.vdr-developer.org/systeminfo/"
-SRC_URI="http://firefly.vdr-developer.org/systeminfo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.7"
-
-RDEPEND="sys-apps/lm-sensors
-		app-admin/hddtemp"
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /usr/share/vdr/systeminfo/
-	insopts -m0755
-	doins "${FILESDIR}"/systeminfo.sh
-}
diff --git a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild
deleted file mode 100644
index 1380ceb13006..000000000000
--- a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: systeminfo"
-HOMEPAGE="http://firefly.vdr-developer.org/systeminfo/"
-SRC_URI="http://firefly.vdr-developer.org/systeminfo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.7"
-
-RDEPEND="sys-apps/lm-sensors
-		app-admin/hddtemp"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	if has_version ">=media-video/vdr-2.3.1"; then
-		epatch "${FILESDIR}/${P}_vdr-2.3.1.patch"
-	fi
-
-	# Makefile correction, .eclass fails in some Makefiles
-	sed -e "s:(VDRINCDIR):(VDRDIR)/include:" -i Makefile
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /usr/share/vdr/systeminfo/
-	insopts -m0755
-	doins "${FILESDIR}"/systeminfo.sh
-}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index fc56ab9cb459..384db52e2b08 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/grig/Manifest b/media-radio/grig/Manifest
index 55573935331e..dd93701bac6c 100644
--- a/media-radio/grig/Manifest
+++ b/media-radio/grig/Manifest
@@ -1,3 +1,3 @@
 DIST grig-0.8.1.tar.gz 621728 BLAKE2B 096ac037d3e5871e32bbb80669e2bafdf061c28c420362e26aea9f01f2e399a4cb769e65aa8261b0726444d08006495de13c62ca9d9e094c44fd8cb28b36a3f1 SHA512 84eda8db5d18324f26f0775483c8272296aad05dd75f0572c01a3c7af6dbd14bff7b98cc6a61fe3c43d25193866be4b3dafdc4e68dfc37217e88b53ca53266f9
-EBUILD grig-0.8.1.ebuild 651 BLAKE2B e1a16ee12970d9212e30571d1cfdf4338e3aec29beb53ada366ae1d5b198522d5cf352f3fcaf6a0cf5d38733027990f2423e8a665ea126e9b2aaccfe55f26d78 SHA512 0ccec0bdbb01a8f40bcd98a61c30e6b90673fb87f14524fae5b45d2cd2dff31f0354b70d69aef09b0e246d54237ebdb02a20030bab0d9465da4bec5358f0280e
+EBUILD grig-0.8.1.ebuild 653 BLAKE2B d206a2a2d1d58d40cc9d1071007fe1f3f4fe290e1c339a6517f74973ee82cce8394836d59fc1c7bb57f1d6aaa992e4d54b63966f420a0b428adf68a1dbbe47cc SHA512 faa93641e1a2c26a4358d4a54b90f7036728e44ac88a52a358b95f781fb04f8c06ec3d77d9a7af9182ac5a97aa469d1ccb0ca8818d17f0d13ad25b7112e60bd4
 MISC metadata.xml 332 BLAKE2B 79bcf349f891026edaa1a92ff783eec4e1800f8c5b86c8b500b799c5be8605f0c9fd150e623a70446b9637a78b93b12ec35b1b259dc64d672cbb2c1dcd416aca SHA512 4f7b94abe8a2e6106a68f77e32aac0156c5d138b2eda01d4cc3e1c51c3fc530c75992c0b6e901a083f98028d751876359c3e7d06465cabb5988174b5d28b4e9e
diff --git a/media-radio/grig/grig-0.8.1.ebuild b/media-radio/grig/grig-0.8.1.ebuild
index f290930b0ddb..198e5a7d5dd3 100644
--- a/media-radio/grig/grig-0.8.1.ebuild
+++ b/media-radio/grig/grig-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND="
 	dev-libs/glib:2
 	x11-libs/gtk+:2
-	media-libs/hamlib"
+	<media-libs/hamlib-3.4"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index 89d302ba2931..031b2b21c3e9 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,5 +1,7 @@
 DIST tucnak-4.21.tar.gz 3545924 BLAKE2B dabc9647e4fde5c8c3b3e9b2ee5f072ce6e85138c6a45f635c05dcf47763a39e191a6ac3d97e71b79d3913915126261f565f8e273cd257731e04bc5ab7956aab SHA512 73fe2e92a0db3a8e152cfc25bbaefdeec6fd7f11223d02eae6c1ac5526c02404e89ecd4f2f715e7fda1d72fd872fc240694ce674d57a95c03417cf59dbd6532c
 DIST tucnak-4.22.tar.gz 3547159 BLAKE2B 4a08bc0f7cfa5bbef6d367e7d5780707b6500bf35938ba38bab779ab68e379dd48f6f08146c042e10f2fe4eb7c6d807fef4a8c64ab4ddd8d4fff25f9a0765436 SHA512 d4ec3707137e7a79ede5722806f30f6442988b6cf79e15578978344d6f3dc978a4ef7bfff215458a65d7436e6344e7288c911e499ad3c03b9edb754cd390e2fc
+DIST tucnak-4.23.tar.gz 3550740 BLAKE2B 559f082e19dc22fb119ba6b075f83a49838347bde8856e22a90b9bfc66c8df17ef172967e0e6c4a88a3cfb7764ad36b6fe1a2dd18a9212d8c4637346a8616e7b SHA512 febd5daf943ec4428fe4d77542e20a47d69b017d345aff00ee7e0aca0cc287cf0f1abf3f858051e23aa8d0dffa4146b22fbdb5813d97debb902b91fd99dcd50a
 EBUILD tucnak-4.21.ebuild 1966 BLAKE2B b1572e6f1747fb61b72ddb6902f9a8bb35d348ca3270c9778184de1a39f9f10c1406c02843f5da5a53428fb2aa0e42bf7305fa3062df6e159e8a28fa71e6599b SHA512 c42d8fc7d31bfaf3cc14d1e3ec68e74580fa56b1d26006882c10d4c457ab4f12519954899eccb47cc9d42734dec50f5f5ceb3bcc0db94e36d37276a2be505147
 EBUILD tucnak-4.22.ebuild 1968 BLAKE2B a5eab8af37cdd38ea0b0f9b0c4da56a7a137c64e1448d986a5a5078d13674bee0eeb48064d3d415f708a9edb3ae8a97f8a946de4d829d4a6931294c43b806af8 SHA512 8143e9ab2b5abaaa2d31b215fbd9b26bf2d28f848ef707caea24378d08d0799b4cf477bb9a5d15b06e0617bb7a21c5a3d5ba35bde1e58735102d517781a06896
+EBUILD tucnak-4.23.ebuild 1968 BLAKE2B a5eab8af37cdd38ea0b0f9b0c4da56a7a137c64e1448d986a5a5078d13674bee0eeb48064d3d415f708a9edb3ae8a97f8a946de4d829d4a6931294c43b806af8 SHA512 8143e9ab2b5abaaa2d31b215fbd9b26bf2d28f848ef707caea24378d08d0799b4cf477bb9a5d15b06e0617bb7a21c5a3d5ba35bde1e58735102d517781a06896
 MISC metadata.xml 408 BLAKE2B 80978177d2257cefae04860fc52e43ea7f0d2221bf4a5b3050fe8057acda81625117b1ba74e7357d40d00cc7fbd44f2dac713494cd8d20679c690cf851e1b678 SHA512 ad015a404c42d5cd0f160907400f545698045bb6c7c3da59816830ec6ed51938a02988c59d4a9ade472a78fd39feeb49ebe6c2a9c625e535a37e44bf19db1b17
diff --git a/media-radio/tucnak/tucnak-4.23.ebuild b/media-radio/tucnak/tucnak-4.23.ebuild
new file mode 100644
index 000000000000..b4c1192a2e40
--- /dev/null
+++ b/media-radio/tucnak/tucnak-4.23.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic multilib
+
+DESCRIPTION="Amateur Radio VHF Contest Logbook"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa fftw gpm hamlib suid"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libzia
+	media-libs/libsndfile
+	>=media-libs/libsdl-1.2
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( sci-libs/fftw:3.0 )
+	gpm? ( sys-libs/gpm )
+	hamlib? ( media-libs/hamlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	# fix destop file
+	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
+	# fix doc install path
+	sed -i -e "s/docsdir/# docsdir/" \
+		-e "s/docs_DATA =/# docs_DATA/" \
+		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/hamlib
+	econf $(use_with alsa) \
+		$(use_with gpm) $(use_with hamlib) \
+		$(use_with fftw fftw3)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
+	if use suid ; then
+		fperms 4711 /usr/bin/soundwrapper
+	fi
+}
+
+pkg_postinst() {
+	elog "In order to use sound with tucnak add yourself to the 'audio' group"
+	elog "and to key your rig via the parport add yourself to the 'lp' group"
+	elog ""
+	elog "tucnak can be used with the following additional packages:"
+	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
+	elog "                             (No need to recompile)"
+	if use suid ; then
+		ewarn "You have choosen to install the little helper program 'soundwrapper'"
+		ewarn "setuid by setting USE=suid. That helper is only needed if you"
+		ewarn "want to use morse sidetone output via the PC speaker."
+		ewarn ""
+		ewarn "While the helper should be safe by design be aware that setting"
+		ewarn "any program setuid is a security risk."
+	fi
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index da21bdf11d8f..86ef229ae9a3 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index 1c92f9bd85db..6f60951bb82e 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -2,5 +2,7 @@ AUX aqualung-1.0-ar.patch 505 BLAKE2B 957845ed9bbe2f9e7ee99209319cf7a438dc693611
 AUX aqualung-1.0-ffmpeg3.patch 1148 BLAKE2B 777233c3c3aaa4921a102e480c31db9533d17316de566f7cb6439b4b9980cc4ab6c6992760a6571cede3b0eae0b1afedd38849b708a7c67f590d7bbf04b05d11 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985
 AUX aqualung-1.0-gcc10.patch 2199 BLAKE2B da146d5a6e3272ba1aa6a7ab4b77c330a54f7a070946e70d4cdc34bb09b5d41d27b2cca60cf81acdf4d7ca679c8c3d9b6e0ca7589cb47ce14883ebfacbc02e4e SHA512 b1c81ce1b27f4eba729aeae7084bdb2a435b06bacf00a003130682108a6a559129713d526a6eaa7f399b5acc9d8c6bdcde91b105cc924f763743d5a1dc9fa520
 DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
+DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece SHA512 77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
 EBUILD aqualung-1.0-r5.ebuild 2510 BLAKE2B 569242aeec1453ccbf040cc826847f27fac5e7e191054057308bf5b912d971a8b008020b7da76faf2bc225b38bae2b1533855bd909843ad2c813819350183f26 SHA512 f6d69930280c3d0068b1a960ccc8e968b2e9d476d4934edb94cc332f10ef805c834a12f062ec8567f839bb8663ce9d563c4deca51cafd800c48ddb7a6569e1c4
+EBUILD aqualung-1.1.ebuild 2337 BLAKE2B 3a5942269484135d29fabbff4dd86251f93768eb334ae33601a35b1fb7d89a251719a1e76fbba475495b971abca06999e3b82c78c42515ef003163ea55ad1ffc SHA512 578f8dcb316c739e383f102f67cba3159b2d7192b5e4064fc40e6fb284f82090683f377b949350bcf6d963cca33e68db0654f1c8fd34c97be4c5b6348527bd2a
 MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566
diff --git a/media-sound/aqualung/aqualung-1.1.ebuild b/media-sound/aqualung/aqualung-1.1.ebuild
new file mode 100644
index 000000000000..ea7f3d62f5a9
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop xdg
+
+DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
+HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
+SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
+	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
+	vorbis wavpack"
+
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/libxml2
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	alsa? ( media-libs/alsa-lib )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	flac? ( media-libs/flac )
+	ifp? ( media-libs/libifp )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lame? ( media-sound/lame )
+	libsamplerate? ( media-libs/libsamplerate )
+	lua? ( dev-lang/lua:0= )
+	mac? ( media-sound/mac )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( media-libs/libsndfile )
+	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		--enable-loop \
+		--enable-nls \
+		--enable-transcoding \
+		$(use_enable debug) \
+		$(use_enable podcast) \
+		$(use_enable systray) \
+		$(use_enable jack jack-mgmt) \
+		$(use_with alsa) \
+		$(use_with cdda) \
+		$(use_with cddb) \
+		$(use_with ffmpeg lavc) \
+		$(use_with flac) \
+		$(use_with ifp) \
+		$(use_with jack) \
+		$(use_with ladspa) \
+		$(use_with lame) \
+		$(use_with libsamplerate src) \
+		$(use_with lua) \
+		$(use_with mac) \
+		$(use_with modplug mod) \
+		$(use_with mp3 mpeg) \
+		$(use_with musepack mpc) \
+		$(use_with oss) \
+		$(use_with pulseaudio pulse) \
+		$(use_with sndfile) \
+		$(use_with speex) \
+		$(use_with vorbis vorbis) \
+		$(use_with vorbis vorbisenc) \
+		$(use_with wavpack)
+}
+
+src_install() {
+	default
+
+	newicon src/img/icon_64.png aqualung.png
+	make_desktop_entry aqualung Aqualung
+}
diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
new file mode 100644
index 000000000000..a8bcdd79998d
--- /dev/null
+++ b/media-sound/deadbeef/Manifest
@@ -0,0 +1,4 @@
+AUX deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch 492 BLAKE2B d6ed36829d7ed139c43b6aa65c940f07e3f023d0554c258a2557c528d75e85c7dd2ca57eecef56088383a3b7b0b4f12109eb899f2847b86953421e826777c954 SHA512 0cec1ae38cf48b3f2ea53f74a6348d0217b1b3f017b836489d5b520f09ad76b6526cd3add48ed23871bc86feb7f7ed697cf6a62164a202be1ecabfd947e895f6
+DIST deadbeef-1.8.4.tar.gz 13049446 BLAKE2B a6c052b3b0aa1f74b49cf29be94e235d3dfd3d3f07ed9e1d05a4fc32036e591633eaff4ab59329cf6895828c9a674eec86b62e4818784db5f8e47eed089c80eb SHA512 18c54ae2c7931419ea06f3eb581cc8e704fa6eb87d330fc09f7295f4a8ef6e88b6f8c314223c34c321cd2a54f14cb6911add41602250c39c1b1c1edbf64d63b7
+EBUILD deadbeef-1.8.4.ebuild 3575 BLAKE2B 22b289febffb22363c8d6d0e9b32f451c153d57c256db546a2f783a4df7f79372b1b8ff8cecc2f07036082cb81c596ae55686b5df7238fce7790dacfbb7c2c3c SHA512 89f78f2bcea5c02a101e99d19c6d11dcf1e1b8e457234034440af104d3868de8924eee3c0652c9aac8a744cde587a8dc8657f375a6d4b289f0ef91d8024cd1de
+MISC metadata.xml 832 BLAKE2B e062743afe851439a7ac29e3547e0296a7a00b6ed93d875f8725de185e5ce6b677432fd039257887b47b294d692de2f0ccb6cf9112a2c843d443ecb528b82cd6 SHA512 96aaed52c8959177be8a6d7ad30266cb8a73475119c27ec734dbab0126d19a139a3d513323d0020c42dae822cb12344959f4b9440c01f8ddd578b8dbd1241aca
diff --git a/media-sound/deadbeef/deadbeef-1.8.4.ebuild b/media-sound/deadbeef/deadbeef-1.8.4.ebuild
new file mode 100644
index 000000000000..aae8086f9092
--- /dev/null
+++ b/media-sound/deadbeef/deadbeef-1.8.4.ebuild
@@ -0,0 +1,165 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg l10n
+
+DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
+HOMEPAGE="https://deadbeef.sourceforge.io/"
+SRC_URI="https://github.com/DeaDBeeF-Player/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis"
+
+REQUIRED_USE="
+	|| ( alsa oss pulseaudio nullout )
+"
+
+DEPEND="
+	x11-libs/gtk+:3
+	net-misc/curl:0=
+	dev-libs/jansson
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	cdda? (
+		dev-libs/libcdio:0=
+		media-libs/libcddb
+		dev-libs/libcdio-paranoia:0=
+	)
+	cover? ( media-libs/imlib2[jpeg,png] )
+	dts? ( media-libs/libdca )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	mp3? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	nls? ( virtual/libintl )
+	notify? ( sys-apps/dbus )
+	opus? ( media-libs/opusfile	)
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
+)
+
+src_prepare() {
+	default
+
+	drop_from_linguas() {
+		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
+	}
+
+	drop_and_stub() {
+		rm -rf "${1}"
+		mkdir "${1}"
+		cat > "${1}/Makefile.in" <<-EOF
+			all: nothing
+			install: nothing
+			nothing:
+		EOF
+	}
+
+	l10n_for_each_disabled_locale_do drop_from_linguas || die
+
+	eautopoint --force
+	eautoreconf
+
+	# Get rid of bundled gettext.
+	drop_and_stub "${S}/intl"
+
+	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
+	for i in adplug alac dumb ffap mms gme mono2stereo psf sc60 shn sid soundtouch wma; do
+		drop_and_stub "${S}/plugins/${i}"
+	done
+
+	rm -rf "${S}/plugins/rg_scanner/ebur128"
+}
+
+src_configure () {
+	local myconf=(
+		"--disable-static"
+		"--disable-staticlink"
+		"--disable-portable"
+		"--disable-rpath"
+
+		"--disable-libmad"
+		"--disable-gtk2"
+		"--disable-adplug"
+		"--disable-coreaudio"
+		"--disable-dumb"
+		"--disable-alac"
+		"--disable-ffap"
+		"--disable-gme"
+		"--disable-mms"
+		"--disable-mono2stereo"
+		"--disable-psf"
+		"--disable-rgscanner"
+		"--disable-sc68"
+		"--disable-shn"
+		"--disable-sid"
+		"--disable-sndfile"
+		"--disable-soundtouch"
+		"--disable-src"
+		"--disable-tta"
+		"--disable-vfs-zip"
+		"--disable-vtx"
+		"--disable-wavpack"
+		"--disable-wildmidi"
+		"--disable-wma"
+
+		"$(use_enable alsa)"
+		"$(use_enable oss)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable mp3)"
+		"$(use_enable mp3 libmpg123)"
+		"$(use_enable nls)"
+		"$(use_enable vorbis)"
+		"$(use_enable threads)"
+		"$(use_enable flac)"
+		"$(use_enable supereq)"
+		"$(use_enable cdda)"
+		"$(use_enable cdda cdda-paranoia)"
+		"$(use_enable aac)"
+		"$(use_enable cover artwork)"
+		"$(use_enable cover artwork-imlib2)"
+		"$(use_enable cover artwork-network)"
+		"$(use_enable dts dca)"
+		"$(use_enable ffmpeg)"
+		"$(use_enable converter)"
+		"$(use_enable musepack)"
+		"$(use_enable notify)"
+		"$(use_enable nullout)"
+		"$(use_enable opus)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable shellexec)"
+		"$(use_enable shellexec shellexecui)"
+		"$(use_enable lastfm lfm)"
+
+		"--enable-gtk3"
+		"--enable-vfs-curl"
+		"--enable-shared"
+		"--enable-m3u"
+		"--enable-pltbrowser"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/deadbeef/files/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch b/media-sound/deadbeef/files/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch
new file mode 100644
index 000000000000..82a979a5c179
--- /dev/null
+++ b/media-sound/deadbeef/files/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
+index da137069a..43cdcb301 100644
+--- a/plugins/ffmpeg/ffmpeg.c
++++ b/plugins/ffmpeg/ffmpeg.c
+@@ -75,7 +75,7 @@
+ static DB_decoder_t plugin;
+ static DB_functions_t *deadbeef;
+ 
+-#define DEFAULT_EXTS "aa3;oma;ac3;vqf;amr;tak;dsf;dff;wma;3gp;mp4;m4a"
++#define DEFAULT_EXTS "aa3;oma;ac3;vqf;amr;tak;dsf;dff;wma;3gp;mp4;m4a;ape"
+ #define UNPOPULATED_EXTS_BY_FFMPEG \
+     "aif,aiff,afc,aifc,amr,asf," \
+     "wmv,wma,au,caf,webm," \
diff --git a/media-sound/deadbeef/metadata.xml b/media-sound/deadbeef/metadata.xml
new file mode 100644
index 000000000000..a0345ca21308
--- /dev/null
+++ b/media-sound/deadbeef/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>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">DeaDBeeF-Player/deadbeef</remote-id>
+	</upstream>
+	<use>
+		<flag name='converter'>File format converter</flag>
+		<flag name='cover'>Support for cover art</flag>
+		<flag name='hotkeys'>Keyboard shortcuts support</flag>
+		<flag name='lastfm'>last.fm/AudioScrobbler protocol support</flag>
+		<flag name='notify'>Desktop notifications support</flag>
+		<flag name='nullout'>Dummy output driver</flag>
+		<flag name='shellexec'>Define custom shell commands that can be called on tracks</flag>
+		<flag name='supereq'>Enable equalizer</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 148914c1f98d..03c469550adb 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,5 @@
 DIST elisa-20.04.3.tar.xz 1409336 BLAKE2B a1432294cb46562145ecb6f41b07a8a1ae352abffd40253670ef17b79e27b221b2589bf14934a7ce4e0001f90e84a0889a1b0c4dd069101e2e614f1fc51a20cc SHA512 00afa92eaab736f5f38759a3076b9f579ee3f5fce84404042a73e11cdfe0e004b32a83f9e542ca6d0a962d66bcb3fcce9d12fc5dbdd8f937d9d4cea9321687b4
 DIST elisa-20.08.1.tar.xz 1634492 BLAKE2B 2ea1f8eb1c6e20d7b0e383fc660af2605a30f174110f0ece059d4c063e62811ae8c0ff89225429c00977633d29315e5bbb89e7207a2ca4c6c49fb450fdf25ab2 SHA512 a273fe799c701f1acad3966b382189aa69448ee5b0532ea7c47744f0a350c0125193a49d6a100efd448cfcbc878fb45c6fbc248d9135155fad5fac554b673c93
-EBUILD elisa-20.04.3.ebuild 1677 BLAKE2B 416386698e6beed682083a764e8e93c42ba8f8cefe726009f4772e179dff413a6e9b79b431391216bda5821b7ab42cb3ddde7fc0cd02d4d61fdde66e8214bcc6 SHA512 0e2c57bafd58f7d15a8aa48feb1aff042390a7fb62a6b0704aea1db3fd2e39f4c9852eb3992d391a6562bc824f94db9a41bf06542856c6ea551a3fef18cdadfc
-EBUILD elisa-20.08.1.ebuild 1689 BLAKE2B 610f4e537a77f4a57bc182e0be48fb730ddc2327e3e8dc5d7907f62507ecb3228411d7efc73ef69081935ff1c453ee36282147287c5164c546df8ee2649bf337 SHA512 4c045967e2dccd96f2fca0ff2cc104daecfc8ffe988167fe7a86912e33216696c9c796069c2fee71a59bea0e5c1eb5933990485fc8d6cf3a67d5f56a7d3f5519
+EBUILD elisa-20.04.3.ebuild 1652 BLAKE2B a9a35dfbe3892ccf19a15195236fc0c26fecc770c5ad0ab9471506bcca11eeb696f6b8670d558b14901c6a01f4d4c054c6930d07f5e57d933479a33ec0acd42f SHA512 1dd4cf67f5fe799e5c60daa24a77510c3172f7e9779ea57d33d5045acbc2b3c6e7006bc850bb105d7e76d65f403c43619b1ca91f12ee2c83203108a62e2d1673
+EBUILD elisa-20.08.1.ebuild 1664 BLAKE2B 1cbb080fa448357801a6d6f8ba0ba3236673b6f2f2e198e21c2966b8080379b6b56f385c6b5bc4df0b1ea33ea0e5b809bd77c05714989bec79a14a43b5c79d46 SHA512 acf9ca4b313fdc6c48023acb8d615570ddaf2e626e4afa8aa9725c089115eb09e135fc42479bdcb57563812b6eba3ca4f062b47996a47433f67ee2bbfacd25c3
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-20.04.3.ebuild b/media-sound/elisa/elisa-20.04.3.ebuild
index 4f1b4d807e97..08fe72fcd012 100644
--- a/media-sound/elisa/elisa-20.04.3.ebuild
+++ b/media-sound/elisa/elisa-20.04.3.ebuild
@@ -11,8 +11,7 @@ QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.elisa
-https://community.kde.org/Elisa"
+HOMEPAGE="https://elisa.kde.org/ https://kde.org/applications/en/elisa"
 
 LICENSE="LGPL-3+"
 SLOT="5"
diff --git a/media-sound/elisa/elisa-20.08.1.ebuild b/media-sound/elisa/elisa-20.08.1.ebuild
index a3e77d8776db..9eecd3942ffb 100644
--- a/media-sound/elisa/elisa-20.08.1.ebuild
+++ b/media-sound/elisa/elisa-20.08.1.ebuild
@@ -11,8 +11,7 @@ QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.elisa
-https://community.kde.org/Elisa"
+HOMEPAGE="https://elisa.kde.org/ https://kde.org/applications/en/elisa"
 
 LICENSE="LGPL-3+"
 SLOT="5"
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 02945f788fb1..3832270188db 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1,5 @@
 DIST kid3-3.8.3.tar.gz 3091795 BLAKE2B 245009d074c4b0734ee9fd39eb796e2679c416915e03773ca4f6fe7d570e17fefc73eaaaa03f4c42a3d81c2f2c4778b500bc8dfdff0a0cf07293d39571b8ab9f SHA512 5381c76b032e30b4a6382d160406f5ed75915c0e23bed62b3070dd875a1c812f907a7ecae833b82753fd2372f96d460b17a879ca9043c3786109074391199a5a
+DIST kid3-3.8.4.tar.gz 3161673 BLAKE2B 0055805bd0470bd000549c970c69cf911eb12d0ca291985759d0ebc2b6aa7394c65a72193606a4730136eeafef7a3d7a21822e998f2d841caa0a23c424a1f906 SHA512 c5abef6b0b7b4cfe606aa547563efff77f70b06770ea8423ed2cb25099a5c015e5de4badf5e87e080b05926459423584bd747aa3e475393026d92f6d73c9782a
 EBUILD kid3-3.8.3.ebuild 1759 BLAKE2B eaf9e42b64cdb1e82e80bbda06cbba78698457787894313f7f1a591ae247d59f1cf2cee27559903cdfc1aca44ada970727d4e98cdaa64d8121147ab59d4a4dd4 SHA512 bb5bf320186a277d31ba6e97c7c774adda87e8dd51a6c6b4f44dc20a4e10f4d5d1bc97262be8f096e978913f4d740e7f213d8dc2a63a1f6aa6eb5cef3854cb6a
-MISC metadata.xml 737 BLAKE2B eec3a25f3041a1174f4d43780344e5dcee09313461e18ecc7ad94400858d84e406934ee5924318539547ead7ad0dfc98af87e333cc62b2653a675598c15d9694 SHA512 6d4dc69756971b2db5d12116db5644b9cda51ea44f06b6e840246ca1d1cc0f53ed37240a1b71e6bd8b3cf6f31975ed9b5ec2a4f7d6a9d0d3dc5130259fce98b1
+EBUILD kid3-3.8.4.ebuild 1784 BLAKE2B 515b193d147282df1e7817c5381dcd2d04d89c611ca13ee0a2e3c9f38785a502b08e52c72465a813fc342593b85504c5091481e57c81b410b9b4f115f4ac6f8e SHA512 377a24fe14a021b31cb3911dcc7410a952be40797d0bc6332b97dbc1fae3f20058fcfbd8fd224418c724d5b07f7b568593c09983487ed42ccc36aafcf56ebac4
+MISC metadata.xml 581 BLAKE2B aaf7af21490a043596d92081040312887a687778836e126b6057db01eaf8bae1bb677ebdf2513bf5ab36f7ad95a7327315de3e42384915b7575d45ef1959e148 SHA512 6f4f92be39dd0099d1f762a07407e1fb6a75b9f0a7b01f0b60f7273eb1c04716e999633720b4535a7d42ea0ca447f8080377f00f93686c019baebfbce2cc25d8
diff --git a/media-sound/kid3/kid3-3.8.4.ebuild b/media-sound/kid3/kid3-3.8.4.ebuild
new file mode 100644
index 000000000000..fad5b2f8ed0e
--- /dev/null
+++ b/media-sound/kid3/kid3-3.8.4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde.org cmake xdg
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="https://kid3.kde.org/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="5"
+IUSE="acoustid flac kde mp3 mp4 +mpris +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/readline:0=
+	acoustid? (
+		media-libs/chromaprint
+		media-video/ffmpeg
+	)
+	flac? (
+		media-libs/flac[cxx]
+		media-libs/libvorbis
+	)
+	kde? (
+		kde-frameworks/kconfig:5
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2:0 )
+	mpris? ( dev-qt/qtdbus:5 )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${DEPEND}
+	!media-sound/kid3:4
+"
+
+src_prepare() {
+	# overengineered upstream build system
+	cmake_src_prepare
+	# applies broken python hacks, bug #614950
+	cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_DBUS=$(usex mpris)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_ID3LIB=$(usex mp3)
+		-DWITH_MP4V2=$(usex mp4)
+		-DWITH_TAGLIB=$(usex taglib)
+		-DWITH_VORBIS=$(usex vorbis)
+	)
+
+	if use kde ; then
+		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+	else
+		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+	fi
+
+	cmake_src_configure
+}
diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
index 17adb5fc18bd..ec4f401b5c32 100644
--- a/media-sound/kid3/metadata.xml
+++ b/media-sound/kid3/metadata.xml
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>kde@gentoo.org</email>
-    <name>Gentoo KDE Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <use>
-    <flag name="acoustid">Build acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
-    <flag name="mpris">Enable support for MPRIS2 interface using <pkg>dev-qt/qtdbus</pkg></flag>
-  </use>
-  <upstream>
-    <bugs-to>https://sourceforge.net/p/kid3/bugs/</bugs-to>
-    <remote-id type="sourceforge">kid3</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="acoustid">Build acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
+		<flag name="mpris">Enable support for MPRIS2 interface using <pkg>dev-qt/qtdbus</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 9b4b71730a1a..2d770a4fa60f 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,10 +1,8 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
-DIST mpd-0.21.22.tar.xz 679244 BLAKE2B d2d76662d1f249b138d3a173cdf712eafcebf91e819b70f2cbc6ccb36ca4bc1f2319972548445789d8861345af5e18ea82f071cd7874a7380bbdda85cf834b73 SHA512 051d97500d8224fe4769a667a58c7915eebcca809e9345a30881f99d7c33d99907d9cc0258c0a5fd20f10609edbeb6da16941099ac3c033762ceb4b116e4df04
-DIST mpd-0.21.24.tar.xz 681576 BLAKE2B 4fc46841077a4fd20c9e0f21bc3de09be0bc7d6b4964db33c51f8d79672c2911ab747d08e27d3f9ab65586594f8fd560d044048a826fcae5909e34067bbff592 SHA512 dd0f97cdb405a0995ceafb965d2e872c54b27b384a721efa8d13ae7e28544b22da9e94433bc544f475d8da52d06c020842b11104cbfbc41406a10599db2d005c
 DIST mpd-0.21.25.tar.xz 683768 BLAKE2B 9bc294850ddd2b5e1468d4988179f633c8fec14f7f99ffa2581d1aa30991a85ace8361a558e674f5c4b8e7471c9911dcb1286f61f1d42a2315ad05db4dfd9053 SHA512 67e0cbf176d18cd63effab0d12b22bea846458cbaa383ead9078c4b5f2a472dbb1d7308af4d6898691e8864a911c808af5ca2c553d8233323b8aaedfdc7189fc
-EBUILD mpd-0.21.22.ebuild 7988 BLAKE2B b0af2e073675581b9dba7441771a7332649eef6967a59f541c25cb4f4938a201a747e9a9fa03179d80c2d22b0c51b09800964bd1f8dba4fed7c449f8b94f0b26 SHA512 a22dedd01642892ec5c9f74a075e0c554069e167639acd28b73fca817d9b439303ad3c1271fc70942341a5187f72f63036d535dfb4973db291735989b3f95027
-EBUILD mpd-0.21.24.ebuild 7990 BLAKE2B 98503ddf2a9b0783bf4396740f897223227ae79cd3eb1eb4ed3390ccc31c5f589a3e92f8a2475625247cf2f05723123710917f56465378e02e160ec09aaca932 SHA512 f53f6b14b1cefcff81e862efc1cf86f23c9441627667ca64a648567d8cf297b7b7f61e8b6f9d63dac09995da59c94a1d0c2cc6b64c6738d3fdfbaeddae69bbb8
-EBUILD mpd-0.21.25.ebuild 7990 BLAKE2B 98503ddf2a9b0783bf4396740f897223227ae79cd3eb1eb4ed3390ccc31c5f589a3e92f8a2475625247cf2f05723123710917f56465378e02e160ec09aaca932 SHA512 f53f6b14b1cefcff81e862efc1cf86f23c9441627667ca64a648567d8cf297b7b7f61e8b6f9d63dac09995da59c94a1d0c2cc6b64c6738d3fdfbaeddae69bbb8
+DIST mpd-0.21.26.tar.xz 685396 BLAKE2B 176c75069190c8df79e5c0b37605abeafac2358dc1840ec66b2eecb809449cf0908b7a3af61c499e88d82b210c8907a752b4f006bcffb7c7d279cbdbc082032f SHA512 31eb5d42bcfc942116cb203d8b1ceb8489b46251204f7288d1e8d7e052ff4cab2c8b2087795cc8118c8b86f080613f80cb182163fcb1c5b5027053d53c5a594a
+EBUILD mpd-0.21.25.ebuild 7988 BLAKE2B b0af2e073675581b9dba7441771a7332649eef6967a59f541c25cb4f4938a201a747e9a9fa03179d80c2d22b0c51b09800964bd1f8dba4fed7c449f8b94f0b26 SHA512 a22dedd01642892ec5c9f74a075e0c554069e167639acd28b73fca817d9b439303ad3c1271fc70942341a5187f72f63036d535dfb4973db291735989b3f95027
+EBUILD mpd-0.21.26.ebuild 7990 BLAKE2B 98503ddf2a9b0783bf4396740f897223227ae79cd3eb1eb4ed3390ccc31c5f589a3e92f8a2475625247cf2f05723123710917f56465378e02e160ec09aaca932 SHA512 f53f6b14b1cefcff81e862efc1cf86f23c9441627667ca64a648567d8cf297b7b7f61e8b6f9d63dac09995da59c94a1d0c2cc6b64c6738d3fdfbaeddae69bbb8
 MISC metadata.xml 2473 BLAKE2B da637e3495141e79aec3a6a1d676c6d98440482e00c57b48efdd9d8a93185d7d093cd2544a2a31beb552ac31f3ea4be897a036b640d630a02f297bde6e2a9f29 SHA512 e7afe6339926473e212cdd9a5be5f4e72c47e78b7ed9839621a09b331c40b4a21312ba4f8fe4154c4cd88908d005af4f3eca17cd6407ea8d10e294775d19299d
diff --git a/media-sound/mpd/mpd-0.21.22.ebuild b/media-sound/mpd/mpd-0.21.22.ebuild
deleted file mode 100644
index a168f3877037..000000000000
--- a/media-sound/mpd/mpd-0.21.22.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info meson systemd xdg-utils
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
-	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	upnp? ( expat )
-	webdav? ( curl expat )
-	"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/mpd
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-
-	chromaprint? ( media-libs/chromaprint )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( media-libs/libshout )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tidal? ( dev-libs/yajl
-		net-misc/curl )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.58:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND=">=dev-util/meson-0.49.2
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
-
-pkg_setup() {
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-	sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbzip2=$(usex bzip2 enabled disabled)
-		-Dcdio_paranoia=$(usex cdio enabled disabled)
-		-Dchromaprint=$(usex chromaprint enabled disabled)
-		-Dcue=$(usex cue true false)
-		-Dcurl=$(usex curl enabled disabled)
-		-Ddbus=$(usex dbus enabled disabled)
-		-Ddebug=$(usex debug true false)
-		-Deventfd=$(usex eventfd true false)
-		-Dexpat=$(usex expat enabled disabled)
-		-Dicu=$(usex icu enabled disabled)
-		-Did3tag=$(usex id3tag enabled disabled)
-		-Dinotify=$(usex inotify true false)
-		-Dipv6=$(usex ipv6 enabled disabled)
-		-Diso9660=$(usex cdio enabled disabled)
-		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
-		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
-		-Dmms=$(usex mms enabled disabled)
-		-Dnfs=$(usex nfs enabled disabled)
-		-Dsignalfd=$(usex signalfd true false)
-		-Dsmbclient=$(usex samba enabled disabled)
-		-Dsoxr=$(usex libsoxr enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsystemd=$(usex systemd enabled disabled)
-		-Dtest=$(usex test true false)
-		-Dudisks=$(usex udisks enabled disabled)
-		-Dupnp=$(usex upnp enabled disabled)
-		-Dwebdav=$(usex webdav enabled disabled)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		-Dzlib=$(usex zlib enabled disabled)
-		-Dzzip=$(usex zip enabled disabled)
-		)
-
-	emesonargs+=(
-		-Dalsa=$(usex alsa enabled disabled)
-		-Dao=$(usex ao enabled disabled)
-		-Dfifo=$(usex fifo true false)
-		-Djack=$(usex jack enabled disabled)
-		-Dopenal=$(usex openal enabled disabled)
-		-Doss=$(usex oss enabled disabled)
-		-Dpipe=$(usex pipe true false)
-		-Dpulse=$(usex pulseaudio enabled disabled)
-		-Drecorder=$(usex recorder true false)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-
-	emesonargs+=(
-		-Dshine=disabled
-		-Dshout=enabled
-		-Dvorbisenc=$(usex vorbis enabled disabled)
-		-Dhttpd=true
-		-Dlame=$(usex lame enabled disabled)
-		-Dtwolame=$(usex twolame enabled disabled)
-		-Dwave_encoder=$(usex audiofile true false)
-	)
-	fi
-
-	emesonargs+=(
-		# media-libs/adplug is not packaged anymore
-		-Dadplug=disabled
-		-Daudiofile=$(usex audiofile enabled disabled)
-		-Dfaad=$(usex faad enabled disabled)
-		-Dffmpeg=$(usex ffmpeg enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dfluidsynth=$(usex fluidsynth enabled disabled)
-		-Dgme=$(usex gme enabled disabled)
-		-Dmad=$(usex mad enabled disabled)
-		-Dmikmod=$(usex mikmod enabled disabled)
-		-Dmodplug=$(usex modplug enabled disabled)
-		-Dmpcdec=$(usex musepack enabled disabled)
-		-Dmpg123=$(usex mpg123 enabled disabled)
-		-Dopus=$(usex opus enabled disabled)
-		-Dsidplay=$(usex sid enabled disabled)
-		-Dsndfile=$(usex sndfile enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dwavpack=$(usex wavpack enabled disabled)
-		-Dwildmidi=$(usex wildmidi enabled disabled)
-
-	)
-
-	emesonargs+=(
-		-Dqobuz=$(usex qobuz enabled disabled)
-		-Dsoundcloud=$(usex soundcloud enabled disabled)
-		-Dtidal=$(usex tidal enabled disabled)
-	)
-
-	emesonargs+=(
-		--libdir="/usr/$(get_libdir)"
-		-Ddocumentation=false
-		-Dsndio=disabled #not yet in the tree
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-Dtcp=true
-
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-		)
-
-	if use icu; then
-		emesonargs+=( -Diconv=enabled )
-	else
-		emesonargs+=( -Diconv=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	doman doc/mpd.1
-	doman doc/mpd.conf.5
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.21.25.ebuild b/media-sound/mpd/mpd-0.21.25.ebuild
index fda03cb33440..a168f3877037 100644
--- a/media-sound/mpd/mpd-0.21.25.ebuild
+++ b/media-sound/mpd/mpd-0.21.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/mpd/mpd-0.21.24.ebuild b/media-sound/mpd/mpd-0.21.26.ebuild
index fda03cb33440..fda03cb33440 100644
--- a/media-sound/mpd/mpd-0.21.24.ebuild
+++ b/media-sound/mpd/mpd-0.21.26.ebuild
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index b6fb25c20edb..5984e5b597ad 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,3 +1,5 @@
 DIST ncmpc-0.34.tar.xz 227892 BLAKE2B 19d9d9abe3d85cb2567a222c8ce108889d4517272e2bb82f4064ef76af68d610ff4c7516102b976f66380e0e3d3ee7ed00023116cb6b2d1628e3d38796705a09 SHA512 e206cc2d61799a97edf1182de4cee1c0fa447bd1fac136dc48670cb624a7efc903c693b0c541fbc00fcb94e055c83be1ca6370386c99131a1b571f47b67c35f4
+DIST ncmpc-0.39.tar.xz 242968 BLAKE2B 1b270ed52aa884cecd3e1ce60bb2ed628ef79480697f388b48a09e0f22068dbbb7623b01171e5cfae9556446e404530f93c84ca3c3d5cc481c8431f37786c2f4 SHA512 bfadc58bf8b66bff08608f561f689a50fd412b87975998ce23751fd312fa009eeba4b48b4afe96391b2ecb184c00c366262e9b96e24d2ce2ab2af6a4002721d9
 EBUILD ncmpc-0.34.ebuild 2019 BLAKE2B ee88c9f5ad907768299060708e08e40a8dbaa89e53216bb250baf8b576a107af68aa13e27d7e7c16a6ae537d62dc9bbd6149cf40590bf45369cf4498bfe9ccd6 SHA512 a573e412cbfc51bbbe3b1f1a38b95521cc22e151247c2f78cf67e63b3aa46e1a19926954b68fbdcdda8fad441b224e9a67100885c2f183e6ba2101fd2757d76d
+EBUILD ncmpc-0.39.ebuild 2023 BLAKE2B e59c9883bab2ea245c4ffea0c1b714ac914fc91af2840762d99994e8e175c0c577153eef3e447dc8f5aa0d3635d39c98e0c7b26d318e8216e1ef6dae9111d814 SHA512 b78020dc31e6edf60c8ee017b406bd61ce6985a2067dfe01de15a66dd84e153f2fea76e6e0cc492bfddd97d5a3afc4b03372419d3bf2320d05e1617b8c3fc8c6
 MISC metadata.xml 947 BLAKE2B de28ab3a9263d21b8a2727fb80a70467d4c086c18712bcc6ee51c434f512a7daab42832728a150a677a4552f36950038e08076fd2c1eaf0ec5c2f7e82408efed SHA512 19a555b3375402a4ff9931e2d1c17bb3146d963f3c4665216e9e63deb61b99313267eb9e3815aa9f6d3f4dabee1734131b9ee71ff41562b7e9aa881fe10b1760
diff --git a/media-sound/ncmpc/ncmpc-0.39.ebuild b/media-sound/ncmpc/ncmpc-0.39.ebuild
new file mode 100644
index 000000000000..cad4074e5d6f
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.39.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+RDEPEND="
+	>=media-libs/libmpdclient-2.9
+	sys-libs/ncurses:0=[unicode]
+	lirc? ( app-misc/lirc )
+	pcre? ( dev-libs/libpcre )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.62
+"
+
+src_prepare() {
+	default
+
+	# use correct docdir and don't install license file
+	sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+		-e "s/'COPYING', //" \
+		-i meson.build || die
+
+	# use correct (html) docdir
+	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
+		-i doc/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcurses=ncursesw
+		-Dcolors=true
+		-Dmini=false
+		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
+		-Dasync_connect=$(usex async-connect true false)
+		-Dchat_screen=$(usex chat-screen true false)
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Dhelp_screen=$(usex help-screen true false)
+		-Dkey_screen=$(usex key-screen true false)
+		-Dlibrary_screen=$(usex library-screen true false)
+		-Dlirc=$(usex lirc enabled disabled)
+		-Dlocale=$(usex nls enabled disabled)
+		-Dlyrics_screen=$(usex lyrics-screen true false)
+		-Dmouse=$(usex mouse enabled disabled)
+		-Dmultibyte=$(usex nls true false)
+		-Dnls=$(usex nls enabled disabled)
+		-Doutputs_screen=$(usex outputs-screen true false)
+		-Dregex=$(usex pcre enabled disabled)
+		-Dsearch_screen=$(usex search-screen true false)
+		-Dsong_screen=$(usex song-screen true false)
+	)
+
+	meson_src_configure
+}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 9b62dfceda6c..fdbabf21abc8 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,6 @@
 DIST picard-2.3.1.tar.gz 3778379 BLAKE2B b829c29d95922e31479cea0c8bcb3294cd3751374e71f37d387a013529c294a695a2e2f4c8b73af5eeee2fa8f7423d24074bc18b7db130798411803c70a013ff SHA512 fb5ac4cbd02f4b832cb23e3c8b5881eeca04b7b101c015a97fc20c8e0e7871ad2098b750a0c486af958b2bf30221b0c28666313f768dc7d70389519dd795d9cd
 DIST picard-2.4.2.tar.gz 4096438 BLAKE2B a44e82ac1a0ad776eb371309ad13f0a5e9afe4a0fe8b898dbbcb71ac554da3ff7cf4a2d88a8e476c811dfeb515ca7371ca8effb326b9285e6c53ebeac6795c15 SHA512 17f6015dd06a1282e6dc216726a74cc7bf2a54a5694e09e2d7ae6f1b4c85f2f60f3de1218d952fa2c4e088b3330d1fd12e4b41cf819d7c3d2d96278532338e15
 EBUILD picard-2.3.1.ebuild 1703 BLAKE2B 5a07646e7724a53aac11788c96938cb7b1bd0993637c1dac9915b93e1e6575fbea4a39b8b50f1aa2b951d72e62bc6f1e7eddf74f3a850812b7a521dcf4b67c2d SHA512 544e58c3e617592ec0827eaee0f2dc47f79bfd03f3c71f2542fe05339d25c8ecc05c32424e4c25fb2334c3f77488f040796ef2332910036514401afbdfc08947
-EBUILD picard-2.4.2.ebuild 1577 BLAKE2B 550fc9aee8118ccd7bf0a6cc622c42cd38fdcc479aa2b5dca84ba934c5c1bea2544cf863bc5572a51024ab0f91842c270f164c42f7aa4a693c56d367f7d4e430 SHA512 77f7a5f2045e79026c2ee10da9c1b9bd7e26dfd5733530b766823bb974f0b0e54964c107f5c99a72522dba48993dcac349aae0a80896d4d59f0f87da27d230ca
+EBUILD picard-2.4.2.ebuild 1576 BLAKE2B 530f5650644056918559c1d7bd017447c7e88c81906c223c1a1dee5a32232820c0629300f9f1f0570b154039732b6546b3b6bc5fbe213d6594d5133e6d328cb4 SHA512 c7d0ed462bb8f99b1ee6f68c42c537e3583bfc2e9f7600d4cf3dcf2568e4c7e0f4c2da1872de794d9276389c085d2da25d575234c683864087ccb3e3217c3821
 EBUILD picard-9999.ebuild 1577 BLAKE2B 550fc9aee8118ccd7bf0a6cc622c42cd38fdcc479aa2b5dca84ba934c5c1bea2544cf863bc5572a51024ab0f91842c270f164c42f7aa4a693c56d367f7d4e430 SHA512 77f7a5f2045e79026c2ee10da9c1b9bd7e26dfd5733530b766823bb974f0b0e54964c107f5c99a72522dba48993dcac349aae0a80896d4d59f0f87da27d230ca
 MISC metadata.xml 739 BLAKE2B 1b941561bb90cc463005e0e706bf53c9d8973aa1961a93e30ffda627922dfc4f05840392893c44767363588d729f7bdd6bea77a7540bead1b3a77a2306006f1c SHA512 94e546f23ab99e5a75e15e18d3f4b1aff2c02099b2202c1d566f92fe6043891c9c2609832bf8fdb48c330fd954555e574dd84be50591a6cfb571ea81e7c20fc5
diff --git a/media-sound/picard/picard-2.4.2.ebuild b/media-sound/picard/picard-2.4.2.ebuild
index 511feea537f9..9e90f652f615 100644
--- a/media-sound/picard/picard-2.4.2.ebuild
+++ b/media-sound/picard/picard-2.4.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi
 
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index fbb2741b2b10..02caf82a5ce2 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,8 +1,6 @@
-DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
-DIST qmmp-1.3.7.tar.bz2 1250192 BLAKE2B bb94234beefbe44606d8db8cc95bd712b4c766d498c1de0549414b728fd9eb88e238bcffde9a3bd74e75adf106b6bf4fcb120547a83892c0bca8da17bf18f2ee SHA512 a67185fcdc7419c8542e64fd54eea3302dcf44c5d8d0c3b739ce3115b00811733234807460d39585ee57b7e105a52285ee3aafa9f24d86d2af09e881ebf2e068
 DIST qmmp-1.4.1.tar.bz2 1296224 BLAKE2B 4a4b72f30bbfb06d312d69c9c0d48fcaaed2d936453ab29c0bd5223819358d2894f4f016a8203c2ea15b7a193b811ae2892e700dec98e580393a9fbf5e0f767c SHA512 af971447383730328e33dc724b9d598a26404517d5aa6e8bb5a2d84bbeb1f628d363383bb5ddc571855d8416b084edd09f64174de7985788671e47317ec9f1bf
-EBUILD qmmp-1.3.2-r1.ebuild 4207 BLAKE2B 3da46dab28fbf9747f35cefae578dcc3b407abc2c5b032060e7eb8a401911ab5f4a798932e42e82fd2967e45ee4af90aa7d7d63b0455a468c2bca50a4dbffb7a SHA512 4d8eb5669edde5f39c4a0212f4bda8704606f3c995996c6660d97ca2711bd63af80e88c08e666d09b09853684ec26506b432d4242a09c38bb5c8d6e140abfb51
-EBUILD qmmp-1.3.7.ebuild 4181 BLAKE2B b3bec00895515fda32c1cafb6c261fcfc9408176e865f3629189e7bfbca5269661fab298466ce1185a41c54f29b5a1e2d9e69eed8378eee25e733d84405b6c1c SHA512 83b77d61fe775d1b4d4f475cb49a9c48eadd366a7e09b11fd8244afaecdf4b355afeed0dad9aedcbbd1472e790b212c6a1c2e2094bd171c10509485d795e68bc
-EBUILD qmmp-1.4.1.ebuild 4052 BLAKE2B e5ffcda6a84276bb0321c1a08de1e251520c4e85ec04a3a82611055ab765dd9f9352cb69f122df25774a36f72bb1adaf00ac945e3c610f3a5bdfa344370e241b SHA512 5926af39c102f98b0dfc979a402ede1e7089d3b9dc608fa64a3775aeb8a04058069f23d7ddaaf8589e764ca0070cac078adb8c8f7d2e0c8c0e9ea46f31ee7eda
+DIST qmmp-1.4.2.tar.bz2 1295867 BLAKE2B ce282f543dc6b14ccd027aa9a4ad85f190a8aee149049798ad5e51bf944cd34ce7773dcfb7b6ea4bdf0a8a69baea430802f04de631e9b12b68d2d23a8c599461 SHA512 00ed0c4bd74dc50294c9d8e717f249a577fb26f5d4eb93dbc42c6c79964188fd885ab577904dea5aec31db0d2b828d7038febca1ffdfd2f4bfe81f931bbed7ff
+EBUILD qmmp-1.4.1.ebuild 4049 BLAKE2B a8fec81aa1ae3d48da3785ad3d053a7f6e0dacc7b34fe0a4e6946f8e56df3677045617f92b4cea827682bdca444ae0bcbca4b14e4281b5df1459dab0548787f5 SHA512 aff0ba05f9d2ee7eba8563888827a1f74d9b0f44e13325ea9358231efb0ef9b7ae459327a8652aecdfe7b633bdf133eab552a55938c4df0275ec82b693c05655
+EBUILD qmmp-1.4.2.ebuild 4051 BLAKE2B 929ab4d9ce347da133a2a2361279d3dee81def809c3513de8cdc3c8ebcb5fc936829583141fc2f51f62eb49e6790a68fad62de0a327dc5de4f08d390ec04d261 SHA512 bca26cdc36d0a35003603930eb4ec8f356084c7acee01cf87492d7765d75aabb72eb247202c0bb235e53f7999e82567f60e6b514c84bdb444beab5309545dc65
 EBUILD qmmp-9999.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.3.2-r1.ebuild b/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
deleted file mode 100644
index ac37a740c308..000000000000
--- a/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-[[ ${PV} = 9999 ]] && inherit subversion
-
-DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
-		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-else
-	QMMP_DEV_BRANCH="1.2"
-	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="
-	gnome? ( dbus )
-	shout? ( soxr vorbis )
-	udisks? ( dbus )
-"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/taglib
-	x11-libs/libX11
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:5 )
-	enca? ( app-i18n/enca )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit
-	)
-	ladspa? ( media-plugins/cmt-plugins )
-	mad? ( || (
-		media-libs/libmad
-		media-sound/mpg123
-	) )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	mplayer? ( media-video/mplayer )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	projectm? (
-		dev-qt/qtgui:5[-gles2-only]
-		dev-qt/qtopengl:5
-		media-libs/libprojectm:=
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
-	scrobbler? ( net-misc/curl )
-	shout? ( media-libs/libshout )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_ARCHIVE="$(usex archive)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FILEWRITER="$(usex vorbis)"
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
-		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
-		-DUSE_PROJECTM="$(usex projectm)"
-		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
-		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
-		-DUSE_SHOUT="$(usex shout)"
-		-DUSE_SID="$(usex sid)"
-		-DUSE_SNDFILE="$(usex sndfile)"
-		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/qmmp/qmmp-1.3.7.ebuild b/media-sound/qmmp/qmmp-1.3.7.ebuild
deleted file mode 100644
index 65622fdb05ff..000000000000
--- a/media-sound/qmmp/qmmp-1.3.7.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-[[ ${PV} = 9999 ]] && inherit subversion
-
-DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
-		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	QMMP_DEV_BRANCH="1.3"
-	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="
-	gnome? ( dbus )
-	shout? ( soxr vorbis )
-	udisks? ( dbus )
-"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/taglib
-	x11-libs/libX11
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:5 )
-	enca? ( app-i18n/enca )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit
-	)
-	ladspa? ( media-plugins/cmt-plugins )
-	mad? ( || (
-		media-libs/libmad
-		media-sound/mpg123
-	) )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	mplayer? ( media-video/mplayer )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	projectm? (
-		dev-qt/qtgui:5[-gles2-only]
-		dev-qt/qtopengl:5
-		media-libs/libprojectm:=
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
-	scrobbler? ( net-misc/curl )
-	shout? ( media-libs/libshout )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_ARCHIVE="$(usex archive)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FILEWRITER="$(usex vorbis)"
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
-		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
-		-DUSE_PROJECTM="$(usex projectm)"
-		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
-		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
-		-DUSE_SHOUT="$(usex shout)"
-		-DUSE_SID="$(usex sid)"
-		-DUSE_SNDFILE="$(usex sndfile)"
-		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/qmmp/qmmp-1.4.1.ebuild b/media-sound/qmmp/qmmp-1.4.1.ebuild
index 2b783689f09d..2e5fa0978838 100644
--- a/media-sound/qmmp/qmmp-1.4.1.ebuild
+++ b/media-sound/qmmp/qmmp-1.4.1.ebuild
@@ -58,10 +58,10 @@ RDEPEND="
 		virtual/jack
 	)
 	ladspa? ( media-plugins/cmt-plugins )
-	mad? ( || (
-		media-libs/libmad
-		media-sound/mpg123
-	) )
+	mad? (
+		media-libs/libmad:=
+		media-sound/mpg123:=
+	)
 	midi? ( media-sound/wildmidi )
 	mms? ( media-libs/libmms )
 	modplug? ( >=media-libs/libmodplug-0.8.4 )
diff --git a/media-sound/qmmp/qmmp-1.4.2.ebuild b/media-sound/qmmp/qmmp-1.4.2.ebuild
new file mode 100644
index 000000000000..e87ff148dc7a
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.4.2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.3"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
+gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		virtual/jack
+	)
+	ladspa? ( media-plugins/cmt-plugins )
+	mad? (
+		media-libs/libmad:=
+		media-sound/mpg123:=
+	)
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm:=
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-sound/redoflacs/Manifest b/media-sound/redoflacs/Manifest
index f2ff050d72ed..b4bc999fc3e7 100644
--- a/media-sound/redoflacs/Manifest
+++ b/media-sound/redoflacs/Manifest
@@ -1,8 +1,4 @@
 AUX README.gentoo 203 BLAKE2B ed3d597cea8b95586dbb2d34468926f1a7344f4bafa4ff022d73b473dafad28c62a463d612b3ac8f1aa62ee54319230cd9b2b1906dbe2f97adba27a7eba0cb80 SHA512 0a19f8694e723ba19871dd6bac72e91d7df9320205ef5feb67fcc7c4bc5a345c126661704470274e4375824a3acc16b4c20a17ac5cfba8486596334b9bbf9266
-DIST redoflacs-0.16.2.tar.gz 20193 BLAKE2B ec76a3f72be350f5ca53bc01a22b9ae034ac55ee3a5d42ad2b6f72cd7ba5c156edb9df64cc2c6d13d2ea4e9f1085d54e47bf75e48c47e3f0ef8b58ade19d61c2 SHA512 f9f861934a9dfb359912d1b529af615a67eca0779ece8a2ab978161e8dc36d25cb870e97713082469fae2ada4152668db2a7d9c7a8bb1555321d21cff8f91476
-DIST redoflacs-0.19.tar.gz 31952 BLAKE2B 572a3459e09a1fc4b0c4c9c007267309f95f7c431a8f920215b2ff81b52343fc2d88369b4c33cabf2b8c2742275a4ccc01bd46fd75652729b49fb5c0d84b5810 SHA512 20988dc0c4c2292f343e9af1c0e638487ca0e0ade3653addcf6cb50fac77e389a662e2d69bc0896899618062b008d5caaede8b3a7cd0c634141b0d5849746777
 DIST redoflacs-0.30.tar.gz 40711 BLAKE2B afa4ddd4892b006092df769be753a6861dc75564021432ef255aef5046e870173c31a76c756362b7c530611432531dab2199155824457623c1ad805b8c51dc57 SHA512 bdd706909f4609668da1dd80635c486821616310d8de1caac1d4dbce17d8eb76ae04657f7f77fe22a05aabcb0b12d34e2e2c0812d16e973af132ab8a420afc4a
-EBUILD redoflacs-0.16.2.ebuild 878 BLAKE2B da0f0f9286995f690b548307adbaf3ecb2c939af3ca7ee8eb9ec4aaef4f2f96e4d9c6fe2f98201f869b194ea6b3ffc76edd38109ee9f4579783de6ab4f36fce4 SHA512 180efa95c4878650aedae58c30e7a3c54601dfb21e6b7a14e6d3104769d7ae2a72966f2e962661f4a4c177b8be7999188198d5bfadca5499857c01407a0aa69f
-EBUILD redoflacs-0.19.ebuild 562 BLAKE2B 968f203851d6571e8aacd9c0b865a075f3e06d49849e436c51566ea94e2f308c05b18bf3fd1f395efac4c987a8a9e0f5d782f0ff057028ab92397b168b7ce03d SHA512 20a93abcbd9e339d74d9ab048ed3c24e088efbc2df36b11e5bf8bbec2ee2b71465e3b40f89d0750ebe8efd05e1ee7e4565255045f242ad31290de7216f99684e
 EBUILD redoflacs-0.30.ebuild 562 BLAKE2B 968f203851d6571e8aacd9c0b865a075f3e06d49849e436c51566ea94e2f308c05b18bf3fd1f395efac4c987a8a9e0f5d782f0ff057028ab92397b168b7ce03d SHA512 20a93abcbd9e339d74d9ab048ed3c24e088efbc2df36b11e5bf8bbec2ee2b71465e3b40f89d0750ebe8efd05e1ee7e4565255045f242ad31290de7216f99684e
 MISC metadata.xml 346 BLAKE2B 869cc7c76112c00ce5496804a6456d3646e8c12acab6edff3a069795e47b5f1307bf4d8adcc16d3648a24287d9d7a471169a499461911829f04b19decfff35de SHA512 5d4b3441227598c1dac9c9f901a195cbe8a2d616bdbf851dc755b5e74f36c6b93542ca73666d7cb54dbfb5d44612d6b3ac17fe8b5a64b02778b0de5fd59544eb
diff --git a/media-sound/redoflacs/redoflacs-0.16.2.ebuild b/media-sound/redoflacs/redoflacs-0.16.2.ebuild
deleted file mode 100644
index 39d688ace3e0..000000000000
--- a/media-sound/redoflacs/redoflacs-0.16.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 vcs-snapshot
-
-DESCRIPTION="Bash commandline flac verifier, organizer, analyzer"
-HOMEPAGE="https://github.com/sirjaren/redoflacs"
-SRC_URI="https://github.com/sirjaren/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-shells/bash
-	media-libs/flac
-	sys-apps/coreutils
-	sys-apps/findutils"
-
-src_install() {
-	newbin redoFlacs redoflacs
-}
-
-pkg_postinst() {
-	elog "This script makes use of optional programs if installed:"
-	elog "   media-sound/sox       ->  support for creating spectrograms"
-	elog "   media-libs/libpng     ->  needed by media-sound/sox"
-	elog "   media-sound/aucdtect  ->  support for determining authenticity"
-	elog "                             of FLAC files (CDDA)"
-}
diff --git a/media-sound/redoflacs/redoflacs-0.19.ebuild b/media-sound/redoflacs/redoflacs-0.19.ebuild
deleted file mode 100644
index a41aaed10bde..000000000000
--- a/media-sound/redoflacs/redoflacs-0.19.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo vcs-snapshot
-
-DESCRIPTION="Bash commandline flac compressor, verifier, organizer, analyzer, retagger"
-HOMEPAGE="https://github.com/sirjaren/redoflacs"
-SRC_URI="https://github.com/sirjaren/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	>=app-shells/bash-4
-	media-libs/flac
-	sys-apps/coreutils"
-
-src_install() {
-	dobin redoflacs
-	readme.gentoo_create_doc
-}
diff --git a/media-sound/traverso/Manifest b/media-sound/traverso/Manifest
deleted file mode 100644
index 4113b1fd5175..000000000000
--- a/media-sound/traverso/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX traverso-0.49.2-desktop.patch 397 BLAKE2B 451566dd3c1f1db012810ce7dc341edf13ec864533a3bd771ced8d9ec96595e5bc89d896d694af45772e4cd64367975c0800e82b50167b2503fdee730150988d SHA512 36b617b837afa2b690433c34cc124fe43b0e5fff585288d279b52070ec0892996ad108c1fdfda0d370b3051b20b5f6238a08c2eb3023313661ceef0bfa5205b7
-DIST traverso-0.49.5.tar.gz 1510807 BLAKE2B de593be2ae8cc0310f25be45c8996ce6e9dd291a4e04d3ff185253821d84d44b2d816795d9510237b7a651af2f2ded3c032e48299d084db78f5f488e00fecda0 SHA512 86490479a06dca0e03e07a7938dd8ef1cf680da30c83ff1fac5f6a2f99b771995f6ef8f5ef8dff31103db50efadb69179057bf1c6a27b42b66260386986c94c4
-EBUILD traverso-0.49.5.ebuild 1954 BLAKE2B 0b4d52214c53178e9300b9c77ec252dd9d63414d9fcb9ae2a7f043882d3c380756cac9cb7f8c244b73066143f46392c76c41c7d08c8006a59c0be400a38e4bc1 SHA512 09ed0c79369c523b8ae3804a7ced06cab42055ddad42079f66426d41d93a73f6d8bb354974d960059e5839006979f57c18d1e7232fe006eed2ced9e893eb8ff0
-MISC metadata.xml 549 BLAKE2B 24ea010b051ff1f74a4ee02fb17fb8dadd6d5fd7dde139b922accb0bfcab6d6ab9c210eda2446b2c25b9ae9122c037131313451e1b6d7081b1634f81c5982c03 SHA512 24c1c480ae3f907aae2948e43b245cc5882585870829712f89d49302ab36b8439c44400f59f52a2874136b3742fc8ccf4fd446131ca242f9af025eac325da053
diff --git a/media-sound/traverso/files/traverso-0.49.2-desktop.patch b/media-sound/traverso/files/traverso-0.49.2-desktop.patch
deleted file mode 100644
index a6584b644d31..000000000000
--- a/media-sound/traverso/files/traverso-0.49.2-desktop.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/resources/traverso.desktop
-+++ b/resources/traverso.desktop
-@@ -1,12 +1,10 @@
- [Desktop Entry]
--Encoding=UTF-8
--MimeType=text/plain
-+MimeType=text/plain;
- GenericName=Multitrack Recorder
- GenericName[de]=Multitrack Recorder
- GenericName[ru]=Многодорожечная запись и сведение
- Exec=traverso
- Icon=traverso
--Path=
- Type=Application
- Terminal=false
- Name=Traverso
diff --git a/media-sound/traverso/metadata.xml b/media-sound/traverso/metadata.xml
deleted file mode 100644
index 36674346cb85..000000000000
--- a/media-sound/traverso/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>proaudio@gentoo.org</email>
-		<name>Gentoo ProAudio Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Traverso is a multitrack audio recording and editing program for GNU/Linux with
-		special emphasis to create an easy to use program with a clean and
-		intuitive interface.
-	</longdescription>
-	<use>
-		<flag name="lv2">Add support for Ladspa V2</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-sound/traverso/traverso-0.49.5.ebuild b/media-sound/traverso/traverso-0.49.5.ebuild
deleted file mode 100644
index 4b4588d6a26d..000000000000
--- a/media-sound/traverso/traverso-0.49.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop flag-o-matic gnome2-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Professional Audio Tools for GNU/Linux"
-HOMEPAGE="https://traverso-daw.org/"
-SRC_URI="https://traverso-daw.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack lame lv2 mad pulseaudio"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=media-libs/flac-1.1.2
-	>=media-libs/libogg-1.1.2
-	media-libs/libsamplerate
-	>=media-libs/libsndfile-1.0.12
-	>=media-libs/libvorbis-1.1.2
-	>=media-sound/wavpack-4.40.0
-	>=sci-libs/fftw-3
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( virtual/jack )
-	lame? ( media-sound/lame )
-	lv2? ( media-libs/lilv )
-	mad? ( >=media-libs/libmad-0.15.0 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README resources/help.text )
-
-PATCHES=( "${FILESDIR}"/${PN}-0.49.2-desktop.patch )
-
-src_configure() {
-	use lv2 && append-cppflags "$($(tc-getPKG_CONFIG) --cflags slv2)" #415165
-
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_TRAVERSO_DEBUG=$(usex debug)
-		-DWANT_JACK=$(usex jack)
-		-DWANT_MP3_ENCODE=$(usex lame)
-		-DWANT_LV2=$(usex lv2)
-		-DWANT_MP3_DECODE=$(usex mad)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local res
-	for res in 16 24 48 64 128; do
-		doicon -s ${res} resources/freedesktop/icons/${res}x${res}/apps/${PN}.png
-	done
-	doicon -s scalable resources/freedesktop/icons/scalable/apps/${PN}.svg
-
-	domenu resources/traverso.desktop
-
-	insinto /usr/share/${PN}
-	doins -r resources/themes
-}
-
-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-video/Manifest.gz b/media-video/Manifest.gz
index 7607c0cea7fe..c337ec757187 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
index b44c564d0c99..f243e4e52596 100644
--- a/media-video/ffmpeg2theora/Manifest
+++ b/media-video/ffmpeg2theora/Manifest
@@ -1,5 +1,5 @@
 AUX ffmpeg2theora-0.29-swr.patch 778 BLAKE2B e0b57be8a1941abc1c3c2c01939dc339a705c9cc7ce1a0de81a868023dc6d9bb7593ae3b7c10cae9ad9e3418819637a2f9e20c42409047f5b9d5686864eacf15 SHA512 38ab469efff0f7607cbc8d8b9c57e1b4e92ce02ff2d4380aa2a04e1e3092e8b5fb2b95eb1c761df4809333d6979cb66fcd8892d245777d375adacfdd82d07c73
-AUX ffmpeg2theora-0.29-underlinking.patch 503 BLAKE2B 2d6d4fb7c23a2fc439b519348a2b39ea30ab00c5a12f5c37f2ae8965d42af5baa4465172e163cd66a63810b3c13923068d8debad495197ec1bc7d469710dbdc5 SHA512 a9c16e115d72400cd29c60e9893b89e37a1c4800edebc23ebd576c47b49c37ec69e31fe2de4bef50a32c1f60a1be5df5dae2b62000e8f558b30c440938652632
+AUX ffmpeg2theora-0.29-underlinking.patch 507 BLAKE2B 337a94a9a948d375a4930686951d1b0db4c8e8bf97c63c2e46729b721e9c0b11e7c5dae648826b5afda0b35e22f8cc4e876513a74831d61c436bcb3937719d51 SHA512 44be5be61ab9786446d49498cf0496b9600b65ecba9b1199f98ee9030f5224887f6a1de73eaab1ee04cefa391ffcfd8629eb4cb9d3e28216569b570cc1e96e48
 DIST ffmpeg2theora-0.30.tar.bz2 91269 BLAKE2B e5a57679cb874e7052db184e8e24b60da640ed818affa228cf5353216c64d2805aee375f67cfa2653112beafa36d492a274ced745846e53f81101e0f97418c41 SHA512 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1
-EBUILD ffmpeg2theora-0.30.ebuild 1023 BLAKE2B 6315347ccdf5cbed4c800a8f8bf12171cd386150bc9d2f193e106cf110982f299af03ef81670a77d00068d560629d6b225bdf2ad72f4893c4e74ee08411c236b SHA512 e1714a54d6d9309bbee045459dccec01fceb9ffca413de14021f8aca6487dd3de8ae08fd9fdf5676ad4cb16d5793126caca717fc45574b2c4ca56df76ce03478
+EBUILD ffmpeg2theora-0.30-r1.ebuild 1156 BLAKE2B 13eb425d21e1f029a32989a9c0b2565993891517564ae82ccbf3689573c98260aeb6d24790646dc9d03e9a0327a884e54d1384d07fe51caa13f809b48a9e37a3 SHA512 d879272ac2899f5d50689a7642da9989e07dfc8f4c13b500e2dc3e18128de48d0317c55e3ef00b86f4a2b28b4a0a05e755a66e1521a2ab7bcc18a01f9dff6173
 MISC metadata.xml 314 BLAKE2B d200d644a8e139816ef36f882f1adf6025a292cfcc6fbfc820265b84a8fc564ad427b0815fb30024ca3d90cf7f42738896cee49e92fc5f8a1e55566051015220 SHA512 2cc51e06842a129ba5e490939f29861b36a1919086aae97a1f5639b56b211700b3839ac66898d0e14b25a3b1471869266ccbff47d2fd98a0baae429514466f54
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
new file mode 100644
index 000000000000..0e9cd2e06d01
--- /dev/null
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-any-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="A simple converter to create Ogg Theora files"
+HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
+SRC_URI="http://www.v2v.cc/~j/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+IUSE="kate"
+
+RDEPEND="
+	media-video/ffmpeg:0=[postproc]
+	>=media-libs/libvorbis-1.1
+	>=media-libs/libogg-1.1
+	>=media-libs/libtheora-1.1[encode]
+	kate? ( >=media-libs/libkate-0.3.7 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.29-swr.patch
+	"${FILESDIR}"/${PN}-0.29-underlinking.patch
+)
+
+src_prepare() {
+	default
+	2to3 -n -w --no-diffs SConstruct || die
+}
+
+src_configure() {
+	SCONSARGS=(
+		APPEND_CCFLAGS="${CFLAGS}"
+		APPEND_LINKFLAGS="${LDFLAGS}"
+		prefix=/usr
+		mandir=PREFIX/share/man
+		libkate=$(usex kate 1 0)
+	)
+}
+
+src_compile() {
+	escons "${SCONSARGS[@]}"
+}
+
+src_install() {
+	escons "${SCONSARGS[@]}" destdir="${D}" install
+	dodoc AUTHORS ChangeLog README subtitles.txt TODO
+}
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
deleted file mode 100644
index 49c6e4674e0a..000000000000
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs scons-utils
-
-DESCRIPTION="A simple converter to create Ogg Theora files"
-HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
-SRC_URI="http://www.v2v.cc/~j/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="kate"
-
-RDEPEND="
-	media-video/ffmpeg:0=[postproc]
-	>=media-libs/libvorbis-1.1
-	>=media-libs/libogg-1.1
-	>=media-libs/libtheora-1.1[encode]
-	kate? ( >=media-libs/libkate-0.3.7 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.29-swr.patch \
-		"${FILESDIR}"/${PN}-0.29-underlinking.patch
-}
-
-src_configure() {
-	myesconsargs=(
-		APPEND_CCFLAGS="${CFLAGS}"
-		APPEND_LINKFLAGS="${LDFLAGS}"
-		prefix=/usr
-		mandir=PREFIX/share/man
-		libkate=$(usex kate 1 0)
-		)
-}
-
-src_compile() {
-	escons
-}
-
-src_install() {
-	escons destdir="${D}" install
-	dodoc AUTHORS ChangeLog README subtitles.txt TODO
-}
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
index dc877603913a..791e39d87744 100644
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
+++ b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
@@ -6,8 +6,8 @@ v = pow(v, g) * 255.0;    // mplayer's vf_eq2.c multiplies with 256 here, strang
 
 For build failure and log, see Gentoo bug #504698
 
---- SConstruct
-+++ SConstruct
+--- a/SConstruct
++++ b/SConstruct
 @@ -206,9 +206,8 @@
    if env['crossmingw']:
        env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 0b621c7f0d75..a41e5af83190 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,4 +1,5 @@
 AUX subtitlecomposer-0.7.0-tests-optional.patch 242 BLAKE2B 6a3d88a537ad39a151b8a6ac071376eda0d1e5d504e92052b9f55e4693633b47fc2b6986d560bd086adf76630ad24bc3671b88f3bc97f9cb429a9e14ad9376bc SHA512 65f5c8db0c5e99b51600db772c918acb7154c7999bbbbbed18ed859f4defcb70d4f907c02a08d9a7529f3aaf4867d6154b9987fb3528cb100f4daa4466e33e74
+AUX subtitlecomposer-0.7.0-valid-desktop-file.patch 1090 BLAKE2B 4491d0bf738fe19374d40b2d278322694a456ac2d11394853653f44351ddf06714143164773eb6597ba4b6f55cf510803231c1241cca20cdc9822d3892f8e646 SHA512 4f2802be511da0b9f132d4368e23c06510fd0c115c8a19f5c05d0e737c355b3c061d290e38370a5992b85a48d77b23949ce3ebf675b9086d585df5be056e358b
 DIST subtitlecomposer-0.7.0.tar.gz 1649840 BLAKE2B a60d3917cc9bd8025d75782e850ba2507ab140ffaeff84e995d58994e848ebe4e103a87824a20dd689132235f67102e7fec39bf0f99d827c78883165e01e9fb7 SHA512 b1c71496a2609686946af2377862b86d70e357565646a3de2f158481bc9e397f649d0907499ecd21a193ec07eaf2135b7f5831697e6b20ba6721a743227fbe04
-EBUILD subtitlecomposer-0.7.0.ebuild 1907 BLAKE2B 321c225b3ec067ddeaa16e69ba076fde1a23e8c2f0fb4708f2b171f97bb1e91a6e0913e8b2599899bfca5939de2259b8b4fde274d16afd34c6d5dce3f0d98a24 SHA512 665e46d1246f8cc680926fdfb86d7f7e634e324ea333f4bef45fc16f243bd1bb3ce483bc0e15325e744461f1e272e838bfa831aab1a5b2f58f9b143377ff6832
+EBUILD subtitlecomposer-0.7.0.ebuild 1957 BLAKE2B c198a52aab4776e0b17e109366db581339744e5727078cfffac79023032eb36ffe9a05fe0c93ed906d211281f86fea3112a28ce06abb7f0ee7f588b3fa9d10b7 SHA512 7eab20abe42eadd951982890349d1964609cd4092b2b00dad2a07e332e39508877067eaf839d65249647d294e487837d5377fe4ff25532af3132b3636e9467dc
 MISC metadata.xml 524 BLAKE2B 662474bada941eadcab48ae4432e72af4f786ff61d2bc1db20115e2f70ca4953e01c38fd550cce72908fe5c36077d9e1b240f53e24142c7556802f3a7783d1bd SHA512 c2ef5d88d2b12534ba76ba4949c4ceee405f88b546f3b749704d8f7529d1b19b3ce8b20b18b496203259dcbde74ba7bf948ae9e4fa4601984554f8f0664a6efe
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch
new file mode 100644
index 000000000000..932fc6770f04
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch
@@ -0,0 +1,21 @@
+From ce2a1a94a6a0802d9a289d701e76b7975d5baa0d Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Thu, 9 Apr 2020 12:21:07 +0200
+Subject: [PATCH] Removed invalid subpicture/x-pgs mime - refs #20
+
+---
+ src/subtitlecomposer.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/subtitlecomposer.desktop b/src/subtitlecomposer.desktop
+index 4195b076..af8a80af 100644
+--- a/src/subtitlecomposer.desktop
++++ b/src/subtitlecomposer.desktop
+@@ -14,6 +14,6 @@
+ Comment[hr]=KDE uređivač podnaslova
+ Icon=subtitlecomposer
+ Exec=subtitlecomposer %f
+-MimeType=text/x-ssa;text/x-ass;text/x-microdvd;text/x-mpsub;application/x-subrip;text/x-subviewer;text/x-mplsub;text/x-tmplayer;text/x-tmplayer+;application/x-vobsub;subpicture/x-pgs;video/mp2t;application/x-vobsub;video/x-matroska;video/mp4;
++MimeType=text/x-ssa;text/x-ass;text/x-microdvd;text/x-mpsub;application/x-subrip;text/x-subviewer;text/x-mplsub;text/x-tmplayer;text/x-tmplayer+;video/mp2t;application/x-vobsub;video/x-matroska;video/mp4;
+ Terminal=false
+ Categories=Qt;KDE;AudioVideo;
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
index f61bf8ca94d2..d5fe989dd52a 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm
 
 DESCRIPTION="Text-based subtitles editor"
-HOMEPAGE="https://github.com/maxrd2/subtitlecomposer"
+HOMEPAGE="https://subtitlecomposer.kde.org/"
 SRC_URI="https://github.com/maxrd2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -54,7 +54,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-tests-optional.patch"
+	"${FILESDIR}/${P}-valid-desktop-file.patch" # bug 745429
+)
 
 S="${WORKDIR}/SubtitleComposer-${PV}"
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index cc918d20ddae..d0b716596248 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 02a902bdfb06..ef606278e760 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Sep 2020 21:38:26 +0000
+Wed, 30 Sep 2020 15:38:33 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index eede2bc1bc2a..27b24e14f18c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 485271 BLAKE2B 4eb8988705304f2e383081a3133de4ec8449e5f0f46de62a4f4c2c2af6353817ee8ec26fe0ae3fd4c8426b8050e7c0de9c3059ab313f7900ebd16aafc208995f SHA512 fa3aa9f4ae7a8c7e47f52390c6374a7742be939c44aa7705cde67726e11710429dacc0c2688d754eb68f752d311d29aaf6454c0cefcd866c171ec1f1a33d76df
-TIMESTAMP 2020-09-23T21:38:30Z
+MANIFEST Manifest.files.gz 486217 BLAKE2B a2e8388c21e11622400955df84cf5750d3dc1ed97260561adcf8593401f8ff3776aefdf5d04f851eb00ee9174b5b2687221348810862c270d26525ad93d576a6 SHA512 b61762e35911592950f03484850ed8e6736359d874b45a8dc2f8c3e462bef78fc8623da4842eeba0a994b89218e6ced81235ec4b0d1cee904aa59dd83fa038b1
+TIMESTAMP 2020-09-30T15:38:36Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl9rwFZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl90pnxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCkvg/9GqU7PqhiUj/jHu50sSnjG7fROWk9HPkbQYV/eNrv6GS/dAXuyNlem1Bm
-I8OzOjOW2cQgkyojFvjdDz/VEBVxaUoF+w9yxwyMoLBEym/QXmq9UrG35MIPo/j5
-RbXaQmUsf1QwdZ64AYpSsmCo7l1i7dqaiLpkIGpGdkZxN69OCiCthNk/WovGY3zy
-5vHo2JwljJ9RJzXyrRZSAyGOAdAHB+IOsIVkWiP/XlpFlulGZImN8STTO0irVwQ3
-MZ9WzpjdjsTypz+k6pvCLrgDDQl9hwo0+MI58TWvzHiQA+6dHrWDL6KrHp1fMLEM
-tn5ILsmHu5v93jGaCaID5BEi98slgup9XBdXzGTW9ZnXuNkRkvT/sI/yiyxCgGki
-ChvonvsrD/tXVCVFgWJ+drStZUAsxGiM7ELn72vdMgzBw7uZQA2b2oLcvUfuC6Qz
-haj0Uhb0cycrpa10Rn8n7/ACuK6qsTS2voIxwTfw20X/ZVIHinyO1jVlVHavw/Pf
-2ybnnlRoFVaPbuiiutkupUYUVPdDlUPf8XAySI55vMD0GCmga66mS7P2JQNwwvoQ
-pJm6tBpHnzIXEbxZNkfDvOiKJ3RKnH+inPgsM/i7Wv5OJ2Aje6iSd+/jPNc56Aiz
-6amqzGLhWgf3BjJsjXPmmqvCc1fC0bcvEfUo4cZxHU7DKUqSpFQ=
-=lcFW
+klB6yxAAmUaNNp1dEV1oQioyfUW4M7TTIAN67TaCYpBpi4b3zo83udZ72Ciuc8jN
+gCo9FLvu2L2i5dUZbm4v7+1lpyz63ZduGxqo4gnhxaLx8CXHnOm/aaTYfKVaBj5Z
+o3BCJEwYZQdIMR8teZLTscsUJsi3wuOQNmOnxnFAmthTj8O1TR4i3qfZnStGDQ6l
++2IKHY9kdpvbZLenSkoftv8nVI8SC/qAutL9BDsCD6aYhndSLgP/Dy3z7J/nxJDs
+varjiOBuwms7lnXKka6NAH7OkSbJ6+nyE231Ea92yK9z1hg2N2+C2MZVA/vIIJTA
+JEWz+RnoVvB8EnjeV78MuZvfhV8RDDZQz7uJ/N8emgMQLvQiA4vtxX0d6tGgKhQo
+dYqhXahoAwrnqTqDRxIrdtzLfQmuWiVEBSexWg485z/GjKD1cXdAEDwjmEC3QgeW
+yuaxF6hdpjpFpaduFz74vq1R12g/G8zu0XCklhNZ4R+6WZi25l2KI3WZFzDsBFV1
+KaKubf1j8ci4VUcplDKVSjQaqeyHzlVbOHourAcOpdsayCHIFOgcAqWX1tl8GztN
+ljBLQ8yBQxaYwffo4GvpDOTK4ugxBRR9LS+lCmFUhTPT3aS/HQUyJcI7eBpLH6QC
+s6e9tkhiMqfmdvNKUGmhun1wPf6jJwYjmDonwjDCod+3EBgTsP0=
+=O4C1
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 3bdc6fcc838a..57704eac4cbc 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-202009-13.xml b/metadata/glsa/glsa-202009-13.xml
new file mode 100644
index 000000000000..163c6c7718e7
--- /dev/null
+++ b/metadata/glsa/glsa-202009-13.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202009-13">
+  <title>Chromium, Google Chrome: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Chromiun and Google
+    Chrome, the worst of which could result in the arbitrary execution of code.
+  </synopsis>
+  <product type="ebuild">chromium,google-chrome</product>
+  <announced>2020-09-29</announced>
+  <revised count="1">2020-09-29</revised>
+  <bug>744007</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-client/chromium" auto="yes" arch="*">
+      <unaffected range="ge">85.0.4183.121</unaffected>
+      <vulnerable range="lt">85.0.4183.121</vulnerable>
+    </package>
+    <package name="www-client/google-chrome" auto="yes" arch="*">
+      <unaffected range="ge">85.0.4183.121</unaffected>
+      <vulnerable range="lt">85.0.4183.121</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Chromium is an open-source browser project that aims to build a safer,
+      faster, and more stable way for all users to experience the web.
+    </p>
+    
+    <p>Google Chrome is one fast, simple, and secure browser for all your
+      devices.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Chromium and Google
+      Chrome. Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Chromium users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/chromium-85.0.4183.121"
+    </code>
+    
+    <p>All Google Chrome users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/google-chrome-85.0.4183.121"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-15960">CVE-2020-15960</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-15961">CVE-2020-15961</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-15962">CVE-2020-15962</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-15963">CVE-2020-15963</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-15964">CVE-2020-15964</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-15965">CVE-2020-15965</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-15966">CVE-2020-15966</uri>
+    <uri link="https://chromereleases.googleblog.com/2020/09/stable-channel-update-for-desktop_21.html">
+      Upstream advisory
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-09-23T03:40:44Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-09-29T18:05:33Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202009-14.xml b/metadata/glsa/glsa-202009-14.xml
new file mode 100644
index 000000000000..e7f29aeae16a
--- /dev/null
+++ b/metadata/glsa/glsa-202009-14.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202009-14">
+  <title>Xen: Buffer overflow</title>
+  <synopsis>A buffer overflow in Xen might allow remote attacker(s) to execute
+    arbitrary code.
+  </synopsis>
+  <product type="ebuild">xen</product>
+  <announced>2020-09-29</announced>
+  <revised count="1">2020-09-29</revised>
+  <bug>738040</bug>
+  <access>local, remote</access>
+  <affected>
+    <package name="app-emulation/xen" auto="yes" arch="*">
+      <unaffected range="ge">4.13.1-r3</unaffected>
+      <vulnerable range="lt">4.13.1-r3</vulnerable>
+    </package>
+    <package name="app-emulation/xen-tools" auto="yes" arch="*">
+      <unaffected range="ge">4.13.1-r3</unaffected>
+      <vulnerable range="lt">4.13.1-r3</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Xen is a bare-metal hypervisor.</p>
+  </background>
+  <description>
+    <p>An out-of-bounds read/write access issue was found in the USB emulator
+      when using QEMU.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process or cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Xen users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/xen-4.13.1-r3"
+    </code>
+    
+    <p>All Xen tools users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=app-emulation/xen-tools-4.13.1-r3"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-14364">CVE-2020-14364</uri>
+    <uri link="https://xenbits.xen.org/xsa/advisory-335.html">XSA-335</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-09-23T03:24:25Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-09-29T18:05:39Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202009-15.xml b/metadata/glsa/glsa-202009-15.xml
new file mode 100644
index 000000000000..8fb1616dfeff
--- /dev/null
+++ b/metadata/glsa/glsa-202009-15.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202009-15">
+  <title>libuv: Buffer overflow</title>
+  <synopsis>A buffer overflow in libuv might allow remote attacker(s) to
+    execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">libuv</product>
+  <announced>2020-09-29</announced>
+  <revised count="1">2020-09-29</revised>
+  <bug>742890</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-libs/libuv" auto="yes" arch="*">
+      <unaffected range="ge">1.39.0</unaffected>
+      <vulnerable range="lt">1.39.0</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>libuv is a multi-platform support library with a focus on asynchronous
+      I/O.
+    </p>
+  </background>
+  <description>
+    <p>libuv used an incorrect buffer size for paths, causing a buffer
+      overflow.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process, or cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All libuv users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-libs/libuv-1.39.0"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-8252">CVE-2020-8252</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-09-23T13:49:20Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-09-29T18:05:50Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202009-16.xml b/metadata/glsa/glsa-202009-16.xml
new file mode 100644
index 000000000000..f58afe91c747
--- /dev/null
+++ b/metadata/glsa/glsa-202009-16.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202009-16">
+  <title>LinuxCIFS: Shell injection</title>
+  <synopsis>A vulnerability in LinuxCIFS may allow a remote code execution via
+    a command line option.
+  </synopsis>
+  <product type="ebuild">LinuxCIFS</product>
+  <announced>2020-09-29</announced>
+  <revised count="1">2020-09-29</revised>
+  <bug>743211</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-fs/cifs-utils" auto="yes" arch="*">
+      <unaffected range="ge">6.11</unaffected>
+      <vulnerable range="lt">6.11</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>The LinuxCIFS utils are a collection of tools for managing Linux CIFS
+      Client Filesystems.
+    </p>
+  </background>
+  <description>
+    <p>The mount.cifs utility had a shell injection issue where one can embed
+      shell commands via the username mount option. Those commands will be run
+      via popen() in the context of the user calling mount.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could entice a user to use a specially crafted
+      argument using mount.cifs, 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 LinuxCIFS users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-fs/cifs-utils-6.11"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-14342">CVE-2020-14342</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-09-20T13:02:21Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-09-29T18:06:06Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202009-17.xml b/metadata/glsa/glsa-202009-17.xml
new file mode 100644
index 000000000000..408f401fbb95
--- /dev/null
+++ b/metadata/glsa/glsa-202009-17.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202009-17">
+  <title>gpsd: Arbitrary code execution</title>
+  <synopsis>A vulnerability in gpsd could allow remote code execution.</synopsis>
+  <product type="ebuild">gpsd</product>
+  <announced>2020-09-29</announced>
+  <revised count="1">2020-09-29</revised>
+  <bug>743766</bug>
+  <access>remote</access>
+  <affected>
+    <package name="sci-geosciences/gpsd" auto="yes" arch="*">
+      <unaffected range="ge">3.18</unaffected>
+      <vulnerable range="lt">3.18</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>gpsd is a GPS daemon and library for USB/serial GPS devices and
+      GPS/mapping clients.
+    </p>
+  </background>
+  <description>
+    <p>A stack-based buffer overflow was discovered in gpsd on port 2947/TCP or
+      crafted JSON inputs.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process, or cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All gpsd users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=sci-geosciences/gpsd-3.18"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-17937">CVE-2018-17937</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-09-25T20:46:53Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-09-29T18:06:31Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-202009-18.xml b/metadata/glsa/glsa-202009-18.xml
new file mode 100644
index 000000000000..024a1e62ea62
--- /dev/null
+++ b/metadata/glsa/glsa-202009-18.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="202009-18">
+  <title>Bitcoin: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Bitcoin, the worst of
+    which could result in a Denial of Service condition.
+  </synopsis>
+  <product type="ebuild">bitcoin</product>
+  <announced>2020-09-30</announced>
+  <revised count="1">2020-09-30</revised>
+  <bug>711198</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-p2p/bitcoind" auto="yes" arch="*">
+      <unaffected range="ge">0.20.1</unaffected>
+      <vulnerable range="lt">0.20.1</vulnerable>
+    </package>
+    <package name="net-p2p/bitcoin-qt" auto="yes" arch="*">
+      <unaffected range="ge">0.20.1</unaffected>
+      <vulnerable range="lt">0.20.1</vulnerable>
+    </package>
+    <package name="net-p2p/bitcoin-cli" auto="yes" arch="*">
+      <unaffected range="ge">0.20.1</unaffected>
+      <vulnerable range="lt">0.20.1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Bitcoin Core consists of both “full-node” software for fully
+      validating the blockchain as well as a bitcoin wallet.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Bitcoin. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Please review the referenced CVE identifiers for details.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All bitcoind users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-p2p/bitcoind-0.20.1"
+    </code>
+    
+    <p>All bitcoin-qt users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-p2p/bitcoin-qt-0.20.1"
+    </code>
+    
+    <p>All bitcoin-cli users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-p2p/bitcoin-cli-0.20.1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2019-15947">CVE-2019-15947</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2020-14198">CVE-2020-14198</uri>
+  </references>
+  <metadata tag="requester" timestamp="2020-09-18T00:17:00Z">sam_c</metadata>
+  <metadata tag="submitter" timestamp="2020-09-30T00:20:42Z">sam_c</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b272585312a4..ef606278e760 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Sep 2020 21:38:27 +0000
+Wed, 30 Sep 2020 15:38:33 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index fd63cfbeda80..25e643fc27d2 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-7204454a89cbf14c4905c5fdedcd66553a95e8aa 1600040174 2020-09-13T23:36:14+00:00
+785de3f76c77159a620986af784b88d221fb335c 1601425319 2020-09-30T00:21:59+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 5587b27e8510..1d9ae131b77c 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 a6a7e67dccaf..14a588de37a5 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/gamemode-0 b/metadata/md5-cache/acct-group/gamemode-0
new file mode 100644
index 000000000000..ad6b199c9b3c
--- /dev/null
+++ b/metadata/md5-cache/acct-group/gamemode-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for the system-wide games-util/gamemode resource group
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 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
+SLOT=0
+_eclasses_=acct-group	c7c2102da2c8db70657be99a7add9c06	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=03c55354ad54e3c695e008d64c05635d
diff --git a/metadata/md5-cache/acct-group/tinyproxy-0 b/metadata/md5-cache/acct-group/tinyproxy-0
new file mode 100644
index 000000000000..2fee82aaebc0
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tinyproxy-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=gid for net-proxy/tinyproxy
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 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
+SLOT=0
+_eclasses_=acct-group	c7c2102da2c8db70657be99a7add9c06	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=d2940ffb6c6a7dc0b9037911b31ab0f2
diff --git a/metadata/md5-cache/acct-group/ttrssd-0 b/metadata/md5-cache/acct-group/ttrssd-0
new file mode 100644
index 000000000000..12baf18222be
--- /dev/null
+++ b/metadata/md5-cache/acct-group/ttrssd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for www-apps/tt-rss
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 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
+SLOT=0
+_eclasses_=acct-group	c7c2102da2c8db70657be99a7add9c06	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=30a76ee0967a01d72c9dfb92b0c4178e
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 11978d88f81b..820a247ea7a7 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/tinyproxy-0 b/metadata/md5-cache/acct-user/tinyproxy-0
new file mode 100644
index 000000000000..fda58ae6edc9
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tinyproxy-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=uid for net-proxy/tinyproxy
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 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
+RDEPEND=acct-group/tinyproxy
+SLOT=0
+_eclasses_=acct-user	4e8cbda4e2f81e96d4113bcf7547e6ba	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=f8a278d8d65befb0bdd747828e73181a
diff --git a/metadata/md5-cache/acct-user/ttrssd-0 b/metadata/md5-cache/acct-user/ttrssd-0
new file mode 100644
index 000000000000..62dd9d781b66
--- /dev/null
+++ b/metadata/md5-cache/acct-user/ttrssd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for www-apps/tt-rss
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 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
+RDEPEND=acct-group/ttrssd
+SLOT=0
+_eclasses_=acct-user	4e8cbda4e2f81e96d4113bcf7547e6ba	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=e56ddbd6aa76e344a381b1080934e987
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 1b2c4efc1b4e..fbf5a9be7fb1 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/emacspeak-39.0-r2 b/metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
index 662e1464805f..9fc0d38d1dbc 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 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://emacspeak.googlecode.com/files/emacspeak-39.0.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	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 b7a896e797a3..f2ad2b274011 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 >=app-editors/emacs-24:*
 SLOT=0
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	git-r3	3e7ec3d6619213460c85e2aa48398441	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	git-r3	3e7ec3d6619213460c85e2aa48398441	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=bb5e081141fefe72f22d1d7405b36da5
diff --git a/metadata/md5-cache/app-accessibility/espeak-1.47.11-r1 b/metadata/md5-cache/app-accessibility/espeak-1.47.11-r1
deleted file mode 100644
index ba10ab901abe..000000000000
--- a/metadata/md5-cache/app-accessibility/espeak-1.47.11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) app-arch/unzip
-DESCRIPTION=Speech synthesizer for English and other languages
-EAPI=5
-HOMEPAGE=http://espeak.sourceforge.net/
-IUSE=portaudio pulseaudio
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) media-sound/sox
-SLOT=0
-SRC_URI=mirror://sourceforge/espeak/espeak-1.47.11-source.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6fbbd31df101447f4433b80a84742068
diff --git a/metadata/md5-cache/app-accessibility/espeak-1.48.04 b/metadata/md5-cache/app-accessibility/espeak-1.48.04
deleted file mode 100644
index 768c4689872b..000000000000
--- a/metadata/md5-cache/app-accessibility/espeak-1.48.04
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) app-arch/unzip
-DESCRIPTION=Speech synthesizer for English and other languages
-EAPI=5
-HOMEPAGE=http://espeak.sourceforge.net/
-IUSE=portaudio pulseaudio
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) media-sound/sox
-SLOT=0
-SRC_URI=mirror://sourceforge/espeak/espeak-1.48.04-source.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b471c5b2df9047ab8f5c7427ede6cdaa
diff --git a/metadata/md5-cache/app-accessibility/kontrast-1.0.2 b/metadata/md5-cache/app-accessibility/kontrast-1.0.2
index b42358fd2cbf..fb01ad6e5673 100644
--- a/metadata/md5-cache/app-accessibility/kontrast-1.0.2
+++ b/metadata/md5-cache/app-accessibility/kontrast-1.0.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kirigami-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kontrast/kontrast-1.0.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55fa5fab52100f1a3d398a832cb96b75
diff --git a/metadata/md5-cache/app-accessibility/simon-9999 b/metadata/md5-cache/app-accessibility/simon-9999
index 1aa3b6a3a760..d578e1b021f5 100644
--- a/metadata/md5-cache/app-accessibility/simon-9999
+++ b/metadata/md5-cache/app-accessibility/simon-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtx11extras:5 kde-apps/okular:5 kde-frameworks/karchive:5 kde-frameworks/kcmutils:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kdbusaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/kguiaddons:5 kde-frameworks/khtml:5 kde-frameworks/ki18n:5 kde-frameworks/kiconthemes:5 kde-frameworks/kio:5 kde-frameworks/kparts:5 kde-frameworks/ktexteditor:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 media-libs/alsa-lib media-libs/libqaccessibilityclient:5 x11-libs/libX11 x11-libs/libXtst x11-libs/qwt:6= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df60694d76c68d32949b82f6a4733f08
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-2.5.0 b/metadata/md5-cache/app-accessibility/speech-tools-2.5.0
index d39900f0fc88..893232d94e04 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-2.5.0
+++ b/metadata/md5-cache/app-accessibility/speech-tools-2.5.0
@@ -11,4 +11,4 @@ RDEPEND=media-libs/alsa-lib sys-libs/ncurses:0= nas? ( media-libs/nas ) X? ( x11
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.5/speech_tools-2.5.0-release.tar.gz https://dev.gentoo.org/~neurogeek/speech-tools/speech_tools-2.1-r3-patches.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c84b0f6a8e850d1342bca6208c942df8
+_md5_=4f4589873eb806be6aa2bc82992e52cf
diff --git a/metadata/md5-cache/app-accessibility/speechd-el-2.5 b/metadata/md5-cache/app-accessibility/speechd-el-2.5
deleted file mode 100644
index 79ac40e25037..000000000000
--- a/metadata/md5-cache/app-accessibility/speechd-el-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-editors/emacs-23.1
-DESCRIPTION=Emacs speech support
-EAPI=4
-HOMEPAGE=http://www.freebsoft.org/speechd-el
-IUSE=brltty
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=>=app-accessibility/speech-dispatcher-0.7 brltty? ( app-accessibility/brltty ) >=app-editors/emacs-23.1
-SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/speechd-el/speechd-el-2.5.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
-_md5_=20323b1a4156951fb1c7625027308a41
diff --git a/metadata/md5-cache/app-accessibility/speechd-el-2.8 b/metadata/md5-cache/app-accessibility/speechd-el-2.8
index d519a5ef7301..fc4c6dc76d4d 100644
--- a/metadata/md5-cache/app-accessibility/speechd-el-2.8
+++ b/metadata/md5-cache/app-accessibility/speechd-el-2.8
@@ -2,11 +2,11 @@ BDEPEND=>=app-editors/emacs-23.1:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs speech support
 EAPI=7
-HOMEPAGE=http://www.freebsoft.org/speechd-el
-KEYWORDS=~amd64 ~ppc ~x86
+HOMEPAGE=https://www.freebsoft.org/speechd-el
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.7 >=app-editors/emacs-23.1:*
 SLOT=0
-SRC_URI=http://www.freebsoft.org/pub/projects/speechd-el/speechd-el-2.8.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
-_md5_=b7d2195858847629f1cdbbe1d4e4424a
+SRC_URI=https://www.freebsoft.org/pub/projects/speechd-el/speechd-el-2.8.tar.gz
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
+_md5_=873a310c04d920102ce93b71dd544682
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index dd370609eddb..e1fe6f3f0ae8 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/aerospike-amc-community-3.6.13-r2 b/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.13-r2
deleted file mode 100644
index 6404ec042f8b..000000000000
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.13-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-DESCRIPTION=Web UI based monitoring tool for Aerospike Community Edition Server
-EAPI=5
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
-SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-amc-community/3.6.13/aerospike-amc-community-3.6.13.all.x86_64.deb
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6f35cc2e0e647837344984b027342838
diff --git a/metadata/md5-cache/app-admin/apg-2.3.0b_p20150129 b/metadata/md5-cache/app-admin/apg-2.3.0b_p20150129
new file mode 100644
index 000000000000..7f99b8301de2
--- /dev/null
+++ b/metadata/md5-cache/app-admin/apg-2.3.0b_p20150129
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=cracklib? ( sys-libs/cracklib )
+DESCRIPTION=Another Password Generator
+EAPI=7
+HOMEPAGE=https://github.com/wilx/apg
+IUSE=cracklib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=cracklib? ( sys-libs/cracklib )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/apg-2.3.0b_p20150129.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=94df413a540f3499eb0c119fd4ed76e0
diff --git a/metadata/md5-cache/app-admin/bastille-3.0.9-r1 b/metadata/md5-cache/app-admin/bastille-3.0.9-r1
deleted file mode 100644
index 189c727727e4..000000000000
--- a/metadata/md5-cache/app-admin/bastille-3.0.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Bastille-Linux is a security hardening tool
-EAPI=5
-HOMEPAGE=http://bastille-linux.sourceforge.net/
-IUSE=X
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=app-admin/logrotate dev-perl/Curses net-firewall/iptables net-firewall/psad virtual/logger X? ( dev-perl/Tk ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://sourceforge/bastille-linux/Bastille-3.0.9.tar.bz2 mirror://gentoo/bastille-3.0.9-gentoo-0.2.patch.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=73585f879895ccd04595cbecf29efbac
diff --git a/metadata/md5-cache/app-admin/calamares-3.2.28.3 b/metadata/md5-cache/app-admin/calamares-3.2.28.3
index 130b71b1d5a7..101d31d4ee10 100644
--- a/metadata/md5-cache/app-admin/calamares-3.2.28.3
+++ b/metadata/md5-cache/app-admin/calamares-3.2.28.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.28.3/calamares-3.2.28.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=759f3afd37867c4eb0f472a32bf9ef88
diff --git a/metadata/md5-cache/app-admin/checksec-1.7.5 b/metadata/md5-cache/app-admin/checksec-1.7.5
deleted file mode 100644
index 9cd54123ec61..000000000000
--- a/metadata/md5-cache/app-admin/checksec-1.7.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
-EAPI=5
-HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=amd64 ~mips ~ppc ~ppc64 x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.7.5.tar.gz -> checksec-1.7.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=785c408f1271f749f90cae1088dfead3
diff --git a/metadata/md5-cache/app-admin/checksec-1.8.0 b/metadata/md5-cache/app-admin/checksec-1.8.0
deleted file mode 100644
index eee007975f1c..000000000000
--- a/metadata/md5-cache/app-admin/checksec-1.8.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
-EAPI=5
-HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/slimm609/checksec.sh/archive/1.8.0.tar.gz -> checksec-1.8.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4b079701dd0c323eec55a37a210ae88b
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r10 b/metadata/md5-cache/app-admin/conky-1.10.8-r10
index da984d219b95..34d152064790 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.8-r10
+++ b/metadata/md5-cache/app-admin/conky-1.10.8-r10
@@ -10,5 +10,5 @@ LICENSE=GPL-3 BSD LGPL-2.1 MIT
 RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) || ( dev-lang/lua:0 dev-lang/lua:5.1 ) apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b06d0c6b244bd9d8874db59b5adf5b82
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r9 b/metadata/md5-cache/app-admin/conky-1.10.8-r9
index a9368770f504..f4c459e509f7 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.8-r9
+++ b/metadata/md5-cache/app-admin/conky-1.10.8-r9
@@ -10,5 +10,5 @@ LICENSE=GPL-3 BSD LGPL-2.1 MIT
 RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) || ( dev-lang/lua:0 dev-lang/lua:5.1 ) apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47525780410b9aacaa368bedc903c3d7
diff --git a/metadata/md5-cache/app-admin/conky-1.11.5 b/metadata/md5-cache/app-admin/conky-1.11.5
index 1f18456d5b98..76e14a040cff 100644
--- a/metadata/md5-cache/app-admin/conky-1.11.5
+++ b/metadata/md5-cache/app-admin/conky-1.11.5
@@ -11,5 +11,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/l
 REQUIRED_USE=imlib? ( X ) nvidia? ( X ) truetype? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.11.5.tar.gz -> conky-1.11.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdada5201fec27738800a94752c7c5fb
diff --git a/metadata/md5-cache/app-admin/conky-1.11.6 b/metadata/md5-cache/app-admin/conky-1.11.6
index 7a89fe5d93db..4333a26b4a1c 100644
--- a/metadata/md5-cache/app-admin/conky-1.11.6
+++ b/metadata/md5-cache/app-admin/conky-1.11.6
@@ -11,5 +11,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/l
 REQUIRED_USE=imlib? ( X ) nvidia? ( X ) truetype? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.11.6.tar.gz -> conky-1.11.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdada5201fec27738800a94752c7c5fb
diff --git a/metadata/md5-cache/app-admin/cpulimit-1.8 b/metadata/md5-cache/app-admin/cpulimit-1.8
deleted file mode 100644
index b43bc0cd1f56..000000000000
--- a/metadata/md5-cache/app-admin/cpulimit-1.8
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Limits the CPU usage of a process
-EAPI=5
-HOMEPAGE=http://cpulimit.sourceforge.net
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/limitcpu/cpulimit-1.8.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aa7cc0dba624bc5c0e654bea5205d2db
diff --git a/metadata/md5-cache/app-admin/cpulimit-2.2 b/metadata/md5-cache/app-admin/cpulimit-2.2
deleted file mode 100644
index 45a4775f4f45..000000000000
--- a/metadata/md5-cache/app-admin/cpulimit-2.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Limits the CPU usage of a process
-EAPI=5
-HOMEPAGE=http://cpulimit.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/limitcpu/cpulimit-2.2.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e2ec485ecac2c44763abb3f31bb2dde4
diff --git a/metadata/md5-cache/app-admin/exo-1.17.0 b/metadata/md5-cache/app-admin/exo-1.17.0
deleted file mode 100644
index 47f442491f29..000000000000
--- a/metadata/md5-cache/app-admin/exo-1.17.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/go:=
-DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
-EAPI=7
-HOMEPAGE=https://github.com/exoscale/cli
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.17.0.tar.gz -> exo-1.17.0.tar.gz
-_md5_=78bbf1316eed84adfc74ed1fd5e2b81c
diff --git a/metadata/md5-cache/app-admin/exo-1.18.0 b/metadata/md5-cache/app-admin/exo-1.18.0
new file mode 100644
index 000000000000..bbfbaf154be8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/exo-1.18.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/go:=
+DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
+EAPI=7
+HOMEPAGE=https://github.com/exoscale/cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/exoscale/cli/archive/v1.18.0.tar.gz -> exo-1.18.0.tar.gz
+_md5_=78bbf1316eed84adfc74ed1fd5e2b81c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.10.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.10.0
deleted file mode 100644
index 3328e53a5847..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.10.0.tar.gz -> github-backup-utils-2.10.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=38663eddb2707bb39859b60e3ab9ceed
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.10.0-r1 b/metadata/md5-cache/app-admin/github-backup-utils-2.10.0-r1
deleted file mode 100644
index 2f67fd775b0e..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.10.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.10.0.tar.gz -> github-backup-utils-2.10.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=75253c3a3c1d26ae895b1ba4a9dbd03e
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.11.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.11.0
deleted file mode 100644
index 240c38566977..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.11.0.tar.gz -> github-backup-utils-2.11.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=38663eddb2707bb39859b60e3ab9ceed
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.11.0-r1 b/metadata/md5-cache/app-admin/github-backup-utils-2.11.0-r1
deleted file mode 100644
index f24a762565d5..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.11.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.11.0.tar.gz -> github-backup-utils-2.11.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=75253c3a3c1d26ae895b1ba4a9dbd03e
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.11.1 b/metadata/md5-cache/app-admin/github-backup-utils-2.11.1
deleted file mode 100644
index 988526631459..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.11.1.tar.gz -> github-backup-utils-2.11.1.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=38663eddb2707bb39859b60e3ab9ceed
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.11.1-r1 b/metadata/md5-cache/app-admin/github-backup-utils-2.11.1-r1
deleted file mode 100644
index 9ad93a79a57a..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.11.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.11.1.tar.gz -> github-backup-utils-2.11.1.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=75253c3a3c1d26ae895b1ba4a9dbd03e
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.11.2 b/metadata/md5-cache/app-admin/github-backup-utils-2.11.2
deleted file mode 100644
index c3d5b0661cfd..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.11.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.11.2.tar.gz -> github-backup-utils-2.11.2.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=38663eddb2707bb39859b60e3ab9ceed
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.11.2-r1 b/metadata/md5-cache/app-admin/github-backup-utils-2.11.2-r1
deleted file mode 100644
index f9d82460f106..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.11.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.11.2.tar.gz -> github-backup-utils-2.11.2.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=75253c3a3c1d26ae895b1ba4a9dbd03e
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.13.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.13.0
deleted file mode 100644
index fda6dd0d1aab..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.13.0.tar.gz -> github-backup-utils-2.13.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.13.2 b/metadata/md5-cache/app-admin/github-backup-utils-2.13.2
deleted file mode 100644
index 6ba2501cdfa8..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.13.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.13.2.tar.gz -> github-backup-utils-2.13.2.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.14.2 b/metadata/md5-cache/app-admin/github-backup-utils-2.14.2
deleted file mode 100644
index 91c972332018..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.14.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.14.2.tar.gz -> github-backup-utils-2.14.2.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.15.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.15.0
deleted file mode 100644
index 1adf47f253bd..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.15.0.tar.gz -> github-backup-utils-2.15.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.15.1 b/metadata/md5-cache/app-admin/github-backup-utils-2.15.1
deleted file mode 100644
index 0df56fe5c137..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.15.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.15.1.tar.gz -> github-backup-utils-2.15.1.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.16.1 b/metadata/md5-cache/app-admin/github-backup-utils-2.16.1
deleted file mode 100644
index 256fa3ecfe78..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.16.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.16.1.tar.gz -> github-backup-utils-2.16.1.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.17.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.17.0
deleted file mode 100644
index 3de658a1b630..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.17.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=6
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.17.0.tar.gz -> github-backup-utils-2.17.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b1ccc182b194c018b2428373cf9e830c
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.18.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.18.0
deleted file mode 100644
index cfe029dfd360..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.18.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=7
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.18.0.tar.gz -> github-backup-utils-2.18.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=62f433eb36063decf506722bf1665476
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.19.1 b/metadata/md5-cache/app-admin/github-backup-utils-2.19.1
deleted file mode 100644
index 488eb259aebd..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.19.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=7
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.19.1.tar.gz -> github-backup-utils-2.19.1.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=62f433eb36063decf506722bf1665476
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.20.2 b/metadata/md5-cache/app-admin/github-backup-utils-2.20.2
deleted file mode 100644
index c8eed14f9ae1..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.20.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=7
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.20.2.tar.gz -> github-backup-utils-2.20.2.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=62f433eb36063decf506722bf1665476
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.21.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.21.0
deleted file mode 100644
index af1c00305508..000000000000
--- a/metadata/md5-cache/app-admin/github-backup-utils-2.21.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=test? ( dev-util/checkbashisms sys-apps/moreutils || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
-DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
-EAPI=7
-HOMEPAGE=https://github.com/github/backup-utils
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=net-misc/rsync
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/github/backup-utils/archive/v2.21.0.tar.gz -> github-backup-utils-2.21.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=62f433eb36063decf506722bf1665476
diff --git a/metadata/md5-cache/app-admin/github-backup-utils-2.22.0 b/metadata/md5-cache/app-admin/github-backup-utils-2.22.0
new file mode 100644
index 000000000000..6bcc5425704e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/github-backup-utils-2.22.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup test
+DEPEND=test? ( net-misc/rsync sys-apps/moreutils dev-util/checkbashisms || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) )
+DESCRIPTION=Backup and recovery utilities for GitHub Enterprise
+EAPI=7
+HOMEPAGE=https://github.com/github/backup-utils
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=net-misc/rsync sys-apps/moreutils
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/github/backup-utils/archive/v2.22.0.tar.gz -> github-backup-utils-2.22.0.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=557e56b5b4c73d02e2f570c4ffa01e30
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.10 b/metadata/md5-cache/app-admin/haskell-updater-1.2.10
deleted file mode 100644
index 5eaf9a8efe06..000000000000
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-6.12.1
-DESCRIPTION=Rebuild Haskell dependencies in Gentoo
-EAPI=5
-HOMEPAGE=https://wiki.haskell.org/Gentoo#haskell-updater
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/haskell-updater-1.2.10/haskell-updater-1.2.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=83c20bbdc44c3a4c8284139d2df17a64
diff --git a/metadata/md5-cache/app-admin/haskell-updater-1.2.9 b/metadata/md5-cache/app-admin/haskell-updater-1.2.9
deleted file mode 100644
index 0d00c92f13ba..000000000000
--- a/metadata/md5-cache/app-admin/haskell-updater-1.2.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-6.12.1
-DESCRIPTION=Rebuild Haskell dependencies in Gentoo
-EAPI=5
-HOMEPAGE=https://wiki.haskell.org/Gentoo#haskell-updater
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore )
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/haskell-updater-1.2.9/haskell-updater-1.2.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=83c20bbdc44c3a4c8284139d2df17a64
diff --git a/metadata/md5-cache/app-admin/hcloud-1.17.0 b/metadata/md5-cache/app-admin/hcloud-1.17.0
deleted file mode 100644
index e0627f67ab31..000000000000
--- a/metadata/md5-cache/app-admin/hcloud-1.17.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/go:=
-DESCRIPTION=A command-line interface for Hetzner Cloud
-EAPI=7
-HOMEPAGE=https://github.com/hetznercloud/cli
-KEYWORDS=amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ago/distfiles/hcloud-1.17.0.tar.xz
-_md5_=5fcb8708fcfaa2550b305dd364b21388
diff --git a/metadata/md5-cache/app-admin/hcloud-1.18.0 b/metadata/md5-cache/app-admin/hcloud-1.18.0
deleted file mode 100644
index eb0e2e0e61e0..000000000000
--- a/metadata/md5-cache/app-admin/hcloud-1.18.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-lang/go:=
-DESCRIPTION=A command-line interface for Hetzner Cloud
-EAPI=7
-HOMEPAGE=https://github.com/hetznercloud/cli
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ago/distfiles/hcloud-1.18.0.tar.xz
-_md5_=eaff0ddb85e9934da211ab49dd2eee8f
diff --git a/metadata/md5-cache/app-admin/hcloud-1.19.1 b/metadata/md5-cache/app-admin/hcloud-1.19.1
index 7e63bc8e3ea2..a2f05a450c66 100644
--- a/metadata/md5-cache/app-admin/hcloud-1.19.1
+++ b/metadata/md5-cache/app-admin/hcloud-1.19.1
@@ -3,9 +3,9 @@ DEPEND=dev-lang/go:=
 DESCRIPTION=A command-line interface for Hetzner Cloud
 EAPI=7
 HOMEPAGE=https://github.com/hetznercloud/cli
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ago/distfiles/hcloud-1.19.1.tar.xz
-_md5_=eaff0ddb85e9934da211ab49dd2eee8f
+_md5_=5fcb8708fcfaa2550b305dd364b21388
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.5.4 b/metadata/md5-cache/app-admin/keepassxc-2.5.4
index cf6bd32c5dc1..b1810f47bc40 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.5.4
+++ b/metadata/md5-cache/app-admin/keepassxc-2.5.4
@@ -12,5 +12,5 @@ RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.5.4/keepassxc-2.5.4-src.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=122406c1312d9f38dc65a8a2225add02
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.6.0 b/metadata/md5-cache/app-admin/keepassxc-2.6.0
index 42487cd6b672..9d4d6e07cf6d 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.6.0
+++ b/metadata/md5-cache/app-admin/keepassxc-2.6.0
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.6.0/keepassxc-2.6.0-src.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc58fa78e3473871e1570c335d0113a2
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.6.1 b/metadata/md5-cache/app-admin/keepassxc-2.6.1
index 75dc18b0356d..0b1453ece6e7 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.6.1
+++ b/metadata/md5-cache/app-admin/keepassxc-2.6.1
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/argon2:= dev-libs/libgcrypt:= >=dev-libs/libsodium-1.0.12:= de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/releases/download/2.6.1/keepassxc-2.6.1-src.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f332adfbe5e0dbe43fbc7e9c67e7bf44
diff --git a/metadata/md5-cache/app-admin/keepassxc-9999 b/metadata/md5-cache/app-admin/keepassxc-9999
index e39d424dd3c2..11e2c0e75851 100644
--- a/metadata/md5-cache/app-admin/keepassxc-9999
+++ b/metadata/md5-cache/app-admin/keepassxc-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 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/readline:0= sys-libs/zlib:= autotype? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst ) keeshare? ( dev-libs/quazip ) yubikey? ( sys-auth/ykpers )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc58fa78e3473871e1570c335d0113a2
diff --git a/metadata/md5-cache/app-admin/mcelog-173 b/metadata/md5-cache/app-admin/mcelog-173
new file mode 100644
index 000000000000..b58673f445e0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mcelog-173
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare pretend setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A tool to log and decode Machine Check Exceptions
+EAPI=6
+HOMEPAGE=http://mcelog.org/
+IUSE=selinux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( sec-policy/selinux-mcelog )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/andikleen/mcelog/archive/v173.tar.gz -> mcelog-173.tar.gz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ea1cf860712de4f6ce3cff399f36be08
diff --git a/metadata/md5-cache/app-admin/mongo-tools-4.0.19 b/metadata/md5-cache/app-admin/mongo-tools-4.0.19
index d01103531a8e..695a833e4100 100644
--- a/metadata/md5-cache/app-admin/mongo-tools-4.0.19
+++ b/metadata/md5-cache/app-admin/mongo-tools-4.0.19
@@ -4,8 +4,8 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=sasl ssl
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-tools/archive/r4.0.19.tar.gz -> mongo-tools-4.0.19.tar.gz
-_md5_=fc0a5c3ebe356bd914a35b642e543d17
+_md5_=e79c009dfa402153d8efad952fa3a6c7
diff --git a/metadata/md5-cache/app-admin/mongo-tools-4.2.8 b/metadata/md5-cache/app-admin/mongo-tools-4.2.8
index 79f9487de6b0..539c778d80b3 100644
--- a/metadata/md5-cache/app-admin/mongo-tools-4.2.8
+++ b/metadata/md5-cache/app-admin/mongo-tools-4.2.8
@@ -4,8 +4,8 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=sasl ssl
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-tools/archive/r4.2.8.tar.gz -> mongo-tools-4.2.8.tar.gz
-_md5_=015044a4b1b37107f8b5825712bc0f85
+_md5_=b622bad8bf550d1413d27a6d695aefd1
diff --git a/metadata/md5-cache/app-admin/pass-1.7.3 b/metadata/md5-cache/app-admin/pass-1.7.3
index 57466d15a36c..d49bfcd9de39 100644
--- a/metadata/md5-cache/app-admin/pass-1.7.3
+++ b/metadata/md5-cache/app-admin/pass-1.7.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 SLOT=0
 SRC_URI=https://git.zx2c4.com/password-store/snapshot/password-store-1.7.3.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a4fcd52900e9107426fab83e0539a6ee
diff --git a/metadata/md5-cache/app-admin/pass-9999 b/metadata/md5-cache/app-admin/pass-9999
index bc81009b9b76..8bade4563d90 100644
--- a/metadata/md5-cache/app-admin/pass-9999
+++ b/metadata/md5-cache/app-admin/pass-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-crypt/gnupg media-gfx/qrencode >=app-text/tree-1.7.0 git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) zsh-completion? ( app-shells/gentoo-zsh-completions ) fish-completion? ( app-shells/fish ) dmenu? ( x11-misc/dmenu x11-misc/xdotool ) emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=221759e64aef54fb0c74a4cc716f6581
diff --git a/metadata/md5-cache/app-admin/passook-20121001 b/metadata/md5-cache/app-admin/passook-20121001
deleted file mode 100644
index 67d159c3e7a3..000000000000
--- a/metadata/md5-cache/app-admin/passook-20121001
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Password generator capable of generating pronounceable and/or secure passwords
-EAPI=4
-HOMEPAGE=https://github.com/mackers/passook
-KEYWORDS=amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl sys-apps/miscfiles
-SLOT=0
-SRC_URI=mirror://gentoo/passook-20121001.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2a4c8f4b807b9298d45d23e138e70f7f
diff --git a/metadata/md5-cache/app-admin/passwordsafe-1.11.0 b/metadata/md5-cache/app-admin/passwordsafe-1.11.0
index 0353747c550e..d30d24b9c634 100644
--- a/metadata/md5-cache/app-admin/passwordsafe-1.11.0
+++ b/metadata/md5-cache/app-admin/passwordsafe-1.11.0
@@ -11,5 +11,5 @@ RDEPEND=net-misc/curl sys-apps/file sys-apps/util-linux x11-libs/libXt x11-libs/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwsafe/pwsafe/archive/1.11.0.tar.gz -> passwordsafe-1.11.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ebd641122c1e5e86cafff822797fcbc
diff --git a/metadata/md5-cache/app-admin/ps_mem-3.13_p20200417 b/metadata/md5-cache/app-admin/ps_mem-3.13_p20200417
index 4e0fc2be8e9b..992d6c0b06f9 100644
--- a/metadata/md5-cache/app-admin/ps_mem-3.13_p20200417
+++ b/metadata/md5-cache/app-admin/ps_mem-3.13_p20200417
@@ -4,11 +4,11 @@ DESCRIPTION=A utility to report core memory usage per program
 EAPI=6
 HOMEPAGE=https://github.com/pixelb/ps_mem
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=amd64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pixelb/ps_mem/archive/fc75a8cc3cda05c53a4ae4fe296deeb9fc43908d.tar.gz -> ps_mem-3.13_p20200417.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b318449e1d38a6489b28e653b0130c5a
+_md5_=a1aae55b01839bbd19f067ba9155ed2a
diff --git a/metadata/md5-cache/app-admin/puppet-6.17.0 b/metadata/md5-cache/app-admin/puppet-6.17.0
deleted file mode 100644
index 93e2f97c1cdb..000000000000
--- a/metadata/md5-cache/app-admin/puppet-6.17.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] dev-ruby/rspec-its[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DESCRIPTION=A system automation and configuration management software.
-EAPI=6
-HOMEPAGE=https://puppet.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=Apache-2.0 GPL-2
-PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.17.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b4ab026ca1101e238be6e8e15daf799
diff --git a/metadata/md5-cache/app-admin/puppet-6.18.0 b/metadata/md5-cache/app-admin/puppet-6.18.0
index 42853534e2ed..fc7f05dd7bd9 100644
--- a/metadata/md5-cache/app-admin/puppet-6.18.0
+++ b/metadata/md5-cache/app-admin/puppet-6.18.0
@@ -4,7 +4,7 @@ DESCRIPTION=A system automation and configuration management software.
 EAPI=6
 HOMEPAGE=https://puppet.com/
 IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
 RDEPEND=ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev-ruby/json:=[ruby_targets_ruby25(-)] dev-ruby/semantic_puppet[ruby_targets_ruby25(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby25(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby25(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby25(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby25(-)] ) virtual/ruby-ssl[ruby_targets_ruby25(-)] dev-ruby/hocon[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/hiera[ruby_targets_ruby26(-)] dev-ruby/json:=[ruby_targets_ruby26(-)] dev-ruby/semantic_puppet[ruby_targets_ruby26(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby26(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby26(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby26(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) virtual/ruby-ssl[ruby_targets_ruby26(-)] dev-ruby/hocon[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.18.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=37eb3f16f2eec3064d96a6645ceda5b4
+_md5_=5b4ab026ca1101e238be6e8e15daf799
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.17.0 b/metadata/md5-cache/app-admin/puppet-agent-6.17.0
deleted file mode 100644
index 8ed5e422d72c..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-6.17.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install unpack
-DEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet acct-group/puppet app-admin/augeas
-DESCRIPTION=general puppet client utils along with hiera and facter
-EAPI=7
-HOMEPAGE=https://puppetlabs.com/
-IUSE=puppetdb selinux
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet acct-group/puppet app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/libxcrypt sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_6.17.0-1focal_amd64.deb
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7e5db47de6d5d3bd56c74478135edec9
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.18.0 b/metadata/md5-cache/app-admin/puppet-agent-6.18.0
index 18e1e2bc4499..955e6b8167e7 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.18.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.18.0
@@ -5,11 +5,11 @@ DESCRIPTION=general puppet client utils along with hiera and facter
 EAPI=7
 HOMEPAGE=https://puppetlabs.com/
 IUSE=puppetdb selinux
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet acct-group/puppet app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/libxcrypt sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_6.18.0-1focal_amd64.deb
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fb4c4875a44093f995775e4a46435cfd
+_md5_=7e5db47de6d5d3bd56c74478135edec9
diff --git a/metadata/md5-cache/app-admin/puppetdb-6.11.2 b/metadata/md5-cache/app-admin/puppetdb-6.11.2
deleted file mode 100644
index a6260d78493f..000000000000
--- a/metadata/md5-cache/app-admin/puppetdb-6.11.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=acct-user/puppetdb acct-group/puppetdb
-DESCRIPTION=PuppetDB collects data generated by Puppet.
-EAPI=7
-HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-6.11.2.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=117bfa6795d547838c5fb6d5afb2a673
diff --git a/metadata/md5-cache/app-admin/puppetdb-6.12.0 b/metadata/md5-cache/app-admin/puppetdb-6.12.0
index a3cbc0991166..d437aaace66b 100644
--- a/metadata/md5-cache/app-admin/puppetdb-6.12.0
+++ b/metadata/md5-cache/app-admin/puppetdb-6.12.0
@@ -4,10 +4,10 @@ DEPEND=acct-user/puppetdb acct-group/puppetdb
 DESCRIPTION=PuppetDB collects data generated by Puppet.
 EAPI=7
 HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-6.12.0.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4776119ce214f1fe4704f8096506d5ba
+_md5_=117bfa6795d547838c5fb6d5afb2a673
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.12.1 b/metadata/md5-cache/app-admin/puppetserver-6.12.1
deleted file mode 100644
index e05def438d27..000000000000
--- a/metadata/md5-cache/app-admin/puppetserver-6.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=acct-user/puppet acct-group/puppet
-DESCRIPTION=Puppet Server is the next-generation application for managing Puppet agents.
-EAPI=7
-HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
-IUSE=puppetdb
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
-SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.12.1.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=877c34d1e198cd2d10b7bd42ea575f3b
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.13.0 b/metadata/md5-cache/app-admin/puppetserver-6.13.0
index 73c0743dc9bc..e62c81d4682f 100644
--- a/metadata/md5-cache/app-admin/puppetserver-6.13.0
+++ b/metadata/md5-cache/app-admin/puppetserver-6.13.0
@@ -5,10 +5,10 @@ DESCRIPTION=Puppet Server is the next-generation application for managing Puppet
 EAPI=7
 HOMEPAGE=http://docs.puppetlabs.com/puppetserver/
 IUSE=puppetdb
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.13.0.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ae75e2a4bcc0d9f18d84adea9b3a8ff8
+_md5_=877c34d1e198cd2d10b7bd42ea575f3b
diff --git a/metadata/md5-cache/app-admin/sagan-0.2.3 b/metadata/md5-cache/app-admin/sagan-0.2.3
deleted file mode 100644
index 305f9722e9c1..000000000000
--- a/metadata/md5-cache/app-admin/sagan-0.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/pkgconfig dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Sagan is a multi-threaded, real time system and event log monitoring system
-EAPI=5
-HOMEPAGE=http://sagan.quadrantsec.com/
-IUSE=+libdnet +lognorm mysql +pcap postgres smtp snort
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 )
-SLOT=0
-SRC_URI=http://sagan.quadrantsec.com/download/sagan-0.2.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f8137960323090eea13b02136f2e7e7b
diff --git a/metadata/md5-cache/app-admin/sagan-0.2.3-r1 b/metadata/md5-cache/app-admin/sagan-0.2.3-r1
deleted file mode 100644
index 363a55614f8b..000000000000
--- a/metadata/md5-cache/app-admin/sagan-0.2.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/pkgconfig dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Sagan is a multi-threaded, real time system and event log monitoring system
-EAPI=5
-HOMEPAGE=http://sagan.quadrantsec.com/
-IUSE=+libdnet +lognorm mysql +pcap postgres smtp snort
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 )
-SLOT=0
-SRC_URI=http://sagan.quadrantsec.com/download/sagan-0.2.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=48ceada163bc38a8b533e74b06ef8b28
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.3 b/metadata/md5-cache/app-admin/sudo-1.9.3
deleted file mode 100644
index 851eeb4cbf2b..000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.9.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] )
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=7
-HOMEPAGE=https://www.sudo.ws/
-IUSE=gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris
-LICENSE=ISC BSD
-RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] ) >=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=?? ( gcrypt ssl )
-SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.3.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.3.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5c9b56961a7366c86c35ce043a15bc82
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.3_p1 b/metadata/md5-cache/app-admin/sudo-1.9.3_p1
new file mode 100644
index 000000000000..372ba2508603
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.9.3_p1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] )
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=7
+HOMEPAGE=https://www.sudo.ws/
+IUSE=gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris
+LICENSE=ISC BSD
+RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] ) >=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=?? ( gcrypt ssl )
+SLOT=0
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.3p1.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.3p1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5c9b56961a7366c86c35ce043a15bc82
diff --git a/metadata/md5-cache/app-admin/systemdgenie-0.99.0 b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
index 1c01fbbed664..250be3a741e1 100644
--- a/metadata/md5-cache/app-admin/systemdgenie-0.99.0
+++ b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kauth-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/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 sys-apps/systemd:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/systemdgenie/systemdgenie-0.99.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b53b630873b51f58d3a8ae1865f2ae6
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index c79a5acfb1ea..f563dcfdd82b 100644
--- a/metadata/md5-cache/app-antivirus/Manifest.gz
+++ b/metadata/md5-cache/app-antivirus/Manifest.gz
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.103.0-r1 b/metadata/md5-cache/app-antivirus/clamav-0.103.0-r1
index 0f4f723e6739..217a7994e262 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.103.0-r1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.103.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=>=sys-devel/autoconf-2.69-r5 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare test
 DEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/tomsfastmath >=sys-libs/zlib-1.2.2:= bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) clamsubmit? ( net-misc/curl dev-libs/json-c:= ) elibc_musl? ( sys-libs/fts-standalone ) iconv? ( virtual/libiconv ) !libclamav-only? ( net-misc/curl ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) xml? ( dev-libs/libxml2 ) metadata-analysis-api? ( dev-libs/json-c:* ) test? ( dev-libs/check )
 DESCRIPTION=Clam Anti-Virus Scanner
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.103.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ab79e6a90bc84bf7056781ae48fa94b0
+_md5_=699a91e43e9073dda2a7e765c188abe7
diff --git a/metadata/md5-cache/app-antivirus/clamtk-6.06 b/metadata/md5-cache/app-antivirus/clamtk-6.06
new file mode 100644
index 000000000000..a55fdcb9072a
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamtk-6.06
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext )
+DEFINED_PHASES=install postinst postrm setup unpack
+DESCRIPTION=A graphical front-end for ClamAV
+EAPI=7
+HOMEPAGE=https://gitlab.com/dave_m/clamtk/wikis/Home
+IUSE=kde nautilus nemo +nls thunar python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=app-antivirus/clamav dev-perl/File-chdir dev-perl/Gtk3 dev-perl/JSON dev-perl/LWP-Protocol-https dev-perl/LWP-UserAgent-Cached dev-perl/Locale-gettext dev-perl/Text-CSV dev-perl/glib-perl dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64 virtual/perl-Time-Piece nautilus? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-python/nautilus-python[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
+REQUIRED_USE=nautilus? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-6.06.tar.xz kde? ( https://bitbucket.org/davem_/clamtk-kde/downloads/clamtk-kde-0.18.tar.xz ) nautilus? ( https://bitbucket.org/davem_/clamtk-gnome/downloads/clamtk-gnome-0.05.tar.xz ) nemo? ( https://bitbucket.org/davem_/nemo-sendto-clamtk/downloads/nemo-sendto-clamtk-0.04.tar.xz ) thunar? ( https://bitbucket.org/davem_/thunar-sendto-clamtk/downloads/thunar-sendto-clamtk-0.06.tar.xz )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=37eba378e7322f2d77e7a31cc3eb16c7
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 03b6f0994c88..6b5d37c3994d 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/alien-8.95 b/metadata/md5-cache/app-arch/alien-8.95
deleted file mode 100644
index 1a3f9331983c..000000000000
--- a/metadata/md5-cache/app-arch/alien-8.95
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/rpm app-arch/dpkg dev-util/debhelper >=app-arch/tar-1.14.91 bzip2? ( app-arch/bzip2 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats
-EAPI=5
-HOMEPAGE=http://kitenet.net/programs/alien
-IUSE=+bzip2
-KEYWORDS=~alpha amd64 ~hppa ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/rpm app-arch/dpkg dev-util/debhelper >=app-arch/tar-1.14.91 bzip2? ( app-arch/bzip2 ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/alien/alien_8.95.tar.xz -> alien-8.95.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e0582ba690e8ec75c2ba57806564a565
diff --git a/metadata/md5-cache/app-arch/dump-0.4.46 b/metadata/md5-cache/app-arch/dump-0.4.46
deleted file mode 100644
index d70b2ed9a392..000000000000
--- a/metadata/md5-cache/app-arch/dump-0.4.46
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=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] ) ) virtual/pkgconfig virtual/os-headers
-DESCRIPTION=Dump/restore ext2fs backup utilities
-EAPI=5
-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
-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 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/dump/dump-0.4b46.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=152eeacb2b491080887d821e765ebc81
diff --git a/metadata/md5-cache/app-arch/engrampa-1.24.1 b/metadata/md5-cache/app-arch/engrampa-1.24.1
new file mode 100644
index 000000000000..e64cfc119c89
--- /dev/null
+++ b/metadata/md5-cache/app-arch/engrampa-1.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/libSM x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) app-text/yelp-tools dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=Engrampa archive manager for MATE
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=caja magic packagekit
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/libSM x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) virtual/libintl !!app-arch/mate-file-archiver
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/engrampa-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=db58899e3c1535a5ff4834cc3a889187
diff --git a/metadata/md5-cache/app-arch/innoextract-1.8 b/metadata/md5-cache/app-arch/innoextract-1.8
index 11ef94501d48..af69eda95996 100644
--- a/metadata/md5-cache/app-arch/innoextract-1.8
+++ b/metadata/md5-cache/app-arch/innoextract-1.8
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=dev-libs/boost:= iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils )
 SLOT=0
 SRC_URI=https://constexpr.org/innoextract/files/innoextract-1.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8191f7670c95568b6e4b8a352d413e70
diff --git a/metadata/md5-cache/app-arch/lxqt-archiver-0.2.0 b/metadata/md5-cache/app-arch/lxqt-archiver-0.2.0
index bdea0480191e..3d18eaf26f1f 100644
--- a/metadata/md5-cache/app-arch/lxqt-archiver-0.2.0
+++ b/metadata/md5-cache/app-arch/lxqt-archiver-0.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/json-glib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=x11-libs/libfm-qt-0.15.0
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-archiver/releases/download/0.2.0/lxqt-archiver-0.2.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6741aca735cacd08ea733f278dbef95e
diff --git a/metadata/md5-cache/app-arch/lz4-1.9.2 b/metadata/md5-cache/app-arch/lz4-1.9.2
index af8c03636678..3c94bf363551 100644
--- a/metadata/md5-cache/app-arch/lz4-1.9.2
+++ b/metadata/md5-cache/app-arch/lz4-1.9.2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 spa
 LICENSE=BSD-2 GPL-2
 SLOT=0/r132
 SRC_URI=https://github.com/lz4/lz4/archive/v1.9.2.tar.gz -> lz4-1.9.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0396817faa9b62f093c900daf89d78c
diff --git a/metadata/md5-cache/app-arch/lz4-9999 b/metadata/md5-cache/app-arch/lz4-9999
index 0b44d68d2c5c..4d9746db422d 100644
--- a/metadata/md5-cache/app-arch/lz4-9999
+++ b/metadata/md5-cache/app-arch/lz4-9999
@@ -7,5 +7,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 LICENSE=BSD-2 GPL-2
 PROPERTIES=live
 SLOT=0/r132
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4fcf983b719b2bee7d9d436031c2550b
diff --git a/metadata/md5-cache/app-arch/pbzip2-1.1.12-r1 b/metadata/md5-cache/app-arch/pbzip2-1.1.12-r1
deleted file mode 100644
index d66a50ec5e0d..000000000000
--- a/metadata/md5-cache/app-arch/pbzip2-1.1.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] ) static? ( app-arch/bzip2[static-libs(+)] )
-DESCRIPTION=Parallel bzip2 (de)compressor using libbz2
-EAPI=5
-HOMEPAGE=http://compression.ca/pbzip2/ https://launchpad.net/pbzip2
-IUSE=static symlink
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BZIP2
-RDEPEND=!static? ( app-arch/bzip2 ) symlink? ( !app-arch/lbzip2[symlink] )
-SLOT=0
-SRC_URI=https://launchpad.net/pbzip2/1.1/1.1.12/+download/pbzip2-1.1.12.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9d86ca113bf70035261d047f324a7d8
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.8 b/metadata/md5-cache/app-arch/snappy-1.1.8
index 942c0aa94a4d..811d71d764c5 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.8
+++ b/metadata/md5-cache/app-arch/snappy-1.1.8
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/snappy/archive/1.1.8.tar.gz -> snappy-1.1.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=193a31d7fabacf9c19d18160482b63d6
diff --git a/metadata/md5-cache/app-arch/unshield-1.4.3 b/metadata/md5-cache/app-arch/unshield-1.4.3
index 01acbf43d0e5..1f409a0f7357 100644
--- a/metadata/md5-cache/app-arch/unshield-1.4.3
+++ b/metadata/md5-cache/app-arch/unshield-1.4.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/twogood/unshield/archive/1.4.3.tar.gz -> unshield-1.4.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=63cb689c67667e9f6b0e59c01036ce08
diff --git a/metadata/md5-cache/app-arch/zopfli-1.0.3 b/metadata/md5-cache/app-arch/zopfli-1.0.3
index cc508eaa06ea..f77972095d5c 100644
--- a/metadata/md5-cache/app-arch/zopfli-1.0.3
+++ b/metadata/md5-cache/app-arch/zopfli-1.0.3
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux
 LICENSE=Apache-2.0
 SLOT=0/1
 SRC_URI=https://github.com/google/zopfli/archive/zopfli-1.0.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f2470aa8fdab3016296c152d1589575e
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 0e9788c54eb9..ca94395b68a1 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/bacula-9.6.6 b/metadata/md5-cache/app-backup/bacula-9.6.6
new file mode 100644
index 000000000000..3cf912d3f77a
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bacula-9.6.6
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=7
+HOMEPAGE=https://www.bacula.org/
+IUSE=acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=AGPL-3
+RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/postgresql:=[threads] ) mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) sqlite? ( dev-db/sqlite:3 ) ) dev-libs/gmp:0 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) readline? ( sys-libs/readline:0 ) static? ( dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( dev-libs/lzo sys-libs/ncurses:= sys-libs/zlib acl? ( virtual/acl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) acct-user/bacula acct-group/bacula !bacula-clientonly? ( !bacula-nosd? ( app-arch/mt-st sys-block/mtx ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
+SLOT=0
+SRC_URI=mirror://sourceforge/bacula/bacula-9.6.6.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6953e1fdffe496581d26b90aa30e3608
diff --git a/metadata/md5-cache/app-backup/bareos-18.2.9 b/metadata/md5-cache/app-backup/bareos-18.2.9
index b29086bf3476..ec4ac3a219f5 100644
--- a/metadata/md5-cache/app-backup/bareos-18.2.9
+++ b/metadata/md5-cache/app-backup/bareos-18.2.9
@@ -12,5 +12,5 @@ REQUIRED_USE=static? ( clientonly )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/bareos/bareos/archive/Release/18.2.9.tar.gz -> bareos-18.2.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56a6836522df4a023f4bbc50dcff245c
diff --git a/metadata/md5-cache/app-backup/bareos-19.2.8 b/metadata/md5-cache/app-backup/bareos-19.2.8
index 79c8d91aebc7..3edd989ae4a3 100644
--- a/metadata/md5-cache/app-backup/bareos-19.2.8
+++ b/metadata/md5-cache/app-backup/bareos-19.2.8
@@ -12,5 +12,5 @@ REQUIRED_USE=!clientonly? ( || ( mysql postgres sqlite ) ) static? ( clientonly
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/bareos/bareos/archive/Release/19.2.8.tar.gz -> bareos-19.2.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3df0454ee0294aebd8df8443aed05e6
diff --git a/metadata/md5-cache/app-backup/btrbk-0.27.0 b/metadata/md5-cache/app-backup/btrbk-0.27.0
deleted file mode 100644
index 121b4b61d1eb..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.27.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst preinst
-DEPEND=>=app-text/asciidoc-8.6.0 app-text/xmlto
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+pv
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.27.0.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4c28c16519661b9967554d78654e5d7f
diff --git a/metadata/md5-cache/app-backup/btrbk-0.27.1 b/metadata/md5-cache/app-backup/btrbk-0.27.1
deleted file mode 100644
index 5e4653b6689c..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.27.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst preinst
-DEPEND=>=app-text/asciidoc-8.6.0 app-text/xmlto
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+pv
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.27.1.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=eed3385211e48533cfccc5b2f266d75e
diff --git a/metadata/md5-cache/app-backup/btrbk-0.27.1-r1 b/metadata/md5-cache/app-backup/btrbk-0.27.1-r1
deleted file mode 100644
index 061698f744ed..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.27.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+pv +doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.27.1.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=81e22a8c30bec8e5e2b1de08ccc17655
diff --git a/metadata/md5-cache/app-backup/btrbk-0.27.2 b/metadata/md5-cache/app-backup/btrbk-0.27.2
deleted file mode 100644
index 2612a23ddc5f..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.27.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+pv +doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.27.2.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dc7b0f9c483673955211850034a9aff9
diff --git a/metadata/md5-cache/app-backup/btrbk-0.28.0 b/metadata/md5-cache/app-backup/btrbk-0.28.0
deleted file mode 100644
index e243bba46a57..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.28.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+pv +doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.28.0.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cfe3677828368cc20df20a2f65563502
diff --git a/metadata/md5-cache/app-backup/btrbk-0.28.1 b/metadata/md5-cache/app-backup/btrbk-0.28.1
deleted file mode 100644
index 712755d79584..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.28.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+pv +doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.28.1.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cfe3677828368cc20df20a2f65563502
diff --git a/metadata/md5-cache/app-backup/btrbk-0.28.2 b/metadata/md5-cache/app-backup/btrbk-0.28.2
deleted file mode 100644
index 91ae3f2931b6..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.28.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+pv +doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.28.2.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cfe3677828368cc20df20a2f65563502
diff --git a/metadata/md5-cache/app-backup/btrbk-0.28.3 b/metadata/md5-cache/app-backup/btrbk-0.28.3
deleted file mode 100644
index a34025908a25..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.28.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+pv +doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.28.3.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cfe3677828368cc20df20a2f65563502
diff --git a/metadata/md5-cache/app-backup/btrbk-0.29.0 b/metadata/md5-cache/app-backup/btrbk-0.29.0
deleted file mode 100644
index 9fb20116c7ae..000000000000
--- a/metadata/md5-cache/app-backup/btrbk-0.29.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
-DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
-EAPI=7
-HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+mbuffer +doc
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
-SLOT=0
-SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.29.0.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b244dbb5c098a987b9d11202fdf7caa6
diff --git a/metadata/md5-cache/app-backup/btrbk-0.30.0 b/metadata/md5-cache/app-backup/btrbk-0.30.0
index 7b65d0d6b779..dfff55be073c 100644
--- a/metadata/md5-cache/app-backup/btrbk-0.30.0
+++ b/metadata/md5-cache/app-backup/btrbk-0.30.0
@@ -4,11 +4,11 @@ DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
 DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
 EAPI=7
 HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+mbuffer +doc
+IUSE=+mbuffer +doc +lsbtr
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
 SLOT=0
 SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.30.0.tar.xz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=111215d7573695620416371a13f46355
+_md5_=4d971ba3275087b8d02b7585a47cafd6
diff --git a/metadata/md5-cache/app-backup/btrbk-9999 b/metadata/md5-cache/app-backup/btrbk-9999
index a088b05a3ab6..4322d63577df 100644
--- a/metadata/md5-cache/app-backup/btrbk-9999
+++ b/metadata/md5-cache/app-backup/btrbk-9999
@@ -4,10 +4,10 @@ DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
 DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
 EAPI=7
 HOMEPAGE=https://digint.ch/btrbk/
-IUSE=+mbuffer +doc
+IUSE=+mbuffer +doc +lsbtr
 LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b244dbb5c098a987b9d11202fdf7caa6
+_md5_=703b6817de96dc52053a36e2d5b968b6
diff --git a/metadata/md5-cache/app-backup/duply-1.11.2 b/metadata/md5-cache/app-backup/duply-1.11.2
deleted file mode 100644
index d958988aebb7..000000000000
--- a/metadata/md5-cache/app-backup/duply-1.11.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=app-text/txt2man
-DESCRIPTION=A shell frontend for duplicity
-EAPI=5
-HOMEPAGE=http://duply.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-backup/duplicity
-SLOT=0
-SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/duply_1.11.2.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a10108cc322dbcb5cd94e8157480b80d
diff --git a/metadata/md5-cache/app-backup/kfoldersync-3.4.1 b/metadata/md5-cache/app-backup/kfoldersync-3.4.1
index 7651537805c5..771bea1b4933 100644
--- a/metadata/md5-cache/app-backup/kfoldersync-3.4.1
+++ b/metadata/md5-cache/app-backup/kfoldersync-3.4.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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/kio-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 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1485353737/kfoldersync-3.4.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e53badb041922d77ad2458c1bbcfa9eb
diff --git a/metadata/md5-cache/app-backup/kup-0.8.0 b/metadata/md5-cache/app-backup/kup-0.8.0
index f3684c37988d..fee638b62439 100644
--- a/metadata/md5-cache/app-backup/kup-0.8.0
+++ b/metadata/md5-cache/app-backup/kup-0.8.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/libgit2:= dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdbusaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kidletime:5 kde-frameworks/kinit:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/knotifications:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/plasma:5 kde-frameworks/solid:5 dev-qt/qtdeclarative:5 dev-qt/qtsvg:5 net-misc/rsync || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kup/kup-0.8.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6ff6ced050ea6a46d9adde0585f5312
diff --git a/metadata/md5-cache/app-backup/rdedup-1.0.2 b/metadata/md5-cache/app-backup/rdedup-1.0.2
index 4ff2bb457930..7eaac87b4bb0 100644
--- a/metadata/md5-cache/app-backup/rdedup-1.0.2
+++ b/metadata/md5-cache/app-backup/rdedup-1.0.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD ISC MIT MPL-2.0 Unlicense
 RDEPEND=>=dev-libs/libsodium-1.0.11:=
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/argparse/0.2.1/download -> argparse-0.2.1.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/flate2/0.2.17/download -> flate2-0.2.17.crate https://crates.io/api/v1/crates/fs2/0.2.5/download -> fs2-0.2.5.crate https://crates.io/api/v1/crates/gcc/0.3.43/download -> gcc-0.3.43.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.20/download -> libc-0.2.20.crate https://crates.io/api/v1/crates/libsodium-sys/0.0.12/download -> libsodium-sys-0.0.12.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/miniz-sys/0.1.9/download -> miniz-sys-0.1.9.crate https://crates.io/api/v1/crates/pkg-config/0.3.9/download -> pkg-config-0.3.9.crate https://crates.io/api/v1/crates/rand/0.3.15/download -> rand-0.3.15.crate https://crates.io/api/v1/crates/rdedup-lib/1.0.2/download -> rdedup-lib-1.0.2.crate https://crates.io/api/v1/crates/regex/0.1.80/download -> regex-0.1.80.crate https://crates.io/api/v1/crates/regex-syntax/0.3.9/download -> regex-syntax-0.3.9.crate https://crates.io/api/v1/crates/rollsum/0.2.1/download -> rollsum-0.2.1.crate https://crates.io/api/v1/crates/rpassword/0.2.3/download -> rpassword-0.2.3.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.22/download -> rustc-serialize-0.3.22.crate https://crates.io/api/v1/crates/serde/0.7.15/download -> serde-0.7.15.crate https://crates.io/api/v1/crates/sodiumoxide/0.0.12/download -> sodiumoxide-0.0.12.crate https://crates.io/api/v1/crates/termios/0.2.2/download -> termios-0.2.2.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/time/0.1.36/download -> time-0.1.36.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/rdedup/1.0.2/download -> rdedup-1.0.2.crate https://crates.io/api/v1/crates/rdedup-lib/1.0.2/download -> rdedup-lib-1.0.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.16/download -> redox_syscall-0.1.16.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=28eeef711827c48dcc855b2a969ad6ef
diff --git a/metadata/md5-cache/app-backup/rear-1.15-r1 b/metadata/md5-cache/app-backup/rear-1.15-r1
deleted file mode 100644
index c3808b339271..000000000000
--- a/metadata/md5-cache/app-backup/rear-1.15-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A setup-and-forget Linux bare metal disaster recovery solution
-EAPI=5
-HOMEPAGE=http://relax-and-recover.org/
-IUSE=libressl udev
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-dialup/mingetty net-fs/nfs-utils sys-apps/iproute2 sys-apps/lsb-release sys-apps/util-linux sys-block/parted sys-boot/syslinux virtual/cdrtools udev? ( virtual/udev )
-SLOT=0
-SRC_URI=mirror://sourceforge/rear/rear-1.15.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e0045754a7ce7fbbeeedddde30ee54cc
diff --git a/metadata/md5-cache/app-backup/rear-1.17.0 b/metadata/md5-cache/app-backup/rear-1.17.0
deleted file mode 100644
index cae231e325f6..000000000000
--- a/metadata/md5-cache/app-backup/rear-1.17.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A setup-and-forget Linux bare metal disaster recovery solution
-EAPI=5
-HOMEPAGE=http://relax-and-recover.org/
-IUSE=libressl udev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/util-linux sys-block/parted sys-boot/syslinux virtual/cdrtools udev? ( virtual/udev )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/rear/rear/1.17/1.17.0/rear-1.17.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bdc1d9ced83581ec05c568d3310f8a4a
diff --git a/metadata/md5-cache/app-backup/rear-1.17.1 b/metadata/md5-cache/app-backup/rear-1.17.1
deleted file mode 100644
index 7ffa7e3f444c..000000000000
--- a/metadata/md5-cache/app-backup/rear-1.17.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A setup-and-forget Linux bare metal disaster recovery solution
-EAPI=5
-HOMEPAGE=http://relax-and-recover.org/
-IUSE=libressl udev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-dialup/mingetty net-fs/nfs-utils sys-apps/gawk sys-apps/iproute2 sys-apps/lsb-release sys-apps/util-linux sys-block/parted sys-boot/syslinux virtual/cdrtools udev? ( virtual/udev )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/rear/rear/1.17/1.17.1/rear-1.17.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bdc1d9ced83581ec05c568d3310f8a4a
diff --git a/metadata/md5-cache/app-backup/tarsnap-1.0.35 b/metadata/md5-cache/app-backup/tarsnap-1.0.35
deleted file mode 100644
index 88c7d16db8f9..000000000000
--- a/metadata/md5-cache/app-backup/tarsnap-1.0.35
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/e2fsprogs-libs sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) xattr? ( sys-apps/attr ) virtual/os-headers
-DESCRIPTION=Online backups for the truly paranoid
-EAPI=5
-HOMEPAGE=http://www.tarsnap.com/
-IUSE=acl bzip2 libressl lzma cpu_flags_x86_sse2 xattr
-KEYWORDS=~amd64 ~x86
-LICENSE=tarsnap
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/e2fsprogs-libs sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) xattr? ( sys-apps/attr )
-SLOT=0
-SRC_URI=https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz
-_md5_=4f488df426cf49358bb576bf0484ecdf
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 8475aca1d70c..bf2316ff2303 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/siege-4.0.5 b/metadata/md5-cache/app-benchmarks/siege-4.0.5
index 59a26098bf7a..964b5da5b162 100644
--- a/metadata/md5-cache/app-benchmarks/siege-4.0.5
+++ b/metadata/md5-cache/app-benchmarks/siege-4.0.5
@@ -5,10 +5,10 @@ DESCRIPTION=A HTTP regression testing and benchmarking utility
 EAPI=7
 HOMEPAGE=https://www.joedog.org/siege-home https://github.com/JoeDog/siege
 IUSE=libressl ssl
-KEYWORDS=~amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~hppa ~mips ppc x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://download.joedog.org/siege/siege-4.0.5.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=350f7b8b3df28446aeefa1d7da263506
+_md5_=bf71ae254bfaf6173b43164ee0922492
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.11.20 b/metadata/md5-cache/app-benchmarks/stress-ng-0.11.20
deleted file mode 100644
index d09dc918d7d0..000000000000
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.11.20
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile postinst
-DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
-DESCRIPTION=Stress test for a computer system with various selectable ways
-EAPI=7
-HOMEPAGE=https://kernel.ubuntu.com/~cking/stress-ng/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
-SLOT=0
-SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.11.20.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=748bd533f1d85f0160fdcb190a4d60e1
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.11.21 b/metadata/md5-cache/app-benchmarks/stress-ng-0.11.21
new file mode 100644
index 000000000000..666cf1443022
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.11.21
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile postinst
+DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
+DESCRIPTION=Stress test for a computer system with various selectable ways
+EAPI=7
+HOMEPAGE=https://kernel.ubuntu.com/~cking/stress-ng/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
+SLOT=0
+SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.11.21.tar.xz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=748bd533f1d85f0160fdcb190a4d60e1
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index fbc6fb58f649..f78918f76774 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/cdemu-3.2.4 b/metadata/md5-cache/app-cdr/cdemu-3.2.4
index 969ed5884279..74f60e4e8344 100644
--- a/metadata/md5-cache/app-cdr/cdemu-3.2.4
+++ b/metadata/md5-cache/app-cdr/cdemu-3.2.4
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/cdemu-client/cdemu-client-3.2.4.tar.bz2
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f051b2fa319ea12fa85fa74b907e579
diff --git a/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.4 b/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.4
index 6d1a74502219..298e4054bfe3 100644
--- a/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.4
+++ b/metadata/md5-cache/app-cdr/cdemu-daemon-3.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libmirage-3.2.0:= >=media-libs/libao-0.8.0:= sys-apps/dbus >=sys-fs/vhba-20130607
 SLOT=0/7
 SRC_URI=https://download.sourceforge.net/cdemu/cdemu-daemon/cdemu-daemon-3.2.4.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5344e04d10280b6a25b38714b102d37a
diff --git a/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.1 b/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.1
index 1c7acd25a57f..5d3e5b346b4c 100644
--- a/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.1
+++ b/metadata/md5-cache/app-cdr/dolphin-plugins-mountiso-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/dolphin-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/dolphin-plugins-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5703effb7b485043883f292a532f8f41
diff --git a/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r1 b/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r1
deleted file mode 100644
index db3d6082688c..000000000000
--- a/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile prepare setup unpack
-DEPEND=dev-libs/libxml2 dev-libs/popt virtual/pkgconfig test? ( dev-util/valgrind )
-DESCRIPTION=A tool to dump and debug bootable CD-like images
-EAPI=6
-HOMEPAGE=https://github.com/rhboot/dumpet
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 dev-libs/popt
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rhboot/dumpet/archive/8f47670dd582c96ad1b6dd3c9b9da0acebded5d8.tar.gz -> dumpet-2.1_p20140601.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=54f0e858bf09af09a8c44b7c32fcf542
diff --git a/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r3 b/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r3
deleted file mode 100644
index cb5f8df91b69..000000000000
--- a/metadata/md5-cache/app-cdr/dumpet-2.1_p20140601-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile prepare setup unpack
-DEPEND=dev-libs/libxml2 dev-libs/popt virtual/pkgconfig test? ( dev-util/valgrind )
-DESCRIPTION=A tool to dump and debug bootable CD-like images
-EAPI=6
-HOMEPAGE=https://github.com/rhboot/dumpet
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 dev-libs/popt
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rhboot/dumpet/archive/8f47670dd582c96ad1b6dd3c9b9da0acebded5d8.tar.gz -> dumpet-2.1_p20140601.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=54b29e1fb671d439a48d1d65ceaaddc2
diff --git a/metadata/md5-cache/app-cdr/gcdemu-3.2.4 b/metadata/md5-cache/app-cdr/gcdemu-3.2.4
index 342d76ce4d48..9c4845dd6fb6 100644
--- a/metadata/md5-cache/app-cdr/gcdemu-3.2.4
+++ b/metadata/md5-cache/app-cdr/gcdemu-3.2.4
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/gcdemu/gcdemu-3.2.4.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=786454b7c3d70acc88530852c6f136c4
diff --git a/metadata/md5-cache/app-cdr/isoimagewriter-0.8 b/metadata/md5-cache/app-cdr/isoimagewriter-0.8
index 6a9260017140..dcc07cace43f 100644
--- a/metadata/md5-cache/app-cdr/isoimagewriter-0.8
+++ b/metadata/md5-cache/app-cdr/isoimagewriter-0.8
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=app-crypt/gpgme[cxx,qt5] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 virtual/libudev:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/isoimagewriter/0.8/isoimagewriter-0.8.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87e6e0a48ff9e9fbb0a26b0d85cb442e
diff --git a/metadata/md5-cache/app-cdr/kcdemu-0.7.3 b/metadata/md5-cache/app-cdr/kcdemu-0.7.3
index 111f93e51763..4ac96e38dfa0 100644
--- a/metadata/md5-cache/app-cdr/kcdemu-0.7.3
+++ b/metadata/md5-cache/app-cdr/kcdemu-0.7.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=app-cdr/cdemu-2.0.0[cdemu-daemon] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/downloadfile/id/1511553040/o/1/s/3e4f95734673128605fc1d8721894a1c/t/1517011407/u/65804/kde_cdemu-0.7.3.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8245c471e43d093edebc8954011c0a81
diff --git a/metadata/md5-cache/app-cdr/pburn-3.4.3 b/metadata/md5-cache/app-cdr/pburn-3.4.3
deleted file mode 100644
index c1c32ab46c96..000000000000
--- a/metadata/md5-cache/app-cdr/pburn-3.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/pet2tgz
-DESCRIPTION=A burning tool with GTK+ frontend
-EAPI=4
-HOMEPAGE=http://murga-linux.com/puppy/viewtopic.php?t=23881
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-admin/killproc app-cdr/cddetect app-cdr/dvd+rw-tools sys-apps/hotplug2stdout virtual/cdrtools >=x11-misc/gtkdialog-0.8.0
-SLOT=0
-SRC_URI=mirror://gentoo/pburn-3.4.3.pet
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=97c316d584bec64f37283bea98cbb7f0
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 48b961b9fa7b..25228ec415be 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/efitools-1.7.0 b/metadata/md5-cache/app-crypt/efitools-1.7.0
deleted file mode 100644
index ff52a28cca3d..000000000000
--- a/metadata/md5-cache/app-crypt/efitools-1.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man >=sys-boot/gnu-efi-3.0u app-crypt/sbsigntools virtual/pkgconfig dev-perl/File-Slurp
-DESCRIPTION=Tools for manipulating UEFI secure boot platforms
-EAPI=5
-HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git
-IUSE=libressl
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
-SLOT=0
-SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git/snapshot/v1.7.0.tar.bz2 -> efitools-1.7.0.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8a266fa0be491d0be16e8149531d4c12
diff --git a/metadata/md5-cache/app-crypt/jetring-0.25 b/metadata/md5-cache/app-crypt/jetring-0.25
deleted file mode 100644
index 108453913d28..000000000000
--- a/metadata/md5-cache/app-crypt/jetring-0.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-crypt/gnupg
-DESCRIPTION=GPG keyring maintenance using changesets
-EAPI=5
-HOMEPAGE=http://joeyh.name/code/jetring/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-crypt/gnupg dev-lang/perl
-SLOT=0
-SRC_URI=mirror://debian/pool/main/j/jetring/jetring_0.25.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9069b77a055ff6cea97bbfdccd5ddb0a
diff --git a/metadata/md5-cache/app-crypt/jitterentropy-2.2.0 b/metadata/md5-cache/app-crypt/jitterentropy-2.2.0
index c15b006abc6e..24e73f28ff45 100644
--- a/metadata/md5-cache/app-crypt/jitterentropy-2.2.0
+++ b/metadata/md5-cache/app-crypt/jitterentropy-2.2.0
@@ -3,9 +3,9 @@ DESCRIPTION=Hardware RNG based on CPU timing jitter
 EAPI=7
 HOMEPAGE=https://github.com/smuellerDD/jitterentropy-library
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/smuellerDD/jitterentropy-library/archive/v2.2.0.tar.gz -> jitterentropy-2.2.0.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aea502fed8e4946ac94391c42d392a70
+_md5_=ff203ef697b3d12367fb8489ad43e719
diff --git a/metadata/md5-cache/app-crypt/minisign-0.9 b/metadata/md5-cache/app-crypt/minisign-0.9
index f0675f9719d9..c209dc3791b8 100644
--- a/metadata/md5-cache/app-crypt/minisign-0.9
+++ b/metadata/md5-cache/app-crypt/minisign-0.9
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=>=dev-libs/libsodium-1.0.16:=[-minimal]
 SLOT=0
 SRC_URI=https://github.com/jedisct1/minisign/archive/0.9.tar.gz -> minisign-0.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da7f7ff2f51699927aee9bd87fdc39d9
diff --git a/metadata/md5-cache/app-crypt/minisign-9999 b/metadata/md5-cache/app-crypt/minisign-9999
index 64b782a895ac..14ff32497287 100644
--- a/metadata/md5-cache/app-crypt/minisign-9999
+++ b/metadata/md5-cache/app-crypt/minisign-9999
@@ -8,5 +8,5 @@ LICENSE=ISC
 PROPERTIES=live
 RDEPEND=>=dev-libs/libsodium-1.0.16:=[-minimal]
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da7f7ff2f51699927aee9bd87fdc39d9
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r1 b/metadata/md5-cache/app-crypt/monkeysphere-0.36-r1
deleted file mode 100644
index 910305cec28b..000000000000
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg app-misc/lockfile-progs dev-perl/Crypt-OpenSSL-RSA dev-perl/Digest-SHA1 || ( net-analyzer/netcat net-misc/socat ) test? ( net-misc/socat )
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg app-misc/lockfile-progs dev-perl/Crypt-OpenSSL-RSA dev-perl/Digest-SHA1 || ( net-analyzer/netcat net-misc/socat )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.36.orig.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=92d280bdf1d9e23a226db402cde1722b
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.37 b/metadata/md5-cache/app-crypt/monkeysphere-0.37
deleted file mode 100644
index 7d9620a09d63..000000000000
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.37
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-RESTRICT=test
-SLOT=0/0
-SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e86d1e4b88c1ef01657632f967844ace
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.38 b/metadata/md5-cache/app-crypt/monkeysphere-0.38
deleted file mode 100644
index 178a3bea3f9c..000000000000
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.38
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-RESTRICT=test
-SLOT=0/0
-SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.38.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.38.orig.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d18de51849e6ea250bbc404dfdb2d477
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.39 b/metadata/md5-cache/app-crypt/monkeysphere-0.39
deleted file mode 100644
index b232048f97ae..000000000000
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.39
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-RESTRICT=test
-SLOT=0/0
-SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.39.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.39.orig.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=df5cc7c52af46ded0cf6755b25595e8e
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.42 b/metadata/md5-cache/app-crypt/monkeysphere-0.42
deleted file mode 100644
index eaf9a5886d9d..000000000000
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.42
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-RESTRICT=test
-SLOT=0/0
-SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.42.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.42.orig.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d8d8bf2359661e53aa96e5c195a04da4
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.3.1 b/metadata/md5-cache/app-crypt/nitrocli-0.3.1
index d4ef3b568602..f6081c5a4acb 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.3.1
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/argparse/0.2.2/download -> argparse-0.2.2.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/cc/1.0.48/download -> cc-1.0.48.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/getrandom/0.1.13/download -> getrandom-0.1.13.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/nitrocli/0.3.1/download -> nitrocli-0.3.1.crate https://crates.io/api/v1/crates/nitrokey/0.4.0/download -> nitrokey-0.4.0.crate https://crates.io/api/v1/crates/nitrokey-sys/3.5.0/download -> nitrokey-sys-3.5.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.3.2/download -> nitrokey-test-0.3.2.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.7/download -> proc-macro2-1.0.7.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/syn/1.0.13/download -> syn-1.0.13.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8e37ec93a6c368e2f59d9be5db0ebffa
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.3.2 b/metadata/md5-cache/app-crypt/nitrocli-0.3.2
index 0c4dcdd92ce4..fa42a36d1cec 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.3.2
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.3.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cc/1.0.48/download -> cc-1.0.48.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/getrandom/0.1.13/download -> getrandom-0.1.13.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/nitrocli/0.3.2/download -> nitrocli-0.3.2.crate https://crates.io/api/v1/crates/nitrokey/0.6.0/download -> nitrokey-0.6.0.crate https://crates.io/api/v1/crates/nitrokey-sys/3.5.0/download -> nitrokey-sys-3.5.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.3.2/download -> nitrokey-test-0.3.2.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/0.4.12/download -> proc-macro-error-0.4.12.crate https://crates.io/api/v1/crates/proc-macro-error-attr/0.4.12/download -> proc-macro-error-attr-0.4.12.crate https://crates.io/api/v1/crates/proc-macro2/1.0.7/download -> proc-macro2-1.0.7.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/structopt/0.3.12/download -> structopt-0.3.12.crate https://crates.io/api/v1/crates/structopt-derive/0.4.5/download -> structopt-derive-0.4.5.crate https://crates.io/api/v1/crates/syn/1.0.14/download -> syn-1.0.14.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fd64a9cc9ffbba95be9f2f5dffa5d1a3
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.3.3 b/metadata/md5-cache/app-crypt/nitrocli-0.3.3
index 8783b269e8a1..a8d2f7d5fbca 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.3.3
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.3.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nitrocli/0.3.3/download -> nitrocli-0.3.3.crate https://crates.io/api/v1/crates/nitrokey/0.6.0/download -> nitrokey-0.6.0.crate https://crates.io/api/v1/crates/nitrokey-sys/3.5.0/download -> nitrokey-sys-3.5.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.3.2/download -> nitrokey-test-0.3.2.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.2/download -> proc-macro-error-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.2/download -> proc-macro-error-attr-1.0.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.10/download -> proc-macro2-1.0.10.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/structopt/0.3.13/download -> structopt-0.3.13.crate https://crates.io/api/v1/crates/structopt-derive/0.4.6/download -> structopt-derive-0.4.6.crate https://crates.io/api/v1/crates/syn/1.0.17/download -> syn-1.0.17.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=bde98e784a296cef74fb90824c297494
diff --git a/metadata/md5-cache/app-crypt/nitrocli-0.3.4 b/metadata/md5-cache/app-crypt/nitrocli-0.3.4
index 9a1b3efc92b9..5d1a0b4cb874 100644
--- a/metadata/md5-cache/app-crypt/nitrocli-0.3.4
+++ b/metadata/md5-cache/app-crypt/nitrocli-0.3.4
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/hidapi app-crypt/gnupg
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/anyhow/1.0.32/download -> anyhow-1.0.32.crate https://crates.io/api/v1/crates/base32/0.4.0/download -> base32-0.4.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nitrocli/0.3.4/download -> nitrocli-0.3.4.crate https://crates.io/api/v1/crates/nitrokey/0.7.1/download -> nitrokey-0.7.1.crate https://crates.io/api/v1/crates/nitrokey-sys/3.5.0/download -> nitrokey-sys-3.5.0.crate https://crates.io/api/v1/crates/nitrokey-test/0.4.0/download -> nitrokey-test-0.4.0.crate https://crates.io/api/v1/crates/nitrokey-test-state/0.1.0/download -> nitrokey-test-state-0.1.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.2/download -> proc-macro-error-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.2/download -> proc-macro-error-attr-1.0.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.19/download -> proc-macro2-1.0.19.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/structopt/0.3.13/download -> structopt-0.3.13.crate https://crates.io/api/v1/crates/structopt-derive/0.4.6/download -> structopt-derive-0.4.6.crate https://crates.io/api/v1/crates/syn/1.0.36/download -> syn-1.0.36.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=212fefc20927fa160beb0b63714d4284
diff --git a/metadata/md5-cache/app-crypt/nitrokey-app-1.4-r1 b/metadata/md5-cache/app-crypt/nitrokey-app-1.4-r1
index 1142a33adcb4..1bae426b0e82 100644
--- a/metadata/md5-cache/app-crypt/nitrokey-app-1.4-r1
+++ b/metadata/md5-cache/app-crypt/nitrokey-app-1.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-crypt/libnitrokey-3.5:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/Nitrokey/nitrokey-app/archive/v1.4.tar.gz -> nitrokey-app-1.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64eebfd6f95b286c1ae97a9e5d277eca
diff --git a/metadata/md5-cache/app-crypt/nitrokey-app-1.4.2 b/metadata/md5-cache/app-crypt/nitrokey-app-1.4.2
index 26f40570f5ea..efd1f8e737e7 100644
--- a/metadata/md5-cache/app-crypt/nitrokey-app-1.4.2
+++ b/metadata/md5-cache/app-crypt/nitrokey-app-1.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-crypt/libnitrokey-3.5:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/Nitrokey/nitrokey-app/archive/v1.4.2.tar.gz -> nitrokey-app-1.4.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39538e57ffb3711998ba4f2026c5f62d
diff --git a/metadata/md5-cache/app-crypt/nitrokey-app-9999 b/metadata/md5-cache/app-crypt/nitrokey-app-9999
index b270c03af230..01ef4e5bd5f6 100644
--- a/metadata/md5-cache/app-crypt/nitrokey-app-9999
+++ b/metadata/md5-cache/app-crypt/nitrokey-app-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=app-crypt/libnitrokey-3.5:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39538e57ffb3711998ba4f2026c5f62d
diff --git a/metadata/md5-cache/app-crypt/qca-2.3.1 b/metadata/md5-cache/app-crypt/qca-2.3.1
index fdba5ceca047..040fdc6866ea 100644
--- a/metadata/md5-cache/app-crypt/qca-2.3.1
+++ b/metadata/md5-cache/app-crypt/qca-2.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 botan? ( dev-libs/botan:= ) gcrypt? ( dev-libs/libgcrypt
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://kde/stable/qca/2.3.1/qca-2.3.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2c921ceb11a3eed770196d17351b5f0
diff --git a/metadata/md5-cache/app-crypt/rotix-0.83 b/metadata/md5-cache/app-crypt/rotix-0.83
deleted file mode 100644
index 9c3c0fc974f6..000000000000
--- a/metadata/md5-cache/app-crypt/rotix-0.83
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/gettext
-DESCRIPTION=Rotix allows you to generate rotational obfuscations
-EAPI=5
-HOMEPAGE=https://github.com/shemminga/rotix
-KEYWORDS=amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-devel/gettext
-SLOT=0
-SRC_URI=http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/rotix-0.83/rotix-0.83.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d84502b5a0eae24a139770db60fd7d0e
diff --git a/metadata/md5-cache/app-crypt/sbsigntools-0.6-r2 b/metadata/md5-cache/app-crypt/sbsigntools-0.6-r2
deleted file mode 100644
index b308a4ae0d03..000000000000
--- a/metadata/md5-cache/app-crypt/sbsigntools-0.6-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/openssl:0= sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi sys-libs/binutils-libs virtual/pkgconfig
-DESCRIPTION=Utilities for signing and verifying files for UEFI Secure Boot
-EAPI=5
-HOMEPAGE=https://launchpad.net/ubuntu/+source/sbsigntool
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/openssl:0= sys-apps/util-linux
-SLOT=0
-SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/sbsigntool_0.6.orig.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=68c7664c5d28d53cd277c0790c8c3a31
diff --git a/metadata/md5-cache/app-crypt/shash-0.2.6-r2 b/metadata/md5-cache/app-crypt/shash-0.2.6-r2
deleted file mode 100644
index fb9631b02461..000000000000
--- a/metadata/md5-cache/app-crypt/shash-0.2.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-crypt/mhash-0.8.18-r1
-DESCRIPTION=Generate or check digests or MACs of files
-EAPI=5
-HOMEPAGE=http://mcrypt.hellug.gr/shash/
-IUSE=static
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/mhash-0.8.18-r1
-SLOT=0
-SRC_URI=ftp://mcrypt.hellug.gr/pub/mcrypt/shash/shash-0.2.6.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=73da674d561f4320ab696ca467510818
diff --git a/metadata/md5-cache/app-crypt/signify-20 b/metadata/md5-cache/app-crypt/signify-20
deleted file mode 100644
index a0366685b17b..000000000000
--- a/metadata/md5-cache/app-crypt/signify-20
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Cryptographically sign and verify files
-EAPI=5
-HOMEPAGE=http://www.openbsd.org/ https://github.com/aperezdc/signify
-KEYWORDS=~amd64
-LICENSE=BSD-1
-RDEPEND=>=dev-libs/libbsd-0.7
-SLOT=0
-SRC_URI=https://github.com/aperezdc/signify/archive/v20.tar.gz -> signify-20.tar.gz
-_md5_=f212f558583c3f13dc0cb52e6a69c473
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.24_p7 b/metadata/md5-cache/app-crypt/veracrypt-1.24_p7
new file mode 100644
index 000000000000..a198d6ba4110
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.24_p7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup test
+DEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev-libs/pkcs11-helper virtual/pkgconfig asm? ( dev-lang/yasm )
+DESCRIPTION=Disk encryption with strong security based on TrueCrypt
+EAPI=6
+HOMEPAGE=https://www.veracrypt.fr/en/Home.html
+IUSE=+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X kernel_linux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD truecrypt-3.0
+RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev-libs/pkcs11-helper
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.24-Update7.tar.gz -> veracrypt-1.24_p7.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_md5_=5a202177d8373c16a6e897651a49b1cd
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 2f699cfe7766..d391f3c2760c 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/dikt-2s_p1 b/metadata/md5-cache/app-dicts/dikt-2s_p1
index b2fd151687a6..8ac579f7a166 100644
--- a/metadata/md5-cache/app-dicts/dikt-2s_p1
+++ b/metadata/md5-cache/app-dicts/dikt-2s_p1
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=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/kguiaddons-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/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 !app-dicts/dikt:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://bitbucket-archive.softwareheritage.org/static/67/67f37093-df38-43b8-845b-2952e0a33bb3/attachments/dikt-2s1.txz -> dikt-2s1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3e0c65bae78b025216532f9b623b55d
diff --git a/metadata/md5-cache/app-dicts/verbiste-0.1.38-r1 b/metadata/md5-cache/app-dicts/verbiste-0.1.38-r1
deleted file mode 100644
index 5a0d53f1c8ec..000000000000
--- a/metadata/md5-cache/app-dicts/verbiste-0.1.38-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 ) sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=French conjugation system
-EAPI=5
-HOMEPAGE=http://sarrazip.com/dev/verbiste.html
-IUSE=gtk
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 )
-SLOT=0
-SRC_URI=http://sarrazip.com/dev/verbiste-0.1.38.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b63f71107132221efbdaa8a3aaa15e23
diff --git a/metadata/md5-cache/app-dicts/verbiste-0.1.41 b/metadata/md5-cache/app-dicts/verbiste-0.1.41
deleted file mode 100644
index 416d837a7410..000000000000
--- a/metadata/md5-cache/app-dicts/verbiste-0.1.41
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 ) sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=French conjugation system
-EAPI=5
-HOMEPAGE=http://sarrazip.com/dev/verbiste.html
-IUSE=gtk
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxml2-2.4.0:2 gtk? ( >=x11-libs/gtk+-2.6:2 )
-SLOT=0
-SRC_URI=http://sarrazip.com/dev/verbiste-0.1.41.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9866f0bd8ee6dc28675e1f2a636a16e5
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index e40f73f8122d..fe6d4775c2ee 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/casting-spels-emacs-19-r2 b/metadata/md5-cache/app-doc/casting-spels-emacs-19-r2
index 324791663535..4c6e7dfacc67 100644
--- a/metadata/md5-cache/app-doc/casting-spels-emacs-19-r2
+++ b/metadata/md5-cache/app-doc/casting-spels-emacs-19-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ FDL-1.2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://casting-spels-emacs.googlecode.com/files/casting-spels-emacs-v19.zip
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=47ea6be5ef00bed6c4e4a88716a6b4b5
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.15 b/metadata/md5-cache/app-doc/doxygen-1.8.15
deleted file mode 100644
index b8ae51dea82a..000000000000
--- a/metadata/md5-cache/app-doc/doxygen-1.8.15
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/flex sys-devel/bison doc? ( || ( dev-lang/python:3.6 ) ) app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( <sys-devel/clang-10:= ) 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 ) sys-devel/make >=dev-util/cmake-3.9.6 !!sys-devel/llvm:0
-DESCRIPTION=Documentation system for most programming languages
-EAPI=6
-HOMEPAGE=http://www.doxygen.org
-IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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-10:= ) 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://doxygen.nl/files/doxygen-1.8.15.src.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d2223968e71ff317d14a596c04b06a1f
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.16-r1 b/metadata/md5-cache/app-doc/doxygen-1.8.16-r1
deleted file mode 100644
index f8bc418ef13e..000000000000
--- a/metadata/md5-cache/app-doc/doxygen-1.8.16-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/flex sys-devel/bison doc? ( || ( dev-lang/python:3.6 ) ) app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( <sys-devel/clang-10:= ) 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 ) sys-devel/make >=dev-util/cmake-3.9.6 !!sys-devel/llvm:0
-DESCRIPTION=Documentation system for most programming languages
-EAPI=6
-HOMEPAGE=http://www.doxygen.org
-IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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-10:= ) 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://doxygen.nl/files/doxygen-1.8.16.src.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67c53e41f6ef033777952a99f07f0a83
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-4.2 b/metadata/md5-cache/app-doc/gnucash-docs-4.2
new file mode 100644
index 000000000000..b43e014b2b0c
--- /dev/null
+++ b/metadata/md5-cache/app-doc/gnucash-docs-4.2
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt
+DESCRIPTION=Documentation package for GnuCash
+EAPI=7
+HOMEPAGE=http://www.gnucash.org/
+IUSE=l10n_de l10n_it l10n_ja l10n_pt l10n_ru
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 FDL-1.1
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/4.2.tar.gz -> gnucash-docs-4.2.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1d9be933130e7aa1a0bfe414952ce7fc
diff --git a/metadata/md5-cache/app-doc/halibut-1.1 b/metadata/md5-cache/app-doc/halibut-1.1
deleted file mode 100644
index 7681a64e6788..000000000000
--- a/metadata/md5-cache/app-doc/halibut-1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=yet another free document preparation system
-EAPI=5
-HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/halibut/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-1.1.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=197d257826e20036c12dbbaadbe714d8
diff --git a/metadata/md5-cache/app-doc/kicad-doc-5.1.5 b/metadata/md5-cache/app-doc/kicad-doc-5.1.5
index b485ce79bc16..52875a602264 100644
--- a/metadata/md5-cache/app-doc/kicad-doc-5.1.5
+++ b/metadata/md5-cache/app-doc/kicad-doc-5.1.5
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
 REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh )
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-doc/archive/5.1.5.tar.gz -> kicad-doc-5.1.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a11243103560ecdd212b6e408ede161d
diff --git a/metadata/md5-cache/app-doc/kicad-doc-5.1.6 b/metadata/md5-cache/app-doc/kicad-doc-5.1.6
index 7a7bac63c4ed..3110ac360ea7 100644
--- a/metadata/md5-cache/app-doc/kicad-doc-5.1.6
+++ b/metadata/md5-cache/app-doc/kicad-doc-5.1.6
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-3+ CC-BY-3.0 ) GPL-2
 REQUIRED_USE=|| ( html pdf ) ^^ ( l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/services/kicad-doc/-/archive/5.1.6/kicad-doc-5.1.6.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3fadc109da0e2a9cdfc44a586de7216f
diff --git a/metadata/md5-cache/app-doc/php-docs-20101029-r1 b/metadata/md5-cache/app-doc/php-docs-20101029-r1
deleted file mode 100644
index 95e75a60395f..000000000000
--- a/metadata/md5-cache/app-doc/php-docs-20101029-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install preinst unpack
-DESCRIPTION=HTML documentation for PHP
-EAPI=4
-HOMEPAGE=http://www.php.net/download-docs.php
-IUSE=+l10n_en l10n_de l10n_es l10n_fa l10n_fr l10n_ja l10n_pl l10n_pt-BR l10n_ro l10n_tr
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86
-LICENSE=GPL-2
-REQUIRED_USE=|| ( l10n_en l10n_de l10n_es l10n_fa l10n_fr l10n_ja l10n_pl l10n_pt-BR l10n_ro l10n_tr )
-RESTRICT=strip binchecks
-SLOT=0
-SRC_URI=l10n_en? ( http://olemarkus.org/~olemarkus/gentoo/php_manual_en-20101029.tar.gz ) l10n_de? ( http://olemarkus.org/~olemarkus/gentoo/php_manual_de-20101029.tar.gz ) l10n_es? ( http://olemarkus.org/~olemarkus/gentoo/php_manual_es-20101029.tar.gz ) l10n_fa? ( http://olemarkus.org/~olemarkus/gentoo/php_manual_fa-20101029.tar.gz ) l10n_fr? ( http://olemarkus.org/~olemarkus/gentoo/php_manual_fr-20101029.tar.gz ) l10n_ja? ( http://olemarkus.org/~olemarkus/gentoo/php_manual_ja-20101029.tar.gz ) l10n_pl? ( http://olemarkus.org/~olemarkus/gentoo/php_manual_pl-20101029.tar.gz ) l10n_pt-BR? ( http://olemarkus.org/~olemarkus/gentoo/php_manual_pt_BR-20101029.tar.gz ) l10n_ro? ( http://olemarkus.org/~olemarkus/gentoo/php_manual_ro-20101029.tar.gz ) l10n_tr? ( http://olemarkus.org/~olemarkus/gentoo/php_manual_tr-20101029.tar.gz )
-_md5_=0d6c4667b95f625af7edf8456732a853
diff --git a/metadata/md5-cache/app-doc/zeal-0.6.1_p20200815 b/metadata/md5-cache/app-doc/zeal-0.6.1_p20200815
index da4178ecfa03..6c53bbdb2753 100644
--- a/metadata/md5-cache/app-doc/zeal-0.6.1_p20200815
+++ b/metadata/md5-cache/app-doc/zeal-0.6.1_p20200815
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/libarchive:= dev-db/sqlite:3 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/extra-cmake-modules:5 x11-libs/libX11 x11-libs/libxcb:= >=x11-libs/xcb-util-keysyms-0.3.9 x11-themes/hicolor-icon-theme
 SLOT=0
 SRC_URI=https://github.com/zealdocs/zeal/archive/994cc5f6b6bfffddd5faaaafdb4fed483c38188f.tar.gz -> zeal-0.6.1_p20200815.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e72efcc7ec55391d74d66317592002ec
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index fac9fa8a0b7e..d22fa52b3573 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/emacs-23.4-r19 b/metadata/md5-cache/app-editors/emacs-23.4-r19
index fd975172c5ba..8ab0d2118239 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r19
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r19
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=23
 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-23.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5cc712ca84b6058c03e9d9ba6c74221b
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r8 b/metadata/md5-cache/app-editors/emacs-24.5-r8
index fc416d818156..bd0a3918486b 100644
--- a/metadata/md5-cache/app-editors/emacs-24.5-r8
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r8
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-5.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=39f993b6ea000f96d49f1e6c3bfcc50e
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r7 b/metadata/md5-cache/app-editors/emacs-25.3-r7
index e1e40579b7d1..33dbc03a2a15 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3-r7
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r7
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !<app-editors/emacs-vcs-25.3 app-eselect/eselect-emacs
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-2.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=46a745631c1d93544ea7b6b2c974ec1e
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r2 b/metadata/md5-cache/app-editors/emacs-26.3-r2
index baa0270ea4fe..c36e03bce204 100644
--- a/metadata/md5-cache/app-editors/emacs-26.3-r2
+++ b/metadata/md5-cache/app-editors/emacs-26.3-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !<app-editors/emacs-vcs-26.3 app-eselect/eselect-emacs
 SLOT=26
 SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=535396a5bb004a15db8804412d113262
diff --git a/metadata/md5-cache/app-editors/emacs-27.1-r1 b/metadata/md5-cache/app-editors/emacs-27.1-r1
index 120132fd3fb1..b360bccfad2a 100644
--- a/metadata/md5-cache/app-editors/emacs-27.1-r1
+++ b/metadata/md5-cache/app-editors/emacs-27.1-r1
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? (
 RESTRICT=test
 SLOT=27
 SRC_URI=mirror://gnu/emacs/emacs-27.1.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=742620288cb3af60a6f1b7a047ebca80
diff --git a/metadata/md5-cache/app-editors/emacs-27.1.9999-r1 b/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
index 833c95712445..81dde0368e49 100644
--- a/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
+++ b/metadata/md5-cache/app-editors/emacs-27.1.9999-r1
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=27-vcs
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b1bdbb6f11b75c2877696cfd425eea0e
diff --git a/metadata/md5-cache/app-editors/emacs-28.0.9999 b/metadata/md5-cache/app-editors/emacs-28.0.9999
index d56ba01455aa..afe8eb3260b4 100644
--- a/metadata/md5-cache/app-editors/emacs-28.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-28.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=28-vcs
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=46fae07b06cc6986f279261472a50001
diff --git a/metadata/md5-cache/app-editors/juffed-0.10_p20160323-r1 b/metadata/md5-cache/app-editors/juffed-0.10_p20160323-r1
index 8108f7fba1c5..0166311c3ad3 100644
--- a/metadata/md5-cache/app-editors/juffed-0.10_p20160323-r1
+++ b/metadata/md5-cache/app-editors/juffed-0.10_p20160323-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-i18n/enca dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
 SLOT=0
 SRC_URI=https://github.com/Mezomish/juffed/tarball/5ba17f90ec173e773470bc80ea26bca9a3f093fd -> juffed-0.10_p20160323.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b00f698b13d8d360e8f7c46563350dd2
diff --git a/metadata/md5-cache/app-editors/kile-2.9.93 b/metadata/md5-cache/app-editors/kile-2.9.93
index 3a1b99fa8082..80c68b06fa7b 100644
--- a/metadata/md5-cache/app-editors/kile-2.9.93
+++ b/metadata/md5-cache/app-editors/kile-2.9.93
@@ -10,5 +10,5 @@ LICENSE=FDL-1.2 GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/okular-19.04.3:5 >=kde-frameworks/kconfig-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/kdoctools-5.60.0:5 >=kde-frameworks/kguiaddons-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/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 pdf? ( app-text/poppler[qt5] ) !app-editors/kile:4 >=kde-apps/konsole-19.04.3:5 >=kde-apps/okular-19.04.3:5[pdf?] virtual/latex-base virtual/tex-base pdf? ( >=app-text/texlive-core-2014 app-text/ghostscript-gpl ) png? ( app-text/dvipng virtual/imagemagick-tools[png?] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kile/kile-2.9.93.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4b192eb61c9de6c1f3d13d4586ec44a
diff --git a/metadata/md5-cache/app-editors/le-1.14.3 b/metadata/md5-cache/app-editors/le-1.14.3
deleted file mode 100644
index 582754fecf27..000000000000
--- a/metadata/md5-cache/app-editors/le-1.14.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-libs/ncurses:0= app-arch/xz-utils
-DESCRIPTION=Terminal text editor
-EAPI=5
-HOMEPAGE=https://www.gnu.org/directory/text/editors/le-editor.html
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=ftp://ftp.yars.free.net/pub/source/le/le-1.14.3.tar.lzma
-_md5_=3faedaa1bdfafef97e7edb93f3029899
diff --git a/metadata/md5-cache/app-editors/neovim-0.4.3 b/metadata/md5-cache/app-editors/neovim-0.4.3
index ce79bad17606..444cf4c57fed 100644
--- a/metadata/md5-cache/app-editors/neovim-0.4.3
+++ b/metadata/md5-cache/app-editors/neovim-0.4.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 vim
 RDEPEND=dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-lua/lpeg[luajit=] dev-lua/luv[luajit=] dev-lua/mpack[luajit=] net-libs/libnsl luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.4.3.tar.gz -> neovim-0.4.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7d339128182acf5edfc72a01e2452406
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=34ff33a26900792e20a26c632d457e8d
diff --git a/metadata/md5-cache/app-editors/neovim-0.4.4 b/metadata/md5-cache/app-editors/neovim-0.4.4
new file mode 100644
index 000000000000..d5945811497b
--- /dev/null
+++ b/metadata/md5-cache/app-editors/neovim-0.4.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gperf virtual/libiconv virtual/libintl virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-lua/lpeg[luajit=] dev-lua/luv[luajit=] dev-lua/mpack[luajit=] net-libs/libnsl luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Vim-fork focused on extensibility and agility.
+EAPI=7
+HOMEPAGE=https://neovim.io
+IUSE=+lto +luajit +nvimpager +tui
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0 vim
+RDEPEND=dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-lua/lpeg[luajit=] dev-lua/luv[luajit=] dev-lua/mpack[luajit=] net-libs/libnsl luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
+SLOT=0
+SRC_URI=https://github.com/neovim/neovim/archive/v0.4.4.tar.gz -> neovim-0.4.4.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=32e502261d0061c3a5cd640ddbc8afc9
diff --git a/metadata/md5-cache/app-editors/neovim-9999 b/metadata/md5-cache/app-editors/neovim-9999
index bb91a6dfd46f..dc65e7836224 100644
--- a/metadata/md5-cache/app-editors/neovim-9999
+++ b/metadata/md5-cache/app-editors/neovim-9999
@@ -1,13 +1,13 @@
 BDEPEND=dev-util/gperf virtual/libiconv virtual/libintl virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-libs/libutf8proc:= dev-libs/libuv:0= >=dev-libs/libvterm-0.1 dev-libs/msgpack:0= dev-lua/lpeg[luajit=] dev-lua/luv[luajit=] dev-lua/mpack[luajit=] net-libs/libnsl luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/libutf8proc:= dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-lua/lpeg[luajit=] dev-lua/luv[luajit=] dev-lua/mpack[luajit=] net-libs/libnsl luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Vim-fork focused on extensibility and agility.
 EAPI=7
 HOMEPAGE=https://neovim.io
-IUSE=+luajit +nvimpager +tui
+IUSE=+lto +luajit +nvimpager +tui
 LICENSE=Apache-2.0 vim
 PROPERTIES=live
-RDEPEND=dev-libs/libutf8proc:= dev-libs/libuv:0= >=dev-libs/libvterm-0.1 dev-libs/msgpack:0= dev-lua/lpeg[luajit=] dev-lua/luv[luajit=] dev-lua/mpack[luajit=] net-libs/libnsl luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
+RDEPEND=dev-libs/libutf8proc:= dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-lua/lpeg[luajit=] dev-lua/luv[luajit=] dev-lua/mpack[luajit=] net-libs/libnsl luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) app-eselect/eselect-vi
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8291f19453dea3941b52101d04afcd23
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=72dc826bcdb59b98409582d9e4600005
diff --git a/metadata/md5-cache/app-editors/okteta-0.26.4 b/metadata/md5-cache/app-editors/okteta-0.26.4
index dc48923ffde7..e3abb5fa73fb 100644
--- a/metadata/md5-cache/app-editors/okteta-0.26.4
+++ b/metadata/md5-cache/app-editors/okteta-0.26.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwo
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/okteta/0.26.4/src/okteta-0.26.4.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dccf8d728754e3b40b74c3321c13ebfd
diff --git a/metadata/md5-cache/app-editors/pluma-1.24.1 b/metadata/md5-cache/app-editors/pluma-1.24.1
new file mode 100644
index 000000000000..cb5772a5516b
--- /dev/null
+++ b/metadata/md5-cache/app-editors/pluma-1.24.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libSM-1.0 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.6:= >=app-text/iso-codes-0.35 ) !!app-editors/mate-text-editor ~app-text/docbook-xml-dtd-4.1.2 app-text/rarian >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/libtool-2.2.6:2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Pluma text editor for the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=+introspection spell test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libSM-1.0 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.6:= >=app-text/iso-codes-0.35 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[introspection?] virtual/libintl
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/pluma-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a248613733727ca14e1b858afa6d634b
diff --git a/metadata/md5-cache/app-editors/sandy-0.4 b/metadata/md5-cache/app-editors/sandy-0.4
deleted file mode 100644
index 101614c66ebc..000000000000
--- a/metadata/md5-cache/app-editors/sandy-0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0=
-DESCRIPTION=an ncurses text editor with an easy-to-read, hackable C source
-EAPI=5
-HOMEPAGE=https://tools.suckless.org/sandy
-KEYWORDS=~amd64
-LICENSE=MIT-with-advertising
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://git.suckless.org/sandy/snapshot/sandy-0.4.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2923eabf5405fe4a796aa8e725c0fbea
diff --git a/metadata/md5-cache/app-editors/texworks-0.6.5 b/metadata/md5-cache/app-editors/texworks-0.6.5
index d85ab5cf6bca..63c67c63ca0c 100644
--- a/metadata/md5-cache/app-editors/texworks-0.6.5
+++ b/metadata/md5-cache/app-editors/texworks-0.6.5
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TeXworks/texworks/archive/release-0.6.5.tar.gz -> texworks-0.6.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ecb7c1eef6c1b3f7082f84e3405e0aa
diff --git a/metadata/md5-cache/app-editors/xemacs-21.4.24 b/metadata/md5-cache/app-editors/xemacs-21.4.24
deleted file mode 100644
index 35d4f02bb6ed..000000000000
--- a/metadata/md5-cache/app-editors/xemacs-21.4.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15 >=sys-apps/texinfo-5 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
-DESCRIPTION=highly customizable open source text editor and application development system
-EAPI=5
-HOMEPAGE=http://www.xemacs.org/
-IUSE=eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb
-KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.24.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=16ed837a59e120d6a0251c8df3906980
diff --git a/metadata/md5-cache/app-editors/xemacs-21.4.24-r1 b/metadata/md5-cache/app-editors/xemacs-21.4.24-r1
deleted file mode 100644
index 999aacd9c278..000000000000
--- a/metadata/md5-cache/app-editors/xemacs-21.4.24-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15 >=sys-apps/texinfo-5 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
-DESCRIPTION=highly customizable open source text editor and application development system
-EAPI=5
-HOMEPAGE=http://www.xemacs.org/
-IUSE=eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb
-KEYWORDS=~alpha amd64 arm64 ~hppa ppc ppc64 sparc ~x86
-LICENSE=GPL-2+
-PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.24.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57b17698723b9473625e84c4ac16e132
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 325110f4482d..c9d4f9819bfe 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 c9f06edbd452..49ec9b0ae0fc 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/austinhaas/actionscript-mode/archive/65abd58e198458a8e46748c5962c41d80d60c4ea.tar.gz -> actionscript-mode-7.2.2_p20180527.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=e6ea45c8f98d76fd35975669c93e9def
diff --git a/metadata/md5-cache/app-emacs/adaptive-wrap-0.7 b/metadata/md5-cache/app-emacs/adaptive-wrap-0.7
index abf2b89a7c50..bab085150c7c 100644
--- a/metadata/md5-cache/app-emacs/adaptive-wrap-0.7
+++ b/metadata/md5-cache/app-emacs/adaptive-wrap-0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/adaptive-wrap-0.7.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=f597d4059056b3b15e37a2853edafef6
diff --git a/metadata/md5-cache/app-emacs/analog-1.9.99 b/metadata/md5-cache/app-emacs/analog-1.9.99
index a20fe5c29257..ed16ac99cb01 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/analog-1.9.99.el.bz2
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 080b8ddadfa9..0d4fe25132fb 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=>=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 819aca407798..545835fa0b84 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=>=app-editors/emacs-23.1:*
 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_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=7faaa917a76503a5edd934ec6379697b
diff --git a/metadata/md5-cache/app-emacs/apel-10.8_p20190407 b/metadata/md5-cache/app-emacs/apel-10.8_p20190407
index acad18f86218..a312127ebb70 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/apel/archive/d146ddbf8818e81d3577d5eee7825d377bec0c73.tar.gz -> apel-10.8_p20190407.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=f5f5e6e8cbb2d0417ab0f1c56997fbc6
diff --git a/metadata/md5-cache/app-emacs/async-1.9.3 b/metadata/md5-cache/app-emacs/async-1.9.3
index f128e1ebdc89..4507fe024d8c 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=>=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 9ec2643bf8ca..461a6a17eb7a 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 >=app-editors/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_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=05fb60580edb6036dc0dd7411f3e627c
diff --git a/metadata/md5-cache/app-emacs/auctex-11.92 b/metadata/md5-cache/app-emacs/auctex-11.92
index 2732b27b9be2..6d145214666f 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 ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-11.92.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=c02dbc9fb741a03407f4b400a0fe3066
diff --git a/metadata/md5-cache/app-emacs/auctex-12.1-r1 b/metadata/md5-cache/app-emacs/auctex-12.1-r1
index 1e52ab959a32..a9bd6b9e8f85 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 ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-12.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=89c5c3457af7a7079b5795dd54033395
diff --git a/metadata/md5-cache/app-emacs/auctex-12.2 b/metadata/md5-cache/app-emacs/auctex-12.2
index ffe682e2b9dc..c7dc9ee12299 100644
--- a/metadata/md5-cache/app-emacs/auctex-12.2
+++ b/metadata/md5-cache/app-emacs/auctex-12.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-12.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=109648ca6706591fc8f782c665e5d07d
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 46dd97684ac9..4ae8028ec51c 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
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/popup >=app-editors/emacs-23.1:*
 RESTRICT=test
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=93ff8c7110b0498fb6980bf946a39b5e
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 42ee068f2736..dbcc2263a188 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=be0a42cb7e16315dd05ef01b9c1cb5f2
diff --git a/metadata/md5-cache/app-emacs/basic-toolkit-0.7 b/metadata/md5-cache/app-emacs/basic-toolkit-0.7
index d2e593fccf94..509df1dc738f 100644
--- a/metadata/md5-cache/app-emacs/basic-toolkit-0.7
+++ b/metadata/md5-cache/app-emacs/basic-toolkit-0.7
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/windows app-emacs/cycle-buffer app-emacs/css-sort-buffer >=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/basic-toolkit-0.7.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=4d5de200e57a6627868ee77effd9530a
diff --git a/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2 b/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
index 02ddbabd2f3c..8fea21742e6c 100644
--- a/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
+++ b/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
@@ -10,5 +10,5 @@ RDEPEND=vm? ( app-emacs/vm ) tex? ( virtual/tex-base ) >=app-editors/emacs-23.1:
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/bbdb/bbdb-3.1.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=34f40f4aa226d6c2cbef933a1eba7cdf
diff --git a/metadata/md5-cache/app-emacs/bbdb-3.2_pre20180106 b/metadata/md5-cache/app-emacs/bbdb-3.2_pre20180106
index d2fb09dfbcda..10a42934964d 100644
--- a/metadata/md5-cache/app-emacs/bbdb-3.2_pre20180106
+++ b/metadata/md5-cache/app-emacs/bbdb-3.2_pre20180106
@@ -10,5 +10,5 @@ RDEPEND=vm? ( app-emacs/vm ) tex? ( virtual/latex-base ) >=app-editors/emacs-23.
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/bbdb-3.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af9f92628406c7ccd0da3c19af6d0f3c
diff --git a/metadata/md5-cache/app-emacs/binclock-1.11 b/metadata/md5-cache/app-emacs/binclock-1.11
index e2fffaed3807..fb8210ee3d81 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/binclock.el/archive/v1.11.tar.gz -> binclock-1.11.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=a3c3e964327bebdfd0a8740363237d8b
diff --git a/metadata/md5-cache/app-emacs/bison-mode-0.3 b/metadata/md5-cache/app-emacs/bison-mode-0.3
index ff559f373d53..571adcd63378 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~nicolasbock/bison-mode-0.3.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=f6114b331d83c9457c02563141761d21
diff --git a/metadata/md5-cache/app-emacs/blogmax-20170321 b/metadata/md5-cache/app-emacs/blogmax-20170321
index fbe466e574d6..9423b455747c 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/blogmax-20170321.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=171de8a465e5289d045eeb8fe7048cf0
diff --git a/metadata/md5-cache/app-emacs/bm-201905 b/metadata/md5-cache/app-emacs/bm-201905
index e9566d000226..6eec89c9d0d8 100644
--- a/metadata/md5-cache/app-emacs/bm-201905
+++ b/metadata/md5-cache/app-emacs/bm-201905
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/joodland/bm/archive/201905.tar.gz -> bm-201905.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=541265409ff659bffce3fc87a3de926f
diff --git a/metadata/md5-cache/app-emacs/bongo-1.1 b/metadata/md5-cache/app-emacs/bongo-1.1
index 8e001dbe426b..7f31eb2872a5 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 >=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=71c654d9d1d75d8b68daa86b08e67684
diff --git a/metadata/md5-cache/app-emacs/boxquote-2.1 b/metadata/md5-cache/app-emacs/boxquote-2.1
index c90b45565da8..f6d593d7ee00 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/boxquote.el/archive/v2.1.tar.gz -> boxquote-2.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=0979523451600bffd9967675c43ff5d5
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 80fa4f2e859c..ba0e560bb430 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=>=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 5d8c4eaee505..aabde3ce2bbc 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/bubblet-0.74.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 c5a1dd63a561..db3c8ce2d4ae 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/buffer-extension-0.1.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=07457a41901ad0dc5246beca8697283a
diff --git a/metadata/md5-cache/app-emacs/calfw-1.6 b/metadata/md5-cache/app-emacs/calfw-1.6
index 113f51186f5c..97b4dcfd3129 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 ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/kiwanami/emacs-calfw/archive/v1.6.tar.gz -> calfw-1.6.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 7b26eeef816f..8eafaa7625b8 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 ) >=app-editors/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_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=2194ac6c05f7510540879af6ef8162af
diff --git a/metadata/md5-cache/app-emacs/circe-2.11 b/metadata/md5-cache/app-emacs/circe-2.11
index 7d5e9f47d6e9..9dda6864951e 100644
--- a/metadata/md5-cache/app-emacs/circe-2.11
+++ b/metadata/md5-cache/app-emacs/circe-2.11
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/circe/archive/v2.11.tar.gz -> circe-2.11.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=1a20f4d913fa501c763de9d584c396e5
diff --git a/metadata/md5-cache/app-emacs/cldoc-1.16 b/metadata/md5-cache/app-emacs/cldoc-1.16
index 7dc79765b5d3..24952d770082 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/cldoc-1.16.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 e3a3a0c9e466..4708c2aa9d95 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/color-browser-0.3.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 eeedf2e012cb..9dc1b5609a0f 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/color-moccur-2.73.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=88523ed9159a2dd28b347df8139b690c
diff --git a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2 b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2
index 29a155057b8a..f39f15157383 100644
--- a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2
+++ b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/color-theme/color-theme-6.6.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=6576c2c44d9f9b9ab9cadc66d2addd8e
diff --git a/metadata/md5-cache/app-emacs/company-mode-0.9.10 b/metadata/md5-cache/app-emacs/company-mode-0.9.10
index 9163814f7307..6ee07610f282 100644
--- a/metadata/md5-cache/app-emacs/company-mode-0.9.10
+++ b/metadata/md5-cache/app-emacs/company-mode-0.9.10
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/company-mode/company-mode/archive/0.9.10.tar.gz -> company-mode-0.9.10.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=5af3e35baf51c8199b30645ffe504d80
diff --git a/metadata/md5-cache/app-emacs/crontab-mode-1.20 b/metadata/md5-cache/app-emacs/crontab-mode-1.20
index fb274e26654e..15326a2718a5 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/crontab-mode-1.20.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=20eed63c32d49e35eff076b103006f65
diff --git a/metadata/md5-cache/app-emacs/crypt++-2.92 b/metadata/md5-cache/app-emacs/crypt++-2.92
index be9281745c5a..0d2182029d90 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/crypt++el/crypt++el_2.92.orig.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 38034ce986fa..d6bc9a25b1c6 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/crypt++-2.94_pre20080430.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=f58e55ff624a1d04965eea2ef384ec98
diff --git a/metadata/md5-cache/app-emacs/csharp-mode-0.9.2 b/metadata/md5-cache/app-emacs/csharp-mode-0.9.2
index 39d665eb6d64..d5ef40a006df 100644
--- a/metadata/md5-cache/app-emacs/csharp-mode-0.9.2
+++ b/metadata/md5-cache/app-emacs/csharp-mode-0.9.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/josteink/csharp-mode/archive/v0.9.2.tar.gz -> csharp-mode-0.9.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=41c54c7b6d88080fef94c04dbbbd1c89
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 85b89d69e909..bcb4529142ee 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/css-mode-0.11.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=7120a4e02f62562a51d09b8b75a83933
diff --git a/metadata/md5-cache/app-emacs/css-sort-buffer-0.2 b/metadata/md5-cache/app-emacs/css-sort-buffer-0.2
index 45999e1a2b62..0c7eabbf6f5a 100644
--- a/metadata/md5-cache/app-emacs/css-sort-buffer-0.2
+++ b/metadata/md5-cache/app-emacs/css-sort-buffer-0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/css-sort-buffer-0.2.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=93df5e2ff021985f8304f2f0efb5d616
diff --git a/metadata/md5-cache/app-emacs/csv-mode-1.10 b/metadata/md5-cache/app-emacs/csv-mode-1.10
index c8c476ce873d..482ac8212b06 100644
--- a/metadata/md5-cache/app-emacs/csv-mode-1.10
+++ b/metadata/md5-cache/app-emacs/csv-mode-1.10
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/csv-mode-1.10.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=390c7770be8167c2e1b4c5ccebd8179f
diff --git a/metadata/md5-cache/app-emacs/csv-mode-1.9 b/metadata/md5-cache/app-emacs/csv-mode-1.9
index 7f2bbf0a2cc9..8d22a63f106b 100644
--- a/metadata/md5-cache/app-emacs/csv-mode-1.9
+++ b/metadata/md5-cache/app-emacs/csv-mode-1.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/csv-mode-1.9.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=fbca9c115ea539557a6410fd7bbdd9d0
diff --git a/metadata/md5-cache/app-emacs/cycle-buffer-2.16 b/metadata/md5-cache/app-emacs/cycle-buffer-2.16
index e30bb11c4ae7..b242412dc707 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/cycle-buffer-2.16.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=fba97e86a9b234e1f601a7ab8c34c249
diff --git a/metadata/md5-cache/app-emacs/d-mode-2.0.10 b/metadata/md5-cache/app-emacs/d-mode-2.0.10
index d07e58ed295b..8af47baca681 100644
--- a/metadata/md5-cache/app-emacs/d-mode-2.0.10
+++ b/metadata/md5-cache/app-emacs/d-mode-2.0.10
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/2.0.10.tar.gz -> d-mode-2.0.10.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=1ce20f9973ed6636c74609c0b60f2fbb
diff --git a/metadata/md5-cache/app-emacs/dash-2.14.1 b/metadata/md5-cache/app-emacs/dash-2.14.1
index 3405cef17b37..b44e5124d4f2 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.14.1.tar.gz -> dash-2.14.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 8f7629a17421..9067a1f1f62c 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.16.0.tar.gz -> dash-2.16.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=458cece7a89bda772136ecc61d30aedb
diff --git a/metadata/md5-cache/app-emacs/dash-2.17.0 b/metadata/md5-cache/app-emacs/dash-2.17.0
index 0b13285f178e..16952fc0c4e8 100644
--- a/metadata/md5-cache/app-emacs/dash-2.17.0
+++ b/metadata/md5-cache/app-emacs/dash-2.17.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.17.0.tar.gz -> dash-2.17.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=51060b3b02c2aa75f2835128c6baceec
diff --git a/metadata/md5-cache/app-emacs/ddskk-16.2 b/metadata/md5-cache/app-emacs/ddskk-16.2
index d541a94c7c06..7ddc06f9f27a 100644
--- a/metadata/md5-cache/app-emacs/ddskk-16.2
+++ b/metadata/md5-cache/app-emacs/ddskk-16.2
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.5
 RESTRICT=test
 SLOT=0
 SRC_URI=http://openlab.ring.gr.jp/skk/maintrunk/ddskk-16.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f
 _md5_=19d7cd4e6f64e86b219b6d048ead2d15
diff --git a/metadata/md5-cache/app-emacs/ddskk-16.3 b/metadata/md5-cache/app-emacs/ddskk-16.3
index e6caec2840ee..48ae64850d97 100644
--- a/metadata/md5-cache/app-emacs/ddskk-16.3
+++ b/metadata/md5-cache/app-emacs/ddskk-16.3
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-16.3_Kutomatsunai.tar.gz -> ddskk-16.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=2cf515e4d0bce249f4e218d02ad3711f
diff --git a/metadata/md5-cache/app-emacs/ddskk-17.1 b/metadata/md5-cache/app-emacs/ddskk-17.1
index 59766bd2f616..8263175a83a9 100644
--- a/metadata/md5-cache/app-emacs/ddskk-17.1
+++ b/metadata/md5-cache/app-emacs/ddskk-17.1
@@ -10,5 +10,5 @@ RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-17.1_Neppu.tar.gz -> ddskk-17.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=68e6f9bad37891f7b53d2a4666614a2c
diff --git a/metadata/md5-cache/app-emacs/desktop+-0.2-r2 b/metadata/md5-cache/app-emacs/desktop+-0.2-r2
index ffdde086df3f..fc20a0c3fcd7 100644
--- a/metadata/md5-cache/app-emacs/desktop+-0.2-r2
+++ b/metadata/md5-cache/app-emacs/desktop+-0.2-r2
@@ -9,5 +9,5 @@ RDEPEND=app-emacs/dash app-emacs/f >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ffevotte/desktop-plus/archive/v0.2.tar.gz -> desktop+-0.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=098794d4cd6c17343c24ddd702f19e63
diff --git a/metadata/md5-cache/app-emacs/develock-0.47 b/metadata/md5-cache/app-emacs/develock-0.47
index 422459289c99..76e88d1e98e6 100644
--- a/metadata/md5-cache/app-emacs/develock-0.47
+++ b/metadata/md5-cache/app-emacs/develock-0.47
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/develock-0.47.el.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=25f6146ad67bb6e1a6b95e860bae5925
diff --git a/metadata/md5-cache/app-emacs/df-mode-20050509-r1 b/metadata/md5-cache/app-emacs/df-mode-20050509-r1
index d6fd8db41f08..5d640165a6a6 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/df-mode-20050509.el.bz2
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=9d0cfa22df387422eb3c3b3c23065f41
diff --git a/metadata/md5-cache/app-emacs/dictionary-1.10 b/metadata/md5-cache/app-emacs/dictionary-1.10
index 76ca9b7eaeb0..f193aea895b1 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.myrkr.in-berlin.de/dictionary/dictionary-1.10.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 1ecea3f1b12f..b77a4f6c0a49 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/dircolors-1.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 0e27ed75a5f6..81ad38e7ed96 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/dired-sort-menu-1.26.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=d253ae322ac667913331ea69c50b19aa
diff --git a/metadata/md5-cache/app-emacs/distel-4.1.1 b/metadata/md5-cache/app-emacs/distel-4.1.1
index 9af1200bb8c7..d04beb84c595 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] >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/massemanet/distel/archive/4.1.1.tar.gz -> distel-4.1.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 4d1e68656f91..24bddbb51bd6 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-editors/emacs-23.1:*
 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_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=61a5a91b891177738e1f766809665387
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 d253f482603c..65f0ba09b782 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/doxymacs/doxymacs-1.8.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=5a343760d9dc6d77e002778fda24e094
diff --git a/metadata/md5-cache/app-emacs/dropdown-list-20120329 b/metadata/md5-cache/app-emacs/dropdown-list-20120329
index d59c9e306c21..79036cd97dce 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/dropdown-list-20120329.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=0402d6ca62dc7d6393838b65203682bb
diff --git a/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103 b/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103
index 045c2d0c65d8..600df48048d8 100644
--- a/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103
+++ b/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/bgamari/dts-mode/archive/9ee0854446dcc6c53d2b8d2941051768dba50344.tar.gz -> dts-mode-0.1.0_pre20161103.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=e8b695cc744fac577ee31bc10b1aff7b
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.50 b/metadata/md5-cache/app-emacs/ebuild-mode-1.50
index cbbc8e20f3d0..0cffed962021 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.50
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.50
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.50.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=0c8589b5cdcf2f088863c92357d008ef
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3 b/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
index ac538978f8bf..1d055a4deb7d 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.51-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.51.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=9219fc6513003a3a04edc4a7bfddda6c
diff --git a/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728 b/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
index b6e3fc29076a..686524b60d5c 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 ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ecb-2.50_pre20170728.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=b1043286115f9c52bc14b28009a706a8
diff --git a/metadata/md5-cache/app-emacs/edb-1.32 b/metadata/md5-cache/app-emacs/edb-1.32
index 7f0347573066..5399f06aed8f 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.gnuvola.org/software/edb/edb-1.32.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 6bf13838b7f0..087960ec844e 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/edit-list-0.3.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 6c783cd71057..204dde34fac9 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/stsquad/emacs_chrome/archive/v1.15.tar.gz -> emacs_chrome-1.15.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 42cf8a799a4a..60ae295e5b1d 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=>=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=ab4acc1125badd8a54276903d4f6b1a4
diff --git a/metadata/md5-cache/app-emacs/elscreen-20180321 b/metadata/md5-cache/app-emacs/elscreen-20180321
index e41a42611e50..8a9b2c665d69 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 ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/knu/elscreen/archive/20180321.tar.gz -> elscreen-20180321.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=762284baff9387cb5cc2ccad2a046618
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r3 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r3
index d6f06e8c4d35..be616d325312 100644
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r3
+++ b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r3
@@ -10,5 +10,5 @@ PDEPEND=>=app-editors/emacs-23.1:*
 RDEPEND=games? ( acct-group/gamestat )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ae47ea5af2dbe8dccbe88f4d4c0947b
diff --git a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r4 b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r4
index 2043dff7cd41..f4d3e95b4bb8 100644
--- a/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r4
+++ b/metadata/md5-cache/app-emacs/emacs-common-gentoo-1.6-r4
@@ -10,5 +10,5 @@ PDEPEND=>=app-editors/emacs-23.1:*
 RDEPEND=games? ( acct-group/gamestat )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=908bc6515ca3b9141e88bdf3c5fc49ef
diff --git a/metadata/md5-cache/app-emacs/emacs-daemon-0.22 b/metadata/md5-cache/app-emacs/emacs-daemon-0.22
index cd49871d5d2f..90356231a6c9 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-daemon-0.22.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=a202f1787793953c6d9579a3e5930cb6
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 4d3252c3edda..b5e01fe66eb2 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-jabber/emacs-jabber-0.8.92.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 ce99c224dff7..38d2b9cafa77 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.625_pre20180518.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=331fda058d6dacfcfd2ee6828fcde124
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 654581cf011c..b941a63932e9 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.632_pre20181112.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _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 c51596104c12..fb49ea179fa1 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/emacs-wget-0.5.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=d95f91854b868334687c51a06925ee56
diff --git a/metadata/md5-cache/app-emacs/emhacks-20070920-r1 b/metadata/md5-cache/app-emacs/emhacks-20070920-r1
index 895705507c2f..ccfcf8b2c1ac 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emhacks-20070920.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=2865aeb84bbd72d2a7ca214d2e7fd99c
diff --git a/metadata/md5-cache/app-emacs/emms-4.4 b/metadata/md5-cache/app-emacs/emms-4.4
index 48538bc490ea..cb451fb5f09f 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-4.4.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=54092665f9aa757d6ebcc23c74c88c5d
diff --git a/metadata/md5-cache/app-emacs/emms-5.3 b/metadata/md5-cache/app-emacs/emms-5.3
index 0cc23a9bb14f..6e923e131bab 100644
--- a/metadata/md5-cache/app-emacs/emms-5.3
+++ b/metadata/md5-cache/app-emacs/emms-5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-5.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=321e45cc837fb4ed684c5b5a82a45298
diff --git a/metadata/md5-cache/app-emacs/emms-5.4 b/metadata/md5-cache/app-emacs/emms-5.4
index ecc1e0e94a04..63b509177c54 100644
--- a/metadata/md5-cache/app-emacs/emms-5.4
+++ b/metadata/md5-cache/app-emacs/emms-5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/emms/emms-5.4.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=321e45cc837fb4ed684c5b5a82a45298
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 53b506c7376d..84b8453e1254 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/erobot-2.1.0.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=bd274dd6ad0e51c0cb0e24f9bc36b80c
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 2352106a3bd3..f3c3d6da3e03 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.15.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=b9e2d0ad1fe39e4bbe3ede0aa61ee7af
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.16 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.16
index b469ef49ad70..1bc097948545 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.16
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.16
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.16.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=b9e2d0ad1fe39e4bbe3ede0aa61ee7af
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-9999 b/metadata/md5-cache/app-emacs/eselect-mode-9999
index 0f62a7a0fedd..40ba7cb54281 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=>=app-editors/emacs-23.1:*
 SLOT=0
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	git-r3	3e7ec3d6619213460c85e2aa48398441
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	git-r3	3e7ec3d6619213460c85e2aa48398441
 _md5_=56b653dc070aca53252610b5c684f5fa
diff --git a/metadata/md5-cache/app-emacs/ess-17.11 b/metadata/md5-cache/app-emacs/ess-17.11
index 7448c3df17df..df3492d5409e 100644
--- a/metadata/md5-cache/app-emacs/ess-17.11
+++ b/metadata/md5-cache/app-emacs/ess-17.11
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-17.11.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	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 92f348a5a950..3c4360b8c959 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=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ess.r-project.org/downloads/ess/ess-18.10.2.tgz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=8a4efa3f0119154d9bdb99117a01e91b
diff --git a/metadata/md5-cache/app-emacs/evil-1.2.13 b/metadata/md5-cache/app-emacs/evil-1.2.13
index fbc689e3d349..27d16b1213d8 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 >=app-editors/emacs-23.1:*
 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_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 ee20c982c2a0..8e0a11188182 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 >=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=e497eea5defd958116fc79cf46e2a8f8
diff --git a/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1 b/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1
index 9d4f608c5f96..ae001c2f7668 100644
--- a/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1
+++ b/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=4177c3f6403c66872818d877654d51b6
diff --git a/metadata/md5-cache/app-emacs/f-0.19.0 b/metadata/md5-cache/app-emacs/f-0.19.0
index 86c227ae9234..746a76fde202 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 >=app-editors/emacs-23.1:*
 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_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 a55aa1c445d0..9c66337123cf 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 >=app-editors/emacs-23.1:*
 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_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=e9d8d9b47c8b24b034cd3bf476daf766
diff --git a/metadata/md5-cache/app-emacs/fff-20050517 b/metadata/md5-cache/app-emacs/fff-20050517
index dd5b43588b13..3a7b13667423 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/fff-20050517.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 357c49e43064..550673d6c3c2 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/filladapt-2.12.el.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _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 60cacf3790c3..abf4361aaccc 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/flashcard-2.3.3.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 2cc053aea295..28dc18bec3c2 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://git.chise.org/elisp/dist/flim/flim-1.14/flim-1.14.9.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=fb0097af2cb9c2d64f5289dbacae1b3a
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 f704362a5685..feb14f045a2f 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/flim/archive/e4bd54fd7d335215b54f7ef27ed974c8cd68d472.tar.gz -> flim-1.14.9_p20190526.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=b0c5b24f97d91f07af662f57b0853309
diff --git a/metadata/md5-cache/app-emacs/folding-2019.0524.1621 b/metadata/md5-cache/app-emacs/folding-2019.0524.1621
index 4ed0c93a5a5f..28fb6491ee01 100644
--- a/metadata/md5-cache/app-emacs/folding-2019.0524.1621
+++ b/metadata/md5-cache/app-emacs/folding-2019.0524.1621
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/jaalto/project-emacs--folding-mode/archive/a1361aa154b27bd4db2e1cfe6c3b81b4fc1fdc9a.tar.gz -> folding-2019.0524.1621.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=5bfed2527b21ef3c903362f80c4906ec
diff --git a/metadata/md5-cache/app-emacs/ghub-3.2.0 b/metadata/md5-cache/app-emacs/ghub-3.2.0
index 65ca0ee4031c..21c8775be898 100644
--- a/metadata/md5-cache/app-emacs/ghub-3.2.0
+++ b/metadata/md5-cache/app-emacs/ghub-3.2.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 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v3.2.0.tar.gz -> ghub-3.2.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=33b47790302bd8a5bcf7ba2fbdd845c6
diff --git a/metadata/md5-cache/app-emacs/ghub-3.3.0 b/metadata/md5-cache/app-emacs/ghub-3.3.0
index 2ea70c96c40d..f7804554d977 100644
--- a/metadata/md5-cache/app-emacs/ghub-3.3.0
+++ b/metadata/md5-cache/app-emacs/ghub-3.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/treepy-0.1.1 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v3.3.0.tar.gz -> ghub-3.3.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=a88314f3dcd67b88efc826df90cd0afd
diff --git a/metadata/md5-cache/app-emacs/ghub-3.4.1 b/metadata/md5-cache/app-emacs/ghub-3.4.1
index 85e520eefb6e..ecc273dcd1fc 100644
--- a/metadata/md5-cache/app-emacs/ghub-3.4.1
+++ b/metadata/md5-cache/app-emacs/ghub-3.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/treepy-0.1.1 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v3.4.1.tar.gz -> ghub-3.4.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=a88314f3dcd67b88efc826df90cd0afd
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 e8a7c87ae379..fc6136841261 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(-)] >=app-editors/emacs-23.1:*
 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	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4c9661638e1fa60890be54be23834ac5
diff --git a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5 b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5
index 8b57fb222279..ac3869e22985 100644
--- a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5
+++ b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-eselect/eselect-emacs-1.15 X? ( x11-libs/libXau ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://meltin.net/hacks/emacs/src/gnuserv-3.12.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7588f0ca0ffa2911b82800f33795f858
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 5c123806bfcf..b30ae009f59e 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=>=app-editors/emacs-23.1:*
 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_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=1db9b6722e79d0fb313dd9baeddba9a9
diff --git a/metadata/md5-cache/app-emacs/google-c-style-20140929 b/metadata/md5-cache/app-emacs/google-c-style-20140929
index d68e9c60ccb5..f69ac32dc9a5 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/google-c-style-20140929.el.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=10e1327d7989e968aa4cbf0e692fb9b2
diff --git a/metadata/md5-cache/app-emacs/graphql-0.1.1 b/metadata/md5-cache/app-emacs/graphql-0.1.1
index d9e08ee5aa33..2b678eabff42 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=>=app-editors/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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=213055d4f50aa71cc25333214677bbc0
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 41e47128e153..d3d3d81899d3 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=>=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=7b0fcfa9a7f0aa959a9ee262ecc7a306
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 8d1b0272b4f1..9114ed868ae6 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=>=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=9c0190d653c5ef147a1e76149558a263
diff --git a/metadata/md5-cache/app-emacs/h4x0r-0.13-r1 b/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
index 67a893116e38..93206b0f5db8 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/h4x0r-0.13.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=154d6ed2afbea3ca7ec1a1582157717c
diff --git a/metadata/md5-cache/app-emacs/haskell-mode-16.1 b/metadata/md5-cache/app-emacs/haskell-mode-16.1
index 0b2f71362ad6..b3ad2077de50 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/haskell/haskell-mode/archive/v16.1.tar.gz -> haskell-mode-16.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=52cdf0da16f2cfc559feedabf27e11db
diff --git a/metadata/md5-cache/app-emacs/helm-3.2 b/metadata/md5-cache/app-emacs/helm-3.2
index 493e1b439dc1..b61eb6af759f 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm/archive/v3.2.tar.gz -> helm-3.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=069fa9b9a48ec7137d162fd2debcbedb
diff --git a/metadata/md5-cache/app-emacs/helm-3.6.0 b/metadata/md5-cache/app-emacs/helm-3.6.0
index d22f40943cb2..6e6cc519d1da 100644
--- a/metadata/md5-cache/app-emacs/helm-3.6.0
+++ b/metadata/md5-cache/app-emacs/helm-3.6.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/async app-emacs/popup >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm/archive/v3.6.0.tar.gz -> helm-3.6.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 e19e9ca86eba..2e3caae69e8f 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 >=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=6f546d7e5e02da8bd885b0f6d354c7fe
diff --git a/metadata/md5-cache/app-emacs/hexrgb-0_p1019 b/metadata/md5-cache/app-emacs/hexrgb-0_p1019
index e47d1c9995b7..a8ce3d4ed61b 100644
--- a/metadata/md5-cache/app-emacs/hexrgb-0_p1019
+++ b/metadata/md5-cache/app-emacs/hexrgb-0_p1019
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/hexrgb-0_p1019.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=18e63a7ffc3d28dc8bfa50a432aeb73c
diff --git a/metadata/md5-cache/app-emacs/highline-7.2.2 b/metadata/md5-cache/app-emacs/highline-7.2.2
index 1404b4335b20..1e3a5b109e4d 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/highline-7.2.2.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=434a1916e32a755710525e4c42dea979
diff --git a/metadata/md5-cache/app-emacs/howm-1.4.5 b/metadata/md5-cache/app-emacs/howm-1.4.5
index 87bc533b5cf3..1ff88ef29d64 100644
--- a/metadata/md5-cache/app-emacs/howm-1.4.5
+++ b/metadata/md5-cache/app-emacs/howm-1.4.5
@@ -8,5 +8,5 @@ LICENSE=GPL-1+ GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://howm.sourceforge.jp/a/howm-1.4.5.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=62be48057c4c7105d16dadd69c26a138
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.54 b/metadata/md5-cache/app-emacs/htmlize-1.54
index 17897705a6f0..bdb9c89fa719 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/hniksic/emacs-htmlize/archive/release/1.54.tar.gz -> htmlize-1.54.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=0b42b8ecd2069cfbcfd43fe66040af45
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.55 b/metadata/md5-cache/app-emacs/htmlize-1.55
index 705001c7d799..1a07a405c839 100644
--- a/metadata/md5-cache/app-emacs/htmlize-1.55
+++ b/metadata/md5-cache/app-emacs/htmlize-1.55
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/hniksic/emacs-htmlize/archive/release/1.55.tar.gz -> htmlize-1.55.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=579775b743a32685d3eb2ddcb2b96c23
diff --git a/metadata/md5-cache/app-emacs/httpd-1.1 b/metadata/md5-cache/app-emacs/httpd-1.1
index 6546b7790a5f..5e9608e460bb 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/httpd-1.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=aaf120d14a436b709ffe81a3c3e7806b
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 3900cef343b9..2bb30938ba1f 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/icicles-2018.02.13.23733.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=2d73a2a1b120177c8ca359abc399f902
diff --git a/metadata/md5-cache/app-emacs/igrep-2.113 b/metadata/md5-cache/app-emacs/igrep-2.113
index dc7e671ed057..5280088cc8fc 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/igrep-2.113.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=2b6be75021c3acb0ce6c42aac099a505
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 f25efe11f8e9..d670b7a264d8 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://rupert-lane.org/inform-mode/releases/inform-mode-1.6.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=d38e1be22b8a7ad411327d9df3fa0373
diff --git a/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919 b/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919
index 8c53363573e8..78f9c1d4e98f 100644
--- a/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919
+++ b/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dabrahams/initsplit/archive/c941d436eb2b10b01c76a582c5a2b23fb30751aa.tar.gz -> initsplit-1.8_pre20160919.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=9bd99c5892d24e3013e6b9ebc7d8f86a
diff --git a/metadata/md5-cache/app-emacs/jam-mode-0.3 b/metadata/md5-cache/app-emacs/jam-mode-0.3
index ed1ea649e5f0..9d2d25b6ea71 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/jam-mode-0.3.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=aed99181c263f94b1200d414ae39e0b3
diff --git a/metadata/md5-cache/app-emacs/jasmin-1.2-r2 b/metadata/md5-cache/app-emacs/jasmin-1.2-r2
index 4a3bd7467b68..fc2f9da06b85 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/jasmin-1.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=634d2e0eaf0c28176e51b40e43966c3c
diff --git a/metadata/md5-cache/app-emacs/jde-2.4.1-r1 b/metadata/md5-cache/app-emacs/jde-2.4.1-r1
index 91c86a0c0886..0a6eb2b1b394 100644
--- a/metadata/md5-cache/app-emacs/jde-2.4.1-r1
+++ b/metadata/md5-cache/app-emacs/jde-2.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=virtual/jdk-1.3:= dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/jdee-2.4.1.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a73240e64ee6b4b62fd355c27d36f503
diff --git a/metadata/md5-cache/app-emacs/keywiz-1.4 b/metadata/md5-cache/app-emacs/keywiz-1.4
index 7c835710affc..648d57f08438 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/keywiz-1.4.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 a5ebdd3b0205..aeea95312d52 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(-)] >=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=ed80baa66e1aac1716bf72854d6e0bca
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 00a2547566b2..bebf877c3b2f 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/lookup2/lookup2/archive/c4f4986aac6c339e03b9e56a5dfc7c8f5c0bb5e0.tar.gz -> lookup-1.99.96_pre20180209.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c43429b01f078f24a86c9009de00d3f9
diff --git a/metadata/md5-cache/app-emacs/lua-mode-20151025 b/metadata/md5-cache/app-emacs/lua-mode-20151025
index 91d4668161c5..af73d9e69646 100644
--- a/metadata/md5-cache/app-emacs/lua-mode-20151025
+++ b/metadata/md5-cache/app-emacs/lua-mode-20151025
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/immerrr/lua-mode/archive/rel-20151025.tar.gz -> lua-mode-20151025.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=f05d4ac70ef0a405b90ae9b822d8bb91
diff --git a/metadata/md5-cache/app-emacs/lua-mode-20151025_p20200513 b/metadata/md5-cache/app-emacs/lua-mode-20151025_p20200513
index 6c136908ea3b..63fb7b1885cc 100644
--- a/metadata/md5-cache/app-emacs/lua-mode-20151025_p20200513
+++ b/metadata/md5-cache/app-emacs/lua-mode-20151025_p20200513
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/immerrr/lua-mode/archive/35b6e4c20b8b4eaf783ccc8e613d0dd06dbd165c.tar.gz -> lua-mode-20151025_p20200513.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=314b0d0c0afde5f6659a3d02e5bab6ad
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 dd2683649ce0..3f3a193e02d6 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20180410.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=97854fe50c3d057a2498b86c1ada7c20
diff --git a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226 b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226
index 4350ac0d013b..feef13d26ad0 100644
--- a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226
+++ b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20200226.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=b15870b18fbaed430a25e9ea31a7a9c1
diff --git a/metadata/md5-cache/app-emacs/magit-2.13.1 b/metadata/md5-cache/app-emacs/magit-2.13.1
index 44d16a6ac086..3d6c3b6a43eb 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 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/2.13.1.tar.gz -> magit-2.13.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 467f675b61b1..976ad45a6ec7 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 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/v2.90.1.tar.gz -> magit-2.90.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=c6db5d55a19e32db8e2d576e4135361f
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 9e9d23b8de27..d76ac41b091d 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 >=app-editors/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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=e3460323affd0fa1e6ab63f2505e6667
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.13.2 b/metadata/md5-cache/app-emacs/magit-popup-2.13.2
index 2f06d8cbd3f6..b804d4a80df7 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.13.2
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.13.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.13.2.tar.gz -> magit-popup-2.13.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=61109e2d12c420d2ade271242509419c
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.13.3 b/metadata/md5-cache/app-emacs/magit-popup-2.13.3
index bfb6c5ababdc..8d16eab30866 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.13.3
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.13.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.13.3.tar.gz -> magit-popup-2.13.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=61109e2d12c420d2ade271242509419c
diff --git a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3 b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3
index 1f0c39fa0a92..97e38924a865 100644
--- a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3
+++ b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/mailcrypt/mailcrypt-3.5.9.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=003c00bc5653fc28d86fb246b9bc0087
diff --git a/metadata/md5-cache/app-emacs/markdown-mode-2.3 b/metadata/md5-cache/app-emacs/markdown-mode-2.3
index f0ef8fec13cf..bbdf74d65994 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 ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://stable.melpa.org/packages/markdown-mode-2.3.el
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=96d0d55530ff13324b9c7f17e18a4047
diff --git a/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1 b/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1
index 8287fcadf23c..78efa9001d61 100644
--- a/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1
+++ b/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/matlab-3.3.6_pre20191010.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=8145adc08b5010f6af3f386a7afb4a4e
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 3b9dadbd849a..c276f4b9180d 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/hexmode/mediawiki-el/archive/2.2.9.tar.gz -> mediawiki-2.2.9.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=46a2f5056f47c4217b4f197fe05133f8
diff --git a/metadata/md5-cache/app-emacs/meson-mode-0.2-r1 b/metadata/md5-cache/app-emacs/meson-mode-0.2-r1
index 579493c5daf1..4014d4b15ed0 100644
--- a/metadata/md5-cache/app-emacs/meson-mode-0.2-r1
+++ b/metadata/md5-cache/app-emacs/meson-mode-0.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/wentasah/meson-mode/archive/v0.2.tar.gz -> meson-mode-0.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=5ed115c1d3d1df7014f8183dd8cd15b2
diff --git a/metadata/md5-cache/app-emacs/meson-mode-0.3 b/metadata/md5-cache/app-emacs/meson-mode-0.3
index 3eb5a20ab67d..34ba90773915 100644
--- a/metadata/md5-cache/app-emacs/meson-mode-0.3
+++ b/metadata/md5-cache/app-emacs/meson-mode-0.3
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/wentasah/meson-mode/archive/v0.3.tar.gz -> meson-mode-0.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=762dd03dc975deaa49a76880d8af6994
diff --git a/metadata/md5-cache/app-emacs/mew-6.8 b/metadata/md5-cache/app-emacs/mew-6.8
index 70b71f635277..7f636a0542e5 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 ) >=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mew.org/Release/mew-6.8.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=b9d852272c81696f968287068ff7f5b4
diff --git a/metadata/md5-cache/app-emacs/mic-paren-3.11 b/metadata/md5-cache/app-emacs/mic-paren-3.11
index 5224456d0576..3ac7c5d650f2 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/mic-paren-3.11.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=6502c441b1513c0ce29e69f2fa12da11
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 f7fb42acae1c..832a46434597 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/mldonkey-el-0.0.4b.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=f58cfa15ef884640381e9a4c3b586859
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 1098b8535fbe..6a10e5c80fc1 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=>=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=c1273665a04e2ca2496d4b4ed3d17237
diff --git a/metadata/md5-cache/app-emacs/moccur-edit-2.16 b/metadata/md5-cache/app-emacs/moccur-edit-2.16
index 62dcbe99b329..e184051d1197 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/moccur-edit-2.16.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=04a639edb97b622a0a18b219bd50febe
diff --git a/metadata/md5-cache/app-emacs/mpg123-el-1.60 b/metadata/md5-cache/app-emacs/mpg123-el-1.60
index ed40d2105524..11c560f1166e 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.60.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0b28df859f73c204843901b9bcf057d2
diff --git a/metadata/md5-cache/app-emacs/mpg123-el-1.61 b/metadata/md5-cache/app-emacs/mpg123-el-1.61
index 49f553f38a86..8ee3e5d1fb37 100644
--- a/metadata/md5-cache/app-emacs/mpg123-el-1.61
+++ b/metadata/md5-cache/app-emacs/mpg123-el-1.61
@@ -8,5 +8,5 @@ LICENSE=mpg123-el
 RDEPEND=media-sound/mpg123 media-sound/alsa-utils >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.61.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c2df5a5d31240af5a83095b6ff566981
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 8359d3f394df..17db52c1871d 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 ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.jpl.org/elips/mu/snapshots/mu-cite-201808232348.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 28ee04c127ba..a567ee09ed5c 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mjo/distfiles/multi-term-1.4.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=e0636cae5b688bed903cf4e016f717c1
diff --git a/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0 b/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
index 355af0dad8d3..69fee6696e32 100644
--- a/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
+++ b/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=19934ddda2983416e762476782a23ddd
diff --git a/metadata/md5-cache/app-emacs/muse-3.20-r1 b/metadata/md5-cache/app-emacs/muse-3.20-r1
index fa40a19f31e7..da09aa61a1ac 100644
--- a/metadata/md5-cache/app-emacs/muse-3.20-r1
+++ b/metadata/md5-cache/app-emacs/muse-3.20-r1
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/alexott/muse/archive/v3.20.tar.gz -> muse-3.20.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=a5bc15f35110be375d19b1f58ba9679f
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 a66e34dd9efe..be6dcd14f410 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/nagios-mode-0.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=8f82a0892d0d20fd4f85f28c83b33440
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 54ccfffc191f..63879ccbecf7 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/navi2ch/navi2ch-1.8.4.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	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 c3dade28dc5b..4a4abf302ee6 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://docbook.org/xml/5.0/rng/docbookxi.rnc -> docbookxi-5.0.rnc
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 b1c7727ac79b..a96f784db20d 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://docbook.org/xml/5.1/rng/docbookxi.rnc -> docbookxi-5.1.rnc
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=719e1af9bd0b431db9e5af672913bd04
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20200303 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20200303
index 8d799acf9651..6fe6ac611cef 100644
--- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20200303
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20200303
@@ -8,5 +8,5 @@ LICENSE=HPND
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20200303.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=fdde55cda1092870df0c21367c303616
diff --git a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-5.8.0 b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-5.8.0
index 91d4d604a28c..cf083e3975a6 100644
--- a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-5.8.0
+++ b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-5.8.0
@@ -9,5 +9,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://libvirt.org/sources/libvirt-5.8.0.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=1dff5e30f6f7b2c943961d23d82999af
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 5af9f51b79d3..fd92849d2513 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=>=app-editors/emacs-23.1:*
 SLOT=1.1
 SRC_URI=http://www.flameeyes.eu/gentoo-distfiles/w3c-svg-rng-1.1.20081123.zip
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=2e3df112cfd4dc76d9f68f3497d6898d
diff --git a/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0 b/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0
index cd41fc22eb51..02bb43a1af3c 100644
--- a/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0
+++ b/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz -> ocaml-4.05.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=b941f17691c86bff697d68d6f6517b6d
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 11ae32c1522a..cbe37b288a2b 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=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://orgmode.org/org-8.3.2.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=e4dde8c189eea224de4771a75427cb3e
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.3.6 b/metadata/md5-cache/app-emacs/org-mode-9.3.6
index d6ede7fdc421..7bbdfa2bfb67 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.3.6
+++ b/metadata/md5-cache/app-emacs/org-mode-9.3.6
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://orgmode.org/org-9.3.6.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=b709b7f6baf98e5df175ade44a21205a
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.4 b/metadata/md5-cache/app-emacs/org-mode-9.4
index bc14e7665d01..805d7a581352 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.4
+++ b/metadata/md5-cache/app-emacs/org-mode-9.4
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://orgmode.org/org-9.4.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=59e68a95c79118b1ca45a525b6715c03
diff --git a/metadata/md5-cache/app-emacs/outline-magic-0.9 b/metadata/md5-cache/app-emacs/outline-magic-0.9
index 9eba9492a582..d70f6b11152a 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/outline-magic-0.9.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=aac2f3da7eb68b1e579c68132b4e8e3d
diff --git a/metadata/md5-cache/app-emacs/paredit-23-r1 b/metadata/md5-cache/app-emacs/paredit-23-r1
index cbdde0a4de4b..44b277e54848 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/paredit-23.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=cc59a57ffcb8673f6fcbedc308687d55
diff --git a/metadata/md5-cache/app-emacs/pariemacs-3.14 b/metadata/md5-cache/app-emacs/pariemacs-3.14
index f508f65c1447..594aa0f278e9 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/latest-pari-distrib/pariemacs-3.14.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=8ee143a7579375bbf2417a32b2dce359
diff --git a/metadata/md5-cache/app-emacs/php-mode-1.22.1 b/metadata/md5-cache/app-emacs/php-mode-1.22.1
index 586d8673dc96..bf0b250e92e2 100644
--- a/metadata/md5-cache/app-emacs/php-mode-1.22.1
+++ b/metadata/md5-cache/app-emacs/php-mode-1.22.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ejmr/php-mode/archive/v1.22.1.tar.gz -> php-mode-1.22.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=9e663bb65fffba949e3d92d7b090cba4
diff --git a/metadata/md5-cache/app-emacs/php-mode-1.23.0 b/metadata/md5-cache/app-emacs/php-mode-1.23.0
index 3254ce31e073..3b23af53e392 100644
--- a/metadata/md5-cache/app-emacs/php-mode-1.23.0
+++ b/metadata/md5-cache/app-emacs/php-mode-1.23.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ejmr/php-mode/archive/v1.23.0.tar.gz -> php-mode-1.23.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=9e663bb65fffba949e3d92d7b090cba4
diff --git a/metadata/md5-cache/app-emacs/planner-3.42-r1 b/metadata/md5-cache/app-emacs/planner-3.42-r1
index c0da42d5231c..3337d858c6dc 100644
--- a/metadata/md5-cache/app-emacs/planner-3.42-r1
+++ b/metadata/md5-cache/app-emacs/planner-3.42-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-emacs/muse-3.02.6a app-emacs/bbdb app-emacs/emacs-w3m >=app-editor
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/planner-3.42.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=cddd455a6413785e32fd1056ec109509
diff --git a/metadata/md5-cache/app-emacs/po-mode-0.20.1 b/metadata/md5-cache/app-emacs/po-mode-0.20.1
index f99de4a5c9e6..dd2009992a24 100644
--- a/metadata/md5-cache/app-emacs/po-mode-0.20.1
+++ b/metadata/md5-cache/app-emacs/po-mode-0.20.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.20.1.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=59c543ea9520f106972cc491343714a0
diff --git a/metadata/md5-cache/app-emacs/popup-0.5.3 b/metadata/md5-cache/app-emacs/popup-0.5.3
index 7bde4f32479e..4ad594c84f14 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=>=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 376bb866e4d1..1af42d9e8ec7 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=>=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 b6f8c5bef3f9..d18641eb9484 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacsmirror/pov-mode/archive/v3.3.tar.gz -> pov-mode-3.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=6706411cec44ff9cd9285b46de710bb9
diff --git a/metadata/md5-cache/app-emacs/proofgeneral-4.4 b/metadata/md5-cache/app-emacs/proofgeneral-4.4
index cceadb68f385..753416d5d27c 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ProofGeneral/PG/archive/v4.4.tar.gz -> proofgeneral-4.4.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=57c64b4e5b7267dd222c582bca407b58
diff --git a/metadata/md5-cache/app-emacs/protbuf-1.7-r1 b/metadata/md5-cache/app-emacs/protbuf-1.7-r1
index 6f1d2a64353c..23bdb6af5cac 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/protbuf-1.7.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=33a7bc541106ab1268d2d4a72591c33d
diff --git a/metadata/md5-cache/app-emacs/psgml-1.4.1 b/metadata/md5-cache/app-emacs/psgml-1.4.1
index e2ebb8e055ac..4841226cba13 100644
--- a/metadata/md5-cache/app-emacs/psgml-1.4.1
+++ b/metadata/md5-cache/app-emacs/psgml-1.4.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=app-text/openjade >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/psgml-1.4.1.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=67138fb6db302c799196d2563d4fc2f5
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 a1bd789f5f41..0ed1ad274046 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/0.3.tar.gz -> puppet-mode-0.3.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=e4a9dbfd4450767946ea207b47218536
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 45acfdc56448..3775366e009f 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=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/7dee1b5a5debac6e56f9107492a413b6c0edb94d.tar.gz -> puppet-mode-0.3.20180813.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=5cefddeebf772aee1bf6202bdf3dd42b
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.26-r1 b/metadata/md5-cache/app-emacs/pymacs-0.26-r1
deleted file mode 100644
index 28b438473741..000000000000
--- a/metadata/md5-cache/app-emacs/pymacs-0.26-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( >=dev-python/docutils-0.7 virtual/latex-base ) >=app-editors/emacs-23.1:* python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DESCRIPTION=A tool that allows both-side communication beetween Python and Emacs Lisp
-EAPI=7
-HOMEPAGE=https://www.emacswiki.org/emacs/PyMacs
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=app-editors/emacs-23.1:* python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/dgentry/Pymacs/archive/v0.26.tar.gz -> pymacs-0.26.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b101eb4cf37ba4f877fb4be6bc76da42
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.26-r2 b/metadata/md5-cache/app-emacs/pymacs-0.26-r2
new file mode 100644
index 000000000000..2b660b58dd77
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/pymacs-0.26-r2
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( >=dev-python/docutils-0.7 virtual/latex-base ) >=app-editors/emacs-23.1:* python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=A tool that allows both-side communication beetween Python and Emacs Lisp
+EAPI=7
+HOMEPAGE=https://www.emacswiki.org/emacs/PyMacs
+IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/emacs-23.1:* python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/dgentry/Pymacs/archive/v0.26.tar.gz -> pymacs-0.26.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7e15ac1dd2470b718cc2571ffaf3a5a8
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 22f2a347d86b..8f6386aa1807 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://launchpad.net/python-mode/trunk/6.2.3/+download/python-mode.el-6.2.3.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=bf29fceedaeddb0653051372cd488486
diff --git a/metadata/md5-cache/app-emacs/quack-0.48 b/metadata/md5-cache/app-emacs/quack-0.48
index 209d50ea9c5b..07272c4de7ee 100644
--- a/metadata/md5-cache/app-emacs/quack-0.48
+++ b/metadata/md5-cache/app-emacs/quack-0.48
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/quack-0.48.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=6f686db065171041cf8bab133ce4c2d0
diff --git a/metadata/md5-cache/app-emacs/quilt-el-0.66 b/metadata/md5-cache/app-emacs/quilt-el-0.66
index 63b10ff35601..075fed11e209 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://nongnu/quilt/quilt-0.66.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=e6ee5488e530f7672a3754789b64c349
diff --git a/metadata/md5-cache/app-emacs/qwerty-1.1 b/metadata/md5-cache/app-emacs/qwerty-1.1
index 15339c6deff8..34964647cfd0 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/qwerty-1.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=cf1594a28e7122d83a56e40de3a71b7e
diff --git a/metadata/md5-cache/app-emacs/redo+-1.19 b/metadata/md5-cache/app-emacs/redo+-1.19
index 41c54e7ec627..6537d8c9e13a 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/redo+-1.19.el.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a29539a37d1f2edba167895bdc6d22e3
diff --git a/metadata/md5-cache/app-emacs/regress-1.5.1 b/metadata/md5-cache/app-emacs/regress-1.5.1
index 9bb58392d67f..3298513673f9 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/regress-1.5.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=57730c4ccf94e6c1c7e938ff1efedf05
diff --git a/metadata/md5-cache/app-emacs/remember-2.0-r1 b/metadata/md5-cache/app-emacs/remember-2.0-r1
index 1c5aa9e67c4c..b05433bd2185 100644
--- a/metadata/md5-cache/app-emacs/remember-2.0-r1
+++ b/metadata/md5-cache/app-emacs/remember-2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=bbdb? ( app-emacs/bbdb ) planner? ( app-emacs/planner ) >=app-editors/em
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jwiegley/remember/archive/v2.0.tar.gz -> remember-2.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=7717fe7ec6d7cf054a36115a58fb1e3f
diff --git a/metadata/md5-cache/app-emacs/revive-2.24 b/metadata/md5-cache/app-emacs/revive-2.24
index 6d4e44659229..41ed949fc35f 100644
--- a/metadata/md5-cache/app-emacs/revive-2.24
+++ b/metadata/md5-cache/app-emacs/revive-2.24
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/revive-2.24.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=3dccdc46beff89c1ebb4d15ff43f7acc
diff --git a/metadata/md5-cache/app-emacs/rfcview-0.13 b/metadata/md5-cache/app-emacs/rfcview-0.13
index ad43aacb10fe..1946ac8bd97a 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rfcview-0.13.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=5d5f294b372141d0d61e20a4d9347474
diff --git a/metadata/md5-cache/app-emacs/riece-9.0.0 b/metadata/md5-cache/app-emacs/riece-9.0.0
index 7d3ef01c2e3d..91613dffc3bf 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=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/riece/riece-9.0.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 0ebf985d3345..8766c9b78eae 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=>=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 82002d16c645..863ed1bbc327 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rpm-spec-mode-0.15.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 7a954e653911..91fc0d7bed5e 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/ruby-2.4.1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=7c3408c8377a94b17c6ac14fb10a23b7
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 4203650c472a..bbeec0b17f00 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://cache.ruby-lang.org/pub/ruby/ruby-2.5.5.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=db0bbcca69a1d23b185b5116cb625bae
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 deab9ba8ce6f..7404e9214ed0 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ruby/elisp/archive/75bccbb384e6907df47ab69acdccb4536806c890.tar.gz -> ruby-mode-2.6.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=9c1a2b2fa7cd169c8ed17945552d5b14
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.7.0 b/metadata/md5-cache/app-emacs/ruby-mode-2.7.0
index 9889e788af06..55f4bba6b55d 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.7.0
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.7.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ruby/elisp/archive/defe0b586b2a888706507a7bbcdf1201d924cc2d.tar.gz -> ruby-mode-2.7.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=396160a939ed66f2c18b973e1a41ac02
diff --git a/metadata/md5-cache/app-emacs/rudel-0.3.1 b/metadata/md5-cache/app-emacs/rudel-0.3.1
index c62c134aad97..c45ded16853d 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=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rudel-0.3.1.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	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 a8bf24f830b9..14b0eabae7e1 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=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rudel-0.3_pre20110721.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=85263b1b75dbbc1c717d2b0d2d6345e9
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 abb591a86148..1d4c87ffa7fc 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=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rust-mode-0.3.0_p20190125.tar.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=6e27e9c8ca0593c7a0c5117a654480ed
diff --git a/metadata/md5-cache/app-emacs/rust-mode-0.4.0 b/metadata/md5-cache/app-emacs/rust-mode-0.4.0
index 032cd7318ced..f52e18e16e7b 100644
--- a/metadata/md5-cache/app-emacs/rust-mode-0.4.0
+++ b/metadata/md5-cache/app-emacs/rust-mode-0.4.0
@@ -8,5 +8,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/rust-lang/rust-mode/archive/0.4.0.tar.gz -> rust-mode-0.4.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=46fbeccadc048af1adb746d0660cb358
diff --git a/metadata/md5-cache/app-emacs/s-1.12.0 b/metadata/md5-cache/app-emacs/s-1.12.0
index c441da7db1ba..f03f7dbfdbcb 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/s.el/archive/1.12.0.tar.gz -> s-1.12.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 e0e6f9458e3e..2ee82e9fadb2 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.scala-lang.org/files/archive/scala-tool-support-2.10.3.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=c166f8e1187eae832175edd2b5f13e37
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 3a1ac33c1887..25c7e12cd886 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://synthcode.com/emacs/scheme-complete-0.9.8.el.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=80be2c404c26db9c3c959d240a818ec2
diff --git a/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1 b/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1
index 8cabba2df801..691dc80d566c 100644
--- a/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1
+++ b/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=app-i18n/scim >=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=ec7289150fac0fb342c2ac2a2265461d
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 fd72d44540c3..3ba772006a3b 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/antonj/scss-mode/archive/b010d134f499c4b4ad33fe8a669a81e9a531b0b2.tar.gz -> scss-mode-0.5.0_p20150107.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 36388e8e0718..2a6bafe07406 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/antonj/scss-mode/archive/cf58dbec5394280503eb5502938f3b5445d1b53d.tar.gz -> scss-mode-0.5.0_p20180123.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 a69ae8c9fe86..c040d8c4f71b 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 >=app-editors/emacs-23.1:*
 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	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=69005b409c989b8194d7f65d904e4438
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 fc8e9cd64aa8..f5e354b327c8 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/semi/archive/4cf114c95fb49ad75eb6916f678b45b04bad8122.tar.gz -> semi-1.14.7_p20190517.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=979907b595dce6ab95d8633bc2e8074b
diff --git a/metadata/md5-cache/app-emacs/session-2.4b b/metadata/md5-cache/app-emacs/session-2.4b
index d96460df7299..050770c89acd 100644
--- a/metadata/md5-cache/app-emacs/session-2.4b
+++ b/metadata/md5-cache/app-emacs/session-2.4b
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-session/session-2.4b.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=ecc272b50db98a62134bc1c44d6d8b5e
diff --git a/metadata/md5-cache/app-emacs/setnu-1.06 b/metadata/md5-cache/app-emacs/setnu-1.06
index d5a55ebd9fdb..d982b0fa96df 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/setnu-1.06.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=98e5281c80d21620565645931af2c3c3
diff --git a/metadata/md5-cache/app-emacs/slime-2.15 b/metadata/md5-cache/app-emacs/slime-2.15
index e580558d014e..069127f439b4 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 >=app-editors/emacs-23.1:*
 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	267124db452231b7e159152d88c6674d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=common-lisp-3	267124db452231b7e159152d88c6674d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8ab5736ced67822251a3a079c68d64ec
diff --git a/metadata/md5-cache/app-emacs/slime-2.20 b/metadata/md5-cache/app-emacs/slime-2.20
index 385b15db150f..b08e09cb35c0 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 >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.20.tar.gz -> slime-2.20.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=de596a97204c603dd6bbda9b460da4ea
diff --git a/metadata/md5-cache/app-emacs/slime-2.20-r1 b/metadata/md5-cache/app-emacs/slime-2.20-r1
index f5d1da420021..5bae34191264 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 >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.20.tar.gz -> slime-2.20.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=43334091c0b7ac890b211407410d8ee0
diff --git a/metadata/md5-cache/app-emacs/slime-2.21 b/metadata/md5-cache/app-emacs/slime-2.21
index 79c49c408a71..cae58f16434b 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 >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.21.tar.gz -> slime-2.21.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=99cef5113c4d0404f7c7e2f28f96ce1c
diff --git a/metadata/md5-cache/app-emacs/sml-mode-6.9 b/metadata/md5-cache/app-emacs/sml-mode-6.9
index fae8b0881d1d..7ed7db8084f5 100644
--- a/metadata/md5-cache/app-emacs/sml-mode-6.9
+++ b/metadata/md5-cache/app-emacs/sml-mode-6.9
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/sml-mode-6.9.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=8a9aacf862113149ae1d968869d6510f
diff --git a/metadata/md5-cache/app-emacs/sokoban-1.4.8 b/metadata/md5-cache/app-emacs/sokoban-1.4.8
index e1acd8265308..07d8c1702c9d 100644
--- a/metadata/md5-cache/app-emacs/sokoban-1.4.8
+++ b/metadata/md5-cache/app-emacs/sokoban-1.4.8
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://elpa.gnu.org/packages/sokoban-1.4.8.tar
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=22eea890fdfa7f597bc1762942844d34
diff --git a/metadata/md5-cache/app-emacs/ssh-20120709 b/metadata/md5-cache/app-emacs/ssh-20120709
index 63dc4a787102..a39b8f292d9d 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ssh-20120709.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 688ac181255a..3f8d467130e7 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/stripes-0.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=55fa2593b7c9292e9044890eb9ff3a4a
diff --git a/metadata/md5-cache/app-emacs/sumibi-0.7.4 b/metadata/md5-cache/app-emacs/sumibi-0.7.4
index 739ad4cdb91c..6bf57477c445 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/sumibi/26504/sumibi-0.7.4.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=c03ed682ab3cf377d43ebdaf661d4b0d
diff --git a/metadata/md5-cache/app-emacs/teco-7-r2 b/metadata/md5-cache/app-emacs/teco-7-r2
index 6f0d2d7c6a0a..12114dc493bb 100644
--- a/metadata/md5-cache/app-emacs/teco-7-r2
+++ b/metadata/md5-cache/app-emacs/teco-7-r2
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/teco-7.el.bz2
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=86a0a97d8ca852f51babb3586641b6d0
diff --git a/metadata/md5-cache/app-emacs/template-3.3b b/metadata/md5-cache/app-emacs/template-3.3b
index 8040d4dc6050..c2af6b80af18 100644
--- a/metadata/md5-cache/app-emacs/template-3.3b
+++ b/metadata/md5-cache/app-emacs/template-3.3b
@@ -8,5 +8,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-template/template-3.3b.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=23d681966816d0b3bdde17eb4956326a
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 4e90245d1eb3..a71ac97b204c 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/tempo-snippets-0.1.5.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=a0ad0574231c6a1a06a1b7db2832b23e
diff --git a/metadata/md5-cache/app-emacs/thinks-1.12 b/metadata/md5-cache/app-emacs/thinks-1.12
index cc6e139b7b5c..6e6cb1461243 100644
--- a/metadata/md5-cache/app-emacs/thinks-1.12
+++ b/metadata/md5-cache/app-emacs/thinks-1.12
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/thinks.el/archive/v1.12.tar.gz -> thinks-1.12.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=d2d4b38eafb7f7423dbbcbc4f98bde9a
diff --git a/metadata/md5-cache/app-emacs/treepy-0.1.1 b/metadata/md5-cache/app-emacs/treepy-0.1.1
index a0ba97f17f0e..23b961a4de8a 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=>=app-editors/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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=aeea164ef25d795b6558eaeed4cdadad
diff --git a/metadata/md5-cache/app-emacs/treepy-0.1.1-r1 b/metadata/md5-cache/app-emacs/treepy-0.1.1-r1
index 7a515afae6f8..fc8cbf34484d 100644
--- a/metadata/md5-cache/app-emacs/treepy-0.1.1-r1
+++ b/metadata/md5-cache/app-emacs/treepy-0.1.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=01a136a13f8b5e8acdf8d51019a31784
diff --git a/metadata/md5-cache/app-emacs/treepy-0.1.2 b/metadata/md5-cache/app-emacs/treepy-0.1.2
index 9d39047517a6..39118386182e 100644
--- a/metadata/md5-cache/app-emacs/treepy-0.1.2
+++ b/metadata/md5-cache/app-emacs/treepy-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/volrath/treepy.el/archive/0.1.2.tar.gz -> treepy-0.1.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=4216527a9322d6ab858ee40c45d84a77
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 38e9ba11f1d0..8631c688a645 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ocaml/tuareg/archive/2.2.0.tar.gz -> tuareg-mode-2.2.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=e76c62edb1664ab0ac7eb25f2ca4ad82
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 1a541d16ccc9..cccb528a0e7d 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 >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twmode/twittering-mode-2.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=caad5da65bcfc2da3d7b061fa0abeb9f
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 f4a77ed8a4b6..7c556ce48879 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 >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twmode/twittering-mode-3.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=caad5da65bcfc2da3d7b061fa0abeb9f
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-9999 b/metadata/md5-cache/app-emacs/twittering-mode-9999
index 6784ae1788d8..2429b4792ecb 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 >=app-editors/emacs-23.1:*
 SLOT=0
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=caad5da65bcfc2da3d7b061fa0abeb9f
diff --git a/metadata/md5-cache/app-emacs/typing-1.1.4 b/metadata/md5-cache/app-emacs/typing-1.1.4
index b2d54dc4cf3c..3368541ed9db 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/typing-1.1.4.el.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=ef3e908bcaa24c775e4791f433218148
diff --git a/metadata/md5-cache/app-emacs/uboat-1.2 b/metadata/md5-cache/app-emacs/uboat-1.2
index d7c8d6599356..7eafd0acbd2f 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/uboat-1.2.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 8382fd2647dd..722033945ef3 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=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/undo-tree-0.6.6.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=1ab3ccd61c2c1ac84c0473a469b00aca
diff --git a/metadata/md5-cache/app-emacs/uptimes-3.7 b/metadata/md5-cache/app-emacs/uptimes-3.7
index 6237b202f7ee..e6cafaa40869 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/uptimes.el/archive/v3.7.tar.gz -> uptimes-3.7.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=204e9669ff84a30760a2cf1e179f7ca5
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 f55173c678b9..13d5e5a141db 100644
--- a/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
+++ b/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.38.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=78612be4d30c7fe18534686eddc589df
diff --git a/metadata/md5-cache/app-emacs/visual-basic-mode-1.5 b/metadata/md5-cache/app-emacs/visual-basic-mode-1.5
index 99f31682438a..b7c5c3a3edb5 100644
--- a/metadata/md5-cache/app-emacs/visual-basic-mode-1.5
+++ b/metadata/md5-cache/app-emacs/visual-basic-mode-1.5
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/visual-basic-mode-1.5.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=4df42e42f6fdf4752515b3f30a519651
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 5abc12acbec9..355d378642dc 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
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=bbdb? ( app-emacs/bbdb ) ssl? ( net-misc/stunnel ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://launchpad.net/vm/8.2.x/8.2.0b/+download/vm-8.2.0b.tgz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=9bbe4b329ef0101820c50af46c7e1d1d
diff --git a/metadata/md5-cache/app-emacs/volume-1.0-r1 b/metadata/md5-cache/app-emacs/volume-1.0-r1
index 02df41bd72e7..03997956fb5b 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/volume-1.0.el.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=0f855b888df369f97e1284f12ab69058
diff --git a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713 b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
index 5a5fb9e1475d..e3f96ef4af57 100644
--- a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
+++ b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/libvterm >=app-editors/emacs-26:*[dynamic-loading] >=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://github.com/akermu/emacs-libvterm/archive/f41849c2c9c1899f22d1c3d4f871ec47c82627ce.tar.gz -> vterm-0.0.1_pre20200713.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c456abde569f69db8b1fb478d9c6bb3
diff --git a/metadata/md5-cache/app-emacs/w3mnav-0.5-r3 b/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
index 0aa900c90feb..660978098f4b 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/w3mnav-0.5.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _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 2dbfd270ea26..417782a30f7e 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 ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/wanderlust/archive/395826e99b84051396d503392f52462b6cb683a5.tar.gz -> wanderlust-2.15.9_p20180814-git.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 e47d52a051e0..37242e32b509 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 ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/wanderlust/archive/b9a529a54b9e7eafa4ed230ad28efffe0d25a20e.tar.gz -> wanderlust-2.15.9_p20190623.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=471b3e685dc56ecf803374b4af166def
diff --git a/metadata/md5-cache/app-emacs/websocket-1.10 b/metadata/md5-cache/app-emacs/websocket-1.10
index 6a3b58e6e43e..068c5313ff0c 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=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.10.tar.gz -> websocket-1.10.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=67b7c84697fc173cc3a45d1aa4b19e12
diff --git a/metadata/md5-cache/app-emacs/websocket-1.12 b/metadata/md5-cache/app-emacs/websocket-1.12
index 003dc5b5d997..30ff5e7da0b6 100644
--- a/metadata/md5-cache/app-emacs/websocket-1.12
+++ b/metadata/md5-cache/app-emacs/websocket-1.12
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.12.tar.gz -> websocket-1.12.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=8f2f06d3008a2404bcd497b928f9e8c8
diff --git a/metadata/md5-cache/app-emacs/wgrep-2.3.0 b/metadata/md5-cache/app-emacs/wgrep-2.3.0
index 97cad0ee1d02..58b6068fe051 100644
--- a/metadata/md5-cache/app-emacs/wgrep-2.3.0
+++ b/metadata/md5-cache/app-emacs/wgrep-2.3.0
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/mhayashi1120/Emacs-wgrep/archive/2.3.0.tar.gz -> wgrep-2.3.0.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=86de93ca42271781271c75d7bdc492f3
diff --git a/metadata/md5-cache/app-emacs/wgrep-2.3.2 b/metadata/md5-cache/app-emacs/wgrep-2.3.2
index 8591c54e9960..04568f44b349 100644
--- a/metadata/md5-cache/app-emacs/wgrep-2.3.2
+++ b/metadata/md5-cache/app-emacs/wgrep-2.3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/mhayashi1120/Emacs-wgrep/archive/2.3.2.tar.gz -> wgrep-2.3.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=bb27c1fcdc7f6274c98b903d1d218ac3
diff --git a/metadata/md5-cache/app-emacs/whine-20091222 b/metadata/md5-cache/app-emacs/whine-20091222
index 0877e196bd6b..99d9d45d632e 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/whine-20091222.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
 _md5_=fdf86ad9c0d6595994973414d7ffb60a
diff --git a/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2 b/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2
index c41688103da9..56b1a9bc5c90 100644
--- a/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2
+++ b/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=outline-magic? ( app-emacs/outline-magic ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/wikipedia-mode-0.5.el.bz2
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=8654a24ce284787db1207a4bed6c0d4c
diff --git a/metadata/md5-cache/app-emacs/windows-2.53 b/metadata/md5-cache/app-emacs/windows-2.53
index 4bdab9ce9a98..bbc6a830377b 100644
--- a/metadata/md5-cache/app-emacs/windows-2.53
+++ b/metadata/md5-cache/app-emacs/windows-2.53
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=app-emacs/revive >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/windows-2.53.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=1a414a30b7d0e3a3b47f793ec5adb13b
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 7987e8bc47a7..1088d2bfcaf6 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-editors/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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=1dc78804774f7b958baf8bfb95a1df7a
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.9.2 b/metadata/md5-cache/app-emacs/with-editor-2.9.2
index a74a88f1016c..f90f67ad1e5a 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.9.2
+++ b/metadata/md5-cache/app-emacs/with-editor-2.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.9.2.tar.gz -> with-editor-2.9.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=95e2c9c8935a7d4ef53919107814e862
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.9.4 b/metadata/md5-cache/app-emacs/with-editor-2.9.4
index c71dc9d0d1c4..23b4920f7aba 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.9.4
+++ b/metadata/md5-cache/app-emacs/with-editor-2.9.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.9.4.tar.gz -> with-editor-2.9.4.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=95e2c9c8935a7d4ef53919107814e862
diff --git a/metadata/md5-cache/app-emacs/xclip-1.9 b/metadata/md5-cache/app-emacs/xclip-1.9
index 1f9e35765565..1ec12a042750 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xclip-1.9.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=57b70a562ce082462abc1dc0139f38f1
diff --git a/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1 b/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
index c687c7cd4d44..5f5dd99972e1 100644
--- a/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
+++ b/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xrdb-mode-3.0.el.xz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=17f5122b6437dc01a28e212b9b84265f
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 edd875cbb53c..9f4a8ae4ced1 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/xslide/xslide-0.2.2.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=5fdb7ec5aa56571e886290e0813b71cb
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 a685a9702934..59201e9489d2 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/yoshiki/yaml-mode/archive/v0.0.13.tar.gz -> yaml-mode-0.0.13.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 be1b29ef6c5d..823c64f8e5c0 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=>=app-editors/emacs-23.1:*
 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	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _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 f1b94bcbc89e..189308f4b331 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/joaotavora/yasnippet/archive/0.13.0.tar.gz -> yasnippet-0.13.0.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	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 938955c8d9de..03cccaa8f41f 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/AndreaCrotti/yasnippet-snippets/archive/0.3.tar.gz -> yasnippet-snippets-0.3.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=aa9a65c265773043b88e1e4239cd3d42
diff --git a/metadata/md5-cache/app-emacs/yatex-1.80 b/metadata/md5-cache/app-emacs/yatex-1.80
index 5d025424bd77..3f2c57411748 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.yatex.org/yatex1.80.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=89ba6ab186f306abd8e72e767d7f8c21
diff --git a/metadata/md5-cache/app-emacs/yc-4.0.13 b/metadata/md5-cache/app-emacs/yc-4.0.13
index 28b4c6a1e1a9..1733be1ef400 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.ceres.dti.ne.jp/~knak/yc-4.0.13.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9fb935d7f79667cb3923f212985850db
diff --git a/metadata/md5-cache/app-emacs/yc-5.2.1 b/metadata/md5-cache/app-emacs/yc-5.2.1
index 3ba15807d657..6a15451a7473 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.ceres.dti.ne.jp/~knak/yc-5.2.1.el.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=3f3e22fba959d3df0c008b9bee62491a
diff --git a/metadata/md5-cache/app-emacs/zenburn-20110907-r1 b/metadata/md5-cache/app-emacs/zenburn-20110907-r1
index dd8add6e7366..13406d66e3a9 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 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dbrock/zenburn-el/archive/2b0672b04ef3e95c25f849dceb10d669296a188b.tar.gz -> zenburn-20110907.tar.gz
-_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_eclasses_=elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
 _md5_=fe565a3144e8e5005c6464547441fa30
diff --git a/metadata/md5-cache/app-emacs/zenirc-2.112-r1 b/metadata/md5-cache/app-emacs/zenirc-2.112-r1
index 815e04cace43..ccf8b3231b3d 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=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=ftp://ftp.zenirc.org/pub/zenirc/zenirc-2.112.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	00840e1f4eb277c757dbfa5abf73c4c7	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=73190e220769f4edb81899bc83450855
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index b134d4983901..546fd77004e6 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/containerd-1.3.7 b/metadata/md5-cache/app-emulation/containerd-1.3.7
new file mode 100644
index 000000000000..560093a603fe
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-1.3.7
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/go-md2man virtual/pkgconfig test? ( btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-emulation/runc-1.0.0_rc10 ) >=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )
+DESCRIPTION=A daemon to control runC
+EAPI=7
+HOMEPAGE=https://containerd.io/
+IUSE=apparmor btrfs device-mapper +cri hardened +seccomp selinux test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-emulation/runc-1.0.0_rc10
+RESTRICT=strip strip test
+SLOT=0
+SRC_URI=https://github.com/containerd/containerd/archive/8fba4e9a7d01810a393d5d25a3621dc101981175.tar.gz -> containerd-1.3.7.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=429923d14e6ad29de534c8b86eeaa737
diff --git a/metadata/md5-cache/app-emulation/containerd-1.4.1 b/metadata/md5-cache/app-emulation/containerd-1.4.1
deleted file mode 100644
index b80fdafa67da..000000000000
--- a/metadata/md5-cache/app-emulation/containerd-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-go/go-md2man virtual/pkgconfig test? ( btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-emulation/runc-1.0.0_rc92 ) >=dev-lang/go-1.10
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp )
-DESCRIPTION=A daemon to control runC
-EAPI=7
-HOMEPAGE=https://containerd.io/
-IUSE=apparmor btrfs device-mapper +cri hardened +seccomp selinux test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-emulation/runc-1.0.0_rc92
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/containerd/containerd/archive/v1.4.1.tar.gz -> containerd-1.4.1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4f6a5d4333af93e9423ad49dbbf76f2c
diff --git a/metadata/md5-cache/app-emulation/docker-19.03.13-r1 b/metadata/md5-cache/app-emulation/docker-19.03.13-r1
deleted file mode 100644
index 3bc0b8e95388..000000000000
--- a/metadata/md5-cache/app-emulation/docker-19.03.13-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.13.12 dev-go/go-md2man virtual/pkgconfig >=dev-lang/go-1.10 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 )
-DESCRIPTION=The core functions you need to create Docker images and run Docker containers
-EAPI=7
-HOMEPAGE=https://www.docker.com/
-IUSE=apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) !sys-apps/systemd[-cgroup-hybrid(+)] >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.4.1[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?] ~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?,selinux?] ~app-emulation/docker-proxy-0.8.0_p20191011 container-init? ( >=sys-process/tini-0.18.0[static] )
-RESTRICT=installsources strip
-SLOT=0
-SRC_URI=https://github.com/docker/docker-ce/archive/v19.03.13.tar.gz -> docker-19.03.13.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=f6e60c955a17b5c67896f96ba757cfaa
diff --git a/metadata/md5-cache/app-emulation/docker-19.03.13-r2 b/metadata/md5-cache/app-emulation/docker-19.03.13-r2
new file mode 100644
index 000000000000..9bd5bdd8fbfa
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-19.03.13-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.13.12 dev-go/go-md2man virtual/pkgconfig >=dev-lang/go-1.10 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=7
+HOMEPAGE=https://www.docker.com/
+IUSE=apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) !sys-apps/systemd[-cgroup-hybrid(+)] >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.3.7[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?] ~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?,selinux(-)?] ~app-emulation/docker-proxy-0.8.0_p20200617 container-init? ( >=sys-process/tini-0.18.0[static] )
+RESTRICT=installsources strip
+SLOT=0
+SRC_URI=https://github.com/docker/docker-ce/archive/v19.03.13.tar.gz -> docker-19.03.13.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=635887c93e569f3d0f8e569ac3ccfd1b
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.27.4 b/metadata/md5-cache/app-emulation/docker-compose-1.27.4
new file mode 100644
index 000000000000..191dcd7e87b5
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.27.4
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cached-property-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distro-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docker-py-4.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dockerpty-0.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docopt-0.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dotenv-0.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-2.5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PySocks-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/texttable-0.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/websocket-client-0.32.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/pytest-5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ddt-1.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Multi-container orchestration for Docker
+EAPI=7
+HOMEPAGE=https://github.com/docker/compose
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cached-property-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distro-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docker-py-4.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dockerpty-0.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docopt-0.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dotenv-0.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-2.5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PySocks-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/texttable-0.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/websocket-client-0.32.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/docker/compose/archive/1.27.4.tar.gz -> docker-compose-1.27.4.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8827a8b1a120ecb6edaddc96d82099d3
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20200617 b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20200617
new file mode 100644
index 000000000000..11113be59d39
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20200617
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Docker container networking
+EAPI=7
+HOMEPAGE=https://github.com/docker/libnetwork
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/docker/libnetwork/archive/026aabaa659832804b01754aaadd2c0f420c68b6.tar.gz -> docker-proxy-0.8.0_p20200617.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
+_md5_=9ce8016db8b251c3f909eb6523c0a2f6
diff --git a/metadata/md5-cache/app-emulation/edumips64-1.1 b/metadata/md5-cache/app-emulation/edumips64-1.1
deleted file mode 100644
index 17b23ebde4fc..000000000000
--- a/metadata/md5-cache/app-emulation/edumips64-1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-python/sphinx dev-java/javahelp:0 >=virtual/jdk-1.6 doc? ( sys-devel/make ) test? ( dev-java/junit:4 dev-java/ant-junit4 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A visual and cross-platform MIPS64 CPU Simulator
-EAPI=5
-HOMEPAGE=https://www.edumips.org
-IUSE=elibc_FreeBSD doc test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/edumips64/edumips64-1.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7ebabcd382dfe3eb1ad509bd4a4ea411
diff --git a/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1 b/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
index 25d70c661731..cb864c5eb501 100644
--- a/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
+++ b/metadata/md5-cache/app-emulation/firecracker-0.21.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firecracker-microvm/firecracker/archive/v0.21.1.tar.gz -> firecracker-0.21.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.8/download -> aho-corasick-0.7.8.crate https://crates.io/api/v1/crates/backtrace/0.3.44/download -> backtrace-0.3.44.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.32/download -> backtrace-sys-0.1.32.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cpuid/0.1.0/download -> cpuid-0.1.0.crate https://crates.io/api/v1/crates/device_tree/1.1.0/download -> device_tree-1.1.0.crate https://crates.io/api/v1/crates/epoll/4.1.0/download -> epoll-4.1.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/kernel/0.1.0/download -> kernel-0.1.0.crate https://crates.io/api/v1/crates/kvm-bindings/0.2.0/download -> kvm-bindings-0.2.0.crate https://crates.io/api/v1/crates/kvm-ioctls/0.5.0/download -> kvm-ioctls-0.5.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/logger/0.1.0/download -> logger-0.1.0.crate https://crates.io/api/v1/crates/memchr/2.3.2/download -> memchr-2.3.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.8/download -> proc-macro2-1.0.8.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/regex/1.3.4/download -> regex-1.3.4.crate https://crates.io/api/v1/crates/regex-syntax/0.6.14/download -> regex-syntax-0.6.14.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/seccomp/0.1.0/download -> seccomp-0.1.0.crate https://crates.io/api/v1/crates/serde/1.0.104/download -> serde-1.0.104.crate https://crates.io/api/v1/crates/serde_derive/1.0.104/download -> serde_derive-1.0.104.crate https://crates.io/api/v1/crates/serde_json/1.0.48/download -> serde_json-1.0.48.crate https://crates.io/api/v1/crates/syn/1.0.14/download -> syn-1.0.14.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/timerfd/1.1.1/download -> timerfd-1.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vm-memory/0.1.0/download -> vm-memory-0.1.0.crate https://crates.io/api/v1/crates/vmm-sys-util/0.4.0/download -> vmm-sys-util-0.4.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=17f137938ff686618c08e813b17e1551
diff --git a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.36.1 b/metadata/md5-cache/app-emulation/libguestfs-appliance-1.36.1
deleted file mode 100644
index b2f659420f0a..000000000000
--- a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.36.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup unpack
-DEPEND=app-arch/xz-utils
-DESCRIPTION=VM appliance disk image used in libguestfs package
-EAPI=5
-HOMEPAGE=http://libguestfs.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=!<app-emulation/libguestfs-1.36.1
-SLOT=0
-SRC_URI=http://libguestfs.org/download/binaries/appliance/appliance-1.36.1.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d
-_md5_=648d972e2c97732e649f844c664fa3ef
diff --git a/metadata/md5-cache/app-emulation/q4wine-1.3.12 b/metadata/md5-cache/app-emulation/q4wine-1.3.12
index 1f9717bf7bc8..8f9fdfea88cb 100644
--- a/metadata/md5-cache/app-emulation/q4wine-1.3.12
+++ b/metadata/md5-cache/app-emulation/q4wine-1.3.12
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) ico? ( >=media-gfx/icoutils-0.26.0 ) app-admin/sudo >=sys-apps/which-2.19 iso? ( sys-fs/fuseiso )
 SLOT=0
 SRC_URI=mirror://sourceforge/q4wine/q4wine-1.3.12.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dac567ccdd3efce223fcf65240886704
diff --git a/metadata/md5-cache/app-emulation/qemu-init-scripts-0.3.0 b/metadata/md5-cache/app-emulation/qemu-init-scripts-0.3.0
deleted file mode 100644
index e5bf95cd65e6..000000000000
--- a/metadata/md5-cache/app-emulation/qemu-init-scripts-0.3.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Kvm and qemu init scripts
-EAPI=5
-HOMEPAGE=https://gitweb.gentoo.org/proj/kvm-tools.git/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-emulation/qemu net-misc/socat
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dolsen/releases/qemu-init-scripts/qemu-init-scripts-0.3.0.tar.xz
-_md5_=bf37d0e24c691231e813b370efbfb4ac
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc10-r1 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc10-r1
new file mode 100644
index 000000000000..9ed5aec7d918
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0_rc10-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/go-md2man test? ( seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor ) ) >=dev-lang/go-1.10
+DEFINED_PHASES=compile install setup test unpack
+DEPEND=seccomp? ( sys-libs/libseccomp )
+DESCRIPTION=runc container cli tools
+EAPI=7
+HOMEPAGE=http://runc.io
+IUSE=apparmor +ambient hardened +kmem +seccomp selinux test kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 BSD-2 BSD MIT
+RDEPEND=seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor )
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/opencontainers/runc/archive/vdc9208a3303feef5b3839f4323d9beb36df0a9dd.tar.gz -> runc-1.0.0_rc10.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=173ecf7af463d8455714171e644d433c
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc92 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc92
deleted file mode 100644
index 67edee529772..000000000000
--- a/metadata/md5-cache/app-emulation/runc-1.0.0_rc92
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-go/go-md2man test? ( seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor ) ) >=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst setup test unpack
-DEPEND=seccomp? ( sys-libs/libseccomp )
-DESCRIPTION=runc container cli tools
-EAPI=7
-HOMEPAGE=http://runc.io
-IUSE=apparmor hardened +kmem +seccomp selinux test kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0 BSD-2 BSD MIT
-RDEPEND=seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor )
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/opencontainers/runc/archive/v1.0.0-rc92.tar.gz -> runc-1.0.0_rc92.tar.gz
-_eclasses_=go-module	92660621959e7fab813173772987588b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=09841b2f3895df0bf047094dd0214537
diff --git a/metadata/md5-cache/app-emulation/ski-1.3.2-r4 b/metadata/md5-cache/app-emulation/ski-1.3.2-r4
index 89ade9332908..b4c3965662c3 100644
--- a/metadata/md5-cache/app-emulation/ski-1.3.2-r4
+++ b/metadata/md5-cache/app-emulation/ski-1.3.2-r4
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/libltdl:0= sys-libs/ncurses:0= virtual/libelf debug? ( sys-libs
 SLOT=0
 SRC_URI=mirror://sourceforge/ski/ski-1.3.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=99461c57ca56fba9f91431daf670cf4c
+_md5_=f245d8330238c062c62b500cb42f4b67
diff --git a/metadata/md5-cache/app-emulation/uade-2.13 b/metadata/md5-cache/app-emulation/uade-2.13
deleted file mode 100644
index 4bd9177368b3..000000000000
--- a/metadata/md5-cache/app-emulation/uade-2.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=media-libs/libao virtual/pkgconfig
-DESCRIPTION=Unix Amiga Delitracker Emulator - plays old Amiga tunes through UAE emulation
-EAPI=5
-HOMEPAGE=http://zakalwe.fi/uade
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libao
-SLOT=0
-SRC_URI=http://zakalwe.fi/uade/uade2/uade-2.13.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=71afad33475b2122472b639669013411
diff --git a/metadata/md5-cache/app-emulation/uade-2.13-r1 b/metadata/md5-cache/app-emulation/uade-2.13-r1
index a5f1e4474265..c36aae912e01 100644
--- a/metadata/md5-cache/app-emulation/uade-2.13-r1
+++ b/metadata/md5-cache/app-emulation/uade-2.13-r1
@@ -4,10 +4,10 @@ DEPEND=media-libs/libao
 DESCRIPTION=Unix Amiga Delitracker Emulator - plays old Amiga tunes through UAE emulation
 EAPI=7
 HOMEPAGE=https://zakalwe.fi/uade
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=media-libs/libao
 SLOT=0
 SRC_URI=https://zakalwe.fi/uade/uade2/uade-2.13.tar.bz2
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=573f60baec379b1a25ad99aceece1ef5
+_md5_=77410b33742555c4c0f96279f7f21b3d
diff --git a/metadata/md5-cache/app-emulation/vice-3.4_p38553 b/metadata/md5-cache/app-emulation/vice-3.4_p38553
index e866942bb11f..29b8fe7669dc 100644
--- a/metadata/md5-cache/app-emulation/vice-3.4_p38553
+++ b/metadata/md5-cache/app-emulation/vice-3.4_p38553
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/unzip app-text/dos2unix dev-embedded/xa dev-lang/perl sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/pkgconfig virtual/yacc doc? ( virtual/texi2dvi ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-arch/unzip app-text/dos2unix dev-embedded/xa dev-lang/perl sys-apps/texinfo sys-devel/flex sys-devel/gettext virtual/pkgconfig virtual/yacc doc? ( virtual/texi2dvi ) gtk? ( x11-misc/xdg-utils ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=sys-libs/readline:0= virtual/libintl alsa? ( media-libs/alsa-lib ) ethernet? ( >=net-libs/libpcap-0.9.8 >=net-libs/libnet-1.1.2.1:1.1 ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) gif? ( media-libs/giflib:= ) gtk? ( dev-libs/glib:2 media-libs/fontconfig:1.0 x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango opengl? ( media-libs/glew:0= virtual/opengl ) ) jpeg? ( virtual/jpeg ) lame? ( media-sound/lame ) mpg123? ( media-sound/mpg123 ) ogg? ( media-libs/libogg media-libs/libvorbis ) parport? ( sys-libs/libieee1284 ) pci? ( sys-apps/pciutils ) png? ( media-libs/libpng:0= ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2[video] ) zlib? ( sys-libs/zlib ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=The Versatile Commodore Emulator
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( gtk headless sdl ) gtk? ( zlib )
 SLOT=0
 SRC_URI=https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/vice-emu-code-r38553-trunk-vice.zip
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34ce4508f299d37ff1529e9c1835c3c0
+_md5_=e0b18d7ca2a9e0ddb1227f491f23e4fb
diff --git a/metadata/md5-cache/app-emulation/vkd3d-1.2 b/metadata/md5-cache/app-emulation/vkd3d-1.2
new file mode 100644
index 000000000000..1e09a96d9c08
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/vkd3d-1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=spirv-tools? ( dev-util/spirv-tools:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] x11-libs/xcb-util:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-wm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/spirv-headers dev-util/vulkan-headers
+DESCRIPTION=D3D12 to Vulkan translation library
+EAPI=6
+HOMEPAGE=https://source.winehq.org/git/vkd3d.git/
+IUSE=spirv-tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=spirv-tools? ( dev-util/spirv-tools:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] x11-libs/xcb-util:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-wm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://dl.winehq.org/vkd3d/source/vkd3d-1.2.tar.xz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f123fec048331bd90a0ce655f00c991
diff --git a/metadata/md5-cache/app-emulation/vkd3d-9999 b/metadata/md5-cache/app-emulation/vkd3d-9999
index a67d4bc94f48..7c66797d4e80 100644
--- a/metadata/md5-cache/app-emulation/vkd3d-9999
+++ b/metadata/md5-cache/app-emulation/vkd3d-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=spirv-tools? ( dev-util/spirv-tools:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] x11-libs/xcb-util:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-wm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2464e6a8f6fb02db9f5c979f7dbfef75
+_md5_=22836b4c6db8687a9544bcfa48de2ed5
diff --git a/metadata/md5-cache/app-emulation/wine-staging-5.14 b/metadata/md5-cache/app-emulation/wine-staging-5.14
deleted file mode 100644
index 1407b8cb9205..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-5.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:5.1.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=5.14
-SRC_URI=https://dl.winehq.org/wine/source/5.x/wine-5.14.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v5.14.tar.gz -> wine-staging-5.14.tar.gz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b3287800104128ceee0cbfde44e0cc63
diff --git a/metadata/md5-cache/app-emulation/wine-staging-5.18 b/metadata/md5-cache/app-emulation/wine-staging-5.18
new file mode 100644
index 000000000000..2930df370d4e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-5.18
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:5.1.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=5.18
+SRC_URI=https://dl.winehq.org/wine/source/5.x/wine-5.18.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v5.18.tar.gz -> wine-staging-5.18.tar.gz )
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bc49df5515b208e8d152a99fb012cf08
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 2108670abd68..367e5f7858a7 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
 EAPI=6
 HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:5.1.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( dev-libs/libgcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:5.1.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c64f1f6f37e949d71429365d3a95c598
+_md5_=aeb9d782fb311da09a864a1aafbf5670
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-5.14 b/metadata/md5-cache/app-emulation/wine-vanilla-5.14
deleted file mode 100644
index b5123e1a0895..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-5.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:5.1.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=5.14
-SRC_URI=https://dl.winehq.org/wine/source/5.x/wine-5.14.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f46cd736cafad3036a9036716c7039f
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-5.18 b/metadata/md5-cache/app-emulation/wine-vanilla-5.18
new file mode 100644
index 000000000000..b9893d43761a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-5.18
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:5.1.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=5.18
+SRC_URI=https://dl.winehq.org/wine/source/5.x/wine-5.18.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=36645eeb9c894391a04c36775e21572e
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index 8e5941f82105..bd7d17a9eb99 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
 EAPI=6
 HOMEPAGE=https://www.winehq.org/
 IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:5.1.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( >=app-emulation/vkd3d-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:5.1.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
 RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f46cd736cafad3036a9036716c7039f
+_md5_=36645eeb9c894391a04c36775e21572e
diff --git a/metadata/md5-cache/app-emulation/xe-guest-utilities-5.6.0_p595 b/metadata/md5-cache/app-emulation/xe-guest-utilities-5.6.0_p595
deleted file mode 100644
index 4b719aa990d0..000000000000
--- a/metadata/md5-cache/app-emulation/xe-guest-utilities-5.6.0_p595
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup unpack
-DEPEND=app-arch/rpm2targz >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=XenServer Virtual Machine Tools
-EAPI=5
-HOMEPAGE=https://www.citrix.com/
-IUSE=xenstore kernel_linux
-KEYWORDS=~amd64
-LICENSE=LGPL-3 LGPL-2.1
-RDEPEND=!xenstore? ( app-emulation/xen-tools ) xenstore? ( !app-emulation/xen-tools )
-SLOT=0
-SRC_URI=http://updates.vmd.citrix.com/XenServer/5.6.0/rhel4x/SRPMS/xe-guest-utilities-5.6.0-595.src.rpm
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d3b55ebdd6a726bf7e723bfa2eb44ca0
diff --git a/metadata/md5-cache/app-emulation/xe-guest-utilities-6.1.0_p1033 b/metadata/md5-cache/app-emulation/xe-guest-utilities-6.1.0_p1033
deleted file mode 100644
index 1731c62a295a..000000000000
--- a/metadata/md5-cache/app-emulation/xe-guest-utilities-6.1.0_p1033
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup unpack
-DEPEND=app-arch/rpm2targz >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=XenServer Virtual Machine Tools
-EAPI=5
-HOMEPAGE=https://www.citrix.com/
-IUSE=xenstore kernel_linux
-KEYWORDS=~amd64
-LICENSE=LGPL-3 LGPL-2.1
-RDEPEND=!xenstore? ( app-emulation/xen-tools ) xenstore? ( !app-emulation/xen-tools )
-SLOT=0
-SRC_URI=http://updates.vmd.citrix.com/XenServer/6.1.0/rhel4x/SRPMS/xe-guest-utilities-6.1.0-1033.src.rpm
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=afff06c400ab807477c261bb11bd6222
diff --git a/metadata/md5-cache/app-emulation/xen-4.13.1-r4 b/metadata/md5-cache/app-emulation/xen-4.13.1-r4
new file mode 100644
index 000000000000..dbfe67e6d471
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.13.1-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.13.1
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.13.1/xen-4.13.1.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.13.1-upstream-patches-3.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.13.1-upstream-patches-3.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=556ec7ffaed48be024c4a68a705ca882
diff --git a/metadata/md5-cache/app-emulation/xen-4.14.0-r1 b/metadata/md5-cache/app-emulation/xen-4.14.0-r1
deleted file mode 100644
index 3eb546b31ec7..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.14.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=debug efi flask
-KEYWORDS=~amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.14.0
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.14.0-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.0-upstream-patches-0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aef303758b2038341069e4afa5dc0919
diff --git a/metadata/md5-cache/app-emulation/xen-4.14.0-r2 b/metadata/md5-cache/app-emulation/xen-4.14.0-r2
new file mode 100644
index 000000000000..452acb9dc653
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.14.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.14.0
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.14.0-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.0-upstream-patches-1.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=42fcca79deae6301dfe59d9845651360
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.13.1-r4 b/metadata/md5-cache/app-emulation/xen-tools-4.13.1-r4
new file mode 100644
index 000000000000..8571a92b3977
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.13.1-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=sys-kernel/linux-headers-4.11 python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] pam? ( dev-python/pypam[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] pam? ( dev-python/pypam[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] pam? ( dev-python/pypam[python_targets_python3_8(-)] ) ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_6? ( dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) python? ( >=dev-lang/swig-4.0.0 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.13
+SRC_URI=https://downloads.xenproject.org/release/xen/4.13.1/xen-4.13.1.tar.gz https://github.com/qemu/seabios/archive/rel-1.12.1.tar.gz -> seabios-1.12.1.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/20d2e5a125e34fc8501026613a71549b2a1a3e54.tar.gz -> edk2-20d2e5a125e34fc8501026613a71549b2a1a3e54.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1b.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.13.1-upstream-patches-3.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.13.1-upstream-patches-3.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-security-patches-28.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-security-patches-28.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-21.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-21.tar.xz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e2e50ee45cfb6b3951969c0cf07c869d
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r1
deleted file mode 100644
index e12c12199c6d..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=sys-kernel/linux-headers-4.11 python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] pam? ( dev-python/pypam[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] pam? ( dev-python/pypam[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] pam? ( dev-python/pypam[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] pam? ( dev-python/pypam[python_targets_python3_9(-)] ) ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_6? ( dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) python? ( >=dev-lang/swig-4.0.0 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.14
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz https://github.com/qemu/seabios/archive/rel-1.13.0.tar.gz -> seabios-1.13.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/20d2e5a125e34fc8501026613a71549b2a1a3e54.tar.gz -> edk2-20d2e5a125e34fc8501026613a71549b2a1a3e54.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1b.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.14.0-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.0-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-security-patches-28.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-security-patches-28.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-22.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-22.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f1d9963fc894dafe6e636c2f5e30c4b
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r2
new file mode 100644
index 000000000000..4c556c622f7c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.14.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=sys-kernel/linux-headers-4.11 python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] pam? ( dev-python/pypam[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] pam? ( dev-python/pypam[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] pam? ( dev-python/pypam[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] pam? ( dev-python/pypam[python_targets_python3_9(-)] ) ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_6? ( dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/markdown[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) python? ( >=dev-lang/swig-4.0.0 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[ncurses,xml,threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.14
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.0/xen-4.14.0.tar.gz https://github.com/qemu/seabios/archive/rel-1.13.0.tar.gz -> seabios-1.13.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/20d2e5a125e34fc8501026613a71549b2a1a3e54.tar.gz -> edk2-20d2e5a125e34fc8501026613a71549b2a1a3e54.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1b.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.14.0-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.0-upstream-patches-1.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-security-patches-28.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-security-patches-28.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-22.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-22.tar.xz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=98dda517051a884241e663f15ed92074
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 21ff3161acea..dc4fcb3ac2c5 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-7 b/metadata/md5-cache/app-eselect/eselect-repository-7
index c1cedbd471d4..bcba7bc2122a 100644
--- a/metadata/md5-cache/app-eselect/eselect-repository-7
+++ b/metadata/md5-cache/app-eselect/eselect-repository-7
@@ -3,11 +3,11 @@ DESCRIPTION=Manage repos.conf via eselect
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/eselect-repository
 IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-admin/eselect python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) net-misc/wget
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/eselect-repository/archive/v7.tar.gz -> eselect-repository-7.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9be0d5c539ade182bdb3da7bb5f8cc70
+_md5_=508e4568bd9e8fe7d5e4c60b0a347f21
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index b89def8190c3..c829c8658e9a 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/libewf-20171104 b/metadata/md5-cache/app-forensics/libewf-20171104
deleted file mode 100644
index f7b78bf8328c..000000000000
--- a/metadata/md5-cache/app-forensics/libewf-20171104
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=fuse? ( sys-fs/fuse:0= ) nls? ( virtual/libintl virtual/libiconv ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) zlib? ( sys-libs/zlib ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Implementation of the EWF (SMART and EnCase) image format
-EAPI=6
-HOMEPAGE=https://github.com/libyal/libewf
-IUSE=bfio bzip2 debug +fuse nls +ssl static-libs +uuid unicode zlib
-KEYWORDS=amd64 ~arm hppa ppc ~ppc64 x86
-LICENSE=BSD
-RDEPEND=fuse? ( sys-fs/fuse:0= ) nls? ( virtual/libintl virtual/libiconv ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) zlib? ( sys-libs/zlib )
-RESTRICT=test
-SLOT=0/3
-SRC_URI=https://github.com/libyal/libewf/releases/download/20171104/libewf-experimental-20171104.tar.gz
-_md5_=a1fa86f4d5635c511ed0d9a304dae42a
diff --git a/metadata/md5-cache/app-forensics/libewf-20171104-r1 b/metadata/md5-cache/app-forensics/libewf-20171104-r1
new file mode 100644
index 000000000000..4a613da73aab
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/libewf-20171104-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=bzip2? ( app-arch/bzip2 ) fuse? ( sys-fs/fuse:0= ) nls? ( virtual/libintl virtual/libiconv ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) zlib? ( sys-libs/zlib ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Implementation of the EWF (SMART and EnCase) image format
+EAPI=7
+HOMEPAGE=https://github.com/libyal/libewf
+IUSE=bfio bzip2 debug +fuse nls +ssl static-libs +uuid unicode zlib
+KEYWORDS=amd64 ~arm hppa ppc ~ppc64 x86
+LICENSE=BSD
+RDEPEND=bzip2? ( app-arch/bzip2 ) fuse? ( sys-fs/fuse:0= ) nls? ( virtual/libintl virtual/libiconv ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) zlib? ( sys-libs/zlib )
+RESTRICT=test
+SLOT=0/3
+SRC_URI=https://github.com/libyal/libewf/releases/download/20171104/libewf-experimental-20171104.tar.gz
+_md5_=e7308d70274567615473c392138ae471
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index f92adf350d76..bfb543a90cd5 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/anthy-9100h-r2 b/metadata/md5-cache/app-i18n/anthy-9100h-r2
index c20b92c33c03..dc9191b6e595 100644
--- a/metadata/md5-cache/app-i18n/anthy-9100h-r2
+++ b/metadata/md5-cache/app-i18n/anthy-9100h-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=canna-2ch? ( app-dicts/canna-2ch ) emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/anthy/37536/anthy-9100h.tar.gz
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=19b43decca4686ac9959a14b1a06c72c
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.2.9.6 b/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
index ab8aa27d59aa..087b8c4efb59 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
+++ b/metadata/md5-cache/app-i18n/fcitx-4.2.9.6
@@ -12,5 +12,5 @@ REQUIRED_USE=cairo? ( X ) pango? ( cairo )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx/fcitx-4.2.9.6_dict.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df21308c9655f8ffa73c25e4ab8f28f6
diff --git a/metadata/md5-cache/app-i18n/fcitx-4.9999 b/metadata/md5-cache/app-i18n/fcitx-4.9999
index 5fee401adcfd..926c7dc8bdf0 100644
--- a/metadata/md5-cache/app-i18n/fcitx-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-4.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=cairo? ( X ) pango? ( cairo )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9880a9b73ade2dcdcbed20a661c692c7
diff --git a/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10 b/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
index 4879e34295d7..072eccd6856f 100644
--- a/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
+++ b/metadata/md5-cache/app-i18n/fcitx-configtool-0.4.10
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=dev-libs/glib:2 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3
 DESCRIPTION=GTK+ GUI configuration tool for Fcitx
@@ -10,4 +10,4 @@ RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-configtool/fcitx-configtool-0.4.10.tar.xz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b514db3e563c84ab1dabedda532df12
+_md5_=e6222b9771f6033fb52a5b0d7bf929b0
diff --git a/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999 b/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999
index 4661340aa7e7..853998469016 100644
--- a/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-configtool-4.9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-libs/glib:2 virtual/pkgconfig 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=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3
 DESCRIPTION=GTK+ GUI configuration tool for Fcitx
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3
 SLOT=4
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1796869ae1eaddd3a33c5d97b2e6b879
+_md5_=d7c3a2cda999822bec74c3145d167ba4
diff --git a/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.3 b/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.3
index 2042017936cb..ce0e3ff5e1a8 100644
--- a/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.3
+++ b/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.5.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libpinyin-2.1.0:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictionary-manager? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-libpinyin/fcitx-libpinyin-0.5.3_dict.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d171c00ea7661c72be5be232a902937
+_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6416291bacc8ae0d521bdf8d6301c443
diff --git a/metadata/md5-cache/app-i18n/fcitx-libpinyin-4.9999 b/metadata/md5-cache/app-i18n/fcitx-libpinyin-4.9999
index b914262acd6e..aa97e94c136d 100644
--- a/metadata/md5-cache/app-i18n/fcitx-libpinyin-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-libpinyin-4.9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/libpinyin-2.1.0:= dev-libs/glib:2 sys-apps/dbus virtual/libintl dictionary-manager? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtdbus-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b98b358c1c7badc27606b4ec25d39ea4
+_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=748fb5827aa71112e8da0dc2938ab78e
diff --git a/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2 b/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2
index 211b068087a8..a511cd1dd627 100644
--- a/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2
+++ b/metadata/md5-cache/app-i18n/fcitx-rime-0.3.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-rime/fcitx-rime-0.3.2.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=93d51cffefc63af7a2d8b6d6727d8fce
+_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c888cb49813adc73a0be237983ee07b
diff --git a/metadata/md5-cache/app-i18n/fcitx-rime-4.9999 b/metadata/md5-cache/app-i18n/fcitx-rime-4.9999
index d4a70d31afee..3c8abd03a3c9 100644
--- a/metadata/md5-cache/app-i18n/fcitx-rime-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-rime-4.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data virtual/libintl configuration_tool? ( >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=4
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4f9cc2bb12e90f45f77404e911f4b69
+_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1e002fde3bec4afb4389da944a133a64
diff --git a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2 b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2
index 5d1a9fad0eda..b948ac02bc11 100644
--- a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2
+++ b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl app-i18n/sunpinyin-data
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3dbea69cab26d241db7e939e2b32076
diff --git a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999 b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999
index 3b9ec9e971aa..26c9d1bee215 100644
--- a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-4.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 >=app-i18n/sunpinyin-2.0.4_alpha:= virtual/libintl app-i18n/sunpinyin-data
 SLOT=4
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2aece897e250136e095cfc3ac091cfb9
diff --git a/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8 b/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8
index 8f74bd8f62ee..d36c7fffb79e 100644
--- a/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8
+++ b/metadata/md5-cache/app-i18n/fcitx-table-extra-0.3.8
@@ -1,12 +1,13 @@
+BDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4[table] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=app-i18n/fcitx-4.2.9:4[table]
 DESCRIPTION=Extra Chinese table input methods for Fcitx
-EAPI=6
+EAPI=7
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-table-extra
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4[table]
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-table-extra/fcitx-table-extra-0.3.8.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a60a12a0abab9623489a613c72e39d0
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=df658679379314c3138e326d6132c0f5
diff --git a/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999 b/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999
index 8c0970cb8b4a..178a60372f16 100644
--- a/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-table-extra-4.9999
@@ -1,11 +1,12 @@
+BDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4[table] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=app-i18n/fcitx-4.2.9:4[table]
 DESCRIPTION=Extra Chinese table input methods for Fcitx
-EAPI=6
+EAPI=7
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-table-extra
 LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=>=app-i18n/fcitx-4.2.9:4[table]
 SLOT=4
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1544232af6a1931624a01b427a06fcd7
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1982328574ccc34043d4d99390000f83
diff --git a/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.7 b/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.7
index 1c6c382cb17c..4c8479ae7cb1 100644
--- a/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.7
+++ b/metadata/md5-cache/app-i18n/fcitx-unikey-0.2.7
@@ -1,7 +1,8 @@
+BDEPEND=>=app-i18n/fcitx-4.2.9:4 sys-devel/gettext virtual/pkgconfig macro-editor? ( >=dev-qt/qtwidgets-5.7:5 ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 ) sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 )
 DESCRIPTION=Vietnamese Unikey input methods for Fcitx
-EAPI=6
+EAPI=7
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey
 IUSE=+macro-editor
 KEYWORDS=amd64 ppc ppc64 x86
@@ -9,5 +10,5 @@ LICENSE=GPL-2+ GPL-3+ LGPL-2+
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 )
 SLOT=4
 SRC_URI=https://download.fcitx-im.org/fcitx-unikey/fcitx-unikey-0.2.7.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d90e4c22a34412656b4a4107541f2fd
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6b4bc8d350ec5a9ea5a1beac17855afc
diff --git a/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999 b/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
index daa07581297b..6cdd30bd8c73 100644
--- a/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
+++ b/metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
@@ -1,12 +1,13 @@
+BDEPEND=>=app-i18n/fcitx-4.2.9:4 sys-devel/gettext virtual/pkgconfig macro-editor? ( >=dev-qt/qtwidgets-5.7:5 ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 ) sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 )
 DESCRIPTION=Vietnamese Unikey input methods for Fcitx
-EAPI=6
+EAPI=7
 HOMEPAGE=https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey
 IUSE=+macro-editor
 LICENSE=GPL-2+ GPL-3+ LGPL-2+
 PROPERTIES=live
 RDEPEND=>=app-i18n/fcitx-4.2.9:4 virtual/libintl macro-editor? ( >=app-i18n/fcitx-qt5-1.1:4 >=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtwidgets-5.7:5 )
 SLOT=4
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54f2ef9288ac79cbb982977d39b96d59
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=36b8750881394a318e0789a6aedae8f2
diff --git a/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.2 b/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.2
index 3c5a9de45dfd..2c4458433f9e 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.2
+++ b/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-i18n/ibus-table
 SLOT=0
 SRC_URI=https://github.com/definite/ibus-table-chinese/archive/1.8.2.tar.gz -> ibus-table-chinese-1.8.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f2d4fcb04eb248252b9057304d2fb435
diff --git a/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.3 b/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.3
index 2c344548a5d3..8508d71f89e8 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.3
+++ b/metadata/md5-cache/app-i18n/ibus-table-chinese-1.8.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-i18n/ibus-table
 SLOT=0
 SRC_URI=https://github.com/definite/ibus-table-chinese/archive/1.8.3.tar.gz -> ibus-table-chinese-1.8.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8b2157e6792417c2ba891202ee1d9b1
diff --git a/metadata/md5-cache/app-i18n/mozc-2.23.2815.102 b/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
index 84584d57c5ec..b7eb3db858ae 100644
--- a/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
+++ b/metadata/md5-cache/app-i18n/mozc-2.23.2815.102
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/mozc/archive/afb03ddfe72dde4cf2409863a3bfea160f7a66d8.tar.gz -> mozc-2.23.2815.102.tar.gz https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz -> japanese-usage-dictionary-20120416091336.tar.gz fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-2.23.2815.102.1.patch )
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5174d1bc60daf137a26ec7753ba31c56
diff --git a/metadata/md5-cache/app-i18n/mozc-9999 b/metadata/md5-cache/app-i18n/mozc-9999
index d97b627a2734..7030fd2d06fc 100644
--- a/metadata/md5-cache/app-i18n/mozc-9999
+++ b/metadata/md5-cache/app-i18n/mozc-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/protobuf-3.0.0:= emacs? ( app-editors/emacs:* ) fcitx4? ( app
 REQUIRED_USE=|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8b1fafc78101852151ea03076bcb926f
diff --git a/metadata/md5-cache/app-i18n/pology-0.12-r2 b/metadata/md5-cache/app-i18n/pology-0.12-r2
index 71cb4f4da7a5..906371fb2a40 100644
--- a/metadata/md5-cache/app-i18n/pology-0.12-r2
+++ b/metadata/md5-cache/app-i18n/pology-0.12-r2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-l
 REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://pology.nedohodnik.net/release/pology-0.12.tar.bz2
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1a4b2395ec089b90a766681bb9916aa
diff --git a/metadata/md5-cache/app-i18n/skktools-1.3.3_p20170305 b/metadata/md5-cache/app-i18n/skktools-1.3.3_p20170305
index 6cd833c9df70..51d97f02dcb7 100644
--- a/metadata/md5-cache/app-i18n/skktools-1.3.3_p20170305
+++ b/metadata/md5-cache/app-i18n/skktools-1.3.3_p20170305
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/gdbm emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://github.com/skk-dev/skktools/archive/e14d98e734d2fdff611385c7df65826e94d929db.tar.gz -> skktools-1.3.3_p20170305.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=e3c76444f48c10e4c9ef34a6107ea976
diff --git a/metadata/md5-cache/app-i18n/skktools-1.3.4 b/metadata/md5-cache/app-i18n/skktools-1.3.4
index e623e6d4cb24..c38e587f592e 100644
--- a/metadata/md5-cache/app-i18n/skktools-1.3.4
+++ b/metadata/md5-cache/app-i18n/skktools-1.3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/gdbm emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://github.com/skk-dev/skktools/archive/skktools-1_3_4.tar.gz -> skktools-1.3.4.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=1b03ee8e809c2cba352c6b88a88cdefa
diff --git a/metadata/md5-cache/app-i18n/uchardet-0.0.7 b/metadata/md5-cache/app-i18n/uchardet-0.0.7
index 4300bd5ca584..d1a7c4837a79 100644
--- a/metadata/md5-cache/app-i18n/uchardet-0.0.7
+++ b/metadata/md5-cache/app-i18n/uchardet-0.0.7
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.7.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4427004718e55d50b5ada7bb7e07a475
diff --git a/metadata/md5-cache/app-i18n/uchardet-9999 b/metadata/md5-cache/app-i18n/uchardet-9999
index 00dc0c6860d9..9d0085aac879 100644
--- a/metadata/md5-cache/app-i18n/uchardet-9999
+++ b/metadata/md5-cache/app-i18n/uchardet-9999
@@ -8,5 +8,5 @@ LICENSE=|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0134a8809ecd7f84a78e92743e518b4
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.8 b/metadata/md5-cache/app-i18n/uim-1.8.8
index 2bcdf3dbeaef..841e0a872b6d 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.8
+++ b/metadata/md5-cache/app-i18n/uim-1.8.8
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk? ( X ) gtk2? ( X ) qt5? ( X ) xft? ( X )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/uim/uim/releases/download/1.8.8/uim-1.8.8.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2cdbf3297f650b118af64066e2c084a2
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index dcb5e4cb89c4..729f08c22489 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/tpacpi-bat-1.1-r1 b/metadata/md5-cache/app-laptop/tpacpi-bat-1.1-r1
deleted file mode 100644
index b42d74f09e89..000000000000
--- a/metadata/md5-cache/app-laptop/tpacpi-bat-1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Control battery thresholds of recent ThinkPads, not supported by tp_smapi
-EAPI=5
-HOMEPAGE=https://github.com/teleshoes/tpacpi-bat
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=sys-power/acpi_call dev-lang/perl
-SLOT=0
-SRC_URI=https://github.com/teleshoes/tpacpi-bat/archive/v1.1.tar.gz -> tpacpi-bat-1.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=66e31d3eaa744b50864a6739a0ffe4f3
diff --git a/metadata/md5-cache/app-laptop/tpacpi-bat-2.1 b/metadata/md5-cache/app-laptop/tpacpi-bat-2.1
deleted file mode 100644
index 2d7b20cf5ac7..000000000000
--- a/metadata/md5-cache/app-laptop/tpacpi-bat-2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Control battery thresholds of recent ThinkPads, not supported by tp_smapi
-EAPI=5
-HOMEPAGE=https://github.com/teleshoes/tpacpi-bat
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=sys-power/acpi_call dev-lang/perl
-SLOT=0
-SRC_URI=https://github.com/teleshoes/tpacpi-bat/archive/v2.1.tar.gz -> tpacpi-bat-2.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=66e31d3eaa744b50864a6739a0ffe4f3
diff --git a/metadata/md5-cache/app-laptop/tpacpi-bat-3.0 b/metadata/md5-cache/app-laptop/tpacpi-bat-3.0
deleted file mode 100644
index 02ac7566ced4..000000000000
--- a/metadata/md5-cache/app-laptop/tpacpi-bat-3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Control battery thresholds of recent ThinkPads, not supported by tp_smapi
-EAPI=5
-HOMEPAGE=https://github.com/teleshoes/tpacpi-bat
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=sys-power/acpi_call dev-lang/perl
-SLOT=0
-SRC_URI=https://github.com/teleshoes/tpacpi-bat/archive/v3.0.tar.gz -> tpacpi-bat-3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=66e31d3eaa744b50864a6739a0ffe4f3
diff --git a/metadata/md5-cache/app-leechcraft/Manifest.gz b/metadata/md5-cache/app-leechcraft/Manifest.gz
index 28cf6c5bce40..a24a5d178867 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-advancednotifications-9999 b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999
index fd6d7e8d6a1b..8a6390400c91 100644
--- a/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-advancednotifications-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=436be28a753a7b1f5d23f6155541d34d
diff --git a/metadata/md5-cache/app-leechcraft/lc-aggregator-9999 b/metadata/md5-cache/app-leechcraft/lc-aggregator-9999
index f46fed55854f..1fe6028bc8e2 100644
--- a/metadata/md5-cache/app-leechcraft/lc-aggregator-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-aggregator-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999[postgres?] dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtsql:5[mysql?,postgres?,sqlite?] virtual/leechcraft-downloader-http dev-qt/qtcore:5 dev-qt/qtgui:5
 REQUIRED_USE=|| ( mysql sqlite postgres )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ba3825dba24dbb3c72a94ce75d895866
diff --git a/metadata/md5-cache/app-leechcraft/lc-anhero-9999 b/metadata/md5-cache/app-leechcraft/lc-anhero-9999
index d1fe899a5e02..8c5b2b9fd07f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-anhero-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-anhero-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 sys-devel/gdb dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d757bdb6bd3bc98bc3f6b9079040d69
diff --git a/metadata/md5-cache/app-leechcraft/lc-auscrie-9999 b/metadata/md5-cache/app-leechcraft/lc-auscrie-9999
index cff95200e928..bfb3ac9d4253 100644
--- a/metadata/md5-cache/app-leechcraft/lc-auscrie-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-auscrie-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=959293626045a08a14f134bcedfe96dd
diff --git a/metadata/md5-cache/app-leechcraft/lc-azoth-9999 b/metadata/md5-cache/app-leechcraft/lc-azoth-9999
index a79b3a609680..46f01fa95ea1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-azoth-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-azoth-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtxml:5 astrality? ( net-libs/telepathy-qt[qt5(+)] ) autoidler? ( dev-qt/qtx11extras:5 x11-libs/libXScrnSaver ) crypt? ( app-crypt/qca:2[qt5(+)] ) lastseen? ( dev-qt/qtconcurrent:5 ) media? ( dev-qt/qtmultimedia:5 ) otroid? ( dev-qt/qtconcurrent:5 net-libs/libotr ) sarin? ( dev-qt/qtconcurrent:5 net-libs/tox:= ) woodpecker? ( dev-libs/kqoauth ) xmpp? ( >=net-libs/qxmpp-1.2.0 media? ( net-libs/qxmpp[speex] ) ) xtazy? ( ~app-leechcraft/lc-xtazy-9999 ) dev-qt/qtsql:5[sqlite] astrality? ( net-im/telepathy-mission-control net-voip/telepathy-haze ) crypt? ( app-crypt/qca:2[gpg] ) latex? ( virtual/imagemagick-tools virtual/latex-base ) spell? ( ~app-leechcraft/lc-rosenthal-9999 ) dev-qt/qtcore:5 dev-qt/qtgui:5
 REQUIRED_USE=|| ( standardstyles adiumstyles )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b0b5cf66ea92ee6cf3136ddbdb847cf
diff --git a/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999 b/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999
index ef545fb5cd42..8494554ef545 100644
--- a/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-bittorrent-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtxml:5 net-libs/libtorrent-rasterbar:= geoip? ( dev-libs/libmaxminddb:= ) virtual/leechcraft-task-show dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5b2abd7e7069b9698f3271185dc830c9
diff --git a/metadata/md5-cache/app-leechcraft/lc-blasq-9999 b/metadata/md5-cache/app-leechcraft/lc-blasq-9999
index 5433c49ea720..3d773ccfff2d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blasq-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-blasq-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 rappor? ( dev-qt/qtxml:5 ) deathnote? ( dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) spegnersi? ( dev-libs/kqoauth dev-qt/qtxml:5 ) vangog? ( dev-qt/qtxml:5 ) dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=326452740b68a186c5155a7e308d95fe
diff --git a/metadata/md5-cache/app-leechcraft/lc-blogique-9999 b/metadata/md5-cache/app-leechcraft/lc-blogique-9999
index 0260a4afb0fc..c71b10551fc5 100644
--- a/metadata/md5-cache/app-leechcraft/lc-blogique-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-blogique-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtxml:5 metida? ( dev-qt/qtnetwork:5 dev-qt/qtxmlpatterns:5 ) dev-qt/qtsql:5[sqlite] virtual/leechcraft-wysiwyg-editor dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b5d0752a7c2caa4523eb134fabda06e2
diff --git a/metadata/md5-cache/app-leechcraft/lc-certmgr-9999 b/metadata/md5-cache/app-leechcraft/lc-certmgr-9999
index aa17ffb8f80c..492f6ed7d0d2 100644
--- a/metadata/md5-cache/app-leechcraft/lc-certmgr-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-certmgr-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d823442a7053c976ba73f8b97f0d0b5
diff --git a/metadata/md5-cache/app-leechcraft/lc-core-9999 b/metadata/md5-cache/app-leechcraft/lc-core-9999
index 61ba2a0d799d..ad9b73b759e2 100644
--- a/metadata/md5-cache/app-leechcraft/lc-core-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-core-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 qwt? ( x11-libs/qwt:6 ) dev-qt/qtsql:5[postgres?,sqlite] dev-qt/qtsvg:5 || ( kde-frameworks/oxygen-icons x11-themes/kfaenza ) dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f04f67035c9d2f23279f4694ee0d5d3
diff --git a/metadata/md5-cache/app-leechcraft/lc-cpuload-9999 b/metadata/md5-cache/app-leechcraft/lc-cpuload-9999
index 30aa784ca4a0..01d46a6ee26d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-cpuload-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-cpuload-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:5 virtual/leechcraft-quark-sideprovider dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8945bbe45bea392be10c3e3603937026
diff --git a/metadata/md5-cache/app-leechcraft/lc-cstp-9999 b/metadata/md5-cache/app-leechcraft/lc-cstp-9999
index 6bb48270bf10..af03516916b0 100644
--- a/metadata/md5-cache/app-leechcraft/lc-cstp-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-cstp-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/leechcraft-task-show dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2436c93693d7d7fc94d796837072bf6
diff --git a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999 b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999
index da4b67f1f9a2..0ffad3781d10 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-dbusmanager-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=475bf20ca34182dab6643b631dd26209
diff --git a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999 b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999
index 1ee8a320add3..cf1c6a1947c1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-deadlyrics-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtxml:5 virtual/leechcraft-search-show virtual/leechcraft-downloader-http dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=45c166e9f658cde38a4b7508eafe9838
diff --git a/metadata/md5-cache/app-leechcraft/lc-devmon-9999 b/metadata/md5-cache/app-leechcraft/lc-devmon-9999
index 4099dfdb29e0..51cbaa5554a4 100644
--- a/metadata/md5-cache/app-leechcraft/lc-devmon-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-devmon-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 virtual/udev dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4debb00b8bc67818c24ce004a96c70a
diff --git a/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999 b/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999
index 12b431e1e19a..d4585d695537 100644
--- a/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-dolozhee-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7d931e13303bba99b2e3570bffcd22c
diff --git a/metadata/md5-cache/app-leechcraft/lc-eleeminator-9999 b/metadata/md5-cache/app-leechcraft/lc-eleeminator-9999
index f3972ec364eb..2fb81b1ee86e 100644
--- a/metadata/md5-cache/app-leechcraft/lc-eleeminator-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-eleeminator-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 x11-libs/qtermwidget:= dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3c8c1a9bafcd3ebf0507cefcb76a7b98
diff --git a/metadata/md5-cache/app-leechcraft/lc-fenet-9999 b/metadata/md5-cache/app-leechcraft/lc-fenet-9999
index 196df023a85f..8b728f6ed59c 100644
--- a/metadata/md5-cache/app-leechcraft/lc-fenet-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-fenet-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb804674264bb519a3389174e6749992
diff --git a/metadata/md5-cache/app-leechcraft/lc-gacts-9999 b/metadata/md5-cache/app-leechcraft/lc-gacts-9999
index e46c64a1ca25..65b2457bedc6 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gacts-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-gacts-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6f6ee7d95c2a2a566d68cf299f2ce73
diff --git a/metadata/md5-cache/app-leechcraft/lc-glance-9999 b/metadata/md5-cache/app-leechcraft/lc-glance-9999
index 73dcfee8dacd..90c8dfe3f1f4 100644
--- a/metadata/md5-cache/app-leechcraft/lc-glance-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-glance-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07b85b89a53cd9e3441e2856dfd3741c
diff --git a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999 b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999
index 3a874c0f2c84..97e572515486 100644
--- a/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-gmailnotifier-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 quark? ( ~virtual/leechcraft-quark-sideprovider-9999 ) notify? ( ~virtual/leechcraft-notifier-9999 ) dev-qt/qtcore:5 dev-qt/qtgui:5
 REQUIRED_USE=|| ( notify quark )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a823ac86ae9f8898d4febcb22d045bbd
diff --git a/metadata/md5-cache/app-leechcraft/lc-historyholder-9999 b/metadata/md5-cache/app-leechcraft/lc-historyholder-9999
index 92dc5d328cc8..11c97e43d9b4 100644
--- a/metadata/md5-cache/app-leechcraft/lc-historyholder-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-historyholder-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtsql:5[sqlite] ~virtual/leechcraft-search-show-9999 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b539e0b54f4e3fae3c1cdb9ef4271bd8
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999 b/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
index 570a33f94201..f717f8bbf483 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-hotsensors-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999[qwt] dev-qt/qtdeclarative:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-apps/lm-sensors:= ~virtual/leechcraft-quark-sideprovider-9999 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4b5730154afab5866a368f8557ea3b4
diff --git a/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999 b/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999
index be912de7eade..dedb4d8f4f34 100644
--- a/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-hotstreams-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c843699e94d0e0330df7c593fe0b73a4
diff --git a/metadata/md5-cache/app-leechcraft/lc-htthare-9999 b/metadata/md5-cache/app-leechcraft/lc-htthare-9999
index 6c43f08048b9..b8fcc6e5b8e1 100644
--- a/metadata/md5-cache/app-leechcraft/lc-htthare-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-htthare-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99862904ef6e9bc7621fcbbb104939a0
diff --git a/metadata/md5-cache/app-leechcraft/lc-imgaste-9999 b/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
index 38c3a11523ba..2eea0d05ad68 100644
--- a/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-imgaste-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93f448820edab09906bd3a309021c024
diff --git a/metadata/md5-cache/app-leechcraft/lc-intermutko-9999 b/metadata/md5-cache/app-leechcraft/lc-intermutko-9999
index 7d6983213410..26ec41173691 100644
--- a/metadata/md5-cache/app-leechcraft/lc-intermutko-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-intermutko-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7f61d1f07198845cee00768bc245676b
diff --git a/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999 b/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999
index 4cc45a090fea..e2d5c6e8dd57 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-kbswitch-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-apps/setxkbmap dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74f3de4dde351cebb897590da15b8a0e
diff --git a/metadata/md5-cache/app-leechcraft/lc-kinotify-9999 b/metadata/md5-cache/app-leechcraft/lc-kinotify-9999
index e17101a30ef7..65bdace9d212 100644
--- a/metadata/md5-cache/app-leechcraft/lc-kinotify-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-kinotify-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c9e744845a9d59d14f7d139b61bb288
diff --git a/metadata/md5-cache/app-leechcraft/lc-knowhow-9999 b/metadata/md5-cache/app-leechcraft/lc-knowhow-9999
index f26a7203dc31..ae903ec72b8f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-knowhow-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-knowhow-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8eab8f244a96284a0760fac06b8d0f9a
diff --git a/metadata/md5-cache/app-leechcraft/lc-krigstask-9999 b/metadata/md5-cache/app-leechcraft/lc-krigstask-9999
index 7e048551a5c1..4e4c9b726a37 100644
--- a/metadata/md5-cache/app-leechcraft/lc-krigstask-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-krigstask-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:5 dev-qt/qtwidgets:5 x11-libs/libXcomposite ~virtual/leechcraft-quark-sideprovider-9999 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9de55810ad61e1356cfc1490d1b6d866
diff --git a/metadata/md5-cache/app-leechcraft/lc-lackman-9999 b/metadata/md5-cache/app-leechcraft/lc-lackman-9999
index 5962746ddffb..5c0838a5d56a 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lackman-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lackman-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-qt/qtsql:5[sqlite] ~virtual/leechcraft-downloader-http-9999 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7203805f519ab62abfd03da8359bc564
diff --git a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999 b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999
index f5a266669ed3..67fd27918545 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lastfmscrobble-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/liblastfm dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=620e9d65cc22fa16ee95839b7d66e998
diff --git a/metadata/md5-cache/app-leechcraft/lc-laughty-9999 b/metadata/md5-cache/app-leechcraft/lc-laughty-9999
index 069ef6026c0e..6e225b689fc7 100644
--- a/metadata/md5-cache/app-leechcraft/lc-laughty-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-laughty-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:5 ~virtual/leechcraft-notifier-9999 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b931db5324bd49c38660a432f38dbc47
diff --git a/metadata/md5-cache/app-leechcraft/lc-launchy-9999 b/metadata/md5-cache/app-leechcraft/lc-launchy-9999
index 01b56587b9bb..5c803ab029c2 100644
--- a/metadata/md5-cache/app-leechcraft/lc-launchy-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-launchy-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:5[widgets] dev-qt/qtnetwork:5 ~virtual/leechcraft-trayarea-9999 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b3ca73fe4bd12a50271552e40d5f6545
diff --git a/metadata/md5-cache/app-leechcraft/lc-lemon-9999 b/metadata/md5-cache/app-leechcraft/lc-lemon-9999
index 3352b7be1637..8b5221c604f7 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lemon-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lemon-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-libs/libnl:3 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 x11-libs/qwt:6 ~virtual/leechcraft-quark-sideprovider-9999 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e80fd4e405e85115cafc2febf4e54599
diff --git a/metadata/md5-cache/app-leechcraft/lc-lhtr-9999 b/metadata/md5-cache/app-leechcraft/lc-lhtr-9999
index ee8cb1744307..727e0e94cde3 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lhtr-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lhtr-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 app-text/tidy-html5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec8b695cf882bb3d9c125c3832a93d0f
diff --git a/metadata/md5-cache/app-leechcraft/lc-liznoo-9999 b/metadata/md5-cache/app-leechcraft/lc-liznoo-9999
index 290337b87daf..94ac19988c60 100644
--- a/metadata/md5-cache/app-leechcraft/lc-liznoo-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-liznoo-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 x11-libs/qwt:6 ~virtual/leechcraft-trayarea-9999 battery? ( sys-power/upower ) poweractions? ( sys-power/upower ) powerevents? ( || ( sys-auth/consolekit sys-auth/elogind sys-power/upower ) ) dev-qt/qtcore:5 dev-qt/qtgui:5
 REQUIRED_USE=|| ( battery poweractions powerevents )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=538a9af029e34fef9009a9338837295d
diff --git a/metadata/md5-cache/app-leechcraft/lc-lmp-9999 b/metadata/md5-cache/app-leechcraft/lc-lmp-9999
index fa54989a0c65..2b8d683d7725 100644
--- a/metadata/md5-cache/app-leechcraft/lc-lmp-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-lmp-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtconcurrent:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/gstreamer:1.0 media-libs/taglib mpris? ( dev-qt/qtdbus:5 ) mtp? ( media-libs/libmtp:= ) potorchu? ( media-libs/libprojectm:= ) dev-qt/qtsql:5[sqlite] graffiti? ( media-libs/flac ) mtp? ( ~app-leechcraft/lc-devmon-9999 ) dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2261ccea4be161cdb6148017d783056f
diff --git a/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999 b/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999
index c760d9d35435..0a4b03ec50b9 100644
--- a/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-mellonetray-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libXdamage x11-libs/libXrender ~virtual/leechcraft-quark-sideprovider-9999 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12d14ff9731547db40b6a29bd5836025
diff --git a/metadata/md5-cache/app-leechcraft/lc-monocle-9999 b/metadata/md5-cache/app-leechcraft/lc-monocle-9999
index ddd596a5a72d..41578f123fea 100644
--- a/metadata/md5-cache/app-leechcraft/lc-monocle-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-monocle-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 djvu? ( app-text/djvu ) pdf? ( app-text/poppler:= ) postscript? ( app-text/ghostscript-gpl ) dev-qt/qtcore:5 dev-qt/qtgui:5
 REQUIRED_USE=postscript? ( pdf )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d37ee4eb62f92180e9a860d83503142
diff --git a/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999 b/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999
index 4eab654fb65b..b46217914cfa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-musiczombie-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 acoustid? ( media-libs/chromaprint:= ) dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb5c6fb647be9cba4b27b5a7e12d186c
diff --git a/metadata/md5-cache/app-leechcraft/lc-nacheku-9999 b/metadata/md5-cache/app-leechcraft/lc-nacheku-9999
index 01d29ddf0f8c..c342de1297ab 100644
--- a/metadata/md5-cache/app-leechcraft/lc-nacheku-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-nacheku-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7521ded53eae8d3236b38cd2483b7221
diff --git a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999 b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999
index e08aa99c4ff4..c290ec3712fa 100644
--- a/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-netstoremanager-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff1d6b7fc332a2a7502b7e19206b8031
diff --git a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999 b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999
index 9b4b952ec34a..c2207dd3d855 100644
--- a/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-networkmonitor-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c397a257d783df413d115acebe0ced76
diff --git a/metadata/md5-cache/app-leechcraft/lc-newlife-9999 b/metadata/md5-cache/app-leechcraft/lc-newlife-9999
index c3b8f8ba7a11..3352442efded 100644
--- a/metadata/md5-cache/app-leechcraft/lc-newlife-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-newlife-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtsql:5[sqlite] dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e06d1a07cf02c22bfe97598e19b0a8fb
diff --git a/metadata/md5-cache/app-leechcraft/lc-ooronee-9999 b/metadata/md5-cache/app-leechcraft/lc-ooronee-9999
index 7a514f53fd8d..6bd19a517a1d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-ooronee-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-ooronee-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ~virtual/leechcraft-quark-sideprovider-9999 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=32c2ab9e7edc0603b7e6ddbf4f7739d2
diff --git a/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999 b/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999
index 8d96a37863e0..5bce774261af 100644
--- a/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-otlozhu-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56e38625e79812c0dd906372ba3bd4a7
diff --git a/metadata/md5-cache/app-leechcraft/lc-pintab-9999 b/metadata/md5-cache/app-leechcraft/lc-pintab-9999
index 0b2b8b5ff687..dce849f977bd 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pintab-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-pintab-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28dae10fd83b2f54141e616cf51244d7
diff --git a/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999 b/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999
index 76ed470c8e58..259519711c08 100644
--- a/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-pogooglue-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9fba2e8080089496d793bdf235bbc076
diff --git a/metadata/md5-cache/app-leechcraft/lc-popishu-9999 b/metadata/md5-cache/app-leechcraft/lc-popishu-9999
index 5d4d82637e05..135fa30e362d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-popishu-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-popishu-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 x11-libs/qscintilla:= dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffb0974ce070647330cc60db9aad82d1
diff --git a/metadata/md5-cache/app-leechcraft/lc-poshuku-9999 b/metadata/md5-cache/app-leechcraft/lc-poshuku-9999
index 81caf45138d5..60bb572d9a89 100644
--- a/metadata/md5-cache/app-leechcraft/lc-poshuku-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-poshuku-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999[postgres?] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 cleanweb? ( dev-qt/qtconcurrent:5 ) idn? ( net-dns/libidn:= ) qrd? ( media-gfx/qrencode:= ) webkit? ( dev-qt/qtwebkit:5 ) webengine? ( dev-qt/qtwebengine:5 ) dev-qt/qtsql:5[postgres?,sqlite?] virtual/leechcraft-downloader-http dev-qt/qtcore:5 dev-qt/qtgui:5
 REQUIRED_USE=|| ( postgres sqlite ) || ( webkit webengine )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d0a24ae9be9fb6286bcef41b20fd3d2
diff --git a/metadata/md5-cache/app-leechcraft/lc-qrosp-9999 b/metadata/md5-cache/app-leechcraft/lc-qrosp-9999
index 759cdb284f2b..d19dcf4e775b 100644
--- a/metadata/md5-cache/app-leechcraft/lc-qrosp-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-qrosp-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-libs/qrosscore dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00f03e72f6fd389923ed86d517c7f706
diff --git a/metadata/md5-cache/app-leechcraft/lc-rosenthal-9999 b/metadata/md5-cache/app-leechcraft/lc-rosenthal-9999
index 960f01d8ca6f..068adcdbe2d6 100644
--- a/metadata/md5-cache/app-leechcraft/lc-rosenthal-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-rosenthal-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 app-text/hunspell:= dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6dd95ba9a5df417f5a6ff6ffad05e80e
diff --git a/metadata/md5-cache/app-leechcraft/lc-sb2-9999 b/metadata/md5-cache/app-leechcraft/lc-sb2-9999
index 82f725a08793..ef26b9891d33 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sb2-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-sb2-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdeclarative:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f402f08ec6bbe27abbea30f4454a670f
diff --git a/metadata/md5-cache/app-leechcraft/lc-scroblibre-9999 b/metadata/md5-cache/app-leechcraft/lc-scroblibre-9999
index a0b9523ce26a..208e111eced3 100644
--- a/metadata/md5-cache/app-leechcraft/lc-scroblibre-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-scroblibre-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cead562d30cd902e597d335b9917d7aa
diff --git a/metadata/md5-cache/app-leechcraft/lc-secman-9999 b/metadata/md5-cache/app-leechcraft/lc-secman-9999
index 6e8d7620e84d..7a9fe250f644 100644
--- a/metadata/md5-cache/app-leechcraft/lc-secman-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-secman-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 crypt? ( dev-libs/openssl:0 ) dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1bc2a3592270607a184c3d280e6008a
diff --git a/metadata/md5-cache/app-leechcraft/lc-seekthru-9999 b/metadata/md5-cache/app-leechcraft/lc-seekthru-9999
index 851f9a178105..561cf3f3efde 100644
--- a/metadata/md5-cache/app-leechcraft/lc-seekthru-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-seekthru-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ~virtual/leechcraft-search-show-9999 ~virtual/leechcraft-downloader-http-9999 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdb578cebbdc75d9fdcfd1bbafef6860
diff --git a/metadata/md5-cache/app-leechcraft/lc-summary-9999 b/metadata/md5-cache/app-leechcraft/lc-summary-9999
index a1b4676889e6..92bde2228e04 100644
--- a/metadata/md5-cache/app-leechcraft/lc-summary-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-summary-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e256490fb155d0686e97a6eb26b5d82
diff --git a/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999 b/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999
index 97a5295f4bd2..271fc48c77d9 100644
--- a/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-sysnotify-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6bdb7eb25fe6b6a02b443e26dc9dfbe9
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999 b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999
index f9346e45a419..b738a7e64f01 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-tabsessmanager-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=761bf157be20f22691867e7582eeba5b
diff --git a/metadata/md5-cache/app-leechcraft/lc-tabslist-9999 b/metadata/md5-cache/app-leechcraft/lc-tabslist-9999
index 26e4bcb2fce4..4aef016203a4 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tabslist-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-tabslist-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25264f695816c4e8f9bdf929ef0dded4
diff --git a/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999 b/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999
index 29080773d0e0..21071f64785d 100644
--- a/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-touchstreams-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a955759016e9a3d7f5a5e4608bfba332
diff --git a/metadata/md5-cache/app-leechcraft/lc-tpi-9999 b/metadata/md5-cache/app-leechcraft/lc-tpi-9999
index 07df1e380987..c2ec21967e0f 100644
--- a/metadata/md5-cache/app-leechcraft/lc-tpi-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-tpi-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 ~virtual/leechcraft-quark-sideprovider-9999 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d31f49a105cfb6a4cf82b408980e5ce
diff --git a/metadata/md5-cache/app-leechcraft/lc-vrooby-9999 b/metadata/md5-cache/app-leechcraft/lc-vrooby-9999
index e5e629ff2f98..1ed9193276ec 100644
--- a/metadata/md5-cache/app-leechcraft/lc-vrooby-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-vrooby-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtwidgets:5 sys-fs/udisks:2 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e88a92296603537e183d2168a3f609f0
diff --git a/metadata/md5-cache/app-leechcraft/lc-xproxy-9999 b/metadata/md5-cache/app-leechcraft/lc-xproxy-9999
index 65829a65ffef..193e4343b9ad 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xproxy-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-xproxy-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3839d9c856cc9f55d1d78d12491eae1f
diff --git a/metadata/md5-cache/app-leechcraft/lc-xtazy-9999 b/metadata/md5-cache/app-leechcraft/lc-xtazy-9999
index d43bd71e68f8..3e088a119a45 100644
--- a/metadata/md5-cache/app-leechcraft/lc-xtazy-9999
+++ b/metadata/md5-cache/app-leechcraft/lc-xtazy-9999
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 PROPERTIES=live
 RDEPEND=~app-leechcraft/lc-core-9999 dev-qt/qtdbus:5 dev-qt/qtcore:5 dev-qt/qtgui:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	leechcraft	c6709bb94f8a39bf337969452842604c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b5909eadaa635f5e6f8d1aa4c62e3581
diff --git a/metadata/md5-cache/app-leechcraft/liblaretz-0.1.2 b/metadata/md5-cache/app-leechcraft/liblaretz-0.1.2
index 1c6f2c8af069..7455a5bb7877 100644
--- a/metadata/md5-cache/app-leechcraft/liblaretz-0.1.2
+++ b/metadata/md5-cache/app-leechcraft/liblaretz-0.1.2
@@ -9,5 +9,5 @@ LICENSE=Boost-1.0
 RDEPEND=dev-libs/boost:=
 SLOT=0
 SRC_URI=https://github.com/0xd34df00d/laretz/archive/0.1.2.tar.gz -> liblaretz-0.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0159e44f19166db001531e6a1e2d1295
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 03b08b767bcc..d712d216bf6e 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/abduco-0.5 b/metadata/md5-cache/app-misc/abduco-0.5
deleted file mode 100644
index e2f1df3f385b..000000000000
--- a/metadata/md5-cache/app-misc/abduco-0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare test
-DESCRIPTION=lightweight session manager with {de,at}tach support
-EAPI=5
-HOMEPAGE=https://www.brain-dump.org/projects/abduco/
-IUSE=savedconfig
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=ISC
-SLOT=0
-SRC_URI=https://www.brain-dump.org/projects/abduco/abduco-0.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6dbe150922e2397738a51acbb4c013fc
diff --git a/metadata/md5-cache/app-misc/bfr-1.6-r2 b/metadata/md5-cache/app-misc/bfr-1.6-r2
deleted file mode 100644
index 09bd297fedfe..000000000000
--- a/metadata/md5-cache/app-misc/bfr-1.6-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=General-purpose command-line pipe buffer
-EAPI=5
-HOMEPAGE=http://www.glines.org/software/bfr
-KEYWORDS=amd64 ~ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.glines.org/bin/pk/bfr-1.6.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=15201e23625f48b9b6f302d72e3dee4a
diff --git a/metadata/md5-cache/app-misc/bfr-1.6-r3 b/metadata/md5-cache/app-misc/bfr-1.6-r3
index a4d7d867ae52..dded14a560e2 100644
--- a/metadata/md5-cache/app-misc/bfr-1.6-r3
+++ b/metadata/md5-cache/app-misc/bfr-1.6-r3
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
 DESCRIPTION=General-purpose command-line pipe buffer
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.glines.org/bin/pk/bfr-1.6.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1a2a642a677f2c4db57142ae5f87460a
+_md5_=cdb289a7a44b6b53945d3741018516ac
diff --git a/metadata/md5-cache/app-misc/boxes-1.1.2-r1 b/metadata/md5-cache/app-misc/boxes-1.1.2-r1
deleted file mode 100644
index 22bcfc512d71..000000000000
--- a/metadata/md5-cache/app-misc/boxes-1.1.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-devel/bison sys-devel/flex
-DESCRIPTION=Draw any kind of boxes around your text
-EAPI=5
-HOMEPAGE=https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes
-KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/ascii-boxes/boxes/archive/v1.1.2.tar.gz -> boxes-1.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ee001131837e5261be4d80b4b386bd46
diff --git a/metadata/md5-cache/app-misc/boxes-1.1.2-r2 b/metadata/md5-cache/app-misc/boxes-1.1.2-r2
deleted file mode 100644
index 7d8e8190b43e..000000000000
--- a/metadata/md5-cache/app-misc/boxes-1.1.2-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-devel/bison sys-devel/flex
-DESCRIPTION=Draw any kind of boxes around your text
-EAPI=5
-HOMEPAGE=https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/ascii-boxes/boxes/archive/v1.1.2.tar.gz -> boxes-1.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bdd5049f8139b0bab84f86b246db0837
diff --git a/metadata/md5-cache/app-misc/boxes-1.1.2-r3 b/metadata/md5-cache/app-misc/boxes-1.1.2-r3
index 247e4490cffc..c22d17f315b7 100644
--- a/metadata/md5-cache/app-misc/boxes-1.1.2-r3
+++ b/metadata/md5-cache/app-misc/boxes-1.1.2-r3
@@ -3,9 +3,9 @@ DEPEND=sys-devel/flex sys-devel/bison
 DESCRIPTION=Draw any kind of boxes around your text
 EAPI=6
 HOMEPAGE=https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/ascii-boxes/boxes/archive/v1.1.2.tar.gz -> boxes-1.1.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=47c15b4978c45fd0853f1b5477fd08a5
+_md5_=967d8353c3d0db295a0ffc247691a3ba
diff --git a/metadata/md5-cache/app-misc/brewtarget-2.3.1-r1 b/metadata/md5-cache/app-misc/brewtarget-2.3.1-r1
index 3623d268618b..df0fa2539080 100644
--- a/metadata/md5-cache/app-misc/brewtarget-2.3.1-r1
+++ b/metadata/md5-cache/app-misc/brewtarget-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 WTFPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/Brewtarget/brewtarget/releases/download/v2.3.1/brewtarget_2.3.1.orig.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=acf22a4c6efd6d71d3e822e4300ce2f8
diff --git a/metadata/md5-cache/app-misc/c_rehash-1.0.2g_p8 b/metadata/md5-cache/app-misc/c_rehash-1.0.2g_p8
deleted file mode 100644
index a41527e5e9d5..000000000000
--- a/metadata/md5-cache/app-misc/c_rehash-1.0.2g_p8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=c_rehash script written in POSIX shell for OpenSSL
-EAPI=5
-HOMEPAGE=https://www.openssl.org/ https://github.com/pld-linux/openssl/
-IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=openssl
-RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 )
-SLOT=0
-SRC_URI=https://github.com/pld-linux/openssl/archive/auto/th/openssl-1.0.2g-8.tar.gz
-_md5_=0cd768e225e783b91b1645f889bae2f1
diff --git a/metadata/md5-cache/app-misc/cdargs-1.35-r2 b/metadata/md5-cache/app-misc/cdargs-1.35-r2
index cb1a0bc2ab69..cf3ddc1d042d 100644
--- a/metadata/md5-cache/app-misc/cdargs-1.35-r2
+++ b/metadata/md5-cache/app-misc/cdargs-1.35-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0= emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=http://www.skamphausen.de/software/cdargs/cdargs-1.35.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=cecbe30c4bf8d80065f7814ea57eda96
diff --git a/metadata/md5-cache/app-misc/cmatrix-2.0-r2 b/metadata/md5-cache/app-misc/cmatrix-2.0-r2
index c6fe2b6cfee6..a4c443da0f64 100644
--- a/metadata/md5-cache/app-misc/cmatrix-2.0-r2
+++ b/metadata/md5-cache/app-misc/cmatrix-2.0-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?]
 SLOT=0
 SRC_URI=https://github.com/abishekvashok/cmatrix/archive/v2.0.tar.gz -> cmatrix-2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=235751381d55f81fde4bb950642bb09c
diff --git a/metadata/md5-cache/app-misc/ddate-0.2.2_p20160627 b/metadata/md5-cache/app-misc/ddate-0.2.2_p20160627
index cc478b76f3c6..6da9a11c73b1 100644
--- a/metadata/md5-cache/app-misc/ddate-0.2.2_p20160627
+++ b/metadata/md5-cache/app-misc/ddate-0.2.2_p20160627
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm arm64 x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/bo0ts/ddate/archive/899ca665a0cb725990c33415dc3c0261dac7fe46.tar.gz -> ddate-0.2.2_p20160627.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f4c2dc14bdc7b41a215fd584b2ac09f
diff --git a/metadata/md5-cache/app-misc/ddccontrol-0.4.2_p20140105-r2 b/metadata/md5-cache/app-misc/ddccontrol-0.4.2_p20140105-r2
deleted file mode 100644
index 58e30161738e..000000000000
--- a/metadata/md5-cache/app-misc/ddccontrol-0.4.2_p20140105-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-misc/ddccontrol-db dev-libs/libxml2:2 gtk? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pci? ( sys-apps/pciutils ) dev-perl/XML-Parser dev-util/intltool sys-kernel/linux-headers doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=DDCControl allows control of monitor parameters via DDC
-EAPI=5
-HOMEPAGE=http://ddccontrol.sourceforge.net/
-IUSE=doc gtk nls +pci static-libs
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/ddccontrol-db dev-libs/libxml2:2 gtk? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pci? ( sys-apps/pciutils )
-SLOT=0
-SRC_URI=https://github.com/ddccontrol/ddccontrol/archive/9d89d8c0b959a4da62ecc50fb2aeb23142d4bfb4.tar.gz -> ddccontrol-0.4.2_p20140105.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f4161f4d746dd2dfac26cb7dadb017c2
diff --git a/metadata/md5-cache/app-misc/ddccontrol-0.4.4 b/metadata/md5-cache/app-misc/ddccontrol-0.4.4
deleted file mode 100644
index e1fa43b00f33..000000000000
--- a/metadata/md5-cache/app-misc/ddccontrol-0.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-misc/ddccontrol-db dev-libs/libxml2:2 app-arch/xz-utils gtk? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pci? ( sys-apps/pciutils ) dev-perl/XML-Parser dev-util/intltool sys-kernel/linux-headers doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=DDCControl allows control of monitor parameters via DDC
-EAPI=5
-HOMEPAGE=http://ddccontrol.sourceforge.net/
-IUSE=doc gtk nls +pci static-libs
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/ddccontrol-db dev-libs/libxml2:2 app-arch/xz-utils gtk? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pci? ( sys-apps/pciutils )
-SLOT=0
-SRC_URI=https://github.com/ddccontrol/ddccontrol/archive/0.4.4.tar.gz -> ddccontrol-0.4.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=af7ab80619b1b4375714a6498725fea6
diff --git a/metadata/md5-cache/app-misc/ddccontrol-0.4.4_p20180123 b/metadata/md5-cache/app-misc/ddccontrol-0.4.4_p20180123
deleted file mode 100644
index 487570129abb..000000000000
--- a/metadata/md5-cache/app-misc/ddccontrol-0.4.4_p20180123
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-misc/ddccontrol-db dev-libs/libxml2:2 app-arch/xz-utils gtk? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pci? ( sys-apps/pciutils ) dev-perl/XML-Parser dev-util/intltool sys-kernel/linux-headers doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=DDCControl allows control of monitor parameters via DDC
-EAPI=5
-HOMEPAGE=http://ddccontrol.sourceforge.net/
-IUSE=doc gtk nls +pci static-libs
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-misc/ddccontrol-db dev-libs/libxml2:2 app-arch/xz-utils gtk? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pci? ( sys-apps/pciutils )
-SLOT=0
-SRC_URI=https://github.com/ddccontrol/ddccontrol/archive/7c74181ed03839fb91e36c6012784cfce2ebe1a5.tar.gz -> ddccontrol-0.4.4_p20180123.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2cf2f1131d423bf078d77614ca638db4
diff --git a/metadata/md5-cache/app-misc/dvtm-0.14-r1 b/metadata/md5-cache/app-misc/dvtm-0.14-r1
deleted file mode 100644
index 9cc610fa986c..000000000000
--- a/metadata/md5-cache/app-misc/dvtm-0.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0=[unicode?]
-DESCRIPTION=Dynamic virtual terminal manager
-EAPI=5
-HOMEPAGE=https://www.brain-dump.org/projects/dvtm/
-IUSE=unicode savedconfig
-KEYWORDS=amd64 arm x86
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:0=[unicode?] !>=sys-libs/ncurses-6.1
-SLOT=0
-SRC_URI=https://www.brain-dump.org/projects/dvtm/dvtm-0.14.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=91ea341ff5eec2bf4e6d5542c2388abe
diff --git a/metadata/md5-cache/app-misc/emelfm2-0.9.1-r2 b/metadata/md5-cache/app-misc/emelfm2-0.9.1-r2
deleted file mode 100644
index 32953deb3f32..000000000000
--- a/metadata/md5-cache/app-misc/emelfm2-0.9.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/glib-2.26:2 !gtk3? ( >=x11-libs/gtk+-2.12:2 ) gtk3? ( x11-libs/gtk+:3 ) acl? ( sys-apps/acl ) gimp? ( media-gfx/gimp ) policykit? ( sys-auth/polkit ) spell? ( >=app-text/gtkspell-2.0.14:2 ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=A file manager that implements the popular two-pane design
-EAPI=5
-HOMEPAGE=https://github.com/tom2tom/emelfm2
-IUSE=acl ansi gimp gtk3 kernel_linux nls policykit spell udisks
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.26:2 !gtk3? ( >=x11-libs/gtk+-2.12:2 ) gtk3? ( x11-libs/gtk+:3 ) acl? ( sys-apps/acl ) gimp? ( media-gfx/gimp ) policykit? ( sys-auth/polkit ) spell? ( >=app-text/gtkspell-2.0.14:2 ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=spell? ( !gtk3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://emelfm2.net/rel/emelfm2-0.9.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6344e16fddda899e183e0499775275a8
diff --git a/metadata/md5-cache/app-misc/fdupes-1.6.1 b/metadata/md5-cache/app-misc/fdupes-1.6.1
deleted file mode 100644
index bcb23f447a0d..000000000000
--- a/metadata/md5-cache/app-misc/fdupes-1.6.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Identify/delete duplicate files residing within specified directories
-EAPI=5
-HOMEPAGE=https://github.com/adrianlopezroche/fdupes
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/adrianlopezroche/fdupes/archive/v1.6.1.tar.gz -> fdupes-1.6.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7de500ed8da585ec3a9bc93bb2843ccd
diff --git a/metadata/md5-cache/app-misc/go-jira-1.0.26 b/metadata/md5-cache/app-misc/go-jira-1.0.26
new file mode 100644
index 000000000000..c45ffa7ab171
--- /dev/null
+++ b/metadata/md5-cache/app-misc/go-jira-1.0.26
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A simple JIRA commandline client in Go
+EAPI=7
+HOMEPAGE=https://github.com/Netflix-Skunkworks/go-jira
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD ISC MIT MIT-with-advertising
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/go-jira/jira/archive/v1.0.26.tar.gz -> go-jira-1.0.26.tar.gz mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.zip -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/!masterminds/goutils/@v/v1.1.0.mod -> github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.zip -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/!masterminds/semver/@v/v1.5.0.mod -> github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!masterminds/sprig/@v/v2.21.0+incompatible.zip -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.21.0+incompatible.zip mirror://goproxy//github.com/!masterminds/sprig/@v/v2.21.0+incompatible.mod -> github.com%2F!masterminds%2Fsprig%2F@v%2Fv2.21.0+incompatible.mod mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180928190340-9d1f4485533b.zip -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180928190340-9d1f4485533b.zip mirror://goproxy//github.com/!netflix/go-expect/@v/v0.0.0-20180928190340-9d1f4485533b.mod -> github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180928190340-9d1f4485533b.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.zip -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/cheekybits/genny/@v/v1.0.0.mod -> github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/coryb/figtree/@v/v0.0.0-20180728224503-071d1ef303df.zip -> github.com%2Fcoryb%2Ffigtree%2F@v%2Fv0.0.0-20180728224503-071d1ef303df.zip mirror://goproxy//github.com/coryb/figtree/@v/v0.0.0-20180728224503-071d1ef303df.mod -> github.com%2Fcoryb%2Ffigtree%2F@v%2Fv0.0.0-20180728224503-071d1ef303df.mod mirror://goproxy//github.com/coryb/figtree/@v/v1.0.1-0.20190907170512-58176d03ef0d.zip -> github.com%2Fcoryb%2Ffigtree%2F@v%2Fv1.0.1-0.20190907170512-58176d03ef0d.zip mirror://goproxy//github.com/coryb/figtree/@v/v1.0.1-0.20190907170512-58176d03ef0d.mod -> github.com%2Fcoryb%2Ffigtree%2F@v%2Fv1.0.1-0.20190907170512-58176d03ef0d.mod mirror://goproxy//github.com/coryb/kingpeon/@v/v0.0.0-20180107011214-9a669f143f2e.zip -> github.com%2Fcoryb%2Fkingpeon%2F@v%2Fv0.0.0-20180107011214-9a669f143f2e.zip mirror://goproxy//github.com/coryb/kingpeon/@v/v0.0.0-20180107011214-9a669f143f2e.mod -> github.com%2Fcoryb%2Fkingpeon%2F@v%2Fv0.0.0-20180107011214-9a669f143f2e.mod mirror://goproxy//github.com/coryb/oreo/@v/v0.0.0-20180804211640-3e1b88fc08f1.zip -> github.com%2Fcoryb%2Foreo%2F@v%2Fv0.0.0-20180804211640-3e1b88fc08f1.zip mirror://goproxy//github.com/coryb/oreo/@v/v0.0.0-20180804211640-3e1b88fc08f1.mod -> github.com%2Fcoryb%2Foreo%2F@v%2Fv0.0.0-20180804211640-3e1b88fc08f1.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/guelfey/go.dbus/@v/v0.0.0-20131113121618-f6a3a2366cc3.zip -> github.com%2Fguelfey%2Fgo.dbus%2F@v%2Fv0.0.0-20131113121618-f6a3a2366cc3.zip mirror://goproxy//github.com/guelfey/go.dbus/@v/v0.0.0-20131113121618-f6a3a2366cc3.mod -> github.com%2Fguelfey%2Fgo.dbus%2F@v%2Fv0.0.0-20131113121618-f6a3a2366cc3.mod mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180809195222-d55458df857c.zip -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180809195222-d55458df857c.zip mirror://goproxy//github.com/hinshun/vt10x/@v/v0.0.0-20180809195222-d55458df857c.mod -> github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180809195222-d55458df857c.mod mirror://goproxy//github.com/huandu/xstrings/@v/v1.2.0.zip -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/huandu/xstrings/@v/v1.2.0.mod -> github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.7.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod mirror://goproxy//github.com/jinzhu/copier/@v/v0.0.0-20180308034124-7e38e58719c3.zip -> github.com%2Fjinzhu%2Fcopier%2F@v%2Fv0.0.0-20180308034124-7e38e58719c3.zip mirror://goproxy//github.com/jinzhu/copier/@v/v0.0.0-20180308034124-7e38e58719c3.mod -> github.com%2Fjinzhu%2Fcopier%2F@v%2Fv0.0.0-20180308034124-7e38e58719c3.mod mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.zip -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip mirror://goproxy//github.com/kballard/go-shellquote/@v/v0.0.0-20180428030007-95032a82bc51.mod -> github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.4.zip -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.zip mirror://goproxy//github.com/kr/pty/@v/v1.1.4.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.6.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.6.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.6.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.zip -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip mirror://goproxy//github.com/mgutz/ansi/@v/v0.0.0-20170206155736-9520e82c474b.mod -> github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.3.zip -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.3.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20170505125900-c90ca0c84f15.zip -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20170505125900-c90ca0c84f15.zip mirror://goproxy//github.com/pkg/browser/@v/v0.0.0-20170505125900-c90ca0c84f15.mod -> github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20170505125900-c90ca0c84f15.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/theckman/go-flock/@v/v0.4.0.zip -> github.com%2Ftheckman%2Fgo-flock%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/theckman/go-flock/@v/v0.4.0.mod -> github.com%2Ftheckman%2Fgo-flock%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/tidwall/gjson/@v/v0.0.0-20180711011033-ba784d767ac7.zip -> github.com%2Ftidwall%2Fgjson%2F@v%2Fv0.0.0-20180711011033-ba784d767ac7.zip mirror://goproxy//github.com/tidwall/gjson/@v/v0.0.0-20180711011033-ba784d767ac7.mod -> github.com%2Ftidwall%2Fgjson%2F@v%2Fv0.0.0-20180711011033-ba784d767ac7.mod mirror://goproxy//github.com/tidwall/match/@v/v1.0.0.zip -> github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/tidwall/match/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tmc/keyring/@v/v0.0.0-20171121202319-839169085ae1.zip -> github.com%2Ftmc%2Fkeyring%2F@v%2Fv0.0.0-20171121202319-839169085ae1.zip mirror://goproxy//github.com/tmc/keyring/@v/v0.0.0-20171121202319-839169085ae1.mod -> github.com%2Ftmc%2Fkeyring%2F@v%2Fv0.0.0-20171121202319-839169085ae1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180723164146-c126467f60eb.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180723164146-c126467f60eb.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180723164146-c126467f60eb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20171102191033-01c190206fbd.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20171102191033-01c190206fbd.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20171102191033-01c190206fbd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20171102191033-01c190206fbd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180727230415-bd9dbc187b6e.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180727230415-bd9dbc187b6e.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180727230415-bd9dbc187b6e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180727230415-bd9dbc187b6e.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//gopkg.in/!alec!aivazis/survey.v1/@v/v1.6.1.zip -> gopkg.in%2F!alec!aivazis%2Fsurvey.v1%2F@v%2Fv1.6.1.zip mirror://goproxy//gopkg.in/!alec!aivazis/survey.v1/@v/v1.6.1.mod -> gopkg.in%2F!alec!aivazis%2Fsurvey.v1%2F@v%2Fv1.6.1.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/coryb/yaml.v2/@v/v2.0.0-20180616071044-0e40e46f7153.zip -> gopkg.in%2Fcoryb%2Fyaml.v2%2F@v%2Fv2.0.0-20180616071044-0e40e46f7153.zip mirror://goproxy//gopkg.in/coryb/yaml.v2/@v/v2.0.0-20180616071044-0e40e46f7153.mod -> gopkg.in%2Fcoryb%2Fyaml.v2%2F@v%2Fv2.0.0-20180616071044-0e40e46f7153.mod mirror://goproxy//gopkg.in/op/go-logging.v1/@v/v1.0.0-20160211212156-b2cb9fa56473.zip -> gopkg.in%2Fop%2Fgo-logging.v1%2F@v%2Fv1.0.0-20160211212156-b2cb9fa56473.zip mirror://goproxy//gopkg.in/op/go-logging.v1/@v/v1.0.0-20160211212156-b2cb9fa56473.mod -> gopkg.in%2Fop%2Fgo-logging.v1%2F@v%2Fv1.0.0-20160211212156-b2cb9fa56473.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=593e4ad5247d2298dcf9f22a2bd96241
diff --git a/metadata/md5-cache/app-misc/graphlcd-base-1.0.2-r1 b/metadata/md5-cache/app-misc/graphlcd-base-1.0.2-r1
deleted file mode 100644
index ecca0d0e6986..000000000000
--- a/metadata/md5-cache/app-misc/graphlcd-base-1.0.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-libs/libhid net-libs/libvncserver freetype? ( media-libs/freetype:2= ) fontconfig? ( media-libs/fontconfig:1.0= ) graphicsmagick? ( media-gfx/graphicsmagick:0/1.3 ) imagemagick? ( <media-gfx/imagemagick-7 ) lcd_devices_ax206dpf? ( virtual/libusb:0 ) lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
-DESCRIPTION=Contains the lowlevel lcd drivers for GraphLCD
-EAPI=7
-HOMEPAGE=https://projects.vdr-developer.org/projects/graphlcd-base
-IUSE=fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libhid net-libs/libvncserver freetype? ( media-libs/freetype:2= ) fontconfig? ( media-libs/fontconfig:1.0= ) graphicsmagick? ( media-gfx/graphicsmagick:0/1.3 ) imagemagick? ( <media-gfx/imagemagick-7 ) lcd_devices_ax206dpf? ( virtual/libusb:0 ) lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
-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_=multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=72aa81f9de642d2e8a7fd48730177fdc
diff --git a/metadata/md5-cache/app-misc/graphlcd-base-1.0.2-r2 b/metadata/md5-cache/app-misc/graphlcd-base-1.0.2-r2
new file mode 100644
index 000000000000..5237914730f0
--- /dev/null
+++ b/metadata/md5-cache/app-misc/graphlcd-base-1.0.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-libs/libhid net-libs/libvncserver freetype? ( media-libs/freetype:2= ) fontconfig? ( media-libs/fontconfig:1.0= ) graphicsmagick? ( media-gfx/graphicsmagick:0/1.3[cxx] ) imagemagick? ( <media-gfx/imagemagick-7 ) lcd_devices_ax206dpf? ( virtual/libusb:0 ) lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
+DESCRIPTION=Contains the lowlevel lcd drivers for GraphLCD
+EAPI=7
+HOMEPAGE=https://projects.vdr-developer.org/projects/graphlcd-base
+IUSE=fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libhid net-libs/libvncserver freetype? ( media-libs/freetype:2= ) fontconfig? ( media-libs/fontconfig:1.0= ) graphicsmagick? ( media-gfx/graphicsmagick:0/1.3[cxx] ) imagemagick? ( <media-gfx/imagemagick-7 ) lcd_devices_ax206dpf? ( virtual/libusb:0 ) lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
+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_=multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=2dfe9f3e68f97cfe1214e0adc3cab9bd
diff --git a/metadata/md5-cache/app-misc/graphlcd-base-2.0.0 b/metadata/md5-cache/app-misc/graphlcd-base-2.0.0
deleted file mode 100644
index d01ff26c7078..000000000000
--- a/metadata/md5-cache/app-misc/graphlcd-base-2.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-libs/libhid net-libs/libvncserver freetype? ( media-libs/freetype:2= ) fontconfig? ( media-libs/fontconfig:1.0= ) graphicsmagick? ( media-gfx/graphicsmagick:0/1.3 ) imagemagick? ( <media-gfx/imagemagick-7 ) lcd_devices_ax206dpf? ( virtual/libusb:0 ) lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
-DESCRIPTION=Contains the lowlevel lcd drivers for GraphLCD
-EAPI=7
-HOMEPAGE=https://projects.vdr-developer.org/projects/graphlcd-base
-IUSE=fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libhid net-libs/libvncserver freetype? ( media-libs/freetype:2= ) fontconfig? ( media-libs/fontconfig:1.0= ) graphicsmagick? ( media-gfx/graphicsmagick:0/1.3 ) imagemagick? ( <media-gfx/imagemagick-7 ) lcd_devices_ax206dpf? ( virtual/libusb:0 ) lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
-REQUIRED_USE=?? ( graphicsmagick imagemagick )
-SLOT=0
-SRC_URI=https://projects.vdr-developer.org/git/graphlcd-base.git/snapshot/graphlcd-base-2.0.0.tar.bz2
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=c77f27f563e142dbba33f50786d23b67
diff --git a/metadata/md5-cache/app-misc/graphlcd-base-2.0.0-r1 b/metadata/md5-cache/app-misc/graphlcd-base-2.0.0-r1
new file mode 100644
index 000000000000..90341ec7db4a
--- /dev/null
+++ b/metadata/md5-cache/app-misc/graphlcd-base-2.0.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-libs/libhid net-libs/libvncserver freetype? ( media-libs/freetype:2= ) fontconfig? ( media-libs/fontconfig:1.0= ) graphicsmagick? ( media-gfx/graphicsmagick:0/1.3[cxx] ) imagemagick? ( <media-gfx/imagemagick-7 ) lcd_devices_ax206dpf? ( virtual/libusb:0 ) lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
+DESCRIPTION=Contains the lowlevel lcd drivers for GraphLCD
+EAPI=7
+HOMEPAGE=https://projects.vdr-developer.org/projects/graphlcd-base
+IUSE=fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libhid net-libs/libvncserver freetype? ( media-libs/freetype:2= ) fontconfig? ( media-libs/fontconfig:1.0= ) graphicsmagick? ( media-gfx/graphicsmagick:0/1.3[cxx] ) imagemagick? ( <media-gfx/imagemagick-7 ) lcd_devices_ax206dpf? ( virtual/libusb:0 ) lcd_devices_picolcd_256x64? ( virtual/libusb:0 )
+REQUIRED_USE=?? ( graphicsmagick imagemagick )
+SLOT=0
+SRC_URI=https://projects.vdr-developer.org/git/graphlcd-base.git/snapshot/graphlcd-base-2.0.0.tar.bz2
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=fd0d4de49eb87d5b9bbbd7dd70692bac
diff --git a/metadata/md5-cache/app-misc/gtypist-2.9.5-r1 b/metadata/md5-cache/app-misc/gtypist-2.9.5-r1
index 4d5f3369e250..4548bb172e23 100644
--- a/metadata/md5-cache/app-misc/gtypist-2.9.5-r1
+++ b/metadata/md5-cache/app-misc/gtypist-2.9.5-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 public-domain
 RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* ) xemacs? ( !emacs? ( app-editors/xemacs app-xemacs/fsf-compat ) )
 SLOT=0
 SRC_URI=mirror://gnu/gtypist/gtypist-2.9.5.tar.xz http://colemak.com/pub/learn/colemak.typ
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c1a2ec824b4ae4cf4e4415cf96f50261
diff --git a/metadata/md5-cache/app-misc/irtrans-irserver-6.09.04 b/metadata/md5-cache/app-misc/irtrans-irserver-6.09.04
deleted file mode 100644
index 1247398a277c..000000000000
--- a/metadata/md5-cache/app-misc/irtrans-irserver-6.09.04
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DESCRIPTION=IRTrans Server
-EAPI=5
-HOMEPAGE=http://www.irtrans.de
-IUSE=mono
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD GPL-2
-RDEPEND=mono? ( >=dev-lang/mono-2.10.5 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://ftp.disconnected-by-peer.at/irtrans/irserver-src-6.09.04.tar.gz http://ftp.disconnected-by-peer.at/irtrans/irserver-6.09.04.tar.gz http://www.irtrans.de/download/Server/Linux/irserver-src.tar.gz -> irserver-src-6.09.04.tar.gz http://www.irtrans.de/download/Server/Linux/irserver.tar.gz -> irserver-6.09.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=65c9e37b00f55410ddb5ab4cf38ecb05
diff --git a/metadata/md5-cache/app-misc/joymouse-0.5 b/metadata/md5-cache/app-misc/joymouse-0.5
deleted file mode 100644
index 286d0b3a84af..000000000000
--- a/metadata/md5-cache/app-misc/joymouse-0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
-DESCRIPTION=An application that translates joystick events to mouse events
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/joymouse-linux
-KEYWORDS=amd64 ~mips ~ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXtst
-SLOT=0
-SRC_URI=mirror://sourceforge/joymouse-linux/joymouse-0.5.tar.gz
-_md5_=d1fab79b68b8441b610ae797a77f17a5
diff --git a/metadata/md5-cache/app-misc/joymouse-0.5-r1 b/metadata/md5-cache/app-misc/joymouse-0.5-r1
index 1850cbe50ff9..cadf4e7b05e8 100644
--- a/metadata/md5-cache/app-misc/joymouse-0.5-r1
+++ b/metadata/md5-cache/app-misc/joymouse-0.5-r1
@@ -3,9 +3,9 @@ DEPEND=x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
 DESCRIPTION=An application that translates joystick events to mouse events
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/joymouse-linux
-KEYWORDS=~amd64 ~mips ~ppc ~x86
+KEYWORDS=amd64 ~mips ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=x11-libs/libX11 x11-libs/libXtst
 SLOT=0
 SRC_URI=mirror://sourceforge/joymouse-linux/joymouse-0.5.tar.gz
-_md5_=0b9ac9d4e15a49851cde7133985eb321
+_md5_=c939db067834ff4203a9b7f6d718c066
diff --git a/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721 b/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721
index a4fc56f563b5..5652fffd7939 100644
--- a/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721
+++ b/metadata/md5-cache/app-misc/lcdproc-0.5.9_p20200721
@@ -5,11 +5,11 @@ DESCRIPTION=Displays real-time system information from your Linux/*BSD box on a
 EAPI=7
 HOMEPAGE=http://www.lcdproc.org/
 IUSE=debug doc ethlcd extra-charmaps freetype menu nfs png samba test-menu lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontzpacket lcd_devices_curses lcd_devices_cwlnx lcd_devices_ea65 lcd_devices_eyeboxone lcd_devices_futaba lcd_devices_g15 lcd_devices_glcd lcd_devices_glcdlib lcd_devices_glk lcd_devices_hd44780 lcd_devices_i2500vfd lcd_devices_icp_a106 lcd_devices_imon lcd_devices_imonlcd lcd_devices_iowarrior lcd_devices_irman lcd_devices_irtrans lcd_devices_joy lcd_devices_jw002 lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_lcterm lcd_devices_linux_input lcd_devices_lirc lcd_devices_lis lcd_devices_md8800 lcd_devices_mdm166a lcd_devices_ms6931 lcd_devices_mtc_s16209x lcd_devices_mtxorb lcd_devices_mx5000 lcd_devices_noritakevfd lcd_devices_olimex_mod_lcd1x9 lcd_devices_picolcd lcd_devices_pyramid lcd_devices_rawserial lcd_devices_sdeclcd lcd_devices_sed1330 lcd_devices_sed1520 lcd_devices_serialpos lcd_devices_serialvfd lcd_devices_shuttlevfd lcd_devices_sli lcd_devices_stv5730 lcd_devices_sureelec lcd_devices_t6963 lcd_devices_text lcd_devices_tyan lcd_devices_ula200 lcd_devices_vlsys_m428 lcd_devices_xosd lcd_devices_yard2lcd
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=lcd_devices_cfontz? ( dev-libs/libhid:= ) lcd_devices_cfontzpacket? ( dev-libs/libhid:= ) lcd_devices_cwlnx? ( dev-libs/libhid:= ) lcd_devices_futaba? ( virtual/libusb:1= ) lcd_devices_g15? ( app-misc/g15daemon dev-libs/libg15render:= virtual/libusb:0= ) lcd_devices_glcd? ( app-misc/glcdprocdriver:= dev-embedded/libftdi:1= dev-libs/libhid:= dev-libs/serdisplib:= virtual/libusb:0= x11-libs/libX11:= ) lcd_devices_hd44780? ( dev-embedded/libftdi:1= dev-libs/libugpio:= virtual/libusb:0= ) lcd_devices_i2500vfd? ( dev-embedded/libftdi:1= ) lcd_devices_irman? ( media-libs/libirman:= ) lcd_devices_iowarrior? ( virtual/libusb:0= ) lcd_devices_lirc? ( app-misc/lirc ) lcd_devices_lis? ( dev-embedded/libftdi:1= ) lcd_devices_lb216? ( dev-libs/libhid:= ) lcd_devices_mdm166a? ( dev-libs/libhid:= ) lcd_devices_mtc_s16209x? ( dev-libs/libhid:= ) lcd_devices_mx5000? ( app-misc/mx5000tools ) lcd_devices_noritakevfd? ( dev-libs/libhid:= ) lcd_devices_picolcd? ( virtual/libusb:1= ) lcd_devices_shuttlevfd? ( virtual/libusb:0= ) lcd_devices_ula200? ( dev-embedded/libftdi:1= ) lcd_devices_xosd? ( x11-libs/libX11:= x11-libs/xosd:= )
 REQUIRED_USE=ethlcd? ( lcd_devices_hd44780 ) freetype? ( lcd_devices_glcd ) png? ( lcd_devices_glcd ) || ( lcd_devices_bayrad lcd_devices_cfontz lcd_devices_cfontzpacket lcd_devices_curses lcd_devices_cwlnx lcd_devices_ea65 lcd_devices_eyeboxone lcd_devices_futaba lcd_devices_g15 lcd_devices_glcd lcd_devices_glcdlib lcd_devices_glk lcd_devices_hd44780 lcd_devices_i2500vfd lcd_devices_icp_a106 lcd_devices_imon lcd_devices_imonlcd lcd_devices_iowarrior lcd_devices_irman lcd_devices_irtrans lcd_devices_joy lcd_devices_jw002 lcd_devices_lb216 lcd_devices_lcdm001 lcd_devices_lcterm lcd_devices_linux_input lcd_devices_lirc lcd_devices_lis lcd_devices_md8800 lcd_devices_mdm166a lcd_devices_ms6931 lcd_devices_mtc_s16209x lcd_devices_mtxorb lcd_devices_mx5000 lcd_devices_noritakevfd lcd_devices_olimex_mod_lcd1x9 lcd_devices_picolcd lcd_devices_pyramid lcd_devices_rawserial lcd_devices_sdeclcd lcd_devices_sed1330 lcd_devices_sed1520 lcd_devices_serialpos lcd_devices_serialvfd lcd_devices_shuttlevfd lcd_devices_sli lcd_devices_stv5730 lcd_devices_sureelec lcd_devices_t6963 lcd_devices_text lcd_devices_tyan lcd_devices_ula200 lcd_devices_vlsys_m428 lcd_devices_xosd lcd_devices_yard2lcd )
 SLOT=0
 SRC_URI=https://github.com/lcdproc/lcdproc/archive/9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1.tar.gz -> lcdproc-0.5.9_p20200721.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9f4d9655454d07637bac7d87f991502e
+_md5_=b894608b4f97f0247fa5c7c61fcd33e7
diff --git a/metadata/md5-cache/app-misc/mmv-1.01b_p18 b/metadata/md5-cache/app-misc/mmv-1.01b_p18
deleted file mode 100644
index 9749155eacab..000000000000
--- a/metadata/md5-cache/app-misc/mmv-1.01b_p18
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Move/copy/append/link multiple files according to a set of wildcard patterns
-EAPI=5
-HOMEPAGE=http://packages.debian.org/unstable/utils/mmv
-KEYWORDS=~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz mirror://debian/pool/main/m/mmv/mmv_1.01b-18.debian.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=39c7534a5297f9704648c33624f7c1a6
diff --git a/metadata/md5-cache/app-misc/mmv-1.01b_p18-r1 b/metadata/md5-cache/app-misc/mmv-1.01b_p18-r1
index f0dc767a373d..cac66af5344f 100644
--- a/metadata/md5-cache/app-misc/mmv-1.01b_p18-r1
+++ b/metadata/md5-cache/app-misc/mmv-1.01b_p18-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Move/copy/append/link multiple files according to a set of wildcard patterns
 EAPI=6
 HOMEPAGE=https://packages.debian.org/unstable/utils/mmv
-KEYWORDS=~alpha ~amd64 ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz mirror://debian/pool/main/m/mmv/mmv_1.01b-18.debian.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=da4007c951a15804793ec8b86253a1eb
+_md5_=0283661f821e347c21889440712d1528
diff --git a/metadata/md5-cache/app-misc/pdfpc-4.4.0 b/metadata/md5-cache/app-misc/pdfpc-4.4.0
index e6fd215d5c2f..8561bca9c535 100644
--- a/metadata/md5-cache/app-misc/pdfpc-4.4.0
+++ b/metadata/md5-cache/app-misc/pdfpc-4.4.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-text/poppler:=[cairo] dev-libs/glib:2 dev-libs/libgee:0.8= gnome-base/librsvg sys-apps/dbus x11-libs/gtk+:3 gstreamer? ( media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= )
 SLOT=0
 SRC_URI=https://github.com/pdfpc/pdfpc/archive/v4.4.0.tar.gz -> pdfpc-4.4.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4b3ccd71e99054e6a5e49a746d8d5f7
diff --git a/metadata/md5-cache/app-misc/reptyr-0.8.0 b/metadata/md5-cache/app-misc/reptyr-0.8.0
new file mode 100644
index 000000000000..0d7aae54ed4e
--- /dev/null
+++ b/metadata/md5-cache/app-misc/reptyr-0.8.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=A utility to attach a running program to a new terminal
+EAPI=7
+HOMEPAGE=https://github.com/nelhage/reptyr
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/nelhage/reptyr/archive/reptyr-0.8.0.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9b6c30cfeba567955bae39a0dba6b14b
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-0.9.4 b/metadata/md5-cache/app-misc/resolve-march-native-0.9.4
index 7b54ed1fb62a..8bdc9d0944ab 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-0.9.4
+++ b/metadata/md5-cache/app-misc/resolve-march-native-0.9.4
@@ -5,7 +5,7 @@ DESCRIPTION=Resolve GCC flag -march=native
 EAPI=7
 HOMEPAGE=https://github.com/hartwork/resolve-march-native
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=sys-devel/gcc-4.2 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hartwork/resolve-march-native/archive/0.9.4.tar.gz -> resolve-march-native-0.9.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3651263b09efc447fdd2fc7e0ba47ed3
+_md5_=0ac58f50319b2a97ebebcb46a52db011
diff --git a/metadata/md5-cache/app-misc/rpick-0.6.1 b/metadata/md5-cache/app-misc/rpick-0.6.1
index 27eb263eb23d..fef5142841d6 100644
--- a/metadata/md5-cache/app-misc/rpick-0.6.1
+++ b/metadata/md5-cache/app-misc/rpick-0.6.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 CC0-1.0 MIT
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/dtoa/0.4.5/download -> dtoa-0.4.5.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.12/download -> hermit-abi-0.1.12.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.2/download -> proc-macro-error-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.2/download -> proc-macro-error-attr-1.0.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.12/download -> proc-macro2-1.0.12.crate https://crates.io/api/v1/crates/quote/1.0.4/download -> quote-1.0.4.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_distr/0.2.2/download -> rand_distr-0.2.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/rpick/0.6.1/download -> rpick-0.6.1.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.106/download -> serde-1.0.106.crate https://crates.io/api/v1/crates/serde_derive/1.0.106/download -> serde_derive-1.0.106.crate https://crates.io/api/v1/crates/serde_yaml/0.8.11/download -> serde_yaml-0.8.11.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.14/download -> structopt-0.3.14.crate https://crates.io/api/v1/crates/structopt-derive/0.4.7/download -> structopt-derive-0.4.7.crate https://crates.io/api/v1/crates/syn/1.0.19/download -> syn-1.0.19.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=986957e71dd17b0c76abe97e0e2e4e36
diff --git a/metadata/md5-cache/app-misc/rpick-0.7.0 b/metadata/md5-cache/app-misc/rpick-0.7.0
index bb683183e4d6..02651f17d054 100644
--- a/metadata/md5-cache/app-misc/rpick-0.7.0
+++ b/metadata/md5-cache/app-misc/rpick-0.7.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc64 x86
 LICENSE=GPL-3 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 MIT Unlicense
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/alga/0.9.3/download -> alga-0.9.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.3.2/download -> approx-0.3.2.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/bstr/0.2.13/download -> bstr-0.2.13.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dirs/3.0.1/download -> dirs-3.0.1.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/dtoa/0.4.6/download -> dtoa-0.4.6.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/generic-array/0.13.2/download -> generic-array-0.13.2.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.15/download -> hermit-abi-0.1.15.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.73/download -> libc-0.2.73.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/matrixmultiply/0.2.3/download -> matrixmultiply-0.2.3.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nalgebra/0.19.0/download -> nalgebra-0.19.0.crate https://crates.io/api/v1/crates/num-complex/0.2.4/download -> num-complex-0.2.4.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.8/download -> ppv-lite86-0.2.8.crate https://crates.io/api/v1/crates/prettytable-rs/0.8.0/download -> prettytable-rs-0.8.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.3/download -> proc-macro-error-1.0.3.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.3/download -> proc-macro-error-attr-1.0.3.crate https://crates.io/api/v1/crates/proc-macro2/1.0.19/download -> proc-macro2-1.0.19.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_distr/0.2.2/download -> rand_distr-0.2.2.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rawpointer/0.2.1/download -> rawpointer-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/rpick/0.7.0/download -> rpick-0.7.0.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.114/download -> serde-1.0.114.crate https://crates.io/api/v1/crates/serde_derive/1.0.114/download -> serde_derive-1.0.114.crate https://crates.io/api/v1/crates/serde_yaml/0.8.13/download -> serde_yaml-0.8.13.crate https://crates.io/api/v1/crates/statrs/0.13.0/download -> statrs-0.13.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.15/download -> structopt-0.3.15.crate https://crates.io/api/v1/crates/structopt-derive/0.4.8/download -> structopt-derive-0.4.8.crate https://crates.io/api/v1/crates/syn/1.0.35/download -> syn-1.0.35.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.4/download -> yaml-rust-0.4.4.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e06a3fe8d1d051f6209a37b87c8b72d1
diff --git a/metadata/md5-cache/app-misc/rundeck-cli-bin-0.1.8 b/metadata/md5-cache/app-misc/rundeck-cli-bin-0.1.8
deleted file mode 100644
index fd6a854ec88c..000000000000
--- a/metadata/md5-cache/app-misc/rundeck-cli-bin-0.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Command line tool for rundeck
-EAPI=5
-HOMEPAGE=http://rundeck.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/rundeck/rundeck-cli/releases/download/v0.1.8/rundeck-cli-0.1.8-all.jar
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1e13dae571ae9fb35efade21287cff6c
diff --git a/metadata/md5-cache/app-misc/skim-0.6.9 b/metadata/md5-cache/app-misc/skim-0.6.9
index 7f759d980897..e1bfd9e415cf 100644
--- a/metadata/md5-cache/app-misc/skim-0.6.9
+++ b/metadata/md5-cache/app-misc/skim-0.6.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 MIT MPL-2.0 Unlicense
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.31/download -> cc-1.0.31.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/darling/0.8.6/download -> darling-0.8.6.crate https://crates.io/api/v1/crates/darling_core/0.8.6/download -> darling_core-0.8.6.crate https://crates.io/api/v1/crates/darling_macro/0.8.6/download -> darling_macro-0.8.6.crate https://crates.io/api/v1/crates/derive_builder/0.7.1/download -> derive_builder-0.7.1.crate https://crates.io/api/v1/crates/derive_builder_core/0.4.1/download -> derive_builder_core-0.4.1.crate https://crates.io/api/v1/crates/either/1.5.1/download -> either-1.5.1.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.2.1/download -> fuzzy-matcher-0.2.1.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.58/download -> libc-0.2.58.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/nix/0.14.0/download -> nix-0.14.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/proc-macro2/0.4.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/skim/0.6.9/download -> skim-0.6.9.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.15.29/download -> syn-0.15.29.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timer/0.2.0/download -> timer-0.2.0.crate https://crates.io/api/v1/crates/tuikit/0.2.9/download -> tuikit-0.2.9.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e4b96670287a9c25354f82755d0d017d
diff --git a/metadata/md5-cache/app-misc/skim-0.7.0 b/metadata/md5-cache/app-misc/skim-0.7.0
index 96c6183cf35c..ba87baad57f1 100644
--- a/metadata/md5-cache/app-misc/skim-0.7.0
+++ b/metadata/md5-cache/app-misc/skim-0.7.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 MIT MPL-2.0 Unlicense
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.1/download -> byteorder-1.3.1.crate https://crates.io/api/v1/crates/cc/1.0.31/download -> cc-1.0.31.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/derive_builder/0.9.0/download -> derive_builder-0.9.0.crate https://crates.io/api/v1/crates/derive_builder_core/0.9.0/download -> derive_builder_core-0.9.0.crate https://crates.io/api/v1/crates/either/1.5.1/download -> either-1.5.1.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.3.1/download -> fuzzy-matcher-0.3.1.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.58/download -> libc-0.2.58.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/nix/0.14.0/download -> nix-0.14.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.6/download -> proc-macro2-1.0.6.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/skim/0.7.0/download -> skim-0.7.0.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/thread_local/1.0.0/download -> thread_local-1.0.0.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timer/0.2.0/download -> timer-0.2.0.crate https://crates.io/api/v1/crates/tuikit/0.2.9/download -> tuikit-0.2.9.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f67ec60429e32c39f96510dae8b80f80
diff --git a/metadata/md5-cache/app-misc/skim-0.8.1 b/metadata/md5-cache/app-misc/skim-0.8.1
index 62c467c79300..bc891151b187 100644
--- a/metadata/md5-cache/app-misc/skim-0.8.1
+++ b/metadata/md5-cache/app-misc/skim-0.8.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 MIT MPL-2.0 Unlicense
 RDEPEND=tmux? ( app-misc/tmux ) vim? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/cc/1.0.31/download -> cc-1.0.31.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam/0.7.3/download -> crossbeam-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.0/download -> crossbeam-channel-0.4.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.2.0/download -> crossbeam-deque-0.2.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.2/download -> crossbeam-deque-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.3.1/download -> crossbeam-epoch-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.0/download -> crossbeam-epoch-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.1/download -> crossbeam-queue-0.2.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.2.2/download -> crossbeam-utils-0.2.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.0/download -> crossbeam-utils-0.7.0.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/derive_builder/0.9.0/download -> derive_builder-0.9.0.crate https://crates.io/api/v1/crates/derive_builder_core/0.9.0/download -> derive_builder_core-0.9.0.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/either/1.5.1/download -> either-1.5.1.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.3.4/download -> fuzzy-matcher-0.3.4.crate https://crates.io/api/v1/crates/getrandom/0.1.6/download -> getrandom-0.1.6.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.58/download -> libc-0.2.58.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/memoffset/0.2.1/download -> memoffset-0.2.1.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/nix/0.14.0/download -> nix-0.14.0.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.6/download -> proc-macro2-1.0.6.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rayon/1.0.3/download -> rayon-1.0.3.crate https://crates.io/api/v1/crates/rayon-core/1.4.1/download -> rayon-core-1.4.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/skim/0.8.1/download -> skim-0.8.1.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/term/0.6.1/download -> term-0.6.1.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/thread_local/1.0.0/download -> thread_local-1.0.0.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/timer/0.2.0/download -> timer-0.2.0.crate https://crates.io/api/v1/crates/tuikit/0.3.2/download -> tuikit-0.3.2.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=838da3b791836de37abf9680150626b7
diff --git a/metadata/md5-cache/app-misc/task-2.5.1-r2 b/metadata/md5-cache/app-misc/task-2.5.1-r2
index 6b2cb972059c..f56bc49481e3 100644
--- a/metadata/md5-cache/app-misc/task-2.5.1-r2
+++ b/metadata/md5-cache/app-misc/task-2.5.1-r2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sync? ( net-libs/gnutls )
 SLOT=0
 SRC_URI=https://taskwarrior.org/download/task-2.5.1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97f2f16b70cd0807e96cbfc522845600
diff --git a/metadata/md5-cache/app-misc/timew-1.4.2 b/metadata/md5-cache/app-misc/timew-1.4.2
index 3b42b691f98b..6128313c9adf 100644
--- a/metadata/md5-cache/app-misc/timew-1.4.2
+++ b/metadata/md5-cache/app-misc/timew-1.4.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/GothenburgBitFactory/timewarrior/releases/download/v1.4.2/timew-1.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6cdedeb961c95ead9fbabbd54bd6f6ef
diff --git a/metadata/md5-cache/app-misc/vcontrold-0.98.8 b/metadata/md5-cache/app-misc/vcontrold-0.98.8
index d41a9d57df66..c066982477a3 100644
--- a/metadata/md5-cache/app-misc/vcontrold-0.98.8
+++ b/metadata/md5-cache/app-misc/vcontrold-0.98.8
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/libxml2:2
 SLOT=0
 SRC_URI=https://github.com/openv/vcontrold/archive/v0.98.8.tar.gz -> vcontrold-0.98.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15b45f884283a7009fdfa300eff7a3d8
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index ef31c2ce6d67..3b45d3f3f671 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/gammu-1.40.0 b/metadata/md5-cache/app-mobilephone/gammu-1.40.0
index e3a54c4255ad..76edbf4a0863 100644
--- a/metadata/md5-cache/app-mobilephone/gammu-1.40.0
+++ b/metadata/md5-cache/app-mobilephone/gammu-1.40.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2= dev-libs/libgudev:= bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= ) dev-util/dialog virtual/libiconv
 SLOT=0
 SRC_URI=https://dl.cihar.com/gammu/releases/gammu-1.40.0.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56d6aa3d8c41e47bd7ecf04155c1dd28
diff --git a/metadata/md5-cache/app-mobilephone/gammu-1.41.0 b/metadata/md5-cache/app-mobilephone/gammu-1.41.0
index 7085ccb9eebf..0fb7e24d8ca1 100644
--- a/metadata/md5-cache/app-mobilephone/gammu-1.41.0
+++ b/metadata/md5-cache/app-mobilephone/gammu-1.41.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2= virtual/libgudev:= virtual/libiconv bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) irda? ( virtual/os-headers ) mysql? ( dev-db/mysql-connector-c:= ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= ) dev-util/dialog
 SLOT=0
 SRC_URI=https://dl.cihar.com/gammu/releases/gammu-1.41.0.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05f8b7fd1ce4856a6f5c93921c9aedd3
diff --git a/metadata/md5-cache/app-mobilephone/smstools-3.1.15-r2 b/metadata/md5-cache/app-mobilephone/smstools-3.1.15-r2
deleted file mode 100644
index 018aaad449b1..000000000000
--- a/metadata/md5-cache/app-mobilephone/smstools-3.1.15-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Send and receive short messages through GSM modems
-EAPI=5
-HOMEPAGE=http://smstools3.kekekasvi.com/
-IUSE=stats
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-process/procps stats? ( >=dev-libs/mm-1.4.0 )
-SLOT=0
-SRC_URI=http://smstools3.kekekasvi.com/packages/smstools3-3.1.15.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2e8d37c4131d50dad008b8cbc676009a
diff --git a/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r3 b/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r3
index f6c624658b2a..6196c67ef6b8 100644
--- a/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r3
+++ b/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r3
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/openobex-1.7.2-r1 net-wireless/bluez
 DESCRIPTION=Scripting/Secure OBEX Server (for BlueZ Linux)
 EAPI=7
 HOMEPAGE=http://www.mulliner.org/bluetooth/sobexsrv.php
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/openobex-1.7.2-r1 net-wireless/bluez acct-user/sobexsrv acct-group/sobexsrv
 SLOT=0
 SRC_URI=http://www.mulliner.org/bluetooth/sobexsrv-1.0.1.tar.gz https://dev.gentoo.org/~joker/sobexsrv-1.0.1-fix64.patch
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5635ee83b7b4d794444efb2944607e65
+_md5_=0efc5aa55894ca408d5e4caee2d70464
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index faa247e20217..c4b0bdd39e5d 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/calligra-3.2.1 b/metadata/md5-cache/app-office/calligra-3.2.1
index 0d461063af8a..f78f0084b95a 100644
--- a/metadata/md5-cache/app-office/calligra-3.2.1
+++ b/metadata/md5-cache/app-office/calligra-3.2.1
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl >=dev-qt/designer-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/calligra/3.2.1/calligra-3.2.1.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b9418ee3395eeb465d3c79f60996315
diff --git a/metadata/md5-cache/app-office/calligraplan-3.2.2 b/metadata/md5-cache/app-office/calligraplan-3.2.2
index 3b3131121d85..b2ee798c7b67 100644
--- a/metadata/md5-cache/app-office/calligraplan-3.2.2
+++ b/metadata/md5-cache/app-office/calligraplan-3.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/designer-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/calligra/3.2.2/calligraplan-3.2.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e17af9287034cb9593b2a394d4a5ca8
diff --git a/metadata/md5-cache/app-office/gnucash-4.0 b/metadata/md5-cache/app-office/gnucash-4.0
index d1ac5f498cd4..43ea39dfd04d 100644
--- a/metadata/md5-cache/app-office/gnucash-4.0
+++ b/metadata/md5-cache/app-office/gnucash-4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=examples? ( gui ) python? ( ^^ ( python_single_target_python3_6 pyt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/4.0/gnucash-4.0.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc66aca99a0bdd6bf1ab49c488f7690b
diff --git a/metadata/md5-cache/app-office/gnucash-4.1 b/metadata/md5-cache/app-office/gnucash-4.1
index cfb8e9efb9c3..81abbba30808 100644
--- a/metadata/md5-cache/app-office/gnucash-4.1
+++ b/metadata/md5-cache/app-office/gnucash-4.1
@@ -13,5 +13,5 @@ REQUIRED_USE=examples? ( gui ) python? ( ^^ ( python_single_target_python3_6 pyt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/4.1/gnucash-4.1.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=db6cf780abda05eaf4ec3e772372dcf1
diff --git a/metadata/md5-cache/app-office/gnucash-4.2 b/metadata/md5-cache/app-office/gnucash-4.2
new file mode 100644
index 000000000000..2bac6b761c4f
--- /dev/null
+++ b/metadata/md5-cache/app-office/gnucash-4.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/swig dev-util/cmake virtual/pkgconfig || ( >=sys-devel/gcc-8:* >=sys-devel/clang-6:* ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.56.1:2 >=dev-scheme/guile-2.2.0:=[regex] >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] sys-libs/gwenhywfar smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( sys-libs/gwenhywfar[gtk] ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] ) >=dev-cpp/gtest-1.8.0 >=sys-devel/gettext-0.20 dev-lang/perl dev-perl/XML-Parser sys-devel/libtool
+DESCRIPTION=A personal finance manager
+EAPI=7
+HOMEPAGE=http://www.gnucash.org/
+IUSE=aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 smartcard sqlite test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=doc? ( ~app-doc/gnucash-docs-4.2 gnome-extra/yelp )
+RDEPEND=>=dev-libs/glib-2.56.1:2 >=dev-scheme/guile-2.2.0:=[regex] >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] sys-libs/gwenhywfar smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( sys-libs/gwenhywfar[gtk] ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] )
+REQUIRED_USE=examples? ( gui ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) smartcard? ( aqbanking )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash/releases/download/4.2/gnucash-4.2.tar.bz2
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b386a7287df76d0a7e6e4610367f14d
diff --git a/metadata/md5-cache/app-office/kexi-3.2.0-r1 b/metadata/md5-cache/app-office/kexi-3.2.0-r1
index b4a672271a49..09cddc4280af 100644
--- a/metadata/md5-cache/app-office/kexi-3.2.0-r1
+++ b/metadata/md5-cache/app-office/kexi-3.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?] >=dev-libs/kpr
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kexi/src/kexi-3.2.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00a9b8c119ec9111626089af5247e116
diff --git a/metadata/md5-cache/app-office/kmymoney-5.1.0 b/metadata/md5-cache/app-office/kmymoney-5.1.0
index ca1b0052610b..b31e282e3a40 100644
--- a/metadata/md5-cache/app-office/kmymoney-5.1.0
+++ b/metadata/md5-cache/app-office/kmymoney-5.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-db/s
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kmymoney/5.1.0/src/kmymoney-5.1.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06c8079ab1318db4746212156b608fec
diff --git a/metadata/md5-cache/app-office/kraft-0.90 b/metadata/md5-cache/app-office/kraft-0.90
deleted file mode 100644
index 4e99eb13ed4d..000000000000
--- a/metadata/md5-cache/app-office/kraft-0.90
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.64.0:5 ) >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-cpp/ctemplate dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcontacts:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 pim? ( kde-apps/akonadi:5 kde-apps/akonadi-contacts:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Software to manage quotes and invoices in small enterprises
-EAPI=7
-HOMEPAGE=https://www.volle-kraft-voraus.de/
-IUSE=pim debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=dev-cpp/ctemplate dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcontacts:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 pim? ( kde-apps/akonadi:5 kde-apps/akonadi-contacts:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=https://github.com/dragotin/kraft/archive/v0.90.tar.gz -> kraft-0.90.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=caabcf6506b24145af38c0325567f0ae
diff --git a/metadata/md5-cache/app-office/kraft-0.95 b/metadata/md5-cache/app-office/kraft-0.95
new file mode 100644
index 000000000000..712aab0effd4
--- /dev/null
+++ b/metadata/md5-cache/app-office/kraft-0.95
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-cpp/ctemplate dev-libs/grantlee:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcontacts:5 kde-frameworks/ki18n:5 pim? ( >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-contacts-19.04.3:5 kde-frameworks/kcoreaddons:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Software to manage quotes and invoices in small enterprises
+EAPI=7
+HOMEPAGE=https://www.volle-kraft-voraus.de/
+IUSE=pim test debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=dev-cpp/ctemplate dev-libs/grantlee:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcontacts:5 kde-frameworks/ki18n:5 pim? ( >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-contacts-19.04.3:5 kde-frameworks/kcoreaddons:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=https://github.com/dragotin/kraft/archive/v0.95.tar.gz -> kraft-0.95.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=be5836e4b2adcac84a709b866db8ed56
diff --git a/metadata/md5-cache/app-office/ktimetracker-5.0.1 b/metadata/md5-cache/app-office/ktimetracker-5.0.1
index 282df0cfe670..5239e7b83ecf 100644
--- a/metadata/md5-cache/app-office/ktimetracker-5.0.1
+++ b/metadata/md5-cache/app-office/ktimetracker-5.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/ktimetracker/5.0.1/src/ktimetracker-5.0.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e450969f9f1aaab9e1a4d1505e5beb62
diff --git a/metadata/md5-cache/app-office/ledger-3.2.0 b/metadata/md5-cache/app-office/ledger-3.2.0
index ef3b5f58afae..6256e1da2982 100644
--- a/metadata/md5-cache/app-office/ledger-3.2.0
+++ b/metadata/md5-cache/app-office/ledger-3.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger/archive/v3.2.0.tar.gz -> ledger-3.2.0.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1296b181070acbe008de2fef7da1b654
diff --git a/metadata/md5-cache/app-office/libalkimia-8.0.3 b/metadata/md5-cache/app-office/libalkimia-8.0.3
index a15ac7b2baa7..25a14ad5edb7 100644
--- a/metadata/md5-cache/app-office/libalkimia-8.0.3
+++ b/metadata/md5-cache/app-office/libalkimia-8.0.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/8
 SRC_URI=mirror://kde/stable/alkimia/8.0.3/alkimia-8.0.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07896d843d26a67fa96b542788f277dd
diff --git a/metadata/md5-cache/app-office/libreoffice-6.4.6.2-r1 b/metadata/md5-cache/app-office/libreoffice-6.4.6.2-r1
deleted file mode 100644
index ddf2101a5902..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-6.4.6.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.15.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/1.5 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.8 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-IUSE=accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-6.4*
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.15.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.8 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.4.6.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.4.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.4.6//libreoffice-6.4.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.4.6//libreoffice-help-6.4.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.4.6.2/src/libreoffice-6.4.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.4.6.2/src/libreoffice-help-6.4.6.2.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e2464cc9fcc8f137f3f89b26affedf0
diff --git a/metadata/md5-cache/app-office/libreoffice-6.4.6.2-r2 b/metadata/md5-cache/app-office/libreoffice-6.4.6.2-r2
new file mode 100644
index 000000000000..0e609dd36369
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-6.4.6.2-r2
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.15.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/1.5 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.8 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-6.4*
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.15.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( dev-db/mysql-connector-c ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.8 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.4.6.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.4.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.4.6//libreoffice-6.4.6.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.4.6//libreoffice-help-6.4.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.4.6.2/src/libreoffice-6.4.6.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.4.6.2/src/libreoffice-help-6.4.6.2.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=765040fc4440c672f94f8179d5b5351d
diff --git a/metadata/md5-cache/app-office/libreoffice-6.4.9999 b/metadata/md5-cache/app-office/libreoffice-6.4.9999
index f80139bf0032..d68d280d0764 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.4.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.4.9999
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f754cb9ae782f63a411e930c5f736080
+_md5_=10fced98bc0ccb5802d99920ab95e243
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 805e1fbaab21..554e35613a32 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz https://dev-www.libreoffice.org/src//QR-Code-generator-1.4.0.tar.gz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e669e6ca1fff8add3c9900a2284657f
+_md5_=6d067096fcf009bbdefba05ed136badf
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-6.4.6.2-r2 b/metadata/md5-cache/app-office/libreoffice-bin-6.4.6.2-r2
new file mode 100644
index 000000000000..b2ef0bc60af1
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-6.4.6.2-r2
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/xdelta:3 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite. Binary package
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=gnome java kde elibc_FreeBSD java +python_single_target_python3_7
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+PDEPEND==app-office/libreoffice-l10n-6.4.6.2*
+RDEPEND=app-text/hunspell:0/1.7 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.72.0 dev-libs/icu:0/67.1 =dev-libs/liborcus-0.15* >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-9.3.0 >=sys-libs/glibc-2.31 virtual/jpeg-compat:62 python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.15.0 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups sys-apps/dbus[X] gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) dev-db/mariadb-connector-c !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.8 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python3_7 )
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-6.4.6.2-r2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-6.4.6.2-r2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-6.4.6.2-r2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-6.4.6.2-r2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-6.4.6.2-r2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-java-6.4.6.2-r2.xd3 ) ) ) ) x86? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-6.4.6.2-r2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-6.4.6.2-r2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-java-6.4.6.2-r2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-6.4.6.2-r2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-java-6.4.6.2-r2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-java-6.4.6.2-r2.xd3 ) ) ) )
+_eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=be18a0a0561bb2c195e3c5dd8ec2d877
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.6.2-r2 b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.6.2-r2
new file mode 100644
index 000000000000..8f36eaab47a5
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.6.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=dev-util/xdelta:3
+DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=gnome java kde
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND==app-office/libreoffice-bin-6.4.6.2-r2[gnome=,java=,kde=]
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-6.4.6.2-r2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-kde-6.4.6.2-r2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-kde-java-6.4.6.2-r2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-gnome-6.4.6.2-r2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-gnome-java-6.4.6.2-r2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-java-6.4.6.2-r2.xd3 ) ) ) ) x86? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-6.4.6.2-r2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-kde-6.4.6.2-r2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-kde-java-6.4.6.2-r2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-gnome-6.4.6.2-r2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-gnome-java-6.4.6.2-r2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-java-6.4.6.2-r2.xd3 ) ) ) )
+_md5_=a6bd81d9b79f05d639d1cbef23894ef1
diff --git a/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1 b/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
index 992b791475b1..20df3b33fd33 100644
--- a/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
+++ b/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXmu imlib
 REQUIRED_USE=imlib? ( !gif !png )
 SLOT=0
 SRC_URI=ftp://sh.wide.ad.jp/WIDE/free-ware/mgp-snap/mgp-snap-20121015.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=e26845d53a5d6b7d70448061e4156e09
diff --git a/metadata/md5-cache/app-office/scribus-1.5.5_p20200626 b/metadata/md5-cache/app-office/scribus-1.5.5_p20200626
index b52e3dc78ad8..9c58e0431242 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.5_p20200626
+++ b/metadata/md5-cache/app-office/scribus-1.5.5_p20200626
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) tk? ( scripts )
 SLOT=0
 SRC_URI=https://github.com/scribusproject/scribus/archive/aa84120d97003a03d883db33ea9a6ad28550e59a.tar.gz -> scribus-1.5.5_p20200626.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d417b3b43a021d927f2a9b4ed2240979
diff --git a/metadata/md5-cache/app-office/scribus-9999 b/metadata/md5-cache/app-office/scribus-9999
index 981bbbcfb5e6..9218cdda4ccb 100644
--- a/metadata/md5-cache/app-office/scribus-9999
+++ b/metadata/md5-cache/app-office/scribus-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-text/libmspub app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:0=[icu] media-libs/lcms:2 media-libs/libcdr media-libs/libfreehand media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.67:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_6? ( dev-python/pillow[tk?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[tk?,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[tk?,python_targets_python3_9(-)] ) ) app-text/ghostscript-gpl
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) tk? ( scripts )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	subversion	ed3498da4fb92dcfb0d6089c85d1465f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	subversion	ed3498da4fb92dcfb0d6089c85d1465f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53bb1f507a28ac4860c6e637f7d6294a
diff --git a/metadata/md5-cache/app-office/skrooge-2.23.0 b/metadata/md5-cache/app-office/skrooge-2.23.0
index 3a3928202021..5de8ccec0fc1 100644
--- a/metadata/md5-cache/app-office/skrooge-2.23.0
+++ b/metadata/md5-cache/app-office/skrooge-2.23.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( designer )
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.23.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0de1a69c3f99f360dea199f166c8647
diff --git a/metadata/md5-cache/app-office/upwork-5.3.3.860 b/metadata/md5-cache/app-office/upwork-5.3.3.860
deleted file mode 100644
index 49a62462e109..000000000000
--- a/metadata/md5-cache/app-office/upwork-5.3.3.860
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DEFINED_PHASES=install unpack
-DESCRIPTION=Project collaboration and tracking software for upwork.com
-EAPI=7
-HOMEPAGE=https://www.upwork.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=ODESK
-RDEPEND=dev-libs/expat dev-libs/nspr dev-libs/nss gnome-base/gconf media-libs/alsa-lib media-libs/freetype sys-apps/dbus sys-libs/libcap x11-libs/gtk+:3[cups]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_3_3_860_wub7hae1mtgzk09u/upwork-5.3.3.860-1fc24.x86_64.rpm -> upwork-5.3.3.860_x86_64.rpm ) x86? ( https://updates-desktopapp.upwork.com/binaries/v5_3_3_860_wub7hae1mtgzk09u/upwork-5.3.3.860-1fc24.i386.rpm -> upwork-5.3.3.860_i386.rpm )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	760ff223c2c4299b68ea901e24c4cabd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c5f1883867d1f4a8c35706ef9f287d0e
diff --git a/metadata/md5-cache/app-office/upwork-5.4.2.8 b/metadata/md5-cache/app-office/upwork-5.4.2.8
deleted file mode 100644
index 90a28d3726c1..000000000000
--- a/metadata/md5-cache/app-office/upwork-5.4.2.8
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DEFINED_PHASES=install unpack
-DESCRIPTION=Project collaboration and tracking software for upwork.com
-EAPI=7
-HOMEPAGE=https://www.upwork.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=ODESK
-RDEPEND=dev-libs/expat dev-libs/nspr dev-libs/nss gnome-base/gconf media-libs/alsa-lib media-libs/freetype sys-apps/dbus sys-libs/libcap x11-libs/gtk+:3[cups]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_4_2_8_17caa201e7ae4660/upwork-5.4.2.8-1fc24.x86_64.rpm -> upwork-5.4.2.8_x86_64.rpm ) x86? ( https://updates-desktopapp.upwork.com/binaries/v5_4_2_8_17caa201e7ae4660/upwork-5.4.2.8-1fc24.i386.rpm -> upwork-5.4.2.8_i386.rpm )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	760ff223c2c4299b68ea901e24c4cabd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=553738e14ac62b492b0c7dceb0aa681c
diff --git a/metadata/md5-cache/app-office/upwork-5.4.5.1 b/metadata/md5-cache/app-office/upwork-5.4.5.1
new file mode 100644
index 000000000000..de937e8eaa51
--- /dev/null
+++ b/metadata/md5-cache/app-office/upwork-5.4.5.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DEFINED_PHASES=install postinst postrm unpack
+DESCRIPTION=Project collaboration and tracking software for upwork.com
+EAPI=7
+HOMEPAGE=https://www.upwork.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=ODESK
+RDEPEND=dev-libs/expat dev-libs/nspr dev-libs/nss gnome-base/gconf media-libs/alsa-lib media-libs/freetype sys-apps/dbus sys-libs/libcap x11-libs/gtk+:3[cups] x11-libs/libXinerama x11-libs/libXScrnSaver
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_4_5_1_941af939eff74e21/upwork-5.4.5.1-1fc24.x86_64.rpm -> upwork-5.4.5.1_x86_64.rpm ) x86? ( https://updates-desktopapp.upwork.com/binaries/v5_4_5_1_941af939eff74e21/upwork-5.4.5.1-1fc24.i386.rpm -> upwork-5.4.5.1_i386.rpm )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	760ff223c2c4299b68ea901e24c4cabd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c313723e29bc7f1884702e791cca1bbc
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index cec6186076bb..8968f2f15097 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/usbmuxd-1.1.0 b/metadata/md5-cache/app-pda/usbmuxd-1.1.0
deleted file mode 100644
index 4abb62c68eee..000000000000
--- a/metadata/md5-cache/app-pda/usbmuxd-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=acct-group/plugdev >=app-pda/libimobiledevice-1.1.6:= <app-pda/libimobiledevice-1.2.1_pre0 >=app-pda/libplist-1.11:= virtual/libusb:1 virtual/os-headers virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-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=acct-group/plugdev >=app-pda/libimobiledevice-1.1.6:= <app-pda/libimobiledevice-1.2.1_pre0 >=app-pda/libplist-1.11:= virtual/libusb:1
-SLOT=0
-SRC_URI=http://www.libimobiledevice.org/downloads/usbmuxd-1.1.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f12897dda31b4cea6c2b1202c0890f8e
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 7a980dfd2979..1e86a0eb1383 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/diffmask-0.3.3-r4 b/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
index 92af60e8f243..351e4f6cb0e6 100644
--- a/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
+++ b/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
@@ -4,11 +4,11 @@ DESCRIPTION=A utility to maintain package.unmask entries up-to-date with masks
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/diffmask/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~mips ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/diffmask/releases/download/diffmask-0.3.3/diffmask-0.3.3.tar.bz2
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4d71383f734249b1b5d38424b2e2104a
+_md5_=79ba42bf52edb998e4c67e6c3f00e6e3
diff --git a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1 b/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
index 9fb0f1ea3f2a..acdfc5a39f38 100644
--- a/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
+++ b/metadata/md5-cache/app-portage/flaggie-0.2.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A smart CLI mangler for package.* files
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/flaggie/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm ~hppa ~mips ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/flaggie/releases/download/flaggie-0.2.1/flaggie-0.2.1.tar.bz2
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1bf3a77b2b25ddf3707632eea6b67397
+_md5_=fa54693cc2b2085519504b6ad2dec30c
diff --git a/metadata/md5-cache/app-portage/gemato-14.4-r1 b/metadata/md5-cache/app-portage/gemato-14.4-r1
deleted file mode 100644
index 9ffe64e60a8a..000000000000
--- a/metadata/md5-cache/app-portage/gemato-14.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( gpg? ( >=app-crypt/gnupg-2.2.20-r1 ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stand-alone Manifest generation & verification tool
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/gemato
-IUSE=+gpg tools test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/gemato/gemato-14.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8e393025ecece05f585d7e43037f5da6
diff --git a/metadata/md5-cache/app-portage/gemato-14.5 b/metadata/md5-cache/app-portage/gemato-14.5
deleted file mode 100644
index 16d55eaaaa5d..000000000000
--- a/metadata/md5-cache/app-portage/gemato-14.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( gpg? ( >=app-crypt/gnupg-2.2.20-r1 ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stand-alone Manifest generation & verification tool
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/gemato
-IUSE=+gpg tools test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/gemato/gemato-14.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a83a1cae6554de8ae51ab73e081d8773
diff --git a/metadata/md5-cache/app-portage/gemato-15.2 b/metadata/md5-cache/app-portage/gemato-15.2
index 16ddebe17305..a7b5fbc09724 100644
--- a/metadata/md5-cache/app-portage/gemato-15.2
+++ b/metadata/md5-cache/app-portage/gemato-15.2
@@ -4,7 +4,7 @@ DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/gemato
 IUSE=+gpg tools test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gemato/gemato-15.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f8801869b98e37f443c52680cb68b30a
+_md5_=205a24a8b50a1cf0044bc8c8238ec0b7
diff --git a/metadata/md5-cache/app-portage/gemato-16.1 b/metadata/md5-cache/app-portage/gemato-16.1
index 56021b48d63d..0c2a7187535e 100644
--- a/metadata/md5-cache/app-portage/gemato-16.1
+++ b/metadata/md5-cache/app-portage/gemato-16.1
@@ -4,7 +4,7 @@ DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/gemato
 IUSE=+gpg tools test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=gpg? ( >=app-crypt/gnupg-2.2.20-r1 dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gemato/gemato-16.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c7c648ac6e9ed3516148c72fb72d8895
+_md5_=e28a5070aa6ef2a561da3ac609362cd6
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.3.2 b/metadata/md5-cache/app-portage/gentoopm-0.3.2
index b8c6a2c1c5d9..1a052e28c24d 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.3.2
+++ b/metadata/md5-cache/app-portage/gentoopm-0.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=A common interface to Gentoo package managers
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/gentoopm/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~mips ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=BSD-2
 PDEPEND=app-eselect/eselect-package-manager
 RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/portage-2.1.10.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 SLOT=0
 SRC_URI=https://github.com/mgorny/gentoopm/archive/v0.3.2.tar.gz -> gentoopm-0.3.2.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de8c95cf7a444766a4e2238d93e3982c
+_md5_=6a68afa680da324283cf1399fcb02b1d
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.4.2 b/metadata/md5-cache/app-portage/gpyutils-0.4.2
deleted file mode 100644
index 95c30f4dbd9d..000000000000
--- a/metadata/md5-cache/app-portage/gpyutils-0.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Utitilies for maintaining Python packages
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/gpyutils/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=app-portage/gentoopm-0.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/gpyutils/archive/v0.4.2.tar.gz -> gpyutils-0.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f16379fac493b05fa6e75c59367a2af0
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.4.3 b/metadata/md5-cache/app-portage/gpyutils-0.4.3
index fa9b872d3e5b..7be99bfbca46 100644
--- a/metadata/md5-cache/app-portage/gpyutils-0.4.3
+++ b/metadata/md5-cache/app-portage/gpyutils-0.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=Utitilies for maintaining Python packages
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/gpyutils/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=app-portage/gentoopm-0.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gpyutils/archive/v0.4.3.tar.gz -> gpyutils-0.4.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=af20cb1a6272543b20b60916da2f5673
+_md5_=f16379fac493b05fa6e75c59367a2af0
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.4.4 b/metadata/md5-cache/app-portage/gpyutils-0.4.4
deleted file mode 100644
index 8ea77d5fb3b2..000000000000
--- a/metadata/md5-cache/app-portage/gpyutils-0.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Utitilies for maintaining Python packages
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/gpyutils/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/gpyutils/archive/v0.4.4.tar.gz -> gpyutils-0.4.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1aa91f820414528a9b283b4215f6a32e
diff --git a/metadata/md5-cache/app-portage/kuroo-9999 b/metadata/md5-cache/app-portage/kuroo-9999
index 7bbce3115149..34e252f829b8 100644
--- a/metadata/md5-cache/app-portage/kuroo-9999
+++ b/metadata/md5-cache/app-portage/kuroo-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-db/sqlite:3 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kauth:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knotifications:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/threadweaver:5 app-portage/gentoolkit kde-apps/kompare:5 kde-plasma/kde-cli-tools:5[kdesu] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	subversion	ed3498da4fb92dcfb0d6089c85d1465f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	subversion	ed3498da4fb92dcfb0d6089c85d1465f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7bf79037b6d4d46854b7dca87ee47efd
diff --git a/metadata/md5-cache/app-portage/nattka-0.2.10 b/metadata/md5-cache/app-portage/nattka-0.2.10
index 5678f0edd63f..427a9bacfa0e 100644
--- a/metadata/md5-cache/app-portage/nattka-0.2.10
+++ b/metadata/md5-cache/app-portage/nattka-0.2.10
@@ -4,7 +4,7 @@ DESCRIPTION=A New Arch Tester Toolkit -- open-source stable-bot replacement
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/nattka/
 IUSE=depgraph-order doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-util/pkgcheck[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git sys-apps/pkgcore[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] depgraph-order? ( dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/nattka/archive/v0.2.10.tar.gz -> nattka-0.2.10.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7f76817788ca4811d92d8d82edd71bdf
+_md5_=f9fb585be35a572ed227e0cf87b0cdf4
diff --git a/metadata/md5-cache/app-portage/pfl-3.1-r1 b/metadata/md5-cache/app-portage/pfl-3.1-r1
new file mode 100644
index 000000000000..8a6530506753
--- /dev/null
+++ b/metadata/md5-cache/app-portage/pfl-3.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Searchable online file/package database for Gentoo
+EAPI=7
+HOMEPAGE=http://www.portagefilelist.de https://github.com/portagefilelist/client
+IUSE=+network-cron python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-2
+RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/curl sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] network-cron? ( sys-apps/util-linux[caps] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/portagefilelist/client/archive/3.1.tar.gz -> pfl-3.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=489b7be8799d6585d0512dd95301be53
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6 b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6
index 664f6fdac387..2cb76acc8070 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-1.3.6
@@ -4,7 +4,7 @@ DESCRIPTION=Check live packages for updates and emerge them as necessary
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/smart-live-rebuild/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm ~mips x86
+KEYWORDS=amd64 arm ~arm64 ~mips x86
 LICENSE=BSD-2
 RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mgorny/smart-live-rebuild/archive/v1.3.6.tar.gz -> smart-live-rebuild-1.3.6.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68c15a4d34ef9be7d19af2124733b2dc
+_md5_=812751d529db891b81d33b5724eb6b87
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 35709f44c4b8..08da0d45d470 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/bash-2.05b_p13 b/metadata/md5-cache/app-shells/bash-2.05b_p13
index 74838d47f34e..45a64f46ab77 100644
--- a/metadata/md5-cache/app-shells/bash-2.05b_p13
+++ b/metadata/md5-cache/app-shells/bash-2.05b_p13
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare setup unpack
 DEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) ) static? ( >=sys-libs/ncurses-5.2-r2[static-libs(+)] nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2[static-libs(+)] ) )
 DESCRIPTION=The standard GNU Bourne again shell
-EAPI=4
+EAPI=7
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs +net nls +readline static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=2.05b
 SRC_URI=mirror://gnu/bash/bash-2.05b.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-001 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-002 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-003 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-004 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-005 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-006 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-007 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-008 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-009 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-010 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-011 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-012 ftp://ftp.cwru.edu/pub/bash/bash-2.05b-patches/bash205b-013 mirror://gnu/bash/bash-2.05b-patches/bash205b-001 mirror://gnu/bash/bash-2.05b-patches/bash205b-002 mirror://gnu/bash/bash-2.05b-patches/bash205b-003 mirror://gnu/bash/bash-2.05b-patches/bash205b-004 mirror://gnu/bash/bash-2.05b-patches/bash205b-005 mirror://gnu/bash/bash-2.05b-patches/bash205b-006 mirror://gnu/bash/bash-2.05b-patches/bash205b-007 mirror://gnu/bash/bash-2.05b-patches/bash205b-008 mirror://gnu/bash/bash-2.05b-patches/bash205b-009 mirror://gnu/bash/bash-2.05b-patches/bash205b-010 mirror://gnu/bash/bash-2.05b-patches/bash205b-011 mirror://gnu/bash/bash-2.05b-patches/bash205b-012 mirror://gnu/bash/bash-2.05b-patches/bash205b-013
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=39800b24de82dcab89f40e6875d73ce5
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=dfc3c29cab9fa9a07ad24bce49569810
diff --git a/metadata/md5-cache/app-shells/bash-3.0_p22 b/metadata/md5-cache/app-shells/bash-3.0_p22
index 57ffe5e95eec..96972e36b8bd 100644
--- a/metadata/md5-cache/app-shells/bash-3.0_p22
+++ b/metadata/md5-cache/app-shells/bash-3.0_p22
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare setup unpack
 DEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) ) static? ( >=sys-libs/ncurses-5.2-r2[static-libs(+)] nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2[static-libs(+)] ) )
 DESCRIPTION=The standard GNU Bourne again shell
-EAPI=4
+EAPI=7
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs +net nls +readline static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=3.0
 SRC_URI=mirror://gnu/bash/bash-3.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-001 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-002 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-003 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-004 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-005 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-006 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-007 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-008 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-009 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-010 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-011 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-012 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-013 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-014 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-015 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-016 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-017 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-018 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-019 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-020 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-021 ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches/bash30-022 mirror://gnu/bash/bash-3.0-patches/bash30-001 mirror://gnu/bash/bash-3.0-patches/bash30-002 mirror://gnu/bash/bash-3.0-patches/bash30-003 mirror://gnu/bash/bash-3.0-patches/bash30-004 mirror://gnu/bash/bash-3.0-patches/bash30-005 mirror://gnu/bash/bash-3.0-patches/bash30-006 mirror://gnu/bash/bash-3.0-patches/bash30-007 mirror://gnu/bash/bash-3.0-patches/bash30-008 mirror://gnu/bash/bash-3.0-patches/bash30-009 mirror://gnu/bash/bash-3.0-patches/bash30-010 mirror://gnu/bash/bash-3.0-patches/bash30-011 mirror://gnu/bash/bash-3.0-patches/bash30-012 mirror://gnu/bash/bash-3.0-patches/bash30-013 mirror://gnu/bash/bash-3.0-patches/bash30-014 mirror://gnu/bash/bash-3.0-patches/bash30-015 mirror://gnu/bash/bash-3.0-patches/bash30-016 mirror://gnu/bash/bash-3.0-patches/bash30-017 mirror://gnu/bash/bash-3.0-patches/bash30-018 mirror://gnu/bash/bash-3.0-patches/bash30-019 mirror://gnu/bash/bash-3.0-patches/bash30-020 mirror://gnu/bash/bash-3.0-patches/bash30-021 mirror://gnu/bash/bash-3.0-patches/bash30-022
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b8a9b06fee5bb2c0e86816601104246f
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2d7855cffd0ed3877d29261c0da031e8
diff --git a/metadata/md5-cache/app-shells/bash-3.1_p23 b/metadata/md5-cache/app-shells/bash-3.1_p23
index 771f66593973..9e6173f6f394 100644
--- a/metadata/md5-cache/app-shells/bash-3.1_p23
+++ b/metadata/md5-cache/app-shells/bash-3.1_p23
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare setup unpack
 DEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) ) static? ( >=sys-libs/ncurses-5.2-r2[static-libs(+)] nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2[static-libs(+)] ) )
 DESCRIPTION=The standard GNU Bourne again shell
-EAPI=4
+EAPI=7
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs +net nls +readline static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=3.1
 SRC_URI=mirror://gnu/bash/bash-3.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-001 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-002 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-003 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-004 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-005 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-006 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-007 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-008 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-009 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-010 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-011 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-012 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-013 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-014 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-015 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-016 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-017 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-018 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-019 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-020 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-021 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-022 ftp://ftp.cwru.edu/pub/bash/bash-3.1-patches/bash31-023 mirror://gnu/bash/bash-3.1-patches/bash31-001 mirror://gnu/bash/bash-3.1-patches/bash31-002 mirror://gnu/bash/bash-3.1-patches/bash31-003 mirror://gnu/bash/bash-3.1-patches/bash31-004 mirror://gnu/bash/bash-3.1-patches/bash31-005 mirror://gnu/bash/bash-3.1-patches/bash31-006 mirror://gnu/bash/bash-3.1-patches/bash31-007 mirror://gnu/bash/bash-3.1-patches/bash31-008 mirror://gnu/bash/bash-3.1-patches/bash31-009 mirror://gnu/bash/bash-3.1-patches/bash31-010 mirror://gnu/bash/bash-3.1-patches/bash31-011 mirror://gnu/bash/bash-3.1-patches/bash31-012 mirror://gnu/bash/bash-3.1-patches/bash31-013 mirror://gnu/bash/bash-3.1-patches/bash31-014 mirror://gnu/bash/bash-3.1-patches/bash31-015 mirror://gnu/bash/bash-3.1-patches/bash31-016 mirror://gnu/bash/bash-3.1-patches/bash31-017 mirror://gnu/bash/bash-3.1-patches/bash31-018 mirror://gnu/bash/bash-3.1-patches/bash31-019 mirror://gnu/bash/bash-3.1-patches/bash31-020 mirror://gnu/bash/bash-3.1-patches/bash31-021 mirror://gnu/bash/bash-3.1-patches/bash31-022 mirror://gnu/bash/bash-3.1-patches/bash31-023
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9e98e3835a82d22d0e2491bf3b4c7412
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=5425fa918ca93b08d966f8d4c3a3197a
diff --git a/metadata/md5-cache/app-shells/bash-3.2_p57 b/metadata/md5-cache/app-shells/bash-3.2_p57
index 8da5985d78ba..2eb47171e168 100644
--- a/metadata/md5-cache/app-shells/bash-3.2_p57
+++ b/metadata/md5-cache/app-shells/bash-3.2_p57
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare setup unpack
 DEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) ) static? ( >=sys-libs/ncurses-5.2-r2[static-libs(+)] nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2[static-libs(+)] ) )
 DESCRIPTION=The standard GNU Bourne again shell
-EAPI=4
+EAPI=7
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs +net nls +readline static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=3.2
 SRC_URI=mirror://gnu/bash/bash-3.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-001 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-002 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-003 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-004 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-005 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-006 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-007 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-008 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-009 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-010 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-011 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-012 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-013 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-014 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-015 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-016 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-017 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-018 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-019 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-020 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-021 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-022 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-023 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-024 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-025 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-026 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-027 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-028 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-029 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-030 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-031 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-032 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-033 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-034 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-035 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-036 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-037 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-038 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-039 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-040 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-041 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-042 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-043 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-044 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-045 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-046 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-047 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-048 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-049 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-050 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-051 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-052 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-053 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-054 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-055 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-056 ftp://ftp.cwru.edu/pub/bash/bash-3.2-patches/bash32-057 mirror://gnu/bash/bash-3.2-patches/bash32-001 mirror://gnu/bash/bash-3.2-patches/bash32-002 mirror://gnu/bash/bash-3.2-patches/bash32-003 mirror://gnu/bash/bash-3.2-patches/bash32-004 mirror://gnu/bash/bash-3.2-patches/bash32-005 mirror://gnu/bash/bash-3.2-patches/bash32-006 mirror://gnu/bash/bash-3.2-patches/bash32-007 mirror://gnu/bash/bash-3.2-patches/bash32-008 mirror://gnu/bash/bash-3.2-patches/bash32-009 mirror://gnu/bash/bash-3.2-patches/bash32-010 mirror://gnu/bash/bash-3.2-patches/bash32-011 mirror://gnu/bash/bash-3.2-patches/bash32-012 mirror://gnu/bash/bash-3.2-patches/bash32-013 mirror://gnu/bash/bash-3.2-patches/bash32-014 mirror://gnu/bash/bash-3.2-patches/bash32-015 mirror://gnu/bash/bash-3.2-patches/bash32-016 mirror://gnu/bash/bash-3.2-patches/bash32-017 mirror://gnu/bash/bash-3.2-patches/bash32-018 mirror://gnu/bash/bash-3.2-patches/bash32-019 mirror://gnu/bash/bash-3.2-patches/bash32-020 mirror://gnu/bash/bash-3.2-patches/bash32-021 mirror://gnu/bash/bash-3.2-patches/bash32-022 mirror://gnu/bash/bash-3.2-patches/bash32-023 mirror://gnu/bash/bash-3.2-patches/bash32-024 mirror://gnu/bash/bash-3.2-patches/bash32-025 mirror://gnu/bash/bash-3.2-patches/bash32-026 mirror://gnu/bash/bash-3.2-patches/bash32-027 mirror://gnu/bash/bash-3.2-patches/bash32-028 mirror://gnu/bash/bash-3.2-patches/bash32-029 mirror://gnu/bash/bash-3.2-patches/bash32-030 mirror://gnu/bash/bash-3.2-patches/bash32-031 mirror://gnu/bash/bash-3.2-patches/bash32-032 mirror://gnu/bash/bash-3.2-patches/bash32-033 mirror://gnu/bash/bash-3.2-patches/bash32-034 mirror://gnu/bash/bash-3.2-patches/bash32-035 mirror://gnu/bash/bash-3.2-patches/bash32-036 mirror://gnu/bash/bash-3.2-patches/bash32-037 mirror://gnu/bash/bash-3.2-patches/bash32-038 mirror://gnu/bash/bash-3.2-patches/bash32-039 mirror://gnu/bash/bash-3.2-patches/bash32-040 mirror://gnu/bash/bash-3.2-patches/bash32-041 mirror://gnu/bash/bash-3.2-patches/bash32-042 mirror://gnu/bash/bash-3.2-patches/bash32-043 mirror://gnu/bash/bash-3.2-patches/bash32-044 mirror://gnu/bash/bash-3.2-patches/bash32-045 mirror://gnu/bash/bash-3.2-patches/bash32-046 mirror://gnu/bash/bash-3.2-patches/bash32-047 mirror://gnu/bash/bash-3.2-patches/bash32-048 mirror://gnu/bash/bash-3.2-patches/bash32-049 mirror://gnu/bash/bash-3.2-patches/bash32-050 mirror://gnu/bash/bash-3.2-patches/bash32-051 mirror://gnu/bash/bash-3.2-patches/bash32-052 mirror://gnu/bash/bash-3.2-patches/bash32-053 mirror://gnu/bash/bash-3.2-patches/bash32-054 mirror://gnu/bash/bash-3.2-patches/bash32-055 mirror://gnu/bash/bash-3.2-patches/bash32-056 mirror://gnu/bash/bash-3.2-patches/bash32-057
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4755ca9ff03fb1ecad96a1bbdbf1cef7
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=235f5ab62526c365dac3ca8dac23b927
diff --git a/metadata/md5-cache/app-shells/bash-4.0_p44 b/metadata/md5-cache/app-shells/bash-4.0_p44
index dc74b003af8b..0f18f374300e 100644
--- a/metadata/md5-cache/app-shells/bash-4.0_p44
+++ b/metadata/md5-cache/app-shells/bash-4.0_p44
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare setup unpack
 DEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) ) static? ( >=sys-libs/ncurses-5.2-r2[static-libs(+)] nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2[static-libs(+)] ) )
 DESCRIPTION=The standard GNU Bourne again shell
-EAPI=4
+EAPI=7
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs mem-scramble +net nls +readline static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=4.0
 SRC_URI=mirror://gnu/bash/bash-4.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-001 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-002 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-003 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-004 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-005 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-006 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-007 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-008 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-009 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-010 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-011 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-012 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-013 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-014 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-015 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-016 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-017 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-018 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-019 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-020 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-021 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-022 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-023 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-024 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-025 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-026 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-027 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-028 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-029 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-030 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-031 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-032 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-033 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-034 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-035 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-036 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-037 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-038 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-039 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-040 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-041 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-042 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-043 ftp://ftp.cwru.edu/pub/bash/bash-4.0-patches/bash40-044 mirror://gnu/bash/bash-4.0-patches/bash40-001 mirror://gnu/bash/bash-4.0-patches/bash40-002 mirror://gnu/bash/bash-4.0-patches/bash40-003 mirror://gnu/bash/bash-4.0-patches/bash40-004 mirror://gnu/bash/bash-4.0-patches/bash40-005 mirror://gnu/bash/bash-4.0-patches/bash40-006 mirror://gnu/bash/bash-4.0-patches/bash40-007 mirror://gnu/bash/bash-4.0-patches/bash40-008 mirror://gnu/bash/bash-4.0-patches/bash40-009 mirror://gnu/bash/bash-4.0-patches/bash40-010 mirror://gnu/bash/bash-4.0-patches/bash40-011 mirror://gnu/bash/bash-4.0-patches/bash40-012 mirror://gnu/bash/bash-4.0-patches/bash40-013 mirror://gnu/bash/bash-4.0-patches/bash40-014 mirror://gnu/bash/bash-4.0-patches/bash40-015 mirror://gnu/bash/bash-4.0-patches/bash40-016 mirror://gnu/bash/bash-4.0-patches/bash40-017 mirror://gnu/bash/bash-4.0-patches/bash40-018 mirror://gnu/bash/bash-4.0-patches/bash40-019 mirror://gnu/bash/bash-4.0-patches/bash40-020 mirror://gnu/bash/bash-4.0-patches/bash40-021 mirror://gnu/bash/bash-4.0-patches/bash40-022 mirror://gnu/bash/bash-4.0-patches/bash40-023 mirror://gnu/bash/bash-4.0-patches/bash40-024 mirror://gnu/bash/bash-4.0-patches/bash40-025 mirror://gnu/bash/bash-4.0-patches/bash40-026 mirror://gnu/bash/bash-4.0-patches/bash40-027 mirror://gnu/bash/bash-4.0-patches/bash40-028 mirror://gnu/bash/bash-4.0-patches/bash40-029 mirror://gnu/bash/bash-4.0-patches/bash40-030 mirror://gnu/bash/bash-4.0-patches/bash40-031 mirror://gnu/bash/bash-4.0-patches/bash40-032 mirror://gnu/bash/bash-4.0-patches/bash40-033 mirror://gnu/bash/bash-4.0-patches/bash40-034 mirror://gnu/bash/bash-4.0-patches/bash40-035 mirror://gnu/bash/bash-4.0-patches/bash40-036 mirror://gnu/bash/bash-4.0-patches/bash40-037 mirror://gnu/bash/bash-4.0-patches/bash40-038 mirror://gnu/bash/bash-4.0-patches/bash40-039 mirror://gnu/bash/bash-4.0-patches/bash40-040 mirror://gnu/bash/bash-4.0-patches/bash40-041 mirror://gnu/bash/bash-4.0-patches/bash40-042 mirror://gnu/bash/bash-4.0-patches/bash40-043 mirror://gnu/bash/bash-4.0-patches/bash40-044
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9d5fef331f382f102ea8b95b35d2e5b5
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ff36a82884ed31f69968df8eede40368
diff --git a/metadata/md5-cache/app-shells/bash-4.1_p17 b/metadata/md5-cache/app-shells/bash-4.1_p17
index 35d74856fa19..5c1b9e7f20a4 100644
--- a/metadata/md5-cache/app-shells/bash-4.1_p17
+++ b/metadata/md5-cache/app-shells/bash-4.1_p17
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare setup unpack
 DEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) ) static? ( >=sys-libs/ncurses-5.2-r2[static-libs(+)] nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2[static-libs(+)] ) )
 DESCRIPTION=The standard GNU Bourne again shell
-EAPI=4
+EAPI=7
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs mem-scramble +net nls +readline static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=4.1
 SRC_URI=mirror://gnu/bash/bash-4.1.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-001 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-002 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-003 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-004 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-005 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-006 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-007 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-008 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-009 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-010 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-011 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-012 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-013 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-014 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-015 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-016 ftp://ftp.cwru.edu/pub/bash/bash-4.1-patches/bash41-017 mirror://gnu/bash/bash-4.1-patches/bash41-001 mirror://gnu/bash/bash-4.1-patches/bash41-002 mirror://gnu/bash/bash-4.1-patches/bash41-003 mirror://gnu/bash/bash-4.1-patches/bash41-004 mirror://gnu/bash/bash-4.1-patches/bash41-005 mirror://gnu/bash/bash-4.1-patches/bash41-006 mirror://gnu/bash/bash-4.1-patches/bash41-007 mirror://gnu/bash/bash-4.1-patches/bash41-008 mirror://gnu/bash/bash-4.1-patches/bash41-009 mirror://gnu/bash/bash-4.1-patches/bash41-010 mirror://gnu/bash/bash-4.1-patches/bash41-011 mirror://gnu/bash/bash-4.1-patches/bash41-012 mirror://gnu/bash/bash-4.1-patches/bash41-013 mirror://gnu/bash/bash-4.1-patches/bash41-014 mirror://gnu/bash/bash-4.1-patches/bash41-015 mirror://gnu/bash/bash-4.1-patches/bash41-016 mirror://gnu/bash/bash-4.1-patches/bash41-017
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fa662cdb8048ffe88697e4462ed9bb54
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2e065486df37f9427cd62f61149bd17b
diff --git a/metadata/md5-cache/app-shells/bash-4.2_p53 b/metadata/md5-cache/app-shells/bash-4.2_p53
index 0c1dc7ef0949..ae73c4e356ee 100644
--- a/metadata/md5-cache/app-shells/bash-4.2_p53
+++ b/metadata/md5-cache/app-shells/bash-4.2_p53
@@ -1,7 +1,8 @@
+BDEPEND=virtual/yacc
 DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) ) virtual/yacc static? ( >=sys-libs/ncurses-5.2-r2[static-libs(+)] nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2[static-libs(+)] ) )
+DEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) ) static? ( >=sys-libs/ncurses-5.2-r2[static-libs(+)] nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2[static-libs(+)] ) )
 DESCRIPTION=The standard GNU Bourne again shell
-EAPI=4
+EAPI=7
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs mem-scramble +net nls +readline static
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
@@ -9,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2 ) )
 SLOT=4.2
 SRC_URI=mirror://gnu/bash/bash-4.2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-001 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-002 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-003 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-004 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-005 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-006 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-007 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-008 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-009 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-010 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-011 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-012 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-013 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-014 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-015 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-016 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-017 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-018 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-019 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-020 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-021 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-022 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-023 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-024 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-025 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-026 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-027 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-028 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-029 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-030 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-031 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-032 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-033 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-034 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-035 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-036 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-037 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-038 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-039 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-040 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-041 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-042 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-043 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-044 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-045 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-046 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-047 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-048 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-049 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-050 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-051 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-052 ftp://ftp.cwru.edu/pub/bash/bash-4.2-patches/bash42-053 mirror://gnu/bash/bash-4.2-patches/bash42-001 mirror://gnu/bash/bash-4.2-patches/bash42-002 mirror://gnu/bash/bash-4.2-patches/bash42-003 mirror://gnu/bash/bash-4.2-patches/bash42-004 mirror://gnu/bash/bash-4.2-patches/bash42-005 mirror://gnu/bash/bash-4.2-patches/bash42-006 mirror://gnu/bash/bash-4.2-patches/bash42-007 mirror://gnu/bash/bash-4.2-patches/bash42-008 mirror://gnu/bash/bash-4.2-patches/bash42-009 mirror://gnu/bash/bash-4.2-patches/bash42-010 mirror://gnu/bash/bash-4.2-patches/bash42-011 mirror://gnu/bash/bash-4.2-patches/bash42-012 mirror://gnu/bash/bash-4.2-patches/bash42-013 mirror://gnu/bash/bash-4.2-patches/bash42-014 mirror://gnu/bash/bash-4.2-patches/bash42-015 mirror://gnu/bash/bash-4.2-patches/bash42-016 mirror://gnu/bash/bash-4.2-patches/bash42-017 mirror://gnu/bash/bash-4.2-patches/bash42-018 mirror://gnu/bash/bash-4.2-patches/bash42-019 mirror://gnu/bash/bash-4.2-patches/bash42-020 mirror://gnu/bash/bash-4.2-patches/bash42-021 mirror://gnu/bash/bash-4.2-patches/bash42-022 mirror://gnu/bash/bash-4.2-patches/bash42-023 mirror://gnu/bash/bash-4.2-patches/bash42-024 mirror://gnu/bash/bash-4.2-patches/bash42-025 mirror://gnu/bash/bash-4.2-patches/bash42-026 mirror://gnu/bash/bash-4.2-patches/bash42-027 mirror://gnu/bash/bash-4.2-patches/bash42-028 mirror://gnu/bash/bash-4.2-patches/bash42-029 mirror://gnu/bash/bash-4.2-patches/bash42-030 mirror://gnu/bash/bash-4.2-patches/bash42-031 mirror://gnu/bash/bash-4.2-patches/bash42-032 mirror://gnu/bash/bash-4.2-patches/bash42-033 mirror://gnu/bash/bash-4.2-patches/bash42-034 mirror://gnu/bash/bash-4.2-patches/bash42-035 mirror://gnu/bash/bash-4.2-patches/bash42-036 mirror://gnu/bash/bash-4.2-patches/bash42-037 mirror://gnu/bash/bash-4.2-patches/bash42-038 mirror://gnu/bash/bash-4.2-patches/bash42-039 mirror://gnu/bash/bash-4.2-patches/bash42-040 mirror://gnu/bash/bash-4.2-patches/bash42-041 mirror://gnu/bash/bash-4.2-patches/bash42-042 mirror://gnu/bash/bash-4.2-patches/bash42-043 mirror://gnu/bash/bash-4.2-patches/bash42-044 mirror://gnu/bash/bash-4.2-patches/bash42-045 mirror://gnu/bash/bash-4.2-patches/bash42-046 mirror://gnu/bash/bash-4.2-patches/bash42-047 mirror://gnu/bash/bash-4.2-patches/bash42-048 mirror://gnu/bash/bash-4.2-patches/bash42-049 mirror://gnu/bash/bash-4.2-patches/bash42-050 mirror://gnu/bash/bash-4.2-patches/bash42-051 mirror://gnu/bash/bash-4.2-patches/bash42-052 mirror://gnu/bash/bash-4.2-patches/bash42-053
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1e5e71b1d51425885f3927c20ea66c20
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c5c7e70945aa6c6eb00dda76b353b6c4
diff --git a/metadata/md5-cache/app-shells/bash-4.3_p48-r2 b/metadata/md5-cache/app-shells/bash-4.3_p48-r2
index 6cefa14a3315..215c16ec650e 100644
--- a/metadata/md5-cache/app-shells/bash-4.3_p48-r2
+++ b/metadata/md5-cache/app-shells/bash-4.3_p48-r2
@@ -1,7 +1,8 @@
+BDEPEND=virtual/yacc
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-6.3:0= ) nls? ( virtual/libintl ) virtual/yacc
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-6.3:0= ) nls? ( virtual/libintl )
 DESCRIPTION=The standard GNU Bourne again shell
-EAPI=5
+EAPI=7
 HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
@@ -9,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-6.3:0= ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1
 SLOT=4.3
 SRC_URI=mirror://gnu/bash/bash-4.3.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-001 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-002 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-003 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-004 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-005 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-006 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-007 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-008 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-009 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-010 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-011 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-012 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-013 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-014 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-015 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-016 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-017 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-018 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-019 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-020 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-021 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-022 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-023 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-024 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-025 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-026 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-027 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-028 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-029 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-030 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-031 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-032 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-033 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-034 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-035 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-036 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-037 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-038 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-039 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-040 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-041 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-042 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-043 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-044 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-045 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-046 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-047 ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/bash43-048 mirror://gnu/bash/bash-4.3-patches/bash43-001 mirror://gnu/bash/bash-4.3-patches/bash43-002 mirror://gnu/bash/bash-4.3-patches/bash43-003 mirror://gnu/bash/bash-4.3-patches/bash43-004 mirror://gnu/bash/bash-4.3-patches/bash43-005 mirror://gnu/bash/bash-4.3-patches/bash43-006 mirror://gnu/bash/bash-4.3-patches/bash43-007 mirror://gnu/bash/bash-4.3-patches/bash43-008 mirror://gnu/bash/bash-4.3-patches/bash43-009 mirror://gnu/bash/bash-4.3-patches/bash43-010 mirror://gnu/bash/bash-4.3-patches/bash43-011 mirror://gnu/bash/bash-4.3-patches/bash43-012 mirror://gnu/bash/bash-4.3-patches/bash43-013 mirror://gnu/bash/bash-4.3-patches/bash43-014 mirror://gnu/bash/bash-4.3-patches/bash43-015 mirror://gnu/bash/bash-4.3-patches/bash43-016 mirror://gnu/bash/bash-4.3-patches/bash43-017 mirror://gnu/bash/bash-4.3-patches/bash43-018 mirror://gnu/bash/bash-4.3-patches/bash43-019 mirror://gnu/bash/bash-4.3-patches/bash43-020 mirror://gnu/bash/bash-4.3-patches/bash43-021 mirror://gnu/bash/bash-4.3-patches/bash43-022 mirror://gnu/bash/bash-4.3-patches/bash43-023 mirror://gnu/bash/bash-4.3-patches/bash43-024 mirror://gnu/bash/bash-4.3-patches/bash43-025 mirror://gnu/bash/bash-4.3-patches/bash43-026 mirror://gnu/bash/bash-4.3-patches/bash43-027 mirror://gnu/bash/bash-4.3-patches/bash43-028 mirror://gnu/bash/bash-4.3-patches/bash43-029 mirror://gnu/bash/bash-4.3-patches/bash43-030 mirror://gnu/bash/bash-4.3-patches/bash43-031 mirror://gnu/bash/bash-4.3-patches/bash43-032 mirror://gnu/bash/bash-4.3-patches/bash43-033 mirror://gnu/bash/bash-4.3-patches/bash43-034 mirror://gnu/bash/bash-4.3-patches/bash43-035 mirror://gnu/bash/bash-4.3-patches/bash43-036 mirror://gnu/bash/bash-4.3-patches/bash43-037 mirror://gnu/bash/bash-4.3-patches/bash43-038 mirror://gnu/bash/bash-4.3-patches/bash43-039 mirror://gnu/bash/bash-4.3-patches/bash43-040 mirror://gnu/bash/bash-4.3-patches/bash43-041 mirror://gnu/bash/bash-4.3-patches/bash43-042 mirror://gnu/bash/bash-4.3-patches/bash43-043 mirror://gnu/bash/bash-4.3-patches/bash43-044 mirror://gnu/bash/bash-4.3-patches/bash43-045 mirror://gnu/bash/bash-4.3-patches/bash43-046 mirror://gnu/bash/bash-4.3-patches/bash43-047 mirror://gnu/bash/bash-4.3-patches/bash43-048
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6fdc1e0257861b84441622dad905128f
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8df626b95bf84fac5a2492c752643ecd
diff --git a/metadata/md5-cache/app-shells/bash-4.4_p23-r2 b/metadata/md5-cache/app-shells/bash-4.4_p23-r2
index 8825735ecb41..bac41534fb01 100644
--- a/metadata/md5-cache/app-shells/bash-4.4_p23-r2
+++ b/metadata/md5-cache/app-shells/bash-4.4_p23-r2
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-
 SLOT=4.4
 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=401fe58151c82854ee0c51b1942f1c53
+_md5_=be418d421761a71661b795fe41cce772
diff --git a/metadata/md5-cache/app-shells/bash-5.0_p17 b/metadata/md5-cache/app-shells/bash-5.0_p17
deleted file mode 100644
index 55129c2881b4..000000000000
--- a/metadata/md5-cache/app-shells/bash-5.0_p17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.0:0= )
-DESCRIPTION=The standard GNU Bourne again shell
-EAPI=7
-HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
-IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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-3
-RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.0:0= )
-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 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-012 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-013 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-014 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-015 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-016 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-017 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 mirror://gnu/bash/bash-5.0-patches/bash50-012 mirror://gnu/bash/bash-5.0-patches/bash50-013 mirror://gnu/bash/bash-5.0-patches/bash50-014 mirror://gnu/bash/bash-5.0-patches/bash50-015 mirror://gnu/bash/bash-5.0-patches/bash50-016 mirror://gnu/bash/bash-5.0-patches/bash50-017
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9c69fdc0c92db326875a22110cd26b35
diff --git a/metadata/md5-cache/app-shells/bash-5.0_p18 b/metadata/md5-cache/app-shells/bash-5.0_p18
index feac13500831..167f2cc08ad4 100644
--- a/metadata/md5-cache/app-shells/bash-5.0_p18
+++ b/metadata/md5-cache/app-shells/bash-5.0_p18
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-
 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 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-012 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-013 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-014 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-015 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-016 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-017 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-018 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 mirror://gnu/bash/bash-5.0-patches/bash50-012 mirror://gnu/bash/bash-5.0-patches/bash50-013 mirror://gnu/bash/bash-5.0-patches/bash50-014 mirror://gnu/bash/bash-5.0-patches/bash50-015 mirror://gnu/bash/bash-5.0-patches/bash50-016 mirror://gnu/bash/bash-5.0-patches/bash50-017 mirror://gnu/bash/bash-5.0-patches/bash50-018
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9c69fdc0c92db326875a22110cd26b35
+_md5_=451f2902c36d98d5244fe77f49c6a4c5
diff --git a/metadata/md5-cache/app-shells/dash-0.5.11.2 b/metadata/md5-cache/app-shells/dash-0.5.11.2
index 2a17c5d7b389..ec2c26646cd9 100644
--- a/metadata/md5-cache/app-shells/dash-0.5.11.2
+++ b/metadata/md5-cache/app-shells/dash-0.5.11.2
@@ -11,4 +11,4 @@ RDEPEND=!static? ( libedit? ( dev-libs/libedit ) )
 SLOT=0
 SRC_URI=http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.2.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=facb7aa367032bdfb9b33689ae28737d
+_md5_=13421c045add33f07272d37710b0d5e2
diff --git a/metadata/md5-cache/app-shells/fish-3.0.2 b/metadata/md5-cache/app-shells/fish-3.0.2
index 31169fa8d685..864e1f14bf1d 100644
--- a/metadata/md5-cache/app-shells/fish-3.0.2
+++ b/metadata/md5-cache/app-shells/fish-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libpcre2-10.21[pcre32] sys-devel/bc sys-libs/ncurses:0=[unico
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.0.2/fish-3.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb0effc9499e6829497dcf4192f1c2ed
diff --git a/metadata/md5-cache/app-shells/fish-3.1.0 b/metadata/md5-cache/app-shells/fish-3.1.0
index 399e3f636b3b..defed4864912 100644
--- a/metadata/md5-cache/app-shells/fish-3.1.0
+++ b/metadata/md5-cache/app-shells/fish-3.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-libs/ncurses:0=[unicode]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.1.0/fish-3.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=29526b34abc25be1cd5844ae1cf2d59a
diff --git a/metadata/md5-cache/app-shells/fish-3.1.2 b/metadata/md5-cache/app-shells/fish-3.1.2
index 74622b305b0e..434612919473 100644
--- a/metadata/md5-cache/app-shells/fish-3.1.2
+++ b/metadata/md5-cache/app-shells/fish-3.1.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-libs/ncurses:0=[unicode]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.1.2/fish-3.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab94a03b461dd717c69b21a7ac3c7ed9
diff --git a/metadata/md5-cache/app-shells/fish-9999 b/metadata/md5-cache/app-shells/fish-9999
index 7f295b677ad6..bbb6049fc0c1 100644
--- a/metadata/md5-cache/app-shells/fish-9999
+++ b/metadata/md5-cache/app-shells/fish-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/libpcre2-10.32[pcre32] sys-apps/coreutils sys-libs/ncurses:0=[unicode]
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5ee0b334519a57be8e5cb743a48b18c1
diff --git a/metadata/md5-cache/app-shells/mcfly-0.3.6 b/metadata/md5-cache/app-shells/mcfly-0.3.6
index 64fde69cc4c4..f3dacebb056e 100644
--- a/metadata/md5-cache/app-shells/mcfly-0.3.6
+++ b/metadata/md5-cache/app-shells/mcfly-0.3.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 MIT Unlicense
 RDEPEND=dev-db/sqlite:3
 SLOT=0
 SRC_URI=https://github.com/cantino/mcfly/archive/v0.3.6.tar.gz -> mcfly-0.3.6.tar.gz https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.7/download -> arrayvec-0.4.7.crate https://crates.io/api/v1/crates/atty/0.2.10/download -> atty-0.2.10.crate https://crates.io/api/v1/crates/backtrace/0.3.9/download -> backtrace-0.3.9.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.24/download -> backtrace-sys-0.1.24.crate https://crates.io/api/v1/crates/bitflags/1.0.3/download -> bitflags-1.0.3.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/cc/1.0.18/download -> cc-1.0.18.crate https://crates.io/api/v1/crates/cfg-if/0.1.5/download -> cfg-if-0.1.5.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/csv/1.0.1/download -> csv-1.0.1.crate https://crates.io/api/v1/crates/csv-core/0.1.4/download -> csv-core-0.1.4.crate https://crates.io/api/v1/crates/dirs/1.0.4/download -> dirs-1.0.4.crate https://crates.io/api/v1/crates/failure/0.1.2/download -> failure-0.1.2.crate https://crates.io/api/v1/crates/failure_derive/0.1.2/download -> failure_derive-0.1.2.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/libc/0.2.42/download -> libc-0.2.42.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.10.0/download -> libsqlite3-sys-0.10.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.4.2/download -> linked-hash-map-0.4.2.crate https://crates.io/api/v1/crates/lru-cache/0.1.1/download -> lru-cache-0.1.1.crate https://crates.io/api/v1/crates/memchr/2.0.1/download -> memchr-2.0.1.crate https://crates.io/api/v1/crates/nodrop/0.1.12/download -> nodrop-0.1.12.crate https://crates.io/api/v1/crates/pkg-config/0.3.11/download -> pkg-config-0.3.11.crate https://crates.io/api/v1/crates/proc-macro2/0.4.20/download -> proc-macro2-0.4.20.crate https://crates.io/api/v1/crates/quote/0.6.8/download -> quote-0.6.8.crate https://crates.io/api/v1/crates/rand/0.4.3/download -> rand-0.4.3.crate https://crates.io/api/v1/crates/rand/0.5.5/download -> rand-0.5.5.crate https://crates.io/api/v1/crates/rand_core/0.2.1/download -> rand_core-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.40/download -> redox_syscall-0.1.40.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/redox_users/0.2.0/download -> redox_users-0.2.0.crate https://crates.io/api/v1/crates/relative-path/0.4.0/download -> relative-path-0.4.0.crate https://crates.io/api/v1/crates/rusqlite/0.15.0/download -> rusqlite-0.15.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.9/download -> rustc-demangle-0.1.9.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/serde/1.0.75/download -> serde-1.0.75.crate https://crates.io/api/v1/crates/shellexpand/1.0.0/download -> shellexpand-1.0.0.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/syn/0.14.9/download -> syn-0.14.9.crate https://crates.io/api/v1/crates/synstructure/0.9.0/download -> synstructure-0.9.0.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/unicode-segmentation/1.2.1/download -> unicode-segmentation-1.2.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.4/download -> vcpkg-0.2.4.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.5/download -> winapi-0.3.5.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=138170ec8f43eecdbdcedaf01f18611c
diff --git a/metadata/md5-cache/app-shells/powerline-2.7-r2 b/metadata/md5-cache/app-shells/powerline-2.7-r2
new file mode 100644
index 000000000000..f47d84e459aa
--- /dev/null
+++ b/metadata/md5-cache/app-shells/powerline-2.7-r2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=The ultimate statusline/prompt utility.
+EAPI=7
+HOMEPAGE=https://github.com/powerline/powerline
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/powerline-status/powerline-status-2.7.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=41263b1448d2475ce9ffec5591ba83b6
diff --git a/metadata/md5-cache/app-shells/quoter-4.2 b/metadata/md5-cache/app-shells/quoter-4.2
index 5c24511582fb..d4b31cae4cb1 100644
--- a/metadata/md5-cache/app-shells/quoter-4.2
+++ b/metadata/md5-cache/app-shells/quoter-4.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Quote arguments or standard input for usage in POSIX shell by eval
 EAPI=7
 HOMEPAGE=https://github.com/vaeth/quoter/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/vaeth/quoter/archive/v4.2.tar.gz -> quoter-4.2.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=660744409a750dcb1b77349d4f393edc
+_md5_=cdc02bcb20c18d4a3d03eadcd3385bf8
diff --git a/metadata/md5-cache/app-shells/squirrelsh-1.2.7 b/metadata/md5-cache/app-shells/squirrelsh-1.2.7
index 26097e7e9e57..c29fb509be65 100644
--- a/metadata/md5-cache/app-shells/squirrelsh-1.2.7
+++ b/metadata/md5-cache/app-shells/squirrelsh-1.2.7
@@ -1,7 +1,7 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install
 DEPEND=dev-libs/libpcre virtual/pkgconfig
 DESCRIPTION=Cross-platform object-oriented scripting shell using the squirrel language
-EAPI=4
+EAPI=7
 HOMEPAGE=http://squirrelsh.sourceforge.net/
 IUSE=doc
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libpcre
 SLOT=0
 SRC_URI=mirror://sourceforge/squirrelsh/squirrelsh-1.2.7-src.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=da257b440d448689d97c403a8158c7f2
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=23ed53f9b44d164b41714a08a4a7c935
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 67d19d207dc6..41d14df490ef 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/a2ps-4.14-r6 b/metadata/md5-cache/app-text/a2ps-4.14-r6
index b4bad1820808..6d71823b333e 100644
--- a/metadata/md5-cache/app-text/a2ps-4.14-r6
+++ b/metadata/md5-cache/app-text/a2ps-4.14-r6
@@ -10,5 +10,5 @@ RDEPEND=app-text/ghostscript-gpl app-text/libpaper >=app-text/psutils-1.17 app-t
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/a2ps/a2ps-4.14.tar.gz cjk? ( mirror://gentoo/a2ps-4.14-ja_nls.patch.gz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=df42a559f51e562d86de9ac1f561fbe3
diff --git a/metadata/md5-cache/app-text/apvlv-0.1.5-r2 b/metadata/md5-cache/app-text/apvlv-0.1.5-r2
index a069b477e51c..638484b937d4 100644
--- a/metadata/md5-cache/app-text/apvlv-0.1.5-r2
+++ b/metadata/md5-cache/app-text/apvlv-0.1.5-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-text/poppler-0.18[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= )
 SLOT=0
 SRC_URI=https://github.com/naihe2010/apvlv/archive/v0.1.5.tar.gz -> apvlv-0.1.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=60ef2f9a82ce349c7f86156705fcd3d9
diff --git a/metadata/md5-cache/app-text/atril-1.24.0-r2 b/metadata/md5-cache/app-text/atril-1.24.0-r2
new file mode 100644
index 000000000000..c1847bc06701
--- /dev/null
+++ b/metadata/md5-cache/app-text/atril-1.24.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk >=dev-libs/glib-2.62:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libICE >=x11-libs/libSM-1:0 x11-libs/libX11 >=x11-libs/cairo-1.14 x11-libs/pango caja? ( >=mate-base/caja-1.17.1[introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax >=net-libs/webkit-gtk-2.6.0:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2 ) synctex? ( virtual/tex-base ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1 ) app-text/docbook-xml-dtd:4.1.2 app-text/rarian app-text/yelp-tools >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.7 dev-util/dogtail[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/dogtail[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Atril document viewer for MATE
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript synctex t1lib test tiff xps test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+
+RDEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk >=dev-libs/glib-2.62:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libICE >=x11-libs/libSM-1:0 x11-libs/libX11 >=x11-libs/cairo-1.14 x11-libs/pango caja? ( >=mate-base/caja-1.17.1[introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax >=net-libs/webkit-gtk-2.6.0:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2 ) synctex? ( virtual/tex-base ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1 ) virtual/libintl !!app-text/mate-document-viewer
+REQUIRED_USE=t1lib? ( dvi )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/atril-1.24.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7251a45dea0302dab7fad67eab4a2f2f
diff --git a/metadata/md5-cache/app-text/bibletime-2.11.2 b/metadata/md5-cache/app-text/bibletime-2.11.2
index d66a756912a0..715417faffa5 100644
--- a/metadata/md5-cache/app-text/bibletime-2.11.2
+++ b/metadata/md5-cache/app-text/bibletime-2.11.2
@@ -11,5 +11,5 @@ RDEPEND=>=app-text/sword-1.7.0 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 de
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bibletime/bibletime/releases/download/v2.11.2/bibletime-2.11.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5061c8a3e826f6b2d0f48d8e2625815
diff --git a/metadata/md5-cache/app-text/bibletime-3.0 b/metadata/md5-cache/app-text/bibletime-3.0
index 42ba57ed2937..6ea09ffb37cb 100644
--- a/metadata/md5-cache/app-text/bibletime-3.0
+++ b/metadata/md5-cache/app-text/bibletime-3.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-text/sword-1.8.1 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 de
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bibletime/bibletime/releases/download/v3.0/bibletime-3.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0d0a08412688bd5aaef12eb74183bab
diff --git a/metadata/md5-cache/app-text/cherrytree-0.99.0_p20200523 b/metadata/md5-cache/app-text/cherrytree-0.99.0_p20200523
index 8968772c3f73..8962975b0b22 100644
--- a/metadata/md5-cache/app-text/cherrytree-0.99.0_p20200523
+++ b/metadata/md5-cache/app-text/cherrytree-0.99.0_p20200523
@@ -11,5 +11,5 @@ RDEPEND=app-text/gspell:= dev-libs/glib:2 >=dev-cpp/glibmm-2.64.2:2 dev-cpp/gtkm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/giuspen/cherrytree/archive/074a09ce3c1130ec60f5f5a3b8be958337b6d5ab.tar.gz -> cherrytree-0.99.0_p20200523.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d5e6899f9c65ee48f5d466222a51625
diff --git a/metadata/md5-cache/app-text/cherrytree-9999 b/metadata/md5-cache/app-text/cherrytree-9999
index b2bb48b69d90..7ad5ddac44f4 100644
--- a/metadata/md5-cache/app-text/cherrytree-9999
+++ b/metadata/md5-cache/app-text/cherrytree-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-text/gspell:= dev-libs/glib:2 >=dev-cpp/glibmm-2.64.2:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-libs/libxml2:2 dev-cpp/libxmlpp:2.6 dev-cpp/pangomm dev-db/sqlite:3
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d5e6899f9c65ee48f5d466222a51625
diff --git a/metadata/md5-cache/app-text/cmark-0.29.0 b/metadata/md5-cache/app-text/cmark-0.29.0
index d72ee037c89e..15c3a976c4f1 100644
--- a/metadata/md5-cache/app-text/cmark-0.29.0
+++ b/metadata/md5-cache/app-text/cmark-0.29.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) )
+DEPEND=test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) )
 DESCRIPTION=CommonMark parsing and rendering library and program in C
 EAPI=7
 HOMEPAGE=https://github.com/commonmark/cmark
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0/0.29.0
 SRC_URI=https://github.com/commonmark/cmark/archive/0.29.0.tar.gz -> cmark-0.29.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b1c628463b1ebfdae1109fda6d29321
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a8b5a130368902be48066448799b53cf
diff --git a/metadata/md5-cache/app-text/coolreader-3.2.49 b/metadata/md5-cache/app-text/coolreader-3.2.49
new file mode 100644
index 000000000000..9516284f9ee1
--- /dev/null
+++ b/metadata/md5-cache/app-text/coolreader-3.2.49
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( x11-libs/wxGTK:3.0 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !wxwidgets? ( dev-qt/linguist-tools:5 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
+EAPI=6
+HOMEPAGE=https://github.com/buggins/coolreader/
+IUSE=wxwidgets l10n_bg l10n_cs l10n_de l10n_es l10n_hu l10n_pl l10n_ru l10n_uk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( x11-libs/wxGTK:3.0 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
+SLOT=0
+SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.49.tar.gz -> coolreader-3.2.49.tar.gz
+_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b7be8790de64ad15d4ef8d7e50667bf1
diff --git a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.3-r2 b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.3-r2
index 2c0602470f0a..9c8fee0c8b2f 100644
--- a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.3-r2
+++ b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.3-r2
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/libpcre2:= cli? ( !dev-python/editorconfig-core-py[cli] )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-c/archive/v0.12.3.tar.gz -> editorconfig-core-c-0.12.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f12803c08d34d75203c20df6bdd71765
diff --git a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4 b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
index 1128127414de..192a31618c92 100644
--- a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
+++ b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/libpcre2:= cli? ( !dev-python/editorconfig-core-py[cli] )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-c/archive/v0.12.4.tar.gz -> editorconfig-core-c-0.12.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49e8696fdb4e0c83e562f83c7705f838
diff --git a/metadata/md5-cache/app-text/fb2edit-0.1.0 b/metadata/md5-cache/app-text/fb2edit-0.1.0
index 5a2baae90ebe..fc78c21c1a64 100644
--- a/metadata/md5-cache/app-text/fb2edit-0.1.0
+++ b/metadata/md5-cache/app-text/fb2edit-0.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-libs/libxml2:2
 SLOT=0
 SRC_URI=https://github.com/vitlav/fb2edit/archive/0.1.0.tar.gz -> fb2edit-0.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=242ed85c56abd6e9d20d953a3bd67215
diff --git a/metadata/md5-cache/app-text/fblog-1.4.1 b/metadata/md5-cache/app-text/fblog-1.4.1
index 9e11a6cfbff9..f19483400d2c 100644
--- a/metadata/md5-cache/app-text/fblog-1.4.1
+++ b/metadata/md5-cache/app-text/fblog-1.4.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc64
 LICENSE=Apache-2.0 Boost-1.0 MIT Unlicense WTFPL-2
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/bitflags/1.1.0/download -> bitflags-1.1.0.crate https://crates.io/api/v1/crates/cc/1.0.45/download -> cc-1.0.45.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/fblog/1.4.1/download -> fblog-1.4.1.crate https://crates.io/api/v1/crates/hlua/0.4.1/download -> hlua-0.4.1.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/lua52-sys/0.1.2/download -> lua52-sys-0.1.2.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.16/download -> pkg-config-0.3.16.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/serde/1.0.100/download -> serde-1.0.100.crate https://crates.io/api/v1/crates/serde_json/1.0.40/download -> serde_json-1.0.40.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e13cc1cc17fea39213f23bea05c98fc4
diff --git a/metadata/md5-cache/app-text/fbreader-0.99.4-r5 b/metadata/md5-cache/app-text/fbreader-0.99.4-r5
index 4193081f8bdb..639273b9d9b9 100644
--- a/metadata/md5-cache/app-text/fbreader-0.99.4-r5
+++ b/metadata/md5-cache/app-text/fbreader-0.99.4-r5
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/bzip2 dev-libs/expat dev-libs/libunibreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl] virtual/pkgconfig
+DEPEND=app-arch/bzip2 dev-db/sqlite dev-libs/expat dev-libs/fribidi dev-libs/libunibreak dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 net-misc/curl sys-libs/zlib
 DESCRIPTION=E-Book Reader. Supports many e-book formats
-EAPI=6
-HOMEPAGE=http://www.fbreader.org/
+EAPI=7
+HOMEPAGE=https://www.fbreader.org/
 IUSE=debug
 KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 dev-libs/expat dev-libs/libunibreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl]
+RDEPEND=app-arch/bzip2 dev-db/sqlite dev-libs/expat dev-libs/fribidi dev-libs/libunibreak dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 net-misc/curl sys-libs/zlib
 SLOT=0
-SRC_URI=http://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=79b4b6c5cd25f3e8139b48a3849707a0
+SRC_URI=https://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=07b3511a31e72b6a32922669bd410bb1
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-9.53.2 b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.2
new file mode 100644
index 000000000000..79cbd17bb47e
--- /dev/null
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-9.53.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:0= >=sys-libs/zlib-1.2.7 virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn:0= ) X? ( x11-libs/libXt x11-libs/libXext )
+DESCRIPTION=Interpreter for the PostScript language and PDF
+EAPI=7
+HOMEPAGE=https://ghostscript.com/
+IUSE=cups dbus gtk l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=AGPL-3 CPL-1.0
+RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:0= >=sys-libs/zlib-1.2.7 virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn:0= ) X? ( x11-libs/libXt x11-libs/libXext ) app-text/poppler-data >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
+SLOT=0
+SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9532/ghostscript-9.53.2.tar.xz https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/ghostscript-gpl-9.53-patchset-01.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=29aa092f9d0453b7d04c998e1d724d27
diff --git a/metadata/md5-cache/app-text/groonga-5.0.3 b/metadata/md5-cache/app-text/groonga-5.0.3
deleted file mode 100644
index 9b1347e31b62..000000000000
--- a/metadata/md5-cache/app-text/groonga-5.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig sphinx? ( dev-python/sphinx ) >=app-portage/elt-patches-20170815
-DESCRIPTION=An Embeddable Fulltext Search Engine
-EAPI=5
-HOMEPAGE=http://groonga.org/
-IUSE=abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
-SLOT=0
-SRC_URI=http://packages.groonga.org/source/groonga/groonga-5.0.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2e403e8e8ae7e87169ed2bc3a81d17bb
diff --git a/metadata/md5-cache/app-text/groonga-5.0.9 b/metadata/md5-cache/app-text/groonga-5.0.9
deleted file mode 100644
index b7f600c79163..000000000000
--- a/metadata/md5-cache/app-text/groonga-5.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig sphinx? ( dev-python/sphinx ) >=app-portage/elt-patches-20170815
-DESCRIPTION=An Embeddable Fulltext Search Engine
-EAPI=5
-HOMEPAGE=http://groonga.org/
-IUSE=abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
-SLOT=0
-SRC_URI=http://packages.groonga.org/source/groonga/groonga-5.0.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2e403e8e8ae7e87169ed2bc3a81d17bb
diff --git a/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.0.6 b/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.0.6
deleted file mode 100644
index 21ac4e39c4fd..000000000000
--- a/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/groonga virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Groonga plugin that provides MySQL compatible normalizers
-EAPI=5
-HOMEPAGE=https://groonga.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/groonga
-SLOT=0
-SRC_URI=https://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8bf56467ddc98d7dd3699c00048615cd
diff --git a/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.0.9 b/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.0.9
deleted file mode 100644
index 633a7ee65d88..000000000000
--- a/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/groonga virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Groonga plugin that provides MySQL compatible normalizers
-EAPI=5
-HOMEPAGE=https://groonga.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/groonga
-SLOT=0
-SRC_URI=https://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db762e6a3dfd13e0244981b979501589
diff --git a/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.0 b/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.0
deleted file mode 100644
index fe6ea2d4e922..000000000000
--- a/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/groonga virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Groonga plugin that provides MySQL compatible normalizers
-EAPI=5
-HOMEPAGE=https://groonga.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/groonga
-SLOT=0
-SRC_URI=https://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db762e6a3dfd13e0244981b979501589
diff --git a/metadata/md5-cache/app-text/htp-1.16-r1 b/metadata/md5-cache/app-text/htp-1.16-r1
deleted file mode 100644
index d5676dcef7a8..000000000000
--- a/metadata/md5-cache/app-text/htp-1.16-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DESCRIPTION=An HTML preprocessor
-EAPI=5
-HOMEPAGE=http://htp.sourceforge.net/
-KEYWORDS=~alpha ~ppc ~sparc ~x86
-LICENSE=Clarified-Artistic
-SLOT=0
-SRC_URI=mirror://sourceforge/htp/htp-1.16.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=703b854353a7ee88356dcca1201bef6f
diff --git a/metadata/md5-cache/app-text/jabref-2.10-r2 b/metadata/md5-cache/app-text/jabref-2.10-r2
deleted file mode 100644
index 5a6e29e80c1c..000000000000
--- a/metadata/md5-cache/app-text/jabref-2.10-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=5
-HOMEPAGE=http://jabref.sourceforge.net/
-IUSE=doc elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=947cdef8f2e53d58a688a98ea9669b0e
diff --git a/metadata/md5-cache/app-text/kbibtex-0.9.2 b/metadata/md5-cache/app-text/kbibtex-0.9.2
index 8c6f2ac0c7c5..0ef785c69361 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.9.2
+++ b/metadata/md5-cache/app-text/kbibtex-0.9.2
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[qt5] dev-libs/icu:= >=dev-qt/qtconcurrent-5.12.3:5 >=de
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/KBibTeX/0.9.2/kbibtex-0.9.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d2500a034a55730bbc4af17541ec933
diff --git a/metadata/md5-cache/app-text/kjots-5.0.2-r1 b/metadata/md5-cache/app-text/kjots-5.0.2-r1
index dfa8ee108eb5..a29bbfd69f22 100644
--- a/metadata/md5-cache/app-text/kjots-5.0.2-r1
+++ b/metadata/md5-cache/app-text/kjots-5.0.2-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/grantlee:5 dev-libs/libxslt >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/akonadi-19.04.3:5 >=kde-apps/akonadi-notes-19.04.3:5 >=kde-apps/kmime-19.04.3:5 >=kde-apps/kontactinterface-19.04.3:5 >=kde-apps/kpimtextedit-19.04.3:5 >=kde-frameworks/kbookmarks-5.60.0:5= >=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/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 !app-text/kjots:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kjots/5.0.2/kjots-5.0.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=febf1214162427dc764f1a331b67779a
diff --git a/metadata/md5-cache/app-text/kjots-5.0.2-r2 b/metadata/md5-cache/app-text/kjots-5.0.2-r2
index 7cc071c63dce..c1d4c1b568c0 100644
--- a/metadata/md5-cache/app-text/kjots-5.0.2-r2
+++ b/metadata/md5-cache/app-text/kjots-5.0.2-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/grantlee:5 dev-libs/libxslt >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/akonadi-notes-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/kontactinterface-20.08.1:5 >=kde-apps/kpimtextedit-20.08.1:5 >=kde-frameworks/kbookmarks-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kjots/5.0.2/kjots-5.0.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f31c444b3d795c787ca894d974b8ffb
diff --git a/metadata/md5-cache/app-text/lcdf-typetools-2.107 b/metadata/md5-cache/app-text/lcdf-typetools-2.107
deleted file mode 100644
index e4732dd449d1..000000000000
--- a/metadata/md5-cache/app-text/lcdf-typetools-2.107
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=kpathsea? ( virtual/tex-base dev-libs/kpathsea ) virtual/pkgconfig
-DESCRIPTION=Font utilities for eg manipulating OTF
-EAPI=5
-HOMEPAGE=http://www.lcdf.org/type/#typetools
-IUSE=+kpathsea
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=kpathsea? ( virtual/tex-base dev-libs/kpathsea )
-SLOT=0
-SRC_URI=http://www.lcdf.org/type/lcdf-typetools-2.107.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6eddf7114e128aa4f4fcaa1a10979c6c
diff --git a/metadata/md5-cache/app-text/libnumbertext-1.0.6 b/metadata/md5-cache/app-text/libnumbertext-1.0.6
index 9bacf204fa31..422b69631994 100644
--- a/metadata/md5-cache/app-text/libnumbertext-1.0.6
+++ b/metadata/md5-cache/app-text/libnumbertext-1.0.6
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Number to number name and money text conversion libraries
 EAPI=7
 HOMEPAGE=https://github.com/Numbertext/libnumbertext
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~x86
 LICENSE=LGPL-3+
 SLOT=0
 SRC_URI=https://github.com/Numbertext/libnumbertext/releases/download/1.0.6/libnumbertext-1.0.6.tar.xz
-_md5_=8599842ff1f6b163cee4965e0bacfd1f
+_md5_=df92edf052af2f81164c623e1666b452
diff --git a/metadata/md5-cache/app-text/libwps-0.4.12 b/metadata/md5-cache/app-text/libwps-0.4.12
index 30dddf38cd13..5e3e76b4a426 100644
--- a/metadata/md5-cache/app-text/libwps-0.4.12
+++ b/metadata/md5-cache/app-text/libwps-0.4.12
@@ -5,9 +5,9 @@ DESCRIPTION=Microsoft Works file word processor format import filter library
 EAPI=7
 HOMEPAGE=https://sourceforge.net/p/libwps/wiki/Home/
 IUSE=debug doc tools
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ppc64 ~x86
 LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=mirror://sourceforge/libwps/libwps-0.4.12.tar.xz
-_md5_=af6cd10a090ff7c4591595b574df854b
+_md5_=4947378a4930ea433fc4719090b9cbfe
diff --git a/metadata/md5-cache/app-text/multitail-6.4.1 b/metadata/md5-cache/app-text/multitail-6.4.1
deleted file mode 100644
index d25b3deb7747..000000000000
--- a/metadata/md5-cache/app-text/multitail-6.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] virtual/pkgconfig
-DESCRIPTION=Tail with multiple windows
-EAPI=5
-HOMEPAGE=http://www.vanheusden.com/multitail/
-IUSE=debug examples unicode
-KEYWORDS=amd64 hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?]
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.vanheusden.com/multitail/multitail-6.4.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=47219e29c257d712fa909dff8e739516
diff --git a/metadata/md5-cache/app-text/namazu-2.0.21 b/metadata/md5-cache/app-text/namazu-2.0.21
index c4198262f68b..8c3858ddcfc0 100644
--- a/metadata/md5-cache/app-text/namazu-2.0.21
+++ b/metadata/md5-cache/app-text/namazu-2.0.21
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/File-MMagic emacs? ( >=app-editors/emacs-23.1:* ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx )
 SLOT=0
 SRC_URI=http://www.namazu.org/stable/namazu-2.0.21.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7ac16842d15e862afddde5cdcc2dd8eb
diff --git a/metadata/md5-cache/app-text/namazu-2.0.22_pre7 b/metadata/md5-cache/app-text/namazu-2.0.22_pre7
index 2dcb14872933..670a52a8fd40 100644
--- a/metadata/md5-cache/app-text/namazu-2.0.22_pre7
+++ b/metadata/md5-cache/app-text/namazu-2.0.22_pre7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-perl/File-MMagic emacs? ( >=app-editors/emacs-23.1:* ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx )
 SLOT=0
 SRC_URI=http://www.namazu.org/test/namazu-2.0.22pre7.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=7c83a1517db606b27a96b3fa0e3e0ab3
diff --git a/metadata/md5-cache/app-text/nuspell-3.0.0 b/metadata/md5-cache/app-text/nuspell-3.0.0
index 0e79172635df..7efb924d5cee 100644
--- a/metadata/md5-cache/app-text/nuspell-3.0.0
+++ b/metadata/md5-cache/app-text/nuspell-3.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/icu
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/nuspell/nuspell/archive/v3.0.0.tar.gz -> nuspell-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e86f426b2f18fd873e63d33ee910366e
diff --git a/metadata/md5-cache/app-text/nuspell-3.1.0 b/metadata/md5-cache/app-text/nuspell-3.1.0
index 9ee58fb3492b..7bfd516f765e 100644
--- a/metadata/md5-cache/app-text/nuspell-3.1.0
+++ b/metadata/md5-cache/app-text/nuspell-3.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/icu
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/nuspell/nuspell/archive/v3.1.0.tar.gz -> nuspell-3.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07da7ddc5668cc1cbe58a1e7b4601ddc
diff --git a/metadata/md5-cache/app-text/nuspell-3.1.1 b/metadata/md5-cache/app-text/nuspell-3.1.1
index 2780c62a9e33..9f258d794b58 100644
--- a/metadata/md5-cache/app-text/nuspell-3.1.1
+++ b/metadata/md5-cache/app-text/nuspell-3.1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/icu
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/nuspell/nuspell/archive/v3.1.1.tar.gz -> nuspell-3.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d2a820b74b503155047fc979dd94910
diff --git a/metadata/md5-cache/app-text/nuspell-3.1.2 b/metadata/md5-cache/app-text/nuspell-3.1.2
index 9e1664a03413..157451c967aa 100644
--- a/metadata/md5-cache/app-text/nuspell-3.1.2
+++ b/metadata/md5-cache/app-text/nuspell-3.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/icu
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/nuspell/nuspell/archive/v3.1.2.tar.gz -> nuspell-3.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d2a820b74b503155047fc979dd94910
diff --git a/metadata/md5-cache/app-text/pdfgrep-1.4.1-r1 b/metadata/md5-cache/app-text/pdfgrep-1.4.1-r1
deleted file mode 100644
index 47a1bfaff90e..000000000000
--- a/metadata/md5-cache/app-text/pdfgrep-1.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-text/poppler:=[cxx] pcre? ( dev-libs/libpcre[cxx] ) unac? ( app-text/unac ) virtual/pkgconfig test? ( dev-texlive/texlive-latex dev-util/dejagnu )
-DESCRIPTION=A tool similar to grep which searches text in PDFs
-EAPI=5
-HOMEPAGE=http://pdfgrep.org/
-IUSE=+pcre test unac
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler:=[cxx] pcre? ( dev-libs/libpcre[cxx] ) unac? ( app-text/unac )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://pdfgrep.org/download/pdfgrep-1.4.1.tar.gz
-_md5_=cd79fca03046df1b01e491c391b32897
diff --git a/metadata/md5-cache/app-text/pdfsandwich-0.1.4-r1 b/metadata/md5-cache/app-text/pdfsandwich-0.1.4-r1
deleted file mode 100644
index 69b46a3e05b5..000000000000
--- a/metadata/md5-cache/app-text/pdfsandwich-0.1.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=sys-apps/gawk >=dev-lang/ocaml-3.10[ocamlopt]
-DESCRIPTION=generator of sandwich OCR pdf files
-EAPI=5
-HOMEPAGE=http://www.tobias-elze.de/pdfsandwich
-IUSE=png
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/tesseract-3.00 media-gfx/exact-image app-text/unpaper app-text/ghostscript-gpl virtual/imagemagick-tools[png?]
-SLOT=0
-SRC_URI=mirror://sourceforge/pdfsandwich/pdfsandwich-0.1.4.tar.bz2
-_md5_=612b9991776cd3ec3383e92aca642c42
diff --git a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928 b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928
index c509af86736c..0e1d9085c29d 100644
--- a/metadata/md5-cache/app-text/podofo-0.9.6_p20190928
+++ b/metadata/md5-cache/app-text/podofo-0.9.6_p20190928
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/0.9.6
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/podofo-0.9.6_p20190928.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc283af57e54992d50bbabace5b8d720
diff --git a/metadata/md5-cache/app-text/poppler-0.90.1 b/metadata/md5-cache/app-text/poppler-0.90.1
index f6c8f5bd277b..fcd9d0bf842e 100644
--- a/metadata/md5-cache/app-text/poppler-0.90.1
+++ b/metadata/md5-cache/app-text/poppler-0.90.1
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-lib
 RESTRICT=test
 SLOT=0/101
 SRC_URI=https://poppler.freedesktop.org/poppler-0.90.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9980f70499b255523b97441ce7b1fa6
diff --git a/metadata/md5-cache/app-text/poppler-20.09.0 b/metadata/md5-cache/app-text/poppler-20.09.0
index f6297d585245..1418a24ebd7d 100644
--- a/metadata/md5-cache/app-text/poppler-20.09.0
+++ b/metadata/md5-cache/app-text/poppler-20.09.0
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-lib
 RESTRICT=test
 SLOT=0/102
 SRC_URI=https://poppler.freedesktop.org/poppler-20.09.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e9ce07f6a18e2d31fd1ef303162b9f9
diff --git a/metadata/md5-cache/app-text/poppler-9999 b/metadata/md5-cache/app-text/poppler-9999
index 43f6b5e39915..cf9ccc9d7fa2 100644
--- a/metadata/md5-cache/app-text/poppler-9999
+++ b/metadata/md5-cache/app-text/poppler-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e9ce07f6a18e2d31fd1ef303162b9f9
diff --git a/metadata/md5-cache/app-text/sigil-1.2.1-r1 b/metadata/md5-cache/app-text/sigil-1.2.1-r1
index 43b6e8e9d07f..ca1ec2277161 100644
--- a/metadata/md5-cache/app-text/sigil-1.2.1-r1
+++ b/metadata/md5-cache/app-text/sigil-1.2.1-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/pyt
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/1.2.1.tar.gz -> sigil-1.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=60b4ee2885ec761fdbec10b418b3ebe9
diff --git a/metadata/md5-cache/app-text/sigil-1.3.0 b/metadata/md5-cache/app-text/sigil-1.3.0
index fa484e48cb71..1b6c2c9ab672 100644
--- a/metadata/md5-cache/app-text/sigil-1.3.0
+++ b/metadata/md5-cache/app-text/sigil-1.3.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/pyt
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/1.3.0.tar.gz -> sigil-1.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1c3525816a8026e0a04cd3676f21d894
diff --git a/metadata/md5-cache/app-text/tofrodos-1.7.12a b/metadata/md5-cache/app-text/tofrodos-1.7.12a
deleted file mode 100644
index b1b39baf9629..000000000000
--- a/metadata/md5-cache/app-text/tofrodos-1.7.12a
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Utility that converts ASCII files between the MSDOS and the Unix format
-EAPI=5
-HOMEPAGE=http://tofrodos.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~hppa ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://tofrodos.sourceforge.net/download/tofrodos-1.7.12a.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0f8280f435a3f0863ec7178b35ec1265
diff --git a/metadata/md5-cache/app-text/unrtf-0.21.9 b/metadata/md5-cache/app-text/unrtf-0.21.9
deleted file mode 100644
index b178d8d62cad..000000000000
--- a/metadata/md5-cache/app-text/unrtf-0.21.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Converts RTF files to various formats
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/unrtf/unrtf.html
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/unrtf/unrtf-0.21.9.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9ffb6c750bd1abd732ac36b71ae465a1
diff --git a/metadata/md5-cache/app-text/wiki2beamer-0.9.5-r1 b/metadata/md5-cache/app-text/wiki2beamer-0.9.5-r1
deleted file mode 100644
index 6102a7b973c7..000000000000
--- a/metadata/md5-cache/app-text/wiki2beamer-0.9.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-arch/unzip
-DESCRIPTION=Tool to produce LaTeX Beamer code from wiki-like input
-EAPI=5
-HOMEPAGE=http://wiki2beamer.sourceforge.net/
-IUSE=+examples +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 ) FDL-1.3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=mirror://sourceforge/wiki2beamer/wiki2beamer-0.9.5.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1cca9c94918c58d95a03033cb015d049
diff --git a/metadata/md5-cache/app-text/wscr-1.2-r1 b/metadata/md5-cache/app-text/wscr-1.2-r1
deleted file mode 100644
index b0a557963c05..000000000000
--- a/metadata/md5-cache/app-text/wscr-1.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A Lightweight and Fast Anagram Solver
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ~mips ppc x86
-LICENSE=public-domain
-RDEPEND=sys-apps/miscfiles
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/wscr-1.2.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9fd1f381c6931aeae4ce6e2c4cabe49b
diff --git a/metadata/md5-cache/app-text/wscr-1.2-r2 b/metadata/md5-cache/app-text/wscr-1.2-r2
index 5babb2fbd4b6..28eb0d25cabc 100644
--- a/metadata/md5-cache/app-text/wscr-1.2-r2
+++ b/metadata/md5-cache/app-text/wscr-1.2-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A Lightweight and Fast Anagram Solver
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ~mips ~ppc ~x86
+KEYWORDS=amd64 ~mips ppc x86
 LICENSE=public-domain
 RDEPEND=sys-apps/miscfiles
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/wscr-1.2.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e29124030c8be8b4ee9ff29bd3155f50
+_md5_=8e0ae3b997e00a602af57a0995dc658f
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.2.25 b/metadata/md5-cache/app-text/xapian-omega-1.2.25
deleted file mode 100644
index 6c54b51d4b10..000000000000
--- a/metadata/md5-cache/app-text/xapian-omega-1.2.25
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
-EAPI=5
-HOMEPAGE=https://xapian.org/
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.oligarchy.co.uk/xapian/1.2.25/xapian-omega-1.2.25.tar.xz
-_md5_=0b6ff7dcad5a51e8473ad159eeb0e647
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.17 b/metadata/md5-cache/app-text/xapian-omega-1.4.17
index f28491b215d5..4813e6435d60 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.17
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.17
@@ -3,9 +3,9 @@ DEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=7
 HOMEPAGE=https://xapian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.17/xapian-omega-1.4.17.tar.xz
-_md5_=a0e76b77e10c7ae2f6c2a2ccfac46301
+_md5_=15d1ce51de52420c8689e97ee0b1bb11
diff --git a/metadata/md5-cache/app-text/xdvik-22.87.03-r2 b/metadata/md5-cache/app-text/xdvik-22.87.03-r2
index 26efb73e7340..c08d323cb073 100644
--- a/metadata/md5-cache/app-text/xdvik-22.87.03-r2
+++ b/metadata/md5-cache/app-text/xdvik-22.87.03-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/freetype-2.9.1-r2:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt emacs? ( >=app-editors/emacs-23.1:* ) motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea virtual/latex-base !<app-text/texlive-2007
 SLOT=0
 SRC_URI=mirror://sourceforge/xdvi/xdvik-22.87.03.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ec983bd3317d8b846c820a082bf7014
diff --git a/metadata/md5-cache/app-text/xiphos-4.2.1 b/metadata/md5-cache/app-text/xiphos-4.2.1
index 98f7babe161c..dbb103179e42 100644
--- a/metadata/md5-cache/app-text/xiphos-4.2.1
+++ b/metadata/md5-cache/app-text/xiphos-4.2.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
 RDEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) >=app-text/sword-1.8.1 dev-libs/glib:2 dev-libs/icu gnome-extra/gtkhtml:4.0 >=net-libs/biblesync-1.2.0 net-libs/webkit-gtk:4 sys-libs/zlib[minizip] x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://github.com/crosswire/xiphos/releases/download/4.2.1/xiphos-4.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c147dbe10954de6d0cf676757c75b5d
diff --git a/metadata/md5-cache/app-text/xournalpp-1.0.17 b/metadata/md5-cache/app-text/xournalpp-1.0.17
deleted file mode 100644
index fa1beef6583a..000000000000
--- a/metadata/md5-cache/app-text/xournalpp-1.0.17
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-apps/lsb-release dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/poppler dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Handwriting notetaking software with PDF annotation support
-EAPI=7
-HOMEPAGE=https://github.com/xournalpp/xournalpp
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=app-text/poppler dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://github.com/xournalpp/xournalpp/archive/1.0.17.tar.gz -> xournalpp-1.0.17.tgz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3660028e4d53c96e1e87990cbb606a47
diff --git a/metadata/md5-cache/app-text/xournalpp-1.0.18 b/metadata/md5-cache/app-text/xournalpp-1.0.18
deleted file mode 100644
index 124a096def6c..000000000000
--- a/metadata/md5-cache/app-text/xournalpp-1.0.18
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-apps/lsb-release dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/poppler dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Handwriting notetaking software with PDF annotation support
-EAPI=7
-HOMEPAGE=https://github.com/xournalpp/xournalpp
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=app-text/poppler dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://github.com/xournalpp/xournalpp/archive/1.0.18.tar.gz -> xournalpp-1.0.18.tgz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd19dd23bfe187317c4238f535accd4d
diff --git a/metadata/md5-cache/app-text/xournalpp-1.0.18-r1 b/metadata/md5-cache/app-text/xournalpp-1.0.18-r1
new file mode 100644
index 000000000000..2d7e3b077aab
--- /dev/null
+++ b/metadata/md5-cache/app-text/xournalpp-1.0.18-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig sys-apps/lsb-release dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Handwriting notetaking software with PDF annotation support
+EAPI=7
+HOMEPAGE=https://github.com/xournalpp/xournalpp
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://github.com/xournalpp/xournalpp/archive/1.0.18.tar.gz -> xournalpp-1.0.18.tgz
+_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f7154613fe7739e99e9dcc908d22ece8
diff --git a/metadata/md5-cache/app-text/xournalpp-9999 b/metadata/md5-cache/app-text/xournalpp-9999
index e534e9d31d1d..7ceb82791b94 100644
--- a/metadata/md5-cache/app-text/xournalpp-9999
+++ b/metadata/md5-cache/app-text/xournalpp-9999
@@ -1,12 +1,12 @@
 BDEPEND=virtual/pkgconfig sys-apps/lsb-release dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-text/poppler dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Handwriting notetaking software with PDF annotation support
 EAPI=7
 HOMEPAGE=https://github.com/xournalpp/xournalpp
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=app-text/poppler dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3
+RDEPEND=app-text/poppler[cairo] dev-libs/glib dev-libs/libxml2 dev-libs/libzip:= media-libs/portaudio media-libs/libsndfile sys-libs/zlib:= x11-libs/gtk+:3
 SLOT=0
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd19dd23bfe187317c4238f535accd4d
+_md5_=f7154613fe7739e99e9dcc908d22ece8
diff --git a/metadata/md5-cache/app-text/xpdf-4.02-r4 b/metadata/md5-cache/app-text/xpdf-4.02-r4
index 91df4aa5f0c1..1d2da892161c 100644
--- a/metadata/md5-cache/app-text/xpdf-4.02-r4
+++ b/metadata/md5-cache/app-text/xpdf-4.02-r4
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-3 i18n? ( BSD )
 RDEPEND=cups? ( dev-qt/qtprintsupport:5[cups] net-print/cups ) fontconfig? ( media-libs/fontconfig ) libpaper? ( app-text/libpaper ) utils? ( png? ( media-libs/libpng:0 ) ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/freetype sys-libs/zlib dev-qt/qtsvg:5 media-fonts/urw-fonts
 SLOT=0
 SRC_URI=https://xpdfreader-dl.s3.amazonaws.com/xpdf-4.02.tar.gz i18n? ( https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a5164559639f93a68f2346b47cafab5
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 2e30f78f24aa..3450af93cdf4 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/c-support-6.0 b/metadata/md5-cache/app-vim/c-support-6.0
deleted file mode 100644
index 6d41e519d810..000000000000
--- a/metadata/md5-cache/app-vim/c-support-6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=213
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/c-support-6.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/c-support-6.0.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=2ffc4054c1c16e498b5bdddbc71db621
diff --git a/metadata/md5-cache/app-vim/c-support-6.1 b/metadata/md5-cache/app-vim/c-support-6.1
deleted file mode 100644
index e3f5d56b2846..000000000000
--- a/metadata/md5-cache/app-vim/c-support-6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=213
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/c-support-6.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/c-support-6.1.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=b72bc9b7958aead73bfe2c5fb2008b9d
diff --git a/metadata/md5-cache/app-vim/jedi-0.10.0 b/metadata/md5-cache/app-vim/jedi-0.10.0
index 45140f399c57..edad3586e8d8 100644
--- a/metadata/md5-cache/app-vim/jedi-0.10.0
+++ b/metadata/md5-cache/app-vim/jedi-0.10.0
@@ -5,7 +5,7 @@ DESCRIPTION=vim plugin: binding to the autocompletion library jedi
 EAPI=7
 HOMEPAGE=https://github.com/davidhalter/jedi-vim
 IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/jedi[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/jedi[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/jedi[python_targets_python3_8(-)] ) app-editors/vim[python] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi-vim/archive/0.10.0.tar.gz -> jedi-0.10.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=16acc9b080960f4a1f23af3cb99c8d87
+_md5_=702e0acd9fe7ca2e1dbf53a2f18ed8db
diff --git a/metadata/md5-cache/app-vim/rails-5.1 b/metadata/md5-cache/app-vim/rails-5.1
deleted file mode 100644
index 75c3a980e999..000000000000
--- a/metadata/md5-cache/app-vim/rails-5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: aids developing Ruby on Rails applications
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-rails/archive/v5.1.tar.gz -> rails-5.1.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=72ed0972470e3fb540cc27a7d384993c
diff --git a/metadata/md5-cache/app-vim/sleuth-1.0 b/metadata/md5-cache/app-vim/sleuth-1.0
deleted file mode 100644
index 1c4a24b538e8..000000000000
--- a/metadata/md5-cache/app-vim/sleuth-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: heuristically set buffer options
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/sleuth-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sleuth-1.0.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=58b84c785968427d828580d2fda8474e
diff --git a/metadata/md5-cache/app-vim/vim-r-1.0 b/metadata/md5-cache/app-vim/vim-r-1.0
deleted file mode 100644
index 37dfe9011395..000000000000
--- a/metadata/md5-cache/app-vim/vim-r-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: integrate vim with R
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2628
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=dev-lang/R || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/vim-r-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-r-1.0.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=6f7b65ff63081140af9eeeb5b693d25e
diff --git a/metadata/md5-cache/app-vim/vim-rest-console-2.3.0 b/metadata/md5-cache/app-vim/vim-rest-console-2.3.0
deleted file mode 100644
index 30a2c169d883..000000000000
--- a/metadata/md5-cache/app-vim/vim-rest-console-2.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a REST console for vim
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.3.0.tar.gz -> vim-rest-console-2.3.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=8d43314f05b15b642291f70a1d4346c9
diff --git a/metadata/md5-cache/app-vim/vim-rest-console-2.4.0 b/metadata/md5-cache/app-vim/vim-rest-console-2.4.0
deleted file mode 100644
index 6efe81d07b54..000000000000
--- a/metadata/md5-cache/app-vim/vim-rest-console-2.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=a REST console for vim
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.4.0.tar.gz -> vim-rest-console-2.4.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=883989ce748dbdd24d8f85c261b9ce69
diff --git a/metadata/md5-cache/app-vim/vim-rest-console-2.5.0 b/metadata/md5-cache/app-vim/vim-rest-console-2.5.0
deleted file mode 100644
index f5b522700881..000000000000
--- a/metadata/md5-cache/app-vim/vim-rest-console-2.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=a REST console for vim
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.5.0.tar.gz -> vim-rest-console-2.5.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=883989ce748dbdd24d8f85c261b9ce69
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 5344d2c5e97d..89646b1ebe02 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/abseil-cpp-20200225.2 b/metadata/md5-cache/dev-cpp/abseil-cpp-20200225.2
index e806d5e73569..a2d9752ec6b0 100644
--- a/metadata/md5-cache/dev-cpp/abseil-cpp-20200225.2
+++ b/metadata/md5-cache/dev-cpp/abseil-cpp-20200225.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/abseil/abseil-cpp/archive/20200225.2.tar.gz -> abseil-cpp-20200225.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2298cef5567992e51ccc03f23c03f65
diff --git a/metadata/md5-cache/dev-cpp/abseil-cpp-20200923 b/metadata/md5-cache/dev-cpp/abseil-cpp-20200923
new file mode 100644
index 000000000000..81ce001c1fa5
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/abseil-cpp-20200923
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( sys-libs/timezone-data ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Abseil Common Libraries (C++), LTS Branch
+EAPI=7
+HOMEPAGE=https://abseil.io
+IUSE=test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Apache-2.0 test? ( BSD )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/abseil/abseil-cpp/archive/20200923.tar.gz -> abseil-cpp-20200923.tar.gz https://github.com/google/googletest/archive/aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.tar.gz -> gtest-1.10.0_p20200702.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=440cd689ce40aebfe8ca591fc80e090d
diff --git a/metadata/md5-cache/dev-cpp/aixlog-1.2.1 b/metadata/md5-cache/dev-cpp/aixlog-1.2.1
deleted file mode 100644
index 9b140ec14885..000000000000
--- a/metadata/md5-cache/dev-cpp/aixlog-1.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Header-only C++ logging library
-EAPI=6
-HOMEPAGE=https://github.com/badaix/aixlog
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/badaix/aixlog/archive/v1.2.1.tar.gz -> aixlog-1.2.1.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5573bf316752db2312901624452734cd
diff --git a/metadata/md5-cache/dev-cpp/aixlog-1.4.0 b/metadata/md5-cache/dev-cpp/aixlog-1.4.0
new file mode 100644
index 000000000000..06125b23bf70
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/aixlog-1.4.0
@@ -0,0 +1,11 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Header-only C++ logging library
+EAPI=7
+HOMEPAGE=https://github.com/badaix/aixlog
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/badaix/aixlog/archive/v1.4.0.tar.gz -> aixlog-1.4.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=824a030df81dd9319ac12c5875cb3dc7
diff --git a/metadata/md5-cache/dev-cpp/aixlog-9999 b/metadata/md5-cache/dev-cpp/aixlog-9999
index 58277fe5a1c6..1fe7c4d4666a 100644
--- a/metadata/md5-cache/dev-cpp/aixlog-9999
+++ b/metadata/md5-cache/dev-cpp/aixlog-9999
@@ -1,10 +1,10 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Header-only C++ logging library
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/badaix/aixlog
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5573bf316752db2312901624452734cd
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=824a030df81dd9319ac12c5875cb3dc7
diff --git a/metadata/md5-cache/dev-cpp/benchmark-1.5.1 b/metadata/md5-cache/dev-cpp/benchmark-1.5.1
index ebcc74c9007d..5cc4c7be9bd1 100644
--- a/metadata/md5-cache/dev-cpp/benchmark-1.5.1
+++ b/metadata/md5-cache/dev-cpp/benchmark-1.5.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/benchmark/archive/v1.5.1.tar.gz -> benchmark-1.5.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44ec419a7dae97636157b630067a5a5c
diff --git a/metadata/md5-cache/dev-cpp/benchmark-1.5.2 b/metadata/md5-cache/dev-cpp/benchmark-1.5.2
index 693fcd94529b..1ec49c5dca75 100644
--- a/metadata/md5-cache/dev-cpp/benchmark-1.5.2
+++ b/metadata/md5-cache/dev-cpp/benchmark-1.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=A microbenchmark support library
 EAPI=7
 HOMEPAGE=https://github.com/google/benchmark
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/benchmark/archive/v1.5.2.tar.gz -> benchmark-1.5.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44ec419a7dae97636157b630067a5a5c
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bc0054669f3145b1e850fc1546ad10b1
diff --git a/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0 b/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0
index 56caff7b37ac..530c41754618 100644
--- a/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0
+++ b/metadata/md5-cache/dev-cpp/cpp-hocon-0.3.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/boost-1.54:=[nls] >=dev-libs/leatherman-0.9.3:=
 SLOT=0/0.3.0
 SRC_URI=https://github.com/puppetlabs/cpp-hocon/archive/0.3.0.tar.gz -> cpp-hocon-0.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=09c9db1f99a46602211e120bfdc04d0e
diff --git a/metadata/md5-cache/dev-cpp/ctemplate-2.4 b/metadata/md5-cache/dev-cpp/ctemplate-2.4
index 55ce3d380920..64174355df57 100644
--- a/metadata/md5-cache/dev-cpp/ctemplate-2.4
+++ b/metadata/md5-cache/dev-cpp/ctemplate-2.4
@@ -11,5 +11,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( >=app-editors/vim-co
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OlafvdSpek/ctemplate/archive/ctemplate-2.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=dcfa095cebcd10853cca9b146a0537cc
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1 b/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
index 23246fe79b8a..50668c103683 100644
--- a/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.7-r1
@@ -10,5 +10,5 @@ LICENSE=MPL-2.0
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.bz2 -> eigen-3.3.7-gitlab.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a7392d436712a302a45daf7f1fc9cad
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.2.0 b/metadata/md5-cache/dev-cpp/gflags-2.2.0
deleted file mode 100644
index 1a37b5d283b0..000000000000
--- a/metadata/md5-cache/dev-cpp/gflags-2.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Google's C++ argument parsing library
-EAPI=6
-HOMEPAGE=http://gflags.github.io/gflags/
-IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RESTRICT=!test? ( test )
-SLOT=0/2.2
-SRC_URI=https://github.com/gflags/gflags/archive/v2.2.0.tar.gz -> gflags-2.2.0.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07cd907126aba6d997b5d21c19e62b07
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.2.1 b/metadata/md5-cache/dev-cpp/gflags-2.2.1
deleted file mode 100644
index e1744b30db97..000000000000
--- a/metadata/md5-cache/dev-cpp/gflags-2.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Google's C++ argument parsing library
-EAPI=6
-HOMEPAGE=http://gflags.github.io/gflags/
-IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RESTRICT=!test? ( test )
-SLOT=0/2.2
-SRC_URI=https://github.com/gflags/gflags/archive/v2.2.1.tar.gz -> gflags-2.2.1.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69ff2d5b19580da92fd7bb8515785c60
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.10.0_p20200702 b/metadata/md5-cache/dev-cpp/gtest-1.10.0_p20200702
index f4aed8a973fc..2ff7ef3b3f94 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.10.0_p20200702
+++ b/metadata/md5-cache/dev-cpp/gtest-1.10.0_p20200702
@@ -9,5 +9,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.tar.gz -> gtest-1.10.0_p20200702.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af4d9d4fffa20b3e02be34b396882176
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607 b/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607
index ac99fdd68063..5ec2066fd491 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607
+++ b/metadata/md5-cache/dev-cpp/gtest-1.9.0_pre20190607
@@ -11,5 +11,5 @@ RDEPEND=!dev-cpp/gmock
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/googletest/archive/da10da05c262af0a9e8fa91789a272a3dec67655.tar.gz -> gtest-1.9.0_pre20190607.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e724e302cbfad940175a175c752376e
diff --git a/metadata/md5-cache/dev-cpp/gtest-9999 b/metadata/md5-cache/dev-cpp/gtest-9999
index 7e205f38e90d..9f862a880e6f 100644
--- a/metadata/md5-cache/dev-cpp/gtest-9999
+++ b/metadata/md5-cache/dev-cpp/gtest-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a42468c3ae0df5f0ba1b56dc9034004d
diff --git a/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.3.0 b/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.3.0
index c61209665d22..7579f90773db 100644
--- a/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.3.0
+++ b/metadata/md5-cache/dev-cpp/libjson-rpc-cpp-1.3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/jsoncpp:= http-client? ( net-misc/curl:= ) http-server? ( net-l
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/cinemast/libjson-rpc-cpp/archive/v1.3.0.tar.gz -> libjson-rpc-cpp-1.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dee068b7b600744b3baabb10fd85712f
diff --git a/metadata/md5-cache/dev-cpp/lucene++-3.0.7-r2 b/metadata/md5-cache/dev-cpp/lucene++-3.0.7-r2
index ca42d8a9bdda..3fe8dae254ec 100644
--- a/metadata/md5-cache/dev-cpp/lucene++-3.0.7-r2
+++ b/metadata/md5-cache/dev-cpp/lucene++-3.0.7-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_3.0.7.tar.gz -> lucene++-3.0.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a653facfb34b84ca928452b7fbf98d65
diff --git a/metadata/md5-cache/dev-cpp/ms-gsl-3.1.0 b/metadata/md5-cache/dev-cpp/ms-gsl-3.1.0
index 4c53fbe10574..014ccf6ce651 100644
--- a/metadata/md5-cache/dev-cpp/ms-gsl-3.1.0
+++ b/metadata/md5-cache/dev-cpp/ms-gsl-3.1.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Microsoft/GSL/archive/v3.1.0.tar.gz -> ms-gsl-3.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6c0c66fc86a30644f243b30de9f71dd
diff --git a/metadata/md5-cache/dev-cpp/ms-gsl-9999 b/metadata/md5-cache/dev-cpp/ms-gsl-9999
index af2ad31c68d3..bfbf7754b275 100644
--- a/metadata/md5-cache/dev-cpp/ms-gsl-9999
+++ b/metadata/md5-cache/dev-cpp/ms-gsl-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64929e9daf597d89b2904da6fefe1d37
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.2.5 b/metadata/md5-cache/dev-cpp/muParser-2.2.5
deleted file mode 100644
index 8e5d0adae88e..000000000000
--- a/metadata/md5-cache/dev-cpp/muParser-2.2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DESCRIPTION=Library for parsing mathematical expressions
-EAPI=5
-HOMEPAGE=http://muparser.beltoforion.de/
-IUSE=doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/beltoforion/muparser/archive/v2.2.5.tar.gz -> muParser-2.2.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d34066c645c661bd4c1bc433d7779775
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1
index a84a95c43aa5..ed5f064818e8 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.6.1.tar.gz -> nlohmann_json-3.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7c0b8bcc56a7939802138416fcdf412
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.0 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.0
index a2ff48007227..9c8c303bdd0c 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.0
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.7.0.tar.gz -> nlohmann_json-3.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=17067ecb8b9bc1590c7559f9c9287893
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3
index 1ef5b67b0728..0595943ebded 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.7.3.tar.gz -> nlohmann_json-3.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c92b9a43c61ff45fd47f0eb467ba17b
diff --git a/metadata/md5-cache/dev-cpp/popl-1.2.0 b/metadata/md5-cache/dev-cpp/popl-1.2.0
index baedf28f0b3f..2d89c8cb8cf6 100644
--- a/metadata/md5-cache/dev-cpp/popl-1.2.0
+++ b/metadata/md5-cache/dev-cpp/popl-1.2.0
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Header-only C++ program options parser library
 EAPI=7
 HOMEPAGE=https://github.com/badaix/popl
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/badaix/popl/archive/v1.2.0.tar.gz -> popl-1.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=84bcd314ccb951ce1d7a5b5082377d6f
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=16fffa44910f1e9711c2213d8023db92
diff --git a/metadata/md5-cache/dev-cpp/popl-9999 b/metadata/md5-cache/dev-cpp/popl-9999
index a767435f8bc8..7ccf92dbf1de 100644
--- a/metadata/md5-cache/dev-cpp/popl-9999
+++ b/metadata/md5-cache/dev-cpp/popl-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/badaix/popl
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76fe1f20e141c55cf3992e293604903b
diff --git a/metadata/md5-cache/dev-cpp/prometheus-cpp-0.9.0 b/metadata/md5-cache/dev-cpp/prometheus-cpp-0.9.0
index 51cf0b0486b5..2f1e5e944963 100644
--- a/metadata/md5-cache/dev-cpp/prometheus-cpp-0.9.0
+++ b/metadata/md5-cache/dev-cpp/prometheus-cpp-0.9.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/cppcodec net-misc/curl sys-libs/zlib www-servers/civetweb[cxx]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupp0r/prometheus-cpp/archive/v0.9.0.tar.gz -> prometheus-cpp-0.9.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a87abee248d1ea2d414af2fa12fc5db1
diff --git a/metadata/md5-cache/dev-cpp/pstreams-0.7.0 b/metadata/md5-cache/dev-cpp/pstreams-0.7.0
deleted file mode 100644
index 2fb4aa3e52a6..000000000000
--- a/metadata/md5-cache/dev-cpp/pstreams-0.7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=C++ wrapper for the POSIX.2 functions popen(3) and pclose(3)
-EAPI=5
-HOMEPAGE=http://pstreams.sourceforge.net/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/pstreams/pstreams-0.7.0.tar.gz doc? ( mirror://sourceforge/pstreams/pstreams-docs-0.7.0.tar.gz )
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5dff9a0b8eb02767b00beb6e26cd496a
diff --git a/metadata/md5-cache/dev-cpp/pstreams-0.8.1 b/metadata/md5-cache/dev-cpp/pstreams-0.8.1
deleted file mode 100644
index a65d2d0e733c..000000000000
--- a/metadata/md5-cache/dev-cpp/pstreams-0.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=C++ wrapper for the POSIX.2 functions popen(3) and pclose(3)
-EAPI=5
-HOMEPAGE=http://pstreams.sourceforge.net/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/pstreams/pstreams-0.8.1.tar.gz doc? ( mirror://sourceforge/pstreams/pstreams-docs-0.8.1.tar.gz )
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1f1576ce956bf18ddd64e0f3a8d7f2d8
diff --git a/metadata/md5-cache/dev-cpp/pstreams-1.0.0 b/metadata/md5-cache/dev-cpp/pstreams-1.0.0
deleted file mode 100644
index 47b7b6b71f17..000000000000
--- a/metadata/md5-cache/dev-cpp/pstreams-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=C++ wrapper for the POSIX.2 functions popen(3) and pclose(3)
-EAPI=5
-HOMEPAGE=http://pstreams.sourceforge.net/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/pstreams/pstreams-1.0.0.tar.gz doc? ( mirror://sourceforge/pstreams/pstreams-docs-1.0.0.tar.gz )
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0bcb95a4a42e755eb77250bd1498a532
diff --git a/metadata/md5-cache/dev-cpp/range-v3-0.10.0-r1 b/metadata/md5-cache/dev-cpp/range-v3-0.10.0-r1
index 3fc29ec062cb..263a4762167d 100644
--- a/metadata/md5-cache/dev-cpp/range-v3-0.10.0-r1
+++ b/metadata/md5-cache/dev-cpp/range-v3-0.10.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~ppc64
 LICENSE=Boost-1.0
 SLOT=0
 SRC_URI=https://github.com/ericniebler/range-v3/archive/0.10.0.tar.gz -> range-v3-0.10.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf628a2b3e7275842b9abe63f878a8b0
diff --git a/metadata/md5-cache/dev-cpp/rttr-0.9.6 b/metadata/md5-cache/dev-cpp/rttr-0.9.6
index 33540023c169..0a4d57ec5f8f 100644
--- a/metadata/md5-cache/dev-cpp/rttr-0.9.6
+++ b/metadata/md5-cache/dev-cpp/rttr-0.9.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rttrorg/rttr/releases/download/v0.9.6/rttr-0.9.6-src.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4119b1de0e478a44f7981723c96466c4
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.2.4 b/metadata/md5-cache/dev-cpp/waylandpp-0.2.4
index 43475447d6a8..ccbe73c8980a 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-0.2.4
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.2.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.4
 SLOT=0/0.2
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.2.4.tar.gz -> waylandpp-0.2.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=341b4dd65ef22ffd9ea7b39231fdb4c8
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.2.5 b/metadata/md5-cache/dev-cpp/waylandpp-0.2.5
index 88dd1e9ee234..c51eb468d31b 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-0.2.5
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.2.5
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1
 SLOT=0/0.2
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.2.5.tar.gz -> waylandpp-0.2.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35de2b3f75525978287298d91587c8f3
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.2.6 b/metadata/md5-cache/dev-cpp/waylandpp-0.2.6
index 30ce0209df82..bc3baaed0819 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-0.2.6
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.2.6
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1
 SLOT=0/0.2
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.2.6.tar.gz -> waylandpp-0.2.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35de2b3f75525978287298d91587c8f3
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.2.7 b/metadata/md5-cache/dev-cpp/waylandpp-0.2.7
index a14083d0fb36..3494a249cbe0 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-0.2.7
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.2.7
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1
 SLOT=0/0.2
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.2.7.tar.gz -> waylandpp-0.2.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=45d01a4335a48654ab2cb9718bde94d7
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-0.2.8 b/metadata/md5-cache/dev-cpp/waylandpp-0.2.8
index 022f1e70c251..1599335dd4c9 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-0.2.8
+++ b/metadata/md5-cache/dev-cpp/waylandpp-0.2.8
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1
 SLOT=0/0.2
 SRC_URI=https://github.com/NilsBrause/waylandpp/archive/0.2.8.tar.gz -> waylandpp-0.2.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70625b85f94fcc32ccab962011973a2d
diff --git a/metadata/md5-cache/dev-cpp/waylandpp-9999 b/metadata/md5-cache/dev-cpp/waylandpp-9999
index 704597691bf6..03ef23d92321 100644
--- a/metadata/md5-cache/dev-cpp/waylandpp-9999
+++ b/metadata/md5-cache/dev-cpp/waylandpp-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] >=dev-libs/pugixml-1.9-r1
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35de2b3f75525978287298d91587c8f3
diff --git a/metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1 b/metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1
index 2a5de06c98f4..0c99f597efdc 100644
--- a/metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1
+++ b/metadata/md5-cache/dev-cpp/websocketpp-0.8.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zaphoyd/websocketpp/archive/0.8.1.tar.gz -> websocketpp-0.8.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f573a2c5969bb5d0c0fd8f52cc5a78a
diff --git a/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r3 b/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r3
index 6f4fa6f6bb5a..d632fbb1a86d 100644
--- a/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r3
+++ b/metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0/0.6
 SRC_URI=https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cd205434b05b195d7b2d22c3decfd82
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 0ce7d35782e3..26bf87aa58f6 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/aerospike-server-community-3.13.0.9 b/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.9
deleted file mode 100644
index 41b3c09a20d1..000000000000
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
-DESCRIPTION=Flash-optimized, in-memory, nosql database
-EAPI=5
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
-SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.13.0.9/aerospike-server-community-3.13.0.9-debian7.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b88c6b6e22054f85335fc8c827f25fc
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.8 b/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.8
deleted file mode 100644
index dfe014a90d49..000000000000
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
-DESCRIPTION=Flash-optimized, in-memory, nosql database
-EAPI=5
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
-SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.14.1.8/aerospike-server-community-3.14.1.8-debian7.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b88c6b6e22054f85335fc8c827f25fc
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.15.1.4 b/metadata/md5-cache/dev-db/aerospike-server-community-3.15.1.4
deleted file mode 100644
index ac783cbe3aa1..000000000000
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.15.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
-DESCRIPTION=Flash-optimized, in-memory, nosql database
-EAPI=5
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
-SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.15.1.4/aerospike-server-community-3.15.1.4-debian7.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0770fb13f48a1876b77e917e9b69a31b
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.16.0.6 b/metadata/md5-cache/dev-db/aerospike-server-community-3.16.0.6
deleted file mode 100644
index 6a1a2a33b26e..000000000000
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.16.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
-DESCRIPTION=Flash-optimized, in-memory, nosql database
-EAPI=5
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
-SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.16.0.6/aerospike-server-community-3.16.0.6-debian7.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=566b2918ad5230bea201b3aa0249171b
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.1 b/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.1
deleted file mode 100644
index 51fd69bdafb5..000000000000
--- a/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
-DESCRIPTION=Flash-optimized, in-memory, nosql database
-EAPI=5
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
-SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/4.0.0.1/aerospike-server-community-4.0.0.1-debian7.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=46b431657340c3c7afeecc2d61fad1cf
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.4 b/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.4
deleted file mode 100644
index 1fcf10749c67..000000000000
--- a/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
-DESCRIPTION=Flash-optimized, in-memory, nosql database
-EAPI=5
-HOMEPAGE=http://www.aerospike.com
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
-SLOT=0
-SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/4.0.0.4/aerospike-server-community-4.0.0.4-debian7.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=46b431657340c3c7afeecc2d61fad1cf
diff --git a/metadata/md5-cache/dev-db/apgdiff-1.4 b/metadata/md5-cache/dev-db/apgdiff-1.4
deleted file mode 100644
index cd03c9206ed8..000000000000
--- a/metadata/md5-cache/dev-db/apgdiff-1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.7.0:0 >=dev-java/ant-junit-1.7.0:0 app-arch/zip:0 test? ( dev-java/hamcrest-core:0 >=dev-java/junit-4.4:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A simple PostgreSQL diff tool that is useful for schema upgrades
-EAPI=5
-HOMEPAGE=https://www.apgdiff.com/
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/apgdiff/apgdiff-1.4-src.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0f299a3e141180c6b38c47a584f5cdd9
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.2.1 b/metadata/md5-cache/dev-db/apgdiff-2.2.1
deleted file mode 100644
index 1e227111961b..000000000000
--- a/metadata/md5-cache/dev-db/apgdiff-2.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/ant-core-1.7.0:0 >=dev-java/ant-junit-1.7.0:0 app-arch/zip:0 test? ( dev-java/hamcrest-core:1.3 >=dev-java/junit-4.4:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A simple PostgreSQL diff tool that is useful for schema upgrades
-EAPI=5
-HOMEPAGE=https://apgdiff.com
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://apgdiff.com/download/apgdiff-2.2.1-src.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=72c383657306d39431a39c7073af1661
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.2.2 b/metadata/md5-cache/dev-db/apgdiff-2.2.2
deleted file mode 100644
index 19cbb6971f77..000000000000
--- a/metadata/md5-cache/dev-db/apgdiff-2.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/ant-core-1.7.0:0 >=dev-java/ant-junit-1.7.0:0 app-arch/zip:0 test? ( dev-java/hamcrest-core:0 >=dev-java/junit-4.4:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A simple PostgreSQL diff tool that is useful for schema upgrades
-EAPI=5
-HOMEPAGE=https://apgdiff.com
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://apgdiff.com/download/apgdiff-2.2.2-src.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=85caa393b21c1987b40f465f39c0e27c
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.3 b/metadata/md5-cache/dev-db/apgdiff-2.3
deleted file mode 100644
index c6719435f76b..000000000000
--- a/metadata/md5-cache/dev-db/apgdiff-2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/ant-core-1.7.0:0 >=dev-java/ant-junit-1.7.0:0 app-arch/zip:0 test? ( dev-java/hamcrest-core:0 >=dev-java/junit-4.4:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A simple PostgreSQL diff tool that is useful for schema upgrades
-EAPI=5
-HOMEPAGE=https://apgdiff.com
-IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://apgdiff.com/download/apgdiff-2.3-src.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=85caa393b21c1987b40f465f39c0e27c
diff --git a/metadata/md5-cache/dev-db/cpp-driver-2.11.0 b/metadata/md5-cache/dev-db/cpp-driver-2.11.0
index f6913a208510..e17e15bae8ff 100644
--- a/metadata/md5-cache/dev-db/cpp-driver-2.11.0
+++ b/metadata/md5-cache/dev-db/cpp-driver-2.11.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/libuv:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/datastax/cpp-driver/archive/2.11.0.tar.gz -> cpp-driver-2.11.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e35d7168c0e2e600a033e8439084823
diff --git a/metadata/md5-cache/dev-db/go-etcd-0_p20141013-r1 b/metadata/md5-cache/dev-db/go-etcd-0_p20141013-r1
deleted file mode 100644
index f6d89b0f67f5..000000000000
--- a/metadata/md5-cache/dev-db/go-etcd-0_p20141013-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.4
-DESCRIPTION=Go client library for etcd
-EAPI=5
-HOMEPAGE=https://github.com/coreos/go-etcd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/coreos/go-etcd/archive/25e2c63be8e8ab405014a78879e0992ae5ff55e8.tar.gz -> go-etcd-0_p20141013.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=03d76c05b23f94879589dbc2f111a2ab
diff --git a/metadata/md5-cache/dev-db/go-etcd-2.0.0 b/metadata/md5-cache/dev-db/go-etcd-2.0.0
deleted file mode 100644
index 073ccacb9c9e..000000000000
--- a/metadata/md5-cache/dev-db/go-etcd-2.0.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.4
-DESCRIPTION=Go client library for etcd
-EAPI=5
-HOMEPAGE=https://github.com/coreos/go-etcd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/coreos/go-etcd/archive/25e2c63be8e8ab405014a78879e0992ae5ff55e8.tar.gz -> go-etcd-2.0.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e9dd4cffe96edaaaf7765ef937fb3677
diff --git a/metadata/md5-cache/dev-db/kdb-3.2.0 b/metadata/md5-cache/dev-db/kdb-3.2.0
index b71fce425145..2e5490de0ecf 100644
--- a/metadata/md5-cache/dev-db/kdb-3.2.0
+++ b/metadata/md5-cache/dev-db/kdb-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/icu:= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev
 RESTRICT=!test? ( test )
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kdb/src/kdb-3.2.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b90e0395310a5081f7f41bbab5f07c60
diff --git a/metadata/md5-cache/dev-db/libdbi-0.9.0 b/metadata/md5-cache/dev-db/libdbi-0.9.0
index e0728cd0a128..556eabc3d39a 100644
--- a/metadata/md5-cache/dev-db/libdbi-0.9.0
+++ b/metadata/md5-cache/dev-db/libdbi-0.9.0
@@ -1,7 +1,8 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=sys-apps/sed-4 virtual/pkgconfig doc? ( app-text/openjade ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-apps/sed-4 virtual/pkgconfig doc? ( app-text/openjade )
 DESCRIPTION=A database-independent abstraction layer in C
-EAPI=4
+EAPI=7
 HOMEPAGE=http://libdbi.sourceforge.net/
 IUSE=doc static-libs
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
@@ -9,5 +10,5 @@ LICENSE=LGPL-2.1
 PDEPEND=>=dev-db/libdbi-drivers-0.9.0
 SLOT=0
 SRC_URI=mirror://sourceforge/libdbi/libdbi-0.9.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8347ae64f54e7414f64a645a9086e5a2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0841b006fd8790e17a3be5256c63faf4
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.46 b/metadata/md5-cache/dev-db/mariadb-10.1.46
index 1ed91a50a99f..9573247d4574 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.46
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.46
@@ -13,5 +13,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.1/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.46/source/mariadb-10.1.46.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.1.46-patches-01.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=880dc34953cc262047031d1c6729e388
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.33 b/metadata/md5-cache/dev-db/mariadb-10.2.33
index 96d4e552553c..3e0367ed2f67 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.33
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.33
@@ -13,5 +13,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.2/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.33/source/mariadb-10.2.33.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.2.33-patches-01.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0166b359944a4f0181a215fcff12a70d
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.24 b/metadata/md5-cache/dev-db/mariadb-10.3.24
index df27bc003c5d..633cb8ae543e 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.24
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.24
@@ -13,5 +13,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.3/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.24/source/mariadb-10.3.24.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.3.24-patches-01.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d612acf4cedbed602c5eb5fa290afd4
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.13-r2 b/metadata/md5-cache/dev-db/mariadb-10.4.13-r2
index 748b48253dce..12e3b7ea2d6c 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.13-r2
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.13-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.4/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.13/source/mariadb-10.4.13.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.4.13-patches-03.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e64ae67abb26076f9bf58dd5b41fe28
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.14 b/metadata/md5-cache/dev-db/mariadb-10.4.14
index 5b700c6f6a53..0a64c3e939bb 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.14
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.14
@@ -13,5 +13,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.4/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.14/source/mariadb-10.4.14.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.4.14-patches-01.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bc15b13d95c38a0e4125918b3c7f7cd
diff --git a/metadata/md5-cache/dev-db/mariadb-10.5.5 b/metadata/md5-cache/dev-db/mariadb-10.5.5
index bee440906562..1c881789b1d8 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.5.5
+++ b/metadata/md5-cache/dev-db/mariadb-10.5.5
@@ -13,5 +13,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) stati
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=10.5/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.5.5/source/mariadb-10.5.5.tar.gz https://dev.gentoo.org/~whissi/dist/mariadb/mariadb-10.5.5-patches-02.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=384d63fe513bf5541399033948f2b8bf
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.6 b/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.6
index 150012de0af8..d8aab4478e4d 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.6
+++ b/metadata/md5-cache/dev-db/mariadb-connector-odbc-3.1.6
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND==dev-db/mariadb-connector-c-3.1* dev-db/unixODBC
 SLOT=0/3.1
 SRC_URI=https://downloads.mariadb.org/interstitial/connector-odbc-3.1.6/mariadb-connector-odbc-3.1.6-ga-src.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b32b121f3ef930d21b55b89544ee127a
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.16-r1 b/metadata/md5-cache/dev-db/mongodb-4.0.16-r1
deleted file mode 100644
index aa6f314d6abc..000000000000
--- a/metadata/md5-cache/dev-db/mongodb-4.0.16-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-util/scons-2.5.0[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 test? ( dev-python/pymongo[python_targets_python2_7(-),python_single_target_python2_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/typing[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=7
-HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos libressl lto mms-agent ssl test +tools
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 SSPL-1
-PDEPEND=tools? ( >=app-admin/mongo-tools-4.0.16 )
-RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.16.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c19a1f7d741472dfa48ac36100315ce3
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.19 b/metadata/md5-cache/dev-db/mongodb-4.0.19
index 367f9360a59f..f4f4864d3a58 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.0.19
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.19
@@ -5,7 +5,7 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=debug kerberos libressl lto mms-agent ssl test +tools
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-4.0.19 )
 RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.19.tar.gz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c19a1f7d741472dfa48ac36100315ce3
+_md5_=35a08be85d4ee7161749742f16cc6445
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.3-r1 b/metadata/md5-cache/dev-db/mongodb-4.2.3-r1
deleted file mode 100644
index 47ecabfb2de2..000000000000
--- a/metadata/md5-cache/dev-db/mongodb-4.2.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.7 >=dev-util/scons-2.5.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-util/scons-2.5.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+)] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( ( dev-lang/python:3.7 test? ( dev-python/pymongo[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/requests[python_targets_python3_7(-),python_single_target_python3_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/cheetah3[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/psutil[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pyyaml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 test? ( dev-python/pymongo[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/requests[python_targets_python3_6(-),python_single_target_python3_6(+)] ) >=dev-util/scons-2.5.0[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/cheetah3[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/psutil[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pyyaml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=7
-HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos libressl lto ssl test +tools
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0 SSPL-1
-PDEPEND=tools? ( >=app-admin/mongo-tools-4.2.3 )
-RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+)] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.3.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d71e02fc082ca7fe729b9c03b18abfe5
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.6 b/metadata/md5-cache/dev-db/mongodb-4.2.6
deleted file mode 100644
index 997c4249be79..000000000000
--- a/metadata/md5-cache/dev-db/mongodb-4.2.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( ( dev-lang/python:3.7 >=dev-util/scons-2.5.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-util/scons-2.5.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+)] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( ( dev-lang/python:3.7 test? ( dev-python/pymongo[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/requests[python_targets_python3_7(-),python_single_target_python3_7(+)] ) >=dev-util/scons-2.5.0[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/cheetah3[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/psutil[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pyyaml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 test? ( dev-python/pymongo[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/requests[python_targets_python3_6(-),python_single_target_python3_6(+)] ) >=dev-util/scons-2.5.0[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/cheetah3[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/psutil[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pyyaml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind )
-DESCRIPTION=A high-performance, open source, schema-free document-oriented database
-EAPI=7
-HOMEPAGE=https://www.mongodb.com
-IUSE=debug kerberos libressl lto ssl test +tools
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0 SSPL-1
-PDEPEND=tools? ( >=app-admin/mongo-tools-4.2.6 )
-RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+)] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.6.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d71e02fc082ca7fe729b9c03b18abfe5
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.8 b/metadata/md5-cache/dev-db/mongodb-4.2.8
index 6b0815d2676e..e7bdfa315b82 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.2.8
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.8
@@ -5,7 +5,7 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=7
 HOMEPAGE=https://www.mongodb.com
 IUSE=debug kerberos libressl lto ssl test +tools
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0 SSPL-1
 PDEPEND=tools? ( >=app-admin/mongo-tools-4.2.8 )
 RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+)] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.8.tar.gz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d71e02fc082ca7fe729b9c03b18abfe5
+_md5_=1850691780bce02bef6f6924fdb17a57
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.31 b/metadata/md5-cache/dev-db/mysql-5.7.31
index 4dac04f6fe93..a50e506fc499 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.31
+++ b/metadata/md5-cache/dev-db/mysql-5.7.31
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.31.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.31.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.31.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.31-patches-01.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6110be19322ede1901665f7d3181607d
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.21-r1 b/metadata/md5-cache/dev-db/mysql-8.0.21-r1
index 64379c6f301f..a2232c8e3549 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.21-r1
+++ b/metadata/md5-cache/dev-db/mysql-8.0.21-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.21.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.21.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.21.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.21-patches-01.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03a281f4bd6352d098e0bd977ddbdf2b
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.21 b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.21
index 5fd30b6c3b27..e25b49771a3c 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.21
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-8.0.21
@@ -10,5 +10,5 @@ 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.21-src.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e443957150496cb6c886acb52fbeb2b
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1 b/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1
new file mode 100644
index 000000000000..da0c76ce577d
--- /dev/null
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-19.6.0.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Oracle 18c Instant Client with SDK
+EAPI=7
+HOMEPAGE=https://www.oracle.com/database/technologies/instant-client.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_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_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=mirror splitdebug test
+SLOT=0/19.1
+SRC_URI=abi_x86_32? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-basic-linux-19.6.0.0.0dbru.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-jdbc-linux-19.6.0.0.0dbru.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-odbc-linux-19.6.0.0.0dbru.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-precomp-linux-19.6.0.0.0dbru.zip ) !abi_x86_64? ( sdk? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sdk-linux-19.6.0.0.0dbru.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sqlplus-linux-19.6.0.0.0dbru.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-tools-linux-19.6.0.0.0dbru.zip ) ) ) abi_x86_64? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-basic-linux.x64-19.6.0.0.0dbru.zip jdbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-jdbc-linux.x64-19.6.0.0.0dbru.zip ) odbc? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-odbc-linux.x64-19.6.0.0.0dbru.zip ) precomp? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-precomp-linux.x64-19.6.0.0.0dbru.zip ) sdk? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip ) sqlplus? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip ) tools? ( https://download.oracle.com/otn_software/linux/instantclient/19600/instantclient-tools-linux.x64-19.6.0.0.0dbru.zip ) )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=db282bf7136716afcb48cc94141986d8
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.3 b/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.3
deleted file mode 100644
index 7e661e68d986..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst prepare unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle 11g Instant Client with SDK
-EAPI=4
-HOMEPAGE=http://www.oracle.com/technetwork/database/features/instant-client/index.html
-IUSE=multilib
-KEYWORDS=amd64 x86
-LICENSE=OTN
-RDEPEND=dev-libs/libaio multilib? ( >=dev-libs/libaio-0.3.109-r3 )
-RESTRICT=fetch
-SLOT=0
-SRC_URI=x86? ( instantclient-basic-linux-11.2.0.3.0.zip instantclient-sdk-linux-11.2.0.3.0.zip ) amd64? ( instantclient-basic-linux.x64-11.2.0.3.0.zip instantclient-sdk-linux.x64-11.2.0.3.0.zip multilib? ( instantclient-basic-linux-11.2.0.3.0.zip ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=305dd4f40cf49f8c8fdb971f25cc69a8
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.3 b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.3
deleted file mode 100644
index 37bfc05072a2..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle 11g Instant Client: JDBC supplement
-EAPI=4
-HOMEPAGE=http://www.oracle.com/technetwork/database/features/instant-client/index.html
-IUSE=multilib
-KEYWORDS=amd64 x86
-LICENSE=OTN
-RDEPEND=~dev-db/oracle-instantclient-basic-11.2.0.3
-RESTRICT=fetch
-SLOT=0
-SRC_URI=x86? ( instantclient-jdbc-linux-11.2.0.3.0.zip ) amd64? ( instantclient-jdbc-linux.x64-11.2.0.3.0.zip multilib? ( instantclient-jdbc-linux-11.2.0.3.0.zip ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a2ca08480bdd8a665a9dac1ab05d7634
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.3 b/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.3
deleted file mode 100644
index 8a3772544665..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle 11g Instant Client: ODBC supplement
-EAPI=4
-HOMEPAGE=http://www.oracle.com/technetwork/database/features/instant-client/index.html
-IUSE=multilib
-KEYWORDS=amd64 x86
-LICENSE=OTN
-RDEPEND=~dev-db/oracle-instantclient-basic-11.2.0.3
-RESTRICT=fetch
-SLOT=0
-SRC_URI=x86? ( instantclient-odbc-linux-11.2.0.3.0.zip ) amd64? ( instantclient-odbc-linux.x64-11.2.0.3.0.zip multilib? ( instantclient-odbc-linux-11.2.0.3.0.zip ) )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c7b5d79ed8cd45e63962814d413376d4
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3 b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3
deleted file mode 100644
index 7af0b70f0f47..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle 11g Instant Client: SQL*Plus
-EAPI=4
-HOMEPAGE=http://www.oracle.com/technetwork/database/features/instant-client/index.html
-KEYWORDS=amd64 x86
-LICENSE=OTN
-RDEPEND=~dev-db/oracle-instantclient-basic-11.2.0.3
-RESTRICT=fetch
-SLOT=0
-SRC_URI=x86? ( instantclient-sqlplus-linux-11.2.0.3.0.zip ) amd64? ( instantclient-sqlplus-linux.x64-11.2.0.3.0.zip )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b25545e0d14ec3a6bf963b62c45de778
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3-r1 b/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3-r1
deleted file mode 100644
index 92af58974844..000000000000
--- a/metadata/md5-cache/dev-db/oracle-instantclient-sqlplus-11.2.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch
-DEPEND=app-arch/unzip
-DESCRIPTION=Oracle 11g Instant Client: SQL*Plus
-EAPI=4
-HOMEPAGE=http://www.oracle.com/technetwork/database/features/instant-client/index.html
-KEYWORDS=amd64 x86
-LICENSE=OTN
-RDEPEND=~dev-db/oracle-instantclient-basic-11.2.0.3
-RESTRICT=fetch
-SLOT=0
-SRC_URI=x86? ( instantclient-sqlplus-linux-11.2.0.3.0.zip ) amd64? ( instantclient-sqlplus-linux.x64-11.2.0.3.0.zip )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9e8ea6a755b2edfc1785dd7125760afc
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.20.11-r1 b/metadata/md5-cache/dev-db/percona-server-8.0.20.11-r1
index a21b53f80cab..4b81060650a7 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.20.11-r1
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.20.11-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) cjk? ( server ) jemalloc? ( server ) numa?
 RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=8.0
 SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.20-11/source/tarball/percona-server-8.0.20-11.tar.gz https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.20.11-patches-01.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff85db4433fa1005aa82dafb730284dd
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.15 b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.15
index da80fd1e18c1..dd3ae01f07b2 100644
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.15
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.15
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.15/source/tarball/percona-xtrabackup-2.4.15.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=058a7bdd98bef4f2219ba5d15b274340
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.20 b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.20
index d7d88d8caf49..c8d5787fc0aa 100644
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.20
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-2.4.20
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-2.4.20/source/tarball/percona-xtrabackup-2.4.20.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82767cb2f368769028bdd589d19cbab8
diff --git a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.13 b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.13
index abb18d63b503..d347134c89b5 100644
--- a/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.13
+++ b/metadata/md5-cache/dev-db/percona-xtrabackup-8.0.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/lz4:0= app-editors/vim-core dev-libs/icu:= dev-libs/libaio dev-libs/libedit dev-libs/libev dev-libs/libevent:0= dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/openssl:0= dev-libs/protobuf:= dev-libs/rapidjson dev-libs/re2:= dev-python/sphinx net-misc/curl sys-libs/zlib:= !dev-db/percona-xtrabackup-bin dev-perl/DBD-mysql
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/Percona-XtraBackup-LATEST/Percona-XtraBackup-8.0.13/source/tarball/percona-xtrabackup-8.0.13.tar.gz mirror://sourceforge/boost/boost_1_70_0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d78450df305981b48ec54729193126a
diff --git a/metadata/md5-cache/dev-db/pgadmin4-4.26 b/metadata/md5-cache/dev-db/pgadmin4-4.26
new file mode 100644
index 000000000000..4d7cc6546dad
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgadmin4-4.26
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/libsodium[-minimal] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) ) virtual/imagemagick-tools[png] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GUI administration and development platform for PostgreSQL
+EAPI=7
+HOMEPAGE=https://www.pgadmin.org/
+IUSE=doc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=POSTGRESQL
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/libsodium[-minimal] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 python_single_target_python3_6? ( >=dev-python/blinker-1.4[python_targets_python3_6(-)] >=dev-python/flask-1.0.2[python_targets_python3_6(-)] >=dev-python/flask-compress-1.4.0[python_targets_python3_6(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_6(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_6(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_6(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_6(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_6(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_6(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_6(-)] >=dev-python/flask-sqlalchemy-2.3.2[python_targets_python3_6(-)] >=dev-python/flask-wtf-0.14.2[python_targets_python3_6(-)] >=dev-python/ldap3-2.5.1[python_targets_python3_6(-)] >=dev-python/passlib-1.7.2[python_targets_python3_6(-)] >=dev-python/psutil-5.7.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_6(-)] >=dev-python/pytz-2018.9[python_targets_python3_6(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_6(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)] >=dev-python/speaklater-1.3[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.13[python_targets_python3_6(-)] >=dev-python/sqlparse-0.2.4[python_targets_python3_6(-)] >=dev-python/sshtunnel-0.1.5[python_targets_python3_6(-)] >=dev-python/werkzeug-0.15.0[python_targets_python3_6(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_6(-)] dev-python/bcrypt[python_targets_python3_6(-)] dev-python/cryptography[python_targets_python3_6(-)] dev-python/python-email-validator[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/blinker-1.4[python_targets_python3_7(-)] >=dev-python/flask-1.0.2[python_targets_python3_7(-)] >=dev-python/flask-compress-1.4.0[python_targets_python3_7(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_7(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_7(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_7(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_7(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_7(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_7(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_7(-)] >=dev-python/flask-sqlalchemy-2.3.2[python_targets_python3_7(-)] >=dev-python/flask-wtf-0.14.2[python_targets_python3_7(-)] >=dev-python/ldap3-2.5.1[python_targets_python3_7(-)] >=dev-python/passlib-1.7.2[python_targets_python3_7(-)] >=dev-python/psutil-5.7.0[python_targets_python3_7(-)] >=dev-python/psycopg-2.8[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_7(-)] >=dev-python/pytz-2018.9[python_targets_python3_7(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_7(-)] >=dev-python/six-1.12.0[python_targets_python3_7(-)] >=dev-python/speaklater-1.3[python_targets_python3_7(-)] >=dev-python/sqlalchemy-1.3.13[python_targets_python3_7(-)] >=dev-python/sqlparse-0.2.4[python_targets_python3_7(-)] >=dev-python/sshtunnel-0.1.5[python_targets_python3_7(-)] >=dev-python/werkzeug-0.15.0[python_targets_python3_7(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_7(-)] dev-python/bcrypt[python_targets_python3_7(-)] dev-python/cryptography[python_targets_python3_7(-)] dev-python/python-email-validator[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/blinker-1.4[python_targets_python3_8(-)] >=dev-python/flask-1.0.2[python_targets_python3_8(-)] >=dev-python/flask-compress-1.4.0[python_targets_python3_8(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_8(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_8(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_8(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_8(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_8(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_8(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_8(-)] >=dev-python/flask-sqlalchemy-2.3.2[python_targets_python3_8(-)] >=dev-python/flask-wtf-0.14.2[python_targets_python3_8(-)] >=dev-python/ldap3-2.5.1[python_targets_python3_8(-)] >=dev-python/passlib-1.7.2[python_targets_python3_8(-)] >=dev-python/psutil-5.7.0[python_targets_python3_8(-)] >=dev-python/psycopg-2.8[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)] >=dev-python/pytz-2018.9[python_targets_python3_8(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_8(-)] >=dev-python/six-1.12.0[python_targets_python3_8(-)] >=dev-python/speaklater-1.3[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.13[python_targets_python3_8(-)] >=dev-python/sqlparse-0.2.4[python_targets_python3_8(-)] >=dev-python/sshtunnel-0.1.5[python_targets_python3_8(-)] >=dev-python/werkzeug-0.15.0[python_targets_python3_8(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_8(-)] dev-python/bcrypt[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] dev-python/python-email-validator[python_targets_python3_8(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v4.26/source/pgadmin4-4.26.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0321f95a7e39843156685c2c9fb47f3
diff --git a/metadata/md5-cache/dev-db/pgcli-2.2.0 b/metadata/md5-cache/dev-db/pgcli-2.2.0
index f77d2bfb1d3c..3b41d64f8a89 100644
--- a/metadata/md5-cache/dev-db/pgcli-2.2.0
+++ b/metadata/md5-cache/dev-db/pgcli-2.2.0
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/pgcli/archive/v2.2.0.tar.gz -> pgcli-2.2.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=828985150b7e568fc3cc2737100b5224
+_md5_=032e1115c01093cb14c38cdef6c21ab5
diff --git a/metadata/md5-cache/dev-db/pgcli-3.0.0 b/metadata/md5-cache/dev-db/pgcli-3.0.0
new file mode 100644
index 000000000000..cea522cf1c43
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgcli-3.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-db/postgresql dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/prompt_toolkit-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/psycopg-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/sqlparse-0.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cli_helpers-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/humanize-0.5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pgspecial-1.11.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setproctitle-1.1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/prompt_toolkit-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/psycopg-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/sqlparse-0.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cli_helpers-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/humanize-0.5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pgspecial-1.11.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setproctitle-1.1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=CLI for Postgres with auto-completion and syntax highlighting
+EAPI=7
+HOMEPAGE=https://www.pgcli.com https://github.com/dbcli/pgcli
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/prompt_toolkit-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prompt_toolkit-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/psycopg-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/sqlparse-0.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cli_helpers-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/configobj-5.0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/humanize-0.5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pgspecial-1.11.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygments-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setproctitle-1.1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dbcli/pgcli/archive/v3.0.0.tar.gz -> pgcli-3.0.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=84d1685973510e76fc6f29c0f5c7606d
diff --git a/metadata/md5-cache/dev-db/pgmemcache-2.1.2 b/metadata/md5-cache/dev-db/pgmemcache-2.1.2
deleted file mode 100644
index 1e38e5536689..000000000000
--- a/metadata/md5-cache/dev-db/pgmemcache-2.1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-db/postgresql dev-libs/cyrus-sasl >=dev-libs/libmemcached-1.0.18[sasl]
-DESCRIPTION=A PostgreSQL API based on libmemcached to interface with memcached
-EAPI=5
-HOMEPAGE=http://pgfoundry.org/projects/pgmemcache https://github.com/ohmu/pgmemcache
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-db/postgresql dev-libs/cyrus-sasl >=dev-libs/libmemcached-1.0.18[sasl]
-SLOT=0
-SRC_URI=https://github.com/ohmu/pgmemcache/archive/2.1.2.tar.gz -> pgmemcache-2.1.2.tar.gz
-_md5_=a690988bff73fc2e7b6aa02d63a7fd94
diff --git a/metadata/md5-cache/dev-db/pgmemcache-2.2.0 b/metadata/md5-cache/dev-db/pgmemcache-2.2.0
deleted file mode 100644
index 6a9d9026b341..000000000000
--- a/metadata/md5-cache/dev-db/pgmemcache-2.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-db/postgresql dev-libs/cyrus-sasl >=dev-libs/libmemcached-1.0.18[sasl]
-DESCRIPTION=A PostgreSQL API based on libmemcached to interface with memcached
-EAPI=5
-HOMEPAGE=http://pgfoundry.org/projects/pgmemcache https://github.com/ohmu/pgmemcache
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-db/postgresql dev-libs/cyrus-sasl >=dev-libs/libmemcached-1.0.18[sasl]
-SLOT=0
-SRC_URI=https://github.com/ohmu/pgmemcache/archive/2.2.0.tar.gz -> pgmemcache-2.2.0.tar.gz
-_md5_=80917920576e1c309bec2702eeab8025
diff --git a/metadata/md5-cache/dev-db/plr-8.4.1 b/metadata/md5-cache/dev-db/plr-8.4.1
new file mode 100644
index 000000000000..f3389297a3cd
--- /dev/null
+++ b/metadata/md5-cache/dev-db/plr-8.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=dev-lang/R postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] ) virtual/pkgconfig
+DESCRIPTION=R language extension for postgresql database
+EAPI=6
+HOMEPAGE=http://www.joeconway.com/plr/
+IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-lang/R postgres_targets_postgres13? ( dev-db/postgresql:13=[server] ) postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server] )
+REQUIRED_USE=|| ( postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 )
+SLOT=0
+SRC_URI=https://github.com/postgres-plr/plr/archive/REL8_4_1.tar.gz -> plr-8.4.1.tar.gz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	postgres	9613fb90112e2a521b6a8315187c2966	postgres-multi	b784ac6c30437f2ded3f16482b56374c	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=078792f66868df4bd542da036cd30c4f
diff --git a/metadata/md5-cache/dev-db/postgresql-10.14 b/metadata/md5-cache/dev-db/postgresql-10.14
index 84a0e52f4b56..ef042a11ac49 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.14
+++ b/metadata/md5-cache/dev-db/postgresql-10.14
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc icu kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=10
 SRC_URI=https://ftp.postgresql.org/pub/source/v10.14/postgresql-10.14.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cf70cfc57f5f541bca6b1c28fc89ccff
+_md5_=4801593923201d4330e943bf25c28d53
diff --git a/metadata/md5-cache/dev-db/postgresql-11.9 b/metadata/md5-cache/dev-db/postgresql-11.9
index 0b027b8e6887..44979f73a3a9 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.9
+++ b/metadata/md5-cache/dev-db/postgresql-11.9
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=11
 SRC_URI=https://ftp.postgresql.org/pub/source/v11.9/postgresql-11.9.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5c06d7852896756709752cb2dd5564b7
+_md5_=8dc9677a13e5a2cb95d6e67ac59c7c6c
diff --git a/metadata/md5-cache/dev-db/postgresql-12.4 b/metadata/md5-cache/dev-db/postgresql-12.4
index 92eebf7d3748..428aff955700 100644
--- a/metadata/md5-cache/dev-db/postgresql-12.4
+++ b/metadata/md5-cache/dev-db/postgresql-12.4
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=12
 SRC_URI=https://ftp.postgresql.org/pub/source/v12.4/postgresql-12.4.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5ae672935989880d6717e03c689cee86
+_md5_=8146bd429c8f6a5264411370ac149b5a
diff --git a/metadata/md5-cache/dev-db/postgresql-13.0 b/metadata/md5-cache/dev-db/postgresql-13.0
new file mode 100644
index 000000000000..403d3dd64717
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-13.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DESCRIPTION=PostgreSQL RDBMS
+EAPI=7
+HOMEPAGE=https://www.postgresql.org/
+IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=POSTGRESQL GPL-2
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=13
+SRC_URI=https://ftp.postgresql.org/pub/source/v13.0/postgresql-13.0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=6ec03d25180a8a04bf5606d6908cc9d1
diff --git a/metadata/md5-cache/dev-db/postgresql-13_rc1 b/metadata/md5-cache/dev-db/postgresql-13_rc1
deleted file mode 100644
index ebee311ae6ba..000000000000
--- a/metadata/md5-cache/dev-db/postgresql-13_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
-DESCRIPTION=PostgreSQL RDBMS
-EAPI=7
-HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
-LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
-SLOT=13
-SRC_URI=https://ftp.postgresql.org/pub/source/v13rc1/postgresql-13rc1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e134839911970ddaa3125aa47845021c
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.23 b/metadata/md5-cache/dev-db/postgresql-9.5.23
index 98aab1aabdfb..191f8963fb1d 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.23
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.23
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=9.5
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.5.23/postgresql-9.5.23.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a3cf4629816cba3edf86f6d212719d60
+_md5_=f7ee7866a2030fa0d5f3ecc0a88301dd
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.19 b/metadata/md5-cache/dev-db/postgresql-9.6.19
index 8f74c6f29643..89fc2c4b5c26 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.19
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.19
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg-legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 acct-group/postgres acct-user/postgres sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) 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 ) ) ) ) ) ) ) selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=9.6
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.19/postgresql-9.6.19.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9d1739c6e49ba9395037a56dc37eaf9
+_md5_=0f81ca06a6559ae4a4f2178a1abc02e4
diff --git a/metadata/md5-cache/dev-db/sqlite-3.33.0 b/metadata/md5-cache/dev-db/sqlite-3.33.0
index d6698178b83f..3e1a2c5f2453 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.33.0
+++ b/metadata/md5-cache/dev-db/sqlite-3.33.0
@@ -5,11 +5,11 @@ DESCRIPTION=SQL database engine
 EAPI=7
 HOMEPAGE=https://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 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=public-domain
 RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://sqlite.org/2020/sqlite-src-3330000.zip doc? ( https://sqlite.org/2020/sqlite-doc-3330000.zip )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c252fcb9bf29dab05743f8f73187c853
+_md5_=c35f3f2fc1759b9741991cfef8c14b05
diff --git a/metadata/md5-cache/dev-db/sqlitebrowser-3.11.1-r1 b/metadata/md5-cache/dev-db/sqlitebrowser-3.11.1-r1
index a147b01aae53..5e6072845984 100644
--- a/metadata/md5-cache/dev-db/sqlitebrowser-3.11.1-r1
+++ b/metadata/md5-cache/dev-db/sqlitebrowser-3.11.1-r1
@@ -11,5 +11,5 @@ RDEPEND=app-editors/qhexedit2 dev-cpp/antlr-cpp:2 dev-db/sqlite:3 >=dev-libs/qcu
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.11.1.tar.gz -> sqlitebrowser-3.11.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c4c81757dc2578f1ed63a0ac46ef422
diff --git a/metadata/md5-cache/dev-db/sqliteodbc-0.99 b/metadata/md5-cache/dev-db/sqliteodbc-0.99
deleted file mode 100644
index b862f2783bf1..000000000000
--- a/metadata/md5-cache/dev-db/sqliteodbc-0.99
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-db/sqlite-3.6 || ( >=dev-db/unixODBC-2.2 >=dev-db/libiodbc-3.5 )
-DESCRIPTION=ODBC driver to access local SQLite database files
-EAPI=4
-HOMEPAGE=http://www.ch-werner.de/sqliteodbc/
-KEYWORDS=amd64 ~arm ppc x86
-LICENSE=BSD
-RDEPEND=>=dev-db/sqlite-3.6 || ( >=dev-db/unixODBC-2.2 >=dev-db/libiodbc-3.5 )
-SLOT=0
-SRC_URI=http://www.ch-werner.de/sqliteodbc/sqliteodbc-0.99.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=11897203d3c758b8fe9685b3e241a165
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index ac21fd6dc9a4..6cb37efe16aa 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/ftdi_eeprom-0.3-r1 b/metadata/md5-cache/dev-embedded/ftdi_eeprom-0.3-r1
deleted file mode 100644
index 0e2abb477226..000000000000
--- a/metadata/md5-cache/dev-embedded/ftdi_eeprom-0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-embedded/libftdi:0 dev-libs/confuse
-DESCRIPTION=Utility to program external EEPROM for FTDI USB chips
-EAPI=4
-HOMEPAGE=https://www.intra2net.com/en/developer/libftdi/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=dev-embedded/libftdi:0 dev-libs/confuse
-SLOT=0
-SRC_URI=https://www.intra2net.com/en/developer/libftdi/download/ftdi_eeprom-0.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ace2429f68e416bea28197aae690a07
diff --git a/metadata/md5-cache/dev-embedded/ftdi_eeprom-1.0 b/metadata/md5-cache/dev-embedded/ftdi_eeprom-1.0
deleted file mode 100644
index 15fdfa9fbd5c..000000000000
--- a/metadata/md5-cache/dev-embedded/ftdi_eeprom-1.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=setup
-DESCRIPTION=Utility to program external EEPROM for FTDI USB chips
-EAPI=4
-HOMEPAGE=https://www.intra2net.com/en/developer/libftdi/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-embedded/libftdi:1[tools]
-SLOT=0
-_md5_=0a1a9ba52d6671f90c93686482a2030b
diff --git a/metadata/md5-cache/dev-embedded/libjaylink-0.1.0 b/metadata/md5-cache/dev-embedded/libjaylink-0.1.0
index d84815901abd..65b7dbe4ce0a 100644
--- a/metadata/md5-cache/dev-embedded/libjaylink-0.1.0
+++ b/metadata/md5-cache/dev-embedded/libjaylink-0.1.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install prepare
 DEPEND=virtual/libusb:1 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library to access J-Link devices
 EAPI=6
-HOMEPAGE=https://gitlab.zapb.de/zapb/libjaylink
+HOMEPAGE=https://gitlab.zapb.de/libjaylink/libjaylink
 IUSE=static-libs
 KEYWORDS=amd64 arm x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
-SRC_URI=https://gitlab.zapb.de/zapb/libjaylink/-/archive/0.1.0/libjaylink-0.1.0.tar.bz2
+SRC_URI=https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/0.1.0/libjaylink-0.1.0.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2e0faf3125798f77c6b23a7a2bee3929
+_md5_=d5a29c66473833f7eb69d83c70245bbe
diff --git a/metadata/md5-cache/dev-embedded/libjaylink-0.2.0 b/metadata/md5-cache/dev-embedded/libjaylink-0.2.0
new file mode 100644
index 000000000000..ec2c52c191a5
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/libjaylink-0.2.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Library to access J-Link devices
+EAPI=7
+HOMEPAGE=https://gitlab.zapb.de/libjaylink/libjaylink
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/0.2.0/libjaylink-0.2.0.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ec9534da0591c0f742f38865904e2e19
diff --git a/metadata/md5-cache/dev-embedded/libjaylink-9999 b/metadata/md5-cache/dev-embedded/libjaylink-9999
index f17c719f9201..262dcc43afb6 100644
--- a/metadata/md5-cache/dev-embedded/libjaylink-9999
+++ b/metadata/md5-cache/dev-embedded/libjaylink-9999
@@ -1,12 +1,13 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=virtual/libusb:1 >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Library to access J-Link devices
-EAPI=5
-HOMEPAGE=https://gitlab.zapb.de/zapb/libjaylink
-IUSE=static-libs
+EAPI=7
+HOMEPAGE=https://gitlab.zapb.de/libjaylink/libjaylink
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=virtual/libusb:1
+RDEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=24d15d6d661263cac299a76df873e422
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4f59185cb102204711e5ce1ede97daf8
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 0901bbd99e81..cbe1510758f0 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/aseprite-1.1.7-r1 b/metadata/md5-cache/dev-games/aseprite-1.1.7-r1
index add556aee6af..282a435c258a 100644
--- a/metadata/md5-cache/dev-games/aseprite-1.1.7-r1
+++ b/metadata/md5-cache/dev-games/aseprite-1.1.7-r1
@@ -10,5 +10,5 @@ RDEPEND=!bundled-libs? ( media-libs/allegro:0[X,png] ) gtk3? ( dev-cpp/gtkmm:3.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aseprite/aseprite/releases/download/v1.1.7/Aseprite-v1.1.7-Source.zip
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4540f82a4a1d8d66ac517aff401a7ba4
diff --git a/metadata/md5-cache/dev-games/aseprite-1.1.9 b/metadata/md5-cache/dev-games/aseprite-1.1.9
index 69da65c73f79..6fa5f9280e25 100644
--- a/metadata/md5-cache/dev-games/aseprite-1.1.9
+++ b/metadata/md5-cache/dev-games/aseprite-1.1.9
@@ -10,5 +10,5 @@ RDEPEND=!bundled-libs? ( media-libs/allegro:0[X,png] ) gtk3? ( dev-cpp/gtkmm:3.0
 RESTRICT=bindist mirror !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aseprite/aseprite/releases/download/v1.1.9/Aseprite-v1.1.9-Source.zip
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=247b511be8f1325933b68b99ef9cae92
diff --git a/metadata/md5-cache/dev-games/cegui-0.8.7-r1 b/metadata/md5-cache/dev-games/cegui-0.8.7-r1
index 5d1dc2ae5785..95f88264a012 100644
--- a/metadata/md5-cache/dev-games/cegui-0.8.7-r1
+++ b/metadata/md5-cache/dev-games/cegui-0.8.7-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= virtual/libiconv bidi? ( dev-libs/fribidi ) devil? ( me
 REQUIRED_USE=|| ( expat tinyxml xerces-c xml ) python? ( ^^ ( python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/crayzedsgui/cegui-0.8.7.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68581adc80649a8f4fb21a4a1eeab8a8
diff --git a/metadata/md5-cache/dev-games/freecell-solver-5.24.0 b/metadata/md5-cache/dev-games/freecell-solver-5.24.0
index 4b2c5e2c650b..376903d2abe3 100644
--- a/metadata/md5-cache/dev-games/freecell-solver-5.24.0
+++ b/metadata/md5-cache/dev-games/freecell-solver-5.24.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-5.24.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9373312babd382550098a54f16cfc6b7
diff --git a/metadata/md5-cache/dev-games/freecell-solver-6.0.1 b/metadata/md5-cache/dev-games/freecell-solver-6.0.1
index fddd5f2fe064..60656857f5a0 100644
--- a/metadata/md5-cache/dev-games/freecell-solver-6.0.1
+++ b/metadata/md5-cache/dev-games/freecell-solver-6.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=C library for automatically solving Freecell and some other solitair
 EAPI=7
 HOMEPAGE=https://fc-solve.shlomifish.org/
 IUSE=tcmalloc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pysol_cards[python_targets_python3_6(-)] dev-python/random2[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pysol_cards[python_targets_python3_7(-)] dev-python/random2[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pysol_cards[python_targets_python3_8(-)] dev-python/random2[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) tcmalloc? ( dev-util/google-perftools )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-6.0.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e29340b0979e75821de57bba90d445c
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=812d292344fc980f54311062ae2636c8
diff --git a/metadata/md5-cache/dev-games/irrlicht-1.8.4-r1 b/metadata/md5-cache/dev-games/irrlicht-1.8.4-r1
index d75693106214..a5c878f18484 100644
--- a/metadata/md5-cache/dev-games/irrlicht-1.8.4-r1
+++ b/metadata/md5-cache/dev-games/irrlicht-1.8.4-r1
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2 ~dev-games/irrlicht-headers-1.8.4 media-libs/libpng:0= sy
 SLOT=0
 SRC_URI=mirror://sourceforge/irrlicht/irrlicht-1.8.4.zip https://dev.gentoo.org/~mgorny/dist/irrlicht-1.8.4-patchset.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=94d366831ca5641c5dc8c9ec8911796d
+_md5_=f6870d795439ace4a2392b89ce1d20e2
diff --git a/metadata/md5-cache/dev-games/ogre-1.12.9 b/metadata/md5-cache/dev-games/ogre-1.12.9
index 1f3541fe34e1..df450dd05bd6 100644
--- a/metadata/md5-cache/dev-games/ogre-1.12.9
+++ b/metadata/md5-cache/dev-games/ogre-1.12.9
@@ -12,5 +12,5 @@ REQUIRED_USE=examples? ( opengl )
 RESTRICT=test
 SLOT=0/1.12
 SRC_URI=https://github.com/OGRECave/ogre/archive/v1.12.9.tar.gz -> ogre-1.12.9.tar.gz https://github.com/ocornut/imgui/archive/v1.77.tar.gz -> imgui-1.77.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85cf89dc846737e04175cd1c836e720b
diff --git a/metadata/md5-cache/dev-games/ogre-1.9.0-r2 b/metadata/md5-cache/dev-games/ogre-1.9.0-r2
index bd2f7ccdfa58..70564319b370 100644
--- a/metadata/md5-cache/dev-games/ogre-1.9.0-r2
+++ b/metadata/md5-cache/dev-games/ogre-1.9.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=threads? ( ^^ ( boost poco tbb ) ) examples? ( ois ) poco? ( thread
 RESTRICT=test
 SLOT=0/1.9.0
 SRC_URI=https://bitbucket.org/sinbad/ogre/get/v1-9-0.tar.bz2 -> ogre-1.9.0.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=81a0ee7fb83c463138207ace734505ba
diff --git a/metadata/md5-cache/dev-games/ogre-2.1 b/metadata/md5-cache/dev-games/ogre-2.1
index 7f7b6ececf6e..86531f37e50c 100644
--- a/metadata/md5-cache/dev-games/ogre-2.1
+++ b/metadata/md5-cache/dev-games/ogre-2.1
@@ -11,5 +11,5 @@ RDEPEND=dev-games/ois dev-libs/zziplib media-libs/freetype:2 x11-libs/libX11 x11
 RESTRICT=test
 SLOT=0/2.1
 SRC_URI=https://github.com/OGRECave/ogre-next/archive/2.1.tar.gz -> ogre-2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3bbf64d436a24d33726940b297ee5868
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.4 b/metadata/md5-cache/dev-games/openscenegraph-3.6.4
index 3f66a9cccfe0..e2f91d2dcfa4 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.4
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.6.4
@@ -11,5 +11,5 @@ RDEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs
 REQUIRED_USE=sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )
 SLOT=0/158
 SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=571a8b438d748a3f0638d4c5a7c91a9a
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5
deleted file mode 100644
index 24bbc6cfadb0..000000000000
--- a/metadata/md5-cache/dev-games/openscenegraph-3.6.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) x11-base/xorg-proto
-DESCRIPTION=Open source high performance 3D graphics toolkit
-EAPI=7
-HOMEPAGE=http://www.openscenegraph.org/
-IUSE=asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=wxWinLL-3 LGPL-2.1
-RDEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext asio? ( dev-cpp/asio ) curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )
-SLOT=0/161
-SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a3b6576cbc79148c410203d73a02d56a
diff --git a/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r1 b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r1
new file mode 100644
index 000000000000..b05ecf0bd42e
--- /dev/null
+++ b/metadata/md5-cache/dev-games/openscenegraph-3.6.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib ) >=dev-libs/boost-1.37.0:* x11-base/xorg-proto
+DESCRIPTION=Open source high performance 3D graphics toolkit
+EAPI=7
+HOMEPAGE=http://www.openscenegraph.org/
+IUSE=curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer jpeg las lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr +zlib
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=wxWinLL-3 LGPL-2.1
+RDEPEND=media-libs/mesa[egl?] virtual/glu virtual/opengl x11-libs/libSM x11-libs/libXext curl? ( net-misc/curl ) examples? ( fltk? ( x11-libs/fltk:1[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[opengl,X] ) ) ffmpeg? ( media-video/ffmpeg:0= ) gdal? ( sci-libs/gdal:= ) gif? ( media-libs/giflib:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) openinventor? ( media-libs/coin ) pdf? ( app-text/poppler[cairo] ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg x11-libs/cairo ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) vnc? ( net-libs/libvncserver ) xrandr? ( x11-libs/libXrandr ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )
+SLOT=0/161
+SRC_URI=https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-3.6.5.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=975f111414835c46cc1604f4097c0e35
diff --git a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425 b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425
index a4b987deff6f..fed64fae66a1 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425
+++ b/metadata/md5-cache/dev-games/openscenegraph-openmw-3.4_p20200425
@@ -11,5 +11,5 @@ RDEPEND=!dev-games/openscenegraph media-libs/mesa[egl?] virtual/glu virtual/open
 REQUIRED_USE=sdl2? ( sdl ) openexr? ( zlib )
 SLOT=0/132
 SRC_URI=https://github.com/OpenMW/osg/archive/8b07809fa674ecffe77338aaea2e223b3aadff0e.tar.gz -> openscenegraph-openmw-3.4_p20200425.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94b5f5fdbe5beb7519536b14eecb61ca
diff --git a/metadata/md5-cache/dev-games/openscenegraph-qt-3.5.7 b/metadata/md5-cache/dev-games/openscenegraph-qt-3.5.7
index a9e01af0b801..c911eb565f7c 100644
--- a/metadata/md5-cache/dev-games/openscenegraph-qt-3.5.7
+++ b/metadata/md5-cache/dev-games/openscenegraph-qt-3.5.7
@@ -10,5 +10,5 @@ LICENSE=wxWinLL-3 LGPL-2.1
 RDEPEND=>=dev-games/openscenegraph-3.6.3:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 webkit? ( dev-qt/qtwebkit:5 )
 SLOT=0/145
 SRC_URI=https://github.com/openscenegraph/osgQt/archive/3.5.7.tar.gz -> osgQt-3.5.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12a333ef269cd5b598b11a459cd2e024
diff --git a/metadata/md5-cache/dev-games/physfs-3.0.2 b/metadata/md5-cache/dev-games/physfs-3.0.2
index fada9371a187..28574fb9450f 100644
--- a/metadata/md5-cache/dev-games/physfs-3.0.2
+++ b/metadata/md5-cache/dev-games/physfs-3.0.2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc64 x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=https://icculus.org/physfs/downloads/physfs-3.0.2.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d4b5cfe0184a52aac8586d197b6acbc
diff --git a/metadata/md5-cache/dev-games/physfs-9999 b/metadata/md5-cache/dev-games/physfs-9999
index a2c6dc316601..da011e308d4e 100644
--- a/metadata/md5-cache/dev-games/physfs-9999
+++ b/metadata/md5-cache/dev-games/physfs-9999
@@ -8,5 +8,5 @@ IUSE=7zip doc grp hog iso mvl qpak slb static-libs vdf wad +zip abi_x86_32 abi_x
 LICENSE=ZLIB
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mercurial	d22fe98ea362174612a57c233239102f	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mercurial	d22fe98ea362174612a57c233239102f	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=505c91a353eebb40f6fcf6630da029d9
diff --git a/metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20200511 b/metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20200511
index 61eb4e9c49bd..f6c96dec97e2 100644
--- a/metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20200511
+++ b/metadata/md5-cache/dev-games/recastnavigation-1.5.1_p20200511
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/recastnavigation/recastnavigation/archive/df27e4eb1a4ade9912f8b7d75c25769a3193dbd0.tar.gz -> recastnavigation-1.5.1_p20200511.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b379054ed794012fef50de8b84593d3a
diff --git a/metadata/md5-cache/dev-games/simgear-2020.1.2 b/metadata/md5-cache/dev-games/simgear-2020.1.2
index bf06984816e8..5aa8528d8c50 100644
--- a/metadata/md5-cache/dev-games/simgear-2020.1.2
+++ b/metadata/md5-cache/dev-games/simgear-2020.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-games/openscenegraph media-libs/openal net-misc/curl
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/simgear-2020.1.2.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d8b125fcba7327460651e228a9ee8bf
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd21fa6215683c59ada9c4f5054a2d3d
diff --git a/metadata/md5-cache/dev-games/simgear-9999 b/metadata/md5-cache/dev-games/simgear-9999
index f04145fecebd..54693b5c9e86 100644
--- a/metadata/md5-cache/dev-games/simgear-9999
+++ b/metadata/md5-cache/dev-games/simgear-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/expat dev-games/openscenegraph media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) gdal? ( sci-libs/gdal ) subversion? ( dev-vcs/subversion )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6179819ba2e96321209c3d7462772641
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 143b7cec7682..a3dbe35274a9 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/alsa-core-0.5.0.1-r2 b/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
index ab681d1fa08d..8e095a3a66ce 100644
--- a/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
+++ b/metadata/md5-cache/dev-haskell/alsa-core-0.5.0.1-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= media-libs/alsa-lib >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/alsa-lib >=dev-haskell/cabal-1.8 virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Binding to the ALSA Library API (Exceptions)
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.haskell.org/haskellwiki/ALSA
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-lang/ghc-6.10.4:= media-libs/alsa-lib
+RDEPEND=>=dev-haskell/extensible-exceptions-0.1.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= media-libs/alsa-lib
 SLOT=0/0.5.0.1
 SRC_URI=https://hackage.haskell.org/package/alsa-core-0.5.0.1/alsa-core-0.5.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3ab70c47382edca7766a0065c6ee1b8d
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1ce89bc54c869c8543312c67f4ffeb23
diff --git a/metadata/md5-cache/dev-haskell/ascii-progress-0.2.1.2 b/metadata/md5-cache/dev-haskell/ascii-progress-0.2.1.2
deleted file mode 100644
index f416516c4200..000000000000
--- a/metadata/md5-cache/dev-haskell/ascii-progress-0.2.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/ansi-terminal:=[profile?] >=dev-haskell/async-2.0.1.5:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] dev-haskell/http:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A simple progress bar for the console
-EAPI=5
-HOMEPAGE=https://github.com/yamadapc/haskell-ascii-progress
-IUSE=examples doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-haskell/ansi-terminal:=[profile?] >=dev-haskell/async-2.0.1.5:=[profile?] >=dev-haskell/conduit-1.2:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] dev-haskell/http:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=!test? ( test )
-SLOT=0/0.2.1.2
-SRC_URI=https://hackage.haskell.org/package/ascii-progress-0.2.1.2/ascii-progress-0.2.1.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=58c8f714abb04c2b655499fd459b45cc
diff --git a/metadata/md5-cache/dev-haskell/ascii-progress-0.3.3.0 b/metadata/md5-cache/dev-haskell/ascii-progress-0.3.3.0
new file mode 100644
index 000000000000..f48140c3b2ce
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/ascii-progress-0.3.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/async-2.0.1.5:=[profile?] >=dev-haskell/concurrent-output-1.7:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] >=dev-lang/ghc-7.6.1:= examples? ( >=dev-haskell/conduit-1.2:=[profile?] dev-haskell/http:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] ) >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-3 >=dev-haskell/quickcheck-2.6 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A simple progress bar for the console
+EAPI=6
+HOMEPAGE=https://github.com/yamadapc/haskell-ascii-progress
+IUSE=examples doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-haskell/async-2.0.1.5:=[profile?] >=dev-haskell/concurrent-output-1.7:=[profile?] >=dev-haskell/data-default-0.5.3:=[profile?] >=dev-lang/ghc-7.6.1:= examples? ( >=dev-haskell/conduit-1.2:=[profile?] dev-haskell/http:=[profile?] >=dev-haskell/http-conduit-2.1:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] )
+RESTRICT=!test? ( test )
+SLOT=0/0.3.3.0
+SRC_URI=https://hackage.haskell.org/package/ascii-progress-0.3.3.0/ascii-progress-0.3.3.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e55f10afd24880e44b746cdfe7f4f945
diff --git a/metadata/md5-cache/dev-haskell/asn1-parse-0.9.4 b/metadata/md5-cache/dev-haskell/asn1-parse-0.9.4
deleted file mode 100644
index 5235d7a04c05..000000000000
--- a/metadata/md5-cache/dev-haskell/asn1-parse-0.9.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Simple monadic parser for ASN1 stream types
-EAPI=5
-HOMEPAGE=https://github.com/vincenthz/hs-asn1
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
-SLOT=0/0.9.4
-SRC_URI=https://hackage.haskell.org/package/asn1-parse-0.9.4/asn1-parse-0.9.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d78bd89718b87f034e5c66d6e12bf328
diff --git a/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5 b/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5
new file mode 100644
index 000000000000..3d1b6575be12
--- /dev/null
+++ b/metadata/md5-cache/dev-haskell/asn1-parse-0.9.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=Simple monadic parser for ASN1 stream types
+EAPI=7
+HOMEPAGE=https://github.com/vincenthz/hs-asn1
+IUSE=doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-haskell/asn1-encoding-0.9:=[profile?] >=dev-haskell/asn1-types-0.3:=[profile?] <dev-haskell/asn1-types-0.4:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.9.5
+SRC_URI=https://hackage.haskell.org/package/asn1-parse-0.9.5/asn1-parse-0.9.5.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=43a609a3a9ea1b8037ff2d1223d4392d
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0 b/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0
index 2453b7114a9b..227824bf7c04 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0
+++ b/metadata/md5-cache/dev-haskell/attoparsec-conduit-1.1.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8
+DEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Consume attoparsec parsers via conduit. (deprecated)
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/snoyberg/conduit
-IUSE=profile
+IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-6.10.4:=
+RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/1.1.0
 SRC_URI=https://hackage.haskell.org/package/attoparsec-conduit-1.1.0/attoparsec-conduit-1.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=daeb14a86c13d1e8d95ca173c50483e0
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ed269df425b392e77388827c4a8348a0
diff --git a/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4 b/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
index 4cea036e8715..281ceec69701 100644
--- a/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
+++ b/metadata/md5-cache/dev-haskell/attoparsec-enumerator-0.3.4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Pass input from an enumerator to an Attoparsec parser
-EAPI=5
+EAPI=7
 HOMEPAGE=https://john-millikin.com/software/attoparsec-enumerator/
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] dev-haskell/text:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/0.3.4
 SRC_URI=https://hackage.haskell.org/package/attoparsec-enumerator-0.3.4/attoparsec-enumerator-0.3.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8d8fdcb92bd731b85bd5f67324fc76ba
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f7308fc6177b0fb16f22c5ea69f49481
diff --git a/metadata/md5-cache/dev-haskell/bio-0.5.3-r2 b/metadata/md5-cache/dev-haskell/bio-0.5.3-r2
deleted file mode 100644
index 9dbed4be3c42..000000000000
--- a/metadata/md5-cache/dev-haskell/bio-0.5.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/binary-0.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parallel:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/tagsoup-0.8:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A bioinformatics library
-EAPI=5
-HOMEPAGE=http://biohaskell.org/Libraries/Bio
-IUSE=+examples test doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-haskell/binary-0.4:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-time:=[profile?] dev-haskell/parallel:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] dev-haskell/random:=[profile?] >=dev-haskell/tagsoup-0.8:=[profile?] >=dev-lang/ghc-6.10.4:=
-RESTRICT=!test? ( test )
-SLOT=0/0.5.3
-SRC_URI=https://hackage.haskell.org/package/bio-0.5.3/bio-0.5.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=59d9100dacbb7de6732e2f70f045217d
diff --git a/metadata/md5-cache/dev-haskell/cipher-blowfish-0.0.3 b/metadata/md5-cache/dev-haskell/cipher-blowfish-0.0.3
deleted file mode 100644
index 68cdc46aa983..000000000000
--- a/metadata/md5-cache/dev-haskell/cipher-blowfish-0.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/crypto-cipher-tests >=dev-haskell/quickcheck-2 >=dev-haskell/test-framework-0.3.3 >=dev-haskell/test-framework-quickcheck2-0.2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Blowfish cipher
-EAPI=5
-HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/byteable:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.3:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-haskell/securemem-0.1.2:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.10.4:=
-RESTRICT=!test? ( test )
-SLOT=0/0.0.3
-SRC_URI=https://hackage.haskell.org/package/cipher-blowfish-0.0.3/cipher-blowfish-0.0.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=53bbc8c746fa5fd3d6c543e2a97a2e04
diff --git a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.10-r1 b/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.10-r1
deleted file mode 100644
index f6550cd71c0c..000000000000
--- a/metadata/md5-cache/dev-haskell/citeproc-hs-0.3.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.8:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) embed-data-files? ( dev-haskell/file-embed:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) unicode-collation? ( dev-haskell/text:=[profile?] dev-haskell/text-icu:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=A Citation Style Language implementation in Haskell
-EAPI=5
-HOMEPAGE=http://istitutocolli.org/repos/citeproc-hs/
-IUSE=+bibutils embed-data-files +hexpat +network +small-base unicode-collation doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.8:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) embed-data-files? ( dev-haskell/file-embed:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) unicode-collation? ( dev-haskell/text:=[profile?] dev-haskell/text-icu:=[profile?] )
-SLOT=0/0.3.10
-SRC_URI=https://hackage.haskell.org/package/citeproc-hs-0.3.10/citeproc-hs-0.3.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9222efabff9457d8783516b2eb8efe8b
diff --git a/metadata/md5-cache/dev-haskell/cryptocipher-0.6.2 b/metadata/md5-cache/dev-haskell/cryptocipher-0.6.2
deleted file mode 100644
index b3ae755ed131..000000000000
--- a/metadata/md5-cache/dev-haskell/cryptocipher-0.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cipher-aes-0.2.3:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/cipher-blowfish-0.0:=[profile?] <dev-haskell/cipher-blowfish-0.1:=[profile?] >=dev-haskell/cipher-camellia-0.0:=[profile?] <dev-haskell/cipher-camellia-0.1:=[profile?] >=dev-haskell/cipher-des-0.0:=[profile?] <dev-haskell/cipher-des-0.1:=[profile?] >=dev-haskell/cipher-rc4-0.1.3:=[profile?] <dev-haskell/cipher-rc4-0.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Symmetrical block and stream ciphers
-EAPI=5
-HOMEPAGE=https://github.com/vincenthz/hs-crypto-cipher
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/cipher-aes-0.2.3:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] >=dev-haskell/cipher-blowfish-0.0:=[profile?] <dev-haskell/cipher-blowfish-0.1:=[profile?] >=dev-haskell/cipher-camellia-0.0:=[profile?] <dev-haskell/cipher-camellia-0.1:=[profile?] >=dev-haskell/cipher-des-0.0:=[profile?] <dev-haskell/cipher-des-0.1:=[profile?] >=dev-haskell/cipher-rc4-0.1.3:=[profile?] <dev-haskell/cipher-rc4-0.2:=[profile?] >=dev-haskell/crypto-cipher-types-0.0.8:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?] >=dev-lang/ghc-6.10.4:=
-SLOT=0/0.6.2
-SRC_URI=https://hackage.haskell.org/package/cryptocipher-0.6.2/cryptocipher-0.6.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3399eb5d791de78203d1245e39ba3a97
diff --git a/metadata/md5-cache/dev-haskell/drift-2.4.2 b/metadata/md5-cache/dev-haskell/drift-2.4.2
deleted file mode 100644
index 047a9cc739fd..000000000000
--- a/metadata/md5-cache/dev-haskell/drift-2.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Program to derive type class instances
-EAPI=5
-HOMEPAGE=http://repetae.net/computer/haskell/DrIFT/
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-haskell/old-time:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:=
-SLOT=0/2.4.2
-SRC_URI=https://hackage.haskell.org/package/DrIFT-2.4.2/DrIFT-2.4.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a3322f629ce7a1c1ee42d3a97664a2c3
diff --git a/metadata/md5-cache/dev-haskell/glade-0.13.1 b/metadata/md5-cache/dev-haskell/glade-0.13.1
deleted file mode 100644
index cd34ca742320..000000000000
--- a/metadata/md5-cache/dev-haskell/glade-0.13.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/glib-0.13.4:0=[profile?] <dev-haskell/glib-0.14:0=[profile?] >=dev-haskell/gtk-0.14.5:2=[profile?] <dev-haskell/gtk-0.15:2=[profile?] >=dev-lang/ghc-7.4.1:= gnome-base/libglade:2.0 >=dev-haskell/cabal-1.24 >=dev-haskell/gtk2hs-buildtools-0.13.2.0:0= <dev-haskell/gtk2hs-buildtools-0.14:0= virtual/pkgconfig doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Binding to the glade library
-EAPI=6
-HOMEPAGE=http://projects.haskell.org/gtk2hs/
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-haskell/glib-0.13.4:0=[profile?] <dev-haskell/glib-0.14:0=[profile?] >=dev-haskell/gtk-0.14.5:2=[profile?] <dev-haskell/gtk-0.15:2=[profile?] >=dev-lang/ghc-7.4.1:= gnome-base/libglade:2.0
-SLOT=2/0.13.1
-SRC_URI=https://hackage.haskell.org/package/glade-0.13.1/glade-0.13.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9d501b73e02e356350d66666704f4e38
diff --git a/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1 b/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
index a21d95f5ba83..c902a352093e 100644
--- a/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
+++ b/metadata/md5-cache/dev-haskell/hlint-2.1.17-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-haskell/aeson-1.1.2.0:=[profile?] >=dev-haskell/ansi-terminal-0.6.2:=[profile?] >=dev-haskell/cmdargs-0.10:=[profile?] >=dev-haskell/cpphs-1.20.1:=[profile?] >=dev-haskell/data-default-0.3:=[profile?] >=dev-haskell/extra-1.6.6:=[profile?] dev-haskell/haskell-src-exts:1.21=[profile?] >=dev-haskell/haskell-src-exts-util-0.2.5:=[profile?] >=dev-haskell/refact-0.3:=[profile?] >=dev-haskell/semigroups-0.18:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/uniplate-1.5:=[profile?] dev-haskell/unordered-containers:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/yaml-0.5.0:=[profile?] >=dev-lang/ghc-7.10.1:= gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] )
 SLOT=0/2.1.17
 SRC_URI=https://hackage.haskell.org/package/hlint-2.1.17/hlint-2.1.17.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2098cdc98fc0e87a82bc4154ba4b8931
diff --git a/metadata/md5-cache/dev-haskell/process-conduit-1.1.0.0-r1 b/metadata/md5-cache/dev-haskell/process-conduit-1.1.0.0-r1
deleted file mode 100644
index 471e63a0748b..000000000000
--- a/metadata/md5-cache/dev-haskell/process-conduit-1.1.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/shakespeare-text-1.0:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Conduits for processes
-EAPI=5
-HOMEPAGE=https://github.com/tanakh/process-conduit
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/shakespeare-text-1.0:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.12.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.1.0.0
-SRC_URI=https://hackage.haskell.org/package/process-conduit-1.1.0.0/process-conduit-1.1.0.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ee5521bbb97882a9f43ae8ee3ffd7c69
diff --git a/metadata/md5-cache/dev-haskell/process-conduit-1.2.0.1 b/metadata/md5-cache/dev-haskell/process-conduit-1.2.0.1
deleted file mode 100644
index 0c1318a1996d..000000000000
--- a/metadata/md5-cache/dev-haskell/process-conduit-1.2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/shakespeare-text-1.0:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( dev-haskell/conduit-extra >=dev-haskell/hspec-1.3 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Conduits for processes (deprecated)
-EAPI=5
-HOMEPAGE=https://github.com/snoyberg/process-conduit
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/conduit-1.1:=[profile?] >=dev-haskell/control-monad-loop-0.1:=[profile?] <dev-haskell/control-monad-loop-0.2:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] >=dev-haskell/resourcet-1.1:=[profile?] dev-haskell/shakespeare:=[profile?] >=dev-haskell/shakespeare-text-1.0:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=!test? ( test )
-SLOT=0/1.2.0.1
-SRC_URI=https://hackage.haskell.org/package/process-conduit-1.2.0.1/process-conduit-1.2.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ad528dfbdd84bb0ebb903d1fe804d150
diff --git a/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1 b/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
index b477ff6f2ad2..903d35b74281 100644
--- a/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
+++ b/metadata/md5-cache/dev-haskell/zlib-enum-0.2.3.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Enumerator interface for zlib compression
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/maltem/zlib-enum
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/transformers-0.2:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+RDEPEND=>=dev-haskell/enumerator-0.4:=[profile?] <dev-haskell/enumerator-0.5:=[profile?] >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] >=dev-lang/ghc-7.8.2:=
 SLOT=0/0.2.3.1
 SRC_URI=https://hackage.haskell.org/package/zlib-enum-0.2.3.1/zlib-enum-0.2.3.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7e01ea944ffcaee99837865a78c62942
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a0d6e80dada0167015cdf56d240c275f
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 0efd11ff1519..4dab1eb3d993 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/bcprov-1.66 b/metadata/md5-cache/dev-java/bcprov-1.66
index b018df72b485..b0ff24df6392 100644
--- a/metadata/md5-cache/dev-java/bcprov-1.66
+++ b/metadata/md5-cache/dev-java/bcprov-1.66
@@ -4,11 +4,11 @@ DESCRIPTION=Java cryptography APIs
 EAPI=7
 HOMEPAGE=https://www.bouncycastle.org/java.html
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.66
 SRC_URI=https://www.bouncycastle.org/download/bcprov-jdk15on-166.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	ec7a89849c84f93e9c6db27812923888
-_md5_=b32b603623d86b9bb86d07c7e71441a3
+_md5_=19c7420c8ce99a167f11e626cfb5f61b
diff --git a/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1 b/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
index 1178555ae41e..a8cbbe3f816b 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.8.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AdoptOpenJDK/icedtea-web/archive/icedtea-web-1.8.4.tar.gz https://crates.io/api/v1/crates/dunce/0.1.1/download -> dunce-0.1.1.crate
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	16808adb27d34df9e5106842af29c73c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=89d48114122e44726a87a4157500206c
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.6.1-r1 b/metadata/md5-cache/dev-java/maven-bin-3.6.1-r1
deleted file mode 100644
index 193cfef7f3eb..000000000000
--- a/metadata/md5-cache/dev-java/maven-bin-3.6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Project Management and Comprehension Tool for Java
-EAPI=6
-HOMEPAGE=https://maven.apache.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=3.6
-SRC_URI=mirror://apache/maven/maven-3/3.6.1/binaries/apache-maven-3.6.1-bin.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=805e8df361f0d498ddeac0a0f8e7d622
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.6.2 b/metadata/md5-cache/dev-java/maven-bin-3.6.2
index 45411e044df7..5b0ba7159e00 100644
--- a/metadata/md5-cache/dev-java/maven-bin-3.6.2
+++ b/metadata/md5-cache/dev-java/maven-bin-3.6.2
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=3.6
 SRC_URI=mirror://apache/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888
-_md5_=8f8469fc39267ef6e5758805cfd7b9f6
+_md5_=cd323c62e3ee6c0a4323580a7828b29c
diff --git a/metadata/md5-cache/dev-java/maven-bin-3.6.3 b/metadata/md5-cache/dev-java/maven-bin-3.6.3
new file mode 100644
index 000000000000..a1f69800c595
--- /dev/null
+++ b/metadata/md5-cache/dev-java/maven-bin-3.6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 app-eselect/eselect-java >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Project Management and Comprehension Tool for Java
+EAPI=7
+HOMEPAGE=https://maven.apache.org/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+SLOT=3.6
+SRC_URI=mirror://apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888
+_md5_=9d2bf7819e0b05b69ec98d3575ba6d5c
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.8_p10 b/metadata/md5-cache/dev-java/openjdk-11.0.8_p10
index 61c37daf303b..d9d465fb70cb 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.8_p10
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.8_p10
@@ -11,4 +11,4 @@ REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.8-ga.tar.bz2 -> openjdk-11.0.8_p10.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ca3cfd1c840ad084a99a0af80543a9b
+_md5_=d947c68f63616adbf132b42f3258b1b4
diff --git a/metadata/md5-cache/dev-java/openjdk-8.265_p01 b/metadata/md5-cache/dev-java/openjdk-8.265_p01
index 79ffacf433c7..83b0f4db5291 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.265_p01
+++ b/metadata/md5-cache/dev-java/openjdk-8.265_p01
@@ -11,4 +11,4 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/ba
 SLOT=8
 SRC_URI=!arm64? ( https://hg.openjdk.java.net/jdk8u/jdk8u/archive/jdk8u265-ga.tar.bz2 -> openjdk-8.265_p01.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/corba/archive/jdk8u265-ga.tar.bz2 -> openjdk-corba-8.265_p01.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/archive/jdk8u265-ga.tar.bz2 -> openjdk-hotspot-8.265_p01.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxp/archive/jdk8u265-ga.tar.bz2 -> openjdk-jaxp-8.265_p01.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jaxws/archive/jdk8u265-ga.tar.bz2 -> openjdk-jaxws-8.265_p01.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/archive/jdk8u265-ga.tar.bz2 -> openjdk-jdk-8.265_p01.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/langtools/archive/jdk8u265-ga.tar.bz2 -> openjdk-langtools-8.265_p01.tar.bz2 https://hg.openjdk.java.net/jdk8u/jdk8u/nashorn/archive/jdk8u265-ga.tar.bz2 -> openjdk-nashorn-8.265_p01.tar.bz2 ) arm64? ( https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/archive/aarch64-shenandoah-jdk8u265-b01.tar.bz2 -> openjdk-aarch64-shenandoah-8.265_p01.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba/archive/aarch64-shenandoah-jdk8u265-b01.tar.bz2 -> openjdk-aarch64-shenandoah-corba-8.265_p01.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot/archive/aarch64-shenandoah-jdk8u265-b01.tar.bz2 -> openjdk-aarch64-shenandoah-hotspot-8.265_p01.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp/archive/aarch64-shenandoah-jdk8u265-b01.tar.bz2 -> openjdk-aarch64-shenandoah-jaxp-8.265_p01.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws/archive/aarch64-shenandoah-jdk8u265-b01.tar.bz2 -> openjdk-aarch64-shenandoah-jaxws-8.265_p01.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk/archive/aarch64-shenandoah-jdk8u265-b01.tar.bz2 -> openjdk-aarch64-shenandoah-jdk-8.265_p01.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/aarch64-shenandoah-jdk8u265-b01.tar.bz2 -> openjdk-aarch64-shenandoah-langtools-8.265_p01.tar.bz2 https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/aarch64-shenandoah-jdk8u265-b01.tar.bz2 -> openjdk-aarch64-shenandoah-nashorn-jdk8.265_p01.tar.bz2 )
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=12bde4cd12321778cbde690ce6c4a838
+_md5_=4522b9b512187925737f466c52da1cd4
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.10.1 b/metadata/md5-cache/dev-java/protobuf-java-3.10.1
deleted file mode 100644
index 60fd5408afc6..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=~dev-libs/protobuf-3.10.1 >=virtual/jdk-1.7
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - Java bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/21
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.10.1.tar.gz -> protobuf-3.10.1.tar.gz
-_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	ec7a89849c84f93e9c6db27812923888
-_md5_=94ff1185a0eb88959d8c3e7899bd3b74
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.12.4 b/metadata/md5-cache/dev-java/protobuf-java-3.12.4
index d45c5805d148..5f8f920c14e8 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.12.4
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.12.4
@@ -5,10 +5,10 @@ DESCRIPTION=Google's Protocol Buffers - Java bindings
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/23
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.4.tar.gz -> protobuf-3.12.4.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	ec7a89849c84f93e9c6db27812923888
-_md5_=28203c974f2fa8cc7ba52293a075ddb0
+_md5_=6bea6e051937352081c9325eb2e57b50
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.13.0 b/metadata/md5-cache/dev-java/protobuf-java-3.13.0
index b5ba108d7edd..e47f7f686453 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-3.13.0
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.13.0
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-
 SLOT=0/24
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz -> protobuf-3.13.0.tar.gz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	ec7a89849c84f93e9c6db27812923888
-_md5_=f2169f2ae1353b14844ee25b1d99838a
+_md5_=176ba11a2adfdd3466ad043bc7782087
diff --git a/metadata/md5-cache/dev-java/protobuf-java-9999 b/metadata/md5-cache/dev-java/protobuf-java-9999
index c4437ec42405..128e9b2b1e89 100644
--- a/metadata/md5-cache/dev-java/protobuf-java-9999
+++ b/metadata/md5-cache/dev-java/protobuf-java-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/24
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	a814c0c1adac3d7902bc7023902a2e1a	java-utils-2	ec7a89849c84f93e9c6db27812923888
-_md5_=052d53d4d6aa12f308b1116349df9966
+_md5_=68cd0885d3e7f14c988c3219186a4307
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index f460a34ead64..770bdcb31d2f 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/c-intercal-31.0 b/metadata/md5-cache/dev-lang/c-intercal-31.0
index 69191b5ed001..e54f48d2a4aa 100644
--- a/metadata/md5-cache/dev-lang/c-intercal-31.0
+++ b/metadata/md5-cache/dev-lang/c-intercal-31.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/intercal/intercal-0.31.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6efac9b6271a5b52807b7e74901523da
diff --git a/metadata/md5-cache/dev-lang/erlang-22.3.2 b/metadata/md5-cache/dev-lang/erlang-22.3.2
index d8d06e1cc166..37b1d3a73d6d 100644
--- a/metadata/md5-cache/dev-lang/erlang-22.3.2
+++ b/metadata/md5-cache/dev-lang/erlang-22.3.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) 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 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/22.3.2
 SRC_URI=https://github.com/erlang/otp/archive/OTP-22.3.2.tar.gz -> erlang-22.3.2.tar.gz http://erlang.org/download/otp_doc_man_22.3.tar.gz -> erlang_doc_man_22.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.3.tar.gz -> erlang_doc_html_22.3.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=66ae759c61c7f83986e98090255a77ad
diff --git a/metadata/md5-cache/dev-lang/erlang-22.3.4 b/metadata/md5-cache/dev-lang/erlang-22.3.4
index 084f570bd5c5..823d153d31d4 100644
--- a/metadata/md5-cache/dev-lang/erlang-22.3.4
+++ b/metadata/md5-cache/dev-lang/erlang-22.3.4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) 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 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/22.3.4
 SRC_URI=https://github.com/erlang/otp/archive/OTP-22.3.4.tar.gz -> erlang-22.3.4.tar.gz http://erlang.org/download/otp_doc_man_22.3.tar.gz -> erlang_doc_man_22.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.3.tar.gz -> erlang_doc_html_22.3.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=efda848b93321bdfbf05193d2cbe872a
diff --git a/metadata/md5-cache/dev-lang/erlang-23.0.1 b/metadata/md5-cache/dev-lang/erlang-23.0.1
deleted file mode 100644
index 14c54b4f8576..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-23.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) 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 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=7
-HOMEPAGE=https://www.erlang.org/
-IUSE=doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) 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 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0/23.0.1
-SRC_URI=https://github.com/erlang/otp/archive/OTP-23.0.1.tar.gz -> erlang-23.0.1.tar.gz http://erlang.org/download/otp_doc_man_23.0.tar.gz -> erlang_doc_man_23.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.0.tar.gz -> erlang_doc_html_23.0.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=66ae759c61c7f83986e98090255a77ad
diff --git a/metadata/md5-cache/dev-lang/erlang-23.0.2 b/metadata/md5-cache/dev-lang/erlang-23.0.2
index 1457ebc672fa..d8657cd49e94 100644
--- a/metadata/md5-cache/dev-lang/erlang-23.0.2
+++ b/metadata/md5-cache/dev-lang/erlang-23.0.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) 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 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/23.0.2
 SRC_URI=https://github.com/erlang/otp/archive/OTP-23.0.2.tar.gz -> erlang-23.0.2.tar.gz http://erlang.org/download/otp_doc_man_23.0.tar.gz -> erlang_doc_man_23.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.0.tar.gz -> erlang_doc_html_23.0.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=f9ed637583f845dd9eec29a3386e83ce
diff --git a/metadata/md5-cache/dev-lang/erlang-23.0.3 b/metadata/md5-cache/dev-lang/erlang-23.0.3
index 1e3404f1dee7..f2b9baaccf56 100644
--- a/metadata/md5-cache/dev-lang/erlang-23.0.3
+++ b/metadata/md5-cache/dev-lang/erlang-23.0.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) 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 ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/23.0.3
 SRC_URI=https://github.com/erlang/otp/archive/OTP-23.0.3.tar.gz -> erlang-23.0.3.tar.gz http://erlang.org/download/otp_doc_man_23.0.tar.gz -> erlang_doc_man_23.0.tar.gz doc? ( http://erlang.org/download/otp_doc_html_23.0.tar.gz -> erlang_doc_html_23.0.tar.gz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=8499078eecfdaa6167aff77402d0c9ef
diff --git a/metadata/md5-cache/dev-lang/gdl-0.9.6-r3 b/metadata/md5-cache/dev-lang/gdl-0.9.6-r3
deleted file mode 100644
index 0389fc6d0479..000000000000
--- a/metadata/md5-cache/dev-lang/gdl-0.9.6-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-cpp/antlr-cpp:2= sci-libs/gsl:0= sci-libs/plplot:0=[-dynamic] sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libX11:0= fftw? ( sci-libs/fftw:3.0= ) gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= ) hdf? ( sci-libs/hdf:0= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) netcdf? ( sci-libs/netcdf ) proj? ( sci-libs/proj ) postscript? ( dev-libs/pslib ) 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(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) udunits? ( sci-libs/udunits ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) dev-java/antlr:0[java(+),script(+)] virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GNU Data Language
-EAPI=5
-HOMEPAGE=https://github.com/gnudatalanguage/gdl
-IUSE=+eigen fftw graphicsmagick gshhs hdf hdf5 +imagemagick netcdf openmp png proj postscript python static-libs udunits wxwidgets python_targets_python2_7 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-cpp/antlr-cpp:2= sci-libs/gsl:0= sci-libs/plplot:0=[-dynamic] sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libX11:0= fftw? ( sci-libs/fftw:3.0= ) gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= ) hdf? ( sci-libs/hdf:0= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) netcdf? ( sci-libs/netcdf ) proj? ( sci-libs/proj ) postscript? ( dev-libs/pslib ) 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(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) udunits? ( sci-libs/udunits ) wxwidgets? ( x11-libs/wxGTK:3.0[X] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/gnudatalanguage/gdl-0.9.6v2.tgz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd4c604594490fb48d54ce8cc3b0a9bd
diff --git a/metadata/md5-cache/dev-lang/gdl-1.0.0_rc3 b/metadata/md5-cache/dev-lang/gdl-1.0.0_rc3
new file mode 100644
index 000000000000..5ba18f4777d7
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/gdl-1.0.0_rc3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig python? ( app-admin/chrpath ) sys-devel/make dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-cpp/antlr-cpp:2= dev-libs/expat sci-libs/gsl:0= sci-libs/plplot:0=[cxx,-dynamic] sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib x11-libs/libX11 fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:= ) gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= ) hdf? ( sci-libs/hdf:0= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) netcdf? ( sci-libs/netcdf ) proj? ( sci-libs/proj ) postscript? ( dev-libs/pslib ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) tiff? ( media-libs/tiff sci-libs/libgeotiff ) udunits? ( sci-libs/udunits ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] ) eigen? ( dev-cpp/eigen:3 )
+DESCRIPTION=GNU Data Language
+EAPI=7
+HOMEPAGE=https://github.com/gnudatalanguage/gdl
+IUSE=+eigen fftw glpk graphicsmagick gshhs hdf hdf5 +imagemagick netcdf openmp png proj postscript python tiff udunits wxwidgets python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-cpp/antlr-cpp:2= dev-libs/expat sci-libs/gsl:0= sci-libs/plplot:0=[cxx,-dynamic] sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib x11-libs/libX11 fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:= ) gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= ) hdf? ( sci-libs/hdf:0= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) netcdf? ( sci-libs/netcdf ) proj? ( sci-libs/proj ) postscript? ( dev-libs/pslib ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) tiff? ( media-libs/tiff sci-libs/libgeotiff ) udunits? ( sci-libs/udunits ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3[X] )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gnudatalanguage/gdl/archive/v1.0.0-rc.3.tar.gz -> gdl-1.0.0_rc3.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d9a352a83566f0368247476c88839456
diff --git a/metadata/md5-cache/dev-lang/gforth-0.7.3-r1 b/metadata/md5-cache/dev-lang/gforth-0.7.3-r1
index 9f811f7b0c1e..6b47adca2fc2 100644
--- a/metadata/md5-cache/dev-lang/gforth-0.7.3-r1
+++ b/metadata/md5-cache/dev-lang/gforth-0.7.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/ffcall emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://gnu/gforth/gforth-0.7.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=610fcd3a73fc83d8052abb34a438a889
diff --git a/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6 b/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6
deleted file mode 100644
index 19e3331288fa..000000000000
--- a/metadata/md5-cache/dev-lang/gnuprologjava-0.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6:= dev-java/ant-core >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=GNU Prolog for Java is an implementation of ISO Prolog as a Java library
-EAPI=5
-HOMEPAGE=http://www.gnu.org/software/gnuprologjava
-IUSE=doc elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=virtual/jdk-1.6:= >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://gnu/gnuprologjava/gnuprologjava-0.2.6-src.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b3afe0bf3a2a9394048d8771dacd39fa
diff --git a/metadata/md5-cache/dev-lang/ispc-1.14.1 b/metadata/md5-cache/dev-lang/ispc-1.14.1
index 6463e8cd0b87..b52cd195084e 100644
--- a/metadata/md5-cache/dev-lang/ispc-1.14.1
+++ b/metadata/md5-cache/dev-lang/ispc-1.14.1
@@ -10,5 +10,5 @@ LICENSE=BSD BSD-2 UoI-NCSA
 RDEPEND=>=sys-devel/clang-3.0:* >=sys-devel/llvm-3.0:*
 SLOT=0
 SRC_URI=https://github.com/ispc/ispc/archive/v1.14.1.tar.gz -> ispc-1.14.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8652d29f1c2e637647c920a3f0e01663
diff --git a/metadata/md5-cache/dev-lang/ispc-9999 b/metadata/md5-cache/dev-lang/ispc-9999
index f95b4e011373..0a999393d59d 100644
--- a/metadata/md5-cache/dev-lang/ispc-9999
+++ b/metadata/md5-cache/dev-lang/ispc-9999
@@ -9,5 +9,5 @@ LICENSE=BSD BSD-2 UoI-NCSA
 PROPERTIES=live
 RDEPEND=>=sys-devel/clang-3.0:* >=sys-devel/llvm-3.0:*
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5e428e932c4941790a14057ba80bf3d
diff --git a/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2 b/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
index c43c8b1beb2f..d8c6a51cd550 100644
--- a/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
+++ b/metadata/md5-cache/dev-lang/lisaac-0.13.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=vim-syntax? ( app-editors/vim ) emacs? ( >=app-editors/emacs-23.1 )
 SLOT=0
 SRC_URI=http://isaacproject.u-strasbg.fr/download/lisaac-0.13.1.tar.gz
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d877c904c66751f1916144e3af2a1ae9
diff --git a/metadata/md5-cache/dev-lang/mercury-14.01.1-r1 b/metadata/md5-cache/dev-lang/mercury-14.01.1-r1
index 1a3ca83ef1eb..30b1223abeb7 100644
--- a/metadata/md5-cache/dev-lang/mercury-14.01.1-r1
+++ b/metadata/md5-cache/dev-lang/mercury-14.01.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.6:= ) mono? ( dev-lang/mono ) doc? ( sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-14.01.1.tar.gz mirror://gentoo/mercury-14.01.1-gentoo-patchset-5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=37eee433b0ca82b6f280fd5bcb1b5ad3
diff --git a/metadata/md5-cache/dev-lang/mercury-20.01 b/metadata/md5-cache/dev-lang/mercury-20.01
index f1ec29160925..35d7a1a0c3ab 100644
--- a/metadata/md5-cache/dev-lang/mercury-20.01
+++ b/metadata/md5-cache/dev-lang/mercury-20.01
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.6:= ) mono? ( dev-lang/mono ) doc? ( sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-20.01.tar.gz mirror://gentoo/mercury-20.01-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8167db01e0a798ae6aaa5464ad81750d
diff --git a/metadata/md5-cache/dev-lang/mercury-20.01.1 b/metadata/md5-cache/dev-lang/mercury-20.01.1
index 416776b6f0f5..d31f67afb79c 100644
--- a/metadata/md5-cache/dev-lang/mercury-20.01.1
+++ b/metadata/md5-cache/dev-lang/mercury-20.01.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.6:= ) mono? ( dev-lang/mono ) doc? ( sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-20.01.1.tar.gz mirror://gentoo/mercury-20.01.1-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=100114a8be0bdadd75eff7b060d54186
diff --git a/metadata/md5-cache/dev-lang/mercury-20.01.2 b/metadata/md5-cache/dev-lang/mercury-20.01.2
index 5283567ee852..4bcdfd0d9824 100644
--- a/metadata/md5-cache/dev-lang/mercury-20.01.2
+++ b/metadata/md5-cache/dev-lang/mercury-20.01.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.6:= ) mono? ( dev-lang/mono ) doc? ( sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://dl.mercurylang.org/release-20.01/mercury-srcdist-20.01.2.tar.gz https://dev.gentoo.org/~keri/distfiles/mercury/mercury-20.01.2-gentoo-patchset-1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=442bb7c3e420bf3481a035324ded7aff
diff --git a/metadata/md5-cache/dev-lang/mercury-20.06 b/metadata/md5-cache/dev-lang/mercury-20.06
index 3c83a97e3dcc..8a544cfd0daa 100644
--- a/metadata/md5-cache/dev-lang/mercury-20.06
+++ b/metadata/md5-cache/dev-lang/mercury-20.06
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=net-libs/libnsl:0= readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.6:= ) mono? ( dev-lang/mono ) doc? ( sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=https://dl.mercurylang.org/release-20.06/mercury-srcdist-20.06.tar.gz https://dev.gentoo.org/~keri/distfiles/mercury/mercury-20.06-gentoo-patchset-0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=506cfce578c479b26d9c31a97cf40149
diff --git a/metadata/md5-cache/dev-lang/polyml-5.4.1 b/metadata/md5-cache/dev-lang/polyml-5.4.1
deleted file mode 100644
index 5206374f0fdb..000000000000
--- a/metadata/md5-cache/dev-lang/polyml-5.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Poly/ML is a full implementation of Standard ML
-EAPI=5
-HOMEPAGE=https://www.polyml.org
-IUSE=X elibc_glibc +gmp portable test +threads
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
-RESTRICT=!test? ( test )
-SLOT=0/5.4.1
-SRC_URI=mirror://sourceforge/polyml/polyml.5.4.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=17fe45c50bba67938c97adf49a8deb29
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.0 b/metadata/md5-cache/dev-lang/polyml-5.5.0
deleted file mode 100644
index 50d7e17a5eb1..000000000000
--- a/metadata/md5-cache/dev-lang/polyml-5.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Poly/ML is a full implementation of Standard ML
-EAPI=5
-HOMEPAGE=https://www.polyml.org
-IUSE=X elibc_glibc +gmp portable test +threads
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
-RESTRICT=!test? ( test )
-SLOT=0/5.5.0
-SRC_URI=mirror://sourceforge/polyml/polyml.5.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bc48e7bf452c8f80d3d65e55fba76961
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.1 b/metadata/md5-cache/dev-lang/polyml-5.5.1
deleted file mode 100644
index 5f66c3dbc17a..000000000000
--- a/metadata/md5-cache/dev-lang/polyml-5.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Poly/ML is a full implementation of Standard ML
-EAPI=5
-HOMEPAGE=https://www.polyml.org
-IUSE=X elibc_glibc +gmp portable test +threads
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
-RESTRICT=!test? ( test )
-SLOT=0/5.5.1
-SRC_URI=mirror://sourceforge/polyml/polyml.5.5.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=afa609e4abfac09fc9cbfdcad30d51de
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.2 b/metadata/md5-cache/dev-lang/polyml-5.5.2
deleted file mode 100644
index 5ecdf4976189..000000000000
--- a/metadata/md5-cache/dev-lang/polyml-5.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Poly/ML is a full implementation of Standard ML
-EAPI=5
-HOMEPAGE=https://www.polyml.org
-IUSE=X elibc_glibc +gmp portable test +threads
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
-RESTRICT=!test? ( test )
-SLOT=0/5.5.2
-SRC_URI=mirror://sourceforge/polyml/polyml.5.5.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ccdd86de6175dbea2bb045dd8158cd95
diff --git a/metadata/md5-cache/dev-lang/python-3.8.6 b/metadata/md5-cache/dev-lang/python-3.8.6
new file mode 100644
index 000000000000..f5c164e06760
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.8.6
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+PDEPEND=>=app-eselect/eselect-python-20140125-r1
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.8
+SRC_URI=https://www.python.org/ftp/python/3.8.6/Python-3.8.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.6.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=94ea499c26da2fbc9924243b240d82cd
diff --git a/metadata/md5-cache/dev-lang/snobol-1.1 b/metadata/md5-cache/dev-lang/snobol-1.1
deleted file mode 100644
index b3940b206db2..000000000000
--- a/metadata/md5-cache/dev-lang/snobol-1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-devel/gcc sys-devel/m4
-DESCRIPTION=Phil Budne's port of Macro SNOBOL4 in C, for modern machines
-EAPI=4
-HOMEPAGE=http://www.snobol4.org/csnobol4/
-KEYWORDS=~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=ftp://ftp.snobol4.org/snobol/old/snobol4-1.1.tar.gz
-_md5_=03c5381d019d59d8c83458e7c18dcdc8
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.3.0 b/metadata/md5-cache/dev-lang/spidermonkey-78.3.0
new file mode 100644
index 000000000000..4582e755d719
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.3.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) sys-devel/llvm >=virtual/rust-1.41.0 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-libs/zlib-1.2.3 test? ( || ( ( dev-lang/python:3.9 dev-python/six[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/six[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/six[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) )
+DESCRIPTION=SpiderMonkey is Mozilla's JavaScript engine written in C and C++
+EAPI=7
+HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
+IUSE=cpu_flags_arm_neon debug +jit test
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-libs/icu-67.1:= >=dev-libs/nspr-4.25 sys-libs/readline:0= >=sys-libs/zlib-1.2.3
+RESTRICT=!test? ( test )
+SLOT=78
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/source/firefox-78.3.0esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-esr-78-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-esr-78-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-esr-78-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-78-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-78-patches-01.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-78-patches-01.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3587c713b5968969c3ede905382e97db
diff --git a/metadata/md5-cache/dev-lang/squirrel-3.1_p20200612 b/metadata/md5-cache/dev-lang/squirrel-3.1_p20200612
index 46a1132957d0..059d12202884 100644
--- a/metadata/md5-cache/dev-lang/squirrel-3.1_p20200612
+++ b/metadata/md5-cache/dev-lang/squirrel-3.1_p20200612
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=https://github.com/albertodemichelis/squirrel/archive/40050fa249733c85485adde533774ec066d29aca.tar.gz -> squirrel-3.1_p20200612.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08f9fca7fe02fe001abe9f27d0734480
diff --git a/metadata/md5-cache/dev-lang/teyjus-2.1 b/metadata/md5-cache/dev-lang/teyjus-2.1
index b49763b6c41b..aec40cc67e5b 100644
--- a/metadata/md5-cache/dev-lang/teyjus-2.1
+++ b/metadata/md5-cache/dev-lang/teyjus-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0/2.1
 SRC_URI=https://github.com/teyjus/teyjus/archive/v2.1.tar.gz -> teyjus-2.1.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5070c03cafa714de321e27f21715a0bb
diff --git a/metadata/md5-cache/dev-lang/teyjus-2.1-r1 b/metadata/md5-cache/dev-lang/teyjus-2.1-r1
index 7bae7cac9a04..468ec7e83861 100644
--- a/metadata/md5-cache/dev-lang/teyjus-2.1-r1
+++ b/metadata/md5-cache/dev-lang/teyjus-2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0/2.1
 SRC_URI=https://github.com/teyjus/teyjus/archive/v2.1.tar.gz -> teyjus-2.1.tar.gz
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b34cd250fa85ef4700126e4c3d3f4372
diff --git a/metadata/md5-cache/dev-lang/tuprolog-2.9.2 b/metadata/md5-cache/dev-lang/tuprolog-2.9.2
deleted file mode 100644
index 345f89d52ee6..000000000000
--- a/metadata/md5-cache/dev-lang/tuprolog-2.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7:= dev-java/javassist:3 dev-java/ant-core test? ( dev-java/ant-junit4:0 dev-java/junit:4 dev-java/hamcrest-core:1.3 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=tuProlog is a light-weight Prolog for Internet applications and infrastructures
-EAPI=5
-HOMEPAGE=http://tuprolog.unibo.it/
-IUSE=doc examples test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-RDEPEND=>=virtual/jdk-1.7:= dev-java/javassist:3 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gentoo/tuprolog-2.9.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d414b6dfdd9979c3c91d17934e8e8fb6
diff --git a/metadata/md5-cache/dev-lang/tuprolog-3.0.1 b/metadata/md5-cache/dev-lang/tuprolog-3.0.1
deleted file mode 100644
index 2e8b3b8569fb..000000000000
--- a/metadata/md5-cache/dev-lang/tuprolog-3.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 dev-java/ant-core test? ( dev-java/ant-junit4:0 dev-java/junit:4 dev-java/hamcrest-core:1.3 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=tuProlog is a light-weight Prolog for Internet applications and infrastructures
-EAPI=5
-HOMEPAGE=http://tuprolog.unibo.it/
-IUSE=doc examples test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3 BSD
-RDEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gentoo/tuprolog-3.0.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=92ce98c1d68a69c9a2cf1b67b495b935
diff --git a/metadata/md5-cache/dev-lang/tuprolog-3.1.0 b/metadata/md5-cache/dev-lang/tuprolog-3.1.0
deleted file mode 100644
index d6b6d5221487..000000000000
--- a/metadata/md5-cache/dev-lang/tuprolog-3.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 dev-java/ant-core test? ( dev-java/ant-junit4:0 dev-java/junit:4 dev-java/hamcrest-core:1.3 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=tuProlog is a light-weight Prolog for Internet applications and infrastructures
-EAPI=5
-HOMEPAGE=http://tuprolog.unibo.it/
-IUSE=doc examples test elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3 BSD
-RDEPEND=>=virtual/jdk-1.8:= dev-java/javassist:3 dev-java/commons-lang:3.1 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gentoo/tuprolog-3.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=20626041f203eed8b164ea97dcfa544b
diff --git a/metadata/md5-cache/dev-lang/xsb-3.6.0 b/metadata/md5-cache/dev-lang/xsb-3.6.0
deleted file mode 100644
index 442ddc95f278..000000000000
--- a/metadata/md5-cache/dev-lang/xsb-3.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=XSB is a logic programming and deductive database system
-EAPI=5
-HOMEPAGE=http://xsb.sourceforge.net
-IUSE=curl debug iodbc java mysql odbc pcre threads xml elibc_FreeBSD java
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://xsb.sourceforge.net/downloads/XSB360.tar.gz mirror://gentoo/xsb-3.6.0-gentoo-patchset-4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=67b8acbc9a58fb2bb77ee79065a96468
diff --git a/metadata/md5-cache/dev-lang/xsb-3.6.0-r1 b/metadata/md5-cache/dev-lang/xsb-3.6.0-r1
deleted file mode 100644
index 01e4f422e85e..000000000000
--- a/metadata/md5-cache/dev-lang/xsb-3.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=XSB is a logic programming and deductive database system
-EAPI=6
-HOMEPAGE=http://xsb.sourceforge.net
-IUSE=curl debug iodbc java mysql odbc pcre threads xml elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://xsb.sourceforge.net/downloads/XSB360.tar.gz mirror://gentoo/xsb-3.6.0-gentoo-patchset-4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=363832b7aabe195482bef63ea9fff95e
diff --git a/metadata/md5-cache/dev-lang/xsb-3.7.0-r1 b/metadata/md5-cache/dev-lang/xsb-3.7.0-r1
deleted file mode 100644
index 857ac203c454..000000000000
--- a/metadata/md5-cache/dev-lang/xsb-3.7.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=XSB is a logic programming and deductive database system
-EAPI=6
-HOMEPAGE=http://xsb.sourceforge.net
-IUSE=curl debug iodbc java mysql odbc pcre threads xml elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://xsb.sourceforge.net/downloads/XSB370.tar.gz mirror://gentoo/xsb-3.7.0-gentoo-patchset-3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f10d222d7b69e72f992c19e3b2e79aae
diff --git a/metadata/md5-cache/dev-lang/zig-0.5.0 b/metadata/md5-cache/dev-lang/zig-0.5.0
index d96c9402db20..53a5fb542175 100644
--- a/metadata/md5-cache/dev-lang/zig-0.5.0
+++ b/metadata/md5-cache/dev-lang/zig-0.5.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-devel/llvm:9 !experimental? ( sys-devel/llvm:9[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:9
 SLOT=0
 SRC_URI=https://github.com/ziglang/zig/archive/0.5.0.tar.gz -> zig-0.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5844e96b83038ffe8544c676ee9325ee
diff --git a/metadata/md5-cache/dev-lang/zig-9999 b/metadata/md5-cache/dev-lang/zig-9999
index 70f0088ce456..52903dbc789c 100644
--- a/metadata/md5-cache/dev-lang/zig-9999
+++ b/metadata/md5-cache/dev-lang/zig-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=sys-devel/llvm:9 !experimental? ( sys-devel/llvm:9[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:9
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5844e96b83038ffe8544c676ee9325ee
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index c5484a86e738..d4de0bf3d58e 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/atcore-1.0.0 b/metadata/md5-cache/dev-libs/atcore-1.0.0
index 376c4b91add6..51007e89ae1e 100644
--- a/metadata/md5-cache/dev-libs/atcore-1.0.0
+++ b/metadata/md5-cache/dev-libs/atcore-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtserialport-5.12.3:5 gui? ( >=dev-qt/qtcharts-5.12.3:5 >=dev-q
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/atcore/1.0.0/atcore-1.0.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1e50ca7ebb68bec4ea41ba8d189940ba
diff --git a/metadata/md5-cache/dev-libs/avro-c-1.9.1 b/metadata/md5-cache/dev-libs/avro-c-1.9.1
index 040133ebde2e..584f140bb5da 100644
--- a/metadata/md5-cache/dev-libs/avro-c-1.9.1
+++ b/metadata/md5-cache/dev-libs/avro-c-1.9.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-arch/snappy >=dev-libs/jansson-2.3 sys-libs/zlib
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/avro/avro-1.9.1/c/avro-c-1.9.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=656b30d668c45be5ae4308c3704f1e86
diff --git a/metadata/md5-cache/dev-libs/aws-c-common-0.4.11 b/metadata/md5-cache/dev-libs/aws-c-common-0.4.11
deleted file mode 100644
index 61666321c182..000000000000
--- a/metadata/md5-cache/dev-libs/aws-c-common-0.4.11
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Core c99 package for AWS SDK for C
-EAPI=7
-HOMEPAGE=https://github.com/awslabs/aws-c-common
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/awslabs/aws-c-common/archive/v0.4.11.tar.gz -> aws-c-common-0.4.11.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62bf2cdd3b961f055fd362e01b07ab62
diff --git a/metadata/md5-cache/dev-libs/aws-c-common-0.4.57-r1 b/metadata/md5-cache/dev-libs/aws-c-common-0.4.57-r1
new file mode 100644
index 000000000000..2d9deeda5f5c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/aws-c-common-0.4.57-r1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Core c99 package for AWS SDK for C
+EAPI=7
+HOMEPAGE=https://github.com/awslabs/aws-c-common
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/awslabs/aws-c-common/archive/v0.4.57.tar.gz -> aws-c-common-0.4.57.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7d64f9e5da00a54c04533fbc2c926504
diff --git a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3 b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3
deleted file mode 100644
index 6ddf745b6c18..000000000000
--- a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/aws-c-common dev-libs/aws-checksums
-DESCRIPTION=C99 implementation of the vnd.amazon.eventstream content-type
-EAPI=7
-HOMEPAGE=https://github.com/awslabs/aws-c-event-stream
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/awslabs/aws-c-event-stream/archive/v0.1.3.tar.gz -> aws-c-event-stream-0.1.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ea000d2ac43d300c91fb5579276c39a
diff --git a/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.6-r1 b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.6-r1
new file mode 100644
index 000000000000..a95f7a803a00
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/aws-c-event-stream-0.1.6-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/aws-c-common-0.4.26:=[static-libs=] >=dev-libs/aws-checksums-0.1.9:=[static-libs=]
+DESCRIPTION=C99 implementation of the vnd.amazon.eventstream content-type
+EAPI=7
+HOMEPAGE=https://github.com/awslabs/aws-c-event-stream
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/awslabs/aws-c-event-stream/archive/v0.1.6.tar.gz -> aws-c-event-stream-0.1.6.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4cd8f34f60c8ecc9de5473ec2fec7a67
diff --git a/metadata/md5-cache/dev-libs/aws-checksums-0.1.3 b/metadata/md5-cache/dev-libs/aws-checksums-0.1.3
deleted file mode 100644
index 84078cfca899..000000000000
--- a/metadata/md5-cache/dev-libs/aws-checksums-0.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Cross-Platform HW accelerated CRC32c and CRC32 with software fallbacks
-EAPI=7
-HOMEPAGE=https://github.com/awslabs/aws-checksums
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/awslabs/aws-checksums/archive/v0.1.3.tar.gz -> aws-checksums-0.1.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0dc40c514fca80676d78811eb7300b07
diff --git a/metadata/md5-cache/dev-libs/aws-checksums-0.1.9-r1 b/metadata/md5-cache/dev-libs/aws-checksums-0.1.9-r1
new file mode 100644
index 000000000000..997c0a5e85ad
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/aws-checksums-0.1.9-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/aws-c-common-0.4.26:=[static-libs=]
+DESCRIPTION=Cross-Platform HW accelerated CRC32c and CRC32 with software fallbacks
+EAPI=7
+HOMEPAGE=https://github.com/awslabs/aws-checksums
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/awslabs/aws-checksums/archive/v0.1.9.tar.gz -> aws-checksums-0.1.9.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18cbcd84e93d80f2ac58c0551a5b437a
diff --git a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.46 b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.46
deleted file mode 100644
index 87908df9de58..000000000000
--- a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.46
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=http? ( net-misc/curl:= ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) dev-libs/aws-c-common dev-libs/aws-checksums dev-libs/aws-c-event-stream sys-libs/zlib
-DESCRIPTION=AWS SDK for C++
-EAPI=7
-HOMEPAGE=https://aws.amazon.com/sdk-for-cpp/
-IUSE=+http libressl pulseaudio +rtti +ssl static-libs test unity-build access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs eks elasticache elasticbeanstalk elasticinference elasticloadbalancing elasticmapreduce email es events forecast frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail machinelearning macie managedblockchain marketplace networkmanager opsworks organizations other outposts personalize polly qldb queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract transcribe translate waf python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=http? ( net-misc/curl:= ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) dev-libs/aws-c-common dev-libs/aws-checksums dev-libs/aws-c-event-stream sys-libs/zlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws/aws-sdk-cpp/archive/1.8.46.tar.gz -> aws-sdk-cpp-1.8.46.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f967bed7db5165bfb56e3fc1bdac5a4
diff --git a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.46-r2 b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.46-r2
new file mode 100644
index 000000000000..13021c41c7a2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.8.46-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=http? ( net-misc/curl:= ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=dev-libs/aws-c-common-0.4.26:=[static-libs=] >=dev-libs/aws-c-event-stream-0.1.6:=[static-libs=] >=dev-libs/aws-checksums-0.1.9:=[static-libs=] sys-libs/zlib
+DESCRIPTION=AWS SDK for C++
+EAPI=7
+HOMEPAGE=https://aws.amazon.com/sdk-for-cpp/
+IUSE=+http libressl pulseaudio +rtti +ssl static-libs test unity-build access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs eks elasticache elasticbeanstalk elastic-inference elasticloadbalancing elasticmapreduce email es events forecast frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail machinelearning macie managedblockchain marketplace networkmanager opsworks organizations other outposts personalize polly qldb queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract transcribe translate waf python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=http? ( net-misc/curl:= ) pulseaudio? ( media-sound/pulseaudio ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=dev-libs/aws-c-common-0.4.26:=[static-libs=] >=dev-libs/aws-c-event-stream-0.1.6:=[static-libs=] >=dev-libs/aws-checksums-0.1.9:=[static-libs=] sys-libs/zlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-sdk-cpp/archive/1.8.46.tar.gz -> aws-sdk-cpp-1.8.46.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bf080e6d9b578f23927c930ef1cda317
diff --git a/metadata/md5-cache/dev-libs/bcm2835-1.52 b/metadata/md5-cache/dev-libs/bcm2835-1.52
deleted file mode 100644
index 63685e60a967..000000000000
--- a/metadata/md5-cache/dev-libs/bcm2835-1.52
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=doc? ( app-doc/doxygen )
-DESCRIPTION=Provides access to GPIO and other IO functions on the Broadcom BCM2835
-EAPI=6
-HOMEPAGE=http://www.airspayce.com/mikem/bcm2835/
-IUSE=doc examples
-KEYWORDS=~arm
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.airspayce.com/mikem/bcm2835/bcm2835-1.52.tar.gz
-_md5_=79a79a6cd29e81d76e686c10df7c340b
diff --git a/metadata/md5-cache/dev-libs/bcm2835-1.68 b/metadata/md5-cache/dev-libs/bcm2835-1.68
new file mode 100644
index 000000000000..a3b7f0806bf6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/bcm2835-1.68
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=doc? ( app-doc/doxygen )
+DESCRIPTION=Provides access to GPIO and other IO functions on the Broadcom BCM2835
+EAPI=6
+HOMEPAGE=https://www.airspayce.com/mikem/bcm2835/
+IUSE=doc examples
+KEYWORDS=~arm
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://www.airspayce.com/mikem/bcm2835/bcm2835-1.68.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=865a6363a6bd357d913028d810b8be07
diff --git a/metadata/md5-cache/dev-libs/boost-1.72.0-r1 b/metadata/md5-cache/dev-libs/boost-1.72.0-r1
deleted file mode 100644
index 15aa524542fa..000000000000
--- a/metadata/md5-cache/dev-libs/boost-1.72.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND==dev-util/boost-build-1.72*
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] numpy? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Boost Libraries for C++
-EAPI=7
-HOMEPAGE=https://www.boost.org/
-IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt
-LICENSE=Boost-1.0
-RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] numpy? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
-RESTRICT=test
-SLOT=0/1.72.0
-SRC_URI=https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b4b895bce1a221c3b6730b7519ed2271
diff --git a/metadata/md5-cache/dev-libs/boost-1.72.0-r2 b/metadata/md5-cache/dev-libs/boost-1.72.0-r2
new file mode 100644
index 000000000000..d4ddd0c717a5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/boost-1.72.0-r2
@@ -0,0 +1,16 @@
+BDEPEND==dev-util/boost-build-1.72*
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] numpy? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Boost Libraries for C++
+EAPI=7
+HOMEPAGE=https://www.boost.org/
+IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt
+LICENSE=Boost-1.0
+RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] numpy? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
+RESTRICT=test
+SLOT=0/1.72.0
+SRC_URI=https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=08c2ab2fb21bac0433e7e32649a72e24
diff --git a/metadata/md5-cache/dev-libs/boost-1.73.0 b/metadata/md5-cache/dev-libs/boost-1.73.0
deleted file mode 100644
index ef720d36c31d..000000000000
--- a/metadata/md5-cache/dev-libs/boost-1.73.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND==dev-util/boost-build-1.73*
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] numpy? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Boost Libraries for C++
-EAPI=7
-HOMEPAGE=https://www.boost.org/
-IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt
-LICENSE=Boost-1.0
-RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] numpy? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
-RESTRICT=test
-SLOT=0/1.73.0
-SRC_URI=https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f988a906afa1786cc375c96b88c4bb88
diff --git a/metadata/md5-cache/dev-libs/boost-1.73.0-r1 b/metadata/md5-cache/dev-libs/boost-1.73.0-r1
new file mode 100644
index 000000000000..9292714d1730
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/boost-1.73.0-r1
@@ -0,0 +1,16 @@
+BDEPEND==dev-util/boost-build-1.73*
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] numpy? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Boost Libraries for C++
+EAPI=7
+HOMEPAGE=https://www.boost.org/
+IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt
+LICENSE=Boost-1.0
+RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] numpy? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
+RESTRICT=test
+SLOT=0/1.73.0
+SRC_URI=https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b05037b4aa428ad83e0754768425ea61
diff --git a/metadata/md5-cache/dev-libs/boost-1.74.0 b/metadata/md5-cache/dev-libs/boost-1.74.0
deleted file mode 100644
index 7be6c130d208..000000000000
--- a/metadata/md5-cache/dev-libs/boost-1.74.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND==dev-util/boost-build-1.74*
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] numpy? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Boost Libraries for C++
-EAPI=7
-HOMEPAGE=https://www.boost.org/
-IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt
-LICENSE=Boost-1.0
-RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] numpy? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
-RESTRICT=test
-SLOT=0/1.74.0
-SRC_URI=https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bf6079939fdbeab6656efb80c1c219e2
diff --git a/metadata/md5-cache/dev-libs/boost-1.74.0-r1 b/metadata/md5-cache/dev-libs/boost-1.74.0-r1
new file mode 100644
index 000000000000..1fc184dabe28
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/boost-1.74.0-r1
@@ -0,0 +1,16 @@
+BDEPEND==dev-util/boost-build-1.74*
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] numpy? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Boost Libraries for C++
+EAPI=7
+HOMEPAGE=https://www.boost.org/
+IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt
+LICENSE=Boost-1.0
+RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy !<dev-libs/leatherman-1.12.0-r1 bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] numpy? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=test
+SLOT=0/1.74.0
+SRC_URI=https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=55d18f62881ebdc621a9e31b13073364
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.20.0 b/metadata/md5-cache/dev-libs/c-blosc-1.20.0
index dce6944722cc..254cc89eb5e4 100644
--- a/metadata/md5-cache/dev-libs/c-blosc-1.20.0
+++ b/metadata/md5-cache/dev-libs/c-blosc-1.20.0
@@ -11,5 +11,5 @@ RDEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy ) zlib? ( sys-
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.20.0.tar.gz -> c-blosc-1.20.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6b53dffbadb6fcfdf1a12d5dcf967a3f
diff --git a/metadata/md5-cache/dev-libs/c-blosc-1.20.1 b/metadata/md5-cache/dev-libs/c-blosc-1.20.1
index ca26cb6ffdf5..b0890f53b326 100644
--- a/metadata/md5-cache/dev-libs/c-blosc-1.20.1
+++ b/metadata/md5-cache/dev-libs/c-blosc-1.20.1
@@ -11,5 +11,5 @@ RDEPEND=lz4? ( >=app-arch/lz4-1.7.5:= ) snappy? ( app-arch/snappy ) zlib? ( sys-
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Blosc/c-blosc/archive/v1.20.1.tar.gz -> c-blosc-1.20.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1dcf03d1e470dd0df65ef7dc944f7633
diff --git a/metadata/md5-cache/dev-libs/capstone-4.0.2-r2 b/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
index bb634d0b3ffa..c565a1f48d1a 100644
--- a/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
+++ b/metadata/md5-cache/dev-libs/capstone-4.0.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/aquynh/capstone/archive/4.0.2.tar.gz -> capstone-4.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13e131c73401540ac2f5dd4a799a6442
diff --git a/metadata/md5-cache/dev-libs/cereal-1.3.0 b/metadata/md5-cache/dev-libs/cereal-1.3.0
index 2e1edbd7d90d..fe6e47db6672 100644
--- a/metadata/md5-cache/dev-libs/cereal-1.3.0
+++ b/metadata/md5-cache/dev-libs/cereal-1.3.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/USCiLab/cereal/archive/v1.3.0.tar.gz -> cereal-1.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=67dca8f28095805811c4269f770dc23a
diff --git a/metadata/md5-cache/dev-libs/cgreen-1.3.0 b/metadata/md5-cache/dev-libs/cgreen-1.3.0
index 7ecc1ccc2d63..b4ca15b36a2e 100644
--- a/metadata/md5-cache/dev-libs/cgreen-1.3.0
+++ b/metadata/md5-cache/dev-libs/cgreen-1.3.0
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=sys-libs/glibc:=
 SLOT=0
 SRC_URI=https://github.com/cgreen-devs/cgreen/archive/1.3.0.tar.gz -> cgreen-1.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8e0562a8ad3d0972b4008f1559580e96
diff --git a/metadata/md5-cache/dev-libs/check-0.15.0 b/metadata/md5-cache/dev-libs/check-0.15.0
deleted file mode 100644
index 38ad60af49a4..000000000000
--- a/metadata/md5-cache/dev-libs/check-0.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=subunit? ( dev-python/subunit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-apps/texinfo
-DESCRIPTION=A unit test framework for C
-EAPI=7
-HOMEPAGE=https://libcheck.github.io/check/
-IUSE=doc subunit test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=subunit? ( dev-python/subunit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/libcheck/check/archive/0.15.0.tar.gz -> check-0.15.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f0c6dab1d6a8bd85fa9d4d91bd7fafe0
diff --git a/metadata/md5-cache/dev-libs/check-0.15.2 b/metadata/md5-cache/dev-libs/check-0.15.2
index 67709b0448eb..4a6beeefb985 100644
--- a/metadata/md5-cache/dev-libs/check-0.15.2
+++ b/metadata/md5-cache/dev-libs/check-0.15.2
@@ -11,5 +11,5 @@ RDEPEND=subunit? ( dev-python/subunit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=ppc? ( test ) ppc64? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libcheck/check/archive/0.15.2.tar.gz -> check-0.15.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e03eda87ed58195b6356b53e75a640b8
diff --git a/metadata/md5-cache/dev-libs/clhpp-2.0.12 b/metadata/md5-cache/dev-libs/clhpp-2.0.12
index b60ccf267394..3b5bb34bafa3 100644
--- a/metadata/md5-cache/dev-libs/clhpp-2.0.12
+++ b/metadata/md5-cache/dev-libs/clhpp-2.0.12
@@ -9,5 +9,5 @@ LICENSE=Khronos-CLHPP
 RDEPEND=virtual/opencl
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v2.0.12.tar.gz -> clhpp-2.0.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2636ef1391d124763945d316b15f6671
diff --git a/metadata/md5-cache/dev-libs/clipper-6.4.2 b/metadata/md5-cache/dev-libs/clipper-6.4.2
index 24ac6b300e4a..2340e3273577 100644
--- a/metadata/md5-cache/dev-libs/clipper-6.4.2
+++ b/metadata/md5-cache/dev-libs/clipper-6.4.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Boost-1.0
 SLOT=0
 SRC_URI=mirror://sourceforge/project/polyclipping/clipper_ver6.4.2.zip -> clipper-6.4.2.zip
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e1311323c8aac10932b9e5355586ec17
diff --git a/metadata/md5-cache/dev-libs/console_bridge-1.0.1 b/metadata/md5-cache/dev-libs/console_bridge-1.0.1
index a783dd9b6420..7fec2628cd8f 100644
--- a/metadata/md5-cache/dev-libs/console_bridge-1.0.1
+++ b/metadata/md5-cache/dev-libs/console_bridge-1.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads]
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cppcheck/ament_cppcheck/main.py -> console_bridge-1.0.1-ament-0.9.5-cppcheck.py https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cpplint/ament_cpplint/cpplint.py -> console_bridge-1.0.1-ament-0.9.5-cpplint.py https://github.com/ros/console_bridge/archive/1.0.1.tar.gz -> console_bridge-1.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=73a0432ad334ca717b311b60a781fc08
diff --git a/metadata/md5-cache/dev-libs/console_bridge-9999 b/metadata/md5-cache/dev-libs/console_bridge-9999
index 81031321c298..2957d0edb539 100644
--- a/metadata/md5-cache/dev-libs/console_bridge-9999
+++ b/metadata/md5-cache/dev-libs/console_bridge-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads]
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cppcheck/ament_cppcheck/main.py -> console_bridge-9999-ament-0.9.5-cppcheck.py https://raw.githubusercontent.com/ament/ament_lint/0.9.5/ament_cpplint/ament_cpplint/cpplint.py -> console_bridge-9999-ament-0.9.5-cpplint.py
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=73a0432ad334ca717b311b60a781fc08
diff --git a/metadata/md5-cache/dev-libs/criterion-2.3.3 b/metadata/md5-cache/dev-libs/criterion-2.3.3
index db58cdaa61ad..bd53f5c5e9ba 100644
--- a/metadata/md5-cache/dev-libs/criterion-2.3.3
+++ b/metadata/md5-cache/dev-libs/criterion-2.3.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/nanomsg:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Snaipe/Criterion/releases/download/v2.3.3/criterion-v2.3.3.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ce42f18f7aa98f6815029ee097bae0f
diff --git a/metadata/md5-cache/dev-libs/date-3.0.0 b/metadata/md5-cache/dev-libs/date-3.0.0
index c21db26e7183..888ae58f0df9 100644
--- a/metadata/md5-cache/dev-libs/date-3.0.0
+++ b/metadata/md5-cache/dev-libs/date-3.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/HowardHinnant/date/archive/v3.0.0.tar.gz -> date-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd7fbaad72a1288726e3068b7c45c2d1
diff --git a/metadata/md5-cache/dev-libs/double-conversion-3.1.5 b/metadata/md5-cache/dev-libs/double-conversion-3.1.5
index 83e614781975..6cb93d504980 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-3.1.5
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.1.5
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux
 LICENSE=BSD
 SLOT=0/3
 SRC_URI=https://github.com/google/double-conversion/archive/v3.1.5.tar.gz -> double-conversion-3.1.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f601e85a7c70c4e67dfdaed706d42093
diff --git a/metadata/md5-cache/dev-libs/efl-1.24.3-r1 b/metadata/md5-cache/dev-libs/efl-1.24.3-r1
deleted file mode 100644
index 0304af466dc3..000000000000
--- a/metadata/md5-cache/dev-libs/efl-1.24.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg:0= X? ( media-libs/freetype x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver wayland? ( x11-libs/libxkbcommon[X] ) ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput dev-libs/wayland media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gles2-only? ( media-libs/mesa[egl,gles2] virtual/opengl ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
-DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
-EAPI=7
-HOMEPAGE=https://www.enlightenment.org
-IUSE=+X bmp connman cpu_flags_arm_neon dds debug doc drm +eet elogind examples fbcon +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim xpm xpresent zeroconf
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
-RDEPEND=dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg:0= X? ( media-libs/freetype x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver wayland? ( x11-libs/libxkbcommon[X] ) ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput dev-libs/wayland media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gles2-only? ( media-libs/mesa[egl,gles2] virtual/opengl ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=?? ( elogind systemd ) ?? ( gles2-only opengl ) ^^ ( lua luajit ) ssl drm? ( gles2-only ) examples? ( eet svg ) gles2-only? ( || ( wayland X ) ) pulseaudio? ( sound ) wayland? ( gles2-only !opengl ) xim? ( X ) xpresent? ( X )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.24.3.tar.xz
-_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc172cad71d28c350be96159b66aaf28
diff --git a/metadata/md5-cache/dev-libs/efl-1.24.4 b/metadata/md5-cache/dev-libs/efl-1.24.4
new file mode 100644
index 000000000000..bd4013caec94
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/efl-1.24.4
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg:0= X? ( media-libs/freetype x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver wayland? ( x11-libs/libxkbcommon[X] ) ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput dev-libs/wayland media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gles2-only? ( media-libs/mesa[egl,gles2] virtual/opengl ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org
+IUSE=+X bmp connman cpu_flags_arm_neon dds debug doc drm +eet elogind examples fbcon +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim xpm xpresent zeroconf
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
+RDEPEND=dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg:0= X? ( media-libs/freetype x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver wayland? ( x11-libs/libxkbcommon[X] ) ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput dev-libs/wayland media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gles2-only? ( media-libs/mesa[egl,gles2] virtual/opengl ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
+REQUIRED_USE=?? ( elogind systemd ) ?? ( gles2-only opengl ) ^^ ( lua luajit ) ssl drm? ( gles2-only ) examples? ( eet svg ) gles2-only? ( || ( wayland X ) ) pulseaudio? ( sound ) wayland? ( gles2-only !opengl ) xim? ( X ) xpresent? ( X )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.24.4.tar.xz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d8a14772d43edaf5bd97a29802e13bc3
diff --git a/metadata/md5-cache/dev-libs/efl-1.25.0 b/metadata/md5-cache/dev-libs/efl-1.25.0
deleted file mode 100644
index dccebc986944..000000000000
--- a/metadata/md5-cache/dev-libs/efl-1.25.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg:0= X? ( media-libs/freetype x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver wayland? ( x11-libs/libxkbcommon[X] ) ) avif? ( media-libs/libavif ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput dev-libs/wayland media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gles2-only? ( media-libs/mesa[egl,gles2] virtual/opengl ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
-DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
-EAPI=7
-HOMEPAGE=https://www.enlightenment.org
-IUSE=+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one elogind examples fbcon +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim xpm xpresent zeroconf
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
-RDEPEND=dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg:0= X? ( media-libs/freetype x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver wayland? ( x11-libs/libxkbcommon[X] ) ) avif? ( media-libs/libavif ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput dev-libs/wayland media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gles2-only? ( media-libs/mesa[egl,gles2] virtual/opengl ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=?? ( elogind systemd ) ?? ( gles2-only opengl ) ^^ ( lua luajit ) ssl drm? ( gles2-only ) examples? ( eet svg ) gles2-only? ( || ( wayland X ) ) pulseaudio? ( sound ) wayland? ( gles2-only !opengl ) xim? ( X ) xpresent? ( X )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.25.0.tar.xz
-_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=795e4f7e4716752e61cb887291e783ff
diff --git a/metadata/md5-cache/dev-libs/efl-1.25.0-r1 b/metadata/md5-cache/dev-libs/efl-1.25.0-r1
new file mode 100644
index 000000000000..8a0d2ef97085
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/efl-1.25.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg:0= X? ( media-libs/freetype x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver wayland? ( x11-libs/libxkbcommon[X] ) ) avif? ( media-libs/libavif ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput dev-libs/wayland media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gles2-only? ( media-libs/mesa[egl,gles2] virtual/opengl ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
+DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org
+IUSE=+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one elogind examples fbcon +fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vnc wayland webp xcf xim xpm xpresent zeroconf
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
+RDEPEND=dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg:0= X? ( media-libs/freetype x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver wayland? ( x11-libs/libxkbcommon[X] ) ) avif? ( media-libs/libavif ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput dev-libs/wayland media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gles2-only? ( media-libs/mesa[egl,gles2] virtual/opengl ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
+REQUIRED_USE=?? ( elogind systemd ) ?? ( gles2-only opengl ) ?? ( fbcon tslib ) ^^ ( lua luajit ) ssl drm? ( gles2-only ) examples? ( eet svg ) gles2-only? ( || ( wayland X ) ) pulseaudio? ( sound ) wayland? ( gles2-only !opengl || ( elogind systemd ) ) xim? ( X ) xpresent? ( X )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.25.0.tar.xz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b4d438ca1929e118c04f8fc89e460102
diff --git a/metadata/md5-cache/dev-libs/flatbuffers-1.12.0 b/metadata/md5-cache/dev-libs/flatbuffers-1.12.0
index 5993687a7674..83e115ae9a4c 100644
--- a/metadata/md5-cache/dev-libs/flatbuffers-1.12.0
+++ b/metadata/md5-cache/dev-libs/flatbuffers-1.12.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/flatbuffers/archive/v1.12.0.tar.gz -> flatbuffers-1.12.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68f976410042b11bcde7acec06642483
diff --git a/metadata/md5-cache/dev-libs/glib-2.64.5 b/metadata/md5-cache/dev-libs/glib-2.64.5
index 9684fe071eba..f9a0abe73bb4 100644
--- a/metadata/md5-cache/dev-libs/glib-2.64.5
+++ b/metadata/md5-cache/dev-libs/glib-2.64.5
@@ -5,7 +5,7 @@ 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_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~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.64.5 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) ) !kernel_Winnt? ( 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_s390_32(-)?,abi_s390_64(-)?] )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.64/glib-2.64.5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=30bd588ef853d497653594fea9af1bf6
+_md5_=921816329f811fbb6d06043bbfef085a
diff --git a/metadata/md5-cache/dev-libs/grantlee-5.2.0 b/metadata/md5-cache/dev-libs/grantlee-5.2.0
index 520ad1af208a..c2cd2928b635 100644
--- a/metadata/md5-cache/dev-libs/grantlee-5.2.0
+++ b/metadata/md5-cache/dev-libs/grantlee-5.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=http://downloads.grantlee.org/grantlee-5.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99aa06729843b383dd549ac27f0f6f25
diff --git a/metadata/md5-cache/dev-libs/hyperscan-5.2.1-r1 b/metadata/md5-cache/dev-libs/hyperscan-5.2.1-r1
index 5bd428c8d32a..c0b40170155a 100644
--- a/metadata/md5-cache/dev-libs/hyperscan-5.2.1-r1
+++ b/metadata/md5-cache/dev-libs/hyperscan-5.2.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost
 REQUIRED_USE=cpu_flags_x86_ssse3
 SLOT=0
 SRC_URI=https://github.com/intel/hyperscan/archive/v5.2.1.tar.gz -> hyperscan-5.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41defbfc62f6cd7ccde8c01b1dcef7a6
diff --git a/metadata/md5-cache/dev-libs/hyperscan-5.3.0 b/metadata/md5-cache/dev-libs/hyperscan-5.3.0
index 4286629d8cd3..7e909ac4d224 100644
--- a/metadata/md5-cache/dev-libs/hyperscan-5.3.0
+++ b/metadata/md5-cache/dev-libs/hyperscan-5.3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost
 REQUIRED_USE=cpu_flags_x86_ssse3
 SLOT=0
 SRC_URI=https://github.com/intel/hyperscan/archive/v5.3.0.tar.gz -> hyperscan-5.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13cb41d7e1e254d3ffc8cf1f6e3336f4
diff --git a/metadata/md5-cache/dev-libs/igraph-0.8.2 b/metadata/md5-cache/dev-libs/igraph-0.8.2
new file mode 100644
index 000000000000..19bf06d3ab8e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/igraph-0.8.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/gmp:0 dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-mathematics/glpk virtual/blas virtual/lapack
+DESCRIPTION=Creating and manipulating undirected and directed graphs
+EAPI=7
+HOMEPAGE=http://www.igraph.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0 dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-mathematics/glpk virtual/blas virtual/lapack
+SLOT=0/0
+SRC_URI=https://github.com/igraph/igraph/releases/download/0.8.2/igraph-0.8.2.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=589be651e81d9bafca758ce821400d65
diff --git a/metadata/md5-cache/dev-libs/inih-51 b/metadata/md5-cache/dev-libs/inih-51
new file mode 100644
index 000000000000..2e1aa55b6781
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/inih-51
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=inih (INI not invented here) simple .INI file parser
+EAPI=7
+HOMEPAGE=https://github.com/benhoyt/inih
+IUSE=abi_x86_32 abi_x86_64
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+SLOT=0
+SRC_URI=https://github.com/benhoyt/inih/archive/r51.tar.gz -> inih-51.tar.gz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b00b9c715023623a91a72b28af7d063a
diff --git a/metadata/md5-cache/dev-libs/intel-neo-20.16.16582 b/metadata/md5-cache/dev-libs/intel-neo-20.16.16582
index be9d5aa9975f..75a649012db8 100644
--- a/metadata/md5-cache/dev-libs/intel-neo-20.16.16582
+++ b/metadata/md5-cache/dev-libs/intel-neo-20.16.16582
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/opencl-3 >=dev-util/intel-graphics-compiler-1.0.3826 >=media-libs/gmmlib-20.1.1 l0? ( <dev-libs/level-zero-1.0.0 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/20.16.16582.tar.gz -> intel-neo-20.16.16582.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc6fb09c4c5f4b387c4b34906983fae3
diff --git a/metadata/md5-cache/dev-libs/intel-neo-20.36.17813 b/metadata/md5-cache/dev-libs/intel-neo-20.36.17813
index cd8734680a35..397ff7d200ab 100644
--- a/metadata/md5-cache/dev-libs/intel-neo-20.36.17813
+++ b/metadata/md5-cache/dev-libs/intel-neo-20.36.17813
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/opencl-3 >=dev-util/intel-graphics-compiler-1.0.3826 >=media-libs/gmmlib-20.2.5 l0? ( >=dev-libs/level-zero-1.0.0 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/20.36.17813.tar.gz -> intel-neo-20.36.17813.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4837246925cab04dd582ea2d35961082
diff --git a/metadata/md5-cache/dev-libs/intel-neo-20.37.17906 b/metadata/md5-cache/dev-libs/intel-neo-20.37.17906
index c5f50e6b2660..399335ea5615 100644
--- a/metadata/md5-cache/dev-libs/intel-neo-20.37.17906
+++ b/metadata/md5-cache/dev-libs/intel-neo-20.37.17906
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/opencl-3 >=dev-util/intel-graphics-compiler-1.0.4944 >=media-libs/gmmlib-20.2.5 l0? ( >=dev-libs/level-zero-1.0.0 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
 SLOT=0
 SRC_URI=https://github.com/intel/compute-runtime/archive/20.37.17906.tar.gz -> intel-neo-20.37.17906.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=619d7cfc0e433ab7a9aedc098833f9ab
diff --git a/metadata/md5-cache/dev-libs/jansson-2.13.1 b/metadata/md5-cache/dev-libs/jansson-2.13.1
index 2922aa0c21e9..cd41e3e8bb0d 100644
--- a/metadata/md5-cache/dev-libs/jansson-2.13.1
+++ b/metadata/md5-cache/dev-libs/jansson-2.13.1
@@ -4,9 +4,9 @@ DESCRIPTION=C library for encoding, decoding and manipulating JSON data
 EAPI=7
 HOMEPAGE=https://www.digip.org/jansson/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.digip.org/jansson/releases/jansson-2.13.1.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1b0d5401cb5da779f668c1c17f754a53
+_md5_=3803d016d9074e1e77ef0c115afb4b46
diff --git a/metadata/md5-cache/dev-libs/json-c-0.14-r3 b/metadata/md5-cache/dev-libs/json-c-0.14-r3
index fbc87a789ca9..9396b3650109 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.14-r3
+++ b/metadata/md5-cache/dev-libs/json-c-0.14-r3
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=MIT
 SLOT=0/5
 SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2257c0dd275a9cae68c74765b9c2f848
diff --git a/metadata/md5-cache/dev-libs/json-c-0.15 b/metadata/md5-cache/dev-libs/json-c-0.15
index f39b44aba316..f75367c4bdfd 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.15
+++ b/metadata/md5-cache/dev-libs/json-c-0.15
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=MIT
 SLOT=0/5
 SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.15.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb4409e57bc82fd2b7bd49349cf5e3b2
diff --git a/metadata/md5-cache/dev-libs/json-c-9999 b/metadata/md5-cache/dev-libs/json-c-9999
index 6e4fed6a9e88..be0f515486f2 100644
--- a/metadata/md5-cache/dev-libs/json-c-9999
+++ b/metadata/md5-cache/dev-libs/json-c-9999
@@ -7,5 +7,5 @@ IUSE=cpu_flags_x86_rdrand doc static-libs threads abi_x86_32 abi_x86_64 abi_x86_
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0/5
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1dbb1f855f8ef5f9cc18975c639cdef
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.4 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
new file mode 100644
index 000000000000..317c73dccc11
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.4
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) doc? ( app-doc/doxygen ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install setup test
+DESCRIPTION=C++ JSON reader and writer
+EAPI=7
+HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
+IUSE=doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=|| ( public-domain MIT )
+RESTRICT=!test? ( test )
+SLOT=0/24
+SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.9.4.tar.gz -> jsoncpp-1.9.4.tar.gz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ce4bb8059d1f8bb31e636475f8337590
diff --git a/metadata/md5-cache/dev-libs/kasync-0.3.0 b/metadata/md5-cache/dev-libs/kasync-0.3.0
index 7bcab761a483..fa49bd1cd8b3 100644
--- a/metadata/md5-cache/dev-libs/kasync-0.3.0
+++ b/metadata/md5-cache/dev-libs/kasync-0.3.0
@@ -11,5 +11,5 @@ RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/unstable/kasync/0.3.0/src/kasync-0.3.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5db5e229536b044435b6e32fc7c2f465
diff --git a/metadata/md5-cache/dev-libs/kdiagram-2.7.0 b/metadata/md5-cache/dev-libs/kdiagram-2.7.0
index 860581d5bfbc..d07151089023 100644
--- a/metadata/md5-cache/dev-libs/kdiagram-2.7.0
+++ b/metadata/md5-cache/dev-libs/kdiagram-2.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( examples )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiagram/2.7.0/kdiagram-2.7.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5949d257be1f37cf9d27cd9de9bb8338
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.1-r1 b/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
index e07ce213b198..5a79bcfd9c2f 100644
--- a/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
+++ b/metadata/md5-cache/dev-libs/keystone-0.9.1-r1
@@ -11,5 +11,5 @@ RDEPEND=<sys-devel/llvm-11:= || ( sys-devel/llvm:8[llvm_targets_AArch64?,llvm_ta
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/keystone-engine/keystone/archive/0.9.1.tar.gz -> keystone-0.9.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84fbad9a0728d07ec6c1bbfcf7c5bc53
diff --git a/metadata/md5-cache/dev-libs/keystone-9999 b/metadata/md5-cache/dev-libs/keystone-9999
index 6188e1db209c..742a7e365658 100644
--- a/metadata/md5-cache/dev-libs/keystone-9999
+++ b/metadata/md5-cache/dev-libs/keystone-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=<sys-devel/llvm-11:= || ( sys-devel/llvm:8[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] sys-devel/llvm:9[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] sys-devel/llvm:10[llvm_targets_AArch64?,llvm_targets_ARM?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_ARM llvm_targets_Hexagon llvm_targets_Mips llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84fbad9a0728d07ec6c1bbfcf7c5bc53
diff --git a/metadata/md5-cache/dev-libs/kpeoplevcard-0.1 b/metadata/md5-cache/dev-libs/kpeoplevcard-0.1
index dd8b4978c1b5..84088b9c579b 100644
--- a/metadata/md5-cache/dev-libs/kpeoplevcard-0.1
+++ b/metadata/md5-cache/dev-libs/kpeoplevcard-0.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcontacts-5.64.0:5 >=kde-frameworks/kcoreaddons-5.64.0:5 >=kde-frameworks/kpeople-5.64.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kpeoplevcard/0.1/kpeoplevcard-0.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4c88d4acafb85893c96cfcbc028ae58
diff --git a/metadata/md5-cache/dev-libs/kproperty-3.2.0 b/metadata/md5-cache/dev-libs/kproperty-3.2.0
index 24cad6382386..be01bcacea30 100644
--- a/metadata/md5-cache/dev-libs/kproperty-3.2.0
+++ b/metadata/md5-cache/dev-libs/kproperty-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kco
 RESTRICT=!test? ( test ) test
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kproperty/src/kproperty-3.2.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6da7e25bbdc38d95a9bfb5efebdb3f4
diff --git a/metadata/md5-cache/dev-libs/kreport-3.2.0 b/metadata/md5-cache/dev-libs/kreport-3.2.0
index 1641fa1397c6..ebbb614a0865 100644
--- a/metadata/md5-cache/dev-libs/kreport-3.2.0
+++ b/metadata/md5-cache/dev-libs/kreport-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/kproperty-3.1.0:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsu
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/4
 SRC_URI=mirror://kde/stable/kreport/src/kreport-3.2.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aa44a2b30162d9bd68c12f8e2d5d3842
diff --git a/metadata/md5-cache/dev-libs/kuserfeedback-1.0.0 b/metadata/md5-cache/dev-libs/kuserfeedback-1.0.0
index 82f88c1436d6..43011d09ef56 100644
--- a/metadata/md5-cache/dev-libs/kuserfeedback-1.0.0
+++ b/metadata/md5-cache/dev-libs/kuserfeedback-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtcharts-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgu
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kuserfeedback/kuserfeedback-1.0.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e106d5f859df77566f74778aafefc997
diff --git a/metadata/md5-cache/dev-libs/level-zero-0.91.10 b/metadata/md5-cache/dev-libs/level-zero-0.91.10
index 11b8d5092726..26e1be9a72b4 100644
--- a/metadata/md5-cache/dev-libs/level-zero-0.91.10
+++ b/metadata/md5-cache/dev-libs/level-zero-0.91.10
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oneapi-src/level-zero/archive/v0.91.10.tar.gz -> level-zero-0.91.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ef7ca021f0984c331e3d6a1c1e7aaca
diff --git a/metadata/md5-cache/dev-libs/level-zero-1.0.0 b/metadata/md5-cache/dev-libs/level-zero-1.0.0
index 8fa6518a703b..0cd7e045628b 100644
--- a/metadata/md5-cache/dev-libs/level-zero-1.0.0
+++ b/metadata/md5-cache/dev-libs/level-zero-1.0.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/oneapi-src/level-zero/archive/v1.0.tar.gz -> level-zero-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3035ac8b0e391f1f4ffb0936a1568fd7
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.2.0 b/metadata/md5-cache/dev-libs/libarcus-4.2.0
index 1b250b19d06b..f2e09fde52d0 100644
--- a/metadata/md5-cache/dev-libs/libarcus-4.2.0
+++ b/metadata/md5-cache/dev-libs/libarcus-4.2.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.2.0.tar.gz -> libarcus-4.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6fd762a7e5df8ebaaba7c2298aca522b
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.3.0-r1 b/metadata/md5-cache/dev-libs/libarcus-4.3.0-r1
index ae3ac9336c8f..9283006ca748 100644
--- a/metadata/md5-cache/dev-libs/libarcus-4.3.0-r1
+++ b/metadata/md5-cache/dev-libs/libarcus-4.3.0-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.3.0.tar.gz -> libarcus-4.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=40c4d925ce4238e30c71501ed6226a36
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.6.1 b/metadata/md5-cache/dev-libs/libarcus-4.6.1
index fed99c68c76a..e7c4d13b0be6 100644
--- a/metadata/md5-cache/dev-libs/libarcus-4.6.1
+++ b/metadata/md5-cache/dev-libs/libarcus-4.6.1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.6.1.tar.gz -> libarcus-4.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3fc21074add39caf6c37412518352282
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.7.0 b/metadata/md5-cache/dev-libs/libarcus-4.7.0
index 7bf1eb2709d7..1b1f45bdc86a 100644
--- a/metadata/md5-cache/dev-libs/libarcus-4.7.0
+++ b/metadata/md5-cache/dev-libs/libarcus-4.7.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.7.0.tar.gz -> libarcus-4.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=321373d0b6061f681158b3b6151abc63
diff --git a/metadata/md5-cache/dev-libs/libcbor-0.8.0 b/metadata/md5-cache/dev-libs/libcbor-0.8.0
index ab17fec9c4b5..a0f494d98824 100644
--- a/metadata/md5-cache/dev-libs/libcbor-0.8.0
+++ b/metadata/md5-cache/dev-libs/libcbor-0.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=CBOR protocol implementation for C and others
 EAPI=7
 HOMEPAGE=https://github.com/pjk/libcbor
 IUSE=+custom-alloc doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.8
 SRC_URI=https://github.com/PJK/libcbor/archive/v0.8.0.tar.gz -> libcbor-0.8.0.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3bf409fda3e4054ba7ac60a9020bd5f1
+_md5_=ebddc9d523fbed7585b3c608183b2fac
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.2.0 b/metadata/md5-cache/dev-libs/libcharon-4.2.0
index d4c7d1c7211d..18d32454e5c2 100644
--- a/metadata/md5-cache/dev-libs/libcharon-4.2.0
+++ b/metadata/md5-cache/dev-libs/libcharon-4.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.2.0.tar.gz -> libcharon-4.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c06045330449bb34abf3124d2deef733
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.3.0 b/metadata/md5-cache/dev-libs/libcharon-4.3.0
index 030b84ede13b..606e78ab3203 100644
--- a/metadata/md5-cache/dev-libs/libcharon-4.3.0
+++ b/metadata/md5-cache/dev-libs/libcharon-4.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.3.0.tar.gz -> libcharon-4.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3cfbc6d3c4e817415fcf3da912822e4c
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.6.1 b/metadata/md5-cache/dev-libs/libcharon-4.6.1
index 3050a14d5c01..e30e6fc40d78 100644
--- a/metadata/md5-cache/dev-libs/libcharon-4.6.1
+++ b/metadata/md5-cache/dev-libs/libcharon-4.6.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.6.1.tar.gz -> libcharon-4.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=911cefdd44c8de8b0c0e541909d386c3
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.7.0 b/metadata/md5-cache/dev-libs/libcharon-4.7.0
index a569b7b15d68..826dd5f959c7 100644
--- a/metadata/md5-cache/dev-libs/libcharon-4.7.0
+++ b/metadata/md5-cache/dev-libs/libcharon-4.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.7.0.tar.gz -> libcharon-4.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c178cd2410550fed5eedc61b89db92d7
diff --git a/metadata/md5-cache/dev-libs/libclangformat-ide-10.0.0 b/metadata/md5-cache/dev-libs/libclangformat-ide-10.0.0
index ace1a8d76d72..6c5a52af87d2 100644
--- a/metadata/md5-cache/dev-libs/libclangformat-ide-10.0.0
+++ b/metadata/md5-cache/dev-libs/libclangformat-ide-10.0.0
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=442e0546302c063e618b95190749767c
diff --git a/metadata/md5-cache/dev-libs/libclangformat-ide-9.0.1 b/metadata/md5-cache/dev-libs/libclangformat-ide-9.0.1
index f2a3655a0c9c..aa8848be637e 100644
--- a/metadata/md5-cache/dev-libs/libclangformat-ide-9.0.1
+++ b/metadata/md5-cache/dev-libs/libclangformat-ide-9.0.1
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 SLOT=9
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce74c5307bfe422894fe175359b0331c
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3 b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
index 703c482948ca..eeb46b501481 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e901c94eae52bb160ba003aaf810bfb4
diff --git a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1 b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
index 543893a5c841..92aaabd2b672 100644
--- a/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
+++ b/metadata/md5-cache/dev-libs/libdivsufsort-2.0.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/y-256/libdivsufsort/archive/2.0.1.tar.gz -> libdivsufsort-2.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c16d9afcf5330416980d43ed090036d
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.14 b/metadata/md5-cache/dev-libs/libdnet-1.14
index 33d0bd5dfd60..545b61f82ea3 100644
--- a/metadata/md5-cache/dev-libs/libdnet-1.14
+++ b/metadata/md5-cache/dev-libs/libdnet-1.14
@@ -5,7 +5,7 @@ DESCRIPTION=simplified, portable interface to several low-level networking routi
 EAPI=7
 HOMEPAGE=https://github.com/ofalk/libdnet
 IUSE=python static-libs test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2
 RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ofalk/libdnet/archive/libdnet-1.14.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=86fcbdf23fb078fcb39b661f201aa065
+_md5_=658420b13ba20d5cb4bed70bee22c7de
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.14-r1 b/metadata/md5-cache/dev-libs/libdnet-1.14-r1
new file mode 100644
index 000000000000..0fff7fd9bbce
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libdnet-1.14-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=simplified, portable interface to several low-level networking routines
+EAPI=7
+HOMEPAGE=https://github.com/ofalk/libdnet
+IUSE=python static-libs test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ofalk/libdnet/archive/libdnet-1.14.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=69672e78d9a56349e55a8af408e45272
diff --git a/metadata/md5-cache/dev-libs/libdnet-9999 b/metadata/md5-cache/dev-libs/libdnet-9999
index e17923dfe006..bca9a7a02c41 100644
--- a/metadata/md5-cache/dev-libs/libdnet-9999
+++ b/metadata/md5-cache/dev-libs/libdnet-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=78ffdbbe70c88e7cc6facf86fdbc7e6a
+_md5_=fd8d7691a92c452a7fd936b33d0cbaab
diff --git a/metadata/md5-cache/dev-libs/libebml-1.3.10 b/metadata/md5-cache/dev-libs/libebml-1.3.10
index 5079c150dd4c..bfe8d01a6e5f 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.3.10
+++ b/metadata/md5-cache/dev-libs/libebml-1.3.10
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-li
 LICENSE=LGPL-2.1
 SLOT=0/4
 SRC_URI=https://dl.matroska.org/downloads/libebml/libebml-1.3.10.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab00b574daa2fb1f853e555b40703a27
diff --git a/metadata/md5-cache/dev-libs/libebml-1.3.9 b/metadata/md5-cache/dev-libs/libebml-1.3.9
index 3d509d868fbb..bb45e604e608 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.3.9
+++ b/metadata/md5-cache/dev-libs/libebml-1.3.9
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x8
 LICENSE=LGPL-2.1
 SLOT=0/4
 SRC_URI=https://dl.matroska.org/downloads/libebml/libebml-1.3.9.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a74045a892ff4593eefa2225d928ea9a
diff --git a/metadata/md5-cache/dev-libs/libebml-1.4.0 b/metadata/md5-cache/dev-libs/libebml-1.4.0
index dbf3c28c4ab1..ff578f561466 100644
--- a/metadata/md5-cache/dev-libs/libebml-1.4.0
+++ b/metadata/md5-cache/dev-libs/libebml-1.4.0
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x8
 LICENSE=LGPL-2.1
 SLOT=0/5
 SRC_URI=https://dl.matroska.org/downloads/libebml/libebml-1.4.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a0624955321a16885d920c9dd663236
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.5.0 b/metadata/md5-cache/dev-libs/libfido2-1.5.0
index 6469087a3efd..92cb10ffa469 100644
--- a/metadata/md5-cache/dev-libs/libfido2-1.5.0
+++ b/metadata/md5-cache/dev-libs/libfido2-1.5.0
@@ -5,10 +5,10 @@ DESCRIPTION=Provides library functionality for FIDO 2.0
 EAPI=7
 HOMEPAGE=https://github.com/Yubico/libfido2
 IUSE=libressl +static-libs kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/libcbor:= virtual/libudev:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/libfido2/archive/1.5.0.tar.gz -> libfido2-1.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e610532ce4fe52f1c9e27af24457c7d2
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6044bf2e98ccd10f6fd1c8c8754920fb
diff --git a/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20200314 b/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20200314
index 9a5f8d57888a..e5fb4acc8b46 100644
--- a/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20200314
+++ b/metadata/md5-cache/dev-libs/libflatarray-0.4.0_pre20200314
@@ -10,5 +10,5 @@ LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/STEllAR-GROUP/libflatarray/archive/c5d90fb37ef52dbe56f611979fbe120fa1303284.tar.gz -> libflatarray-0.4.0_pre20200314.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6cac924b77ebf7a532435b392d3d55f2
diff --git a/metadata/md5-cache/dev-libs/libfmt-6.1.2 b/metadata/md5-cache/dev-libs/libfmt-6.1.2
index 31c60916c511..c0662fa77376 100644
--- a/metadata/md5-cache/dev-libs/libfmt-6.1.2
+++ b/metadata/md5-cache/dev-libs/libfmt-6.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://github.com/fmtlib/fmt/archive/6.1.2.tar.gz -> libfmt-6.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d9c7949a4a71bea336f4284d20d2797a
diff --git a/metadata/md5-cache/dev-libs/libfmt-7.0.3 b/metadata/md5-cache/dev-libs/libfmt-7.0.3
index d7f84010458f..d79261853d47 100644
--- a/metadata/md5-cache/dev-libs/libfmt-7.0.3
+++ b/metadata/md5-cache/dev-libs/libfmt-7.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/fmtlib/fmt/archive/7.0.3.tar.gz -> libfmt-7.0.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6fe01fdf0e88dc9d0c00ceed31f5c45d
diff --git a/metadata/md5-cache/dev-libs/libfmt-9999 b/metadata/md5-cache/dev-libs/libfmt-9999
index 1a1e5454aadc..c973f0a42048 100644
--- a/metadata/md5-cache/dev-libs/libfmt-9999
+++ b/metadata/md5-cache/dev-libs/libfmt-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f36d02cbdc974338c90523c5a07f02a
diff --git a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1 b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
index b85e4b1d3fc0..c132bcae67ee 100644
--- a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
+++ b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-db/sqlite-3.17:3 dev-libs/glib:2 media-libs/libcanberra x11-libs/cairo x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/libgaminggear/libgaminggear-0.15.1.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=964033e2a1813d100a1305d104c5960b
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.0.1 b/metadata/md5-cache/dev-libs/libgit2-1.0.1
index 83f363385110..86d99a70970e 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.0.1
+++ b/metadata/md5-cache/dev-libs/libgit2-1.0.1
@@ -11,5 +11,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sy
 RESTRICT=!test? ( test )
 SLOT=0/1.0
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.0.1.tar.gz -> libgit2-1.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=526a92904dd848585d1881e61da5308c
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.8 b/metadata/md5-cache/dev-libs/libical-3.0.8
index 8ed392666d97..4c3f9a4bfcea 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.8
+++ b/metadata/md5-cache/dev-libs/libical-3.0.8
@@ -12,5 +12,5 @@ REQUIRED_USE=introspection? ( glib ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/releases/download/v3.0.8/libical-3.0.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8e12dc03460a9ecf574cd48f2003dd7
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.24.1 b/metadata/md5-cache/dev-libs/libmateweather-1.24.1
new file mode 100644
index 000000000000..e5eb27891b26
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmateweather-1.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2.6:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=MATE library to access weather information from online services
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+ GPL-2+
+RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.54:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/libmateweather-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8ffd8617bb82649b74d05012082a1717
diff --git a/metadata/md5-cache/dev-libs/libmirage-3.2.4 b/metadata/md5-cache/dev-libs/libmirage-3.2.4
index 4671882aa79a..c7d47b4802f6 100644
--- a/metadata/md5-cache/dev-libs/libmirage-3.2.4
+++ b/metadata/md5-cache/dev-libs/libmirage-3.2.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-arch/bzip2-1:= >=app-arch/xz-utils-5:= >=dev-libs/glib-2.38:2 >=media-libs/libsamplerate-0.1:= >=media-libs/libsndfile-1.0:= sys-libs/zlib:= introspection? ( >=dev-libs/gobject-introspection-1.30 )
 SLOT=0/11
 SRC_URI=https://download.sourceforge.net/cdemu/libmirage/libmirage-3.2.4.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae8baa7fcf4f1d3f7906e2aec2778769
diff --git a/metadata/md5-cache/dev-libs/libnl-3.4.0 b/metadata/md5-cache/dev-libs/libnl-3.4.0
deleted file mode 100644
index f6ba3b03859e..000000000000
--- a/metadata/md5-cache/dev-libs/libnl-3.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( 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(-)] ) python? ( dev-lang/swig ) sys-devel/bison sys-devel/flex >=app-portage/elt-patches-20170815
-DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel interfaces
-EAPI=6
-HOMEPAGE=http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
-IUSE=+debug static-libs python +threads utils python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1 utils? ( GPL-2 )
-RDEPEND=python? ( 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? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
-SLOT=3
-SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_4_0/libnl-3.4.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe275d30e686870a6a0d21ed95a486d8
diff --git a/metadata/md5-cache/dev-libs/libnl-3.5.0 b/metadata/md5-cache/dev-libs/libnl-3.5.0
index 0949e9ec4651..35859fed6054 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.5.0
+++ b/metadata/md5-cache/dev-libs/libnl-3.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel inte
 EAPI=7
 HOMEPAGE=http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
 IUSE=+debug static-libs python +threads utils python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 utils? ( GPL-2 )
 RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=3
 SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b0e1219e3b6585efbc27e7c0cc05453f
+_md5_=38a69c802a94e0ad5feac41a91da8a3a
diff --git a/metadata/md5-cache/dev-libs/libpqxx-6.4.5 b/metadata/md5-cache/dev-libs/libpqxx-6.4.5
deleted file mode 100644
index 179675c6faaa..000000000000
--- a/metadata/md5-cache/dev-libs/libpqxx-6.4.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup test
-DEPEND=dev-db/postgresql:= || ( >=dev-lang/python-2.7.5-r2:2.7 ) doc? ( app-doc/doxygen app-text/xmlto )
-DESCRIPTION=Standard front-end for writing C++ programs that use PostgreSQL
-EAPI=7
-HOMEPAGE=http://pqxx.org/development/libpqxx/
-IUSE=doc static-libs
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=dev-db/postgresql:=
-SLOT=0
-SRC_URI=https://github.com/jtv/libpqxx/archive/6.4.5.tar.gz -> libpqxx-6.4.5.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3e1e8e953b3522e90edc58eebd692250
diff --git a/metadata/md5-cache/dev-libs/libqtxdg-3.5.0 b/metadata/md5-cache/dev-libs/libqtxdg-3.5.0
index 32e623f21854..f4beface9a2a 100644
--- a/metadata/md5-cache/dev-libs/libqtxdg-3.5.0
+++ b/metadata/md5-cache/dev-libs/libqtxdg-3.5.0
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxqt/libqtxdg/releases/download/3.5.0/libqtxdg-3.5.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ba2d7619e93098c8e116aec85a89b89b
diff --git a/metadata/md5-cache/dev-libs/librep-0.92.6 b/metadata/md5-cache/dev-libs/librep-0.92.6
index 16145c36b99c..216fe8ffafc2 100644
--- a/metadata/md5-cache/dev-libs/librep-0.92.6
+++ b/metadata/md5-cache/dev-libs/librep-0.92.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/gdbm-1.8.0 emacs? ( >=app-editors/emacs-23.1:* ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/librep/librep_0.92.6.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=188b4d153a5523783c76b5c5195a777e
diff --git a/metadata/md5-cache/dev-libs/librep-0.92.7 b/metadata/md5-cache/dev-libs/librep-0.92.7
index 76cd330f0024..6b291d24fabd 100644
--- a/metadata/md5-cache/dev-libs/librep-0.92.7
+++ b/metadata/md5-cache/dev-libs/librep-0.92.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/gdbm-1.8.0 emacs? ( >=app-editors/emacs-23.1:* ) gmp? ( dev-libs/gmp:= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/librep/librep_0.92.7.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1d8b0c6df40439769e3b7ca4ef40ef49
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.2.0 b/metadata/md5-cache/dev-libs/libsavitar-4.2.0
index 730d34102f0d..e0d235c249e7 100644
--- a/metadata/md5-cache/dev-libs/libsavitar-4.2.0
+++ b/metadata/md5-cache/dev-libs/libsavitar-4.2.0
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.2.0.tar.gz -> libsavitar-4.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f2a83233021affb08bca263a2c30578d
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.3.0-r1 b/metadata/md5-cache/dev-libs/libsavitar-4.3.0-r1
index 7973936d3df4..f21d9ba4f609 100644
--- a/metadata/md5-cache/dev-libs/libsavitar-4.3.0-r1
+++ b/metadata/md5-cache/dev-libs/libsavitar-4.3.0-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.3.0.tar.gz -> libsavitar-4.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf1749275f4bce075560c50a95160586
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.6.1 b/metadata/md5-cache/dev-libs/libsavitar-4.6.1
index e72112d5ce04..707532011a7f 100644
--- a/metadata/md5-cache/dev-libs/libsavitar-4.6.1
+++ b/metadata/md5-cache/dev-libs/libsavitar-4.6.1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.6.1.tar.gz -> libsavitar-4.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3bcb7cc10550cb79977861ffd2fb3697
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.7.0 b/metadata/md5-cache/dev-libs/libsavitar-4.7.0
index 72c458c58d00..145a1a78464e 100644
--- a/metadata/md5-cache/dev-libs/libsavitar-4.7.0
+++ b/metadata/md5-cache/dev-libs/libsavitar-4.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.7.0.tar.gz -> libsavitar-4.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a67059b2740500babc7204cdd5bdc9c
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.10.0 b/metadata/md5-cache/dev-libs/libstrophe-0.10.0
index e33a155568b0..e60a043a17df 100644
--- a/metadata/md5-cache/dev-libs/libstrophe-0.10.0
+++ b/metadata/md5-cache/dev-libs/libstrophe-0.10.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install
+DEFINED_PHASES=compile configure install test
 DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) doc? ( app-doc/doxygen )
 DESCRIPTION=A simple, lightweight C library for writing XMPP clients
 EAPI=7
@@ -9,4 +9,4 @@ LICENSE=|| ( MIT GPL-3 )
 RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.10.0/libstrophe-0.10.0.tar.gz
-_md5_=6121274212de3bcd14ca44d9666c49e0
+_md5_=8da24fda0e332ea5e199c9236936fe88
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.9.2 b/metadata/md5-cache/dev-libs/libstrophe-0.9.2
index 1f031db9f420..714350da6221 100644
--- a/metadata/md5-cache/dev-libs/libstrophe-0.9.2
+++ b/metadata/md5-cache/dev-libs/libstrophe-0.9.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install
+DEFINED_PHASES=compile configure install test
 DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) doc? ( app-doc/doxygen )
 DESCRIPTION=A simple, lightweight C library for writing XMPP clients
 EAPI=7
@@ -9,4 +9,4 @@ LICENSE=|| ( MIT GPL-3 )
 RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.9.2/libstrophe-0.9.2.tar.gz
-_md5_=501259a2919a20a34a66cc985ecedb0d
+_md5_=b8e51235c182a18f8e8c26377475cda6
diff --git a/metadata/md5-cache/dev-libs/libstrophe-0.9.3 b/metadata/md5-cache/dev-libs/libstrophe-0.9.3
index 8af7c15b1554..691d5d93c49e 100644
--- a/metadata/md5-cache/dev-libs/libstrophe-0.9.3
+++ b/metadata/md5-cache/dev-libs/libstrophe-0.9.3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install
+DEFINED_PHASES=compile configure install test
 DEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) doc? ( app-doc/doxygen )
 DESCRIPTION=A simple, lightweight C library for writing XMPP clients
 EAPI=7
@@ -9,4 +9,4 @@ LICENSE=|| ( MIT GPL-3 )
 RDEPEND=expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/strophe/libstrophe/releases/download/0.9.3/libstrophe-0.9.3.tar.gz
-_md5_=6121274212de3bcd14ca44d9666c49e0
+_md5_=8da24fda0e332ea5e199c9236936fe88
diff --git a/metadata/md5-cache/dev-libs/libugpio-0.0.7 b/metadata/md5-cache/dev-libs/libugpio-0.0.7
index 3408b82051c3..16302fa13c99 100644
--- a/metadata/md5-cache/dev-libs/libugpio-0.0.7
+++ b/metadata/md5-cache/dev-libs/libugpio-0.0.7
@@ -3,9 +3,9 @@ DESCRIPTION=Lib for the use of linux kernel's sysfs gpio interface from C progra
 EAPI=7
 HOMEPAGE=https://github.com/mhei/libugpio
 IUSE=kernel_linux
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ppc64 ~x86
 LICENSE=GPL-3+ LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/mhei/libugpio/releases/download/v0.0.7/libugpio-0.0.7.tar.bz2
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aa06ec4295795b7e393fdb19bbb6c9d8
+_md5_=8c4e874130f72148033303b55d6a0c0a
diff --git a/metadata/md5-cache/dev-libs/libuv-1.40.0 b/metadata/md5-cache/dev-libs/libuv-1.40.0
new file mode 100644
index 000000000000..6d9534be2e89
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libuv-1.40.0
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+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_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~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.40.0.tar.gz -> libuv-1.40.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=29603cd2b031c40ff6e78ac69fb56be2
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.10 b/metadata/md5-cache/dev-libs/libxml2-2.9.10
deleted file mode 100644
index 51c2dc0069ad..000000000000
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-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_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
-DESCRIPTION=XML C parser and toolkit
-EAPI=7
-HOMEPAGE=http://www.xmlsoft.org/
-IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 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=MIT
-RDEPEND=>=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_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.10-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	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fa6596e2926a7ae2800850012128845f
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r1 b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r1
deleted file mode 100644
index 3ba8a1374058..000000000000
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-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_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
-DESCRIPTION=XML C parser and toolkit
-EAPI=7
-HOMEPAGE=http://www.xmlsoft.org/
-IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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=MIT
-RDEPEND=>=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_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.10-r1-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	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5b3c3e411bb7eee323e9d9d1181ab8c4
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r2 b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r2
new file mode 100644
index 000000000000..ad5de97760aa
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+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_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
+DESCRIPTION=XML C parser and toolkit
+EAPI=7
+HOMEPAGE=http://www.xmlsoft.org/
+IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 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=MIT
+RDEPEND=>=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_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.10-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	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3230f9dc908928abfe55b2a572b77cd5
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.10-r3 b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r3
new file mode 100644
index 000000000000..37277a365fe1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.10-r3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+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_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
+DESCRIPTION=XML C parser and toolkit
+EAPI=7
+HOMEPAGE=http://www.xmlsoft.org/
+IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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=MIT
+RDEPEND=>=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_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) python_targets_python3_9? ( dev-lang/python:3.9[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.10.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-libs/libxml2/libxml2-2.9.10-r1-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	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=77826e6ccd6c9e9d981df8ff6693d56f
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.9-r3 b/metadata/md5-cache/dev-libs/libxml2-2.9.9-r3
deleted file mode 100644
index d3480c04c248..000000000000
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.9-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-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_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) readline? ( sys-libs/readline:= ) dev-util/gtk-doc-am virtual/pkgconfig hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=XML C parser and toolkit
-EAPI=6
-HOMEPAGE=http://www.xmlsoft.org/
-IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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=MIT
-RDEPEND=>=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_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) readline? ( sys-libs/readline:= )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
-RESTRICT=!test? ( test )
-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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9544ac731a21c0796914306ae5b2099a
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.9-r4 b/metadata/md5-cache/dev-libs/libxml2-2.9.9-r4
new file mode 100644
index 000000000000..cbb6e62db82d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.9-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+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_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) readline? ( sys-libs/readline:= ) dev-util/gtk-doc-am virtual/pkgconfig hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=XML C parser and toolkit
+EAPI=6
+HOMEPAGE=http://www.xmlsoft.org/
+IUSE=debug examples icu ipv6 lzma +python readline static-libs test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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=MIT
+RDEPEND=>=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_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) readline? ( sys-libs/readline:= )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
+RESTRICT=!test? ( test )
+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	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=94e185c21d97ea903c2152d3f2faab8b
diff --git a/metadata/md5-cache/dev-libs/libzia-4.23 b/metadata/md5-cache/dev-libs/libzia-4.23
new file mode 100644
index 000000000000..506ecf47f1d1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzia-4.23
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 ) virtual/pkgconfig
+DESCRIPTION=platform abstraction code for tucnak package
+EAPI=7
+HOMEPAGE=http://tucnak.nagano.cz
+IUSE=ftdi
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/libsdl media-libs/libpng:0 ftdi? ( dev-embedded/libftdi:0 )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/libzia-4.23.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4f5ed2e89405e4f635c6e4f07ffb3298
diff --git a/metadata/md5-cache/dev-libs/libzip-1.7.3 b/metadata/md5-cache/dev-libs/libzip-1.7.3
index 4a154d9bc70f..7d45b0797d51 100644
--- a/metadata/md5-cache/dev-libs/libzip-1.7.3
+++ b/metadata/md5-cache/dev-libs/libzip-1.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://www.nih.at/libzip/libzip-1.7.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=edd45dbfa87a4f24b9d70675b2672e6c
diff --git a/metadata/md5-cache/dev-libs/link-grammar-5.3.11 b/metadata/md5-cache/dev-libs/link-grammar-5.3.11
deleted file mode 100644
index 4745b4bc9548..000000000000
--- a/metadata/md5-cache/dev-libs/link-grammar-5.3.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-db/sqlite:3 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.6:* dev-java/ant-core ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) !sci-mathematics/minisat dev-lang/swig:0 sys-devel/autoconf-archive virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A Syntactic English parser
-EAPI=6
-HOMEPAGE=https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/
-IUSE=aspell +hunspell java python static-libs threads elibc_FreeBSD java python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.6:* dev-java/ant-core ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) !sci-mathematics/minisat java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://www.abisource.com/downloads/link-grammar/5.3.11/link-grammar-5.3.11.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=849ec1e6e95e0ae9503ec0655e8b682f
diff --git a/metadata/md5-cache/dev-libs/link-grammar-5.8.0 b/metadata/md5-cache/dev-libs/link-grammar-5.8.0
index 24b7fcb66532..a81ea5d13ca2 100644
--- a/metadata/md5-cache/dev-libs/link-grammar-5.8.0
+++ b/metadata/md5-cache/dev-libs/link-grammar-5.8.0
@@ -5,11 +5,11 @@ DESCRIPTION=A Syntactic English parser
 EAPI=7
 HOMEPAGE=https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/
 IUSE=aspell +hunspell java python elibc_FreeBSD java python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-db/sqlite:3 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) java? ( >=virtual/jdk-1.6:* dev-java/ant-core ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) !sci-mathematics/minisat java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=https://www.abisource.com/downloads/link-grammar/5.8.0/link-grammar-5.8.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=74597a8050aca9f1423d6b25bb632f34
+_md5_=4952c63f591b984ff90b1fd2396aa8ab
diff --git a/metadata/md5-cache/dev-libs/mpc-1.1.0-r1 b/metadata/md5-cache/dev-libs/mpc-1.1.0-r1
deleted file mode 100644
index ef109cd7054c..000000000000
--- a/metadata/md5-cache/dev-libs/mpc-1.1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
-DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
-EAPI=6
-HOMEPAGE=http://mpc.multiprecision.org/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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=LGPL-2.1
-RDEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
-SLOT=0/3
-SRC_URI=mirror://gnu/mpc/mpc-1.1.0.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=742e788ba9ff24582c99cf4f4ba0c947
diff --git a/metadata/md5-cache/dev-libs/msgpack-1.1.0 b/metadata/md5-cache/dev-libs/msgpack-1.1.0
deleted file mode 100644
index 4aef6ef9c12a..000000000000
--- a/metadata/md5-cache/dev-libs/msgpack-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-cpp/gtest-1.6.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=MessagePack is a binary-based efficient data interchange format
-EAPI=6
-HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-c/
-IUSE=+cxx static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-1.1.0/msgpack-1.1.0.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a27bb28f52b874405a7e3f8f0c34b2b4
diff --git a/metadata/md5-cache/dev-libs/msgpack-3.1.1 b/metadata/md5-cache/dev-libs/msgpack-3.1.1
deleted file mode 100644
index 9b41725bad3f..000000000000
--- a/metadata/md5-cache/dev-libs/msgpack-3.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=boost? ( dev-libs/boost[context,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-cpp/gtest-1.6.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] )
-DESCRIPTION=MessagePack is a binary-based efficient data interchange format
-EAPI=7
-HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-c/
-IUSE=boost +cxx doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Boost-1.0
-RDEPEND=boost? ( dev-libs/boost[context,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-3.1.1/msgpack-3.1.1.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=998bb6d50822152c5c0a94df701657f6
diff --git a/metadata/md5-cache/dev-libs/msgpack-3.2.1 b/metadata/md5-cache/dev-libs/msgpack-3.2.1
deleted file mode 100644
index 96060af76c9e..000000000000
--- a/metadata/md5-cache/dev-libs/msgpack-3.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=boost? ( dev-libs/boost[context,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-cpp/gtest-1.6.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-doc/doxygen[dot] )
-DESCRIPTION=MessagePack is a binary-based efficient data interchange format
-EAPI=7
-HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-c/
-IUSE=boost +cxx doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Boost-1.0
-RDEPEND=boost? ( dev-libs/boost[context,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-3.2.1/msgpack-3.2.1.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a765526d318decac1ab6b361a6e62e6
diff --git a/metadata/md5-cache/dev-libs/msgpack-3.3.0 b/metadata/md5-cache/dev-libs/msgpack-3.3.0
new file mode 100644
index 000000000000..d40af855c933
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/msgpack-3.3.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=boost? ( dev-libs/boost[context,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-cpp/gtest-1.6.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=MessagePack is a binary-based efficient data interchange format
+EAPI=7
+HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-c/
+IUSE=boost +cxx doc examples static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Boost-1.0
+RDEPEND=boost? ( dev-libs/boost[context,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-3.3.0/msgpack-3.3.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0f4bafa74422a14624a1ae6b0d5a48a0
diff --git a/metadata/md5-cache/dev-libs/nanomsg-1.1.5 b/metadata/md5-cache/dev-libs/nanomsg-1.1.5
index 0d82c3877f14..ed007a6f31ce 100644
--- a/metadata/md5-cache/dev-libs/nanomsg-1.1.5
+++ b/metadata/md5-cache/dev-libs/nanomsg-1.1.5
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 SLOT=0/5.0.0
 SRC_URI=https://github.com/nanomsg/nanomsg/archive/1.1.5.tar.gz -> nanomsg-1.1.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb1aa8e71a111d5bcfcf56c182a316d7
diff --git a/metadata/md5-cache/dev-libs/ncnn-20200226 b/metadata/md5-cache/dev-libs/ncnn-20200226
index 0a1dd7bf0f12..855df714e15d 100644
--- a/metadata/md5-cache/dev-libs/ncnn-20200226
+++ b/metadata/md5-cache/dev-libs/ncnn-20200226
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-util/glslang dev-util/vulkan-headers media-libs/vulkan-loader
 SLOT=0
 SRC_URI=https://github.com/Tencent/ncnn/archive/20200226.tar.gz -> ncnn-20200226.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad362c980db8c1f22f0242d262bbeea0
diff --git a/metadata/md5-cache/dev-libs/ncnn-20200413 b/metadata/md5-cache/dev-libs/ncnn-20200413
index 1b010272291f..62e24fc3007b 100644
--- a/metadata/md5-cache/dev-libs/ncnn-20200413
+++ b/metadata/md5-cache/dev-libs/ncnn-20200413
@@ -10,5 +10,5 @@ RDEPEND=dev-util/glslang dev-util/vulkan-headers media-libs/vulkan-loader
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Tencent/ncnn/archive/20200413.tar.gz -> ncnn-20200413.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf32539b0441c675fdeb98f8fb688390
diff --git a/metadata/md5-cache/dev-libs/ncnn-20200727 b/metadata/md5-cache/dev-libs/ncnn-20200727
index 9e0a1ece22ff..be7323f445a3 100644
--- a/metadata/md5-cache/dev-libs/ncnn-20200727
+++ b/metadata/md5-cache/dev-libs/ncnn-20200727
@@ -10,5 +10,5 @@ RDEPEND=dev-util/glslang dev-util/vulkan-headers media-libs/vulkan-loader
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Tencent/ncnn/archive/20200727.tar.gz -> ncnn-20200727.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf32539b0441c675fdeb98f8fb688390
diff --git a/metadata/md5-cache/dev-libs/nss-pem-1.0.5 b/metadata/md5-cache/dev-libs/nss-pem-1.0.5
index 16acf90e6a04..67fd3274e059 100644
--- a/metadata/md5-cache/dev-libs/nss-pem-1.0.5
+++ b/metadata/md5-cache/dev-libs/nss-pem-1.0.5
@@ -10,5 +10,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/nss-3.50-r1
 SLOT=0
 SRC_URI=https://github.com/kdudka/nss-pem/releases/download/nss-pem-1.0.5/nss-pem-1.0.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b6fb766b6b8d28c8aa508ff893c1ac7
diff --git a/metadata/md5-cache/dev-libs/nss-pem-1.0.6 b/metadata/md5-cache/dev-libs/nss-pem-1.0.6
index 31ea192a32ac..13a1d1780aed 100644
--- a/metadata/md5-cache/dev-libs/nss-pem-1.0.6
+++ b/metadata/md5-cache/dev-libs/nss-pem-1.0.6
@@ -10,5 +10,5 @@ LICENSE=MPL-1.1
 RDEPEND=>=dev-libs/nss-3.50-r1
 SLOT=0
 SRC_URI=https://github.com/kdudka/nss-pem/releases/download/nss-pem-1.0.6/nss-pem-1.0.6.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f27f977a2f6cc258dea17b8f4a3630d
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1 b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1
index a4369fd8474f..a4b15a2fa999 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1
+++ b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=sys-devel/clang:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/spirv-llvm-translator:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=10
 SRC_URI=https://github.com/intel/opencl-clang/archive/v10.0.0-1.tar.gz -> opencl-clang-10.0.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b0b8bbaa0b1d82d6fc33f2ecb593422
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1 b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1
new file mode 100644
index 000000000000..7733d71d67ce
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=~sys-devel/clang-10.0.1:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/spirv-llvm-translator:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!sys-devel/llvm:0
+DESCRIPTION=OpenCL-oriented thin wrapper library around clang
+EAPI=7
+HOMEPAGE=https://github.com/intel/opencl-clang
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=UoI-NCSA
+RDEPEND=~sys-devel/clang-10.0.1:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/spirv-llvm-translator:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=10
+SRC_URI=https://github.com/intel/opencl-clang/archive/v10.0.0-1.tar.gz -> opencl-clang-10.0.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=49bfd2f3f5a35c3a3d7b7a1bcc98399c
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2 b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2
index 135e25d1700f..e6e0103276b7 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2
+++ b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=sys-devel/clang:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-llvm-translator-10.0.0_p20200909:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=10
 SRC_URI=https://github.com/intel/opencl-clang/archive/v10.0.0-2.tar.gz -> opencl-clang-10.0.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1cb5b664225ac6dbcd5e47f7afcc2ab7
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1 b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1
new file mode 100644
index 000000000000..9e4b3d96c733
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/opencl-clang-10.0.0.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=~sys-devel/clang-10.0.1:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-llvm-translator-10.0.0_p20200909:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!sys-devel/llvm:0
+DESCRIPTION=OpenCL-oriented thin wrapper library around clang
+EAPI=7
+HOMEPAGE=https://github.com/intel/opencl-clang
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=UoI-NCSA
+RDEPEND=~sys-devel/clang-10.0.1:10=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-llvm-translator-10.0.0_p20200909:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=10
+SRC_URI=https://github.com/intel/opencl-clang/archive/v10.0.0-2.tar.gz -> opencl-clang-10.0.0.2.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0c04a100a7c06f0e6a9be219aac58951
diff --git a/metadata/md5-cache/dev-libs/opencl-clang-9.0.1 b/metadata/md5-cache/dev-libs/opencl-clang-9.0.1
index a2f65647684b..69ff6239834d 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-9.0.1
+++ b/metadata/md5-cache/dev-libs/opencl-clang-9.0.1
@@ -10,5 +10,5 @@ LICENSE=UoI-NCSA
 RDEPEND=sys-devel/clang:9=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] dev-util/spirv-llvm-translator:9=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=9
 SRC_URI=https://github.com/intel/opencl-clang/archive/v9.0.1.tar.gz -> opencl-clang-9.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d3d68c8b6e653f529495caa278b98c9
diff --git a/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13-r1 b/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13-r1
index 0859e69f3cd8..8111007f25c1 100644
--- a/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13-r1
+++ b/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-util/opencl-headers !app-eselect/eselect-opencl !dev-libs/ocl-icd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v2020.03.13.tar.gz -> opencl-icd-loader-2020.03.13.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=913ee998c63a2fa22dee58672f02a2dc
diff --git a/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.06.16 b/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.06.16
index 9d5f960c7739..cb892c70b2a8 100644
--- a/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.06.16
+++ b/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.06.16
@@ -11,5 +11,5 @@ RDEPEND=dev-util/opencl-headers !app-eselect/eselect-opencl !dev-libs/ocl-icd
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v2020.06.16.tar.gz -> opencl-icd-loader-2020.06.16.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=828b56fc92f0e62e2daf5c43697f55fe
diff --git a/metadata/md5-cache/dev-libs/pegtl-2.8.3 b/metadata/md5-cache/dev-libs/pegtl-2.8.3
index aa8fcb2ca820..43c765cabd3c 100644
--- a/metadata/md5-cache/dev-libs/pegtl-2.8.3
+++ b/metadata/md5-cache/dev-libs/pegtl-2.8.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taocpp/PEGTL/archive/2.8.3.tar.gz -> pegtl-2.8.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3199174e4558c761a38a2cf4db6cf32f
diff --git a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1 b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
index 133c5e443835..cb42ba92dcef 100644
--- a/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
+++ b/metadata/md5-cache/dev-libs/plasma-wayland-protocols-1.1.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=mirror://kde/stable/plasma-wayland-protocols/1.1.1/plasma-wayland-protocols-1.1.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=227b51fb3d70e4cb0591be39dd1d300b
diff --git a/metadata/md5-cache/dev-libs/poco-1.9.0-r2 b/metadata/md5-cache/dev-libs/poco-1.9.0-r2
index cc3e6ff2ad3c..9b03e7f59565 100644
--- a/metadata/md5-cache/dev-libs/poco-1.9.0-r2
+++ b/metadata/md5-cache/dev-libs/poco-1.9.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=7z? ( xml ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) mon
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.9.0-release.tar.gz -> poco-1.9.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5729311e2a514cedefaada47869cff02
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.10.1 b/metadata/md5-cache/dev-libs/protobuf-3.10.1
deleted file mode 100644
index 7dc99edc185f..000000000000
--- a/metadata/md5-cache/dev-libs/protobuf-3.10.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=test? ( >=dev-cpp/gtest-1.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing structured data
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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
-LICENSE=BSD
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0/21
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.10.1.tar.gz -> protobuf-3.10.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd15d9237e2d2ef530236f1f002bdfa1
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.11.4 b/metadata/md5-cache/dev-libs/protobuf-3.11.4
index 250f545409a7..2843da17be53 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.11.4
+++ b/metadata/md5-cache/dev-libs/protobuf-3.11.4
@@ -11,5 +11,5 @@ RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_
 RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.11.4.tar.gz -> protobuf-3.11.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ff577c4f36fabba6c03b3270efb4dca2
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.12.2 b/metadata/md5-cache/dev-libs/protobuf-3.12.2
index b6a1ed95b848..bd6f264af8ac 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.12.2
+++ b/metadata/md5-cache/dev-libs/protobuf-3.12.2
@@ -5,11 +5,11 @@ DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing str
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/23
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.2.tar.gz -> protobuf-3.12.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b28bc56032b6444a8788ead9ff7c5715
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2359822ceb469d8e745118fae5dca34e
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.12.4 b/metadata/md5-cache/dev-libs/protobuf-3.12.4
index c5fddd0576ce..e65cab2e5acd 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.12.4
+++ b/metadata/md5-cache/dev-libs/protobuf-3.12.4
@@ -5,11 +5,11 @@ DESCRIPTION=Google's Protocol Buffers - Extensible mechanism for serializing str
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
 IUSE=emacs examples static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/23
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.4.tar.gz -> protobuf-3.12.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5f557fedb4c4a3c86f153324a4acb15d
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2a302104b43fcf2a8a1c90e4123ebd36
diff --git a/metadata/md5-cache/dev-libs/protobuf-3.13.0 b/metadata/md5-cache/dev-libs/protobuf-3.13.0
index 1fe18dc2358a..a99b2c74fb80 100644
--- a/metadata/md5-cache/dev-libs/protobuf-3.13.0
+++ b/metadata/md5-cache/dev-libs/protobuf-3.13.0
@@ -11,5 +11,5 @@ RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz -> protobuf-3.13.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7f7476fa75f3c77ad096aa41919b8111
diff --git a/metadata/md5-cache/dev-libs/protobuf-9999 b/metadata/md5-cache/dev-libs/protobuf-9999
index 054c51d30e37..2e505a6fad22 100644
--- a/metadata/md5-cache/dev-libs/protobuf-9999
+++ b/metadata/md5-cache/dev-libs/protobuf-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=emacs? ( app-editors/emacs:* ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/24
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=66191bf0fa2254dbe6c0ab59e60c2b3b
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.10 b/metadata/md5-cache/dev-libs/pugixml-1.10
index 13a2b5d1223d..22d024df7594 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.10
+++ b/metadata/md5-cache/dev-libs/pugixml-1.10
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x8
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.10/pugixml-1.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2aa12b32accf74839077af7f56ec3880
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.9-r1 b/metadata/md5-cache/dev-libs/pugixml-1.9-r1
index d40357c18b0f..1a4af30821d9 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.9-r1
+++ b/metadata/md5-cache/dev-libs/pugixml-1.9-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.9/pugixml-1.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=203148961c032e8237506a564655322a
diff --git a/metadata/md5-cache/dev-libs/pugixml-9999 b/metadata/md5-cache/dev-libs/pugixml-9999
index 3fb6a15592f9..45ad1978c7a0 100644
--- a/metadata/md5-cache/dev-libs/pugixml-9999
+++ b/metadata/md5-cache/dev-libs/pugixml-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml/
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b6486055cfafc303fc7d867fbd3c21b
diff --git a/metadata/md5-cache/dev-libs/qtkeychain-0.10.0 b/metadata/md5-cache/dev-libs/qtkeychain-0.10.0
index 5dcbe34216d3..5b0328a46eb5 100644
--- a/metadata/md5-cache/dev-libs/qtkeychain-0.10.0
+++ b/metadata/md5-cache/dev-libs/qtkeychain-0.10.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 )
 SLOT=0/1
 SRC_URI=https://github.com/frankosterfeld/qtkeychain/archive/v0.10.0.tar.gz -> qtkeychain-0.10.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80d81e39519a93e56541583b1df77f73
diff --git a/metadata/md5-cache/dev-libs/quazip-0.9.1 b/metadata/md5-cache/dev-libs/quazip-0.9.1
index b93aa3017728..49e05f5b0b55 100644
--- a/metadata/md5-cache/dev-libs/quazip-0.9.1
+++ b/metadata/md5-cache/dev-libs/quazip-0.9.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 sys-libs/zlib[minizip]
 SLOT=0
 SRC_URI=https://github.com/stachenov/quazip/archive/v0.9.1.tar.gz -> quazip-0.9.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=acf222271a92f173a10660beef25ae6e
diff --git a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2 b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2
index c8fe2136c887..ccc835b5fe8e 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2
+++ b/metadata/md5-cache/dev-libs/rapidjson-1.1.0-r2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz -> rapidjson-1.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=72309a17f2dd97e50bbee08318abeb5d
diff --git a/metadata/md5-cache/dev-libs/rapidjson-9999 b/metadata/md5-cache/dev-libs/rapidjson-9999
index 8163c10ac496..3061d171eb17 100644
--- a/metadata/md5-cache/dev-libs/rapidjson-9999
+++ b/metadata/md5-cache/dev-libs/rapidjson-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1828d2ad093b3b2985b8d876a8e69386
diff --git a/metadata/md5-cache/dev-libs/re2-0.2020.06.01 b/metadata/md5-cache/dev-libs/re2-0.2020.06.01
deleted file mode 100644
index 48bc33573ba4..000000000000
--- a/metadata/md5-cache/dev-libs/re2-0.2020.06.01
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=icu? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=An efficient, principled regular expression library
-EAPI=7
-HOMEPAGE=https://github.com/google/re2
-IUSE=icu abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
-LICENSE=BSD
-RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/7
-SRC_URI=https://github.com/google/re2/archive/2020-06-01.tar.gz -> re2-2020-06-01.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1b9c1c6f8296e3e073da8c6c75286563
diff --git a/metadata/md5-cache/dev-libs/re2-0.2020.07.06 b/metadata/md5-cache/dev-libs/re2-0.2020.07.06
deleted file mode 100644
index 3863aeb603cb..000000000000
--- a/metadata/md5-cache/dev-libs/re2-0.2020.07.06
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=icu? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=An efficient, principled regular expression library
-EAPI=7
-HOMEPAGE=https://github.com/google/re2
-IUSE=icu abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/8
-SRC_URI=https://github.com/google/re2/archive/2020-07-06.tar.gz -> re2-2020-07-06.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5e0fdd11048b7a1ce121e701fc746d16
diff --git a/metadata/md5-cache/dev-libs/re2-0.2020.08.01 b/metadata/md5-cache/dev-libs/re2-0.2020.08.01
index cd672464cded..0afc127bac82 100644
--- a/metadata/md5-cache/dev-libs/re2-0.2020.08.01
+++ b/metadata/md5-cache/dev-libs/re2-0.2020.08.01
@@ -5,10 +5,10 @@ DESCRIPTION=An efficient, principled regular expression library
 EAPI=7
 HOMEPAGE=https://github.com/google/re2
 IUSE=icu abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/8
 SRC_URI=https://github.com/google/re2/archive/2020-08-01.tar.gz -> re2-2020-08-01.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fcb41d5b2194bd64351f07ba4d320068
+_md5_=53a77f769d34d5ab9cc6c9b0599cab7d
diff --git a/metadata/md5-cache/dev-libs/rinutils-0.4.0 b/metadata/md5-cache/dev-libs/rinutils-0.4.0
index 91e6550fa211..4be159e58371 100644
--- a/metadata/md5-cache/dev-libs/rinutils-0.4.0
+++ b/metadata/md5-cache/dev-libs/rinutils-0.4.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/shlomif/rinutils/releases/download/0.4.0/rinutils-0.4.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=368e80ca7946d6e28d8b2bd2e15fed64
diff --git a/metadata/md5-cache/dev-libs/rinutils-0.4.1 b/metadata/md5-cache/dev-libs/rinutils-0.4.1
index 143e2e6cce81..bf33e93b4461 100644
--- a/metadata/md5-cache/dev-libs/rinutils-0.4.1
+++ b/metadata/md5-cache/dev-libs/rinutils-0.4.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/shlomif/rinutils/releases/download/0.4.1/rinutils-0.4.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2f09d874f85ffbc8b6cfc678d10c2e2
diff --git a/metadata/md5-cache/dev-libs/rinutils-0.6.0 b/metadata/md5-cache/dev-libs/rinutils-0.6.0
new file mode 100644
index 000000000000..2244cb464ec9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rinutils-0.6.0
@@ -0,0 +1,11 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Set of C headers containing macros and static functions
+EAPI=7
+HOMEPAGE=https://www.shlomifish.org/open-source/projects/ https://github.com/shlomif/rinutils
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/shlomif/rinutils/releases/download/0.6.0/rinutils-0.6.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c2f09d874f85ffbc8b6cfc678d10c2e2
diff --git a/metadata/md5-cache/dev-libs/rocclr-3.8.0 b/metadata/md5-cache/dev-libs/rocclr-3.8.0
index 3bbd0421ad59..47b81e9c315d 100644
--- a/metadata/md5-cache/dev-libs/rocclr-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocclr-3.8.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-comgr-3.8.0 >=dev-libs/rocr-runtime-3.8.0
 SLOT=0/3.8
 SRC_URI=https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-3.8.0.tar.gz -> rocclr-3.8.0.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-3.8.0.tar.gz -> rocm-opencl-runtime-3.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42fbc29b244b38ebf46de85ff27a698d
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-3.7.0 b/metadata/md5-cache/dev-libs/rocm-comgr-3.7.0
index 03cf3c0744c2..ef280fda3d51 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-3.7.0
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-3.7.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-3.7.0 >=sys-devel/llvm-roc-3.7.0:=
 SLOT=0/3.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-3.7.0.tar.gz -> rocm-comgr-3.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d86040964c8507cd24f7a2d01318f864
diff --git a/metadata/md5-cache/dev-libs/rocm-comgr-3.8.0 b/metadata/md5-cache/dev-libs/rocm-comgr-3.8.0
index d7a6e8aca619..2f61886bf750 100644
--- a/metadata/md5-cache/dev-libs/rocm-comgr-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocm-comgr-3.8.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocm-device-libs-3.8.0 >=sys-devel/llvm-roc-3.8.0:=
 SLOT=0/3.8
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-3.8.0.tar.gz -> rocm-comgr-3.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d86040964c8507cd24f7a2d01318f864
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-3.7.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-3.7.0
index 8bdb1e11d93c..c12324e9692e 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-3.7.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-3.7.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-3.7.0:=
 SLOT=0/3.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-3.7.0.tar.gz -> rocm-device-libs-3.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99f5867f03ec583d1ea39eb62b32a088
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-3.8.0 b/metadata/md5-cache/dev-libs/rocm-device-libs-3.8.0
index 2ee41b8a6c71..1db8c37ba607 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-3.8.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sys-devel/llvm-roc-3.8.0:=
 SLOT=0/3.8
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-3.8.0.tar.gz -> rocm-device-libs-3.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99f5867f03ec583d1ea39eb62b32a088
diff --git a/metadata/md5-cache/dev-libs/rocm-device-libs-9999 b/metadata/md5-cache/dev-libs/rocm-device-libs-9999
index c638b5635dc1..7077d080966d 100644
--- a/metadata/md5-cache/dev-libs/rocm-device-libs-9999
+++ b/metadata/md5-cache/dev-libs/rocm-device-libs-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/rocr-runtime sys-devel/llvm-roc:=
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4c1e0e3c92a41ad9132b9c95edf47e8
diff --git a/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0 b/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0
index fe1df06be41a..bab60bd2363d 100644
--- a/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0
+++ b/metadata/md5-cache/dev-libs/rocm-hostcall-2.7.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/rocr-runtime
 SLOT=0/2.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-2.7.0.tar.gz -> rocm-hostcall-2.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=731ea371f522d3707dc0844408393875
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.7.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.7.0
deleted file mode 100644
index e9010b8608a1..000000000000
--- a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/rocm-cmake-3.7.0 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/rocr-runtime-3.7.0 >=dev-libs/rocclr-3.7.0 >=dev-libs/rocm-comgr-3.7.0 >=dev-libs/rocm-device-libs-3.7.0 >=virtual/opencl-3 media-libs/mesa dev-lang/ocaml dev-ml/findlib
-DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
-EAPI=7
-HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 MIT
-RDEPEND=>=dev-libs/rocr-runtime-3.7.0 >=dev-libs/rocclr-3.7.0 >=dev-libs/rocm-comgr-3.7.0 >=dev-libs/rocm-device-libs-3.7.0 >=virtual/opencl-3 media-libs/mesa
-SLOT=0/3.7
-SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.7.0.tar.gz -> rocm-opencl-runtime-3.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ceac68d953b532e9dbfc1eb1d8c1915d
diff --git a/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0 b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0
new file mode 100644
index 000000000000..66eedb005eb2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rocm-opencl-runtime-3.8.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/rocm-cmake-3.8.0 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/rocr-runtime-3.8.0 >=dev-libs/rocclr-3.8.0 >=dev-libs/rocm-comgr-3.8.0 >=dev-libs/rocm-device-libs-3.8.0 >=virtual/opencl-3 media-libs/mesa dev-lang/ocaml dev-ml/findlib
+DESCRIPTION=Radeon Open Compute OpenCL Compatible Runtime
+EAPI=7
+HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT
+RDEPEND=>=dev-libs/rocr-runtime-3.8.0 >=dev-libs/rocclr-3.8.0 >=dev-libs/rocm-comgr-3.8.0 >=dev-libs/rocm-device-libs-3.8.0 >=virtual/opencl-3 media-libs/mesa
+SLOT=0/3.8
+SRC_URI=https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-3.8.0.tar.gz -> rocm-opencl-runtime-3.8.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ceac68d953b532e9dbfc1eb1d8c1915d
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0 b/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0
index e61f9ddee271..11a8cd634b70 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-3.8.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl dev-libs/elfutils:=
 SLOT=0/3.8
 SRC_URI=https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-3.8.0.tar.gz -> rocr-runtime-3.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=48a106492a94ad193f0e0864bbc712b0
diff --git a/metadata/md5-cache/dev-libs/rocr-runtime-9999 b/metadata/md5-cache/dev-libs/rocr-runtime-9999
index 6de910c402e1..acfd37b6eb03 100644
--- a/metadata/md5-cache/dev-libs/rocr-runtime-9999
+++ b/metadata/md5-cache/dev-libs/rocr-runtime-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=sys-process/numactl dev-libs/elfutils:=
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=48a106492a94ad193f0e0864bbc712b0
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.7.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.7.0
index d8e0c86822cf..1d68b15a48d4 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.7.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.7.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/3.7
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-3.7.0.tar.gz -> roct-thunk-interface-3.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d47d1f6f96f6141da33282b380807e84
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.8.0 b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.8.0
index 8bc6410c1c05..53a0bc40396d 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-3.8.0
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-3.8.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=sys-process/numactl
 SLOT=0/3.8
 SRC_URI=https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-3.8.0.tar.gz -> roct-thunk-interface-3.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d47d1f6f96f6141da33282b380807e84
diff --git a/metadata/md5-cache/dev-libs/roct-thunk-interface-9999 b/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
index f70404d13974..afd2f3365229 100644
--- a/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
+++ b/metadata/md5-cache/dev-libs/roct-thunk-interface-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=sys-process/numactl
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d47d1f6f96f6141da33282b380807e84
diff --git a/metadata/md5-cache/dev-libs/serd-0.30.4 b/metadata/md5-cache/dev-libs/serd-0.30.4
index 1932f030e859..8e9f206d8eee 100644
--- a/metadata/md5-cache/dev-libs/serd-0.30.4
+++ b/metadata/md5-cache/dev-libs/serd-0.30.4
@@ -4,10 +4,10 @@ DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/serd/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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=ISC
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/serd-0.30.4.tar.bz2
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=ab7bccee7a9be439e4ce49683950ae36
+_md5_=82cfb854577124caf32c4ee8b594d492
diff --git a/metadata/md5-cache/dev-libs/sink-0.8.0-r2 b/metadata/md5-cache/dev-libs/sink-0.8.0-r2
index fdec461ceb00..22bd9707b03e 100644
--- a/metadata/md5-cache/dev-libs/sink-0.8.0-r2
+++ b/metadata/md5-cache/dev-libs/sink-0.8.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-db/lmdb:= dev-libs/flatbuffers >=dev-libs/kasync-0.3:5 >=dev-libs/xa
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/sink/0.8.0/src/sink-0.8.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a950f293ed17d4eada3f8d9d2a9f8365
diff --git a/metadata/md5-cache/dev-libs/softhsm-2.6.1 b/metadata/md5-cache/dev-libs/softhsm-2.6.1
index 314d999a87aa..7b6bae4cc362 100644
--- a/metadata/md5-cache/dev-libs/softhsm-2.6.1
+++ b/metadata/md5-cache/dev-libs/softhsm-2.6.1
@@ -5,10 +5,10 @@ DESCRIPTION=A software PKCS#11 implementation
 EAPI=7
 HOMEPAGE=https://www.opendnssec.org/
 IUSE=bindist gost libressl migration-tool test
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:= ) !~dev-libs/softhsm-2.0.0:0
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://www.opendnssec.org/files/source/softhsm-2.6.1.tar.gz
-_md5_=d669671686a29343c4d78ad5ec56915a
+_md5_=267c2fb06c9f6568544785b049d536b6
diff --git a/metadata/md5-cache/dev-libs/sord-0.16.6 b/metadata/md5-cache/dev-libs/sord-0.16.6
new file mode 100644
index 000000000000..116c2380e712
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/sord-0.16.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libpcre dev-libs/serd || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig
+DESCRIPTION=Library for storing RDF data in memory
+EAPI=6
+HOMEPAGE=http://drobilla.net/software/sord/
+IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=ISC
+RDEPEND=dev-libs/libpcre dev-libs/serd
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://download.drobilla.net/sord-0.16.6.tar.bz2
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa
+_md5_=f24fae9bfa4f01b3b023b8e437eae133
diff --git a/metadata/md5-cache/dev-libs/sord-9999 b/metadata/md5-cache/dev-libs/sord-9999
index fd2e151d64a3..3c1432312342 100644
--- a/metadata/md5-cache/dev-libs/sord-9999
+++ b/metadata/md5-cache/dev-libs/sord-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libpcre >=dev-libs/serd-0.30.0 || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/libpcre dev-libs/serd || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Library for storing RDF data in memory
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/sord/
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=ISC
 PROPERTIES=live
-RDEPEND=dev-libs/libpcre >=dev-libs/serd-0.30.0
+RDEPEND=dev-libs/libpcre dev-libs/serd
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=b92689596f111390d2e46dffa3c6c17c
+_md5_=37c6a0e1ca204be80ee24eae13ad0e94
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.5.0-r1 b/metadata/md5-cache/dev-libs/spdlog-1.5.0-r1
index 3e872f78bf44..6640be8e3f7d 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.5.0-r1
+++ b/metadata/md5-cache/dev-libs/spdlog-1.5.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libfmt-5.3.0:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.5.0.tar.gz -> spdlog-1.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=384edabd53265cc59ba6da5ab696630a
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.6.1 b/metadata/md5-cache/dev-libs/spdlog-1.6.1
index cf63923196d2..dc09ffe371aa 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.6.1
+++ b/metadata/md5-cache/dev-libs/spdlog-1.6.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libfmt-5.3.0:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.6.1.tar.gz -> spdlog-1.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8a27801ad823694e8ca38a7a9a07def
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.6.1-r1 b/metadata/md5-cache/dev-libs/spdlog-1.6.1-r1
index dff12411529e..15c86b4ad6e6 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.6.1-r1
+++ b/metadata/md5-cache/dev-libs/spdlog-1.6.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libfmt-5.3.0:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.6.1.tar.gz -> spdlog-1.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=678769a4a6c14d265a39529fa83e4037
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.7.0 b/metadata/md5-cache/dev-libs/spdlog-1.7.0
index 21a7570015f4..1be095c10938 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.7.0
+++ b/metadata/md5-cache/dev-libs/spdlog-1.7.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libfmt-6.1.2:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.7.0.tar.gz -> spdlog-1.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=92d143983527afc9a43376e5b983462d
diff --git a/metadata/md5-cache/dev-libs/spdlog-9999 b/metadata/md5-cache/dev-libs/spdlog-9999
index 23cbe141e579..682e6f42b92f 100644
--- a/metadata/md5-cache/dev-libs/spdlog-9999
+++ b/metadata/md5-cache/dev-libs/spdlog-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/libfmt-5.3.0:=
 RESTRICT=!test? ( test )
 SLOT=0/1
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8a27801ad823694e8ca38a7a9a07def
diff --git a/metadata/md5-cache/dev-libs/stp-2.3.3 b/metadata/md5-cache/dev-libs/stp-2.3.3
index bb217c0d1d97..51f64975a980 100644
--- a/metadata/md5-cache/dev-libs/stp-2.3.3
+++ b/metadata/md5-cache/dev-libs/stp-2.3.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= sci-mathematics/minisat
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stp/stp/archive/2.3.3.tar.gz -> stp-2.3.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad6b1e168714f4a3069c4e650c9d29d3
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-7.1.0 b/metadata/md5-cache/dev-libs/tinyxml2-7.1.0
index 3d8904489d64..3f620b6d3ad1 100644
--- a/metadata/md5-cache/dev-libs/tinyxml2-7.1.0
+++ b/metadata/md5-cache/dev-libs/tinyxml2-7.1.0
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/leethomason/tinyxml2/archive/7.1.0.tar.gz -> tinyxml2-7.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0415e47eacf014082fdc0905c7937b0b
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-8.0.0 b/metadata/md5-cache/dev-libs/tinyxml2-8.0.0
index 92e561989b01..3b30e0799f6f 100644
--- a/metadata/md5-cache/dev-libs/tinyxml2-8.0.0
+++ b/metadata/md5-cache/dev-libs/tinyxml2-8.0.0
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://github.com/leethomason/tinyxml2/archive/8.0.0.tar.gz -> tinyxml2-8.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2af99a3e77e2fd51170b2c3f6f20152
diff --git a/metadata/md5-cache/dev-libs/unibilium-2.1.0 b/metadata/md5-cache/dev-libs/unibilium-2.1.0
new file mode 100644
index 000000000000..e5d91a78a95e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/unibilium-2.1.0
@@ -0,0 +1,12 @@
+BDEPEND=dev-lang/perl sys-devel/libtool
+DEFINED_PHASES=compile install
+DESCRIPTION=A very basic terminfo library
+EAPI=7
+HOMEPAGE=https://github.com/neovim/unibilium/
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-3+ MIT
+SLOT=0/4
+SRC_URI=https://github.com/neovim/unibilium/archive/v2.1.0.tar.gz -> unibilium-2.1.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e106f461e46897c304f44a01a3f80346
diff --git a/metadata/md5-cache/dev-libs/unittest++-2.0.0-r1 b/metadata/md5-cache/dev-libs/unittest++-2.0.0-r1
index a699e1df07f0..0a49b093facf 100644
--- a/metadata/md5-cache/dev-libs/unittest++-2.0.0-r1
+++ b/metadata/md5-cache/dev-libs/unittest++-2.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unittest-cpp/unittest-cpp/archive/v2.0.0.tar.gz -> unittest++-2.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ace714a459d661ddbfb522e933c6b9c7
diff --git a/metadata/md5-cache/dev-libs/urdfdom-1.0.4 b/metadata/md5-cache/dev-libs/urdfdom-1.0.4
index 312101aa1336..1431c765651f 100644
--- a/metadata/md5-cache/dev-libs/urdfdom-1.0.4
+++ b/metadata/md5-cache/dev-libs/urdfdom-1.0.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl] dev-libs/boost:=[threads]
 SLOT=0/1
 SRC_URI=https://github.com/ros/urdfdom/archive/1.0.4.tar.gz -> urdfdom-1.0.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eae541e5b613b80d3a5f510dcbcbae5a
diff --git a/metadata/md5-cache/dev-libs/urdfdom-9999 b/metadata/md5-cache/dev-libs/urdfdom-9999
index 50032eeec7f4..ddf18fa6c4e6 100644
--- a/metadata/md5-cache/dev-libs/urdfdom-9999
+++ b/metadata/md5-cache/dev-libs/urdfdom-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=>=dev-libs/urdfdom_headers-1.0.0 >=dev-libs/console_bridge-0.3:= dev-libs/tinyxml[stl] dev-libs/boost:=[threads]
 SLOT=0/1
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=24b770dd6eed70f1326bb151e0137914
diff --git a/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.5 b/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.5
index 723e3236919c..0f55c6cf94bd 100644
--- a/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.5
+++ b/metadata/md5-cache/dev-libs/urdfdom_headers-1.0.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/ros/urdfdom_headers/archive/1.0.5.tar.gz -> urdfdom_headers-1.0.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b28afac5d14b1268c81232c5b38406f6
diff --git a/metadata/md5-cache/dev-libs/urdfdom_headers-9999 b/metadata/md5-cache/dev-libs/urdfdom_headers-9999
index 620821567709..b7f370f37d9a 100644
--- a/metadata/md5-cache/dev-libs/urdfdom_headers-9999
+++ b/metadata/md5-cache/dev-libs/urdfdom_headers-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://ros.org/wiki/urdf
 LICENSE=BSD
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b28afac5d14b1268c81232c5b38406f6
diff --git a/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904 b/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
index 0eb1143d57cc..0407c0180a04 100644
--- a/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
+++ b/metadata/md5-cache/dev-libs/vc-intrinsics-0_p20200904
@@ -11,5 +11,5 @@ RDEPEND=sys-devel/llvm:10=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/intel/vc-intrinsics/archive/830067832d4af0fbd5710e9a45669a02fcfb7c3f.tar.gz -> vc-intrinsics-0_p20200904.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a5b9aff9177091ef0437b665eaa82fe3
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.17 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.17
index 8c56d67a28b5..719d942886ac 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.17
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.17
@@ -5,11 +5,11 @@ DESCRIPTION=SWIG and JNI bindings for Xapian
 EAPI=7
 HOMEPAGE=https://www.xapian.org/
 IUSE=java lua mono perl php python ruby tcl elibc_FreeBSD java php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ruby_targets_ruby25 ruby_targets_ruby26
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/xapian-1.4.15 lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) ruby? ( || ( ruby_targets_ruby25 ruby_targets_ruby26 ) ) php? ( || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.17/xapian-bindings-1.4.17.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	estack	686eaab303305a908fd57b2fd7617800	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=28af3d7dd7ec30fcd4c58426782026d3
+_md5_=e3e2df2f69203b4ca83391582f6e700a
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.71-r2 b/metadata/md5-cache/dev-libs/zziplib-0.13.71-r2
index 0afe3a50ccd2..e4ab774c9eb2 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.71-r2
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.71-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 RESTRICT=!test? ( test )
 SLOT=0/13
 SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.71.tar.gz -> zziplib-0.13.71.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2df6f792b20dcb2f2c90192e30f6da2
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.71_p20200419 b/metadata/md5-cache/dev-libs/zziplib-0.13.71_p20200419
index 8769ccbeb911..49260e113c02 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.71_p20200419
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.71_p20200419
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 RESTRICT=test
 SLOT=0/13
 SRC_URI=https://github.com/gdraheim/zziplib/archive/223930775aa5b325f04cec01f0b18726a7918821.tar.gz -> zziplib-0.13.71_p20200419.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27f70c96746c0f6b4cb95aa2de205e39
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 40c79249ae05..f8e065100328 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/c2ffi-10.0.0.20200527 b/metadata/md5-cache/dev-lisp/c2ffi-10.0.0.20200527
index d5397493a065..942d53cc75a0 100644
--- a/metadata/md5-cache/dev-lisp/c2ffi-10.0.0.20200527
+++ b/metadata/md5-cache/dev-lisp/c2ffi-10.0.0.20200527
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-devel/clang:10= sys-devel/llvm:10=
 SLOT=0
 SRC_URI=https://github.com/rpav/c2ffi/archive/a2d1f667b707fb413fc8ab2413446f15cb23de51.tar.gz -> c2ffi-10.0.0.20200527.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=246e37a27209d92624e68be12b76e36e
diff --git a/metadata/md5-cache/dev-lisp/c2ffi-10.0.0.9999 b/metadata/md5-cache/dev-lisp/c2ffi-10.0.0.9999
index 8e83e38a3c21..857f0e5b2153 100644
--- a/metadata/md5-cache/dev-lisp/c2ffi-10.0.0.9999
+++ b/metadata/md5-cache/dev-lisp/c2ffi-10.0.0.9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=sys-devel/clang:10= sys-devel/llvm:10=
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df5948020874693a61e1ed55c0a75106
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.10 b/metadata/md5-cache/dev-lisp/gcl-2.6.10
index ea4b62a04356..16c88f3cf93b 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.10
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.10
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) readline? ( sys-libs/readline:= )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gnu/gcl/gcl-2.6.10.tar.gz https://dev.gentoo.org/~grozin/gcl-2.6.10-fedora.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=784dfc8d754e43a36dc2c042b5145f8f
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.12 b/metadata/md5-cache/dev-lisp/gcl-2.6.12
index 9437243b8096..fba9823d828c 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.12
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.12
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) readline? ( sys-libs/readline:= )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gnu/gcl/gcl-2.6.12.tar.gz https://dev.gentoo.org/~grozin/gcl-2.6.12-fedora.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=683a39a62bea51a52c5226b965dfc10b
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 348bb841b5df..c090eb12048b 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/lua-zlib-1.2 b/metadata/md5-cache/dev-lua/lua-zlib-1.2
index 171647634427..0bb04c21dd24 100644
--- a/metadata/md5-cache/dev-lua/lua-zlib-1.2
+++ b/metadata/md5-cache/dev-lua/lua-zlib-1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/lua:0 sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/brimworks/lua-zlib/archive/v1.2.tar.gz -> lua-zlib-1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5cdfbb8e59ef7f1ee12c8b87a2b3004
diff --git a/metadata/md5-cache/dev-lua/luaposix-35.0 b/metadata/md5-cache/dev-lua/luaposix-35.0
index f28101a158f3..ec1887c01214 100644
--- a/metadata/md5-cache/dev-lua/luaposix-35.0
+++ b/metadata/md5-cache/dev-lua/luaposix-35.0
@@ -1,5 +1,5 @@
 BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install
+DEFINED_PHASES=compile install prepare
 DEPEND=dev-lang/lua:0= dev-lua/lua-bit32
 DESCRIPTION=Bindings for POSIX APIs
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/lua:0= dev-lua/lua-bit32
 SLOT=0
 SRC_URI=https://github.com/luaposix/luaposix/archive/v35.0.tar.gz -> luaposix-35.0.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=95bc6cb35324790f0ed1a3f142cd0635
+_md5_=220605325496d4d999e1670a7340f217
diff --git a/metadata/md5-cache/dev-lua/luv-1.32.0.0 b/metadata/md5-cache/dev-lua/luv-1.32.0.0
index 77ec29d2adaa..6705765787b6 100644
--- a/metadata/md5-cache/dev-lua/luv-1.32.0.0
+++ b/metadata/md5-cache/dev-lua/luv-1.32.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libuv-1.32.0:= luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/luvit/luv/archive/1.32.0-0.tar.gz -> luv-1.32.0.0.tar.gz https://github.com/keplerproject/lua-compat-5.3/archive/v0.7.tar.gz -> luv-lua-compat-0.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d2079fb1ff5099ed702fc9e1da0cffc
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 82ce5c7d3330..76b782738fb4 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/alcotest-0.8.1 b/metadata/md5-cache/dev-ml/alcotest-0.8.1
deleted file mode 100644
index 8394f13fd606..000000000000
--- a/metadata/md5-cache/dev-ml/alcotest-0.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-ml/fmt:= dev-ml/astring:= dev-ml/cmdliner:= dev-ml/result:= dev-ml/jbuilder dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam
-DESCRIPTION=A lightweight and colourful test framework
-EAPI=5
-HOMEPAGE=https://github.com/mirage/alcotest/
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=ISC
-RDEPEND=dev-ml/fmt:= dev-ml/astring:= dev-ml/cmdliner:= dev-ml/result:= >=dev-lang/ocaml-4:=
-RESTRICT=!test? ( test )
-SLOT=0/0.8.1
-SRC_URI=https://github.com/mirage/alcotest/archive/0.8.1.tar.gz -> alcotest-0.8.1.tar.gz
-_eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
-_md5_=e88ebb65444a1e01d8632ee831408ba1
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.08_p1 b/metadata/md5-cache/dev-ml/camlp4-4.08_p1
index a628db5c876d..24ad382b8eae 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.08_p1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.08_p1
@@ -4,9 +4,9 @@ DESCRIPTION=System for writing extensible parsers for programming languages
 EAPI=7
 HOMEPAGE=https://github.com/camlp4/camlp4
 IUSE=+ocamlopt
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt?] !<dev-lang/ocaml-4.02 !<dev-ml/findlib-1.5.5-r1
 SLOT=0/4.08_p1
 SRC_URI=https://github.com/camlp4/camlp4/archive/4.08+1.tar.gz -> camlp4-4.08_p1.tar.gz
-_md5_=bcebc55ce328f5569c312a25ffae5b56
+_md5_=3ff1ec51284c50ec08b0e2e9f9af3d53
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
index 07b65ac9d3af..335b7dc45781 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/10.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=58fd4da38c132f04b27819bac122569e
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999
index bcb24068a514..25703bfb696d 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-11.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE )
 RESTRICT=!test? ( test )
 SLOT=0/11.0.0.9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=90921f4cd69c8d88f750bc9e4e63ccc0
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0_rc3 b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0_rc3
index 63d2f0ebb016..f21ba6157ae6 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0_rc3
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0_rc3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/11.0.0_rc3
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=90921f4cd69c8d88f750bc9e4e63ccc0
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0_rc4 b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0_rc4
new file mode 100644
index 000000000000..87f9e432db5e
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0_rc4
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-11.0.0_rc4:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_AVR?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_VE?,debug?] !sys-devel/llvm[ocaml(-)] !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-11.0.0_rc4:=[llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_AVR?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_VE?,debug?] !sys-devel/llvm[ocaml(-)]
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE )
+RESTRICT=!test? ( test )
+SLOT=0/11.0.0_rc4
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=90921f4cd69c8d88f750bc9e4e63ccc0
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999
index 48e5f8d8c1e2..b592855d4295 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-12.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-12.0.0.
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE )
 RESTRICT=!test? ( test )
 SLOT=0/12.0.0.9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=90921f4cd69c8d88f750bc9e4e63ccc0
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.3 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.3
deleted file mode 100644
index c484e031aca0..000000000000
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure
-DEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-3.10.2:=[ocamlopt?] tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( >=dev-ml/lablgtk-2:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) virtual/pkgconfig >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Modules for OCaml application-level Internet protocols
-EAPI=5
-HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
-IUSE=gtk kerberos tk httpd +ocamlopt +pcre ssl zip
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=ZLIB GPL-2+
-RDEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-3.10.2:=[ocamlopt?] tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( >=dev-ml/lablgtk-2:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= )
-RESTRICT=installsources strip
-SLOT=0/4.1.3
-SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4c955f85a4f3d13cbcf6fce513fd0701
diff --git a/metadata/md5-cache/dev-ml/ounit-2.0.0 b/metadata/md5-cache/dev-ml/ounit-2.0.0
deleted file mode 100644
index 5842939fe95d..000000000000
--- a/metadata/md5-cache/dev-ml/ounit-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Unit testing framework for OCaml
-EAPI=5
-HOMEPAGE=http://ounit.forge.ocamlcore.org/
-IUSE=+ocamlopt debug doc
-KEYWORDS=amd64 arm ~arm64 ~ppc x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/2.0.0
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1258/ounit-2.0.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=02fd56e902931293388118839423e27c
diff --git a/metadata/md5-cache/dev-ml/ounit-2.0.5 b/metadata/md5-cache/dev-ml/ounit-2.0.5
deleted file mode 100644
index 65cc7a362c6a..000000000000
--- a/metadata/md5-cache/dev-ml/ounit-2.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
-DESCRIPTION=Unit testing framework for OCaml
-EAPI=5
-HOMEPAGE=http://ounit.forge.ocamlcore.org/
-IUSE=+ocamlopt debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
-SLOT=0/2.0.5
-SRC_URI=https://forge.ocamlcore.org/frs/download.php/1719/ounit-2.0.5.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3dc07a372d13c7436a1b299b785a8205
diff --git a/metadata/md5-cache/dev-ml/ounit-2.0.6 b/metadata/md5-cache/dev-ml/ounit-2.0.6
index 2923b2012ce8..11258f92fa7d 100644
--- a/metadata/md5-cache/dev-ml/ounit-2.0.6
+++ b/metadata/md5-cache/dev-ml/ounit-2.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=Unit testing framework for OCaml
 EAPI=5
 HOMEPAGE=http://ounit.forge.ocamlcore.org/
 IUSE=+ocamlopt debug doc
-KEYWORDS=amd64 arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 arm ~arm64 ~ppc x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/2.0.6
 SRC_URI=https://forge.ocamlcore.org/frs/download.php/1722/ounit-2.0.6.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	findlib	17c71a5d96323df925f9f6db1215668a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	oasis	54418322bbbf713ed1a0222b8c6593c0	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d82fdfb6e8f7814e11c20cf17219a27d
+_md5_=7a03b111e8f6a886e2c7bd8b1c9bda12
diff --git a/metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r1 b/metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r1
deleted file mode 100644
index 3ac2b76c2ab1..000000000000
--- a/metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Algorithm-Diff-1.150.0 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Represent a series of changes in annotate form
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Algorithm-Annotate
-KEYWORDS=~alpha amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Algorithm-Diff-1.150.0 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6cc6d836670f19fcc3d0f6e32f8c75e7
diff --git a/metadata/md5-cache/dev-perl/Algorithm-Munkres-0.80.0-r1 b/metadata/md5-cache/dev-perl/Algorithm-Munkres-0.80.0-r1
deleted file mode 100644
index 695b0a59f1f1..000000000000
--- a/metadata/md5-cache/dev-perl/Algorithm-Munkres-0.80.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Munkres solution to classical Assignment problem
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Algorithm-Munkres
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TP/TPEDERSE/Algorithm-Munkres-0.08.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8e3d128bb8d90dccc860b8aac07183f6
diff --git a/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.140.0 b/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.140.0
index 1c12e1d4417b..48952e6bf3cc 100644
--- a/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.140.0
+++ b/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.140.0
@@ -5,11 +5,11 @@ DESCRIPTION=A Module::Build subclass for building Alien:: modules and their libr
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Alien-Base-ModuleBuild
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Alien-Build-1.200.0 dev-perl/Archive-Extract >=virtual/perl-Archive-Tar-1.400.0 >=dev-perl/Capture-Tiny-0.170.0 >=dev-perl/File-chdir-0.100.500 >=virtual/perl-HTTP-Tiny-0.44.0 >=dev-perl/Module-Build-0.400.400 >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Shell-Config-Generate dev-perl/Shell-Guess dev-perl/Sort-Versions >=virtual/perl-Text-ParseWords-3.260.0 dev-perl/URI virtual/perl-parent dev-perl/HTML-Parser virtual/perl-JSON-PP dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Base-ModuleBuild-1.14.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=397fc026fbbb295aacea8769bd15288b
+_md5_=364dcab24b3cf4cedb4e442ba3ea2a40
diff --git a/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0 b/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0
index cdfe61873e88..b4b1ab571491 100644
--- a/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0
+++ b/metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0
@@ -5,11 +5,11 @@ DESCRIPTION=A Module::Build subclass for building Alien:: modules and their libr
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Alien-Base-ModuleBuild
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Alien-Build-1.200.0 dev-perl/Archive-Extract >=virtual/perl-Archive-Tar-1.400.0 >=dev-perl/Capture-Tiny-0.170.0 >=dev-perl/File-chdir-0.100.500 >=virtual/perl-HTTP-Tiny-0.44.0 >=dev-perl/Module-Build-0.400.400 >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Scalar-List-Utils-1.450.0 dev-perl/Shell-Config-Generate dev-perl/Shell-Guess dev-perl/Sort-Versions >=virtual/perl-Text-ParseWords-3.260.0 dev-perl/URI virtual/perl-parent dev-perl/HTML-Parser virtual/perl-JSON-PP dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Base-ModuleBuild-1.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c83d8f9656b99d41f36843eed3af5272
+_md5_=5f1d33c08dd28d318220a4283bc72ead
diff --git a/metadata/md5-cache/dev-perl/Alien-Build-2.290.0 b/metadata/md5-cache/dev-perl/Alien-Build-2.290.0
index 421a66ded7a8..67a71f89b7de 100644
--- a/metadata/md5-cache/dev-perl/Alien-Build-2.290.0
+++ b/metadata/md5-cache/dev-perl/Alien-Build-2.290.0
@@ -5,11 +5,11 @@ DESCRIPTION=Build external dependencies for use in CPAN
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Alien-Build
 IUSE=minimal test zip examples
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=zip? ( dev-perl/Archive-Zip ) virtual/perl-Archive-Tar >=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 >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=virtual/perl-Test-Simple-1.302.96 >=virtual/perl-Text-ParseWords-3.260.0 virtual/pkgconfig dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.29.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d00830aaf2217f0cedc9223d3c38a8fb
+_md5_=ed4bcb561f7b98231fb8a2834c7632a1
diff --git a/metadata/md5-cache/dev-perl/Alien-Build-2.320.0 b/metadata/md5-cache/dev-perl/Alien-Build-2.320.0
index 8ac2b588950b..97b852d6414f 100644
--- a/metadata/md5-cache/dev-perl/Alien-Build-2.320.0
+++ b/metadata/md5-cache/dev-perl/Alien-Build-2.320.0
@@ -5,11 +5,11 @@ DESCRIPTION=Build external dependencies for use in CPAN
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Alien-Build
 IUSE=minimal test zip examples
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=zip? ( dev-perl/Archive-Zip ) virtual/perl-Archive-Tar >=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 >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=virtual/perl-Test-Simple-1.302.96 >=virtual/perl-Text-ParseWords-3.260.0 virtual/pkgconfig dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=25c3d406361d544ab2b7f4938e47f681
+_md5_=ff6415a563a4115a998a8bc64a8b3d8b
diff --git a/metadata/md5-cache/dev-perl/Alien-Build-2.330.0 b/metadata/md5-cache/dev-perl/Alien-Build-2.330.0
index d1fdfee753d6..9a91e77b55b8 100644
--- a/metadata/md5-cache/dev-perl/Alien-Build-2.330.0
+++ b/metadata/md5-cache/dev-perl/Alien-Build-2.330.0
@@ -5,11 +5,11 @@ DESCRIPTION=Build external dependencies for use in CPAN
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Alien-Build
 IUSE=minimal test zip examples
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=zip? ( dev-perl/Archive-Zip ) virtual/perl-Archive-Tar >=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 >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=virtual/perl-Test-Simple-1.302.96 >=virtual/perl-Text-ParseWords-3.260.0 virtual/pkgconfig dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.33.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1edec2f6fbb09d53694df1a87c7033d9
+_md5_=89eb6758883cdbb384f99c50bc45c8d8
diff --git a/metadata/md5-cache/dev-perl/Alien-SDL-1.446.0 b/metadata/md5-cache/dev-perl/Alien-SDL-1.446.0
deleted file mode 100644
index 65f83fcb983a..000000000000
--- a/metadata/md5-cache/dev-perl/Alien-SDL-1.446.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Archive-Extract dev-perl/Archive-Zip dev-perl/Capture-Tiny dev-perl/File-ShareDir dev-perl/File-Which dev-perl/Text-Patch media-libs/libsdl virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-ExtUtils-CBuilder virtual/perl-ExtUtils-MakeMaker dev-perl/Module-Build virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=[-build(-)]
-DESCRIPTION=building, finding and using SDL binaries
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Alien-SDL
-KEYWORDS=amd64 ~hppa x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Archive-Extract dev-perl/Archive-Zip dev-perl/Capture-Tiny dev-perl/File-ShareDir dev-perl/File-Which dev-perl/Text-Patch media-libs/libsdl virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-ExtUtils-CBuilder virtual/perl-ExtUtils-MakeMaker dev-perl/Module-Build virtual/perl-File-Spec virtual/perl-File-Temp dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/F/FR/FROGGS/Alien-SDL-1.446.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=95c1927baad02a5b57ad6c4f597a30d0
diff --git a/metadata/md5-cache/dev-perl/AnyEvent-HTTP-2.240.0 b/metadata/md5-cache/dev-perl/AnyEvent-HTTP-2.240.0
deleted file mode 100644
index e9a5c2c706a4..000000000000
--- a/metadata/md5-cache/dev-perl/AnyEvent-HTTP-2.240.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/AnyEvent-5.330.0 dev-perl/URI >=dev-perl/common-sense-3.300.0 virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Simple but non-blocking HTTP/HTTPS client
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/AnyEvent-HTTP
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/AnyEvent-5.330.0 dev-perl/URI >=dev-perl/common-sense-3.300.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.24.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=188509fc9b4c5889f494684c9ec13b5b
diff --git a/metadata/md5-cache/dev-perl/Apache-AuthCookie-3.270.0-r1 b/metadata/md5-cache/dev-perl/Apache-AuthCookie-3.270.0-r1
deleted file mode 100644
index bc9cf6898889..000000000000
--- a/metadata/md5-cache/dev-perl/Apache-AuthCookie-3.270.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=www-apache/mod_perl-2 virtual/perl-Carp >=dev-perl/Class-Load-0.30.0 virtual/perl-Encode dev-perl/HTTP-Body dev-perl/Hash-MultiValue dev-perl/WWW-Form-UrlEncoded virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Apache-Test-1.390.0 >=dev-perl/URI-1.310.0 >=virtual/perl-Test-Simple-0.940.0 !www-apache/mpm_itk ) dev-lang/perl
-DESCRIPTION=Perl Authentication and Authorization via cookies
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Apache-AuthCookie
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=www-apache/mod_perl-2 virtual/perl-Carp >=dev-perl/Class-Load-0.30.0 virtual/perl-Encode dev-perl/HTTP-Body dev-perl/Hash-MultiValue dev-perl/WWW-Form-UrlEncoded dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.27.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=7eb3325baf90c7579b1d7e699aac3618
diff --git a/metadata/md5-cache/dev-perl/App-perlbrew-0.840.0 b/metadata/md5-cache/dev-perl/App-perlbrew-0.840.0
deleted file mode 100644
index f12142d3a9c0..000000000000
--- a/metadata/md5-cache/dev-perl/App-perlbrew-0.840.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.860.0 >=dev-perl/CPAN-Perl-Releases-3.660.0 >=dev-perl/Capture-Tiny-0.360.0 >=dev-perl/Devel-PatchPerl-1.520.0 >=virtual/perl-File-Temp-0.230.400 virtual/perl-JSON-PP >=virtual/perl-Pod-Parser-1.630.0 >=dev-perl/local-lib-2.0.14 >=dev-perl/Module-Build-Tiny-0.34.0 test? ( >=dev-perl/File-Which-1.210.0 >=dev-perl/IO-All-0.510.0 >=dev-perl/Path-Class-0.330.0 >=dev-perl/Test-Exception-0.320.0 >=dev-perl/Test-NoWarnings-1.40.0 >=dev-perl/Test-Output-1.30.0 >=virtual/perl-Test-Simple-1.1.2 >=dev-perl/Test-Spec-0.470.0 >=dev-perl/Test-TempDir-Tiny-0.16.0 ) dev-lang/perl
-DESCRIPTION=Manage perl installations in your $HOME
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/App-perlbrew
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.860.0 >=dev-perl/CPAN-Perl-Releases-3.660.0 >=dev-perl/Capture-Tiny-0.360.0 >=dev-perl/Devel-PatchPerl-1.520.0 >=virtual/perl-File-Temp-0.230.400 virtual/perl-JSON-PP >=virtual/perl-Pod-Parser-1.630.0 >=dev-perl/local-lib-2.0.14 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.84.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d0cc1dcff1b0dd8d22907d53806f512b
diff --git a/metadata/md5-cache/dev-perl/Archive-Any-0.94.500 b/metadata/md5-cache/dev-perl/Archive-Any-0.94.500
deleted file mode 100644
index cbb867211ecc..000000000000
--- a/metadata/md5-cache/dev-perl/Archive-Any-0.94.500
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Archive-Tar dev-perl/Archive-Zip dev-perl/Module-Find dev-perl/MIME-Types dev-perl/File-MMagic virtual/perl-File-Spec >=dev-perl/Module-Build-0.280.0 test? ( virtual/perl-Test-Simple dev-perl/Test-Warn ) dev-lang/perl
-DESCRIPTION=Single interface to deal with file archives
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Archive-Any
-IUSE=test examples
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Archive-Tar dev-perl/Archive-Zip dev-perl/Module-Find dev-perl/MIME-Types dev-perl/File-MMagic virtual/perl-File-Spec dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/Archive-Any-0.0945.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c951810d7843dfb2eca8ce1a59fffbbc
diff --git a/metadata/md5-cache/dev-perl/Archive-Extract-0.860.0 b/metadata/md5-cache/dev-perl/Archive-Extract-0.860.0
index cabde32f1126..09449c35b0f3 100644
--- a/metadata/md5-cache/dev-perl/Archive-Extract-0.860.0
+++ b/metadata/md5-cache/dev-perl/Archive-Extract-0.860.0
@@ -5,11 +5,11 @@ DESCRIPTION=Generic archive extracting mechanism
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Archive-Extract
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Path >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-IPC-Cmd-0.640.0 virtual/perl-Locale-Maketext-Simple >=virtual/perl-Module-Load-Conditional-0.660.0 >=virtual/perl-Params-Check-0.70.0 virtual/perl-if dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.86.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=cc743b049b24e99490f4bd8148f766ac
+_md5_=005c832a9bda3d0e67640c92b11541b5
diff --git a/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1 b/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1
deleted file mode 100644
index 499a5cfaf962..000000000000
--- a/metadata/md5-cache/dev-perl/Array-Window-1.20.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Params-Util test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Array::Window - Calculate windows/subsets/pages of arrays
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Array-Window
-IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Params-Util dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Array-Window-1.02.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6a771e180c820c3dd1fdb3a547cee9a7
diff --git a/metadata/md5-cache/dev-perl/Audio-DSP-0.20.0-r2 b/metadata/md5-cache/dev-perl/Audio-DSP-0.20.0-r2
deleted file mode 100644
index 6d6d644faba3..000000000000
--- a/metadata/md5-cache/dev-perl/Audio-DSP-0.20.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Perl interface to *NIX digital audio device
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Audio-DSP
-KEYWORDS=amd64 sparc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SE/SETHJ/Audio-DSP-0.02.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b9b8ff0c09fa6572ecb7acba9e2a5d90
diff --git a/metadata/md5-cache/dev-perl/Audio-Mixer-0.700.0-r2 b/metadata/md5-cache/dev-perl/Audio-Mixer-0.700.0-r2
deleted file mode 100644
index f945ce01da43..000000000000
--- a/metadata/md5-cache/dev-perl/Audio-Mixer-0.700.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Perl extension for Sound Mixer control
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Audio-Mixer
-IUSE=examples
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SE/SERGEY/Audio-Mixer-0.7.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=2581da856ca90dfd7d0bc6926a8706a5
diff --git a/metadata/md5-cache/dev-perl/Authen-DigestMD5-0.40.0-r1 b/metadata/md5-cache/dev-perl/Authen-DigestMD5-0.40.0-r1
deleted file mode 100644
index 8401e871a846..000000000000
--- a/metadata/md5-cache/dev-perl/Authen-DigestMD5-0.40.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=SASL DIGEST-MD5 authentication (RFC2831)
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Authen-DigestMD5
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ppc64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SA/SALVA/Authen-DigestMD5-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=065c023644c754823742d42ee9c31300
diff --git a/metadata/md5-cache/dev-perl/Authen-Htpasswd-0.171.0-r1 b/metadata/md5-cache/dev-perl/Authen-Htpasswd-0.171.0-r1
deleted file mode 100644
index 4a5e4ed14937..000000000000
--- a/metadata/md5-cache/dev-perl/Authen-Htpasswd-0.171.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Class-Accessor dev-perl/IO-LockedFile dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 dev-lang/perl:=[-build(-)]
-DESCRIPTION=interface to read and modify Apache .htpasswd files
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Authen-Htpasswd
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-Accessor dev-perl/IO-LockedFile dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSTROUT/Authen-Htpasswd-0.171.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=24ecbe498a8352121db91b51cd1d2a31
diff --git a/metadata/md5-cache/dev-perl/Authen-Radius-0.270.0 b/metadata/md5-cache/dev-perl/Authen-Radius-0.270.0
deleted file mode 100644
index fc07c11adae6..000000000000
--- a/metadata/md5-cache/dev-perl/Authen-Radius-0.270.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-Data-Dumper-1.0.0 >=dev-perl/Data-HexDump-0.20.0 >=virtual/perl-Digest-MD5-2.200.0 >=virtual/perl-IO-1.120.0 >=dev-perl/Net-IP-1.260.0 >=virtual/perl-ExtUtils-MakeMaker-6.640.0 test? ( dev-perl/Test-NoWarnings virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Communicate with a Radius server from Perl
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Authen-Radius
-IUSE=test examples
-KEYWORDS=amd64 ~hppa ~sparc x86
-LICENSE=Artistic-2
-RDEPEND=>=virtual/perl-Data-Dumper-1.0.0 >=dev-perl/Data-HexDump-0.20.0 >=virtual/perl-Digest-MD5-2.200.0 >=virtual/perl-IO-1.120.0 >=dev-perl/Net-IP-1.260.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.27.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=3f3744fd491378cc45a0a468dad0f388
diff --git a/metadata/md5-cache/dev-perl/B-COW-0.4.0-r1 b/metadata/md5-cache/dev-perl/B-COW-0.4.0-r1
index 63c7203bd822..54d865d2b0e1 100644
--- a/metadata/md5-cache/dev-perl/B-COW-0.4.0-r1
+++ b/metadata/md5-cache/dev-perl/B-COW-0.4.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=additional B helpers to check COW status
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/B-COW
 IUSE=test examples
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.004.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9b4995c6c6b0b3a809b432d9ee60bc93
+_md5_=469f6dfb7231732edf79c6175be1449a
diff --git a/metadata/md5-cache/dev-perl/Business-FedEx-DirectConnect-1.10.0-r1 b/metadata/md5-cache/dev-perl/Business-FedEx-DirectConnect-1.10.0-r1
deleted file mode 100644
index 246e61fc2563..000000000000
--- a/metadata/md5-cache/dev-perl/Business-FedEx-DirectConnect-1.10.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/libwww-perl dev-perl/Tie-StrictHash dev-lang/perl:=[-build(-)]
-DESCRIPTION=Interface to FedEx Ship Manager Direct
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Business-FedEx-DirectConnect
-KEYWORDS=amd64 ~ia64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/libwww-perl dev-perl/Tie-StrictHash dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JP/JPOWERS/Business-FedEx-DirectConnect-1.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bda0900dd352390a51febde68c86b113
diff --git a/metadata/md5-cache/dev-perl/Business-Hours-0.120.0-r1 b/metadata/md5-cache/dev-perl/Business-Hours-0.120.0-r1
deleted file mode 100644
index 20ccc3b22820..000000000000
--- a/metadata/md5-cache/dev-perl/Business-Hours-0.120.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Set-IntSpan-1.120.0 dev-lang/perl
-DESCRIPTION=Calculate business hours in a time period
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Business-Hours
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Set-IntSpan-1.120.0 dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/Business-Hours-0.12.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=fe44690b244cda61ffca63d23da79019
diff --git a/metadata/md5-cache/dev-perl/Business-ISBN-3.4.0 b/metadata/md5-cache/dev-perl/Business-ISBN-3.4.0
deleted file mode 100644
index e21a00dcd42c..000000000000
--- a/metadata/md5-cache/dev-perl/Business-ISBN-3.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=barcode? ( dev-perl/GD-Barcode dev-perl/GD[png] ) >=dev-perl/Business-ISBN-Data-20140910.2.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.950.0 ) dev-lang/perl
-DESCRIPTION=Work with ISBN as objects
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Business-ISBN
-IUSE=test barcode examples
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=Artistic-2
-RDEPEND=barcode? ( dev-perl/GD-Barcode dev-perl/GD[png] ) >=dev-perl/Business-ISBN-Data-20140910.2.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-3.004.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=137c55897c8a216bedc49ac2715e9f19
diff --git a/metadata/md5-cache/dev-perl/Business-ISBN-Data-20140910.3.0 b/metadata/md5-cache/dev-perl/Business-ISBN-Data-20140910.3.0
deleted file mode 100644
index a65b34b2a25e..000000000000
--- a/metadata/md5-cache/dev-perl/Business-ISBN-Data-20140910.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-File-Spec >=virtual/perl-ExtUtils-MakeMaker-6.640.0 test? ( >=virtual/perl-Test-Simple-0.950.0 ) dev-lang/perl
-DESCRIPTION=Data pack for Business::ISBN
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Business-ISBN-Data
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-File-Spec dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20140910.003.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d6c01a8d1253fed86dccd4b46836e5e7
diff --git a/metadata/md5-cache/dev-perl/Business-ISMN-1.132.0 b/metadata/md5-cache/dev-perl/Business-ISMN-1.132.0
deleted file mode 100644
index c963d014bf2c..000000000000
--- a/metadata/md5-cache/dev-perl/Business-ISMN-1.132.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Tie-Cycle-1.210.0 virtual/perl-Scalar-List-Utils >=virtual/perl-ExtUtils-MakeMaker-6.640.0 virtual/perl-File-Spec test? ( >=virtual/perl-Test-Simple-0.950.0 ) dev-lang/perl
-DESCRIPTION=International Standard Music Numbers
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Business-ISMN
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=Artistic-2
-RDEPEND=>=dev-perl/Tie-Cycle-1.210.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.132.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=dab2e72a8b1fc16e839960e03ce3997a
diff --git a/metadata/md5-cache/dev-perl/Business-ISSN-1.3.0 b/metadata/md5-cache/dev-perl/Business-ISSN-1.3.0
deleted file mode 100644
index 0eb2c565c34c..000000000000
--- a/metadata/md5-cache/dev-perl/Business-ISSN-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Exporter >=virtual/perl-ExtUtils-MakeMaker-6.640.0 virtual/perl-File-Spec test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Object and functions to work with International Standard Serial Numbers
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Business-ISSN
-IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=Artistic-2
-RDEPEND=virtual/perl-Exporter dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.003.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=24918dad8ff3b5b406a8fb705a9258e4
diff --git a/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r1 b/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r1
deleted file mode 100644
index 3c14e1a33742..000000000000
--- a/metadata/md5-cache/dev-perl/Business-UPS-2.10.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
-DESCRIPTION=A UPS Interface Module
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Business-UPS
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/libwww-perl dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Business-UPS-2.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dac60cba84f2cd205f57d6d1e929a66e
diff --git a/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0 b/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0
deleted file mode 100644
index 8a81ba5eba4b..000000000000
--- a/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-perl/CGI virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DESCRIPTION=Extremely fast, reliable form generation and processing module
-EAPI=6
-HOMEPAGE=http://www.formbuilder.org/ https://metacpan.org/release/CGI-FormBuilder
-IUSE=test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/CGI dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BI/BIGPRESH/CGI-FormBuilder-3.10.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=35e922ffeff1dabf504261e4d73b32a5
diff --git a/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1 b/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1
deleted file mode 100644
index 9b6797e85cb5..000000000000
--- a/metadata/md5-cache/dev-perl/CGI-PSGI-0.150.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/CGI-3.330.0 test? ( >=virtual/perl-Test-Simple-0.88 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Adapt CGI.pm to the PSGI protocol
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/CGI-PSGI
-IUSE=test
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/CGI-3.330.0 dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-PSGI-0.15.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=18265994ee2800a15eb77a7fbed4797b
diff --git a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2 b/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2
deleted file mode 100644
index 369999812366..000000000000
--- a/metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=dev-perl/CGI-3.26 >=dev-perl/Module-Build-0.380.0 test? ( virtual/perl-Test-Simple dev-perl/CGI-Simple ) dev-lang/perl
-DESCRIPTION=persistent session data in CGI applications
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CGI-Session
-IUSE=test
-KEYWORDS=amd64 ~hppa ~ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Scalar-List-Utils >=dev-perl/CGI-3.26 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.48.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=27daeb6b263390784ea4aa48e86c331b
diff --git a/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2 b/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
deleted file mode 100644
index b2ddac189b6d..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-Text-Tabs+Wrap-0.3.0 >=virtual/perl-version-0.990.600 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Read and write Changes files
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/CPAN-Changes
-IUSE=test
-KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Text-Tabs+Wrap-0.3.0 >=virtual/perl-version-0.990.600 dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/CPAN-Changes-0.400002.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=59d0f981557611abc0106de0d6dd3a10
diff --git a/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2-r1 b/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2-r1
index bfeadbe476be..bf384897a1a4 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2-r1
+++ b/metadata/md5-cache/dev-perl/CPAN-Changes-0.400.2-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Read and write Changes files
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/CPAN-Changes
 IUSE=test
-KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Text-Tabs+Wrap-0.3.0 >=virtual/perl-version-0.990.600 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/CPAN-Changes-0.400002.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d4483fd8b1ca891de7f9632d7b08e2d4
+_md5_=135cfaeabb36b354fe2e4677e5a90dc1
diff --git a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.760.0 b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.760.0
deleted file mode 100644
index 14c08902811d..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-3.760.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DESCRIPTION=Mapping Perl releases on CPAN to the location of the tarballs
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CPAN-Perl-Releases
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-3.76.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=58678d65977d2856c1bd00eb26722043
diff --git a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.7.170 b/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.7.170
deleted file mode 100644
index f412cb7d215d..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-Perl-Releases-5.202.7.170
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec virtual/perl-IO >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Mapping Perl releases on CPAN to the location of the tarballs
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/CPAN-Perl-Releases
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200717.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f4c54e536df0163400ff4d29378b63cf
diff --git a/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.14 b/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.14
deleted file mode 100644
index 1de06343fa06..000000000000
--- a/metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.14
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/HTTP-Message >=dev-perl/LWP-Protocol-https-1.0.0 dev-perl/libwww-perl dev-perl/TermReadKey virtual/perl-ExtUtils-MakeMaker test? ( !minimal? ( >=virtual/perl-CPAN-Meta-2.120.900 ) >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=upload things to the CPAN
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/CPAN-Uploader
-IUSE=test minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Digest-MD5 dev-perl/File-HomeDir virtual/perl-File-Spec >=dev-perl/Getopt-Long-Descriptive-0.84.0 dev-perl/HTTP-Message >=dev-perl/LWP-Protocol-https-1.0.0 dev-perl/libwww-perl dev-perl/TermReadKey dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103014.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=64377c528e66cbfdd2e660e5b5d99760
diff --git a/metadata/md5-cache/dev-perl/CSS-Minifier-XS-0.90.0-r1 b/metadata/md5-cache/dev-perl/CSS-Minifier-XS-0.90.0-r1
deleted file mode 100644
index 71219a7c305f..000000000000
--- a/metadata/md5-cache/dev-perl/CSS-Minifier-XS-0.90.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/Module-Build virtual/perl-ExtUtils-CBuilder dev-lang/perl
-DESCRIPTION=XS based CSS minifier
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/CSS-Minifier-XS
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=9e854d910792e421d2e815352030f702
diff --git a/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1 b/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1
deleted file mode 100644
index 927543140b07..000000000000
--- a/metadata/md5-cache/dev-perl/CSS-Squish-0.100.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/URI virtual/perl-File-Spec dev-perl/Test-LongString ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Compact many CSS files into one big file
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/CSS-Squish
-IUSE=test
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/URI virtual/perl-File-Spec dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/T/TS/TSIBLEY/CSS-Squish-0.10.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c470bd7c47af44bc848f5298068d4b92
diff --git a/metadata/md5-cache/dev-perl/Calendar-Simple-1.230.0 b/metadata/md5-cache/dev-perl/Calendar-Simple-1.230.0
deleted file mode 100644
index 0c27342feea8..000000000000
--- a/metadata/md5-cache/dev-perl/Calendar-Simple-1.230.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp virtual/perl-Time-Local >=dev-perl/Module-Build-0.28 test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Perl extension to create simple calendars
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Calendar-Simple
-IUSE=test
-KEYWORDS=amd64 ~hppa ~ppc x86 ~ppc-aix
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Time-Local dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Calendar-Simple-1.23.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=75808592adc343e4e2a26151c58d6086
diff --git a/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0 b/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0
deleted file mode 100644
index 0ad17486a050..000000000000
--- a/metadata/md5-cache/dev-perl/Carp-Assert-0.210.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Executable comments in carp
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Carp-Assert
-IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Carp-Assert-0.21.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4b6af927818ad161f7e1b2590f9c2b6e
diff --git a/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0 b/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0
deleted file mode 100644
index 3f0a30097383..000000000000
--- a/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp dev-perl/Carp-Assert virtual/perl-Scalar-List-Utils test? ( dev-perl/Test-Exception ) dev-lang/perl
-DESCRIPTION=convenience wrappers around Carp::Assert
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Carp-Assert-More
-IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-perl/Carp-Assert virtual/perl-Scalar-List-Utils dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.16.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=47a24fb19fd34a170249accdb7ce98dd
diff --git a/metadata/md5-cache/dev-perl/Chart-Math-Axis-1.60.0-r2 b/metadata/md5-cache/dev-perl/Chart-Math-Axis-1.60.0-r2
deleted file mode 100644
index 02224d3d538b..000000000000
--- a/metadata/md5-cache/dev-perl/Chart-Math-Axis-1.60.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=virtual/perl-Math-BigInt-1.70 >=virtual/perl-Storable-2.12 >=dev-perl/Params-Util-0.15 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Implements an algorithm to find good values for chart axis
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Chart-Math-Axis
-KEYWORDS=amd64 hppa ~mips ~ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=virtual/perl-Math-BigInt-1.70 >=virtual/perl-Storable-2.12 >=dev-perl/Params-Util-0.15 dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Chart-Math-Axis-1.06.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=91944c17ace947e2ecd03b16d7408532
diff --git a/metadata/md5-cache/dev-perl/Class-Accessor-Chained-0.10.0-r1 b/metadata/md5-cache/dev-perl/Class-Accessor-Chained-0.10.0-r1
deleted file mode 100644
index bf24f24dedb5..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Accessor-Chained-0.10.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/Class-Accessor dev-perl/Module-Build dev-lang/perl:=[-build(-)]
-DESCRIPTION=Perl module to make chained class accessors
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Class-Accessor-Chained
-KEYWORDS=amd64 x86 ~ppc-aix ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-perl/Class-Accessor dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=86930852aaa7deac9b164b50c35f4177
diff --git a/metadata/md5-cache/dev-perl/Class-Default-1.510.0-r1 b/metadata/md5-cache/dev-perl/Class-Default-1.510.0-r1
deleted file mode 100644
index 0868b7206d9d..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Default-1.510.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/Module-Build-0.28 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Static calls apply to a default instantiation
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Class-Default
-KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ~ppc sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Class-Default-1.51.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=570a69149c2108440248df179c387196
diff --git a/metadata/md5-cache/dev-perl/Class-Loader-2.30.0-r1 b/metadata/md5-cache/dev-perl/Class-Loader-2.30.0-r1
deleted file mode 100644
index c8d32b94b7e1..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Loader-2.30.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Load modules and create objects on demand
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Class-Loader
-KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/V/VI/VIPUL/Class-Loader-2.03.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0655718d442610a7c66954e9d02abc49
diff --git a/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.130.0 b/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.130.0
index a5701e81cc2b..fb7d97a41ee8 100644
--- a/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.130.0
+++ b/metadata/md5-cache/dev-perl/Class-Method-Modifiers-2.130.0
@@ -5,11 +5,11 @@ DESCRIPTION=provides Moose-like method modifiers
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Class-Method-Modifiers
 IUSE=test
-KEYWORDS=amd64 ~arm hppa ppc ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 hppa ppc ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=00f9baadc57dec08e07e3a7e2f398e64
+_md5_=9d0646aac5c48d7185813c3d683bc510
diff --git a/metadata/md5-cache/dev-perl/Class-Mix-0.6.0 b/metadata/md5-cache/dev-perl/Class-Mix-0.6.0
deleted file mode 100644
index f9931697d57a..000000000000
--- a/metadata/md5-cache/dev-perl/Class-Mix-0.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-Carp dev-perl/Params-Classify virtual/perl-Exporter virtual/perl-if virtual/perl-parent dev-perl/Module-Build test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=dynamic class mixing
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Class-Mix
-IUSE=test
-KEYWORDS=amd64
-LICENSE=|| ( Artistic GPL-2 )
-RDEPEND=virtual/perl-Carp dev-perl/Params-Classify virtual/perl-Exporter virtual/perl-if virtual/perl-parent dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Class-Mix-0.006.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=73a02b214b8735e2d7ec3f8df3706afc
diff --git a/metadata/md5-cache/dev-perl/Class-WhiteHole-0.40.0-r1 b/metadata/md5-cache/dev-perl/Class-WhiteHole-0.40.0-r1
deleted file mode 100644
index 84cd36a4fc61..000000000000
--- a/metadata/md5-cache/dev-perl/Class-WhiteHole-0.40.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=base class to treat unhandled method calls as errors
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Class-WhiteHole
-KEYWORDS=amd64 ~ia64 ~ppc ppc64 sparc x86 ~x86-solaris
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Class-WhiteHole-0.04.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f99d180981b1bf2f8d98170922a8e1c7
diff --git a/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1 b/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1
deleted file mode 100644
index 9d01172baecf..000000000000
--- a/metadata/md5-cache/dev-perl/Class-XPath-1.400.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/HTML-Tree ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=adds xpath matching to object trees
-EAPI=5
-HOMEPAGE=https://metacpan.org/release/Class-XPath
-IUSE=test
-KEYWORDS=amd64 ~ia64 sparc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/S/SA/SAMTREGAR/Class-XPath-1.4.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1f61d8cec5b53969360b4bcd6627e713
diff --git a/metadata/md5-cache/dev-perl/Clone-0.450.0 b/metadata/md5-cache/dev-perl/Clone-0.450.0
index effa734c3282..dad25c70266b 100644
--- a/metadata/md5-cache/dev-perl/Clone-0.450.0
+++ b/metadata/md5-cache/dev-perl/Clone-0.450.0
@@ -5,11 +5,11 @@ DESCRIPTION=Recursively copy Perl datatypes
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Clone
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.45.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=82f9bfde7a751f6d9e3835434c58a6cb
+_md5_=12a66b8ce8635c31a30c5aceadf4826c
diff --git a/metadata/md5-cache/dev-perl/Conf-Libconfig-0.100.0 b/metadata/md5-cache/dev-perl/Conf-Libconfig-0.100.0
deleted file mode 100644
index e327c8c7d8b6..000000000000
--- a/metadata/md5-cache/dev-perl/Conf-Libconfig-0.100.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libconfig virtual/perl-XSLoader dev-perl/ExtUtils-PkgConfig test? ( >=dev-perl/Test-Exception-0.430.0 >=dev-perl/Test-Deep-1.127.0 >=dev-perl/Test-Warn-0.320.0 ) dev-lang/perl
-DESCRIPTION=Perl extension for libconfig
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/Conf-Libconfig
-IUSE=test
-KEYWORDS=~amd64 ~arm ~s390 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/libconfig virtual/perl-XSLoader dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CN/CNANGEL/Conf-Libconfig-0.100.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=d5f349b8d3f3a1e4cffd003737267c9b
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0
index a150f7fadf0e..4af6cbcb7d84 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Guess-0.110.0
@@ -5,11 +5,11 @@ DESCRIPTION=Guess OpenSSL include path
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-Guess
 IUSE=libressl test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-File-Spec !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b9a20a011e1e0c7d2faff7bf563491f8
+_md5_=ef93afb23efd7e19ef48cf960455ecfc
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0
index 2d0e3e6b0c00..d16d1df497be 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-RSA-0.310.0
@@ -5,11 +5,11 @@ DESCRIPTION=RSA encoding and decoding using the OpenSSL libraries
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-RSA
 IUSE=libressl test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Crypt-OpenSSL-Bignum dev-perl/Crypt-OpenSSL-Random !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=0bb3c103a924589edf96dcbae93d1cb5
+_md5_=a1e35a2fa1773ff1f71dd6483cdb2e02
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0
index 7564fb14bf3f..107f136c6514 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.150.0
@@ -5,10 +5,10 @@ DESCRIPTION=OpenSSL/LibreSSL pseudo-random number generator access
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/Crypt-OpenSSL-Random
 IUSE=libressl
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=b6fef13384c1892171ccf365a664f878
+_md5_=d751681e4a3f57477a51416885049c67
diff --git a/metadata/md5-cache/dev-perl/DateTime-Locale-1.260.0 b/metadata/md5-cache/dev-perl/DateTime-Locale-1.260.0
index 4d8402309a18..16ca750cd18a 100644
--- a/metadata/md5-cache/dev-perl/DateTime-Locale-1.260.0
+++ b/metadata/md5-cache/dev-perl/DateTime-Locale-1.260.0
@@ -5,11 +5,11 @@ DESCRIPTION=Localization support for DateTime
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/DateTime-Locale
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ ) unicode
 RDEPEND=virtual/perl-Carp >=dev-perl/Dist-CheckConflicts-0.20.0 virtual/perl-Exporter dev-perl/File-ShareDir >=dev-perl/Params-ValidationCompiler-0.130.0 >=virtual/perl-Scalar-List-Utils-1.450.0 >=dev-perl/Specio-0.150.0 >=dev-perl/namespace-autoclean-0.190.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.26.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a1aec88192323e204c916760da569786
+_md5_=cce6c9695687b1c596a078bf81b848c1
diff --git a/metadata/md5-cache/dev-perl/Emacs-PDE-0.2.17 b/metadata/md5-cache/dev-perl/Emacs-PDE-0.2.17
index d7bc0d019f18..f36a6694887a 100644
--- a/metadata/md5-cache/dev-perl/Emacs-PDE-0.2.17
+++ b/metadata/md5-cache/dev-perl/Emacs-PDE-0.2.17
@@ -9,5 +9,5 @@ LICENSE=|| ( Artistic GPL-1+ ) GPL-2+ FDL-1.1+
 RDEPEND=>=app-editors/emacs-23.1:* dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Y/YE/YEWENBIN/Emacs-PDE-v0.2.17.tar.gz
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=71af4aab61634d84ddfe5e7612348c53
diff --git a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.450.0 b/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.450.0
index 2c825e480bb7..12682d2e1bfb 100644
--- a/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.450.0
+++ b/metadata/md5-cache/dev-perl/File-Copy-Recursive-0.450.0
@@ -5,11 +5,11 @@ DESCRIPTION=uses File::Copy to recursively copy dirs
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Copy-Recursive
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.45.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=45355fedcedccbce4e953f45d3f64e8a
+_md5_=eaddd01d94cb1fd98f1a564b1a41c74e
diff --git a/metadata/md5-cache/dev-perl/File-Slurp-9999.320.0 b/metadata/md5-cache/dev-perl/File-Slurp-9999.320.0
index 0090ba867914..b77dc3518745 100644
--- a/metadata/md5-cache/dev-perl/File-Slurp-9999.320.0
+++ b/metadata/md5-cache/dev-perl/File-Slurp-9999.320.0
@@ -5,11 +5,11 @@ DESCRIPTION=Simple and Efficient Reading/Writing/Modifying of Complete Files
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/File-Slurp
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~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 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 >=virtual/perl-File-Spec-3.10.0 virtual/perl-File-Temp virtual/perl-IO dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e9366918dcfda66c745fbf9a5bb2f161
+_md5_=be9d1cf0b150b93eadfa76669ef04ba6
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-0.426.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-0.426.0
index 70d5bf007dce..8303ca61beb8 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-0.426.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-0.426.0
@@ -4,7 +4,7 @@ DESCRIPTION=Provide the missing functionality from List::Util
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/List-MoreUtils
 IUSE=test +xs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 PDEPEND=xs? ( >=dev-perl/List-MoreUtils-XS-0.426.0 )
 RDEPEND=>=dev-perl/Exporter-Tiny-0.38.0 dev-lang/perl:=
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.426.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=307de6ecbc31287df67811d121b0fa1d
+_md5_=a20c61aa481d2e3f2278f5b5f5a2534f
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-0.428.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-0.428.0
index 77ccb4f2dabf..d735ee47ea20 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-0.428.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-0.428.0
@@ -5,7 +5,7 @@ DESCRIPTION=Provide the missing functionality from List::Util
 EAPI=7
 HOMEPAGE=https://metacpan.org/release/List-MoreUtils
 IUSE=test +xs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
 PDEPEND=xs? ( >=dev-perl/List-MoreUtils-XS-0.426.0 )
 RDEPEND=>=dev-perl/Exporter-Tiny-0.38.0 dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.428.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=158421245f45959d97c9a0a1ac58ebc5
+_md5_=ccc3533c71ca17555466e6297b7a16c1
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index e1d6466bd78b..9f87d0595037 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/Moo-2.3.3 b/metadata/md5-cache/dev-perl/Moo-2.3.3
index e1d9a515cb58..d1c1bddf8751 100644
--- a/metadata/md5-cache/dev-perl/Moo-2.3.3
+++ b/metadata/md5-cache/dev-perl/Moo-2.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=Minimalist Object Orientation (with Moose compatiblity)
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Moo
 IUSE=test
-KEYWORDS=amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 hppa ppc ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Method-Modifiers-1.100.0 >=dev-perl/Devel-GlobalDestruction-0.110.0 >=virtual/perl-Exporter-5.570.0 >=dev-perl/Module-Runtime-0.14.0 >=dev-perl/Role-Tiny-2.0.4 >=dev-perl/Sub-Quote-2.3.1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Moo-2.003003.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=e4082313eee0471c9c60a229411df3ce
+_md5_=bf929a804c3191bda9a56f4a6f3400b4
diff --git a/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0 b/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
index 8da854143f87..9c882fb1898a 100644
--- a/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
+++ b/metadata/md5-cache/dev-perl/Perl-Critic-1.130.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/B-Keywords-1.50.0 virtual/perl-Carp >=dev-perl/Config-Tiny-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.130.tar.gz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
 _md5_=036f91a23a6cce7651830249686d87b9
diff --git a/metadata/md5-cache/dev-perl/Pod-Markdown-3.5.0 b/metadata/md5-cache/dev-perl/Pod-Markdown-3.5.0
index 867d7eee99d1..de7e0f248e7a 100644
--- a/metadata/md5-cache/dev-perl/Pod-Markdown-3.5.0
+++ b/metadata/md5-cache/dev-perl/Pod-Markdown-3.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=Convert POD to Markdown
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Pod-Markdown
 IUSE=test minimal
-KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( dev-perl/HTML-Parser ) virtual/perl-Encode virtual/perl-Getopt-Long >=virtual/perl-Pod-Simple-3.270.0 virtual/perl-parent dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=98bbd377cbd2f78d1089bb989c500948
+_md5_=acb3d218ac20e53049f29c42d83fda82
diff --git a/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0 b/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0
index fd52300a43d6..512963034504 100644
--- a/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0
+++ b/metadata/md5-cache/dev-perl/Pod-Simple-LaTeX-0.60.0
@@ -4,11 +4,11 @@ DESCRIPTION=format Pod as LaTeX
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Pod-Simple-LaTeX
 IUSE=test
-KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~riscv x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Pod-Simple-0.10.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JG/JGOFF/Pod-Simple-LaTeX-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f9d986c5ee30e780130694b2b91fb4e8
+_md5_=b602870474d198ce078d57d7a1a0fde8
diff --git a/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0 b/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0
index 14034c20b6c6..1ab77fb1dcbf 100644
--- a/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0
+++ b/metadata/md5-cache/dev-perl/Shell-Config-Generate-0.330.0
@@ -4,11 +4,11 @@ DESCRIPTION=Portably generate config for any shell
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Shell-Config-Generate
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Shell-Guess dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Config-Generate-0.33.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=8312ed6f17c337668b98065d7e232f22
+_md5_=245f3dde5fcd5eaba07ac10fe128bd6d
diff --git a/metadata/md5-cache/dev-perl/Shell-Guess-0.90.0 b/metadata/md5-cache/dev-perl/Shell-Guess-0.90.0
index 844ca4bc05aa..5a38bc793843 100644
--- a/metadata/md5-cache/dev-perl/Shell-Guess-0.90.0
+++ b/metadata/md5-cache/dev-perl/Shell-Guess-0.90.0
@@ -4,11 +4,11 @@ DESCRIPTION=Make an educated guess about the shell in use
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Shell-Guess
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Shell-Guess-0.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=c2ac9d744f9f854d838d6284ee810c2e
+_md5_=719e0e5658f4f7468b99bf06a389fab5
diff --git a/metadata/md5-cache/dev-perl/Test-Differences-0.640.0 b/metadata/md5-cache/dev-perl/Test-Differences-0.640.0
index 8224a9a508f5..e3baa876b609 100644
--- a/metadata/md5-cache/dev-perl/Test-Differences-0.640.0
+++ b/metadata/md5-cache/dev-perl/Test-Differences-0.640.0
@@ -4,11 +4,11 @@ DESCRIPTION=Test strings and data structures and show differences if not ok
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Test-Differences
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~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 ~mips ppc ppc64 ~riscv sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Text-Diff-1.430.0 >=virtual/perl-Data-Dumper-2.126.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.64.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1e815ed5fa5d8082468b31c6ed8f96f6
+_md5_=d55f2efd7e343faadd714c2a441d7242
diff --git a/metadata/md5-cache/dev-perl/Test-File-1.443.0 b/metadata/md5-cache/dev-perl/Test-File-1.443.0
index 9c81d32b7817..5ab6a8e4e0d3 100644
--- a/metadata/md5-cache/dev-perl/Test-File-1.443.0
+++ b/metadata/md5-cache/dev-perl/Test-File-1.443.0
@@ -4,11 +4,11 @@ DESCRIPTION=Test file attributes
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Test-File
 IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=547b89a46ed970666bda073e58fca57d
+_md5_=d139007d0db93b7f27e194affd8daad3
diff --git a/metadata/md5-cache/dev-perl/Test-utf8-1.10.0 b/metadata/md5-cache/dev-perl/Test-utf8-1.10.0
index 8230a6ed4b98..8ea774bac146 100644
--- a/metadata/md5-cache/dev-perl/Test-utf8-1.10.0
+++ b/metadata/md5-cache/dev-perl/Test-utf8-1.10.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl
 DESCRIPTION=Handy utf8 tests
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Test-utf8
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ec24813e7e14b287306f33ecb1430a58
+_md5_=2720b1324c6e78dd7a0598df8f1c8c78
diff --git a/metadata/md5-cache/dev-perl/asa-1.30.0-r1 b/metadata/md5-cache/dev-perl/asa-1.30.0-r1
deleted file mode 100644
index 54d49ab28613..000000000000
--- a/metadata/md5-cache/dev-perl/asa-1.30.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.420.0 test? ( >=virtual/perl-File-Spec-0.800.0 >=virtual/perl-Test-Simple-0.470.0 ) dev-lang/perl
-DESCRIPTION=Lets your class/object say it works like something else
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/asa
-IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/asa-1.03.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a97d809bbf5be5ff6a6fe690e40e294b
diff --git a/metadata/md5-cache/dev-perl/autobox-3.0.1 b/metadata/md5-cache/dev-perl/autobox-3.0.1
deleted file mode 100644
index d30b9e8a3764..000000000000
--- a/metadata/md5-cache/dev-perl/autobox-3.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/Scope-Guard-0.210.0 >=virtual/perl-version-0.770.0 virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/IPC-System-Simple-1.250.0 >=dev-perl/Test-Fatal-0.14.0 ) dev-lang/perl
-DESCRIPTION=Call methods on native types
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/autobox
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/Scope-Guard-0.210.0 >=virtual/perl-version-0.770.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-v3.0.1.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=124fca6c3add2fabb260ad3ad3741443
diff --git a/metadata/md5-cache/dev-perl/autovivification-0.180.0 b/metadata/md5-cache/dev-perl/autovivification-0.180.0
deleted file mode 100644
index 9033ca518370..000000000000
--- a/metadata/md5-cache/dev-perl/autovivification-0.180.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Exporter virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Lexically disable autovivification
-EAPI=6
-HOMEPAGE=https://metacpan.org/release/autovivification
-IUSE=test examples
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/V/VP/VPIT/autovivification-0.18.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a8bfe39b550f978b8bf3fac169f7c753
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 8a5922e9673a..a325bac7d7de 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/pecl-event-2.5.7 b/metadata/md5-cache/dev-php/pecl-event-2.5.7
new file mode 100644
index 000000000000..40d5dea06fa6
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-event-2.5.7
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libevent-2.0.2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php7-2? ( dev-lang/php:7.2[sockets?] ) php_targets_php7-3? ( dev-lang/php:7.3[sockets?] ) php_targets_php7-4? ( dev-lang/php:7.4[sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+DESCRIPTION=PHP wrapper for libevent2
+EAPI=7
+HOMEPAGE=https://pecl.php.net/event
+IUSE=debug examples +extra libressl +sockets +ssl threads php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=>=dev-libs/libevent-2.0.2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php7-2? ( dev-lang/php:7.2[sockets?] ) php_targets_php7-3? ( dev-lang/php:7.3[sockets?] ) php_targets_php7-4? ( dev-lang/php:7.4[sockets?] ) !dev-php/pecl-libevent php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/event-2.5.7.tgz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	a700d476900e6b3556f80fe0655c4303	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3b0bb2270a88c449857ddac39b610941
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 98369c2269af..c16ccb318e87 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.51 b/metadata/md5-cache/dev-python/PyGithub-1.51
deleted file mode 100644
index cb9e8ae383ea..000000000000
--- a/metadata/md5-cache/dev-python/PyGithub-1.51
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/httpretty-0.9.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/deprecated[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyjwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library to access the Github API v3
-EAPI=7
-HOMEPAGE=https://github.com/PyGithub/PyGithub/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3+
-RDEPEND=dev-python/deprecated[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyjwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.51.tar.gz -> PyGithub-1.51.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c797dfaf7fef86366682417f63031666
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.53 b/metadata/md5-cache/dev-python/PyGithub-1.53
index db8d5df008e2..b6333c46b334 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.53
+++ b/metadata/md5-cache/dev-python/PyGithub-1.53
@@ -4,7 +4,7 @@ DESCRIPTION=Python library to access the Github API v3
 EAPI=7
 HOMEPAGE=https://github.com/PyGithub/PyGithub/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-python/deprecated[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyjwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.53.tar.gz -> PyGithub-1.53.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d50c050cc487e8f59b9dc44a829ff66b
+_md5_=c797dfaf7fef86366682417f63031666
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.6.2 b/metadata/md5-cache/dev-python/aiohttp-3.6.2
index fb2e6675235a..09031df1b763 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.6.2
+++ b/metadata/md5-cache/dev-python/aiohttp-3.6.2
@@ -5,7 +5,7 @@ DESCRIPTION=http client/server for asyncio
 EAPI=7
 HOMEPAGE=https://pypi.org/project/aiohttp/
 IUSE=doc test doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/async_timeout-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/attrs-17.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/multidict-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/yarl-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/idna-ssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.6.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6c1501265c7611d196aeeb794401fb5c
+_md5_=ae5f155c9041f6b52d5217ad07e15f7e
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1 b/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
index 12910152e0d7..a53609adbdfe 100644
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Implements CORS support for aiohttp asyncio-powered asynchronous HTT
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/aiohttp-cors
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aiohttp-1.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.7.0.tar.gz -> aiohttp-cors-0.7.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5ca31fe3acb777285d206f4070caed76
+_md5_=c2f6ca400a012539b8b831e895cc7ee5
diff --git a/metadata/md5-cache/dev-python/aiorpcX-0.18.4 b/metadata/md5-cache/dev-python/aiorpcX-0.18.4
deleted file mode 100644
index 020247354514..000000000000
--- a/metadata/md5-cache/dev-python/aiorpcX-0.18.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/uvloop[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/pytest-4.5.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(-)] >=dev-python/setuptools-42.0.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
-DESCRIPTION=Generic async RPC implementation, including JSON-RPC
-EAPI=7
-HOMEPAGE=https://pypi.org/project/aiorpcX/ https://github.com/kyuupichan/aiorpcX/
-IUSE=test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=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? ( test )
-SLOT=0
-SRC_URI=https://github.com/kyuupichan/aiorpcX/archive/0.18.4.tar.gz -> aiorpcX-0.18.4.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5ae8cf90c0eb848c46fa09408643d47a
diff --git a/metadata/md5-cache/dev-python/aiorpcX-0.18.4-r1 b/metadata/md5-cache/dev-python/aiorpcX-0.18.4-r1
new file mode 100644
index 000000000000..6e22f14305cb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aiorpcX-0.18.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/uvloop[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Generic async RPC implementation, including JSON-RPC
+EAPI=7
+HOMEPAGE=https://pypi.org/project/aiorpcX/ https://github.com/kyuupichan/aiorpcX/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kyuupichan/aiorpcX/archive/0.18.4.tar.gz -> aiorpcX-0.18.4.gh.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fed755b6a5ef5931de5c556fa43ba16b
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.12.1-r1 b/metadata/md5-cache/dev-python/argcomplete-1.12.1-r1
new file mode 100644
index 000000000000..c8e422d3551a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/argcomplete-1.12.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-shells/fish app-shells/tcsh dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pip-19 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Bash tab completion for argparse
+EAPI=7
+HOMEPAGE=https://pypi.org/project/argcomplete/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( <dev-python/importlib_metadata-3[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( <dev-python/importlib_metadata-3[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/importlib_metadata-3[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.12.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6e8bbc454f2227793fc438146a6cecec
diff --git a/metadata/md5-cache/dev-python/arrow-0.16.0 b/metadata/md5-cache/dev-python/arrow-0.16.0
index 97a4e528f185..ef3d762337c6 100644
--- a/metadata/md5-cache/dev-python/arrow-0.16.0
+++ b/metadata/md5-cache/dev-python/arrow-0.16.0
@@ -4,7 +4,7 @@ DESCRIPTION=Better dates and times for Python
 EAPI=7
 HOMEPAGE=https://github.com/crsmithdev/arrow/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/python-dateutil-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-0.16.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ca69ee5cf2195f6f32cc6d244b21bfb9
+_md5_=66d7248c661448b369a76e00b1664688
diff --git a/metadata/md5-cache/dev-python/async_generator-1.10 b/metadata/md5-cache/dev-python/async_generator-1.10
index cb4383ad29a1..49f696adad07 100644
--- a/metadata/md5-cache/dev-python/async_generator-1.10
+++ b/metadata/md5-cache/dev-python/async_generator-1.10
@@ -4,11 +4,11 @@ DESCRIPTION=Making it easy to write async iterators in Python 3.5
 EAPI=7
 HOMEPAGE=https://github.com/python-trio/async_generator https://pypi.org/project/async_generator/
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_generator/async_generator-1.10.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2cc88b4c7f6cbc91b4f1dfd22d6445a7
+_md5_=7677ce8dbc8f4e4026ba316434246da4
diff --git a/metadata/md5-cache/dev-python/async_timeout-3.0.1 b/metadata/md5-cache/dev-python/async_timeout-3.0.1
index 378d9be71842..3730d3c5b812 100644
--- a/metadata/md5-cache/dev-python/async_timeout-3.0.1
+++ b/metadata/md5-cache/dev-python/async_timeout-3.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Timeout context manager for asyncio programs
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/async-timeout
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async-timeout-3.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6bfbdbdc74f30dea99157bfdc9c2b2b6
+_md5_=48762c7fa148af987e1e14b4b679d9dc
diff --git a/metadata/md5-cache/dev-python/atpublic-1.0 b/metadata/md5-cache/dev-python/atpublic-1.0
index 9933d7575fdb..30a67a907175 100644
--- a/metadata/md5-cache/dev-python/atpublic-1.0
+++ b/metadata/md5-cache/dev-python/atpublic-1.0
@@ -1,15 +1,15 @@
-BDEPEND=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(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A decorator and function to polulate a module's __all__ and the module globals.
 EAPI=7
 HOMEPAGE=https://gitlab.com/warsaw/public
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=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(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/atpublic/atpublic-1.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b30f48b1ddd7198d58011dfcbcd37fd4
+_md5_=89b908ce5d6b0655b85f399f0c16ad13
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.9.2 b/metadata/md5-cache/dev-python/beautifulsoup-4.9.2
new file mode 100644
index 000000000000..df4b25f52e5d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.9.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree
+EAPI=7
+HOMEPAGE=https://www.crummy.com/software/BeautifulSoup/bs4/
+IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.9.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3c2242496385716d43650e075f28cb73
diff --git a/metadata/md5-cache/dev-python/black-20.8_beta1 b/metadata/md5-cache/dev-python/black-20.8_beta1
index c7f501da6928..c1d56c0b5b21 100644
--- a/metadata/md5-cache/dev-python/black-20.8_beta1
+++ b/metadata/md5-cache/dev-python/black-20.8_beta1
@@ -4,7 +4,7 @@ DESCRIPTION=The uncompromising Python code formatter
 EAPI=7
 HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
 IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/click-7.1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/appdirs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toml-0.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/typed-ast[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/typing-extensions-3.7.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/dataclasses[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/psf/black/archive/20.8b1.tar.gz -> black-20.8b1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=801c85ead1c01c8d17226541fc87c3c7
+_md5_=953a6633b58cc954ef8b378b80e42c0f
diff --git a/metadata/md5-cache/dev-python/blockdiag-2.0.1 b/metadata/md5-cache/dev-python/blockdiag-2.0.1
index 1f6ba808ca73..33c0f72298ad 100644
--- a/metadata/md5-cache/dev-python/blockdiag-2.0.1
+++ b/metadata/md5-cache/dev-python/blockdiag-2.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Generate block-diagram image from text
 EAPI=7
 HOMEPAGE=http://blockdiag.com/ https://pypi.org/project/blockdiag/ https://github.com/blockdiag/blockdiag/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/funcparserlib-0.3.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pillow-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webcolors[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blockdiag/blockdiag-2.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a11fc643aca7b9d4d56e79bfb02cb2dd
+_md5_=f65f2c6807d6dcdcf79f1f3b5f3567d8
diff --git a/metadata/md5-cache/dev-python/boto3-1.15.4 b/metadata/md5-cache/dev-python/boto3-1.15.4
new file mode 100644
index 000000000000..f35fce104275
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.15.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/botocore-1.18.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.18.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.15.4.tar.gz -> boto3-1.15.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/boto3-1.15.5 b/metadata/md5-cache/dev-python/boto3-1.15.5
new file mode 100644
index 000000000000..9cb1c32604da
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.15.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/botocore-1.18.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.18.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.15.5.tar.gz -> boto3-1.15.5.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/boto3-1.15.6 b/metadata/md5-cache/dev-python/boto3-1.15.6
new file mode 100644
index 000000000000..fd3fb516abd9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.15.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/botocore-1.18.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.18.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.15.6.tar.gz -> boto3-1.15.6.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/boto3-1.15.7 b/metadata/md5-cache/dev-python/boto3-1.15.7
new file mode 100644
index 000000000000..8c5d1917d719
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.15.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/botocore-1.18.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.18.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.15.7.tar.gz -> boto3-1.15.7.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/boto3-1.15.8 b/metadata/md5-cache/dev-python/boto3-1.15.8
new file mode 100644
index 000000000000..c0bae48037f3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.15.8
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/botocore-1.18.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.18.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.15.8.tar.gz -> boto3-1.15.8.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=53909f2d22ada8f7f100ce8183ef9cfc
diff --git a/metadata/md5-cache/dev-python/botocore-1.18.4 b/metadata/md5-cache/dev-python/botocore-1.18.4
new file mode 100644
index 000000000000..ea148fd38d78
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.18.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.18.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7c010df9f0c2d3dee1cc97a947987974
diff --git a/metadata/md5-cache/dev-python/botocore-1.18.5 b/metadata/md5-cache/dev-python/botocore-1.18.5
new file mode 100644
index 000000000000..1b9f106d952d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.18.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.18.5.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7c010df9f0c2d3dee1cc97a947987974
diff --git a/metadata/md5-cache/dev-python/botocore-1.18.6 b/metadata/md5-cache/dev-python/botocore-1.18.6
new file mode 100644
index 000000000000..38bbf8f4ec94
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.18.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.18.6.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7c010df9f0c2d3dee1cc97a947987974
diff --git a/metadata/md5-cache/dev-python/botocore-1.18.7 b/metadata/md5-cache/dev-python/botocore-1.18.7
new file mode 100644
index 000000000000..0b5c2d888f18
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.18.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.18.7.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7c010df9f0c2d3dee1cc97a947987974
diff --git a/metadata/md5-cache/dev-python/botocore-1.18.8 b/metadata/md5-cache/dev-python/botocore-1.18.8
new file mode 100644
index 000000000000..f8786d8c8ead
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.18.8
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/guzzle_sphinx_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.18.8.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7c010df9f0c2d3dee1cc97a947987974
diff --git a/metadata/md5-cache/dev-python/breathe-4.14.1 b/metadata/md5-cache/dev-python/breathe-4.14.1
index 74ffd338c8e2..ddfa8d3d5479 100644
--- a/metadata/md5-cache/dev-python/breathe-4.14.1
+++ b/metadata/md5-cache/dev-python/breathe-4.14.1
@@ -4,11 +4,11 @@ DESCRIPTION=Sphinx Doxygen renderer
 EAPI=7
 HOMEPAGE=https://breathe.readthedocs.io/en/latest/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=app-doc/doxygen dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-texlive/texlive-bibtexextra dev-texlive/texlive-fontsextra dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/b/breathe/breathe-4.14.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=74b24893221e2e476b9fa586315d6b6d
+_md5_=5c60ff4be9832d93ebd01cdbbfb1d18b
diff --git a/metadata/md5-cache/dev-python/capturer-3.0 b/metadata/md5-cache/dev-python/capturer-3.0
new file mode 100644
index 000000000000..9a46028b3e28
--- /dev/null
+++ b/metadata/md5-cache/dev-python/capturer-3.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/humanfriendly[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Easily capture stdout/stderr of the current process and subprocesses
+EAPI=7
+HOMEPAGE=https://capturer.readthedocs.io/en/latest/ https://pypi.org/project/capturer/ https://github.com/xolox/python-capturer
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/humanfriendly[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/capturer/capturer-3.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0291ac462f7e5f89ffe74191814e3065
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.22-r1 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.22-r1
deleted file mode 100644
index a88b1cc7a3e6..000000000000
--- a/metadata/md5-cache/dev-python/catkin_pkg-0.4.22-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/flake8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Standalone Python library for the catkin package system
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/catkin_pkg
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !<dev-util/catkin-0.7.14 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.22.tar.gz -> catkin_pkg-0.4.22-gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8c119815c81fb30b6a2f41df7e612e51
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.23 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.23
new file mode 100644
index 000000000000..28e4ba08cc3a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/catkin_pkg-0.4.23
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/flake8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Standalone Python library for the catkin package system
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/catkin_pkg
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !<dev-util/catkin-0.7.14 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.23.tar.gz -> catkin_pkg-0.4.23-gh.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=24cf09214153341c1c8c314c12a3ab7a
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-9999 b/metadata/md5-cache/dev-python/catkin_pkg-9999
index 4735a5647b97..e7399235f212 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-9999
+++ b/metadata/md5-cache/dev-python/catkin_pkg-9999
@@ -7,9 +7,9 @@ HOMEPAGE=https://wiki.ros.org/catkin_pkg
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !<dev-util/catkin-0.7.14 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyparsing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !<dev-util/catkin-0.7.14 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8c119815c81fb30b6a2f41df7e612e51
+_md5_=24cf09214153341c1c8c314c12a3ab7a
diff --git a/metadata/md5-cache/dev-python/certifi-10001-r1 b/metadata/md5-cache/dev-python/certifi-10001-r1
new file mode 100644
index 000000000000..4becaaac0cd0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/certifi-10001-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-misc/ca-certificates ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Thin replacement for certifi using system certificate store
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/certifi-shim https://pypi.org/project/certifi
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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=CC0-1.0
+RDEPEND=app-misc/ca-certificates python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mgorny/certifi-shim/archive/v10001.tar.gz -> certifi-shim-10001.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=139f94eb1aaac356ea7cd43f717f4fc3
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.37.0 b/metadata/md5-cache/dev-python/cfn-python-lint-0.37.0
new file mode 100644
index 000000000000..bc34ee283cc1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-python-lint-0.37.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CloudFormation Linter
+EAPI=7
+HOMEPAGE=https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/importlib_resources[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/jsonpatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/junit-xml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/aws-cloudformation/cfn-python-lint/archive/v0.37.0.tar.gz -> cfn-python-lint-0.37.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=64a7938e54e4f01024da0f99f996409a
diff --git a/metadata/md5-cache/dev-python/clang-python-11.0.0_rc4 b/metadata/md5-cache/dev-python/clang-python-11.0.0_rc4
new file mode 100644
index 000000000000..6d957aff7fdd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-11.0.0_rc4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-11.0.0_rc4:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=sys-devel/clang-11.0.0_rc4:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c4b76662cc5a9e0f4d6feffcbb2eade4
diff --git a/metadata/md5-cache/dev-python/cliff-3.4.0 b/metadata/md5-cache/dev-python/cliff-3.4.0
index 2716fd2b5a9f..8ae7a221eea3 100644
--- a/metadata/md5-cache/dev-python/cliff-3.4.0
+++ b/metadata/md5-cache/dev-python/cliff-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !~dev-python/pbr-2.1.0 test? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/testscenarios-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cmd2-0.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prettytable-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/stevedore-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !~dev-python/pbr-2.1.0 dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/testscenarios-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cmd2-0.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prettytable-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/stevedore-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Command Line Interface Formulation Framework
 EAPI=7
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/openstack/cliff
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cmd2-0.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prettytable-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/stevedore-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=>=dev-python/cmd2-0.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prettytable-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/stevedore-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-3.4.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b3b5128a2427e528435ee3ff659ce302
+_md5_=92ac3b5f70736c09da0c46af30fc7412
diff --git a/metadata/md5-cache/dev-python/coloredlogs-14.0 b/metadata/md5-cache/dev-python/coloredlogs-14.0
new file mode 100644
index 000000000000..7d1cd142e7b9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/coloredlogs-14.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/capturer[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/verboselogs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/humanfriendly[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Colored stream handler for the logging module
+EAPI=7
+HOMEPAGE=https://pypi.org/project/coloredlogs/ https://github.com/xolox/python-coloredlogs https://coloredlogs.readthedocs.io/en/latest/
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/humanfriendly[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-14.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ebb52edf7c57ade1c3675ad76e18f3e7
diff --git a/metadata/md5-cache/dev-python/construct-2.10.56 b/metadata/md5-cache/dev-python/construct-2.10.56
index e8904b4ec2b4..67eb94c90d90 100644
--- a/metadata/md5-cache/dev-python/construct-2.10.56
+++ b/metadata/md5-cache/dev-python/construct-2.10.56
@@ -1,15 +1,15 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/arrow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/numpy-1.15.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ruamel-yaml[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(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/arrow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.15.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A powerful declarative parser for binary data
 EAPI=7
 HOMEPAGE=https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=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 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/construct/construct/archive/v2.10.56.tar.gz -> construct-2.10.56.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c829165f6678a025ae1a44088193a7d0
+_md5_=d31d9e0b3728909010e32212add8bc40
diff --git a/metadata/md5-cache/dev-python/cookies-2.2.1-r1 b/metadata/md5-cache/dev-python/cookies-2.2.1-r1
index 3290c68e817a..67a252e17229 100644
--- a/metadata/md5-cache/dev-python/cookies-2.2.1-r1
+++ b/metadata/md5-cache/dev-python/cookies-2.2.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Friendlier RFC 6265-compliant cookie parser/renderer
 EAPI=7
 HOMEPAGE=https://gitlab.com/sashahart/cookies
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cookies/cookies-2.2.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5c68c97daad484e699abd270fa7fbf50
+_md5_=220a07f44c63d2152bee77319fc8f726
diff --git a/metadata/md5-cache/dev-python/cssselect-1.1.0 b/metadata/md5-cache/dev-python/cssselect-1.1.0
deleted file mode 100644
index 42724afeccfb..000000000000
--- a/metadata/md5-cache/dev-python/cssselect-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/lxml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=parses CSS3 Selectors and translates them to XPath 1.0
-EAPI=7
-HOMEPAGE=https://cssselect.readthedocs.io/en/latest/ https://pypi.org/project/cssselect/ https://github.com/scrapy/cssselect
-IUSE=test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/scrapy/cssselect/archive/v1.1.0.tar.gz -> cssselect-1.1.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=276323d38805f2860ead35b4a499f46d
diff --git a/metadata/md5-cache/dev-python/cssselect-1.1.0-r1 b/metadata/md5-cache/dev-python/cssselect-1.1.0-r1
new file mode 100644
index 000000000000..fb2d81eb8a09
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cssselect-1.1.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=parses CSS3 Selectors and translates them to XPath 1.0
+EAPI=7
+HOMEPAGE=https://cssselect.readthedocs.io/en/latest/ https://pypi.org/project/cssselect/ https://github.com/scrapy/cssselect
+IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/scrapy/cssselect/archive/v1.1.0.tar.gz -> cssselect-1.1.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=dd2027bced08c37b6b7272cce87104b7
diff --git a/metadata/md5-cache/dev-python/cssselect2-0.3.0 b/metadata/md5-cache/dev-python/cssselect2-0.3.0
index f11f796ec3a8..b7f6a2f639ec 100644
--- a/metadata/md5-cache/dev-python/cssselect2-0.3.0
+++ b/metadata/md5-cache/dev-python/cssselect2-0.3.0
@@ -2,7 +2,7 @@ BDEPEND=test? ( dev-python/tinycss2[python_targets_python3_6(-)?,python_targets_
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Parses CSS3 Selectors and translates them to XPath 1.0
 EAPI=7
-HOMEPAGE=https://cssselect.readthedocs.io/en/latest/ https://pypi.org/project/cssselect/ https://github.com/Kozea/cssselect2
+HOMEPAGE=https://cssselect2.readthedocs.io/en/latest/ https://pypi.org/project/cssselect2/ https://github.com/Kozea/cssselect2
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssselect2/cssselect2-0.3.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=01565affb61ba6f311804f36420df0de
+_md5_=52f3907a0975cbea4a4936652cdf0eac
diff --git a/metadata/md5-cache/dev-python/cython-0.29.15 b/metadata/md5-cache/dev-python/cython-0.29.15
index cd34bf01902c..ebcfb384ebbd 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.15
+++ b/metadata/md5-cache/dev-python/cython-0.29.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.15.tar.gz -> cython-0.29.15.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fb8644e9cc458aa27584ac8029c03a2c
diff --git a/metadata/md5-cache/dev-python/cython-0.29.20-r2 b/metadata/md5-cache/dev-python/cython-0.29.20-r2
index d7357091f71f..89f19e98dc12 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.20-r2
+++ b/metadata/md5-cache/dev-python/cython-0.29.20-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.20.tar.gz -> cython-0.29.20.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f4e2116cd3cde7e9a27a19c71691191c
diff --git a/metadata/md5-cache/dev-python/cython-0.29.21 b/metadata/md5-cache/dev-python/cython-0.29.21
index 611fab66f8fc..0b20339c809e 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.21
+++ b/metadata/md5-cache/dev-python/cython-0.29.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.21.tar.gz -> cython-0.29.21.gh.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=d98a8f4ebc3386ce8a4887be29db080d
diff --git a/metadata/md5-cache/dev-python/cython-0.29.21-r1 b/metadata/md5-cache/dev-python/cython-0.29.21-r1
new file mode 100644
index 000000000000..8e00bf25d733
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cython-0.29.21-r1
@@ -0,0 +1,15 @@
+BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=A Python to C compiler
+EAPI=7
+HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
+IUSE=emacs test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cython/cython/archive/0.29.21.tar.gz -> cython-0.29.21.gh.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a3424d9d8499c7108c5e8248c0f8ff99
diff --git a/metadata/md5-cache/dev-python/dask-2.28.0 b/metadata/md5-cache/dev-python/dask-2.28.0
new file mode 100644
index 000000000000..205ac16b0fa3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dask-2.28.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/toolz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/moto[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numexpr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3fs-0.0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/fsspec-0.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/partd-0.3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toolz-0.8.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
+EAPI=7
+HOMEPAGE=https://dask.org/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/fsspec-0.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/partd-0.3.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/toolz-0.8.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/dask/dask-2.28.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1e3c32d3a5fd601ba93482261e3e2276
diff --git a/metadata/md5-cache/dev-python/dataclasses-0.7 b/metadata/md5-cache/dev-python/dataclasses-0.7
index c99b90073598..9c407a863a5c 100644
--- a/metadata/md5-cache/dev-python/dataclasses-0.7
+++ b/metadata/md5-cache/dev-python/dataclasses-0.7
@@ -4,11 +4,11 @@ DESCRIPTION=A backport of the dataclasses module for Python 3.6
 EAPI=7
 HOMEPAGE=https://pypi.org/project/dataclasses/ https://github.com/ericvsmith/dataclasses
 IUSE=python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dataclasses/dataclasses-0.7.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=31c133df0cc1bfb430f38cc3ce9db1d1
+_md5_=f39ecd4767b5c3fff1e69e91d3b6919e
diff --git a/metadata/md5-cache/dev-python/deprecation-2.1.0 b/metadata/md5-cache/dev-python/deprecation-2.1.0
index 243f0bd655a8..8281a07fc126 100644
--- a/metadata/md5-cache/dev-python/deprecation-2.1.0
+++ b/metadata/md5-cache/dev-python/deprecation-2.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=A library to handle automated deprecations
 EAPI=7
 HOMEPAGE=https://deprecation.readthedocs.io/
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/deprecation/deprecation-2.1.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=75400a7b67d4213359cdd902047421a5
+_md5_=1fce3a1b2781472c27ca00a845335a4c
diff --git a/metadata/md5-cache/dev-python/django-debug-toolbar-3.1 b/metadata/md5-cache/dev-python/django-debug-toolbar-3.1
new file mode 100644
index 000000000000..c1ffe25fa8a3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-debug-toolbar-3.1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=A configurable set of panels that display debug information
+EAPI=7
+HOMEPAGE=https://pypi.org/project/django-debug-toolbar/ https://github.com/django-debug-toolbar/django-debug-toolbar/
+IUSE=doc examples test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/django-debug-toolbar/django-debug-toolbar/archive/3.1.tar.gz -> django-debug-toolbar-3.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=de444ae24fe438db75117b53b2cd2180
diff --git a/metadata/md5-cache/dev-python/docker-py-4.3.1 b/metadata/md5-cache/dev-python/docker-py-4.3.1
index 04bcacde374b..1e4ee30c4710 100644
--- a/metadata/md5-cache/dev-python/docker-py-4.3.1
+++ b/metadata/md5-cache/dev-python/docker-py-4.3.1
@@ -5,7 +5,7 @@ DESCRIPTION=Python client for Docker
 EAPI=7
 HOMEPAGE=https://github.com/docker/docker-py
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=!~dev-python/requests-2.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/websocket-client-0.32.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/4.3.1.tar.gz -> docker-py-4.3.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a1bccecac50cc35e3f7d6ef1769d4643
+_md5_=aaff721fedb23ca058466877093ed806
diff --git a/metadata/md5-cache/dev-python/eyeD3-0.9.5 b/metadata/md5-cache/dev-python/eyeD3-0.9.5
index e5f2c093488a..4e3246d092e7 100644
--- a/metadata/md5-cache/dev-python/eyeD3-0.9.5
+++ b/metadata/md5-cache/dev-python/eyeD3-0.9.5
@@ -4,7 +4,7 @@ DESCRIPTION=Module for manipulating ID3 (v1 + v2) tags in Python
 EAPI=7
 HOMEPAGE=https://eyed3.nicfit.net/
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-python/deprecation[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/filetype[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0.7
 SRC_URI=https://github.com/nicfit/eyeD3/archive/v0.9.5.tar.gz -> eyeD3-0.9.5.tar.gz test? ( https://eyed3.nicfit.net/releases/eyeD3-test-data.tgz )
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d4e77a3889675175cc319b33a1ebc3fa
+_md5_=bdabe012cc9580c0df143dd3f689dc07
diff --git a/metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1 b/metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1
new file mode 100644
index 000000000000..6f0c5ebe607c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/feedgenerator-1.9.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Standalone version of django.utils.feedgenerator
+EAPI=7
+HOMEPAGE=https://pypi.org/project/feedgenerator/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/feedgenerator/feedgenerator-1.9.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2ac87f58e9bc3977a3f8e5680d827f61
diff --git a/metadata/md5-cache/dev-python/filetype-1.0.7 b/metadata/md5-cache/dev-python/filetype-1.0.7
index 07323aabfbd3..af74aae90ce4 100644
--- a/metadata/md5-cache/dev-python/filetype-1.0.7
+++ b/metadata/md5-cache/dev-python/filetype-1.0.7
@@ -4,11 +4,11 @@ DESCRIPTION=Small, dependency-free, fast Python package to infer binary file typ
 EAPI=7
 HOMEPAGE=https://github.com/h2non/filetype.py
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/f/filetype/filetype-1.0.7.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=01187009f691b4bf52f1f2e62b82acb3
+_md5_=5a68db5c518662dc66f38a860d888fe1
diff --git a/metadata/md5-cache/dev-python/flask-paginate-0.5.3-r1 b/metadata/md5-cache/dev-python/flask-paginate-0.5.3-r1
deleted file mode 100644
index 2399b2a27cb8..000000000000
--- a/metadata/md5-cache/dev-python/flask-paginate-0.5.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Pagination support for flask
-EAPI=7
-HOMEPAGE=https://flask-paginate.readthedocs.io
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/lixxu/flask-paginate/archive/510ad833106134711868653fb597bf75ea8ac34f.tar.gz -> flask-paginate-0.5.3.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3a869b5a24f9bebbb0d6691b0d09a207
diff --git a/metadata/md5-cache/dev-python/flask-paginate-0.7.0 b/metadata/md5-cache/dev-python/flask-paginate-0.7.0
new file mode 100644
index 000000000000..e4cce1766197
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-paginate-0.7.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pagination support for flask
+EAPI=7
+HOMEPAGE=https://flask-paginate.readthedocs.io
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/lixxu/flask-paginate/archive/0.7.0.tar.gz -> flask-paginate-0.7.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5909c2f01ad5fb45b08efd202fb6a410
diff --git a/metadata/md5-cache/dev-python/flufl-lock-5.0.1 b/metadata/md5-cache/dev-python/flufl-lock-5.0.1
new file mode 100644
index 000000000000..4c1cbbbc6634
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flufl-lock-5.0.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=NFS-safe file locking with timeouts for POSIX systems.
+EAPI=7
+HOMEPAGE=https://gitlab.com/warsaw/flufl.lock
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/atpublic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-python/typing-extensions[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/typing-extensions[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/f/flufl.lock/flufl.lock-5.0.1.tar.gz -> flufl-lock-5.0.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=78ec6d44ed96e489aaf2aea885a0ba76
diff --git a/metadata/md5-cache/dev-python/fqdn-1.4.0 b/metadata/md5-cache/dev-python/fqdn-1.4.0
new file mode 100644
index 000000000000..0edf942379d9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fqdn-1.4.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/cached-property[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=RFC-compliant FQDN validation and manipulation for Python
+EAPI=7
+HOMEPAGE=https://github.com/guyhughes/fqdn
+IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=dev-python/cached-property[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/guyhughes/fqdn/archive/v1.4.0.tar.gz -> fqdn-1.4.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1e2bc32eb8e258760a3a18a0d61dbee4
diff --git a/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1 b/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
index 528acbf98307..88264df97c8e 100644
--- a/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
+++ b/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Recursive descent parsing library based on functional combinators
 EAPI=7
 HOMEPAGE=https://pypi.org/project/funcparserlib/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcparserlib/funcparserlib-0.3.6.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f77315ae6b071df9d67c471bc1e6fb71
+_md5_=25febd27e0bde89e10b65be8c978415b
diff --git a/metadata/md5-cache/dev-python/gast-0.3.3-r1 b/metadata/md5-cache/dev-python/gast-0.3.3-r1
new file mode 100644
index 000000000000..bbd748b9f81a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gast-0.3.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)
+EAPI=7
+HOMEPAGE=https://pypi.org/project/gast/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/g/gast/gast-0.3.3.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1d69f95cea12ca3b70b7c0257a9bb2ef
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
new file mode 100644
index 000000000000..7169bba0168a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=7
+HOMEPAGE=https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/google-auth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-oauthlib-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/g/google-auth-oauthlib/google-auth-oauthlib-0.4.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b842435b558bfabc32579794347ac33a
diff --git a/metadata/md5-cache/dev-python/graph-tool-2.35 b/metadata/md5-cache/dev-python/graph-tool-2.35
index 77f4dec16d92..5d2b589de6dd 100644
--- a/metadata/md5-cache/dev-python/graph-tool-2.35
+++ b/metadata/md5-cache/dev-python/graph-tool-2.35
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 SLOT=0
 SRC_URI=https://downloads.skewed.de/graph-tool/graph-tool-2.35.tar.bz2
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=628b520e0b6d626e9f0a04ec979b4d9d
+_md5_=144296b34bef3447af3daec86d8a7ab6
diff --git a/metadata/md5-cache/dev-python/graph-tool-9999 b/metadata/md5-cache/dev-python/graph-tool-9999
index b3a80ab08cb0..12a9c0f1415e 100644
--- a/metadata/md5-cache/dev-python/graph-tool-9999
+++ b/metadata/md5-cache/dev-python/graph-tool-9999
@@ -11,4 +11,4 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=628b520e0b6d626e9f0a04ec979b4d9d
+_md5_=144296b34bef3447af3daec86d8a7ab6
diff --git a/metadata/md5-cache/dev-python/grpcio-1.32.0 b/metadata/md5-cache/dev-python/grpcio-1.32.0
new file mode 100644
index 000000000000..078c3f39f9ca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/grpcio-1.32.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-dns/c-ares:= sys-libs/zlib:=
+DESCRIPTION=High-performance RPC framework (python libraries)
+EAPI=7
+HOMEPAGE=https://grpc.io
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-dns/c-ares:= sys-libs/zlib:= python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/g/grpcio/grpcio-1.32.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5bdf00ec0f19e3119f4f81171d0b4427
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.32.0 b/metadata/md5-cache/dev-python/grpcio-testing-1.32.0
new file mode 100644
index 000000000000..c79fd4f4d256
--- /dev/null
+++ b/metadata/md5-cache/dev-python/grpcio-testing-1.32.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-python/grpcio-1.32.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=Testing utilities for gRPC Python
+EAPI=7
+HOMEPAGE=https://grpc.io
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=~dev-python/grpcio-1.32.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.32.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d0e93c282ae9b2652c96ccd56962a672
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.32.0 b/metadata/md5-cache/dev-python/grpcio-tools-1.32.0
new file mode 100644
index 000000000000..6a0d464c4bf5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/grpcio-tools-1.32.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-python/grpcio-1.32.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=Protobuf code generator for gRPC
+EAPI=7
+HOMEPAGE=https://grpc.io
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-python/grpcio-1.32.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.32.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0ad93750a634143dba0c04ecb6990574
diff --git a/metadata/md5-cache/dev-python/hpack-4.0.0 b/metadata/md5-cache/dev-python/hpack-4.0.0
index e67656fa5a40..f867716ea2c7 100644
--- a/metadata/md5-cache/dev-python/hpack-4.0.0
+++ b/metadata/md5-cache/dev-python/hpack-4.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Pure-Python HPACK header compression
 EAPI=7
 HOMEPAGE=https://python-hyper.org/hpack/en/latest/ https://pypi.org/project/hpack/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hpack/archive/v4.0.0.tar.gz -> hpack-4.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b5d276394b71276abee27407cdd0811d
+_md5_=2f0f9f0e736fdadf90999ff864a70def
diff --git a/metadata/md5-cache/dev-python/humanfriendly-8.2 b/metadata/md5-cache/dev-python/humanfriendly-8.2
new file mode 100644
index 000000000000..cd5fdaea72b7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/humanfriendly-8.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/capturer[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coloredlogs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Human friendly output for text interfaces using Python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/humanfriendly https://github.com/xolox/python-humanfriendly https://humanfriendly.readthedocs.org
+IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-8.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=eb0db93c6970468184f457b73d8e4604
diff --git a/metadata/md5-cache/dev-python/hyper-h2-4.0.0 b/metadata/md5-cache/dev-python/hyper-h2-4.0.0
index 4091ad17928d..cf86e3e0632d 100644
--- a/metadata/md5-cache/dev-python/hyper-h2-4.0.0
+++ b/metadata/md5-cache/dev-python/hyper-h2-4.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP/2 State-Machine based protocol implementation
 EAPI=7
 HOMEPAGE=https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/hyperframe-6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/hyperframe-7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hpack-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/hpack-5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hyper-h2/archive/v4.0.0.tar.gz -> hyper-h2-4.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=870cc4571e8bbaf5d8cf2967a8bb3dc1
+_md5_=a3e70b64ea60a91e127f1d00db2cff25
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.29.4 b/metadata/md5-cache/dev-python/hypothesis-5.29.4
index 77fd66168f56..faf62e8afe70 100644
--- a/metadata/md5-cache/dev-python/hypothesis-5.29.4
+++ b/metadata/md5-cache/dev-python/hypothesis-5.29.4
@@ -4,7 +4,7 @@ DESCRIPTION=A library for property based testing
 EAPI=7
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
 IUSE=cli test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_6? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.29.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=eb3439e3ef61f481a04400f20815fb74
+_md5_=0d36defd9e6507a2c9a519f076e1960e
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.36.0 b/metadata/md5-cache/dev-python/hypothesis-5.36.0
new file mode 100644
index 000000000000..47060ee51a3e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-5.36.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_6? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-5.3.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_6? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.36.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ce1c5458afd7eba45b189fe91301d72c
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.36.1 b/metadata/md5-cache/dev-python/hypothesis-5.36.1
new file mode 100644
index 000000000000..b0668c3a0f88
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-5.36.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_6? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-5.3.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=cli test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] cli? ( python_targets_python3_6? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.36.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=86947594f6cd3764c5a4fb23dea5b8e0
diff --git a/metadata/md5-cache/dev-python/idna-ssl-1.1.0 b/metadata/md5-cache/dev-python/idna-ssl-1.1.0
index 49e7446aa868..a0e612584431 100644
--- a/metadata/md5-cache/dev-python/idna-ssl-1.1.0
+++ b/metadata/md5-cache/dev-python/idna-ssl-1.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Patch ssl.match_hostname for Unicode(idna) domains support
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/idna-ssl https://pypi.org/project/idna_ssl/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/idna[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/idna-ssl/archive/v1.1.0.tar.gz -> idna-ssl-1.1.0.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e9459b7bdbd80fc90c0c5d10f9e1ad9a
+_md5_=5510b6d01aecddd2407a1c5c8226570b
diff --git a/metadata/md5-cache/dev-python/iniconfig-1.0.0 b/metadata/md5-cache/dev-python/iniconfig-1.0.0
index 25879b58095d..0f97cf92eaa6 100644
--- a/metadata/md5-cache/dev-python/iniconfig-1.0.0
+++ b/metadata/md5-cache/dev-python/iniconfig-1.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Brain-dead simple config-ini parsing
 EAPI=7
 HOMEPAGE=https://github.com/RonnyPfannschmidt/iniconfig
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iniconfig/iniconfig-1.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=88ff66f67ecbc0520f2adbbc1e6575ed
+_md5_=a3ca47155b6a20c25fbaf517bd30e084
diff --git a/metadata/md5-cache/dev-python/ipaddr-2.2.0 b/metadata/md5-cache/dev-python/ipaddr-2.2.0
deleted file mode 100644
index 051a2fbe3c80..000000000000
--- a/metadata/md5-cache/dev-python/ipaddr-2.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python IP address manipulation library
-EAPI=7
-HOMEPAGE=https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipaddr/ipaddr-2.2.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ac58d54c5e56c1a0c1d5ec6076852fa0
diff --git a/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1 b/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
new file mode 100644
index 000000000000..2d0cb54af169
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipaddr-2.2.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python IP address manipulation library
+EAPI=7
+HOMEPAGE=https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=amd64 arm arm64 ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipaddr/ipaddr-2.2.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8e1b6774d12e4488f2c25ae740d6288d
diff --git a/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2 b/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2
new file mode 100644
index 000000000000..f7252bc067b7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyterlab_pygments-0.1.2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pygments theme making use of JupyterLab CSS variables
+EAPI=7
+HOMEPAGE=https://github.com/jupyterlab/jupyterlab_pygments
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/jupyterlab/jupyterlab_pygments/archive/0.1.2.tar.gz -> jupyterlab_pygments-0.1.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9e48135455353fc8f4b60590957128af
diff --git a/metadata/md5-cache/dev-python/jwcrypto-0.8.0 b/metadata/md5-cache/dev-python/jwcrypto-0.8.0
new file mode 100644
index 000000000000..2e16ab243bad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jwcrypto-0.8.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( >=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Implements JWK,JWS,JWE specifications using python-cryptography
+EAPI=7
+HOMEPAGE=https://github.com/latchset/jwcrypto
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/latchset/jwcrypto/archive/v0.8.0.tar.gz -> jwcrypto-0.8.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=07abf7d2a780a50f8dbe87f71f0ad85e
diff --git a/metadata/md5-cache/dev-python/lark-parser-0.7.8 b/metadata/md5-cache/dev-python/lark-parser-0.7.8
index 81aa02d413d6..c6131638ddaa 100644
--- a/metadata/md5-cache/dev-python/lark-parser-0.7.8
+++ b/metadata/md5-cache/dev-python/lark-parser-0.7.8
@@ -1,14 +1,14 @@
-BDEPEND=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(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python module to propose a modern general-purpose parsing library for Python
 EAPI=7
 HOMEPAGE=https://github.com/lark-parser/lark
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=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 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lark-parser/lark-parser-0.7.8.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f20133ad266723e90deed4c8f9c9941f
+_md5_=1a3cdc14d07a7c64c6100e2cf9c5759f
diff --git a/metadata/md5-cache/dev-python/libsass-0.20.0 b/metadata/md5-cache/dev-python/libsass-0.20.0
index 564ecd7f3a59..ef11b6f7cecc 100644
--- a/metadata/md5-cache/dev-python/libsass-0.20.0
+++ b/metadata/md5-cache/dev-python/libsass-0.20.0
@@ -5,7 +5,7 @@ DESCRIPTION=A straightforward binding of libsass for Python
 EAPI=7
 HOMEPAGE=https://github.com/sass/libsass-python
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/libsass/libsass-0.20.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=75ecb7fa5b88bfe1fca1151102616bf4
+_md5_=d46e584d8503897d188b8b9d903efe4d
diff --git a/metadata/md5-cache/dev-python/lit-11.0.0_rc4 b/metadata/md5-cache/dev-python/lit-11.0.0_rc4
new file mode 100644
index 000000000000..c75ff57cc018
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-11.0.0_rc4
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/llvm ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A stand-alone install of the LLVM suite testing tool
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=95c6c42106d8f76add19500f1a394c09
diff --git a/metadata/md5-cache/dev-python/lxml-4.5.2 b/metadata/md5-cache/dev-python/lxml-4.5.2
deleted file mode 100644
index 2baeb07ac999..000000000000
--- a/metadata/md5-cache/dev-python/lxml-4.5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-python/cython[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/cssselect[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28
-DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
-EAPI=7
-HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
-IUSE=doc examples +threads test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD ElementTree GPL-2 PSF-2
-RDEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.5.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=36aaa4f199c22d590abda8735a428ff5
diff --git a/metadata/md5-cache/dev-python/lxml-4.5.2-r1 b/metadata/md5-cache/dev-python/lxml-4.5.2-r1
new file mode 100644
index 000000000000..a29a658d111b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lxml-4.5.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/cssselect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28
+DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
+EAPI=7
+HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
+IUSE=doc examples +threads test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD ElementTree GPL-2 PSF-2
+RDEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.5.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f7169b853826818ac464af2937c81a39
diff --git a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1 b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
index b42e6e7d4700..5b95e5c23d2f 100644
--- a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
+++ b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Optional static typing for Python
 EAPI=7
 HOMEPAGE=http://www.mypy-lang.org/
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy_extensions/archive/0.4.3.tar.gz -> mypy_extensions-0.4.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3982030406030667a111d0b3a5eefdf4
+_md5_=2d4b6000678561d755bd6890ef286a81
diff --git a/metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1 b/metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
index 71c29a794e6f..d12e737fd645 100644
--- a/metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
+++ b/metadata/md5-cache/dev-python/mysqlclient-1.4.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Fork of MySQL-python
 EAPI=6
 HOMEPAGE=https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python
 IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=!dev-python/mysql-python dev-db/mysql-connector-c:0= python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mysqlclient/mysqlclient-1.4.6.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc9be0d241538219cfa627597bd4a050
+_md5_=5ac578724729eb95af095fec410081ad
diff --git a/metadata/md5-cache/dev-python/namespace-google-1 b/metadata/md5-cache/dev-python/namespace-google-1
deleted file mode 100644
index 0bd9e76422b5..000000000000
--- a/metadata/md5-cache/dev-python/namespace-google-1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Namespace package declaration for google
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=public-domain
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=54eef86b27b649fa735014bfca43f4d3
diff --git a/metadata/md5-cache/dev-python/namespace-google-1-r1 b/metadata/md5-cache/dev-python/namespace-google-1-r1
new file mode 100644
index 000000000000..78daaa88bf6c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/namespace-google-1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Namespace package declaration for google
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=public-domain
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=554fdaee3bccdeccb5a089475b8b1238
diff --git a/metadata/md5-cache/dev-python/namespace-jaraco-2-r1 b/metadata/md5-cache/dev-python/namespace-jaraco-2-r1
deleted file mode 100644
index 1fa7c5f70b5f..000000000000
--- a/metadata/md5-cache/dev-python/namespace-jaraco-2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Namespace package declaration for jaraco
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=public-domain
-RDEPEND=!<dev-python/jaraco-packaging-5.1 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fd1699cd2ae6ddeb48a0591ec99d9924
diff --git a/metadata/md5-cache/dev-python/namespace-jaraco-2-r2 b/metadata/md5-cache/dev-python/namespace-jaraco-2-r2
new file mode 100644
index 000000000000..1fb655d47169
--- /dev/null
+++ b/metadata/md5-cache/dev-python/namespace-jaraco-2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Namespace package declaration for jaraco
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+LICENSE=public-domain
+RDEPEND=!<dev-python/jaraco-packaging-5.1 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0bd999f0c4ce8556d90a8da72a294363
diff --git a/metadata/md5-cache/dev-python/neovim-remote-2.4.0 b/metadata/md5-cache/dev-python/neovim-remote-2.4.0
new file mode 100644
index 000000000000..e52db1a942e5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/neovim-remote-2.4.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pynvim[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( app-editors/neovim ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A tool that helps control neovim processes
+EAPI=7
+HOMEPAGE=https://github.com/mhinz/neovim-remote
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=dev-python/pynvim[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mhinz/neovim-remote/archive/v2.4.0.tar.gz -> neovim-remote-2.4.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9ccd05f8586f4c284d2a36310c08ec39
diff --git a/metadata/md5-cache/dev-python/networkx-2.5 b/metadata/md5-cache/dev-python/networkx-2.5
index e2d009ebd492..232c0c939a8a 100644
--- a/metadata/md5-cache/dev-python/networkx-2.5
+++ b/metadata/md5-cache/dev-python/networkx-2.5
@@ -4,7 +4,7 @@ DESCRIPTION=Python tools to manipulate graphs and complex networks
 EAPI=7
 HOMEPAGE=https://networkx.github.io/ https://github.com/networkx/networkx
 IUSE=examples extras pandas scipy test xml yaml test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/decorator-4.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/matplotlib-2.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] extras? ( >=dev-python/pydot-1.2.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( >=dev-python/pygraphviz-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=sci-libs/gdal-1.10.0[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( >=dev-python/pygraphviz-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=sci-libs/gdal-1.10.0[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( >=dev-python/pygraphviz-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] >=sci-libs/gdal-1.10.0[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) pandas? ( >=dev-python/pandas-0.23.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) scipy? ( >=dev-python/scipy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xml? ( >=dev-python/lxml-4.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) yaml? ( >=dev-python/pyyaml-3.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.5.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=ba2df756abf8ceb671317c52c49f79e5
+_md5_=90fb097eca6fe9c9f5f7e42baa3ecd93
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r7 b/metadata/md5-cache/dev-python/nose-1.3.7-r7
new file mode 100644
index 000000000000..7c1d04c8d43a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nose-1.3.7-r7
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=coverage? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) )
+DESCRIPTION=Unittest extension with automatic test suite discovery and easy test authoring
+EAPI=7
+HOMEPAGE=https://pypi.org/project/nose/ https://nose.readthedocs.io/en/latest/ https://github.com/nose-devs/nose
+IUSE=coverage examples test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=coverage? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/nose/nose-1.3.7.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ecec8bea352fee2500e64778f868d5d5
diff --git a/metadata/md5-cache/dev-python/notify2-0.3.1-r2 b/metadata/md5-cache/dev-python/notify2-0.3.1-r2
new file mode 100644
index 000000000000..54ee78a589ef
--- /dev/null
+++ b/metadata/md5-cache/dev-python/notify2-0.3.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Python interface to DBus notifications.
+EAPI=6
+HOMEPAGE=https://bitbucket.org/takluyver/pynotify2
+IUSE=examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/n/notify2/notify2-0.3.1.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=404b8d59c963ecff294318251247875b
diff --git a/metadata/md5-cache/dev-python/numpy-1.19.1 b/metadata/md5-cache/dev-python/numpy-1.19.1
index c66bce03c5ff..0b8d5646945f 100644
--- a/metadata/md5-cache/dev-python/numpy-1.19.1
+++ b/metadata/md5-cache/dev-python/numpy-1.19.1
@@ -5,7 +5,7 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=7
 HOMEPAGE=https://www.numpy.org
 IUSE=doc lapack test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.19.1.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db5a6ad8c084989bfd6bc683e8524842
+_md5_=67e9bd1f419e187ef4815f05cd63c329
diff --git a/metadata/md5-cache/dev-python/olefile-0.46-r1 b/metadata/md5-cache/dev-python/olefile-0.46-r1
new file mode 100644
index 000000000000..d7c10fa64066
--- /dev/null
+++ b/metadata/md5-cache/dev-python/olefile-0.46-r1
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python package to parse, read and write Microsoft OLE2 files
+EAPI=7
+HOMEPAGE=https://www.decalage.info/olefile
+IUSE=doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/decalage2/olefile/archive/v0.46.tar.gz -> olefile-0.46.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4f2160604883e8cadd899bc0a6474a7a
diff --git a/metadata/md5-cache/dev-python/openpyxl-3.0.5 b/metadata/md5-cache/dev-python/openpyxl-3.0.5
new file mode 100644
index 000000000000..a6bf509b4149
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openpyxl-3.0.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),tiff,jpeg] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/jdcal[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/et_xmlfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure python reader and writer of Excel OpenXML files
+EAPI=7
+HOMEPAGE=https://openpyxl.readthedocs.io/en/stable/
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/jdcal[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/et_xmlfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://foss.heptapod.net/openpyxl/openpyxl/-/archive/3.0.5/openpyxl-3.0.5.tar.bz2
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5fd440df25d45a417d544dc391848a3b
diff --git a/metadata/md5-cache/dev-python/openpyxl-9999 b/metadata/md5-cache/dev-python/openpyxl-9999
deleted file mode 100644
index cb0a59b8ce4c..000000000000
--- a/metadata/md5-cache/dev-python/openpyxl-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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(-)] >=dev-python/setuptools-42.0.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 unpack
-DEPEND=test? ( dev-python/jdcal[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/et_xmlfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-vcs/mercurial
-DESCRIPTION=Pure python reader and writer of Excel OpenXML files
-EAPI=7
-HOMEPAGE=https://openpyxl.readthedocs.io/en/stable/
-IUSE=test python_targets_python3_6 python_targets_python3_7
-LICENSE=MIT
-PROPERTIES=live
-RDEPEND=dev-python/jdcal[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/et_xmlfile[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? ( test )
-SLOT=0
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	mercurial	d22fe98ea362174612a57c233239102f	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c640f70e502f59f4fadd317d6af1080c
diff --git a/metadata/md5-cache/dev-python/opt-einsum-3.0.1-r1 b/metadata/md5-cache/dev-python/opt-einsum-3.0.1-r1
new file mode 100644
index 000000000000..751871cbecc1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/opt-einsum-3.0.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+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_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/o/opt-einsum/opt_einsum-3.0.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f0a575f2c5277ff8dbed032e49d7bb03
diff --git a/metadata/md5-cache/dev-python/pandas-1.1.1 b/metadata/md5-cache/dev-python/pandas-1.1.1
index cae4de31dcb3..f6ccb64bf725 100644
--- a/metadata/md5-cache/dev-python/pandas-1.1.1
+++ b/metadata/md5-cache/dev-python/pandas-1.1.1
@@ -5,7 +5,7 @@ DESCRIPTION=Powerful data structures for data analysis and statistics
 EAPI=7
 HOMEPAGE=https://pandas.pydata.org/
 IUSE=doc full-support minimal test X python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 x86
 LICENSE=BSD
 RDEPEND=>dev-python/numpy-1.15.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !minimal? ( >=dev-python/bottleneck-1.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numexpr-2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) full-support? ( dev-python/beautifulsoup:4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blosc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( dev-python/openpyxl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/xlsxwriter[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytables-3.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/s3fs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/statsmodels[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( >=dev-python/xarray-0.10.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/xarray-0.10.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-0.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/xlrd-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/xlwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] X? ( || ( dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-1.1.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fca5b787eed37b4663e792583fe6070d
+_md5_=78346f5387a86fc48182f1a992b3cb61
diff --git a/metadata/md5-cache/dev-python/parver-0.3.1 b/metadata/md5-cache/dev-python/parver-0.3.1
new file mode 100644
index 000000000000..fbfefc1a2b57
--- /dev/null
+++ b/metadata/md5-cache/dev-python/parver-0.3.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/arpeggio-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/attrs-19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-python/arpeggio-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/attrs-19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/hypothesis[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretend[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Parse and manipulate version numbers
+EAPI=7
+HOMEPAGE=https://github.com/RazerM/parver https://pypi.org/project/parver/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/arpeggio-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/attrs-19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/RazerM/parver/archive/0.3.1.tar.gz -> parver-0.3.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3d066bff7ada07fb24ecefb345d493b1
diff --git a/metadata/md5-cache/dev-python/paste-3.4.5 b/metadata/md5-cache/dev-python/paste-3.4.5
new file mode 100644
index 000000000000..594f20aec07a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/paste-3.4.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tools for using a Web Server Gateway Interface stack
+EAPI=7
+HOMEPAGE=https://pypi.org/project/Paste/
+IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris
+LICENSE=MIT
+RDEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/P/Paste/Paste-3.4.5.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7c4db71085ca083427bddd0b01960fa8
diff --git a/metadata/md5-cache/dev-python/paste-3.4.6 b/metadata/md5-cache/dev-python/paste-3.4.6
new file mode 100644
index 000000000000..ac977443ddf2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/paste-3.4.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tools for using a Web Server Gateway Interface stack
+EAPI=7
+HOMEPAGE=https://pypi.org/project/Paste/
+IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris
+LICENSE=MIT
+RDEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/P/Paste/Paste-3.4.6.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7c4db71085ca083427bddd0b01960fa8
diff --git a/metadata/md5-cache/dev-python/path-py-15.0.0 b/metadata/md5-cache/dev-python/path-py-15.0.0
index 59a57f0e5c09..32b453478bc9 100644
--- a/metadata/md5-cache/dev-python/path-py-15.0.0
+++ b/metadata/md5-cache/dev-python/path-py-15.0.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://pypi.org/project/path/ https://github.com/jaraco/path
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-python/pytest-shutil-1.7.0-r1 !<dev-python/pytest-virtualenv-1.7.0-r1 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-python/pytest-shutil-1.7.0-r1 !<dev-python/pytest-virtualenv-1.7.0-r1 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/path/path-15.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=04ca1f80af3e433b575062f054d4a18a
+_md5_=89184e22fe83e2ba38525a00e3ee2a6e
diff --git a/metadata/md5-cache/dev-python/pbr-5.5.0-r1 b/metadata/md5-cache/dev-python/pbr-5.5.0-r1
index 5f0da7396019..3f76e1f293a8 100644
--- a/metadata/md5-cache/dev-python/pbr-5.5.0-r1
+++ b/metadata/md5-cache/dev-python/pbr-5.5.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Inject some useful and sensible default behaviors into setuptools
 EAPI=7
 HOMEPAGE=https://github.com/openstack-dev/pbr
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-5.5.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6d9db56b719e4aa0d6d7830c96ab2cba
+_md5_=f2d10a1bfe05e4f774b66df0f13dd83b
diff --git a/metadata/md5-cache/dev-python/pexpect-4.8.0-r1 b/metadata/md5-cache/dev-python/pexpect-4.8.0-r1
index 9985fa9cab29..430314804bbd 100644
--- a/metadata/md5-cache/dev-python/pexpect-4.8.0-r1
+++ b/metadata/md5-cache/dev-python/pexpect-4.8.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/ptyprocess-0.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/ptyprocess-0.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=doc? ( dev-python/sphinx )
 DESCRIPTION=Python module for spawning child apps and responding to expected patterns
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pexpect/pexpect-4.8.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bb7344eda30a63283df71fefa1eeeedb
+_md5_=8d4cdcc7b9f51a0eec7ad5f17c423d0c
diff --git a/metadata/md5-cache/dev-python/pgspecial-1.11.10 b/metadata/md5-cache/dev-python/pgspecial-1.11.10
new file mode 100644
index 000000000000..6c3de83de1ed
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pgspecial-1.11.10
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/psycopg-2.7.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python implementation of PostgreSQL meta commands
+EAPI=7
+HOMEPAGE=https://github.com/dbcli/pgspecial
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/psycopg-2.7.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlparse-0.1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dbcli/pgspecial/archive/v1.11.10.tar.gz -> pgspecial-1.11.10.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8952374692fe0015801a7acea75a9493
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.10 b/metadata/md5-cache/dev-python/phonenumbers-8.12.10
new file mode 100644
index 000000000000..59c13cf9d633
--- /dev/null
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.10
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python port of Google's libphonenumber
+EAPI=7
+HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.12.10.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=82a94cf3e0ff7cc68cb4b10dcbda2dd0
diff --git a/metadata/md5-cache/dev-python/pip-20.1.1-r1 b/metadata/md5-cache/dev-python/pip-20.1.1-r1
deleted file mode 100644
index cf6d9227a128..000000000000
--- a/metadata/md5-cache/dev-python/pip-20.1.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/csv23[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scripttest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=Installs python packages -- replacement for easy_install
-EAPI=7
-HOMEPAGE=https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
-IUSE=test -vanilla python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pypa/pip/archive/20.1.1.tar.gz -> pip-20.1.1.tar.gz test? ( https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-44.0.0-py2.py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.34.2-py2.py3-none-any.whl )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8dbfc2076d79ce6734148895514ab186
diff --git a/metadata/md5-cache/dev-python/pip-20.2.2-r1 b/metadata/md5-cache/dev-python/pip-20.2.2-r1
index 4160d527d84a..95cddf0435b9 100644
--- a/metadata/md5-cache/dev-python/pip-20.2.2-r1
+++ b/metadata/md5-cache/dev-python/pip-20.2.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Installs python packages -- replacement for easy_install
 EAPI=7
 HOMEPAGE=https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/
 IUSE=test -vanilla python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/setuptools-39.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[ssl(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/20.2.2.tar.gz -> pip-20.2.2.tar.gz test? ( https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-44.0.0-py2.py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.34.2-py2.py3-none-any.whl )
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3472d234a994ca2aa0a11fcca2bed587
+_md5_=ee5e16aae40ae5a4a71951b21c625fde
diff --git a/metadata/md5-cache/dev-python/ply-3.11 b/metadata/md5-cache/dev-python/ply-3.11
deleted file mode 100644
index 5e4dd12dc6c4..000000000000
--- a/metadata/md5-cache/dev-python/ply-3.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Python Lex-Yacc library
-EAPI=6
-HOMEPAGE=http://www.dabeaz.com/ply/ https://pypi.org/project/ply/
-IUSE=examples python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/3.11
-SRC_URI=mirror://pypi/p/ply/ply-3.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da78dd7459165d2e9ce89f3258cc4fea
diff --git a/metadata/md5-cache/dev-python/ply-3.11-r1 b/metadata/md5-cache/dev-python/ply-3.11-r1
new file mode 100644
index 000000000000..64e018d841c0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ply-3.11-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Python Lex-Yacc library
+EAPI=6
+HOMEPAGE=http://www.dabeaz.com/ply/ https://pypi.org/project/ply/
+IUSE=examples python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0/3.11
+SRC_URI=mirror://pypi/p/ply/ply-3.11.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=97af0e4431f694c74b823eefece14ad3
diff --git a/metadata/md5-cache/dev-python/process-tests-2.1.1 b/metadata/md5-cache/dev-python/process-tests-2.1.1
index e194f2bdf160..8b653da1a519 100644
--- a/metadata/md5-cache/dev-python/process-tests-2.1.1
+++ b/metadata/md5-cache/dev-python/process-tests-2.1.1
@@ -4,7 +4,7 @@ DESCRIPTION=Tools for testing processes
 EAPI=7
 HOMEPAGE=https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/process-tests/process-tests-2.1.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7434e8aeaeb198c8f53c88985b00950f
+_md5_=0fcf7f1b9671b5277cb00ac1b091a052
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.11.4 b/metadata/md5-cache/dev-python/protobuf-python-3.11.4
deleted file mode 100644
index 75e652cb0dd3..000000000000
--- a/metadata/md5-cache/dev-python/protobuf-python-3.11.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-libs/protobuf-3.11.4 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-libs/protobuf-3.11.4
-DESCRIPTION=Google's Protocol Buffers - Python bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-libs/protobuf-3.11.4 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-SLOT=0/22
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.11.4.tar.gz -> protobuf-3.11.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=36fea4bc4c506c480b80b661f1f83c24
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.11.4-r1 b/metadata/md5-cache/dev-python/protobuf-python-3.11.4-r1
new file mode 100644
index 000000000000..62e24e3400ee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.11.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-libs/protobuf-3.11.4 dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-libs/protobuf-3.11.4
+DESCRIPTION=Google's Protocol Buffers - Python bindings
+EAPI=7
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-libs/protobuf-3.11.4 dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0/22
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.11.4.tar.gz -> protobuf-3.11.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9a914b0ddd43732c1662dfb609910282
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.12.2 b/metadata/md5-cache/dev-python/protobuf-python-3.12.2
deleted file mode 100644
index 64f7df811f5e..000000000000
--- a/metadata/md5-cache/dev-python/protobuf-python-3.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.12.2 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.12.2
-DESCRIPTION=Google's Protocol Buffers - Python bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.12.2 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/23
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.2.tar.gz -> protobuf-3.12.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=41dff09de0eba74ff8c0daa1817a7396
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.12.2-r1 b/metadata/md5-cache/dev-python/protobuf-python-3.12.2-r1
new file mode 100644
index 000000000000..2a37ee187947
--- /dev/null
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.12.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.12.2 dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.12.2
+DESCRIPTION=Google's Protocol Buffers - Python bindings
+EAPI=7
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.12.2 dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0/23
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.2.tar.gz -> protobuf-3.12.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4f5978430738eb304a5b9182cb6d9acc
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.12.4 b/metadata/md5-cache/dev-python/protobuf-python-3.12.4
deleted file mode 100644
index dd59fb98e9af..000000000000
--- a/metadata/md5-cache/dev-python/protobuf-python-3.12.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.12.4 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.12.4
-DESCRIPTION=Google's Protocol Buffers - Python bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.12.4 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/23
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.4.tar.gz -> protobuf-3.12.4.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fd883508bfa3faa2044bda0285b5b00e
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.12.4-r1 b/metadata/md5-cache/dev-python/protobuf-python-3.12.4-r1
new file mode 100644
index 000000000000..4ebad6e96476
--- /dev/null
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.12.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.12.4 dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.12.4
+DESCRIPTION=Google's Protocol Buffers - Python bindings
+EAPI=7
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.12.4 dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0/23
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.12.4.tar.gz -> protobuf-3.12.4.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0d4675cd880edd17969cdd3d59048263
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.13.0 b/metadata/md5-cache/dev-python/protobuf-python-3.13.0
deleted file mode 100644
index 19a09017cc3a..000000000000
--- a/metadata/md5-cache/dev-python/protobuf-python-3.13.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 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.13.0 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.13.0
-DESCRIPTION=Google's Protocol Buffers - Python bindings
-EAPI=7
-HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.13.0 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0/24
-SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz -> protobuf-3.13.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e3696cd5fc54a2a436d8073ab0489e77
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.13.0-r1 b/metadata/md5-cache/dev-python/protobuf-python-3.13.0-r1
new file mode 100644
index 000000000000..c01f6f48f238
--- /dev/null
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.13.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.13.0 dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.13.0
+DESCRIPTION=Google's Protocol Buffers - Python bindings
+EAPI=7
+HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-3.13.0 dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0/24
+SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz -> protobuf-3.13.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c75865f189024b593057a97becba10e3
diff --git a/metadata/md5-cache/dev-python/protobuf-python-9999 b/metadata/md5-cache/dev-python/protobuf-python-9999
index 25be7b128cde..0d9ca4208e08 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-9999
+++ b/metadata/md5-cache/dev-python/protobuf-python-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-9999 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-9999 dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-9999
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-9999
 DESCRIPTION=Google's Protocol Buffers - Python bindings
 EAPI=7
 HOMEPAGE=https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-9999 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ~dev-libs/protobuf-9999 dev-python/namespace-google[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0/24
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f6c283048043b3a714bc0641ef6c4482
+_md5_=a9be68277bcbf033e6ba94eae92bd5d4
diff --git a/metadata/md5-cache/dev-python/pybind11-2.5.0 b/metadata/md5-cache/dev-python/pybind11-2.5.0
index 9c0ee5801640..41d5e25c5c71 100644
--- a/metadata/md5-cache/dev-python/pybind11-2.5.0
+++ b/metadata/md5-cache/dev-python/pybind11-2.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pybind/pybind11/archive/v2.5.0.tar.gz -> pybind11-2.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b9ed890e6f4b6081cf5571f754bd6c7
diff --git a/metadata/md5-cache/dev-python/pycairo-1.18.2 b/metadata/md5-cache/dev-python/pycairo-1.18.2
deleted file mode 100644
index f3abc4cae57f..000000000000
--- a/metadata/md5-cache/dev-python/pycairo-1.18.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_python3_6? ( dev-python/hypothesis[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/hypothesis[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/hypothesis[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/hypothesis[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) test? ( >=x11-libs/cairo-1.13.1[svg] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/cairo-1.13.1[svg]
-DESCRIPTION=Python bindings for the cairo library
-EAPI=7
-HOMEPAGE=https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo
-IUSE=examples doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( LGPL-2.1 MPL-1.1 )
-RDEPEND=>=x11-libs/cairo-1.13.1[svg] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.18.2/pycairo-1.18.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b34f3fba3a5e825cd2f14669e7a524d4
diff --git a/metadata/md5-cache/dev-python/pycparser-2.20 b/metadata/md5-cache/dev-python/pycparser-2.20
deleted file mode 100644
index c1f26a9e7dc0..000000000000
--- a/metadata/md5-cache/dev-python/pycparser-2.20
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/ply:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=C parser and AST generator written in Python
-EAPI=7
-HOMEPAGE=https://github.com/eliben/pycparser
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=dev-python/ply:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pycparser/pycparser-2.20.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aa9a7210f9d87f958ab79793448568dd
diff --git a/metadata/md5-cache/dev-python/pycparser-2.20-r1 b/metadata/md5-cache/dev-python/pycparser-2.20-r1
new file mode 100644
index 000000000000..3b111c3fdbd9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycparser-2.20-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/ply:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=C parser and AST generator written in Python
+EAPI=7
+HOMEPAGE=https://github.com/eliben/pycparser
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=dev-python/ply:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pycparser/pycparser-2.20.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9f9fccb91944e9cf1f3e46138d0ead42
diff --git a/metadata/md5-cache/dev-python/pyenchant-3.1.0 b/metadata/md5-cache/dev-python/pyenchant-3.1.0
index 3d46e0da6b9e..aee745716df3 100644
--- a/metadata/md5-cache/dev-python/pyenchant-3.1.0
+++ b/metadata/md5-cache/dev-python/pyenchant-3.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for the Enchant spellchecking system
 EAPI=7
 HOMEPAGE=https://github.com/pyenchant/pyenchant https://pypi.org/project/pyenchant/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/enchant:* python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyenchant/pyenchant/archive/v3.1.0.tar.gz -> pyenchant-3.1.0.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5d421834abc174e1b98d1a3427c6e98a
+_md5_=8f181e5b1f9e5516c7c17f79519dbb80
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2 b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
new file mode 100644
index 000000000000..22436525abe9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-7.3.5-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:= virtual/jpeg:0
+DESCRIPTION=Reimplementation of portions of the pygame API using SDL2
+EAPI=7
+HOMEPAGE=https://github.com/renpy/pygame_sdl2
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1 ZLIB
+RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] >=media-libs/sdl2-mixer-2.0.2:= media-libs/sdl2-ttf:= virtual/jpeg:0 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://www.renpy.org/dl/7.3.5/pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c3e450d5278f7b6cda420a3d21b57fbd
diff --git a/metadata/md5-cache/dev-python/pygobject-3.34.0 b/metadata/md5-cache/dev-python/pygobject-3.34.0
deleted file mode 100644
index e03bfd76d032..000000000000
--- a/metadata/md5-cache/dev-python/pygobject-3.34.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/cairo[glib] ) test? ( python_targets_python3_6? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_python3_7? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_python3_8? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_python3_9? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Python bindings for GObject Introspection
-EAPI=7
-HOMEPAGE=https://pygobject.readthedocs.io/
-IUSE=+cairo examples test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/cairo[glib] )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=mirror://gnome/sources/pygobject/3.34/pygobject-3.34.0.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea82a384a7cf68e3976261a052ef7bb9
diff --git a/metadata/md5-cache/dev-python/pygobject-3.34.0-r1 b/metadata/md5-cache/dev-python/pygobject-3.34.0-r1
new file mode 100644
index 000000000000..1ab40f1c9d70
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygobject-3.34.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/cairo[glib] ) test? ( python_targets_python3_6? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_python3_7? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_python3_8? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_python3_9? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Python bindings for GObject Introspection
+EAPI=7
+HOMEPAGE=https://pygobject.readthedocs.io/
+IUSE=+cairo examples test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/cairo[glib] )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=mirror://gnome/sources/pygobject/3.34/pygobject-3.34.0.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=058421d021cb50769cf8798940f9b91b
diff --git a/metadata/md5-cache/dev-python/pygobject-3.36.1 b/metadata/md5-cache/dev-python/pygobject-3.36.1
deleted file mode 100644
index 46401a697fb9..000000000000
--- a/metadata/md5-cache/dev-python/pygobject-3.36.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/cairo[glib] ) test? ( python_targets_python3_6? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_python3_7? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_python3_8? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_python3_9? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Python bindings for GObject Introspection
-EAPI=7
-HOMEPAGE=https://pygobject.readthedocs.io/
-IUSE=+cairo examples test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/cairo[glib] )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=mirror://gnome/sources/pygobject/3.36/pygobject-3.36.1.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c2817f768f67aca7f20f6617e3ef80e6
diff --git a/metadata/md5-cache/dev-python/pygobject-3.36.1-r1 b/metadata/md5-cache/dev-python/pygobject-3.36.1-r1
new file mode 100644
index 000000000000..3ebccb5f0b62
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygobject-3.36.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/cairo[glib] ) test? ( python_targets_python3_6? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_python3_7? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_python3_8? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) python_targets_python3_9? ( dev-libs/atk[introspection] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] x11-libs/gdk-pixbuf:2[introspection,jpeg] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Python bindings for GObject Introspection
+EAPI=7
+HOMEPAGE=https://pygobject.readthedocs.io/
+IUSE=+cairo examples test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 test
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.54:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.11.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-libs/cairo[glib] )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=mirror://gnome/sources/pygobject/3.36/pygobject-3.36.1.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eba4f38e65b7d45401e837f03822fb2b
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.6 b/metadata/md5-cache/dev-python/pygraphviz-1.6
index 68f80babbe45..e33ee18a0758 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.6
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.6
@@ -5,7 +5,7 @@ DESCRIPTION=Python wrapper for the Graphviz Agraph data structure
 EAPI=7
 HOMEPAGE=https://pygraphviz.github.io/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=media-gfx/graphviz python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygraphviz/pygraphviz-1.6.zip
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=11b0641610467fa802618f85c878403b
+_md5_=4987f189a1e72ac141dd79f9e8556a06
diff --git a/metadata/md5-cache/dev-python/pyilmbase-2.5.2-r1 b/metadata/md5-cache/dev-python/pyilmbase-2.5.2-r1
index b830c2a359bc..29fba14d04a1 100644
--- a/metadata/md5-cache/dev-python/pyilmbase-2.5.2-r1
+++ b/metadata/md5-cache/dev-python/pyilmbase-2.5.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.2.tar.gz -> pyilmbase-2.5.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d8bb153a632c621b2512e3f94f002d4
diff --git a/metadata/md5-cache/dev-python/pykerberos-1.3.0-r1 b/metadata/md5-cache/dev-python/pykerberos-1.3.0-r1
new file mode 100644
index 000000000000..f4f61de7338b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pykerberos-1.3.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-crypt/mit-krb5
+DESCRIPTION=A high-level Python wrapper for Kerberos/GSSAPI operations
+EAPI=7
+HOMEPAGE=https://trac.calendarserver.org/wiki/PyKerberos https://github.com/apple/ccs-pykerberos/ https://pypi.org/project/kerberos/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=app-crypt/mit-krb5 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/apple/ccs-pykerberos/archive/PyKerberos-1.3.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0d5e4a685310498d0ef2d27d1fdb5d1a
diff --git a/metadata/md5-cache/dev-python/pylast-3.3.0 b/metadata/md5-cache/dev-python/pylast-3.3.0
index f7aacae53adb..b73e01c8607d 100644
--- a/metadata/md5-cache/dev-python/pylast-3.3.0
+++ b/metadata/md5-cache/dev-python/pylast-3.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python interface to last.fm and other api-compatible websites
 EAPI=7
 HOMEPAGE=https://github.com/pylast/pylast
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pylast/pylast/archive/3.3.0.tar.gz -> pylast-3.3.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9006a8adb39bbf3c6d48cb3606232894
+_md5_=94d27dc0dd898f5fafd89f92a6d3e3fe
diff --git a/metadata/md5-cache/dev-python/pymongo-3.11.0-r1 b/metadata/md5-cache/dev-python/pymongo-3.11.0-r1
new file mode 100644
index 000000000000..1b16bbaf41b6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymongo-3.11.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-db/mongodb-2.6.0 dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DESCRIPTION=Python driver for MongoDB
+EAPI=7
+HOMEPAGE=https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/
+IUSE=doc kerberos test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm64 ~hppa x86
+LICENSE=Apache-2.0
+RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pymongo/pymongo-3.11.0.tar.gz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=39b8244387df65a0df82516594c19103
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.1.0 b/metadata/md5-cache/dev-python/pyopengl-3.1.0
deleted file mode 100644
index 148e1c184bfa..000000000000
--- a/metadata/md5-cache/dev-python/pyopengl-3.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) 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[tk?] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?] ) >=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(-)] >=dev-python/setuptools-42.0.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(-)]
-DESCRIPTION=Python OpenGL bindings
-EAPI=5
-HOMEPAGE=http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/
-IUSE=tk python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) python_targets_python3_6? ( dev-lang/python:3.6[tk?] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?] ) >=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/P/PyOpenGL/PyOpenGL-3.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=02e9efbde1827057527b80cf5833aa76
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.1.0-r1 b/metadata/md5-cache/dev-python/pyopengl-3.1.0-r1
new file mode 100644
index 000000000000..8ccfad6d6408
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopengl-3.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) 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[tk?] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?] ) >=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/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Python OpenGL bindings
+EAPI=5
+HOMEPAGE=http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/
+IUSE=tk python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) python_targets_python3_6? ( dev-lang/python:3.6[tk?] ) python_targets_python3_7? ( dev-lang/python:3.7[tk?] ) >=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/P/PyOpenGL/PyOpenGL-3.1.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c1356f2bf3c7dd504d664c83a75659bd
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.4.7 b/metadata/md5-cache/dev-python/pyparsing-2.4.7
deleted file mode 100644
index d1730a98e873..000000000000
--- a/metadata/md5-cache/dev-python/pyparsing-2.4.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Easy-to-use Python module for text parsing
-EAPI=7
-HOMEPAGE=https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/
-IUSE=examples python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/pyparsing/pyparsing/archive/pyparsing_2.4.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ca00d9ebecdbe4b9a45e4c28f4b9545c
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1 b/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
new file mode 100644
index 000000000000..2563a3eef67a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyparsing-2.4.7-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Easy-to-use Python module for text parsing
+EAPI=7
+HOMEPAGE=https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/
+IUSE=examples python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/pyparsing/pyparsing/archive/pyparsing_2.4.7.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e8e0198e0dd565bf5b4ac73e5d8ca812
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.2 b/metadata/md5-cache/dev-python/pypy-7.3.2
new file mode 100644
index 000000000000..ac3d4a94c1e5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-7.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=|| ( dev-python/pypy-exe:7.3.2[bzip2?,ncurses?] dev-python/pypy-exe-bin:7.3.2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
+DESCRIPTION=A fast, compliant alternative implementation of the Python language
+EAPI=7
+HOMEPAGE=https://pypy.org/
+IUSE=bzip2 gdbm +jit libressl ncurses sqlite tk
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( dev-python/pypy-exe:7.3.2[bzip2?,ncurses?] dev-python/pypy-exe-bin:7.3.2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
+SLOT=0/73
+SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.2-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18-r1.tar.xz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b0da21a3d3b47a066f71e3f0bd02d12b
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.2_rc2-r1 b/metadata/md5-cache/dev-python/pypy-7.3.2_rc2-r1
deleted file mode 100644
index e71374e1e8ba..000000000000
--- a/metadata/md5-cache/dev-python/pypy-7.3.2_rc2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=|| ( dev-python/pypy-exe:7.3.2_rc2[bzip2?,ncurses?] dev-python/pypy-exe-bin:7.3.2_rc2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
-DESCRIPTION=A fast, compliant alternative implementation of the Python language
-EAPI=7
-HOMEPAGE=https://pypy.org/
-IUSE=bzip2 gdbm +jit libressl ncurses sqlite tk
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=|| ( dev-python/pypy-exe:7.3.2_rc2[bzip2?,ncurses?] dev-python/pypy-exe-bin:7.3.2_rc2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
-SLOT=0/73
-SRC_URI=https://downloads.python.org/pypy/pypy2.7-v7.3.2rc2-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18-r1.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=725f8163397b739894f28d5f32cb8602
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.2 b/metadata/md5-cache/dev-python/pypy-exe-7.3.2
new file mode 100644
index 000000000000..c64d93ca55e7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-exe-7.3.2
@@ -0,0 +1,14 @@
+BDEPEND=!low-memory? ( || ( dev-python/pypy dev-lang/python:2.7 ) )
+DEFINED_PHASES=compile configure install pretend setup
+DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.2
+DESCRIPTION=PyPy executable (build from source)
+EAPI=7
+HOMEPAGE=https://pypy.org/
+IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.2
+SLOT=7.3.2
+SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.2-src.tar.bz2
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4faaeb49e8283690b3e9973cb177027d
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.2_rc2 b/metadata/md5-cache/dev-python/pypy-exe-7.3.2_rc2
deleted file mode 100644
index a6a250bdbd7f..000000000000
--- a/metadata/md5-cache/dev-python/pypy-exe-7.3.2_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!low-memory? ( || ( dev-python/pypy ( dev-lang/python:2.7 dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DEFINED_PHASES=compile configure install pretend setup
-DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.2_rc2
-DESCRIPTION=PyPy executable (build from source)
-EAPI=7
-HOMEPAGE=https://pypy.org/
-IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.2_rc2
-SLOT=7.3.2_rc2
-SRC_URI=https://downloads.python.org/pypy/pypy2.7-v7.3.2rc2-src.tar.bz2
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=19f9f00bddbd2ea36c1f62b7b4804d5f
diff --git a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.2 b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.2
new file mode 100644
index 000000000000..5fe6637dc4e0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy executable (pre-built version)
+EAPI=7
+HOMEPAGE=https://pypy.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0/1 dev-libs/libffi:0/7 virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.2
+SLOT=7.3.2
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/pypy-exe-7.3.2-1.xpak -> pypy-exe-7.3.2-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/pypy-exe-7.3.2-1.xpak -> pypy-exe-7.3.2-1.x86.xpak )
+_eclasses_=pax-utils	a41d1fd1c111289ffa04490de6ee79d7
+_md5_=387bc9886fa41abb4f67e163de746ebc
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.2 b/metadata/md5-cache/dev-python/pypy3-7.3.2
new file mode 100644
index 000000000000..8a4da08542f4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( dev-python/pypy3-exe:7.3.2[bzip2?,ncurses?] dev-python/pypy3-exe-bin:7.3.2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0 test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) !!dev-python/pytest-forked )
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.6) language
+EAPI=7
+HOMEPAGE=https://pypy.org/
+IUSE=bzip2 gdbm +jit libressl ncurses sqlite test tk
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( dev-python/pypy3-exe:7.3.2[bzip2?,ncurses?] dev-python/pypy3-exe-bin:7.3.2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
+RESTRICT=!test? ( test )
+SLOT=0/pypy36-pp73
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.6-v7.3.2-src.tar.bz2
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a2cd038542111d6426975a9b020227f7
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.2_p37 b/metadata/md5-cache/dev-python/pypy3-7.3.2_p37
new file mode 100644
index 000000000000..36064e9c87f3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.2_p37
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( dev-python/pypy3-exe:7.3.2_p37[bzip2?,ncurses?] dev-python/pypy3-exe-bin:7.3.2_p37 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0 test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) !!dev-python/pytest-forked )
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.7) language
+EAPI=7
+HOMEPAGE=https://pypy.org/
+IUSE=bzip2 gdbm +jit libressl ncurses sqlite test tk
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( dev-python/pypy3-exe:7.3.2_p37[bzip2?,ncurses?] dev-python/pypy3-exe-bin:7.3.2_p37 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
+RESTRICT=test
+SLOT=0/pypy37-pp73
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.2-src.tar.bz2
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9e03043368ce957ef7e597cd4c9f2652
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.2_rc2-r1 b/metadata/md5-cache/dev-python/pypy3-7.3.2_rc2-r1
deleted file mode 100644
index 8832ab373e86..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-7.3.2_rc2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( dev-python/pypy3-exe:7.3.2_rc2[bzip2?,ncurses?] dev-python/pypy3-exe-bin:7.3.2_rc2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0 test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) !!dev-python/pytest-forked )
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.6) language
-EAPI=7
-HOMEPAGE=https://pypy.org/
-IUSE=bzip2 gdbm +jit libressl ncurses sqlite test tk
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=|| ( dev-python/pypy3-exe:7.3.2_rc2[bzip2?,ncurses?] dev-python/pypy3-exe-bin:7.3.2_rc2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
-RESTRICT=!test? ( test )
-SLOT=0/pypy36-pp73
-SRC_URI=https://downloads.python.org/pypy/pypy3.6-v7.3.2rc2-src.tar.bz2
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=315426807a9f9ac9534684dcb78670d9
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.2_rc2_p37-r1 b/metadata/md5-cache/dev-python/pypy3-7.3.2_rc2_p37-r1
deleted file mode 100644
index 1e246a31458e..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-7.3.2_rc2_p37-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( dev-python/pypy3-exe:7.3.2_rc2_p37[bzip2?,ncurses?] dev-python/pypy3-exe-bin:7.3.2_rc2_p37 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0 test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) !!dev-python/pytest-forked )
-DESCRIPTION=A fast, compliant alternative implementation of the Python (3.7) language
-EAPI=7
-HOMEPAGE=https://pypy.org/
-IUSE=bzip2 gdbm +jit libressl ncurses sqlite test tk
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=|| ( dev-python/pypy3-exe:7.3.2_rc2_p37[bzip2?,ncurses?] dev-python/pypy3-exe-bin:7.3.2_rc2_p37 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
-RESTRICT=test
-SLOT=0/pypy37-pp73
-SRC_URI=https://downloads.python.org/pypy/pypy3.7-v7.3.2rc2-src.tar.bz2
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e0f7b51be0b3c71b882b39ded149e4cf
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.2 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.2
new file mode 100644
index 000000000000..17ec3bee8357
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-7.3.2
@@ -0,0 +1,14 @@
+BDEPEND=low-memory? ( dev-python/pypy ) !low-memory? ( || ( dev-python/pypy dev-lang/python:2.7 ) )
+DEFINED_PHASES=compile configure install pretend setup
+DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.2
+DESCRIPTION=PyPy3 executable (build from source)
+EAPI=7
+HOMEPAGE=https://pypy.org/
+IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.2
+SLOT=7.3.2
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.6-v7.3.2-src.tar.bz2
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=85c161d4bbf7ad742ebeee50a4130efd
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.2_p37 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.2_p37
new file mode 100644
index 000000000000..f515c4c04f26
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-7.3.2_p37
@@ -0,0 +1,14 @@
+BDEPEND=low-memory? ( dev-python/pypy ) !low-memory? ( || ( dev-python/pypy dev-lang/python:2.7 ) )
+DEFINED_PHASES=compile configure install pretend setup
+DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.2_p37
+DESCRIPTION=PyPy3 executable (build from source)
+EAPI=7
+HOMEPAGE=https://pypy.org/
+IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.2_p37
+SLOT=7.3.2_p37
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.7-v7.3.2-src.tar.bz2
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ad2cade3de3ca9379cf35b7acc9f0181
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.2_rc2 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.2_rc2
deleted file mode 100644
index 060540736a5a..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-exe-7.3.2_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=low-memory? ( dev-python/pypy ) !low-memory? ( || ( dev-python/pypy ( dev-lang/python:2.7 dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DEFINED_PHASES=compile configure install pretend setup
-DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.2_rc2
-DESCRIPTION=PyPy3 executable (build from source)
-EAPI=7
-HOMEPAGE=https://pypy.org/
-IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.2_rc2
-SLOT=7.3.2_rc2
-SRC_URI=https://downloads.python.org/pypy/pypy3.6-v7.3.2rc2-src.tar.bz2
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=51f3c6cdd56b22556b00857b8b00cbb9
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.2_rc2_p37 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.2_rc2_p37
deleted file mode 100644
index 83ff8cf6d618..000000000000
--- a/metadata/md5-cache/dev-python/pypy3-exe-7.3.2_rc2_p37
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=low-memory? ( dev-python/pypy ) !low-memory? ( || ( dev-python/pypy ( dev-lang/python:2.7 dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DEFINED_PHASES=compile configure install pretend setup
-DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.2_rc2_p37
-DESCRIPTION=PyPy3 executable (build from source)
-EAPI=7
-HOMEPAGE=https://pypy.org/
-IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
-KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.2_rc2_p37
-SLOT=7.3.2_rc2_p37
-SRC_URI=https://downloads.python.org/pypy/pypy3.7-v7.3.2rc2-src.tar.bz2
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=977f8aa70e594337652dc36e7bcc1609
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.2 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.2
new file mode 100644
index 000000000000..28be48733392
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy3 executable (pre-built version)
+EAPI=7
+HOMEPAGE=https://pypy.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0/1 dev-libs/libffi:0/7 virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.2
+SLOT=7.3.2
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.2-1.xpak -> pypy3-exe-7.3.2-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.2-1.xpak -> pypy3-exe-7.3.2-1.x86.xpak )
+_eclasses_=pax-utils	a41d1fd1c111289ffa04490de6ee79d7
+_md5_=7c1f8b5c23bfac8af9825465542a2de1
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.2_p37 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.2_p37
new file mode 100644
index 000000000000..fa78e1d82c0b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.2_p37
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy3 executable (pre-built version)
+EAPI=7
+HOMEPAGE=https://pypy.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0/1 dev-libs/libffi:0/7 virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.2_p37
+SLOT=7.3.2_p37
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-1.xpak -> pypy3-exe-7.3.2_p37-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-1.xpak -> pypy3-exe-7.3.2_p37-1.x86.xpak )
+_eclasses_=pax-utils	a41d1fd1c111289ffa04490de6ee79d7
+_md5_=c5cfda5ec3a0db071c8a3148cff9a796
diff --git a/metadata/md5-cache/dev-python/pyside2-5.14.2 b/metadata/md5-cache/dev-python/pyside2-5.14.2
index 3a154744a869..262b9b6f8a32 100644
--- a/metadata/md5-cache/dev-python/pyside2-5.14.2
+++ b/metadata/md5-cache/dev-python/pyside2-5.14.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-5.14.2-src/pyside-setup-opensource-src-5.14.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dcfbb5cf440700f885ecb26120bef5b5
diff --git a/metadata/md5-cache/dev-python/pytest-6.0.1 b/metadata/md5-cache/dev-python/pytest-6.0.1
index 98a0357f0f2e..8321d71efb6e 100644
--- a/metadata/md5-cache/dev-python/pytest-6.0.1
+++ b/metadata/md5-cache/dev-python/pytest-6.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=7
 HOMEPAGE=https://pytest.org/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pluggy-1 >=dev-python/py-1.8.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-6.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5ca9188a0d01a650780c5fe92ece43f0
+_md5_=bdbcc659b642f8f36b07eff34410dbc4
diff --git a/metadata/md5-cache/dev-python/pytest-6.0.2 b/metadata/md5-cache/dev-python/pytest-6.0.2
index 6574a338489a..d7f20bf203fc 100644
--- a/metadata/md5-cache/dev-python/pytest-6.0.2
+++ b/metadata/md5-cache/dev-python/pytest-6.0.2
@@ -5,7 +5,7 @@ DESCRIPTION=Simple powerful testing with Python
 EAPI=7
 HOMEPAGE=https://pytest.org/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pluggy-1 >=dev-python/py-1.8.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-6.0.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d73a2db8e91f13fd1c5ab4d8a37ddc19
+_md5_=2b4accc30ca2858899be243e621e45c0
diff --git a/metadata/md5-cache/dev-python/pytest-6.1.0 b/metadata/md5-cache/dev-python/pytest-6.1.0
new file mode 100644
index 000000000000..79d67e7986db
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-6.1.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pluggy-1 >=dev-python/py-1.8.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/argcomplete[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !!dev-python/flaky )
+DESCRIPTION=Simple powerful testing with Python
+EAPI=7
+HOMEPAGE=https://pytest.org/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/attrs-17.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pluggy-1 >=dev-python/py-1.8.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest/pytest-6.1.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d73a2db8e91f13fd1c5ab4d8a37ddc19
diff --git a/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1 b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
index d37a58201cf7..9606ef3e0fd2 100644
--- a/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-aiohttp-0.3.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=pytest plugin for aiohttp support
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/pytest-aiohttp/
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pytest-5.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/aiohttp-0.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-aiohttp/pytest-aiohttp-0.3.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ed8db7beb40f5c036ad14b73c2f9ff43
+_md5_=566dd454de7879a6985d9ae2a9e6cecd
diff --git a/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2 b/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
index 1fc78a2e2c80..465fa3b05a8d 100644
--- a/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
+++ b/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=Easily freeze time in pytest test + fixtures
 EAPI=7
 HOMEPAGE=https://github.com/ktosiek/pytest-freezegun
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ktosiek/pytest-freezegun/archive/0.4.2.tar.gz -> pytest-freezegun-0.4.2.gh.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4e2898090de1130b7cc604352d6327fc
+_md5_=9355530221e81b30d38f4a45ba1c44e9
diff --git a/metadata/md5-cache/dev-python/pytest-services-2.2.0 b/metadata/md5-cache/dev-python/pytest-services-2.2.0
new file mode 100644
index 000000000000..8670a0a3adc8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-services-2.2.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pylibmc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] x11-base/xorg-server[xvfb] net-misc/memcached !dev-python/pytest-salt ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of fixtures and utility functions to run service processes for pytest
+EAPI=7
+HOMEPAGE=https://github.com/pytest-dev/pytest-services
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zc-lockfile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pytest-dev/pytest-services/archive/2.2.0.tar.gz -> pytest-services-2.2.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7c101d459607010f1b3e708ccc77865e
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.1.0 b/metadata/md5-cache/dev-python/pytest-xdist-2.1.0
index 97591e8f2855..96a544e64f3e 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-2.1.0
+++ b/metadata/md5-cache/dev-python/pytest-xdist-2.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Distributed testing and loop-on-failing modes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-2.1.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3c683ee0f6df6b158994939309aea914
+_md5_=7867276c6c5d2397ce4e8229f8a857c8
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.14.0 b/metadata/md5-cache/dev-python/pytest-xprocess-0.14.0
new file mode 100644
index 000000000000..16841d8b7eda
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.14.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Manage external processes across test runs
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.14.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3ab93424b700e9c35f2af31ee6e0c26a
diff --git a/metadata/md5-cache/dev-python/python-caja-1.24.0-r2 b/metadata/md5-cache/dev-python/python-caja-1.24.0-r2
new file mode 100644
index 000000000000..31cc4e6530fd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-caja-1.24.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/glib-2.50:2 python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=mate-base/caja-1.17.1[introspection] >=x11-libs/gtk+-3.22:3 dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=Python bindings for the Caja file manager
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=doc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/glib-2.50:2 python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=mate-base/caja-1.17.1[introspection] >=x11-libs/gtk+-3.22:3
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/python-caja-1.24.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ed6c0851f599153614bd6b46439fbce7
diff --git a/metadata/md5-cache/dev-python/python-efl-1.25.0 b/metadata/md5-cache/dev-python/python-efl-1.25.0
new file mode 100644
index 000000000000..67ec1ab6a324
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-efl-1.25.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] media-gfx/graphviz ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-libs/efl-1.25* dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Python bindings for Enlightenment Foundation Libraries
+EAPI=7
+HOMEPAGE=https://phab.enlightenment.org/w/projects/python_bindings_for_efl/
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-3 LGPL-3 )
+RDEPEND==dev-libs/efl-1.25* dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/bindings/python/python-efl-1.25.0.tar.xz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=66de933ee70b478113bd3242302d9b7c
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.34.1 b/metadata/md5-cache/dev-python/python-language-server-0.34.1
index 9841412141de..15a0aa161588 100644
--- a/metadata/md5-cache/dev-python/python-language-server-0.34.1
+++ b/metadata/md5-cache/dev-python/python-language-server-0.34.1
@@ -5,7 +5,7 @@ DESCRIPTION=An implementation of the Language Server Protocol for Python
 EAPI=7
 HOMEPAGE=https://github.com/palantir/python-language-server
 IUSE=test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jedi-0.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/jedi-0.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pluggy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-jsonrpc-server-0.3.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-python/ujson-1.35[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.34.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=acddfeae017fd364edccceb45e059840
+_md5_=98bb5be55f895b99dbefd2b6a1ebd2b9
diff --git a/metadata/md5-cache/dev-python/python-memcached-1.59-r1 b/metadata/md5-cache/dev-python/python-memcached-1.59-r1
new file mode 100644
index 000000000000..c558a6b6af06
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-memcached-1.59-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/memcached ) test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Pure python memcached client
+EAPI=7
+HOMEPAGE=https://www.tummy.com/Community/software/python-memcached/ https://pypi.org/project/python-memcached/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=OSL-2.0
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/linsomniac/python-memcached/archive/1.59.tar.gz -> python-memcached-1.59-gh.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=76ba84ef5364075b67a732d1859d8253
diff --git a/metadata/md5-cache/dev-python/pytools-2020.4 b/metadata/md5-cache/dev-python/pytools-2020.4
index a3ef71b3b1bd..8f79a0ec7156 100644
--- a/metadata/md5-cache/dev-python/pytools-2020.4
+++ b/metadata/md5-cache/dev-python/pytools-2020.4
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of tools missing from the Python standard library
 EAPI=7
 HOMEPAGE=https://mathema.tician.de/software/pytools/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=>=dev-python/appdirs-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/decorator-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytools/pytools-2020.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ef8e98eba11ccfd488d57e94e5ea120d
+_md5_=1b719d686637165ed1213204ac464c18
diff --git a/metadata/md5-cache/dev-python/pywavelets-1.1.1 b/metadata/md5-cache/dev-python/pywavelets-1.1.1
new file mode 100644
index 000000000000..16aeb494adad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pywavelets-1.1.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpydoc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpydoc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Discrete Wavelet Transforms in Python
+EAPI=7
+HOMEPAGE=https://pywavelets.readthedocs.io/en/latest/ https://github.com/PyWavelets/pywt
+IUSE=doc examples test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpydoc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyWavelets/PyWavelets-1.1.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=676eab2d1d5042fcd9f6e65389bf8eb4
diff --git a/metadata/md5-cache/dev-python/pyyaml-5.3.1-r1 b/metadata/md5-cache/dev-python/pyyaml-5.3.1-r1
new file mode 100644
index 000000000000..454cea60d3b0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyyaml-5.3.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( libyaml? ( dev-libs/libyaml:= ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=libyaml? ( dev-libs/libyaml:= ) libyaml? ( python_targets_python3_6? ( dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) )
+DESCRIPTION=YAML parser and emitter for Python
+EAPI=7
+HOMEPAGE=https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/ https://github.com/yaml/pyyaml
+IUSE=examples +libyaml test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=libyaml? ( dev-libs/libyaml:= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/yaml/pyyaml/archive/5.3.1.tar.gz -> pyyaml-5.3.1.gh.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=23c46fab131481f32ae9bb0dd5e9ca7c
diff --git a/metadata/md5-cache/dev-python/qtsass-0.3.0 b/metadata/md5-cache/dev-python/qtsass-0.3.0
index 9ee292511419..1e22b14d33cc 100644
--- a/metadata/md5-cache/dev-python/qtsass-0.3.0
+++ b/metadata/md5-cache/dev-python/qtsass-0.3.0
@@ -5,7 +5,7 @@ DESCRIPTION=Compile SASS files to Qt stylesheets
 EAPI=7
 HOMEPAGE=https://github.com/spyder-ide/qtsass
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/qtsass/archive/v0.3.0.tar.gz -> qtsass-0.3.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=435fcd3fd685da05bc14172ea4ca6736
+_md5_=89e9dacd824be267527797ed0d43719f
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.48 b/metadata/md5-cache/dev-python/reportlab-3.5.48
index 0e3c0db84b6c..38ba8d024c58 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.5.48
+++ b/metadata/md5-cache/dev-python/reportlab-3.5.48
@@ -5,7 +5,7 @@ DESCRIPTION=Tools for generating printable PDF documents from any data source
 EAPI=7
 HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
 IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=media-libs/freetype media-libs/libart_lgpl:= sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/reportlab/reportlab-3.5.48.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=086835a0d89e78133d36bebe49b5a198
+_md5_=29958119b14844cf392034e4f8aabafb
diff --git a/metadata/md5-cache/dev-python/responses-0.12.0 b/metadata/md5-cache/dev-python/responses-0.12.0
index 6e040229eb6d..4f774a5ff0fb 100644
--- a/metadata/md5-cache/dev-python/responses-0.12.0
+++ b/metadata/md5-cache/dev-python/responses-0.12.0
@@ -4,7 +4,7 @@ DESCRIPTION=Utility for mocking out the Python Requests library
 EAPI=7
 HOMEPAGE=https://github.com/getsentry/responses
 IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/responses/responses-0.12.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2683b994008910dc1071d0d34c25f8e6
+_md5_=4dcf8a9d53f49261b491bd3d471a1995
diff --git a/metadata/md5-cache/dev-python/retrying-1.3.3 b/metadata/md5-cache/dev-python/retrying-1.3.3
index 33c17f6f2641..bd4e2d2cb0a5 100644
--- a/metadata/md5-cache/dev-python/retrying-1.3.3
+++ b/metadata/md5-cache/dev-python/retrying-1.3.3
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( >=dev-python/six-1.7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=General-purpose retrying library
 EAPI=7
 HOMEPAGE=https://github.com/rholder/retrying
-IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/six-1.7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/six-1.7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/r/retrying/retrying-1.3.3.tar.gz
+SRC_URI=https://github.com/rholder/retrying/archive/v1.3.3.tar.gz -> retrying-1.3.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8e4253c787a5439d2cdf90de76a5502d
+_md5_=74d6ceb07391d24991bf94fcaedd0015
diff --git a/metadata/md5-cache/dev-python/rply-0.7.7 b/metadata/md5-cache/dev-python/rply-0.7.7
deleted file mode 100644
index 7315807da112..000000000000
--- a/metadata/md5-cache/dev-python/rply-0.7.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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(-)] >=dev-python/setuptools-42.0.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=dev-python/appdirs[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(-)] test? ( dev-python/py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Pure python parser generator that also works with RPython
-EAPI=7
-HOMEPAGE=https://github.com/alex/rply
-IUSE=test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=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? ( test )
-SLOT=0
-SRC_URI=https://github.com/alex/rply/archive/v0.7.7.tar.gz -> rply-0.7.7.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0589307183d7d8e16dd3590cfe3ab90d
diff --git a/metadata/md5-cache/dev-python/rply-0.7.7-r1 b/metadata/md5-cache/dev-python/rply-0.7.7-r1
new file mode 100644
index 000000000000..51d34ce9e93c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rply-0.7.7-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/appdirs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Pure python parser generator that also works with RPython
+EAPI=7
+HOMEPAGE=https://github.com/alex/rply
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/alex/rply/archive/v0.7.7.tar.gz -> rply-0.7.7.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4de641989a05a75ff1ea4bd22ffadc65
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.16.12 b/metadata/md5-cache/dev-python/ruamel-yaml-0.16.12
deleted file mode 100644
index 6ad9ac1c2ef7..000000000000
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.16.12
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=YAML parser/emitter that supports roundtrip comment preservation
-EAPI=7
-HOMEPAGE=https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/p/ruamel-yaml
-IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/ruamel-yaml-clib[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/r/ruamel.yaml/ruamel.yaml-0.16.12.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=552e0e72e11d0a58a1ba463abba17764
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.16.12-r1 b/metadata/md5-cache/dev-python/ruamel-yaml-0.16.12-r1
new file mode 100644
index 000000000000..cc9f73473bf9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.16.12-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=YAML parser/emitter that supports roundtrip comment preservation
+EAPI=7
+HOMEPAGE=https://pypi.org/project/ruamel.yaml/ https://sourceforge.net/p/ruamel-yaml
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/ruamel-yaml-clib[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/r/ruamel.yaml/ruamel.yaml-0.16.12.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d577df8ea1edcd4133fafcd6a194679b
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2 b/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2
deleted file mode 100644
index 6c4705c83576..000000000000
--- a/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=C-based reader/scanner and emitter for dev-python/ruamel-yaml
-EAPI=7
-HOMEPAGE=https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib
-IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=!<dev-python/ruamel-yaml-0.16.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/r/ruamel.yaml.clib/ruamel.yaml.clib-0.2.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0800498d13bcf8cdca103043e61d7a19
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2-r1 b/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2-r1
new file mode 100644
index 000000000000..3aa84bd1fb71
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=C-based reader/scanner and emitter for dev-python/ruamel-yaml
+EAPI=7
+HOMEPAGE=https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=!<dev-python/ruamel-yaml-0.16.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/r/ruamel.yaml.clib/ruamel.yaml.clib-0.2.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=67f17e7d7a6cb890b10e9f422e849aaa
diff --git a/metadata/md5-cache/dev-python/selenium-3.141.0-r1 b/metadata/md5-cache/dev-python/selenium-3.141.0-r1
index 25a7cbc2c9da..0210eb22ab89 100644
--- a/metadata/md5-cache/dev-python/selenium-3.141.0-r1
+++ b/metadata/md5-cache/dev-python/selenium-3.141.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python language binding for Selenium Remote Control
 EAPI=7
 HOMEPAGE=https://www.seleniumhq.org
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/selenium/selenium-3.141.0.tar.gz test? ( https://github.com/SeleniumHQ/selenium/archive/selenium-3.141.0.tar.gz -> selenium-3.141.0.gh.tar.gz )
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f2cf46d4cbf7657c78c282091c040dc3
+_md5_=0da67c2e670bfda08f7c7ac8823e79a1
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-0.18.0 b/metadata/md5-cache/dev-python/sentry-sdk-0.18.0
new file mode 100644
index 000000000000..c40b6e62592f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sentry-sdk-0.18.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/asttokens[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/dnspython-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/executing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/eventlet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/fakeredis[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask-login[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/gevent[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyrsistent[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-aiohttp[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-forked[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-localserver[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/aiocontextvars[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/contextvars[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) test? ( dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python client for Sentry
+EAPI=7
+HOMEPAGE=https://getsentry.com https://pypi.org/project/sentry-sdk/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=PSF-2
+RDEPEND=dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/certifi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/getsentry/sentry-python/archive/0.18.0.tar.gz -> sentry-sdk-0.18.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3babb363e916a0999f8a4e4864386872
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1 b/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
index beb70ded61e8..cc4197d54386 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Allow customization of the process title
 EAPI=7
 HOMEPAGE=https://github.com/dvarrazzo/py-setproctitle
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.10.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4229b1b6671910c097814ea292c56d44
+_md5_=11888d077e2c043399e026c9e7a598a4
diff --git a/metadata/md5-cache/dev-python/setuptools-46.4.0-r3 b/metadata/md5-cache/dev-python/setuptools-46.4.0-r3
index ebb6bd12d7da..38dfeb7d5c5a 100644
--- a/metadata/md5-cache/dev-python/setuptools-46.4.0-r3
+++ b/metadata/md5-cache/dev-python/setuptools-46.4.0-r3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-46.4.0.zip
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=92136f9ded9e670a511c883c4e7d979a
+_md5_=27576e8719982258e3cba994d7ce21a6
diff --git a/metadata/md5-cache/dev-python/setuptools-50.3.0 b/metadata/md5-cache/dev-python/setuptools-50.3.0
index 092a84eb7043..8fda2857eefc 100644
--- a/metadata/md5-cache/dev-python/setuptools-50.3.0
+++ b/metadata/md5-cache/dev-python/setuptools-50.3.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-50.3.0.zip
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4de23a02b15a3ff63b27f762cbb80397
+_md5_=5bc36989366bb234596b0939645d470f
diff --git a/metadata/md5-cache/dev-python/simplejson-3.17.2 b/metadata/md5-cache/dev-python/simplejson-3.17.2
deleted file mode 100644
index 9394d266b80e..000000000000
--- a/metadata/md5-cache/dev-python/simplejson-3.17.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
-EAPI=7
-HOMEPAGE=https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=|| ( MIT AFL-2.1 )
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=mirror://pypi/s/simplejson/simplejson-3.17.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f81fd64e1ec6f10b098f06887f61ed38
diff --git a/metadata/md5-cache/dev-python/simplejson-3.17.2-r1 b/metadata/md5-cache/dev-python/simplejson-3.17.2-r1
new file mode 100644
index 000000000000..197a806369d9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/simplejson-3.17.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
+EAPI=7
+HOMEPAGE=https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=|| ( MIT AFL-2.1 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/s/simplejson/simplejson-3.17.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0899af82c2b30e21e7519e74e4d00663
diff --git a/metadata/md5-cache/dev-python/six-1.15.0 b/metadata/md5-cache/dev-python/six-1.15.0
deleted file mode 100644
index b0ade6377561..000000000000
--- a/metadata/md5-cache/dev-python/six-1.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( python_targets_pypy3? ( dev-python/pytest[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-python/pytest[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/pytest[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/pytest[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/pytest[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( dev-python/sphinx ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python 2 and 3 compatibility library
-EAPI=7
-HOMEPAGE=https://github.com/benjaminp/six https://pypi.org/project/six/
-IUSE=doc test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/six/six-1.15.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e7ab724a9bab840f55c387c4e7835669
diff --git a/metadata/md5-cache/dev-python/six-1.15.0-r1 b/metadata/md5-cache/dev-python/six-1.15.0-r1
new file mode 100644
index 000000000000..64ed321ef1b9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/six-1.15.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python 2 and 3 compatibility library
+EAPI=7
+HOMEPAGE=https://github.com/benjaminp/six https://pypi.org/project/six/
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/six/six-1.15.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9a002f4361438365c9c4df13c79fe8d3
diff --git a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6 b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
index a7eea2a48bc1..d81cf3915bc8 100644
--- a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
+++ b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
@@ -5,11 +5,11 @@ DESCRIPTION=Sphinx theme for aiohttp
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/aiohttp-theme
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp-theme/aiohttp-theme-0.1.6.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=99d59c210e6fb372f4507e9292e7ed6a
+_md5_=bf9818617cc83bbdc5d49f1c2d434387
diff --git a/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1 b/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
index d7dda81f2d13..479f8ec768be 100644
--- a/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Testing utility classes and functions for Sphinx extensions
 EAPI=7
 HOMEPAGE=https://github.com/sphinx-doc/sphinx-testing
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-testing/sphinx-testing-1.0.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=66b624cc781ae79da82f6e8a1790a5eb
+_md5_=ff09fec30a923a011e077eccb56e6461
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0 b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
index c1b61f0cd335..d03c25221a47 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=A sphinx extension for embedding block diagrams using blockdiag
 EAPI=7
 HOMEPAGE=https://github.com/blockdiag/sphinxcontrib-blockdiag
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/sphinx-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/blockdiag-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/blockdiag/sphinxcontrib-blockdiag/archive/2.0.0.tar.gz -> sphinxcontrib-blockdiag-2.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f045a7c18dce3fd9f3bde5e1b083841
+_md5_=d69fd09bd7e052dd66cc2181542903af
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4 b/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
index 2951a0dd96a9..fb420a9cbc08 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=News Feed extension for Sphinx
 EAPI=6
 HOMEPAGE=https://github.com/prometheusresearch/sphinxcontrib-newsfeed
 IUSE=examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f091034a6998dd28a540545b86d26cd3
+_md5_=b83409739f57882e02dc465b869b90be
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.3.0 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.3.0
index 7898ca4c9eee..d1aea386d36a 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.3.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-5.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=Sphinx spelling extension
 EAPI=7
 HOMEPAGE=https://github.com/sphinx-contrib/spelling
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_6? ( >=dev-python/importlib_metadata-1.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyenchant[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b1a807167fa246b0f10f288c411c8aae
+_md5_=f513cf81c2dffc79e9b6d4da4518e76d
diff --git a/metadata/md5-cache/dev-python/svg-path-4.0.2 b/metadata/md5-cache/dev-python/svg-path-4.0.2
new file mode 100644
index 000000000000..9e1a2bf5f76f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/svg-path-4.0.2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=SVG path objects and parser
+EAPI=7
+HOMEPAGE=https://github.com/regebro/svg.path
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/regebro/svg.path/archive/4.0.2.tar.gz -> svg.path-4.0.2.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0d3fdc182d7d49716f50ac9cbfb7120f
diff --git a/metadata/md5-cache/dev-python/tempora-4.0.0 b/metadata/md5-cache/dev-python/tempora-4.0.0
index 3db106fd7bbd..b9b20d2d9d91 100644
--- a/metadata/md5-cache/dev-python/tempora-4.0.0
+++ b/metadata/md5-cache/dev-python/tempora-4.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Objects and routines pertaining to date and time
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/tempora
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-4.0.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=108a181b8d8a99b7e339a5442e5cf1fb
+_md5_=7e2def3fd5ede19514ebba1c04832a83
diff --git a/metadata/md5-cache/dev-python/toolz-0.11.0 b/metadata/md5-cache/dev-python/toolz-0.11.0
new file mode 100644
index 000000000000..1a4edbe945ae
--- /dev/null
+++ b/metadata/md5-cache/dev-python/toolz-0.11.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/versioneer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=List processing tools and functional utilities
+EAPI=7
+HOMEPAGE=https://pypi.org/project/toolz/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/toolz/toolz-0.11.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f38a64a3cd7bce92274ed91e27951243
diff --git a/metadata/md5-cache/dev-python/toolz-0.11.1 b/metadata/md5-cache/dev-python/toolz-0.11.1
new file mode 100644
index 000000000000..6532319135d1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/toolz-0.11.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/versioneer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=List processing tools and functional utilities
+EAPI=7
+HOMEPAGE=https://pypi.org/project/toolz/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/toolz/toolz-0.11.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f38a64a3cd7bce92274ed91e27951243
diff --git a/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3 b/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
index 69c47304e5ef..1f86c94be965 100644
--- a/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
+++ b/metadata/md5-cache/dev-python/typing-extensions-3.7.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=Type Hint extensions from Python 3.8 backported
 EAPI=7
 HOMEPAGE=https://pypi.org/project/typing_extensions/ https://github.com/python/typing
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/t/typing_extensions/typing_extensions-3.7.4.3.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e261ffca34014cea85a6bb5ae95f6ff4
+_md5_=d2ba1d68dadc7612c596ecb67a08c60f
diff --git a/metadata/md5-cache/dev-python/uranium-4.7.0 b/metadata/md5-cache/dev-python/uranium-4.7.0
index 0c59ef83fcd7..f0ff19f555a5 100644
--- a/metadata/md5-cache/dev-python/uranium-4.7.0
+++ b/metadata/md5-cache/dev-python/uranium-4.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Uranium/archive/4.7.0.tar.gz -> uranium-4.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4707435d9392c578f33b1bb31345dc7
diff --git a/metadata/md5-cache/dev-python/verboselogs-1.7 b/metadata/md5-cache/dev-python/verboselogs-1.7
index 880c908e6b96..981e0cea0372 100644
--- a/metadata/md5-cache/dev-python/verboselogs-1.7
+++ b/metadata/md5-cache/dev-python/verboselogs-1.7
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Verbose logging for Python's logging module
 EAPI=7
 HOMEPAGE=https://pypi.org/project/verboselogs https://github.com/xolox/python-verboselogs
-IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/verboselogs/verboselogs-1.7.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c75bbba2aaf25db1dc33e5329b9c5346
+_md5_=e36e8e6beda62e905925f283104e68af
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.0.31-r1 b/metadata/md5-cache/dev-python/virtualenv-20.0.31-r1
index 4e83bb6b8553..18c832001422 100644
--- a/metadata/md5-cache/dev-python/virtualenv-20.0.31-r1
+++ b/metadata/md5-cache/dev-python/virtualenv-20.0.31-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Virtual Python Environment builder
 EAPI=7
 HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.0.31.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6999ef56ac8d8c3f072fbaf5354f9b32
+_md5_=71e8a62a05c90de33df0023307e10336
diff --git a/metadata/md5-cache/dev-python/websockify-0.9.0-r1 b/metadata/md5-cache/dev-python/websockify-0.9.0-r1
new file mode 100644
index 000000000000..d91de1f7faf3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/websockify-0.9.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/jwcrypto[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=WebSockets support for any application/server
+EAPI=7
+HOMEPAGE=https://github.com/kanaka/websockify
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kanaka/websockify/archive/v0.9.0.tar.gz -> websockify-0.9.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=cfd60ff5ab8243f6d9429ad1a58f77fa
diff --git a/metadata/md5-cache/dev-python/wxpython-3.0.2.0 b/metadata/md5-cache/dev-python/wxpython-3.0.2.0
deleted file mode 100644
index 89c62c023458..000000000000
--- a/metadata/md5-cache/dev-python/wxpython-3.0.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-lang/python-exec:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/wxGTK-3.0.2.0:3.0=[libnotify=,opengl?,tiff,X] dev-libs/glib:2 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg x11-libs/gtk+:2 x11-libs/pango[X] cairo? ( >=dev-python/pycairo-1.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig 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/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A blending of the wxWindows C++ class library with Python
-EAPI=5
-HOMEPAGE=http://www.wxpython.org/
-IUSE=cairo examples libnotify opengl python_targets_python2_7
-KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 ~sparc x86
-LICENSE=wxWinLL-3
-RDEPEND=dev-lang/python-exec:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/wxGTK-3.0.2.0:3.0=[libnotify=,opengl?,tiff,X] dev-libs/glib:2 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg x11-libs/gtk+:2 x11-libs/pango[X] cairo? ( >=dev-python/pycairo-1.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( dev-python/pyopengl[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=3.0
-SRC_URI=mirror://sourceforge/wxpython/wxPython-src-3.0.2.0.tar.bz2 examples? ( mirror://sourceforge/wxpython/wxPython-demo-3.0.2.0.tar.bz2 )
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=104f9bc69895cb607bd486278e148259
diff --git a/metadata/md5-cache/dev-python/wxpython-4.0.7 b/metadata/md5-cache/dev-python/wxpython-4.0.7
index e73298c70341..2bc9142a482c 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.0.7
+++ b/metadata/md5-cache/dev-python/wxpython-4.0.7
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0 app-doc/doxygen dev-python/pathlib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/appdirs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=A blending of the wxWindows C++ class library with Python
 EAPI=7
-HOMEPAGE=http://www.wxpython.org/
+HOMEPAGE=https://www.wxpython.org/
 IUSE=test webkit python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
 KEYWORDS=~alpha ~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=wxWinLL-3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=4.0
 SRC_URI=mirror://pypi/w/wxPython/wxPython-4.0.7.post2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=398e33da04aeb7efecd58431c5ac3dde
+_md5_=fa53d836204d95c635b6b9f00b7a2535
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-1.3.6 b/metadata/md5-cache/dev-python/xlsxwriter-1.3.6
new file mode 100644
index 000000000000..af0c65318b28
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xlsxwriter-1.3.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module for creating Excel XLSX files
+EAPI=7
+HOMEPAGE=https://github.com/jmcnamara/XlsxWriter
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_1.3.6.tar.gz -> xlsxwriter-1.3.6-tests.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3e851768c2abe357fd4b394d02351455
diff --git a/metadata/md5-cache/dev-python/yarl-1.4.2 b/metadata/md5-cache/dev-python/yarl-1.4.2
deleted file mode 100644
index fac661c86ceb..000000000000
--- a/metadata/md5-cache/dev-python/yarl-1.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/multidict-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Yet another URL library
-EAPI=7
-HOMEPAGE=https://github.com/aio-libs/yarl/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/multidict-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/y/yarl/yarl-1.4.2.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3043a4bad931295f6c982af795f14efb
diff --git a/metadata/md5-cache/dev-python/yarl-1.5.1 b/metadata/md5-cache/dev-python/yarl-1.5.1
index 71b8c18194bb..ee9ed9738900 100644
--- a/metadata/md5-cache/dev-python/yarl-1.5.1
+++ b/metadata/md5-cache/dev-python/yarl-1.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=Yet another URL library
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/yarl/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/multidict-4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/typing-extensions-3.7.4[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.5.1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d42a55b38a161aab6de00387b6e0bca7
+_md5_=7f803a0c26a9b24c1dd2ea66e444f3dc
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index d47eab97ff0a..2620ad321411 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.15.0 b/metadata/md5-cache/dev-qt/assistant-5.15.0
deleted file mode 100644
index c67e9444e438..000000000000
--- a/metadata/md5-cache/dev-qt/assistant-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtgui-5.15.0 ~dev-qt/qthelp-5.15.0 ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qtprintsupport-5.15.0 ~dev-qt/qtsql-5.15.0[sqlite] ~dev-qt/qtwidgets-5.15.0 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0:5= ~dev-qt/qtgui-5.15.0 ~dev-qt/qthelp-5.15.0 ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qtprintsupport-5.15.0 ~dev-qt/qtsql-5.15.0[sqlite] ~dev-qt/qtwidgets-5.15.0 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6fd9da51d550f2db33091aab640c60a2
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.0 b/metadata/md5-cache/dev-qt/designer-5.15.0
deleted file mode 100644
index 2ea0bab767d1..000000000000
--- a/metadata/md5-cache/dev-qt/designer-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtgui-5.15.0:5= ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qtprintsupport-5.15.0 ~dev-qt/qtwidgets-5.15.0 ~dev-qt/qtxml-5.15.0 declarative? ( ~dev-qt/qtdeclarative-5.15.0[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) test? ( ~dev-qt/qttest-5.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtgui-5.15.0:5= ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qtprintsupport-5.15.0 ~dev-qt/qtwidgets-5.15.0 ~dev-qt/qtxml-5.15.0 declarative? ( ~dev-qt/qtdeclarative-5.15.0[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c36240422c1a61bbd7517b4863ddd3c
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.0 b/metadata/md5-cache/dev-qt/linguist-5.15.0
deleted file mode 100644
index fd93ef4827e7..000000000000
--- a/metadata/md5-cache/dev-qt/linguist-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/designer-5.15.0 ~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtgui-5.15.0:5= ~dev-qt/qtprintsupport-5.15.0 ~dev-qt/qtwidgets-5.15.0 ~dev-qt/qtxml-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=Graphical tool for translating Qt applications
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/designer-5.15.0 ~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtgui-5.15.0:5= ~dev-qt/qtprintsupport-5.15.0 ~dev-qt/qtwidgets-5.15.0 ~dev-qt/qtxml-5.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=786da6968c99e18dbb2860e709c1e5e2
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.0 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.0
deleted file mode 100644
index fcb4d2312f34..000000000000
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtxml-5.15.0 qml? ( ~dev-qt/qtdeclarative-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtxml-5.15.0 qml? ( ~dev-qt/qtdeclarative-5.15.0 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6acdf55e181bbfb13b504fed3b398f1c
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.0 b/metadata/md5-cache/dev-qt/pixeltool-5.15.0
deleted file mode 100644
index 6c1abbe404c0..000000000000
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtgui-5.15.0:5= ~dev-qt/qtwidgets-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0:5= ~dev-qt/qtgui-5.15.0:5= ~dev-qt/qtwidgets-5.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a9e77e9497792eaf7a74f5e6940ce107
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.0 b/metadata/md5-cache/dev-qt/qdbus-5.15.0
deleted file mode 100644
index 1f44255cfe3d..000000000000
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdbus-5.15.0 ~dev-qt/qtxml-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 ~dev-qt/qtdbus-5.15.0 ~dev-qt/qtxml-5.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ea61874478565948df97642e1e6902f0
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.0 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.0
deleted file mode 100644
index 522bfda37c1b..000000000000
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdbus-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtwidgets-5.15.0 ~dev-qt/qtxml-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdbus-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtwidgets-5.15.0 ~dev-qt/qtxml-5.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91c0b5a80a91bd3fce97b3c7a0742f7e
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.0 b/metadata/md5-cache/dev-qt/qdoc-5.15.0
deleted file mode 100644
index d25961478bef..000000000000
--- a/metadata/md5-cache/dev-qt/qdoc-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0:5= sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0:5= sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.15.0 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=302e549f0fa322a32327fb9cc0c6b727
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.15.0_p202005140838 b/metadata/md5-cache/dev-qt/qt-docs-5.15.0_p202005140838
deleted file mode 100644
index a4c5c284b434..000000000000
--- a/metadata/md5-cache/dev-qt/qt-docs-5.15.0_p202005140838
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/p7zip media-libs/libpng:0
-DEFINED_PHASES=install prepare
-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 timeline virtualkeyboard webengine +sql +x11extras +declarative +svg +linguist +printsupport +imageformats +gui +webview +dbus +assistant +help +network +bluetooth +3d +xml +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=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qmake-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtcore-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdoc-documentation.7z charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtcharts/5.15.0-0-202005140838qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtdatavis3d/5.15.0-0-202005140838qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtnetworkauth/5.15.0-0-202005140838qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtscript/5.15.0-0-202005140838qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtscript/5.15.0-0-202005140838qtscripttools-documentation.7z ) timeline? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtquicktimeline/5.15.0-0-202005140838qtquicktimeline-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtvirtualkeyboard/5.15.0-0-202005140838qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtwebengine/5.15.0-0-202005140838qtwebengine-documentation.7z ) sql? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsql-documentation.7z ) x11extras? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtx11extras-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtqml-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtqmltest-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquick-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickdialogs-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickextras-documentation.7z ) svg? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsvg-documentation.7z ) linguist? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtlinguist-documentation.7z ) printsupport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtprintsupport-documentation.7z ) imageformats? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtimageformats-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgui-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtplatformheaders-documentation.7z ) webview? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebview-documentation.7z ) dbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdbus-documentation.7z ) assistant? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtassistant-documentation.7z ) help? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qthelp-documentation.7z ) network? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtnetwork-documentation.7z ) bluetooth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtbluetooth-documentation.7z ) 3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qt3d-documentation.7z ) xml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtxml-documentation.7z ) quickcontrols? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickcontrols1-documentation.7z ) qdoc? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qdoc-documentation.7z ) location? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtlocation-documentation.7z ) scxml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtscxml-documentation.7z ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtspeech-documentation.7z ) webchannel? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebchannel-documentation.7z ) quickcontrols2? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickcontrols-documentation.7z ) graphicaleffects? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgraphicaleffects-documentation.7z ) concurrent? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtconcurrent-documentation.7z ) sensors? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsensors-documentation.7z ) multimedia? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtmultimedia-documentation.7z ) websockets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebsockets-documentation.7z ) serialport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtserialport-documentation.7z ) xmlpatterns? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtxmlpatterns-documentation.7z ) wayland? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwaylandcompositor-documentation.7z ) serialbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtserialbus-documentation.7z ) test? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qttestlib-documentation.7z ) opengl? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtopengl-documentation.7z ) gamepad? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgamepad-documentation.7z ) positioning? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtpositioning-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdesigner-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtuitools-documentation.7z ) widgets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwidgets-documentation.7z )
-_md5_=d03ca3afea37dddbb727526f9205dd3e
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.0 b/metadata/md5-cache/dev-qt/qt3d-5.15.0
deleted file mode 100644
index 98ae65da96d0..000000000000
--- a/metadata/md5-cache/dev-qt/qt3d-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.15.0 ~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtnetwork-5.15.0 >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-5.15.0 ) qml? ( ~dev-qt/qtdeclarative-5.15.0[gles2-only=] ) test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=3D rendering module for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=gamepad gles2-only qml debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtconcurrent-5.15.0 ~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtnetwork-5.15.0 >=media-libs/assimp-4.0.0 gamepad? ( ~dev-qt/qtgamepad-5.15.0 ) qml? ( ~dev-qt/qtdeclarative-5.15.0[gles2-only=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qt3d-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=790a380abd934b1b6146371fefa7b6a6
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.0-r1 b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.0-r1
deleted file mode 100644
index 2344bfa5f462..000000000000
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtconcurrent-5.15.0 ~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtdbus-5.15.0 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.15.0 ) ~dev-qt/qtnetwork-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 ~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtdbus-5.15.0 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.15.0 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtconnectivity-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=423e27f950e80c48e53e1e27e150469a
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.15.0 b/metadata/md5-cache/dev-qt/qtcharts-5.15.0
deleted file mode 100644
index f1cc3a61a7ed..000000000000
--- a/metadata/md5-cache/dev-qt/qtcharts-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtwidgets-5.15.0 qml? ( ~dev-qt/qtdeclarative-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=Chart component library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtwidgets-5.15.0 qml? ( ~dev-qt/qtdeclarative-5.15.0 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtcharts-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f1fd48ad114334dcf2f18912adb4864
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.0 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.0
deleted file mode 100644
index 01b7724b1161..000000000000
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0:5= test? ( ~dev-qt/qttest-5.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0:5= dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7ce7cf8fcee60c90bf849ebe6db56982
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.0 b/metadata/md5-cache/dev-qt/qtcore-5.15.0
deleted file mode 100644
index ea455040904d..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup 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.15.0 )
-DESCRIPTION=Cross-platform application development framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=icu old-kernel systemd kernel_linux debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-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.15.0
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd1f43c122811b3c77f9b08c4f2ce136
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.0 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.0
deleted file mode 100644
index 556a3080cb83..000000000000
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0[gles2-only=] qml? ( ~dev-qt/qtdeclarative-5.15.0[gles2-only=] ) test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=3D data visualization library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2-only qml debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3
-RDEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0[gles2-only=] qml? ( ~dev-qt/qtdeclarative-5.15.0[gles2-only=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtdatavis3d-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5a3040684b90092a907ea8e91c3c1450
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.0 b/metadata/md5-cache/dev-qt/qtdbus-5.15.0
deleted file mode 100644
index 22c7007dacd7..000000000000
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0:5= >=sys-apps/dbus-1.4.20 test? ( ~dev-qt/qttest-5.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0:5= >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=63ee0f05705439853baf1a087ae1cb54
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.0-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.0-r1
deleted file mode 100644
index 32943b6e4fba..000000000000
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0:5=[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qttest-5.15.0 localstorage? ( ~dev-qt/qtsql-5.15.0 ) widgets? ( ~dev-qt/qtwidgets-5.15.0[gles2-only=] ) test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=The QML and Quick modules for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2-only +jit localstorage vulkan +widgets 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.15.0 ~dev-qt/qtgui-5.15.0:5=[gles2-only=,vulkan=] ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qttest-5.15.0 localstorage? ( ~dev-qt/qtsql-5.15.0 ) widgets? ( ~dev-qt/qtwidgets-5.15.0[gles2-only=] ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtdeclarative-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f2cb900756763186595ae8fbf8db6368
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.0 b/metadata/md5-cache/dev-qt/qtdiag-5.15.0
deleted file mode 100644
index 417a2d35360f..000000000000
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtgui-5.15.0:5= network? ( ~dev-qt/qtnetwork-5.15.0[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0:5= ~dev-qt/qtgui-5.15.0:5= network? ( ~dev-qt/qtnetwork-5.15.0[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.15.0 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9cfa11f81e9afef4440a451c682ed48d
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.1 b/metadata/md5-cache/dev-qt/qtdiag-5.15.1
index 41024f4ee3b5..5d2a42e237f7 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.1
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.15.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.1:5= ~dev-qt/qtgui-5.15.1:5= network? ( ~dev-qt/qtnetwork-5.15.1[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.15.1 ) test? ( ~dev-qt/qttest-5.15.1 )
+DEPEND=~dev-qt/qtcore-5.15.1:5= ~dev-qt/qtgui-5.15.1:5= network? ( ~dev-qt/qtnetwork-5.15.1[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.15.1 ) ~dev-qt/qtxml-5.15.1 test? ( ~dev-qt/qttest-5.15.1 )
 DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
 EAPI=7
 HOMEPAGE=https://www.qt.io/
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qttools-everywhere-src-5.15.1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9cfa11f81e9afef4440a451c682ed48d
+_md5_=072a3106389d6f645a6ccf500fa4b991
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.0 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.0
deleted file mode 100644
index 88d62e9190c5..000000000000
--- a/metadata/md5-cache/dev-qt/qtgamepad-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0[evdev?] evdev? ( virtual/libudev:= ) qml? ( ~dev-qt/qtdeclarative-5.15.0 ) sdl? ( media-libs/libsdl ) test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=Qt module to support gamepad hardware
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=evdev qml sdl debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0[evdev?] evdev? ( virtual/libudev:= ) qml? ( ~dev-qt/qtdeclarative-5.15.0 ) sdl? ( media-libs/libsdl ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtgamepad-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d4e1c2b7e621f9bc3c690d73f7b8cb53
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.0 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.0
deleted file mode 100644
index 6b61ec6db323..000000000000
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 dev-qt/qtchooser
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9eb0377a453df5aae2c28ec05ee8602f
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.0-r1 b/metadata/md5-cache/dev-qt/qtgui-5.15.0-r1
deleted file mode 100644
index d2171408866e..000000000000
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-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.15.0: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:= dbus? ( ~dev-qt/qtdbus-5.15.0 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.15.0 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.15.0 ) vulkan? ( dev-util/vulkan-headers ) X? ( 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.15.0 )
-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-only ibus jpeg +libinput +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( ~dev-qt/qtwayland-5.15.0 )
-RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.15.0: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:= dbus? ( ~dev-qt/qtdbus-5.15.0 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.15.0 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.15.0 ) vulkan? ( dev-util/vulkan-headers ) X? ( 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 X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) X? ( gles2-only? ( egl ) )
-RESTRICT=test
-SLOT=5/5.15.0
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a601ce0f6ce7b25b805ebab9bc01a709
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.0 b/metadata/md5-cache/dev-qt/qthelp-5.15.0
deleted file mode 100644
index 3aac91cb3442..000000000000
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtgui-5.15.0 ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qtsql-5.15.0[sqlite] ~dev-qt/qtwidgets-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtgui-5.15.0 ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qtsql-5.15.0[sqlite] ~dev-qt/qtwidgets-5.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ea2042f72d7fac989390fe0f822b0ad7
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.0 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.0
deleted file mode 100644
index a24f890f1e61..000000000000
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 ~dev-qt/qtgui-5.15.0 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtimageformats-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=79f62fef8f1f9f29258eb373b680a222
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.0 b/metadata/md5-cache/dev-qt/qtlocation-5.15.0
deleted file mode 100644
index f69c94124c81..000000000000
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/icu:= ~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qtpositioning-5.15.0[qml] ~dev-qt/qtsql-5.15.0 sys-libs/zlib ~dev-qt/qtconcurrent-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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-libs/icu:= ~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qtpositioning-5.15.0[qml] ~dev-qt/qtsql-5.15.0 sys-libs/zlib dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtlocation-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7eff8aa5402df8eb2519dbf452eeb3ee
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.0 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.0
deleted file mode 100644
index f208c85e8310..000000000000
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0[gles2-only=] ~dev-qt/qtnetwork-5.15.0 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.15.0 gles2-only? ( ~dev-qt/qtgui-5.15.0[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.15.0 ~dev-qt/qtwidgets-5.15.0[gles2-only=] ) gstreamer? ( x11-base/xorg-proto ) test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa gles2-only gstreamer openal pulseaudio qml widgets 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.15.0 ~dev-qt/qtgui-5.15.0[gles2-only=] ~dev-qt/qtnetwork-5.15.0 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.15.0 gles2-only? ( ~dev-qt/qtgui-5.15.0[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.15.0 ~dev-qt/qtwidgets-5.15.0[gles2-only=] ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtmultimedia-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c20c78009eff3e9fab95449bbb3841f5
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.0 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.0
deleted file mode 100644
index 94957c2267ff..000000000000
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.15.0:5= sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.15.0 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.15.0 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=Network abstraction library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=bindist connman gssapi libproxy libressl networkmanager sctp +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.15.0:5= sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.15.0 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.15.0 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=82c0c131ea677c79cac8e93135384bf8
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.0 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.0
deleted file mode 100644
index 4f908df51743..000000000000
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtnetwork-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 ~dev-qt/qtnetwork-5.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtnetworkauth-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2ef5ada6266b6c748b4ca05d19cac837
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.0-r1 b/metadata/md5-cache/dev-qt/qtopengl-5.15.0-r1
deleted file mode 100644
index 2af1ea6bbcb9..000000000000
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-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.15.0:5= ~dev-qt/qtgui-5.15.0[gles2-only=] ~dev-qt/qtwidgets-5.15.0[gles2-only=] !gles2-only? ( virtual/opengl ) test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2-only test 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.15.0:5= ~dev-qt/qtgui-5.15.0[gles2-only=] ~dev-qt/qtwidgets-5.15.0[gles2-only=] !gles2-only? ( virtual/opengl ) dev-qt/qtchooser
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=47093733b233c698497a5e3ac6f9a415
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.0 b/metadata/md5-cache/dev-qt/qtpaths-5.15.0
deleted file mode 100644
index cc490b3a56b7..000000000000
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=98331403d897ec61423bd66bc56bc32a
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.0 b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.0
deleted file mode 100644
index dc77f2ed388f..000000000000
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e4cbf428a050d3ce8a1be9e8ae806829
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.15.0 b/metadata/md5-cache/dev-qt/qtpositioning-5.15.0
deleted file mode 100644
index 19cb1bf30f98..000000000000
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 geoclue? ( ~dev-qt/qtdbus-5.15.0 ) qml? ( ~dev-qt/qtdeclarative-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 geoclue? ( ~dev-qt/qtdbus-5.15.0 ) qml? ( ~dev-qt/qtdeclarative-5.15.0 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtlocation-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8bdbe6a4e901f8493d4436eb0cd92152
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.0 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.0
deleted file mode 100644
index 726a16a10aae..000000000000
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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.15.0:5= ~dev-qt/qtgui-5.15.0[gles2-only=] ~dev-qt/qtwidgets-5.15.0[gles2-only=] cups? ( >=net-print/cups-1.4 ) test? ( ~dev-qt/qtnetwork-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=Printing support library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=cups gles2-only test 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.15.0:5= ~dev-qt/qtgui-5.15.0[gles2-only=] ~dev-qt/qtwidgets-5.15.0[gles2-only=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=34aff5c6fc756e5d89dd49c0e7dd006a
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.0 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.0
deleted file mode 100644
index 5b7833a67c87..000000000000
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 widgets? ( ~dev-qt/qtwidgets-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 widgets? ( ~dev-qt/qtwidgets-5.15.0 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9b8d5d3c21a2c1cb7f5768cb9141e8be
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.0 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.0
deleted file mode 100644
index 9a7b4ea4376d..000000000000
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 widgets? ( ~dev-qt/qtwidgets-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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 ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 widgets? ( ~dev-qt/qtwidgets-5.15.0 ) ~dev-qt/qtgraphicaleffects-5.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols2-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fa7c91da9f03c8e1f220869438e963ed
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.0 b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.0
deleted file mode 100644
index 1b120c48a5ce..000000000000
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=Qt module for keyframe-based timeline construction
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtquicktimeline-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3b08d83389ecd7560375db89542b121a
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.15.0 b/metadata/md5-cache/dev-qt/qtscript-5.15.0
deleted file mode 100644
index e78a17effb9c..000000000000
--- a/metadata/md5-cache/dev-qt/qtscript-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 scripttools? ( ~dev-qt/qtgui-5.15.0 ~dev-qt/qtwidgets-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0 scripttools? ( ~dev-qt/qtgui-5.15.0 ~dev-qt/qtwidgets-5.15.0 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtscript-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ad7db99b38ba5130eaa2c4be57c43749
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.15.0 b/metadata/md5-cache/dev-qt/qtscxml-5.15.0
deleted file mode 100644
index 9d394b67d752..000000000000
--- a/metadata/md5-cache/dev-qt/qtscxml-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 ~dev-qt/qtdeclarative-5.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtscxml-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fddd5aed40caa88c033b28744aee0778
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.15.0 b/metadata/md5-cache/dev-qt/qtsensors-5.15.0
deleted file mode 100644
index eccf664beaa3..000000000000
--- a/metadata/md5-cache/dev-qt/qtsensors-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdbus-5.15.0 qml? ( ~dev-qt/qtdeclarative-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 ~dev-qt/qtdbus-5.15.0 qml? ( ~dev-qt/qtdeclarative-5.15.0 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtsensors-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9d0fbd1dbd10256fd12b6c4665df3199
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.15.0 b/metadata/md5-cache/dev-qt/qtserialbus-5.15.0
deleted file mode 100644
index 1c55fd23b87b..000000000000
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qtserialport-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qtserialport-5.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtserialbus-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eb9768ec584fd00f322c4ed232125925
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.15.0 b/metadata/md5-cache/dev-qt/qtserialport-5.15.0
deleted file mode 100644
index ef1d39d7a7e3..000000000000
--- a/metadata/md5-cache/dev-qt/qtserialport-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 virtual/libudev:= test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 virtual/libudev:= dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtserialport-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=11a82bb19ebbac5d33ae79aa7df2d2ac
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.0 b/metadata/md5-cache/dev-qt/qtspeech-5.15.0
deleted file mode 100644
index 3ed6a5adb293..000000000000
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=Text-to-speech library for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtspeech-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bd1914d9257386bb727f2191087e862d
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.0 b/metadata/md5-cache/dev-qt/qtsql-5.15.0
deleted file mode 100644
index f4c66feb3d1a..000000000000
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0: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.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0: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.15.0
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2d02ff0011e90fd149f1081e109e4d78
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.0 b/metadata/md5-cache/dev-qt/qtsvg-5.15.0
deleted file mode 100644
index 88f20d0ad52d..000000000000
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtwidgets-5.15.0 sys-libs/zlib:= test? ( ~dev-qt/qtxml-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtwidgets-5.15.0 sys-libs/zlib:= dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtsvg-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e33d2c56b5be347807762d6552507266
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.0 b/metadata/md5-cache/dev-qt/qttest-5.15.0
deleted file mode 100644
index b9ca0d8240e6..000000000000
--- a/metadata/md5-cache/dev-qt/qttest-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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.15.0:5= test? ( ~dev-qt/qtgui-5.15.0 ~dev-qt/qtxml-5.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0:5= dev-qt/qtchooser
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6fbdeab0d2bbe4ed21543e2fba610081
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.0 b/metadata/md5-cache/dev-qt/qttranslations-5.15.0
deleted file mode 100644
index e6bb188b5e16..000000000000
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/linguist-tools-5.15.0 ~dev-qt/qtcore-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qttranslations-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b3b73177e2777f23fd9a8d916fc87a32
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.0 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.0
deleted file mode 100644
index 48b6effa3de7..000000000000
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtsvg-5.15.0 spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= ) test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=Customizable input framework and virtual keyboard for Qt
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=handwriting +spell +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtsvg-5.15.0 spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=656e9445dca0af3fd2d51bfccb5888ca
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.0 b/metadata/md5-cache/dev-qt/qtwayland-5.15.0
deleted file mode 100644
index de2618c1ceb5..000000000000
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0[egl,libinput,vulkan=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) X? ( ~dev-qt/qtgui-5.15.0[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=Wayland platform plugin for Qt
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=vulkan X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0[egl,libinput,vulkan=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 vulkan? ( dev-util/vulkan-headers ) X? ( ~dev-qt/qtgui-5.15.0[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtwayland-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=aaf177bec9afa484fee418bac257525d
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.0 b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.0
deleted file mode 100644
index 39345dff32d2..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 qml? ( ~dev-qt/qtdeclarative-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 qml? ( ~dev-qt/qtdeclarative-5.15.0 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtwebchannel-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3e8346269088d969884d98bf555cc7d0
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.0 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.0
deleted file mode 100644
index 84efa8a070d8..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qtprintsupport-5.15.0 ~dev-qt/qtwebchannel-5.15.0[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.15.0 ) geolocation? ( ~dev-qt/qtpositioning-5.15.0 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.15.0[widgets] ~dev-qt/qtwidgets-5.15.0 ) || ( >=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 test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~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.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtnetwork-5.15.0 ~dev-qt/qtprintsupport-5.15.0 ~dev-qt/qtwebchannel-5.15.0[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.15.0 ) geolocation? ( ~dev-qt/qtpositioning-5.15.0 ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.15.0[widgets] ~dev-qt/qtwidgets-5.15.0 ) dev-qt/qtchooser
-REQUIRED_USE=designer? ( widgets )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtwebengine-everywhere-src-5.15.0.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.0-ppc64.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=25713d6b579ab1f6d60328237127dbd6
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20200309-r1 b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20200309-r1
index 618085b94fdd..643f1da0cf2c 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20200309-r1
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20200309-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-libs/icu:= dev-libs/libxml2 dev-libs/libxslt >=dev-q
 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-alpha4/qtwebkit-5.212.0-alpha4.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac37f0df7622fab0e4e224aeafa2c3a6
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.0 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.0
deleted file mode 100644
index 340024f6bb29..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtnetwork-5.15.0[ssl=] qml? ( ~dev-qt/qtdeclarative-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 ~dev-qt/qtnetwork-5.15.0[ssl=] qml? ( ~dev-qt/qtdeclarative-5.15.0 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtwebsockets-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dc530a2f4cea84237736d58e5768ae1d
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.15.0 b/metadata/md5-cache/dev-qt/qtwebview-5.15.0
deleted file mode 100644
index f372f3dcf416..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebview-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtwebengine-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
-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.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 ~dev-qt/qtwebengine-5.15.0 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtwebview-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3014a37942ac945bbd6e5f98c435b201
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.0 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.0
deleted file mode 100644
index 3002db0e6496..000000000000
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0:5= ~dev-qt/qtgui-5.15.0[gles2-only=,png=,X?] gtk? ( ~dev-qt/qtgui-5.15.0[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) test? ( ~dev-qt/qttest-5.15.0 )
-DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2-only gtk +png +X 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.15.0:5= ~dev-qt/qtgui-5.15.0[gles2-only=,png=,X?] gtk? ( ~dev-qt/qtgui-5.15.0[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=287343a09d7abf2d4d9d0e7d2a6165d5
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.15.0 b/metadata/md5-cache/dev-qt/qtx11extras-5.15.0
deleted file mode 100644
index 355df494ea95..000000000000
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0[X] test? ( ~dev-qt/qtwidgets-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtgui-5.15.0[X] dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtx11extras-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=df72385e75c31f161a8e608cfd6012e3
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.0 b/metadata/md5-cache/dev-qt/qtxml-5.15.0
deleted file mode 100644
index 1a92ac8b4154..000000000000
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0:5= test? ( ~dev-qt/qtnetwork-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0:5= dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fbe80c00613aa12c885a2d1256c3666e
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.0 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.0
deleted file mode 100644
index 531ec80923df..000000000000
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtnetwork-5.15.0 qml? ( ~dev-qt/qtdeclarative-5.15.0 ) test? ( ~dev-qt/qttest-5.15.0 )
-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
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtnetwork-5.15.0 qml? ( ~dev-qt/qtdeclarative-5.15.0 ) dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtxmlpatterns-everywhere-src-5.15.0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qt5-build	b73c1a2aa059052f72ed80be501ea5ca	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=017fca725684387944e25aaf808bbf39
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 6e5fd1fae543..b1e5e79ff832 100644
--- a/metadata/md5-cache/dev-ros/Manifest.gz
+++ b/metadata/md5-cache/dev-ros/Manifest.gz
diff --git a/metadata/md5-cache/dev-ros/actionlib-1.13.2 b/metadata/md5-cache/dev-ros/actionlib-1.13.2
index 15d96a35ee04..06e6fae38ce6 100644
--- a/metadata/md5-cache/dev-ros/actionlib-1.13.2
+++ b/metadata/md5-cache/dev-ros/actionlib-1.13.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/actionlib/archive/1.13.2.tar.gz -> actionlib-1.13.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0b01f60abb44e363241aa89755c69cd
diff --git a/metadata/md5-cache/dev-ros/actionlib-9999 b/metadata/md5-cache/dev-ros/actionlib-9999
index 951e2ea2dc67..f8713a2e399b 100644
--- a/metadata/md5-cache/dev-ros/actionlib-9999
+++ b/metadata/md5-cache/dev-ros/actionlib-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_tar
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0b01f60abb44e363241aa89755c69cd
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0 b/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
index f4fac7fa3cd0..65989fadae6a 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e95dcda748d6de6497ba8e893c632696
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-9999 b/metadata/md5-cache/dev-ros/actionlib_msgs-9999
index d2381d7db6f9..a9d3aebf783a 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e95dcda748d6de6497ba8e893c632696
diff --git a/metadata/md5-cache/dev-ros/actionlib_tools-1.13.2 b/metadata/md5-cache/dev-ros/actionlib_tools-1.13.2
index 51b8e8c1cfa6..4bab79246ba4 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tools-1.13.2
+++ b/metadata/md5-cache/dev-ros/actionlib_tools-1.13.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/actionlib/archive/1.13.2.tar.gz -> actionlib-1.13.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b64bfc7adca94d4d6b324787a92d90a1
diff --git a/metadata/md5-cache/dev-ros/actionlib_tools-9999 b/metadata/md5-cache/dev-ros/actionlib_tools-9999
index 78cca5741c33..d3d5e00e9a33 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tools-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_tools-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b64bfc7adca94d4d6b324787a92d90a1
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
index 1ad8fc6ef819..233434233e12 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=530f7ea28fba85a8e902134c7c69a216
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.2.0 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.2.0
index cd894a4ca044..32f387cb38b5 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.2.0
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.2.0.tar.gz -> common_tutorials-0.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=530f7ea28fba85a8e902134c7c69a216
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-9999 b/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
index edb6692ff2d0..9135ebb272b6 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_single
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=530f7ea28fba85a8e902134c7c69a216
diff --git a/metadata/md5-cache/dev-ros/amcl-1.17.0 b/metadata/md5-cache/dev-ros/amcl-1.17.0
index 0d412312b934..15ffd55542e3 100644
--- a/metadata/md5-cache/dev-ros/amcl-1.17.0
+++ b/metadata/md5-cache/dev-ros/amcl-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz http://download.ros.org/data/amcl/basic_localization_stage_indexed.bag -> amcl-1.17.0-basic_localization_stage_indexed.bag http://download.ros.org/data/amcl/global_localization_stage_indexed.bag -> amcl-1.17.0-global_localization_stage_indexed.bag http://download.ros.org/data/amcl/small_loop_prf_indexed.bag -> amcl-1.17.0-small_loop_prf_indexed.bag http://download.ros.org/data/amcl/small_loop_crazy_driving_prg_indexed.bag -> amcl-1.17.0-small_loop_crazy_driving_prg_indexed.bag http://download.ros.org/data/amcl/texas_greenroom_loop_indexed.bag -> amcl-1.17.0-texas_greenroom_loop_indexed.bag http://download.ros.org/data/amcl/texas_willow_hallway_loop_indexed.bag -> amcl-1.17.0-texas_willow_hallway_loop_indexed.bag http://download.ros.org/data/amcl/rosie_localization_stage.bag -> amcl-1.17.0-rosie_localization_stage.bag http://download.ros.org/data/amcl/willow-full.pgm -> amcl-1.17.0-willow-full.pgm http://download.ros.org/data/amcl/willow-full-0.05.pgm -> amcl-1.17.0-willow-full-0.05.pgm
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=402b9b36331387dd8c11c477ffda2c05
diff --git a/metadata/md5-cache/dev-ros/amcl-9999 b/metadata/md5-cache/dev-ros/amcl-9999
index b4ca23d77537..9f346a0e6029 100644
--- a/metadata/md5-cache/dev-ros/amcl-9999
+++ b/metadata/md5-cache/dev-ros/amcl-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/data/amcl/basic_localization_stage_indexed.bag -> amcl-9999-basic_localization_stage_indexed.bag http://download.ros.org/data/amcl/global_localization_stage_indexed.bag -> amcl-9999-global_localization_stage_indexed.bag http://download.ros.org/data/amcl/small_loop_prf_indexed.bag -> amcl-9999-small_loop_prf_indexed.bag http://download.ros.org/data/amcl/small_loop_crazy_driving_prg_indexed.bag -> amcl-9999-small_loop_crazy_driving_prg_indexed.bag http://download.ros.org/data/amcl/texas_greenroom_loop_indexed.bag -> amcl-9999-texas_greenroom_loop_indexed.bag http://download.ros.org/data/amcl/texas_willow_hallway_loop_indexed.bag -> amcl-9999-texas_willow_hallway_loop_indexed.bag http://download.ros.org/data/amcl/rosie_localization_stage.bag -> amcl-9999-rosie_localization_stage.bag http://download.ros.org/data/amcl/willow-full.pgm -> amcl-9999-willow-full.pgm http://download.ros.org/data/amcl/willow-full-0.05.pgm -> amcl-9999-willow-full-0.05.pgm
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=402b9b36331387dd8c11c477ffda2c05
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.0 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.0
new file mode 100644
index 000000000000..73d5e583986e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.10.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-ros/ament_copyright[python_targets_python3_8(-),python_single_target_python3_8(+)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-ros/ament_copyright[python_targets_python3_7(-),python_single_target_python3_7(+)] test? ( dev-ros/ament_lint_cmake[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) ) dev-ros/ament_cmake_core dev-ros/ament_cmake_test dev-ros/ament_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=The auto-magic functions for ease to use of the ament linters
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_copyright dev-ros/ament_cmake_test
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=433b372d53ad05f7ab86f0a69fa7e032
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.9.5 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.9.5
index 7b8771359dfa..e5bbaf441098 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_cmake_copyright-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/ament_copyright dev-ros/ament_cmake_test
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=433b372d53ad05f7ab86f0a69fa7e032
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_copyright-9999 b/metadata/md5-cache/dev-ros/ament_cmake_copyright-9999
index a3a48bd5af6a..81c2040a52db 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_copyright-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_copyright-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_copyright dev-ros/ament_cmake_test
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=433b372d53ad05f7ab86f0a69fa7e032
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_core-0.9.6
index c91952648b0e..77cf6fe58ab4 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc628729b8ade2eb03ebe395cde844fb
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.0
index b1d5278ee905..3cfab49bf243 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc628729b8ade2eb03ebe395cde844fb
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.1
new file mode 100644
index 000000000000..ee3585d0f820
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/ament_package dev-python/catkin_pkg
+DESCRIPTION=The core of the ament buildsystem in CMake
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/ament_package dev-python/catkin_pkg
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cc628729b8ade2eb03ebe395cde844fb
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_core-9999 b/metadata/md5-cache/dev-ros/ament_cmake_core-9999
index 853691aa904c..c53ac2accd3c 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_core-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_core-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-python/ament_package dev-python/catkin_pkg
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc628729b8ade2eb03ebe395cde844fb
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.0 b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.0
new file mode 100644
index 000000000000..969946fe6e15
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.10.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=CMake API for ament_cppcheck to perform static code analysis on C/C++
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cppcheck
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=640d0e4e8e27abac31f3a70a18c5f5c7
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.9.5 b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.9.5
index ca07d65648e6..831a9a2e4a61 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cppcheck
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=640d0e4e8e27abac31f3a70a18c5f5c7
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-9999 b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-9999
index 1a7d02e4c327..e12d63bbe793 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cppcheck-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cppcheck
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=640d0e4e8e27abac31f3a70a18c5f5c7
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.0 b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.0
new file mode 100644
index 000000000000..9df9eb159faa
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.10.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=CMake API for ament_cpplint to lint C / C++ code using cpplint
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cpplint
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ea3e6c071678785c47538f418e3d66cf
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.9.5 b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.9.5
index 6fc4d43e866a..ed6e86bc3966 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cpplint
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea3e6c071678785c47538f418e3d66cf
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-9999 b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-9999
index 73175ae14387..a83925088de2 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_cpplint-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_cpplint-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cpplint
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea3e6c071678785c47538f418e3d66cf
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-0.9.6
index f48de5b8e608..22c39c97c8fb 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b038c19d124fd6a7b0ff7df456c76ca5
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.0
index 9121b8b54208..03359aaf8cab 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b038c19d124fd6a7b0ff7df456c76ca5
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.1
new file mode 100644
index 000000000000..e037f5063388
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export definitions to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b038c19d124fd6a7b0ff7df456c76ca5
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-9999
index 674cbcb84249..45b923a2874a 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_definitions-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b038c19d124fd6a7b0ff7df456c76ca5
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-0.9.6
index a68253c151df..46028227631d 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c83c280bc595183a5cad34989bb75bbc
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.0
index 45677ceafe9f..4a5116a33c1f 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c83c280bc595183a5cad34989bb75bbc
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.1
new file mode 100644
index 000000000000..043962e733d9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
+DESCRIPTION=Export dependencies to downstream packages in the ament buildsystem in CMake
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c83c280bc595183a5cad34989bb75bbc
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-9999
index ce3e1830fbd5..5fbb222831ca 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_dependencies-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_libraries
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c83c280bc595183a5cad34989bb75bbc
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-0.9.6
index b8390df845c5..a9cad6a6a004 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e32fd582a60429970e93d71bc1673301
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.0
index 59c399e1e45c..bfd64b5f8bbe 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e32fd582a60429970e93d71bc1673301
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.1
new file mode 100644
index 000000000000..049574a3bf5c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e32fd582a60429970e93d71bc1673301
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-9999
index 39ed45c3f335..5fa16ba21046 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_include_directories-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e32fd582a60429970e93d71bc1673301
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-0.9.6
index 8997d78606d2..43b7c7489bf2 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f5da469869307df5039c0bb10c15032
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.0
index 6e3f37d6dc94..7232e1705ca2 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f5da469869307df5039c0bb10c15032
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.1
new file mode 100644
index 000000000000..bf205ae3c831
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
+DESCRIPTION=Export interfaces to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0f5da469869307df5039c0bb10c15032
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-9999
index 019a09a3da6a..7e6b510c8da5 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_interfaces-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f5da469869307df5039c0bb10c15032
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-0.9.6
index 108bdd70aea1..c3af5d6473f1 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e51854814bc1af7b3bfb775405f19dd
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.0
index abb4e0ffd2df..db6cd43ebfa1 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e51854814bc1af7b3bfb775405f19dd
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.1
new file mode 100644
index 000000000000..3040bc3fe3c4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export libraries to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6e51854814bc1af7b3bfb775405f19dd
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-9999
index 2e0bdb3496ca..6277520de729 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_libraries-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e51854814bc1af7b3bfb775405f19dd
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-0.9.6
index a0e6d3edfc53..9a026e9d0619 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74cae31f9897506f3989052c32abea9c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.0
index b5b3eb8338a3..413d6132d788 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74cae31f9897506f3989052c32abea9c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.1
new file mode 100644
index 000000000000..1b68ad26fa71
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export link flags to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=74cae31f9897506f3989052c32abea9c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-9999
index 8be8c215e7cb..29a1ed96c43d 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_link_flags-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74cae31f9897506f3989052c32abea9c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-0.9.6
index 48761fdb9804..4b9d679805c4 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61ee72577da7e736253485c95d74af32
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.0
index 01c6632f4cab..747acc7697ec 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61ee72577da7e736253485c95d74af32
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.1
new file mode 100644
index 000000000000..740353629e3e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
+DESCRIPTION=Export targets to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=61ee72577da7e736253485c95d74af32
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-9999 b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-9999
index f1bb1080e4c6..da3ce9778274 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_export_targets-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_export_targets-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_libraries
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61ee72577da7e736253485c95d74af32
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.0
index adecf21c53ae..c3f6d0fa7c8f 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f49b990b3494f2a31767bc4185858760
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.1
new file mode 100644
index 000000000000..a94d2ca158c2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gmock-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The ability to add Google mock-based tests in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f49b990b3494f2a31767bc4185858760
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gmock-9999 b/metadata/md5-cache/dev-ros/ament_cmake_gmock-9999
index 598a30c10648..878e967a415a 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gmock-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gmock-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f49b990b3494f2a31767bc4185858760
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gtest-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_gtest-0.9.6
index 7603dbaff1bd..69452ccf33f8 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gtest-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gtest-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66bf6bcaa537797d20489908d534401c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.0
index 2fddc60d9525..945734931ccd 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66bf6bcaa537797d20489908d534401c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.1
new file mode 100644
index 000000000000..dde74f816625
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gtest-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The ability to add gtest-based tests in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=66bf6bcaa537797d20489908d534401c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_gtest-9999 b/metadata/md5-cache/dev-ros/ament_cmake_gtest-9999
index f0aaa5f36ea8..b3426436f399 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_gtest-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_gtest-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66bf6bcaa537797d20489908d534401c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-0.9.6
index b8390df845c5..a9cad6a6a004 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e32fd582a60429970e93d71bc1673301
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.0
index 59c399e1e45c..bfd64b5f8bbe 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e32fd582a60429970e93d71bc1673301
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.1
new file mode 100644
index 000000000000..049574a3bf5c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Export include directories to downstream packages in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e32fd582a60429970e93d71bc1673301
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-9999 b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-9999
index 39ed45c3f335..5fa16ba21046 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_include_directories-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_include_directories-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e32fd582a60429970e93d71bc1673301
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_libraries-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_libraries-0.9.6
index b282fde0c628..d4fe3020d25e 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_libraries-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_libraries-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c5199b8258c4d43df0184a79526e6f10
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.0
index 5e008eff6c3e..a878d339d236 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c5199b8258c4d43df0184a79526e6f10
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.1
new file mode 100644
index 000000000000..8630076e0b5d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_libraries-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The functionality to deduplicate libraries in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c5199b8258c4d43df0184a79526e6f10
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_libraries-9999 b/metadata/md5-cache/dev-ros/ament_cmake_libraries-9999
index b758a1696b3b..335a46ebbc92 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_libraries-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_libraries-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c5199b8258c4d43df0184a79526e6f10
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.0 b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.0
new file mode 100644
index 000000000000..4ca0f9d877ad
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.10.0
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-ros/ament_lint_cmake[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-ros/ament_lint_cmake[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
+DESCRIPTION=The CMake API for ament_lint_cmake to lint CMake code using cmakelint
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b0116539c461ce11b6314088d713d716
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.9.5 b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.9.5
index 275a6d8a1fde..83cf3bca33df 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-0.9.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0116539c461ce11b6314088d713d716
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-9999 b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-9999
index 356fed616ced..cb6fc08bfef2 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_lint_cmake-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_lint_cmake
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0116539c461ce11b6314088d713d716
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.0
index 742a3af441ef..c1a86b84973d 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b442dce9ffc720845d606946ed68bded
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.1
new file mode 100644
index 000000000000..a43cfbff5665
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_pytest-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The ability to run Python tests using pytest in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b442dce9ffc720845d606946ed68bded
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_pytest-9999 b/metadata/md5-cache/dev-ros/ament_cmake_pytest-9999
index 0d5f0d0c3c3a..2a7045d92d01 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_pytest-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_pytest-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b442dce9ffc720845d606946ed68bded
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_python-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_python-0.9.6
index c795cf7a3a73..539ad6857c77 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_python-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_python-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43fa7aabf57b3659fa5c20988aba706c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.0
index 3358d78b8f67..a98970ba1fbf 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43fa7aabf57b3659fa5c20988aba706c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.1
new file mode 100644
index 000000000000..1b4954c760ab
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_python-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=The ability to use Python in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=43fa7aabf57b3659fa5c20988aba706c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_python-9999 b/metadata/md5-cache/dev-ros/ament_cmake_python-9999
index 811c0c56f0d5..e8437bbdf958 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_python-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_python-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43fa7aabf57b3659fa5c20988aba706c
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_ros-0.9.0 b/metadata/md5-cache/dev-ros/ament_cmake_ros-0.9.0
index d14a0ed1eb9e..aab2d97c27b4 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_ros-0.9.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_ros-0.9.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros2/ament_cmake_ros/archive/0.9.0.tar.gz -> ament_cmake_ros-0.9.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb8790b5edb257a499e6e0befe75a4b0
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_ros-9999 b/metadata/md5-cache/dev-ros/ament_cmake_ros-9999
index 8ffac91992b6..9240b584e5e0 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_ros-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_ros-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb8790b5edb257a499e6e0befe75a4b0
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-0.9.6
index bd37cb8e0167..0a96294fce68 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=acc79785d2ef4b30b0f794530231ea53
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.0
index 9afc3c8b9896..1e2876a82963 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=acc79785d2ef4b30b0f794530231ea53
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.1
new file mode 100644
index 000000000000..cb892f6417a0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
+DESCRIPTION=Add defs, include dirs and libs to a target in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=acc79785d2ef4b30b0f794530231ea53
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-9999 b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-9999
index e1ca6003f8a6..64354225b736 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_target_dependencies-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_include_directories dev-ros/ament_cmake_libraries
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=acc79785d2ef4b30b0f794530231ea53
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_test-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_test-0.9.6
index a5e9b0ff5867..6723aea9a299 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_test-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_test-0.9.6
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a422ef7f61f4c1935d4481878ab05184
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.0
index 4097a99597ed..5e6b8852ec7a 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a422ef7f61f4c1935d4481878ab05184
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.1
new file mode 100644
index 000000000000..78b47ea62dfb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_test-1.0.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=The ability to add tests in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a422ef7f61f4c1935d4481878ab05184
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_test-9999 b/metadata/md5-cache/dev-ros/ament_cmake_test-9999
index fe3261ca6506..3b94d6eecf4c 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_test-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_test-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-python/ament_package[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_python python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a422ef7f61f4c1935d4481878ab05184
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.0 b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.0
new file mode 100644
index 000000000000..650e0911cc36
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.10.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core test? ( dev-ros/ament_cmake_copyright || ( ( dev-lang/python:3.8 dev-ros/ament_copyright[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-ros/ament_copyright[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=The CMake API for ament_uncrustify to check code against styleconventions
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_uncrustify
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7b26adf90528f2f3997ff29fde9c57fe
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.9.5 b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.9.5
index 11d72079b909..a5f1edbde882 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_uncrustify
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b26adf90528f2f3997ff29fde9c57fe
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-9999 b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-9999
index be8d19fd1f24..700fa551ba04 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_uncrustify-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_uncrustify
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b26adf90528f2f3997ff29fde9c57fe
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_version-0.9.6 b/metadata/md5-cache/dev-ros/ament_cmake_version-0.9.6
index b38d5c892ebe..7601f64ba035 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_version-0.9.6
+++ b/metadata/md5-cache/dev-ros/ament_cmake_version-0.9.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0cc1d8d17a4682d93f7539184ac8fac7
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.0 b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.0
index 74934a8461a5..a947b62cceb2 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.0
+++ b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0cc1d8d17a4682d93f7539184ac8fac7
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.1 b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.1
new file mode 100644
index 000000000000..c9c7cef5b67b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_version-1.0.1
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core
+DESCRIPTION=Override the exported package version in the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0cc1d8d17a4682d93f7539184ac8fac7
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_version-9999 b/metadata/md5-cache/dev-ros/ament_cmake_version-9999
index 8645eba85348..0fb0fe317588 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_version-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_version-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0cc1d8d17a4682d93f7539184ac8fac7
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.0 b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.0
new file mode 100644
index 000000000000..3dcb5056c2d6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.10.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-ros/ament_xmllint[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-ros/ament_xmllint[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) dev-ros/ament_cmake_test dev-ros/ament_cmake_core dev-ros/ament_cmake_copyright test? ( dev-ros/ament_cmake_lint_cmake ) || ( dev-lang/python:3.8 dev-lang/python:3.7 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=he CMake API for ament_xmllint to check XML file using xmmlint
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_copyright
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=414f5304beb3a267a9bf6c1b1518765b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.9.5 b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.9.5
index fb87e3ada99b..a8380254ea6a 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_copyright
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=414f5304beb3a267a9bf6c1b1518765b
diff --git a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-9999 b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-9999
index a2497f5f58bf..905f341d1696 100644
--- a/metadata/md5-cache/dev-ros/ament_cmake_xmllint-9999
+++ b/metadata/md5-cache/dev-ros/ament_cmake_xmllint-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_test dev-ros/ament_cmake_copyright
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=414f5304beb3a267a9bf6c1b1518765b
diff --git a/metadata/md5-cache/dev-ros/ament_copyright-0.10.0 b/metadata/md5-cache/dev-ros/ament_copyright-0.10.0
new file mode 100644
index 000000000000..7e4b391abb6a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_copyright-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=The ability to check source files for copyright and license information.
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test test python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2802ff01d857b0722fe9571d96d10864
diff --git a/metadata/md5-cache/dev-ros/ament_copyright-0.9.5 b/metadata/md5-cache/dev-ros/ament_copyright-0.9.5
deleted file mode 100644
index 95908f4e5003..000000000000
--- a/metadata/md5-cache/dev-ros/ament_copyright-0.9.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=The ability to check source files for copyright and license information.
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=test test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dd204335b4bf691161c1455dbb90a5e3
diff --git a/metadata/md5-cache/dev-ros/ament_copyright-9999 b/metadata/md5-cache/dev-ros/ament_copyright-9999
index baf759d98063..5a1848fba24e 100644
--- a/metadata/md5-cache/dev-ros/ament_copyright-9999
+++ b/metadata/md5-cache/dev-ros/ament_copyright-9999
@@ -7,9 +7,9 @@ HOMEPAGE=https://github.com/ament/ament_lint
 IUSE=test test python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=dev-ros/ament_lint dev-python/importlib_metadata[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=dd204335b4bf691161c1455dbb90a5e3
+_md5_=2802ff01d857b0722fe9571d96d10864
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0 b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0
new file mode 100644
index 000000000000..2c4d4f89a6d9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-0.10.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The ability to perform static code analysis on C/C++ code using Cppcheck
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-util/cppcheck python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f906d7b42236f008e8e2001dd59d2a6f
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-0.9.5 b/metadata/md5-cache/dev-ros/ament_cppcheck-0.9.5
deleted file mode 100644
index 2a885180f899..000000000000
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-0.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The ability to perform static code analysis on C/C++ code using Cppcheck
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-util/cppcheck python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=de34bd43be4263bf0374e840881c4a1c
diff --git a/metadata/md5-cache/dev-ros/ament_cppcheck-9999 b/metadata/md5-cache/dev-ros/ament_cppcheck-9999
index 05ed5f12a19d..00807e1b1e9d 100644
--- a/metadata/md5-cache/dev-ros/ament_cppcheck-9999
+++ b/metadata/md5-cache/dev-ros/ament_cppcheck-9999
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/ament/ament_lint
 IUSE=python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-util/cppcheck python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=dev-util/cppcheck python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=de34bd43be4263bf0374e840881c4a1c
+_md5_=f906d7b42236f008e8e2001dd59d2a6f
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0 b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0
new file mode 100644
index 000000000000..5f3c614f0b97
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=The ability to check code against the Google style conventions using cpplint
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test test python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3349a3f97bd98867e5da8a54580460c4
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-0.9.5 b/metadata/md5-cache/dev-ros/ament_cpplint-0.9.5
deleted file mode 100644
index 91d2ca2d35a4..000000000000
--- a/metadata/md5-cache/dev-ros/ament_cpplint-0.9.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=The ability to check code against the Google style conventions using cpplint
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=test test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2081341c4722e30d97d1bba707a44aa0
diff --git a/metadata/md5-cache/dev-ros/ament_cpplint-9999 b/metadata/md5-cache/dev-ros/ament_cpplint-9999
index 60389043490c..19c538e93da4 100644
--- a/metadata/md5-cache/dev-ros/ament_cpplint-9999
+++ b/metadata/md5-cache/dev-ros/ament_cpplint-9999
@@ -7,9 +7,9 @@ HOMEPAGE=https://github.com/ament/ament_lint
 IUSE=test test python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2081341c4722e30d97d1bba707a44aa0
+_md5_=3349a3f97bd98867e5da8a54580460c4
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-0.10.0 b/metadata/md5-cache/dev-ros/ament_flake8-0.10.0
new file mode 100644
index 000000000000..7786768867f4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_flake8-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_lint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=The ability to check code for style and syntax conventions with flake8
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_lint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=49fd556b02a0ab9fcd61022b5e5be942
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-0.9.5 b/metadata/md5-cache/dev-ros/ament_flake8-0.9.5
deleted file mode 100644
index 200fb3ee3fde..000000000000
--- a/metadata/md5-cache/dev-ros/ament_flake8-0.9.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=The ability to check code for style and syntax conventions with flake8
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bb81d795867ba0decbc3852abeb414ab
diff --git a/metadata/md5-cache/dev-ros/ament_flake8-9999 b/metadata/md5-cache/dev-ros/ament_flake8-9999
index beb0c4b6b49f..1ef085a39e6c 100644
--- a/metadata/md5-cache/dev-ros/ament_flake8-9999
+++ b/metadata/md5-cache/dev-ros/ament_flake8-9999
@@ -7,9 +7,9 @@ HOMEPAGE=https://github.com/ament/ament_lint
 IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/ament_lint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=dev-ros/ament_lint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bb81d795867ba0decbc3852abeb414ab
+_md5_=49fd556b02a0ab9fcd61022b5e5be942
diff --git a/metadata/md5-cache/dev-ros/ament_lint-0.10.0 b/metadata/md5-cache/dev-ros/ament_lint-0.10.0
new file mode 100644
index 000000000000..9461274eab9a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_lint-0.10.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Common API for ament linter packages
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9892ea456ead68452dea8529f4e2c45a
diff --git a/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.0 b/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.0
new file mode 100644
index 000000000000..0788717ec9d3
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_lint_auto-0.10.0
@@ -0,0 +1,13 @@
+BDEPEND=|| ( ( dev-lang/python:3.8 dev-python/ament_package[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/catkin_pkg[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/ament_package[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/catkin_pkg[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/ament_package[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/catkin_pkg[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
+DESCRIPTION=The auto-magic functions for ease to use of the ament linters
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c12b7c23c411b7377e761fb186ecd7ba
diff --git a/metadata/md5-cache/dev-ros/ament_lint_auto-0.9.5 b/metadata/md5-cache/dev-ros/ament_lint_auto-0.9.5
index 165c072ad779..a4432512fd56 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_auto-0.9.5
+++ b/metadata/md5-cache/dev-ros/ament_lint_auto-0.9.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
 SLOT=0
 SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c12b7c23c411b7377e761fb186ecd7ba
diff --git a/metadata/md5-cache/dev-ros/ament_lint_auto-9999 b/metadata/md5-cache/dev-ros/ament_lint_auto-9999
index 39cd7e5b4fa8..6ea6b0fe6a87 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_auto-9999
+++ b/metadata/md5-cache/dev-ros/ament_lint_auto-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c12b7c23c411b7377e761fb186ecd7ba
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0 b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0
new file mode 100644
index 000000000000..a19710d60548
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Lint CMake code using cmakelint and generate xUnit test result files
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test test python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3f4e4efbbb89f7c4f61a4013cebf1a42
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.9.5 b/metadata/md5-cache/dev-ros/ament_lint_cmake-0.9.5
deleted file mode 100644
index 7c5ca0539f3a..000000000000
--- a/metadata/md5-cache/dev-ros/ament_lint_cmake-0.9.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Lint CMake code using cmakelint and generate xUnit test result files
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=test test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=133f70c77d43c9eab01d3ed884a86da0
diff --git a/metadata/md5-cache/dev-ros/ament_lint_cmake-9999 b/metadata/md5-cache/dev-ros/ament_lint_cmake-9999
index f79753320c64..859ba5146610 100644
--- a/metadata/md5-cache/dev-ros/ament_lint_cmake-9999
+++ b/metadata/md5-cache/dev-ros/ament_lint_cmake-9999
@@ -7,9 +7,9 @@ HOMEPAGE=https://github.com/ament/ament_lint
 IUSE=test test python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=133f70c77d43c9eab01d3ed884a86da0
+_md5_=3f4e4efbbb89f7c4f61a4013cebf1a42
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-0.10.0 b/metadata/md5-cache/dev-ros/ament_pep257-0.10.0
new file mode 100644
index 000000000000..e29fd24778d6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_pep257-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Checks code against style conventions in PEP 8 and generate test result files
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test test python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f7d2af15ca6d78dc1b3d0e4c08cd9d4d
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-0.9.5 b/metadata/md5-cache/dev-ros/ament_pep257-0.9.5
deleted file mode 100644
index 45cf44ed8cac..000000000000
--- a/metadata/md5-cache/dev-ros/ament_pep257-0.9.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Checks code against style conventions in PEP 8 and generate test result files
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=test test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0db6864a8e44145614242f52e4d8bdc0
diff --git a/metadata/md5-cache/dev-ros/ament_pep257-9999 b/metadata/md5-cache/dev-ros/ament_pep257-9999
index 4c616be6116d..3437f3ab097d 100644
--- a/metadata/md5-cache/dev-ros/ament_pep257-9999
+++ b/metadata/md5-cache/dev-ros/ament_pep257-9999
@@ -7,9 +7,9 @@ HOMEPAGE=https://github.com/ament/ament_lint
 IUSE=test test python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pydocstyle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0db6864a8e44145614242f52e4d8bdc0
+_md5_=f7d2af15ca6d78dc1b3d0e4c08cd9d4d
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0 b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0
new file mode 100644
index 000000000000..52d68d46caea
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-0.10.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The ability to check code against style conventions using uncrustify
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-util/uncrustify python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=dd4f411e73b2dfdee5b90ebaec04064e
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-0.9.5 b/metadata/md5-cache/dev-ros/ament_uncrustify-0.9.5
deleted file mode 100644
index 2061bc1d0d9c..000000000000
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-0.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=The ability to check code against style conventions using uncrustify
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-util/uncrustify python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=916f10650181fa0f9d3101e37b4df18b
diff --git a/metadata/md5-cache/dev-ros/ament_uncrustify-9999 b/metadata/md5-cache/dev-ros/ament_uncrustify-9999
index b1f0ee0020cd..bcf509a0d218 100644
--- a/metadata/md5-cache/dev-ros/ament_uncrustify-9999
+++ b/metadata/md5-cache/dev-ros/ament_uncrustify-9999
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/ament/ament_lint
 IUSE=python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-util/uncrustify python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=dev-util/uncrustify python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=916f10650181fa0f9d3101e37b4df18b
+_md5_=dd4f411e73b2dfdee5b90ebaec04064e
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0 b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
new file mode 100644
index 000000000000..e4274593b751
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Checks XML files like the package manifest using xmllint
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_lint
+IUSE=test test python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_lint/archive/0.10.0.tar.gz -> ament_lint-0.10.0.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d93beb5aa4b64474bf240096f6f93fb1
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-0.9.5 b/metadata/md5-cache/dev-ros/ament_xmllint-0.9.5
deleted file mode 100644
index c75aa123e761..000000000000
--- a/metadata/md5-cache/dev-ros/ament_xmllint-0.9.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-ros/ament_copyright[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_flake8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_pep257[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Checks XML files like the package manifest using xmllint
-EAPI=7
-HOMEPAGE=https://github.com/ament/ament_lint
-IUSE=test test python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ament/ament_lint/archive/0.9.5.tar.gz -> ament_lint-0.9.5.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=382e984dd7d3889d855698d0b9d15c30
diff --git a/metadata/md5-cache/dev-ros/ament_xmllint-9999 b/metadata/md5-cache/dev-ros/ament_xmllint-9999
index d03dc8045643..2de148ff0f31 100644
--- a/metadata/md5-cache/dev-ros/ament_xmllint-9999
+++ b/metadata/md5-cache/dev-ros/ament_xmllint-9999
@@ -7,9 +7,9 @@ HOMEPAGE=https://github.com/ament/ament_lint
 IUSE=test test python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=dev-ros/ament_lint[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libxml2[python,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=382e984dd7d3889d855698d0b9d15c30
+_md5_=d93beb5aa4b64474bf240096f6f93fb1
diff --git a/metadata/md5-cache/dev-ros/angles-1.9.13 b/metadata/md5-cache/dev-ros/angles-1.9.13
index f93a331110ab..65fdc90a4f45 100644
--- a/metadata/md5-cache/dev-ros/angles-1.9.13
+++ b/metadata/md5-cache/dev-ros/angles-1.9.13
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/angles/archive/1.9.13.tar.gz -> angles-1.9.13.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff71c32720451a93e498f46795a63bc4
diff --git a/metadata/md5-cache/dev-ros/angles-9999 b/metadata/md5-cache/dev-ros/angles-9999
index 024337818a72..f885e300c4ec 100644
--- a/metadata/md5-cache/dev-ros/angles-9999
+++ b/metadata/md5-cache/dev-ros/angles-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff71c32720451a93e498f46795a63bc4
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.6 b/metadata/md5-cache/dev-ros/audio_capture-0.3.6
index 648b67eb4b09..e31627c28dbf 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.6
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.6.tar.gz -> audio_common-0.3.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64fdba36435eba08dd70a22f43ae4a2f
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.7 b/metadata/md5-cache/dev-ros/audio_capture-0.3.7
index 1171580f067a..af3183aba457 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.7
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.7.tar.gz -> audio_common-0.3.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64fdba36435eba08dd70a22f43ae4a2f
diff --git a/metadata/md5-cache/dev-ros/audio_capture-9999 b/metadata/md5-cache/dev-ros/audio_capture-9999
index 69e1142159f2..01a4de8531d7 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-9999
+++ b/metadata/md5-cache/dev-ros/audio_capture-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64fdba36435eba08dd70a22f43ae4a2f
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6
index 12670befd8aa..a96026d4597a 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.6.tar.gz -> audio_common-0.3.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de63960ca5ad5ac769adc5b8ef25acf7
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.7 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.7
index 46dad7d50a32..e87545d5bee7 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.7
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.7.tar.gz -> audio_common-0.3.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de63960ca5ad5ac769adc5b8ef25acf7
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-9999 b/metadata/md5-cache/dev-ros/audio_common_msgs-9999
index f749491fe819..ba3726a0e9a4 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-9999
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de63960ca5ad5ac769adc5b8ef25acf7
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.6 b/metadata/md5-cache/dev-ros/audio_play-0.3.6
index b9eb08b5c0f5..e529b57b0ab4 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.6
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.6.tar.gz -> audio_common-0.3.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94f22bf7c6a558567594e3bbcd74ec96
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.7 b/metadata/md5-cache/dev-ros/audio_play-0.3.7
index 93bf98482913..d6e2fdb2f2c4 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.7
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.7.tar.gz -> audio_common-0.3.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94f22bf7c6a558567594e3bbcd74ec96
diff --git a/metadata/md5-cache/dev-ros/audio_play-9999 b/metadata/md5-cache/dev-ros/audio_play-9999
index 3d9a3d73affa..d7e141e350b5 100644
--- a/metadata/md5-cache/dev-ros/audio_play-9999
+++ b/metadata/md5-cache/dev-ros/audio_play-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94f22bf7c6a558567594e3bbcd74ec96
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.17.0 b/metadata/md5-cache/dev-ros/base_local_planner-1.17.0
index 828876cd344c..dd50fd0fa2ec 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-1.17.0
+++ b/metadata/md5-cache/dev-ros/base_local_planner-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f947d2cb6fe176df3738c8c6df211905
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-9999 b/metadata/md5-cache/dev-ros/base_local_planner-9999
index 6e0bc3f07de8..087ff92c1f81 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/base_local_planner-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[pyt
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f947d2cb6fe176df3738c8c6df211905
diff --git a/metadata/md5-cache/dev-ros/bond-1.8.5 b/metadata/md5-cache/dev-ros/bond-1.8.5
index 738106a9db4e..b11ec74464c7 100644
--- a/metadata/md5-cache/dev-ros/bond-1.8.5
+++ b/metadata/md5-cache/dev-ros/bond-1.8.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.5.tar.gz -> bond_core-1.8.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d3ac4dd2efee4b100138be71dbd3f73
diff --git a/metadata/md5-cache/dev-ros/bond-1.8.6 b/metadata/md5-cache/dev-ros/bond-1.8.6
index 9b116700cafb..196821644ff3 100644
--- a/metadata/md5-cache/dev-ros/bond-1.8.6
+++ b/metadata/md5-cache/dev-ros/bond-1.8.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.6.tar.gz -> bond_core-1.8.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d3ac4dd2efee4b100138be71dbd3f73
diff --git a/metadata/md5-cache/dev-ros/bond-9999 b/metadata/md5-cache/dev-ros/bond-9999
index e928d4f93357..d7304f1585ee 100644
--- a/metadata/md5-cache/dev-ros/bond-9999
+++ b/metadata/md5-cache/dev-ros/bond-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d3ac4dd2efee4b100138be71dbd3f73
diff --git a/metadata/md5-cache/dev-ros/bondcpp-1.8.5 b/metadata/md5-cache/dev-ros/bondcpp-1.8.5
index b8892c04b509..3f42c4384642 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-1.8.5
+++ b/metadata/md5-cache/dev-ros/bondcpp-1.8.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.5.tar.gz -> bond_core-1.8.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1231b8405941d634eee73b624944f1c
diff --git a/metadata/md5-cache/dev-ros/bondcpp-1.8.6 b/metadata/md5-cache/dev-ros/bondcpp-1.8.6
index 59e425286149..8c10881ff124 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-1.8.6
+++ b/metadata/md5-cache/dev-ros/bondcpp-1.8.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.6.tar.gz -> bond_core-1.8.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1231b8405941d634eee73b624944f1c
diff --git a/metadata/md5-cache/dev-ros/bondcpp-9999 b/metadata/md5-cache/dev-ros/bondcpp-9999
index e3abd873991f..a3cd696b07d2 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-9999
+++ b/metadata/md5-cache/dev-ros/bondcpp-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/bond dev-ros/cmake_modules >=dev-ros/roscpp-1.13.6 dev-ros/smcli
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1231b8405941d634eee73b624944f1c
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.8.5 b/metadata/md5-cache/dev-ros/bondpy-1.8.5
index 6e350b4ccf3e..92c24bd0514c 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.8.5
+++ b/metadata/md5-cache/dev-ros/bondpy-1.8.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.5.tar.gz -> bond_core-1.8.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7474a45b9c35d2267667350b8489004
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.8.6 b/metadata/md5-cache/dev-ros/bondpy-1.8.6
index c6dbe7f5d426..f42e9ee3f235 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.8.6
+++ b/metadata/md5-cache/dev-ros/bondpy-1.8.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.6.tar.gz -> bond_core-1.8.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7474a45b9c35d2267667350b8489004
diff --git a/metadata/md5-cache/dev-ros/bondpy-9999 b/metadata/md5-cache/dev-ros/bondpy-9999
index e9aa44c0dd71..78c51acd6591 100644
--- a/metadata/md5-cache/dev-ros/bondpy-9999
+++ b/metadata/md5-cache/dev-ros/bondpy-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/bond[python_single_target_python3_7(-)?] dev-ros/rospy[python_si
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7474a45b9c35d2267667350b8489004
diff --git a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14 b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
index 9c58d9054f87..e9ce97613777 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa76d91e76e67f399830ed7e5d76f059
diff --git a/metadata/md5-cache/dev-ros/calibration_estimation-9999 b/metadata/md5-cache/dev-ros/calibration_estimation-9999
index 99e1c6c97c59..01b5bac8667d 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-9999
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa76d91e76e67f399830ed7e5d76f059
diff --git a/metadata/md5-cache/dev-ros/calibration_launch-0.10.14 b/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
index 7f8ad90056b2..1deac7f4df9d 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7f19cf72a5d99628726d97812d758f4
diff --git a/metadata/md5-cache/dev-ros/calibration_launch-9999 b/metadata/md5-cache/dev-ros/calibration_launch-9999
index ecf6bb51a864..233c1e248f76 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-9999
+++ b/metadata/md5-cache/dev-ros/calibration_launch-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7f19cf72a5d99628726d97812d758f4
diff --git a/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14 b/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
index 7042936fcc52..00304ed8b056 100644
--- a/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfdbf88ea58efa0567ef1b7e13961029
diff --git a/metadata/md5-cache/dev-ros/calibration_msgs-9999 b/metadata/md5-cache/dev-ros/calibration_msgs-9999
index fa68c500cd2f..b6ab8141d4cb 100644
--- a/metadata/md5-cache/dev-ros/calibration_msgs-9999
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfdbf88ea58efa0567ef1b7e13961029
diff --git a/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14 b/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14
index 4945f1d1cc7b..cb008853b19b 100644
--- a/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.14
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=857ec1b6e75a7d4be74b62f90af83e66
diff --git a/metadata/md5-cache/dev-ros/calibration_setup_helper-9999 b/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
index a80da8451b71..815af353a876 100644
--- a/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
+++ b/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/calibration_launch python_single_target_python3_7? ( dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=857ec1b6e75a7d4be74b62f90af83e66
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.15.2 b/metadata/md5-cache/dev-ros/camera_calibration-1.15.2
index 1bc6ced591fe..2e260a726181 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.15.2
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.15.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz -> camera_calibration-1.15.2-camera_calibration.tar.gz http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz -> camera_calibration-1.15.2-multi_board_calibration.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfb2fa254ac35e47e4dd86325d7120d7
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-9999 b/metadata/md5-cache/dev-ros/camera_calibration-9999
index 8f5f4d2d0eda..51d451746f1c 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/camera_calibration-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz -> camera_calibration-9999-camera_calibration.tar.gz http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz -> camera_calibration-9999-multi_board_calibration.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfb2fa254ac35e47e4dd86325d7120d7
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0
index 4cb678085944..c2ec8d7e1d14 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=36995f8465c691edde3fa6cd35e1e7ae
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
index 3cd485aeed7d..4a2503fc680c 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=36995f8465c691edde3fa6cd35e1e7ae
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.12.0 b/metadata/md5-cache/dev-ros/camera_info_manager-1.12.0
index 974ec01a7f02..f954c73949b7 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.12.0
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3caa7e5ebd1981f0464ca1cbc11d9ca
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-9999 b/metadata/md5-cache/dev-ros/camera_info_manager-9999
index a1eedfd54f24..17e015e558f8 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-9999
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscp
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3caa7e5ebd1981f0464ca1cbc11d9ca
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.17.0-r1 b/metadata/md5-cache/dev-ros/carrot_planner-1.17.0-r1
index a4e2fd532b85..0f8816ddeb52 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.17.0-r1
+++ b/metadata/md5-cache/dev-ros/carrot_planner-1.17.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4aba74e6e586813ce43e714830383858
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-9999 b/metadata/md5-cache/dev-ros/carrot_planner-9999
index 8129657a5404..c2105123ac38 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-9999
+++ b/metadata/md5-cache/dev-ros/carrot_planner-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/na
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4aba74e6e586813ce43e714830383858
diff --git a/metadata/md5-cache/dev-ros/class_loader-0.5.0 b/metadata/md5-cache/dev-ros/class_loader-0.5.0
index 74808b08e5ac..1318bf3a806f 100644
--- a/metadata/md5-cache/dev-ros/class_loader-0.5.0
+++ b/metadata/md5-cache/dev-ros/class_loader-0.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/melodic2
 SRC_URI=https://github.com/ros/class_loader/archive/0.5.0.tar.gz -> class_loader-0.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea25e496e9205be6f619095d789cb1c5
diff --git a/metadata/md5-cache/dev-ros/class_loader-9999 b/metadata/md5-cache/dev-ros/class_loader-9999
index 92402937a55f..c38cb025e111 100644
--- a/metadata/md5-cache/dev-ros/class_loader-9999
+++ b/metadata/md5-cache/dev-ros/class_loader-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/melodic2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea25e496e9205be6f619095d789cb1c5
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0
index 2f4cb28f16c4..8afaa5259704 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=231b6389e7236afcdd3fdf6e8a4399cc
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
index 7d9542e96dee..fbfdda012002 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/plu
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=231b6389e7236afcdd3fdf6e8a4399cc
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-0.5.0 b/metadata/md5-cache/dev-ros/cmake_modules-0.5.0
index 2eac39752861..40f859fd960a 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-0.5.0
+++ b/metadata/md5-cache/dev-ros/cmake_modules-0.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/cmake_modules/archive/0.5.0.tar.gz -> cmake_modules-0.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ed8adbe875888eb5dd936712d309c00
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-9999 b/metadata/md5-cache/dev-ros/cmake_modules-9999
index 010e96bb721e..819506d536c8 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-9999
+++ b/metadata/md5-cache/dev-ros/cmake_modules-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ed8adbe875888eb5dd936712d309c00
diff --git a/metadata/md5-cache/dev-ros/collada_parser-1.12.13 b/metadata/md5-cache/dev-ros/collada_parser-1.12.13
index bdbdf9ebfcc0..1a5409de6bbe 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-1.12.13
+++ b/metadata/md5-cache/dev-ros/collada_parser-1.12.13
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.13.tar.gz -> collada_urdf-1.12.13.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2a7d635cc3062e6dc1bda167558ba78
diff --git a/metadata/md5-cache/dev-ros/collada_parser-9999 b/metadata/md5-cache/dev-ros/collada_parser-9999
index a5d726f642c3..1c3d3856432e 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-9999
+++ b/metadata/md5-cache/dev-ros/collada_parser-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loade
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2a7d635cc3062e6dc1bda167558ba78
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-1.12.13 b/metadata/md5-cache/dev-ros/collada_urdf-1.12.13
index ecc69b4b7616..c0eee1da4511 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-1.12.13
+++ b/metadata/md5-cache/dev-ros/collada_urdf-1.12.13
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.13.tar.gz -> collada_urdf-1.12.13.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4115555a31f7ef057529bde59ca5e1c3
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-9999 b/metadata/md5-cache/dev-ros/collada_urdf-9999
index 04fb2665e296..f23bcbb1202f 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-9999
+++ b/metadata/md5-cache/dev-ros/collada_urdf-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4115555a31f7ef057529bde59ca5e1c3
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1
index 09d902dcd7f7..a2800486dee8 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df7e8a0862fa84f81e4346d497255bc3
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.2 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.2
index 3da4d3870f39..ecbfce1b3377 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.2
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df7e8a0862fa84f81e4346d497255bc3
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-9999 b/metadata/md5-cache/dev-ros/combined_robot_hw-9999
index 4970d474b318..8b2b190d9d01 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:=
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df7e8a0862fa84f81e4346d497255bc3
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
index 5f7e30f96567..fe79936c5c2a 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=749ce5cd1956ce73850c7b2ed221a298
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.2 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.2
index 78e8b50ab43e..bf878130ad85 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.2
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=749ce5cd1956ce73850c7b2ed221a298
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
index 972478660d82..887dfa5b7ab9 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=749ce5cd1956ce73850c7b2ed221a298
diff --git a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0 b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
index b327aad34354..5ea1e5307e4c 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.14.0.tar.gz -> image_transport_plugins-1.14.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd664d07887fd189f098ff58d734b12b
diff --git a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999 b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
index efb1e6b1020a..f7084ae2d0c7 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd664d07887fd189f098ff58d734b12b
diff --git a/metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0 b/metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0
index 237ecf3e7cab..752d90da0f12 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.14.0.tar.gz -> image_transport_plugins-1.14.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18865f53abe09f215a18065131bb10cb
diff --git a/metadata/md5-cache/dev-ros/compressed_image_transport-9999 b/metadata/md5-cache/dev-ros/compressed_image_transport-9999
index 01ed7ee98121..6ced59101c88 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18865f53abe09f215a18065131bb10cb
diff --git a/metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.1 b/metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.1
index 864e736ac986..2bb66fdf0e99 100644
--- a/metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.1
+++ b/metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/console_bridge-1.0.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros2/console_bridge_vendor/archive/1.2.1.tar.gz -> console_bridge_vendor-1.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e3cfb93af19da0c73a2cea29521013f
diff --git a/metadata/md5-cache/dev-ros/console_bridge_vendor-9999 b/metadata/md5-cache/dev-ros/console_bridge_vendor-9999
index 912b4393f1fd..b48c626d34dd 100644
--- a/metadata/md5-cache/dev-ros/console_bridge_vendor-9999
+++ b/metadata/md5-cache/dev-ros/console_bridge_vendor-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/console_bridge-1.0.1
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e3cfb93af19da0c73a2cea29521013f
diff --git a/metadata/md5-cache/dev-ros/control_msgs-1.5.2 b/metadata/md5-cache/dev-ros/control_msgs-1.5.2
index d7cfdf827879..f2f41be8b87b 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-1.5.2
+++ b/metadata/md5-cache/dev-ros/control_msgs-1.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/control_msgs/archive/1.5.2.tar.gz -> control_msgs-1.5.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ead36c91c5596d4c4e2ea71eed51546
diff --git a/metadata/md5-cache/dev-ros/control_msgs-9999 b/metadata/md5-cache/dev-ros/control_msgs-9999
index 9a7cbbb9e43b..176322d281be 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-9999
+++ b/metadata/md5-cache/dev-ros/control_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ead36c91c5596d4c4e2ea71eed51546
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-1.18.2 b/metadata/md5-cache/dev-ros/control_toolbox-1.18.2
index b404e04d1b0a..a705aebc11f2 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-1.18.2
+++ b/metadata/md5-cache/dev-ros/control_toolbox-1.18.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/control_toolbox/archive/1.18.2.tar.gz -> control_toolbox-1.18.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66b9fff91bfe82c285fc7a6b337ddb65
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-9999 b/metadata/md5-cache/dev-ros/control_toolbox-9999
index a7c1858cb870..fd4bc7247908 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-9999
+++ b/metadata/md5-cache/dev-ros/control_toolbox-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-li
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66b9fff91bfe82c285fc7a6b337ddb65
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.19.1-r1 b/metadata/md5-cache/dev-ros/controller_interface-0.19.1-r1
index 156ed7e00c76..830d3bea4b72 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.19.1-r1
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.19.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7332dbe70c23f0b5c45f4965f4f594f5
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.19.2 b/metadata/md5-cache/dev-ros/controller_interface-0.19.2
index f7fc05999ae5..b2e0f97e6eba 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.19.2
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7332dbe70c23f0b5c45f4965f4f594f5
diff --git a/metadata/md5-cache/dev-ros/controller_interface-9999 b/metadata/md5-cache/dev-ros/controller_interface-9999
index 697bbf4b4b66..0f5c6e35fe38 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-9999
+++ b/metadata/md5-cache/dev-ros/controller_interface-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib:= python_sin
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7332dbe70c23f0b5c45f4965f4f594f5
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.19.1 b/metadata/md5-cache/dev-ros/controller_manager-0.19.1
index 9ca32f9c347b..ae70ae01e990 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.19.1
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e9ea3a67a13514867b1c2b4d68191a8
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.19.2 b/metadata/md5-cache/dev-ros/controller_manager-0.19.2
index 1c139d9dbb7d..0e576e8a2d9e 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.19.2
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e9ea3a67a13514867b1c2b4d68191a8
diff --git a/metadata/md5-cache/dev-ros/controller_manager-9999 b/metadata/md5-cache/dev-ros/controller_manager-9999
index ced3b5b3a09f..866451bb8812 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e9ea3a67a13514867b1c2b4d68191a8
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1
index dcb13636dea8..d2d447d7a07c 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a82b1a5b97417f2b39f5cbd47692ea61
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.2 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.2
index 80f9ccd866c1..423078664dd3 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.2
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a82b1a5b97417f2b39f5cbd47692ea61
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-9999 b/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
index b5f04e56eb8f..0988dc568ea8 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_p
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a82b1a5b97417f2b39f5cbd47692ea61
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
index 2788ddbb3f1d..a0756019f283 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbafac8f035225bb77b456e7b34e69b6
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.2 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.2
index a034dfdc3bd3..c7ee8519f956 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.2
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb354ea6a2e4972a4c54b3d519e81b82
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-9999 b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
index cb3c05c0c8a0..b4b0d3469cf2 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/c
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb354ea6a2e4972a4c54b3d519e81b82
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12 b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
index 3e4049efa8d5..810939d5bbe6 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/convex_decomposition/archive/0.1.12.tar.gz -> convex_decomposition-0.1.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d3fb7be73c1a7467c91d52567060bfb
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-9999 b/metadata/md5-cache/dev-ros/convex_decomposition-9999
index 49e2292bc74b..cba468bd5744 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-9999
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-9999
@@ -11,5 +11,5 @@ RDEPEND=app-arch/unzip python_single_target_python3_7? ( dev-lang/python:3.7 >=d
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d3fb7be73c1a7467c91d52567060bfb
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1 b/metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1
index 5b5fb5ec15a2..b9a770d3bb5d 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1
+++ b/metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz http://download.ros.org/data/costmap_2d/simple_driving_test_indexed.bag -> costmap_2d-1.17.0-simple_driving_test_indexed.bag http://download.ros.org/data/costmap_2d/willow-full-0.025.pgm -> costmap_2d-1.17.0-willow-full-0.025.pgm
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39b02f2dcdf7bdfff6aa330189c87df8
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-9999 b/metadata/md5-cache/dev-ros/costmap_2d-9999
index 9e5fc708b68d..31b38902d78b 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-9999
+++ b/metadata/md5-cache/dev-ros/costmap_2d-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/data/costmap_2d/simple_driving_test_indexed.bag -> costmap_2d-9999-simple_driving_test_indexed.bag http://download.ros.org/data/costmap_2d/willow-full-0.025.pgm -> costmap_2d-9999-willow-full-0.025.pgm
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39b02f2dcdf7bdfff6aa330189c87df8
diff --git a/metadata/md5-cache/dev-ros/cpp_common-0.7.2 b/metadata/md5-cache/dev-ros/cpp_common-0.7.2
index ed62a64d8b7b..a00ff854c386 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-0.7.2
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.7.2.tar.gz -> roscpp_core-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=574c0e74863867b299f9c1c2dfaa4eff
diff --git a/metadata/md5-cache/dev-ros/cpp_common-9999 b/metadata/md5-cache/dev-ros/cpp_common-9999
index 903d76b21266..00127a0ee556 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-9999
+++ b/metadata/md5-cache/dev-ros/cpp_common-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_single_target
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=574c0e74863867b299f9c1c2dfaa4eff
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.15.0 b/metadata/md5-cache/dev-ros/cv_bridge-1.15.0
index e9643a02dc30..3a36712f31e6 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.15.0
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf41b18245173127a545bf5d520c8299
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-9999 b/metadata/md5-cache/dev-ros/cv_bridge-9999
index 15ba798c5e97..607eb2ba018b 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-9999
+++ b/metadata/md5-cache/dev-ros/cv_bridge-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+),png,jpeg,tiff] pyt
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf41b18245173127a545bf5d520c8299
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-1.15.2 b/metadata/md5-cache/dev-ros/depth_image_proc-1.15.2
index ca45cf403ce4..75bf18f88f6a 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-1.15.2
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-1.15.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cec3f1a2bdea775d505e7abf1f6ab93
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-9999 b/metadata/md5-cache/dev-ros/depth_image_proc-9999
index 13fd73dc013d..32d773ff4064 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-9999
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/eigen_conversions dev-ros/
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cec3f1a2bdea775d505e7abf1f6ab93
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
index 1666242c1415..71c577138622 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/depthimage_to_laserscan/archive/1.0.8.tar.gz -> depthimage_to_laserscan-1.0.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8bdaeeb64d92430af5f36dfcc4404477
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
index 409e55dcf722..b6ab69299eab 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8bdaeeb64d92430af5f36dfcc4404477
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.1 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.1
index 65956913b569..4e7de34f3728 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.1
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5557d08ee07d9e7fb755bb6100e61b15
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
index d2fe65ded00f..96fbcb7e98cf 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/pluginlib:= dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy dev
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5557d08ee07d9e7fb755bb6100e61b15
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.1 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.1
index 1239cd05bf47..a168eb099a77 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.1
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dedbc747381c781b1d8e24cd155217bb
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4
index 7c9d35c1485b..7c943b87dabd 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dedbc747381c781b1d8e24cd155217bb
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.6 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.6
index 31ac73128f02..57275a945443 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.6
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.6.tar.gz -> diagnostics-1.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dedbc747381c781b1d8e24cd155217bb
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-9999 b/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
index 88c66d115e8a..8de1cc2061b4 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dedbc747381c781b1d8e24cd155217bb
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.1 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.1
index 9f0af2ac7be0..3af0c6935763 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.1
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68b4a6f01dfcd01460667a50d8634671
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.4 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.4
index 096a5f0f150a..873cb5fa1c15 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68b4a6f01dfcd01460667a50d8634671
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.6 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.6
index 061fb0c35905..f4a7aa672bba 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.6
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.9.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.6.tar.gz -> diagnostics-1.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68b4a6f01dfcd01460667a50d8634671
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
index e43a0186bad0..b87b27800786 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/r
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68b4a6f01dfcd01460667a50d8634671
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0 b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
index e515d713d49d..85d93f1a4497 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=886f5ee4f61183592c17894438837433
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-9999 b/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
index 0f62e7f25536..732c369ce73e 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=886f5ee4f61183592c17894438837433
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.1 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.1
index 9fd94bc29a5b..437fe46ae960 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.1
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f637180ddfe4dd7f6fd9d0ced9548c8
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4
index a1e0eaf21bab..5bf9b1161b2f 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f637180ddfe4dd7f6fd9d0ced9548c8
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.6 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.6
index afab1982bd49..eecc8d22998b 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.6
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.6.tar.gz -> diagnostics-1.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f637180ddfe4dd7f6fd9d0ced9548c8
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-9999 b/metadata/md5-cache/dev-ros/diagnostic_updater-9999
index 307be8adf0ac..160df19ecbf8 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f637180ddfe4dd7f6fd9d0ced9548c8
diff --git a/metadata/md5-cache/dev-ros/driver_base-1.6.8 b/metadata/md5-cache/dev-ros/driver_base-1.6.8
index 01c9e3dd97aa..41d1a6544e2e 100644
--- a/metadata/md5-cache/dev-ros/driver_base-1.6.8
+++ b/metadata/md5-cache/dev-ros/driver_base-1.6.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/driver_common/archive/1.6.8.tar.gz -> driver_common-1.6.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47fe3039e76fa5de838dd16bdfd5a936
diff --git a/metadata/md5-cache/dev-ros/driver_base-9999 b/metadata/md5-cache/dev-ros/driver_base-9999
index bc2d6c3affb5..2c667f97d8b8 100644
--- a/metadata/md5-cache/dev-ros/driver_base-9999
+++ b/metadata/md5-cache/dev-ros/driver_base-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47fe3039e76fa5de838dd16bdfd5a936
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0
index 83a41f7a254c..81364214f7e9 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=affd31a6290d3ebb58c34263148d09d9
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-9999 b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
index d63f9899d6ba..27fb0103e665 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dyn
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=affd31a6290d3ebb58c34263148d09d9
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.1 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.1
index 101876b11b44..a59389ad61cf 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.1
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.7.1.tar.gz -> dynamic_reconfigure-1.7.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d06c3a9cb790443610144e2cfd79d01
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
index dcfcc5b34ae7..2a82c42d0951 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d06c3a9cb790443610144e2cfd79d01
diff --git a/metadata/md5-cache/dev-ros/eigen_conversions-1.13.2 b/metadata/md5-cache/dev-ros/eigen_conversions-1.13.2
index 64ccae196ea6..88a3b0d6aca8 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-1.13.2
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-1.13.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.13.2.tar.gz -> geometry-1.13.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06d257b5cf3b920e3549d99f9dc375c7
diff --git a/metadata/md5-cache/dev-ros/eigen_conversions-9999 b/metadata/md5-cache/dev-ros/eigen_conversions-9999
index 4e568499417b..062ddfb74679 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-9999
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-9999
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06d257b5cf3b920e3549d99f9dc375c7
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
index c361577bca10..ed058615b642 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.8.tar.gz -> eigen_stl_containers-0.1.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70b5caeb0dc427ad6b3d87326c2656b3
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-9999 b/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
index d32fe70b9f5e..507cd7aa7350 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70b5caeb0dc427ad6b3d87326c2656b3
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.17.0 b/metadata/md5-cache/dev-ros/fake_localization-1.17.0
index 8e27185a940c..e0a36f3baccb 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-1.17.0
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b2989dcd1a5b3100835667f8f2f38e9
diff --git a/metadata/md5-cache/dev-ros/fake_localization-9999 b/metadata/md5-cache/dev-ros/fake_localization-9999
index f3f0b61f6700..bc3ae5adaee4 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-9999
+++ b/metadata/md5-cache/dev-ros/fake_localization-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_sing
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b2989dcd1a5b3100835667f8f2f38e9
diff --git a/metadata/md5-cache/dev-ros/filters-1.9.0 b/metadata/md5-cache/dev-ros/filters-1.9.0
index 40b9d0835f27..816c70e9e4ca 100644
--- a/metadata/md5-cache/dev-ros/filters-1.9.0
+++ b/metadata/md5-cache/dev-ros/filters-1.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/filters/archive/1.9.0.tar.gz -> filters-1.9.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=20027b0f1e30d6b0edb94721f9dab0ac
diff --git a/metadata/md5-cache/dev-ros/filters-9999 b/metadata/md5-cache/dev-ros/filters-9999
index 1efa8a579a93..4fcf55152f79 100644
--- a/metadata/md5-cache/dev-ros/filters-9999
+++ b/metadata/md5-cache/dev-ros/filters-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-r
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=20027b0f1e30d6b0edb94721f9dab0ac
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
index 9e2ed463d3f7..e86278739f1b 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b327cea369c8453b406b61ce9c2a5422
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-9999 b/metadata/md5-cache/dev-ros/gazebo_dev-9999
index 1ead46c344b4..a5277edf0d51 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-9999
@@ -11,5 +11,5 @@ RDEPEND=sci-electronics/gazebo python_single_target_python3_7? ( dev-lang/python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b327cea369c8453b406b61ce9c2a5422
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
index bc3e4dc86bde..07bc2f965ebf 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5231bcb1ababf0a1c7fa0bdd6dd0661d
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-9999 b/metadata/md5-cache/dev-ros/gazebo_msgs-9999
index 2fe806b53486..c3e0c75fc31a 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5231bcb1ababf0a1c7fa0bdd6dd0661d
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
index 4a8f5e1d5b92..05bc729fa604 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0ccc4f7cb1ff2271f58a164612487dc
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-9999 b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
index 6d6bcd11bdc8..c790316765e3 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0ccc4f7cb1ff2271f58a164612487dc
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
index b04e97078e9a..45f7a3379d0f 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=63f20d33cc4d6c3408bfd2bf368ea5d0
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-9999 b/metadata/md5-cache/dev-ros/gazebo_ros-9999
index 3953d62afc69..59e7d496f8b7 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/pr
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=63f20d33cc4d6c3408bfd2bf368ea5d0
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1
index 7dd090e422bc..4674e50ca68b 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe2b15fcc5e2edd26caeaa5b226f1c70
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999 b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
index 1f22749996e2..a3efaeea49a9 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_too
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe2b15fcc5e2edd26caeaa5b226f1c70
diff --git a/metadata/md5-cache/dev-ros/gencpp-0.6.5 b/metadata/md5-cache/dev-ros/gencpp-0.6.5
index 5f2d94611a40..e2abb39a692e 100644
--- a/metadata/md5-cache/dev-ros/gencpp-0.6.5
+++ b/metadata/md5-cache/dev-ros/gencpp-0.6.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/0.6.5
 SRC_URI=https://github.com/ros/gencpp/archive/0.6.5.tar.gz -> gencpp-0.6.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf5e45c38cc680d7b2b694291cc14b16
diff --git a/metadata/md5-cache/dev-ros/gencpp-9999 b/metadata/md5-cache/dev-ros/gencpp-9999
index b6d186727f72..39a80defd195 100644
--- a/metadata/md5-cache/dev-ros/gencpp-9999
+++ b/metadata/md5-cache/dev-ros/gencpp-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf5e45c38cc680d7b2b694291cc14b16
diff --git a/metadata/md5-cache/dev-ros/geneus-3.0.0-r1 b/metadata/md5-cache/dev-ros/geneus-3.0.0-r1
index 890596d44575..354044925a1c 100644
--- a/metadata/md5-cache/dev-ros/geneus-3.0.0-r1
+++ b/metadata/md5-cache/dev-ros/geneus-3.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/3.0.0
 SRC_URI=https://github.com/jsk-ros-pkg/geneus/archive/3.0.0.tar.gz -> geneus-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07cd86823a52009f839f82d634ad4fd5
diff --git a/metadata/md5-cache/dev-ros/geneus-9999 b/metadata/md5-cache/dev-ros/geneus-9999
index 15a965a6370f..a6f750a3bcf5 100644
--- a/metadata/md5-cache/dev-ros/geneus-9999
+++ b/metadata/md5-cache/dev-ros/geneus-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07cd86823a52009f839f82d634ad4fd5
diff --git a/metadata/md5-cache/dev-ros/genlisp-0.4.18 b/metadata/md5-cache/dev-ros/genlisp-0.4.18
index 7f80e6f50bad..b6fc39c46260 100644
--- a/metadata/md5-cache/dev-ros/genlisp-0.4.18
+++ b/metadata/md5-cache/dev-ros/genlisp-0.4.18
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/0.4.18
 SRC_URI=https://github.com/ros/genlisp/archive/0.4.18.tar.gz -> genlisp-0.4.18.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d47add50bf7b0d67d6e8cf4c8726141
diff --git a/metadata/md5-cache/dev-ros/genlisp-9999 b/metadata/md5-cache/dev-ros/genlisp-9999
index b533c4383916..7a96f4bb13a8 100644
--- a/metadata/md5-cache/dev-ros/genlisp-9999
+++ b/metadata/md5-cache/dev-ros/genlisp-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d47add50bf7b0d67d6e8cf4c8726141
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.16 b/metadata/md5-cache/dev-ros/genmsg-0.5.16
index 2921e6238109..1c132a52b708 100644
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.16
+++ b/metadata/md5-cache/dev-ros/genmsg-0.5.16
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/genmsg/archive/0.5.16.tar.gz -> genmsg-0.5.16.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b256532efa7c4d61b391eadf6fe72fe
diff --git a/metadata/md5-cache/dev-ros/genmsg-9999 b/metadata/md5-cache/dev-ros/genmsg-9999
index 84f948f45b27..0722145adbb7 100644
--- a/metadata/md5-cache/dev-ros/genmsg-9999
+++ b/metadata/md5-cache/dev-ros/genmsg-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b256532efa7c4d61b391eadf6fe72fe
diff --git a/metadata/md5-cache/dev-ros/gennodejs-2.0.1 b/metadata/md5-cache/dev-ros/gennodejs-2.0.1
index db4db6547ada..2f00888b206f 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-2.0.1
+++ b/metadata/md5-cache/dev-ros/gennodejs-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/2.0.1
 SRC_URI=https://github.com/RethinkRobotics-opensource/gennodejs/archive/2.0.1.tar.gz -> gennodejs-2.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82a48fa628f3382d32a13341fa0a31e1
diff --git a/metadata/md5-cache/dev-ros/gennodejs-9999 b/metadata/md5-cache/dev-ros/gennodejs-9999
index b7bbd8edb2f9..41bbfb6e3994 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-9999
+++ b/metadata/md5-cache/dev-ros/gennodejs-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82a48fa628f3382d32a13341fa0a31e1
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.11 b/metadata/md5-cache/dev-ros/genpy-0.6.11
index 591b7b1352f0..43d44549a5de 100644
--- a/metadata/md5-cache/dev-ros/genpy-0.6.11
+++ b/metadata/md5-cache/dev-ros/genpy-0.6.11
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/0.6.11
 SRC_URI=https://github.com/ros/genpy/archive/0.6.11.tar.gz -> genpy-0.6.11.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0dc2e9627c07ac7646f8fb119c8c8210
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.14 b/metadata/md5-cache/dev-ros/genpy-0.6.14
index 5d201e51edd1..f2ac2de77caf 100644
--- a/metadata/md5-cache/dev-ros/genpy-0.6.14
+++ b/metadata/md5-cache/dev-ros/genpy-0.6.14
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/0.6.14
 SRC_URI=https://github.com/ros/genpy/archive/0.6.14.tar.gz -> genpy-0.6.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0dc2e9627c07ac7646f8fb119c8c8210
diff --git a/metadata/md5-cache/dev-ros/genpy-9999 b/metadata/md5-cache/dev-ros/genpy-9999
index 23e38459c4ec..dd2f95318cc2 100644
--- a/metadata/md5-cache/dev-ros/genpy-9999
+++ b/metadata/md5-cache/dev-ros/genpy-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0dc2e9627c07ac7646f8fb119c8c8210
diff --git a/metadata/md5-cache/dev-ros/geodesy-0.5.5 b/metadata/md5-cache/dev-ros/geodesy-0.5.5
index f5c31cb5096c..c2fbfbc25c45 100644
--- a/metadata/md5-cache/dev-ros/geodesy-0.5.5
+++ b/metadata/md5-cache/dev-ros/geodesy-0.5.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/0.5.5.tar.gz -> geographic_info-0.5.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e545964748af07d52bd5978719c80f3
diff --git a/metadata/md5-cache/dev-ros/geodesy-9999 b/metadata/md5-cache/dev-ros/geodesy-9999
index e4454d64fc69..3072209fdf2c 100644
--- a/metadata/md5-cache/dev-ros/geodesy-9999
+++ b/metadata/md5-cache/dev-ros/geodesy-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_sin
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e545964748af07d52bd5978719c80f3
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5 b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
index a0c5031713c1..c7dac7714ca6 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/0.5.5.tar.gz -> geographic_info-0.5.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfbe26988d020197f147fac0f0bf2e25
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-9999 b/metadata/md5-cache/dev-ros/geographic_msgs-9999
index 1468f28d4108..51b0cd7aca4b 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfbe26988d020197f147fac0f0bf2e25
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0 b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
index 91171703de68..1681f5049044 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.7.0.tar.gz -> geometric_shapes-0.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66a149403d3e3f7e4fa39dee81a14a77
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-9999 b/metadata/md5-cache/dev-ros/geometric_shapes-9999
index 5da737565402..75271bb2b236 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-9999
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66a149403d3e3f7e4fa39dee81a14a77
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0 b/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
index 6a391d1e1d32..c2522119cc71 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=72701395a6441ca24710bdb9deb98c69
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-9999 b/metadata/md5-cache/dev-ros/geometry_msgs-9999
index dadd1f7432f4..f0aa0ac83eeb 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=72701395a6441ca24710bdb9deb98c69
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.17.0 b/metadata/md5-cache/dev-ros/global_planner-1.17.0
index 15a38d77e5e4..2c4aa68f1b15 100644
--- a/metadata/md5-cache/dev-ros/global_planner-1.17.0
+++ b/metadata/md5-cache/dev-ros/global_planner-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a97f0811f15fe2f6fae0fc3886c5db88
diff --git a/metadata/md5-cache/dev-ros/global_planner-9999 b/metadata/md5-cache/dev-ros/global_planner-9999
index 8a067a5505f4..7c1650c380b9 100644
--- a/metadata/md5-cache/dev-ros/global_planner-9999
+++ b/metadata/md5-cache/dev-ros/global_planner-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_targ
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a97f0811f15fe2f6fae0fc3886c5db88
diff --git a/metadata/md5-cache/dev-ros/gmapping-1.4.1 b/metadata/md5-cache/dev-ros/gmapping-1.4.1
index a5556d41e9f1..f1971660a3ea 100644
--- a/metadata/md5-cache/dev-ros/gmapping-1.4.1
+++ b/metadata/md5-cache/dev-ros/gmapping-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.4.1.tar.gz -> slam_gmapping-1.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1af76dc8c46b3a9cccc53626491d0e7
diff --git a/metadata/md5-cache/dev-ros/gmapping-9999 b/metadata/md5-cache/dev-ros/gmapping-9999
index 20b61debb79e..c041af3d1491 100644
--- a/metadata/md5-cache/dev-ros/gmapping-9999
+++ b/metadata/md5-cache/dev-ros/gmapping-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1af76dc8c46b3a9cccc53626491d0e7
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.19.1 b/metadata/md5-cache/dev-ros/hardware_interface-0.19.1
index fcc8cf1bc90c..b18ff7e1e7e3 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.19.1
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27da90fb15967ce2b1e5611caf42f3c4
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.19.2 b/metadata/md5-cache/dev-ros/hardware_interface-0.19.2
index 924bb792c8fa..f5d2325ad891 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.19.2
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27da90fb15967ce2b1e5611caf42f3c4
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-9999 b/metadata/md5-cache/dev-ros/hardware_interface-9999
index e68110cb176c..1b04e374454d 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-9999
+++ b/metadata/md5-cache/dev-ros/hardware_interface-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=d
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27da90fb15967ce2b1e5611caf42f3c4
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1
index 5782674d3810..46f3645442f8 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d830e16d8397255ba1c20e283425b216
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
index 15929fd5d381..4fe829a4097c 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/i
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d830e16d8397255ba1c20e283425b216
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1 b/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
index b4648ba267db..4181ff696197 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d69a6460307608173fc1f79733d2c4f
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-9999 b/metadata/md5-cache/dev-ros/hector_geotiff-9999
index 19a6b0aef6ac..00e8e3485d53 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d69a6460307608173fc1f79733d2c4f
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1
index 188c3b08cfb9..69b945ac0161 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a40ae04cc5a3313a255461d6be4d559
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
index fa2a3c4d657b..146e630b108b 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a40ae04cc5a3313a255461d6be4d559
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1
index 7dee3a678907..4070be4baf1b 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a17eaa44ef1699ca20dd7943f1bcd6c6
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
index 193bd9526f3e..bc1af7bd628b 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a17eaa44ef1699ca20dd7943f1bcd6c6
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1 b/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1
index 4261e022fb23..809108b5a249 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=213489697035b562e76bfd44c44da07d
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-9999 b/metadata/md5-cache/dev-ros/hector_imu_tools-9999
index 72f90b897935..810a193610e5 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_single_target_python3_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=213489697035b562e76bfd44c44da07d
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-0.4.1 b/metadata/md5-cache/dev-ros/hector_map_server-0.4.1
index 8fa35f5a1552..b40cdb25a740 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_map_server-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6822b5490cb03e5c42def1f2a103580
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-9999 b/metadata/md5-cache/dev-ros/hector_map_server-9999
index dbfa1ace945b..828c4a8eaa55 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_server-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing de
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6822b5490cb03e5c42def1f2a103580
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.4.1 b/metadata/md5-cache/dev-ros/hector_map_tools-0.4.1
index 23245ac9277c..940365132b8e 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85c23dd2f9789c5f39ee2170803b4766
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-9999 b/metadata/md5-cache/dev-ros/hector_map_tools-9999
index a62fb19b382b..f8c9c8e8f9bb 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85c23dd2f9789c5f39ee2170803b4766
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.4.1 b/metadata/md5-cache/dev-ros/hector_mapping-0.4.1
index 79d238d4d559..b9cc5e1785ef 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad87d2d78b60f932d629fa814bb74d47
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-9999 b/metadata/md5-cache/dev-ros/hector_mapping-9999
index fd773fe60b8f..b67f665a2555 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-9999
+++ b/metadata/md5-cache/dev-ros/hector_mapping-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad87d2d78b60f932d629fa814bb74d47
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1
index b4e8e88c35bb..97b721b76f1a 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ede9860a621b113b9237ea08cc1105c8
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-9999 b/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
index d501ea1c5afb..ce1329a37c01 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=d
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ede9860a621b113b9237ea08cc1105c8
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1 b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1
index e5ba4b4e5fcf..2e4d5b291290 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8fc6876bc9317bd927b127f32204a198
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999 b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
index f6f0bf56d6f1..d71e01a897f7 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8fc6876bc9317bd927b127f32204a198
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1 b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
index 1a932696ee1c..141d8e714865 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e658ee7e44484c2c9a89267812b2472
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-9999 b/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
index 29ccbcd418f4..b91509a7aefd 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/m
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d90fcc08383e793d7fdf87f1fb3256c1
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1 b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
index 106e3e48a3a8..3646cb978b16 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a40d3b7b6eeef71184fd7c6fe8f399dc
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999 b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
index 1672c0618ce9..fc9a8e872128 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/bo
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fabbfad8e1eab30ede6e0257ae2ed725
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1
index 42666ff198df..6962ca382292 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af4bd6a8cf4132a83050d6be43cc1116
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-9999 b/metadata/md5-cache/dev-ros/hector_slam_launch-9999
index 1aee59a756a1..5bb4007803f8 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-9999
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajecto
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af4bd6a8cf4132a83050d6be43cc1116
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1 b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1
index de267e32e515..927d375c643b 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e02032ead3c4811d370fdd61c5d983e4
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-9999 b/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
index c1055168964b..4b7dc430f9cb 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e02032ead3c4811d370fdd61c5d983e4
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1 b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
index afdcded66d91..fe93da4c8f4a 100644
--- a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35fafcf5d2b4a2fbfd908f45c79c584a
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-9999 b/metadata/md5-cache/dev-ros/image_cb_detector-9999
index 21c95c0223b8..ab63790b92d6 100644
--- a/metadata/md5-cache/dev-ros/image_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge[
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35fafcf5d2b4a2fbfd908f45c79c584a
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.15.0 b/metadata/md5-cache/dev-ros/image_geometry-1.15.0
index fb47bd00aa85..2af6f66e5b22 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.15.0
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7783c0b0b829989068eae968840cc699
diff --git a/metadata/md5-cache/dev-ros/image_geometry-9999 b/metadata/md5-cache/dev-ros/image_geometry-9999
index 0880e7111802..1cef0b696f9e 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-9999
+++ b/metadata/md5-cache/dev-ros/image_geometry-9999
@@ -11,5 +11,5 @@ RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_si
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7783c0b0b829989068eae968840cc699
diff --git a/metadata/md5-cache/dev-ros/image_proc-1.15.2 b/metadata/md5-cache/dev-ros/image_proc-1.15.2
index acd8ff15b6d9..0b942d765ea6 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_proc-1.15.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a96a2dbcf1b73c8a8bf89d26e37b0ef1
diff --git a/metadata/md5-cache/dev-ros/image_proc-9999 b/metadata/md5-cache/dev-ros/image_proc-9999
index 466bca5ff300..5018cca730bb 100644
--- a/metadata/md5-cache/dev-ros/image_proc-9999
+++ b/metadata/md5-cache/dev-ros/image_proc-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a96a2dbcf1b73c8a8bf89d26e37b0ef1
diff --git a/metadata/md5-cache/dev-ros/image_publisher-1.15.2 b/metadata/md5-cache/dev-ros/image_publisher-1.15.2
index 3eb9960af925..8e8c1644a0c7 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_publisher-1.15.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b3e57918efd8fb2c61e22af78c3f5027
diff --git a/metadata/md5-cache/dev-ros/image_publisher-9999 b/metadata/md5-cache/dev-ros/image_publisher-9999
index 1a9d79e9cbe6..18fe7148da78 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-9999
+++ b/metadata/md5-cache/dev-ros/image_publisher-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ro
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b3e57918efd8fb2c61e22af78c3f5027
diff --git a/metadata/md5-cache/dev-ros/image_rotate-1.15.2 b/metadata/md5-cache/dev-ros/image_rotate-1.15.2
index 4c70924a0781..020f1634fb7a 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_rotate-1.15.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a092722c2f32c7c28dceff7d2c3463e2
diff --git a/metadata/md5-cache/dev-ros/image_rotate-9999 b/metadata/md5-cache/dev-ros/image_rotate-9999
index 320fe7c41d67..2a34c56eb8a0 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-9999
+++ b/metadata/md5-cache/dev-ros/image_rotate-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ro
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a092722c2f32c7c28dceff7d2c3463e2
diff --git a/metadata/md5-cache/dev-ros/image_transport-1.12.0 b/metadata/md5-cache/dev-ros/image_transport-1.12.0
index 638ebccb5aa6..1bd5e27ee02f 100644
--- a/metadata/md5-cache/dev-ros/image_transport-1.12.0
+++ b/metadata/md5-cache/dev-ros/image_transport-1.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68426ff5c3e79a02b1680501bf3b7b19
diff --git a/metadata/md5-cache/dev-ros/image_transport-9999 b/metadata/md5-cache/dev-ros/image_transport-9999
index ea2eafd79e2a..672bd33340aa 100644
--- a/metadata/md5-cache/dev-ros/image_transport-9999
+++ b/metadata/md5-cache/dev-ros/image_transport-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/ro
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68426ff5c3e79a02b1680501bf3b7b19
diff --git a/metadata/md5-cache/dev-ros/image_view-1.15.2-r1 b/metadata/md5-cache/dev-ros/image_view-1.15.2-r1
index 837e4233ea27..2db55ded3221 100644
--- a/metadata/md5-cache/dev-ros/image_view-1.15.2-r1
+++ b/metadata/md5-cache/dev-ros/image_view-1.15.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7a37ba16a9f22a43d5f134248482c6d
diff --git a/metadata/md5-cache/dev-ros/image_view-9999 b/metadata/md5-cache/dev-ros/image_view-9999
index c4b7a1c524f1..8a9af75235d8 100644
--- a/metadata/md5-cache/dev-ros/image_view-9999
+++ b/metadata/md5-cache/dev-ros/image_view-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/i
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7a37ba16a9f22a43d5f134248482c6d
diff --git a/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.2 b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.2
index 89cc8713d38e..fb2ae46aa011 100644
--- a/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.2
+++ b/metadata/md5-cache/dev-ros/imu_complementary_filter-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.2.tar.gz -> imu_tools-1.2.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c62e875d19cf311b6955b02a2d4dc422
diff --git a/metadata/md5-cache/dev-ros/imu_complementary_filter-9999 b/metadata/md5-cache/dev-ros/imu_complementary_filter-9999
index 4e70010fdead..20bf056b0367 100644
--- a/metadata/md5-cache/dev-ros/imu_complementary_filter-9999
+++ b/metadata/md5-cache/dev-ros/imu_complementary_filter-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c62e875d19cf311b6955b02a2d4dc422
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2-r1 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2-r1
index 253844e92828..e0ad83738407 100644
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2-r1
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.2.tar.gz -> imu_tools-1.2.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15365db44e6f882eeddaad7abe1418bc
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
index 8a948931dc26..514a441a7f49 100644
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15365db44e6f882eeddaad7abe1418bc
diff --git a/metadata/md5-cache/dev-ros/imu_processors-0.3.0 b/metadata/md5-cache/dev-ros/imu_processors-0.3.0
index 45de8056ab1c..1c71e8049b88 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-0.3.0
+++ b/metadata/md5-cache/dev-ros/imu_processors-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.3.0.tar.gz -> imu_pipeline-0.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d9160bc0441761d8e9cbe788cb6f9369
diff --git a/metadata/md5-cache/dev-ros/imu_processors-9999 b/metadata/md5-cache/dev-ros/imu_processors-9999
index 7a0b61949c65..43379ed198b6 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-9999
+++ b/metadata/md5-cache/dev-ros/imu_processors-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_7? ( dev-lang/pyt
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d9160bc0441761d8e9cbe788cb6f9369
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-0.3.0 b/metadata/md5-cache/dev-ros/imu_transformer-0.3.0
index 6e9cf41b6cc2..fd59ad817176 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-0.3.0
+++ b/metadata/md5-cache/dev-ros/imu_transformer-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.3.0.tar.gz -> imu_pipeline-0.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6164d0e9c16941ca2888a612b91f9c69
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-9999 b/metadata/md5-cache/dev-ros/imu_transformer-9999
index 515a70311704..0dbed17f601e 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-9999
+++ b/metadata/md5-cache/dev-ros/imu_transformer-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ro
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6164d0e9c16941ca2888a612b91f9c69
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.11.0 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.11.0
index 5d0f606e9c55..790563b8abf2 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.11.0
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c65cea054bfd871b0d3a59bd066b7cc1
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
index 276aa549b984..e5534a4dda76 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ro
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c65cea054bfd871b0d3a59bd066b7cc1
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-1.12.0-r1 b/metadata/md5-cache/dev-ros/interactive_markers-1.12.0-r1
index e4eaff513520..3b576718ff5e 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-1.12.0-r1
+++ b/metadata/md5-cache/dev-ros/interactive_markers-1.12.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/interactive_markers/archive/1.12.0.tar.gz -> interactive_markers-1.12.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47bb9f8f3462fa315ec17f8525052db7
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-9999 b/metadata/md5-cache/dev-ros/interactive_markers-9999
index 181cf8b029eb..95a406aa3096 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-9999
+++ b/metadata/md5-cache/dev-ros/interactive_markers-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_pyt
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47bb9f8f3462fa315ec17f8525052db7
diff --git a/metadata/md5-cache/dev-ros/interval_intersection-0.10.14 b/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
index 085c6942d28f..7c173c6375ca 100644
--- a/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
+++ b/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ad95ea37746528400822a99b2297f69
diff --git a/metadata/md5-cache/dev-ros/interval_intersection-9999 b/metadata/md5-cache/dev-ros/interval_intersection-9999
index 8288914b2e75..a01d0d6de656 100644
--- a/metadata/md5-cache/dev-ros/interval_intersection-9999
+++ b/metadata/md5-cache/dev-ros/interval_intersection-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/r
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ad95ea37746528400822a99b2297f69
diff --git a/metadata/md5-cache/dev-ros/ivcon-0.1.7 b/metadata/md5-cache/dev-ros/ivcon-0.1.7
index 05692c905636..d28d867fec0a 100644
--- a/metadata/md5-cache/dev-ros/ivcon-0.1.7
+++ b/metadata/md5-cache/dev-ros/ivcon-0.1.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ivcon/archive/0.1.7.tar.gz -> ivcon-0.1.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a8960ef5eca578b981de012f97bd8d9
diff --git a/metadata/md5-cache/dev-ros/ivcon-9999 b/metadata/md5-cache/dev-ros/ivcon-9999
index f93e795651cb..40f982fcfcce 100644
--- a/metadata/md5-cache/dev-ros/ivcon-9999
+++ b/metadata/md5-cache/dev-ros/ivcon-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a8960ef5eca578b981de012f97bd8d9
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.1 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.1
index 9c18b1817066..ae63d51281ed 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.1
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c067ac886afa7c7f35cd2691d3c59c10
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.2 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.2
index 36cb7a1c223b..8efa19551ead 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.2
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c067ac886afa7c7f35cd2691d3c59c10
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-9999 b/metadata/md5-cache/dev-ros/joint_limits_interface-9999
index 64ed45ad880c..ff0b47c41356 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-9999
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c067ac886afa7c7f35cd2691d3c59c10
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.15.0 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.15.0
index 827b16703133..a0caa01c3387 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.15.0
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/joint_state_publisher/archive/1.15.0.tar.gz -> joint_state_publisher-1.15.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cffdd16933ddc1f0b5c2e1c138118ef0
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-9999 b/metadata/md5-cache/dev-ros/joint_state_publisher-9999
index 9c645acf25af..52f410b1d961 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-9999
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ro
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cffdd16933ddc1f0b5c2e1c138118ef0
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher_gui-1.15.0 b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-1.15.0
index 793422fdd541..485da24c6f49 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher_gui-1.15.0
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-1.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/joint_state_publisher/archive/1.15.0.tar.gz -> joint_state_publisher-1.15.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76e62518131d50558df462f55bfda05a
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999 b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
index cb503149bdc3..00341d5075d1 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/python_qt_bind
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76e62518131d50558df462f55bfda05a
diff --git a/metadata/md5-cache/dev-ros/joint_states_settler-0.10.14 b/metadata/md5-cache/dev-ros/joint_states_settler-0.10.14
index de2c03595e8b..930eb1d2a383 100644
--- a/metadata/md5-cache/dev-ros/joint_states_settler-0.10.14
+++ b/metadata/md5-cache/dev-ros/joint_states_settler-0.10.14
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0458f74ed7a8d91c2ac758a74eedca96
diff --git a/metadata/md5-cache/dev-ros/joint_states_settler-9999 b/metadata/md5-cache/dev-ros/joint_states_settler-9999
index a94c4940dd1b..a4769dcaf9fd 100644
--- a/metadata/md5-cache/dev-ros/joint_states_settler-9999
+++ b/metadata/md5-cache/dev-ros/joint_states_settler-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/r
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0458f74ed7a8d91c2ac758a74eedca96
diff --git a/metadata/md5-cache/dev-ros/kdl_conversions-1.13.2 b/metadata/md5-cache/dev-ros/kdl_conversions-1.13.2
index 34127de89114..7f6c8f919ef6 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-1.13.2
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-1.13.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.13.2.tar.gz -> geometry-1.13.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5bfa7082a473c3cda915209c84bc2b03
diff --git a/metadata/md5-cache/dev-ros/kdl_conversions-9999 b/metadata/md5-cache/dev-ros/kdl_conversions-9999
index 9131ac53d8e4..a56a3653390c 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-9999
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5bfa7082a473c3cda915209c84bc2b03
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.14.1 b/metadata/md5-cache/dev-ros/kdl_parser-1.14.1
index 14edba4b769a..b07b819edc67 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.14.1
+++ b/metadata/md5-cache/dev-ros/kdl_parser-1.14.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.14.1.tar.gz -> kdl_parser-1.14.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8ff9a976196a39a4b3e8070fcca7a93
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-9999 b/metadata/md5-cache/dev-ros/kdl_parser-9999
index cc858d2a8833..aed0c42187cf 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-libs/console_brid
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8ff9a976196a39a4b3e8070fcca7a93
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.1 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.1
index 8228a08ac0b1..a8168e0fef13 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.1
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.14.1.tar.gz -> kdl_parser-1.14.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbdd8985165c236bdae3cc72ac2f52ea
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-9999 b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
index d4ff42d85a3e..6a576b970c8c 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbdd8985165c236bdae3cc72ac2f52ea
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-1.7.8 b/metadata/md5-cache/dev-ros/laser_assembler-1.7.8
index b71fc673b062..9c7ac62554c5 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-1.7.8
+++ b/metadata/md5-cache/dev-ros/laser_assembler-1.7.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.8.tar.gz -> laser_assembler-1.7.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64281a7d918a2cc3e4e168982e57b81b
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-9999 b/metadata/md5-cache/dev-ros/laser_assembler-9999
index c46c02c3ddbe..91702c520dc0 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-9999
+++ b/metadata/md5-cache/dev-ros/laser_assembler-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64281a7d918a2cc3e4e168982e57b81b
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14 b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
index 230d1c5dce04..ecf5c5153ad6 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.14
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bc0394f15c6fe404392800da41846909
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-9999 b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
index a03c5fe03c27..eec7b81d8029 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bc0394f15c6fe404392800da41846909
diff --git a/metadata/md5-cache/dev-ros/laser_filters-1.8.11 b/metadata/md5-cache/dev-ros/laser_filters-1.8.11
index 31749a5ca07f..8a94b09e8cd2 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-1.8.11
+++ b/metadata/md5-cache/dev-ros/laser_filters-1.8.11
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_filters/archive/1.8.11.tar.gz -> laser_filters-1.8.11.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=234fba8da39dae2beff0c760ef2f4292
diff --git a/metadata/md5-cache/dev-ros/laser_filters-9999 b/metadata/md5-cache/dev-ros/laser_filters-9999
index b243b12ea504..69ae62d50483 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-9999
+++ b/metadata/md5-cache/dev-ros/laser_filters-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/filters dev-ros/message_filters dev-ro
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=234fba8da39dae2beff0c760ef2f4292
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-1.6.5 b/metadata/md5-cache/dev-ros/laser_geometry-1.6.5
index cfe4f2a02ca3..940ccc73cc48 100644
--- a/metadata/md5-cache/dev-ros/laser_geometry-1.6.5
+++ b/metadata/md5-cache/dev-ros/laser_geometry-1.6.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_geometry/archive/1.6.5.tar.gz -> laser_geometry-1.6.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a373d09fbb82d26dba6a223d4d6dc078
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-9999 b/metadata/md5-cache/dev-ros/laser_geometry-9999
index 01354b8bd953..616bde540cdc 100644
--- a/metadata/md5-cache/dev-ros/laser_geometry-9999
+++ b/metadata/md5-cache/dev-ros/laser_geometry-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a373d09fbb82d26dba6a223d4d6dc078
diff --git a/metadata/md5-cache/dev-ros/laser_proc-0.1.6 b/metadata/md5-cache/dev-ros/laser_proc-0.1.6
index ede454c56f8c..83ddc32a5054 100644
--- a/metadata/md5-cache/dev-ros/laser_proc-0.1.6
+++ b/metadata/md5-cache/dev-ros/laser_proc-0.1.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_proc/archive/0.1.6.tar.gz -> laser_proc-0.1.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3a275d0a7d06763f2bcf08f94b483a7
diff --git a/metadata/md5-cache/dev-ros/laser_proc-9999 b/metadata/md5-cache/dev-ros/laser_proc-9999
index 68c8c35fc615..bf2ac564fb0e 100644
--- a/metadata/md5-cache/dev-ros/laser_proc-9999
+++ b/metadata/md5-cache/dev-ros/laser_proc-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/plug
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3a275d0a7d06763f2bcf08f94b483a7
diff --git a/metadata/md5-cache/dev-ros/libmavconn-1.2.0 b/metadata/md5-cache/dev-ros/libmavconn-1.2.0
index c6e71be2a2c4..29a0a11ec715 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-1.2.0
+++ b/metadata/md5-cache/dev-ros/libmavconn-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ffc733eb9f883c4dd3f64af83418ea5
diff --git a/metadata/md5-cache/dev-ros/libmavconn-9999 b/metadata/md5-cache/dev-ros/libmavconn-9999
index 662cd6665c04..fa95c12cddd8 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-9999
+++ b/metadata/md5-cache/dev-ros/libmavconn-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ffc733eb9f883c4dd3f64af83418ea5
diff --git a/metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0 b/metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0
index 583194ad02ad..ead626ac9c4c 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89c98a2af4114c4e6738b01d90c21ef3
diff --git a/metadata/md5-cache/dev-ros/librviz_tutorial-9999 b/metadata/md5-cache/dev-ros/librviz_tutorial-9999
index fd0cfe38d9b1..fc62637eb058 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_single_target_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89c98a2af4114c4e6738b01d90c21ef3
diff --git a/metadata/md5-cache/dev-ros/map_msgs-1.14.0 b/metadata/md5-cache/dev-ros/map_msgs-1.14.0
index bd918fd3dda7..153ddae73563 100644
--- a/metadata/md5-cache/dev-ros/map_msgs-1.14.0
+++ b/metadata/md5-cache/dev-ros/map_msgs-1.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation_msgs/archive/1.14.0.tar.gz -> navigation_msgs-1.14.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d9902613bec184d432f057ce4dd8eb2
diff --git a/metadata/md5-cache/dev-ros/map_msgs-9999 b/metadata/md5-cache/dev-ros/map_msgs-9999
index 1beb31c5e036..122148cae93d 100644
--- a/metadata/md5-cache/dev-ros/map_msgs-9999
+++ b/metadata/md5-cache/dev-ros/map_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d9902613bec184d432f057ce4dd8eb2
diff --git a/metadata/md5-cache/dev-ros/map_server-1.17.0 b/metadata/md5-cache/dev-ros/map_server-1.17.0
index bfdcc029c15f..09c342c36321 100644
--- a/metadata/md5-cache/dev-ros/map_server-1.17.0
+++ b/metadata/md5-cache/dev-ros/map_server-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c5fe820ba77b7da2b52b8302d97cf0a
diff --git a/metadata/md5-cache/dev-ros/map_server-9999 b/metadata/md5-cache/dev-ros/map_server-9999
index 3eaa71ea1eea..7fb0ff48f7c3 100644
--- a/metadata/md5-cache/dev-ros/map_server-9999
+++ b/metadata/md5-cache/dev-ros/map_server-9999
@@ -11,5 +11,5 @@ RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image[png] dev-ros/tf
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c5fe820ba77b7da2b52b8302d97cf0a
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7-r1 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7-r1
index ec64a9e5a463..324fda7b7128 100644
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7-r1
+++ b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/noetic/mavlink/2020.7.7-2020.7.7.tar.gz -> mavlink-gbp-release-2020.7.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aaa5240aa2874d27cc1890ee7da112f6
diff --git a/metadata/md5-cache/dev-ros/mavros-1.2.0 b/metadata/md5-cache/dev-ros/mavros-1.2.0
index fb54289da369..fcbd626502bb 100644
--- a/metadata/md5-cache/dev-ros/mavros-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97a87f1d3c66eca22769bea745583b3a
diff --git a/metadata/md5-cache/dev-ros/mavros-9999 b/metadata/md5-cache/dev-ros/mavros-9999
index e2bf107b4364..d8e6ec3e161e 100644
--- a/metadata/md5-cache/dev-ros/mavros-9999
+++ b/metadata/md5-cache/dev-ros/mavros-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97a87f1d3c66eca22769bea745583b3a
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-1.2.0 b/metadata/md5-cache/dev-ros/mavros_extras-1.2.0
index de4b1fae17c4..a5b3893af36d 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros_extras-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a32bca61b73d165ce652a5e91bb039c0
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-9999 b/metadata/md5-cache/dev-ros/mavros_extras-9999
index 9e6f86d0edd5..872b568e8995 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-9999
+++ b/metadata/md5-cache/dev-ros/mavros_extras-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a32bca61b73d165ce652a5e91bb039c0
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0 b/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
index 4991ce6422ba..71bddd8dcfd4 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cfac3d5630d73dfc3489eb948345dcb
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-9999 b/metadata/md5-cache/dev-ros/mavros_msgs-9999
index da2511c52483..facdb3b9a0a0 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-9999
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cfac3d5630d73dfc3489eb948345dcb
diff --git a/metadata/md5-cache/dev-ros/media_export-0.3.0 b/metadata/md5-cache/dev-ros/media_export-0.3.0
index ad3f45fa0922..8678abc7c714 100644
--- a/metadata/md5-cache/dev-ros/media_export-0.3.0
+++ b/metadata/md5-cache/dev-ros/media_export-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/media_export/archive/0.3.0.tar.gz -> media_export-0.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9baa909c0b32670e31af5d4a69f2cd48
diff --git a/metadata/md5-cache/dev-ros/media_export-9999 b/metadata/md5-cache/dev-ros/media_export-9999
index fea7691c93ba..3dc32fa2d0ec 100644
--- a/metadata/md5-cache/dev-ros/media_export-9999
+++ b/metadata/md5-cache/dev-ros/media_export-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9baa909c0b32670e31af5d4a69f2cd48
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.15.8 b/metadata/md5-cache/dev-ros/message_filters-1.15.8
index 57d722636bda..aa283eb6827a 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.15.8
+++ b/metadata/md5-cache/dev-ros/message_filters-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=455d5436cef5de9cba345a36f4199797
diff --git a/metadata/md5-cache/dev-ros/message_filters-9999 b/metadata/md5-cache/dev-ros/message_filters-9999
index 5bbd26e56381..5b905f524471 100644
--- a/metadata/md5-cache/dev-ros/message_filters-9999
+++ b/metadata/md5-cache/dev-ros/message_filters-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genp
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=455d5436cef5de9cba345a36f4199797
diff --git a/metadata/md5-cache/dev-ros/message_generation-0.4.1 b/metadata/md5-cache/dev-ros/message_generation-0.4.1
index a414c6e07a21..0bf774ebece2 100644
--- a/metadata/md5-cache/dev-ros/message_generation-0.4.1
+++ b/metadata/md5-cache/dev-ros/message_generation-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/message_generation/archive/0.4.1.tar.gz -> message_generation-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a46f751e3efb9d00ab4de7bd74f4b542
diff --git a/metadata/md5-cache/dev-ros/message_generation-9999 b/metadata/md5-cache/dev-ros/message_generation-9999
index 7c4fa8ba93f7..ee890ad099f3 100644
--- a/metadata/md5-cache/dev-ros/message_generation-9999
+++ b/metadata/md5-cache/dev-ros/message_generation-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/gene
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a46f751e3efb9d00ab4de7bd74f4b542
diff --git a/metadata/md5-cache/dev-ros/message_runtime-0.4.13 b/metadata/md5-cache/dev-ros/message_runtime-0.4.13
index 2bbe4c3b3735..fd9656cef4fe 100644
--- a/metadata/md5-cache/dev-ros/message_runtime-0.4.13
+++ b/metadata/md5-cache/dev-ros/message_runtime-0.4.13
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/message_runtime/archive/0.4.13.tar.gz -> message_runtime-0.4.13.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c3ea7d07776344a7e60211286a9eb76
diff --git a/metadata/md5-cache/dev-ros/message_runtime-9999 b/metadata/md5-cache/dev-ros/message_runtime-9999
index cafb4785b488..88b9f33f1815 100644
--- a/metadata/md5-cache/dev-ros/message_runtime-9999
+++ b/metadata/md5-cache/dev-ros/message_runtime-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c3ea7d07776344a7e60211286a9eb76
diff --git a/metadata/md5-cache/dev-ros/message_to_tf-0.3.0 b/metadata/md5-cache/dev-ros/message_to_tf-0.3.0
index d904a4e50713..281b04f36991 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-0.3.0
+++ b/metadata/md5-cache/dev-ros/message_to_tf-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef0efaff87d81fdddfabf528c8c97902
diff --git a/metadata/md5-cache/dev-ros/message_to_tf-9999 b/metadata/md5-cache/dev-ros/message_to_tf-9999
index f034989b8018..b106022378da 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-9999
+++ b/metadata/md5-cache/dev-ros/message_to_tf-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= python_single_target_pyt
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef0efaff87d81fdddfabf528c8c97902
diff --git a/metadata/md5-cache/dev-ros/mk-1.15.5 b/metadata/md5-cache/dev-ros/mk-1.15.5
index ee6420579853..52fa9479ae88 100644
--- a/metadata/md5-cache/dev-ros/mk-1.15.5
+++ b/metadata/md5-cache/dev-ros/mk-1.15.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d79830b7b58d1e5e05e9732db8df2874
diff --git a/metadata/md5-cache/dev-ros/mk-1.15.6 b/metadata/md5-cache/dev-ros/mk-1.15.6
index d21ad5026900..ff14ac8bc7c5 100644
--- a/metadata/md5-cache/dev-ros/mk-1.15.6
+++ b/metadata/md5-cache/dev-ros/mk-1.15.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d79830b7b58d1e5e05e9732db8df2874
diff --git a/metadata/md5-cache/dev-ros/mk-9999 b/metadata/md5-cache/dev-ros/mk-9999
index b87badedd02d..86c56d75a472 100644
--- a/metadata/md5-cache/dev-ros/mk-9999
+++ b/metadata/md5-cache/dev-ros/mk-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospack dev-ros/rosbuild python_single_target_python3_7? ( dev-l
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d79830b7b58d1e5e05e9732db8df2874
diff --git a/metadata/md5-cache/dev-ros/monocam_settler-0.10.14 b/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
index dc5baa5f3ba8..bea8cf0581fc 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
+++ b/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9052ec866e058fb137edf6861a70c3d0
diff --git a/metadata/md5-cache/dev-ros/monocam_settler-9999 b/metadata/md5-cache/dev-ros/monocam_settler-9999
index a34559c29960..b3cacfc36ae2 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-9999
+++ b/metadata/md5-cache/dev-ros/monocam_settler-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/rosconsole
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9052ec866e058fb137edf6861a70c3d0
diff --git a/metadata/md5-cache/dev-ros/move_base-1.17.0 b/metadata/md5-cache/dev-ros/move_base-1.17.0
index bf30dd612019..eb977599bd4b 100644
--- a/metadata/md5-cache/dev-ros/move_base-1.17.0
+++ b/metadata/md5-cache/dev-ros/move_base-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8008e49d8d1fbd3ca5295253dae9af32
diff --git a/metadata/md5-cache/dev-ros/move_base-9999 b/metadata/md5-cache/dev-ros/move_base-9999
index 508450568042..0bd645106dc4 100644
--- a/metadata/md5-cache/dev-ros/move_base-9999
+++ b/metadata/md5-cache/dev-ros/move_base-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigur
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8008e49d8d1fbd3ca5295253dae9af32
diff --git a/metadata/md5-cache/dev-ros/move_base_msgs-1.14.0 b/metadata/md5-cache/dev-ros/move_base_msgs-1.14.0
index feea7ea18819..94b411b38c0e 100644
--- a/metadata/md5-cache/dev-ros/move_base_msgs-1.14.0
+++ b/metadata/md5-cache/dev-ros/move_base_msgs-1.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation_msgs/archive/1.14.0.tar.gz -> navigation_msgs-1.14.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06c2a20a66b87f8c7ad0efdb6dc4846c
diff --git a/metadata/md5-cache/dev-ros/move_base_msgs-9999 b/metadata/md5-cache/dev-ros/move_base_msgs-9999
index 204fd0ca8083..8fe927887f0f 100644
--- a/metadata/md5-cache/dev-ros/move_base_msgs-9999
+++ b/metadata/md5-cache/dev-ros/move_base_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06c2a20a66b87f8c7ad0efdb6dc4846c
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.0 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.0
index 4818f4bacc50..315279711875 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.0
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a58279222aca1163281df33cdf1af7f
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-9999 b/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
index 97bd11d23513..f977cb808a88 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/ros
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a58279222aca1163281df33cdf1af7f
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1 b/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
index b114f27aae18..bba7a8a2f4a5 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.10.1.tar.gz -> moveit_msgs-0.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3ee98710b0c308b3a8bab2054f695e7
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-9999 b/metadata/md5-cache/dev-ros/moveit_msgs-9999
index f418e143efb0..d0fffa339220 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-9999
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3ee98710b0c308b3a8bab2054f695e7
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.17.0 b/metadata/md5-cache/dev-ros/nav_core-1.17.0
index d11b9107a142..4391a30e6e17 100644
--- a/metadata/md5-cache/dev-ros/nav_core-1.17.0
+++ b/metadata/md5-cache/dev-ros/nav_core-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=abfeeba4f628bdf673b6b1a9b7aca8ee
diff --git a/metadata/md5-cache/dev-ros/nav_core-9999 b/metadata/md5-cache/dev-ros/nav_core-9999
index b6ef9add4d36..dfcb87fd0e44 100644
--- a/metadata/md5-cache/dev-ros/nav_core-9999
+++ b/metadata/md5-cache/dev-ros/nav_core-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/st
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=abfeeba4f628bdf673b6b1a9b7aca8ee
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-1.13.0 b/metadata/md5-cache/dev-ros/nav_msgs-1.13.0
index 25c0f455a3fa..5ddcd7a29226 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/nav_msgs-1.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb4d3011de1b0ea7cb75e163d2233678
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-9999 b/metadata/md5-cache/dev-ros/nav_msgs-9999
index 6407fe377291..80702723f1b0 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/nav_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb4d3011de1b0ea7cb75e163d2233678
diff --git a/metadata/md5-cache/dev-ros/navfn-1.17.0 b/metadata/md5-cache/dev-ros/navfn-1.17.0
index 5232cd64ea3c..c9c5061cfbf6 100644
--- a/metadata/md5-cache/dev-ros/navfn-1.17.0
+++ b/metadata/md5-cache/dev-ros/navfn-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e35c60ae62d5a77f8938ba7810fb3071
diff --git a/metadata/md5-cache/dev-ros/navfn-9999 b/metadata/md5-cache/dev-ros/navfn-9999
index 97915522fa6c..b0ec2ed578d8 100644
--- a/metadata/md5-cache/dev-ros/navfn-9999
+++ b/metadata/md5-cache/dev-ros/navfn-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/ros
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e35c60ae62d5a77f8938ba7810fb3071
diff --git a/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0 b/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
index c3242c1531eb..ee84129e61be 100644
--- a/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
+++ b/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/nmea_msgs/archive/1.1.0.tar.gz -> nmea_msgs-1.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57e6ac9db02136bec3d5ed687675b3ad
diff --git a/metadata/md5-cache/dev-ros/nmea_msgs-9999 b/metadata/md5-cache/dev-ros/nmea_msgs-9999
index 909d6b32854f..96c3770e3da8 100644
--- a/metadata/md5-cache/dev-ros/nmea_msgs-9999
+++ b/metadata/md5-cache/dev-ros/nmea_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57e6ac9db02136bec3d5ed687675b3ad
diff --git a/metadata/md5-cache/dev-ros/nodelet-1.10.0-r1 b/metadata/md5-cache/dev-ros/nodelet-1.10.0-r1
index a5b3dd07a2e6..947e80e55e5e 100644
--- a/metadata/md5-cache/dev-ros/nodelet-1.10.0-r1
+++ b/metadata/md5-cache/dev-ros/nodelet-1.10.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.0.tar.gz -> nodelet_core-1.10.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06887e16bc3bd0263ec44d43e74a6faf
diff --git a/metadata/md5-cache/dev-ros/nodelet-9999 b/metadata/md5-cache/dev-ros/nodelet-9999
index 89226825101b..f8697d86e7af 100644
--- a/metadata/md5-cache/dev-ros/nodelet-9999
+++ b/metadata/md5-cache/dev-ros/nodelet-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib:= dev-libs/tinyx
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06887e16bc3bd0263ec44d43e74a6faf
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.0 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.0
index 68faa0add945..dec5584537b4 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.0
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.0.tar.gz -> nodelet_core-1.10.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=962551d30beb45ce589288347b0a18d3
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
index 1ba839a53be9..67189f0d1dae 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_targ
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=962551d30beb45ce589288347b0a18d3
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.12 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.12
index a60cba1f96a1..d2bb3a42bac0 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.12
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.12
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2086caf097813e63bb91115c4a72df23
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.2.0 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.2.0
index de323e4928ce..c38e33f5e7e6 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.2.0
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.2.0.tar.gz -> common_tutorials-0.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2086caf097813e63bb91115c4a72df23
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
index e90087a6b90e..9737e6dfdc32 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msg
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2086caf097813e63bb91115c4a72df23
diff --git a/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1 b/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
index d34fe66246eb..3f864b8da7c4 100644
--- a/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
+++ b/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wg-perception/object_recognition_msgs/archive/0.4.1.tar.gz -> object_recognition_msgs-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35c97eba14e78a4aa5bb582f53d03f74
diff --git a/metadata/md5-cache/dev-ros/object_recognition_msgs-9999 b/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
index d6c300842e04..cddfeb0aaef9 100644
--- a/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
+++ b/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35c97eba14e78a4aa5bb582f53d03f74
diff --git a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5 b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
index b74032676841..76ceb53472ac 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OctoMap/octomap_msgs/archive/0.3.5.tar.gz -> octomap_msgs-0.3.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7fd1efd1e54e5c2dd5400e9418caac6b
diff --git a/metadata/md5-cache/dev-ros/octomap_msgs-9999 b/metadata/md5-cache/dev-ros/octomap_msgs-9999
index 92aef8f56360..dc2c70ff45f9 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-9999
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7fd1efd1e54e5c2dd5400e9418caac6b
diff --git a/metadata/md5-cache/dev-ros/octomap_ros-0.4.1 b/metadata/md5-cache/dev-ros/octomap_ros-0.4.1
index 6193fdef0dfe..ada3af7a3aa3 100644
--- a/metadata/md5-cache/dev-ros/octomap_ros-0.4.1
+++ b/metadata/md5-cache/dev-ros/octomap_ros-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OctoMap/octomap_ros/archive/0.4.1.tar.gz -> octomap_ros-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb69d0845d5e0a6185a81e389d347efe
diff --git a/metadata/md5-cache/dev-ros/octomap_ros-9999 b/metadata/md5-cache/dev-ros/octomap_ros-9999
index 3d6e0775a0a3..f829fc0c1209 100644
--- a/metadata/md5-cache/dev-ros/octomap_ros-9999
+++ b/metadata/md5-cache/dev-ros/octomap_ros-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap python_single_target_python3
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb69d0845d5e0a6185a81e389d347efe
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-2.0.2 b/metadata/md5-cache/dev-ros/opencv_apps-2.0.2
index 7608470ea5c3..e581da80cb12 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-2.0.2
+++ b/metadata/md5-cache/dev-ros/opencv_apps-2.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/opencv_apps/archive/2.0.2.tar.gz -> opencv_apps-2.0.2.tar.gz http://download.ros.org/data/face_detector/face_detector_withface_test_diamondback.bag -> opencv_apps-2.0.2-face_detector_withface_test_diamondback.bag http://download.ros.org/data/vslam_system/vslam_tutorial.bag -> opencv_apps-2.0.2-vslam_tutorial.bag
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76277f9ccf36ea327842ac64cbabac76
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-9999 b/metadata/md5-cache/dev-ros/opencv_apps-9999
index 6ab11f099d9e..99c5972e492c 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-9999
+++ b/metadata/md5-cache/dev-ros/opencv_apps-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/data/face_detector/face_detector_withface_test_diamondback.bag -> opencv_apps-9999-face_detector_withface_test_diamondback.bag http://download.ros.org/data/vslam_system/vslam_tutorial.bag -> opencv_apps-9999-vslam_tutorial.bag
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76277f9ccf36ea327842ac64cbabac76
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.15.0 b/metadata/md5-cache/dev-ros/opencv_tests-1.15.0
index 161b781929ef..849ef962a1a9 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.15.0
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc0f3e3487d5f637737b0c38750155f4
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-9999 b/metadata/md5-cache/dev-ros/opencv_tests-9999
index aae5bc810650..a6ebe7181e00 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-9999
+++ b/metadata/md5-cache/dev-ros/opencv_tests-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/rospy[pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc0f3e3487d5f637737b0c38750155f4
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-1.4.2 b/metadata/md5-cache/dev-ros/openni2_camera-1.4.2
index 2b049637945e..6f6920bf07e3 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-1.4.2
+++ b/metadata/md5-cache/dev-ros/openni2_camera-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/1.4.2.tar.gz -> openni2_camera-1.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac228684ed4d61c4a9a9369c0d96fe62
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-9999 b/metadata/md5-cache/dev-ros/openni2_camera-9999
index 3f0e27760e7d..a45fbd033638 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-9999
+++ b/metadata/md5-cache/dev-ros/openni2_camera-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reco
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac228684ed4d61c4a9a9369c0d96fe62
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-1.4.2 b/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
index 94695ce3468f..ddbbc8dcf551 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
+++ b/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/1.4.2.tar.gz -> openni2_camera-1.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c50a83e3f7327e2e2c38ca27b6a7d810
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-9999 b/metadata/md5-cache/dev-ros/openni2_launch-9999
index ea2941c779dc..9723103e3610 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-9999
+++ b/metadata/md5-cache/dev-ros/openni2_launch-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c50a83e3f7327e2e2c38ca27b6a7d810
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1 b/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
index e999a4637f78..a783cac44d4a 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/openslam_gmapping/archive/0.2.1.tar.gz -> openslam_gmapping-0.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7890d310f96776aed32e6b912cb76b99
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-9999 b/metadata/md5-cache/dev-ros/openslam_gmapping-9999
index 434900ba6c83..ca51c05b6b4a 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-9999
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7890d310f96776aed32e6b912cb76b99
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1 b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
index 62bb719865c8..3cd98694d440 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.7.1.tar.gz -> perception_pcl-1.7.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=745ff6bb85b4c0dab889f165304329f6
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-9999 b/metadata/md5-cache/dev-ros/pcl_conversions-9999
index 49af18c81ca1..41e0fad6abcb 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_single_target_python3_7? ( dev-lang
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=745ff6bb85b4c0dab889f165304329f6
diff --git a/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0 b/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
index 01c5f8b1a920..004c6e52137e 100644
--- a/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/pcl_msgs/archive/0.3.0.tar.gz -> pcl_msgs-0.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85517fdb433b14bd707ed99694601949
diff --git a/metadata/md5-cache/dev-ros/pcl_msgs-9999 b/metadata/md5-cache/dev-ros/pcl_msgs-9999
index b247d908d57f..4c7651d1ed4f 100644
--- a/metadata/md5-cache/dev-ros/pcl_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85517fdb433b14bd707ed99694601949
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-1.7.1 b/metadata/md5-cache/dev-ros/pcl_ros-1.7.1
index 939ff2585a66..ab53858fd509 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-1.7.1
+++ b/metadata/md5-cache/dev-ros/pcl_ros-1.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.7.1.tar.gz -> perception_pcl-1.7.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87928d478389e49366fd1601a5a4fea4
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-9999 b/metadata/md5-cache/dev-ros/pcl_ros-9999
index c1bfa5dbde03..c4d1782f867f 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-9999
+++ b/metadata/md5-cache/dev-ros/pcl_ros-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e166d4d4315bdda094658078ff499834
diff --git a/metadata/md5-cache/dev-ros/pluginlib-1.13.0-r2 b/metadata/md5-cache/dev-ros/pluginlib-1.13.0-r2
index 1c6021e87720..de3a9465c0cb 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-1.13.0-r2
+++ b/metadata/md5-cache/dev-ros/pluginlib-1.13.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/1.13.0
 SRC_URI=https://github.com/ros/pluginlib/archive/1.13.0.tar.gz -> pluginlib-1.13.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1decdd9291df781fc091c6cfd282c97c
diff --git a/metadata/md5-cache/dev-ros/pluginlib-9999 b/metadata/md5-cache/dev-ros/pluginlib-9999
index 3b6ea069bfc4..5efc39ab3634 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1decdd9291df781fc091c6cfd282c97c
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
index 9dd7117e58f4..869b1439713b 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53016e53951fed5a9041fcc620dbcf95
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.2.0 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.2.0
index 9ff950dfedc8..fd6525fc9911 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.2.0
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.2.0.tar.gz -> common_tutorials-0.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53016e53951fed5a9041fcc620dbcf95
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
index 02e762c80448..44c971d77be0 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53016e53951fed5a9041fcc620dbcf95
diff --git a/metadata/md5-cache/dev-ros/poco_vendor-1.2.0 b/metadata/md5-cache/dev-ros/poco_vendor-1.2.0
index dca3fe676de9..f10a51da331a 100644
--- a/metadata/md5-cache/dev-ros/poco_vendor-1.2.0
+++ b/metadata/md5-cache/dev-ros/poco_vendor-1.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Boost-1.0
 RDEPEND=>=dev-libs/poco-1.6.1 dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/ros2/poco_vendor/archive/1.2.0.tar.gz -> poco_vendor-1.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50d89510467c57be04e9845de3166499
diff --git a/metadata/md5-cache/dev-ros/poco_vendor-9999 b/metadata/md5-cache/dev-ros/poco_vendor-9999
index 1b19c1183a94..04a14d098204 100644
--- a/metadata/md5-cache/dev-ros/poco_vendor-9999
+++ b/metadata/md5-cache/dev-ros/poco_vendor-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/poco-1.6.1 dev-libs/libpcre sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0ce493c65809587b889d3219da4c8fa
diff --git a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1 b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1
index 1e61d9b018fe..50ad880f8991 100644
--- a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1
+++ b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/pointcloud_to_laserscan/archive/1.4.1.tar.gz -> pointcloud_to_laserscan-1.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f2388eefb2c335e8a3e6d5953335c3ec
diff --git a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999 b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
index 4cd20c3b8453..8d357f3082dd 100644
--- a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-r
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f2388eefb2c335e8a3e6d5953335c3ec
diff --git a/metadata/md5-cache/dev-ros/polled_camera-1.12.0 b/metadata/md5-cache/dev-ros/polled_camera-1.12.0
index b4b0b323d89e..ec439096c775 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-1.12.0
+++ b/metadata/md5-cache/dev-ros/polled_camera-1.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ba00563b065b6bd9a349548328e02267
diff --git a/metadata/md5-cache/dev-ros/polled_camera-9999 b/metadata/md5-cache/dev-ros/polled_camera-9999
index 1d96262872cb..d8f56a1cd6fd 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-9999
+++ b/metadata/md5-cache/dev-ros/polled_camera-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_single_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ba00563b065b6bd9a349548328e02267
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
index c8e0488366ff..d8bae4829797 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eaeb26ef6577acc6afe1141b325f73e1
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
index 7630b357ba21..9be47cb5cc91 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_m
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eaeb26ef6577acc6afe1141b325f73e1
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.4 b/metadata/md5-cache/dev-ros/pr2_description-1.12.4
index 95462c73baad..f7d5bc021b1b 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.12.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f22d691b3b46d7fe4873ace02b964c1
diff --git a/metadata/md5-cache/dev-ros/pr2_description-9999 b/metadata/md5-cache/dev-ros/pr2_description-9999
index ff112b183474..5b4980b0321d 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-9999
+++ b/metadata/md5-cache/dev-ros/pr2_description-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/xacro[python_single_target_python3_7(-)?] python_single_target_p
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f22d691b3b46d7fe4873ace02b964c1
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.4 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
index c7f3afc6a7fa..a7488fff28aa 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bc7c9c14387f513127a44722aa874613
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-9999 b/metadata/md5-cache/dev-ros/pr2_machine-9999
index 3097a4c2d915..f0a1d0d40330 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-9999
+++ b/metadata/md5-cache/dev-ros/pr2_machine-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bc7c9c14387f513127a44722aa874613
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
index fcd0e5a6400f..f96599b21d35 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd4a603c018bbf01381945ef6ffad0a7
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-9999 b/metadata/md5-cache/dev-ros/pr2_msgs-9999
index 4ab142819a9a..85f7f91ce9b3 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd4a603c018bbf01381945ef6ffad0a7
diff --git a/metadata/md5-cache/dev-ros/python_cmake_module-0.8.0 b/metadata/md5-cache/dev-ros/python_cmake_module-0.8.0
index 9968d5f94fbe..086de841d8a3 100644
--- a/metadata/md5-cache/dev-ros/python_cmake_module-0.8.0
+++ b/metadata/md5-cache/dev-ros/python_cmake_module-0.8.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros2/python_cmake_module/archive/0.8.0.tar.gz -> python_cmake_module-0.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5402136ff7b10a480a81ce6f485da78a
diff --git a/metadata/md5-cache/dev-ros/python_cmake_module-9999 b/metadata/md5-cache/dev-ros/python_cmake_module-9999
index 4e78c668bfa3..ed584d2e98fe 100644
--- a/metadata/md5-cache/dev-ros/python_cmake_module-9999
+++ b/metadata/md5-cache/dev-ros/python_cmake_module-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5402136ff7b10a480a81ce6f485da78a
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3-r1 b/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3-r1
index 6ddcfd9c3b94..15b117eb6a71 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3-r1
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.4.3.tar.gz -> python_qt_binding-0.4.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8690f843c8469772ca1adc02b252b643
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-9999 b/metadata/md5-cache/dev-ros/python_qt_binding-9999
index 068bef1c76c2..28fa58d0ba32 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-9999
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,printsupp
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8690f843c8469772ca1adc02b252b643
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1
index c356616f9ad8..bee9caf77e91 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfa163b8c6fdf99f4f14ea141e7f67cb
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.2 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.2
index eb93e50234ec..ff6f4db68eeb 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.2
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfa163b8c6fdf99f4f14ea141e7f67cb
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-9999 b/metadata/md5-cache/dev-ros/qt_dotgraph-9999
index 6975ddb73023..458166cb7776 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-9999
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfa163b8c6fdf99f4f14ea141e7f67cb
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.4.1 b/metadata/md5-cache/dev-ros/qt_gui-0.4.1
index d08c0c7775f7..d6ea6ea4dab5 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd903a3b5029b642f7cb747ac889bf94
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.4.2 b/metadata/md5-cache/dev-ros/qt_gui-0.4.2
index 6a338ca20ba8..4fd0ee952d49 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.4.2
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd903a3b5029b642f7cb747ac889bf94
diff --git a/metadata/md5-cache/dev-ros/qt_gui-9999 b/metadata/md5-cache/dev-ros/qt_gui-9999
index a37e010f17a1..35fe3baa4fa8 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd903a3b5029b642f7cb747ac889bf94
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.4.1 b/metadata/md5-cache/dev-ros/qt_gui_app-0.4.1
index 425c4d13636d..8d6ede6e00b4 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01a03656edf641e8bfa800cf75d2fd6d
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.4.2 b/metadata/md5-cache/dev-ros/qt_gui_app-0.4.2
index 16aa885a7cc0..504767beec24 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.4.2
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01a03656edf641e8bfa800cf75d2fd6d
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-9999 b/metadata/md5-cache/dev-ros/qt_gui_app-9999
index 5e4cc6c24b62..ae103d12b33e 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] python_single
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01a03656edf641e8bfa800cf75d2fd6d
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.1 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.1
index b17a3537789e..80aa65e5f67e 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f1f8ada8f7c5835bc5919d6190b5235
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2
index 3e9401926159..54179e6300bb 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2fc17b9ae540cf6395e7937bd73ccdb8
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999 b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
index cd21e225f568..1d4d619095b8 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/t
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2fc17b9ae540cf6395e7937bd73ccdb8
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.1 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.1
index 681a53240cf8..7b82c48c3d2e 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79afdd17bd4472fb276dea85c2465621
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.2 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.2
index 66f3c992221e..be43bcab0140 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.2
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79afdd17bd4472fb276dea85c2465621
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-9999 b/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
index f9e0bef93348..4e513c43b4a8 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79afdd17bd4472fb276dea85c2465621
diff --git a/metadata/md5-cache/dev-ros/random_numbers-0.3.2 b/metadata/md5-cache/dev-ros/random_numbers-0.3.2
index 4739b4a394a5..eb22ac3d88f6 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-0.3.2
+++ b/metadata/md5-cache/dev-ros/random_numbers-0.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/random_numbers/archive/0.3.2.tar.gz -> random_numbers-0.3.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e2da958e332fed47263a047239460ef
diff --git a/metadata/md5-cache/dev-ros/random_numbers-9999 b/metadata/md5-cache/dev-ros/random_numbers-9999
index d27e6e463285..e6e82125f3bd 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-9999
+++ b/metadata/md5-cache/dev-ros/random_numbers-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/pyt
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e2da958e332fed47263a047239460ef
diff --git a/metadata/md5-cache/dev-ros/realtime_tools-1.16.0-r1 b/metadata/md5-cache/dev-ros/realtime_tools-1.16.0-r1
index d4ca8f3c5287..467c1aba6258 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-1.16.0-r1
+++ b/metadata/md5-cache/dev-ros/realtime_tools-1.16.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/realtime_tools/archive/1.16.0.tar.gz -> realtime_tools-1.16.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7b5d09bf7ee715154cc61a9fc647af0
diff --git a/metadata/md5-cache/dev-ros/realtime_tools-9999 b/metadata/md5-cache/dev-ros/realtime_tools-9999
index 82ebf05d9ced..5857f7885c18 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-9999
+++ b/metadata/md5-cache/dev-ros/realtime_tools-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-lib
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7b5d09bf7ee715154cc61a9fc647af0
diff --git a/metadata/md5-cache/dev-ros/resource_retriever-1.12.6 b/metadata/md5-cache/dev-ros/resource_retriever-1.12.6
index f511ef9c3195..133464a62ff3 100644
--- a/metadata/md5-cache/dev-ros/resource_retriever-1.12.6
+++ b/metadata/md5-cache/dev-ros/resource_retriever-1.12.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/resource_retriever/archive/1.12.6.tar.gz -> resource_retriever-1.12.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14140a9105b15d9897a8677952f01ae0
diff --git a/metadata/md5-cache/dev-ros/resource_retriever-9999 b/metadata/md5-cache/dev-ros/resource_retriever-9999
index 4536f7303438..89069407e87f 100644
--- a/metadata/md5-cache/dev-ros/resource_retriever-9999
+++ b/metadata/md5-cache/dev-ros/resource_retriever-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] ne
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14140a9105b15d9897a8677952f01ae0
diff --git a/metadata/md5-cache/dev-ros/rgbd_launch-2.3.0 b/metadata/md5-cache/dev-ros/rgbd_launch-2.3.0
index de8d954764ff..08a46d8701cf 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-2.3.0
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rgbd_launch/archive/2.3.0.tar.gz -> rgbd_launch-2.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a0172aa3b993be0c56d9d9cf0efa7a6
diff --git a/metadata/md5-cache/dev-ros/rgbd_launch-9999 b/metadata/md5-cache/dev-ros/rgbd_launch-9999
index 51bbcf32aa37..a2fe7be79da1 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-9999
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf p
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a0172aa3b993be0c56d9d9cf0efa7a6
diff --git a/metadata/md5-cache/dev-ros/robot_localization-2.6.8 b/metadata/md5-cache/dev-ros/robot_localization-2.6.8
index 22b90809a037..2bc05669218a 100644
--- a/metadata/md5-cache/dev-ros/robot_localization-2.6.8
+++ b/metadata/md5-cache/dev-ros/robot_localization-2.6.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cra-ros-pkg/robot_localization/archive/2.6.8.tar.gz -> robot_localization-2.6.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a00168896e2921956fbee1db3e75bfbc
diff --git a/metadata/md5-cache/dev-ros/robot_localization-9999 b/metadata/md5-cache/dev-ros/robot_localization-9999
index 74660a6179ed..f283e6f8e0d6 100644
--- a/metadata/md5-cache/dev-ros/robot_localization-9999
+++ b/metadata/md5-cache/dev-ros/robot_localization-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/diagnostic_updater dev-ros/eigen_conversions dev-ros/message_fil
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a00168896e2921956fbee1db3e75bfbc
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.5 b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.5
index 838bcea29167..caccc7b18452 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.5
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/robot_pose_ekf/archive/1.14.5.tar.gz -> robot_pose_ekf-1.14.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e2a90cd5523569c0b24e79d52b64127
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-9999 b/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
index 38fd5b911807..d957e7ea2e29 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads]
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e2a90cd5523569c0b24e79d52b64127
diff --git a/metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4 b/metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4
index 0184785d364c..182cb53e3e4a 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4
+++ b/metadata/md5-cache/dev-ros/robot_pose_publisher-0.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GT-RAIL/robot_pose_publisher/archive/0.2.4.tar.gz -> robot_pose_publisher-0.2.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26bb91a7f9c5021909e35f76f9a3a83d
diff --git a/metadata/md5-cache/dev-ros/robot_pose_publisher-9999 b/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
index de90bd87bb47..73bd876e3fd9 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
+++ b/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf python_single_target_python3_7? ( dev-lang/pyt
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26bb91a7f9c5021909e35f76f9a3a83d
diff --git a/metadata/md5-cache/dev-ros/robot_state_publisher-1.15.1 b/metadata/md5-cache/dev-ros/robot_state_publisher-1.15.1
index aa9b7a4772c8..261a41aef7a5 100644
--- a/metadata/md5-cache/dev-ros/robot_state_publisher-1.15.1
+++ b/metadata/md5-cache/dev-ros/robot_state_publisher-1.15.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/robot_state_publisher/archive/1.15.1.tar.gz -> robot_state_publisher-1.15.1.tar.gz http://wiki.ros.org/robot_state_publisher/data?action=AttachFile&do=get&target=joint_states_indexed.bag -> robot_state_publisher-1.15.1-joint_states_indexed.bag
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e46f12c3c9356810c5bfb3b6ddaa7b5
diff --git a/metadata/md5-cache/dev-ros/robot_state_publisher-9999 b/metadata/md5-cache/dev-ros/robot_state_publisher-9999
index a13458693334..319a5643097c 100644
--- a/metadata/md5-cache/dev-ros/robot_state_publisher-9999
+++ b/metadata/md5-cache/dev-ros/robot_state_publisher-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://wiki.ros.org/robot_state_publisher/data?action=AttachFile&do=get&target=joint_states_indexed.bag -> robot_state_publisher-9999-joint_states_indexed.bag
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e46f12c3c9356810c5bfb3b6ddaa7b5
diff --git a/metadata/md5-cache/dev-ros/ros_environment-1.3.1 b/metadata/md5-cache/dev-ros/ros_environment-1.3.1
index 84ce0af42e2a..47f4aa736357 100644
--- a/metadata/md5-cache/dev-ros/ros_environment-1.3.1
+++ b/metadata/md5-cache/dev-ros/ros_environment-1.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_environment/archive/1.3.1.tar.gz -> ros_environment-1.3.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f1e9ed0b71fdc39497a11cbd2ca30f6
diff --git a/metadata/md5-cache/dev-ros/ros_environment-9999 b/metadata/md5-cache/dev-ros/ros_environment-9999
index 222e3787c72a..7433058cf735 100644
--- a/metadata/md5-cache/dev-ros/ros_environment-9999
+++ b/metadata/md5-cache/dev-ros/ros_environment-9999
@@ -11,5 +11,5 @@ RDEPEND=!!<dev-ros/roslib-1.14.3 python_single_target_python3_7? ( dev-lang/pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f1e9ed0b71fdc39497a11cbd2ca30f6
diff --git a/metadata/md5-cache/dev-ros/rosapi-0.11.10 b/metadata/md5-cache/dev-ros/rosapi-0.11.10
index c911efd7ce5c..bcec80855ad0 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.11.10
+++ b/metadata/md5-cache/dev-ros/rosapi-0.11.10
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.10.tar.gz -> rosbridge_suite-0.11.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=334c761331a30942a4cbaf72301566e6
diff --git a/metadata/md5-cache/dev-ros/rosapi-0.11.9 b/metadata/md5-cache/dev-ros/rosapi-0.11.9
index d2321448c70d..0e563158f5bf 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosapi-0.11.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.9.tar.gz -> rosbridge_suite-0.11.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=334c761331a30942a4cbaf72301566e6
diff --git a/metadata/md5-cache/dev-ros/rosapi-9999 b/metadata/md5-cache/dev-ros/rosapi-9999
index 7bb01c523fa9..838a5768a811 100644
--- a/metadata/md5-cache/dev-ros/rosapi-9999
+++ b/metadata/md5-cache/dev-ros/rosapi-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?] dev-ros/ro
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=334c761331a30942a4cbaf72301566e6
diff --git a/metadata/md5-cache/dev-ros/rosauth-1.0.1 b/metadata/md5-cache/dev-ros/rosauth-1.0.1
index fb01b5d71ae7..e8a1e4a0d217 100644
--- a/metadata/md5-cache/dev-ros/rosauth-1.0.1
+++ b/metadata/md5-cache/dev-ros/rosauth-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/WPI-RAIL/rosauth/archive/1.0.1.tar.gz -> rosauth-1.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=495c4ad18b4db7227d75f2a75f560125
diff --git a/metadata/md5-cache/dev-ros/rosauth-9999 b/metadata/md5-cache/dev-ros/rosauth-9999
index 055b2c9818cc..2d1b57207b5d 100644
--- a/metadata/md5-cache/dev-ros/rosauth-9999
+++ b/metadata/md5-cache/dev-ros/rosauth-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-libs/openssl:0= python_single_target_python3_7? ( dev
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=495c4ad18b4db7227d75f2a75f560125
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.15.7 b/metadata/md5-cache/dev-ros/rosbag-1.15.7
index 33aece17a77b..43e3cdf3dfea 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosbag-1.15.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7643c9b0b0b5996275624f27dced515
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.15.8 b/metadata/md5-cache/dev-ros/rosbag-1.15.8
index 7725eebfc193..abc944439113 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosbag-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7643c9b0b0b5996275624f27dced515
diff --git a/metadata/md5-cache/dev-ros/rosbag-9999 b/metadata/md5-cache/dev-ros/rosbag-9999
index 9f7d214c82f8..39c8f2910c56 100644
--- a/metadata/md5-cache/dev-ros/rosbag-9999
+++ b/metadata/md5-cache/dev-ros/rosbag-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7643c9b0b0b5996275624f27dced515
diff --git a/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.1 b/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.1
index c3f5e9712584..1da4c1269adb 100644
--- a/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.1
+++ b/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/rosbag_migration_rule/archive/1.0.1.tar.gz -> rosbag_migration_rule-1.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=016be3e9e4e5c5c8c0fd99b41c6d0b82
diff --git a/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999 b/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
index b8ff6834f599..9d08703940a5 100644
--- a/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=016be3e9e4e5c5c8c0fd99b41c6d0b82
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8-r1 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8-r1
index 80e585b76b05..6a017b64442b 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8-r1
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c644faf2924fe157758925ee15e0f4f
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-9999 b/metadata/md5-cache/dev-ros/rosbag_storage-9999
index 95597ea478cb..4c06826c8e45 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/cpp_common >=dev-ros/pluginlib-1.13.0-r2
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c644faf2924fe157758925ee15e0f4f
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.15.5 b/metadata/md5-cache/dev-ros/rosbash-1.15.5
index a18f3b98a6e1..e865cd5c9f4d 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosbash-1.15.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2e3eb8f120546c7f59dcf656d9c116a
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.15.6 b/metadata/md5-cache/dev-ros/rosbash-1.15.6
index 72374b18bd6f..ef7589cae718 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosbash-1.15.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2e3eb8f120546c7f59dcf656d9c116a
diff --git a/metadata/md5-cache/dev-ros/rosbash-9999 b/metadata/md5-cache/dev-ros/rosbash-9999
index e29b94dc5eb0..5696a87d145c 100644
--- a/metadata/md5-cache/dev-ros/rosbash-9999
+++ b/metadata/md5-cache/dev-ros/rosbash-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2e3eb8f120546c7f59dcf656d9c116a
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5
index 619f15b0fb83..85b832281b7b 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=206b5a5b394c5137c7ef2ae24f3e8129
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.6 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.6
index fb86e8541533..29768a7d334a 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=206b5a5b394c5137c7ef2ae24f3e8129
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-9999 b/metadata/md5-cache/dev-ros/rosboost_cfg-9999
index e7fd7fb74fb6..e12b04952144 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-9999
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=206b5a5b394c5137c7ef2ae24f3e8129
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.10 b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.10
index d92f4664b29e..1841db67416e 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.10
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.10
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.10.tar.gz -> rosbridge_suite-0.11.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=382c5a760c9f032063700e284a01981d
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.9 b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.9
index 72651f586dcb..dfcab1fb5aa9 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.9.tar.gz -> rosbridge_suite-0.11.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=382c5a760c9f032063700e284a01981d
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-9999 b/metadata/md5-cache/dev-ros/rosbridge_library-9999
index 140e96058170..698ac032bc29 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp[python_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=382c5a760c9f032063700e284a01981d
diff --git a/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.10 b/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.10
index e1bfb73acddc..548c1c903817 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.10
+++ b/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.10
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.10.tar.gz -> rosbridge_suite-0.11.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=991e48acf060130eba0eb87b4f245e6b
diff --git a/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9 b/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9
index 7e5da194091c..78cf2918f6b7 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.9.tar.gz -> rosbridge_suite-0.11.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=991e48acf060130eba0eb87b4f245e6b
diff --git a/metadata/md5-cache/dev-ros/rosbridge_msgs-9999 b/metadata/md5-cache/dev-ros/rosbridge_msgs-9999
index 1cf31aee94c5..6aadb11911e2 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=991e48acf060130eba0eb87b4f245e6b
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.10 b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.10
index a590c48f0000..348a7cc92c15 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.10
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.10
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.10.tar.gz -> rosbridge_suite-0.11.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=470015f6c6cbaefba6783708c2acf304
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.9 b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.9
index e3668bdcd44c..8230be97a223 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.9.tar.gz -> rosbridge_suite-0.11.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=470015f6c6cbaefba6783708c2acf304
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-9999 b/metadata/md5-cache/dev-ros/rosbridge_server-9999
index be333e5b3f72..9a192d351e59 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,ros_message
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=470015f6c6cbaefba6783708c2acf304
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.15.5 b/metadata/md5-cache/dev-ros/rosbuild-1.15.5
index 1d3b52feb5e0..77d183824bd5 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.15.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb0e89330a0b9383ba078280f7bdfd81
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.15.6 b/metadata/md5-cache/dev-ros/rosbuild-1.15.6
index 1415fb4a5a23..a79b1fd82b34 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.15.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb0e89330a0b9383ba078280f7bdfd81
diff --git a/metadata/md5-cache/dev-ros/rosbuild-9999 b/metadata/md5-cache/dev-ros/rosbuild-9999
index ef46b97f977d..d1724f3f3b8b 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-9999
+++ b/metadata/md5-cache/dev-ros/rosbuild-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb0e89330a0b9383ba078280f7bdfd81
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.15.5 b/metadata/md5-cache/dev-ros/rosclean-1.15.5
index 652c03b88a5a..b2271f701bd1 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosclean-1.15.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ba0b60832be714480e60501292f3cf22
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.15.6 b/metadata/md5-cache/dev-ros/rosclean-1.15.6
index e1d890a9268a..34c10ee2413f 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosclean-1.15.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ba0b60832be714480e60501292f3cf22
diff --git a/metadata/md5-cache/dev-ros/rosclean-9999 b/metadata/md5-cache/dev-ros/rosclean-9999
index 6caa49400ddf..6bbd9055cc60 100644
--- a/metadata/md5-cache/dev-ros/rosclean-9999
+++ b/metadata/md5-cache/dev-ros/rosclean-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ba0b60832be714480e60501292f3cf22
diff --git a/metadata/md5-cache/dev-ros/rosconsole-1.14.0 b/metadata/md5-cache/dev-ros/rosconsole-1.14.0
index 1cc8229b6d9b..8a7c5a4149a9 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-1.14.0
+++ b/metadata/md5-cache/dev-ros/rosconsole-1.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/rosconsole/archive/1.14.0.tar.gz -> rosconsole-1.14.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd2cd90c4da2a7aab92ca685c01d9053
diff --git a/metadata/md5-cache/dev-ros/rosconsole-1.14.2 b/metadata/md5-cache/dev-ros/rosconsole-1.14.2
index c1fa1412a31c..f817a8309787 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-1.14.2
+++ b/metadata/md5-cache/dev-ros/rosconsole-1.14.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/rosconsole/archive/1.14.2.tar.gz -> rosconsole-1.14.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd2cd90c4da2a7aab92ca685c01d9053
diff --git a/metadata/md5-cache/dev-ros/rosconsole-9999 b/metadata/md5-cache/dev-ros/rosconsole-9999
index 3f4758504015..95b4e2aa026c 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-9999
+++ b/metadata/md5-cache/dev-ros/rosconsole-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[thre
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd2cd90c4da2a7aab92ca685c01d9053
diff --git a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4 b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4
index 5a386a8870fe..937412215acc 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/rosconsole_bridge/archive/0.5.4.tar.gz -> rosconsole_bridge-0.5.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef83949d69304343a9efba003de0a8fb
diff --git a/metadata/md5-cache/dev-ros/rosconsole_bridge-9999 b/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
index 695339f6ebbe..6d137d6da292 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_single_target_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef83949d69304343a9efba003de0a8fb
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.15.7 b/metadata/md5-cache/dev-ros/roscpp-1.15.7
index 8a0a8e0c182c..64cf546412ee 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.15.7
+++ b/metadata/md5-cache/dev-ros/roscpp-1.15.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76c0f153c3a9ad7d28f851429461686d
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.15.8 b/metadata/md5-cache/dev-ros/roscpp-1.15.8
index b1b709cc1244..9fbb0c85a6c4 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.15.8
+++ b/metadata/md5-cache/dev-ros/roscpp-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76c0f153c3a9ad7d28f851429461686d
diff --git a/metadata/md5-cache/dev-ros/roscpp-9999 b/metadata/md5-cache/dev-ros/roscpp-9999
index 654ac87a8ac1..f790b356712c 100644
--- a/metadata/md5-cache/dev-ros/roscpp-9999
+++ b/metadata/md5-cache/dev-ros/roscpp-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76c0f153c3a9ad7d28f851429461686d
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2
index aa1b58292717..d9c4db8dd9e3 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.7.2.tar.gz -> roscpp_core-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c44874a13858d172a270c905d8f7d8d
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-9999 b/metadata/md5-cache/dev-ros/roscpp_serialization-9999
index fbf6fff4b8e1..54aead188f5a 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_single_t
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c44874a13858d172a270c905d8f7d8d
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.7.2 b/metadata/md5-cache/dev-ros/roscpp_traits-0.7.2
index 20f35d398647..f225c404bcd5 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.7.2
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.7.2.tar.gz -> roscpp_core-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e39f2c98a32da1734dc1721a4959cefa
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-9999 b/metadata/md5-cache/dev-ros/roscpp_traits-9999
index cd0698e7575c..b0214fa8e240 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e39f2c98a32da1734dc1721a4959cefa
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1
index 16577a126382..add44829719c 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.1.tar.gz -> ros_tutorials-0.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=774d828732fa665b9bad6c050613ef65
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.2 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.2
index 4b05130dc240..5b286953dbc7 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.2
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.2.tar.gz -> ros_tutorials-0.10.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=774d828732fa665b9bad6c050613ef65
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-9999 b/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
index 9ec707ef620b..67edca23e502 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/roscons
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=774d828732fa665b9bad6c050613ef65
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.15.6 b/metadata/md5-cache/dev-ros/roscreate-1.15.6
index cd582018dfb7..136f2b873634 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.15.6
+++ b/metadata/md5-cache/dev-ros/roscreate-1.15.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d09d1337c8d641229de9f4c31e808a36
diff --git a/metadata/md5-cache/dev-ros/roscreate-9999 b/metadata/md5-cache/dev-ros/roscreate-9999
index 2be6b315e48f..d963c1fe7a20 100644
--- a/metadata/md5-cache/dev-ros/roscreate-9999
+++ b/metadata/md5-cache/dev-ros/roscreate-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d09d1337c8d641229de9f4c31e808a36
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.1 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.1
index 2d21a8312058..6a9f5303711b 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.1
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c387a0d56f1eb1156375350926eb2717
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4
index c91258daef26..d1f07641f565 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c387a0d56f1eb1156375350926eb2717
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.6 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.6
index 5aa7debc58cd..08c3438b3ea5 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.6
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.6.tar.gz -> diagnostics-1.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c387a0d56f1eb1156375350926eb2717
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-9999 b/metadata/md5-cache/dev-ros/rosdiagnostic-9999
index ae98adae7018..484d194fb966 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-9999
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c387a0d56f1eb1156375350926eb2717
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.15.8 b/metadata/md5-cache/dev-ros/rosgraph-1.15.8
index 7b0038f88446..f785bd9f4ec4 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=410c28c128f6deed079ad289ea290b0e
diff --git a/metadata/md5-cache/dev-ros/rosgraph-9999 b/metadata/md5-cache/dev-ros/rosgraph-9999
index f2a6d465a8bf..231b70eb59ac 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/rosgraph-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_py
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=410c28c128f6deed079ad289ea290b0e
diff --git a/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3 b/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3
index 9743e1d37d37..75199c5ba19b 100644
--- a/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3
+++ b/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm_msgs/archive/1.11.3.tar.gz -> ros_comm_msgs-1.11.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4cf45a13da9a6d2d3d580a6bdc6a1b17
diff --git a/metadata/md5-cache/dev-ros/rosgraph_msgs-9999 b/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
index f1920964f073..8a1323cc0930 100644
--- a/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4cf45a13da9a6d2d3d580a6bdc6a1b17
diff --git a/metadata/md5-cache/dev-ros/roslang-1.15.5 b/metadata/md5-cache/dev-ros/roslang-1.15.5
index 053b47a3cd7a..dbd2189b6eb3 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.15.5
+++ b/metadata/md5-cache/dev-ros/roslang-1.15.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55118fe6333523938e2a9540c5e817cb
diff --git a/metadata/md5-cache/dev-ros/roslang-1.15.6 b/metadata/md5-cache/dev-ros/roslang-1.15.6
index c5f178eaf7e4..836f53507da0 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.15.6
+++ b/metadata/md5-cache/dev-ros/roslang-1.15.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55118fe6333523938e2a9540c5e817cb
diff --git a/metadata/md5-cache/dev-ros/roslang-9999 b/metadata/md5-cache/dev-ros/roslang-9999
index 8d992fa03563..1998713ac601 100644
--- a/metadata/md5-cache/dev-ros/roslang-9999
+++ b/metadata/md5-cache/dev-ros/roslang-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55118fe6333523938e2a9540c5e817cb
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1 b/metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1
index d85e6ce9bcf4..065c03ffa1ff 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.15.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7e8bf6e1b2ed6efeea222e885b0da70
diff --git a/metadata/md5-cache/dev-ros/roslaunch-9999 b/metadata/md5-cache/dev-ros/roslaunch-9999
index 1b31e0b706a5..4df11e358142 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/roslaunch-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7e8bf6e1b2ed6efeea222e885b0da70
diff --git a/metadata/md5-cache/dev-ros/roslib-1.15.6 b/metadata/md5-cache/dev-ros/roslib-1.15.6
index ab85bf67c87e..dbc733cf6193 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.15.6
+++ b/metadata/md5-cache/dev-ros/roslib-1.15.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35e443478414512991ac0775738f95c7
diff --git a/metadata/md5-cache/dev-ros/roslib-9999 b/metadata/md5-cache/dev-ros/roslib-9999
index 0183f24693b9..4b8da9f738d2 100644
--- a/metadata/md5-cache/dev-ros/roslib-9999
+++ b/metadata/md5-cache/dev-ros/roslib-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targ
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35e443478414512991ac0775738f95c7
diff --git a/metadata/md5-cache/dev-ros/roslint-0.12.0 b/metadata/md5-cache/dev-ros/roslint-0.12.0
index e7d71f194d29..71b27f99caeb 100644
--- a/metadata/md5-cache/dev-ros/roslint-0.12.0
+++ b/metadata/md5-cache/dev-ros/roslint-0.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roslint/archive/0.12.0.tar.gz -> roslint-0.12.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d6c6ddd55d56216d89f088c7264b23a
diff --git a/metadata/md5-cache/dev-ros/roslint-9999 b/metadata/md5-cache/dev-ros/roslint-9999
index fe714f36d309..38e1e454e558 100644
--- a/metadata/md5-cache/dev-ros/roslint-9999
+++ b/metadata/md5-cache/dev-ros/roslint-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d6c6ddd55d56216d89f088c7264b23a
diff --git a/metadata/md5-cache/dev-ros/roslisp-1.9.24 b/metadata/md5-cache/dev-ros/roslisp-1.9.24
index 4df784f55504..8ec2df4e1ebc 100644
--- a/metadata/md5-cache/dev-ros/roslisp-1.9.24
+++ b/metadata/md5-cache/dev-ros/roslisp-1.9.24
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roslisp/archive/1.9.24.tar.gz -> roslisp-1.9.24.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50820048bc92b86e42b6f2f85d7863da
diff --git a/metadata/md5-cache/dev-ros/roslisp-9999 b/metadata/md5-cache/dev-ros/roslisp-9999
index c028eb0eddcc..5027da5e54b2 100644
--- a/metadata/md5-cache/dev-ros/roslisp-9999
+++ b/metadata/md5-cache/dev-ros/roslisp-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50820048bc92b86e42b6f2f85d7863da
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.15.8 b/metadata/md5-cache/dev-ros/roslz4-1.15.8
index b206f304531c..5d0a8f078d80 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.15.8
+++ b/metadata/md5-cache/dev-ros/roslz4-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ff32d78ac64e19b554bdc70cbcf7806
diff --git a/metadata/md5-cache/dev-ros/roslz4-9999 b/metadata/md5-cache/dev-ros/roslz4-9999
index b8699dc17d7e..c4ea47a2624c 100644
--- a/metadata/md5-cache/dev-ros/roslz4-9999
+++ b/metadata/md5-cache/dev-ros/roslz4-9999
@@ -11,5 +11,5 @@ RDEPEND=app-arch/lz4 dev-ros/cpp_common python_single_target_python3_7? ( dev-la
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ff32d78ac64e19b554bdc70cbcf7806
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.15.5 b/metadata/md5-cache/dev-ros/rosmake-1.15.5
index e51254d5fae5..2e61989e81b9 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosmake-1.15.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d749d18aaddb49f31a887602656957cb
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.15.6 b/metadata/md5-cache/dev-ros/rosmake-1.15.6
index 7f41dea1c184..abcb3bc39522 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosmake-1.15.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d749d18aaddb49f31a887602656957cb
diff --git a/metadata/md5-cache/dev-ros/rosmake-9999 b/metadata/md5-cache/dev-ros/rosmake-9999
index 41642d5cdf08..72440a6638f0 100644
--- a/metadata/md5-cache/dev-ros/rosmake-9999
+++ b/metadata/md5-cache/dev-ros/rosmake-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d749d18aaddb49f31a887602656957cb
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.15.7 b/metadata/md5-cache/dev-ros/rosmaster-1.15.7
index a3edebb10bc5..d0cc98292282 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.15.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e99df6e26ec3c6d8c3a2af12a187f69
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.15.8 b/metadata/md5-cache/dev-ros/rosmaster-1.15.8
index fc472894dc6a..98d098b255a0 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e99df6e26ec3c6d8c3a2af12a187f69
diff --git a/metadata/md5-cache/dev-ros/rosmaster-9999 b/metadata/md5-cache/dev-ros/rosmaster-9999
index afd22b827fd0..a8dcb3fae4d5 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/rosmaster-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_targe
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e99df6e26ec3c6d8c3a2af12a187f69
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.15.7 b/metadata/md5-cache/dev-ros/rosmsg-1.15.7
index 74f93df61c7c..af64a29482c0 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.15.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bd8500232cc1d40d1642c3c47a1f719
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.15.8 b/metadata/md5-cache/dev-ros/rosmsg-1.15.8
index 918ed1178964..f13884efe6f2 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bd8500232cc1d40d1642c3c47a1f719
diff --git a/metadata/md5-cache/dev-ros/rosmsg-9999 b/metadata/md5-cache/dev-ros/rosmsg-9999
index 9c99466501ee..b93494be4178 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-9999
+++ b/metadata/md5-cache/dev-ros/rosmsg-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bd8500232cc1d40d1642c3c47a1f719
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.15.8 b/metadata/md5-cache/dev-ros/rosnode-1.15.8
index 5e77ab9926c4..4691d42c3605 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosnode-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad5d15e2268c7f74e034b47fda78256c
diff --git a/metadata/md5-cache/dev-ros/rosnode-9999 b/metadata/md5-cache/dev-ros/rosnode-9999
index 3778caeccf38..d93107171f43 100644
--- a/metadata/md5-cache/dev-ros/rosnode-9999
+++ b/metadata/md5-cache/dev-ros/rosnode-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad5d15e2268c7f74e034b47fda78256c
diff --git a/metadata/md5-cache/dev-ros/rosout-1.15.7 b/metadata/md5-cache/dev-ros/rosout-1.15.7
index ffb4c2e9a0a9..523e39ebeef6 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosout-1.15.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5acd9311aaeb96df2200f42788a0f9ca
diff --git a/metadata/md5-cache/dev-ros/rosout-1.15.8 b/metadata/md5-cache/dev-ros/rosout-1.15.8
index 0f4b2b6b5e5f..6ef0553d32ec 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosout-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5acd9311aaeb96df2200f42788a0f9ca
diff --git a/metadata/md5-cache/dev-ros/rosout-9999 b/metadata/md5-cache/dev-ros/rosout-9999
index 789ea066c0eb..c75ac91e21ba 100644
--- a/metadata/md5-cache/dev-ros/rosout-9999
+++ b/metadata/md5-cache/dev-ros/rosout-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=d
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5acd9311aaeb96df2200f42788a0f9ca
diff --git a/metadata/md5-cache/dev-ros/rospack-2.6.2 b/metadata/md5-cache/dev-ros/rospack-2.6.2
index 6a39edb846a7..a8405b2eb75c 100644
--- a/metadata/md5-cache/dev-ros/rospack-2.6.2
+++ b/metadata/md5-cache/dev-ros/rospack-2.6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/rospack/archive/2.6.2.tar.gz -> rospack-2.6.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3004cce08dc048d47c82bc9fdd0f4191
diff --git a/metadata/md5-cache/dev-ros/rospack-9999 b/metadata/md5-cache/dev-ros/rospack-9999
index 6ac92546a9c4..bb8fc6b036ae 100644
--- a/metadata/md5-cache/dev-ros/rospack-9999
+++ b/metadata/md5-cache/dev-ros/rospack-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= dev-ros/ros_environment python_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3004cce08dc048d47c82bc9fdd0f4191
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.15.7 b/metadata/md5-cache/dev-ros/rosparam-1.15.7
index ffe89e5d01bf..140cc9526abb 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosparam-1.15.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26e161c00f1ede8e67a4d163fa9aa089
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.15.8 b/metadata/md5-cache/dev-ros/rosparam-1.15.8
index 51604c85c698..f84c1f62427e 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosparam-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26e161c00f1ede8e67a4d163fa9aa089
diff --git a/metadata/md5-cache/dev-ros/rosparam-9999 b/metadata/md5-cache/dev-ros/rosparam-9999
index 1e625bb77951..f88f767d11bb 100644
--- a/metadata/md5-cache/dev-ros/rosparam-9999
+++ b/metadata/md5-cache/dev-ros/rosparam-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_targe
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26e161c00f1ede8e67a4d163fa9aa089
diff --git a/metadata/md5-cache/dev-ros/rospy-1.15.7 b/metadata/md5-cache/dev-ros/rospy-1.15.7
index f5861f51858d..8fa9b644b7af 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.15.7
+++ b/metadata/md5-cache/dev-ros/rospy-1.15.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c7b9475a6d2b8c752eaa03ca398f7cc
diff --git a/metadata/md5-cache/dev-ros/rospy-1.15.8 b/metadata/md5-cache/dev-ros/rospy-1.15.8
index 37716f0bd1e8..05b2ef735a76 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.15.8
+++ b/metadata/md5-cache/dev-ros/rospy-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c7b9475a6d2b8c752eaa03ca398f7cc
diff --git a/metadata/md5-cache/dev-ros/rospy-9999 b/metadata/md5-cache/dev-ros/rospy-9999
index 159ae4850cca..4ba9dfd56333 100644
--- a/metadata/md5-cache/dev-ros/rospy-9999
+++ b/metadata/md5-cache/dev-ros/rospy-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c7b9475a6d2b8c752eaa03ca398f7cc
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
index de4f9eae3a91..79ee81d7626f 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.1.tar.gz -> ros_tutorials-0.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9047fda4d84828e565e866cb7471b283
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.2 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.2
index c3f4b5507b6a..b381a9406587 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.2
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.2.tar.gz -> ros_tutorials-0.10.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9047fda4d84828e565e866cb7471b283
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-9999 b/metadata/md5-cache/dev-ros/rospy_tutorials-9999
index 278426966485..09dd32ae017c 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_p
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9047fda4d84828e565e866cb7471b283
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0
index 38ee4bc99572..d5ea79388861 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01f5d2e059145dbd4b8d5499257803a6
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-9999 b/metadata/md5-cache/dev-ros/rosserial_arduino-9999
index 2e573c7569b7..e4edcd6328df 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01f5d2e059145dbd4b8d5499257803a6
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_client-0.8.0
index 35dd48fc0980..375d78c472e0 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_client-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b4d212504387ee1f1a43dcd1d19b12b
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-9999 b/metadata/md5-cache/dev-ros/rosserial_client-9999
index 87d79f840241..dc4da4169771 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_client-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_sing
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b4d212504387ee1f1a43dcd1d19b12b
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0
index f25c754d80ea..33b25b146c0a 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b29350ec3aa158b69276ec88ac695ed5
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
index 777381c21525..0f2a0dfb2c2f 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b29350ec3aa158b69276ec88ac695ed5
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0
index b3cce6db62d7..a77b60029ace 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b9bd5c0e8043ab57691a0967eae88cd
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-9999 b/metadata/md5-cache/dev-ros/rosserial_msgs-9999
index 5ffe9fe67d23..314088019c3f 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b9bd5c0e8043ab57691a0967eae88cd
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_python-0.8.0
index 68f19bb68211..c9e38367f8ed 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff762244924b198b89504337dd9f31d1
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-9999 b/metadata/md5-cache/dev-ros/rosserial_python-9999
index 2cbc1c54651e..26f74639225c 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_python-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_p
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff762244924b198b89504337dd9f31d1
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_server-0.8.0
index a7c3d8c8b687..4d47c4b33780 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_server-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5861d4f7fe56da0b0f0cafc6ebd7091b
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-9999 b/metadata/md5-cache/dev-ros/rosserial_server-9999
index 5bc297e2eb14..b6c7c6117203 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_server-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] python_sing
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5861d4f7fe56da0b0f0cafc6ebd7091b
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0
index 844bee4dbbea..28146b6bfa64 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=243f73748f717611e78b9a861e0eb9b8
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-9999 b/metadata/md5-cache/dev-ros/rosserial_tivac-9999
index be39a41ee941..954876edbcce 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/ros
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=243f73748f717611e78b9a861e0eb9b8
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_windows-0.8.0
index b7da95904bc7..66bcd21b7a60 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0dc0b18363be2339ae14a86ae36b428a
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-9999 b/metadata/md5-cache/dev-ros/rosserial_windows-9999
index ca7d6686cf40..924878114117 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0dc0b18363be2339ae14a86ae36b428a
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0
index a74136d00c3a..e478e3782520 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1577863352a25b6cd0312f24233cd75
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-9999 b/metadata/md5-cache/dev-ros/rosserial_xbee-9999
index f8ecdedbd37d..2649cc8a5392 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_p
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1577863352a25b6cd0312f24233cd75
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.15.7 b/metadata/md5-cache/dev-ros/rosservice-1.15.7
index e8d5edb58636..b448e5dae421 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosservice-1.15.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a223748f45a180da9eea2962fdb8b2bf
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.15.8 b/metadata/md5-cache/dev-ros/rosservice-1.15.8
index 2b0be4c32500..e593e403b20d 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.15.8
+++ b/metadata/md5-cache/dev-ros/rosservice-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a223748f45a180da9eea2962fdb8b2bf
diff --git a/metadata/md5-cache/dev-ros/rosservice-9999 b/metadata/md5-cache/dev-ros/rosservice-9999
index c10e29fa8031..936356dcea04 100644
--- a/metadata/md5-cache/dev-ros/rosservice-9999
+++ b/metadata/md5-cache/dev-ros/rosservice-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a223748f45a180da9eea2962fdb8b2bf
diff --git a/metadata/md5-cache/dev-ros/rostest-1.15.8 b/metadata/md5-cache/dev-ros/rostest-1.15.8
index 9bde0143a261..053d46915783 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.15.8
+++ b/metadata/md5-cache/dev-ros/rostest-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12e9c999d29d688ca01bd25b33e9d871
diff --git a/metadata/md5-cache/dev-ros/rostest-9999 b/metadata/md5-cache/dev-ros/rostest-9999
index b9f18a912d35..4dd23dd6942b 100644
--- a/metadata/md5-cache/dev-ros/rostest-9999
+++ b/metadata/md5-cache/dev-ros/rostest-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[thr
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12e9c999d29d688ca01bd25b33e9d871
diff --git a/metadata/md5-cache/dev-ros/rostime-0.7.2 b/metadata/md5-cache/dev-ros/rostime-0.7.2
index 45b4ecc4829d..9bd6671a231d 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.7.2
+++ b/metadata/md5-cache/dev-ros/rostime-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.7.2.tar.gz -> roscpp_core-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb75d86a8d373f1c0239715407a047fa
diff --git a/metadata/md5-cache/dev-ros/rostime-9999 b/metadata/md5-cache/dev-ros/rostime-9999
index 101b19910dde..7166657fe2b3 100644
--- a/metadata/md5-cache/dev-ros/rostime-9999
+++ b/metadata/md5-cache/dev-ros/rostime-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_single_target_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb75d86a8d373f1c0239715407a047fa
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.15.8 b/metadata/md5-cache/dev-ros/rostopic-1.15.8
index 038602ac8be3..d1cde9862c48 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.15.8
+++ b/metadata/md5-cache/dev-ros/rostopic-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8138353993a17636f40fa1af6057dba2
diff --git a/metadata/md5-cache/dev-ros/rostopic-9999 b/metadata/md5-cache/dev-ros/rostopic-9999
index 520c8ca49115..877d9d62cd6c 100644
--- a/metadata/md5-cache/dev-ros/rostopic-9999
+++ b/metadata/md5-cache/dev-ros/rostopic-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rospy[python_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8138353993a17636f40fa1af6057dba2
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.15.5 b/metadata/md5-cache/dev-ros/rosunit-1.15.5
index 39817f8b0a25..9f3c6d721708 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosunit-1.15.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c02a417bea734387509412c88f623792
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.15.6 b/metadata/md5-cache/dev-ros/rosunit-1.15.6
index caf819f3a916..e0aec684bb12 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.15.6
+++ b/metadata/md5-cache/dev-ros/rosunit-1.15.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c02a417bea734387509412c88f623792
diff --git a/metadata/md5-cache/dev-ros/rosunit-9999 b/metadata/md5-cache/dev-ros/rosunit-9999
index 0a3f416ebe16..8fc3a8c84a51 100644
--- a/metadata/md5-cache/dev-ros/rosunit-9999
+++ b/metadata/md5-cache/dev-ros/rosunit-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c02a417bea734387509412c88f623792
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.15.8 b/metadata/md5-cache/dev-ros/roswtf-1.15.8
index 11286785b8e4..31b1dea0cf3a 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.15.8
+++ b/metadata/md5-cache/dev-ros/roswtf-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=17f255589bd3ddf8e325af975822863f
diff --git a/metadata/md5-cache/dev-ros/roswtf-9999 b/metadata/md5-cache/dev-ros/roswtf-9999
index c50eeba805b3..521e2f5cb9a7 100644
--- a/metadata/md5-cache/dev-ros/roswtf-9999
+++ b/metadata/md5-cache/dev-ros/roswtf-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_pyt
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=17f255589bd3ddf8e325af975822863f
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0 b/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
index 7913de858b70..ae63e4c040f5 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6abb5d12d5fbfcd5a10a1c0f88254f8b
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-9999 b/metadata/md5-cache/dev-ros/rotate_recovery-9999
index 2a03d495d500..91d579c2f1c9 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-9999
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eig
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6abb5d12d5fbfcd5a10a1c0f88254f8b
diff --git a/metadata/md5-cache/dev-ros/rqt_action-0.4.9 b/metadata/md5-cache/dev-ros/rqt_action-0.4.9
index 4c70293646d1..23ade22664c8 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_action-0.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_action/archive/0.4.9.tar.gz -> rqt_action-0.4.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03ac5926db66a3c233cb044ccad4946c
diff --git a/metadata/md5-cache/dev-ros/rqt_action-9999 b/metadata/md5-cache/dev-ros/rqt_action-9999
index 45d7a1a14edf..129a56ae06c9 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-9999
+++ b/metadata/md5-cache/dev-ros/rqt_action-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03ac5926db66a3c233cb044ccad4946c
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.13 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.13
index 4da5a833ba7c..11306a489523 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.13
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.4.13
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.13.tar.gz -> rqt_bag-0.4.13.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56be5be194b74b297c61f0d84be69fc2
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-9999 b/metadata/md5-cache/dev-ros/rqt_bag-9999
index 1ffe2cf7c26c..36dcf4767753 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56be5be194b74b297c61f0d84be69fc2
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13
index 4ba0182a0cef..283bc7986e8f 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.13.tar.gz -> rqt_bag-0.4.13.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efde050257d357297145beb708d3f729
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
index ede769140f4e..de7486ec89b6 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efde050257d357297145beb708d3f729
diff --git a/metadata/md5-cache/dev-ros/rqt_console-0.4.11 b/metadata/md5-cache/dev-ros/rqt_console-0.4.11
index 8a4fccd99bb0..8a0799b9da7b 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-0.4.11
+++ b/metadata/md5-cache/dev-ros/rqt_console-0.4.11
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_console/archive/0.4.11.tar.gz -> rqt_console-0.4.11.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=364b5d1158f5632babd0cebe1663f1e8
diff --git a/metadata/md5-cache/dev-ros/rqt_console-9999 b/metadata/md5-cache/dev-ros/rqt_console-9999
index 328c6846bad9..c9879da25737 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_console-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=364b5d1158f5632babd0cebe1663f1e8
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.1 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.1
index 04597d9bc23f..4f986e09e853 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.1
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b03b2093c3461ee6ef092f5815074db
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.2 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.2
index be90742453f4..72e4cf5d8307 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.2
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b03b2093c3461ee6ef092f5815074db
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-9999 b/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
index 51b01fab6e2a..b3044a03ba0e 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/r
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b03b2093c3461ee6ef092f5815074db
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.10 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
index 5d6116b6c25e..c737a11e5d16 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_dep/archive/0.4.10.tar.gz -> rqt_dep-0.4.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9331376cee8d83fc91ff6c88239e701f
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-9999 b/metadata/md5-cache/dev-ros/rqt_dep-9999
index 59f63dac6637..c035ddf605e6 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-9999
+++ b/metadata/md5-cache/dev-ros/rqt_dep-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9331376cee8d83fc91ff6c88239e701f
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-0.4.14 b/metadata/md5-cache/dev-ros/rqt_graph-0.4.14
index 37aecb6f2b5d..a45634c0f2e9 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.4.14
+++ b/metadata/md5-cache/dev-ros/rqt_graph-0.4.14
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_graph/archive/0.4.14.tar.gz -> rqt_graph-0.4.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08e33af7fbb2839e08c857e92f5488a3
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-9999 b/metadata/md5-cache/dev-ros/rqt_graph-9999
index 77ec4ef440b2..02d3cdb2ed86 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-9999
+++ b/metadata/md5-cache/dev-ros/rqt_graph-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08e33af7fbb2839e08c857e92f5488a3
diff --git a/metadata/md5-cache/dev-ros/rqt_gui-0.5.2 b/metadata/md5-cache/dev-ros/rqt_gui-0.5.2
index b3d74bba9963..9451428b549d 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_gui-0.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4154236a271b8032e520ed3ae15f20d6
diff --git a/metadata/md5-cache/dev-ros/rqt_gui-9999 b/metadata/md5-cache/dev-ros/rqt_gui-9999
index 4f28ff72a58b..d31fb154e6a2 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] dev-libs/boos
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4154236a271b8032e520ed3ae15f20d6
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.2 b/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.2
index f1861b12e1c9..9a5977db0a37 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6fd3fc039eead4d96d25c2ba55e309d
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999 b/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
index 4fb277279d1b..9775dc15a1ed 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6fd3fc039eead4d96d25c2ba55e309d
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.2 b/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.2
index 72e097e31d1d..48801d517a31 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-0.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07bb753f9d503907082eda3a1e95b5a9
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-9999 b/metadata/md5-cache/dev-ros/rqt_gui_py-9999
index 6df914b08252..985404d6d815 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] >=dev-ros/qt_gui-0.3.0
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07bb753f9d503907082eda3a1e95b5a9
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.15 b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.15
index a860b8992312..5e49ecdbcdb7 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.15
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.15
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_image_view/archive/0.4.15.tar.gz -> rqt_image_view-0.4.15.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e1210d84a04b5573c35a9a8220aef47
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-9999 b/metadata/md5-cache/dev-ros/rqt_image_view-9999
index fe4d41782956..a0c57cec1bed 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] media-libs/opencv:
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e1210d84a04b5573c35a9a8220aef47
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.4.8 b/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
index 6726b85ad3ac..598fe92ad427 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_launch/archive/0.4.8.tar.gz -> rqt_launch-0.4.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efc22c56f04960580f0bce126eeb3b60
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-9999 b/metadata/md5-cache/dev-ros/rqt_launch-9999
index b19ad563638b..836331ab1376 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-9999
+++ b/metadata/md5-cache/dev-ros/rqt_launch-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslau
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efc22c56f04960580f0bce126eeb3b60
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.11 b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.11
index 8b91e43323bf..1ec5e09464fd 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.11
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.11
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_logger_level/archive/0.4.11.tar.gz -> rqt_logger_level-0.4.11.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39b6ff45cf6cf3d0ce48c17c063108fc
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-9999 b/metadata/md5-cache/dev-ros/rqt_logger_level-9999
index 5fd676ee26f0..94377304345c 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-9999
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39b6ff45cf6cf3d0ce48c17c063108fc
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9 b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
index cdc33de60bc1..4915bf389f3a 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_moveit/archive/0.5.9.tar.gz -> rqt_moveit-0.5.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95ef5531ef01ba95369c25cee54e12cb
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-9999 b/metadata/md5-cache/dev-ros/rqt_moveit-9999
index e60585a55cf2..7cba25d0ff4a 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-9999
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95ef5531ef01ba95369c25cee54e12cb
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.4.9 b/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
index 1b768bd0e807..5d36a1b4f718 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_msg/archive/0.4.9.tar.gz -> rqt_msg-0.4.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=696f9747a699226d1aa78179a2493721
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-9999 b/metadata/md5-cache/dev-ros/rqt_msg-9999
index 45f4bf0dbcee..68b71689ada2 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-9999
+++ b/metadata/md5-cache/dev-ros/rqt_msg-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=696f9747a699226d1aa78179a2493721
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7 b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
index 3f4b8397c204..0acd60186437 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_nav_view/archive/0.5.7.tar.gz -> rqt_nav_view-0.5.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f45f1ccc29b7a1cf785e711fb5562d81
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-9999 b/metadata/md5-cache/dev-ros/rqt_nav_view-9999
index 8e6aed8e19cd..7725be7de4dd 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f45f1ccc29b7a1cf785e711fb5562d81
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-0.4.12 b/metadata/md5-cache/dev-ros/rqt_plot-0.4.12
index 54715ad97250..98d9664f9af2 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-0.4.12
+++ b/metadata/md5-cache/dev-ros/rqt_plot-0.4.12
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_plot/archive/0.4.12.tar.gz -> rqt_plot-0.4.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76f32f03eefdff59fbbf4f1145c35ad4
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-9999 b/metadata/md5-cache/dev-ros/rqt_plot-9999
index e8a5af6066f8..766482aecdf5 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-9999
+++ b/metadata/md5-cache/dev-ros/rqt_plot-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_p
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76f32f03eefdff59fbbf4f1145c35ad4
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10
index bf8c060aaf2f..9544946d8fe0 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.10
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_pose_view/archive/0.5.10.tar.gz -> rqt_pose_view-0.5.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53b5a70d3a6dbb057b02fedb3b7d40a0
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-9999 b/metadata/md5-cache/dev-ros/rqt_pose_view-9999
index abb01d187d3d..06e23b502411 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53b5a70d3a6dbb057b02fedb3b7d40a0
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9 b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
index 91c71a296158..7269eb19350d 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_publisher/archive/0.4.9.tar.gz -> rqt_publisher-0.4.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ca4ae103b03a0a221e70e7c921c27e0
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-9999 b/metadata/md5-cache/dev-ros/rqt_publisher-9999
index 73e1e604d707..d7e8f216633b 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-9999
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ca4ae103b03a0a221e70e7c921c27e0
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-0.5.2 b/metadata/md5-cache/dev-ros/rqt_py_common-0.5.2
index 304dae0af856..6c9fc2e832c0 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-0.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a4247c65291c3ab33f41629c2bc5fba
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-9999 b/metadata/md5-cache/dev-ros/rqt_py_common-9999
index e008255dfa5c..90868ca55de5 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a4247c65291c3ab33f41629c2bc5fba
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.9 b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.9
index 0108c0b387ef..d0b56d756366 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_py_console/archive/0.4.9.tar.gz -> rqt_py_console-0.4.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=753094002b8406055cdb156e0f51cecf
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-9999 b/metadata/md5-cache/dev-ros/rqt_py_console-9999
index a644ea6b7fe2..41d3b70998f4 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=753094002b8406055cdb156e0f51cecf
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3
index a156b234bb65..d965ee6e9c33 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_reconfigure/archive/0.5.3.tar.gz -> rqt_reconfigure-0.5.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8416338bef220a5c38a93aa6425a4f91
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-9999 b/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
index 9a61c661abb7..87a478b1fb07 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8416338bef220a5c38a93aa6425a4f91
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.8 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.8
index 7daa8977f3de..b3bc42c7a4ed 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.8
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_dashboard/archive/0.5.8.tar.gz -> rqt_robot_dashboard-0.5.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13c2b74d4fb1d0d9bfd2c94770622ad4
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
index bf12cf63317e..99fea3d100d5 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13c2b74d4fb1d0d9bfd2c94770622ad4
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.12 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.12
index 23743b0d6211..a4d55cc8a6af 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.12
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.12
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_monitor/archive/0.5.12.tar.gz -> rqt_robot_monitor-0.5.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=959de8cb5b8de2f5820c9e8f2315c59c
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
index a1625e77b53d..5e0ce86f41b4 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=959de8cb5b8de2f5820c9e8f2315c59c
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.11 b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.11
index dc890fd325bb..091dbe3940fa 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.11
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.11
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_steering/archive/0.5.11.tar.gz -> rqt_robot_steering-0.5.11.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96d222cb0d47f69b7ccb351cdffcab76
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-9999 b/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
index 93d6cbf66b77..79d4312573c9 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96d222cb0d47f69b7ccb351cdffcab76
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.8 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.8
index bda323fddbe4..1ebb4d8dd42a 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.8
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_runtime_monitor/archive/0.5.8.tar.gz -> rqt_runtime_monitor-0.5.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ad941378a1cf74bb31ef324132edfcc
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
index 4115ea09b495..a5ff35f6c96d 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ad941378a1cf74bb31ef324132edfcc
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1 b/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
index a8eefcbd795c..b6928e181d16 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_rviz/archive/0.6.1.tar.gz -> rqt_rviz-0.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35a2aa9428c930af81ee79dc142cccfd
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-9999 b/metadata/md5-cache/dev-ros/rqt_rviz-9999
index 8802ec9dd599..6b8654d45313 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-9999
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?] d
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35a2aa9428c930af81ee79dc142cccfd
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.9 b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.9
index c3fc8ebcc669..610c8ebe1a65 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_service_caller/archive/0.4.9.tar.gz -> rqt_service_caller-0.4.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61229b35f7b2c28fc2a0f3b18fa25c8c
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-9999 b/metadata/md5-cache/dev-ros/rqt_service_caller-9999
index 74877bd20932..9f72259bbad7 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-9999
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61229b35f7b2c28fc2a0f3b18fa25c8c
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-0.4.10 b/metadata/md5-cache/dev-ros/rqt_shell-0.4.10
index 47dba402f5ac..d309e583161e 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-0.4.10
+++ b/metadata/md5-cache/dev-ros/rqt_shell-0.4.10
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_shell/archive/0.4.10.tar.gz -> rqt_shell-0.4.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=269d72ae6ef97884c12bed51157b84f1
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-9999 b/metadata/md5-cache/dev-ros/rqt_shell-9999
index bb39d3f7f6af..978efcefa4a7 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-9999
+++ b/metadata/md5-cache/dev-ros/rqt_shell-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=269d72ae6ef97884c12bed51157b84f1
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-0.4.8 b/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
index c38807f42c29..ed331e9d8b32 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_srv/archive/0.4.8.tar.gz -> rqt_srv-0.4.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b04275dd5b5283b32d2f88e3d7957294
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-9999 b/metadata/md5-cache/dev-ros/rqt_srv-9999
index 83b3543948eb..688e3398f4ea 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-9999
+++ b/metadata/md5-cache/dev-ros/rqt_srv-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b04275dd5b5283b32d2f88e3d7957294
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.1 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.1
index 95dbaddee3e2..0e333ca4fc0e 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.1
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_tf_tree/archive/0.6.1.tar.gz -> rqt_tf_tree-0.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1641f4ed598644646fdb8f9bcf93630
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-9999 b/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
index d77b3b559a67..1e4d53d775af 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1641f4ed598644646fdb8f9bcf93630
diff --git a/metadata/md5-cache/dev-ros/rqt_top-0.4.9 b/metadata/md5-cache/dev-ros/rqt_top-0.4.9
index e437def5a71c..b5fa5fc94da0 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_top-0.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_top/archive/0.4.9.tar.gz -> rqt_top-0.4.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c93ed0908343f114500103c996d8235
diff --git a/metadata/md5-cache/dev-ros/rqt_top-9999 b/metadata/md5-cache/dev-ros/rqt_top-9999
index eb7d5b84dbf8..5e62346d1001 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-9999
+++ b/metadata/md5-cache/dev-ros/rqt_top-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c93ed0908343f114500103c996d8235
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-0.4.12 b/metadata/md5-cache/dev-ros/rqt_topic-0.4.12
index 35e4377d738e..26e738770d94 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-0.4.12
+++ b/metadata/md5-cache/dev-ros/rqt_topic-0.4.12
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_topic/archive/0.4.12.tar.gz -> rqt_topic-0.4.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e355a9cc639c6d03feb11f96b86cd724
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-9999 b/metadata/md5-cache/dev-ros/rqt_topic-9999
index e28a6271415d..189490cfc4d1 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-9999
+++ b/metadata/md5-cache/dev-ros/rqt_topic-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e355a9cc639c6d03feb11f96b86cd724
diff --git a/metadata/md5-cache/dev-ros/rqt_web-0.4.9 b/metadata/md5-cache/dev-ros/rqt_web-0.4.9
index d552fec09104..c0a39fbb5d7a 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_web-0.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_web/archive/0.4.9.tar.gz -> rqt_web-0.4.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50c2cdbdc2a3e609194674eb0cdabec4
diff --git a/metadata/md5-cache/dev-ros/rqt_web-9999 b/metadata/md5-cache/dev-ros/rqt_web-9999
index 9351b8dd7594..54967871e9dd 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-9999
+++ b/metadata/md5-cache/dev-ros/rqt_web-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50c2cdbdc2a3e609194674eb0cdabec4
diff --git a/metadata/md5-cache/dev-ros/rviz-1.14.1 b/metadata/md5-cache/dev-ros/rviz-1.14.1
index 2ed7767959f8..c3f24f2148cf 100644
--- a/metadata/md5-cache/dev-ros/rviz-1.14.1
+++ b/metadata/md5-cache/dev-ros/rviz-1.14.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rviz/archive/1.14.1.tar.gz -> rviz-1.14.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4042f68c8b1e376e09ed104a74bc0f51
diff --git a/metadata/md5-cache/dev-ros/rviz-9999 b/metadata/md5-cache/dev-ros/rviz-9999
index 40edc499f9d7..bc9c3e223296 100644
--- a/metadata/md5-cache/dev-ros/rviz-9999
+++ b/metadata/md5-cache/dev-ros/rviz-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-doub
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4042f68c8b1e376e09ed104a74bc0f51
diff --git a/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.2 b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.2
index 6986be5fb569..3bbe4397a02f 100644
--- a/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.2
+++ b/metadata/md5-cache/dev-ros/rviz_imu_plugin-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.2.tar.gz -> imu_tools-1.2.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=645787d6dcb34edaaf55f68612cd56eb
diff --git a/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999 b/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
index 522b4886093f..e19fad196639 100644
--- a/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
+++ b/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-ros/roscpp dev-ros
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=645787d6dcb34edaaf55f68612cd56eb
diff --git a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.11.0 b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.11.0
index 0c43b98cdf69..6d9d71fec416 100644
--- a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.11.0
+++ b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a8d647f56c5fbd8623e89d5f4f2f07d
diff --git a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999 b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
index b8f9eb9fa4fc..5f7364af9ffb 100644
--- a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a8d647f56c5fbd8623e89d5f4f2f07d
diff --git a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.11.0 b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.11.0
index 3bf58d5a97cd..12c1909513c1 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.11.0
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61f21fef4ea62f70c698acd388806c40
diff --git a/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999 b/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
index c73fdebabc54..cc3b81d21516 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rviz[python_single_target_python3_7(-)?] python_single_target_py
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61f21fef4ea62f70c698acd388806c40
diff --git a/metadata/md5-cache/dev-ros/self_test-1.10.1 b/metadata/md5-cache/dev-ros/self_test-1.10.1
index db36b6a85e37..3c236d9664e4 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.10.1
+++ b/metadata/md5-cache/dev-ros/self_test-1.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb8c2c745a16883f85eea041b08c6852
diff --git a/metadata/md5-cache/dev-ros/self_test-1.9.4 b/metadata/md5-cache/dev-ros/self_test-1.9.4
index 580811ef9cf5..17e0e496129a 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.9.4
+++ b/metadata/md5-cache/dev-ros/self_test-1.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb8c2c745a16883f85eea041b08c6852
diff --git a/metadata/md5-cache/dev-ros/self_test-1.9.6 b/metadata/md5-cache/dev-ros/self_test-1.9.6
index 99fc76d40c17..1f731aa28e49 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.9.6
+++ b/metadata/md5-cache/dev-ros/self_test-1.9.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.6.tar.gz -> diagnostics-1.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb8c2c745a16883f85eea041b08c6852
diff --git a/metadata/md5-cache/dev-ros/self_test-9999 b/metadata/md5-cache/dev-ros/self_test-9999
index 5e84104bb923..336d80f35ff8 100644
--- a/metadata/md5-cache/dev-ros/self_test-9999
+++ b/metadata/md5-cache/dev-ros/self_test-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb8c2c745a16883f85eea041b08c6852
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0 b/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
index e5fde0c102b0..b76a4091f476 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb569c38e9a80935bdce93993514b438
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-9999 b/metadata/md5-cache/dev-ros/sensor_msgs-9999
index 5ecde2c7f48a..d9f796ae8f88 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-9999
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb569c38e9a80935bdce93993514b438
diff --git a/metadata/md5-cache/dev-ros/settlerlib-0.10.14 b/metadata/md5-cache/dev-ros/settlerlib-0.10.14
index ebc45ba4c4a2..b2012c8ddb64 100644
--- a/metadata/md5-cache/dev-ros/settlerlib-0.10.14
+++ b/metadata/md5-cache/dev-ros/settlerlib-0.10.14
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11d434e4a3edeb27b70f74af6c131c89
diff --git a/metadata/md5-cache/dev-ros/settlerlib-9999 b/metadata/md5-cache/dev-ros/settlerlib-9999
index 244d9b536608..c8582605bde8 100644
--- a/metadata/md5-cache/dev-ros/settlerlib-9999
+++ b/metadata/md5-cache/dev-ros/settlerlib-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime python_single_target
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11d434e4a3edeb27b70f74af6c131c89
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-1.13.0 b/metadata/md5-cache/dev-ros/shape_msgs-1.13.0
index b17f715d5792..0524a4e525ad 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/shape_msgs-1.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b44e669f2aeeded957191d45aadcfee1
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-9999 b/metadata/md5-cache/dev-ros/shape_msgs-9999
index 3aa8c4861561..e29eb5301a83 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-9999
+++ b/metadata/md5-cache/dev-ros/shape_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b44e669f2aeeded957191d45aadcfee1
diff --git a/metadata/md5-cache/dev-ros/smach-2.5.0 b/metadata/md5-cache/dev-ros/smach-2.5.0
index 888e237de5a7..7e79aa001509 100644
--- a/metadata/md5-cache/dev-ros/smach-2.5.0
+++ b/metadata/md5-cache/dev-ros/smach-2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.5.0.tar.gz -> executive_smach-2.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=711e08053ee160d9fdb0ae1701db5597
diff --git a/metadata/md5-cache/dev-ros/smach-9999 b/metadata/md5-cache/dev-ros/smach-9999
index 7af07af0f1f8..a59659eeddd3 100644
--- a/metadata/md5-cache/dev-ros/smach-9999
+++ b/metadata/md5-cache/dev-ros/smach-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=711e08053ee160d9fdb0ae1701db5597
diff --git a/metadata/md5-cache/dev-ros/smach_msgs-2.5.0 b/metadata/md5-cache/dev-ros/smach_msgs-2.5.0
index e648d1d340a2..7533e16f82b0 100644
--- a/metadata/md5-cache/dev-ros/smach_msgs-2.5.0
+++ b/metadata/md5-cache/dev-ros/smach_msgs-2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.5.0.tar.gz -> executive_smach-2.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e30ccac70cea974d168c81de129832c
diff --git a/metadata/md5-cache/dev-ros/smach_msgs-9999 b/metadata/md5-cache/dev-ros/smach_msgs-9999
index 5456b81bbf36..f5eebfd163d0 100644
--- a/metadata/md5-cache/dev-ros/smach_msgs-9999
+++ b/metadata/md5-cache/dev-ros/smach_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e30ccac70cea974d168c81de129832c
diff --git a/metadata/md5-cache/dev-ros/smach_ros-2.5.0 b/metadata/md5-cache/dev-ros/smach_ros-2.5.0
index 3f6f8ef56aaa..7fbe0035f2e7 100644
--- a/metadata/md5-cache/dev-ros/smach_ros-2.5.0
+++ b/metadata/md5-cache/dev-ros/smach_ros-2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.5.0.tar.gz -> executive_smach-2.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27961f918090d44ff975c5aa43eb42e5
diff --git a/metadata/md5-cache/dev-ros/smach_ros-9999 b/metadata/md5-cache/dev-ros/smach_ros-9999
index 4291125fd3ae..1a8f168055a3 100644
--- a/metadata/md5-cache/dev-ros/smach_ros-9999
+++ b/metadata/md5-cache/dev-ros/smach_ros-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rospy[python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27961f918090d44ff975c5aa43eb42e5
diff --git a/metadata/md5-cache/dev-ros/smclib-1.8.5 b/metadata/md5-cache/dev-ros/smclib-1.8.5
index 6429b028894f..abf6ad14377e 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.8.5
+++ b/metadata/md5-cache/dev-ros/smclib-1.8.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.5.tar.gz -> bond_core-1.8.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=887fb68742590c83aea0c297454be317
diff --git a/metadata/md5-cache/dev-ros/smclib-1.8.6 b/metadata/md5-cache/dev-ros/smclib-1.8.6
index 90afd7c7bf6a..e2943208f2fc 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.8.6
+++ b/metadata/md5-cache/dev-ros/smclib-1.8.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.6.tar.gz -> bond_core-1.8.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=887fb68742590c83aea0c297454be317
diff --git a/metadata/md5-cache/dev-ros/smclib-9999 b/metadata/md5-cache/dev-ros/smclib-9999
index 39f525ce032d..9493072fe9e0 100644
--- a/metadata/md5-cache/dev-ros/smclib-9999
+++ b/metadata/md5-cache/dev-ros/smclib-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=887fb68742590c83aea0c297454be317
diff --git a/metadata/md5-cache/dev-ros/stage_ros-1.8.0 b/metadata/md5-cache/dev-ros/stage_ros-1.8.0
index 60389c3ec825..a4e547a88e72 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-1.8.0
+++ b/metadata/md5-cache/dev-ros/stage_ros-1.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/stage_ros/archive/1.8.0.tar.gz -> stage_ros-1.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbaf8d7621b7a78a591391356810f2f5
diff --git a/metadata/md5-cache/dev-ros/stage_ros-9999 b/metadata/md5-cache/dev-ros/stage_ros-9999
index e5c93031fbbb..9c26903cf4ba 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-9999
+++ b/metadata/md5-cache/dev-ros/stage_ros-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbaf8d7621b7a78a591391356810f2f5
diff --git a/metadata/md5-cache/dev-ros/std_msgs-0.5.13 b/metadata/md5-cache/dev-ros/std_msgs-0.5.13
index 4461cdb24777..5d1cedb81b67 100644
--- a/metadata/md5-cache/dev-ros/std_msgs-0.5.13
+++ b/metadata/md5-cache/dev-ros/std_msgs-0.5.13
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/std_msgs/archive/0.5.13.tar.gz -> std_msgs-0.5.13.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f216de12e8cf869eb9480f4bffcb9997
diff --git a/metadata/md5-cache/dev-ros/std_msgs-9999 b/metadata/md5-cache/dev-ros/std_msgs-9999
index e8105d360465..4f2e406d83d0 100644
--- a/metadata/md5-cache/dev-ros/std_msgs-9999
+++ b/metadata/md5-cache/dev-ros/std_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f216de12e8cf869eb9480f4bffcb9997
diff --git a/metadata/md5-cache/dev-ros/std_srvs-1.11.3 b/metadata/md5-cache/dev-ros/std_srvs-1.11.3
index 52ee56d89bf3..56198f998f46 100644
--- a/metadata/md5-cache/dev-ros/std_srvs-1.11.3
+++ b/metadata/md5-cache/dev-ros/std_srvs-1.11.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm_msgs/archive/1.11.3.tar.gz -> ros_comm_msgs-1.11.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2dde0c47eceaa51210d10fce577171e5
diff --git a/metadata/md5-cache/dev-ros/std_srvs-9999 b/metadata/md5-cache/dev-ros/std_srvs-9999
index 7b45aab93122..90fbea071f6f 100644
--- a/metadata/md5-cache/dev-ros/std_srvs-9999
+++ b/metadata/md5-cache/dev-ros/std_srvs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2dde0c47eceaa51210d10fce577171e5
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-1.15.2 b/metadata/md5-cache/dev-ros/stereo_image_proc-1.15.2
index 8bb5f4c6b653..df81560dd0dd 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-1.15.2
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-1.15.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52de8406f3d02fb7c1a5a97d9ed37038
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-9999 b/metadata/md5-cache/dev-ros/stereo_image_proc-9999
index 0858afead6c9..5089e2470e47 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-9999
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52de8406f3d02fb7c1a5a97d9ed37038
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0 b/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
index 72eb2d53d197..30ebbecb2df8 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d4ddbd19e2db907af8e7dcd62efd814
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-9999 b/metadata/md5-cache/dev-ros/stereo_msgs-9999
index 56d3e2238ea7..821c60be990f 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d4ddbd19e2db907af8e7dcd62efd814
diff --git a/metadata/md5-cache/dev-ros/test_bond-1.8.5 b/metadata/md5-cache/dev-ros/test_bond-1.8.5
index c7d21e2441bc..0eabb0d4098b 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.8.5
+++ b/metadata/md5-cache/dev-ros/test_bond-1.8.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.5.tar.gz -> bond_core-1.8.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9bb7581d661d49eba38425bd9de92410
diff --git a/metadata/md5-cache/dev-ros/test_bond-1.8.6 b/metadata/md5-cache/dev-ros/test_bond-1.8.6
index 10525b33a4b4..259b7ebc083d 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.8.6
+++ b/metadata/md5-cache/dev-ros/test_bond-1.8.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.6.tar.gz -> bond_core-1.8.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9bb7581d661d49eba38425bd9de92410
diff --git a/metadata/md5-cache/dev-ros/test_bond-9999 b/metadata/md5-cache/dev-ros/test_bond-9999
index 1e9659a46748..b44005051325 100644
--- a/metadata/md5-cache/dev-ros/test_bond-9999
+++ b/metadata/md5-cache/dev-ros/test_bond-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?] dev-r
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9bb7581d661d49eba38425bd9de92410
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.1 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.1
index ed52c23ed319..eb066d675130 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.1
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=91b3588f6203021b4d45ddf424aadbc7
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.4 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.4
index a64248de95f9..896d68d9b814 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.4
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=91b3588f6203021b4d45ddf424aadbc7
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.6 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.6
index 610304c95e79..724b4651f1ae 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.6
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.9.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.6.tar.gz -> diagnostics-1.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=91b3588f6203021b4d45ddf424aadbc7
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
index e2337a53305f..62a4f02960ab 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=91b3588f6203021b4d45ddf424aadbc7
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-1.10.0 b/metadata/md5-cache/dev-ros/test_nodelet-1.10.0
index 28c0cfedbb6a..ba72ec3ef161 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-1.10.0
+++ b/metadata/md5-cache/dev-ros/test_nodelet-1.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.0.tar.gz -> nodelet_core-1.10.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=492d9604646f82e6961c246e1d5f7c80
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-9999 b/metadata/md5-cache/dev-ros/test_nodelet-9999
index 7b2dbbd1aef4..c5a141c69b1a 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-9999
+++ b/metadata/md5-cache/dev-ros/test_nodelet-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=492d9604646f82e6961c246e1d5f7c80
diff --git a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.0 b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.0
index c055f1f0697d..8b3a7b96e8cd 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.0
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.0.tar.gz -> nodelet_core-1.10.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2004c75590a739b1ae4f88e9dc17e43a
diff --git a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999 b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
index 4868a6f7d987..dbae67273246 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2004c75590a739b1ae4f88e9dc17e43a
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.15.8 b/metadata/md5-cache/dev-ros/test_rosbag-1.15.8
index 14ead6681013..779d4dc7d3a1 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz http://download.ros.org/data/test_rosbag/constants_gen1.bag -> test_rosbag-1.15.8-constants_gen1.bag http://download.ros.org/data/test_rosbag/constants_gen2.bag -> test_rosbag-1.15.8-constants_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen1.bag -> test_rosbag-1.15.8-converged_gen1.bag http://download.ros.org/data/test_rosbag/converged_gen2.bag -> test_rosbag-1.15.8-converged_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen3.bag -> test_rosbag-1.15.8-converged_gen3.bag http://download.ros.org/data/test_rosbag/converged_gen4.bag -> test_rosbag-1.15.8-converged_gen4.bag http://download.ros.org/data/test_rosbag/convergent_gen1.bag -> test_rosbag-1.15.8-convergent_gen1.bag http://download.ros.org/data/test_rosbag/convergent_gen2.bag -> test_rosbag-1.15.8-convergent_gen2.bag http://download.ros.org/data/test_rosbag/migrated_addsub_gen1.bag -> test_rosbag-1.15.8-migrated_addsub_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen1.bag -> test_rosbag-1.15.8-migrated_explicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen2.bag -> test_rosbag-1.15.8-migrated_explicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen3.bag -> test_rosbag-1.15.8-migrated_explicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen4.bag -> test_rosbag-1.15.8-migrated_explicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen1.bag -> test_rosbag-1.15.8-migrated_implicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen2.bag -> test_rosbag-1.15.8-migrated_implicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen3.bag -> test_rosbag-1.15.8-migrated_implicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen4.bag -> test_rosbag-1.15.8-migrated_implicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen1.bag -> test_rosbag-1.15.8-migrated_mixed_gen1.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen2.bag -> test_rosbag-1.15.8-migrated_mixed_gen2.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen3.bag -> test_rosbag-1.15.8-migrated_mixed_gen3.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen4.bag -> test_rosbag-1.15.8-migrated_mixed_gen4.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen1.bag -> test_rosbag-1.15.8-partially_migrated_gen1.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen2.bag -> test_rosbag-1.15.8-partially_migrated_gen2.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen3.bag -> test_rosbag-1.15.8-partially_migrated_gen3.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen4.bag -> test_rosbag-1.15.8-partially_migrated_gen4.bag http://download.ros.org/data/test_rosbag/renamed_gen1.bag -> test_rosbag-1.15.8-renamed_gen1.bag http://download.ros.org/data/test_rosbag/renamed_gen2.bag -> test_rosbag-1.15.8-renamed_gen2.bag http://download.ros.org/data/test_rosbag/renamed_gen3.bag -> test_rosbag-1.15.8-renamed_gen3.bag http://download.ros.org/data/test_rosbag/renamed_gen4.bag -> test_rosbag-1.15.8-renamed_gen4.bag http://download.ros.org/data/test_rosbag/subunmigrated_gen1.bag -> test_rosbag-1.15.8-subunmigrated_gen1.bag http://download.ros.org/data/test_rosbag/unmigrated_gen1.bag -> test_rosbag-1.15.8-unmigrated_gen1.bag http://download.ros.org/data/rosbag/test_indexed_1.2.bag -> test_rosbag-1.15.8-test_indexed_1.2.bag http://download.ros.org/data/rosbag/chatter_50hz.bag -> test_rosbag-1.15.8-chatter_50hz.bag http://download.ros.org/data/rosbag/test_future_version_2.1.bag -> test_rosbag-1.15.8-test_future_version_2.1.bag http://download.ros.org/data/rosbag/test_rosbag_latched_pub.bag -> test_rosbag-1.15.8-test_rosbag_latched_pub.bag
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4bb1302b4c10ae5fb94eaebfc2ef7e9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-9999 b/metadata/md5-cache/dev-ros/test_rosbag-9999
index a66bf6d36d94..2cfcac0cb7b4 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/data/test_rosbag/constants_gen1.bag -> test_rosbag-9999-constants_gen1.bag http://download.ros.org/data/test_rosbag/constants_gen2.bag -> test_rosbag-9999-constants_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen1.bag -> test_rosbag-9999-converged_gen1.bag http://download.ros.org/data/test_rosbag/converged_gen2.bag -> test_rosbag-9999-converged_gen2.bag http://download.ros.org/data/test_rosbag/converged_gen3.bag -> test_rosbag-9999-converged_gen3.bag http://download.ros.org/data/test_rosbag/converged_gen4.bag -> test_rosbag-9999-converged_gen4.bag http://download.ros.org/data/test_rosbag/convergent_gen1.bag -> test_rosbag-9999-convergent_gen1.bag http://download.ros.org/data/test_rosbag/convergent_gen2.bag -> test_rosbag-9999-convergent_gen2.bag http://download.ros.org/data/test_rosbag/migrated_addsub_gen1.bag -> test_rosbag-9999-migrated_addsub_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen1.bag -> test_rosbag-9999-migrated_explicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen2.bag -> test_rosbag-9999-migrated_explicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen3.bag -> test_rosbag-9999-migrated_explicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_explicit_gen4.bag -> test_rosbag-9999-migrated_explicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen1.bag -> test_rosbag-9999-migrated_implicit_gen1.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen2.bag -> test_rosbag-9999-migrated_implicit_gen2.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen3.bag -> test_rosbag-9999-migrated_implicit_gen3.bag http://download.ros.org/data/test_rosbag/migrated_implicit_gen4.bag -> test_rosbag-9999-migrated_implicit_gen4.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen1.bag -> test_rosbag-9999-migrated_mixed_gen1.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen2.bag -> test_rosbag-9999-migrated_mixed_gen2.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen3.bag -> test_rosbag-9999-migrated_mixed_gen3.bag http://download.ros.org/data/test_rosbag/migrated_mixed_gen4.bag -> test_rosbag-9999-migrated_mixed_gen4.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen1.bag -> test_rosbag-9999-partially_migrated_gen1.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen2.bag -> test_rosbag-9999-partially_migrated_gen2.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen3.bag -> test_rosbag-9999-partially_migrated_gen3.bag http://download.ros.org/data/test_rosbag/partially_migrated_gen4.bag -> test_rosbag-9999-partially_migrated_gen4.bag http://download.ros.org/data/test_rosbag/renamed_gen1.bag -> test_rosbag-9999-renamed_gen1.bag http://download.ros.org/data/test_rosbag/renamed_gen2.bag -> test_rosbag-9999-renamed_gen2.bag http://download.ros.org/data/test_rosbag/renamed_gen3.bag -> test_rosbag-9999-renamed_gen3.bag http://download.ros.org/data/test_rosbag/renamed_gen4.bag -> test_rosbag-9999-renamed_gen4.bag http://download.ros.org/data/test_rosbag/subunmigrated_gen1.bag -> test_rosbag-9999-subunmigrated_gen1.bag http://download.ros.org/data/test_rosbag/unmigrated_gen1.bag -> test_rosbag-9999-unmigrated_gen1.bag http://download.ros.org/data/rosbag/test_indexed_1.2.bag -> test_rosbag-9999-test_indexed_1.2.bag http://download.ros.org/data/rosbag/chatter_50hz.bag -> test_rosbag-9999-chatter_50hz.bag http://download.ros.org/data/rosbag/test_future_version_2.1.bag -> test_rosbag-9999-test_future_version_2.1.bag http://download.ros.org/data/rosbag/test_rosbag_latched_pub.bag -> test_rosbag-9999-test_rosbag_latched_pub.bag
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4bb1302b4c10ae5fb94eaebfc2ef7e9
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.8 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.8
index 757f42708c08..9cd4c653b025 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0af2801fcc7f9a908b68b2ca52127fff
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999 b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
index cde6aa493262..3147b7f13d69 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ccb741cd674addcfa76d8f54ba889e57
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.15.7 b/metadata/md5-cache/dev-ros/test_roscpp-1.15.7
index 47bcb7561c95..62af2e49c4d3 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.15.7
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3c7cb71ac18b5c95cf474d36238ded25
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.15.8 b/metadata/md5-cache/dev-ros/test_roscpp-1.15.8
index 59df9f5abdb9..4312ac93837f 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a944843d62bc1ec44d26ef9d0a1d1e3
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-9999 b/metadata/md5-cache/dev-ros/test_roscpp-9999
index 84ec884e941d..266e7749e14d 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-9999
+++ b/metadata/md5-cache/dev-ros/test_roscpp-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a944843d62bc1ec44d26ef9d0a1d1e3
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7 b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
index 086663f73cd3..8dca0f399753 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea8bbdfaa8fceb0d25bd3511ee272bad
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.8 b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.8
index 9d8d2f651242..55a9bce62b8d 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1dc5594791bbf695641f5cc8b61fe9ca
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-9999 b/metadata/md5-cache/dev-ros/test_rosgraph-9999
index f5a5aa5885b1..5cd6ce9c041a 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1dc5594791bbf695641f5cc8b61fe9ca
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.8 b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.8
index aeeccc7f7603..22bb8f736b67 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42d05e1b0987c6e0695ca83ddb45263b
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-9999 b/metadata/md5-cache/dev-ros/test_roslaunch-9999
index 4cc331bb2d46..6d2d9ad29e08 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42d05e1b0987c6e0695ca83ddb45263b
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.8 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.8
index b1741c4966f5..5b51f54e9621 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f053b7cda85697de9d5d72c1c6edf769
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-9999 b/metadata/md5-cache/dev-ros/test_roslib_comm-9999
index 75e3e603c1b5..b8658e7c438e 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-9999
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f053b7cda85697de9d5d72c1c6edf769
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.8 b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.8
index 2121ea4f0a83..5d2bff93afc2 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3904ddbc3caac3c0a7d75bd6cacf6787
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-9999 b/metadata/md5-cache/dev-ros/test_rosmaster-9999
index 14b127274b65..729f6c890a9a 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostest[pyt
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3904ddbc3caac3c0a7d75bd6cacf6787
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.15.7 b/metadata/md5-cache/dev-ros/test_rosparam-1.15.7
index edc1de1f7c8a..22d422691f87 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.15.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a915e73918dc0b1e6532bf58379010b9
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.15.8 b/metadata/md5-cache/dev-ros/test_rosparam-1.15.8
index eed1ca12c4cf..6478ddacd1b5 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf1ea5b2f818e3a6af3cde288391abaa
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-9999 b/metadata/md5-cache/dev-ros/test_rosparam-9999
index 5e04096be259..c8484b91a91b 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-9999
+++ b/metadata/md5-cache/dev-ros/test_rosparam-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf1ea5b2f818e3a6af3cde288391abaa
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.15.8 b/metadata/md5-cache/dev-ros/test_rospy-1.15.8
index 33cc4039e1ad..6b9afd4cd89c 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2bf8b3e7f987d1a71114e2f3f5a9c45c
diff --git a/metadata/md5-cache/dev-ros/test_rospy-9999 b/metadata/md5-cache/dev-ros/test_rospy-9999
index a00f2dcb44c9..232aeb12160b 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-9999
+++ b/metadata/md5-cache/dev-ros/test_rospy-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2bf8b3e7f987d1a71114e2f3f5a9c45c
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.15.8 b/metadata/md5-cache/dev-ros/test_rosservice-1.15.8
index 648590916421..eaba3e1bae8f 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.15.8
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=67319b6f687dc3ed76dd7dd11fe1b16e
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-9999 b/metadata/md5-cache/dev-ros/test_rosservice-9999
index 4833acbfe7ba..2fc24f5eb888 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-9999
+++ b/metadata/md5-cache/dev-ros/test_rosservice-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=67319b6f687dc3ed76dd7dd11fe1b16e
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.7.2 b/metadata/md5-cache/dev-ros/test_tf2-0.7.2
index 5d217ad4aff8..3634383556fc 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.7.2
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fae3e89b0214ea6a7785b1480df0513d
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.7.3 b/metadata/md5-cache/dev-ros/test_tf2-0.7.3
index c1d9557ba000..e21b540875e5 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.7.3
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fae3e89b0214ea6a7785b1480df0513d
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.7.5 b/metadata/md5-cache/dev-ros/test_tf2-0.7.5
index fd335989c4de..5d4b9add173c 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.7.5
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fae3e89b0214ea6a7785b1480df0513d
diff --git a/metadata/md5-cache/dev-ros/test_tf2-9999 b/metadata/md5-cache/dev-ros/test_tf2-9999
index c469430250ad..3cd8c333b110 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-9999
+++ b/metadata/md5-cache/dev-ros/test_tf2-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fae3e89b0214ea6a7785b1480df0513d
diff --git a/metadata/md5-cache/dev-ros/tf-1.13.2-r1 b/metadata/md5-cache/dev-ros/tf-1.13.2-r1
index 25d13b35e39b..1eebab382aeb 100644
--- a/metadata/md5-cache/dev-ros/tf-1.13.2-r1
+++ b/metadata/md5-cache/dev-ros/tf-1.13.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.13.2.tar.gz -> geometry-1.13.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e0b8bea286f98d9554e1208e0d07c1e
diff --git a/metadata/md5-cache/dev-ros/tf-9999 b/metadata/md5-cache/dev-ros/tf-9999
index 13946eebe19b..fa9b78984ea8 100644
--- a/metadata/md5-cache/dev-ros/tf-9999
+++ b/metadata/md5-cache/dev-ros/tf-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e0b8bea286f98d9554e1208e0d07c1e
diff --git a/metadata/md5-cache/dev-ros/tf2-0.7.2 b/metadata/md5-cache/dev-ros/tf2-0.7.2
index 77f1d2bd467f..ba115f6beeb8 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=847a6acc90784194a238fd8b12d49459
diff --git a/metadata/md5-cache/dev-ros/tf2-0.7.3 b/metadata/md5-cache/dev-ros/tf2-0.7.3
index e57bfd9ce01c..0d32a1e02f45 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=847a6acc90784194a238fd8b12d49459
diff --git a/metadata/md5-cache/dev-ros/tf2-0.7.5 b/metadata/md5-cache/dev-ros/tf2-0.7.5
index e43a0d280f45..132bf776d729 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=847a6acc90784194a238fd8b12d49459
diff --git a/metadata/md5-cache/dev-ros/tf2-9999 b/metadata/md5-cache/dev-ros/tf2-9999
index b9a9888f8761..f2b21d264cf4 100644
--- a/metadata/md5-cache/dev-ros/tf2-9999
+++ b/metadata/md5-cache/dev-ros/tf2-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=847a6acc90784194a238fd8b12d49459
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.2 b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.2
index ba1de5b829cf..28c4b23df609 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56f50acff2e39e1ec459d135c1430340
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.3 b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.3
index 0cc081331156..10e12a14fcf7 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56f50acff2e39e1ec459d135c1430340
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.5 b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.5
index a1a82c6fc58e..95a6f4d7b4d1 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56f50acff2e39e1ec459d135c1430340
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-9999 b/metadata/md5-cache/dev-ros/tf2_bullet-9999
index cb7ac75f993e..29afc8f785e8 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-9999
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/tf2 sci-physics/bullet python_single_target_python3_7? ( dev-lan
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56f50acff2e39e1ec459d135c1430340
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.2 b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.2
index 009905bc164e..717631ad9d57 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a69c4400e86955390df706323949c13
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.3 b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.3
index e1cce9549f78..65dc3d57d1ea 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a69c4400e86955390df706323949c13
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.5 b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.5
index d20f0f13626b..ec73bd02f27b 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a69c4400e86955390df706323949c13
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-9999 b/metadata/md5-cache/dev-ros/tf2_eigen-9999
index 61a1750085e4..207b271f79f4 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-9999
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a69c4400e86955390df706323949c13
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.2 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.2
index 6e136519eaab..df77f5a88265 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd3992bb1b28be3a22f42ff35a3add84
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.3 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.3
index c4ad3b52f2a4..e746ce9ada9b 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd3992bb1b28be3a22f42ff35a3add84
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.5 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.5
index fa16a17fa692..606caf1afb15 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd3992bb1b28be3a22f42ff35a3add84
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
index defd50e923e2..7e1a2a7d507d 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd3992bb1b28be3a22f42ff35a3add84
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.2 b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.2
index d0c36dd5404c..0fd17896c868 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95c2de7315ef87e06ce8579e37d40137
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.3 b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.3
index d5f562ad74fe..0dfb4539c152 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95c2de7315ef87e06ce8579e37d40137
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.5 b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.5
index 1631ed8a8941..9ee4dd200ef6 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95c2de7315ef87e06ce8579e37d40137
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-9999 b/metadata/md5-cache/dev-ros/tf2_kdl-9999
index 660147015a5f..824148fae2ea 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-9999
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95c2de7315ef87e06ce8579e37d40137
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.2 b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.2
index baf217037fdc..2458eff80549 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7b231f8bc518afe60eb9d2449d8fa7c
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.3 b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.3
index b221873f223a..dc4c6006742f 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7b231f8bc518afe60eb9d2449d8fa7c
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.5 b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.5
index c43156021059..469281bcc436 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7b231f8bc518afe60eb9d2449d8fa7c
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_msgs-9999
index f8e032b159e6..d87be29d26c9 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7b231f8bc518afe60eb9d2449d8fa7c
diff --git a/metadata/md5-cache/dev-ros/tf2_py-0.7.2 b/metadata/md5-cache/dev-ros/tf2_py-0.7.2
index 669011d3bcde..34275f7c59ae 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cc679effdc13500184182748a4fdc81
diff --git a/metadata/md5-cache/dev-ros/tf2_py-0.7.3 b/metadata/md5-cache/dev-ros/tf2_py-0.7.3
index 105dba91a56b..ceaac0e5ead0 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cc679effdc13500184182748a4fdc81
diff --git a/metadata/md5-cache/dev-ros/tf2_py-0.7.5 b/metadata/md5-cache/dev-ros/tf2_py-0.7.5
index 79bda50e9245..9408587ac414 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cc679effdc13500184182748a4fdc81
diff --git a/metadata/md5-cache/dev-ros/tf2_py-9999 b/metadata/md5-cache/dev-ros/tf2_py-9999
index 8f3e1b48cd67..2e449dc32e62 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-9999
+++ b/metadata/md5-cache/dev-ros/tf2_py-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/b
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cc679effdc13500184182748a4fdc81
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.7.2 b/metadata/md5-cache/dev-ros/tf2_ros-0.7.2
index 20029e8ad352..6f9724e4551d 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d107e81cc7489f82e31535caa4b1c0f6
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.7.3 b/metadata/md5-cache/dev-ros/tf2_ros-0.7.3
index 0fa64c195b5c..a445737656df 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d107e81cc7489f82e31535caa4b1c0f6
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.7.5 b/metadata/md5-cache/dev-ros/tf2_ros-0.7.5
index beb5ab4878d8..12ae67e2579e 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d107e81cc7489f82e31535caa4b1c0f6
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-9999 b/metadata/md5-cache/dev-ros/tf2_ros-9999
index f310493c22f1..5eeb8ac266ab 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-9999
+++ b/metadata/md5-cache/dev-ros/tf2_ros-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/message_fi
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d107e81cc7489f82e31535caa4b1c0f6
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.2 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.2
index c31a5630de5d..15b71546137d 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a13171038954aeb631610f23fdcce4a3
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.3 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.3
index 7ca4714d7b19..6266b7462af6 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a13171038954aeb631610f23fdcce4a3
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.5 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.5
index 49cfe30ba0e6..c2502d9e897c 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a13171038954aeb631610f23fdcce4a3
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
index 0b0f90932ff3..baf5b35eb4b9 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a13171038954aeb631610f23fdcce4a3
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-0.7.2 b/metadata/md5-cache/dev-ros/tf2_tools-0.7.2
index b465162a726b..d83f763e3e4e 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f9f8f6f4d0f28799cd00517368c22a9
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-0.7.3 b/metadata/md5-cache/dev-ros/tf2_tools-0.7.3
index 444b6745a67e..cf7dcd219ac6 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.7.3
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f9f8f6f4d0f28799cd00517368c22a9
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-0.7.5 b/metadata/md5-cache/dev-ros/tf2_tools-0.7.5
index 3c2b6ea1a6bb..1899c18cea65 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.7.5
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f9f8f6f4d0f28799cd00517368c22a9
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-9999 b/metadata/md5-cache/dev-ros/tf2_tools-9999
index c812211c336d..55114427d586 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-9999
+++ b/metadata/md5-cache/dev-ros/tf2_tools-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f9f8f6f4d0f28799cd00517368c22a9
diff --git a/metadata/md5-cache/dev-ros/tf_conversions-1.13.2-r1 b/metadata/md5-cache/dev-ros/tf_conversions-1.13.2-r1
index c52309390c76..31762a572840 100644
--- a/metadata/md5-cache/dev-ros/tf_conversions-1.13.2-r1
+++ b/metadata/md5-cache/dev-ros/tf_conversions-1.13.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.13.2.tar.gz -> geometry-1.13.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3061d265d5b768e6fdc234bd1cf8f7e
diff --git a/metadata/md5-cache/dev-ros/tf_conversions-9999 b/metadata/md5-cache/dev-ros/tf_conversions-9999
index 14f12f5e5b59..6cf35edb7812 100644
--- a/metadata/md5-cache/dev-ros/tf_conversions-9999
+++ b/metadata/md5-cache/dev-ros/tf_conversions-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3061d265d5b768e6fdc234bd1cf8f7e
diff --git a/metadata/md5-cache/dev-ros/theora_image_transport-1.14.0 b/metadata/md5-cache/dev-ros/theora_image_transport-1.14.0
index 0e4787026384..6449ea1feaa1 100644
--- a/metadata/md5-cache/dev-ros/theora_image_transport-1.14.0
+++ b/metadata/md5-cache/dev-ros/theora_image_transport-1.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.14.0.tar.gz -> image_transport_plugins-1.14.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e8ec5aaf31998424597dc48252b348b
diff --git a/metadata/md5-cache/dev-ros/theora_image_transport-9999 b/metadata/md5-cache/dev-ros/theora_image_transport-9999
index 22d2f231b3b2..393f7f183d66 100644
--- a/metadata/md5-cache/dev-ros/theora_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/theora_image_transport-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ro
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e8ec5aaf31998424597dc48252b348b
diff --git a/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8-r1 b/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8-r1
index ef356882856b..bf6b61e9bbcb 100644
--- a/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8-r1
+++ b/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/driver_common/archive/1.6.8.tar.gz -> driver_common-1.6.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74a1e7f5a162fef2f81652ca762f10c8
diff --git a/metadata/md5-cache/dev-ros/timestamp_tools-9999 b/metadata/md5-cache/dev-ros/timestamp_tools-9999
index ec44399e48bf..24eef0e9c2d1 100644
--- a/metadata/md5-cache/dev-ros/timestamp_tools-9999
+++ b/metadata/md5-cache/dev-ros/timestamp_tools-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roslib dev-ros/roscpp python_single_target_python3_7? ( dev-lang
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1aac495027a696c3243f33a224397d84
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.15.8 b/metadata/md5-cache/dev-ros/topic_tools-1.15.8
index 4d965537aef9..56843f9aff4c 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.15.8
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18074fb1a69009c957dea695cd1d2b93
diff --git a/metadata/md5-cache/dev-ros/topic_tools-9999 b/metadata/md5-cache/dev-ros/topic_tools-9999
index 95c5bf3aa4c4..9086bc58295a 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/topic_tools-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18074fb1a69009c957dea695cd1d2b93
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0 b/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
index 564aee3a2f3c..c3bc15502449 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbf0b7ab7b64de0c4bc8003a72476753
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-9999 b/metadata/md5-cache/dev-ros/trajectory_msgs-9999
index 7fde7d76bf68..35599bf42ea0 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-9999
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbf0b7ab7b64de0c4bc8003a72476753
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.19.1 b/metadata/md5-cache/dev-ros/transmission_interface-0.19.1
index 7ff05ebd415b..6738e9c095ea 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.19.1
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e06aae249164caea69c5e9c35790b97
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.19.2 b/metadata/md5-cache/dev-ros/transmission_interface-0.19.2
index cf7cd533925d..dc2a6f2de843 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.19.2
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e06aae249164caea69c5e9c35790b97
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-9999 b/metadata/md5-cache/dev-ros/transmission_interface-9999
index 1210e864f839..1cd648e9ae13 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-9999
+++ b/metadata/md5-cache/dev-ros/transmission_interface-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-lib
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e06aae249164caea69c5e9c35790b97
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12 b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
index 3463ce30b467..2ac606fe0d11 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d3d7af5649a4f79b3ce1811313fdfa2
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-0.2.0 b/metadata/md5-cache/dev-ros/turtle_actionlib-0.2.0
index f00e97130cbe..3fd9570521bf 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-0.2.0
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.2.0.tar.gz -> common_tutorials-0.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d3d7af5649a4f79b3ce1811313fdfa2
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-9999 b/metadata/md5-cache/dev-ros/turtle_actionlib-9999
index bed32f2160b9..19a3773381d6 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-9999
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconso
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d3d7af5649a4f79b3ce1811313fdfa2
diff --git a/metadata/md5-cache/dev-ros/turtle_tf-0.2.3 b/metadata/md5-cache/dev-ros/turtle_tf-0.2.3
index 916352b08f9e..ea669b506f23 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf-0.2.3
+++ b/metadata/md5-cache/dev-ros/turtle_tf-0.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.3.tar.gz -> geometry_tutorials-0.2.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ae62db7e6c587787a0a6ca43de3278e
diff --git a/metadata/md5-cache/dev-ros/turtle_tf-9999 b/metadata/md5-cache/dev-ros/turtle_tf-9999
index 8de42961aa94..1f272aeecf62 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ae62db7e6c587787a0a6ca43de3278e
diff --git a/metadata/md5-cache/dev-ros/turtle_tf2-0.2.3 b/metadata/md5-cache/dev-ros/turtle_tf2-0.2.3
index 1fc3de2e8cfc..278fea69144b 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf2-0.2.3
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-0.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.3.tar.gz -> geometry_tutorials-0.2.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=829faea29e10805c1a1ece323ba5634d
diff --git a/metadata/md5-cache/dev-ros/turtle_tf2-9999 b/metadata/md5-cache/dev-ros/turtle_tf2-9999
index 856777e20a4b..ffc372965b84 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf2-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=829faea29e10805c1a1ece323ba5634d
diff --git a/metadata/md5-cache/dev-ros/turtlesim-0.10.1 b/metadata/md5-cache/dev-ros/turtlesim-0.10.1
index 53431c3ddb29..b74064311c8c 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-0.10.1
+++ b/metadata/md5-cache/dev-ros/turtlesim-0.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.1.tar.gz -> ros_tutorials-0.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7677c36614a0cffdd2412a51db29924
diff --git a/metadata/md5-cache/dev-ros/turtlesim-0.10.2 b/metadata/md5-cache/dev-ros/turtlesim-0.10.2
index 9c2ee6200f37..c0db8c4a3e15 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-0.10.2
+++ b/metadata/md5-cache/dev-ros/turtlesim-0.10.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.2.tar.gz -> ros_tutorials-0.10.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7677c36614a0cffdd2412a51db29924
diff --git a/metadata/md5-cache/dev-ros/turtlesim-9999 b/metadata/md5-cache/dev-ros/turtlesim-9999
index 41fdeb939248..47135d0332d7 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-9999
+++ b/metadata/md5-cache/dev-ros/turtlesim-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threa
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7677c36614a0cffdd2412a51db29924
diff --git a/metadata/md5-cache/dev-ros/unique_id-1.0.6 b/metadata/md5-cache/dev-ros/unique_id-1.0.6
index 02a87f693d69..d4cecac49e98 100644
--- a/metadata/md5-cache/dev-ros/unique_id-1.0.6
+++ b/metadata/md5-cache/dev-ros/unique_id-1.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.6.tar.gz -> unique_identifier-1.0.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f009a9db53f130d43c8253925e396c3
diff --git a/metadata/md5-cache/dev-ros/unique_id-9999 b/metadata/md5-cache/dev-ros/unique_id-9999
index c301f237cdaf..0f488b15aeb1 100644
--- a/metadata/md5-cache/dev-ros/unique_id-9999
+++ b/metadata/md5-cache/dev-ros/unique_id-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f009a9db53f130d43c8253925e396c3
diff --git a/metadata/md5-cache/dev-ros/urdf-1.13.2 b/metadata/md5-cache/dev-ros/urdf-1.13.2
index 9a823ba03ce9..9c0cb9b7d68c 100644
--- a/metadata/md5-cache/dev-ros/urdf-1.13.2
+++ b/metadata/md5-cache/dev-ros/urdf-1.13.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf/archive/1.13.2.tar.gz -> urdf-1.13.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87c135a1d691b5036f1f27be3700dc98
diff --git a/metadata/md5-cache/dev-ros/urdf-9999 b/metadata/md5-cache/dev-ros/urdf-9999
index 28431c1c888b..1711dc6ba8cd 100644
--- a/metadata/md5-cache/dev-ros/urdf-9999
+++ b/metadata/md5-cache/dev-ros/urdf-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87c135a1d691b5036f1f27be3700dc98
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.2 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.2
index da7b9065dbca..f668fcfb8000 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.2
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.13.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf/archive/1.13.2.tar.gz -> urdf-1.13.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d155665f4fc307edfcd3c35960fe013
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
index 574c5b2267fd..cdcc7ebe4619 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/urdfdom_headers python_single_target_python3_7? ( dev-lang/pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d155665f4fc307edfcd3c35960fe013
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0 b/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
index 0f0757c326e7..d2722c64a9e8 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf_tutorial/archive/0.5.0.tar.gz -> urdf_tutorial-0.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ca20dd2bc9cccac68bda81c9e6e8914f
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-9999 b/metadata/md5-cache/dev-ros/urdf_tutorial-9999
index e30d76a3d7b0..4af360f09e27 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ca20dd2bc9cccac68bda81c9e6e8914f
diff --git a/metadata/md5-cache/dev-ros/urg_c-1.0.405 b/metadata/md5-cache/dev-ros/urg_c-1.0.405
index c44939190ee8..fd8aac89fc53 100644
--- a/metadata/md5-cache/dev-ros/urg_c-1.0.405
+++ b/metadata/md5-cache/dev-ros/urg_c-1.0.405
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/urg_c/archive/1.0.405.tar.gz -> urg_c-1.0.405.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1be427a884cf104a28fb052f00135c47
diff --git a/metadata/md5-cache/dev-ros/urg_c-9999 b/metadata/md5-cache/dev-ros/urg_c-9999
index 2f9ec1f599d1..7233d75b4c8d 100644
--- a/metadata/md5-cache/dev-ros/urg_c-9999
+++ b/metadata/md5-cache/dev-ros/urg_c-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1be427a884cf104a28fb052f00135c47
diff --git a/metadata/md5-cache/dev-ros/urg_node-0.1.13 b/metadata/md5-cache/dev-ros/urg_node-0.1.13
index 91687c3867dd..4f2bd50ad98c 100644
--- a/metadata/md5-cache/dev-ros/urg_node-0.1.13
+++ b/metadata/md5-cache/dev-ros/urg_node-0.1.13
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/urg_node/archive/0.1.13.tar.gz -> urg_node-0.1.13.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d45d963661bf7a5c0155e5d7fc7f2fa
diff --git a/metadata/md5-cache/dev-ros/urg_node-9999 b/metadata/md5-cache/dev-ros/urg_node-9999
index 7532c947504a..6fd5443b5e87 100644
--- a/metadata/md5-cache/dev-ros/urg_node-9999
+++ b/metadata/md5-cache/dev-ros/urg_node-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_targe
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d45d963661bf7a5c0155e5d7fc7f2fa
diff --git a/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6 b/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
index 024374c4f2b7..c2174d3ce793 100644
--- a/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
+++ b/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.6.tar.gz -> unique_identifier-1.0.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ce3229db0b1c2ed3f5aa1837255b65c
diff --git a/metadata/md5-cache/dev-ros/uuid_msgs-9999 b/metadata/md5-cache/dev-ros/uuid_msgs-9999
index 49405076ecc2..a771571d4e1d 100644
--- a/metadata/md5-cache/dev-ros/uuid_msgs-9999
+++ b/metadata/md5-cache/dev-ros/uuid_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ce3229db0b1c2ed3f5aa1837255b65c
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1-r1 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1-r1
index e00b6dec75ab..b0b9233fc1a4 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1-r1
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.11.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4aa24a60b7627a12f7cdd66dae23803c
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-9999 b/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
index 15a78ec355f3..0950060120e0 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ro
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4aa24a60b7627a12f7cdd66dae23803c
diff --git a/metadata/md5-cache/dev-ros/visp_bridge-0.11.1 b/metadata/md5-cache/dev-ros/visp_bridge-0.11.1
index 4996a44ddfe6..bc42e3b0f466 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-0.11.1
+++ b/metadata/md5-cache/dev-ros/visp_bridge-0.11.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00ebeb1636ad11ff4ccd40191a09d4b1
diff --git a/metadata/md5-cache/dev-ros/visp_bridge-9999 b/metadata/md5-cache/dev-ros/visp_bridge-9999
index 7b11d35530cb..e8cfdd6b146d 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-9999
+++ b/metadata/md5-cache/dev-ros/visp_bridge-9999
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers d
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00ebeb1636ad11ff4ccd40191a09d4b1
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-0.11.1 b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.11.1
index 23455d254a97..a4ff53fa17fa 100644
--- a/metadata/md5-cache/dev-ros/visp_camera_calibration-0.11.1
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.11.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34458dd0a6aa5a824a7f505d3edfa072
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999 b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
index 0fcdf2f11b3e..0940f87f6255 100644
--- a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sc
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34458dd0a6aa5a824a7f505d3edfa072
diff --git a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.11.1 b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.11.1
index caa2c44995c9..c1e928a5ecf3 100644
--- a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.11.1
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.11.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7e7c3f94c2fa300363c271e15607085
diff --git a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999 b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
index 4c88dd861c92..bf59882c1371 100644
--- a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridg
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7e7c3f94c2fa300363c271e15607085
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-0.11.1 b/metadata/md5-cache/dev-ros/visp_tracker-0.11.1
index 32c1d1f6f799..873929995bbc 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-0.11.1
+++ b/metadata/md5-cache/dev-ros/visp_tracker-0.11.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64312a362150d743d60275643dbb6419
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-9999 b/metadata/md5-cache/dev-ros/visp_tracker-9999
index a09e88277e77..9b790fa0c846 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_tracker-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_m
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64312a362150d743d60275643dbb6419
diff --git a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.11.0 b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.11.0
index 066ff09e820f..311caf29f07e 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.11.0
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85f821ba642794aa79522b06a338b160
diff --git a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999 b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
index 2aa49ab9d37a..469e9e5270c9 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=d
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85f821ba642794aa79522b06a338b160
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.7 b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.7
index 6f6f3e0c0586..73fe94b07a89 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.7
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.7.tar.gz -> common_msgs-1.12.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=146e0f3b8edd5fd6437fde736305474c
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0 b/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
index 16865ec3479f..f05d923b5873 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=146e0f3b8edd5fd6437fde736305474c
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-9999 b/metadata/md5-cache/dev-ros/visualization_msgs-9999
index c7d0c761ac61..c2471ff7e499 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-9999
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=146e0f3b8edd5fd6437fde736305474c
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.16.6 b/metadata/md5-cache/dev-ros/voxel_grid-1.16.6
index 983fac2a29d9..f7b43a848318 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.16.6
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.16.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=362dcdfbcfe82e7103ecd7af2b00eb12
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.17.0 b/metadata/md5-cache/dev-ros/voxel_grid-1.17.0
index 9079063aa610..c301fde1452e 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.17.0
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=362dcdfbcfe82e7103ecd7af2b00eb12
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-9999 b/metadata/md5-cache/dev-ros/voxel_grid-9999
index 6b2d637d0ab2..96bf3a32a678 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-9999
+++ b/metadata/md5-cache/dev-ros/voxel_grid-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=d
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=362dcdfbcfe82e7103ecd7af2b00eb12
diff --git a/metadata/md5-cache/dev-ros/xacro-1.14.1 b/metadata/md5-cache/dev-ros/xacro-1.14.1
index 55f61bba9bf2..674a34a52ce1 100644
--- a/metadata/md5-cache/dev-ros/xacro-1.14.1
+++ b/metadata/md5-cache/dev-ros/xacro-1.14.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/xacro/archive/1.14.1.tar.gz -> xacro-1.14.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=864fe4d3a403fd1489a8366372d84461
diff --git a/metadata/md5-cache/dev-ros/xacro-9999 b/metadata/md5-cache/dev-ros/xacro-9999
index fec115673428..9afa28808b93 100644
--- a/metadata/md5-cache/dev-ros/xacro-9999
+++ b/metadata/md5-cache/dev-ros/xacro-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roslint[python_single_target_python3_7(-)?] dev-ros/roslaunch[py
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=864fe4d3a403fd1489a8366372d84461
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
index 67a5d740ab48..3e625031cd4c 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=63f7cee17e2df190dc6e2752710315ae
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-9999 b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
index 9fe819ceadc6..910f33f6e427 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-9999
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=63f7cee17e2df190dc6e2752710315ae
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 3dcf8b1dc5ac..09c7ccfe194f 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/bundler-2.1.4 b/metadata/md5-cache/dev-ruby/bundler-2.1.4
index a77ba4c44dc4..63ad5a38b225 100644
--- a/metadata/md5-cache/dev-ruby/bundler-2.1.4
+++ b/metadata/md5-cache/dev-ruby/bundler-2.1.4
@@ -7,10 +7,10 @@ HOMEPAGE=https://github.com/carlhuda/bundler
 IUSE=+doc test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
 KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) dev-vcs/git !!<dev-ruby/bundler-1.17.3-r1:0 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+RDEPEND=ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/bundler-2.1.4.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=370fee2b9bd6ca95c4651ddec507f4a9
+_md5_=f294c1491cf69de190d94ec1f0d88299
diff --git a/metadata/md5-cache/dev-ruby/coolio-1.7.0 b/metadata/md5-cache/dev-ruby/coolio-1.7.0
new file mode 100644
index 000000000000..5a5fabdb4c9e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/coolio-1.7.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A high performance event framework for Ruby which uses the libev C library
+EAPI=7
+HOMEPAGE=https://coolio.github.com/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/cool.io-1.7.0.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=40dc4a547375da0e08a88766b9a1fc0f
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.11 b/metadata/md5-cache/dev-ruby/dalli-2.7.11
new file mode 100644
index 000000000000..ad91c3fcce26
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.11
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25(-)] >=dev-ruby/mocha-0.13[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] >=dev-ruby/activesupport-5.2[ruby_targets_ruby25(-)] dev-ruby/connection_pool[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.13[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/activesupport-5.2[ruby_targets_ruby26(-)] dev-ruby/connection_pool[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.13[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] >=dev-ruby/activesupport-5.2[ruby_targets_ruby27(-)] dev-ruby/connection_pool[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( >=net-misc/memcached-1.5.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A high performance pure Ruby client for accessing memcached servers
+EAPI=7
+HOMEPAGE=https://github.com/petergoldstein/dalli
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.11.tar.gz -> dalli-2.7.11.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a60bdb957f9e90c06cc161ed29237036
diff --git a/metadata/md5-cache/dev-ruby/em-websocket-0.5.2 b/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
new file mode 100644
index 000000000000..1c344e4fd99b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/em-websocket-0.5.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby25(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby26(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( 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_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(-)] )
+DESCRIPTION=EventMachine based WebSocket server
+EAPI=7
+HOMEPAGE=https://rubygems.org/gems/em-websocket
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby25(-)] =dev-ruby/http_parser_rb-0.6*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/eventmachine-0.12.9[ruby_targets_ruby26(-)] =dev-ruby/http_parser_rb-0.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 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/igrigorik/em-websocket/archive/v0.5.2.tar.gz -> em-websocket-0.5.2.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=18a60d63a4b94dc1f00a3058aeb7898e
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.3.8 b/metadata/md5-cache/dev-ruby/exifr-1.3.8
new file mode 100644
index 000000000000..6d9b2df18a01
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/exifr-1.3.8
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A library to read EXIF info from JPEG and TIFF images
+EAPI=7
+HOMEPAGE=https://github.com/remvee/exifr/
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/remvee/exifr/archive/release-1.3.8.tar.gz -> exifr-1.3.8.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=df089115027dabce4e259e850c9281ad
diff --git a/metadata/md5-cache/dev-ruby/facter-3.14.13 b/metadata/md5-cache/dev-ruby/facter-3.14.13
index 4acc40e1c6ad..bd2ec1a7438d 100644
--- a/metadata/md5-cache/dev-ruby/facter-3.14.13
+++ b/metadata/md5-cache/dev-ruby/facter-3.14.13
@@ -5,7 +5,7 @@ DESCRIPTION=A cross-platform ruby library for retrieving facts from operating sy
 EAPI=7
 HOMEPAGE=http://www.puppetlabs.com/puppet/related-projects/facter/
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-cpp/cpp-hocon-0.2.1:= >=dev-libs/leatherman-1.0.0:= dev-libs/openssl:0= sys-apps/util-linux app-emulation/virt-what net-misc/curl dev-libs/boost:=[nls] >=dev-cpp/yaml-cpp-0.5.1 !<app-admin/puppet-4.0.0 ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/facter/archive/3.14.13.tar.gz -> facter-3.14.13.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bface0e1c1f3704f8f498de9d30a22b1
+_md5_=48f2a70e65bf5a9c6d0d97030238459f
diff --git a/metadata/md5-cache/dev-ruby/parser-2.7.1.5 b/metadata/md5-cache/dev-ruby/parser-2.7.1.5
new file mode 100644
index 000000000000..501989271a55
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/parser-2.7.1.5
@@ -0,0 +1,16 @@
+BDEPEND=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(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/racc[ruby_targets_ruby27(-)] dev-ruby/cliver[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( =dev-util/ragel-6* ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A production-ready Ruby parser written in pure Ruby
+EAPI=7
+HOMEPAGE=https://github.com/whitequark/parser
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( =dev-ruby/ast-2.4*[ruby_targets_ruby25(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( =dev-ruby/ast-2.4*[ruby_targets_ruby26(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( =dev-ruby/ast-2.4*[ruby_targets_ruby27(-)] >=dev-ruby/ast-2.4.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/parser-2.7.1.5.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d669eaea2d72b31d29ba5ef9627290e1
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.11.2 b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.11.2
deleted file mode 100644
index 7f04e98f33b9..000000000000
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.11.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Library needed to connect puppet to puppetdb
-EAPI=7
-HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_6.11.2-1stretch_all.deb
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=8487378a920cb95d503eceec907aca8e
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.12.0 b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.12.0
index 4203d7a6a8e8..23daafe1945e 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-6.12.0
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-6.12.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Library needed to connect puppet to puppetdb
 EAPI=7
 HOMEPAGE=http://docs.puppetlabs.com/puppetdb/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/stretch/puppet/p/puppetdb-termini/puppetdb-termini_6.12.0-1stretch_all.deb
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=ba3066b564a51300a700761c95873c9b
+_md5_=8487378a920cb95d503eceec907aca8e
diff --git a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2 b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
index 61050ca3ade7..9a9b1244d59e 100644
--- a/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
+++ b/metadata/md5-cache/dev-ruby/rdtool-0.6.38-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/rdtool-0.6.38.gem
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7732ac483460ba34953095ba5a2fe53f
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-1.8.0 b/metadata/md5-cache/dev-ruby/regexp_parser-1.8.0
new file mode 100644
index 000000000000..1a255f52a58b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-1.8.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] test? ( dev-ruby/regexp_property_values[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND==dev-util/ragel-6* ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
+EAPI=7
+HOMEPAGE=https://github.com/ammar/regexp_parser
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://github.com/ammar/regexp_parser/archive/v1.8.0.tar.gz -> regexp_parser-1.8.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=844e3973a33dd1d4be26e1289a2e5915
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
index 3d80b6333616..8271a4ffed0d 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.4
@@ -5,7 +5,7 @@ DESCRIPTION=Generates readable ruby from ParseTree
 EAPI=7
 HOMEPAGE=https://github.com/seattlerb/ruby2ruby
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby25(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby26(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby27(-)] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/ruby2ruby-2.4.4.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ad69121149752425e1c9082f095f0657
+_md5_=62a51f06beeeba28957a7e88cac78c4f
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2 b/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
index da0f5ba5b775..036814d799b6 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
@@ -5,7 +5,7 @@ DESCRIPTION=A ruby parser written in pure ruby
 EAPI=7
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha ~amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/ruby_parser-3.14.2.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a994331ee40592c9601c12c1a1f84541
+_md5_=d5b1a7aa5f3a56436e7736ba7f38cebb
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
index c003cf5c234d..6b7f08030318 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.15.0
@@ -5,7 +5,7 @@ DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
 EAPI=7
 HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha ~amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=4
 SRC_URI=https://rubygems.org/gems/sexp_processor-4.15.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fcfdc0caba2de84fad20ebfe5b1cc194
+_md5_=45cbaa2896561f089671ba567db5a50b
diff --git a/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3 b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
new file mode 100644
index 000000000000..2d4c8f082142
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/simplecov-html-0.12.3
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Generates a HTML report of your SimpleCov ruby code coverage results
+EAPI=7
+HOMEPAGE=https://github.com/colszowka/simplecov
+IUSE=doc ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test )
+SLOT=0.12
+SRC_URI=https://rubygems.org/gems/simplecov-html-0.12.3.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9acaf9a09c72a02f9c36507b1a8a7a92
diff --git a/metadata/md5-cache/dev-ruby/spy-1.0.1 b/metadata/md5-cache/dev-ruby/spy-1.0.1
new file mode 100644
index 000000000000..01f940a1ef16
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/spy-1.0.1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A simple opinionated mocking framework
+EAPI=7
+HOMEPAGE=https://github.com/ryanong/spy
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/spy-1.0.1.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8b78626073ab4d673a1873436ac69987
diff --git a/metadata/md5-cache/dev-ruby/strptime-0.2.5 b/metadata/md5-cache/dev-ruby/strptime-0.2.5
new file mode 100644
index 000000000000..7ee3548a3674
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/strptime-0.2.5
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A fast strptime/strftime engine which uses VM
+EAPI=7
+HOMEPAGE=https://github.com/nurse/strptime
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nurse/strptime/archive/v0.2.5.tar.gz -> strptime-0.2.5.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e37e4a1ca15efdb59bcfefb22dd5b0c8
diff --git a/metadata/md5-cache/dev-ruby/sys-uname-1.2.1 b/metadata/md5-cache/dev-ruby/sys-uname-1.2.1
index c4a536f8a0df..4d3e163ebf4c 100644
--- a/metadata/md5-cache/dev-ruby/sys-uname-1.2.1
+++ b/metadata/md5-cache/dev-ruby/sys-uname-1.2.1
@@ -5,7 +5,7 @@ DESCRIPTION=A Ruby interface for getting operating system information
 EAPI=7
 HOMEPAGE=https://github.com/djberg96/sys-uname
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/ffi-1.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ffi-1.0.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ffi-1.0.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/sys-uname-1.2.1.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5454b56524c71beb55582954f80700b0
+_md5_=3ec6d2dc095be5b9eff96f4b9986f834
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index d7e5af90cf41..df79f34ece58 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.8.8-r1 b/metadata/md5-cache/dev-scheme/gambit-4.8.8-r1
index d4a953227a11..d228266c9327 100644
--- a/metadata/md5-cache/dev-scheme/gambit-4.8.8-r1
+++ b/metadata/md5-cache/dev-scheme/gambit-4.8.8-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RDEPEND=ssl? ( dev-libs/openssl:0 )
 SLOT=0
 SRC_URI=http://www-labs.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_8.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4bff4f37fc2971a1c20cae63d37c7c40
diff --git a/metadata/md5-cache/dev-scheme/gambit-4.8.8-r2 b/metadata/md5-cache/dev-scheme/gambit-4.8.8-r2
index e6aa8b293171..3261e8fa44a2 100644
--- a/metadata/md5-cache/dev-scheme/gambit-4.8.8-r2
+++ b/metadata/md5-cache/dev-scheme/gambit-4.8.8-r2
@@ -9,5 +9,5 @@ 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.8/source/gambit-v4_8_8.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b731aff7ac340d3d00bb67a46e44f1b7
diff --git a/metadata/md5-cache/dev-scheme/gambit-4.9.3 b/metadata/md5-cache/dev-scheme/gambit-4.9.3
index c4a270cece29..05ff4d995540 100644
--- a/metadata/md5-cache/dev-scheme/gambit-4.9.3
+++ b/metadata/md5-cache/dev-scheme/gambit-4.9.3
@@ -10,5 +10,5 @@ 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_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3a2535a262a82680b6269cabe7b70a7e
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.8-r3 b/metadata/md5-cache/dev-scheme/guile-1.8.8-r3
index ba80ccd85546..83755feac1cf 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.8-r3
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.8-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/gmp-4.1:0= dev-libs/libltdl:0= sys-devel/gettext sys-libs/ncu
 RESTRICT=!regex? ( test )
 SLOT=12/8
 SRC_URI=mirror://gnu/guile/guile-1.8.8.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=44e7d1f78dd00829ad46f57754bff2d3
diff --git a/metadata/md5-cache/dev-scheme/guile-2.2.6 b/metadata/md5-cache/dev-scheme/guile-2.2.6
index b7dd7d3efad7..b825fd29cc8a 100644
--- a/metadata/md5-cache/dev-scheme/guile-2.2.6
+++ b/metadata/md5-cache/dev-scheme/guile-2.2.6
@@ -5,11 +5,11 @@ DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= dev-libs/libffi:= dev-libs/libltdl:= dev-libs/libunistring:0= sys-libs/ncurses:0= sys-libs/readline:0=
 REQUIRED_USE=regex
 RESTRICT=strip
 SLOT=12/2.2-1
 SRC_URI=mirror://gnu/guile/guile-2.2.6.tar.gz
-_md5_=c7f3f90873461ccfb19edc825dcce8f7
+_md5_=ec6fec89b85db9fdb3e167b62cbda9ab
diff --git a/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1 b/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1
index b62d55c59f6b..6504dee10481 100644
--- a/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1
+++ b/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=http://www.s48.org/1.9.2/scheme48-1.9.2.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9b1b4c2d508a6735b8431b22bde21025
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 79f90e0fcf1c..946ebc4e6a8a 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/snack-2.2.10-r9 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
index 017225b1deb9..b64b5913ce9a 100644
--- a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r9
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_7(-)] ) vorbis? ( media-libs/libvorbis )
+DEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) vorbis? ( media-libs/libvorbis )
 DESCRIPTION=The Snack Sound Toolkit (Tcl)
 EAPI=7
 HOMEPAGE=http://www.speech.kth.se/snack/
-IUSE=alsa examples python vorbis python_targets_python2_7 python_targets_python3_7 test
-KEYWORDS=~amd64 hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+IUSE=alsa examples python vorbis python_targets_python3_7 test
+KEYWORDS=~amd64 hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
-RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_7(-)] ) vorbis? ( media-libs/libvorbis )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_7 )
+RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= alsa? ( media-libs/alsa-lib ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) vorbis? ( media-libs/libvorbis )
+REQUIRED_USE=|| ( python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=a0f35ab115c0772d3f72a99ef545ea8b
+_md5_=8683c276069019389b965762165fd08a
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 03deb108b5df..7f9398e0affe 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-21 b/metadata/md5-cache/dev-util/android-sdk-update-manager-21
deleted file mode 100644
index c82d7e284436..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r21-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=414f0e7e0c51fe2c814d8b714179806a
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-21.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-21.1
deleted file mode 100644
index edd67f4dee44..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-21.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r21.1-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=799f31e54bce0f0d0fbb92bf282c14ad
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22
deleted file mode 100644
index fcfd13edb42c..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r22-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=97f3272b466b387f6cb0b2736c93903d
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1
deleted file mode 100644
index 09be21d30b6f..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r22.0.1-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=97f3272b466b387f6cb0b2736c93903d
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1-r1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1-r1
deleted file mode 100644
index a6834836d4e8..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r22.0.1-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=37656681e027bee6940f0ab45004be3b
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.4 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.4
deleted file mode 100644
index 9c2ff4cbe496..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r22.0.4-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=37656681e027bee6940f0ab45004be3b
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5
deleted file mode 100644
index 44708e96f327..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r22.0.5-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=37656681e027bee6940f0ab45004be3b
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5-r1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5-r1
deleted file mode 100644
index 4a92179fcd60..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r22.0.5-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9455cce2a4826ad75280eeaa3cae68f8
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.2.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.2.1
deleted file mode 100644
index 576a714a2d15..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r22.2.1-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9455cce2a4826ad75280eeaa3cae68f8
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
deleted file mode 100644
index f749ba32fec1..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip virtual/pkgconfig
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r22.3-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9b301045ef6c0bb7734656393bbe7c2
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
deleted file mode 100644
index 0644cfbc8ed8..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip virtual/pkgconfig
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r22.6-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9b301045ef6c0bb7734656393bbe7c2
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
deleted file mode 100644
index e53e00b4a49e..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip virtual/pkgconfig
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r22.6.1-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9b301045ef6c0bb7734656393bbe7c2
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-23 b/metadata/md5-cache/dev-util/android-sdk-update-manager-23
deleted file mode 100644
index a3fb93d2ce85..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-23
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip virtual/pkgconfig
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] sys-libs/zlib[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r23-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3e757f6964f45af987a8ec5815ff71cc
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
deleted file mode 100644
index 414ce234a238..000000000000
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-23-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-arch/tar app-arch/gzip virtual/pkgconfig
-DESCRIPTION=Open Handset Alliance's Android SDK
-EAPI=5
-HOMEPAGE=https://developer.android.com
-KEYWORDS=~amd64 ~x86
-LICENSE=android
-RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] sys-libs/zlib[abi_x86_32(-)]
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://dl.google.com/android/android-sdk_r23-linux.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd60f49fdbb3f7408192592a9f0b51f9
diff --git a/metadata/md5-cache/dev-util/apitrace-9.0-r1 b/metadata/md5-cache/dev-util/apitrace-9.0-r1
index 2fffbb69ad16..08f1ec9720aa 100644
--- a/metadata/md5-cache/dev-util/apitrace-9.0-r1
+++ b/metadata/md5-cache/dev-util/apitrace-9.0-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/apitrace/apitrace/archive/9.0.tar.gz -> apitrace-9.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6ae0da5933bf15b168145edfade1a19
diff --git a/metadata/md5-cache/dev-util/aruba-1.0.3-r1 b/metadata/md5-cache/dev-util/aruba-1.0.3-r1
index 3d02f5e0f7f5..9e442c400053 100644
--- a/metadata/md5-cache/dev-util/aruba-1.0.3-r1
+++ b/metadata/md5-cache/dev-util/aruba-1.0.3-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Cucumber steps for driving out command line applications
 EAPI=7
 HOMEPAGE=https://github.com/cucumber/aruba
 IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/childprocess-2.0[ruby_targets_ruby25(-)] <dev-ruby/childprocess-5[ruby_targets_ruby25(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby25(-)] >=dev-ruby/ffi-1.9[ruby_targets_ruby25(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby25(-)] dev-ruby/thor:1[ruby_targets_ruby25(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby25(-)] <dev-util/cucumber-6[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/childprocess-2.0[ruby_targets_ruby26(-)] <dev-ruby/childprocess-5[ruby_targets_ruby26(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby26(-)] >=dev-ruby/ffi-1.9[ruby_targets_ruby26(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby26(-)] <dev-util/cucumber-6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/childprocess-2.0[ruby_targets_ruby27(-)] <dev-ruby/childprocess-5[ruby_targets_ruby27(-)] >=dev-ruby/contracts-0.16.0:0[ruby_targets_ruby27(-)] >=dev-ruby/ffi-1.9[ruby_targets_ruby27(-)] >=dev-ruby/rspec-expectations-3.4:3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-util/cucumber-2.4[ruby_targets_ruby27(-)] <dev-util/cucumber-6[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/cucumber/aruba/archive/v1.0.3.tar.gz -> aruba-1.0.3.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=759d2ca7c598c41ad39b96fc9af607c9
+_md5_=2a126f2a8e8292c9bc0ab538ede616d0
diff --git a/metadata/md5-cache/dev-util/bcc-0.16.0 b/metadata/md5-cache/dev-util/bcc-0.16.0
index 4efd1e2cb691..1d31d050bbc0 100644
--- a/metadata/md5-cache/dev-util/bcc-0.16.0
+++ b/metadata/md5-cache/dev-util/bcc-0.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.16.0.tar.gz -> bcc-0.16.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51c727e31f39bf9cc9f91511a3138966
diff --git a/metadata/md5-cache/dev-util/bear-2.4.3 b/metadata/md5-cache/dev-util/bear-2.4.3
index 250986d4c339..a6c69956c6ec 100644
--- a/metadata/md5-cache/dev-util/bear-2.4.3
+++ b/metadata/md5-cache/dev-util/bear-2.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rizsotto/Bear/archive/v2.4.3.tar.gz -> bear-2.4.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98d00fd4d1452bc674a00b58c2294074
diff --git a/metadata/md5-cache/dev-util/bear-2.4.4 b/metadata/md5-cache/dev-util/bear-2.4.4
index 54e5261925ee..edf8cd3f2e6b 100644
--- a/metadata/md5-cache/dev-util/bear-2.4.4
+++ b/metadata/md5-cache/dev-util/bear-2.4.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rizsotto/Bear/archive/2.4.4.tar.gz -> bear-2.4.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=69818125af2d77e80a803264e94aa523
diff --git a/metadata/md5-cache/dev-util/bingrep-0.8.2 b/metadata/md5-cache/dev-util/bingrep-0.8.2
index 0970c98d9403..bf4faf1c23ec 100644
--- a/metadata/md5-cache/dev-util/bingrep-0.8.2
+++ b/metadata/md5-cache/dev-util/bingrep-0.8.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 BSD BSD-2 CC0-1.0 GPL-3 ISC MIT Unlicense
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/backtrace/0.3.42/download -> backtrace-0.3.42.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.32/download -> backtrace-sys-0.1.32.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bingrep/0.8.2/download -> bingrep-0.8.2.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/bstr/0.2.10/download -> bstr-0.2.10.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/cpp_demangle/0.2.14/download -> cpp_demangle-0.2.14.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.0/download -> crossbeam-utils-0.7.0.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.6/download -> csv-core-0.1.6.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/failure/0.1.6/download -> failure-0.1.6.crate https://crates.io/api/v1/crates/failure_derive/0.1.6/download -> failure_derive-0.1.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/goblin/0.2.0/download -> goblin-0.2.0.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.6/download -> hermit-abi-0.1.6.crate https://crates.io/api/v1/crates/hexplay/0.2.1/download -> hexplay-0.2.1.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/memchr/2.3.0/download -> memchr-2.3.0.crate https://crates.io/api/v1/crates/memrange/0.1.3/download -> memrange-0.1.3.crate https://crates.io/api/v1/crates/metagoblin/0.3.1/download -> metagoblin-0.3.1.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/prettytable-rs/0.8.0/download -> prettytable-rs-0.8.0.crate https://crates.io/api/v1/crates/proc-macro-error/0.2.6/download -> proc-macro-error-0.2.6.crate https://crates.io/api/v1/crates/proc-macro-error/0.4.5/download -> proc-macro-error-0.4.5.crate https://crates.io/api/v1/crates/proc-macro-error-attr/0.4.5/download -> proc-macro-error-attr-0.4.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.8/download -> proc-macro2-1.0.8.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.3/download -> regex-1.3.3.crate https://crates.io/api/v1/crates/regex-automata/0.1.8/download -> regex-automata-0.1.8.crate https://crates.io/api/v1/crates/regex-syntax/0.6.13/download -> regex-syntax-0.6.13.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/rustversion/1.0.2/download -> rustversion-1.0.2.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/scroll/0.10.1/download -> scroll-0.10.1.crate https://crates.io/api/v1/crates/scroll_derive/0.10.1/download -> scroll_derive-0.10.1.crate https://crates.io/api/v1/crates/serde/1.0.104/download -> serde-1.0.104.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.8/download -> structopt-0.3.8.crate https://crates.io/api/v1/crates/structopt-derive/0.3.5/download -> structopt-derive-0.3.5.crate https://crates.io/api/v1/crates/structopt-derive/0.4.1/download -> structopt-derive-0.4.1.crate https://crates.io/api/v1/crates/syn/1.0.14/download -> syn-1.0.14.crate https://crates.io/api/v1/crates/syn-mid/0.4.0/download -> syn-mid-0.4.0.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/termcolor/0.3.6/download -> termcolor-0.3.6.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/theban_interval_tree/0.7.1/download -> theban_interval_tree-0.7.1.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.3/download -> winapi-util-0.1.3.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/0.1.6/download -> wincolor-0.1.6.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1eef758df026617cafb6679e5dfd758e
diff --git a/metadata/md5-cache/dev-util/bloaty-1.1 b/metadata/md5-cache/dev-util/bloaty-1.1
index c1a036fe0f7e..0f017c8c22ba 100644
--- a/metadata/md5-cache/dev-util/bloaty-1.1
+++ b/metadata/md5-cache/dev-util/bloaty-1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/capstone:= dev-libs/protobuf:= dev-libs/re2:=
 SLOT=0
 SRC_URI=https://github.com/google/bloaty/releases/download/v1.1/bloaty-1.1.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1c3fc1f119f24b1ead36f6f5c72b2b9
diff --git a/metadata/md5-cache/dev-util/bloaty-9999 b/metadata/md5-cache/dev-util/bloaty-9999
index 56a514962190..aec4298dded2 100644
--- a/metadata/md5-cache/dev-util/bloaty-9999
+++ b/metadata/md5-cache/dev-util/bloaty-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/capstone:= dev-libs/protobuf:= dev-libs/re2:=
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3002619a4b43ce42001760f10c089cd
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.11.0-r1 b/metadata/md5-cache/dev-util/bpftrace-0.11.0-r1
index b57e850f23f4..d148bda40d67 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.11.0-r1
+++ b/metadata/md5-cache/dev-util/bpftrace-0.11.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.11.0.tar.gz -> bpftrace-0.11.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b8ba9db0542a789ef8b320e0c23e5790
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.11.1 b/metadata/md5-cache/dev-util/bpftrace-0.11.1
index b53e053cbf0a..824ae01b31aa 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.11.1
+++ b/metadata/md5-cache/dev-util/bpftrace-0.11.1
@@ -11,5 +11,5 @@ RDEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.11.1.tar.gz -> bpftrace-0.11.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b8ba9db0542a789ef8b320e0c23e5790
diff --git a/metadata/md5-cache/dev-util/bpftrace-9999 b/metadata/md5-cache/dev-util/bpftrace-9999
index 7a3bb6c15581..cd9e8235336b 100644
--- a/metadata/md5-cache/dev-util/bpftrace-9999
+++ b/metadata/md5-cache/dev-util/bpftrace-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-util/systemtap sys-devel/clang:= dev-libs/libbpf:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] sys-devel/clang:= >=dev-util/bcc-0.13.0:= virtual/libelf
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b8ba9db0542a789ef8b320e0c23e5790
diff --git a/metadata/md5-cache/dev-util/cargo-c-0.6.2 b/metadata/md5-cache/dev-util/cargo-c-0.6.2
index 76e1aca2eb69..cfa178c0b15a 100644
--- a/metadata/md5-cache/dev-util/cargo-c-0.6.2
+++ b/metadata/md5-cache/dev-util/cargo-c-0.6.2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/li
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.27/download -> anyhow-1.0.27.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitmaps/2.0.0/download -> bitmaps-2.0.0.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bytesize/1.0.0/download -> bytesize-1.0.0.crate https://crates.io/api/v1/crates/cargo/0.43.1/download -> cargo-0.43.1.crate https://crates.io/api/v1/crates/cargo-c/0.6.2/download -> cargo-c-0.6.2.crate https://crates.io/api/v1/crates/cargo-platform/0.1.1/download -> cargo-platform-0.1.1.crate https://crates.io/api/v1/crates/cbindgen/0.13.2/download -> cbindgen-0.13.2.crate https://crates.io/api/v1/crates/cc/1.0.50/download -> cc-1.0.50.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/crates-io/0.31.0/download -> crates-io-0.31.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crypto-hash/0.3.4/download -> crypto-hash-0.3.4.crate https://crates.io/api/v1/crates/curl/0.4.28/download -> curl-0.4.28.crate https://crates.io/api/v1/crates/curl-sys/0.4.30+curl-7.69.1/download -> curl-sys-0.4.30+curl-7.69.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/filetime/0.2.8/download -> filetime-0.2.8.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fwdansi/1.1.0/download -> fwdansi-1.1.0.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/git2/0.11.0/download -> git2-0.11.0.crate https://crates.io/api/v1/crates/git2-curl/0.12.0/download -> git2-curl-0.12.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.8/download -> hermit-abi-0.1.8.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/hex/0.4.2/download -> hex-0.4.2.crate https://crates.io/api/v1/crates/home/0.5.3/download -> home-0.5.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/humantime/2.0.0/download -> humantime-2.0.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/ignore/0.4.12/download -> ignore-0.4.12.crate https://crates.io/api/v1/crates/im-rc/14.3.0/download -> im-rc-14.3.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.68/download -> libc-0.2.68.crate https://crates.io/api/v1/crates/libgit2-sys/0.10.0/download -> libgit2-sys-0.10.0.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.3/download -> libnghttp2-sys-0.1.3.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.16/download -> libssh2-sys-0.2.16.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/opener/0.4.1/download -> opener-0.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.28/download -> openssl-0.10.28.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.54/download -> openssl-sys-0.9.54.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/proc-macro-error/0.4.11/download -> proc-macro-error-0.4.11.crate https://crates.io/api/v1/crates/proc-macro-error-attr/0.4.11/download -> proc-macro-error-attr-0.4.11.crate https://crates.io/api/v1/crates/proc-macro2/1.0.9/download -> proc-macro2-1.0.9.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_xoshiro/0.4.0/download -> rand_xoshiro-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.5/download -> regex-1.3.5.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustfix/0.5.0/download -> rustfix-0.5.0.crate https://crates.io/api/v1/crates/ryu/1.0.3/download -> ryu-1.0.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.18/download -> schannel-0.1.18.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.105/download -> serde-1.0.105.crate https://crates.io/api/v1/crates/serde_derive/1.0.105/download -> serde_derive-1.0.105.crate https://crates.io/api/v1/crates/serde_ignored/0.1.1/download -> serde_ignored-0.1.1.crate https://crates.io/api/v1/crates/serde_json/1.0.48/download -> serde_json-1.0.48.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/sized-chunks/0.5.3/download -> sized-chunks-0.5.3.crate https://crates.io/api/v1/crates/smallvec/1.2.0/download -> smallvec-1.2.0.crate https://crates.io/api/v1/crates/socket2/0.3.11/download -> socket2-0.3.11.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.12/download -> structopt-0.3.12.crate https://crates.io/api/v1/crates/structopt-derive/0.4.5/download -> structopt-derive-0.4.5.crate https://crates.io/api/v1/crates/syn/1.0.17/download -> syn-1.0.17.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/tar/0.4.26/download -> tar-0.4.26.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/typenum/1.11.2/download -> typenum-1.11.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.3/download -> winapi-util-0.1.3.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a553081caa7697794805854382b93569
diff --git a/metadata/md5-cache/dev-util/cargo-ebuild-0.2.0 b/metadata/md5-cache/dev-util/cargo-ebuild-0.2.0
index 27c3eddd6f63..75eb1ad4d648 100644
--- a/metadata/md5-cache/dev-util/cargo-ebuild-0.2.0
+++ b/metadata/md5-cache/dev-util/cargo-ebuild-0.2.0
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.6/download -> autocfg-0.1.6.crate https://crates.io/api/v1/crates/backtrace/0.3.38/download -> backtrace-0.3.38.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.0/download -> bitflags-1.2.0.crate https://crates.io/api/v1/crates/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/bytesize/1.0.0/download -> bytesize-1.0.0.crate https://crates.io/api/v1/crates/c2-chacha/0.2.2/download -> c2-chacha-0.2.2.crate https://crates.io/api/v1/crates/cargo/0.37.0/download -> cargo-0.37.0.crate https://crates.io/api/v1/crates/cargo-ebuild/0.2.0/download -> cargo-ebuild-0.2.0.crate https://crates.io/api/v1/crates/cc/1.0.45/download -> cc-1.0.45.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/commoncrypto/0.2.0/download -> commoncrypto-0.2.0.crate https://crates.io/api/v1/crates/commoncrypto-sys/0.2.0/download -> commoncrypto-sys-0.2.0.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/crates-io/0.25.0/download -> crates-io-0.25.0.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.3.9/download -> crossbeam-channel-0.3.9.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/crypto-hash/0.3.4/download -> crypto-hash-0.3.4.crate https://crates.io/api/v1/crates/curl/0.4.25/download -> curl-0.4.25.crate https://crates.io/api/v1/crates/curl-sys/0.4.23/download -> curl-sys-0.4.23.crate https://crates.io/api/v1/crates/env_logger/0.6.2/download -> env_logger-0.6.2.crate https://crates.io/api/v1/crates/failure/0.1.5/download -> failure-0.1.5.crate https://crates.io/api/v1/crates/failure_derive/0.1.5/download -> failure_derive-0.1.5.crate https://crates.io/api/v1/crates/filetime/0.2.7/download -> filetime-0.2.7.crate https://crates.io/api/v1/crates/flate2/1.0.12/download -> flate2-1.0.12.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fwdansi/1.0.1/download -> fwdansi-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.1.12/download -> getrandom-0.1.12.crate https://crates.io/api/v1/crates/git2/0.8.0/download -> git2-0.8.0.crate https://crates.io/api/v1/crates/git2-curl/0.9.0/download -> git2-curl-0.9.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.4/download -> globset-0.4.4.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/home/0.3.4/download -> home-0.3.4.crate https://crates.io/api/v1/crates/http/0.1.18/download -> http-0.1.18.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/ignore/0.4.10/download -> ignore-0.4.10.crate https://crates.io/api/v1/crates/im-rc/12.3.4/download -> im-rc-12.3.4.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/jobserver/0.1.17/download -> jobserver-0.1.17.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/libgit2-sys/0.7.11/download -> libgit2-sys-0.7.11.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.2/download -> libnghttp2-sys-0.1.2.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.12/download -> libssh2-sys-0.2.12.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.3/download -> miniz_oxide-0.3.3.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/num_cpus/1.10.1/download -> num_cpus-1.10.1.crate https://crates.io/api/v1/crates/opener/0.4.1/download -> opener-0.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.25/download -> openssl-0.10.25.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.51/download -> openssl-sys-0.9.51.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.16/download -> pkg-config-0.3.16.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.5/download -> ppv-lite86-0.2.5.crate https://crates.io/api/v1/crates/proc-macro-error/0.2.6/download -> proc-macro-error-0.2.6.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.5/download -> proc-macro2-1.0.5.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand/0.7.2/download -> rand-0.7.2.crate https://crates.io/api/v1/crates/rand_chacha/0.2.1/download -> rand_chacha-0.2.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc-workspace-hack/1.0.0/download -> rustc-workspace-hack-1.0.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustfix/0.4.6/download -> rustfix-0.4.6.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/schannel/0.1.16/download -> schannel-0.1.16.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.101/download -> serde-1.0.101.crate https://crates.io/api/v1/crates/serde_derive/1.0.101/download -> serde_derive-1.0.101.crate https://crates.io/api/v1/crates/serde_ignored/0.0.4/download -> serde_ignored-0.0.4.crate https://crates.io/api/v1/crates/serde_json/1.0.41/download -> serde_json-1.0.41.crate https://crates.io/api/v1/crates/shell-escape/0.1.4/download -> shell-escape-0.1.4.crate https://crates.io/api/v1/crates/sized-chunks/0.1.3/download -> sized-chunks-0.1.3.crate https://crates.io/api/v1/crates/smallvec/0.6.10/download -> smallvec-0.6.10.crate https://crates.io/api/v1/crates/socket2/0.3.11/download -> socket2-0.3.11.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.3/download -> structopt-0.3.3.crate https://crates.io/api/v1/crates/structopt-derive/0.3.3/download -> structopt-derive-0.3.3.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/synstructure/0.10.2/download -> synstructure-0.10.2.crate https://crates.io/api/v1/crates/tar/0.4.26/download -> tar-0.4.26.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/toml/0.5.3/download -> toml-0.5.3.crate https://crates.io/api/v1/crates/typenum/1.11.2/download -> typenum-1.11.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-segmentation/1.3.0/download -> unicode-segmentation-1.3.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url_serde/0.2.0/download -> url_serde-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.7/download -> vcpkg-0.2.7.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.2/download -> wincolor-1.0.2.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=53a9b0c6375b8bda6b0bac08288ad1b0
diff --git a/metadata/md5-cache/dev-util/cargo-ebuild-0.3.0 b/metadata/md5-cache/dev-util/cargo-ebuild-0.3.0
index dc9817fedba2..4d811f4c8b1a 100644
--- a/metadata/md5-cache/dev-util/cargo-ebuild-0.3.0
+++ b/metadata/md5-cache/dev-util/cargo-ebuild-0.3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Boost-1.0 MIT
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/bitflags/1.2.0/download -> bitflags-1.2.0.crate https://crates.io/api/v1/crates/cargo-ebuild/0.3.0/download -> cargo-ebuild-0.3.0.crate https://crates.io/api/v1/crates/cargo_metadata/0.9.1/download -> cargo_metadata-0.9.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/libc/0.2.62/download -> libc-0.2.62.crate https://crates.io/api/v1/crates/proc-macro-error/0.2.6/download -> proc-macro-error-0.2.6.crate https://crates.io/api/v1/crates/proc-macro2/1.0.5/download -> proc-macro2-1.0.5.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/ryu/1.0.0/download -> ryu-1.0.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.101/download -> serde-1.0.101.crate https://crates.io/api/v1/crates/serde_derive/1.0.101/download -> serde_derive-1.0.101.crate https://crates.io/api/v1/crates/serde_json/1.0.41/download -> serde_json-1.0.41.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.3/download -> structopt-0.3.3.crate https://crates.io/api/v1/crates/structopt-derive/0.3.3/download -> structopt-derive-0.3.3.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/unicode-segmentation/1.3.0/download -> unicode-segmentation-1.3.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2cde69142112737d30578f56bc4dc1cc
diff --git a/metadata/md5-cache/dev-util/cargo-ebuild-0.3.1 b/metadata/md5-cache/dev-util/cargo-ebuild-0.3.1
index cccaaede451c..28b75449c03c 100644
--- a/metadata/md5-cache/dev-util/cargo-ebuild-0.3.1
+++ b/metadata/md5-cache/dev-util/cargo-ebuild-0.3.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Boost-1.0 MIT
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/anyhow/1.0.31/download -> anyhow-1.0.31.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cargo-ebuild/0.3.1/download -> cargo-ebuild-0.3.1.crate https://crates.io/api/v1/crates/cargo_metadata/0.9.1/download -> cargo_metadata-0.9.1.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.14/download -> hermit-abi-0.1.14.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.71/download -> libc-0.2.71.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.2/download -> proc-macro-error-1.0.2.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.2/download -> proc-macro-error-attr-1.0.2.crate https://crates.io/api/v1/crates/proc-macro2/1.0.18/download -> proc-macro2-1.0.18.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.112/download -> serde-1.0.112.crate https://crates.io/api/v1/crates/serde_derive/1.0.112/download -> serde_derive-1.0.112.crate https://crates.io/api/v1/crates/serde_json/1.0.55/download -> serde_json-1.0.55.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.15/download -> structopt-0.3.15.crate https://crates.io/api/v1/crates/structopt-derive/0.4.8/download -> structopt-derive-0.4.8.crate https://crates.io/api/v1/crates/syn/1.0.31/download -> syn-1.0.31.crate https://crates.io/api/v1/crates/syn-mid/0.5.0/download -> syn-mid-0.5.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8bff26a48a97a91ac0bfb513b3ec9a7d
diff --git a/metadata/md5-cache/dev-util/cargo-license-0.3.0 b/metadata/md5-cache/dev-util/cargo-license-0.3.0
index b2ad5b209cd9..b3b031c25334 100644
--- a/metadata/md5-cache/dev-util/cargo-license-0.3.0
+++ b/metadata/md5-cache/dev-util/cargo-license-0.3.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 MIT
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.9.0/download -> ansi_term-0.9.0.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/backtrace/0.3.40/download -> backtrace-0.3.40.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.32/download -> backtrace-sys-0.1.32.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/cargo-license/0.3.0/download -> cargo-license-0.3.0.crate https://crates.io/api/v1/crates/cargo_metadata/0.9.1/download -> cargo_metadata-0.9.1.crate https://crates.io/api/v1/crates/cc/1.0.48/download -> cc-1.0.48.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/csv/1.1.1/download -> csv-1.1.1.crate https://crates.io/api/v1/crates/csv-core/0.1.6/download -> csv-core-0.1.6.crate https://crates.io/api/v1/crates/failure/0.1.6/download -> failure-0.1.6.crate https://crates.io/api/v1/crates/failure_derive/0.1.6/download -> failure_derive-0.1.6.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/proc-macro-error/0.2.6/download -> proc-macro-error-0.2.6.crate https://crates.io/api/v1/crates/proc-macro2/1.0.6/download -> proc-macro2-1.0.6.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/regex-automata/0.1.8/download -> regex-automata-0.1.8.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.103/download -> serde-1.0.103.crate https://crates.io/api/v1/crates/serde_derive/1.0.103/download -> serde_derive-1.0.103.crate https://crates.io/api/v1/crates/serde_json/1.0.44/download -> serde_json-1.0.44.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.5/download -> structopt-0.3.5.crate https://crates.io/api/v1/crates/structopt-derive/0.3.5/download -> structopt-derive-0.3.5.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/toml/0.4.10/download -> toml-0.4.10.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1b500b59947fb3b4f394cd660b31ee7d
diff --git a/metadata/md5-cache/dev-util/catkin-0.8.8-r1 b/metadata/md5-cache/dev-util/catkin-0.8.8-r1
index 7a3f13df7911..cd2de56dff69 100644
--- a/metadata/md5-cache/dev-util/catkin-0.8.8-r1
+++ b/metadata/md5-cache/dev-util/catkin-0.8.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/catkin/archive/0.8.8.tar.gz -> catkin-0.8.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9548f9bec4d6b0646452d13d535a55f7
diff --git a/metadata/md5-cache/dev-util/catkin-9999 b/metadata/md5-cache/dev-util/catkin-9999
index 13584799107f..de1a03528eee 100644
--- a/metadata/md5-cache/dev-util/catkin-9999
+++ b/metadata/md5-cache/dev-util/catkin-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9548f9bec4d6b0646452d13d535a55f7
diff --git a/metadata/md5-cache/dev-util/cbindgen-0.14.4 b/metadata/md5-cache/dev-util/cbindgen-0.14.4
index 8beea5e5bb37..a6a65e0efc2d 100644
--- a/metadata/md5-cache/dev-util/cbindgen-0.14.4
+++ b/metadata/md5-cache/dev-util/cbindgen-0.14.4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=MIT MPL-2.0
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/c2-chacha/0.2.3/download -> c2-chacha-0.2.3.crate https://crates.io/api/v1/crates/cbindgen/0.14.4/download -> cbindgen-0.14.4.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/getrandom/0.1.13/download -> getrandom-0.1.13.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/proc-macro2/1.0.6/download -> proc-macro2-1.0.6.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand/0.7.2/download -> rand-0.7.2.crate https://crates.io/api/v1/crates/rand_chacha/0.2.1/download -> rand_chacha-0.2.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/serde/1.0.104/download -> serde-1.0.104.crate https://crates.io/api/v1/crates/serde_derive/1.0.104/download -> serde_derive-1.0.104.crate https://crates.io/api/v1/crates/serde_json/1.0.44/download -> serde_json-1.0.44.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/toml/0.5.5/download -> toml-0.5.5.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d15f849b69818119978ea97cc7ec6d1c
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=475b540080f4df643f8edae988262da1
diff --git a/metadata/md5-cache/dev-util/ccls-0.20190823.5 b/metadata/md5-cache/dev-util/ccls-0.20190823.5
index dc81c3be39de..924e3da362c3 100644
--- a/metadata/md5-cache/dev-util/ccls-0.20190823.5
+++ b/metadata/md5-cache/dev-util/ccls-0.20190823.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/rapidjson sys-devel/clang:= sys-devel/llvm:=
 SLOT=0
 SRC_URI=https://github.com/MaskRay/ccls/archive/0.20190823.5.tar.gz -> ccls-0.20190823.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d50b71b6a8971a6bbacfd4a1d181dc1
diff --git a/metadata/md5-cache/dev-util/ccls-0.20190823.6 b/metadata/md5-cache/dev-util/ccls-0.20190823.6
index aa1a0fd41fac..f98d73ef9151 100644
--- a/metadata/md5-cache/dev-util/ccls-0.20190823.6
+++ b/metadata/md5-cache/dev-util/ccls-0.20190823.6
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/rapidjson sys-devel/clang:= sys-devel/llvm:=
 SLOT=0
 SRC_URI=https://github.com/MaskRay/ccls/archive/0.20190823.6.tar.gz -> ccls-0.20190823.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d70e3109aaa6a069757ae296f7b11349
diff --git a/metadata/md5-cache/dev-util/ccls-9999 b/metadata/md5-cache/dev-util/ccls-9999
index 92dd7da19a1a..1547a7261373 100644
--- a/metadata/md5-cache/dev-util/ccls-9999
+++ b/metadata/md5-cache/dev-util/ccls-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-libs/rapidjson sys-devel/clang:= sys-devel/llvm:=
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b05f17c9fb24290c65b2da8bc0e1931
diff --git a/metadata/md5-cache/dev-util/cflow-1.6 b/metadata/md5-cache/dev-util/cflow-1.6
index 25e2b2c6774b..53578d49889b 100644
--- a/metadata/md5-cache/dev-util/cflow-1.6
+++ b/metadata/md5-cache/dev-util/cflow-1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) nls? ( virtual/libintl virtual/libiconv )
 SLOT=0
 SRC_URI=http://ftp.gnu.org/gnu/cflow/cflow-1.6.tar.bz2
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=367a7fdde5606a67accd669360171fb6
diff --git a/metadata/md5-cache/dev-util/clazy-1.7 b/metadata/md5-cache/dev-util/clazy-1.7
index 5c00a3f31743..29d5be0fdd0c 100644
--- a/metadata/md5-cache/dev-util/clazy-1.7
+++ b/metadata/md5-cache/dev-util/clazy-1.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=sys-devel/clang-5.0:= >=sys-devel/llvm-5.0:=
 SLOT=0
 SRC_URI=mirror://kde/stable/clazy/1.7/src/clazy-1.7.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0bf7a96ff98f6c9a6e55f53de11dd484
diff --git a/metadata/md5-cache/dev-util/cmake-3.13.5 b/metadata/md5-cache/dev-util/cmake-3.13.5
index ce506070cb40..3e9ef3ce6620 100644
--- a/metadata/md5-cache/dev-util/cmake-3.13.5
+++ b/metadata/md5-cache/dev-util/cmake-3.13.5
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.13/cmake-3.13.5.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2705b2fadfd78d5195fdedbc1cbaa114
diff --git a/metadata/md5-cache/dev-util/cmake-3.16.5 b/metadata/md5-cache/dev-util/cmake-3.16.5
index 6623d88645cf..00024aec78da 100644
--- a/metadata/md5-cache/dev-util/cmake-3.16.5
+++ b/metadata/md5-cache/dev-util/cmake-3.16.5
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.3.3:= >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.16/cmake-3.16.5.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=423f21c3701ea3ecb73525354d0472bb
diff --git a/metadata/md5-cache/dev-util/cmake-3.17.4-r1 b/metadata/md5-cache/dev-util/cmake-3.17.4-r1
index 5ac62b6189b6..b6da66ddbb77 100644
--- a/metadata/md5-cache/dev-util/cmake-3.17.4-r1
+++ b/metadata/md5-cache/dev-util/cmake-3.17.4-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Cross platform Make
 EAPI=7
 HOMEPAGE=https://cmake.org/
 IUSE=doc emacs ncurses qt5 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.17/cmake-3.17.4.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7bf91588af7d1f416f3a27789875add
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5a662596c874fe761d4bda4a8b8f0536
diff --git a/metadata/md5-cache/dev-util/cmake-3.18.2 b/metadata/md5-cache/dev-util/cmake-3.18.2
index 07905700fcc4..dba44be36b91 100644
--- a/metadata/md5-cache/dev-util/cmake-3.18.2
+++ b/metadata/md5-cache/dev-util/cmake-3.18.2
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.18/cmake-3.18.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7da4c97c573b73d8058558a8da8e15e7
diff --git a/metadata/md5-cache/dev-util/cmake-3.18.3 b/metadata/md5-cache/dev-util/cmake-3.18.3
index cb81313077e5..30f424b420b0 100644
--- a/metadata/md5-cache/dev-util/cmake-3.18.3
+++ b/metadata/md5-cache/dev-util/cmake-3.18.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.18/cmake-3.18.3.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7da4c97c573b73d8058558a8da8e15e7
diff --git a/metadata/md5-cache/dev-util/cmocka-1.1.5 b/metadata/md5-cache/dev-util/cmocka-1.1.5
index e8a84890e1c5..1e797707becb 100644
--- a/metadata/md5-cache/dev-util/cmocka-1.1.5
+++ b/metadata/md5-cache/dev-util/cmocka-1.1.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmocka.org/files/1.1/cmocka-1.1.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=065581daa52a4f17308dd0db3a12869f
diff --git a/metadata/md5-cache/dev-util/creduce-2.11.0_pre20191110 b/metadata/md5-cache/dev-util/creduce-2.11.0_pre20191110
index 377638a03ef9..ae818799755a 100644
--- a/metadata/md5-cache/dev-util/creduce-2.11.0_pre20191110
+++ b/metadata/md5-cache/dev-util/creduce-2.11.0_pre20191110
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=sys-devel/clang:9 >=dev-lang/perl-5.10.0 dev-perl/Exporter-Lite dev-perl/File-Which dev-perl/Getopt-Tabular dev-perl/Regexp-Common
 SLOT=0
 SRC_URI=https://github.com/csmith-project/creduce/archive/2a4480eb6cb72b3d2d131b536c883cc6d41bdcaa.tar.gz -> creduce-2a4480eb6cb72b3d2d131b536c883cc6d41bdcaa.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fef2ade93b51eda550ac48258b6f0de2
diff --git a/metadata/md5-cache/dev-util/cscope-15.8a-r1 b/metadata/md5-cache/dev-util/cscope-15.8a-r1
index 5cf6a672131e..f1030334fc2e 100644
--- a/metadata/md5-cache/dev-util/cscope-15.8a-r1
+++ b/metadata/md5-cache/dev-util/cscope-15.8a-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+
 RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://sourceforge/cscope/cscope-15.8a.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=803386ba5982b872d225c5e02a1bfe0e
diff --git a/metadata/md5-cache/dev-util/cscope-15.8a-r2 b/metadata/md5-cache/dev-util/cscope-15.8a-r2
index 3395d78ee749..a81948b9b375 100644
--- a/metadata/md5-cache/dev-util/cscope-15.8a-r2
+++ b/metadata/md5-cache/dev-util/cscope-15.8a-r2
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+
 RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://sourceforge/cscope/cscope-15.8a.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=893fc2abb8942080d5902f8fdcdc40a6
diff --git a/metadata/md5-cache/dev-util/cscope-15.9 b/metadata/md5-cache/dev-util/cscope-15.9
index 880f2831e5b2..f5a7a8f5233f 100644
--- a/metadata/md5-cache/dev-util/cscope-15.9
+++ b/metadata/md5-cache/dev-util/cscope-15.9
@@ -10,5 +10,5 @@ LICENSE=BSD GPL-2+
 RDEPEND=>=sys-libs/ncurses-5.2:0= emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://sourceforge/cscope/cscope-15.9.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f660472876f79517bf0a0d3b9b715d1e
diff --git a/metadata/md5-cache/dev-util/cvise-1.6.0 b/metadata/md5-cache/dev-util/cvise-1.6.0
index 6c44635b6989..84bf985374a5 100644
--- a/metadata/md5-cache/dev-util/cvise-1.6.0
+++ b/metadata/md5-cache/dev-util/cvise-1.6.0
@@ -5,12 +5,12 @@ DESCRIPTION=Super-parallel Python port of the C-Reduce
 EAPI=7
 HOMEPAGE=https://github.com/marxin/cvise/
 IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=UoI-NCSA
 RDEPEND=|| ( sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) <=sys-devel/clang-13:= python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-python/pebble[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pebble[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pebble[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pebble[python_targets_python3_9(-)] ) dev-util/unifdef sys-devel/flex
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/marxin/cvise/archive/v1.6.0.tar.gz -> cvise-1.6.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=70bd1c4aa5d40e65bfbea49fdde8aee7
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c319326cdaf429f51fe2705247bb3ba
diff --git a/metadata/md5-cache/dev-util/cvise-1.7.0-r1 b/metadata/md5-cache/dev-util/cvise-1.7.0-r1
new file mode 100644
index 000000000000..56f3a97855d8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cvise-1.7.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-devel/flex test? ( python_single_target_python3_6? ( dev-python/pebble[python_targets_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pebble[python_targets_python3_7(-)] dev-python/pytest[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pebble[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pebble[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) <=sys-devel/clang-13:= !!sys-devel/llvm:0
+DESCRIPTION=Super-parallel Python port of the C-Reduce
+EAPI=7
+HOMEPAGE=https://github.com/marxin/cvise/
+IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=UoI-NCSA
+RDEPEND=|| ( sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) <=sys-devel/clang-13:= python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-python/pebble[python_targets_python3_6(-)] dev-python/psutil[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pebble[python_targets_python3_7(-)] dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pebble[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pebble[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) dev-util/unifdef sys-devel/flex
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/marxin/cvise/archive/v1.7.0.tar.gz -> cvise-1.7.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c63ec333316bce860971023562f4d6d8
diff --git a/metadata/md5-cache/dev-util/cwdiff-0.2.8 b/metadata/md5-cache/dev-util/cwdiff-0.2.8
deleted file mode 100644
index aaf3e5913341..000000000000
--- a/metadata/md5-cache/dev-util/cwdiff-0.2.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A script that wraps wdiff to support directories and colorize the output
-EAPI=5
-HOMEPAGE=https://github.com/junghans/cwdiff
-IUSE=a2ps mercurial
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-apps/sed app-shells/bash app-text/wdiff sys-apps/diffutils a2ps? ( app-text/a2ps ) mercurial? ( dev-vcs/mercurial )
-SLOT=0
-SRC_URI=https://github.com/junghans/cwdiff/archive/v0.2.8.tar.gz -> cwdiff-0.2.8.tar.gz
-_md5_=91353fd4eb724da2db65ac9400a49063
diff --git a/metadata/md5-cache/dev-util/cwdiff-0.3.0 b/metadata/md5-cache/dev-util/cwdiff-0.3.0
deleted file mode 100644
index 407aac37fbc7..000000000000
--- a/metadata/md5-cache/dev-util/cwdiff-0.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-apps/help2man sys-apps/coreutils
-DESCRIPTION=A script that wraps wdiff to support directories and colorize the output
-EAPI=5
-HOMEPAGE=https://github.com/junghans/cwdiff
-IUSE=a2ps mercurial
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-apps/sed app-shells/bash app-text/wdiff sys-apps/diffutils a2ps? ( app-text/a2ps ) mercurial? ( dev-vcs/mercurial )
-SLOT=0
-SRC_URI=https://github.com/junghans/cwdiff/archive/v0.3.0.tar.gz -> cwdiff-0.3.0.tar.gz
-_md5_=1ba80455842f3363f06c4f7aaed2d54e
diff --git a/metadata/md5-cache/dev-util/cwdiff-0.3.1 b/metadata/md5-cache/dev-util/cwdiff-0.3.1
deleted file mode 100644
index a71655532cb7..000000000000
--- a/metadata/md5-cache/dev-util/cwdiff-0.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-apps/help2man sys-apps/coreutils
-DESCRIPTION=A script that wraps wdiff to support directories and colorize the output
-EAPI=5
-HOMEPAGE=https://github.com/junghans/cwdiff
-IUSE=a2ps mercurial
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sys-apps/sed app-shells/bash app-text/wdiff sys-apps/diffutils a2ps? ( app-text/a2ps ) mercurial? ( dev-vcs/mercurial )
-SLOT=0
-SRC_URI=https://github.com/junghans/cwdiff/archive/v0.3.1.tar.gz -> cwdiff-0.3.1.tar.gz
-_md5_=1ba80455842f3363f06c4f7aaed2d54e
diff --git a/metadata/md5-cache/dev-util/ddd-3.3.12-r4 b/metadata/md5-cache/dev-util/ddd-3.3.12-r4
index ad5fbbcf8f59..47e4b68c24a4 100644
--- a/metadata/md5-cache/dev-util/ddd-3.3.12-r4
+++ b/metadata/md5-cache/dev-util/ddd-3.3.12-r4
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/ddd/ddd-3.3.12.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0e87717d4d2bb3f4381b325e54afda05
+_md5_=891f45f84dd0195bc873321cf7abe3d5
diff --git a/metadata/md5-cache/dev-util/desktop-file-utils-0.24 b/metadata/md5-cache/dev-util/desktop-file-utils-0.24
index 22e15c80d1b2..be512040a31a 100644
--- a/metadata/md5-cache/dev-util/desktop-file-utils-0.24
+++ b/metadata/md5-cache/dev-util/desktop-file-utils-0.24
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.12:2 emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.24.tar.xz
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce
 _md5_=fc458c618ec2612cb97467d3c8f1408d
diff --git a/metadata/md5-cache/dev-util/desktop-file-utils-0.26 b/metadata/md5-cache/dev-util/desktop-file-utils-0.26
index 062bd9de4ffb..30ce13e74f95 100644
--- a/metadata/md5-cache/dev-util/desktop-file-utils-0.26
+++ b/metadata/md5-cache/dev-util/desktop-file-utils-0.26
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.12:2 emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.26.tar.xz
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=73e85f22f127d69c88157ad0fd6ef553
diff --git a/metadata/md5-cache/dev-util/edb-debugger-1.2.0 b/metadata/md5-cache/dev-util/edb-debugger-1.2.0
index 0fa6b0a1efb0..a31620842065 100644
--- a/metadata/md5-cache/dev-util/edb-debugger-1.2.0
+++ b/metadata/md5-cache/dev-util/edb-debugger-1.2.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/capstone:= dev-libs/double-conversion dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 graphviz? ( media-gfx/graphviz )
 SLOT=0
 SRC_URI=https://github.com/eteran/edb-debugger/releases/download/1.2.0/edb-debugger-1.2.0.tgz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d35cbc44065e77451fbe2cb236b2d69
diff --git a/metadata/md5-cache/dev-util/edb-debugger-9999 b/metadata/md5-cache/dev-util/edb-debugger-9999
index bf7cc3e9a5cc..e536888234fb 100644
--- a/metadata/md5-cache/dev-util/edb-debugger-9999
+++ b/metadata/md5-cache/dev-util/edb-debugger-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=dev-libs/capstone:= dev-libs/double-conversion dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 graphviz? ( media-gfx/graphviz )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7dcaf966dc6faae52727bcf69218c5f
diff --git a/metadata/md5-cache/dev-util/global-6.6.4 b/metadata/md5-cache/dev-util/global-6.6.4
index 8419ebce4d9b..e1b31e4e4e5d 100644
--- a/metadata/md5-cache/dev-util/global-6.6.4
+++ b/metadata/md5-cache/dev-util/global-6.6.4
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses emacs? ( >=app-editors/emacs-23.1:* ) vim? ( || ( app-editors/vim app-editors/gvim ) ) || ( dev-libs/libltdl:0 sys-devel/libtool:2 )
 SLOT=0
 SRC_URI=mirror://gnu/global/global-6.6.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=b581472ebcd9757bf6c8676ab32b4fab
diff --git a/metadata/md5-cache/dev-util/glslang-8.13.3559 b/metadata/md5-cache/dev-util/glslang-8.13.3559
index 54b4b19fdc3c..0f55d764ad7c 100644
--- a/metadata/md5-cache/dev-util/glslang-8.13.3559
+++ b/metadata/md5-cache/dev-util/glslang-8.13.3559
@@ -10,5 +10,5 @@ RDEPEND=!<media-libs/shaderc-2019-r1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/glslang/archive/8.13.3559.tar.gz -> glslang-8.13.3559.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42b590a65a7dac07adcf2e8cba7ca20a
diff --git a/metadata/md5-cache/dev-util/glslang-8.13.3560_pre20200404 b/metadata/md5-cache/dev-util/glslang-8.13.3560_pre20200404
index 28cbe0f2906d..19dba6801c3b 100644
--- a/metadata/md5-cache/dev-util/glslang-8.13.3560_pre20200404
+++ b/metadata/md5-cache/dev-util/glslang-8.13.3560_pre20200404
@@ -10,5 +10,5 @@ RDEPEND=!<media-libs/shaderc-2020.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/glslang/archive/b5757b95005bbf6b0287096c5b708c5e25645311.tar.gz -> glslang-8.13.3560_pre20200404.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f93e807b181b242ac08909aa3d6f981d
diff --git a/metadata/md5-cache/dev-util/glslang-8.13.3743-r1 b/metadata/md5-cache/dev-util/glslang-8.13.3743-r1
index ceca7bfe96c2..b3dfd0fab9aa 100644
--- a/metadata/md5-cache/dev-util/glslang-8.13.3743-r1
+++ b/metadata/md5-cache/dev-util/glslang-8.13.3743-r1
@@ -10,5 +10,5 @@ RDEPEND=!<media-libs/shaderc-2020.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/glslang/archive/8.13.3743.tar.gz -> glslang-8.13.3743.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ba108bec74ce72fae441c8f6e170659
diff --git a/metadata/md5-cache/dev-util/glslang-9999 b/metadata/md5-cache/dev-util/glslang-9999
index dba54216b1b4..ff57af4d610c 100644
--- a/metadata/md5-cache/dev-util/glslang-9999
+++ b/metadata/md5-cache/dev-util/glslang-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!<media-libs/shaderc-2020.1
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=094138e9a459df151e9a33ae59edb937
diff --git a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32 b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32
deleted file mode 100644
index d8212ea00791..000000000000
--- a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xml-dtd:4.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt app-arch/xz-utils
-DESCRIPTION=Converts Glade files to GtkBuilder XML format
-EAPI=6
-HOMEPAGE=https://www.gtk.org/
-IUSE=+python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !<x11-libs/gtk+-2.24.31-r1:2
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.32.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1d73ec0ea95e80fb79b3d07e6a16bca6
diff --git a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32-r1 b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32-r1
new file mode 100644
index 000000000000..2c4f1d08a4c5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/docbook-xml-dtd:4.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt app-arch/xz-utils
+DESCRIPTION=Converts Glade files to GtkBuilder XML format
+EAPI=6
+HOMEPAGE=https://www.gtk.org/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !<x11-libs/gtk+-2.24.31-r1:2
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.32.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=df3f07439b35779dd91fc7aff1d8165e
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.32-r1 b/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
index fb03c2239528..900f603d6ef8 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c948aebf8a74cbcc242a70fd5819672d
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.32-r2 b/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
index 6d14669a0bd4..f3b6ef857f9b 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.32-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=45808a11623b921958cfec31f59cf1b0
diff --git a/metadata/md5-cache/dev-util/heaptrack-9999 b/metadata/md5-cache/dev-util/heaptrack-9999
index 30cd4cf70473..a6b03909aa15 100644
--- a/metadata/md5-cache/dev-util/heaptrack-9999
+++ b/metadata/md5-cache/dev-util/heaptrack-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/boost:= sys-libs/libunwind sys-libs/zlib gui? ( dev-libs/kdiagram:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemmodels:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/threadweaver:5 ) zstd? ( app-arch/zstd:= ) gui? ( >=kde-frameworks/kf-env-4 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b2ede7681f1350c886d37e595591729
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4111 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4111
index 93a3459d1889..580a35d10e9c 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4111
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4111
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=<=sys-devel/llvm-10.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <=dev-libs/opencl-clang-10.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.4111.tar.gz -> intel-graphics-compiler-1.0.4111.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7c43816acea92e8a4159a714753c755
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4944 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4944
index d544c172c688..d51f27dcc23a 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4944
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.4944
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=<=sys-devel/llvm-10.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <=dev-libs/opencl-clang-10.9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/opencl-clang-10.0.0.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.4944.tar.gz -> intel-graphics-compiler-1.0.4944.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4d697ce7ea96ad122424c6adc64fbcf
diff --git a/metadata/md5-cache/dev-util/kbuild-0.1.9998.3407 b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3407
index 3e267b1090b9..e2973d2ded71 100644
--- a/metadata/md5-cache/dev-util/kbuild-0.1.9998.3407
+++ b/metadata/md5-cache/dev-util/kbuild-0.1.9998.3407
@@ -4,9 +4,9 @@ DEPEND=sys-apps/texinfo sys-devel/flex sys-devel/gettext || ( dev-util/byacc dev
 DESCRIPTION=A makefile framework for writing simple makefiles for complex tasks
 EAPI=7
 HOMEPAGE=http://svn.netlabs.org/kbuild/wiki
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/kbuild-0.1.9998.3407-src.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=de17e76aad2b991e6e14d9b2dce1211c
+_md5_=f291a3738aa59655a2331ebaa49b2731
diff --git a/metadata/md5-cache/dev-util/kdbg-3.0.1 b/metadata/md5-cache/dev-util/kdbg-3.0.1
index 9353bc919e03..ef6376636d5d 100644
--- a/metadata/md5-cache/dev-util/kdbg-3.0.1
+++ b/metadata/md5-cache/dev-util/kdbg-3.0.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=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/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 sys-devel/gdb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kdbg/kdbg-3.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c5b4ad90564695c32ae66ecb4b2a6c8
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.5.2 b/metadata/md5-cache/dev-util/kdevelop-5.5.2
index f7436a47c8a9..b77635de24e1 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.5.2
+++ b/metadata/md5-cache/dev-util/kdevelop-5.5.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/55
 SRC_URI=mirror://kde/stable/kdevelop/5.5.2/src/kdevelop-5.5.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1870d72358098ed86896edc8aac53ac
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.6.0 b/metadata/md5-cache/dev-util/kdevelop-5.6.0
index 4da1159db0cc..bc9e4cb59815 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.6.0
+++ b/metadata/md5-cache/dev-util/kdevelop-5.6.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/55
 SRC_URI=mirror://kde/stable/kdevelop/5.6.0/src/kdevelop-5.6.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43bd5b3732572f59cc630150e086face
diff --git a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1 b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1
index a5e072f98147..c38057e94bd3 100644
--- a/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1
+++ b/metadata/md5-cache/dev-util/kdevelop-pg-qt-2.2.1
@@ -11,5 +11,5 @@ RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop-pg-qt/2.2.1/src/kdevelop-pg-qt-2.2.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e940cbdaca7e84641ee16048b1ba3bd5
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.5.2 b/metadata/md5-cache/dev-util/kdevelop-php-5.5.2
index 1a87d6562eae..7999436939a0 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.5.2
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.5.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop-pg
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.5.2/src/kdev-php-5.5.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a2129da279a6b8cd6fe6a4b46713f8b
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.6.0 b/metadata/md5-cache/dev-util/kdevelop-php-5.6.0
index 6f5aa0c6bea9..3eab29a72067 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.6.0
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop-pg
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.6.0/src/kdev-php-5.6.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c283dd4dbe1b4abdf30764b9ff2d54d2
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.5.2 b/metadata/md5-cache/dev-util/kdevelop-python-5.5.2
index ef685f38e779..a25ef22ca272 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.5.2
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.5.2/src/kdev-python-5.5.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5ca83d18fdfdafaf02f22083817cb755
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.6.0 b/metadata/md5-cache/dev-util/kdevelop-python-5.6.0
index f64b50c8d192..4fd76b4dbe3b 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.6.0
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.6.0/src/kdev-python-5.6.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a35f77374be5dacfb63f0902e64b95c
diff --git a/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.4 b/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.4
index f2abb35d0740..5f2661253bf0 100644
--- a/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.4
+++ b/metadata/md5-cache/dev-util/kdstatemachineeditor-1.2.4
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KDAB/KDStateMachineEditor/releases/download/v1.2.4/kdstatemachineeditor-1.2.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbded6728c67b3ccbcb56077f01b0876
diff --git a/metadata/md5-cache/dev-util/kdstatemachineeditor-9999 b/metadata/md5-cache/dev-util/kdstatemachineeditor-9999
index f11c456feb81..edcdd28f223a 100644
--- a/metadata/md5-cache/dev-util/kdstatemachineeditor-9999
+++ b/metadata/md5-cache/dev-util/kdstatemachineeditor-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbded6728c67b3ccbcb56077f01b0876
diff --git a/metadata/md5-cache/dev-util/lcov-1.15 b/metadata/md5-cache/dev-util/lcov-1.15
new file mode 100644
index 000000000000..cffb0e38a3d1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lcov-1.15
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
+EAPI=7
+HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=dev-lang/perl dev-perl/JSON dev-perl/PerlIO-gzip
+SLOT=0
+SRC_URI=https://github.com/linux-test-project/lcov/releases/download/v1.15/lcov-1.15.tar.gz
+_eclasses_=optfeature	6c9aa35fc16df43d7142ef2660e00e25	prefix	c2993e4c430c1ee24f278983d6189501
+_md5_=3ea0656088dc62e0b8a83ff835ad456c
diff --git a/metadata/md5-cache/dev-util/lcov-9999 b/metadata/md5-cache/dev-util/lcov-9999
index ce0f3945c4cb..818702952983 100644
--- a/metadata/md5-cache/dev-util/lcov-9999
+++ b/metadata/md5-cache/dev-util/lcov-9999
@@ -1,12 +1,11 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install prepare unpack
+DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
 EAPI=7
 HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
-IUSE=png
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=dev-lang/perl dev-perl/JSON dev-perl/PerlIO-gzip png? ( dev-perl/GD[png] )
+RDEPEND=dev-lang/perl dev-perl/JSON dev-perl/PerlIO-gzip
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	prefix	c2993e4c430c1ee24f278983d6189501
-_md5_=a7af227bd609d0eba29e2180a5313d86
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	optfeature	6c9aa35fc16df43d7142ef2660e00e25	prefix	c2993e4c430c1ee24f278983d6189501
+_md5_=930240a88eab9595d52b6ecd9645bc3a
diff --git a/metadata/md5-cache/dev-util/lldb-10.0.1 b/metadata/md5-cache/dev-util/lldb-10.0.1
index 98746a890c83..5b56e47ec895 100644
--- a/metadata/md5-cache/dev-util/lldb-10.0.1
+++ b/metadata/md5-cache/dev-util/lldb-10.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6074c297fe2ffb70f65d40234e334372
diff --git a/metadata/md5-cache/dev-util/lldb-11.0.0.9999 b/metadata/md5-cache/dev-util/lldb-11.0.0.9999
index 19064a4adb84..6ba9f3dd8b1d 100644
--- a/metadata/md5-cache/dev-util/lldb-11.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-11.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses?
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49dcb24e45aa70bb2d5dc7d45ef3d818
diff --git a/metadata/md5-cache/dev-util/lldb-11.0.0_rc3 b/metadata/md5-cache/dev-util/lldb-11.0.0_rc3
index bf64110a8d98..90ad2363b636 100644
--- a/metadata/md5-cache/dev-util/lldb-11.0.0_rc3
+++ b/metadata/md5-cache/dev-util/lldb-11.0.0_rc3
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49dcb24e45aa70bb2d5dc7d45ef3d818
diff --git a/metadata/md5-cache/dev-util/lldb-11.0.0_rc4 b/metadata/md5-cache/dev-util/lldb-11.0.0_rc4
new file mode 100644
index 000000000000..615197108d91
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-11.0.0_rc4
@@ -0,0 +1,15 @@
+BDEPEND=python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python3_6? ( ~dev-python/lit-11.0.0_rc4[python_targets_python3_6(-)] ) python_single_target_python3_7? ( ~dev-python/lit-11.0.0_rc4[python_targets_python3_7(-)] ) python_single_target_python3_8? ( ~dev-python/lit-11.0.0_rc4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-11.0.0_rc4[python_targets_python3_9(-)] ) sys-devel/lld ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ~sys-devel/clang-11.0.0_rc4[xml] ~sys-devel/llvm-11.0.0_rc4 !<sys-devel/llvm-4.0 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM debugger
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=libedit lzma ncurses +python test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ~sys-devel/clang-11.0.0_rc4[xml] ~sys-devel/llvm-11.0.0_rc4 !<sys-devel/llvm-4.0
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7223b96fccdd0250d213aac10bf73c73
diff --git a/metadata/md5-cache/dev-util/lldb-12.0.0.9999 b/metadata/md5-cache/dev-util/lldb-12.0.0.9999
index e74a8bca3488..b92e6c80a9cc 100644
--- a/metadata/md5-cache/dev-util/lldb-12.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-12.0.0.9999
@@ -9,7 +9,7 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
 RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) ~sys-devel/clang-12.0.0.9999[xml] ~sys-devel/llvm-12.0.0.9999 !<sys-devel/llvm-4.0
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49dcb24e45aa70bb2d5dc7d45ef3d818
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7223b96fccdd0250d213aac10bf73c73
diff --git a/metadata/md5-cache/dev-util/lxqt-build-tools-0.7.0 b/metadata/md5-cache/dev-util/lxqt-build-tools-0.7.0
index 0589680cc409..54749ee1b84b 100644
--- a/metadata/md5-cache/dev-util/lxqt-build-tools-0.7.0
+++ b/metadata/md5-cache/dev-util/lxqt-build-tools-0.7.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/glib-2.50.0 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-build-tools/releases/download/0.7.0/lxqt-build-tools-0.7.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f865a0ce45f5fbea0d80042786b65a3c
diff --git a/metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1 b/metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1
index f29f3207fe67..d31701c65f44 100644
--- a/metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1
+++ b/metadata/md5-cache/dev-util/massif-visualizer-0.7.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/kdiagram:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/massif-visualizer/0.7.0/src/massif-visualizer-0.7.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f60095a7f39f1e2e0d97d27ac561f90
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.0 b/metadata/md5-cache/dev-util/ninja-1.10.0
index 0d096363c428..3184bf86bffd 100644
--- a/metadata/md5-cache/dev-util/ninja-1.10.0
+++ b/metadata/md5-cache/dev-util/ninja-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz -> ninja-1.10.0.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3e6cb1ec2fa167ae92072ba38dfb9c04
diff --git a/metadata/md5-cache/dev-util/ninja-1.10.1 b/metadata/md5-cache/dev-util/ninja-1.10.1
new file mode 100644
index 000000000000..697b5351dc22
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ninja-1.10.1
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
+DEFINED_PHASES=compile install postinst postrm setup test
+DESCRIPTION=A small build system similar to make
+EAPI=7
+HOMEPAGE=https://ninja-build.org/
+IUSE=doc emacs test vim-syntax
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ninja-build/ninja/archive/v1.10.1.tar.gz -> ninja-1.10.1.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4c065b699b11479016099bbc4e615f06
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2 b/metadata/md5-cache/dev-util/ninja-1.8.2
deleted file mode 100644
index 260adec2d47c..000000000000
--- a/metadata/md5-cache/dev-util/ninja-1.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup test
-DEPEND=|| ( dev-lang/python:3.6 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
-DESCRIPTION=A small build system similar to make
-EAPI=6
-HOMEPAGE=https://ninja-build.org/
-IUSE=doc emacs test vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz -> ninja-1.8.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bf546054d280e4e44e2b6042fb27d2cf
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2-r1 b/metadata/md5-cache/dev-util/ninja-1.8.2-r1
deleted file mode 100644
index cb94f8fd385d..000000000000
--- a/metadata/md5-cache/dev-util/ninja-1.8.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup test
-DEPEND=|| ( dev-lang/python:3.6 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
-DESCRIPTION=A small build system similar to make
-EAPI=6
-HOMEPAGE=https://ninja-build.org/
-IUSE=doc emacs test vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0382356c1b4b220b5ca1a7984de23432
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2-r2 b/metadata/md5-cache/dev-util/ninja-1.8.2-r2
deleted file mode 100644
index 8aa867fd643f..000000000000
--- a/metadata/md5-cache/dev-util/ninja-1.8.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup test
-DEPEND=|| ( dev-lang/python:3.6 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
-DESCRIPTION=A small build system similar to make
-EAPI=6
-HOMEPAGE=https://ninja-build.org/
-IUSE=doc emacs test vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Kitware/ninja/archive/v1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d1b151ff4a2893b17c67f9a99df47d9a
diff --git a/metadata/md5-cache/dev-util/ninja-1.9.0 b/metadata/md5-cache/dev-util/ninja-1.9.0
deleted file mode 100644
index e8862deaab18..000000000000
--- a/metadata/md5-cache/dev-util/ninja-1.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
-DEFINED_PHASES=compile install postinst postrm setup test
-DESCRIPTION=A small build system similar to make
-EAPI=7
-HOMEPAGE=https://ninja-build.org/
-IUSE=doc emacs test vim-syntax
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Kitware/ninja/archive/v1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=84feb498d87f055d558b5b2f28c3b7e8
diff --git a/metadata/md5-cache/dev-util/ninja-9999 b/metadata/md5-cache/dev-util/ninja-9999
index 2818d585fc65..5db8cfd3f11d 100644
--- a/metadata/md5-cache/dev-util/ninja-9999
+++ b/metadata/md5-cache/dev-util/ninja-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm setup test unpack
 DESCRIPTION=A small build system similar to make
 EAPI=7
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	848a95b01913ff6374bcb5eae09c52ba	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8574a3c82582826b69b1a02716c832c7
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=965f4147f7a66c61b1c82620bcdbd018
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.0.3 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.0.3
index 0fea123154a0..ac1823902e48 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.0.3
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-11.0.3
@@ -10,4 +10,4 @@ RESTRICT=bindist mirror
 SLOT=0/11.0.3
 SRC_URI=https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_450.51.06_linux.run
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4e1aa29d6680c07f722dfe09f73f21c4
+_md5_=f2fe15a9d7081f95fbc1706c25f0d057
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.7.6-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.7.6-r1
deleted file mode 100644
index 13d61ec4f3cf..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.7.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/snakeoil-0.8.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.10.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=pkgcore-based QA utility for ebuild repos
-EAPI=6
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/snakeoil-0.8.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.10.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.7.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7231dfaf13ffc3bf3a3bb08c69c07b32
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.7.7 b/metadata/md5-cache/dev-util/pkgcheck-0.7.7
index 82b1df67de3a..7175e9d7f4e1 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.7.7
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.7.7
@@ -4,7 +4,7 @@ DESCRIPTION=pkgcore-based QA utility for ebuild repos
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/snakeoil-0.8.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.10.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.7.7.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2bb0d452917aa56354f496df2118d6df
+_md5_=4e0f93b794eb2d30a20bc3938132431f
diff --git a/metadata/md5-cache/dev-util/re2c-2.0.3 b/metadata/md5-cache/dev-util/re2c-2.0.3
index 9335d0349017..b7b4e2583b28 100644
--- a/metadata/md5-cache/dev-util/re2c-2.0.3
+++ b/metadata/md5-cache/dev-util/re2c-2.0.3
@@ -3,8 +3,8 @@ DESCRIPTION=tool for generating C-based recognizers from regular expressions
 EAPI=7
 HOMEPAGE=http://re2c.org/
 IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~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 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/skvadrik/re2c/releases/download/2.0.3/re2c-2.0.3.tar.xz
-_md5_=f5b24e3722f5da3a4fc226ccddb0fcf8
+_md5_=a7046a0ed7941e26c4264b381babe35d
diff --git a/metadata/md5-cache/dev-util/rocm-cmake-3.8.0 b/metadata/md5-cache/dev-util/rocm-cmake-3.8.0
index c30f976f2e11..224b363eab8e 100644
--- a/metadata/md5-cache/dev-util/rocm-cmake-3.8.0
+++ b/metadata/md5-cache/dev-util/rocm-cmake-3.8.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-3.8.0.tar.gz -> rocm-cmake-3.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4afe92216ba4629086d6ee99cba7822
diff --git a/metadata/md5-cache/dev-util/rocm-cmake-9999 b/metadata/md5-cache/dev-util/rocm-cmake-9999
index 67bedf534eb6..645e3894b847 100644
--- a/metadata/md5-cache/dev-util/rocm-cmake-9999
+++ b/metadata/md5-cache/dev-util/rocm-cmake-9999
@@ -7,5 +7,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4afe92216ba4629086d6ee99cba7822
diff --git a/metadata/md5-cache/dev-util/rocminfo-3.7.0 b/metadata/md5-cache/dev-util/rocminfo-3.7.0
index a4bb58eab44a..53b8a353a092 100644
--- a/metadata/md5-cache/dev-util/rocminfo-3.7.0
+++ b/metadata/md5-cache/dev-util/rocminfo-3.7.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocr-runtime-3.7.0
 SLOT=0/3.7
 SRC_URI=https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-3.7.0.tar.gz -> rocminfo-3.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d0d8c64fa517c59629ad465d5371579
diff --git a/metadata/md5-cache/dev-util/rocminfo-3.8.0 b/metadata/md5-cache/dev-util/rocminfo-3.8.0
index 896cbe809c59..560fc4ad0355 100644
--- a/metadata/md5-cache/dev-util/rocminfo-3.8.0
+++ b/metadata/md5-cache/dev-util/rocminfo-3.8.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/rocr-runtime-3.8.0
 SLOT=0/3.8
 SRC_URI=https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-3.8.0.tar.gz -> rocminfo-3.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d0d8c64fa517c59629ad465d5371579
diff --git a/metadata/md5-cache/dev-util/rocminfo-9999 b/metadata/md5-cache/dev-util/rocminfo-9999
index 58fc2d6ef766..afa0ae5fcc36 100644
--- a/metadata/md5-cache/dev-util/rocminfo-9999
+++ b/metadata/md5-cache/dev-util/rocminfo-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/rocr-runtime
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d737a02c4cfcfca9884db1bdcc64a18
diff --git a/metadata/md5-cache/dev-util/rustup-1.22.1-r1 b/metadata/md5-cache/dev-util/rustup-1.22.1-r1
index abff77d95bec..4fc2e0ee2886 100644
--- a/metadata/md5-cache/dev-util/rustup-1.22.1-r1
+++ b/metadata/md5-cache/dev-util/rustup-1.22.1-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/xz-utils net-misc/curl:=[http2,ssl] dev-libs/openssl:0=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rust-lang/rustup/archive/1.22.1.tar.gz -> rustup-1.22.1.tar.gz https://github.com/rbtcollins/home/archive/a243ee2fbee6022c57d56f5aa79aefe194eabe53.tar.gz -> rustup-1.22.1_home_crate.tar.gz https://crates.io/api/v1/crates/addr2line/0.12.2/download -> addr2line-0.12.2.crate https://crates.io/api/v1/crates/adler32/1.1.0/download -> adler32-1.1.0.crate https://crates.io/api/v1/crates/aes/0.3.2/download -> aes-0.3.2.crate https://crates.io/api/v1/crates/aes-soft/0.3.3/download -> aes-soft-0.3.3.crate https://crates.io/api/v1/crates/aesni/0.6.0/download -> aesni-0.6.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/async-compression/0.3.5/download -> async-compression-0.3.5.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.49/download -> backtrace-0.3.49.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/bitfield/0.13.2/download -> bitfield-0.13.2.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-cipher-trait/0.6.2/download -> block-cipher-trait-0.6.2.crate https://crates.io/api/v1/crates/block-modes/0.3.3/download -> block-modes-0.3.3.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/blowfish/0.4.0/download -> blowfish-0.4.0.crate https://crates.io/api/v1/crates/buf_redux/0.8.4/download -> buf_redux-0.8.4.crate https://crates.io/api/v1/crates/bumpalo/3.4.0/download -> bumpalo-3.4.0.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bytes/0.5.5/download -> bytes-0.5.5.crate https://crates.io/api/v1/crates/cast5/0.6.0/download -> cast5-0.6.0.crate https://crates.io/api/v1/crates/cc/1.0.55/download -> cc-1.0.55.crate https://crates.io/api/v1/crates/cfb-mode/0.3.2/download -> cfb-mode-0.3.2.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.11/download -> chrono-0.4.11.crate https://crates.io/api/v1/crates/circular/0.3.0/download -> circular-0.3.0.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/clear_on_drop/0.2.4/download -> clear_on_drop-0.2.4.crate https://crates.io/api/v1/crates/core-foundation/0.7.1/download -> core-foundation-0.7.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.1/download -> core-foundation-sys-0.7.1.crate https://crates.io/api/v1/crates/crc24/0.1.6/download -> crc24-0.1.6.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/curl/0.4.30/download -> curl-0.4.30.crate https://crates.io/api/v1/crates/curl-sys/0.4.32+curl-7.70.0/download -> curl-sys-0.4.32+curl-7.70.0.crate https://crates.io/api/v1/crates/curve25519-dalek/2.1.0/download -> curve25519-dalek-2.1.0.crate https://crates.io/api/v1/crates/darling/0.10.2/download -> darling-0.10.2.crate https://crates.io/api/v1/crates/darling_core/0.10.2/download -> darling_core-0.10.2.crate https://crates.io/api/v1/crates/darling_macro/0.10.2/download -> darling_macro-0.10.2.crate https://crates.io/api/v1/crates/derive_builder/0.9.0/download -> derive_builder-0.9.0.crate https://crates.io/api/v1/crates/derive_builder_core/0.9.0/download -> derive_builder_core-0.9.0.crate https://crates.io/api/v1/crates/des/0.3.0/download -> des-0.3.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/dtoa/0.4.6/download -> dtoa-0.4.6.crate https://crates.io/api/v1/crates/ed25519-dalek/1.0.0-pre.3/download -> ed25519-dalek-1.0.0-pre.3.crate https://crates.io/api/v1/crates/effective-limits/0.5.1/download -> effective-limits-0.5.1.crate https://crates.io/api/v1/crates/encoding_rs/0.8.23/download -> encoding_rs-0.8.23.crate https://crates.io/api/v1/crates/env_proxy/0.4.1/download -> env_proxy-0.4.1.crate https://crates.io/api/v1/crates/error-chain/0.12.2/download -> error-chain-0.12.2.crate https://crates.io/api/v1/crates/failure/0.1.8/download -> failure-0.1.8.crate https://crates.io/api/v1/crates/failure_derive/0.1.8/download -> failure_derive-0.1.8.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/filetime/0.2.10/download -> filetime-0.2.10.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures-channel/0.3.5/download -> futures-channel-0.3.5.crate https://crates.io/api/v1/crates/futures-core/0.3.5/download -> futures-core-0.3.5.crate https://crates.io/api/v1/crates/futures-io/0.3.5/download -> futures-io-0.3.5.crate https://crates.io/api/v1/crates/futures-sink/0.3.5/download -> futures-sink-0.3.5.crate https://crates.io/api/v1/crates/futures-task/0.3.5/download -> futures-task-0.3.5.crate https://crates.io/api/v1/crates/futures-util/0.3.5/download -> futures-util-0.3.5.crate https://crates.io/api/v1/crates/generator/0.6.21/download -> generator-0.6.21.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gimli/0.21.0/download -> gimli-0.21.0.crate https://crates.io/api/v1/crates/git-testament/0.1.9/download -> git-testament-0.1.9.crate https://crates.io/api/v1/crates/git-testament-derive/0.1.10/download -> git-testament-derive-0.1.10.crate https://crates.io/api/v1/crates/h2/0.2.5/download -> h2-0.2.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.14/download -> hermit-abi-0.1.14.crate https://crates.io/api/v1/crates/hex/0.4.2/download -> hex-0.4.2.crate https://crates.io/api/v1/crates/http/0.2.1/download -> http-0.2.1.crate https://crates.io/api/v1/crates/http-body/0.3.1/download -> http-body-0.3.1.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/hyper/0.13.6/download -> hyper-0.13.6.crate https://crates.io/api/v1/crates/hyper-tls/0.4.1/download -> hyper-tls-0.4.1.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.4.0/download -> indexmap-1.4.0.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/js-sys/0.3.40/download -> js-sys-0.3.40.crate https://crates.io/api/v1/crates/keccak/0.1.0/download -> keccak-0.1.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.71/download -> libc-0.2.71.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/loom/0.3.4/download -> loom-0.3.4.crate https://crates.io/api/v1/crates/lzma-sys/0.1.16/download -> lzma-sys-0.1.16.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/md-5/0.8.0/download -> md-5-0.8.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.3/download -> mime_guess-2.0.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/native-tls/0.2.4/download -> native-tls-0.2.4.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/num-bigint-dig/0.6.0/download -> num-bigint-dig-0.6.0.crate https://crates.io/api/v1/crates/num-derive/0.3.0/download -> num-derive-0.3.0.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.crate https://crates.io/api/v1/crates/num-iter/0.1.41/download -> num-iter-0.1.41.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/object/0.20.0/download -> object-0.20.0.crate https://crates.io/api/v1/crates/once_cell/1.4.0/download -> once_cell-1.4.0.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/opener/0.4.1/download -> opener-0.4.1.crate https://crates.io/api/v1/crates/openssl/0.10.30/download -> openssl-0.10.30.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.58/download -> openssl-sys-0.9.58.crate https://crates.io/api/v1/crates/openssl-src/111.10.0+1.1.1g/download -> openssl-src-111.10.0+1.1.1g.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pgp/0.5.2/download -> pgp-0.5.2.crate https://crates.io/api/v1/crates/pin-project/0.4.22/download -> pin-project-0.4.22.crate https://crates.io/api/v1/crates/pin-project-internal/0.4.22/download -> pin-project-internal-0.4.22.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.7/download -> pin-project-lite-0.1.7.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.8/download -> ppv-lite86-0.2.8.crate https://crates.io/api/v1/crates/proc-macro2/1.0.18/download -> proc-macro2-1.0.18.crate https://crates.io/api/v1/crates/pulldown-cmark/0.7.1/download -> pulldown-cmark-0.7.1.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.10.6/download -> reqwest-0.10.6.crate https://crates.io/api/v1/crates/retry/1.0.0/download -> retry-1.0.0.crate https://crates.io/api/v1/crates/ripemd160/0.8.0/download -> ripemd160-0.8.0.crate https://crates.io/api/v1/crates/rs_tracing/1.0.1/download -> rs_tracing-1.0.1.crate https://crates.io/api/v1/crates/rsa/0.2.0/download -> rsa-0.2.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scoped-tls/0.1.2/download -> scoped-tls-0.1.2.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/security-framework/0.4.4/download -> security-framework-0.4.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.4.3/download -> security-framework-sys-0.4.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.114/download -> serde-1.0.114.crate https://crates.io/api/v1/crates/serde_derive/1.0.114/download -> serde_derive-1.0.114.crate https://crates.io/api/v1/crates/serde_json/1.0.55/download -> serde_json-1.0.55.crate https://crates.io/api/v1/crates/serde_urlencoded/0.6.1/download -> serde_urlencoded-0.6.1.crate https://crates.io/api/v1/crates/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/sha2/0.8.2/download -> sha2-0.8.2.crate https://crates.io/api/v1/crates/sha3/0.8.2/download -> sha3-0.8.2.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.4.0/download -> smallvec-1.4.0.crate https://crates.io/api/v1/crates/socket2/0.3.12/download -> socket2-0.3.12.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/stream-cipher/0.3.2/download -> stream-cipher-0.3.2.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.9.3/download -> strsim-0.9.3.crate https://crates.io/api/v1/crates/subtle/2.2.3/download -> subtle-2.2.3.crate https://crates.io/api/v1/crates/syn/1.0.33/download -> syn-1.0.33.crate https://crates.io/api/v1/crates/synstructure/0.12.4/download -> synstructure-0.12.4.crate https://crates.io/api/v1/crates/sys-info/0.6.1/download -> sys-info-0.6.1.crate https://crates.io/api/v1/crates/tar/0.4.29/download -> tar-0.4.29.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term/0.5.1/download -> term-0.5.1.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.20/download -> thiserror-1.0.20.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.20/download -> thiserror-impl-1.0.20.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/0.3.3/download -> tinyvec-0.3.3.crate https://crates.io/api/v1/crates/tokio/0.2.21/download -> tokio-0.2.21.crate https://crates.io/api/v1/crates/tokio-tls/0.3.1/download -> tokio-tls-0.3.1.crate https://crates.io/api/v1/crates/tokio-util/0.3.1/download -> tokio-util-0.3.1.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/tower-service/0.3.0/download -> tower-service-0.3.0.crate https://crates.io/api/v1/crates/try-lock/0.2.2/download -> try-lock-0.2.2.crate https://crates.io/api/v1/crates/try_from/0.3.2/download -> try_from-0.3.2.crate https://crates.io/api/v1/crates/twofish/0.2.0/download -> twofish-0.2.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.13/download -> unicode-normalization-0.1.13.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.63/download -> wasm-bindgen-0.2.63.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.63/download -> wasm-bindgen-backend-0.2.63.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.13/download -> wasm-bindgen-futures-0.4.13.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.63/download -> wasm-bindgen-macro-0.2.63.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.63/download -> wasm-bindgen-macro-support-0.2.63.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.63/download -> wasm-bindgen-shared-0.2.63.crate https://crates.io/api/v1/crates/web-sys/0.3.40/download -> web-sys-0.3.40.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/winreg/0.7.0/download -> winreg-0.7.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x25519-dalek/0.6.0/download -> x25519-dalek-0.6.0.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/xz2/0.1.6/download -> xz2-0.1.6.crate https://crates.io/api/v1/crates/zeroize/1.1.0/download -> zeroize-1.1.0.crate https://crates.io/api/v1/crates/zeroize_derive/1.0.0/download -> zeroize_derive-1.0.0.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=84aee6ca1d7c49bb78a88e398f8cf7ab
diff --git a/metadata/md5-cache/dev-util/rustup-9999 b/metadata/md5-cache/dev-util/rustup-9999
index c2730d221cde..a5bdc42df34c 100644
--- a/metadata/md5-cache/dev-util/rustup-9999
+++ b/metadata/md5-cache/dev-util/rustup-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-arch/xz-utils net-misc/curl:=[http2,ssl] dev-libs/openssl:0=
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	16808adb27d34df9e5106842af29c73c	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=a8c2ce8030d3085ac7ef89bd761ed488
diff --git a/metadata/md5-cache/dev-util/sccache-0.2.13 b/metadata/md5-cache/dev-util/sccache-0.2.13
index 7bf4c068b11e..39205264d284 100644
--- a/metadata/md5-cache/dev-util/sccache-0.2.13
+++ b/metadata/md5-cache/dev-util/sccache-0.2.13
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT U
 RDEPEND=dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/openssl:0= ) dist-server? ( sys-apps/bubblewrap )
 SLOT=0
 SRC_URI=https://github.com/mozilla/sccache/archive/0.2.13.tar.gz -> sccache-0.2.13.tar.gz https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ar/0.6.2/download -> ar-0.6.2.crate https://crates.io/api/v1/crates/arc-swap/0.4.4/download -> arc-swap-0.4.4.crate https://crates.io/api/v1/crates/arrayref/0.3.5/download -> arrayref-0.3.5.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/ascii/0.8.7/download -> ascii-0.8.7.crate https://crates.io/api/v1/crates/ascii/0.9.3/download -> ascii-0.9.3.crate https://crates.io/api/v1/crates/assert_cmd/0.9.1/download -> assert_cmd-0.9.1.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/backtrace/0.3.40/download -> backtrace-0.3.40.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.32/download -> backtrace-sys-0.1.32.crate https://crates.io/api/v1/crates/base64/0.10.1/download -> base64-0.10.1.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/base64/0.9.3/download -> base64-0.9.3.crate https://crates.io/api/v1/crates/bincode/0.8.0/download -> bincode-0.8.0.crate https://crates.io/api/v1/crates/bincode/1.2.0/download -> bincode-1.2.0.crate https://crates.io/api/v1/crates/bincode/1.2.1/download -> bincode-1.2.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.9/download -> blake2b_simd-0.5.9.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/buf_redux/0.6.3/download -> buf_redux-0.6.3.crate https://crates.io/api/v1/crates/bufstream/0.1.4/download -> bufstream-0.1.4.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/bytes/0.4.12/download -> bytes-0.4.12.crate https://crates.io/api/v1/crates/c2-chacha/0.2.3/download -> c2-chacha-0.2.3.crate https://crates.io/api/v1/crates/case/0.1.0/download -> case-0.1.0.crate https://crates.io/api/v1/crates/cc/1.0.48/download -> cc-1.0.48.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.10/download -> chrono-0.4.10.crate https://crates.io/api/v1/crates/chunked_transfer/0.3.1/download -> chunked_transfer-0.3.1.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/combine/3.8.1/download -> combine-3.8.1.crate https://crates.io/api/v1/crates/conhash/0.4.0/download -> conhash-0.4.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.4/download -> constant_time_eq-0.1.4.crate https://crates.io/api/v1/crates/cookie/0.12.0/download -> cookie-0.12.0.crate https://crates.io/api/v1/crates/cookie_store/0.7.0/download -> cookie_store-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/counted-array/0.1.2/download -> counted-array-0.1.2.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.2/download -> crossbeam-deque-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.0/download -> crossbeam-epoch-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.5.0/download -> crossbeam-utils-0.5.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.0/download -> crossbeam-utils-0.7.0.crate https://crates.io/api/v1/crates/crypto-mac/0.7.0/download -> crypto-mac-0.7.0.crate https://crates.io/api/v1/crates/daemonize/0.3.0/download -> daemonize-0.3.0.crate https://crates.io/api/v1/crates/derive-error/0.0.3/download -> derive-error-0.0.3.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/directories/1.0.2/download -> directories-1.0.2.crate https://crates.io/api/v1/crates/dirs/1.0.5/download -> dirs-1.0.5.crate https://crates.io/api/v1/crates/dtoa/0.4.4/download -> dtoa-0.4.4.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/encoding_rs/0.8.20/download -> encoding_rs-0.8.20.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/error-chain/0.11.0/download -> error-chain-0.11.0.crate https://crates.io/api/v1/crates/error-chain/0.12.1/download -> error-chain-0.12.1.crate https://crates.io/api/v1/crates/escargot/0.3.1/download -> escargot-0.3.1.crate https://crates.io/api/v1/crates/failure/0.1.6/download -> failure-0.1.6.crate https://crates.io/api/v1/crates/failure_derive/0.1.6/download -> failure_derive-0.1.6.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/filetime/0.1.15/download -> filetime-0.1.15.crate https://crates.io/api/v1/crates/filetime/0.2.8/download -> filetime-0.2.8.crate https://crates.io/api/v1/crates/flate2/1.0.13/download -> flate2-1.0.13.crate https://crates.io/api/v1/crates/float-cmp/0.4.0/download -> float-cmp-0.4.0.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.1.29/download -> futures-0.1.29.crate https://crates.io/api/v1/crates/futures-cpupool/0.1.8/download -> futures-cpupool-0.1.8.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.13/download -> getrandom-0.1.13.crate https://crates.io/api/v1/crates/h2/0.1.26/download -> h2-0.1.26.crate https://crates.io/api/v1/crates/hermit-abi/0.1.3/download -> hermit-abi-0.1.3.crate https://crates.io/api/v1/crates/hmac/0.7.1/download -> hmac-0.7.1.crate https://crates.io/api/v1/crates/http/0.1.21/download -> http-0.1.21.crate https://crates.io/api/v1/crates/http-body/0.1.0/download -> http-body-0.1.0.crate https://crates.io/api/v1/crates/httparse/1.3.4/download -> httparse-1.3.4.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/hyper/0.12.35/download -> hyper-0.12.35.crate https://crates.io/api/v1/crates/hyper-tls/0.3.2/download -> hyper-tls-0.3.2.crate https://crates.io/api/v1/crates/hyperx/0.12.0/download -> hyperx-0.12.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.3.0/download -> indexmap-1.3.0.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.7.11/download -> itertools-0.7.11.crate https://crates.io/api/v1/crates/itoa/0.3.4/download -> itoa-0.3.4.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/jobserver/0.1.19/download -> jobserver-0.1.19.crate https://crates.io/api/v1/crates/jsonwebtoken/6.0.1/download -> jsonwebtoken-6.0.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/language-tags/0.2.2/download -> language-tags-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/libmount/0.1.15/download -> libmount-0.1.15.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/linked-hash-map/0.2.1/download -> linked-hash-map-0.2.1.crate https://crates.io/api/v1/crates/local-encoding/0.2.0/download -> local-encoding-0.2.0.crate https://crates.io/api/v1/crates/lock_api/0.3.2/download -> lock_api-0.3.2.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lru-disk-cache/0.4.0/download -> lru-disk-cache-0.4.0.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/md-5/0.8.0/download -> md-5-0.8.0.crate https://crates.io/api/v1/crates/md5/0.3.8/download -> md5-0.3.8.crate https://crates.io/api/v1/crates/memcached-rs/0.3.0/download -> memcached-rs-0.3.0.crate https://crates.io/api/v1/crates/memchr/1.0.2/download -> memchr-1.0.2.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/mime/0.2.6/download -> mime-0.2.6.crate https://crates.io/api/v1/crates/mime/0.3.14/download -> mime-0.3.14.crate https://crates.io/api/v1/crates/mime_guess/1.8.7/download -> mime_guess-1.8.7.crate https://crates.io/api/v1/crates/mime_guess/2.0.1/download -> mime_guess-2.0.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.5/download -> miniz_oxide-0.3.5.crate https://crates.io/api/v1/crates/mio/0.6.21/download -> mio-0.6.21.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.7/download -> mio-uds-0.6.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/msdos_time/0.1.6/download -> msdos_time-0.1.6.crate https://crates.io/api/v1/crates/multipart/0.13.6/download -> multipart-0.13.6.crate https://crates.io/api/v1/crates/native-tls/0.2.3/download -> native-tls-0.2.3.crate https://crates.io/api/v1/crates/net2/0.2.33/download -> net2-0.2.33.crate https://crates.io/api/v1/crates/nix/0.11.1/download -> nix-0.11.1.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.2.2/download -> normalize-line-endings-0.2.2.crate https://crates.io/api/v1/crates/num-integer/0.1.41/download -> num-integer-0.1.41.crate https://crates.io/api/v1/crates/num-traits/0.1.43/download -> num-traits-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.10/download -> num-traits-0.2.10.crate https://crates.io/api/v1/crates/num_cpus/1.11.1/download -> num_cpus-1.11.1.crate https://crates.io/api/v1/crates/number_prefix/0.2.8/download -> number_prefix-0.2.8.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/openssl/0.10.26/download -> openssl-0.10.26.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.53/download -> openssl-sys-0.9.53.crate https://crates.io/api/v1/crates/parking_lot/0.9.0/download -> parking_lot-0.9.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.6.2/download -> parking_lot_core-0.6.2.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.7.24/download -> phf-0.7.24.crate https://crates.io/api/v1/crates/phf_codegen/0.7.24/download -> phf_codegen-0.7.24.crate https://crates.io/api/v1/crates/phf_generator/0.7.24/download -> phf_generator-0.7.24.crate https://crates.io/api/v1/crates/phf_shared/0.7.24/download -> phf_shared-0.7.24.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/podio/0.1.6/download -> podio-0.1.6.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/predicates/0.9.1/download -> predicates-0.9.1.crate https://crates.io/api/v1/crates/predicates-core/0.9.0/download -> predicates-core-0.9.0.crate https://crates.io/api/v1/crates/predicates-tree/0.9.0/download -> predicates-tree-0.9.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.6/download -> proc-macro2-1.0.6.crate https://crates.io/api/v1/crates/publicsuffix/1.5.4/download -> publicsuffix-1.5.4.crate https://crates.io/api/v1/crates/pulldown-cmark/0.0.3/download -> pulldown-cmark-0.0.3.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.5.6/download -> rand-0.5.6.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand/0.7.2/download -> rand-0.7.2.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_chacha/0.2.1/download -> rand_chacha-0.2.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redis/0.9.1/download -> redis-0.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_users/0.3.1/download -> redox_users-0.3.1.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/reqwest/0.9.22/download -> reqwest-0.9.22.crate https://crates.io/api/v1/crates/retry/0.4.0/download -> retry-0.4.0.crate https://crates.io/api/v1/crates/ring/0.14.6/download -> ring-0.14.6.crate https://crates.io/api/v1/crates/rouille/2.2.0/download -> rouille-2.2.0.crate https://crates.io/api/v1/crates/rust-argon2/0.5.1/download -> rust-argon2-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/safemem/0.2.0/download -> safemem-0.2.0.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/0.1.3/download -> same-file-0.1.3.crate https://crates.io/api/v1/crates/sccache/0.2.13/download -> sccache-0.2.13.crate https://crates.io/api/v1/crates/schannel/0.1.16/download -> schannel-0.1.16.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.crate https://crates.io/api/v1/crates/security-framework/0.3.4/download -> security-framework-0.3.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.3.3/download -> security-framework-sys-0.3.3.crate https://crates.io/api/v1/crates/selenium-rs/0.1.1/download -> selenium-rs-0.1.1.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.103/download -> serde-1.0.103.crate https://crates.io/api/v1/crates/serde_derive/1.0.103/download -> serde_derive-1.0.103.crate https://crates.io/api/v1/crates/serde_json/1.0.44/download -> serde_json-1.0.44.crate https://crates.io/api/v1/crates/serde_urlencoded/0.5.5/download -> serde_urlencoded-0.5.5.crate https://crates.io/api/v1/crates/sha-1/0.8.1/download -> sha-1-0.8.1.crate https://crates.io/api/v1/crates/sha1/0.6.0/download -> sha1-0.6.0.crate https://crates.io/api/v1/crates/sha2/0.8.0/download -> sha2-0.8.0.crate https://crates.io/api/v1/crates/signal-hook/0.1.12/download -> signal-hook-0.1.12.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/siphasher/0.2.3/download -> siphasher-0.2.3.crate https://crates.io/api/v1/crates/skeptic/0.4.0/download -> skeptic-0.4.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/0.6.13/download -> smallvec-0.6.13.crate https://crates.io/api/v1/crates/smallvec/1.0.0/download -> smallvec-1.0.0.crate https://crates.io/api/v1/crates/socket2/0.3.11/download -> socket2-0.3.11.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/string/0.2.1/download -> string-0.2.1.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.0/download -> strip-ansi-escapes-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/subtle/1.0.0/download -> subtle-1.0.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/1.0.11/download -> syn-1.0.11.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/syslog/4.0.1/download -> syslog-4.0.1.crate https://crates.io/api/v1/crates/tar/0.4.26/download -> tar-0.4.26.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term/0.5.2/download -> term-0.5.2.crate https://crates.io/api/v1/crates/termcolor/1.0.5/download -> termcolor-1.0.5.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/threadpool/1.7.1/download -> threadpool-1.7.1.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/tiny_http/0.6.2/download -> tiny_http-0.6.2.crate https://crates.io/api/v1/crates/tokio/0.1.22/download -> tokio-0.1.22.crate https://crates.io/api/v1/crates/tokio-buf/0.1.1/download -> tokio-buf-0.1.1.crate https://crates.io/api/v1/crates/tokio-codec/0.1.1/download -> tokio-codec-0.1.1.crate https://crates.io/api/v1/crates/tokio-current-thread/0.1.6/download -> tokio-current-thread-0.1.6.crate https://crates.io/api/v1/crates/tokio-executor/0.1.9/download -> tokio-executor-0.1.9.crate https://crates.io/api/v1/crates/tokio-fs/0.1.6/download -> tokio-fs-0.1.6.crate https://crates.io/api/v1/crates/tokio-io/0.1.12/download -> tokio-io-0.1.12.crate https://crates.io/api/v1/crates/tokio-named-pipes/0.1.0/download -> tokio-named-pipes-0.1.0.crate https://crates.io/api/v1/crates/tokio-process/0.2.4/download -> tokio-process-0.2.4.crate https://crates.io/api/v1/crates/tokio-reactor/0.1.11/download -> tokio-reactor-0.1.11.crate https://crates.io/api/v1/crates/tokio-serde/0.1.0/download -> tokio-serde-0.1.0.crate https://crates.io/api/v1/crates/tokio-serde-bincode/0.1.1/download -> tokio-serde-bincode-0.1.1.crate https://crates.io/api/v1/crates/tokio-signal/0.2.7/download -> tokio-signal-0.2.7.crate https://crates.io/api/v1/crates/tokio-sync/0.1.7/download -> tokio-sync-0.1.7.crate https://crates.io/api/v1/crates/tokio-tcp/0.1.3/download -> tokio-tcp-0.1.3.crate https://crates.io/api/v1/crates/tokio-threadpool/0.1.17/download -> tokio-threadpool-0.1.17.crate https://crates.io/api/v1/crates/tokio-timer/0.2.12/download -> tokio-timer-0.2.12.crate https://crates.io/api/v1/crates/tokio-udp/0.1.5/download -> tokio-udp-0.1.5.crate https://crates.io/api/v1/crates/tokio-uds/0.2.5/download -> tokio-uds-0.2.5.crate https://crates.io/api/v1/crates/toml/0.4.10/download -> toml-0.4.10.crate https://crates.io/api/v1/crates/tower/0.1.1/download -> tower-0.1.1.crate https://crates.io/api/v1/crates/tower-buffer/0.1.2/download -> tower-buffer-0.1.2.crate https://crates.io/api/v1/crates/tower-discover/0.1.0/download -> tower-discover-0.1.0.crate https://crates.io/api/v1/crates/tower-layer/0.1.0/download -> tower-layer-0.1.0.crate https://crates.io/api/v1/crates/tower-limit/0.1.1/download -> tower-limit-0.1.1.crate https://crates.io/api/v1/crates/tower-load-shed/0.1.0/download -> tower-load-shed-0.1.0.crate https://crates.io/api/v1/crates/tower-retry/0.1.0/download -> tower-retry-0.1.0.crate https://crates.io/api/v1/crates/tower-service/0.2.0/download -> tower-service-0.2.0.crate https://crates.io/api/v1/crates/tower-timeout/0.1.1/download -> tower-timeout-0.1.1.crate https://crates.io/api/v1/crates/tower-util/0.1.0/download -> tower-util-0.1.0.crate https://crates.io/api/v1/crates/tracing/0.1.10/download -> tracing-0.1.10.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.5/download -> tracing-attributes-0.1.5.crate https://crates.io/api/v1/crates/tracing-core/0.1.7/download -> tracing-core-0.1.7.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/try-lock/0.2.2/download -> try-lock-0.2.2.crate https://crates.io/api/v1/crates/try_from/0.3.2/download -> try_from-0.3.2.crate https://crates.io/api/v1/crates/twoway/0.1.8/download -> twoway-0.1.8.crate https://crates.io/api/v1/crates/typenum/1.11.2/download -> typenum-1.11.2.crate https://crates.io/api/v1/crates/unicase/1.4.2/download -> unicase-1.4.2.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.11/download -> unicode-normalization-0.1.11.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/unix_socket/0.5.0/download -> unix_socket-0.5.0.crate https://crates.io/api/v1/crates/unreachable/1.0.0/download -> unreachable-1.0.0.crate https://crates.io/api/v1/crates/untrusted/0.6.2/download -> untrusted-0.6.2.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url/2.1.0/download -> url-2.1.0.crate https://crates.io/api/v1/crates/utf8parse/0.1.1/download -> utf8parse-0.1.1.crate https://crates.io/api/v1/crates/uuid/0.7.4/download -> uuid-0.7.4.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version-compare/0.0.10/download -> version-compare-0.0.10.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vte/0.3.3/download -> vte-0.3.3.crate https://crates.io/api/v1/crates/walkdir/1.0.7/download -> walkdir-1.0.7.crate https://crates.io/api/v1/crates/want/0.2.0/download -> want-0.2.0.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/which/2.0.1/download -> which-2.0.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.2/download -> wincolor-1.0.2.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate https://crates.io/api/v1/crates/zip/0.4.2/download -> zip-0.4.2.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=376ab1c2eefe0b016899c2170dc5777e
diff --git a/metadata/md5-cache/dev-util/sccache-9999 b/metadata/md5-cache/dev-util/sccache-9999
index cb822a3f9fe5..920b47121d46 100644
--- a/metadata/md5-cache/dev-util/sccache-9999
+++ b/metadata/md5-cache/dev-util/sccache-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 ISC MIT U
 PROPERTIES=live
 RDEPEND=dist-server? ( dev-libs/openssl:0= ) gcs? ( dev-libs/openssl:0= ) dist-server? ( sys-apps/bubblewrap )
 SLOT=0
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e72ce04dd1e3c4711027bd62e56f9066
diff --git a/metadata/md5-cache/dev-util/schroot-1.6.10_p7 b/metadata/md5-cache/dev-util/schroot-1.6.10_p7
index 2003cb09bae7..fcb5471b30d7 100644
--- a/metadata/md5-cache/dev-util/schroot-1.6.10_p7
+++ b/metadata/md5-cache/dev-util/schroot-1.6.10_p7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.42.0:= >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/b
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/schroot/schroot_1.6.10.orig.tar.xz mirror://debian/pool/main/s/schroot/schroot_1.6.10-7.debian.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b1b554f69beeecf27f275c4c9ee258a
diff --git a/metadata/md5-cache/dev-util/scons-3.1.1 b/metadata/md5-cache/dev-util/scons-3.1.1
index 986792eeb153..14f1d118304b 100644
--- a/metadata/md5-cache/dev-util/scons-3.1.1
+++ b/metadata/md5-cache/dev-util/scons-3.1.1
@@ -1,16 +1,15 @@
 BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.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 unpack
-DEPEND=test? ( dev-libs/libxml2[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/lxml[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=Extensible Python-based build utility
 EAPI=7
 HOMEPAGE=http://www.scons.org/
-IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~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_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_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? ( test )
+RESTRICT=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 )
+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 )
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=06b2ad3db428aad019f4c3c4b13b91b1
+_md5_=e54f631a3f2ae4ec181ad7e2755adabe
diff --git a/metadata/md5-cache/dev-util/scons-3.1.2 b/metadata/md5-cache/dev-util/scons-3.1.2
index f97efdf2a62c..9329e9a47e8e 100644
--- a/metadata/md5-cache/dev-util/scons-3.1.2
+++ b/metadata/md5-cache/dev-util/scons-3.1.2
@@ -1,16 +1,15 @@
 BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-libs/libxml2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Extensible Python-based build utility
 EAPI=7
 HOMEPAGE=https://www.scons.org/
-IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~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_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=0
-SRC_URI=https://downloads.sourceforge.net/project/scons/scons/3.1.2/scons-3.1.2.tar.gz doc? ( https://www.scons.org/doc/3.1.2/PDF/scons-user.pdf -> scons-3.1.2-user.pdf https://www.scons.org/doc/3.1.2/HTML/scons-user.html -> scons-3.1.2-user.html ) test? ( https://github.com/scons/scons/archive/3.1.2.tar.gz -> scons-3.1.2.gh.tar.gz )
+SRC_URI=https://downloads.sourceforge.net/project/scons/scons/3.1.2/scons-3.1.2.tar.gz doc? ( https://www.scons.org/doc/3.1.2/PDF/scons-user.pdf -> scons-3.1.2-user.pdf https://www.scons.org/doc/3.1.2/HTML/scons-user.html -> scons-3.1.2-user.html )
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ad8c6a8446371f3cc6b749f60d3761a7
+_md5_=59e3b1da713f8a131f0516ade333c302
diff --git a/metadata/md5-cache/dev-util/scons-4.0.1 b/metadata/md5-cache/dev-util/scons-4.0.1
index d5cea3a8a7b2..682f19a649d3 100644
--- a/metadata/md5-cache/dev-util/scons-4.0.1
+++ b/metadata/md5-cache/dev-util/scons-4.0.1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-libs/libxml2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-libs/libxml2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Extensible Python-based build utility
 EAPI=7
 HOMEPAGE=https://www.scons.org/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/scons/scons/4.0.1/scons-4.0.1.tar.gz doc? ( https://www.scons.org/doc/4.0.1/PDF/scons-user.pdf -> scons-4.0.1-user.pdf https://www.scons.org/doc/4.0.1/HTML/scons-user.html -> scons-4.0.1-user.html ) test? ( https://github.com/scons/scons/archive/4.0.1.tar.gz -> scons-4.0.1.gh.tar.gz )
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=795007d59e539123d14577dce7a3008f
+_md5_=9cc6ffd1ede14bd7976f325fb06dceae
diff --git a/metadata/md5-cache/dev-util/serialtalk-1.2-r1 b/metadata/md5-cache/dev-util/serialtalk-1.2-r1
index 6cb2a817c5f8..58b816bda704 100644
--- a/metadata/md5-cache/dev-util/serialtalk-1.2-r1
+++ b/metadata/md5-cache/dev-util/serialtalk-1.2-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://github.com/BGO-OD/serialtalk/archive/v1.2.tar.gz -> serialtalk-1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af59a8c3e8a17ae3835a10d4f877a5cb
diff --git a/metadata/md5-cache/dev-util/serialtalk-9999 b/metadata/md5-cache/dev-util/serialtalk-9999
index 1200b9fa3459..33a4b6534fcd 100644
--- a/metadata/md5-cache/dev-util/serialtalk-9999
+++ b/metadata/md5-cache/dev-util/serialtalk-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/BGO-OD/serialtalk
 LICENSE=GPL-3+
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b8e7da6c2a9658ba37000d873192fcd0
diff --git a/metadata/md5-cache/dev-util/spirv-headers-9999 b/metadata/md5-cache/dev-util/spirv-headers-9999
index ed8476d20b3c..2ab65ddc5441 100644
--- a/metadata/md5-cache/dev-util/spirv-headers-9999
+++ b/metadata/md5-cache/dev-util/spirv-headers-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://www.khronos.org/registry/spir-v/ https://github.com/KhronosGrou
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e7bb892ad7d0675ac065ea4daa1353f
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0 b/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0
index fd09db404fd6..d713ca70521a 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v10.0.0.tar.gz -> spirv-llvm-translator-10.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d89d84f98eb95d9849435acc728fb57
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0_p20200909 b/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0_p20200909
index 17ca7315c5a2..05a5f2b14112 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0_p20200909
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0_p20200909
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=test
 SLOT=10
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/4f1a3270f2431aa98f1bff30d1a32c9d8f4729bf.tar.gz -> spirv-llvm-translator-10.0.0_p20200909.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bcb41517ded20932fe9eb029489bfcd1
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-9.0.1.1 b/metadata/md5-cache/dev-util/spirv-llvm-translator-9.0.1.1
index a18d766e8910..c070409c46c8 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-9.0.1.1
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-9.0.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( tools )
 RESTRICT=!test? ( test )
 SLOT=9
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v9.0.1-1.tar.gz -> spirv-llvm-translator-9.0.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbbcc0dcdb9f48b46f68582380741b29
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2020.3 b/metadata/md5-cache/dev-util/spirv-tools-2020.3
index a25761540733..191eea361de0 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-2020.3
+++ b/metadata/md5-cache/dev-util/spirv-tools-2020.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/v2020.3.tar.gz -> spirv-tools-2020.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4932201fd16d6775bec3d59da3b89317
diff --git a/metadata/md5-cache/dev-util/spirv-tools-9999 b/metadata/md5-cache/dev-util/spirv-tools-9999
index 78254bcf23cb..ddb521fc4543 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-9999
+++ b/metadata/md5-cache/dev-util/spirv-tools-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ad22353a6836c858b47d79d2a5eb578
diff --git a/metadata/md5-cache/dev-util/statifier-1.7.4 b/metadata/md5-cache/dev-util/statifier-1.7.4
deleted file mode 100644
index 3ae8a49ce989..000000000000
--- a/metadata/md5-cache/dev-util/statifier-1.7.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Statifier is a tool for creating portable, self-containing Linux executables
-EAPI=6
-HOMEPAGE=http://statifier.sourceforge.net
-IUSE=abi_x86_32 abi_x86_64
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-shells/bash sys-apps/coreutils virtual/awk
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
-SLOT=0
-SRC_URI=https://sourceforge.net/projects/statifier/files/statifier/1.7.4/statifier-1.7.4.tar.gz
-_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=785a13f6006df4938aa91a7aad20196b
diff --git a/metadata/md5-cache/dev-util/statifier-1.7.4-r1 b/metadata/md5-cache/dev-util/statifier-1.7.4-r1
index 5cb38fb60b65..00baf147ac47 100644
--- a/metadata/md5-cache/dev-util/statifier-1.7.4-r1
+++ b/metadata/md5-cache/dev-util/statifier-1.7.4-r1
@@ -3,11 +3,11 @@ DESCRIPTION=Statifier is a tool for creating portable, self-containing Linux exe
 EAPI=7
 HOMEPAGE=http://statifier.sourceforge.net
 IUSE=abi_x86_32 abi_x86_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-shells/bash sys-apps/coreutils virtual/awk
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/statifier/files/statifier/1.7.4/statifier-1.7.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1e51449929176907a46d9c2b6836862c
+_md5_=aa804441775eff034e206cf86cc0ba4b
diff --git a/metadata/md5-cache/dev-util/strace-5.3 b/metadata/md5-cache/dev-util/strace-5.3
deleted file mode 100644
index 957de427047f..000000000000
--- a/metadata/md5-cache/dev-util/strace-5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
-DESCRIPTION=A useful diagnostic, instructional, and debugging tool
-EAPI=7
-HOMEPAGE=https://strace.io/
-IUSE=aio perl static unwind elfutils
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
-REQUIRED_USE=?? ( unwind elfutils )
-SLOT=0
-SRC_URI=https://github.com/strace/strace/releases/download/v5.3/strace-5.3.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=56bca4daea4fe5c05ff6539718a7d565
diff --git a/metadata/md5-cache/dev-util/strace-5.7 b/metadata/md5-cache/dev-util/strace-5.7
deleted file mode 100644
index 801f2012115d..000000000000
--- a/metadata/md5-cache/dev-util/strace-5.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare test
-DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
-DESCRIPTION=A useful diagnostic, instructional, and debugging tool
-EAPI=7
-HOMEPAGE=https://strace.io/
-IUSE=aio perl static unwind elfutils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
-REQUIRED_USE=?? ( unwind elfutils )
-SLOT=0
-SRC_URI=https://github.com/strace/strace/releases/download/v5.7/strace-5.7.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c9f49a2a00a8dcb7a0932062a61ff396
diff --git a/metadata/md5-cache/dev-util/strace-5.9 b/metadata/md5-cache/dev-util/strace-5.9
new file mode 100644
index 000000000000..d98657d61d7d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/strace-5.9
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=7
+HOMEPAGE=https://strace.io/
+IUSE=aio perl static unwind elfutils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
+REQUIRED_USE=?? ( unwind elfutils )
+SLOT=0
+SRC_URI=https://github.com/strace/strace/releases/download/v5.9/strace-5.9.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1c6605f74ee7a8957e56ebd01aaf43d1
diff --git a/metadata/md5-cache/dev-util/sysdig-0.27.0 b/metadata/md5-cache/dev-util/sysdig-0.27.0
index 8cffcdc6c86f..53cc93169165 100644
--- a/metadata/md5-cache/dev-util/sysdig-0.27.0
+++ b/metadata/md5-cache/dev-util/sysdig-0.27.0
@@ -12,5 +12,5 @@ RDEPEND=app-misc/jq:0= dev-cpp/tbb:0= dev-lang/luajit:2= >=dev-libs/jsoncpp-0.6_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.27.0.tar.gz -> sysdig-0.27.0.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a9489fc8374cc2f55130d54c4505c81
diff --git a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.0 b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.0
index c68155df90b1..73ca590b21b2 100644
--- a/metadata/md5-cache/dev-util/sysdig-kmod-0.27.0
+++ b/metadata/md5-cache/dev-util/sysdig-kmod-0.27.0
@@ -10,5 +10,5 @@ LICENSE=|| ( MIT GPL-2 )
 RDEPEND=!<=dev-util/sysdig-0.26.4[modules] kernel_linux? ( sys-apps/kmod[tools] )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.27.0.tar.gz -> sysdig-0.27.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61741cb5f2da07566fea735d3cd01476
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.2.143 b/metadata/md5-cache/dev-util/vulkan-headers-1.2.143
index 0ff96743860a..8b09a50a8b55 100644
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.2.143
+++ b/metadata/md5-cache/dev-util/vulkan-headers-1.2.143
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.2.143.tar.gz -> vulkan-headers-1.2.143.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cefe1a80db5009216795add08daee616
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-9999 b/metadata/md5-cache/dev-util/vulkan-headers-9999
index 16805a2422b1..461e5783fa9c 100644
--- a/metadata/md5-cache/dev-util/vulkan-headers-9999
+++ b/metadata/md5-cache/dev-util/vulkan-headers-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
 LICENSE=Apache-2.0
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=edafc46f2b69f819003ec370fa097ed8
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.2.141 b/metadata/md5-cache/dev-util/vulkan-tools-1.2.141
index 178db1446441..5085a3eb0a0a 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.2.141
+++ b/metadata/md5-cache/dev-util/vulkan-tools-1.2.141
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/vulkan-loader-1.2.141:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 REQUIRED_USE=!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/v1.2.141.tar.gz -> vulkan-tools-1.2.141.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43950b69d903dd6f8533241a8e9a8c44
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-9999 b/metadata/md5-cache/dev-util/vulkan-tools-9999
index 21b66e56735d..d75e9cfb3dc0 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-9999
+++ b/metadata/md5-cache/dev-util/vulkan-tools-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=media-libs/vulkan-loader-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b41a6c72644954c543c7680894eb90f
diff --git a/metadata/md5-cache/dev-util/wasmer-0.11.0 b/metadata/md5-cache/dev-util/wasmer-0.11.0
index 58ffb09036f3..acea60693cb5 100644
--- a/metadata/md5-cache/dev-util/wasmer-0.11.0
+++ b/metadata/md5-cache/dev-util/wasmer-0.11.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=MIT Apache-2.0 BSD-2 ISC
 SLOT=0
 SRC_URI=https://github.com/wasmerio/wasmer/archive/0.11.0.tar.gz -> wasmer-0.11.0.tar.gz https://dev.gentoo.org/~williamh/dist/wasmer-0.11.0-git-deps.tar.xz https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/arrayref/0.3.5/download -> arrayref-0.3.5.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/bincode/1.2.0/download -> bincode-1.2.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.9/download -> blake2b_simd-0.5.9.crate https://crates.io/api/v1/crates/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/c2-chacha/0.2.3/download -> c2-chacha-0.2.3.crate https://crates.io/api/v1/crates/cargo_toml/0.6.4/download -> cargo_toml-0.6.4.crate https://crates.io/api/v1/crates/cast/0.2.2/download -> cast-0.2.2.crate https://crates.io/api/v1/crates/cbindgen/0.9.1/download -> cbindgen-0.9.1.crate https://crates.io/api/v1/crates/cc/1.0.47/download -> cc-1.0.47.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.42/download -> cmake-0.1.42.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.4/download -> constant_time_eq-0.1.4.crate https://crates.io/api/v1/crates/cranelift-bforest/0.44.0/download -> cranelift-bforest-0.44.0.crate https://crates.io/api/v1/crates/cranelift-codegen/0.44.0/download -> cranelift-codegen-0.44.0.crate https://crates.io/api/v1/crates/cranelift-codegen-meta/0.44.0/download -> cranelift-codegen-meta-0.44.0.crate https://crates.io/api/v1/crates/cranelift-codegen-shared/0.44.0/download -> cranelift-codegen-shared-0.44.0.crate https://crates.io/api/v1/crates/cranelift-entity/0.44.0/download -> cranelift-entity-0.44.0.crate https://crates.io/api/v1/crates/cranelift-native/0.44.0/download -> cranelift-native-0.44.0.crate https://crates.io/api/v1/crates/criterion/0.2.11/download -> criterion-0.2.11.crate https://crates.io/api/v1/crates/criterion-plot/0.3.1/download -> criterion-plot-0.3.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.2/download -> crossbeam-deque-0.7.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.0/download -> crossbeam-epoch-0.8.0.crate https://crates.io/api/v1/crates/crossbeam-queue/0.1.2/download -> crossbeam-queue-0.1.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.0/download -> crossbeam-utils-0.7.0.crate https://crates.io/api/v1/crates/csv/1.1.1/download -> csv-1.1.1.crate https://crates.io/api/v1/crates/csv-core/0.1.6/download -> csv-core-0.1.6.crate https://crates.io/api/v1/crates/ctor/0.1.12/download -> ctor-0.1.12.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/dynasm/0.5.1/download -> dynasm-0.5.1.crate https://crates.io/api/v1/crates/dynasmrt/0.5.1/download -> dynasmrt-0.5.1.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/enum-methods/0.0.8/download -> enum-methods-0.0.8.crate https://crates.io/api/v1/crates/erased-serde/0.3.9/download -> erased-serde-0.3.9.crate https://crates.io/api/v1/crates/errno/0.2.4/download -> errno-0.2.4.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.1/download -> errno-dragonfly-0.1.1.crate https://crates.io/api/v1/crates/failure/0.1.6/download -> failure-0.1.6.crate https://crates.io/api/v1/crates/failure_derive/0.1.6/download -> failure_derive-0.1.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/generational-arena/0.2.4/download -> generational-arena-0.2.4.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getrandom/0.1.13/download -> getrandom-0.1.13.crate https://crates.io/api/v1/crates/ghost/0.1.1/download -> ghost-0.1.1.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/goblin/0.0.24/download -> goblin-0.0.24.crate https://crates.io/api/v1/crates/heck/0.3.1/download -> heck-0.3.1.crate https://crates.io/api/v1/crates/hermit-abi/0.1.3/download -> hermit-abi-0.1.3.crate https://crates.io/api/v1/crates/hex/0.3.2/download -> hex-0.3.2.crate https://crates.io/api/v1/crates/indexmap/1.3.0/download -> indexmap-1.3.0.crate https://crates.io/api/v1/crates/inventory/0.1.4/download -> inventory-0.1.4.crate https://crates.io/api/v1/crates/inventory-impl/0.1.4/download -> inventory-impl-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.1/download -> itertools-0.8.1.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.65/download -> libc-0.2.65.crate https://crates.io/api/v1/crates/llvm-sys/80.1.1/download -> llvm-sys-80.1.1.crate https://crates.io/api/v1/crates/lock_api/0.3.1/download -> lock_api-0.3.1.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/md5/0.6.1/download -> md5-0.6.1.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/nix/0.15.0/download -> nix-0.15.0.crate https://crates.io/api/v1/crates/num_cpus/1.11.0/download -> num_cpus-1.11.0.crate https://crates.io/api/v1/crates/num-traits/0.2.8/download -> num-traits-0.2.8.crate https://crates.io/api/v1/crates/owning_ref/0.4.0/download -> owning_ref-0.4.0.crate https://crates.io/api/v1/crates/page_size/0.4.1/download -> page_size-0.4.1.crate https://crates.io/api/v1/crates/parking_lot/0.9.0/download -> parking_lot-0.9.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.6.2/download -> parking_lot_core-0.6.2.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.6/download -> proc-macro2-1.0.6.crate https://crates.io/api/v1/crates/proc-macro-error/0.2.6/download -> proc-macro-error-0.2.6.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand/0.7.2/download -> rand-0.7.2.crate https://crates.io/api/v1/crates/rand_chacha/0.2.1/download -> rand_chacha-0.2.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_xoshiro/0.1.0/download -> rand_xoshiro-0.1.0.crate https://crates.io/api/v1/crates/raw-cpuid/6.1.0/download -> raw-cpuid-6.1.0.crate https://crates.io/api/v1/crates/rayon/1.2.0/download -> rayon-1.2.0.crate https://crates.io/api/v1/crates/rayon-core/1.6.0/download -> rayon-core-1.6.0.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-automata/0.1.8/download -> regex-automata-0.1.8.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/scopeguard/1.0.0/download -> scopeguard-1.0.0.crate https://crates.io/api/v1/crates/scroll/0.9.2/download -> scroll-0.9.2.crate https://crates.io/api/v1/crates/scroll_derive/0.9.5/download -> scroll_derive-0.9.5.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.102/download -> serde-1.0.102.crate https://crates.io/api/v1/crates/serde-bench/0.0.7/download -> serde-bench-0.0.7.crate https://crates.io/api/v1/crates/serde_bytes/0.11.2/download -> serde_bytes-0.11.2.crate https://crates.io/api/v1/crates/serde_derive/1.0.102/download -> serde_derive-1.0.102.crate https://crates.io/api/v1/crates/serde_json/1.0.41/download -> serde_json-1.0.41.crate https://crates.io/api/v1/crates/smallvec/0.6.13/download -> smallvec-0.6.13.crate https://crates.io/api/v1/crates/stable_deref_trait/1.1.1/download -> stable_deref_trait-1.1.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/structopt/0.3.4/download -> structopt-0.3.4.crate https://crates.io/api/v1/crates/structopt-derive/0.3.4/download -> structopt-derive-0.3.4.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/0.15.44/download -> syn-0.15.44.crate https://crates.io/api/v1/crates/syn/1.0.8/download -> syn-1.0.8.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/synstructure/0.12.2/download -> synstructure-0.12.2.crate https://crates.io/api/v1/crates/target-lexicon/0.8.1/download -> target-lexicon-0.8.1.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/tinytemplate/1.0.2/download -> tinytemplate-1.0.2.crate https://crates.io/api/v1/crates/toml/0.4.10/download -> toml-0.4.10.crate https://crates.io/api/v1/crates/toml/0.5.5/download -> toml-0.5.5.crate https://crates.io/api/v1/crates/typenum/1.11.2/download -> typenum-1.11.2.crate https://crates.io/api/v1/crates/typetag/0.1.4/download -> typetag-0.1.4.crate https://crates.io/api/v1/crates/typetag-impl/0.1.4/download -> typetag-impl-0.1.4.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/wabt/0.9.2/download -> wabt-0.9.2.crate https://crates.io/api/v1/crates/wabt-sys/0.7.0/download -> wabt-sys-0.7.0.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/wasmer-clif-fork-frontend/0.44.0/download -> wasmer-clif-fork-frontend-0.44.0.crate https://crates.io/api/v1/crates/wasmer-clif-fork-wasm/0.44.0/download -> wasmer-clif-fork-wasm-0.44.0.crate https://crates.io/api/v1/crates/wasmparser/0.39.2/download -> wasmparser-0.39.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fa1992eb776e093e27babd674b29d8fe
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 3b90f73a1e40..2fd196f02bc6 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/fossil-2.12.1 b/metadata/md5-cache/dev-vcs/fossil-2.12.1
index ae2010704d2e..f5e95520c48d 100644
--- a/metadata/md5-cache/dev-vcs/fossil-2.12.1
+++ b/metadata/md5-cache/dev-vcs/fossil-2.12.1
@@ -4,7 +4,7 @@ DESCRIPTION=Simple, high-reliability, source control management, and more
 EAPI=7
 HOMEPAGE=https://www.fossil-scm.org/
 IUSE=debug fusefs json -miniz system-sqlite +ssl static tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ppc ppc64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/zlib || ( sys-libs/readline:0 dev-libs/libedit ) system-sqlite? ( >=dev-db/sqlite-3.33.0:3 ) ssl? ( dev-libs/openssl:0 ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=ssl? ( !miniz )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://fossil-scm.org/home/uv/fossil-src-2.12.1.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b8c9d75e8ccd4f464bcfabf123a59a74
+_md5_=b9a5522643611e18a3e6d8ee83d96edf
diff --git a/metadata/md5-cache/dev-vcs/git-2.23.3 b/metadata/md5-cache/dev-vcs/git-2.23.3
index 6fb50055d7f0..d91d83268f20 100644
--- a/metadata/md5-cache/dev-vcs/git-2.23.3
+++ b/metadata/md5-cache/dev-vcs/git-2.23.3
@@ -11,5 +11,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.23.3.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.23.3.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.23.3.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=95d0579ee867821c30623f946722d995
diff --git a/metadata/md5-cache/dev-vcs/git-2.24.3 b/metadata/md5-cache/dev-vcs/git-2.24.3
index 370149aba673..a2461ebbc10f 100644
--- a/metadata/md5-cache/dev-vcs/git-2.24.3
+++ b/metadata/md5-cache/dev-vcs/git-2.24.3
@@ -12,5 +12,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.24.3.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.24.3.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.24.3.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	848a95b01913ff6374bcb5eae09c52ba	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e511a25e99b4f03f4cab3303ed88cfd8
diff --git a/metadata/md5-cache/dev-vcs/git-2.25.4 b/metadata/md5-cache/dev-vcs/git-2.25.4
index e99e74833976..54d3a925988c 100644
--- a/metadata/md5-cache/dev-vcs/git-2.25.4
+++ b/metadata/md5-cache/dev-vcs/git-2.25.4
@@ -12,5 +12,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.25.4.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.25.4.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.25.4.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	848a95b01913ff6374bcb5eae09c52ba	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e511a25e99b4f03f4cab3303ed88cfd8
diff --git a/metadata/md5-cache/dev-vcs/git-2.26.2 b/metadata/md5-cache/dev-vcs/git-2.26.2
index c01595d681db..2fb945acc4a6 100644
--- a/metadata/md5-cache/dev-vcs/git-2.26.2
+++ b/metadata/md5-cache/dev-vcs/git-2.26.2
@@ -12,5 +12,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.26.2.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.26.2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.26.2.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	848a95b01913ff6374bcb5eae09c52ba	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e511a25e99b4f03f4cab3303ed88cfd8
diff --git a/metadata/md5-cache/dev-vcs/git-2.27.0 b/metadata/md5-cache/dev-vcs/git-2.27.0
index eef8933dbbbb..9a7da0effac7 100644
--- a/metadata/md5-cache/dev-vcs/git-2.27.0
+++ b/metadata/md5-cache/dev-vcs/git-2.27.0
@@ -12,5 +12,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.27.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.27.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.27.0.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	848a95b01913ff6374bcb5eae09c52ba	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=736e17fbd99ff705688df66683ec25fb
diff --git a/metadata/md5-cache/dev-vcs/git-2.28.0 b/metadata/md5-cache/dev-vcs/git-2.28.0
index 201735430f8a..b664930d91c2 100644
--- a/metadata/md5-cache/dev-vcs/git-2.28.0
+++ b/metadata/md5-cache/dev-vcs/git-2.28.0
@@ -12,5 +12,5 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.28.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.28.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.28.0.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	848a95b01913ff6374bcb5eae09c52ba	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=736e17fbd99ff705688df66683ec25fb
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index 3a8c27d481c4..7003efdfb87f 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -11,5 +11,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	848a95b01913ff6374bcb5eae09c52ba	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=736e17fbd99ff705688df66683ec25fb
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r1 b/metadata/md5-cache/dev-vcs/git-9999-r1
index 3a8c27d481c4..7003efdfb87f 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/metadata/md5-cache/dev-vcs/git-9999-r1
@@ -11,5 +11,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	848a95b01913ff6374bcb5eae09c52ba	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=736e17fbd99ff705688df66683ec25fb
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r2 b/metadata/md5-cache/dev-vcs/git-9999-r2
index 3a8c27d481c4..7003efdfb87f 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/metadata/md5-cache/dev-vcs/git-9999-r2
@@ -11,5 +11,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	848a95b01913ff6374bcb5eae09c52ba	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=736e17fbd99ff705688df66683ec25fb
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r3 b/metadata/md5-cache/dev-vcs/git-9999-r3
index 3a8c27d481c4..7003efdfb87f 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/metadata/md5-cache/dev-vcs/git-9999-r3
@@ -11,5 +11,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	848a95b01913ff6374bcb5eae09c52ba	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=736e17fbd99ff705688df66683ec25fb
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.3-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.3-r1
deleted file mode 100644
index 9d56e76864c1..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=contrib vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-2.3.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=779302a6682158b719b9bcab816a0d84
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
deleted file mode 100644
index 0e39a3f2ff89..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.5.3.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=77192b097e5c5611604709e8b9f8a211
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1
deleted file mode 100644
index 60fd03b473d3..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=77192b097e5c5611604709e8b9f8a211
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1-r1
deleted file mode 100644
index 37ac91513a52..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/Net-SSH-AuthorizedKeysFile dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c3dd1f4c10d5accd8fcbdd33856b0e28
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.1
deleted file mode 100644
index 27c1db6b4c73..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/Net-SSH-AuthorizedKeysFile dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c3dd1f4c10d5accd8fcbdd33856b0e28
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.2 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.2
deleted file mode 100644
index 23944703c40b..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/Net-SSH-AuthorizedKeysFile dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.2.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c3dd1f4c10d5accd8fcbdd33856b0e28
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.3 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.3
deleted file mode 100644
index 8ef59988353f..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ce8faa2ca3d3fcd0ea645686f502b8a
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4
deleted file mode 100644
index dfecd566c406..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.4.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ce8faa2ca3d3fcd0ea645686f502b8a
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3
deleted file mode 100644
index 3c5b7b265b5c..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ce8faa2ca3d3fcd0ea645686f502b8a
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3.2 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3.2
deleted file mode 100644
index 59c71ba35b52..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.3.2.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a58c4eeecd27cc98527e213efc13618d
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4
deleted file mode 100644
index 573d50611a2d..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.4.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a58c4eeecd27cc98527e213efc13618d
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1
deleted file mode 100644
index 91409326fcb3..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.4.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a58c4eeecd27cc98527e213efc13618d
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1-r1
deleted file mode 100644
index a1833f898cd1..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.4.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=70185dd5b0f8398dfe1464f12e29d9d9
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.5 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.5
deleted file mode 100644
index 6c15a8d4fce0..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.5.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=70185dd5b0f8398dfe1464f12e29d9d9
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6
deleted file mode 100644
index 403c67d84773..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.6.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5db7324a31716239a8d2db5fdff0ddfc
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1
deleted file mode 100644
index 499ee258e520..000000000000
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
-EAPI=5
-HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-IUSE=selinux tools vim-syntax
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.6.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5db7324a31716239a8d2db5fdff0ddfc
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-2.1.0 b/metadata/md5-cache/dev-vcs/kdesvn-2.1.0
index 08888b06cb1f..c11fadd7987e 100644
--- a/metadata/md5-cache/dev-vcs/kdesvn-2.1.0
+++ b/metadata/md5-cache/dev-vcs/kdesvn-2.1.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-vcs/subversion >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcodecs-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/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/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-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-apps/kdesdk-kioslaves:4[subversion(-)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdesvn/2.1.0/kdesvn-2.1.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4c107c8f82d549e0f91c86091baba98
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.2.2-r2 b/metadata/md5-cache/dev-vcs/mercurial-5.2.2-r2
index e274b591c7fb..c127bbc00eab 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.2.2-r2
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.2.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.2.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=397f4c9d52c973d7d00908a85d7e9ee0
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.3.2-r1 b/metadata/md5-cache/dev-vcs/mercurial-5.3.2-r1
index ed9abc6261ca..cdd5e8d8d161 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.3.2-r1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.3.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.3.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7f1b347e615d2c056f9dba086eb94455
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.4.2-r1 b/metadata/md5-cache/dev-vcs/mercurial-5.4.2-r1
index d92279824c59..189f0ee75052 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.4.2-r1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.4.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.4.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=acfe7b06bcb1420d288f2f71bdcc5f44
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.5.1-r1 b/metadata/md5-cache/dev-vcs/mercurial-5.5.1-r1
index b786d67661e0..abb8ccc904df 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.5.1-r1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.5.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.5.1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a7d1451be3bdf6b66f4dffb27f02b00d
diff --git a/metadata/md5-cache/dev-vcs/mercurial-9999 b/metadata/md5-cache/dev-vcs/mercurial-9999
index 84825985772d..a682b8d10be4 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-9999
@@ -11,5 +11,5 @@ RDEPEND=app-misc/ca-certificates dev-python/zstandard[python_targets_python3_6(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mercurial	d22fe98ea362174612a57c233239102f	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mercurial	d22fe98ea362174612a57c233239102f	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b5599b8e4ab3cc657eac87e159efd570
diff --git a/metadata/md5-cache/dev-vcs/qgit-2.9 b/metadata/md5-cache/dev-vcs/qgit-2.9
index 8008fa96191e..4f0f3a71d890 100644
--- a/metadata/md5-cache/dev-vcs/qgit-2.9
+++ b/metadata/md5-cache/dev-vcs/qgit-2.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-vcs/git !dev-vcs/qgit:2
 SLOT=0
 SRC_URI=https://github.com/tibirna/qgit/archive/qgit-2.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=434793ed7f8d60947501ae9cfde8f5c0
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.13.0-r2 b/metadata/md5-cache/dev-vcs/subversion-1.13.0-r2
deleted file mode 100644
index e401ce315a12..000000000000
--- a/metadata/md5-cache/dev-vcs/subversion-1.13.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) gnome-keyring? ( dev-libs/glib:2 app-crypt/libsecret sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!<sys-apps/sandbox-1.6 doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) java? ( >=virtual/jdk-1.8 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) perl? ( dev-lang/swig ) ruby? ( dev-lang/swig ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Advanced version control system
-EAPI=6
-HOMEPAGE=https://subversion.apache.org/
-IUSE=apache2 berkdb debug doc +dso extras gnome-keyring +http java kwallet nls perl ruby sasl test vim-syntax apache2 elibc_FreeBSD java
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Subversion GPL-2
-RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) gnome-keyring? ( dev-libs/glib:2 app-crypt/libsecret sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.8 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=test? ( !dso )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/subversion/subversion-1.13.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a73d87a97beb85885100ff8c38d66a86
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.14.0-r1 b/metadata/md5-cache/dev-vcs/subversion-1.14.0-r1
index c699840ab909..57e9227839ea 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.14.0-r1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.14.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced version control system
 EAPI=6
 HOMEPAGE=https://subversion.apache.org/
 IUSE=apache2 berkdb debug doc extras gnome-keyring java kwallet nls perl ruby sasl test apache2 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Subversion GPL-2
 RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= >=net-libs/serf-1.3.4 sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) gnome-keyring? ( dev-libs/glib:2 app-crypt/libsecret sys-apps/dbus ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( acct-group/apache acct-user/apache www-servers/apache[apache2_modules_dav] ) !apache2? ( acct-group/svnusers acct-user/svn ) java? ( >=virtual/jre-1.8 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.14.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5835e0e1768763e114763b6b1056e5c1
+_md5_=5d8e578c7d26e4765ab230ce3621ef70
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 630075e8ae42..0f3d6ea3019b 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/abuse-0.9_p20181213-r1 b/metadata/md5-cache/games-action/abuse-0.9_p20181213-r1
index fd5e9b3bf9e5..21ba36a21443 100644
--- a/metadata/md5-cache/games-action/abuse-0.9_p20181213-r1
+++ b/metadata/md5-cache/games-action/abuse-0.9_p20181213-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 public-domain WTFPL-2
 RDEPEND=>=media-libs/libsdl2-2.0.3[sound,video] media-libs/sdl2-mixer[midi,wav]
 SLOT=0
 SRC_URI=https://github.com/Xenoveritas/abuse/archive/42b6acd19af00689e8f34355e3b13323d8ea3f79.tar.gz -> abuse-0.9_p20181213.tar.gz http://abuse.zoy.org/raw-attachment/wiki/download/abuse-0.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aca3c49cee0bb80ca24f76dcb4f86138
diff --git a/metadata/md5-cache/games-action/astromenace-1.4.1-r1 b/metadata/md5-cache/games-action/astromenace-1.4.1-r1
index 46252d831f9a..3d6ffe68a6d8 100644
--- a/metadata/md5-cache/games-action/astromenace-1.4.1-r1
+++ b/metadata/md5-cache/games-action/astromenace-1.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 GPL-3+ CC-BY-SA-4.0 OFL-1.1
 RDEPEND=media-libs/freealut media-libs/freetype:2 media-libs/libogg media-libs/libsdl2[joystick,video] media-libs/libvorbis media-libs/openal virtual/glu virtual/opengl x11-libs/libXinerama
 SLOT=0
 SRC_URI=https://github.com/viewizard/astromenace/archive/v1.4.1.tar.gz -> astromenace-1.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51f4004b15aaf0d0ae3b256acd9b95f1
diff --git a/metadata/md5-cache/games-action/lugaru-20151204-r1 b/metadata/md5-cache/games-action/lugaru-20151204-r1
index acc62d646336..1d913cd583a3 100644
--- a/metadata/md5-cache/games-action/lugaru-20151204-r1
+++ b/metadata/md5-cache/games-action/lugaru-20151204-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ free-noncomm CC-BY-SA-3.0
 RDEPEND=media-libs/libpng:0= media-libs/libsdl:=[opengl,video] media-libs/libvorbis:= media-libs/openal:= sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl
 SLOT=0
 SRC_URI=mirror://gentoo/lugaru-20151204.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d6c44471ab5694d4622817e7d240f4d
diff --git a/metadata/md5-cache/games-action/minetest-5.3.0 b/metadata/md5-cache/games-action/minetest-5.3.0
index a9849a6564be..bf560b3931f5 100644
--- a/metadata/md5-cache/games-action/minetest-5.3.0
+++ b/metadata/md5-cache/games-action/minetest-5.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( client server )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/minetest/minetest/archive/5.3.0.tar.gz -> minetest-5.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5fbfe139ee2b14225ba614bf15f84a9
diff --git a/metadata/md5-cache/games-action/supertuxkart-1.1 b/metadata/md5-cache/games-action/supertuxkart-1.1
index 2c8e2c7a5f2c..4798c55927f6 100644
--- a/metadata/md5-cache/games-action/supertuxkart-1.1
+++ b/metadata/md5-cache/games-action/supertuxkart-1.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB
 RDEPEND=dev-libs/angelscript:= dev-libs/fribidi media-libs/freetype:2 media-libs/glew:0= media-libs/harfbuzz:= media-libs/libpng:0= media-libs/libvorbis media-libs/openal net-libs/enet:1.3= net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm nettle? ( dev-libs/nettle:= ) !nettle? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-1.0.1d:0= ) ) recorder? ( media-libs/libopenglrecorder ) wiimote? ( net-wireless/bluez )
 SLOT=0
 SRC_URI=mirror://sourceforge/supertuxkart/SuperTuxKart/1.1/supertuxkart-1.1-src.tar.xz mirror://gentoo/supertuxkart.png
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1319918561e7f1bb2096b516e607dc22
diff --git a/metadata/md5-cache/games-action/supertuxkart-1.2 b/metadata/md5-cache/games-action/supertuxkart-1.2
index 0facc3a726c4..11be64fd9514 100644
--- a/metadata/md5-cache/games-action/supertuxkart-1.2
+++ b/metadata/md5-cache/games-action/supertuxkart-1.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 public-domain ZLIB
 RDEPEND=dev-cpp/libmcpp sqlite? ( dev-db/sqlite:3 ) dev-libs/angelscript:= media-libs/freetype:2 media-libs/glew:0= media-libs/harfbuzz:= media-libs/libpng:0= media-libs/libsdl2 media-libs/libvorbis media-libs/openal net-libs/enet:1.3= net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm nettle? ( dev-libs/nettle:= ) !nettle? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-1.0.1d:0= ) ) recorder? ( media-libs/libopenglrecorder ) wiimote? ( net-wireless/bluez )
 SLOT=0
 SRC_URI=https://github.com/supertuxkart/stk-code/releases/download/1.2/SuperTuxKart-1.2-src.tar.xz mirror://gentoo/supertuxkart.png
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cdad0b0bdb71e10c3f4b45722b10323f
diff --git a/metadata/md5-cache/games-action/teeworlds-0.7.5 b/metadata/md5-cache/games-action/teeworlds-0.7.5
index c9abc2a440ed..351340a3389c 100644
--- a/metadata/md5-cache/games-action/teeworlds-0.7.5
+++ b/metadata/md5-cache/games-action/teeworlds-0.7.5
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=!dedicated? ( app-arch/bzip2:= media-libs/freetype media-libs/libsdl[X,sound,opengl,video] media-libs/pnglite media-sound/wavpack virtual/glu virtual/opengl x11-libs/libX11 ) dev-libs/openssl:0= sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/ktrace/gentoo-blobs/raw/master/teeworlds.png https://github.com/teeworlds/teeworlds/archive/0.7.5.tar.gz -> teeworlds-0.7.5.tar.gz https://github.com/teeworlds/teeworlds-maps/archive/1d3401a37a3334e311faf18a22aeff0e0ac9ee65.tar.gz -> teeworlds-0.7.5-maps.tar.gz https://github.com/teeworlds/teeworlds-translation/archive/4ba6f824e9c34565e61340d25bc8c3cc004d40fb.tar.gz -> teeworlds-0.7.5-translation.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb47c749a64b611aac0d7573adf462b3
diff --git a/metadata/md5-cache/games-action/violetland-0.5 b/metadata/md5-cache/games-action/violetland-0.5
index e514322397d1..84ce39535bc0 100644
--- a/metadata/md5-cache/games-action/violetland-0.5
+++ b/metadata/md5-cache/games-action/violetland-0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3 CC-BY-SA-3.0
 RDEPEND=dev-libs/boost:=[threads(+)] media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/ooxi/violetland/releases/download/0.5/violetland-0.5-source-with-dependencies.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef41908054c9cc7b57c1124d117d5c5b
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 4a414a2615ae..6cf82b14c357 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/blobby-1.0-r1 b/metadata/md5-cache/games-arcade/blobby-1.0-r1
index 88ec785d8775..1c55680da1d8 100644
--- a/metadata/md5-cache/games-arcade/blobby-1.0-r1
+++ b/metadata/md5-cache/games-arcade/blobby-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-games/physfs-2[zip] media-libs/libsdl2[sound,joystick,opengl,video] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/blobby/blobby2-linux-1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=419739c4a6330081d34fc481c038c6a0
diff --git a/metadata/md5-cache/games-arcade/commandergenius-2.4.0 b/metadata/md5-cache/games-arcade/commandergenius-2.4.0
index 8cd7801ebd86..c0736a3c5a4d 100644
--- a/metadata/md5-cache/games-arcade/commandergenius-2.4.0
+++ b/metadata/md5-cache/games-arcade/commandergenius-2.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v2.4.0/Commander-Genius-v2.4.0.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98dbb9013c4e3ae7d427cd98730d21b9
diff --git a/metadata/md5-cache/games-arcade/ninvaders-0.1.2 b/metadata/md5-cache/games-arcade/ninvaders-0.1.2
index b7dd668f6566..c5b192d07460 100644
--- a/metadata/md5-cache/games-arcade/ninvaders-0.1.2
+++ b/metadata/md5-cache/games-arcade/ninvaders-0.1.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/sf-refugees/ninvaders/archive/v0.1.2.tar.gz -> ninvaders-0.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c51779042ff308e92a19ad33a13eee62
diff --git a/metadata/md5-cache/games-arcade/oshu-2.0.1 b/metadata/md5-cache/games-arcade/oshu-2.0.1
index 750934dbccbd..bbec422ffe12 100644
--- a/metadata/md5-cache/games-arcade/oshu-2.0.1
+++ b/metadata/md5-cache/games-arcade/oshu-2.0.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3 CC-BY-NC-4.0
 RDEPEND=media-libs/libsdl2 media-libs/sdl2-image x11-libs/cairo x11-libs/pango media-video/ffmpeg:=
 SLOT=0
 SRC_URI=https://github.com/fmang/oshu/archive/2.0.1.tar.gz -> oshu-2.0.1.tar.gz osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> oshu-skin-v1.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=69137c7c3c3af0d599331b289629b42e
diff --git a/metadata/md5-cache/games-arcade/oshu-9999 b/metadata/md5-cache/games-arcade/oshu-9999
index 5048bc05524d..1494b608f61d 100644
--- a/metadata/md5-cache/games-arcade/oshu-9999
+++ b/metadata/md5-cache/games-arcade/oshu-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=media-libs/libsdl2 media-libs/sdl2-image x11-libs/cairo x11-libs/pango media-video/ffmpeg:=
 SLOT=0
 SRC_URI=osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> oshu-skin-v1.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=69137c7c3c3af0d599331b289629b42e
diff --git a/metadata/md5-cache/games-arcade/slimevolley-2.4.2-r1 b/metadata/md5-cache/games-arcade/slimevolley-2.4.2-r1
index b47708e47a7a..922b57e7c8d1 100644
--- a/metadata/md5-cache/games-arcade/slimevolley-2.4.2-r1
+++ b/metadata/md5-cache/games-arcade/slimevolley-2.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf virtual/libintl
 SLOT=0
 SRC_URI=http://downloads.tuxfamily.org/slime/v242/slimevolley_2.4.2.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c770e6b5bc105264e5958c5889ea5715
diff --git a/metadata/md5-cache/games-arcade/supertux-0.6.1.1 b/metadata/md5-cache/games-arcade/supertux-0.6.1.1
index 0624bcf7c73a..3f20d7be9225 100644
--- a/metadata/md5-cache/games-arcade/supertux-0.6.1.1
+++ b/metadata/md5-cache/games-arcade/supertux-0.6.1.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0
 RDEPEND=>=dev-games/physfs-3.0 dev-libs/boost:= media-libs/glew:= virtual/opengl media-libs/libvorbis media-libs/openal >=media-libs/libsdl2-2.0.1[joystick,video] >=media-libs/sdl2-image-2.0.0[png,jpeg] >=net-misc/curl-7.21.7
 SLOT=0
 SRC_URI=https://github.com/SuperTux/supertux/releases/download/v0.6.1.1/SuperTux-v0.6.1.1-Source.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=30a1d1ddb4d5c62f50b606193158945a
diff --git a/metadata/md5-cache/games-arcade/supertux-0.6.2 b/metadata/md5-cache/games-arcade/supertux-0.6.2
index a87c0359dca7..4ecd93e335a5 100644
--- a/metadata/md5-cache/games-arcade/supertux-0.6.2
+++ b/metadata/md5-cache/games-arcade/supertux-0.6.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0
 RDEPEND=>=dev-games/physfs-3.0 dev-libs/boost:= media-libs/glew:= virtual/opengl media-libs/libvorbis media-libs/openal >=media-libs/libsdl2-2.0.1[joystick,video] >=media-libs/sdl2-image-2.0.0[png,jpeg] >=net-misc/curl-7.21.7
 SLOT=0
 SRC_URI=https://github.com/SuperTux/supertux/releases/download/v0.6.2/SuperTux-v0.6.2-Source.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b016654deb8052ddacdb3182b9fa71b1
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index b67eed35fe2b..dae771c7b018 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/cockatrice-20190304-r1 b/metadata/md5-cache/games-board/cockatrice-20190304-r1
index 767551216d01..fffa786fc07e 100644
--- a/metadata/md5-cache/games-board/cockatrice-20190304-r1
+++ b/metadata/md5-cache/games-board/cockatrice-20190304-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 client? ( dev-libs/protobuf:= dev-qt/qtmultimedia:5 dev-qt/qtsvg:5 ) oracle? ( sys-libs/zlib ) server? ( dev-libs/protobuf:= dev-qt/qtsql:5 )
 SLOT=0
 SRC_URI=https://github.com/Cockatrice/Cockatrice/archive/2019-03-04-Release-2.7.0.tar.gz -> cockatrice-20190304.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c7d8faa476ebb443c696668a1bfd352
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index c39e47ecd655..296604031007 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/dolphin-5.0_p20200705 b/metadata/md5-cache/games-emulation/dolphin-5.0_p20200705
index 3bf6f5cfb1c2..6024127ddd8d 100644
--- a/metadata/md5-cache/games-emulation/dolphin-5.0_p20200705
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0_p20200705
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/hidapi:0= dev-libs/libfmt:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) media-libs/vulkan-loader
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/0dbe8fb2eaa608a6540df3d269648a596c29cf4b.tar.gz -> dolphin-5.0_p20200705.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=643281562fddf907497895164d61b4cc
diff --git a/metadata/md5-cache/games-emulation/dolphin-9999 b/metadata/md5-cache/games-emulation/dolphin-9999
index 08f61b8472c6..b7345204347c 100644
--- a/metadata/md5-cache/games-emulation/dolphin-9999
+++ b/metadata/md5-cache/games-emulation/dolphin-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/hidapi:0= dev-libs/libfmt:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) media-libs/vulkan-loader
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1544447f7197f01079d06b355a7303ce
diff --git a/metadata/md5-cache/games-emulation/hatari-2.2.1-r1 b/metadata/md5-cache/games-emulation/hatari-2.2.1-r1
index 4f17f7be97c1..c45fec6decf2 100644
--- a/metadata/md5-cache/games-emulation/hatari-2.2.1-r1
+++ b/metadata/md5-cache/games-emulation/hatari-2.2.1-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/hatari/2.2.1/hatari-2.2.1.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a4c17af432def64fe2164612c19776d
diff --git a/metadata/md5-cache/games-emulation/mgba-0.7.3 b/metadata/md5-cache/games-emulation/mgba-0.7.3
index ae110f286e76..4a0a2ddf58b9 100644
--- a/metadata/md5-cache/games-emulation/mgba-0.7.3
+++ b/metadata/md5-cache/games-emulation/mgba-0.7.3
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] elf? ( dev-libs/elfutils ) f
 REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/mgba-emu/mgba/archive/0.7.3.tar.gz -> mgba-0.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f7f962ee4865e34bde77adc3bb7c92f
diff --git a/metadata/md5-cache/games-emulation/mgba-0.8.2 b/metadata/md5-cache/games-emulation/mgba-0.8.2
index 7176099f2d15..d6ddacadd4fa 100644
--- a/metadata/md5-cache/games-emulation/mgba-0.8.2
+++ b/metadata/md5-cache/games-emulation/mgba-0.8.2
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] elf? ( dev-libs/elfutils ) f
 REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/mgba-emu/mgba/archive/0.8.2.tar.gz -> mgba-0.8.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3069ec3769f3b5d71b68103954233a3
diff --git a/metadata/md5-cache/games-emulation/mgba-0.8.3 b/metadata/md5-cache/games-emulation/mgba-0.8.3
index 0964a1c6e986..f05227e638b8 100644
--- a/metadata/md5-cache/games-emulation/mgba-0.8.3
+++ b/metadata/md5-cache/games-emulation/mgba-0.8.3
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] elf? ( dev-libs/elfutils ) f
 REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
 SRC_URI=https://github.com/mgba-emu/mgba/archive/0.8.3.tar.gz -> mgba-0.8.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=735d52643d9376f281959934c4132f09
diff --git a/metadata/md5-cache/games-emulation/mgba-9999 b/metadata/md5-cache/games-emulation/mgba-9999
index 1ddfd87de0d5..51c0ae72f83b 100644
--- a/metadata/md5-cache/games-emulation/mgba-9999
+++ b/metadata/md5-cache/games-emulation/mgba-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] elf? ( dev-libs/elfutils ) ffmpeg? ( media-video/ffmpeg:= ) opengl? ( media-libs/libglvnd ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=735d52643d9376f281959934c4132f09
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r2 b/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r2
index e48ed0e34016..77c771337374 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r2
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl[abi_x86_32(-),joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),X]
 SLOT=0
 SRC_URI=https://github.com/PCSX2/pcsx2/archive/v1.4.0.tar.gz -> pcsx2-1.4.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8476114de632d81b529b8c1cd8e4549
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.6.0 b/metadata/md5-cache/games-emulation/pcsx2-1.6.0
index 0b8323036cc2..aa88f8bb8189 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-1.6.0
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] dev-libs/libxml2:2[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] net-libs/libpcap[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:3[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] >=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
 SLOT=0
 SRC_URI=https://github.com/PCSX2/pcsx2/archive/v1.6.0.tar.gz -> pcsx2-1.6.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c086fb371f51b605c05bc11715b7a0b
diff --git a/metadata/md5-cache/games-emulation/pcsx2-9999 b/metadata/md5-cache/games-emulation/pcsx2-9999
index 43011ca83858..a3a7b0ed3028 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-9999
+++ b/metadata/md5-cache/games-emulation/pcsx2-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] dev-libs/libxml2:2[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] net-libs/libpcap[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:3[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] >=x11-libs/wxGTK-3.0.4-r301:3.0-gtk3[abi_x86_32(-),X]
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bdbf41183a7c9ea74b4a1f0c57673cc3
diff --git a/metadata/md5-cache/games-emulation/pcsxr-1.9.94_p20190306 b/metadata/md5-cache/games-emulation/pcsxr-1.9.94_p20190306
index 38f46cd29a3d..5e815af5b9ca 100644
--- a/metadata/md5-cache/games-emulation/pcsxr-1.9.94_p20190306
+++ b/metadata/md5-cache/games-emulation/pcsxr-1.9.94_p20190306
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 media-libs/libsdl2[joystick] sys-libs/zlib:= x11-libs/gt
 REQUIRED_USE=?? ( alsa openal oss pulseaudio sdl )
 SLOT=0
 SRC_URI=https://github.com/iCatButler/pcsxr/archive/62467b86871aee3d70c7445f3cb79f0858ec566e.tar.gz -> pcsxr-62467b86871aee3d70c7445f3cb79f0858ec566e.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d6f835b449f243bd7238c7801b4f997
diff --git a/metadata/md5-cache/games-emulation/pcsxr-9999 b/metadata/md5-cache/games-emulation/pcsxr-9999
index f495ebf7b907..f8c9daf98c88 100644
--- a/metadata/md5-cache/games-emulation/pcsxr-9999
+++ b/metadata/md5-cache/games-emulation/pcsxr-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 media-libs/libsdl2[joystick] sys-libs/zlib:= x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXtst x11-libs/libXv x11-libs/libXxf86vm virtual/libintl virtual/opengl archive? ( app-arch/libarchive:= ) alsa? ( media-libs/alsa-lib:= ) cdio? ( dev-libs/libcdio:= ) ccdda? ( >=media-video/ffmpeg-3:= ) openal? ( media-libs/openal:= ) pulseaudio? ( media-sound/pulseaudio:= ) sdl? ( media-libs/libsdl2:=[sound] )
 REQUIRED_USE=?? ( alsa openal oss pulseaudio sdl )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b843beecebd61e1728099da87755878d
diff --git a/metadata/md5-cache/games-emulation/vbam-2.1.4 b/metadata/md5-cache/games-emulation/vbam-2.1.4
index 26a4d785b757..8138c38bfc88 100644
--- a/metadata/md5-cache/games-emulation/vbam-2.1.4
+++ b/metadata/md5-cache/games-emulation/vbam-2.1.4
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-
 REQUIRED_USE=ffmpeg? ( wxwidgets ) openal? ( wxwidgets ) || ( sdl wxwidgets )
 SLOT=0
 SRC_URI=https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v2.1.4.tar.gz -> vbam-2.1.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8acf1dfab62922be87db1d493f3d4416
diff --git a/metadata/md5-cache/games-emulation/vbam-9999 b/metadata/md5-cache/games-emulation/vbam-9999
index 50d2982d7495..82e9a10a57ed 100644
--- a/metadata/md5-cache/games-emulation/vbam-9999
+++ b/metadata/md5-cache/games-emulation/vbam-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( ffmpeg? ( media-video/ffmpeg:= ) openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] )
 REQUIRED_USE=ffmpeg? ( wxwidgets ) openal? ( wxwidgets ) || ( sdl wxwidgets )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87821ef45f2cf3f9d65163b336046862
diff --git a/metadata/md5-cache/games-emulation/yabause-0.9.15 b/metadata/md5-cache/games-emulation/yabause-0.9.15
index b1d941ee2131..1b04a6aaed9c 100644
--- a/metadata/md5-cache/games-emulation/yabause-0.9.15
+++ b/metadata/md5-cache/games-emulation/yabause-0.9.15
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 sys-libs/zlib x11-libs/libXrandr x11-libs/libX11 openal? ( media-libs/openal ) opengl? ( dev-qt/qtopengl:5 media-libs/freeglut virtual/glu virtual/opengl ) sdl? ( media-libs/libsdl2[opengl?,video] )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/yabause/releases/0.9.15/yabause-0.9.15.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28e7b1cfc5fe6a1148b9e23291618804
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index fe668c1727c3..e8d8eaeef6df 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/devilutionx-1.0.0-r1 b/metadata/md5-cache/games-engines/devilutionx-1.0.0-r1
index 596c0241c9e2..5a68ba587bd3 100644
--- a/metadata/md5-cache/games-engines/devilutionx-1.0.0-r1
+++ b/metadata/md5-cache/games-engines/devilutionx-1.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=dev-libs/libsodium media-fonts/sil-charis media-libs/libsdl2[haptic] media-libs/sdl2-mixer media-libs/sdl2-ttf
 SLOT=0
 SRC_URI=https://github.com/diasurgical/devilutionX/archive/1.0.0.tar.gz -> devilutionx-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=820932a677b8a7f46aaf5142c51612b5
diff --git a/metadata/md5-cache/games-engines/devilutionx-1.0.1 b/metadata/md5-cache/games-engines/devilutionx-1.0.1
index e01022392a70..c8dcd3a60b58 100644
--- a/metadata/md5-cache/games-engines/devilutionx-1.0.1
+++ b/metadata/md5-cache/games-engines/devilutionx-1.0.1
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=dev-libs/libsodium media-fonts/sil-charis media-libs/libsdl2[haptic] media-libs/sdl2-mixer media-libs/sdl2-ttf
 SLOT=0
 SRC_URI=https://github.com/diasurgical/devilutionX/archive/1.0.1.tar.gz -> devilutionx-1.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=820932a677b8a7f46aaf5142c51612b5
diff --git a/metadata/md5-cache/games-engines/devilutionx-9999 b/metadata/md5-cache/games-engines/devilutionx-9999
index 548936736638..63fc621e1eab 100644
--- a/metadata/md5-cache/games-engines/devilutionx-9999
+++ b/metadata/md5-cache/games-engines/devilutionx-9999
@@ -9,5 +9,5 @@ LICENSE=public-domain
 PROPERTIES=live
 RDEPEND=dev-libs/libsodium media-fonts/sil-charis media-libs/libsdl2[haptic] media-libs/sdl2-mixer media-libs/sdl2-ttf
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d20590d2fdb2bdaf46e09b392173aea
diff --git a/metadata/md5-cache/games-engines/odamex-0.8.3 b/metadata/md5-cache/games-engines/odamex-0.8.3
index 22d72e87d7a5..4560d0df36f9 100644
--- a/metadata/md5-cache/games-engines/odamex-0.8.3
+++ b/metadata/md5-cache/games-engines/odamex-0.8.3
@@ -11,5 +11,5 @@ RDEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video]
 REQUIRED_USE=|| ( client master server )
 SLOT=0
 SRC_URI=mirror://sourceforge/odamex/Odamex/0.8.3/odamex-src-0.8.3.tar.bz2 -> odamex-0.8.3.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e4651030adadd0bb48d7dee548e0d1d
diff --git a/metadata/md5-cache/games-engines/openmw-0.46.0 b/metadata/md5-cache/games-engines/openmw-0.46.0
index a84e19bedef3..6731ce2f260b 100644
--- a/metadata/md5-cache/games-engines/openmw-0.46.0
+++ b/metadata/md5-cache/games-engines/openmw-0.46.0
@@ -11,5 +11,5 @@ RDEPEND=dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads] dev
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenMW/openmw/archive/openmw-0.46.0.tar.gz https://gitlab.com/OpenMW/openmw/-/merge_requests/163.patch -> openmw-0.46.0-floattest.patch
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4b0bd9225c706fd519c7da2e5d55b3b
diff --git a/metadata/md5-cache/games-engines/openmw-9999 b/metadata/md5-cache/games-engines/openmw-9999
index 77def9c1ca36..93d4ad75a999 100644
--- a/metadata/md5-cache/games-engines/openmw-9999
+++ b/metadata/md5-cache/games-engines/openmw-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-games/mygui dev-games/recastnavigation dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86:= virtual/opengl osg-fork? ( dev-games/openscenegraph-openmw:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) !osg-fork? ( >=dev-games/openscenegraph-3.5.5:=[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] ) qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=21ef3a8ea98d02753172b36b9221470a
diff --git a/metadata/md5-cache/games-engines/scummvm-2.2.0 b/metadata/md5-cache/games-engines/scummvm-2.2.0
index 57dfb4227586..47912668ab6b 100644
--- a/metadata/md5-cache/games-engines/scummvm-2.2.0
+++ b/metadata/md5-cache/games-engines/scummvm-2.2.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://scummvm.org/frs/scummvm/2.2.0/scummvm-2.2.0.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9856ef91ec7abfb1c6632c0662f9a704
+_md5_=3899f469a496201ca8fe539cf51c9112
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 2457fb1e7507..6744a9a2430a 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/doomsday-2.1.1-r1 b/metadata/md5-cache/games-fps/doomsday-2.1.1-r1
index 830de9413fef..419be2f0ea4e 100644
--- a/metadata/md5-cache/games-fps/doomsday-2.1.1-r1
+++ b/metadata/md5-cache/games-fps/doomsday-2.1.1-r1
@@ -11,5 +11,5 @@ PDEPEND=demo? ( games-fps/doom-data ) freedoom? ( games-fps/freedoom )
 RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5=[-gles2-only] dev-qt/qtnetwork:5= dev-qt/qtopengl:5= dev-qt/qtwidgets:5= dev-qt/qtx11extras:5= media-libs/assimp net-misc/curl sys-libs/zlib fmod? ( media-libs/fmod:1 ) fluidsynth? ( media-sound/fluidsynth:= ) openal? ( media-libs/openal ) tools? ( sys-libs/ncurses:0= )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/2.1.1/doomsday-2.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=156a7fc3733220945b33f7549a247abb
diff --git a/metadata/md5-cache/games-fps/gzdoom-4.3.3 b/metadata/md5-cache/games-fps/gzdoom-4.3.3
index bd3e7050426e..197dfe9da771 100644
--- a/metadata/md5-cache/games-fps/gzdoom-4.3.3
+++ b/metadata/md5-cache/games-fps/gzdoom-4.3.3
@@ -10,5 +10,5 @@ LICENSE=BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT non-free? ( Activision ChexQuest3
 RDEPEND=media-libs/libsdl2[opengl] media-libs/openal sys-libs/zlib virtual/jpeg:0 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) mpg123? ( media-sound/mpg123 ) sndfile? ( media-libs/libsndfile )
 SLOT=0
 SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.3.3.tar.gz -> gzdoom-4.3.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8fc358f3751cf889ff9d3fb18f481b58
diff --git a/metadata/md5-cache/games-fps/gzdoom-4.4.2 b/metadata/md5-cache/games-fps/gzdoom-4.4.2
index c1181c5aa0d0..40987e6715be 100644
--- a/metadata/md5-cache/games-fps/gzdoom-4.4.2
+++ b/metadata/md5-cache/games-fps/gzdoom-4.4.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT non-free? ( Activision C
 RDEPEND=app-arch/bzip2 media-libs/libsdl2[opengl] media-libs/openal media-libs/zmusic sys-libs/zlib virtual/jpeg:0 gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) )
 SLOT=0
 SRC_URI=https://github.com/coelckers/gzdoom/archive/g4.4.2.tar.gz -> gzdoom-4.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f14d39e990384e3a23cb9dc3677277b1
diff --git a/metadata/md5-cache/games-fps/prboom-plus-2.5.1.7.82 b/metadata/md5-cache/games-fps/prboom-plus-2.5.1.7.82
index 299f0a708d4f..f702b7db1752 100644
--- a/metadata/md5-cache/games-fps/prboom-plus-2.5.1.7.82
+++ b/metadata/md5-cache/games-fps/prboom-plus-2.5.1.7.82
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libsdl2[opengl?,joystick,sound,video] dumb? ( media-libs/dumb
 REQUIRED_USE=server? ( net )
 SLOT=0
 SRC_URI=http://deb.debian.org/debian/pool/main/p/prboom-plus/prboom-plus_2.5.1.7um+git82.orig.tar.gz -> prboom-plus-2.5.1.7.82.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93dbaf637f65280a294cbf1b84e047ad
diff --git a/metadata/md5-cache/games-kids/Manifest.gz b/metadata/md5-cache/games-kids/Manifest.gz
index 7254e2cb133f..8ac7d0dc1a41 100644
--- a/metadata/md5-cache/games-kids/Manifest.gz
+++ b/metadata/md5-cache/games-kids/Manifest.gz
diff --git a/metadata/md5-cache/games-kids/gcompris-0.97-r1 b/metadata/md5-cache/games-kids/gcompris-0.97-r1
index a88440da5d87..f9988e668797 100644
--- a/metadata/md5-cache/games-kids/gcompris-0.97-r1
+++ b/metadata/md5-cache/games-kids/gcompris-0.97-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwo
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gcompris.net/download/qt/src/gcompris-qt-0.97.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee770a82f0698d64922ae53b16f79706
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 2f7359927ec9..002f0bf773c5 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20190225 b/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20190225
index 88fc6beb5113..bbfe73090e3b 100644
--- a/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20190225
+++ b/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20190225
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://github.com/KDE/ksokoban/archive/317b1e70a87224c94cac85955a3d666a43527812.tar.gz -> ksokoban-0.5.0_pre20190225.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5028c144236249ef5a4698db25184163
diff --git a/metadata/md5-cache/games-puzzle/ksokoban-9999 b/metadata/md5-cache/games-puzzle/ksokoban-9999
index c28a70c0e291..871a11c4b511 100644
--- a/metadata/md5-cache/games-puzzle/ksokoban-9999
+++ b/metadata/md5-cache/games-puzzle/ksokoban-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d6ae4016932691794d6186647e5a752
diff --git a/metadata/md5-cache/games-puzzle/pingus-9999 b/metadata/md5-cache/games-puzzle/pingus-9999
index 64539119b4a8..860734d396ac 100644
--- a/metadata/md5-cache/games-puzzle/pingus-9999
+++ b/metadata/md5-cache/games-puzzle/pingus-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-libs/jsoncpp media-libs/libpng:0= media-libs/libsdl2[joystick,opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-mixer[mod] virtual/opengl
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8404daaa4b0a17cc8a0078a62976506
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 1d4ad4319197..f0666b0a7c90 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/mazesofmonad-1.0.9-r3 b/metadata/md5-cache/games-roguelike/mazesofmonad-1.0.9-r3
deleted file mode 100644
index a441f49502d5..000000000000
--- a/metadata/md5-cache/games-roguelike/mazesofmonad-1.0.9-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-libs/gmp-5:0= dev-libs/libffi:= >=dev-lang/ghc-7.4.1 >=dev-haskell/cabal-1.6 dev-haskell/hunit dev-haskell/mtl dev-haskell/random dev-haskell/regex-posix dev-haskell/time-locale-compat
-DESCRIPTION=Console-based roguelike Role Playing Game similar to nethack
-EAPI=6
-HOMEPAGE=https://github.com/JPMoresmau/MazesOfMonad https://hackage.haskell.org/package/MazesOfMonad
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-libs/gmp-5:0= dev-libs/libffi:=
-SLOT=0
-SRC_URI=https://hackage.haskell.org/package/MazesOfMonad-1.0.9/MazesOfMonad-1.0.9.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9d811f766c824399bb3c198127216ed7
diff --git a/metadata/md5-cache/games-roguelike/moria-5.7.12-r1 b/metadata/md5-cache/games-roguelike/moria-5.7.12-r1
index 074105da6a3e..b40bdf13f588 100644
--- a/metadata/md5-cache/games-roguelike/moria-5.7.12-r1
+++ b/metadata/md5-cache/games-roguelike/moria-5.7.12-r1
@@ -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.12.tar.gz -> moria-5.7.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=955a2c614a543b7da5d70ca44930501c
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index ce7fa8a75f25..ac7e5ef4e2fb 100644
--- a/metadata/md5-cache/games-rpg/Manifest.gz
+++ b/metadata/md5-cache/games-rpg/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/deponia-tcj-3.3.0156 b/metadata/md5-cache/games-rpg/deponia-tcj-3.3.0156
new file mode 100644
index 000000000000..6497ed5706d3
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/deponia-tcj-3.3.0156
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch prepare
+DESCRIPTION=The Complete Journey: The first three Deponia point-and-click adventures
+EAPI=7
+HOMEPAGE=https://www.daedalic.com/deponia
+KEYWORDS=-* ~amd64
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/libsdl2[opengl,video] media-libs/openal virtual/opengl
+RESTRICT=bindist fetch splitdebug strip
+SLOT=0
+SRC_URI=DeponiaTCJ_3.3.0156_Full_DEB_DE_EN_FR_IT_RU_PL_Daedalic_ESD.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=dd8c3981349ce0a046e64579310889ab
diff --git a/metadata/md5-cache/games-rpg/manaplus-1.8.12.8 b/metadata/md5-cache/games-rpg/manaplus-1.8.12.8
deleted file mode 100644
index 9140fe6cd6f8..000000000000
--- a/metadata/md5-cache/games-rpg/manaplus-1.8.12.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
-EAPI=7
-HOMEPAGE=http://manaplus.evolonline.org
-IUSE=mumble nls opengl pugixml +sdl2 test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://download.evolonline.org/manaplus/download/1.8.12.8/manaplus-1.8.12.8.tar.xz
-_md5_=279033b238057c603338d092dd40418d
diff --git a/metadata/md5-cache/games-rpg/manaplus-1.9.3.23 b/metadata/md5-cache/games-rpg/manaplus-1.9.3.23
index c496ec06aa80..b8884060786a 100644
--- a/metadata/md5-cache/games-rpg/manaplus-1.9.3.23
+++ b/metadata/md5-cache/games-rpg/manaplus-1.9.3.23
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install prepare test
 DEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf )
 DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
 EAPI=7
-HOMEPAGE=http://manaplus.evolonline.org
+HOMEPAGE=https://manaplus.org
 IUSE=mumble nls opengl pugixml +sdl2 test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
@@ -11,4 +11,4 @@ RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.evolonline.org/manaplus/download/1.9.3.23/manaplus-1.9.3.23.tar.xz
-_md5_=f4c413be87434b85ea241fc5557ac7df
+_md5_=2daa7e6bc4989b5925b73dc6291b052b
diff --git a/metadata/md5-cache/games-rpg/manaplus-9999 b/metadata/md5-cache/games-rpg/manaplus-9999
index 84a14ecbbeed..0b1e2b88afde 100644
--- a/metadata/md5-cache/games-rpg/manaplus-9999
+++ b/metadata/md5-cache/games-rpg/manaplus-9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install prepare test unpack
 DEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf ) virtual/pkgconfig nls? ( sys-devel/gettext )
 DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
 EAPI=7
-HOMEPAGE=http://manaplus.evolonline.org
+HOMEPAGE=https://manaplus.org
 IUSE=mumble nls opengl pugixml +sdl2 test
 LICENSE=GPL-2+
 PROPERTIES=live
@@ -11,4 +11,4 @@ RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=279033b238057c603338d092dd40418d
+_md5_=b4e0b622afb004e8f0d7222bcfb7ab4c
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 2f5ef04a21db..c22711672d4f 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.16.20.03-r1 b/metadata/md5-cache/games-server/bedrock-server-1.16.20.03-r1
deleted file mode 100644
index fdf66d5157c0..000000000000
--- a/metadata/md5-cache/games-server/bedrock-server-1.16.20.03-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
-EAPI=7
-HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* ~amd64
-LICENSE=Mojang
-RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 net-misc/curl[ssl]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.16.20.03.zip
-_md5_=98b7b87c8352e51e66b7ff8c793fc38e
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.16.40.02 b/metadata/md5-cache/games-server/bedrock-server-1.16.40.02
new file mode 100644
index 000000000000..d1e4004c85c6
--- /dev/null
+++ b/metadata/md5-cache/games-server/bedrock-server-1.16.40.02
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
+EAPI=7
+HOMEPAGE=https://www.minecraft.net/
+KEYWORDS=-* ~amd64
+LICENSE=Mojang
+RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 net-misc/curl[ssl]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.16.40.02.zip
+_md5_=98b7b87c8352e51e66b7ff8c793fc38e
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.16.2-r1 b/metadata/md5-cache/games-server/minecraft-server-1.16.2-r1
deleted file mode 100644
index 4c7fb4ec974e..000000000000
--- a/metadata/md5-cache/games-server/minecraft-server-1.16.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.2.0-r3
-DESCRIPTION=The official server for the sandbox video game
-EAPI=7
-HOMEPAGE=https://www.minecraft.net/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Mojang
-RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/dtach || ( >=virtual/jre-1.8 >=virtual/jdk-1.8 ) >=dev-java/java-config-2.2.0-r3
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://launcher.mojang.com/v1/objects/c5f6fb23c3876461d46ec380421e42b289789530/server.jar -> minecraft-server-1.16.2.jar
-_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=f5ddcdcbd42d6d997fcbd12b4a2d5416
diff --git a/metadata/md5-cache/games-server/minecraft-server-1.16.3 b/metadata/md5-cache/games-server/minecraft-server-1.16.3
new file mode 100644
index 000000000000..102eb1936ed2
--- /dev/null
+++ b/metadata/md5-cache/games-server/minecraft-server-1.16.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup unpack
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=The official server for the sandbox video game
+EAPI=7
+HOMEPAGE=https://www.minecraft.net/
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Mojang
+RDEPEND=acct-group/minecraft acct-user/minecraft app-misc/dtach || ( >=virtual/jre-1.8 >=virtual/jdk-1.8 ) >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://launcher.mojang.com/v1/objects/f02f4473dbf152c23d7d484952121db0b36698cb/server.jar -> minecraft-server-1.16.3.jar
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=60eafa73de8bc05ca489e057694b5541
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index ac945bc48b5b..d30fec436c4b 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/corsix-th-0.63 b/metadata/md5-cache/games-simulation/corsix-th-0.63
index f5b2f29a8009..50737198fae3 100644
--- a/metadata/md5-cache/games-simulation/corsix-th-0.63
+++ b/metadata/md5-cache/games-simulation/corsix-th-0.63
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:0 >=dev-lua/luafilesystem-1.5 >=dev-lua/lpeg-0.9 >=dev-lua/luasocket-3.0_rc1-r4 media-libs/libsdl2[opengl,video] sound? ( media-libs/sdl2-mixer[midi?] ) truetype? ( >=media-libs/freetype-2.5.3:2 ) videos? ( >=media-video/ffmpeg-2.2.3:0= )
 SLOT=0
 SRC_URI=https://github.com/CorsixTH/CorsixTH/archive/v0.63.tar.gz -> corsix-th-0.63.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=425afe99ef98d2ba53c4714b3cebb484
diff --git a/metadata/md5-cache/games-simulation/corsix-th-0.64 b/metadata/md5-cache/games-simulation/corsix-th-0.64
index 4821435f1ee6..528b67fde322 100644
--- a/metadata/md5-cache/games-simulation/corsix-th-0.64
+++ b/metadata/md5-cache/games-simulation/corsix-th-0.64
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:0 >=dev-lua/luafilesystem-1.5 >=dev-lua/lpeg-0.9 >=dev-lua/luasocket-3.0_rc1-r4 media-libs/libsdl2[opengl,video] sound? ( media-libs/sdl2-mixer[midi?] ) truetype? ( >=media-libs/freetype-2.5.3:2 ) videos? ( >=media-video/ffmpeg-2.2.3:0= )
 SLOT=0
 SRC_URI=https://github.com/CorsixTH/CorsixTH/archive/v0.64.tar.gz -> corsix-th-0.64.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a2c48967e9a667e6ececcee3e16c101
diff --git a/metadata/md5-cache/games-simulation/flightgear-2020.1.2 b/metadata/md5-cache/games-simulation/flightgear-2020.1.2
index b0e598f12590..16a09953b3bb 100644
--- a/metadata/md5-cache/games-simulation/flightgear-2020.1.2
+++ b/metadata/md5-cache/games-simulation/flightgear-2020.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-20
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/flightgear-2020.1.2.tar.bz2
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1919114dc83ad1e447703fcd4de12d89
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fb600b5455966d4d6685194e151e5386
diff --git a/metadata/md5-cache/games-simulation/flightgear-9999 b/metadata/md5-cache/games-simulation/flightgear-9999
index c9183a7238b2..be419d083eea 100644
--- a/metadata/md5-cache/games-simulation/flightgear-9999
+++ b/metadata/md5-cache/games-simulation/flightgear-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-9999
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f87c685dc35bbb19f3912fd861656ae
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.2.6 b/metadata/md5-cache/games-simulation/openrct2-0.2.6
deleted file mode 100644
index f11bc1a3ded9..000000000000
--- a/metadata/md5-cache/games-simulation/openrct2-0.2.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) twitch? ( net-misc/curl[ssl] ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) test? ( dev-cpp/gtest )
-DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
-EAPI=7
-HOMEPAGE=https://openrct2.org/
-IUSE=dedicated libressl +lightfx +opengl test +truetype twitch
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) twitch? ( net-misc/curl[ssl] ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.2.6.tar.gz -> openrct2-0.2.6.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.0.14/objects.zip -> openrct2-objects-1.0.14.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.9/replays.zip -> openrct2-replays-0.0.9.zip )
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e98ca263d15611b9149feeba1a4f3199
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.3.0 b/metadata/md5-cache/games-simulation/openrct2-0.3.0
index 2c98df7a19b8..d1b728b427d6 100644
--- a/metadata/md5-cache/games-simulation/openrct2-0.3.0
+++ b/metadata/md5-cache/games-simulation/openrct2-0.3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= n
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.3.0.tar.gz -> openrct2-0.3.0.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.0.16/objects.zip -> openrct2-objects-1.0.16.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.17/replays.zip -> openrct2-replays-0.0.17.zip )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c91c9defa58ffafd749b9aace588a925
diff --git a/metadata/md5-cache/games-simulation/openrct2-9999 b/metadata/md5-cache/games-simulation/openrct2-9999
index a6655daa9fec..464352f77479 100644
--- a/metadata/md5-cache/games-simulation/openrct2-9999
+++ b/metadata/md5-cache/games-simulation/openrct2-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= n
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenRCT2/objects/releases/download/v1.0.16/objects.zip -> openrct2-objects-1.0.16.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.17/replays.zip -> openrct2-replays-0.0.17.zip )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4b002b041058eace2a0907f3f6337a1
diff --git a/metadata/md5-cache/games-sports/Manifest.gz b/metadata/md5-cache/games-sports/Manifest.gz
index 56cd91ba0351..6ad0131a4f75 100644
--- a/metadata/md5-cache/games-sports/Manifest.gz
+++ b/metadata/md5-cache/games-sports/Manifest.gz
diff --git a/metadata/md5-cache/games-sports/xmoto-0.6.1-r1 b/metadata/md5-cache/games-sports/xmoto-0.6.1-r1
index 4604aaeb9916..b164aaae12d6 100644
--- a/metadata/md5-cache/games-sports/xmoto-0.6.1-r1
+++ b/metadata/md5-cache/games-sports/xmoto-0.6.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-games/ode[double-precision=] dev-lang/lua:0 dev-libs/libxdg-basedir dev-libs/libxml2 media-fonts/dejavu media-libs/libpng:0= media-libs/libsdl[joystick,opengl] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib:= virtual/jpeg:0 virtual/glu virtual/opengl nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://github.com/xmoto/xmoto/archive/0.6.1.tar.gz -> xmoto-0.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4d1df6c357c91f94519ee2708addbfeb
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index af87cf9e5968..fbe771bc8615 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/colobot-0.1.12 b/metadata/md5-cache/games-strategy/colobot-0.1.12
index f6c01033af87..e03977151b97 100644
--- a/metadata/md5-cache/games-strategy/colobot-0.1.12
+++ b/metadata/md5-cache/games-strategy/colobot-0.1.12
@@ -11,5 +11,5 @@ RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg me
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/colobot/colobot/archive/colobot-gold-0.1.12-alpha.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=362cd3deda587f7a85db0c53a970b297
diff --git a/metadata/md5-cache/games-strategy/colobot-9999 b/metadata/md5-cache/games-strategy/colobot-9999
index 21e6bab60fe1..2c41f8b89fce 100644
--- a/metadata/md5-cache/games-strategy/colobot-9999
+++ b/metadata/md5-cache/games-strategy/colobot-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools openal? ( media-libs/openal ) games-strategy/colobot-data
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6aa75e344afe78e827821138f3c784dd
diff --git a/metadata/md5-cache/games-strategy/colobot-data-0.1.12 b/metadata/md5-cache/games-strategy/colobot-data-0.1.12
index 8b283affcc33..d18fa6620d60 100644
--- a/metadata/md5-cache/games-strategy/colobot-data-0.1.12
+++ b/metadata/md5-cache/games-strategy/colobot-data-0.1.12
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://github.com/colobot/colobot-data/archive/colobot-gold-0.1.12-alpha.tar.gz -> colobot-gold-0.1.12-alpha.data.tar.gz music? ( https://colobot.info/files/music/colobot-music_ogg_0.1.12-alpha.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82a02b03d070c2db3ca33899989898f7
diff --git a/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r1 b/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r1
index 7f99335ffcb1..d9c793671f75 100644
--- a/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r1
+++ b/metadata/md5-cache/games-strategy/hedgewars-1.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 Apache-2.0 FDL-1.3
 RDEPEND=>=dev-games/physfs-3.0.1 dev-lang/lua:0= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libpng:0= media-libs/libsdl2:= media-libs/sdl2-image:= media-libs/sdl2-mixer:=[vorbis] media-libs/sdl2-net:= media-libs/sdl2-ttf:= sys-libs/zlib !x86? ( media-video/ffmpeg:= ) app-arch/xz-utils >=media-fonts/dejavu-2.28 media-fonts/wqy-zenhei
 SLOT=0
 SRC_URI=https://www.hedgewars.org/download/releases/hedgewars-src-1.0.0.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3bd10f881de84b4ef916a34e3e1bb1f4
diff --git a/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723 b/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723
index 7f4db8ab28f5..068e18e860cb 100644
--- a/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723
+++ b/metadata/md5-cache/games-strategy/s25rttr-0.9.0_pre20200723
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2 >=dev-lang/lua-5.1:= >=dev-libs/boost-1.73:0=[nls] >=medi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Return-To-The-Roots/s25client/archive/f0b97b120140c96bbeacae9c22633f899931db69.tar.gz -> s25client-f0b97b120140c96bbeacae9c22633f899931db69.tar.gz https://github.com/mat007/turtle/archive/9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz -> s25rttr-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz https://github.com/Return-To-The-Roots/languages/archive/6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz -> s25rttr-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz https://github.com/Return-To-The-Roots/libendian/archive/dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz -> s25rttr-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz https://github.com/Return-To-The-Roots/liblobby/archive/9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz -> s25rttr-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz https://github.com/Return-To-The-Roots/libsiedler2/archive/5cb9993a32504337c63fd894266991445e0dcd65.tar.gz -> s25rttr-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz https://github.com/Return-To-The-Roots/libutil/archive/6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz -> s25rttr-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz https://github.com/Return-To-The-Roots/mygettext/archive/b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz -> s25rttr-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz https://github.com/Return-To-The-Roots/s25edit/archive/677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz -> s25rttr-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz https://github.com/Return-To-The-Roots/s25maps/archive/5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz -> s25rttr-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz https://github.com/satoren/kaguya/archive/38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz -> s25rttr-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a50fd76a4e0700a9f41646f3b7bfd0f
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.13 b/metadata/md5-cache/games-strategy/wesnoth-1.14.13
index b3ca0c964b15..44331ed455f3 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.13
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.13
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.13.tar.gz -> wesnoth-1.14.13.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4cd4e05fb9ef5710345de62cb779af8a
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.14 b/metadata/md5-cache/games-strategy/wesnoth-1.14.14
index a27fcd07c7dd..eb6f5fd4ac99 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.14
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.14
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.14.tar.gz -> wesnoth-1.14.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4cd4e05fb9ef5710345de62cb779af8a
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.15.4 b/metadata/md5-cache/games-strategy/wesnoth-1.15.4
index 35bca7094106..b83f1318ec76 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.15.4
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.15.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/wesnoth acct-user/wesnoth >=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.15.4.tar.gz -> wesnoth-1.15.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4cd4e05fb9ef5710345de62cb779af8a
diff --git a/metadata/md5-cache/games-strategy/widelands-0.20-r1 b/metadata/md5-cache/games-strategy/widelands-0.20-r1
index 9a049ea4d260..48bdad6012a7 100644
--- a/metadata/md5-cache/games-strategy/widelands-0.20-r1
+++ b/metadata/md5-cache/games-strategy/widelands-0.20-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/boost-1.48:= dev-libs/icu:= media-libs/glew:0= media-libs/libglvnd media-libs/libpng:0= media-libs/libsdl2[video] media-libs/sdl2-image[jpeg,png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib:=[minizip]
 SLOT=0
 SRC_URI=https://launchpad.net/widelands/build20/build20/+download/widelands-build20.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b76768001bd4287e1d96d1888d3819f7
diff --git a/metadata/md5-cache/games-strategy/widelands-9999 b/metadata/md5-cache/games-strategy/widelands-9999
index 7b1db4a52a5a..4de01d00dd2c 100644
--- a/metadata/md5-cache/games-strategy/widelands-9999
+++ b/metadata/md5-cache/games-strategy/widelands-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=>=dev-libs/boost-1.48:= dev-libs/icu:= media-libs/glew:0= media-libs/libglvnd media-libs/libpng:0= media-libs/libsdl2[video] media-libs/sdl2-image[jpeg,png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf sys-libs/zlib:=[minizip]
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7a0866e78c555cba9d0d709eb61a3a1
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 8157f22f7c14..b9040820e967 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/gamemode-1.2 b/metadata/md5-cache/games-util/gamemode-1.2
deleted file mode 100644
index 49e854693b5d..000000000000
--- a/metadata/md5-cache/games-util/gamemode-1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst pretend test
-DEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DESCRIPTION=Optimise Linux system performance on demand
-EAPI=6
-HOMEPAGE=https://github.com/FeralInteractive/gamemode
-IUSE=abi_x86_32 abi_x86_64
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
-SLOT=0
-SRC_URI=https://github.com/FeralInteractive/gamemode/releases/download/1.2/gamemode-1.2.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=5f90faf8204f60e1c27e14533d03a2a0
diff --git a/metadata/md5-cache/games-util/gamemode-1.6 b/metadata/md5-cache/games-util/gamemode-1.6
new file mode 100644
index 000000000000..43e073b48780
--- /dev/null
+++ b/metadata/md5-cache/games-util/gamemode-1.6
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst pretend test
+DEPEND=acct-group/gamemode dev-libs/inih sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,systemd(+)=,elogind(-)=] sys-auth/polkit sys-libs/libcap
+DESCRIPTION=Optimise Linux system performance on demand
+EAPI=7
+HOMEPAGE=https://github.com/FeralInteractive/gamemode
+IUSE=systemd elogind abi_x86_32 abi_x86_64
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=acct-group/gamemode dev-libs/inih sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,systemd(+)=,elogind(-)=] sys-auth/polkit sys-libs/libcap
+REQUIRED_USE=^^ ( systemd elogind ) || ( abi_x86_32 abi_x86_64 )
+SLOT=0
+SRC_URI=https://github.com/FeralInteractive/gamemode/releases/download/1.6/gamemode-1.6.tar.xz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1f1b6af90cc66c47d88f9c2435a5f4b6
diff --git a/metadata/md5-cache/games-util/gamemode-9999 b/metadata/md5-cache/games-util/gamemode-9999
index 37490ef576bc..943969a58f11 100644
--- a/metadata/md5-cache/games-util/gamemode-9999
+++ b/metadata/md5-cache/games-util/gamemode-9999
@@ -1,13 +1,14 @@
+BDEPEND=>=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst pretend test unpack
-DEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=acct-group/gamemode dev-libs/inih sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,systemd(+)=,elogind(-)=] sys-auth/polkit sys-libs/libcap
 DESCRIPTION=Optimise Linux system performance on demand
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/FeralInteractive/gamemode
-IUSE=abi_x86_32 abi_x86_64
+IUSE=systemd elogind abi_x86_32 abi_x86_64
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+RDEPEND=acct-group/gamemode dev-libs/inih sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,systemd(+)=,elogind(-)=] sys-auth/polkit sys-libs/libcap
+REQUIRED_USE=^^ ( systemd elogind ) || ( abi_x86_32 abi_x86_64 )
 SLOT=0
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	git-r3	3e7ec3d6619213460c85e2aa48398441	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=5f90faf8204f60e1c27e14533d03a2a0
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1f1b6af90cc66c47d88f9c2435a5f4b6
diff --git a/metadata/md5-cache/games-util/lgogdownloader-3.7 b/metadata/md5-cache/games-util/lgogdownloader-3.7
index 5060186a39c1..b39b855fce82 100644
--- a/metadata/md5-cache/games-util/lgogdownloader-3.7
+++ b/metadata/md5-cache/games-util/lgogdownloader-3.7
@@ -10,5 +10,5 @@ LICENSE=WTFPL-2
 RDEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= >=net-misc/curl-7.32:0=[ssl] gui? ( dev-qt/qtwebengine:5=[widgets] )
 SLOT=0
 SRC_URI=https://sites.google.com/site/gogdownloader/lgogdownloader-3.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=48897bc85ab46ec8ef55445d31f805db
diff --git a/metadata/md5-cache/games-util/lgogdownloader-9999 b/metadata/md5-cache/games-util/lgogdownloader-9999
index 7a2fd8fe663d..8dfa104ad603 100644
--- a/metadata/md5-cache/games-util/lgogdownloader-9999
+++ b/metadata/md5-cache/games-util/lgogdownloader-9999
@@ -9,5 +9,5 @@ LICENSE=WTFPL-2
 PROPERTIES=live
 RDEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= >=net-misc/curl-7.32:0=[ssl] gui? ( dev-qt/qtwebengine:5=[widgets] )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5b9efdc6af2ddfdfe4a0a4feec573bc1
diff --git a/metadata/md5-cache/games-util/pyfa-2.22.1 b/metadata/md5-cache/games-util/pyfa-2.22.1
deleted file mode 100644
index 260768a1481d..000000000000
--- a/metadata/md5-cache/games-util/pyfa-2.22.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/zip
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=python_single_target_python3_6? ( >=dev-python/cryptography-2.3[python_targets_python3_6(-)] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/cryptography-2.3[python_targets_python3_7(-)] >=dev-python/logbook-1.0.0[python_targets_python3_7(-)] >=dev-python/pyyaml-5.1[python_targets_python3_7(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_7(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=7
-HOMEPAGE=https://github.com/pyfa-org/Pyfa
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ all-rights-reserved
-RDEPEND=python_single_target_python3_6? ( >=dev-python/cryptography-2.3[python_targets_python3_6(-)] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/cryptography-2.3[python_targets_python3_7(-)] >=dev-python/logbook-1.0.0[python_targets_python3_7(-)] >=dev-python/pyyaml-5.1[python_targets_python3_7(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_7(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/beautifulsoup-4.6.0[python_targets_python3_6(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_6(-)] >=dev-python/packaging-16.8[python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] >=dev-python/requests-2.0.0[python_targets_python3_6(-)] >=dev-python/roman-2.0.0[python_targets_python3_6(-)] >=dev-python/matplotlib-3.1.2[wxwidgets,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/beautifulsoup-4.6.0[python_targets_python3_7(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_7(-)] >=dev-python/packaging-16.8[python_targets_python3_7(-)] dev-python/python-dateutil[python_targets_python3_7(-)] >=dev-python/requests-2.0.0[python_targets_python3_7(-)] >=dev-python/roman-2.0.0[python_targets_python3_7(-)] >=dev-python/matplotlib-3.1.2[wxwidgets,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/beautifulsoup-4.6.0[python_targets_python3_8(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_8(-)] >=dev-python/packaging-16.8[python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] >=dev-python/requests-2.0.0[python_targets_python3_8(-)] >=dev-python/roman-2.0.0[python_targets_python3_8(-)] >=dev-python/matplotlib-3.1.2[wxwidgets,python_targets_python3_8(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.22.1.tar.gz -> pyfa-2.22.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d99cc57d014b7fd95ff3a644892fb0ce
diff --git a/metadata/md5-cache/games-util/pyfa-2.28.3 b/metadata/md5-cache/games-util/pyfa-2.28.3
new file mode 100644
index 000000000000..23c9d7f9d3d4
--- /dev/null
+++ b/metadata/md5-cache/games-util/pyfa-2.28.3
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/zip
+DEFINED_PHASES=install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( >=dev-python/cryptography-2.3[python_targets_python3_6(-)] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/cryptography-2.3[python_targets_python3_7(-)] >=dev-python/logbook-1.0.0[python_targets_python3_7(-)] >=dev-python/pyyaml-5.1[python_targets_python3_7(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_7(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
+EAPI=7
+HOMEPAGE=https://github.com/pyfa-org/Pyfa
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ all-rights-reserved
+RDEPEND=python_single_target_python3_6? ( >=dev-python/cryptography-2.3[python_targets_python3_6(-)] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/cryptography-2.3[python_targets_python3_7(-)] >=dev-python/logbook-1.0.0[python_targets_python3_7(-)] >=dev-python/pyyaml-5.1[python_targets_python3_7(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_7(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/cryptography-2.3[python_targets_python3_8(-)] >=dev-python/logbook-1.0.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)] >=dev-python/wxpython-4.0.6[webkit,python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/beautifulsoup-4.6.0[python_targets_python3_6(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_6(-)] >=dev-python/packaging-16.8[python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] >=dev-python/requests-2.0.0[python_targets_python3_6(-)] >=dev-python/roman-2.0.0[python_targets_python3_6(-)] >=dev-python/matplotlib-3.1.2[wxwidgets,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/beautifulsoup-4.6.0[python_targets_python3_7(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_7(-)] >=dev-python/packaging-16.8[python_targets_python3_7(-)] dev-python/python-dateutil[python_targets_python3_7(-)] >=dev-python/requests-2.0.0[python_targets_python3_7(-)] >=dev-python/roman-2.0.0[python_targets_python3_7(-)] >=dev-python/matplotlib-3.1.2[wxwidgets,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/beautifulsoup-4.6.0[python_targets_python3_8(-)] >=dev-python/markdown2-2.3.5[python_targets_python3_8(-)] >=dev-python/packaging-16.8[python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] >=dev-python/requests-2.0.0[python_targets_python3_8(-)] >=dev-python/roman-2.0.0[python_targets_python3_8(-)] >=dev-python/matplotlib-3.1.2[wxwidgets,python_targets_python3_8(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.28.3.tar.gz -> pyfa-2.28.3.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a1d1b06f317ef08b591ff84cbcac5008
diff --git a/metadata/md5-cache/games-util/qjoypad-4.3.1 b/metadata/md5-cache/games-util/qjoypad-4.3.1
index 49b1ef524763..772be2ba99c0 100644
--- a/metadata/md5-cache/games-util/qjoypad-4.3.1
+++ b/metadata/md5-cache/games-util/qjoypad-4.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev x11-libs/libxcb x11-libs/libXtst
 SLOT=0
 SRC_URI=https://github.com/panzi/qjoypad/archive/v4.3.1.tar.gz -> qjoypad-4.3.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9663c00bfe698639d98c2ed13f04190c
diff --git a/metadata/md5-cache/games-util/slade-3.1.12a b/metadata/md5-cache/games-util/slade-3.1.12a
index f0c43a6beaec..a512ec713df0 100644
--- a/metadata/md5-cache/games-util/slade-3.1.12a
+++ b/metadata/md5-cache/games-util/slade-3.1.12a
@@ -10,5 +10,5 @@ LICENSE=GPL-2 MIT
 RDEPEND=app-arch/bzip2:= dev-lang/lua:0 >=media-libs/dumb-2:= media-libs/freeimage[jpeg,png,tiff] media-libs/glew:0= media-libs/libsfml:= net-misc/curl sys-libs/zlib x11-libs/wxGTK:3.0-gtk3[gstreamer,opengl,webkit?,X] fluidsynth? ( media-sound/fluidsynth:= ) timidity? ( media-sound/timidity++ )
 SLOT=0
 SRC_URI=https://github.com/sirjuddington/SLADE/archive/3.1.12a.tar.gz -> slade-3.1.12a.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0923e3a9edce5855eeed4f427477ad6f
diff --git a/metadata/md5-cache/games-util/springlobby-0.269 b/metadata/md5-cache/games-util/springlobby-0.269
index 96ac8f6b7c4c..bb21cf6dae71 100644
--- a/metadata/md5-cache/games-util/springlobby-0.269
+++ b/metadata/md5-cache/games-util/springlobby-0.269
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/openssl:0= net-misc/curl sys-libs/zlib[minizip] x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/wxGTK:3.0[X] libnotify? ( x11-libs/libnotify ) sound? ( media-libs/alure media-libs/openal )
 SLOT=0
 SRC_URI=https://springlobby.springrts.com/dl/stable/springlobby-0.269.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c6f9d7aa74c47c27b91e55e77ea3d4f
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 56b1a4d3e442..a1b9708313f0 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/gnome-keyring-3.36.0 b/metadata/md5-cache/gnome-base/gnome-keyring-3.36.0
index cc609e0cdde4..f455cc0040a5 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.36.0
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.36.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.36/gnome-keyring-3.36.0.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3afc471db4132b097497f7ac3ae580a1
+_md5_=6caabec892ae7269a813d5659bbae0bd
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.36.0-r1 b/metadata/md5-cache/gnome-base/gnome-keyring-3.36.0-r1
deleted file mode 100644
index 5a2349cc07fc..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.36.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-crypt/gcr-3.27.90:=[gtk] >=dev-libs/glib-2.44:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:= ssh-agent? ( net-misc/openssh ) >=app-eselect/eselect-pinentry-0.5 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Password and keyring managing daemon
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
-IUSE=+caps pam selinux +ssh-agent test +filecaps test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-PDEPEND=app-crypt/pinentry[gnome-keyring]
-RDEPEND=>=app-crypt/gcr-3.27.90:=[gtk] >=dev-libs/glib-2.44:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:= ssh-agent? ( net-misc/openssh ) filecaps? ( sys-libs/libcap )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-keyring/3.36/gnome-keyring-3.36.0.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32e1f1217ff0a34e2ce183053310143f
diff --git a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1 b/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
index 0a19e31528e9..42820a948003 100644
--- a/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
+++ b/metadata/md5-cache/gnome-base/libgnome-keyring-3.12.0-r1
@@ -1,15 +1,15 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.16.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.16.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Compatibility library for accessing secrets
-EAPI=5
+EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
-IUSE=debug +introspection test vala debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=debug +introspection vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris
 LICENSE=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.16.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
 REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnome-keyring/3.12/libgnome-keyring-3.12.0.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=76bfc4842c446db2e09e00723c33f537
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0ac31adbd3957c0634ff2dc21f19737d
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 3ecc695ccc89..c881b90e6a08 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/nm-applet-1.18.0 b/metadata/md5-cache/gnome-extra/nm-applet-1.18.0
index 8b93e7ecd536..c98d38a57266 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.18.0
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.18.0
@@ -5,10 +5,10 @@ DESCRIPTION=NetworkManager connection editor and applet
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=appindicator 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+
 RDEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.27 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=x11-libs/libnotify-0.7.0 >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.18/network-manager-applet-1.18.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8793a666e21dae7ec8add198db241fd0
+_md5_=d6d0df8b1dbd1fcbacf865d8ae1fa7ce
diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz
index 43bc2a1bdd47..5b96ede96855 100644
--- a/metadata/md5-cache/gnustep-apps/Manifest.gz
+++ b/metadata/md5-cache/gnustep-apps/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-apps/terminal-0.9.8 b/metadata/md5-cache/gnustep-apps/terminal-0.9.8
deleted file mode 100644
index 17aeee4185cc..000000000000
--- a/metadata/md5-cache/gnustep-apps/terminal-0.9.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-DESCRIPTION=A terminal emulator for GNUstep
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/terminal/
-IUSE=debug doc
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/gap/Terminal-0.9.8.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4822aa7b2ef31e1f6285c45abae2ced3
diff --git a/metadata/md5-cache/gnustep-apps/terminal-0.9.9 b/metadata/md5-cache/gnustep-apps/terminal-0.9.9
index 1eb8cd08eb83..cdcfcd7ffaea 100644
--- a/metadata/md5-cache/gnustep-apps/terminal-0.9.9
+++ b/metadata/md5-cache/gnustep-apps/terminal-0.9.9
@@ -4,10 +4,10 @@ DESCRIPTION=A terminal emulator for GNUstep
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/gap/terminal/
 IUSE=debug doc
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/gap/Terminal-0.9.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ddf272036a95b73d314b7ccb0dc7921d
+_md5_=f7baa4040c9a62ca48257af39377b0a0
diff --git a/metadata/md5-cache/gnustep-base/Manifest.gz b/metadata/md5-cache/gnustep-base/Manifest.gz
index 8d402489178e..758f67b625f9 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/libobjc2-2.1 b/metadata/md5-cache/gnustep-base/libobjc2-2.1
index b2717c59cb77..5a5525549587 100644
--- a/metadata/md5-cache/gnustep-base/libobjc2-2.1
+++ b/metadata/md5-cache/gnustep-base/libobjc2-2.1
@@ -10,5 +10,5 @@ RDEPEND=boehm-gc? ( dev-libs/boehm-gc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnustep/libobjc2/archive/v2.1.tar.gz -> libobjc2-2.1.tar.gz https://github.com/Tessil/robin-map/archive/757de82.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8e6202ac1a99dd258c40e9c85d04536d
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index 5ddd79f7baef..f8e8b32737a4 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/nm-tray-0.4.3-r1 b/metadata/md5-cache/gui-apps/nm-tray-0.4.3-r1
index 62e2820f2542..9272d8a73258 100644
--- a/metadata/md5-cache/gui-apps/nm-tray-0.4.3-r1
+++ b/metadata/md5-cache/gui-apps/nm-tray-0.4.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 kde-frameworks/networkmanager-qt
 SLOT=0
 SRC_URI=https://github.com/palinek/nm-tray/archive/0.4.3.tar.gz -> nm-tray-0.4.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79d2865d1217182088b3530528d8f213
diff --git a/metadata/md5-cache/gui-apps/tuigreet-0.1.1 b/metadata/md5-cache/gui-apps/tuigreet-0.1.1
index 699665a829a1..b2354b9bcb7a 100644
--- a/metadata/md5-cache/gui-apps/tuigreet-0.1.1
+++ b/metadata/md5-cache/gui-apps/tuigreet-0.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Boost-1.0 GPL-3 MIT
 RDEPEND=gui-libs/greetd
 SLOT=0
 SRC_URI=https://github.com/apognu/tuigreet/archive/0.1.1.tar.gz -> tuigreet-0.1.1.tar.gz https://crates.io/api/v1/crates/ahash/0.3.8/download -> ahash-0.3.8.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cassowary/0.3.0/download -> cassowary-0.3.0.crate https://crates.io/api/v1/crates/cc/1.0.55/download -> cc-1.0.55.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.11/download -> chrono-0.4.11.crate https://crates.io/api/v1/crates/dlv-list/0.2.2/download -> dlv-list-0.2.2.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/greetd_ipc/0.6.0/download -> greetd_ipc-0.6.0.crate https://crates.io/api/v1/crates/hashbrown/0.7.2/download -> hashbrown-0.7.2.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/libc/0.2.71/download -> libc-0.2.71.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/numtoa/0.1.0/download -> numtoa-0.1.0.crate https://crates.io/api/v1/crates/ordered-multimap/0.2.4/download -> ordered-multimap-0.2.4.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.8/download -> ppv-lite86-0.2.8.crate https://crates.io/api/v1/crates/proc-macro2/1.0.18/download -> proc-macro2-1.0.18.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/rust-ini/0.15.3/download -> rust-ini-0.15.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.114/download -> serde-1.0.114.crate https://crates.io/api/v1/crates/serde_derive/1.0.114/download -> serde_derive-1.0.114.crate https://crates.io/api/v1/crates/serde_json/1.0.55/download -> serde_json-1.0.55.crate https://crates.io/api/v1/crates/syn/1.0.33/download -> syn-1.0.33.crate https://crates.io/api/v1/crates/termion/1.5.5/download -> termion-1.5.5.crate https://crates.io/api/v1/crates/textwrap/0.12.0/download -> textwrap-0.12.0.crate https://crates.io/api/v1/crates/thiserror/1.0.20/download -> thiserror-1.0.20.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.20/download -> thiserror-impl-1.0.20.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tui/0.9.5/download -> tui-0.9.5.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/zeroize/1.1.0/download -> zeroize-1.1.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0660da80d3810b43799d56d14b93f16e
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 64441f2b3fb6..485bb08c7076 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/greetd-0.6.1 b/metadata/md5-cache/gui-libs/greetd-0.6.1
index 065717a632a2..0ada4a92448b 100644
--- a/metadata/md5-cache/gui-libs/greetd-0.6.1
+++ b/metadata/md5-cache/gui-libs/greetd-0.6.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD Boost-1.0 GPL-3 MIT Unlicense
 RDEPEND=acct-user/greetd sys-auth/pambase sys-libs/pam
 SLOT=0
 SRC_URI=https://git.sr.ht/~kennylevinsen/greetd/archive/0.6.1.tar.gz -> greetd-0.6.1.tar.gz https://crates.io/api/v1/crates/arc-swap/0.4.6/download -> arc-swap-0.4.6.crate https://crates.io/api/v1/crates/async-trait/0.1.31/download -> async-trait-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bytes/0.5.4/download -> bytes-0.5.4.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/enquote/1.0.3/download -> enquote-1.0.3.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.70/download -> libc-0.2.70.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/mio-uds/0.6.8/download -> mio-uds-0.6.8.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/pam-sys/0.5.6/download -> pam-sys-0.5.6.crate https://crates.io/api/v1/crates/pin-project-lite/0.1.5/download -> pin-project-lite-0.1.5.crate https://crates.io/api/v1/crates/proc-macro2/1.0.12/download -> proc-macro2-1.0.12.crate https://crates.io/api/v1/crates/quote/1.0.5/download -> quote-1.0.5.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/rpassword/4.0.5/download -> rpassword-4.0.5.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/socket2/0.3.12/download -> socket2-0.3.12.crate https://crates.io/api/v1/crates/syn/1.0.21/download -> syn-1.0.21.crate https://crates.io/api/v1/crates/thiserror/1.0.17/download -> thiserror-1.0.17.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.17/download -> thiserror-impl-1.0.17.crate https://crates.io/api/v1/crates/tokio/0.2.11/download -> tokio-0.2.11.crate https://crates.io/api/v1/crates/tokio-macros/0.2.4/download -> tokio-macros-0.2.4.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=0a1c98f407b4716ac2f706696b49ad04
diff --git a/metadata/md5-cache/gui-libs/libwpe-1.4.0.1 b/metadata/md5-cache/gui-libs/libwpe-1.4.0.1
index d5d26f0e054e..4d92ca246dfb 100644
--- a/metadata/md5-cache/gui-libs/libwpe-1.4.0.1
+++ b/metadata/md5-cache/gui-libs/libwpe-1.4.0.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=media-libs/mesa[egl] x11-libs/libxkbcommon
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/libwpe-1.4.0.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82f1d52de940b235a5a8152e11fb9df1
diff --git a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0 b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0
index a51980cdd4bd..523d48af522a 100644
--- a/metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0
+++ b/metadata/md5-cache/gui-libs/wpebackend-fdo-1.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=media-libs/mesa[egl] dev-libs/glib:2 >=dev-libs/wayland-1.10 gui-libs/libwpe:1.0
 SLOT=1.0
 SRC_URI=https://wpewebkit.org/releases/wpebackend-fdo-1.4.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e0a18b62c91e3f684727ef06d366da7
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 7dd444e272b1..0a966117c0dc 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/hikari-1.2.0 b/metadata/md5-cache/gui-wm/hikari-1.2.0
deleted file mode 100644
index 63180b351f83..000000000000
--- a/metadata/md5-cache/gui-wm/hikari-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-libs/glib dev-libs/libinput:= dev-libs/libucl gui-libs/wlroots x11-libs/cairo:=[X,svg] x11-libs/pango:=[X] x11-libs/pixman x11-libs/libxkbcommon:=[X] app-text/pandoc virtual/pkgconfig dev-libs/wayland-protocols
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/glib dev-libs/libinput:= dev-libs/libucl gui-libs/wlroots x11-libs/cairo:=[X,svg] x11-libs/pango:=[X] x11-libs/pixman x11-libs/libxkbcommon:=[X]
-DESCRIPTION=wayland compositor inspired by CWM
-EAPI=7
-HOMEPAGE=https://hikari.acmelabs.space/
-IUSE=gamma layershell screencopy +X
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib dev-libs/libinput:= dev-libs/libucl gui-libs/wlroots x11-libs/cairo:=[X,svg] x11-libs/pango:=[X] x11-libs/pixman x11-libs/libxkbcommon:=[X] x11-misc/xkeyboard-config
-SLOT=0
-SRC_URI=https://hikari.acmelabs.space/releases/hikari-1.2.0.tar.gz
-_md5_=fa9aa4bbd115b0011d192f1ff593d415
diff --git a/metadata/md5-cache/gui-wm/hikari-2.0.2 b/metadata/md5-cache/gui-wm/hikari-2.0.2
deleted file mode 100644
index 28c9fd161bc1..000000000000
--- a/metadata/md5-cache/gui-wm/hikari-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-libs/glib dev-libs/libinput:= dev-libs/libucl gui-libs/wlroots media-libs/libglvnd x11-libs/cairo:=[X,svg] x11-libs/pango:=[X] x11-libs/pixman x11-libs/libxkbcommon:=[X] sys-libs/pam virtual/pkgconfig dev-libs/wayland-protocols man? ( app-text/pandoc )
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/glib dev-libs/libinput:= dev-libs/libucl gui-libs/wlroots media-libs/libglvnd x11-libs/cairo:=[X,svg] x11-libs/pango:=[X] x11-libs/pixman x11-libs/libxkbcommon:=[X] sys-libs/pam
-DESCRIPTION=wayland compositor inspired by CWM
-EAPI=7
-HOMEPAGE=https://hikari.acmelabs.space/
-IUSE=gamma layershell +man screencopy +X
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib dev-libs/libinput:= dev-libs/libucl gui-libs/wlroots media-libs/libglvnd x11-libs/cairo:=[X,svg] x11-libs/pango:=[X] x11-libs/pixman x11-libs/libxkbcommon:=[X] sys-libs/pam x11-misc/xkeyboard-config
-SLOT=0
-SRC_URI=https://hikari.acmelabs.space/releases/hikari-2.0.2.tar.gz
-_md5_=017684026a26754d0bdec006732fc65d
diff --git a/metadata/md5-cache/gui-wm/hikari-2.1.2 b/metadata/md5-cache/gui-wm/hikari-2.1.2
new file mode 100644
index 000000000000..a5a0814fcb55
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/hikari-2.1.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/wayland-protocols sys-devel/bmake virtual/pkgconfig
+DEFINED_PHASES=compile install setup
+DEPEND=dev-libs/libinput:= dev-libs/libucl >=gui-libs/wlroots-0.11.0[X?] media-libs/libglvnd x11-libs/cairo[X?,svg] x11-libs/libxkbcommon[X?] x11-libs/pango[X?] x11-libs/pixman sys-libs/pam
+DESCRIPTION=Wayland compositor inspired by CWM
+EAPI=7
+HOMEPAGE=https://hikari.acmelabs.space/
+IUSE=gamma layershell screencopy suid virtual-io +X
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libinput:= dev-libs/libucl >=gui-libs/wlroots-0.11.0[X?] media-libs/libglvnd x11-libs/cairo[X?,svg] x11-libs/libxkbcommon[X?] x11-libs/pango[X?] x11-libs/pixman sys-libs/pam x11-misc/xkeyboard-config
+SLOT=0
+SRC_URI=https://hikari.acmelabs.space/releases/hikari-2.1.2.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=8cc0b07e3fff48e9c9efc427df491c94
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index c868e9772f56..58b59a2ab248 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-20.04.3 b/metadata/md5-cache/kde-apps/akonadi-20.04.3
index 15d02721ba14..3854a700dfec 100644
--- a/metadata/md5-cache/kde-apps/akonadi-20.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-20.04.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/akonadi-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c03b7da2e5bba7466d8d983733f1346
diff --git a/metadata/md5-cache/kde-apps/akonadi-20.08.1 b/metadata/md5-cache/kde-apps/akonadi-20.08.1
index 972c8ae14585..1e53a18dd317 100644
--- a/metadata/md5-cache/kde-apps/akonadi-20.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-20.08.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/akonadi-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ffc5a19ee02343fff56d3b7eba2a780
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-20.04.3 b/metadata/md5-cache/kde-apps/akonadi-calendar-20.04.3
index 8a6827728091..8f33ade28aa4 100644
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-20.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/akonadi-calendar-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=71f222f07c4c89c20a6dab3b67208cd4
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-20.08.1 b/metadata/md5-cache/kde-apps/akonadi-calendar-20.08.1
index 9e873cbcc203..98859343a20a 100644
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-20.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/akonadi-calendar-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83d6066ed949512b2d94c41ac6069f0b
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-20.04.3 b/metadata/md5-cache/kde-apps/akonadi-contacts-20.04.3
index 645a40316fa3..8addc199041d 100644
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-20.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/akonadi-contacts-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e8704b00c4de4402eb950206d9ff13b
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-20.08.1 b/metadata/md5-cache/kde-apps/akonadi-contacts-20.08.1
index c1e9abc385be..28dad1a40a9e 100644
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-20.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/akonadi-contacts-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c731d2326c2da1910b93a677db35780
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-20.04.3 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-20.04.3
index e49c3d6b74ab..4f5d6047c6f7 100644
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-20.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.04.3:5 >=kde-apps/kidentitymanagement-20.04.3:5 >=kde-apps/kmailtransport-20.04.3:5 >=kde-apps/libkdepim-20.04.3:5 >=kde-apps/mailcommon-20.04.3:5 >=kde-apps/mailimporter-20.04.3:5 >=kde-apps/messagelib-20.04.3:5 >=kde-apps/pimcommon-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcontacts-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/akonadi-import-wizard-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad8c0df3fc18c51e34e1028a58229fa8
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-20.08.1 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-20.08.1
index ff97c0e2d13f..12182d656745 100644
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-20.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 >=kde-apps/mailcommon-20.08.1:5 >=kde-apps/mailimporter-20.08.1:5 >=kde-apps/messagelib-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/akonadi-import-wizard-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16fdee4c076ee7a1a9b443d6e193237b
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-20.04.3 b/metadata/md5-cache/kde-apps/akonadi-mime-20.04.3
index f4e5bf83ce29..707437542a0d 100644
--- a/metadata/md5-cache/kde-apps/akonadi-mime-20.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/akonadi-mime-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16879430fec9d720d2efde23409458bb
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-20.08.1 b/metadata/md5-cache/kde-apps/akonadi-mime-20.08.1
index 090452084ba3..7ee8536eea30 100644
--- a/metadata/md5-cache/kde-apps/akonadi-mime-20.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/akonadi-mime-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49d327a80c8d3107fae4029b115650a0
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-20.04.3 b/metadata/md5-cache/kde-apps/akonadi-notes-20.04.3
index b265f285d1d5..8a8f897059e1 100644
--- a/metadata/md5-cache/kde-apps/akonadi-notes-20.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/kmime-20.04.3
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/akonadi-notes-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5207e3e1e191963e0df26efb898af0f0
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-20.08.1 b/metadata/md5-cache/kde-apps/akonadi-notes-20.08.1
index f666cbc275a7..9ad09c373fd1 100644
--- a/metadata/md5-cache/kde-apps/akonadi-notes-20.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/kmime-20.08.1
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/akonadi-notes-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8cd4bc777e74cb44820e32bdff92b8c
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-20.04.3 b/metadata/md5-cache/kde-apps/akonadi-search-20.04.3
index 661a91227eeb..00b7604094e8 100644
--- a/metadata/md5-cache/kde-apps/akonadi-search-20.04.3
+++ b/metadata/md5-cache/kde-apps/akonadi-search-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/xapian-1.3:=[chert(+)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgu
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/akonadi-search-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e162e7cfffad96c3e546a610fca54993
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-20.08.1 b/metadata/md5-cache/kde-apps/akonadi-search-20.08.1
index d8a2c61b40d6..17677beb1573 100644
--- a/metadata/md5-cache/kde-apps/akonadi-search-20.08.1
+++ b/metadata/md5-cache/kde-apps/akonadi-search-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/xapian-1.3:=[chert(+)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgu
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/akonadi-search-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cdae2763075ccda2f151e0e016b4226
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-20.04.3 b/metadata/md5-cache/kde-apps/akonadiconsole-20.04.3
index af198157137e..d315fa10a2e4 100644
--- a/metadata/md5-cache/kde-apps/akonadiconsole-20.04.3
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
 RDEPEND=dev-libs/xapian:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.04.3:5 >=kde-apps/akonadi-contacts-20.04.3:5 >=kde-apps/akonadi-search-20.04.3:5 >=kde-apps/calendarsupport-20.04.3:5 >=kde-apps/kmime-20.04.3:5 >=kde-apps/libkdepim-20.04.3:5 >=kde-apps/messagelib-20.04.3:5 >=kde-frameworks/kcalendarcore-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcontacts-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/akonadiconsole-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42159e7080a709bbf54115dab6408fb0
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-20.08.1 b/metadata/md5-cache/kde-apps/akonadiconsole-20.08.1
index 78e8f2691a09..4a56fcf8b03c 100644
--- a/metadata/md5-cache/kde-apps/akonadiconsole-20.08.1
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
 RDEPEND=dev-libs/xapian:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-search-20.08.1:5 >=kde-apps/calendarsupport-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/messagelib-20.08.1:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kitemmodels-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/akonadiconsole-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5b02e50c89a0bd31e65a051990e68d28
diff --git a/metadata/md5-cache/kde-apps/akregator-20.04.3 b/metadata/md5-cache/kde-apps/akregator-20.04.3
index 5ae80abb2155..bdb710c28976 100644
--- a/metadata/md5-cache/kde-apps/akregator-20.04.3
+++ b/metadata/md5-cache/kde-apps/akregator-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/akregator-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bcd6ee6f9af9414f1a79de6dcd2a07c9
diff --git a/metadata/md5-cache/kde-apps/akregator-20.08.1 b/metadata/md5-cache/kde-apps/akregator-20.08.1
index 778b0139affe..87837a0ab094 100644
--- a/metadata/md5-cache/kde-apps/akregator-20.08.1
+++ b/metadata/md5-cache/kde-apps/akregator-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/akregator-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=310b9f28bb79159c6c6f09b41edc90df
diff --git a/metadata/md5-cache/kde-apps/analitza-20.04.3 b/metadata/md5-cache/kde-apps/analitza-20.04.3
index fa5c63673ecc..d0f6434c0756 100644
--- a/metadata/md5-cache/kde-apps/analitza-20.04.3
+++ b/metadata/md5-cache/kde-apps/analitza-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[-gles2-only] >=d
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/analitza-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=92699bbc8e9bf151a60466075958b2c2
diff --git a/metadata/md5-cache/kde-apps/analitza-20.08.1 b/metadata/md5-cache/kde-apps/analitza-20.08.1
index 751068652a14..e85019f322d0 100644
--- a/metadata/md5-cache/kde-apps/analitza-20.08.1
+++ b/metadata/md5-cache/kde-apps/analitza-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[-gles2-only] >=d
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/analitza-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3177e2000437665761b5712a4bbf527d
diff --git a/metadata/md5-cache/kde-apps/ark-20.04.3-r1 b/metadata/md5-cache/kde-apps/ark-20.04.3-r1
index ebacaec54386..346a2013c461 100644
--- a/metadata/md5-cache/kde-apps/ark-20.04.3-r1
+++ b/metadata/md5-cache/kde-apps/ark-20.04.3-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/libarchive:=[bzip2?,lzma?,zlib] >=dev-qt/qtdbus-5.14.2:5 >=dev-
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ark-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9464bd0337d5f79632dc4c36cba03d66
diff --git a/metadata/md5-cache/kde-apps/ark-20.04.3-r2 b/metadata/md5-cache/kde-apps/ark-20.04.3-r2
new file mode 100644
index 000000000000..fa94e9d4a9d8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ark-20.04.3-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/libarchive:=[bzip2,lzma,zlib] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kpty-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=File archiver by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/en/ark https://utils.kde.org/projects/ark/
+IUSE=zip test debug +handbook test
+KEYWORDS=~amd64 arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/libarchive:=[bzip2,lzma,zlib] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kpty-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ark-20.04.3.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=15ec447470740397548ea101f8a5d0ff
diff --git a/metadata/md5-cache/kde-apps/ark-20.08.1 b/metadata/md5-cache/kde-apps/ark-20.08.1
index efc4eae99325..be9450a0e7fb 100644
--- a/metadata/md5-cache/kde-apps/ark-20.08.1
+++ b/metadata/md5-cache/kde-apps/ark-20.08.1
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.72.0:5 ) >=kde-frameworks/extra-cmake-modules-5.72.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=app-arch/libarchive:=[bzip2,lzma,zlib] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kitemmodels-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kpty-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.14.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Archiving tool
+DESCRIPTION=File archiver by KDE
 EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.ark https://utils.kde.org/projects/ark/
+HOMEPAGE=https://kde.org/applications/en/ark https://utils.kde.org/projects/ark/
 IUSE=zip test debug +handbook test
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/libarchive:=[bzip2,lzma,zlib] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kitemmodels-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kpty-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ark-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=495146886b2423f4bda6437856955740
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7f2e46b23c03ee92276d809482449c7a
diff --git a/metadata/md5-cache/kde-apps/artikulate-20.04.3 b/metadata/md5-cache/kde-apps/artikulate-20.04.3
index c8b9460514da..222b2cb0c9da 100644
--- a/metadata/md5-cache/kde-apps/artikulate-20.04.3
+++ b/metadata/md5-cache/kde-apps/artikulate-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=dev-qt/qtxmlpatterns-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) !gstreamer? ( >=dev-qt/qtmultimedia-5.14.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/artikulate-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d379eaf88bafda9ef8e55568be94b95e
diff --git a/metadata/md5-cache/kde-apps/artikulate-20.08.1 b/metadata/md5-cache/kde-apps/artikulate-20.08.1
index 0375835bad3d..d39af6528964 100644
--- a/metadata/md5-cache/kde-apps/artikulate-20.08.1
+++ b/metadata/md5-cache/kde-apps/artikulate-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=dev-qt/qtxmlpatterns-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) !gstreamer? ( >=dev-qt/qtmultimedia-5.14.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/artikulate-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8f816b0018b8a67790ed30c1fcb4534
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-20.04.3 b/metadata/md5-cache/kde-apps/audiocd-kio-20.04.3
index 4a8c18f2fb17..cb9bbe8dd4e9 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-20.04.3
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkcddb-20.04.3:5 >=kde-apps/libkcompactdisc-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/audiocd-kio-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d0ec28c27e2bfebf1c104d8a759d3ac
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-20.08.1 b/metadata/md5-cache/kde-apps/audiocd-kio-20.08.1
index 07f27e9e4dec..5cd64c06086c 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-20.08.1
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkcddb-20.08.1:5 >=kde-apps/libkcompactdisc-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/audiocd-kio-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d5f939ee9d92306ce68fed12a2207055
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-20.04.3 b/metadata/md5-cache/kde-apps/baloo-widgets-20.04.3
index c1071e18ee74..4e39b45cbf08 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-20.04.3
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/bal
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/baloo-widgets-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0bc8402231d96967e467b8a511bc565c
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-20.08.1 b/metadata/md5-cache/kde-apps/baloo-widgets-20.08.1
index a9a06a0c332f..3115e76658f4 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-20.08.1
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/bal
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/baloo-widgets-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8801ab2d3daa8856714bbfd80cec72d
diff --git a/metadata/md5-cache/kde-apps/blinken-20.04.3 b/metadata/md5-cache/kde-apps/blinken-20.04.3
index 40cad9dd6edf..76320c949ff5 100644
--- a/metadata/md5-cache/kde-apps/blinken-20.04.3
+++ b/metadata/md5-cache/kde-apps/blinken-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/blinken-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ede832ed517a881578563bae58e6ce89
diff --git a/metadata/md5-cache/kde-apps/blinken-20.08.1 b/metadata/md5-cache/kde-apps/blinken-20.08.1
index bb89afaece2b..5f6d14b5ebd9 100644
--- a/metadata/md5-cache/kde-apps/blinken-20.08.1
+++ b/metadata/md5-cache/kde-apps/blinken-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/blinken-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=096c0d67a3263bf43f42e74d5d252663
diff --git a/metadata/md5-cache/kde-apps/bomber-20.04.3 b/metadata/md5-cache/kde-apps/bomber-20.04.3
index fafb3b553c84..f0b7ffc2e7f3 100644
--- a/metadata/md5-cache/kde-apps/bomber-20.04.3
+++ b/metadata/md5-cache/kde-apps/bomber-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 !games-action/xbomber || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/bomber-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98aaa2994b4ccda14653afae8fdaca77
diff --git a/metadata/md5-cache/kde-apps/bomber-20.08.1 b/metadata/md5-cache/kde-apps/bomber-20.08.1
index f120d3f265dc..a1ce71c52328 100644
--- a/metadata/md5-cache/kde-apps/bomber-20.08.1
+++ b/metadata/md5-cache/kde-apps/bomber-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 !games-action/xbomber || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/bomber-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55fb8f2543e1c3e8920c172ff08a29db
diff --git a/metadata/md5-cache/kde-apps/bovo-20.04.3 b/metadata/md5-cache/kde-apps/bovo-20.04.3
index f5e4b963eb3d..b8a0ccd2f210 100644
--- a/metadata/md5-cache/kde-apps/bovo-20.04.3
+++ b/metadata/md5-cache/kde-apps/bovo-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/bovo-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e0539bf10c08cbb32e669c9dc9f67acb
diff --git a/metadata/md5-cache/kde-apps/bovo-20.08.1 b/metadata/md5-cache/kde-apps/bovo-20.08.1
index 156b991308e1..e5d489a5a2f1 100644
--- a/metadata/md5-cache/kde-apps/bovo-20.08.1
+++ b/metadata/md5-cache/kde-apps/bovo-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/bovo-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3cf577d95f7afefd8d1078b9bd0ab27
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-20.04.3 b/metadata/md5-cache/kde-apps/calendarjanitor-20.04.3
index d74bec6e041e..0ce9bc08e88c 100644
--- a/metadata/md5-cache/kde-apps/calendarjanitor-20.04.3
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.04.3:5 >=kde-apps/akonadi-calendar-20.04.3:5 >=kde-apps/calendarsupport-20.04.3:5 >=kde-frameworks/kcalendarcore-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/akonadi-calendar-tools-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a71156ae510f2254202a792870c03096
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-20.08.1 b/metadata/md5-cache/kde-apps/calendarjanitor-20.08.1
index 1bf4b69c2e80..49038c731341 100644
--- a/metadata/md5-cache/kde-apps/calendarjanitor-20.08.1
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/akonadi-calendar-20.08.1:5 >=kde-apps/calendarsupport-20.08.1:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/akonadi-calendar-tools-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bfb15affaa01937752374fe70facaea4
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-20.04.3 b/metadata/md5-cache/kde-apps/calendarsupport-20.04.3
index 2570482e23a4..08db6ad5c12e 100644
--- a/metadata/md5-cache/kde-apps/calendarsupport-20.04.3
+++ b/metadata/md5-cache/kde-apps/calendarsupport-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/libical >=dev-qt/designer-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.04.3:5 >=kde-apps/akonadi-calendar-20.04.3:5 >=kde-apps/akonadi-mime-20.04.3:5 >=kde-apps/kcalutils-20.04.3:5 >=kde-apps/kdepim-apps-libs-20.04.3:5 >=kde-apps/kidentitymanagement-20.04.3:5 >=kde-apps/kmime-20.04.3:5 >=kde-apps/libkdepim-20.04.3:5 >=kde-apps/pimcommon-20.04.3:5 >=kde-frameworks/kcalendarcore-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/kholidays-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/calendarsupport-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2fbe9c9820a616234036fec06f077a46
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-20.08.1 b/metadata/md5-cache/kde-apps/calendarsupport-20.08.1
index 1a24fe11d39d..029044b9f4c9 100644
--- a/metadata/md5-cache/kde-apps/calendarsupport-20.08.1
+++ b/metadata/md5-cache/kde-apps/calendarsupport-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/libical >=dev-qt/designer-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/akonadi-calendar-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/akonadi-notes-20.08.1:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcodecs-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kguiaddons-5.72.0:5 >=kde-frameworks/kholidays-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/calendarsupport-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95e8e197c513e25c6e09284730f79591
diff --git a/metadata/md5-cache/kde-apps/cantor-20.04.3-r1 b/metadata/md5-cache/kde-apps/cantor-20.04.3-r1
index 31b0c88327a7..84ad23b359a6 100644
--- a/metadata/md5-cache/kde-apps/cantor-20.04.3-r1
+++ b/metadata/md5-cache/kde-apps/cantor-20.04.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/cantor-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd69071aac709760648924365e5c08c2
diff --git a/metadata/md5-cache/kde-apps/cantor-20.08.1 b/metadata/md5-cache/kde-apps/cantor-20.08.1
index 0f9dcf0516ba..84cf90a234a4 100644
--- a/metadata/md5-cache/kde-apps/cantor-20.08.1
+++ b/metadata/md5-cache/kde-apps/cantor-20.08.1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/cantor-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a137d68fb48243e609ebbb4cd50b66f5
diff --git a/metadata/md5-cache/kde-apps/cervisia-20.04.3 b/metadata/md5-cache/kde-apps/cervisia-20.04.3
index a737db7d1ac9..debc6afb3208 100644
--- a/metadata/md5-cache/kde-apps/cervisia-20.04.3
+++ b/metadata/md5-cache/kde-apps/cervisia-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdesu-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kinit-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 dev-vcs/cvs || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/cervisia-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac273078454c96f2d79698059ea2b2c8
diff --git a/metadata/md5-cache/kde-apps/cervisia-20.08.1 b/metadata/md5-cache/kde-apps/cervisia-20.08.1
index 0902d770f5d9..1b5d493ea7eb 100644
--- a/metadata/md5-cache/kde-apps/cervisia-20.08.1
+++ b/metadata/md5-cache/kde-apps/cervisia-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdesu-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kinit-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 dev-vcs/cvs || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/cervisia-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a8e07876c85a6939a70881572804504
diff --git a/metadata/md5-cache/kde-apps/dolphin-20.04.3 b/metadata/md5-cache/kde-apps/dolphin-20.04.3
index 86e19a3d5dbd..160c30067417 100644
--- a/metadata/md5-cache/kde-apps/dolphin-20.04.3
+++ b/metadata/md5-cache/kde-apps/dolphin-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/dolphin-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=be85d655ead1e0cc7df38d543e518da0
diff --git a/metadata/md5-cache/kde-apps/dolphin-20.08.1 b/metadata/md5-cache/kde-apps/dolphin-20.08.1
index f14b95433e79..17c7816577ab 100644
--- a/metadata/md5-cache/kde-apps/dolphin-20.08.1
+++ b/metadata/md5-cache/kde-apps/dolphin-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/dolphin-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7f96099d3725d6d4aee000d54a56fe9
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.04.3
index 6fbd530047aa..4f916526e07a 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.04.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-apps/dolphin-20.04.3:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 !kde-apps/dolphin-plugins:5 net-misc/dropbox-cli || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/dolphin-plugins-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b99b048efb1d013331ebd7955dd7685
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.08.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.08.1
index 85fafb8636aa..acf099dc9a88 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.08.1
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/dolphin-20.08.1:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 !kde-apps/dolphin-plugins:5 net-misc/dropbox-cli || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/dolphin-plugins-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a04539e8fd84730968721bf602cb69ec
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-git-20.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-git-20.04.3
index 5c3719724343..fff8ef147850 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-git-20.04.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-git-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-apps/dolphin-20.04.3:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 !kde-apps/dolphin-plugins:5 dev-vcs/git || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/dolphin-plugins-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a5a116d739c43e1fb7cb0223df579ec
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-git-20.08.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-git-20.08.1
index 508ef2107a4d..e8c93523d4d3 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-git-20.08.1
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-git-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/dolphin-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 !kde-apps/dolphin-plugins:5 dev-vcs/git || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/dolphin-plugins-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4ecbb92dd299af3facee61693c21054
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.04.3
index 2d419e65ca10..505e50f6a62b 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.04.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktexteditor-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-apps/dolphin-20.04.3:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 !kde-apps/dolphin-plugins:5 dev-vcs/mercurial || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/dolphin-plugins-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6acc4eb38caacff87790f0a950af9aab
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.08.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.08.1
index a473a8df2f84..da815f289823 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.08.1
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/dolphin-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/ktexteditor-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 !kde-apps/dolphin-plugins:5 dev-vcs/mercurial || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/dolphin-plugins-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5cedffbbbab537ab9dc1e23e1b424802
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.04.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.04.3
index 2976d9fee31c..057d314295b1 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.04.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-apps/dolphin-20.04.3:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 !kde-apps/dolphin-plugins:5 >=kde-apps/kompare-20.04.3:5 dev-vcs/subversion || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/dolphin-plugins-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c29743299c158efea7ed8ba4937f217c
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.08.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.08.1
index 48777a42d650..7690df4aaf19 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.08.1
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/dolphin-20.08.1:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 !kde-apps/dolphin-plugins:5 dev-vcs/subversion >=kde-apps/kompare-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/dolphin-plugins-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=662b15b9442a4b9ff03160ea7994e470
diff --git a/metadata/md5-cache/kde-apps/dragon-20.04.3 b/metadata/md5-cache/kde-apps/dragon-20.04.3
index 74d014ae305d..c861a81d69e5 100644
--- a/metadata/md5-cache/kde-apps/dragon-20.04.3
+++ b/metadata/md5-cache/kde-apps/dragon-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/dragon-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c576e70ae637441fadbdc462ea65cfe0
diff --git a/metadata/md5-cache/kde-apps/dragon-20.08.1 b/metadata/md5-cache/kde-apps/dragon-20.08.1
index e04988a68445..dd6bf8905580 100644
--- a/metadata/md5-cache/kde-apps/dragon-20.08.1
+++ b/metadata/md5-cache/kde-apps/dragon-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/dragon-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=afebf2a9bf6facf4d866e3126cdcce4b
diff --git a/metadata/md5-cache/kde-apps/eventviews-20.04.3 b/metadata/md5-cache/kde-apps/eventviews-20.04.3
index 379e5bebd496..6bdff8e279f3 100644
--- a/metadata/md5-cache/kde-apps/eventviews-20.04.3
+++ b/metadata/md5-cache/kde-apps/eventviews-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/kdiagram:5 dev-libs/libical >=dev-qt/qtgui-5.14.2:5= >=dev-qt/q
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/eventviews-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1fb676a31835f52a0ad98dfff7515d0
diff --git a/metadata/md5-cache/kde-apps/eventviews-20.08.1 b/metadata/md5-cache/kde-apps/eventviews-20.08.1
index c2be92c74d24..b94d764bb4ae 100644
--- a/metadata/md5-cache/kde-apps/eventviews-20.08.1
+++ b/metadata/md5-cache/kde-apps/eventviews-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/kdiagram:5 dev-libs/libical >=dev-qt/qtcore-5.14.2:5= >=dev-qt/
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/eventviews-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=656556b9527ad19b2c455c8791523bc6
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-20.04.3 b/metadata/md5-cache/kde-apps/ffmpegthumbs-20.04.3
index 7792eb2509d2..e30f1edbcf91 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-20.04.3
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 media-video/ffmpeg:0= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ffmpegthumbs-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e9cd5d7506e9f8d6a3c1b1234e49542
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-20.08.1 b/metadata/md5-cache/kde-apps/ffmpegthumbs-20.08.1
index 3677d545ac51..29f1b2bfe032 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-20.08.1
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 media-video/ffmpeg:0= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ffmpegthumbs-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2f580287083d9d171243affe3baba49
diff --git a/metadata/md5-cache/kde-apps/filelight-20.04.3 b/metadata/md5-cache/kde-apps/filelight-20.04.3
index 5dcc698b2172..9380d4b82c28 100644
--- a/metadata/md5-cache/kde-apps/filelight-20.04.3
+++ b/metadata/md5-cache/kde-apps/filelight-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/filelight-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc8d67eb160fd075add7bdae8629289c
diff --git a/metadata/md5-cache/kde-apps/filelight-20.08.1 b/metadata/md5-cache/kde-apps/filelight-20.08.1
index 5b3e32dd1745..dda36e6a77b2 100644
--- a/metadata/md5-cache/kde-apps/filelight-20.08.1
+++ b/metadata/md5-cache/kde-apps/filelight-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kco
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/filelight-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=20918fd723cb542492388b1594c1e9c9
diff --git a/metadata/md5-cache/kde-apps/granatier-20.04.3 b/metadata/md5-cache/kde-apps/granatier-20.04.3
index 7a2b7895ccca..15b3d1e1b0fb 100644
--- a/metadata/md5-cache/kde-apps/granatier-20.04.3
+++ b/metadata/md5-cache/kde-apps/granatier-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/granatier-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=78a857df768d4a54d3959c107f0881a6
diff --git a/metadata/md5-cache/kde-apps/granatier-20.08.1 b/metadata/md5-cache/kde-apps/granatier-20.08.1
index 82d5fd6e9f8b..eaf077fd4e88 100644
--- a/metadata/md5-cache/kde-apps/granatier-20.08.1
+++ b/metadata/md5-cache/kde-apps/granatier-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/granatier-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=379adcd1ebcb1023f90903a26f57b82f
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-20.04.3 b/metadata/md5-cache/kde-apps/grantlee-editor-20.04.3
index bc77775b22ff..39fbc3282092 100644
--- a/metadata/md5-cache/kde-apps/grantlee-editor-20.04.3
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-contacts-20.04.3:5 >=kde-apps/kmime-20.04.3:5 >=kde-apps/kpimtextedit-20.04.3:5 >=kde-apps/messagelib-20.04.3:5 >=kde-apps/pimcommon-20.04.3:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcontacts-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/ktexteditor-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/grantlee-editor-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f186029ee8e53bcc45b39475bb9eb236
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-20.08.1 b/metadata/md5-cache/kde-apps/grantlee-editor-20.08.1
index 5273354f5210..b0bfd2b3f2d8 100644
--- a/metadata/md5-cache/kde-apps/grantlee-editor-20.08.1
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/kpimtextedit-20.08.1:5 >=kde-apps/messagelib-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/ktexteditor-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/grantlee-editor-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=731cfbef7068b4500bdc71d2b80335af
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-20.04.3 b/metadata/md5-cache/kde-apps/grantleetheme-20.04.3
index 61080218704e..b46f111baada 100644
--- a/metadata/md5-cache/kde-apps/grantleetheme-20.04.3
+++ b/metadata/md5-cache/kde-apps/grantleetheme-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/grantleetheme-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=37c4bf4fd4bf04a9a1f4c50f5621378b
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-20.08.1 b/metadata/md5-cache/kde-apps/grantleetheme-20.08.1
index e56881e349a1..2daad452bfc6 100644
--- a/metadata/md5-cache/kde-apps/grantleetheme-20.08.1
+++ b/metadata/md5-cache/kde-apps/grantleetheme-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/grantleetheme-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8639829605a55ad2e1ccfccae1a5e16e
diff --git a/metadata/md5-cache/kde-apps/gwenview-20.04.3 b/metadata/md5-cache/kde-apps/gwenview-20.04.3
index da8f0783d268..16e3e59bcc89 100644
--- a/metadata/md5-cache/kde-apps/gwenview-20.04.3
+++ b/metadata/md5-cache/kde-apps/gwenview-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtopengl-5.14.2:5 >=dev-qt/qtprintsuppo
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/gwenview-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b28814b3803b80f7c3123f572d5058c
diff --git a/metadata/md5-cache/kde-apps/gwenview-20.08.1 b/metadata/md5-cache/kde-apps/gwenview-20.08.1
index 6be71ee9d01f..bc351d0bd2f9 100644
--- a/metadata/md5-cache/kde-apps/gwenview-20.08.1
+++ b/metadata/md5-cache/kde-apps/gwenview-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtopengl-5.14.2:5 >=dev-qt/qtprintsuppo
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/gwenview-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4f23a09caaeb7ba8e6974fa66604d85
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-20.04.3 b/metadata/md5-cache/kde-apps/incidenceeditor-20.04.3
index 042c0b3cff63..937f05e99545 100644
--- a/metadata/md5-cache/kde-apps/incidenceeditor-20.04.3
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/kdiagram:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=d
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/incidenceeditor-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc02940f3cf882ea39b4f7844adb8d63
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-20.08.1 b/metadata/md5-cache/kde-apps/incidenceeditor-20.08.1
index fe04e3563568..732b3ab3ff33 100644
--- a/metadata/md5-cache/kde-apps/incidenceeditor-20.08.1
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/kdiagram:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=d
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/incidenceeditor-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d329f99bb744e4794fa0906b28c87830
diff --git a/metadata/md5-cache/kde-apps/juk-20.04.3 b/metadata/md5-cache/kde-apps/juk-20.04.3
index 86e9e3777ae5..af48c64153f5 100644
--- a/metadata/md5-cache/kde-apps/juk-20.04.3
+++ b/metadata/md5-cache/kde-apps/juk-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/juk-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4dc3839fd5b3fba5c93d419a1dd88d1c
diff --git a/metadata/md5-cache/kde-apps/juk-20.08.1 b/metadata/md5-cache/kde-apps/juk-20.08.1
index ae1d9b086b1c..b6d52599e380 100644
--- a/metadata/md5-cache/kde-apps/juk-20.08.1
+++ b/metadata/md5-cache/kde-apps/juk-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/juk-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e20f446ce3f8a2c0c99bef14a829d29c
diff --git a/metadata/md5-cache/kde-apps/k3b-20.04.3 b/metadata/md5-cache/kde-apps/k3b-20.04.3
index bb9f7f8b36e1..e55fa03a217f 100644
--- a/metadata/md5-cache/kde-apps/k3b-20.04.3
+++ b/metadata/md5-cache/kde-apps/k3b-20.04.3
@@ -12,5 +12,5 @@ REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/k3b-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0983e0759700ee92de04cf25de8dbcd
diff --git a/metadata/md5-cache/kde-apps/k3b-20.08.1 b/metadata/md5-cache/kde-apps/k3b-20.08.1
index 0c205b939614..0fea1bb43cdb 100644
--- a/metadata/md5-cache/kde-apps/k3b-20.08.1
+++ b/metadata/md5-cache/kde-apps/k3b-20.08.1
@@ -12,5 +12,5 @@ REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/k3b-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc06d8965ff9a89e1cf8b50d6e099608
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-20.04.3 b/metadata/md5-cache/kde-apps/kaccounts-integration-20.04.3
index 06f126de38f9..0fb039fbeea1 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-20.04.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kaccounts-integration-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4a78dc6dabb25912f50853de222acf5
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-20.08.1 b/metadata/md5-cache/kde-apps/kaccounts-integration-20.08.1
index 9076d1c3cbad..d4835f42426a 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-20.08.1
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kaccounts-integration-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a02ab7f88d3848dedecde39cf466470
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-20.04.3 b/metadata/md5-cache/kde-apps/kaccounts-providers-20.04.3
index a97483d2465d..bbba1f12fa97 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-20.04.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-20.04.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtxml-5.14.2:5 >=kde-apps/kaccounts-integration-20.04.3:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kpackage-5.70.0:5 net-libs/signon-oauth2 net-libs/signon-ui || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kaccounts-providers-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8903dd664b3571f65007a458dcc4a39e
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-20.08.1 b/metadata/md5-cache/kde-apps/kaccounts-providers-20.08.1
index 7953dd3cd67b..5091f67bd60f 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-20.08.1
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-20.08.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtxml-5.14.2:5 >=kde-apps/kaccounts-integration-20.08.1:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kpackage-5.72.0:5 net-libs/signon-oauth2 net-libs/signon-ui || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kaccounts-providers-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ee9178c4b5c5bd13a5babe4175dcf6e
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-20.04.3 b/metadata/md5-cache/kde-apps/kaddressbook-20.04.3
index ce512f2902ba..48d08455e318 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-20.04.3
+++ b/metadata/md5-cache/kde-apps/kaddressbook-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 >=dev-qt/qtdbus-5.
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kaddressbook-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d59a2c3fe27fbaecbbbb70d0be8fd540
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-20.08.1 b/metadata/md5-cache/kde-apps/kaddressbook-20.08.1
index 71342c899e9f..53602731e562 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-20.08.1
+++ b/metadata/md5-cache/kde-apps/kaddressbook-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 >=dev-qt/qtdbus-5.
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kaddressbook-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebc309b2a7a7b483fbf8ac4ef2ae48ac
diff --git a/metadata/md5-cache/kde-apps/kajongg-20.04.3 b/metadata/md5-cache/kde-apps/kajongg-20.04.3
index ac7b7d72c0f2..d04f62251d77 100644
--- a/metadata/md5-cache/kde-apps/kajongg-20.04.3
+++ b/metadata/md5-cache/kde-apps/kajongg-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kajongg-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=762dbb5e8df0f4676ce58ae1d5221acf
diff --git a/metadata/md5-cache/kde-apps/kajongg-20.08.1 b/metadata/md5-cache/kde-apps/kajongg-20.08.1
index 55ab75a647cc..d61030c0bce5 100644
--- a/metadata/md5-cache/kde-apps/kajongg-20.08.1
+++ b/metadata/md5-cache/kde-apps/kajongg-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kajongg-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=356ecf9801b3f47ba09896bb665b5d68
diff --git a/metadata/md5-cache/kde-apps/kalarm-20.04.3 b/metadata/md5-cache/kde-apps/kalarm-20.04.3
index 32291217dd46..94d23e1daba8 100644
--- a/metadata/md5-cache/kde-apps/kalarm-20.04.3
+++ b/metadata/md5-cache/kde-apps/kalarm-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.04.3:5 >=kde-apps/akonadi-contacts-20.04.3:5 >=kde-apps/akonadi-mime-20.04.3:5 >=kde-apps/kalarmcal-20.04.3:5 >=kde-apps/kcalutils-20.04.3:5 >=kde-apps/kdepim-apps-libs-20.04.3:5 >=kde-apps/kidentitymanagement-20.04.3:5 >=kde-apps/kmailtransport-20.04.3:5 >=kde-apps/kmime-20.04.3:5 >=kde-apps/kontactinterface-20.04.3:5 >=kde-apps/kpimtextedit-20.04.3:5 >=kde-apps/libkdepim-20.04.3:5 >=kde-apps/mailcommon-20.04.3:5 >=kde-apps/pimcommon-20.04.3:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kcalendarcore-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcontacts-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/kholidays-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) >=kde-apps/kdepim-runtime-20.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kalarm-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c37b3bfc23490607ed8bfb04e0c625e
diff --git a/metadata/md5-cache/kde-apps/kalarm-20.08.1 b/metadata/md5-cache/kde-apps/kalarm-20.08.1
index 1155f078be7b..f46befd7a4f2 100644
--- a/metadata/md5-cache/kde-apps/kalarm-20.08.1
+++ b/metadata/md5-cache/kde-apps/kalarm-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-apps/akonadi-mime-20.08.1:5 >=kde-apps/kalarmcal-20.08.1:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/kmailtransport-20.08.1:5 >=kde-apps/kmime-20.08.1:5 >=kde-apps/kontactinterface-20.08.1:5 >=kde-apps/kpimtextedit-20.08.1:5 >=kde-apps/mailcommon-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/kauth-5.72.0:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kcodecs-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kglobalaccel-5.72.0:5 >=kde-frameworks/kguiaddons-5.72.0:5 >=kde-frameworks/kholidays-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kitemmodels-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=media-libs/phonon-4.11.0 X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) >=kde-apps/kdepim-runtime-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kalarm-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16c19bde9e5ec29bd4156e405d45c83d
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-20.04.3 b/metadata/md5-cache/kde-apps/kalarmcal-20.04.3
index 34a3c2a2b90f..6acc42163999 100644
--- a/metadata/md5-cache/kde-apps/kalarmcal-20.04.3
+++ b/metadata/md5-cache/kde-apps/kalarmcal-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-apps/akonadi-20.04.3:5 >=kde-apps/kcalutil
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kalarmcal-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39cf7fc1736b820a9c282609f1777205
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-20.08.1 b/metadata/md5-cache/kde-apps/kalarmcal-20.08.1
index 0a393808bc76..933cf8ae406d 100644
--- a/metadata/md5-cache/kde-apps/kalarmcal-20.08.1
+++ b/metadata/md5-cache/kde-apps/kalarmcal-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/kcalutil
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kalarmcal-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cea4c5ff1745cf79c147c061fb1190a9
diff --git a/metadata/md5-cache/kde-apps/kalgebra-20.04.3 b/metadata/md5-cache/kde-apps/kalgebra-20.04.3
index a15964db2e7e..82f8801da99c 100644
--- a/metadata/md5-cache/kde-apps/kalgebra-20.04.3
+++ b/metadata/md5-cache/kde-apps/kalgebra-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/analitza-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 readline? ( sys-libs/readline:0= ) >=dev-qt/qtquickcontrols-5.14.2:5 >=kde-frameworks/kirigami-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kalgebra-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1c16cdd85c9d3010683e8103855eb144
diff --git a/metadata/md5-cache/kde-apps/kalgebra-20.08.1 b/metadata/md5-cache/kde-apps/kalgebra-20.08.1
index 81010a126be9..6e81d0955b64 100644
--- a/metadata/md5-cache/kde-apps/kalgebra-20.08.1
+++ b/metadata/md5-cache/kde-apps/kalgebra-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/analitza-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 readline? ( sys-libs/readline:0= ) >=dev-qt/qtquickcontrols-5.14.2:5 >=kde-frameworks/kirigami-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kalgebra-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38100cdc8ce68aeb1e5ce32642b9099f
diff --git a/metadata/md5-cache/kde-apps/kalzium-20.04.3 b/metadata/md5-cache/kde-apps/kalzium-20.04.3
index df3c1bf74638..8ff29f0f9168 100644
--- a/metadata/md5-cache/kde-apps/kalzium-20.04.3
+++ b/metadata/md5-cache/kde-apps/kalzium-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kplotting-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kunitconversion-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 editor? ( dev-cpp/eigen:3 >=dev-qt/qtopengl-5.14.2:5 >=kde-frameworks/knewstuff-5.70.0:5 sci-chemistry/openbabel >=sci-libs/avogadrolibs-1.93[qt5] ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kalzium-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=22e10c409a6a4af84760b0cbd1d7d445
diff --git a/metadata/md5-cache/kde-apps/kalzium-20.08.1 b/metadata/md5-cache/kde-apps/kalzium-20.08.1
index 6ecb2aa9d766..1e1044e1afea 100644
--- a/metadata/md5-cache/kde-apps/kalzium-20.08.1
+++ b/metadata/md5-cache/kde-apps/kalzium-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kplotting-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kunitconversion-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 editor? ( dev-cpp/eigen:3 >=dev-qt/qtopengl-5.14.2:5 >=kde-frameworks/knewstuff-5.72.0:5 sci-chemistry/openbabel >=sci-libs/avogadrolibs-1.93[qt5] ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kalzium-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c112a01ec13b562b93bd9560e2db3ddf
diff --git a/metadata/md5-cache/kde-apps/kamera-20.04.3 b/metadata/md5-cache/kde-apps/kamera-20.04.3
index 158d90829186..8798152c67de 100644
--- a/metadata/md5-cache/kde-apps/kamera-20.04.3
+++ b/metadata/md5-cache/kde-apps/kamera-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 media-libs/libgphoto2:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kamera-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b519980c6fa1d5c58b6f85a312a56685
diff --git a/metadata/md5-cache/kde-apps/kamera-20.08.1 b/metadata/md5-cache/kde-apps/kamera-20.08.1
index 27686e8cb96a..cf068e3584b9 100644
--- a/metadata/md5-cache/kde-apps/kamera-20.08.1
+++ b/metadata/md5-cache/kde-apps/kamera-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 media-libs/libgphoto2:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kamera-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e31c216a992e782342d3d1753440bf37
diff --git a/metadata/md5-cache/kde-apps/kamoso-20.04.3 b/metadata/md5-cache/kde-apps/kamoso-20.04.3
index ad8220ff088c..aa403b229113 100644
--- a/metadata/md5-cache/kde-apps/kamoso-20.04.3
+++ b/metadata/md5-cache/kde-apps/kamoso-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kamoso-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84993048236ce29fe0af03afcb2020f4
diff --git a/metadata/md5-cache/kde-apps/kamoso-20.08.1 b/metadata/md5-cache/kde-apps/kamoso-20.08.1
index 12cdd36e5ce5..33aeb94d71aa 100644
--- a/metadata/md5-cache/kde-apps/kamoso-20.08.1
+++ b/metadata/md5-cache/kde-apps/kamoso-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kamoso-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a9d87707daf259d604ec3bf7f5d6389
diff --git a/metadata/md5-cache/kde-apps/kanagram-20.04.3 b/metadata/md5-cache/kde-apps/kanagram-20.04.3
index f1a0799de4a1..4972e45e77c2 100644
--- a/metadata/md5-cache/kde-apps/kanagram-20.04.3
+++ b/metadata/md5-cache/kde-apps/kanagram-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkeduvocdocument-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/sonnet-5.70.0:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.14.2:5 ) >=dev-qt/qtmultimedia-5.14.2:5[qml] >=dev-qt/qtquickcontrols-5.14.2:5 >=kde-apps/kdeedu-data-20.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kanagram-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aa5660626e5152a14fca7dfce0213d7e
diff --git a/metadata/md5-cache/kde-apps/kanagram-20.08.1 b/metadata/md5-cache/kde-apps/kanagram-20.08.1
index 41dd66c1f246..17e139c97391 100644
--- a/metadata/md5-cache/kde-apps/kanagram-20.08.1
+++ b/metadata/md5-cache/kde-apps/kanagram-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkeduvocdocument-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/sonnet-5.72.0:5 >=media-libs/phonon-4.11.0 speech? ( >=dev-qt/qtspeech-5.14.2:5 ) >=dev-qt/qtmultimedia-5.14.2:5[qml] >=dev-qt/qtquickcontrols-5.14.2:5 >=kde-apps/kdeedu-data-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kanagram-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82297b408c321eea87653732bb52255e
diff --git a/metadata/md5-cache/kde-apps/kapman-20.04.3 b/metadata/md5-cache/kde-apps/kapman-20.04.3
index cd80ffa8ce62..39e9d2a4f70c 100644
--- a/metadata/md5-cache/kde-apps/kapman-20.04.3
+++ b/metadata/md5-cache/kde-apps/kapman-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kapman-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bda00ba7955000e8482a4d5e8d8ba27c
diff --git a/metadata/md5-cache/kde-apps/kapman-20.08.1 b/metadata/md5-cache/kde-apps/kapman-20.08.1
index fe6985c438c7..f9a28c399c6d 100644
--- a/metadata/md5-cache/kde-apps/kapman-20.08.1
+++ b/metadata/md5-cache/kde-apps/kapman-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kapman-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c632e401b2dc88c1ef53249f3e9692f
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-20.04.3 b/metadata/md5-cache/kde-apps/kapptemplate-20.04.3
index 7324a842ed4b..d9909d50a1bd 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-20.04.3
+++ b/metadata/md5-cache/kde-apps/kapptemplate-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kar
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kapptemplate-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ed070724f9adb5f84999c6457ca33943
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-20.08.1 b/metadata/md5-cache/kde-apps/kapptemplate-20.08.1
index 394769098316..85d7801a4ca6 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-20.08.1
+++ b/metadata/md5-cache/kde-apps/kapptemplate-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kar
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kapptemplate-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f032f3f183785482babbfab25354b8d
diff --git a/metadata/md5-cache/kde-apps/kate-20.04.3 b/metadata/md5-cache/kde-apps/kate-20.04.3
index 9869dcb727ee..f2f448a880a6 100644
--- a/metadata/md5-cache/kde-apps/kate-20.04.3
+++ b/metadata/md5-cache/kde-apps/kate-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kate-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8edcccde27c986dd94df7fedf3e957ba
diff --git a/metadata/md5-cache/kde-apps/kate-20.08.1 b/metadata/md5-cache/kde-apps/kate-20.08.1
index cf668656fc1f..6696a791edc7 100644
--- a/metadata/md5-cache/kde-apps/kate-20.08.1
+++ b/metadata/md5-cache/kde-apps/kate-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kate-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0936fc88769cc9bbf1e3ca8137dc990b
diff --git a/metadata/md5-cache/kde-apps/katomic-20.04.3 b/metadata/md5-cache/kde-apps/katomic-20.04.3
index 7103b1dd08cb..830d44a6bbe6 100644
--- a/metadata/md5-cache/kde-apps/katomic-20.04.3
+++ b/metadata/md5-cache/kde-apps/katomic-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/katomic-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=73b144e18ca2a05408622c496706c510
diff --git a/metadata/md5-cache/kde-apps/katomic-20.08.1 b/metadata/md5-cache/kde-apps/katomic-20.08.1
index 45abbf9c80e7..75600c1da2d6 100644
--- a/metadata/md5-cache/kde-apps/katomic-20.08.1
+++ b/metadata/md5-cache/kde-apps/katomic-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/katomic-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7cbf0a7e3fed07a7113e8367ebd7eaff
diff --git a/metadata/md5-cache/kde-apps/kbackup-20.04.3 b/metadata/md5-cache/kde-apps/kbackup-20.04.3
index 72373d79dbc9..7750021a446c 100644
--- a/metadata/md5-cache/kde-apps/kbackup-20.04.3
+++ b/metadata/md5-cache/kde-apps/kbackup-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kbackup-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eacf0668aa1aa3f014818480831649db
diff --git a/metadata/md5-cache/kde-apps/kbackup-20.08.1 b/metadata/md5-cache/kde-apps/kbackup-20.08.1
index 5595876b3528..dd2b67df6cf5 100644
--- a/metadata/md5-cache/kde-apps/kbackup-20.08.1
+++ b/metadata/md5-cache/kde-apps/kbackup-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kbackup-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f5a14ad05a45d644c29002316e7a6cf
diff --git a/metadata/md5-cache/kde-apps/kblackbox-20.04.3 b/metadata/md5-cache/kde-apps/kblackbox-20.04.3
index 27eb201cb624..a88be49a2815 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-20.04.3
+++ b/metadata/md5-cache/kde-apps/kblackbox-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kblackbox-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a24834108034e1df2f8519b0131aedfb
diff --git a/metadata/md5-cache/kde-apps/kblackbox-20.08.1 b/metadata/md5-cache/kde-apps/kblackbox-20.08.1
index fd1969efd2ee..26e948f622d7 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-20.08.1
+++ b/metadata/md5-cache/kde-apps/kblackbox-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kblackbox-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97fede7bfd0e917dcaabda95a5abdb7c
diff --git a/metadata/md5-cache/kde-apps/kblocks-20.04.3 b/metadata/md5-cache/kde-apps/kblocks-20.04.3
index a623d79db8cc..03d3cf1b6dda 100644
--- a/metadata/md5-cache/kde-apps/kblocks-20.04.3
+++ b/metadata/md5-cache/kde-apps/kblocks-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kblocks-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e30c98f8b7f088948385532888f3b8a
diff --git a/metadata/md5-cache/kde-apps/kblocks-20.08.1 b/metadata/md5-cache/kde-apps/kblocks-20.08.1
index 2ab6a7ec2d91..303efe0ea581 100644
--- a/metadata/md5-cache/kde-apps/kblocks-20.08.1
+++ b/metadata/md5-cache/kde-apps/kblocks-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kblocks-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b4f0335a44605c21d8a3b7800db9a9a
diff --git a/metadata/md5-cache/kde-apps/kbounce-20.04.3 b/metadata/md5-cache/kde-apps/kbounce-20.04.3
index e7cf3b03ce2a..81e04429e46a 100644
--- a/metadata/md5-cache/kde-apps/kbounce-20.04.3
+++ b/metadata/md5-cache/kde-apps/kbounce-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kbounce-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=516e0c0e734d2451ab3f423f603a89c1
diff --git a/metadata/md5-cache/kde-apps/kbounce-20.08.1 b/metadata/md5-cache/kde-apps/kbounce-20.08.1
index 55fc1913d1f3..263019af339e 100644
--- a/metadata/md5-cache/kde-apps/kbounce-20.08.1
+++ b/metadata/md5-cache/kde-apps/kbounce-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kbounce-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd013c624f1bcb7871e94a16b0a1655e
diff --git a/metadata/md5-cache/kde-apps/kbreakout-20.04.3 b/metadata/md5-cache/kde-apps/kbreakout-20.04.3
index 255e3118df40..644735406789 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-20.04.3
+++ b/metadata/md5-cache/kde-apps/kbreakout-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kbreakout-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d293a05449639eaf37d8e59548c173c9
diff --git a/metadata/md5-cache/kde-apps/kbreakout-20.08.1 b/metadata/md5-cache/kde-apps/kbreakout-20.08.1
index 8f25dcc8258e..65596075c701 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-20.08.1
+++ b/metadata/md5-cache/kde-apps/kbreakout-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kbreakout-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1a77ca924075527bfc8cb1f6ed13e7b
diff --git a/metadata/md5-cache/kde-apps/kbruch-20.04.3 b/metadata/md5-cache/kde-apps/kbruch-20.04.3
index 8a7bfc3c84cb..5823a9276344 100644
--- a/metadata/md5-cache/kde-apps/kbruch-20.04.3
+++ b/metadata/md5-cache/kde-apps/kbruch-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kbruch-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=37a1b332d7de38009361788bda6db09f
diff --git a/metadata/md5-cache/kde-apps/kbruch-20.08.1 b/metadata/md5-cache/kde-apps/kbruch-20.08.1
index f6aeade79b41..fd1815138596 100644
--- a/metadata/md5-cache/kde-apps/kbruch-20.08.1
+++ b/metadata/md5-cache/kde-apps/kbruch-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kbruch-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b95ea0a9588e948ffd8e43403ef6cbe6
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-20.04.3 b/metadata/md5-cache/kde-apps/kcachegrind-20.04.3
index 202119393214..90c7407bd2eb 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-20.04.3
+++ b/metadata/md5-cache/kde-apps/kcachegrind-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 media-gfx/graphviz || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kcachegrind-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b79fe98af69cd8e621a001458047792f
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-20.08.1 b/metadata/md5-cache/kde-apps/kcachegrind-20.08.1
index cd3100bf4209..de286206255d 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-20.08.1
+++ b/metadata/md5-cache/kde-apps/kcachegrind-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 media-gfx/graphviz || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kcachegrind-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b5f7d1e30786eb4ca1957b3b95562ec7
diff --git a/metadata/md5-cache/kde-apps/kcalc-20.04.3 b/metadata/md5-cache/kde-apps/kcalc-20.04.3
index 38092ad677f3..7f96919e69ce 100644
--- a/metadata/md5-cache/kde-apps/kcalc-20.04.3
+++ b/metadata/md5-cache/kde-apps/kcalc-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidg
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kcalc-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e40d29625c26c605121fad82246d16b2
diff --git a/metadata/md5-cache/kde-apps/kcalc-20.08.1 b/metadata/md5-cache/kde-apps/kcalc-20.08.1
index 2c8cc7e30038..9ea886b34349 100644
--- a/metadata/md5-cache/kde-apps/kcalc-20.08.1
+++ b/metadata/md5-cache/kde-apps/kcalc-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:0= >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidg
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kcalc-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b91d6a6c443c745c5c805c6c2c84a8e
diff --git a/metadata/md5-cache/kde-apps/kcalutils-20.04.3 b/metadata/md5-cache/kde-apps/kcalutils-20.04.3
index 4dedefaf7172..611405d7becc 100644
--- a/metadata/md5-cache/kde-apps/kcalutils-20.04.3
+++ b/metadata/md5-cache/kde-apps/kcalutils-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kcalutils-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d33d135b3a3f08d93d39727c088d9d2
diff --git a/metadata/md5-cache/kde-apps/kcalutils-20.08.1 b/metadata/md5-cache/kde-apps/kcalutils-20.08.1
index eecebbfbe33b..b457c2397833 100644
--- a/metadata/md5-cache/kde-apps/kcalutils-20.08.1
+++ b/metadata/md5-cache/kde-apps/kcalutils-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kcalutils-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f12ed4402d687a80f148794ee87a240b
diff --git a/metadata/md5-cache/kde-apps/kcharselect-20.04.3 b/metadata/md5-cache/kde-apps/kcharselect-20.04.3
index b3695b8d192a..37f274eb904f 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-20.04.3
+++ b/metadata/md5-cache/kde-apps/kcharselect-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kbookmarks-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kcharselect-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f67fbcc7903fd02f03226dbeb49a15e4
diff --git a/metadata/md5-cache/kde-apps/kcharselect-20.08.1 b/metadata/md5-cache/kde-apps/kcharselect-20.08.1
index 9878d65cabd1..b62292f59b31 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-20.08.1
+++ b/metadata/md5-cache/kde-apps/kcharselect-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kbookmarks-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kcharselect-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f40f5e4a0b568f79f61a8c2049413853
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-20.04.3 b/metadata/md5-cache/kde-apps/kcolorchooser-20.04.3
index 52d66bb500a3..e534bc25703d 100644
--- a/metadata/md5-cache/kde-apps/kcolorchooser-20.04.3
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-20.04.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kcolorchooser-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4c3f3ea7d41f097691c2f66108db4c2
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-20.08.1 b/metadata/md5-cache/kde-apps/kcolorchooser-20.08.1
index 34cf92879c3a..51106660c63b 100644
--- a/metadata/md5-cache/kde-apps/kcolorchooser-20.08.1
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-20.08.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kcolorchooser-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c45db13bb264b3fd6ed8c716f782cd0
diff --git a/metadata/md5-cache/kde-apps/kcron-20.04.3 b/metadata/md5-cache/kde-apps/kcron-20.04.3
index 594ae95f31a2..89e71da56d1b 100644
--- a/metadata/md5-cache/kde-apps/kcron-20.04.3
+++ b/metadata/md5-cache/kde-apps/kcron-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 virtual/cron || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kcron-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25ae8ca387d51e8f7f13df5d031f86aa
diff --git a/metadata/md5-cache/kde-apps/kcron-20.08.1 b/metadata/md5-cache/kde-apps/kcron-20.08.1
index 9c2dbfa3252b..aec9941bf6a2 100644
--- a/metadata/md5-cache/kde-apps/kcron-20.08.1
+++ b/metadata/md5-cache/kde-apps/kcron-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 virtual/cron || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kcron-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38256366c8bbfbb7b182322ccd31c9d7
diff --git a/metadata/md5-cache/kde-apps/kdav-20.04.3 b/metadata/md5-cache/kde-apps/kdav-20.04.3
index 26c7a0e44b11..23a4f6aed391 100644
--- a/metadata/md5-cache/kde-apps/kdav-20.04.3
+++ b/metadata/md5-cache/kde-apps/kdav-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=dev-qt/qtxmlpatterns-5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdav-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f393851aa3e75b3eed59a5813bfb6b36
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-20.04.3 b/metadata/md5-cache/kde-apps/kde-dev-scripts-20.04.3
index 17d89cf5979e..bc3b97de99ae 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-20.04.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kde-dev-scripts-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23884e901a872d882bcc4c204d1f47a9
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-20.08.1 b/metadata/md5-cache/kde-apps/kde-dev-scripts-20.08.1
index c12349df2e5e..8f63695b0055 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-20.08.1
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kde-dev-scripts-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb0620cc72031a974c09533765582acc
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-20.04.3 b/metadata/md5-cache/kde-apps/kde-dev-utils-20.04.3
index 4bf21d5d3fa3..4d84a2bc8fe1 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-20.04.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/designer-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kde-dev-utils-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98182ba941c5706a21a4447164810194
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-20.08.1 b/metadata/md5-cache/kde-apps/kde-dev-utils-20.08.1
index 8b3beb74c1c5..f773423e12a5 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-20.08.1
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/designer-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kde-dev-utils-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbb3e4482ca3aa4630d6f3814d827fe9
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-20.04.3 b/metadata/md5-cache/kde-apps/kdebugsettings-20.04.3
index f0666de566f8..2d8df81511a2 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-20.04.3
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kco
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdebugsettings-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdd01de137f9e3f5c8b9d1cdac9d4d41
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-20.08.1 b/metadata/md5-cache/kde-apps/kdebugsettings-20.08.1
index a4af9ad3c61e..00cadecec1ea 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-20.08.1
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kco
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdebugsettings-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=844217548bbe5de8acd2facd540c8dc1
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-20.04.3 b/metadata/md5-cache/kde-apps/kdeedu-data-20.04.3
index aae7fa29626e..beda158b1ea9 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-20.04.3
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-20.04.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdeedu-data-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f77eac57cf162dc94b85f1cd9649f5e0
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-20.08.1 b/metadata/md5-cache/kde-apps/kdeedu-data-20.08.1
index 9e7b77ad6b92..de474752d1c1 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-20.08.1
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-20.08.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdeedu-data-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85e6a3aa3db4f36da9fba6caa825e54d
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.04.3 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.04.3
index 7e81af60408e..113de11c9451 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.04.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 thumbnail? ( >=kde-frameworks/kio-5.70.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdegraphics-mobipocket-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94eed3fdf5918ec7852e6b4dfc40488d
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.08.1 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.08.1
index c907a1d7fe96..9f7d68988e91 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.08.1
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 thumbnail? ( >=kde-frameworks/kio-5.72.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdegraphics-mobipocket-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c09807a1afb6a4eb6bcb7621718eeb2
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.04.3 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.04.3
index eac602104c17..ce276275547d 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.04.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdenetwork-filesharing-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0de99490396db8b4aeba77a6e988213e
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.08.1 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.08.1
index 785ab7c5e7d3..1a113b3a7bad 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.08.1
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdenetwork-filesharing-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf08a01d6a7ceb487728f4675d6ef2e3
diff --git a/metadata/md5-cache/kde-apps/kdenlive-20.04.3 b/metadata/md5-cache/kde-apps/kdenlive-20.04.3
index cf2af0edb272..ffe44a5e21c1 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-20.04.3
+++ b/metadata/md5-cache/kde-apps/kdenlive-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/rttr >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=d
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdenlive-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3226e800a911896c3e45e73596e8f2e2
diff --git a/metadata/md5-cache/kde-apps/kdenlive-20.08.1 b/metadata/md5-cache/kde-apps/kdenlive-20.08.1
index 6b524f30e3e0..b4baa6c08d02 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-20.08.1
+++ b/metadata/md5-cache/kde-apps/kdenlive-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/rttr >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=d
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdenlive-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2837390a53f4a5f8c062c495c0e7d86c
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-20.04.3 b/metadata/md5-cache/kde-apps/kdepim-addons-20.04.3
index 62b693c8e0ff..901c2111762d 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-20.04.3
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdepim-addons-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9754efb22b64ed41c293b8b9230c5250
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-20.08.1 b/metadata/md5-cache/kde-apps/kdepim-addons-20.08.1
index b607f2ceb1df..96d9a49a5bed 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-20.08.1
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdepim-addons-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=947bbabd4d17168b8b84d258f05f17ea
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.04.3 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.04.3
index 2fbe351852b0..7ffe94958a6b 100644
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.04.3
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdepim-apps-libs-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=992a9c063072ce3d4510881228b17c71
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.08.1 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.08.1
index dcbad7e4b138..2312d48f3331 100644
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.08.1
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdepim-apps-libs-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7950bd32b5ca1b9e7d40020061d47296
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-20.04.3-r1 b/metadata/md5-cache/kde-apps/kdepim-runtime-20.04.3-r1
index 68cf01996c0c..d8e2fdc2922b 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-20.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-20.04.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/qca-2.3.0:2 dev-libs/cyrus-sasl:2 dev-libs/libical:= >=dev-q
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdepim-runtime-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee039058d3aa4cfe82919ba31ba25e92
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-20.08.1 b/metadata/md5-cache/kde-apps/kdepim-runtime-20.08.1
index a91548437513..6a91d2a7d8ed 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-20.08.1
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/qca-2.3.0:2 dev-libs/cyrus-sasl:2 dev-libs/libical:= >=dev-q
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdepim-runtime-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3d868a6af7c049ece855cee866f362f
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.04.3 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.04.3
index 06f3b14de677..251012a7a93a 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.04.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdesdk-kioslaves-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80d867bc92b9bbb78606bcd8ba65b13a
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.08.1 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.08.1
index 9362c8705e54..69be05455b53 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.08.1
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdesdk-kioslaves-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b5620cb9bdc85968b0cbf484de3dfe7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.04.3 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.04.3
index cd428397c608..3bb4c37a5f4c 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.04.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdesdk-thumbnailers-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eabbee37aaa2672e69566e62e0901eea
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.08.1 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.08.1
index ca49c48a8642..71e38e8c88e5 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.08.1
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdesdk-thumbnailers-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=33e2bc8eb58109df58823e71641be062
diff --git a/metadata/md5-cache/kde-apps/kdf-20.04.3 b/metadata/md5-cache/kde-apps/kdf-20.04.3
index 256e7df3fcaa..63c4115253f2 100644
--- a/metadata/md5-cache/kde-apps/kdf-20.04.3
+++ b/metadata/md5-cache/kde-apps/kdf-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdf-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5e398bbaa17d41f9b048a9af8ddb222
diff --git a/metadata/md5-cache/kde-apps/kdf-20.08.1 b/metadata/md5-cache/kde-apps/kdf-20.08.1
index 504a5f730ff5..9c3ca1907cff 100644
--- a/metadata/md5-cache/kde-apps/kdf-20.08.1
+++ b/metadata/md5-cache/kde-apps/kdf-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdf-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a07ff1baa2d3f63e47fe29f0f014c0c9
diff --git a/metadata/md5-cache/kde-apps/kdialog-20.04.3 b/metadata/md5-cache/kde-apps/kdialog-20.04.3
index 11d4b4d78c10..258dcb2131f6 100644
--- a/metadata/md5-cache/kde-apps/kdialog-20.04.3
+++ b/metadata/md5-cache/kde-apps/kdialog-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdialog-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b1cf4e1338f272d9d466845d47296ad
diff --git a/metadata/md5-cache/kde-apps/kdialog-20.08.1 b/metadata/md5-cache/kde-apps/kdialog-20.08.1
index d9f3ff2822c1..9871c622867c 100644
--- a/metadata/md5-cache/kde-apps/kdialog-20.08.1
+++ b/metadata/md5-cache/kde-apps/kdialog-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdialog-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1a41893f7fd2d7d866e3eec53c2cb85
diff --git a/metadata/md5-cache/kde-apps/kdiamond-20.04.3 b/metadata/md5-cache/kde-apps/kdiamond-20.04.3
index a53eb5c8770a..f0ba2c1e9db2 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-20.04.3
+++ b/metadata/md5-cache/kde-apps/kdiamond-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdiamond-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52ede6814dc9582965319a6e361eddc3
diff --git a/metadata/md5-cache/kde-apps/kdiamond-20.08.1 b/metadata/md5-cache/kde-apps/kdiamond-20.08.1
index 813030a35878..35ec2eeaab59 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-20.08.1
+++ b/metadata/md5-cache/kde-apps/kdiamond-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/knotifyconfig-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdiamond-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1769e9a8d51cb1b973b7413d0212da9
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-20.04.3 b/metadata/md5-cache/kde-apps/keditbookmarks-20.04.3
index dc06a8ff90f3..60aecb3cca02 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-20.04.3
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/keditbookmarks-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=631f6415bfa909acda6d8c69e72bc6df
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-20.08.1 b/metadata/md5-cache/kde-apps/keditbookmarks-20.08.1
index ef9a346978ec..85a38654f2ad 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-20.08.1
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/keditbookmarks-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=143d8c38950933352348690a7b12a7ee
diff --git a/metadata/md5-cache/kde-apps/kfind-20.04.3 b/metadata/md5-cache/kde-apps/kfind-20.04.3
index 2fc8672163ee..9ffc3d8e5ea2 100644
--- a/metadata/md5-cache/kde-apps/kfind-20.04.3
+++ b/metadata/md5-cache/kde-apps/kfind-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kfilemetadata-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kfind-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6b06de00140d1304bc7ae9a15a92c3a6
diff --git a/metadata/md5-cache/kde-apps/kfind-20.08.1 b/metadata/md5-cache/kde-apps/kfind-20.08.1
index be0ce5bf73c9..7cc489acad12 100644
--- a/metadata/md5-cache/kde-apps/kfind-20.08.1
+++ b/metadata/md5-cache/kde-apps/kfind-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kfilemetadata-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kfind-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d9b0177150044e66c0a66e79f3f9f70c
diff --git a/metadata/md5-cache/kde-apps/kfloppy-20.04.3 b/metadata/md5-cache/kde-apps/kfloppy-20.04.3
index cbfd9e35a4a6..d51adf3e8ec9 100644
--- a/metadata/md5-cache/kde-apps/kfloppy-20.04.3
+++ b/metadata/md5-cache/kde-apps/kfloppy-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kfloppy-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82b2529ff73fb9650fe63f8610975682
diff --git a/metadata/md5-cache/kde-apps/kfloppy-20.08.1 b/metadata/md5-cache/kde-apps/kfloppy-20.08.1
index f5e27cfc6f1f..ba9df1c94abe 100644
--- a/metadata/md5-cache/kde-apps/kfloppy-20.08.1
+++ b/metadata/md5-cache/kde-apps/kfloppy-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kfloppy-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3965f78c2c6cfed50435b818e9a97e6d
diff --git a/metadata/md5-cache/kde-apps/kfourinline-20.04.3 b/metadata/md5-cache/kde-apps/kfourinline-20.04.3
index da8dce2f7dfb..a29691017c69 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-20.04.3
+++ b/metadata/md5-cache/kde-apps/kfourinline-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdnssd-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kfourinline-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1beae9a703b4da05949afd6a45e4137
diff --git a/metadata/md5-cache/kde-apps/kfourinline-20.08.1 b/metadata/md5-cache/kde-apps/kfourinline-20.08.1
index 8e6d5fd56840..e661ef8d76f1 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-20.08.1
+++ b/metadata/md5-cache/kde-apps/kfourinline-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdnssd-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kfourinline-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41ae4503c007a933bc7d9571771a4973
diff --git a/metadata/md5-cache/kde-apps/kgeography-20.04.3 b/metadata/md5-cache/kde-apps/kgeography-20.04.3
index d31a4106eb9e..6da1377d9274 100644
--- a/metadata/md5-cache/kde-apps/kgeography-20.04.3
+++ b/metadata/md5-cache/kde-apps/kgeography-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kgeography-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c9a1384d2a0b9f92d3a6108dbf249b8
diff --git a/metadata/md5-cache/kde-apps/kgeography-20.08.1 b/metadata/md5-cache/kde-apps/kgeography-20.08.1
index a91d58ffaa5e..3c815096d098 100644
--- a/metadata/md5-cache/kde-apps/kgeography-20.08.1
+++ b/metadata/md5-cache/kde-apps/kgeography-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kgeography-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82d1a987ce518bcdff8c28e960836549
diff --git a/metadata/md5-cache/kde-apps/kget-20.04.3 b/metadata/md5-cache/kde-apps/kget-20.04.3
index d46f9aec11c1..fbd68ce7ab01 100644
--- a/metadata/md5-cache/kde-apps/kget-20.04.3
+++ b/metadata/md5-cache/kde-apps/kget-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kget-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=428548c16073efca966768f26837f10b
diff --git a/metadata/md5-cache/kde-apps/kget-20.08.1 b/metadata/md5-cache/kde-apps/kget-20.08.1
index e131277c6773..92455f742167 100644
--- a/metadata/md5-cache/kde-apps/kget-20.08.1
+++ b/metadata/md5-cache/kde-apps/kget-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kget-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ed1169a98a21484a4c0e1b452aa0647c
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-20.04.3 b/metadata/md5-cache/kde-apps/kgoldrunner-20.04.3
index c5aa3ea653b2..39bc1509c8b4 100644
--- a/metadata/md5-cache/kde-apps/kgoldrunner-20.04.3
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 media-libs/libsndfile media-libs/openal >=dev-qt/qtsvg-5.14.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kgoldrunner-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4cd8370a23d7527632358cdcf37b6605
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-20.08.1 b/metadata/md5-cache/kde-apps/kgoldrunner-20.08.1
index f1430c8ac153..7dc38ac296c1 100644
--- a/metadata/md5-cache/kde-apps/kgoldrunner-20.08.1
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 media-libs/libsndfile media-libs/openal >=dev-qt/qtsvg-5.14.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kgoldrunner-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a8a566af4ab8ce29e5b06fe45820e15
diff --git a/metadata/md5-cache/kde-apps/kgpg-20.04.3 b/metadata/md5-cache/kde-apps/kgpg-20.04.3
index 6c5a1fdc5f67..0002a01e9b0e 100644
--- a/metadata/md5-cache/kde-apps/kgpg-20.04.3
+++ b/metadata/md5-cache/kde-apps/kgpg-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.04.3:5 >=kde-apps/akonadi-contacts-20.04.3:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcontacts-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 app-crypt/gnupg || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-gpg )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kgpg-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c946a4e37eb1f4c9d87a0c7ab477242c
diff --git a/metadata/md5-cache/kde-apps/kgpg-20.08.1 b/metadata/md5-cache/kde-apps/kgpg-20.08.1
index fb1aa14e9f47..d6529c6a0f46 100644
--- a/metadata/md5-cache/kde-apps/kgpg-20.08.1
+++ b/metadata/md5-cache/kde-apps/kgpg-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/akonadi-contacts-20.08.1:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kcodecs-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcontacts-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 app-crypt/gnupg || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-gpg )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kgpg-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a6de467e338e2903b9802e0e4dcc1c6
diff --git a/metadata/md5-cache/kde-apps/khangman-20.04.3 b/metadata/md5-cache/kde-apps/khangman-20.04.3
index 186b022cfdae..a28b3108a63e 100644
--- a/metadata/md5-cache/kde-apps/khangman-20.04.3
+++ b/metadata/md5-cache/kde-apps/khangman-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkeduvocdocument-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 media-libs/phonon[qt5(+)] >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtmultimedia-5.14.2:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=kde-apps/kdeedu-data-20.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/khangman-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d605c0343900330b7e9d587836f59acd
diff --git a/metadata/md5-cache/kde-apps/khangman-20.08.1 b/metadata/md5-cache/kde-apps/khangman-20.08.1
index 88ce764d245c..f0c4bae4532d 100644
--- a/metadata/md5-cache/kde-apps/khangman-20.08.1
+++ b/metadata/md5-cache/kde-apps/khangman-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkeduvocdocument-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=media-libs/phonon-4.11.0 >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtmultimedia-5.14.2:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=kde-apps/kdeedu-data-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/khangman-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=030b8e4ff994d64de86240911f123c80
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-20.04.3 b/metadata/md5-cache/kde-apps/khelpcenter-20.04.3
index fc06a2d9ac16..1eb50c1f29e5 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-20.04.3
+++ b/metadata/md5-cache/kde-apps/khelpcenter-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kbookmarks-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdoctools-5.70.0:5 >=kde-frameworks/khtml-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kinit-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/khelpcenter-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6fb2da3e7cf3f0f0eadb5942db00d1c5
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-20.08.1 b/metadata/md5-cache/kde-apps/khelpcenter-20.08.1
index f56b1f6fa1dd..73f31e74f0c4 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-20.08.1
+++ b/metadata/md5-cache/kde-apps/khelpcenter-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kbookmarks-5.72.0:5 >=kde-frameworks/kcodecs-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdoctools-5.72.0:5 >=kde-frameworks/khtml-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kinit-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/khelpcenter-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbc1540c75b188b09f0e3d1670887cc9
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-20.04.3 b/metadata/md5-cache/kde-apps/kidentitymanagement-20.04.3
index aff0028d7e45..0c1c23db17bf 100644
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-20.04.3
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kidentitymanagement-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de4fc3e6ad3d326c4ffabc398a170a0d
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-20.08.1 b/metadata/md5-cache/kde-apps/kidentitymanagement-20.08.1
index 3dc4f5b2e739..88391f61f7e4 100644
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-20.08.1
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kidentitymanagement-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da897ec8795dccdd83dcd1e619005618
diff --git a/metadata/md5-cache/kde-apps/kig-20.04.3 b/metadata/md5-cache/kde-apps/kig-20.04.3
index 783e26da7ae6..853925af1e4c 100644
--- a/metadata/md5-cache/kde-apps/kig-20.04.3
+++ b/metadata/md5-cache/kde-apps/kig-20.04.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kig-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=674e257f34397f91085d47a20d4cd08b
diff --git a/metadata/md5-cache/kde-apps/kig-20.08.1 b/metadata/md5-cache/kde-apps/kig-20.08.1
index 9a1f5b173e15..432b5c703ab6 100644
--- a/metadata/md5-cache/kde-apps/kig-20.08.1
+++ b/metadata/md5-cache/kde-apps/kig-20.08.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kig-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88d22c5b8c318ffaa7d0b63b4989a878
diff --git a/metadata/md5-cache/kde-apps/kigo-20.04.3 b/metadata/md5-cache/kde-apps/kigo-20.04.3
index 147536852904..d11f653fd1e8 100644
--- a/metadata/md5-cache/kde-apps/kigo-20.04.3
+++ b/metadata/md5-cache/kde-apps/kigo-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 games-board/gnugo || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kigo-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ac9c828e0d6553508a504edbcbb137a
diff --git a/metadata/md5-cache/kde-apps/kigo-20.08.1 b/metadata/md5-cache/kde-apps/kigo-20.08.1
index 31d618485d8c..8fb85f88f7ea 100644
--- a/metadata/md5-cache/kde-apps/kigo-20.08.1
+++ b/metadata/md5-cache/kde-apps/kigo-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 games-board/gnugo || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kigo-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2966712d293a10c4e6b13e2f3792958b
diff --git a/metadata/md5-cache/kde-apps/killbots-20.04.3 b/metadata/md5-cache/kde-apps/killbots-20.04.3
index bba8cfebcce9..8b53bf751430 100644
--- a/metadata/md5-cache/kde-apps/killbots-20.04.3
+++ b/metadata/md5-cache/kde-apps/killbots-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/killbots-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9fae0d441b0910c3f2301a87f160b9b
diff --git a/metadata/md5-cache/kde-apps/killbots-20.08.1 b/metadata/md5-cache/kde-apps/killbots-20.08.1
index 8a14c1ad5946..7bc139b936fa 100644
--- a/metadata/md5-cache/kde-apps/killbots-20.08.1
+++ b/metadata/md5-cache/kde-apps/killbots-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/killbots-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6eb6ededf98becc88b11fa670062a5d
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-20.04.3 b/metadata/md5-cache/kde-apps/kimagemapeditor-20.04.3
index 1032a6a746cc..512651797f56 100644
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-20.04.3
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kimagemapeditor-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=21b045a00a872f17c7fbb68574e51fd2
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-20.08.1 b/metadata/md5-cache/kde-apps/kimagemapeditor-20.08.1
index c39b3f61a12b..a45c1e7fca4e 100644
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-20.08.1
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kimagemapeditor-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82d68e6a658bed7f9fa54187ace31a9a
diff --git a/metadata/md5-cache/kde-apps/kimap-20.04.3 b/metadata/md5-cache/kde-apps/kimap-20.04.3
index 2711cf809fff..07dbe3813d41 100644
--- a/metadata/md5-cache/kde-apps/kimap-20.04.3
+++ b/metadata/md5-cache/kde-apps/kimap-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.14.2:5 >=kde-apps/kmime-20.04.3:5 >
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kimap-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27ca73cdee9f762411c9d6dba97f2194
diff --git a/metadata/md5-cache/kde-apps/kimap-20.08.1 b/metadata/md5-cache/kde-apps/kimap-20.08.1
index 33cde2b795c4..57e3f97e4b19 100644
--- a/metadata/md5-cache/kde-apps/kimap-20.08.1
+++ b/metadata/md5-cache/kde-apps/kimap-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.14.2:5 >=kde-apps/kmime-20.08.1:5 >
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kimap-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bfd075b1311a00c9782a08edf116300f
diff --git a/metadata/md5-cache/kde-apps/kio-extras-20.04.3 b/metadata/md5-cache/kde-apps/kio-extras-20.04.3
index 5a07982b9f6f..f6fc9a56b524 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-20.04.3
+++ b/metadata/md5-cache/kde-apps/kio-extras-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kio-extras-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97aa94f05de134faa13d69bf5e199a2d
diff --git a/metadata/md5-cache/kde-apps/kio-extras-20.08.1 b/metadata/md5-cache/kde-apps/kio-extras-20.08.1
index bbe291f1af3d..8212d9e98983 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-20.08.1
+++ b/metadata/md5-cache/kde-apps/kio-extras-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kio-extras-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95245886f75470a9d4bbe2c0743dc02f
diff --git a/metadata/md5-cache/kde-apps/kipi-plugins-20.04.3 b/metadata/md5-cache/kde-apps/kipi-plugins-20.04.3
index 6c1ea34e9a6c..046acfe13093 100644
--- a/metadata/md5-cache/kde-apps/kipi-plugins-20.04.3
+++ b/metadata/md5-cache/kde-apps/kipi-plugins-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtprintsupp
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kipi-plugins-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d0bfe8ff4366ac584118671dbfa41d0
diff --git a/metadata/md5-cache/kde-apps/kipi-plugins-20.08.1 b/metadata/md5-cache/kde-apps/kipi-plugins-20.08.1
index 3aad23bc8e42..c80c3a3582d2 100644
--- a/metadata/md5-cache/kde-apps/kipi-plugins-20.08.1
+++ b/metadata/md5-cache/kde-apps/kipi-plugins-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtprintsupp
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kipi-plugins-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=080de3a85720c717ed343fa461ccdda4
diff --git a/metadata/md5-cache/kde-apps/kiriki-20.04.3 b/metadata/md5-cache/kde-apps/kiriki-20.04.3
index 54b9417dc226..ec564a97753d 100644
--- a/metadata/md5-cache/kde-apps/kiriki-20.04.3
+++ b/metadata/md5-cache/kde-apps/kiriki-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kiriki-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e22fdc10bec5bb60c6f6d2826011fb7b
diff --git a/metadata/md5-cache/kde-apps/kiriki-20.08.1 b/metadata/md5-cache/kde-apps/kiriki-20.08.1
index 3b29b2eba240..221aa20b5d51 100644
--- a/metadata/md5-cache/kde-apps/kiriki-20.08.1
+++ b/metadata/md5-cache/kde-apps/kiriki-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kiriki-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44cf70b121ecb7d1843fd9cb40e2a329
diff --git a/metadata/md5-cache/kde-apps/kiten-20.04.3 b/metadata/md5-cache/kde-apps/kiten-20.04.3
index 7da8458facc2..8e654738159c 100644
--- a/metadata/md5-cache/kde-apps/kiten-20.04.3
+++ b/metadata/md5-cache/kde-apps/kiten-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 media-fonts/kanjistrokeorders || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kiten-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6f09deb3e0d8586fde4fc0ba3f8dd50
diff --git a/metadata/md5-cache/kde-apps/kiten-20.08.1 b/metadata/md5-cache/kde-apps/kiten-20.08.1
index f01591ccee96..023869777019 100644
--- a/metadata/md5-cache/kde-apps/kiten-20.08.1
+++ b/metadata/md5-cache/kde-apps/kiten-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 media-fonts/kanjistrokeorders || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kiten-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb4a56475f49cef082ca73fa73e31df3
diff --git a/metadata/md5-cache/kde-apps/kitinerary-20.04.3 b/metadata/md5-cache/kde-apps/kitinerary-20.04.3
index 510bb614c35c..3f6022dcf915 100644
--- a/metadata/md5-cache/kde-apps/kitinerary-20.04.3
+++ b/metadata/md5-cache/kde-apps/kitinerary-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=kde-apps/kmime
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kitinerary-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d72b4dd123ebdda9032714363a6a870
diff --git a/metadata/md5-cache/kde-apps/kitinerary-20.08.1 b/metadata/md5-cache/kde-apps/kitinerary-20.08.1
index a7b363798b17..36b549b0a818 100644
--- a/metadata/md5-cache/kde-apps/kitinerary-20.08.1
+++ b/metadata/md5-cache/kde-apps/kitinerary-20.08.1
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( pdf )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kitinerary-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2d9bb3bbbeeec9a4481507436b0ae26
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-20.04.3 b/metadata/md5-cache/kde-apps/kjumpingcube-20.04.3
index 46f796949319..9c369d9bc2a5 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-20.04.3
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kjumpingcube-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9dca0364cadfd58b22d648b5ba221c4
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-20.08.1 b/metadata/md5-cache/kde-apps/kjumpingcube-20.08.1
index 7db18bb860aa..d36a94f6e628 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-20.08.1
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kjumpingcube-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d168c92c5d233eb26787755e4403ec02
diff --git a/metadata/md5-cache/kde-apps/kldap-20.04.3 b/metadata/md5-cache/kde-apps/kldap-20.04.3
index 4599eb80fb35..71d33d6b76e9 100644
--- a/metadata/md5-cache/kde-apps/kldap-20.04.3
+++ b/metadata/md5-cache/kde-apps/kldap-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kldap-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4b2e792fba534b7c5c5a4e506144c97
diff --git a/metadata/md5-cache/kde-apps/kldap-20.08.1 b/metadata/md5-cache/kde-apps/kldap-20.08.1
index 5526fae0cea3..34dac2a6cef0 100644
--- a/metadata/md5-cache/kde-apps/kldap-20.08.1
+++ b/metadata/md5-cache/kde-apps/kldap-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kldap-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6946e964a5691afb1b914b6161c6bbf8
diff --git a/metadata/md5-cache/kde-apps/kleopatra-20.04.3-r1 b/metadata/md5-cache/kde-apps/kleopatra-20.04.3-r1
index b9599875d766..95946ec84d1d 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-20.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kleopatra-20.04.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan de
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kleopatra-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=974a47f90413ec6638c374500617d88d
diff --git a/metadata/md5-cache/kde-apps/kleopatra-20.08.1 b/metadata/md5-cache/kde-apps/kleopatra-20.08.1
index 06c525db4ffe..80e1a66bbd07 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-20.08.1
+++ b/metadata/md5-cache/kde-apps/kleopatra-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan de
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kleopatra-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c834ba086d5dd1841b449cf410cc9822
diff --git a/metadata/md5-cache/kde-apps/klettres-20.04.3 b/metadata/md5-cache/kde-apps/klettres-20.04.3
index 5d51b0bc0906..3b90595370c1 100644
--- a/metadata/md5-cache/kde-apps/klettres-20.04.3
+++ b/metadata/md5-cache/kde-apps/klettres-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/klettres-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e2a23f14cbb87eaf7ec23735abd907d
diff --git a/metadata/md5-cache/kde-apps/klettres-20.08.1 b/metadata/md5-cache/kde-apps/klettres-20.08.1
index a1a883d405b8..e42bf910bbf0 100644
--- a/metadata/md5-cache/kde-apps/klettres-20.08.1
+++ b/metadata/md5-cache/kde-apps/klettres-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/klettres-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b603481da35c62c02538d72a33185e64
diff --git a/metadata/md5-cache/kde-apps/klickety-20.04.3 b/metadata/md5-cache/kde-apps/klickety-20.04.3
index 909783f3da5f..56e3c760fafd 100644
--- a/metadata/md5-cache/kde-apps/klickety-20.04.3
+++ b/metadata/md5-cache/kde-apps/klickety-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/klickety-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d38060c6734879be38acd6527178c45
diff --git a/metadata/md5-cache/kde-apps/klickety-20.08.1 b/metadata/md5-cache/kde-apps/klickety-20.08.1
index 798375355254..66dacb81a0fe 100644
--- a/metadata/md5-cache/kde-apps/klickety-20.08.1
+++ b/metadata/md5-cache/kde-apps/klickety-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/knotifyconfig-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/klickety-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6dd09c450f9b770452fd5fdd88654d75
diff --git a/metadata/md5-cache/kde-apps/klines-20.04.3 b/metadata/md5-cache/kde-apps/klines-20.04.3
index 510971ebd8fa..e21b8264fb2a 100644
--- a/metadata/md5-cache/kde-apps/klines-20.04.3
+++ b/metadata/md5-cache/kde-apps/klines-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/klines-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05b1a3e561f133abff5314c208b8e03e
diff --git a/metadata/md5-cache/kde-apps/klines-20.08.1 b/metadata/md5-cache/kde-apps/klines-20.08.1
index 06716d5f1f1b..7333f1746d00 100644
--- a/metadata/md5-cache/kde-apps/klines-20.08.1
+++ b/metadata/md5-cache/kde-apps/klines-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/klines-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7415197ec9e7c141b0c5522e8f059dee
diff --git a/metadata/md5-cache/kde-apps/kmag-20.04.3 b/metadata/md5-cache/kde-apps/kmag-20.04.3
index f668ea0e890c..5c0620267f29 100644
--- a/metadata/md5-cache/kde-apps/kmag-20.04.3
+++ b/metadata/md5-cache/kde-apps/kmag-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kmag-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=880f4ebd20450453afc6f47e0b24b612
diff --git a/metadata/md5-cache/kde-apps/kmag-20.08.1 b/metadata/md5-cache/kde-apps/kmag-20.08.1
index d654a05439fe..44da99e7c8d1 100644
--- a/metadata/md5-cache/kde-apps/kmag-20.08.1
+++ b/metadata/md5-cache/kde-apps/kmag-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmag-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3caef2653a5c66243f73b81c47b144fd
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-20.04.3 b/metadata/md5-cache/kde-apps/kmahjongg-20.04.3
index 522967ee99ca..a39e9f3a9bd2 100644
--- a/metadata/md5-cache/kde-apps/kmahjongg-20.04.3
+++ b/metadata/md5-cache/kde-apps/kmahjongg-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-apps/libkmahjongg-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kmahjongg-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=486cc3f73d1857e58a3dedde2d6f024c
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-20.08.1 b/metadata/md5-cache/kde-apps/kmahjongg-20.08.1
index e0e088df0f5c..fd838a11fbf1 100644
--- a/metadata/md5-cache/kde-apps/kmahjongg-20.08.1
+++ b/metadata/md5-cache/kde-apps/kmahjongg-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-apps/libkmahjongg-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmahjongg-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3ea2490f6b543eb2813014e8712db70
diff --git a/metadata/md5-cache/kde-apps/kmail-20.04.3 b/metadata/md5-cache/kde-apps/kmail-20.04.3
index d8a778432005..6320aef94910 100644
--- a/metadata/md5-cache/kde-apps/kmail-20.04.3
+++ b/metadata/md5-cache/kde-apps/kmail-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-qt/qtcore-5.14.2:5= >=dev-qt/qtd
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kmail-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=921eb113a04b6b6f35567c689439f408
diff --git a/metadata/md5-cache/kde-apps/kmail-20.08.1 b/metadata/md5-cache/kde-apps/kmail-20.08.1
index b97f5a604bdf..62d37425c1d8 100644
--- a/metadata/md5-cache/kde-apps/kmail-20.08.1
+++ b/metadata/md5-cache/kde-apps/kmail-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-qt/qtcore-5.14.2:5 >=dev-qt/qtdb
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmail-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fcfec82cda4e9868d7f34df10c9250fe
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-20.04.3-r1 b/metadata/md5-cache/kde-apps/kmail-account-wizard-20.04.3-r1
index 023f85c5e472..e9f634718f98 100644
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-20.04.3-r1
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-20.04.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kmail-account-wizard-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d1823d79c9bbd7ece7520a12637545d
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-20.08.1 b/metadata/md5-cache/kde-apps/kmail-account-wizard-20.08.1
index e1f57335fcd6..29bef7a2f45a 100644
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-20.08.1
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmail-account-wizard-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6db0f6b0afc6a3fd83f323acad4e6000
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-20.04.3 b/metadata/md5-cache/kde-apps/kmailtransport-20.04.3
index 2ca7dd610998..f7f974301596 100644
--- a/metadata/md5-cache/kde-apps/kmailtransport-20.04.3
+++ b/metadata/md5-cache/kde-apps/kmailtransport-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kmailtransport-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5383384142f2c6d6c7b044721acd07ad
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-20.08.1 b/metadata/md5-cache/kde-apps/kmailtransport-20.08.1
index 6b43d51e8c15..affc392b4c81 100644
--- a/metadata/md5-cache/kde-apps/kmailtransport-20.08.1
+++ b/metadata/md5-cache/kde-apps/kmailtransport-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmailtransport-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1458f72395b4e97af5d56e457ccc27a
diff --git a/metadata/md5-cache/kde-apps/kmbox-20.04.3 b/metadata/md5-cache/kde-apps/kmbox-20.04.3
index b4a013c777bb..6eb2879e1a41 100644
--- a/metadata/md5-cache/kde-apps/kmbox-20.04.3
+++ b/metadata/md5-cache/kde-apps/kmbox-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=kde-apps/kmime-20.04.3:5 || ( kde-frameworks/breeze-icons:* kde-framew
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kmbox-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=221bca0f85f0ddf4b3d3f63b001f80b6
diff --git a/metadata/md5-cache/kde-apps/kmbox-20.08.1 b/metadata/md5-cache/kde-apps/kmbox-20.08.1
index e4e7b67789e4..3a0ed5a54090 100644
--- a/metadata/md5-cache/kde-apps/kmbox-20.08.1
+++ b/metadata/md5-cache/kde-apps/kmbox-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=kde-apps/kmime-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-framew
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmbox-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c81e97d34c5eed3e592c4f0a0048d5c
diff --git a/metadata/md5-cache/kde-apps/kmime-20.04.3 b/metadata/md5-cache/kde-apps/kmime-20.04.3
index a465551476b9..e42842de23a6 100644
--- a/metadata/md5-cache/kde-apps/kmime-20.04.3
+++ b/metadata/md5-cache/kde-apps/kmime-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 || ( k
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kmime-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f54ef0296c9d826e75877ace362c02a7
diff --git a/metadata/md5-cache/kde-apps/kmime-20.08.1 b/metadata/md5-cache/kde-apps/kmime-20.08.1
index 75dd496099a6..31722ef35eae 100644
--- a/metadata/md5-cache/kde-apps/kmime-20.08.1
+++ b/metadata/md5-cache/kde-apps/kmime-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 || ( k
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmime-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4832c0ad3a9ef36a56a8f138964ca0ff
diff --git a/metadata/md5-cache/kde-apps/kmines-20.04.3 b/metadata/md5-cache/kde-apps/kmines-20.04.3
index a3caa31eebb5..03b844cb068f 100644
--- a/metadata/md5-cache/kde-apps/kmines-20.04.3
+++ b/metadata/md5-cache/kde-apps/kmines-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kmines-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=485c6c6d3b83b25a96d6865dafaf5173
diff --git a/metadata/md5-cache/kde-apps/kmines-20.08.1 b/metadata/md5-cache/kde-apps/kmines-20.08.1
index 04301e2ca3e6..52c1f9f98201 100644
--- a/metadata/md5-cache/kde-apps/kmines-20.08.1
+++ b/metadata/md5-cache/kde-apps/kmines-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmines-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac0254169b5559693d5fa0c220187e35
diff --git a/metadata/md5-cache/kde-apps/kmix-20.04.3 b/metadata/md5-cache/kde-apps/kmix-20.04.3
index 69f60d78122d..b8bad78df3e1 100644
--- a/metadata/md5-cache/kde-apps/kmix-20.04.3
+++ b/metadata/md5-cache/kde-apps/kmix-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) plasma? ( >=kde-frameworks/plasma-5.70.0:5 ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.16.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kmix-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=91727de6d8adba66e538564045a9e93c
diff --git a/metadata/md5-cache/kde-apps/kmix-20.08.1 b/metadata/md5-cache/kde-apps/kmix-20.08.1
index 338c93d883dc..7fce92649be3 100644
--- a/metadata/md5-cache/kde-apps/kmix-20.08.1
+++ b/metadata/md5-cache/kde-apps/kmix-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kglobalaccel-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/solid-5.72.0:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) plasma? ( >=kde-frameworks/plasma-5.72.0:5 ) pulseaudio? ( media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) kde-plasma/kde-cli-tools:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmix-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8dada62ec3bd65c9485e501d93ecf570
diff --git a/metadata/md5-cache/kde-apps/kmousetool-20.04.3 b/metadata/md5-cache/kde-apps/kmousetool-20.04.3
index 308b40c99fc1..73335aa5d5f0 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-20.04.3
+++ b/metadata/md5-cache/kde-apps/kmousetool-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kmousetool-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1471900c9bb3bbff9e4cbae268fcd52
diff --git a/metadata/md5-cache/kde-apps/kmousetool-20.08.1 b/metadata/md5-cache/kde-apps/kmousetool-20.08.1
index c390811daa9c..22a2a7f2aa44 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-20.08.1
+++ b/metadata/md5-cache/kde-apps/kmousetool-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXtst || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmousetool-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd5053cc19546ee1d9dccced4f9d1b0a
diff --git a/metadata/md5-cache/kde-apps/kmouth-20.04.3 b/metadata/md5-cache/kde-apps/kmouth-20.04.3
index 13770d5b0eb9..33a074eb334a 100644
--- a/metadata/md5-cache/kde-apps/kmouth-20.04.3
+++ b/metadata/md5-cache/kde-apps/kmouth-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtspeech-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kmouth-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d781a1e2c3f0d2c1e795b1af71d134f
diff --git a/metadata/md5-cache/kde-apps/kmouth-20.08.1 b/metadata/md5-cache/kde-apps/kmouth-20.08.1
index 0265b6911bfe..2fb6f31e800e 100644
--- a/metadata/md5-cache/kde-apps/kmouth-20.08.1
+++ b/metadata/md5-cache/kde-apps/kmouth-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtspeech-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmouth-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51a1de2b8596a413966af96e6075ce63
diff --git a/metadata/md5-cache/kde-apps/kmplot-20.04.3 b/metadata/md5-cache/kde-apps/kmplot-20.04.3
index 63a07f549805..1263122f7bac 100644
--- a/metadata/md5-cache/kde-apps/kmplot-20.04.3
+++ b/metadata/md5-cache/kde-apps/kmplot-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kmplot-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc3d6c266536290b2aaeed69cece872c
diff --git a/metadata/md5-cache/kde-apps/kmplot-20.08.1 b/metadata/md5-cache/kde-apps/kmplot-20.08.1
index a32e646051a3..2f55fe218363 100644
--- a/metadata/md5-cache/kde-apps/kmplot-20.08.1
+++ b/metadata/md5-cache/kde-apps/kmplot-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kmplot-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d74c6818d4b03593b55705176e2aa6a8
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-20.04.3 b/metadata/md5-cache/kde-apps/knavalbattle-20.04.3
index 6ff582f4294e..99e3626a5be9 100644
--- a/metadata/md5-cache/kde-apps/knavalbattle-20.04.3
+++ b/metadata/md5-cache/kde-apps/knavalbattle-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdnssd-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/knavalbattle-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df5dfe5eb40926683dcfe45a1aa3b69d
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-20.08.1 b/metadata/md5-cache/kde-apps/knavalbattle-20.08.1
index 7be5c03a0651..135bcf5e5f4d 100644
--- a/metadata/md5-cache/kde-apps/knavalbattle-20.08.1
+++ b/metadata/md5-cache/kde-apps/knavalbattle-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdnssd-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/knavalbattle-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00d96c062528f9a74cc012d0eb66149a
diff --git a/metadata/md5-cache/kde-apps/knetwalk-20.04.3 b/metadata/md5-cache/kde-apps/knetwalk-20.04.3
index a1c58d9d54b6..5efcbf6cdeed 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-20.04.3
+++ b/metadata/md5-cache/kde-apps/knetwalk-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidge
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/knetwalk-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bec38fe6fe1c9050d9cd21362b8086f7
diff --git a/metadata/md5-cache/kde-apps/knetwalk-20.08.1 b/metadata/md5-cache/kde-apps/knetwalk-20.08.1
index 0f61c6e43789..b2e1cc714109 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-20.08.1
+++ b/metadata/md5-cache/kde-apps/knetwalk-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidge
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/knetwalk-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e852c3b8b5a6e9fafec40503c380ef2f
diff --git a/metadata/md5-cache/kde-apps/knights-20.04.3 b/metadata/md5-cache/kde-apps/knights-20.04.3
index 2369034e02ce..6a69365c11ff 100644
--- a/metadata/md5-cache/kde-apps/knights-20.04.3
+++ b/metadata/md5-cache/kde-apps/knights-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kplotting-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 speech? ( >=dev-qt/qtspeech-5.14.2:5 ) || ( games-board/gnuchess games-board/crafty games-board/stockfish games-board/sjeng ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/knights-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4445609b92de04a4c588936d4f5afdc
diff --git a/metadata/md5-cache/kde-apps/knights-20.08.1 b/metadata/md5-cache/kde-apps/knights-20.08.1
index 11cc410405b9..97d28ba77636 100644
--- a/metadata/md5-cache/kde-apps/knights-20.08.1
+++ b/metadata/md5-cache/kde-apps/knights-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kplotting-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/plasma-5.72.0:5 speech? ( >=dev-qt/qtspeech-5.14.2:5 ) || ( games-board/gnuchess games-board/crafty games-board/stockfish games-board/sjeng ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/knights-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb0e8bdaa3e16fbbc83587f79993dcc5
diff --git a/metadata/md5-cache/kde-apps/knotes-20.04.3 b/metadata/md5-cache/kde-apps/knotes-20.04.3
index 44862fff49dd..2a2c25456ec8 100644
--- a/metadata/md5-cache/kde-apps/knotes-20.04.3
+++ b/metadata/md5-cache/kde-apps/knotes-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/grantlee:5 dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/q
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/knotes-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=02af69ec502cdc18b15b7d04293c1f00
diff --git a/metadata/md5-cache/kde-apps/knotes-20.08.1 b/metadata/md5-cache/kde-apps/knotes-20.08.1
index 5705c1edf143..fe0d22b0c15b 100644
--- a/metadata/md5-cache/kde-apps/knotes-20.08.1
+++ b/metadata/md5-cache/kde-apps/knotes-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/grantlee:5 dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/q
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/knotes-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=29defe956611fb0fd17a37590be6df5f
diff --git a/metadata/md5-cache/kde-apps/kolf-20.04.3 b/metadata/md5-cache/kde-apps/kolf-20.04.3
index bba06da8fedd..e65c64b10b4c 100644
--- a/metadata/md5-cache/kde-apps/kolf-20.04.3
+++ b/metadata/md5-cache/kde-apps/kolf-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kolf-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f3550aa90ad5a89616ea17038d368bf
diff --git a/metadata/md5-cache/kde-apps/kolf-20.08.1 b/metadata/md5-cache/kde-apps/kolf-20.08.1
index b91bf3e4f966..c59b79a9d939 100644
--- a/metadata/md5-cache/kde-apps/kolf-20.08.1
+++ b/metadata/md5-cache/kde-apps/kolf-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kolf-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=493f5e769ab93365d7f071bc9d571ba6
diff --git a/metadata/md5-cache/kde-apps/kollision-20.04.3 b/metadata/md5-cache/kde-apps/kollision-20.04.3
index 20ef3565bcb2..36991ccca318 100644
--- a/metadata/md5-cache/kde-apps/kollision-20.04.3
+++ b/metadata/md5-cache/kde-apps/kollision-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kollision-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42bcb323980df8a2de659174150ebecf
diff --git a/metadata/md5-cache/kde-apps/kollision-20.08.1 b/metadata/md5-cache/kde-apps/kollision-20.08.1
index 664534d4c322..a18e0bcc2cc3 100644
--- a/metadata/md5-cache/kde-apps/kollision-20.08.1
+++ b/metadata/md5-cache/kde-apps/kollision-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kollision-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af8cd686661d37fa4ee4860239ab2143
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-20.04.3 b/metadata/md5-cache/kde-apps/kolourpaint-20.04.3
index 82bfccfd8652..a3b5d305ae7a 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-20.04.3
+++ b/metadata/md5-cache/kde-apps/kolourpaint-20.04.3
@@ -10,5 +10,5 @@ LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 scanner? ( >=kde-apps/libksane-20.04.3:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kolourpaint-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14245cbde138452b1379664fa1e2d7ca
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-20.08.1 b/metadata/md5-cache/kde-apps/kolourpaint-20.08.1
index 49c240785361..2dedcbfda4db 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-20.08.1
+++ b/metadata/md5-cache/kde-apps/kolourpaint-20.08.1
@@ -10,5 +10,5 @@ LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 scanner? ( >=kde-apps/libksane-20.08.1:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kolourpaint-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b62a7b0087051f3ae37cef8774655f2f
diff --git a/metadata/md5-cache/kde-apps/kompare-20.04.3 b/metadata/md5-cache/kde-apps/kompare-20.04.3
index 8f9ae5a0103b..101a754699cb 100644
--- a/metadata/md5-cache/kde-apps/kompare-20.04.3
+++ b/metadata/md5-cache/kde-apps/kompare-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkomparediff2-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktexteditor-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kompare-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d90d6807b65c5ab34a6aee7a0c41c80
diff --git a/metadata/md5-cache/kde-apps/kompare-20.08.1 b/metadata/md5-cache/kde-apps/kompare-20.08.1
index 3e6bcc5da2ce..40057908a9b0 100644
--- a/metadata/md5-cache/kde-apps/kompare-20.08.1
+++ b/metadata/md5-cache/kde-apps/kompare-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkomparediff2-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kcodecs-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/ktexteditor-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kompare-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d452381b59122a3d13d22dc3d97cbfce
diff --git a/metadata/md5-cache/kde-apps/konqueror-20.04.3 b/metadata/md5-cache/kde-apps/konqueror-20.04.3
index 63e7e86a8b98..ec75aba2575c 100644
--- a/metadata/md5-cache/kde-apps/konqueror-20.04.3
+++ b/metadata/md5-cache/kde-apps/konqueror-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwebengine-5.
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/konqueror-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47cdcc0cb46a6c04471b1cb5e6c313b7
diff --git a/metadata/md5-cache/kde-apps/konqueror-20.08.1 b/metadata/md5-cache/kde-apps/konqueror-20.08.1
index 2d5f5c858a96..c02a852bc937 100644
--- a/metadata/md5-cache/kde-apps/konqueror-20.08.1
+++ b/metadata/md5-cache/kde-apps/konqueror-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwebengine-5.
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/konqueror-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e76ecb53b9dfabc9ce1b99f0f63e7775
diff --git a/metadata/md5-cache/kde-apps/konquest-20.04.3 b/metadata/md5-cache/kde-apps/konquest-20.04.3
index d2c51e0aa07e..0c5a423cadc0 100644
--- a/metadata/md5-cache/kde-apps/konquest-20.04.3
+++ b/metadata/md5-cache/kde-apps/konquest-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/konquest-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ed83e5f7e1c82dfab8f0df87021fb11
diff --git a/metadata/md5-cache/kde-apps/konquest-20.08.1 b/metadata/md5-cache/kde-apps/konquest-20.08.1
index 3c3e5bab036d..80ef0178e1ca 100644
--- a/metadata/md5-cache/kde-apps/konquest-20.08.1
+++ b/metadata/md5-cache/kde-apps/konquest-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/konquest-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e97491874779a780a25e8f32b54eda05
diff --git a/metadata/md5-cache/kde-apps/konsole-20.04.3 b/metadata/md5-cache/kde-apps/konsole-20.04.3
index fe7d50378b87..b35fb8294918 100644
--- a/metadata/md5-cache/kde-apps/konsole-20.04.3
+++ b/metadata/md5-cache/kde-apps/konsole-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/konsole-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51bad986ff4319d4722cd1780f4c2327
diff --git a/metadata/md5-cache/kde-apps/konsole-20.08.1 b/metadata/md5-cache/kde-apps/konsole-20.08.1
index ebfbc91035c8..6f0a55a9f1ef 100644
--- a/metadata/md5-cache/kde-apps/konsole-20.08.1
+++ b/metadata/md5-cache/kde-apps/konsole-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/konsole-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f308d1122af7c6a5a246034ced63b20e
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-20.04.3 b/metadata/md5-cache/kde-apps/konsolekalendar-20.04.3
index 872f0018df80..f971ff85c949 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-20.04.3
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-apps/akonadi-20.04.3:5 >=kde-apps/akonadi-calendar-20.04.3:5 >=kde-apps/calendarsupport-20.04.3:5 >=kde-apps/kcalutils-20.04.3:5 >=kde-frameworks/kcalendarcore-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/akonadi-calendar-tools-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=504f20e7c5a6bf1be3ad22580800d5f0
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-20.08.1 b/metadata/md5-cache/kde-apps/konsolekalendar-20.08.1
index 52948e34f376..2048e966571c 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-20.08.1
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-apps/akonadi-20.08.1:5 >=kde-apps/akonadi-calendar-20.08.1:5 >=kde-apps/calendarsupport-20.08.1:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-frameworks/kcalendarcore-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/akonadi-calendar-tools-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b83213da0c84b26c92c2d26db77b491d
diff --git a/metadata/md5-cache/kde-apps/kontact-20.04.3 b/metadata/md5-cache/kde-apps/kontact-20.04.3
index 1d3225da8aa9..9d227fad1e21 100644
--- a/metadata/md5-cache/kde-apps/kontact-20.04.3
+++ b/metadata/md5-cache/kde-apps/kontact-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.04.3:5 >=kde-apps/grantleetheme-20.04.3:5 >=kde-apps/kdepim-apps-libs-20.04.3:5 >=kde-apps/kontactinterface-20.04.3:5 >=kde-apps/kpimtextedit-20.04.3:5 >=kde-apps/libkdepim-20.04.3:5 >=kde-apps/mailcommon-20.04.3:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kontact-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88e2317c44eea4174c7514c50c4b9f75
diff --git a/metadata/md5-cache/kde-apps/kontact-20.08.1 b/metadata/md5-cache/kde-apps/kontact-20.08.1
index 19e397cfd61b..60d8a73654ec 100644
--- a/metadata/md5-cache/kde-apps/kontact-20.08.1
+++ b/metadata/md5-cache/kde-apps/kontact-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/grantleetheme-20.08.1:5 >=kde-apps/kontactinterface-20.08.1:5 >=kde-apps/kpimtextedit-20.08.1:5 >=kde-apps/libkdepim-20.08.1:5 >=kde-apps/mailcommon-20.08.1:5 >=kde-apps/pimcommon-20.08.1:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kontact-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aaed9163be9c25439c3febdaefbeed1b
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-20.04.3 b/metadata/md5-cache/kde-apps/kontactinterface-20.04.3
index 18ea90d7cd1d..556772fe14cc 100644
--- a/metadata/md5-cache/kde-apps/kontactinterface-20.04.3
+++ b/metadata/md5-cache/kde-apps/kontactinterface-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kontactinterface-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4307684b5d6d1f68a55504448a4d1363
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-20.08.1 b/metadata/md5-cache/kde-apps/kontactinterface-20.08.1
index ed1bfde88e7c..04ee2863728b 100644
--- a/metadata/md5-cache/kde-apps/kontactinterface-20.08.1
+++ b/metadata/md5-cache/kde-apps/kontactinterface-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kontactinterface-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=db68d5422a32b27b00ab2acad19ad099
diff --git a/metadata/md5-cache/kde-apps/kopete-20.04.3 b/metadata/md5-cache/kde-apps/kopete-20.04.3
index e9f25a32ce07..9d01f1d95637 100644
--- a/metadata/md5-cache/kde-apps/kopete-20.04.3
+++ b/metadata/md5-cache/kde-apps/kopete-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/gpgme[cxx,qt5] dev-libs/libpcre >=dev-qt/qtgui-5.14.2:5 >=dev-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kopete-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=924dbe01a75f9424d806bf5e75064091
diff --git a/metadata/md5-cache/kde-apps/kopete-20.08.1 b/metadata/md5-cache/kde-apps/kopete-20.08.1
index 27cded3863a2..ee263d18aa98 100644
--- a/metadata/md5-cache/kde-apps/kopete-20.08.1
+++ b/metadata/md5-cache/kde-apps/kopete-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/gpgme[cxx,qt5] dev-libs/libpcre >=dev-qt/qtgui-5.14.2:5 >=dev-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kopete-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42458b0968b0e9293c7c2f538a1219b6
diff --git a/metadata/md5-cache/kde-apps/korganizer-20.04.3 b/metadata/md5-cache/kde-apps/korganizer-20.04.3
index 89d0815faf0b..930d858a0b4b 100644
--- a/metadata/md5-cache/kde-apps/korganizer-20.04.3
+++ b/metadata/md5-cache/kde-apps/korganizer-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/korganizer-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03ea49437dffb506ea3619db4b06e2f0
diff --git a/metadata/md5-cache/kde-apps/korganizer-20.08.1 b/metadata/md5-cache/kde-apps/korganizer-20.08.1
index 5a66e8bec64f..c1d1746adb70 100644
--- a/metadata/md5-cache/kde-apps/korganizer-20.08.1
+++ b/metadata/md5-cache/kde-apps/korganizer-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/korganizer-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a96af004796b267623a4595a2f403b6
diff --git a/metadata/md5-cache/kde-apps/kpat-20.04.3 b/metadata/md5-cache/kde-apps/kpat-20.04.3
index cc66ca6d8669..9d514c7c6039 100644
--- a/metadata/md5-cache/kde-apps/kpat-20.04.3
+++ b/metadata/md5-cache/kde-apps/kpat-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-games/freecell-solver >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kpat-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b713e4e4408ac1f4ace190ed032608df
diff --git a/metadata/md5-cache/kde-apps/kpat-20.08.1 b/metadata/md5-cache/kde-apps/kpat-20.08.1
index 33de1f73b36a..85738d7bb352 100644
--- a/metadata/md5-cache/kde-apps/kpat-20.08.1
+++ b/metadata/md5-cache/kde-apps/kpat-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-games/freecell-solver >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kpat-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70b25ee56a2353bc747ca2ad0539fcaa
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-20.04.3 b/metadata/md5-cache/kde-apps/kpimtextedit-20.04.3
index 19522cf2fdc7..f9add207cb0a 100644
--- a/metadata/md5-cache/kde-apps/kpimtextedit-20.04.3
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/grantlee-5.2.0:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtspeech-5.
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kpimtextedit-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a58a3a7d932571531d188fcce7ad0dd
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-20.08.1 b/metadata/md5-cache/kde-apps/kpimtextedit-20.08.1
index 14fa371a0417..086b31479494 100644
--- a/metadata/md5-cache/kde-apps/kpimtextedit-20.08.1
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtspeech-5.14.2:5 >=dev-qt/qtwidgets-5.
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kpimtextedit-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b059ac1dc44ce331c370cd28ea6fafe2
diff --git a/metadata/md5-cache/kde-apps/kpkpass-20.04.3 b/metadata/md5-cache/kde-apps/kpkpass-20.04.3
index b694cb65668d..4cb4cbd53080 100644
--- a/metadata/md5-cache/kde-apps/kpkpass-20.04.3
+++ b/metadata/md5-cache/kde-apps/kpkpass-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 !<kde-apps/kd
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kpkpass-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cbd8fe9977151fde747b4a161b1f7151
diff --git a/metadata/md5-cache/kde-apps/kpkpass-20.08.1 b/metadata/md5-cache/kde-apps/kpkpass-20.08.1
index 433af9186eb5..84cbde907606 100644
--- a/metadata/md5-cache/kde-apps/kpkpass-20.08.1
+++ b/metadata/md5-cache/kde-apps/kpkpass-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 !<kde-apps/kd
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kpkpass-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=867b3ecff6e00c16d4e9ccf867a63d09
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-20.04.3 b/metadata/md5-cache/kde-apps/kqtquickcharts-20.04.3
index 875791165ce9..35ddad4c062d 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-20.04.3
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kqtquickcharts-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=121eb68df7c44e2631e35a6e84212dfe
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-20.08.1 b/metadata/md5-cache/kde-apps/kqtquickcharts-20.08.1
index a1ccf85d8d95..98172cc7c9c9 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-20.08.1
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kqtquickcharts-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee0e213557d7dd77af1ba9745d995dcb
diff --git a/metadata/md5-cache/kde-apps/krdc-20.04.3 b/metadata/md5-cache/kde-apps/krdc-20.04.3
index 8cacc5f7d1ff..ed4af0535081 100644
--- a/metadata/md5-cache/kde-apps/krdc-20.04.3
+++ b/metadata/md5-cache/kde-apps/krdc-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kbookmarks-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdnssd-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/krdc-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b1e4db88b7e582f814f29ed759ba257
diff --git a/metadata/md5-cache/kde-apps/krdc-20.08.1 b/metadata/md5-cache/kde-apps/krdc-20.08.1
index ce2a22984922..b5643afe2849 100644
--- a/metadata/md5-cache/kde-apps/krdc-20.08.1
+++ b/metadata/md5-cache/kde-apps/krdc-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kbookmarks-5.72.0:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdnssd-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/knotifyconfig-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/krdc-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b4ed40ad737144dad9743643f3f5969
diff --git a/metadata/md5-cache/kde-apps/kreversi-20.04.3 b/metadata/md5-cache/kde-apps/kreversi-20.04.3
index 63935df98201..413d590e8c18 100644
--- a/metadata/md5-cache/kde-apps/kreversi-20.04.3
+++ b/metadata/md5-cache/kde-apps/kreversi-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kreversi-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=86e49c51d2fa290577a909fc2acadee5
diff --git a/metadata/md5-cache/kde-apps/kreversi-20.08.1 b/metadata/md5-cache/kde-apps/kreversi-20.08.1
index c9743c093340..dac864878895 100644
--- a/metadata/md5-cache/kde-apps/kreversi-20.08.1
+++ b/metadata/md5-cache/kde-apps/kreversi-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kreversi-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7ca6e0aff93a56ea766b01fe10f2cca
diff --git a/metadata/md5-cache/kde-apps/krfb-20.04.3 b/metadata/md5-cache/kde-apps/krfb-20.04.3
index 8f3985c64671..697ecf731471 100644
--- a/metadata/md5-cache/kde-apps/krfb-20.04.3
+++ b/metadata/md5-cache/kde-apps/krfb-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdnssd-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image wayland? ( media-video/pipewire:= ) wayland? ( sys-apps/xdg-desktop-portal[screencast] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/krfb-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0cb0aa17b7347bbb2d01d32f2810c317
diff --git a/metadata/md5-cache/kde-apps/krfb-20.08.1 b/metadata/md5-cache/kde-apps/krfb-20.08.1
index a9d88c741326..8b0e4f922e27 100644
--- a/metadata/md5-cache/kde-apps/krfb-20.08.1
+++ b/metadata/md5-cache/kde-apps/krfb-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdnssd-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image wayland? ( media-video/pipewire:= ) wayland? ( sys-apps/xdg-desktop-portal[screencast] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/krfb-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cef5c9730206be20949c2d2755b2ab33
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-20.04.3 b/metadata/md5-cache/kde-apps/kross-interpreters-20.04.3
index 9501d8221cd0..162576a446e4 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-20.04.3
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kro
 REQUIRED_USE=|| ( python ruby ) python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kross-interpreters-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08fd10f0699121456b1cc5fed78171d7
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-20.08.1 b/metadata/md5-cache/kde-apps/kross-interpreters-20.08.1
index 9acda14c39b4..484a9d5c9152 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-20.08.1
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kro
 REQUIRED_USE=|| ( python ruby ) python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kross-interpreters-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee4bfbc0c3e554bfa31eee6e8cdac19d
diff --git a/metadata/md5-cache/kde-apps/kruler-20.04.3 b/metadata/md5-cache/kde-apps/kruler-20.04.3
index 2a1203fdf0a2..bb6e757c2406 100644
--- a/metadata/md5-cache/kde-apps/kruler-20.04.3
+++ b/metadata/md5-cache/kde-apps/kruler-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kruler-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7522a4c741d27eb2287aaf1fa7d14701
diff --git a/metadata/md5-cache/kde-apps/kruler-20.08.1 b/metadata/md5-cache/kde-apps/kruler-20.08.1
index 734d5cc90e1f..01f946d63da8 100644
--- a/metadata/md5-cache/kde-apps/kruler-20.08.1
+++ b/metadata/md5-cache/kde-apps/kruler-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kruler-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5404084a6fe574663b24dde08eca926c
diff --git a/metadata/md5-cache/kde-apps/kshisen-20.04.3 b/metadata/md5-cache/kde-apps/kshisen-20.04.3
index fc4a47ce5b4d..e8a7171ba357 100644
--- a/metadata/md5-cache/kde-apps/kshisen-20.04.3
+++ b/metadata/md5-cache/kde-apps/kshisen-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-apps/libkmahjongg-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kshisen-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5594ae5b563a2c74eac632d01c4e48d3
diff --git a/metadata/md5-cache/kde-apps/kshisen-20.08.1 b/metadata/md5-cache/kde-apps/kshisen-20.08.1
index 563a8d620477..94064bc3efff 100644
--- a/metadata/md5-cache/kde-apps/kshisen-20.08.1
+++ b/metadata/md5-cache/kde-apps/kshisen-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-apps/libkmahjongg-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kshisen-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3cba95fed8b0617d356f2a353041a61a
diff --git a/metadata/md5-cache/kde-apps/ksirk-20.04.3 b/metadata/md5-cache/kde-apps/ksirk-20.04.3
index d5355c6bcb70..92b81133af6f 100644
--- a/metadata/md5-cache/kde-apps/ksirk-20.04.3
+++ b/metadata/md5-cache/kde-apps/ksirk-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2[qt5(+)] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 media-libs/phonon[qt5(+)] sys-libs/zlib || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ksirk-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03032204713e94f199dd8adde9ae7931
diff --git a/metadata/md5-cache/kde-apps/ksirk-20.08.1 b/metadata/md5-cache/kde-apps/ksirk-20.08.1
index 3959679d68a3..40523371406a 100644
--- a/metadata/md5-cache/kde-apps/ksirk-20.08.1
+++ b/metadata/md5-cache/kde-apps/ksirk-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=media-libs/phonon-4.11.0 sys-libs/zlib || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ksirk-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b448791dc9d49c13bfca414c51a0767
diff --git a/metadata/md5-cache/kde-apps/ksmtp-20.04.3 b/metadata/md5-cache/kde-apps/ksmtp-20.04.3
index ffafe4ce35cf..d524e3adb06f 100644
--- a/metadata/md5-cache/kde-apps/ksmtp-20.04.3
+++ b/metadata/md5-cache/kde-apps/ksmtp-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtnetwork-5.14.2:5 >=kde-frameworks/kcoread
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ksmtp-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=20df45d65a76028e6299aaa63a74a956
diff --git a/metadata/md5-cache/kde-apps/ksmtp-20.08.1 b/metadata/md5-cache/kde-apps/ksmtp-20.08.1
index fed542e48309..d37dd8858f36 100644
--- a/metadata/md5-cache/kde-apps/ksmtp-20.08.1
+++ b/metadata/md5-cache/kde-apps/ksmtp-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtnetwork-5.14.2:5 >=kde-frameworks/kcoread
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ksmtp-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e11793ebb093a723d0b317376bf7ee03
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-20.04.3 b/metadata/md5-cache/kde-apps/ksnakeduel-20.04.3
index 021aed2931ca..fbd5a060e333 100644
--- a/metadata/md5-cache/kde-apps/ksnakeduel-20.04.3
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ksnakeduel-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=680d2f3967ae4e03e8ba4f08679b50ca
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-20.08.1 b/metadata/md5-cache/kde-apps/ksnakeduel-20.08.1
index aa5e8ced5035..baa5a26040dc 100644
--- a/metadata/md5-cache/kde-apps/ksnakeduel-20.08.1
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ksnakeduel-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b402d1ead07739539ba6d162502c654e
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-20.04.3 b/metadata/md5-cache/kde-apps/kspaceduel-20.04.3
index aaee989c466a..0da8d6fa06f1 100644
--- a/metadata/md5-cache/kde-apps/kspaceduel-20.04.3
+++ b/metadata/md5-cache/kde-apps/kspaceduel-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kspaceduel-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af8be639f52a8effc99651f1fa4fa0c1
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-20.08.1 b/metadata/md5-cache/kde-apps/kspaceduel-20.08.1
index 8238a38a1080..02a3eb6b122d 100644
--- a/metadata/md5-cache/kde-apps/kspaceduel-20.08.1
+++ b/metadata/md5-cache/kde-apps/kspaceduel-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kspaceduel-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9a544038a46e7e1a789cee77d58e4b8
diff --git a/metadata/md5-cache/kde-apps/ksquares-20.04.3 b/metadata/md5-cache/kde-apps/ksquares-20.04.3
index d45a11c664f8..6d83386863d7 100644
--- a/metadata/md5-cache/kde-apps/ksquares-20.04.3
+++ b/metadata/md5-cache/kde-apps/ksquares-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ksquares-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59ecea8a21d4aa41b5e3c600e4acbb34
diff --git a/metadata/md5-cache/kde-apps/ksquares-20.08.1 b/metadata/md5-cache/kde-apps/ksquares-20.08.1
index f9def8f7ad44..30b554691a15 100644
--- a/metadata/md5-cache/kde-apps/ksquares-20.08.1
+++ b/metadata/md5-cache/kde-apps/ksquares-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ksquares-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4fb37f113e3906240f762d1721b1318
diff --git a/metadata/md5-cache/kde-apps/ksudoku-20.04.3 b/metadata/md5-cache/kde-apps/ksudoku-20.04.3
index e4e88e7ab02c..44988bbcbf94 100644
--- a/metadata/md5-cache/kde-apps/ksudoku-20.04.3
+++ b/metadata/md5-cache/kde-apps/ksudoku-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 opengl? ( >=dev-qt/qtopengl-5.14.2:5 virtual/glu ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ksudoku-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6469efdba67c7ceaaeddceefd93408b3
diff --git a/metadata/md5-cache/kde-apps/ksudoku-20.08.1 b/metadata/md5-cache/kde-apps/ksudoku-20.08.1
index 41a8790aaafe..0907d39dd6a9 100644
--- a/metadata/md5-cache/kde-apps/ksudoku-20.08.1
+++ b/metadata/md5-cache/kde-apps/ksudoku-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 opengl? ( >=dev-qt/qtopengl-5.14.2:5 virtual/glu ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ksudoku-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=73caa01ace599056f650761b77b9a02d
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-20.04.3-r1 b/metadata/md5-cache/kde-apps/ksystemlog-20.04.3-r1
index 00ed3b51eca4..c24ab259e7d2 100644
--- a/metadata/md5-cache/kde-apps/ksystemlog-20.04.3-r1
+++ b/metadata/md5-cache/kde-apps/ksystemlog-20.04.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidg
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ksystemlog-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93b11419b95a3805e97236e8fbb1552d
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-20.08.1-r1 b/metadata/md5-cache/kde-apps/ksystemlog-20.08.1-r1
index 94cd8ecabfbc..0f1c1b4210c1 100644
--- a/metadata/md5-cache/kde-apps/ksystemlog-20.08.1-r1
+++ b/metadata/md5-cache/kde-apps/ksystemlog-20.08.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidg
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ksystemlog-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13259c30dc3ea042d564c28b47a6b439
diff --git a/metadata/md5-cache/kde-apps/kteatime-20.04.3 b/metadata/md5-cache/kde-apps/kteatime-20.04.3
index 8c2c44336877..77f9525dc985 100644
--- a/metadata/md5-cache/kde-apps/kteatime-20.04.3
+++ b/metadata/md5-cache/kde-apps/kteatime-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kteatime-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4cc671830a2658348f64271dd1aa00c2
diff --git a/metadata/md5-cache/kde-apps/kteatime-20.08.1 b/metadata/md5-cache/kde-apps/kteatime-20.08.1
index fb480251995b..75e993b3387b 100644
--- a/metadata/md5-cache/kde-apps/kteatime-20.08.1
+++ b/metadata/md5-cache/kde-apps/kteatime-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/knotifyconfig-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kteatime-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a885c68edf2b68be2e519ff54852ce25
diff --git a/metadata/md5-cache/kde-apps/ktimer-20.04.3 b/metadata/md5-cache/kde-apps/ktimer-20.04.3
index 7e80832eda93..06e665a6130f 100644
--- a/metadata/md5-cache/kde-apps/ktimer-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktimer-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktimer-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6967d8a31dfa66abfda361a36f31886
diff --git a/metadata/md5-cache/kde-apps/ktimer-20.08.1 b/metadata/md5-cache/kde-apps/ktimer-20.08.1
index 490f89e9ef53..b1b9de6fe31f 100644
--- a/metadata/md5-cache/kde-apps/ktimer-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktimer-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktimer-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15811dee39b2f9988491169a21b88c95
diff --git a/metadata/md5-cache/kde-apps/ktouch-20.04.3 b/metadata/md5-cache/kde-apps/ktouch-20.04.3
index 5185dfb61f1b..6bb5b6031c18 100644
--- a/metadata/md5-cache/kde-apps/ktouch-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktouch-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=dev-qt/qtxmlpatterns-5.14.2:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libxkbfile ) >=dev-qt/qtgraphicaleffects-5.14.2:5 >=kde-apps/kqtquickcharts-20.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktouch-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f519de9eb2c6e0bead510b3e6d731646
diff --git a/metadata/md5-cache/kde-apps/ktouch-20.08.1 b/metadata/md5-cache/kde-apps/ktouch-20.08.1
index 1e957a1c1313..5c6d289f72eb 100644
--- a/metadata/md5-cache/kde-apps/ktouch-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktouch-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=dev-qt/qtxmlpatterns-5.14.2:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libxkbfile ) >=dev-qt/qtgraphicaleffects-5.14.2:5 >=kde-apps/kqtquickcharts-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktouch-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96e0eaec01737addb0a5e20ac195a7c5
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.04.3 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.04.3
index 2a156091c3f4..e44d5d570fa2 100644
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.04.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kaccounts-integration-20.04.3:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-20.04.3:5 net-im/telepathy-connection-managers || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktp-accounts-kcm-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d83cfc17afe0b25c6f39097c2b1218a
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.08.1 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.08.1
index d5f2755b0968..e228f270070c 100644
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-20.08.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kaccounts-integration-20.08.1:5 >=kde-frameworks/kcodecs-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 net-libs/accounts-qt net-libs/signond >=net-libs/telepathy-qt-0.9.8 >=kde-apps/kaccounts-providers-20.08.1:5 net-im/telepathy-connection-managers || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktp-accounts-kcm-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0129fb035b1ec697bde80567948c9ba3
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-20.04.3 b/metadata/md5-cache/kde-apps/ktp-approver-20.04.3
index 6c1486b4ff43..f93870558b14 100644
--- a/metadata/md5-cache/kde-apps/ktp-approver-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-approver-20.04.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=net-libs/telepathy-qt-0.9.8[qt5(+)] >=kde-apps/ktp-contact-list-20.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktp-approver-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3567df09033f243a18ddd2efe93d02b0
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-20.08.1 b/metadata/md5-cache/kde-apps/ktp-approver-20.08.1
index e059b4cfa0dc..6743b34b536e 100644
--- a/metadata/md5-cache/kde-apps/ktp-approver-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-approver-20.08.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-apps/ktp-contact-list-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktp-approver-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f06df14510786d876fad1f89f69523cd
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-20.04.3 b/metadata/md5-cache/kde-apps/ktp-auth-handler-20.04.3
index 542022269019..cab64ad79117 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-20.04.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-crypt/qca:2[qt5(+)] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kaccounts-integration-20.04.3:5 >=kde-apps/ktp-common-internals-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktp-auth-handler-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a694f54615459ed1111627c62aabaf9
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-20.08.1 b/metadata/md5-cache/kde-apps/ktp-auth-handler-20.08.1
index f576f24785ba..bf24826af8dc 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-20.08.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kaccounts-integration-20.08.1:5 >=kde-apps/ktp-common-internals-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 net-libs/accounts-qt net-libs/signond >=net-libs/telepathy-qt-0.9.8 >=app-crypt/qca-2.3.0:2[ssl] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktp-auth-handler-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=31fe278ab43870ee97b17d3c5422c8fa
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-20.04.3 b/metadata/md5-cache/kde-apps/ktp-call-ui-20.04.3
index d95001d59373..4f00562a9122 100644
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktp-call-ui-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2c534d028faf9319c872c2db8b6317f
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-20.08.1 b/metadata/md5-cache/kde-apps/ktp-call-ui-20.08.1
index 13d7d64f936b..77aec0714edd 100644
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=media-libs/phonon-4.11.0 media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream >=net-libs/telepathy-qt-0.9.8[farstream] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktp-call-ui-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8cf304e8241fba53a4b63f6682c2440
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-20.04.3 b/metadata/md5-cache/kde-apps/ktp-common-internals-20.04.3
index 20eea3b7976a..d3c2a4cdd74a 100644
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktp-common-internals-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87e2c674a5d99f9c93a0bc4cecd3e2dc
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-20.08.1 b/metadata/md5-cache/kde-apps/ktp-common-internals-20.08.1
index d8e6b02ad732..efddbc23a96c 100644
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktp-common-internals-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68e248c93925f4847cd6f3f699183771
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-20.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-list-20.04.3
index 3e8178a75fdc..730f03490e4f 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kpeople-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 net-libs/telepathy-qt[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktp-contact-list-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f7da425ce3080f1a04f584b9f74e3c8
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-20.08.1 b/metadata/md5-cache/kde-apps/ktp-contact-list-20.08.1
index 1951b4c4531f..0a012a90a732 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kpeople-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=net-libs/telepathy-qt-0.9.8 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktp-contact-list-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f69ce2a5e0e0fdcb340498d7d9f240f0
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-20.04.3 b/metadata/md5-cache/kde-apps/ktp-contact-runner-20.04.3
index 09afe526cabb..d44f3d7d51db 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-20.04.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.04.3:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/krunner-5.70.0:5 net-libs/telepathy-qt[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktp-contact-runner-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61a5525240dcdfe66b6731b9d8a653cf
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-20.08.1 b/metadata/md5-cache/kde-apps/ktp-contact-runner-20.08.1
index 834dc5665833..426601bd30be 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-20.08.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.08.1:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/krunner-5.72.0:5 >=net-libs/telepathy-qt-0.9.8 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktp-contact-runner-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08655608978bd938a0f663be05c7f2d1
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-20.04.3 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-20.04.3
index 7c85319b81ad..bd6dda0ca4e4 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-20.04.3
@@ -10,5 +10,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktp-desktop-applets-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=136a2e0a4f7d8aecce4a8e9b162978e1
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-20.08.1 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-20.08.1
index 35cd885577e2..8c39bda315e4 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-20.08.1
@@ -10,5 +10,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/plasma-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktp-desktop-applets-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a73adf4e6ae63097e21c3e8b610c5db
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.04.3 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.04.3
index 2b0e6b5ab8c6..967f3422f0db 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 net-libs/telepathy-qt[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktp-filetransfer-handler-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1fe1e289308fc50829a19eab6117c1cc
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.08.1 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.08.1
index 716c628104ae..edff09915c02 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=net-libs/telepathy-qt-0.9.8 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktp-filetransfer-handler-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad79678be6a09c65932e677a097a07d1
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-20.04.3 b/metadata/md5-cache/kde-apps/ktp-kded-module-20.04.3
index 29fe3319b127..0f81178ef192 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-20.04.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-20.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktp-kded-module-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6c5294c4361932acd3b71b2c8424cb2
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-20.08.1 b/metadata/md5-cache/kde-apps/ktp-kded-module-20.08.1
index 4f30759f8132..0249e0677bc9 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-20.08.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kidletime-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-apps/signon-kwallet-extension-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktp-kded-module-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3cf93ee52fbeb6cb7f7bd3abc7ca21b
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-20.04.3 b/metadata/md5-cache/kde-apps/ktp-send-file-20.04.3
index 38913c749b30..74fcaae6eb06 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-20.04.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.04.3:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-20.04.3:5 >=kde-apps/ktp-filetransfer-handler-20.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktp-send-file-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=65cdba27fb52121ebee4d823759712f2
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-20.08.1 b/metadata/md5-cache/kde-apps/ktp-send-file-20.08.1
index 8248c5e7a1b9..b8bb45419d81 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-20.08.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/ktp-common-internals-20.08.1:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=net-libs/telepathy-qt-0.9.8 >=kde-apps/ktp-contact-list-20.08.1:5 >=kde-apps/ktp-filetransfer-handler-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktp-send-file-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18d7f02ab097650a1e5e5e84d52b672d
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-20.04.3 b/metadata/md5-cache/kde-apps/ktp-text-ui-20.04.3
index e59e28d6ca64..e9181ce9527d 100644
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-20.04.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/ktp-common-internals-20.04.3:5[otr] >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kemoticons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kpeople-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/sonnet-5.70.0:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.14.2:5 ) >=kde-apps/ktp-contact-list-20.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktp-text-ui-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7994122410f4c2b94ff911add29cc16
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-20.08.1 b/metadata/md5-cache/kde-apps/ktp-text-ui-20.08.1
index 4ad7a9e56e08..2cb838475128 100644
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-20.08.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/ktp-common-internals-20.08.1:5[otr] >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kemoticons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/knotifyconfig-5.72.0:5 >=kde-frameworks/kpeople-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/sonnet-5.72.0:5 >=net-libs/telepathy-qt-0.9.8 speech? ( >=dev-qt/qtspeech-5.14.2:5 ) >=kde-apps/ktp-contact-list-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktp-text-ui-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c820069c7d8014b3a16daf161ddede76
diff --git a/metadata/md5-cache/kde-apps/ktuberling-20.04.3 b/metadata/md5-cache/kde-apps/ktuberling-20.04.3
index 4d3852e5cfe5..91a553604838 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-20.04.3
+++ b/metadata/md5-cache/kde-apps/ktuberling-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktuberling-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39e582c2845d25b528bf8962a3610d7e
diff --git a/metadata/md5-cache/kde-apps/ktuberling-20.08.1 b/metadata/md5-cache/kde-apps/ktuberling-20.08.1
index e54868cb32f7..00320eb594e7 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-20.08.1
+++ b/metadata/md5-cache/kde-apps/ktuberling-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktuberling-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4604217880855791bd2588490aa1b8b0
diff --git a/metadata/md5-cache/kde-apps/kturtle-20.04.3 b/metadata/md5-cache/kde-apps/kturtle-20.04.3
index 5035933c1398..0a7f028dc77e 100644
--- a/metadata/md5-cache/kde-apps/kturtle-20.04.3
+++ b/metadata/md5-cache/kde-apps/kturtle-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kturtle-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f68581e438e02a19b665515fe4504903
diff --git a/metadata/md5-cache/kde-apps/kturtle-20.08.1 b/metadata/md5-cache/kde-apps/kturtle-20.08.1
index 19bc872d2846..6b62380a4763 100644
--- a/metadata/md5-cache/kde-apps/kturtle-20.08.1
+++ b/metadata/md5-cache/kde-apps/kturtle-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kturtle-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=273ac8dbd5a5c9a311b93b6a7596187f
diff --git a/metadata/md5-cache/kde-apps/kubrick-20.04.3 b/metadata/md5-cache/kde-apps/kubrick-20.04.3
index 0bf4f2df543f..fee6b74a60ac 100644
--- a/metadata/md5-cache/kde-apps/kubrick-20.04.3
+++ b/metadata/md5-cache/kde-apps/kubrick-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtopengl-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 virtual/glu virtual/opengl || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kubrick-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ac35b1557b822123963845d19f80cf6
diff --git a/metadata/md5-cache/kde-apps/kubrick-20.08.1 b/metadata/md5-cache/kde-apps/kubrick-20.08.1
index ea5a46cec581..1b17fd406081 100644
--- a/metadata/md5-cache/kde-apps/kubrick-20.08.1
+++ b/metadata/md5-cache/kde-apps/kubrick-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtopengl-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 virtual/glu virtual/opengl || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kubrick-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00fc78136b530b30add8543ca36c57cb
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-20.04.3 b/metadata/md5-cache/kde-apps/kwalletmanager-20.04.3
index eaffed7f71e2..71b08608e4e0 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-20.04.3
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kauth-5.70.0:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kwalletmanager-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=938b61c2ae90e307a3e866a8eb6d9e50
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-20.08.1 b/metadata/md5-cache/kde-apps/kwalletmanager-20.08.1
index 1ebd97a80c96..78ac04601708 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-20.08.1
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kauth-5.72.0:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kcodecs-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwallet-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kwalletmanager-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=897ebe99e0c98265c4be288c5154dc56
diff --git a/metadata/md5-cache/kde-apps/kwave-20.04.3 b/metadata/md5-cache/kde-apps/kwave-20.04.3
index a58a069b2600..2667faa4cb5e 100644
--- a/metadata/md5-cache/kde-apps/kwave-20.04.3
+++ b/metadata/md5-cache/kde-apps/kwave-20.04.3
@@ -10,5 +10,5 @@ LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.14.2:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kwave-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95777bcb9238cf87105d8965392862ac
diff --git a/metadata/md5-cache/kde-apps/kwave-20.08.1 b/metadata/md5-cache/kde-apps/kwave-20.08.1
index 99491abfd569..dbe7dbfee0fd 100644
--- a/metadata/md5-cache/kde-apps/kwave-20.08.1
+++ b/metadata/md5-cache/kde-apps/kwave-20.08.1
@@ -10,5 +10,5 @@ LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.14.2:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kwave-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6605b77983489782cde5cee23e3aadec
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-20.04.3 b/metadata/md5-cache/kde-apps/kwordquiz-20.04.3
index 3c318aeb9cc7..b9bfb561a97b 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-20.04.3
+++ b/metadata/md5-cache/kde-apps/kwordquiz-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkeduvocdocument-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kwordquiz-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3338a00e6d8a498625a04ee60008cb14
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-20.08.1 b/metadata/md5-cache/kde-apps/kwordquiz-20.08.1
index e18c0c900b75..127b7481007b 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-20.08.1
+++ b/metadata/md5-cache/kde-apps/kwordquiz-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkeduvocdocument-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/knotifyconfig-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=media-libs/phonon-4.11.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kwordquiz-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f049bd43aee63a584339c93baba9a24c
diff --git a/metadata/md5-cache/kde-apps/kwrite-20.04.3 b/metadata/md5-cache/kde-apps/kwrite-20.04.3
index 6e6edf068a4a..e2c748f3e65b 100644
--- a/metadata/md5-cache/kde-apps/kwrite-20.04.3
+++ b/metadata/md5-cache/kde-apps/kwrite-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kjobwidgets-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/ktexteditor-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 activities? ( >=kde-frameworks/kactivities-5.70.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kate-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=193192cacc90056022ce82375a7c7630
diff --git a/metadata/md5-cache/kde-apps/kwrite-20.08.1 b/metadata/md5-cache/kde-apps/kwrite-20.08.1
index 59edcbbc3a02..6210a7867f21 100644
--- a/metadata/md5-cache/kde-apps/kwrite-20.08.1
+++ b/metadata/md5-cache/kde-apps/kwrite-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kjobwidgets-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/ktexteditor-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 activities? ( >=kde-frameworks/kactivities-5.72.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kate-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b48e02d2024596ba5b29f47161dd234
diff --git a/metadata/md5-cache/kde-apps/libgravatar-20.04.3 b/metadata/md5-cache/kde-apps/libgravatar-20.04.3
index d3994e58836e..d44b5cbea7db 100644
--- a/metadata/md5-cache/kde-apps/libgravatar-20.04.3
+++ b/metadata/md5-cache/kde-apps/libgravatar-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libgravatar-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bc8c376ceac1ecbbcf7e225526c01c68
diff --git a/metadata/md5-cache/kde-apps/libgravatar-20.08.1 b/metadata/md5-cache/kde-apps/libgravatar-20.08.1
index 6098728154a7..d1ed699d0553 100644
--- a/metadata/md5-cache/kde-apps/libgravatar-20.08.1
+++ b/metadata/md5-cache/kde-apps/libgravatar-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libgravatar-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79e38eba8fbac78e1faad50581aa628a
diff --git a/metadata/md5-cache/kde-apps/libkcddb-20.04.3 b/metadata/md5-cache/kde-apps/libkcddb-20.04.3
index 6823974898ec..315c84315e57 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-20.04.3
+++ b/metadata/md5-cache/kde-apps/libkcddb-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libkcddb-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7158848eec62d98f444f0bf17dbd093d
diff --git a/metadata/md5-cache/kde-apps/libkcddb-20.08.1 b/metadata/md5-cache/kde-apps/libkcddb-20.08.1
index 9bea495d4397..332c01712e19 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-20.08.1
+++ b/metadata/md5-cache/kde-apps/libkcddb-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkcddb-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=660392e43f231faa08ddd08421551265
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-20.04.3 b/metadata/md5-cache/kde-apps/libkcompactdisc-20.04.3
index ec7fea7cd30a..3dff4ccf06a6 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-20.04.3
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/solid-5.70.0:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libkcompactdisc-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b6fb1c643afe5b3c2fa85efe61a8aea
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-20.08.1 b/metadata/md5-cache/kde-apps/libkcompactdisc-20.08.1
index 69bbefe31841..bfdf2cf1ec10 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-20.08.1
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-fra
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkcompactdisc-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2081f32c3efc743d4e895564896b4d90
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-20.04.3 b/metadata/md5-cache/kde-apps/libkdcraw-20.04.3
index da5d9e7dc0b2..04c2947ee2c4 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-20.04.3
+++ b/metadata/md5-cache/kde-apps/libkdcraw-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=media-libs/libraw-0.16:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libkdcraw-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f537f3ef14d90a1999614b4289bc08af
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-20.08.1 b/metadata/md5-cache/kde-apps/libkdcraw-20.08.1
index 55facca9de3a..eb61369366fa 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-20.08.1
+++ b/metadata/md5-cache/kde-apps/libkdcraw-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=media-libs/libraw-0.16:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkdcraw-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c79e1db6cb86a41473ca1818ed72618c
diff --git a/metadata/md5-cache/kde-apps/libkdegames-20.04.3 b/metadata/md5-cache/kde-apps/libkdegames-20.04.3
index f369b75f333a..71dad98ef05d 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-20.04.3
+++ b/metadata/md5-cache/kde-apps/libkdegames-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-q
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libkdegames-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6daf88cd73c1fe3ad455c3f0fca38642
diff --git a/metadata/md5-cache/kde-apps/libkdegames-20.08.1 b/metadata/md5-cache/kde-apps/libkdegames-20.08.1
index 1a040bf6d743..df5b3280a7ff 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-20.08.1
+++ b/metadata/md5-cache/kde-apps/libkdegames-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-q
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkdegames-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=184b8921d36c286838a668bd522cd50d
diff --git a/metadata/md5-cache/kde-apps/libkdepim-20.04.3 b/metadata/md5-cache/kde-apps/libkdepim-20.04.3
index cb0491c12223..b4f508d563c2 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-20.04.3
+++ b/metadata/md5-cache/kde-apps/libkdepim-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libkdepim-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1eee53234558748ce2dede72e0132b4d
diff --git a/metadata/md5-cache/kde-apps/libkdepim-20.08.1 b/metadata/md5-cache/kde-apps/libkdepim-20.08.1
index e07cfb51dfc4..fd5e493450aa 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-20.08.1
+++ b/metadata/md5-cache/kde-apps/libkdepim-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkdepim-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7eb7ee2672e4d85ff3adf843eba4003a
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-20.04.3 b/metadata/md5-cache/kde-apps/libkeduvocdocument-20.04.3
index 0fbe8a9926e8..77e703e1cbc9 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-20.04.3
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-framewo
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libkeduvocdocument-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=960004dd0438805dd81eed61dabb4de3
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-20.08.1 b/metadata/md5-cache/kde-apps/libkeduvocdocument-20.08.1
index df0aef427d8d..bd6858532e1b 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-20.08.1
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-framewo
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkeduvocdocument-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0abb388fdac536c0bc56525f7b24e79c
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-20.04.3 b/metadata/md5-cache/kde-apps/libkexiv2-20.04.3
index 1afd5e6eaf5a..344abe5fdaa2 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-20.04.3
+++ b/metadata/md5-cache/kde-apps/libkexiv2-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=media-gfx/exiv2-0.25:=[xmp=] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libkexiv2-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3128af7863f372ca1ec4e4d60e2550c9
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-20.08.1 b/metadata/md5-cache/kde-apps/libkexiv2-20.08.1
index a94c3dec9b8b..25d1f8b9ca10 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-20.08.1
+++ b/metadata/md5-cache/kde-apps/libkexiv2-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=media-gfx/exiv2-0.25:=[xmp=] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkexiv2-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=77ade9e68f291ae5a4ac542927f4166e
diff --git a/metadata/md5-cache/kde-apps/libkgapi-20.04.3 b/metadata/md5-cache/kde-apps/libkgapi-20.04.3
index c85e61e4d0eb..c4b3889dec33 100644
--- a/metadata/md5-cache/kde-apps/libkgapi-20.04.3
+++ b/metadata/md5-cache/kde-apps/libkgapi-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/cyrus-sasl:2 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libkgapi-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7dccd368add0951c15bd73f5a76e6d8
diff --git a/metadata/md5-cache/kde-apps/libkgapi-20.08.1 b/metadata/md5-cache/kde-apps/libkgapi-20.08.1
index c3a61620a2a0..441c1a3513bc 100644
--- a/metadata/md5-cache/kde-apps/libkgapi-20.08.1
+++ b/metadata/md5-cache/kde-apps/libkgapi-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/cyrus-sasl:2 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkgapi-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4268b5f0abb5000d1405d9b23fd2040
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-20.04.3 b/metadata/md5-cache/kde-apps/libkgeomap-20.04.3
index 8ab6a0b02808..5834d21fd885 100644
--- a/metadata/md5-cache/kde-apps/libkgeomap-20.04.3
+++ b/metadata/md5-cache/kde-apps/libkgeomap-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwebkit
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libkgeomap-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=818a0ec91a8f20143ccb5eebe0396501
diff --git a/metadata/md5-cache/kde-apps/libkipi-20.04.3 b/metadata/md5-cache/kde-apps/libkipi-20.04.3
index f591d56fef58..758ac1f3d48c 100644
--- a/metadata/md5-cache/kde-apps/libkipi-20.04.3
+++ b/metadata/md5-cache/kde-apps/libkipi-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/32
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libkipi-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0ee404307255fdbc6789ceec13a7ccb
diff --git a/metadata/md5-cache/kde-apps/libkipi-20.08.1 b/metadata/md5-cache/kde-apps/libkipi-20.08.1
index e2121451cc5a..c5e48f8e3e3e 100644
--- a/metadata/md5-cache/kde-apps/libkipi-20.08.1
+++ b/metadata/md5-cache/kde-apps/libkipi-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/32
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkipi-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7209b2b3f2285070b40398fd331df663
diff --git a/metadata/md5-cache/kde-apps/libkleo-20.04.3 b/metadata/md5-cache/kde-apps/libkleo-20.04.3
index 2c6794a34bc1..e9aa43ce1bc7 100644
--- a/metadata/md5-cache/kde-apps/libkleo-20.04.3
+++ b/metadata/md5-cache/kde-apps/libkleo-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kitemmodels-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 fancyviewer? ( >=kde-apps/kpimtextedit-20.04.3:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libkleo-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c4c6005b612bd9c508cbf07002024eb
diff --git a/metadata/md5-cache/kde-apps/libkleo-20.08.1 b/metadata/md5-cache/kde-apps/libkleo-20.08.1
index 87ec260266b5..4614b1922d83 100644
--- a/metadata/md5-cache/kde-apps/libkleo-20.08.1
+++ b/metadata/md5-cache/kde-apps/libkleo-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-crypt/gpgme-1.11.1[cxx,qt5] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcodecs-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kitemmodels-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 fancyviewer? ( >=kde-apps/kpimtextedit-20.08.1:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkleo-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e93adb3113fbf5e76fff5de8c0b06163
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-20.04.3 b/metadata/md5-cache/kde-apps/libkmahjongg-20.04.3
index 911210d2bf04..0d7c57244bda 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-20.04.3
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libkmahjongg-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8983a39c0445eccd06d01c8dad17463e
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-20.08.1 b/metadata/md5-cache/kde-apps/libkmahjongg-20.08.1
index 7ff7a4a1b624..c59402bfa369 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-20.08.1
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkmahjongg-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5bb68e6325a90d2c16056c597c5c5bbe
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-20.04.3 b/metadata/md5-cache/kde-apps/libkomparediff2-20.04.3
index b039c29a6308..4388f595aaa0 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-20.04.3
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kco
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libkomparediff2-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68f059ff50aeb24534e674cbfa63d3bd
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-20.08.1 b/metadata/md5-cache/kde-apps/libkomparediff2-20.08.1
index ef276694fe36..174ac70fe6db 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-20.08.1
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kco
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libkomparediff2-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e543e98dee6a4adf28211db85ae3e5fb
diff --git a/metadata/md5-cache/kde-apps/libksane-20.04.3 b/metadata/md5-cache/kde-apps/libksane-20.04.3
index b00976b7c8ba..786e9abc6948 100644
--- a/metadata/md5-cache/kde-apps/libksane-20.04.3
+++ b/metadata/md5-cache/kde-apps/libksane-20.04.3
@@ -10,5 +10,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.70.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libksane-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2926418100295bcca96a3d6ff82e0943
diff --git a/metadata/md5-cache/kde-apps/libksane-20.08.1 b/metadata/md5-cache/kde-apps/libksane-20.08.1
index dbb227d04e51..f80e956f1d05 100644
--- a/metadata/md5-cache/kde-apps/libksane-20.08.1
+++ b/metadata/md5-cache/kde-apps/libksane-20.08.1
@@ -10,5 +10,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.72.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libksane-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6480534b7e6da4d229707d189f9a2bbc
diff --git a/metadata/md5-cache/kde-apps/libksieve-20.04.3 b/metadata/md5-cache/kde-apps/libksieve-20.04.3
index 518ae5322723..cb01716cab34 100644
--- a/metadata/md5-cache/kde-apps/libksieve-20.04.3
+++ b/metadata/md5-cache/kde-apps/libksieve-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=d
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/libksieve-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e0f173449553fc93612cc1bbd36ebff
diff --git a/metadata/md5-cache/kde-apps/libksieve-20.08.1 b/metadata/md5-cache/kde-apps/libksieve-20.08.1
index 5858da424e22..851615f892e2 100644
--- a/metadata/md5-cache/kde-apps/libksieve-20.08.1
+++ b/metadata/md5-cache/kde-apps/libksieve-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=d
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/libksieve-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35c3ab18e134bf66f0ef759570d55d91
diff --git a/metadata/md5-cache/kde-apps/libktnef-20.04.3 b/metadata/md5-cache/kde-apps/libktnef-20.04.3
index 1699957273e3..2ca90d342f3a 100644
--- a/metadata/md5-cache/kde-apps/libktnef-20.04.3
+++ b/metadata/md5-cache/kde-apps/libktnef-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kcalutils-20.04.3:5 >=kde-framewo
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/ktnef-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3c8a6eab40e82865966e741411749cae
diff --git a/metadata/md5-cache/kde-apps/libktnef-20.08.1 b/metadata/md5-cache/kde-apps/libktnef-20.08.1
index 867f04aae859..72b872bcd6c1 100644
--- a/metadata/md5-cache/kde-apps/libktnef-20.08.1
+++ b/metadata/md5-cache/kde-apps/libktnef-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/kcalutils-20.08.1:5 >=kde-framewo
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/ktnef-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e378f7891b513c3445079689ac78328
diff --git a/metadata/md5-cache/kde-apps/lokalize-20.04.3 b/metadata/md5-cache/kde-apps/lokalize-20.04.3
index be4524d34c50..b04e3f158c5d 100644
--- a/metadata/md5-cache/kde-apps/lokalize-20.04.3
+++ b/metadata/md5-cache/kde-apps/lokalize-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/lokalize-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=60548e591b186483b2b49b380ee9e6e5
diff --git a/metadata/md5-cache/kde-apps/lokalize-20.08.1 b/metadata/md5-cache/kde-apps/lokalize-20.08.1
index 56acfa9faf04..d3e0bb526424 100644
--- a/metadata/md5-cache/kde-apps/lokalize-20.08.1
+++ b/metadata/md5-cache/kde-apps/lokalize-20.08.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/lokalize-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=60624a59f1722ca83d223de0cd7a97bd
diff --git a/metadata/md5-cache/kde-apps/lskat-20.04.3 b/metadata/md5-cache/kde-apps/lskat-20.04.3
index a10682cf8f24..f7a0e97d2d41 100644
--- a/metadata/md5-cache/kde-apps/lskat-20.04.3
+++ b/metadata/md5-cache/kde-apps/lskat-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kguiaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/lskat-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ad185d6dcf1753df27cc39e9bf4b980
diff --git a/metadata/md5-cache/kde-apps/lskat-20.08.1 b/metadata/md5-cache/kde-apps/lskat-20.08.1
index 1def5c52dc56..a44240365725 100644
--- a/metadata/md5-cache/kde-apps/lskat-20.08.1
+++ b/metadata/md5-cache/kde-apps/lskat-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kguiaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/lskat-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e18ce0e03bb9a1fb2631dbbee5811b8
diff --git a/metadata/md5-cache/kde-apps/mailcommon-20.04.3 b/metadata/md5-cache/kde-apps/mailcommon-20.04.3
index 5099766c4cd1..6b60622def2e 100644
--- a/metadata/md5-cache/kde-apps/mailcommon-20.04.3
+++ b/metadata/md5-cache/kde-apps/mailcommon-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/mailcommon-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3665c2248facfe9bfaedeadff2395ec1
diff --git a/metadata/md5-cache/kde-apps/mailcommon-20.08.1 b/metadata/md5-cache/kde-apps/mailcommon-20.08.1
index 666132e5cb04..d5b863b30421 100644
--- a/metadata/md5-cache/kde-apps/mailcommon-20.08.1
+++ b/metadata/md5-cache/kde-apps/mailcommon-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtcore-5.14.2:5= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/mailcommon-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93c34c9080daf74917c175c7c95e2679
diff --git a/metadata/md5-cache/kde-apps/mailimporter-20.04.3 b/metadata/md5-cache/kde-apps/mailimporter-20.04.3
index 05d568985024..99637634a2d9 100644
--- a/metadata/md5-cache/kde-apps/mailimporter-20.04.3
+++ b/metadata/md5-cache/kde-apps/mailimporter-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/mailimporter-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a3ba3a6c0bdf5d12a835acf05dd50726
diff --git a/metadata/md5-cache/kde-apps/mailimporter-20.08.1 b/metadata/md5-cache/kde-apps/mailimporter-20.08.1
index f122131bce72..478424c61257 100644
--- a/metadata/md5-cache/kde-apps/mailimporter-20.08.1
+++ b/metadata/md5-cache/kde-apps/mailimporter-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/mailimporter-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b165966338b5c535f213566ce2d76d42
diff --git a/metadata/md5-cache/kde-apps/marble-20.04.3 b/metadata/md5-cache/kde-apps/marble-20.04.3
index aae9d13b6b8c..d7cf7a9ba061 100644
--- a/metadata/md5-cache/kde-apps/marble-20.04.3
+++ b/metadata/md5-cache/kde-apps/marble-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/20.04
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/marble-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a2b50cd9ae07c1a710c52083c793d23f
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=784ce25a0aba2d13b92cce072a4658cf
diff --git a/metadata/md5-cache/kde-apps/marble-20.08.1 b/metadata/md5-cache/kde-apps/marble-20.08.1
index f2387947529c..4390b3614e8b 100644
--- a/metadata/md5-cache/kde-apps/marble-20.08.1
+++ b/metadata/md5-cache/kde-apps/marble-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/20.08
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/marble-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85404874e9c3941e762f3394e0d2a85c
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-20.04.3 b/metadata/md5-cache/kde-apps/mbox-importer-20.04.3
index 631f5bf52995..eb324340a04c 100644
--- a/metadata/md5-cache/kde-apps/mbox-importer-20.04.3
+++ b/metadata/md5-cache/kde-apps/mbox-importer-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.04.3:5 >=kde-apps/kidentitymanagement-20.04.3:5 >=kde-apps/mailcommon-20.04.3:5 >=kde-apps/mailimporter-20.04.3:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/mbox-importer-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ef100cfd076b185c7f7fdff6a485a1f
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-20.08.1 b/metadata/md5-cache/kde-apps/mbox-importer-20.08.1
index 4b9677b53bdc..3e4b3de36550 100644
--- a/metadata/md5-cache/kde-apps/mbox-importer-20.08.1
+++ b/metadata/md5-cache/kde-apps/mbox-importer-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-20.08.1:5 >=kde-apps/kidentitymanagement-20.08.1:5 >=kde-apps/mailcommon-20.08.1:5 >=kde-apps/mailimporter-20.08.1:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/mbox-importer-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a73b61281042374644f2b7e1859d099
diff --git a/metadata/md5-cache/kde-apps/messagelib-20.04.3 b/metadata/md5-cache/kde-apps/messagelib-20.04.3
index 1cbbfd5823b8..ee1ddb996228 100644
--- a/metadata/md5-cache/kde-apps/messagelib-20.04.3
+++ b/metadata/md5-cache/kde-apps/messagelib-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=app-crypt/qca-2.3.0:2 >=dev-libs/g
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/messagelib-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a3c75316b24097ec0f302f83cae29200
diff --git a/metadata/md5-cache/kde-apps/messagelib-20.08.1 b/metadata/md5-cache/kde-apps/messagelib-20.08.1
index fd418bdaad38..5f35c566b596 100644
--- a/metadata/md5-cache/kde-apps/messagelib-20.08.1
+++ b/metadata/md5-cache/kde-apps/messagelib-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.8.0-r1[cxx,qt5] >=app-crypt/qca-2.3.0:2 >=dev-libs/g
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/messagelib-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b79b17aa3a060ae85d6b4e42ac5713e
diff --git a/metadata/md5-cache/kde-apps/minuet-20.04.3 b/metadata/md5-cache/kde-apps/minuet-20.04.3
index c89eddf27b93..4d61584543f0 100644
--- a/metadata/md5-cache/kde-apps/minuet-20.04.3
+++ b/metadata/md5-cache/kde-apps/minuet-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 media-sound/fluidsynth:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/minuet-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9370eccbbfccb28752810115d4c6e21a
diff --git a/metadata/md5-cache/kde-apps/minuet-20.08.1 b/metadata/md5-cache/kde-apps/minuet-20.08.1
index 2f37b99a1c6f..32453ca88dcf 100644
--- a/metadata/md5-cache/kde-apps/minuet-20.08.1
+++ b/metadata/md5-cache/kde-apps/minuet-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 media-sound/fluidsynth:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/minuet-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c4fe136673fccb0849de7b5d273190f
diff --git a/metadata/md5-cache/kde-apps/okular-20.04.3 b/metadata/md5-cache/kde-apps/okular-20.04.3
index 7003ca1a2cc7..1b1b593bfaa6 100644
--- a/metadata/md5-cache/kde-apps/okular-20.04.3
+++ b/metadata/md5-cache/kde-apps/okular-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/okular-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4833d591a64645285b96d9e82f3d9519
diff --git a/metadata/md5-cache/kde-apps/okular-20.08.1 b/metadata/md5-cache/kde-apps/okular-20.08.1
index ba344b9492bf..f6f702d5112c 100644
--- a/metadata/md5-cache/kde-apps/okular-20.08.1
+++ b/metadata/md5-cache/kde-apps/okular-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/okular-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=075594880348c1a7e9b15652c122f4e0
diff --git a/metadata/md5-cache/kde-apps/palapeli-20.04.3 b/metadata/md5-cache/kde-apps/palapeli-20.04.3
index 2eb745ab9752..b3a010060782 100644
--- a/metadata/md5-cache/kde-apps/palapeli-20.04.3
+++ b/metadata/md5-cache/kde-apps/palapeli-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.04.3:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/palapeli-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=31e7ac8f46fad7162025f9044a237818
diff --git a/metadata/md5-cache/kde-apps/palapeli-20.08.1 b/metadata/md5-cache/kde-apps/palapeli-20.08.1
index 520cccf5c90d..e469a4a67a2f 100644
--- a/metadata/md5-cache/kde-apps/palapeli-20.08.1
+++ b/metadata/md5-cache/kde-apps/palapeli-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkdegames-20.08.1:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/palapeli-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7f3e4b6d232a2e55d8b4be093885218
diff --git a/metadata/md5-cache/kde-apps/parley-20.04.3 b/metadata/md5-cache/kde-apps/parley-20.04.3
index 8a7d6794aa59..3ccecc9c7577 100644
--- a/metadata/md5-cache/kde-apps/parley-20.04.3
+++ b/metadata/md5-cache/kde-apps/parley-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=kde-apps/libkeduvocdocument-20.04.3:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kross-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=kde-frameworks/sonnet-5.70.0:5 >=kde-apps/kdeedu-data-20.04.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/parley-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=835e80629b38dbbcbad646aeec8db169
diff --git a/metadata/md5-cache/kde-apps/parley-20.08.1 b/metadata/md5-cache/kde-apps/parley-20.08.1
index 29c468f996e6..52d67858c846 100644
--- a/metadata/md5-cache/kde-apps/parley-20.08.1
+++ b/metadata/md5-cache/kde-apps/parley-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5[widgets] >=kde-apps/libkeduvocdocument-20.08.1:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kcompletion-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kross-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 >=kde-frameworks/sonnet-5.72.0:5 >=kde-apps/kdeedu-data-20.08.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/parley-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e066ead6625da168b1c1fbce334b7e98
diff --git a/metadata/md5-cache/kde-apps/picmi-20.04.3 b/metadata/md5-cache/kde-apps/picmi-20.04.3
index 909addd97216..346db58bfe41 100644
--- a/metadata/md5-cache/kde-apps/picmi-20.04.3
+++ b/metadata/md5-cache/kde-apps/picmi-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/picmi-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c917be362777439387b586b10e465439
diff --git a/metadata/md5-cache/kde-apps/picmi-20.08.1 b/metadata/md5-cache/kde-apps/picmi-20.08.1
index bfdf2f30fb24..18cf7bef49a5 100644
--- a/metadata/md5-cache/kde-apps/picmi-20.08.1
+++ b/metadata/md5-cache/kde-apps/picmi-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/picmi-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4278c6be29f38d67a88d288feb2c1f2b
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-20.04.3 b/metadata/md5-cache/kde-apps/pim-data-exporter-20.04.3
index 4ec38a3abd38..f6f5c3cbea03 100644
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-20.04.3
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-2
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/pim-data-exporter-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a6f840817f3ae45695364d7b827cf1b
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-20.08.1 b/metadata/md5-cache/kde-apps/pim-data-exporter-20.08.1
index f16e74cb176f..52558d676413 100644
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-20.08.1
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/akonadi-2
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/pim-data-exporter-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74e95903c25aa04057713125c13d38d3
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-20.04.3 b/metadata/md5-cache/kde-apps/pim-sieve-editor-20.04.3
index 21ba7bf5642c..97e71c7e4e24 100644
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-20.04.3
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/pim-sieve-editor-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68417295f3882038eaf2128c0ec6f407
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-20.08.1 b/metadata/md5-cache/kde-apps/pim-sieve-editor-20.08.1
index 92197fd1de59..d425f8669a7b 100644
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-20.08.1
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/pim-sieve-editor-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a3aa12bb4e259af4794e7c1bd0ad57c7
diff --git a/metadata/md5-cache/kde-apps/pimcommon-20.04.3 b/metadata/md5-cache/kde-apps/pimcommon-20.04.3
index 987a1aa617e9..a565e286044b 100644
--- a/metadata/md5-cache/kde-apps/pimcommon-20.04.3
+++ b/metadata/md5-cache/kde-apps/pimcommon-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/pimcommon-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d8b56202c02f781aa25c7dcc83e66d80
diff --git a/metadata/md5-cache/kde-apps/pimcommon-20.08.1 b/metadata/md5-cache/kde-apps/pimcommon-20.08.1
index d57c34108c4e..f04fe3c9e2e2 100644
--- a/metadata/md5-cache/kde-apps/pimcommon-20.08.1
+++ b/metadata/md5-cache/kde-apps/pimcommon-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/pimcommon-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d3bb0c3e1cc2a8792d1936d88098ce9
diff --git a/metadata/md5-cache/kde-apps/poxml-20.04.3 b/metadata/md5-cache/kde-apps/poxml-20.04.3
index 3731366b84a8..b4c7312ec6ff 100644
--- a/metadata/md5-cache/kde-apps/poxml-20.04.3
+++ b/metadata/md5-cache/kde-apps/poxml-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.14.2:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/poxml-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1609b477df0d57b27b01f7fe4ff548b5
diff --git a/metadata/md5-cache/kde-apps/poxml-20.08.1 b/metadata/md5-cache/kde-apps/poxml-20.08.1
index b10c06153f5c..a6c4fa832576 100644
--- a/metadata/md5-cache/kde-apps/poxml-20.08.1
+++ b/metadata/md5-cache/kde-apps/poxml-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.14.2:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/poxml-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55a4c55c29f263b3722917551975c2b0
diff --git a/metadata/md5-cache/kde-apps/print-manager-20.04.3 b/metadata/md5-cache/kde-apps/print-manager-20.04.3
index d8317e14a320..8fc866a76550 100644
--- a/metadata/md5-cache/kde-apps/print-manager-20.04.3
+++ b/metadata/md5-cache/kde-apps/print-manager-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcmutils-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/plasma-5.70.0:5 net-print/cups >=kde-plasma/kde-cli-tools-5.16.5:5 gtk? ( app-admin/system-config-printer ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/print-manager-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98fd8e80a2f73a1ffaa3d817ee0585c3
diff --git a/metadata/md5-cache/kde-apps/print-manager-20.08.1 b/metadata/md5-cache/kde-apps/print-manager-20.08.1
index 09c24ba2a6b0..bad4d8bb9ee1 100644
--- a/metadata/md5-cache/kde-apps/print-manager-20.08.1
+++ b/metadata/md5-cache/kde-apps/print-manager-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcmutils-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/plasma-5.72.0:5 net-print/cups >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 gtk? ( app-admin/system-config-printer ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/print-manager-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b26f978b791384b501542f2d571a0239
diff --git a/metadata/md5-cache/kde-apps/rocs-20.04.3 b/metadata/md5-cache/kde-apps/rocs-20.04.3
index 3ce8ff1d3d4e..eae5683e9626 100644
--- a/metadata/md5-cache/kde-apps/rocs-20.04.3
+++ b/metadata/md5-cache/kde-apps/rocs-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdeclarativ
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/rocs-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=525d9af49a43d3bd0e78c27e3bd5da58
diff --git a/metadata/md5-cache/kde-apps/rocs-20.08.1 b/metadata/md5-cache/kde-apps/rocs-20.08.1
index b247a62476e8..aa253cac6cd9 100644
--- a/metadata/md5-cache/kde-apps/rocs-20.08.1
+++ b/metadata/md5-cache/kde-apps/rocs-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdeclarativ
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/rocs-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1dca351a6e4d1e14abdb8e2e058a6a50
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-20.04.3 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-20.04.3
index 9bdbb300febc..fb770717e0e8 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-20.04.3
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kwallet-5.70.0:5 net-libs/signond || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/signon-kwallet-extension-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50d56a823f4af26dfb1824e1ea85604d
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-20.08.1 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-20.08.1
index aebb7879f357..b881498a2510 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-20.08.1
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kwallet-5.72.0:5 net-libs/signond || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/signon-kwallet-extension-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f3cea4f165feedb0cb088c252995569
diff --git a/metadata/md5-cache/kde-apps/spectacle-20.04.3 b/metadata/md5-cache/kde-apps/spectacle-20.04.3
index f702fb40c1b5..088a8786a7a2 100644
--- a/metadata/md5-cache/kde-apps/spectacle-20.04.3
+++ b/metadata/md5-cache/kde-apps/spectacle-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qdbus-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/spectacle-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1f7b12bbca24518f5cc4b83abec8bc5
diff --git a/metadata/md5-cache/kde-apps/spectacle-20.08.1 b/metadata/md5-cache/kde-apps/spectacle-20.08.1
index d0e042eb95a0..7ff4360909f0 100644
--- a/metadata/md5-cache/kde-apps/spectacle-20.08.1
+++ b/metadata/md5-cache/kde-apps/spectacle-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qdbus-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/spectacle-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab286814652a00d8b5d102420fbeef47
diff --git a/metadata/md5-cache/kde-apps/step-20.04.3 b/metadata/md5-cache/kde-apps/step-20.04.3
index 8162f09436dc..06ed8b7d7966 100644
--- a/metadata/md5-cache/kde-apps/step-20.04.3
+++ b/metadata/md5-cache/kde-apps/step-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-cpp/eigen-3.2:3 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtopengl-5.14.2:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/step-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1aae5db470045885ea10c2a00fe1bb36
diff --git a/metadata/md5-cache/kde-apps/step-20.08.1 b/metadata/md5-cache/kde-apps/step-20.08.1
index d3a0ee2860c9..afda1e98c67a 100644
--- a/metadata/md5-cache/kde-apps/step-20.08.1
+++ b/metadata/md5-cache/kde-apps/step-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-cpp/eigen-3.2:3 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtopengl-5.14.2:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/step-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9189e2cd4ce6ee02bf3d9b8b803cafcf
diff --git a/metadata/md5-cache/kde-apps/svgpart-20.04.3 b/metadata/md5-cache/kde-apps/svgpart-20.04.3
index 71873b0886ea..d624018b1a69 100644
--- a/metadata/md5-cache/kde-apps/svgpart-20.04.3
+++ b/metadata/md5-cache/kde-apps/svgpart-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/svgpart-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad1c8e3645d48a865eeed4c4277083b2
diff --git a/metadata/md5-cache/kde-apps/svgpart-20.08.1 b/metadata/md5-cache/kde-apps/svgpart-20.08.1
index a7937ad62419..ec3489793564 100644
--- a/metadata/md5-cache/kde-apps/svgpart-20.08.1
+++ b/metadata/md5-cache/kde-apps/svgpart-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/svgpart-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e7b274ec4537117a793ac52341d401b
diff --git a/metadata/md5-cache/kde-apps/sweeper-20.04.3 b/metadata/md5-cache/kde-apps/sweeper-20.04.3
index bc3056416fa6..3ce995335cfb 100644
--- a/metadata/md5-cache/kde-apps/sweeper-20.04.3
+++ b/metadata/md5-cache/kde-apps/sweeper-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kactivities-stats-5.70.0:5 >=kde-frameworks/kbookmarks-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/sweeper-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82ec99186066bc0dd519e9c3cd57144b
diff --git a/metadata/md5-cache/kde-apps/sweeper-20.08.1 b/metadata/md5-cache/kde-apps/sweeper-20.08.1
index f164cfb3c287..ab4ed01ac785 100644
--- a/metadata/md5-cache/kde-apps/sweeper-20.08.1
+++ b/metadata/md5-cache/kde-apps/sweeper-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kactivities-stats-5.72.0:5 >=kde-frameworks/kbookmarks-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/ktextwidgets-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/sweeper-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1280833efd99e433dd1bdb6c766d88cc
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-20.04.3 b/metadata/md5-cache/kde-apps/thumbnailers-20.04.3
index 2392fc305b4b..e6c103a03f3f 100644
--- a/metadata/md5-cache/kde-apps/thumbnailers-20.04.3
+++ b/metadata/md5-cache/kde-apps/thumbnailers-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 raw? ( >=kde-apps/libkdcraw-20.04.3:5 >=kde-apps/libkexiv2-20.04.3:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdegraphics-thumbnailers-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a753411d27c666b08f065d47f8813389
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-20.08.1 b/metadata/md5-cache/kde-apps/thumbnailers-20.08.1
index ef54d2266f70..6fda434b12b1 100644
--- a/metadata/md5-cache/kde-apps/thumbnailers-20.08.1
+++ b/metadata/md5-cache/kde-apps/thumbnailers-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 raw? ( >=kde-apps/libkdcraw-20.08.1:5 >=kde-apps/libkexiv2-20.08.1:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdegraphics-thumbnailers-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84ba09b789291e2b62c703f6b669f91c
diff --git a/metadata/md5-cache/kde-apps/umbrello-20.04.3 b/metadata/md5-cache/kde-apps/umbrello-20.04.3
index df550ce32d61..3f0448c733e0 100644
--- a/metadata/md5-cache/kde-apps/umbrello-20.04.3
+++ b/metadata/md5-cache/kde-apps/umbrello-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtpri
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/umbrello-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4559cd001a2b5335cd5457b30b213287
diff --git a/metadata/md5-cache/kde-apps/umbrello-20.08.1 b/metadata/md5-cache/kde-apps/umbrello-20.08.1
index e514dd90d2c4..ce111dd8d423 100644
--- a/metadata/md5-cache/kde-apps/umbrello-20.08.1
+++ b/metadata/md5-cache/kde-apps/umbrello-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtpri
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/umbrello-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b8645322f92e7426c5a4891f03400be
diff --git a/metadata/md5-cache/kde-apps/yakuake-20.04.3-r1 b/metadata/md5-cache/kde-apps/yakuake-20.04.3-r1
index 1dd9a0b57abe..c9b5e5f5fb30 100644
--- a/metadata/md5-cache/kde-apps/yakuake-20.04.3-r1
+++ b/metadata/md5-cache/kde-apps/yakuake-20.04.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/konsole-20.04.3:5 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kiconthemes-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/knewstuff-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 absolute-position? ( >=kde-frameworks/kwayland-5.70.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/yakuake-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cef7210def23bcf7ac84086844ce14c0
diff --git a/metadata/md5-cache/kde-apps/yakuake-20.08.1 b/metadata/md5-cache/kde-apps/yakuake-20.08.1
index b0706cde30c3..c7aa594f7e98 100644
--- a/metadata/md5-cache/kde-apps/yakuake-20.08.1
+++ b/metadata/md5-cache/kde-apps/yakuake-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/konsole-20.08.1:5 >=kde-frameworks/karchive-5.72.0:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kglobalaccel-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kiconthemes-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/knewstuff-5.72.0:5 >=kde-frameworks/knotifications-5.72.0:5 >=kde-frameworks/knotifyconfig-5.72.0:5 >=kde-frameworks/kparts-5.72.0:5 >=kde-frameworks/kservice-5.72.0:5 >=kde-frameworks/kwidgetsaddons-5.72.0:5 >=kde-frameworks/kwindowsystem-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 absolute-position? ( >=kde-frameworks/kwayland-5.72.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/yakuake-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0623a7a489954d2ce7401b40c91b7f7c
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-20.04.3 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-20.04.3
index 7b9b1c4e40da..5c1b429927e3 100644
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-20.04.3
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-20.04.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kdnssd-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/zeroconf-ioslave-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6b0cb3c864b2b579f2d04b70f0bb33e
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-20.08.1 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-20.08.1
index 64986db1dcad..cfbef1c0556a 100644
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-20.08.1
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-20.08.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kdbusaddons-5.72.0:5 >=kde-frameworks/kdnssd-5.72.0:5 >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/zeroconf-ioslave-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27c00931ecab56c812909def905738ae
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 7d8b5e6910d9..1211b31faed3 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/attica-5.70.0 b/metadata/md5-cache/kde-frameworks/attica-5.70.0
index 80ed60f4163d..ea32e4554443 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-d
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/attica-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55521f96496d8b8514943887501c20aa
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.74.0 b/metadata/md5-cache/kde-frameworks/attica-5.74.0
index 4c40f6b528b9..74f16d36b4bd 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtnetwork-5.14.2:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-d
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/attica-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b5e2e0bf7840133472032fb4e71dee2c
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.70.0 b/metadata/md5-cache/kde-frameworks/baloo-5.70.0
index 5a190113f6bf..45823ac3b8a6 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.1
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/baloo-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a3302bc9b190f663a89740636020b5d7
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.74.0 b/metadata/md5-cache/kde-frameworks/baloo-5.74.0
index 95a43e9cc2fb..7c5b226d4537 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.1
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/baloo-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eac496a132b55d452c0f8f769efc07ff
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.70.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.70.0
index 89b4703336e1..d6104bbc45b0 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetw
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/bluez-qt-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49f85248438e915fd02218274dc0f3b1
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.74.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.74.0
index b5d4acd0b52e..5bb4af083e50 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtnetw
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/bluez-qt-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=850a2a2b8307af7c4e7cc87971ef7b05
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.70.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.70.0
index 17194156300e..f504821cc947 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.70.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/breeze-icons-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f6df19a0cbda439cccc27fb8ee60e28
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.74.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.74.0
index 0081f6585ba6..f908dfebdd7c 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.74.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/breeze-icons-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9305738f65625e6d4c6e40f506c83e11
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.70.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.70.0
index 6477f07117d9..7ae786041a13 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.70.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/breeze-icons-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a443c487774e107e5497a740f7fe3fa4
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.74.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.74.0
index bd45ec4491bc..dc86cbedd1ee 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.74.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/breeze-icons-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd6bab7a81ba331a6dff02c93d137906
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.70.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.70.0
index c6a2267ce9fa..a1789ab133e0 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.70.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/libarchive[bzip2]
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/extra-cmake-modules-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=730eab65b70fd4deadcb0b74e7167575
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.74.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.74.0
index 54e3ac43e703..6634a0431b57 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.74.0
@@ -10,5 +10,5 @@ RDEPEND=app-arch/libarchive[bzip2]
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/extra-cmake-modules-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=345b3d7cdc77a2d64ed826b5f36491f8
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.70.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.70.0
index fb09e4542472..b73c9966ce1c 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= =kde-frameworks/kco
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/frameworkintegration-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96c5e5182f031075d4c8829ab8edf246
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.74.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.74.0
index 92ea2efeb1c9..0daa37a2d60d 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5= =kde-frameworks/kco
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/frameworkintegration-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8322d99f98730db63410e9705474125e
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.70.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.70.0
index ec88e1bbf713..ba498f7459d5 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 >=de
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kactivities-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef682dd8583780011f072172d06e2aa8
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.74.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.74.0
index 6908616bc4e1..835c00f891e8 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kactivities-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb48d5a217fd2f68c61210dc2782add0
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.70.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.70.0
index 1d0a3119e50c..2a97e6f76218 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 =kde-frameworks/kactivi
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kactivities-stats-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5184e8f92e0defc5e9370419eaa06e08
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.74.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.74.0
index 80f31dffefae..a19ea85a9a94 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 =kde-frameworks/kactivi
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kactivities-stats-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a256bff3af3162164f914f69b7acbd3e
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.70.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.70.0
index 374bae9180d5..07c5f1fded34 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.70.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen python_single_target_python3_6? ( dev-python/jinja[pytho
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kapidox-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=514d3da914135350505864bfe3aa054f
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.70.0-r1 b/metadata/md5-cache/kde-frameworks/karchive-5.70.0-r1
index cd638712c6cc..5cdf67a06915 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.70.0-r1
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.70.0-r1
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib >=kde-frameworks/kf-env-4
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/karchive-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=babbe428b37659ea411502b082e710b5
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.74.0 b/metadata/md5-cache/kde-frameworks/karchive-5.74.0
index 4b07984c5707..f6dd8a25d2d3 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2 app-arch/xz-utils sys-libs/zlib >=kde-frameworks/kf-env-4
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/karchive-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2923aca4053d35b408c23cd0afb801b1
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.70.0 b/metadata/md5-cache/kde-frameworks/kauth-5.70.0
index 4d3ffc12bb34..5aa0619bf23f 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.70.0
@@ -12,5 +12,5 @@ RDEPEND==kde-frameworks/kcoreaddons-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qt
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kauth-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6b2af36209423d9259a085ab4ffde799
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.74.0 b/metadata/md5-cache/kde-frameworks/kauth-5.74.0
index d59909a7d677..c22d9abce4b4 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.74.0
@@ -12,5 +12,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kauth-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4604bfa792625d9a8cf30a950889c2d2
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.70.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.70.0
index f3e34084a2ec..c8b9cc84bb2a 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kbookmarks-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0c01124f53541a5871847ac91d07001
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.74.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.74.0
index a69a7fbc96f3..37a93d067f3a 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kbookmarks-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3847b38ac14a69a453644cddd9878add
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.70.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.70.0
index e6d6902eafeb..09bcd006dfe2 100644
--- a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 dev-libs/libical:= !kde-apps/kcalcore:5 >=kde-fr
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kcalendarcore-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a46f97b6b8ff5267b6f49b62e2887ff
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.74.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.74.0
index 471827e909f4..6973eb824779 100644
--- a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libical:= >=dev-qt/qtgui-5.14.2:5 !kde-apps/kcalcore:5 >=kde-fr
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcalendarcore-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b95a8bcbcda16d5040c9b0f90d122cbf
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.70.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.70.0
index 2704739be643..0114fa18c6b8 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.70.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND==kde-frameworks/kauth-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kdeclarative-5.70*:5 =kde-frameworks/kguiaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kitemviews-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kxmlgui-5.70*: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/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kcmutils-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2834002297393c9d9497dd5ade23a0e1
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.74.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.74.0
index 49b0d9c8d207..05bfe441f9ba 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcmutils-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39217326217c6750d183523bb0c1f1ec
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.70.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.70.0
index ceff88c4db18..4657e8dbc895 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kcodecs-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=267c4d6730730ed24e74ce6788a03736
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.74.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.74.0
index c3601df5a148..61dd6fcf6531 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcodecs-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e4013dfc65a218bdaddfd699cfa5044
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.70.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.70.0
index f60d9a936271..35e159a0cb00 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 >
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kcompletion-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4f25469bc6b3c48d8fdfaa763e44153
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.74.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.74.0
index 3a34e6127107..f6a51d9b3747 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kcon
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcompletion-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b526abc01e3d7bb17f2d61698841d1f8
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.70.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.70.0
index 22d2a9d0adb9..153a18c898ec 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dbus? ( >=dev-qt/qtdbus-
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kconfig-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=40d11f41dae3df83b1eab5069c0151d2
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.74.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.74.0
index 09e3f487c006..3024567752e3 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 dbus? ( >=dev-qt/qtdbus-
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kconfig-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=624d8208eb494e60776557d85dd7f78d
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.70.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.70.0
index 26ac0dc164ec..ca7a70d1a693 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kauth-5.70*:5 =kde-frameworks/kcodecs-5.70*:5 =kde-frame
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kconfigwidgets-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1dd60da35f8272743d4008ba590f96f
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.74.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.74.0
index e81483e2063f..ee73d4ea41a3 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kconfigwidgets-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bc7397a420d15f47d5fa431d7c23bb01
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.70.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.70.0
index 4d093a0ea9b9..ad35bb05ca63 100644
--- a/metadata/md5-cache/kde-frameworks/kcontacts-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kcontacts-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kcodecs-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-fra
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kcontacts-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b08d5e1d22ff977eac63a4e1bcf86955
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.74.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.74.0
index 243441d0d581..a1fcf9302e89 100644
--- a/metadata/md5-cache/kde-frameworks/kcontacts-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcontacts-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 =kde-frameworks/kcodecs-5.74*:5 =kde-frameworks/
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcontacts-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=899224c07b29dcd0dfe638e4bd38e21e
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.70.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.70.0
index c38ca971ae85..844b6092c6bf 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtcore-5.12.3:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-e
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kcoreaddons-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5125a54fba5b955762096dffafeb8c5
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.74.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.74.0
index ca79e5684958..532e98059527 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtcore-5.14.2:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-e
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcoreaddons-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44518fcb248fd68072748d8ed5059486
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.70.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.70.0
index 771fa1c4c557..61b029051fc5 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kcrash-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ea725db7bebb0f846d7901c5ba07832
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.74.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.74.0
index ed63de947cb5..7b2672ab9830 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 =kde-frameworks/kc
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kcrash-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b088d42df6d2912170b915d80d2e60c
diff --git a/metadata/md5-cache/kde-frameworks/kdav-5.74.0 b/metadata/md5-cache/kde-frameworks/kdav-5.74.0
index a77d4cdfd2d4..77c4e6c55f28 100644
--- a/metadata/md5-cache/kde-frameworks/kdav-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdav-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=dev-qt/qtxmlpatterns-5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/frameworks/5.74/kdav-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e663e7da6940ab2441921416a18c75d3
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.70.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.70.0
index ef9eff22bb15..51a34bf169e7 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-fram
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kdbusaddons-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce691ba90afca2716e38754cea09be61
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.74.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.74.0
index 914fec7789cb..6a1ee0a404a0 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 ) >=kde-fram
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kdbusaddons-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f88bac3ad1f20fac73873fa8d4b30477
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.70.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.70.0
index 62ffe6780986..0c066f7456a2 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.70.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kglobalaccel-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kiconthemes-5.70*:5 =kde-frameworks/kio-5.70*:5 =kde-frameworks/kpackage-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*: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 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kdeclarative-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a70160f500cc7e76842d50a47ff0a208
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0
deleted file mode 100644
index 8fe7bb726cc5..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.74:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5= >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kpackage-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 media-libs/libepoxy doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing integration of QML and KDE work spaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5= >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kpackage-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.74
-SRC_URI=mirror://kde/stable/frameworks/5.74/kdeclarative-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f57e6a0773cbf55e531ed1292b05185
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0-r1 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0-r1
new file mode 100644
index 000000000000..3bef7d89303a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.74.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.74:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5= >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kpackage-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 media-libs/libepoxy doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing integration of QML and KDE work spaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5= >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kpackage-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.74
+SRC_URI=mirror://kde/stable/frameworks/5.74/kdeclarative-5.74.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dda947c5edb23c3dd5265856ba4d847f
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.70.0 b/metadata/md5-cache/kde-frameworks/kded-5.70.0
index 432be866ae46..6009c0586890 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.70.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kcrash-5.70*:5 =kde-frameworks/kdbusaddons-5.70*:5 =kde-frameworks/kinit-5.70*:5 =kde-frameworks/kservice-5.70*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kded-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f6d9e1834aba4302564be688ce0bbd7
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.74.0 b/metadata/md5-cache/kde-frameworks/kded-5.74.0
index 23bdabd4837a..55dacbc42908 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.74.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kcrash-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 =kde-frameworks/kinit-5.74*:5 =kde-frameworks/kservice-5.74*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kded-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab781da11137b162e4e89f5952bdd475
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.70.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.70.0
index 437cdddf45bb..afcf6329fc98 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/portingAids/kdelibs4support-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1105fdba6db3af5a2a313a29a297118f
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.74.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.74.0
index 466bdd29735c..d0e4606f39ae 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kdelibs4support-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1c8fbd97c01362da078a581ab56613e5
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.70.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.70.0
index cd26a0aa4b24..183416a2e2c8 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.70.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/portingAids/kdesignerplugin-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec821932396615ea74bd5565146d9e92
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.74.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.74.0
index 8277c7f65ad2..afc1598f8fdf 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.74.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND==kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kdesignerplugin-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b4aa8a51707507e232f6003212c87ad
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.70.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.70.0
index cf2b7940fbde..1bab2d12e7e1 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kdesu-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec6f830886a08510cd123306bc4e4d3f
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.74.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.74.0
index ceda91fd5fee..378d6e77d887 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.74.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kdesu-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16a5d3fb8479c5e61ad00452446733c2
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.70.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.70.0
index ceb995105685..f0929e70bea0 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.70.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kio-5.70*:5 =kde-frameworks/kjobwidgets-5.70*:5 =kde-frameworks/kparts-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/kwallet-5.70*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 designer? ( =kde-frameworks/kdesignerplugin-5.70*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/portingAids/kdewebkit-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f5dd6ea9ea2df89e58a66a0934d8e5d
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.74.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.74.0
index c8544bba8d38..7c5946a1006a 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.74.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kjobwidgets-5.74*:5 =kde-frameworks/kparts-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwallet-5.74*:5 designer? ( =kde-frameworks/kdesignerplugin-5.74*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kdewebkit-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c4c36cae36d141826165963b558dee5
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.70.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.70.0
index 9f4779c68951..800925f96633 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 zeroconf? ( >=dev-qt/qtdbus-5.12.3:5 net-dns
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kdnssd-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49b19629f5889173330c47fb5e4d6997
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.74.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.74.0
index e2fe93502ef0..a0194bdba236 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtnetwork-5.14.2:5 zeroconf? ( >=dev-qt/qtdbus-5.14.2:5 net-dns
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kdnssd-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8c9ac06758f290000706dcfb25020fb6
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.70.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.70.0
index d30a6aa205af..bcf0570d7e65 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/s
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kdoctools-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e33bd84fa8d2bb1bc29c6faf16c6628d
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.74.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.74.0
index 9a1f004414a0..23a4b50e2a8f 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/s
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kdoctools-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0cfb5daf7cea5bf029d934ae540536d6
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.70.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.70.0
index f92735d2188f..b1f988855647 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/karchive-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-fr
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kemoticons-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=abbfc891a4154b93c2039236baab8f55
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.74.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.74.0
index ebdbdca99849..3c389b3159ed 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtxml-5.14.2:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kemoticons-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae1691b54ee02bcbe16cd1312d9382e3
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.70.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.70.0
index 2cb763cb30bd..97526d8a4596 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-framewo
 RESTRICT=!test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kfilemetadata-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=73e8ff43b5b411bc423042b1ff82fc0e
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.74.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.74.0
index 8737e3980efb..82bbf632ebab 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-framewo
 RESTRICT=!test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kfilemetadata-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5abc0a16db01ed1b7908be5cece7a642
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.70.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.70.0
index 47542c9c6cf4..d23bc5df44d4 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kglobalaccel-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00bcbb585622c7495d8e1118e662424d
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.74.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.74.0
index f18619610383..829b61b475c7 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kglobalaccel-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=233ef9af47800b039003807f61246a32
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.70.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.70.0
index 7478e197a573..ba199753cc27 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kguiaddons-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51bade2bfb0e9aa38860b503c11db1f5
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.74.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.74.0
index 14e5390838be..87138874fcb5 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 >=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kguiaddons-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=370fb58af1600cf913791db8f7b40bc1
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.70.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.70.0
index b1868746301b..8b9d5257b5fc 100644
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 !kde-apps/kholidays:5 >=kde-frameworks/k
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kholidays-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c90400e1ebe035ef4e54ef1c5078569a
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.74.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.74.0
index 118da8260764..5f5ebd5a9a93 100644
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kholidays-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=541cdae3e8e98fd5da90b507834d10a5
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.70.0 b/metadata/md5-cache/kde-frameworks/khtml-5.70.0
index bb1335226071..c22e5145f650 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/karchive-5.70*:5 =kde-frameworks/kcodecs-5.70*:5 =kde-fr
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/portingAids/khtml-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a0bdbe17a889784fbc32c7214f5d937
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.74.0 b/metadata/md5-cache/kde-frameworks/khtml-5.74.0
index 5a52c9707ff9..48c7d5dd653f 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/khtml-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8e0e83acbe19ce6c1a00c1de6d3a1d9f
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.70.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.70.0
index 63db939591f9..4f67d761eef1 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.70.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/ki18n-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5a38609a3403669723ebd011e1791ff
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.74.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.74.0
index 53787845fecb..3b1a45107632 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.74.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/ki18n-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98c2c094309eeebb2c32d3b3a8847d39
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.70.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.70.0
index 9eeb6231e10f..4072bb7ad4a5 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/karchive-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-fr
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kiconthemes-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5acb52ddc671567e0c9cc5814e5bd6b6
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.74.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.74.0
index 5166b55123b0..dc071e0de586 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kiconthemes-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e94af2ed972a3706b9bf456f7ac6d4e9
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.70.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.70.0
index 854ee6ec9d8e..92fc192a5edf 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11e
 REQUIRED_USE=xscreensaver? ( X )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kidletime-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7873fcf725aac962efbccf896fda8b26
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.74.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.74.0
index 2048bb9c22be..7dc839745340 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 X? ( >=dev-qt/qtx11e
 REQUIRED_USE=xscreensaver? ( X )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kidletime-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06d120a1e15dda043967bb75ef4998f3
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.70.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.70.0
index 3212e826e3be..83cd7cbc9009 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/karchive-5.70*:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kimageformats-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce0bcee2186987e3085e3d84e2e905f1
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.74.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.74.0
index f02895f81b54..e4a3a52704cf 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 =kde-frameworks/karchive-5.74*:5 eps? ( >=dev-qt
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kimageformats-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6143c97f46e3c5101a3a186412c63dc
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.70.0 b/metadata/md5-cache/kde-frameworks/kinit-5.70.0
index 4173c37881ab..d382dbbfba06 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.70.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kcrash-5.70*:5 =kde-frameworks/kdbusaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kio-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kinit-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ada24cf25605a30c1b72be217450832
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.74.0 b/metadata/md5-cache/kde-frameworks/kinit-5.74.0
index fd9f0223058a..c58b51c821c7 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.74.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kcrash-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kinit-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=37843b80a2b4865d59b3a0a5db4c7c4a
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.70.1-r1 b/metadata/md5-cache/kde-frameworks/kio-5.70.1-r1
index 57b624374527..f7fdda9de8d4 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.70.1-r1
+++ b/metadata/md5-cache/kde-frameworks/kio-5.70.1-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtde
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kio-5.70.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b88d009d42cf3cd0e7756fe4ced690e
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.74.1 b/metadata/md5-cache/kde-frameworks/kio-5.74.1
deleted file mode 100644
index 0d30281e1ede..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.74.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.74:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5=[ssl] >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kauth-5.74*:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kbookmarks-5.74*:5 =kde-frameworks/kcodecs-5.74*:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kcrash-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kjobwidgets-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/ktextwidgets-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 =kde-frameworks/solid-5.74*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.74*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.74*:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 ) >=dev-qt/qtconcurrent-5.14.2:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.74:5
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5=[ssl] >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kauth-5.74*:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kbookmarks-5.74*:5 =kde-frameworks/kcodecs-5.74*:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kcrash-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kjobwidgets-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/ktextwidgets-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 =kde-frameworks/solid-5.74*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.74*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.74*:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.74
-SRC_URI=mirror://kde/stable/frameworks/5.74/kio-5.74.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c94845aedb8c2d52edd961bf21a1683
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.74.1-r1 b/metadata/md5-cache/kde-frameworks/kio-5.74.1-r1
new file mode 100644
index 000000000000..30480be520e4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.74.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.74:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5=[ssl] >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kauth-5.74*:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kbookmarks-5.74*:5 =kde-frameworks/kcodecs-5.74*:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kcrash-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kjobwidgets-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/ktextwidgets-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 =kde-frameworks/solid-5.74*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.74*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.74*:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 ) >=dev-qt/qtconcurrent-5.14.2:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.74:5
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5=[ssl] >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kauth-5.74*:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kbookmarks-5.74*:5 =kde-frameworks/kcodecs-5.74*:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kcrash-5.74*:5 =kde-frameworks/kdbusaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kjobwidgets-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/ktextwidgets-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 =kde-frameworks/solid-5.74*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.74*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.74*:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.74
+SRC_URI=mirror://kde/stable/frameworks/5.74/kio-5.74.1.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1a4228f6643bf89cbf98d647810830e0
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.70.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.70.0
index 8ae668890616..93cba53ed195 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdecla
 RESTRICT=!test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kirigami2-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1f5b99907aee9c03324f49506f440da
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.74.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.74.0
deleted file mode 100644
index 0b43ea9585b2..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.74.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.14.2:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
-EAPI=7
-HOMEPAGE=https://techbase.kde.org/Kirigami
-IUSE=debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtgraphicaleffects-5.14.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.74
-SRC_URI=mirror://kde/stable/frameworks/5.74/kirigami2-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3ef79d733bf437b6dae68981e1449878
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.74.0-r1 b/metadata/md5-cache/kde-frameworks/kirigami-5.74.0-r1
new file mode 100644
index 000000000000..fcd70bae27a5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.74.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-qt/linguist-tools-5.14.2:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
+EAPI=7
+HOMEPAGE=https://techbase.kde.org/Kirigami
+IUSE=debug examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtgraphicaleffects-5.14.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.74
+SRC_URI=mirror://kde/stable/frameworks/5.74/kirigami2-5.74.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a026e279f9efc4cd25e4105b984426ac
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.70.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.70.0
index cec78e0760a9..960f05ae8483 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc?
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kitemmodels-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0ba952a13db6d32a2c9f59adf029787
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.74.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.74.0
index 850e91e1b2d5..d9c72c85347f 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.14.2:5 ) >=kde-frameworks/kf-env-4 doc?
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kitemmodels-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=78b487b5f16b4409aeec6a811ebfdc93
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.70.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.70.0
index 52bc2c503014..14010580722f 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kitemviews-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76790e7104f7bd60f20e8cf6299e4a8f
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.74.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.74.0
index ac71eacca97c..f30ff1ed3ae2 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kf-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kitemviews-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4e0b527f8b4bbeb6a8d0d55bcfcd409
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.70.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.70.0
index c3c22157551d..a7bfae80b67c 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kjobwidgets-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d0363d818aff3fdf191c0756a640206c
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.74.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.74.0
index 890bdd79aa7f..673c4f8a6755 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kjobwidgets-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d9146ab49afa6ace670090d451476f00
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.70.0 b/metadata/md5-cache/kde-frameworks/kjs-5.70.0
index 9b009bf65998..9dca09d9c07f 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/portingAids/kjs-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43bcdfc32ec23b4d032a96d55c3885df
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.74.0 b/metadata/md5-cache/kde-frameworks/kjs-5.74.0
index c25214291fd6..6e734662ce21 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kjs-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0467c69afa4b5c03f525a5412bbe0a0c
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.70.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.70.0
index c47c2fb6eb35..b57701a154c2 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.70.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND==kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kjs-5.70*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/portingAids/kjsembed-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ef31848ec5e0e725ff3399cda819a5c
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.74.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.74.0
index 9e1ef39775a3..73d90e6bea56 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.74.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kjs-5.74*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kjsembed-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ba98d259c354e7e914fba9dfbdbd403
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.70.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.70.0
index 9f9b1c4f6b15..335c08d9f2ee 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kparts-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 >=dev-qt/
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/portingAids/kmediaplayer-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c192693d902c02e34854d181f5b1311
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.74.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.74.0
index 9a194b8af718..37c3c3eb6b85 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kpa
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kmediaplayer-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa640c4f4c44c9157bfa583524617460
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.70.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.70.0
index 9f72aa38a9b9..5a66d81ea888 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.70.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=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/qtxml-5.12.3:5 =kde-frameworks/attica-5.70*:5 =kde-frameworks/karchive-5.70*:5 =kde-frameworks/kcompletion-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kiconthemes-5.70*:5 =kde-frameworks/kio-5.70*:5 =kde-frameworks/kitemviews-5.70*:5 =kde-frameworks/kservice-5.70*:5 =kde-frameworks/ktextwidgets-5.70*:5 =kde-frameworks/kwidgetsaddons-5.70*:5 =kde-frameworks/kxmlgui-5.70*:5 >=kde-frameworks/kirigami-5.70:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/knewstuff-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d849437acc9c2635c3118eeccf4ac94
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.74.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.74.0
index d9f4fd91af70..ef6b84f8ced6 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.74.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/attica-5.74*:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kpackage-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/ktextwidgets-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 >=kde-frameworks/kirigami-5.74:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/knewstuff-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee4535deeeef1ba6f92c5fdc759d5540
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.70.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.70.0
index b76efe39cff6..cd8dbb1c24a8 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.70.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/kwindowsystem-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/knotifications-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f20b1aa0ca4952d382b59a3fbd4426b
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.74.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.74.0
index 85012d39b22e..ea04997e73ca 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.74.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) speech? ( >=dev-qt/qtspeech-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/knotifications-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b2a409deb58d85c515523e2ebeb27c8
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.70.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.70.0
index 0b83be44dcd2..0e332a600276 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.70.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND==kde-frameworks/kcompletion-5.70*:5 =kde-frameworks/kconfig-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-frameworks/kio-5.70*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/knotifyconfig-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f473d62a277ce90c6e902e7cdc9b97e5
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.74.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.74.0
index 8124a7667b64..686ba28092d0 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.74.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kcompletion-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kio-5.74*:5 !phonon? ( media-libs/libcanberra ) phonon? ( >=media-libs/phonon-4.11.0 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/knotifyconfig-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbfbb6d13f1b471e65cec8fc06b73da2
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.70.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.70.0
index f5d3cc96ffb3..d0915bdce70b 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/karchive-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kd
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kpackage-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd06e9ae971ebf58a95f165025722e7e
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.74.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.74.0
index 3188f5bc381b..81e8c7bdaf57 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.74.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/karchive-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kd
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kpackage-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=390c03741f140a09b28d96efcf64fc01
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.70.0 b/metadata/md5-cache/kde-frameworks/kparts-5.70.0
index 1a55939c281c..6b80cbe016d6 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kparts-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb0aa3760e1ff453d317223ea45a8c2b
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.74.0 b/metadata/md5-cache/kde-frameworks/kparts-5.74.0
index 9610f32dcc8c..6e06a973e26b 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kparts-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2188dc3f424eb8abc6fed497adced8b6
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.70.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.70.0
index 316001b26f13..d11c495a511c 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kpeople-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a85c5234c500502e42530c5120df857
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.74.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.74.0
index 56729dd45093..59730a87f316 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kpeople-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9a0cba7c3bd14c36d7aefa5ce7ad113
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.70.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.70.0
index 7222562407c3..1a2cb60af2de 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kplotting-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b67e272c310dd21e790c7fbc48e5f7a
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.74.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.74.0
index 0c77fb3abacb..b93be44d0c40 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kf-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kplotting-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25eae226d7b8e3cb309ff425fd8aac65
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.70.0 b/metadata/md5-cache/kde-frameworks/kpty-5.70.0
index 02e7c0a580a8..aa86ef197cba 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 sys-li
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kpty-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=083a13cd60dcac490a7ca9e34f399be8
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.74.0 b/metadata/md5-cache/kde-frameworks/kpty-5.74.0
index 43c590422e29..c67f25e28e02 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.74.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 sys-li
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kpty-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e14301dcad55434b5757aea21c4a2d2
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.70.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.70.0
index 45e6a1943665..a46f70a0026f 100644
--- a/metadata/md5-cache/kde-frameworks/kquickcharts-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kquickcharts-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtquick
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kquickcharts-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dcd919118597805fe6db6f7a162454ce
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.74.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.74.0
index c4f38d92ccef..a9975a4b5b5d 100644
--- a/metadata/md5-cache/kde-frameworks/kquickcharts-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kquickcharts-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtquick
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kquickcharts-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=356718604e5ae33e5b075d0b0a244e42
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.70.0 b/metadata/md5-cache/kde-frameworks/kross-5.70.0
index 224f5517a8c5..60dba04c6f26 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kcompletion-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/portingAids/kross-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c50299ac6d0ec365727923dbbe3c230
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.74.0 b/metadata/md5-cache/kde-frameworks/kross-5.74.0
index 72ca9f99fb16..5dd43c2482cc 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtscript-5.14.2:5 >=dev-qt/qtwidgets-5.
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kross-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=353b09ca240855033577626ed7dd8710
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.70.0 b/metadata/md5-cache/kde-frameworks/krunner-5.70.0
index 471c4fabe380..0daeeeed9e59 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kconfig-5.70*:5 =kde-frameworks/kcoreaddons-5.70*:5 =kde
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/krunner-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59e28f1046fdd7159580b7e61063bd38
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.74.0 b/metadata/md5-cache/kde-frameworks/krunner-5.74.0
index 1bbae8635050..51c15623a340 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/krunner-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a70290769f900ad1373a87388a969385
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.70.0 b/metadata/md5-cache/kde-frameworks/kservice-5.70.0
index 5fd527481467..4e2a6e70ed45 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig
 RESTRICT=!test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kservice-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34da97965170b1fc7deaf03a5ef973b0
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.74.0 b/metadata/md5-cache/kde-frameworks/kservice-5.74.0
index 7b7278ae6367..d29949f43a87 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kconfig
 RESTRICT=!test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kservice-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f03a515232288b4cbc0e28faa2837a20
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.70.1 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.70.1
index cabd1d69d894..c7d3b4bdffdb 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.70.1
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.70.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprint
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/ktexteditor-5.70.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b78516eaa469c34be619545d2820eee7
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.74.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.74.0
index 6b998e8ed821..3084b1d0bbe2 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprint
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/ktexteditor-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2fe284cab433a270c4db85f87d24712e
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.70.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.70.0
index 184404dce589..732a4cf07ee1 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kcom
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/ktextwidgets-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d473c2c15929bfe5beedfdd064266be0
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.74.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.74.0
index 78112eb8531e..d9fd6a4cde9b 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kcom
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/ktextwidgets-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ba3ce347ec3b568fdc4077be96fb1529
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.70.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.70.0
index 8c57a0df3c4a..45f0ccf4a610 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/ki18n-5.70*:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-framewor
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kunitconversion-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8de30f8c0bac234db7a32563b75398dd
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.74.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.74.0
index 51ba3e0c8107..f2c08238f074 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtnetwork-5.14.2:5 =kde-frameworks/ki18n-5.74*:5 >=kde-framewor
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kunitconversion-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c861f0e7cea28f3f8a4456078d341e02
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.70.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.70.0
index 6b425c76a53e..16bac96249d8 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kwallet-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4b0f5feb33b28dec723f4b82cfb4cb6
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.74.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.74.0
index daace2ac0c43..221303e72892 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kwallet-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=224a0225747711410bc26de19340862b
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.70.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.70.0
index 2807186d80c4..272c53ca89ee 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kwayland-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=733943d7f237e7e8f2103f3aa329be73
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.74.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.74.0
index 17b0e5e9c52a..b61418c59e53 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kwayland-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87161b4a4a988c186096edbf207d8467
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.70.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.70.0
index 0a887ab96e5f..4e19a598db60 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kwidgetsaddons-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5112ad67db9bd5a2ced38b2138caf033
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.74.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.74.0
index e6ee94848f1c..9fb30d467d8a 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kf-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kwidgetsaddons-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=620c6fe254883e894ecc228560191e93
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.70.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.70.0
index cb57728938ce..1ae25e84b976 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11e
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kwindowsystem-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d0b291c8f4d68891d6fe05dffb4647e7
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.74.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.74.0
index 29a5a706e2c9..de32a9798274 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 X? ( >=dev-qt/qtx11e
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/kwindowsystem-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a981ba1220b13aaa36f0fdaa45031512
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.70.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.70.0
index 6d8838a9f084..96854a61c2e6 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kxmlgui-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5dadd9b8d598b97160f9433439058822
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0
deleted file mode 100644
index c9124ba34593..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.74:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.14.2:5= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5[ssl] >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.14.2:5= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5[ssl] >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.74
-SRC_URI=mirror://kde/stable/frameworks/5.74/kxmlgui-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=603fbabe480f642429b44668f41470c8
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0-r1 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0-r1
new file mode 100644
index 000000000000..0c78ecb550de
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.74.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.74:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.14.2:5= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5[ssl] >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.14.2:5= >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5[ssl] >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kitemviews-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.74
+SRC_URI=mirror://kde/stable/frameworks/5.74/kxmlgui-5.74.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b6ea767ab94975fcb3ffc8851be1d81
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.70.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.70.0
index 0c2e96c6b1cd..45bd52725912 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kcoreaddons-5.70*:5 =kde-frameworks/ki18n-5.70*:5 =kde-f
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/kxmlrpcclient-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e0dd8c5627533d57592667b3d07b67ed
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.74.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.74.0
index bdb5d877b02d..31055d0ad1fc 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-framewo
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/portingAids/kxmlrpcclient-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a79e731051a9f53ecc8002a0b40c5f5b
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.70.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.70.0
index 9e52e0c37f47..41145c167aa1 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-misc/modemmanager >
 RESTRICT=!test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/modemmanager-qt-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5ff1d20cd2d8688b375a50da2137efa3
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.74.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.74.0
index 90ee2132bbfa..5680becb6572 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 net-misc/modemmanager >
 RESTRICT=!test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/modemmanager-qt-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=655609966a33360ff0afc732f059c054
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.70.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.70.0
index 1976e40803b5..9b3ce022de97 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkm
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/networkmanager-qt-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4121f6557ecf323771cff320991cffef
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.74.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.74.0
index 2774eb04466b..ecf2ba828c7b 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=net-misc/networkm
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/networkmanager-qt-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12e10912066a83bd9c66eed77087b1a2
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.70.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.70.0
index 0e9f2cad9089..d48e4f1243a2 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.70.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/oxygen-icons5-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=248cbbe66b1b70ade6b5b61fd6895ed2
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.74.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.74.0
index 0028f9f92bf8..18854f925753 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.74.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/oxygen-icons5-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a7feaafed64c525129d1c8b8df89e61a
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.70.1 b/metadata/md5-cache/kde-frameworks/plasma-5.70.1
index aad6b60a9da7..4fd146c6f022 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.70.1
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.70.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/plasma-framework-5.70.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16861bb5ca5fa780fbe7cddd3a3ccac7
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.74.0 b/metadata/md5-cache/kde-frameworks/plasma-5.74.0
deleted file mode 100644
index 0f217824d231..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.74.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=kde-frameworks/kdoctools-5.74:5 dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.74:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[gles2-only=] >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kactivities-5.74*:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kdeclarative-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/kguiaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kirigami-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kpackage-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.74*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma framework
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=gles2-only wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[gles2-only=] >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kactivities-5.74*:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kdeclarative-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/kguiaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kirigami-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kpackage-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.74*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.74
-SRC_URI=mirror://kde/stable/frameworks/5.74/plasma-framework-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b40e5749bf7aa02b57469fbef221ae35
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1 b/metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1
new file mode 100644
index 000000000000..2dbb48bd0397
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.74.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=kde-frameworks/kdoctools-5.74:5 dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.74:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[gles2-only=] >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kactivities-5.74*:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kdeclarative-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/kguiaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kirigami-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kpackage-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.74*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma framework
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=gles2-only wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[gles2-only=] >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kactivities-5.74*:5 =kde-frameworks/karchive-5.74*:5 =kde-frameworks/kconfig-5.74*:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kcoreaddons-5.74*:5 =kde-frameworks/kdeclarative-5.74*:5 =kde-frameworks/kglobalaccel-5.74*:5 =kde-frameworks/kguiaddons-5.74*:5 =kde-frameworks/ki18n-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kio-5.74*:5 =kde-frameworks/kirigami-5.74*:5 =kde-frameworks/knotifications-5.74*:5 =kde-frameworks/kpackage-5.74*:5 =kde-frameworks/kservice-5.74*:5 =kde-frameworks/kwidgetsaddons-5.74*:5 =kde-frameworks/kwindowsystem-5.74*:5 =kde-frameworks/kxmlgui-5.74*:5 !gles2-only? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.74*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.74
+SRC_URI=mirror://kde/stable/frameworks/5.74/plasma-framework-5.74.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9f5b75ff9c75ae4df3d6ab79c24044bc
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.70.0 b/metadata/md5-cache/kde-frameworks/prison-5.70.0
index ae63bd4a5643..b85485467d4a 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/prison-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50bfa24a65ad3b44d0a671a5f5d15ced
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.74.0 b/metadata/md5-cache/kde-frameworks/prison-5.74.0
index c83ef0f9492a..b57d49347aad 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/prison-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8029eca1a0ed77f91132aee14c540cb
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.70.0 b/metadata/md5-cache/kde-frameworks/purpose-5.70.0
index 7b93460824be..b75bc1643c3b 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwo
 RESTRICT=!test? ( test ) test
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/purpose-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6cdaf2c6968685738c09ccb3b4b2ae66
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.74.0 b/metadata/md5-cache/kde-frameworks/purpose-5.74.0
index 54d621201ad8..4b7322497536 100644
--- a/metadata/md5-cache/kde-frameworks/purpose-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwo
 RESTRICT=!test? ( test ) test
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/purpose-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=31d1f4d71245e63e2537059d7f4f3a50
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.70.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.70.0
index 620f57aa46c8..8b880d00e049 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kconfigwidgets-5.70*:5 =kde-frameworks/kiconthemes-5.70*
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/qqc2-desktop-style-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a352773497e6e15258b351c40273488
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.74.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.74.0
deleted file mode 100644
index eec74394707e..000000000000
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.74.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.14.2:5= >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kirigami-5.74*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-2+ LGPL-3+ )
-RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5= >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kirigami-5.74*:5 >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.74
-SRC_URI=mirror://kde/stable/frameworks/5.74/qqc2-desktop-style-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7ddaa1b5061a01ba595942d760bcf89
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.74.0-r1 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.74.0-r1
new file mode 100644
index 000000000000..6ca3f8caabff
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.74.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.74:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.14.2:5= >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kirigami-5.74*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2+ LGPL-3+ )
+RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5= >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 =kde-frameworks/kconfigwidgets-5.74*:5 =kde-frameworks/kiconthemes-5.74*:5 =kde-frameworks/kirigami-5.74*:5 >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.74
+SRC_URI=mirror://kde/stable/frameworks/5.74/qqc2-desktop-style-5.74.0.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=49a7d9c3c592f6b87fe3609a81628d29
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.70.0 b/metadata/md5-cache/kde-frameworks/solid-5.70.0
index 34a91a1d857f..a32c83e06710 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/solid-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab7f3209203077d1c6c5a9dce176d647
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.74.0 b/metadata/md5-cache/kde-frameworks/solid-5.74.0
index 752cce0080f1..4febb9e573a6 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtdeclarative-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/solid-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5409bd25f8ef00c7a46da070df27b088
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.70.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.70.0
index 0a57c4d4c12d..4bde4eb17569 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 aspell? ( app-text/a
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/sonnet-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1c05517a54ae1ee1baaf6eee338fa549
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.74.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.74.0
index d25daaff3bb5..4d92f0519db6 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 aspell? ( app-text/a
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/sonnet-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f5921148d72e1fefad39fb643fd10c0
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.70.0 b/metadata/md5-cache/kde-frameworks/syndication-5.70.0
index 45b1c43f61ac..f0c7d1d47386 100644
--- a/metadata/md5-cache/kde-frameworks/syndication-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.70.0
@@ -11,5 +11,5 @@ RDEPEND==kde-frameworks/kcodecs-5.70*:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/syndic
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/syndication-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4d2c5d3399c2b511b9fa639a752fd2de
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.74.0 b/metadata/md5-cache/kde-frameworks/syndication-5.74.0
index 3bb15e20425e..47857af61010 100644
--- a/metadata/md5-cache/kde-frameworks/syndication-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtxml-5.14.2:5 =kde-frameworks/kcodecs-5.74*:5 !kde-apps/syndic
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/syndication-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0519793cb37f688578d2b1f1327974ec
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.70.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.70.0
index 84c0679ede81..ef2269bb28ca 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxmlpatter
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/syntax-highlighting-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f19bab9277d7eb145038f169decd2442
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.74.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.74.0
index dc9282ce8d1d..2d31a33617b8 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtxmlpatter
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/syntax-highlighting-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a7ceefe82c4a5c16271329ccbf727412
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.70.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.70.0
index be290542323e..295d553b4296 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.70.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.70.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.70
 SRC_URI=mirror://kde/stable/frameworks/5.70/threadweaver-5.70.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0385c9f2bd77727cafa1f358ff61f290
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.74.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.74.0
index c7df8a0afc81..bc948c45ab7a 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.74.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.74.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5/5.74
 SRC_URI=mirror://kde/stable/frameworks/5.74/threadweaver-5.74.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa770c88e844f70617ab2e9463ea3b68
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index bd1c7e281a5c..04725127e9fe 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/basket-2.49b b/metadata/md5-cache/kde-misc/basket-2.49b
index a859c7e9d48f..e899317e3203 100644
--- a/metadata/md5-cache/kde-misc/basket-2.49b
+++ b/metadata/md5-cache/kde-misc/basket-2.49b
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/basket-notepads/basket/archive/v2.49b.tar.gz -> basket-2.49b.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b84bb4777fc3127510ccae5b59890ad
diff --git a/metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2 b/metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
index c5f5172cc00b..a9a263ba33ac 100644
--- a/metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
+++ b/metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/kcmutils-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/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 media-libs/lcms:2 x11-libs/libxcb x11-libs/libX11 x11-libs/libXrandr kde-plasma/kde-cli-tools:5 x11-misc/colord || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/colord-kde/0.5.0/src/colord-kde-0.5.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/colord-kde-0.5.0-patches.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3086c34f99ad160941da2a1487b08f4
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-20.04.3 b/metadata/md5-cache/kde-misc/kdeconnect-20.04.3
index 8786d03b082e..690863ff515d 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-20.04.3
+++ b/metadata/md5-cache/kde-misc/kdeconnect-20.04.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/qca-2.1.0:2[qt5(+),ssl] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qt
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/kdeconnect-kde-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=235a3156232285cb34ee14b74fdacb4d
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-20.08.1 b/metadata/md5-cache/kde-misc/kdeconnect-20.08.1
index 5678932ffb32..fd840d94d55f 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-20.08.1
+++ b/metadata/md5-cache/kde-misc/kdeconnect-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/qca-2.3.0:2[ssl] >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclara
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kdeconnect-kde-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d21a09f85efb56061b85f7fa5dd84cec
diff --git a/metadata/md5-cache/kde-misc/kdiff3-1.8.3-r1 b/metadata/md5-cache/kde-misc/kdiff3-1.8.3-r1
index c4282578b855..868858fecb71 100644
--- a/metadata/md5-cache/kde-misc/kdiff3-1.8.3-r1
+++ b/metadata/md5-cache/kde-misc/kdiff3-1.8.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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/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/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 sys-apps/diffutils || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiff3/kdiff3-1.8.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a225a721475962cc415406dc800a18c1
diff --git a/metadata/md5-cache/kde-misc/kdiff3-1.8.4 b/metadata/md5-cache/kde-misc/kdiff3-1.8.4
index d3bc709d19a4..a542063e81d6 100644
--- a/metadata/md5-cache/kde-misc/kdiff3-1.8.4
+++ b/metadata/md5-cache/kde-misc/kdiff3-1.8.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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/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/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 sys-apps/diffutils || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiff3/kdiff3-1.8.4.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e1ab3c405cf9507f402f31c72d025e89
diff --git a/metadata/md5-cache/kde-misc/kdirstat-3.2.1 b/metadata/md5-cache/kde-misc/kdirstat-3.2.1
index 6caec9fa6a11..9b6e5cab2aba 100644
--- a/metadata/md5-cache/kde-misc/kdirstat-3.2.1
+++ b/metadata/md5-cache/kde-misc/kdirstat-3.2.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kiconthemes:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 sys-libs/zlib || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://github.com/jeromerobert/k4dirstat/archive/3.2.1.tar.gz -> kdirstat-3.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f766e0bc55efb860c052adbf229f709d
diff --git a/metadata/md5-cache/kde-misc/kimtoy-1.92_pre20190225 b/metadata/md5-cache/kde-misc/kimtoy-1.92_pre20190225
index 8c50a085df0d..c67caf06026d 100644
--- a/metadata/md5-cache/kde-misc/kimtoy-1.92_pre20190225
+++ b/metadata/md5-cache/kde-misc/kimtoy-1.92_pre20190225
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/karchive-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/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-frameworks/plasma-5.60.0:5 media-libs/libpng:0=[apng] x11-libs/libX11 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) scim? ( >=app-i18n/scim-1.4.9 dev-libs/dbus-c++ ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.60.0:5 ) !kde-misc/kimtoy:4 >=app-i18n/fcitx-4.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://github.com/KDE/kimtoy/archive/c8b3da65bfd289d0a0262aa673aa6b697022d4a3.tar.gz -> kimtoy-1.92_pre20190225.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd9f61059061666027e1d3314eef1f9e
diff --git a/metadata/md5-cache/kde-misc/kio-fuse-4.95.0 b/metadata/md5-cache/kde-misc/kio-fuse-4.95.0
index 081b8938675f..890c6a2df504 100644
--- a/metadata/md5-cache/kde-misc/kio-fuse-4.95.0
+++ b/metadata/md5-cache/kde-misc/kio-fuse-4.95.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kco
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kio-fuse/4.95.0/kio-fuse-4.95.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b3f73ac4e37ba83b0f60f9a3272f322
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.3.0 b/metadata/md5-cache/kde-misc/kio-gdrive-1.3.0
index 8594766da4d8..53fba87e06cf 100644
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.3.0
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/libkgapi-19.08.0:5 >=kde-framewor
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kio-gdrive/1.3.0/src/kio-gdrive-1.3.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=40af09d23c00e2d8a8573aee6bb6a51d
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-20.08.1 b/metadata/md5-cache/kde-misc/kio-gdrive-20.08.1
index 37ef73114ce5..bf028988c840 100644
--- a/metadata/md5-cache/kde-misc/kio-gdrive-20.08.1
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-20.08.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-apps/libkgapi-19.08.0:5 >=kde-framewor
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/kio-gdrive-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6cf7695a40cc6920757bb40a02e67d5
diff --git a/metadata/md5-cache/kde-misc/kio-gopher-0.1.99-r1 b/metadata/md5-cache/kde-misc/kio-gopher-0.1.99-r1
index 571df576473d..4c6c4340446f 100644
--- a/metadata/md5-cache/kde-misc/kio-gopher-0.1.99-r1
+++ b/metadata/md5-cache/kde-misc/kio-gopher-0.1.99-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcodecs-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/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kio-gopher/kio-gopher-0.1.99.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b383b7ba3e814619700be7596dd08acd
diff --git a/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r3 b/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r3
index bebf8565cc05..9693edb97b05 100644
--- a/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r3
+++ b/metadata/md5-cache/kde-misc/kio-locate-0.5.3-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/ki18n:5 kde-frameworks/kiconthemes:5 kde-frameworks/kio:5 kde-frameworks/kwidgetsaddons:5 sys-apps/mlocate || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1460972255/120965-kio-locate-0.5.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=92b0f6e240055f79afeea2f7b0b9de78
diff --git a/metadata/md5-cache/kde-misc/kio-stash-1.0-r1 b/metadata/md5-cache/kde-misc/kio-stash-1.0-r1
index cc4ebba5c08a..2f09d2208c8c 100644
--- a/metadata/md5-cache/kde-misc/kio-stash-1.0-r1
+++ b/metadata/md5-cache/kde-misc/kio-stash-1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-fra
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=mirror://kde/stable/kio-stash/kio-stash-1.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=040779a9ff3a96470376f992e99507c2
diff --git a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.5 b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.5
index 254792dd0ac8..997c19c62b22 100644
--- a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.5
+++ b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.5
@@ -10,5 +10,5 @@ LICENSE=!webkit? ( BSD ) LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmarkdownwebview/0.5.5/src/kmarkdownwebview-0.5.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bdb27d4be877c0d786f2e8391a687106
diff --git a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.6 b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.6
index d37406da9f65..1e92faef8c9d 100644
--- a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.6
+++ b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.6
@@ -10,5 +10,5 @@ LICENSE=BSD LGPL-2.1+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kparts:5 kde-frameworks/kxmlgui:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmarkdownwebview/0.5.6/src/kmarkdownwebview-0.5.6.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fcbafd570949b1c3f48cc367e35be2e0
diff --git a/metadata/md5-cache/kde-misc/kolor-manager-1.1.0 b/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
index 1f16c5920e9c..2cc686a35b4a 100644
--- a/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
+++ b/metadata/md5-cache/kde-misc/kolor-manager-1.1.0
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 media-gfx/synnefo media-libs/libXcm >=media-libs/oyranos-0.9.6 x11-libs/libXrandr || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://github.com/KDE/kolor-manager/archive/1.1.0.tar.gz -> kolor-manager-1.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e0d3b84cabe143c780ce11e2f9bd612f
diff --git a/metadata/md5-cache/kde-misc/krename-5.0.0-r1 b/metadata/md5-cache/kde-misc/krename-5.0.0-r1
index 20737979b552..e212b36d53a6 100644
--- a/metadata/md5-cache/kde-misc/krename-5.0.0-r1
+++ b/metadata/md5-cache/kde-misc/krename-5.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/krename/5.0.0/src/krename-5.0.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94d63b5a7d4ec3f5b86b0783b7a14315
diff --git a/metadata/md5-cache/kde-misc/krusader-2.7.2 b/metadata/md5-cache/kde-misc/krusader-2.7.2
index f37a9b5ff2e9..42299f6b69c7 100644
--- a/metadata/md5-cache/kde-misc/krusader-2.7.2
+++ b/metadata/md5-cache/kde-misc/krusader-2.7.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcodecs-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/kguiaddons-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/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-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/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 sys-apps/acl sys-libs/zlib kde-apps/kio-extras:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krusader/2.7.2/krusader-2.7.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c0675e10473bf14db693a72e6844fa7
diff --git a/metadata/md5-cache/kde-misc/kshutdown-5.2 b/metadata/md5-cache/kde-misc/kshutdown-5.2
index a8baca1f95d8..89b746e83c28 100644
--- a/metadata/md5-cache/kde-misc/kshutdown-5.2
+++ b/metadata/md5-cache/kde-misc/kshutdown-5.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kdbusaddons:5 kde-frameworks/kglobalaccel:5 kde-frameworks/ki18n:5 kde-frameworks/kidletime:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* )
 SLOT=5
 SRC_URI=mirror://sourceforge/kshutdown/kshutdown-source-5.2.zip
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49a14f87a4439ffa48bdf45f7d38ba31
diff --git a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1 b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
index bc80be4864e9..2112dd13a87d 100644
--- a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
+++ b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kauth-5.60.0:5 >=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/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 net-libs/libmnl || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=http://prdownloads.sourceforge.net/ktoshiba/ktoshiba-5.3.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7103698a688e31cb39bf2f5b01f3807c
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.9.11 b/metadata/md5-cache/kde-misc/latte-dock-0.9.11
index 04fd9e9b16c4..52b767172bd6 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.9.11
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.9.11
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgraphicaleffects-5.12.3:5 || ( >=dev-qt/qtgui-5.12.3:5[X(-)] >=dev-qt/qtgui-5.12.3:5[xcb(-)] ) >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/kactivities-5.64.0:5 >=kde-frameworks/karchive-5.64.0:5 >=kde-frameworks/kconfig-5.64.0:5 >=kde-frameworks/kcoreaddons-5.64.0:5 >=kde-frameworks/kcrash-5.64.0:5 >=kde-frameworks/kdbusaddons-5.64.0:5 >=kde-frameworks/kdeclarative-5.64.0:5 >=kde-frameworks/kglobalaccel-5.64.0:5 >=kde-frameworks/kguiaddons-5.64.0:5 >=kde-frameworks/ki18n-5.64.0:5 >=kde-frameworks/kiconthemes-5.64.0:5 >=kde-frameworks/knewstuff-5.64.0:5 >=kde-frameworks/knotifications-5.64.0:5 >=kde-frameworks/kpackage-5.64.0:5 >=kde-frameworks/kwayland-5.64.0:5 >=kde-frameworks/kwindowsystem-5.64.0:5 >=kde-frameworks/kxmlgui-5.64.0:5 >=kde-frameworks/plasma-5.64.0:5[X] x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.9.11.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebc120e36d4cf9649b61baf21412848a
diff --git a/metadata/md5-cache/kde-misc/markdownpart-0.1.1 b/metadata/md5-cache/kde-misc/markdownpart-0.1.1
index 69cb4b51e818..38372f0dc212 100644
--- a/metadata/md5-cache/kde-misc/markdownpart-0.1.1
+++ b/metadata/md5-cache/kde-misc/markdownpart-0.1.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/markdownpart/0.1.1/src/markdownpart-0.1.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfb35229e7ac159ad6a227c204bcdcf0
diff --git a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500 b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
index 063202359fe9..545db3175dc3 100644
--- a/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
+++ b/metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=http://arielch.fedorapeople.org/devel/src/OpenOfficeorgThumbnail-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbac5536070cddf19eb8945bd0f6856c
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3-r1 b/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3-r1
index a6e674abeb12..cd466d7cfd2e 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3-r1
+++ b/metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/plasma-5.60.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-network-monitor/archive/v1.7.3.tar.gz -> plasma-applet-network-monitor-1.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54cce57927a963a58b9c9b9fe06c2a7c
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10-r1 b/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10-r1
index 1ed7ac926cb2..21b80779616a 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10-r1
+++ b/metadata/md5-cache/kde-misc/plasma-applet-weather-widget-1.6.10-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)] >=kde-frameworks/plasma-5.60.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://github.com/kotelnik/plasma-applet-weather-widget/archive/v1.6.10.tar.gz -> plasma-applet-weather-widget-1.6.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35208aedaec68b13066f06bdb893da32
diff --git a/metadata/md5-cache/kde-misc/plasma-pass-1.1.0 b/metadata/md5-cache/kde-misc/plasma-pass-1.1.0
index b4c7570c8f05..63cff1d886a5 100644
--- a/metadata/md5-cache/kde-misc/plasma-pass-1.1.0
+++ b/metadata/md5-cache/kde-misc/plasma-pass-1.1.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/kcoreaddons-5.64.0:5 >=kde-frameworks/ki18n-5.64.0:5 >=kde-frameworks/kitemmodels-5.64.0:5 >=kde-frameworks/plasma-5.64.0:5 >=kde-frameworks/kirigami-5.64.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma-pass/plasma-pass-1.1.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=414251c43bdbdea9797225cf7901db80
diff --git a/metadata/md5-cache/kde-misc/playbar2-2.5-r1 b/metadata/md5-cache/kde-misc/playbar2-2.5-r1
index f2cca68bf947..320cc2f12cef 100644
--- a/metadata/md5-cache/kde-misc/playbar2-2.5-r1
+++ b/metadata/md5-cache/kde-misc/playbar2-2.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kglobalaccel:5 kde-frameworks/ki18n:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 kde-frameworks/plasma:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/audoban/PlayBar2/archive/v2.5.tar.gz -> playbar2-2.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16e231c8347df465a514b0fc4c366a2d
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.13 b/metadata/md5-cache/kde-misc/rsibreak-0.12.13
index 8b9178a5fbdc..79ad46a83ab3 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.13
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.13
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.13.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab6e9e71a7e575a7183da08069a080de
diff --git a/metadata/md5-cache/kde-misc/skanlite-2.2.0 b/metadata/md5-cache/kde-misc/skanlite-2.2.0
index a1a2c73104ff..3b168dd072da 100644
--- a/metadata/md5-cache/kde-misc/skanlite-2.2.0
+++ b/metadata/md5-cache/kde-misc/skanlite-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/libksane-
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/skanlite/2.2/skanlite-2.2.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4509fbac69e09713abad479c45202c67
diff --git a/metadata/md5-cache/kde-misc/tellico-3.3.2 b/metadata/md5-cache/kde-misc/tellico-3.3.2
index 5c8c092dda9b..2bf382ef5b77 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.3.2
+++ b/metadata/md5-cache/kde-misc/tellico-3.3.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-perl/Text-BibTeX-0.780.0-r1 dev-
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=https://tellico-project.org/files/tellico-3.3.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e50af530579deaa12c4861c5436950d4
diff --git a/metadata/md5-cache/kde-misc/tellico-3.3.3 b/metadata/md5-cache/kde-misc/tellico-3.3.3
index 33af9586f40e..182bd637a562 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.3.3
+++ b/metadata/md5-cache/kde-misc/tellico-3.3.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-perl/Text-BibTeX-0.780.0-r1 dev-
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=https://tellico-project.org/files/tellico-3.3.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ed48e082c66f5b0ce1b753d8e17381e
diff --git a/metadata/md5-cache/kde-misc/ultimate-gmail-feed-2.1 b/metadata/md5-cache/kde-misc/ultimate-gmail-feed-2.1
index c0564cb6c935..7ad47acfa38a 100644
--- a/metadata/md5-cache/kde-misc/ultimate-gmail-feed-2.1
+++ b/metadata/md5-cache/kde-misc/ultimate-gmail-feed-2.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 kde-frameworks/knotifications:5 kde-frameworks/plasma:5 dev-qt/qtquickcontrols:5 dev-qt/qtxmlpatterns:5[qml] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://github.com/Intika-KDE-Plasmoids/plasmoid-ultimate-gmail-feed/archive/v2.1.tar.gz -> ultimate-gmail-feed-2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=083aba4a7f0ff9cf8b2b2f3779b9afe2
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.2.0 b/metadata/md5-cache/kde-misc/wacomtablet-3.2.0
index 3caa9081ecea..e1cdf2ca55e6 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.2.0
+++ b/metadata/md5-cache/kde-misc/wacomtablet-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libwacom-0.30 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/wacomtablet-3.2.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=077004b86c4171fd0b52bf9c414e6b80
diff --git a/metadata/md5-cache/kde-misc/zanshin-0.5.71-r1 b/metadata/md5-cache/kde-misc/zanshin-0.5.71-r1
index 7a44f9b176ba..b50e99178c3d 100644
--- a/metadata/md5-cache/kde-misc/zanshin-0.5.71-r1
+++ b/metadata/md5-cache/kde-misc/zanshin-0.5.71-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/zanshin/zanshin-0.5.71.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a66cce8aedeb8e6d58525cd8abf78fad
diff --git a/metadata/md5-cache/kde-misc/zanshin-0.5.71-r2 b/metadata/md5-cache/kde-misc/zanshin-0.5.71-r2
index 4573dbba1490..ffd0241267a0 100644
--- a/metadata/md5-cache/kde-misc/zanshin-0.5.71-r2
+++ b/metadata/md5-cache/kde-misc/zanshin-0.5.71-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/zanshin/zanshin-0.5.71.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bab0e93b59a8900af3fcb34c62d818ed
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index edd4c9d21e99..5bdccb88d5f6 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/bluedevil-5.18.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.18.5
index 895c6209a8ac..30c80f370a09 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.18.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/bluez-qt-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kded-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/plasma-5.66.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/qtwidgets-5.12.3:5 >=kde-plasma/kde-cli-tools-5.18.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/bluedevil-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=218e4d7ed0ce4a76967ef2e87d9e501a
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.19.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.19.5
index 904a396f072e..894a41400df0 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.19.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/bluez-qt-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/bluedevil-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=517ad7e86e547af777506a4436100171
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.18.5 b/metadata/md5-cache/kde-plasma/breeze-5.18.5
index ea59cd2769f2..318e010dd71f 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.18.5
+++ b/metadata/md5-cache/kde-plasma/breeze-5.18.5
@@ -11,5 +11,5 @@ PDEPEND=>=kde-frameworks/breeze-icons-5.66.0:5 >=kde-plasma/kde-cli-tools-5.18.5
 RDEPEND=>=kde-frameworks/frameworkintegration-5.66.0:5 >=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kguiaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-plasma/kdecoration-5.18.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.66.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/breeze-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2975c0eedd42cdbf50c5a17732cc085
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.19.5-r1 b/metadata/md5-cache/kde-plasma/breeze-5.19.5-r1
index 9e3658607404..23c1ee3d5b26 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.19.5-r1
+++ b/metadata/md5-cache/kde-plasma/breeze-5.19.5-r1
@@ -11,5 +11,5 @@ PDEPEND=>=kde-frameworks/breeze-icons-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.5
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/frameworkintegration-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-plasma/kdecoration-5.19.5:5 wayland? ( >=kde-frameworks/kwayland-5.71.0:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/breeze-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e4060e4c20932971b9c7378a23ea53b
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.18.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.18.5
index c563b1be2077..3652ead35e61 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.18.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.18.5
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/breeze-gtk-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a41c4a1d034cbe1b6bd3b3b2bc69e384
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.5
index ca3e9172476b..0fc8d80ccd65 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.19.5
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/breeze-gtk-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f478bca8e306806f7577e0e5e71ba7d7
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.18.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.18.5
index 3761d3995af1..4cd28a291e4d 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.18.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.18.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/breeze-plymouth-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03343cbaf76139e8e083433eff4ab4c3
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.5
index 7635e277e0b1..5de6132dda6e 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.19.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/breeze-plymouth-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=deb02f1faa3cb5b86a0f31ee8c5b8bf6
diff --git a/metadata/md5-cache/kde-plasma/discover-5.18.5 b/metadata/md5-cache/kde-plasma/discover-5.18.5
index adbac0dde13c..c0c5cee3df9f 100644
--- a/metadata/md5-cache/kde-plasma/discover-5.18.5
+++ b/metadata/md5-cache/kde-plasma/discover-5.18.5
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/attica-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/discover-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c2ab207055c7c4c2c1f9bfac0204ea3
diff --git a/metadata/md5-cache/kde-plasma/discover-5.19.5 b/metadata/md5-cache/kde-plasma/discover-5.19.5
index 089607364927..23160e197fb7 100644
--- a/metadata/md5-cache/kde-plasma/discover-5.19.5
+++ b/metadata/md5-cache/kde-plasma/discover-5.19.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdecla
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/discover-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13b5ffe6af87c1e3e66543188fd2e7ae
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.18.5-r2 b/metadata/md5-cache/kde-plasma/drkonqi-5.18.5-r2
index a192b221378b..a7c8f944301c 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.18.5-r2
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.18.5-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 >=kde-frameworks/kcompletion-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kcrash-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kidletime-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/kjobwidgets-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwallet-5.66.0:5 >=kde-frameworks/kwayland-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/drkonqi-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38922b7cfeb00829e4f08f0708be560b
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.19.5 b/metadata/md5-cache/kde-plasma/drkonqi-5.19.5
index 654e4dca6c2d..8efdb1e8bc0c 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.19.5
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/syntax-highlighting-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 X? ( >=dev-qt/qtx11extras-5.14.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/drkonqi-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5354ddb8d37fe5e3a764adf8410a77e3
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.18.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.18.5
index dd34980f5a54..011e38f8c5c4 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.18.5
@@ -10,5 +10,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kcrash-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kactivitymanagerd-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f4910bedddfe4a2c0efe00dc8c309ad3
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.5
index 3fca47facddc..9491367de398 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.19.5
@@ -10,5 +10,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtsql-5.14.2:5[sqlite] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kactivitymanagerd-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b52be1a5d2db5cf17241679494840e91
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.18.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.18.5
index 066a86e6b7af..a30e29f206fc 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.18.5
@@ -12,5 +12,5 @@ REQUIRED_USE=kdesu? ( X )
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kde-cli-tools-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50df4d9e67e5c53af7a05ae185184155
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.5
index ab8e67ce3177..67e5368e81d4 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.19.5
@@ -12,5 +12,5 @@ REQUIRED_USE=kdesu? ( X )
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kde-cli-tools-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=941d7e429c31c86220664545f5cb3043
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.18.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.18.5
index 1bb811604f94..e27397842234 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.18.5
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 gnome-b
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kde-gtk-config-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a503befc0fdace4995cd1e769163faea
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.5
index 846dcab22199..7a089f7464c8 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.19.5
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kde-gtk-config-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c0ab1b60567f27e7dcddf59a30f2b42
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.18.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.18.5
index 9a9783fbdc23..1fd9f09476b7 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.18.5
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/ki18n-5.66.0:5 >=dev-qt/qtgui-5.12.3:5 || ( kde-framewo
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kdecoration-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e614cdb10c56fdc1fe09bc620fd594da
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.19.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.19.5
index feba698818ad..ce7f3d118717 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.19.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=kde-frameworks/ki18n-5.71.0:5 || ( kde-framewo
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kdecoration-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bf0b0b22f26c7eef7b0ab6d68fadba2
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.18.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.18.5
index 22b960fb437a..03a3e866e714 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kcompletion-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kdeclarative-5.66.0:5 >=kde-frameworks/kholidays-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/kpackage-5.66.0:5 >=kde-frameworks/kross-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kunitconversion-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-frameworks/sonnet-5.66.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/qtwidgets-5.12.3:5 share? ( >=kde-frameworks/purpose-5.66.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) >=kde-plasma/plasma-workspace-5.18.5:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kdeplasma-addons-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bdfa9c2111addc0a7f3d4c7e6c2d98dc
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.5-r1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.5-r1
index 6104300dd588..978a6aaa0fd6 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.5-r1
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.19.5-r1
@@ -8,8 +8,8 @@ IUSE=+comic share webengine test debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kholidays-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kunitconversion-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 comic? ( >=kde-frameworks/kross-5.71.0:5 ) share? ( >=kde-frameworks/purpose-5.71.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.14.2:5 ) >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-plasma/plasma-workspace-5.19.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kdeplasma-addons-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b429a303dc65b127655896069dc895b
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=117f502791f3cf82cbed5e86af5906a7
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.18.5 b/metadata/md5-cache/kde-plasma/kgamma-5.18.5
index 045fce9f1844..915949a0611e 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kgamma5-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe91d6e6dff538c8887cca3676f01981
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.19.5 b/metadata/md5-cache/kde-plasma/kgamma-5.19.5
index 627f33ce007b..d475da5e5f10 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kgamma5-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c75842d746ee2d126c8d0a95ceb0e085
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.18.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.18.5
index a2007c457457..1f219d95a164 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.18.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/kdelibs4support-5.66.0:5[X] >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/ktextwidgets-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-plasma/libkworkspace-5.18.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.66.0:5 >=kde-plasma/kde-cli-tools-5.18.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/khotkeys-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=888ecd0d6ab9a4a156ec27f27b7b96ad
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.19.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.19.5
index 17a356fd4758..66d94308f78c 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.19.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5[X] >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/ktextwidgets-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/libkworkspace-5.19.5:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/khotkeys-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da01e186596d4e79b032efd86515b903
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.18.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.18.5
index fe7c46c6ee6c..1be9db787e97 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.18.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-
 REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kinfocenter-5.18.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=791fde0290e5b982fadf74ed574ba54a
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.19.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.19.5
index 8109e451f3b4..9232279fd4fd 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.19.5
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/cmake-3.14.3 dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[gles2-only=] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.71.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.71.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5[gles2-only=] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) ieee1394? ( sys-libs/libraw1394 ) opengl? ( media-libs/mesa[X(+)] !gles2-only? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.71.0:5 media-libs/mesa[egl] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Utility providing information about the computer hardware
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/KInfoCenter
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-
 REQUIRED_USE=wayland? ( || ( opengl gles2-only ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kinfocenter-5.19.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e1d0c33b59452b11b27f90e05dc52ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2ccbc5570d5208e0d81874676527e81
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.18.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.18.5
index 3caa96c73b74..e8454f38daf8 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 >=kde-frameworks/kcompletion-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 >=kde-frameworks/kitemviews-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/sonnet-5.66.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kmenuedit-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=231bb71fa073685306ec7cdf3b80c998
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.19.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.19.5
index 4accb3133676..52e08a9a36bf 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kmenuedit-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06242e4e6a65e9ee5039fc307dbda883
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.18.5 b/metadata/md5-cache/kde-plasma/kscreen-5.18.5
index 573047d7f6c4..18b79099647d 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.18.5
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=k
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kscreen-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54ea37309e7c28e97b923ad81beba116
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.19.5 b/metadata/md5-cache/kde-plasma/kscreen-5.19.5
index e55531a0d2f9..782fd4dbc09b 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.19.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kscreen-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=242b7aa4bcfb91a34e72c025e2ccd59b
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.18.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.18.5
index f11d49c973c3..234b66dbf126 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.18.5
@@ -13,5 +13,5 @@ REQUIRED_USE=seccomp? ( pam )
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kscreenlocker-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f8f7cd16d6550acc656d2eb04d8b80f9
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.5
index 8d0b3a3627d8..29248cae9ff0 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.19.5
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kscreenlocker-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e18c81380cc3e745577be47f8d41d96
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.18.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.18.5
index dd44f559f544..a46ff53fb083 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.18.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kwallet-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/ksshaskpass-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26bfd7daa16aa3c656c1512b3172db0b
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5
index 6739e464fc6d..5f4ef9f3ba6c 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/ksshaskpass-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6b43a574eca7d45363e05029b61394c
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.18.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.18.5
index 3b616046e0c8..2306de07a783 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.18.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 >=kde-frameworks/kinit-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/kitemviews-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-plasma/libksysguard-5.18.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 pcap? ( net-libs/libpcap sys-libs/libcap ) lm-sensors? ( sys-apps/lm-sensors:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/ksysguard-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83f5478bc119b47993b126213b380f73
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.19.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.19.5
index d03b5b8f162c..8ba42a94523d 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.19.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.19.5
@@ -8,7 +8,8 @@ IUSE=lm-sensors pcap debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kinit-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/libksysguard-5.19.5:5 lm-sensors? ( sys-apps/lm-sensors:= ) pcap? ( net-libs/libpcap sys-libs/libcap ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/ksysguard-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=120df225e18317d650ef9f9e9638607d
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8a49ae41b53cef5c4d83b67fe1330ea1
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.18.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.18.5
index 709b29a455fb..6eb36246c932 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.18.5
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kwallet-5.66.0:5 dev-libs/libgcrypt:0= sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kwallet-pam-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab9893aa6da2561404417301be1bad60
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.5
index 0ea58180e377..6c5feefef1c4 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.19.5
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.71.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kwallet-pam-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=32fbb1d71b4e4223231c1c0d808923d2
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.18.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.18.5
index b840e3f39050..cc2eca3d98e4 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.18.5
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kguiaddons-5.66.0:5 >=kde-frameworks/kidletime-5.66.0:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kwayland-integration-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4d087679f8a591061faa7d907b50e4e9
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.5
index c58809b8b6b9..b820d5dd0d78 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.19.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kgu
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kwayland-integration-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=084a27e28044518f009c15bf2e7b360e
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.19.5 b/metadata/md5-cache/kde-plasma/kwayland-server-5.19.5
index 7ea8b172e44a..ad6ba8a8afa7 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-server-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-server-5.19.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/wayland-1.15.0 >=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kwayland-server-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d9ad1cf00d70e860023349d61c8a82b2
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.18.5-r1 b/metadata/md5-cache/kde-plasma/kwin-5.18.5-r1
index bec65cb7ea9f..fddb4042f15a 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.18.5-r1
+++ b/metadata/md5-cache/kde-plasma/kwin-5.18.5-r1
@@ -12,5 +12,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kwin-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0fadbabc4f845a10f6daaa758bfd6260
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.18.5-r3 b/metadata/md5-cache/kde-plasma/kwin-5.18.5-r3
index 2e319c065b53..b45623b4d1b2 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.18.5-r3
+++ b/metadata/md5-cache/kde-plasma/kwin-5.18.5-r3
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.12.3:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kwin-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4dad24ca55f1bf29d518278e64bbf95
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.19.5 b/metadata/md5-cache/kde-plasma/kwin-5.19.5
index d5fa1f9f0bb7..3522caed0eac 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.19.5
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libinput-1.14 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.14.2:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kwin-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b8e33b09340707fa89d351649c501dd5
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.18.5 b/metadata/md5-cache/kde-plasma/kwrited-5.18.5
index a6f2950ec059..cf351a89af7c 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.18.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/kpty-5.66.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/kwrited-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27e3ab006e0f183b886c0c224e8f7023
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.19.5 b/metadata/md5-cache/kde-plasma/kwrited-5.19.5
index 862abbbee366..4023093d8bb9 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.19.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kpty-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/kwrited-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6344109a47bb8bd96f1a4007a42e843f
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.18.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.18.5
index 4e6752ddb386..735e5e9b6a44 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.18.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.18.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.18.5/libkscreen-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d786203bdadf073f52359880bb09aeac
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.19.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.19.5
index f85089db245f..c2b23055fdcb 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.19.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.19.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.19.5/libkscreen-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7f9f6321cb1099ac57065b1b6b0b458b
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.18.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.18.5
index ac54975c3d10..1be14230120c 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.18.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.18.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/8
 SRC_URI=mirror://kde/stable/plasma/5.18.5/libksysguard-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e1527766870e289fcda144b81981b61b
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.19.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.19.5
index e8bf805464c2..03fe883218a4 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.19.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.19.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/9
 SRC_URI=mirror://kde/stable/plasma/5.19.5/libksysguard-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9bed394c41eed3962786ae9ddfbecfd8
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.18.5 b/metadata/md5-cache/kde-plasma/libkworkspace-5.18.5
index 2a5c5003b79f..ba7ee769842a 100644
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.18.5
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.18.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-workspace-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de0e341b9e816a03f20fb828098ceeec
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.19.5 b/metadata/md5-cache/kde-plasma/libkworkspace-5.19.5
index 0d1997fd6572..e2db3714dadd 100644
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.19.5
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.19.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-workspace-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc7980f1c9c44a221af1d104715bde1e
diff --git a/metadata/md5-cache/kde-plasma/milou-5.18.5 b/metadata/md5-cache/kde-plasma/milou-5.18.5
index 062473dc9b0d..cf87a6dcfd08 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.18.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.18.5
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/milou-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7692a725ba7aea50f47242e1cbef9c33
diff --git a/metadata/md5-cache/kde-plasma/milou-5.19.5 b/metadata/md5-cache/kde-plasma/milou-5.19.5
index e89bcc92cfe7..0962a8ae3f65 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.19.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.19.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidge
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/milou-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1bdc2132bf45f26bd2f48b8f96a5514
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.18.5 b/metadata/md5-cache/kde-plasma/oxygen-5.18.5
index 183d4b680ed8..f64c46734273 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.18.5
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.18.5
@@ -11,5 +11,5 @@ PDEPEND=>=kde-plasma/kde-cli-tools-5.18.5:5
 RDEPEND=>=kde-frameworks/frameworkintegration-5.66.0:5 >=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kcompletion-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kguiaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-plasma/kdecoration-5.18.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.66.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/oxygen-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e8fe59ff86e1b57a49d7795366b47fd
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.19.5 b/metadata/md5-cache/kde-plasma/oxygen-5.19.5
index 0206371836c2..d045acbea05f 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.19.5
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.19.5
@@ -11,5 +11,5 @@ PDEPEND=>=kde-plasma/kde-cli-tools-5.19.5:5
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/frameworkintegration-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-plasma/kdecoration-5.19.5:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.71.0:5 ) !<kde-plasma/plasma-desktop-5.16.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/oxygen-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e25f38d09614bb86111281a370a13a92
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.18.5
index 936b6729d9d5..a5295da17993 100644
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.18.5
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/kfilemetadata-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/krunner-5.66.0:5 >=kde-frameworks/purpose-5.66.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-browser-integration-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8688eb7134f78e4ede31143b89d4e8aa
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.5
index 133aaf8963b8..9177525cc8b6 100644
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kfilemetadata-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/purpose-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-browser-integration-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=458760f49ff3f2cb75230d188ff444cc
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5-r1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5-r1
index 967baf0359d4..e2f64b32f06e 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdecla
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-desktop-5.18.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87fc0db0af873220c5c4d244377b9aac
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5-r2 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5-r2
index 9fb72443324b..8796913e5357 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5-r2
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.18.5-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdecla
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-desktop-5.18.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=58815243e73939c3a587090bf39b08aa
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.5
index 396c3995e639..ba828c9bc371 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.19.5
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.71.0:5 ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/attica-5.71.0:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kbookmarks-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcodecs-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5 >=kde-frameworks/kemoticons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kparts-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 >=kde-plasma/kwin-5.19.5:5 >=kde-plasma/libksysguard-5.19.5:5 >=kde-plasma/plasma-workspace-5.19.5:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.71.0:5 ) dev-libs/boost x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/attica-5.71.0:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kbookmarks-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcodecs-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5 >=kde-frameworks/kemoticons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kparts-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 >=kde-plasma/kwin-5.19.5:5 >=kde-plasma/libksysguard-5.19.5:5 >=kde-plasma/plasma-workspace-5.19.5:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.71.0:5 ) dev-libs/boost x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=KDE Plasma desktop
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=+fontconfig ibus scim +semantic-desktop test debug +handbook test
+IUSE=emoji +fontconfig ibus scim +semantic-desktop test debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/attica-5.71.0:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kbookmarks-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcodecs-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5 >=kde-frameworks/kemoticons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kparts-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 >=kde-plasma/kwin-5.19.5:5 >=kde-plasma/libksysguard-5.19.5:5 >=kde-plasma/plasma-workspace-5.19.5:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.71.0:5 ) >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-frameworks/qqc2-desktop-style-5.71.0:5 >=kde-plasma/breeze-5.19.5:5 >=kde-plasma/kde-cli-tools-5.19.5:5 >=kde-plasma/oxygen-5.19.5:5 sys-apps/util-linux x11-apps/setxkbmap !<kde-plasma/kdeplasma-addons-5.15.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtconcurrent-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtsvg-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=dev-qt/qtxml-5.14.2:5 >=kde-frameworks/attica-5.71.0:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kbookmarks-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcodecs-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kded-5.71.0:5 >=kde-frameworks/kdelibs4support-5.71.0:5 >=kde-frameworks/kemoticons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kparts-5.71.0:5 >=kde-frameworks/krunner-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwallet-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-frameworks/sonnet-5.71.0:5 >=kde-plasma/kwin-5.19.5:5 >=kde-plasma/libksysguard-5.19.5:5 >=kde-plasma/plasma-workspace-5.19.5:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.71.0:5 ) >=dev-qt/qtgraphicaleffects-5.14.2:5 >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-frameworks/qqc2-desktop-style-5.71.0:5 >=kde-plasma/breeze-5.19.5:5 >=kde-plasma/kde-cli-tools-5.19.5:5 >=kde-plasma/oxygen-5.19.5:5 sys-apps/util-linux x11-apps/setxkbmap !<kde-plasma/kdeplasma-addons-5.15.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-desktop-5.19.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=26328e50686e7bd2cd24627d0cca986a
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4793b9f8e6c14dd7dbe7fb30b077ccda
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.18.5
index 2d6de539ec76..52a7df745e23 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.18.5
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.18.5
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-integration-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ecb56baad6aee918953003f5f043e82d
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.19.5
deleted file mode 100644
index 594b44c4f6f1..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.19.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/breeze-5.19.5:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/breeze-5.19.5:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-integration-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=958e91471ca6fd9d981b7bf042015c8b
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.19.5-r1 b/metadata/md5-cache/kde-plasma/plasma-integration-5.19.5-r1
new file mode 100644
index 000000000000..91456349d090
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.19.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.71.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/breeze-5.19.5:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=test debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/breeze-5.19.5:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-integration-5.19.5.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=49e349221417e33223ee859aef927c22
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.18.5-r1 b/metadata/md5-cache/kde-plasma/plasma-nm-5.18.5-r1
index 51955693d3ec..95a3557c061d 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.18.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.18.5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/qca-2.1.1:2[qt5(+)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdecl
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-nm-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23965323067f1c729becd4947b2a742b
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.19.5
index 2d9dd8a431c6..8eb0d2768a83 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.19.5
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-nm-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=20f715ec7bebf1afff7ae6a730230653
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.18.5
index b22ad2a5cd5c..b718488d6f68 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.18.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kdeclarative-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/plasma-5.66.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/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kirigami-5.66.0:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-libs/libcanberra x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-pa-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b011bee69f5bae83ed93f4afb88c4214
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.19.5
index b6349f0ada2d..b1e993c22839 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-pa-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=350240c3511a1a1fe500f647014caa50
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.18.5
index 22f0ac18e9ca..01328017ff1a 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.18.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.18.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-sdk-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7094811a4a42406705954ddac1e37c46
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.5
index d500c782b901..26486bfc77bf 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.19.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-sdk-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57533e62c03028afadc48b02de4c6702
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.18.5
index 49bd984ce180..83dd8d9bc29e 100644
--- a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.18.5
+++ b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.18.5
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-thunderbolt-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af5a89ce0572d41061d990acf1a74647
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.19.5
index 249e71e1f3fe..9b73dc6a6608 100644
--- a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.19.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-thunderbolt-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87671b9ce348c2043d5f08fce59061ff
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.18.5
index 33e0bf40ab6c..bd9553bcf899 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.18.5
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.18.5
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=>=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kcodecs-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/plasma-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-plasma/libksysguard-5.18.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.66.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-vault-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b7e9832b333feac219fc02e194c24cc
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.19.5
index 9293d762da69..8b9add0afb33 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.19.5
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kcodecs-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-plasma/libksysguard-5.19.5:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.71.0:5 ) >=dev-qt/qtquickcontrols2-5.14.2:5 >=kde-frameworks/kirigami-5.71.0:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-vault-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3c46ddd83301793aafaafad8f453f46a
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.18.5-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.18.5-r1
index c696a2031217..9f66d28acaa7 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.18.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.18.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=gps? ( geolocation )
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-workspace-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e34703c760d1bcf1ab04bf03ee7ed388
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r1
index 30f6c39de50f..263b1f45b83e 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.19.5-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=gps? ( geolocation )
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-workspace-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ede7ca65edcb8f4db76fdbdecd58d565
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.18.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.18.5
index 5612390183e8..f71a6fdde3c5 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.18.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.18.5
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-workspace-wallpapers-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27200312ce371c87ecae4d160c81aaa4
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.5
index de1ad116d8b5..2263a18ad0c7 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.19.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-workspace-wallpapers-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3998fe2f2d6ed4d18dbaeb7417bdffc2
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.18.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.18.5
index d5bd2a0f13f6..f8857956ca96 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.18.5
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kdeclarative-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.18.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plymouth-kcm-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26dbfc7f9c919ea89e5e97429ba0fe83
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.5
index 2bd90f461b09..86c01bef4a8b 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.5
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtquickcontrols-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.19.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plymouth-kcm-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=270232d4f2a76cf6349c0fdef6d7f6fb
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.18.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.18.5
index 5bbdb5f5e7a4..91e7182db95e 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.18.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kcrash-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/polkit-kde-agent-1-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5251da6016ad58e548fda554f7a749b9
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.5
index d081af523720..79844f767663 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/polkit-kde-agent-1-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=32de53302d960539e32b2fe6fbbf15a1
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.18.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.18.5
index 15707e2ff622..0b89ca8a3460 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.18.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5[policykit] >=kde-frameworks/kcompletion-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kcrash-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kidletime-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwayland-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/solid-5.66.0:5 >=kde-plasma/libkscreen-5.18.5:5 >=kde-plasma/libkworkspace-5.18.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.66.0:5 >=kde-frameworks/networkmanager-qt-5.66.0:5 ) >=kde-plasma/kde-cli-tools-5.18.5:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/powerdevil-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00bc1d4ba2f3fada2c487a4cfd871c9c
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.18.5-r1 b/metadata/md5-cache/kde-plasma/powerdevil-5.18.5-r1
index cc458112bcbe..36b74f961921 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.18.5-r1
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.18.5-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5[policykit] >=kde-frameworks/kcompletion-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kcrash-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/kglobalaccel-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kidletime-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/knotifyconfig-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwayland-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-frameworks/solid-5.66.0:5 >=kde-plasma/libkscreen-5.18.5:5 >=kde-plasma/libkworkspace-5.18.5:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.66.0:5 >=kde-frameworks/networkmanager-qt-5.66.0:5 ) >=kde-plasma/kde-cli-tools-5.18.5:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/powerdevil-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d26a5263e870929bf111749c627b95b
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.19.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.19.5
index 09560e940df6..68927728d98e 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.19.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5[policykit] >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kglobalaccel-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kidletime-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/knotifyconfig-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwayland-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-frameworks/solid-5.71.0:5 >=kde-plasma/libkscreen-5.19.5:5 >=kde-plasma/libkworkspace-5.19.5:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.71.0:5 >=kde-frameworks/networkmanager-qt-5.71.0:5 ) >=kde-plasma/kde-cli-tools-5.19.5:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/powerdevil-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4662c5d18bca87696e5f97640dabcc26
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.18.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.18.5
index b781a0034dd0..a008b59208eb 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.18.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/knewstuff-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-plasma/kde-cli-tools-5.18.5:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/sddm-kcm-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ad7334a5a2b03645eac9327d5cc28ca
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.5
index e84124a34785..2cdd0ff145f3 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/karchive-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-plasma/kde-cli-tools-5.19.5:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/sddm-kcm-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5be06dd4e9d54762c6d445d436a167a9
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.18.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.18.5
index 62dc0e4f5326..ed8ee080f105 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.18.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.66.0:5 >=kde-frameworks/kactivities-stats-5.66.0:5 >=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kcompletion-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kcrash-5.66.0:5 >=kde-frameworks/kdbusaddons-5.66.0:5 >=kde-frameworks/kdeclarative-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kiconthemes-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/kitemmodels-5.66.0:5 >=kde-frameworks/kitemviews-5.66.0:5 >=kde-frameworks/kpackage-5.66.0:5 >=kde-frameworks/kservice-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 >=kde-frameworks/kxmlgui-5.66.0:5 >=kde-plasma/libkworkspace-5.18.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-misc/systemd-kcm >=kde-frameworks/kirigami-5.66.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/systemsettings-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=67da332d5e466b90e10a2f00554d81dd
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.19.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.19.5
index aa6c5bcde2a8..b6bebff4a300 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.19.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kactivities-5.71.0:5 >=kde-frameworks/kactivities-stats-5.71.0:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kcrash-5.71.0:5 >=kde-frameworks/kdbusaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/kguiaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kiconthemes-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kitemmodels-5.71.0:5 >=kde-frameworks/kitemviews-5.71.0:5 >=kde-frameworks/kpackage-5.71.0:5 >=kde-frameworks/kservice-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 >=kde-frameworks/kxmlgui-5.71.0:5 >=kde-plasma/libkworkspace-5.19.5:5 !kde-misc/systemd-kcm >=kde-frameworks/kirigami-5.71.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/systemsettings-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce7a239e8fa4c1e06d88dfb66e7f4cd9
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.18.5 b/metadata/md5-cache/kde-plasma/user-manager-5.18.5
index 8d866c92ca26..c45a8ecc9e82 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.18.5
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.18.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.66.0:5 >=kde-frameworks/kcmutils-5.66.0:5 >=kde-frameworks/kconfig-5.66.0:5 >=kde-frameworks/kconfigwidgets-5.66.0:5 >=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/user-manager-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0dff1cf287b788ec6c8c5f9255fef05f
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.19.5 b/metadata/md5-cache/kde-plasma/user-manager-5.19.5
index 2348b0af4bfa..943f7ce42665 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.19.5
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.19.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcmutils-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/user-manager-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70d5ff900371a8edca179c6fa35f6ef6
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.18.5 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.18.5
index 5fc5bb818415..2a293576af8e 100644
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.18.5
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.18.5
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.66.0:5 >=kde-frameworks/kdeclarative-5.66.0:5 >=kde-frameworks/ki18n-5.66.0:5 >=kde-frameworks/kio-5.66.0:5 >=kde-frameworks/kirigami-5.66.0:5 >=kde-frameworks/knotifications-5.66.0:5 >=kde-frameworks/kwidgetsaddons-5.66.0:5 >=kde-frameworks/plasma-5.66.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/qtprintsupport-5.12.3:5[cups] >=dev-qt/qtwidgets-5.12.3:5 screencast? ( media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire:= ) sys-apps/xdg-desktop-portal[screencast?] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/xdg-desktop-portal-kde-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=090f67283856436be9f0a378b466b339
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.5 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.5
index f95a88353bf1..a414e4e1e3b4 100644
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.5
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.19.5
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtprintsupport-5.14.2:5[cups] >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/kdeclarative-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kio-5.71.0:5 >=kde-frameworks/kirigami-5.71.0:5 >=kde-frameworks/knotifications-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/plasma-5.71.0:5 screencast? ( media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire:= ) sys-apps/xdg-desktop-portal[screencast?] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/xdg-desktop-portal-kde-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f63d64d8ce5942429222dce194cd9b67
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.18.5 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.18.5
index 35aba0913e56..115f939aeca4 100644
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.18.5
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.18.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=kde-frameworks/extra-cmake-modules-5.66.0:5 >=kde-frameworks/kwindowsystem-5.66.0:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !<kde-plasma/plasma-workspace-5.14.2:5 !kde-plasma/xembed-sni-proxy:0
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.18.5/plasma-workspace-5.18.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99db355774fd93604044419a82510a4c
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.5-r1 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.5-r1
index 4433412bef9e..f4f45e5e4c5b 100644
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.5-r1
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.19.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtcore-5.14.2:5 >=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtx11extras-5.14.2:5 >=kde-frameworks/extra-cmake-modules-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !<kde-plasma/plasma-workspace-5.14.2:5 !kde-plasma/xembed-sni-proxy:0
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.19.5/plasma-workspace-5.19.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=375cc8de0b1201e108048b1da7c2aca1
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index b99f356c9d29..bf419691522f 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/lxterminal-0.3.2-r1 b/metadata/md5-cache/lxde-base/lxterminal-0.3.2-r1
new file mode 100644
index 000000000000..5ee8cf109e3e
--- /dev/null
+++ b/metadata/md5-cache/lxde-base/lxterminal-0.3.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 !gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 ) gtk3? ( x11-libs/gtk+:3 x11-libs/vte:2.91 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Lightweight vte-based tabbed terminal emulator for LXDE
+EAPI=7
+HOMEPAGE=https://wiki.lxde.org/en/LXTerminal
+IUSE=gtk3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 !gtk3? ( x11-libs/gtk+:2 x11-libs/vte:0 ) gtk3? ( x11-libs/gtk+:3 x11-libs/vte:2.91 )
+SLOT=0
+SRC_URI=mirror://sourceforge/lxde/lxterminal-0.3.2.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=36a7770cb71a3a32c654133f5b4449d3
diff --git a/metadata/md5-cache/lxqt-base/Manifest.gz b/metadata/md5-cache/lxqt-base/Manifest.gz
index 54150b5b7ceb..ab00aecf4de4 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.15.1 b/metadata/md5-cache/lxqt-base/liblxqt-0.15.1
index 06dfa23efeef..92fb0781c93d 100644
--- a/metadata/md5-cache/lxqt-base/liblxqt-0.15.1
+++ b/metadata/md5-cache/lxqt-base/liblxqt-0.15.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+ BSD
 RDEPEND=>=dev-libs/libqtxdg-3.5.0 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] x11-libs/libX11 x11-libs/libXScrnSaver backlight? ( sys-auth/polkit-qt ) !lxqt-base/lxqt-l10n
 SLOT=0/0.15
 SRC_URI=https://github.com/lxqt/liblxqt/releases/download/0.15.1/liblxqt-0.15.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f556b437625e6cc949b52eb2c95aec8
diff --git a/metadata/md5-cache/lxqt-base/libsysstat-0.4.3 b/metadata/md5-cache/lxqt-base/libsysstat-0.4.3
index eacbc0fc2c5a..8fe37b202133 100644
--- a/metadata/md5-cache/lxqt-base/libsysstat-0.4.3
+++ b/metadata/md5-cache/lxqt-base/libsysstat-0.4.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://github.com/lxqt/libsysstat/releases/download/0.4.3/libsysstat-0.4.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e1aaa9ef2a53db954352cd1c83f1e6b
diff --git a/metadata/md5-cache/lxqt-base/lxqt-about-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-about-0.15.0
index 87f43ec3c210..11a2009d01a3 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-about-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-about-0.15.0
@@ -9,5 +9,5 @@ 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.15* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-about/releases/download/0.15.0/lxqt-about-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07722284ad91a9503d3aef3e9a35892e
diff --git a/metadata/md5-cache/lxqt-base/lxqt-admin-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-admin-0.15.0
index 7978fe8476fb..37fa2a9ef8e0 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-admin-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-admin-0.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.15* kde-frameworks/kwindowsystem:5 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-admin/releases/download/0.15.0/lxqt-admin-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=454071c6762a0a72aedb1e23236f6888
diff --git a/metadata/md5-cache/lxqt-base/lxqt-config-0.15.0-r1 b/metadata/md5-cache/lxqt-base/lxqt-config-0.15.0-r1
index 42c300a4c47b..b6a8c8983b59 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-config-0.15.0-r1
+++ b/metadata/md5-cache/lxqt-base/lxqt-config-0.15.0-r1
@@ -10,5 +10,5 @@ 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.15* 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 x11-libs/libXi ) !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-config/releases/download/0.15.0/lxqt-config-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a74e2fac8e1e4b50538f94d88a17269
diff --git a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.15.0
index 255e32d8c6bb..ab1b67b7584b 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-globalkeys-0.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 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.15* kde-frameworks/kwindowsystem:5 x11-libs/libX11 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-globalkeys/releases/download/0.15.0/lxqt-globalkeys-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb82cb57bd9b948e24d3681059e779f2
diff --git a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.15.0
index ca2a0e199d64..35cb394e05f7 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-notificationd-0.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 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.15* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-notificationd/releases/download/0.15.0/lxqt-notificationd-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f13b60f850d3738975d0428f41d1d08
diff --git a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.15.0
index 5b4dd14db5ea..6e985b6ee24e 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-openssh-askpass-0.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.15* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-openssh-askpass/releases/download/0.15.0/lxqt-openssh-askpass-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=40cddae611954462155f695f414ec9ae
diff --git a/metadata/md5-cache/lxqt-base/lxqt-panel-0.15.1 b/metadata/md5-cache/lxqt-base/lxqt-panel-0.15.1
index 7cbb012b78cc..f8e8f3fcf2b4 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-panel-0.15.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-panel-0.15.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5
 REQUIRED_USE=|| ( desktopswitch mainmenu showdesktop taskbar ) volume? ( || ( alsa pulseaudio ) )
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-panel/releases/download/0.15.1/lxqt-panel-0.15.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d46ab5849c4e2001b12bdc91b9a71cc
diff --git a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.15.0
index b3fccf37c455..97c32f64622e 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-policykit-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-policykit-0.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 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.15* sys-auth/polkit-qt[qt5(+)] !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-policykit/releases/download/0.15.0/lxqt-policykit-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0098be78ec2e5b16e3903aa0f3285680
diff --git a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.15.0
index fdf332fe5ff0..1d24173ab363 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-powermanagement-0.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 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 kde-frameworks/kidletime:5 kde-frameworks/solid:5 =lxqt-base/liblxqt-0.15* sys-power/upower !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-powermanagement/releases/download/0.15.0/lxqt-powermanagement-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e78d1b839eda2524f79ea73e5144eca6
diff --git a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.15.1 b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.15.1
index d0f3987fa9b1..352786088439 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.15.1
+++ b/metadata/md5-cache/lxqt-base/lxqt-qtplugin-0.15.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/libdbusmenu-qt:=[qt5(+)] >=dev-libs/libqtxdg-3.5.0 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.15*
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-qtplugin/releases/download/0.15.1/lxqt-qtplugin-0.15.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0cd0c4a31d339bed1e3991281764acc1
diff --git a/metadata/md5-cache/lxqt-base/lxqt-runner-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-runner-0.15.0
index 2bcb424ac0c5..88ae51612ee8 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-runner-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-runner-0.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 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 =lxqt-base/liblxqt-0.15* =lxqt-base/lxqt-globalkeys-0.15* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-runner/releases/download/0.15.0/lxqt-runner-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c640c1b2bf33eacb37e7b3962e6f1bbf
diff --git a/metadata/md5-cache/lxqt-base/lxqt-session-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-session-0.15.0
index 0ac9e142405f..e9d893f58c65 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-session-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-session-0.15.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1 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.15* x11-libs/libX11 x11-misc/xdg-user-dirs udev? ( virtual/libudev ) !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-session/releases/download/0.15.0/lxqt-session-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=684116ba9a988e52da49b263a88d0e1c
diff --git a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.15.0 b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.15.0
index 57c3bef638de..57549f045bee 100644
--- a/metadata/md5-cache/lxqt-base/lxqt-sudo-0.15.0
+++ b/metadata/md5-cache/lxqt-base/lxqt-sudo-0.15.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 LGPL-2.1+
 RDEPEND=app-admin/sudo >=dev-libs/libqtxdg-3.3.1 dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-0.15* !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-sudo/releases/download/0.15.0/lxqt-sudo-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3064ad03c54e806a788792167b2644e3
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 3aeb092621dd..93da71bc4f8f 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/claws-mail-3.17.7 b/metadata/md5-cache/mail-client/claws-mail-3.17.7
new file mode 100644
index 000000000000..198b3b122906
--- /dev/null
+++ b/metadata/md5-cache/mail-client/claws-mail-3.17.7
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] >=x11-libs/gtk+-2.24:2 x11-libs/libX11 x11-libs/pango archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 sys-apps/dbus ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) litehtml? ( >=dev-libs/glib-2.36:2 >=dev-libs/gumbo-0.10 net-misc/curl media-libs/fontconfig ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 appindicator? ( dev-libs/libindicate:3[gtk] ) libcanberra? ( media-libs/libcanberra[gtk] ) libnotify? ( x11-libs/libnotify ) ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-2.0.0:2= ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) xface? ( >=media-libs/compface-1.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An email client (and news reader) based on GTK+
+EAPI=7
+HOMEPAGE=https://www.claws-mail.org/
+IUSE=+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] >=x11-libs/gtk+-2.24:2 x11-libs/libX11 x11-libs/pango archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 sys-apps/dbus ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) litehtml? ( >=dev-libs/glib-2.36:2 >=dev-libs/gumbo-0.10 net-misc/curl media-libs/fontconfig ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 appindicator? ( dev-libs/libindicate:3[gtk] ) libcanberra? ( media-libs/libcanberra[gtk] ) libnotify? ( x11-libs/libnotify ) ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-2.0.0:2= ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) perl? ( dev-lang/perl:= ) rss? ( dev-libs/libxml2 net-misc/curl )
+REQUIRED_USE=appindicator? ( notification ) libcanberra? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) smime? ( pgp )
+SLOT=0
+SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.17.7.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd750e3a6dd08d60584f1cb2a54ceed6
diff --git a/metadata/md5-cache/mail-client/kube-0.7.0-r1 b/metadata/md5-cache/mail-client/kube-0.7.0-r1
index edf056cf3dfe..56ba88373e15 100644
--- a/metadata/md5-cache/mail-client/kube-0.7.0-r1
+++ b/metadata/md5-cache/mail-client/kube-0.7.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.7.1:=[cxx,qt5] dev-libs/kasync:5 >=dev-libs/sink-0.7
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kube/0.7.0/src/kube-0.7.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f42197017ff909235b8eabee33ee3fa
diff --git a/metadata/md5-cache/mail-client/neomutt-20200925 b/metadata/md5-cache/mail-client/neomutt-20200925
new file mode 100644
index 000000000000..c4b31e1f7267
--- /dev/null
+++ b/metadata/md5-cache/mail-client/neomutt-20200925
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst test
+DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2u:0= ) libressl? ( dev-libs/libressl:= ) ) dev-lang/tcl:= net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=7
+HOMEPAGE=https://neomutt.org/
+IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2u:0= ) libressl? ( dev-libs/libressl:= ) ) selinux? ( sec-policy/selinux-mutt )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/neomutt/neomutt/archive/20200925.tar.gz -> neomutt-20200925.tar.gz test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=42d9a1b664e4df93884f40c1bd549f02
diff --git a/metadata/md5-cache/mail-client/neomutt-99999999 b/metadata/md5-cache/mail-client/neomutt-99999999
index f3d81fb8beb6..a140c68c8f32 100644
--- a/metadata/md5-cache/mail-client/neomutt-99999999
+++ b/metadata/md5-cache/mail-client/neomutt-99999999
@@ -1,13 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install postinst unpack
-DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
+DEFINED_PHASES=configure install postinst test unpack
+DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2u:0= ) libressl? ( dev-libs/libressl:= ) ) dev-lang/tcl:= net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
 DESCRIPTION=A small but very powerful text-based mail client
 EAPI=7
 HOMEPAGE=https://neomutt.org/
-IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet
+IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp-classic qdbm sasl selinux slang smime-classic ssl tokyocabinet test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
+RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) <sys-libs/db-6.3:= ) gdbm? ( sys-libs/gdbm:= ) kyotocabinet? ( dev-db/kyotocabinet ) lmdb? ( dev-db/lmdb:= ) nls? ( virtual/libintl ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) gnutls? ( >=net-libs/gnutls-1.0.17:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch:= ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2u:0= ) libressl? ( dev-libs/libressl:= ) ) selinux? ( sec-policy/selinux-mutt )
+RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3e9b5540151a6a056b7366f746c34d10
+SRC_URI=test? ( https://github.com/neomutt/neomutt-test-files/archive/8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz -> neomutt-test-files-8629adab700a75c54e8e28bf05ad092503a98f75.tar.gz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=42d9a1b664e4df93884f40c1bd549f02
diff --git a/metadata/md5-cache/mail-client/trojita-0.7-r5 b/metadata/md5-cache/mail-client/trojita-0.7-r5
index 35151ff5b4a1..b9fdcf466a51 100644
--- a/metadata/md5-cache/mail-client/trojita-0.7-r5
+++ b/metadata/md5-cache/mail-client/trojita-0.7-r5
@@ -12,5 +12,5 @@ REQUIRED_USE=password? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/trojita/trojita-0.7.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e568a180ae45c5468a710867f3d4e3a0
diff --git a/metadata/md5-cache/mail-client/trojita-9999 b/metadata/md5-cache/mail-client/trojita-9999
index 51a652f1544a..567b6b7d9a33 100644
--- a/metadata/md5-cache/mail-client/trojita-9999
+++ b/metadata/md5-cache/mail-client/trojita-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sq
 REQUIRED_USE=password? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d731b07091fed47357b7ccf58f6c84ee
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 36063774d27e..bb535f01d053 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/opendmarc-1.3.3 b/metadata/md5-cache/mail-filter/opendmarc-1.3.3
index f98daddba96f..f389e5b714d0 100644
--- a/metadata/md5-cache/mail-filter/opendmarc-1.3.3
+++ b/metadata/md5-cache/mail-filter/opendmarc-1.3.3
@@ -5,10 +5,10 @@ DESCRIPTION=Open source DMARC implementation
 EAPI=7
 HOMEPAGE=http://www.trusteddomain.org/opendmarc/
 IUSE=spf +reports static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc ~x86
 LICENSE=BSD
 RDEPEND=reports? ( dev-perl/DBI ) || ( mail-filter/libmilter mail-mta/sendmail ) reports? ( dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/Switch ) spf? ( mail-filter/libspf2 )
 SLOT=0
 SRC_URI=https://github.com/trusteddomainproject/OpenDMARC/archive/rel-opendmarc-1-3-3.tar.gz -> opendmarc-1.3.3.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=f4fd30763b405664b4d84787b15fcf70
+_md5_=3f9fa1139a6ae431deb19373cad8c9b9
diff --git a/metadata/md5-cache/mail-filter/postgrey-1.34-r3 b/metadata/md5-cache/mail-filter/postgrey-1.34-r3
deleted file mode 100644
index 10ea0fce62c5..000000000000
--- a/metadata/md5-cache/mail-filter/postgrey-1.34-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=Postgrey is a Postfix policy server implementing greylisting
-EAPI=5
-HOMEPAGE=http://postgrey.schweikert.ch/
-IUSE=targrey
-KEYWORDS=amd64 hppa ~ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/Net-Server dev-perl/IO-Multiplex dev-perl/BerkeleyDB dev-perl/Net-DNS dev-perl/Parse-Syslog dev-perl/Net-RBLClient >=sys-libs/db-4.1
-SLOT=0
-SRC_URI=http://postgrey.schweikert.ch/pub/postgrey-1.34.tar.gz http://postgrey.schweikert.ch/pub/old/postgrey-1.34.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8912d5da404378e19bb5f56e76e1d888
diff --git a/metadata/md5-cache/mail-filter/postgrey-1.35-r2 b/metadata/md5-cache/mail-filter/postgrey-1.35-r2
deleted file mode 100644
index 440c38a6e85d..000000000000
--- a/metadata/md5-cache/mail-filter/postgrey-1.35-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Postgrey is a Postfix policy server implementing greylisting
-EAPI=5
-HOMEPAGE=http://postgrey.schweikert.ch/
-IUSE=targrey
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/Net-Server dev-perl/IO-Multiplex dev-perl/BerkeleyDB dev-perl/Net-DNS dev-perl/Parse-Syslog dev-perl/Net-RBLClient virtual/perl-Digest-SHA >=sys-libs/db-4.1
-SLOT=0
-SRC_URI=http://postgrey.schweikert.ch/pub/postgrey-1.35.tar.gz http://postgrey.schweikert.ch/pub/old/postgrey-1.35.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f72b563f99f4e4e6f1238ff9b6af050a
diff --git a/metadata/md5-cache/mail-filter/postsrsd-1.4 b/metadata/md5-cache/mail-filter/postsrsd-1.4
deleted file mode 100644
index 6c8f085a9345..000000000000
--- a/metadata/md5-cache/mail-filter/postsrsd-1.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Postfix Sender Rewriting Scheme daemon
-EAPI=5
-HOMEPAGE=https://github.com/roehling/postsrsd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/roehling/postsrsd/archive/1.4.tar.gz -> postsrsd-1.4.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1bf921d8cca83df563a3d2e67a2306e4
diff --git a/metadata/md5-cache/mail-filter/postsrsd-1.4-r1 b/metadata/md5-cache/mail-filter/postsrsd-1.4-r1
deleted file mode 100644
index 48ba6e9c3854..000000000000
--- a/metadata/md5-cache/mail-filter/postsrsd-1.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Postfix Sender Rewriting Scheme daemon
-EAPI=5
-HOMEPAGE=https://github.com/roehling/postsrsd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/roehling/postsrsd/archive/1.4.tar.gz -> postsrsd-1.4.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7f2cf5aadda7064bc640c0406d8ad04
diff --git a/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523 b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
index 9855bd2bb95b..9175ee72c1bf 100644
--- a/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
+++ b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
@@ -5,7 +5,7 @@ DESCRIPTION=A distributed, collaborative spam detection and filtering network
 EAPI=7
 HOMEPAGE=https://github.com/SpamExperts/pyzor
 IUSE=doc gdbm gevent mysql pyzord redis test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=pyzord? ( gdbm? ( python_targets_python3_6? ( dev-lang/python:3.6[gdbm] ) python_targets_python3_7? ( dev-lang/python:3.7[gdbm] ) python_targets_python3_8? ( dev-lang/python:3.8[gdbm] ) ) gevent? ( dev-python/gevent[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mysql? ( dev-python/mysqlclient[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) redis? ( dev-python/redis-py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=pyzord? ( || ( gdbm redis ) ) test? ( gdbm redis ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SpamExperts/pyzor/archive/f46159bd6519cebcebf59e9334a7920371111d75.tar.gz -> pyzor-1.0.0_p20200523.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c057723c51e5ca9bc05f2b4d4b6e939d
+_md5_=9b46494e76b74b6dd7e0b0c7983f8efe
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.3 b/metadata/md5-cache/mail-filter/rspamd-2.3
index 0160fc497781..a0e12d170c94 100644
--- a/metadata/md5-cache/mail-filter/rspamd-2.3
+++ b/metadata/md5-cache/mail-filter/rspamd-2.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain un
 RDEPEND=acct-group/rspamd acct-user/rspamd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-util/ragel net-libs/libnsl sys-apps/file blas? ( sci-libs/openblas ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) jit? ( dev-lang/luajit:2 ) !jit? ( dev-lang/lua:* ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/rspamd/rspamd/archive/2.3.tar.gz -> rspamd-2.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=936406cef9d1795d504a6dead89e4090
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.4 b/metadata/md5-cache/mail-filter/rspamd-2.4
index cea687ca9fe6..7b665a1045ed 100644
--- a/metadata/md5-cache/mail-filter/rspamd-2.4
+++ b/metadata/md5-cache/mail-filter/rspamd-2.4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain un
 RDEPEND=acct-group/rspamd acct-user/rspamd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-util/ragel net-libs/libnsl sys-apps/file blas? ( sci-libs/openblas ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) jit? ( dev-lang/luajit:2 ) !jit? ( dev-lang/lua:* ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/rspamd/rspamd/archive/2.4.tar.gz -> rspamd-2.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=936406cef9d1795d504a6dead89e4090
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.5 b/metadata/md5-cache/mail-filter/rspamd-2.5
index 18ec8656cfe2..6dbe58d08ba4 100644
--- a/metadata/md5-cache/mail-filter/rspamd-2.5
+++ b/metadata/md5-cache/mail-filter/rspamd-2.5
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain un
 RDEPEND=acct-group/rspamd acct-user/rspamd app-arch/zstd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-libs/snowball-stemmer net-libs/libnsl sys-apps/file blas? ( sci-libs/openblas ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) jit? ( dev-lang/luajit:2 dev-lua/lpeg[luajit] ) !jit? ( dev-lang/lua:* dev-lua/lpeg[-luajit] dev-lua/LuaBitOp ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/rspamd/rspamd/archive/2.5.tar.gz -> rspamd-2.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5b4d35e2e28d16fa1b66b7900df3e39
diff --git a/metadata/md5-cache/mail-filter/rspamd-9999 b/metadata/md5-cache/mail-filter/rspamd-9999
index 864b6aca9153..b98b05b66e07 100644
--- a/metadata/md5-cache/mail-filter/rspamd-9999
+++ b/metadata/md5-cache/mail-filter/rspamd-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain un
 PROPERTIES=live
 RDEPEND=acct-group/rspamd acct-user/rspamd app-arch/zstd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-libs/snowball-stemmer net-libs/libnsl sys-apps/file blas? ( sci-libs/openblas ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) jit? ( dev-lang/luajit:2 dev-lua/lpeg[luajit] ) !jit? ( dev-lang/lua:* dev-lua/lpeg[-luajit] dev-lua/LuaBitOp ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5b4d35e2e28d16fa1b66b7900df3e39
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index b37649d0f28e..b699665e9168 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/postfix-3.5.1 b/metadata/md5-cache/mail-mta/postfix-3.5.1
deleted file mode 100644
index d9dbfc49cd2d..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-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? ( sys-libs/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 ~s390 ~sparc x86
-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? ( sys-libs/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[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/official/postfix-3.5.1.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=45000aea221ca6d5fdf31c58c418f9d9
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6_pre20200830 b/metadata/md5-cache/mail-mta/postfix-3.6_pre20200830
deleted file mode 100644
index 20128b1dc94a..000000000000
--- a/metadata/md5-cache/mail-mta/postfix-3.6_pre20200830
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst 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? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1: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 ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-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? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1: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[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
-REQUIRED_USE=ldap-bind? ( ldap sasl ) !libressl
-SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.6-20200830.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=901e7a43bc878872e847ad09afc8d20f
diff --git a/metadata/md5-cache/mail-mta/postfix-3.6_pre20200925 b/metadata/md5-cache/mail-mta/postfix-3.6_pre20200925
new file mode 100644
index 000000000000..d339d21675ec
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.6_pre20200925
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst 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? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1: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 ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+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? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1: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[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl ) !libressl
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.6-20200925.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=901e7a43bc878872e847ad09afc8d20f
diff --git a/metadata/md5-cache/mate-base/Manifest.gz b/metadata/md5-cache/mate-base/Manifest.gz
index d0fc807fbba1..d88d8d6cc217 100644
--- a/metadata/md5-cache/mate-base/Manifest.gz
+++ b/metadata/md5-cache/mate-base/Manifest.gz
diff --git a/metadata/md5-cache/mate-base/caja-1.24.0-r2 b/metadata/md5-cache/mate-base/caja-1.24.0-r2
new file mode 100644
index 000000000000..0b6a119672c5
--- /dev/null
+++ b/metadata/md5-cache/mate-base/caja-1.24.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/atk >=dev-libs/glib-2.58.1:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.17.3:0 >=media-libs/libexif-0.6.14:0 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.36.5:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/libnotify-0.7.0:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender >=x11-libs/pango-1.1.2 introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) selinux? ( sys-libs/libselinux ) xmp? ( >=media-libs/exempi-1.99.5:2 ) >=dev-lang/perl-5:= dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Caja file manager for the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=+introspection +mate packagekit selinux xmp test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=mate? ( >=x11-themes/mate-icon-theme-1.24 )
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.58.1:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.17.3:0 >=media-libs/libexif-0.6.14:0 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.36.5:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/libnotify-0.7.0:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender >=x11-libs/pango-1.1.2 introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) selinux? ( sys-libs/libselinux ) xmp? ( >=media-libs/exempi-1.99.5:2 ) virtual/libintl !!mate-base/mate-file-manager
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/caja-1.24.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ceb27c556a15d1c4b252940680c2481b
diff --git a/metadata/md5-cache/mate-base/libmatekbd-1.24.1 b/metadata/md5-cache/mate-base/libmatekbd-1.24.1
new file mode 100644
index 000000000000..75b3482817ed
--- /dev/null
+++ b/metadata/md5-cache/mate-base/libmatekbd-1.24.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.50:2 virtual/libintl x11-libs/cairo >=x11-libs/gdk-pixbuf-2.24:2 x11-libs/libX11 >=x11-libs/libxklavier-5.2:0[introspection?] x11-libs/pango >=x11-libs/gtk+-3.22:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) dev-libs/libxml2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=MATE keyboard configuration library
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X +introspection test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.50:2 virtual/libintl x11-libs/cairo >=x11-libs/gdk-pixbuf-2.24:2 x11-libs/libX11 >=x11-libs/libxklavier-5.2:0[introspection?] x11-libs/pango >=x11-libs/gtk+-3.22:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/libmatekbd-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6dfcce49da56ba46465cbeec027c9144
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.24.1 b/metadata/md5-cache/mate-base/mate-applets-1.24.1
new file mode 100644
index 000000000000..d44faf01dff9
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-applets-1.24.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/atk >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.50:2 >=dev-libs/libmateweather-1.17.0 >=dev-libs/libxml2-2.5:2 >=gnome-base/libgtop-2.12.0:2= >=gnome-extra/gucharmap-3.0:2.90 >=mate-base/mate-panel-1.17.0 >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.10.0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/gtksourceview:3.0 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libwnck-3.0:3 x11-libs/pango cpupower? ( sys-power/cpupower policykit? ( >=sys-auth/polkit-0.97:0 ) ) upower? ( >=sys-power/upower-0.9.23 ) !!net-analyzer/mate-netspeed app-text/docbook-xml-dtd:4.3 app-text/rarian >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=Applets for the MATE Desktop and Panel
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X +cpupower ipv6 policykit +upower
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+
+RDEPEND=dev-libs/atk >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.50:2 >=dev-libs/libmateweather-1.17.0 >=dev-libs/libxml2-2.5:2 >=gnome-base/libgtop-2.12.0:2= >=gnome-extra/gucharmap-3.0:2.90 >=mate-base/mate-panel-1.17.0 >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.10.0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/gtksourceview:3.0 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libwnck-3.0:3 x11-libs/pango cpupower? ( sys-power/cpupower policykit? ( >=sys-auth/polkit-0.97:0 ) ) upower? ( >=sys-power/upower-0.9.23 ) !!net-analyzer/mate-netspeed mate-base/caja mate-base/mate-desktop >=mate-base/mate-settings-daemon-1.6 virtual/libintl
+REQUIRED_USE=policykit? ( cpupower )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-applets-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=452317bf253d74c06e995653d8e06177
diff --git a/metadata/md5-cache/mate-base/mate-common-1.24.2 b/metadata/md5-cache/mate-base/mate-common-1.24.2
new file mode 100644
index 000000000000..e74db13b5e90
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-common-1.24.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Common files for development of MATE packages
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-common-1.24.2.tar.xz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=1abf1866be5936991f73e5cacda681f4
diff --git a/metadata/md5-cache/mate-base/mate-control-center-1.24.1 b/metadata/md5-cache/mate-base/mate-control-center-1.24.1
new file mode 100644
index 000000000000..751a54ce70e3
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-control-center-1.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk >=dev-libs/dbus-glib-0.73 >=dev-libs/glib-2.50:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.23.2 >=mate-base/caja-1.20.0 >=mate-base/mate-menus-1.21.0 >=mate-base/mate-settings-daemon-1.23.1 >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 media-libs/libcanberra:0[gtk3] >=sys-apps/dbus-1 sys-auth/polkit[introspection] x11-apps/xmodmap x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXi-1.5 x11-libs/libXrandr x11-libs/libXrender >=x11-libs/libxklavier-4 x11-libs/pango >=x11-wm/marco-1.17.0:= accountsservice? ( sys-apps/accountsservice ) appindicator? ( dev-libs/libappindicator:3 ) app-text/rarian >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools dev-libs/libxml2 dev-util/desktop-file-utils dev-util/glib-utils >=sys-devel/gettext-0.19.8 x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=The MATE Desktop configuration tool
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=accountsservice appindicator debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.1+ GPL-2+ LGPL-2+ LGPL-2.1+ HPND
+RDEPEND=dev-libs/atk >=dev-libs/dbus-glib-0.73 >=dev-libs/glib-2.50:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.23.2 >=mate-base/caja-1.20.0 >=mate-base/mate-menus-1.21.0 >=mate-base/mate-settings-daemon-1.23.1 >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 media-libs/libcanberra:0[gtk3] >=sys-apps/dbus-1 sys-auth/polkit[introspection] x11-apps/xmodmap x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXi-1.5 x11-libs/libXrandr x11-libs/libXrender >=x11-libs/libxklavier-4 x11-libs/pango >=x11-wm/marco-1.17.0:= accountsservice? ( sys-apps/accountsservice ) appindicator? ( dev-libs/libappindicator:3 )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-control-center-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fdbd7ced0859962a57172d55727289a3
diff --git a/metadata/md5-cache/mate-base/mate-desktop-1.24.1 b/metadata/md5-cache/mate-base/mate-desktop-1.24.1
new file mode 100644
index 000000000000..7e8bf96e14a3
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-desktop-1.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.50:2 >=gnome-base/dconf-0.13.4 x11-libs/cairo x11-libs/libX11 >=x11-libs/libXrandr-1.3 >=x11-libs/gtk+-3.22:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 ) app-text/docbook-xml-dtd:4.1.2 app-text/iso-codes dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 x11-base/xorg-proto >=x11-libs/gdk-pixbuf-2.36.5 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=Libraries for the MATE desktop that are not part of the UI
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X debug +introspection startup-notification
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.1 GPL-2+ LGPL-2+ MIT-with-advertising
+RDEPEND=>=dev-libs/glib-2.50:2 >=gnome-base/dconf-0.13.4 x11-libs/cairo x11-libs/libX11 >=x11-libs/libXrandr-1.3 >=x11-libs/gtk+-3.22:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 ) virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-desktop-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8b3757dfc9d6c788e397b0c2adbd6c0f
diff --git a/metadata/md5-cache/mate-base/mate-menus-1.24.1 b/metadata/md5-cache/mate-base/mate-menus-1.24.1
new file mode 100644
index 000000000000..83e0bdb5d189
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-menus-1.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.50:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=MATE menu system, implementing the F.D.O cross-desktop spec
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=debug +introspection
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.50:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-menus-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e932362e74c5f3f5443019506f6dc5e5
diff --git a/metadata/md5-cache/mate-base/mate-panel-1.24.1 b/metadata/md5-cache/mate-base/mate-panel-1.24.1
new file mode 100644
index 000000000000..8f8648885f56
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-panel-1.24.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.50:2 >=dev-libs/libmateweather-1.17.0 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.17.0 >=mate-base/mate-menus-1.21.0 >=sys-apps/dbus-1.1.2 >=x11-libs/cairo-1.0.0[X?] >=x11-libs/gdk-pixbuf-2.25.2:2 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libICE x11-libs/libSM >=x11-libs/libwnck-3.4.6:3[introspection?] >=x11-libs/pango-1.15.4:0[introspection?] X? ( x11-libs/libX11 x11-libs/libXau >=x11-libs/libXrandr-1.3 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) wayland? ( gui-libs/gtk-layer-shell ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools >=dev-lang/perl-5:= dev-util/glib-utils dev-util/gdbus-codegen dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=The MATE panel
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X +introspection wayland
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
+RDEPEND=dev-libs/atk >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.50:2 >=dev-libs/libmateweather-1.17.0 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.17.0 >=mate-base/mate-menus-1.21.0 >=sys-apps/dbus-1.1.2 >=x11-libs/cairo-1.0.0[X?] >=x11-libs/gdk-pixbuf-2.25.2:2 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libICE x11-libs/libSM >=x11-libs/libwnck-3.4.6:3[introspection?] >=x11-libs/pango-1.15.4:0[introspection?] X? ( x11-libs/libX11 x11-libs/libXau >=x11-libs/libXrandr-1.3 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) wayland? ( gui-libs/gtk-layer-shell ) virtual/libintl
+REQUIRED_USE=|| ( X wayland )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-panel-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6d7b422b1aeadaf93de71ce106b7ddfc
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.24.1 b/metadata/md5-cache/mate-base/mate-session-manager-1.24.1
new file mode 100644
index 000000000000..c5e6c023fb2d
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.24.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.50:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango gles2? ( media-libs/mesa[egl,gles2] ) systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) xtrans? ( x11-libs/xtrans ) >=dev-lang/perl-5 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=MATE session manager
+EAPI=6
+HOMEPAGE=https://mate-desktop.org/
+IUSE=debug elogind gles2 gnome-keyring ipv6 systemd +xtrans
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.50:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango gles2? ( media-libs/mesa[egl,gles2] ) systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind ) xtrans? ( x11-libs/xtrans ) mate-base/mate-desktop virtual/libintl x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring ) !<gnome-base/gdm-2.20.4
+REQUIRED_USE=^^ ( elogind systemd )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-session-manager-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=27d3b0fa5f970f2df145925c43added0
diff --git a/metadata/md5-cache/mate-base/mate-settings-daemon-1.24.1 b/metadata/md5-cache/mate-base/mate-settings-daemon-1.24.1
new file mode 100644
index 000000000000..ca8cd9c88199
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-settings-daemon-1.24.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.50:2 >=gnome-base/dconf-0.13.4 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.23.2 media-libs/fontconfig:1.0 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXi x11-libs/libXext >=x11-libs/libxklavier-5.2 libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-1.10.0 >=sys-auth/polkit-0.97 ) pulseaudio? ( >=media-libs/libmatemixer-1.10[pulseaudio] >=media-sound/pulseaudio-0.9.15 ) smartcard? ( >=dev-libs/nss-3.11.2 ) sound? ( >=media-libs/libmatemixer-1.10 media-libs/libcanberra[gtk3] ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=MATE Settings Daemon
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X debug libnotify policykit pulseaudio rfkill smartcard +sound
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.50:2 >=gnome-base/dconf-0.13.4 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.23.2 media-libs/fontconfig:1.0 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXi x11-libs/libXext >=x11-libs/libxklavier-5.2 libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-1.10.0 >=sys-auth/polkit-0.97 ) pulseaudio? ( >=media-libs/libmatemixer-1.10[pulseaudio] >=media-sound/pulseaudio-0.9.15 ) smartcard? ( >=dev-libs/nss-3.11.2 ) sound? ( >=media-libs/libmatemixer-1.10 media-libs/libcanberra[gtk3] ) virtual/libintl
+REQUIRED_USE=pulseaudio? ( sound )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-settings-daemon-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=408a8f40a9fb53e5692d2863aebc7067
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index 8bfe3a828ce2..99163c412d58 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/caja-dropbox-1.24.0-r1 b/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1
new file mode 100644
index 000000000000..94035b7c52e6
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/caja-dropbox-1.24.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/atk >=dev-libs/glib-2.50:2 python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=mate-base/caja-1.19.1 mate-extra/caja-extensions media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango dev-python/docutils virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=Store, Sync and Share Files Online
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=debug python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-ND-3.0 GPL-3+ public-domain
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/atk >=dev-libs/glib-2.50:2 python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) >=mate-base/caja-1.19.1 mate-extra/caja-extensions media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango net-misc/dropbox
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/caja-dropbox-1.24.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d0c94222ab8bd2302c320db92bb24f55
diff --git a/metadata/md5-cache/mate-extra/caja-extensions-1.24.1 b/metadata/md5-cache/mate-extra/caja-extensions-1.24.1
new file mode 100644
index 000000000000..af8e9ac440c5
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/caja-extensions-1.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.50:2 >=mate-base/caja-1.21.3 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 gajim? ( >=dev-libs/dbus-glib-0.60 >=sys-apps/dbus-1 ) open-terminal? ( >=mate-base/mate-desktop-1.17.0 ) pidgin? ( >=dev-libs/dbus-glib-0.60 ) upnp? ( >=net-libs/gupnp-0.13:0= ) xattr? ( sys-apps/attr ) dev-libs/libxml2 dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig !!mate-extra/mate-file-manager-open-terminal !!mate-extra/mate-file-manager-sendto !!mate-extra/mate-file-manager-image-converter !!mate-extra/mate-file-manager-share >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=Several Caja extensions
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=image-converter +open-terminal share +wallpaper xattr cdr gajim +mail pidgin upnp
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.50:2 >=mate-base/caja-1.21.3 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 gajim? ( >=dev-libs/dbus-glib-0.60 >=sys-apps/dbus-1 ) open-terminal? ( >=mate-base/mate-desktop-1.17.0 ) pidgin? ( >=dev-libs/dbus-glib-0.60 ) upnp? ( >=net-libs/gupnp-0.13:0= ) xattr? ( sys-apps/attr ) mate-base/mate-desktop cdr? ( >=app-cdr/brasero-2.32.1:= ) gajim? ( net-im/gajim ) image-converter? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) pidgin? ( net-im/pidgin )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/caja-extensions-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d6d13034c31ab9de13fb373038465915
diff --git a/metadata/md5-cache/mate-extra/mate-calc-1.24.1 b/metadata/md5-cache/mate-extra/mate-calc-1.24.1
new file mode 100644
index 000000000000..c10f64493792
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-calc-1.24.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.22:3 x11-libs/pango app-text/yelp-tools dev-libs/libxml2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=Calculator for MATE
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=CC-BY-SA-3.0 GPL-2+
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.22:3 x11-libs/pango virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-calc-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3f3920c8390608b03e8903da290bb00f
diff --git a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.24.0-r1 b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.24.0-r1
new file mode 100644
index 000000000000..66d75bf2dece
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.24.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/libindicator-0.4:3 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.22:3 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=MATE indicator applet
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3 GPL-3+ LGPL-2+ LGPL-3+
+RDEPEND=>=dev-libs/libindicator-0.4:3 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.22:3 virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-indicator-applet-1.24.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=72c58f118c412b0cca293f88216f8875
diff --git a/metadata/md5-cache/mate-extra/mate-media-1.24.1 b/metadata/md5-cache/mate-extra/mate-media-1.24.1
new file mode 100644
index 000000000000..5b0bd77fd760
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-media-1.24.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.50:2 dev-libs/libxml2:2 >=mate-base/mate-panel-1.17.0 >=mate-base/mate-desktop-1.17.0 >=media-libs/libcanberra-0.13[gtk3] >=media-libs/libmatemixer-1.10.0 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango >=sys-devel/gettext-0.19.8 virtual/pkgconfig !!<mate-base/mate-applets-1.8 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=Multimedia related programs for the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.1+ GPL-2+ HPND LGPL-2+
+RDEPEND=>=dev-libs/glib-2.50:2 dev-libs/libxml2:2 >=mate-base/mate-panel-1.17.0 >=mate-base/mate-desktop-1.17.0 >=media-libs/libcanberra-0.13[gtk3] >=media-libs/libmatemixer-1.10.0 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-media-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e07a8bbc581f891cb804837cd69530fe
diff --git a/metadata/md5-cache/mate-extra/mate-netbook-1.24.0-r1 b/metadata/md5-cache/mate-extra/mate-netbook-1.24.0-r1
new file mode 100644
index 000000000000..cd94525355bc
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-netbook-1.24.0-r1
@@ -0,0 +1,12 @@
+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/gtk+-3.22:3 x11-libs/libfakekey x11-libs/libwnck:3 x11-libs/libXtst x11-libs/libX11 x11-libs/cairo x11-base/xorg-proto >=dev-util/intltool-0.50.1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=MATE utilities for netbooks
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+ GPL-3
+RDEPEND=>=dev-libs/glib-2.50:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.22:3 x11-libs/libfakekey x11-libs/libwnck:3 x11-libs/libXtst x11-libs/libX11 x11-libs/cairo virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-netbook-1.24.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eeb77823a149c04d6388593cc0318762
diff --git a/metadata/md5-cache/mate-extra/mate-polkit-1.24.0-r1 b/metadata/md5-cache/mate-extra/mate-polkit-1.24.0-r1
new file mode 100644
index 000000000000..cf3b758146a9
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-polkit-1.24.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.50:2 >=sys-auth/polkit-0.102 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22.0:3 appindicator? ( dev-libs/libappindicator:3 ) dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2.6 virtual/pkgconfig !<gnome-extra/polkit-gnome-0.102:0 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=A MATE specific DBUS service that is used to bring up authentication dialogs
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=accountsservice appindicator
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.50:2 >=sys-auth/polkit-0.102 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22.0:3 appindicator? ( dev-libs/libappindicator:3 ) accountsservice? ( sys-apps/accountsservice ) virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-polkit-1.24.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1a16a8eae9fc5bff63ad37a754eb723d
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.24.2 b/metadata/md5-cache/mate-extra/mate-power-manager-1.24.2
new file mode 100644
index 000000000000..b003d179af83
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-power-manager-1.24.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=media-libs/libcanberra-0.10:0[gtk3] >=sys-apps/dbus-1 >=sys-power/upower-0.99.8:= >=x11-apps/xrandr-1.3 >=x11-libs/cairo-1 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr >=x11-libs/libnotify-0.7:0 x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 ) libsecret? ( >=app-crypt/libsecret-0.11 ) app-text/docbook-xml-dtd:4.3 app-text/rarian >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools dev-libs/libxml2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=A session daemon for MATE that makes it easy to manage your laptop or desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=+applet elogind libsecret policykit systemd test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=media-libs/libcanberra-0.10:0[gtk3] >=sys-apps/dbus-1 >=sys-power/upower-0.99.8:= >=x11-apps/xrandr-1.3 >=x11-libs/cairo-1 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr >=x11-libs/libnotify-0.7:0 x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 ) libsecret? ( >=app-crypt/libsecret-0.11 ) virtual/libintl policykit? ( >=mate-extra/mate-polkit-1.6 ) systemd? ( sys-apps/systemd ) elogind? ( sys-auth/elogind )
+REQUIRED_USE=^^ ( elogind systemd )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-power-manager-1.24.2.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c1b970ae09d8c6f555db37cbbb500100
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.24.1 b/metadata/md5-cache/mate-extra/mate-screensaver-1.24.1
new file mode 100644
index 000000000000..7ee36a52aef0
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-screensaver-1.24.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.50:2 gnome-base/dconf >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.17.0 >=mate-base/mate-menus-1.21.0 >=sys-apps/dbus-0.30 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86vm x11-libs/libxklavier x11-libs/pango consolekit? ( sys-auth/consolekit ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl ) pam? ( gnome-base/gnome-keyring sys-libs/pam ) !pam? ( kernel_linux? ( sys-apps/shadow ) ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:= ) dev-libs/libxml2 >=sys-devel/gettext-0.19.8:* x11-base/xorg-proto virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=Replaces xscreensaver, integrating with the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X debug consolekit elogind kernel_linux libnotify opengl pam systemd
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ HPND LGPL-2+
+RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.50:2 gnome-base/dconf >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.17.0 >=mate-base/mate-menus-1.21.0 >=sys-apps/dbus-0.30 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86vm x11-libs/libxklavier x11-libs/pango consolekit? ( sys-auth/consolekit ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl ) pam? ( gnome-base/gnome-keyring sys-libs/pam ) !pam? ( kernel_linux? ( sys-apps/shadow ) ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:= ) >=mate-base/mate-session-manager-1.6 virtual/libintl !!<gnome-extra/gnome-screensaver-3
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-screensaver-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=05b3c7ad1378d4f0d64f166ddd78cc1b
diff --git a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.24.1 b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.24.1
new file mode 100644
index 000000000000..cdf5146537c4
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.24.1
@@ -0,0 +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 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 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+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
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=FDL-1.1+ 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 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] ) virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-sensors-applet-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b23e1c7b636b09dddcdc3cf1d064afb5
diff --git a/metadata/md5-cache/mate-extra/mate-system-monitor-1.24.1 b/metadata/md5-cache/mate-extra/mate-system-monitor-1.24.1
new file mode 100644
index 000000000000..80dfa8a6ae71
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-system-monitor-1.24.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-cpp/glibmm-2.26:2 >=dev-cpp/gtkmm-3.8:3.0 >=dev-libs/glib-2.56:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2:2 >=gnome-base/libgtop-2.37.2:2= >=gnome-base/librsvg-2.35:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.0:3 elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) app-text/yelp-tools >=sys-devel/gettext-0.19.8 >=sys-devel/autoconf-2.63:* virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=The MATE System Monitor
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=elogind systemd
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.1+ GPL-2+ LGPL-2+
+RDEPEND=>=dev-cpp/glibmm-2.26:2 >=dev-cpp/gtkmm-3.8:3.0 >=dev-libs/glib-2.56:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2:2 >=gnome-base/libgtop-2.37.2:2= >=gnome-base/librsvg-2.35:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.0:3 elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) >=sys-auth/polkit-0.97:0 virtual/libintl
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-system-monitor-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dda748eba9be6edbea715c01ae033643
diff --git a/metadata/md5-cache/mate-extra/mate-user-guide-1.24.0-r2 b/metadata/md5-cache/mate-extra/mate-user-guide-1.24.0-r2
new file mode 100644
index 000000000000..c7a44c8f7853
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-user-guide-1.24.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/yelp-tools >=sys-devel/gettext-0.19.8 virtual/pkgconfig !!mate-base/mate-desktop[user-guide(-)] >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=User documentation for MATE Desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=FDL-1.1+ GPL-2+
+RDEPEND=gnome-extra/yelp mate-base/mate-desktop virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-user-guide-1.24.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=65a99d62071079ca91865cfd3e410137
diff --git a/metadata/md5-cache/mate-extra/mate-user-share-1.24.0-r1 b/metadata/md5-cache/mate-extra/mate-user-share-1.24.0-r1
new file mode 100644
index 000000000000..3f72e9f3bb5f
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-user-share-1.24.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=mate-base/caja-1.17.1 media-libs/libcanberra[gtk3] >=sys-apps/dbus-1.1.1 >=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/pango >=x11-libs/libnotify-0.7 app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=Personal file sharing for the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=FDL-1.1+ GPL-2+
+RDEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=mate-base/caja-1.17.1 media-libs/libcanberra[gtk3] >=sys-apps/dbus-1.1.1 >=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/pango >=x11-libs/libnotify-0.7 >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-user-share-1.24.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8b4bb3df137cd16283f34a4b7cf20ded
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.24.0-r3 b/metadata/md5-cache/mate-extra/mate-utils-1.24.0-r3
new file mode 100644
index 000000000000..a12a7da47c7f
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-utils-1.24.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=gnome-base/libgtop-2.12:2= >=media-libs/libcanberra-0.4[gtk3] sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 ) udisks? ( >=sys-fs/udisks-1.90.0:2 ) app-text/rarian >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools dev-libs/libxml2 dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=Utilities for the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X applet debug ipv6 test udisks
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=gnome-base/libgtop-2.12:2= >=media-libs/libcanberra-0.4[gtk3] sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 ) udisks? ( >=sys-fs/udisks-1.90.0:2 ) mate-base/mate-desktop virtual/libintl
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-utils-1.24.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d1bc83700a76a0b8cc854c041fe68b76
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index fab810d7b61b..69624ba2890a 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/encodings-1.0.5 b/metadata/md5-cache/media-fonts/encodings-1.0.5
deleted file mode 100644
index f8a1433588b6..000000000000
--- a/metadata/md5-cache/media-fonts/encodings-1.0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org font encodings
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/encodings
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/encodings-1.0.5.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=9441168e7ea49912d92024640ae93c44
diff --git a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r1
deleted file mode 100644
index 7572ede4f191..000000000000
--- a/metadata/md5-cache/media-fonts/font-adobe-100dpi-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Adobe bitmap fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-adobe-100dpi
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-adobe-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=f75201f4119b49653001881ee41d96bb
diff --git a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r1
deleted file mode 100644
index 6a0cab039d05..000000000000
--- a/metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Adobe bitmap fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-adobe-75dpi
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-adobe-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=75e94c427eb1d56b303fdd5c15c56381
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r1
deleted file mode 100644
index 8aa0894e76a7..000000000000
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-100dpi-1.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Adobe Utopia bitmap fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-adobe-utopia-100dpi
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=b287718d423ed218145f58bdb8f99b27
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r1
deleted file mode 100644
index 9f966c6e485b..000000000000
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-75dpi-1.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Adobe Utopia bitmap fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-adobe-utopia-75dpi
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=b287718d423ed218145f58bdb8f99b27
diff --git a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r1
deleted file mode 100644
index ca1795a5e14a..000000000000
--- a/metadata/md5-cache/media-fonts/font-adobe-utopia-type1-1.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Adobe Utopia Type 1 fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-adobe-utopia-type1
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=d24f3615127bf6402388d4a7f85d5540
diff --git a/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1
deleted file mode 100644
index 093a02c6b5b6..000000000000
--- a/metadata/md5-cache/media-fonts/font-alias-1.0.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org font aliases
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-alias
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-alias-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=11b243e4c5b8ff13aff80b25f5508667
diff --git a/metadata/md5-cache/media-fonts/font-alias-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-alias-1.0.3-r2
deleted file mode 100644
index 18f05940428b..000000000000
--- a/metadata/md5-cache/media-fonts/font-alias-1.0.3-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DESCRIPTION=X.Org font aliases
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-alias
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-alias-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
-_md5_=cf66346e12625c252b95a75dc2bd7dda
diff --git a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r1
deleted file mode 100644
index 6e2bf70af774..000000000000
--- a/metadata/md5-cache/media-fonts/font-arabic-misc-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org arabic bitmap fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-arabic-misc
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-arabic-misc-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=3f665e170281c2a7ef63d5d929564be6
diff --git a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r1
deleted file mode 100644
index 2eece53f6291..000000000000
--- a/metadata/md5-cache/media-fonts/font-bh-100dpi-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Bigelow & Holmes bitmap fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-100dpi
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=public-domain
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-bh-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=703cf8219a3cd9eefb26268ccecd9d62
diff --git a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r1
deleted file mode 100644
index 9372a8c5ae52..000000000000
--- a/metadata/md5-cache/media-fonts/font-bh-75dpi-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Bigelow & Holmes bitmap fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-75dpi
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=public-domain
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-bh-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=703cf8219a3cd9eefb26268ccecd9d62
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r1
deleted file mode 100644
index 5459661fbf61..000000000000
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-100dpi-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Bigelow & Holmes Lucida bitmap fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-lucidatypewriter-100dpi
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=public-domain
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=1fc3d53e3d876035a9126b0046cc6a7a
diff --git a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r1
deleted file mode 100644
index c5535fcb90f6..000000000000
--- a/metadata/md5-cache/media-fonts/font-bh-lucidatypewriter-75dpi-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Bigelow & Holmes Lucida bitmap fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-lucidatypewriter-75dpi
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=public-domain
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=1fc3d53e3d876035a9126b0046cc6a7a
diff --git a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r1
deleted file mode 100644
index 8319aa3ca0e9..000000000000
--- a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Bigelow & Holmes TrueType fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-ttf
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos
-LICENSE=bh-luxi
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-bh-ttf-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=ed00bf6d1590bf66a76e3aeea9b13b0d
diff --git a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r2
index 245b8d685260..7360f7fb4ca7 100644
--- a/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-bh-ttf-1.0.3-r2
@@ -5,11 +5,11 @@ DESCRIPTION=X.Org Bigelow & Holmes TrueType fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-ttf
 IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=bh-luxi
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-ttf-1.0.3.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
-_md5_=6c675c22fe5e1c7abffd8214dccfe3c3
+_md5_=370e047e3d4b747e0fe236461284d6ee
diff --git a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r1
deleted file mode 100644
index 7b69d17ce53a..000000000000
--- a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Bigelow & Holmes Type 1 fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-type1
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos
-LICENSE=bh-luxi
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-bh-type1-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=4e1af32ab549529cf288d254c7a67769
diff --git a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r2 b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r2
index 28c4e85fff34..42ae896a4b82 100644
--- a/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r2
+++ b/metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r2
@@ -5,11 +5,11 @@ DESCRIPTION=X.Org Bigelow & Holmes Type 1 fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bh-type1
 IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos
 LICENSE=bh-luxi
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-bh-type1-1.0.3.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
-_md5_=56e916801a8d4b18dd17955f0b0f663d
+_md5_=7e180617ab41c7dd9dfba9b7b13dc939
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r1
deleted file mode 100644
index 11643d5dc283..000000000000
--- a/metadata/md5-cache/media-fonts/font-bitstream-100dpi-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Bitstream bitmap fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bitstream-100dpi
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=65f444bd72142266ab42c6552bd2c850
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r1
deleted file mode 100644
index 4e47db720c25..000000000000
--- a/metadata/md5-cache/media-fonts/font-bitstream-75dpi-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Bitstream bitmap fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bitstream-75dpi
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=65f444bd72142266ab42c6552bd2c850
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r1 b/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r1
deleted file mode 100644
index 12e65d5955b1..000000000000
--- a/metadata/md5-cache/media-fonts/font-bitstream-speedo-1.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=Bitstream Speedo fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bitstream-speedo
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-speedo-1.0.2.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=fe28b79a21e38d3185a65fddedc73e73
diff --git a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r1
deleted file mode 100644
index 866135890f1f..000000000000
--- a/metadata/md5-cache/media-fonts/font-bitstream-type1-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Bitstream Type 1 fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-bitstream-type1
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-bitstream-type1-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=7a1070e5c16d206a84f548d01bfa6b5b
diff --git a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r1
deleted file mode 100644
index 72c42cb77e33..000000000000
--- a/metadata/md5-cache/media-fonts/font-cronyx-cyrillic-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Cronyx cyrillic fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-cronyx-cyrillic
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=3efa7d876e59bc5cfe67c332a040b615
diff --git a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r1
deleted file mode 100644
index b5d44032837c..000000000000
--- a/metadata/md5-cache/media-fonts/font-cursor-misc-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org cursor font
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-cursor-misc
-IUSE=X
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-cursor-misc-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=807f28c73f31d79a3e2f828dc53995a8
diff --git a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r1
deleted file mode 100644
index 37efdfbb4ab8..000000000000
--- a/metadata/md5-cache/media-fonts/font-daewoo-misc-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Daewoo fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-daewoo-misc
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-daewoo-misc-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=856ce10beba5920ff223837f890ef6b6
diff --git a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r1
deleted file mode 100644
index ab49c1bad453..000000000000
--- a/metadata/md5-cache/media-fonts/font-dec-misc-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org DEC fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-dec-misc
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-dec-misc-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=a54cc8833284d0fb812056f07b5ed2ef
diff --git a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r1
deleted file mode 100644
index a821cf924a1f..000000000000
--- a/metadata/md5-cache/media-fonts/font-ibm-type1-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org IBM Courier font
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-ibm-type1
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-ibm-type1-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=c8932497060e349124fad8b1f9ea2c2d
diff --git a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r1
deleted file mode 100644
index ef6c98588898..000000000000
--- a/metadata/md5-cache/media-fonts/font-isas-misc-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org the Institute of Software, Academia Sinica (chinese) fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-isas-misc
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-isas-misc-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=a3ebba1f399c2e5bff00be6e01804d9f
diff --git a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r1
deleted file mode 100644
index 50e24274541a..000000000000
--- a/metadata/md5-cache/media-fonts/font-jis-misc-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org JIS (japanese) fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-jis-misc
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-jis-misc-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=2f975b9f61f45d04c9ed10829462af28
diff --git a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r1
deleted file mode 100644
index d47f15d1066b..000000000000
--- a/metadata/md5-cache/media-fonts/font-micro-misc-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org micro-misc font
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-micro-misc
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=public-domain
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-micro-misc-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=f0cb074f258203a7b6d67ccf13829342
diff --git a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r1
deleted file mode 100644
index 3ebf045e7f82..000000000000
--- a/metadata/md5-cache/media-fonts/font-misc-cyrillic-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org misc-cyrillic fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-misc-cyrillic
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-misc-cyrillic-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=d05486f6f0fa6fb7863bd2322815f8f6
diff --git a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3-r1
deleted file mode 100644
index 945a53f41dcd..000000000000
--- a/metadata/md5-cache/media-fonts/font-misc-ethiopic-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=Miscellaneous Ethiopic fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-misc-ethiopic
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-misc-ethiopic-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=6d0e5834de81a613c28c64de018e2600
diff --git a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r1
deleted file mode 100644
index 078b4619a8a9..000000000000
--- a/metadata/md5-cache/media-fonts/font-misc-meltho-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Syriac fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-misc-meltho
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-misc-meltho-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=9b1e203d22da1a3151f4a094fb9bba29
diff --git a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r1 b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r1
deleted file mode 100644
index ec405e6faf5a..000000000000
--- a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org miscellaneous fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-misc-misc
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-misc-misc-1.1.2.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=da9a50655ff7255f7e699c3975ca2cb5
diff --git a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r2 b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r2
index 5d9b05e63789..c97c440de534 100644
--- a/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r2
+++ b/metadata/md5-cache/media-fonts/font-misc-misc-1.1.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=X.Org miscellaneous fonts
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-misc-misc
 IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 PDEPEND=media-fonts/font-alias
 RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/font/font-misc-misc-1.1.2.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
-_md5_=7f0b6d6eec29c211d80f9c5cd7bbfcbd
+_md5_=a177224ec4af4b7ccc5a4ea7af5ac5d0
diff --git a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r1
deleted file mode 100644
index 6f1f3ac07878..000000000000
--- a/metadata/md5-cache/media-fonts/font-mutt-misc-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org ClearlyU fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-mutt-misc
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-mutt-misc-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=a1df59c0bb29124673c78578c19c5a99
diff --git a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r1 b/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r1
deleted file mode 100644
index 01c996535fa2..000000000000
--- a/metadata/md5-cache/media-fonts/font-schumacher-misc-1.1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Schumacher fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-schumacher-misc
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-schumacher-misc-1.1.2.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=235c32173d1a893cf1406ca74574f13d
diff --git a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r1
deleted file mode 100644
index 43aefa3ce3ab..000000000000
--- a/metadata/md5-cache/media-fonts/font-screen-cyrillic-1.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Screen cyrillic fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-screen-cyrillic
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-screen-cyrillic-1.0.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=b074b73e9ac4a8b4e1b5243227d77316
diff --git a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r1
deleted file mode 100644
index db4a893f61a4..000000000000
--- a/metadata/md5-cache/media-fonts/font-sony-misc-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Sony fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-sony-misc
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-sony-misc-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=b547b9270479999313673f683caf46cc
diff --git a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r1
deleted file mode 100644
index 22b6ed6e7f9f..000000000000
--- a/metadata/md5-cache/media-fonts/font-sun-misc-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Sun fonts
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-sun-misc
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-sun-misc-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=e51a56436809eb49a875ad84e0224549
diff --git a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r1 b/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r1
deleted file mode 100644
index 26eadef03fce..000000000000
--- a/metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-apps/bdftopcf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org Winitzki cyrillic font
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-winitzki-cyrillic
-IUSE=X nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=c5a907060316c17caba01faf9dc759bf
diff --git a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r1 b/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r1
deleted file mode 100644
index 50c7b8eb0ce7..000000000000
--- a/metadata/md5-cache/media-fonts/font-xfree86-type1-1.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=media-fonts/font-util-1.2.0 >=x11-apps/mkfontscale-1.2.0 virtual/pkgconfig
-DESCRIPTION=X.Org XFree86 Type 1 font
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/font-xfree86-type1
-IUSE=X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-PDEPEND=media-fonts/font-alias
-RDEPEND=media-fonts/encodings >=x11-apps/mkfontscale-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/font/font-xfree86-type1-1.0.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=d10d008ad94b6888b06ca0e31d651307
diff --git a/metadata/md5-cache/media-fonts/monoid-0.60 b/metadata/md5-cache/media-fonts/monoid-0.60
deleted file mode 100644
index 1897ecde753b..000000000000
--- a/metadata/md5-cache/media-fonts/monoid-0.60
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=media-gfx/fontforge[python] X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Open source coding font
-EAPI=5
-HOMEPAGE=https://larsenwork.com/monoid/ https://github.com/larsenwork/monoid
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT OFL-1.1
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://github.com/larsenwork/monoid/archive/0.60.tar.gz -> monoid-0.60.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fb686a39475106e7247a366685f48548
diff --git a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1 b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1
index f6ea99a97bdf..42ebeda13282 100644
--- a/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1
+++ b/metadata/md5-cache/media-fonts/oxygen-fonts-5.4.3-r1
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=OFL-1.1
 SLOT=5
 SRC_URI=mirror://kde/unstable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	font	dd073b36fe3fd8b868c23bc23209db45	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ea319233a6995c79017d57d9d7c3d1b
diff --git a/metadata/md5-cache/media-fonts/umeplus-fonts-20130511 b/metadata/md5-cache/media-fonts/umeplus-fonts-20130511
deleted file mode 100644
index fde098944162..000000000000
--- a/metadata/md5-cache/media-fonts/umeplus-fonts-20130511
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=UmePlus fonts are modified Ume and M+ fonts for Japanese
-EAPI=5
-HOMEPAGE=http://www.geocities.jp/ep3797/modified_fonts_01.html
-IUSE=X
-KEYWORDS=amd64 x86 ~ppc-macos ~x86-macos
-LICENSE=mplus-fonts public-domain
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://sourceforge/mdk-ut/umeplus-fonts-20130511.tar.lzma
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=31ac1e62323a45c6ee0fc85fb3227778
diff --git a/metadata/md5-cache/media-fonts/umeplus-fonts-20131109 b/metadata/md5-cache/media-fonts/umeplus-fonts-20131109
deleted file mode 100644
index 92d61ab5758b..000000000000
--- a/metadata/md5-cache/media-fonts/umeplus-fonts-20131109
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=UmePlus fonts are modified Ume and M+ fonts for Japanese
-EAPI=5
-HOMEPAGE=http://www.geocities.jp/ep3797/modified_fonts_01.html
-IUSE=X
-KEYWORDS=amd64 x86 ~ppc-macos ~x86-macos
-LICENSE=mplus-fonts public-domain
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://sourceforge/mdk-ut/umeplus-fonts-20131109.tar.lzma
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=001a375c3e53482fe5eefc876aae52dd
diff --git a/metadata/md5-cache/media-fonts/umeplus-fonts-20150115 b/metadata/md5-cache/media-fonts/umeplus-fonts-20150115
deleted file mode 100644
index ee1983fd4a38..000000000000
--- a/metadata/md5-cache/media-fonts/umeplus-fonts-20150115
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=UmePlus fonts are modified Ume and M+ fonts for Japanese
-EAPI=5
-HOMEPAGE=http://www.geocities.jp/ep3797/modified_fonts_01.html
-IUSE=X
-KEYWORDS=~amd64 ~x86 ~ppc-macos ~x86-macos
-LICENSE=mplus-fonts public-domain
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=mirror://sourceforge/mdk-ut/umeplus-fonts-20150115.tar.lzma
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	font	dd073b36fe3fd8b868c23bc23209db45	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4a0bc02b25cf6a28da21b450b4e512c0
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 242efe123be9..d96329748ab2 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/alembic-1.7.11-r1 b/metadata/md5-cache/media-gfx/alembic-1.7.11-r1
index 6f40cf18f039..2015f37672b1 100644
--- a/metadata/md5-cache/media-gfx/alembic-1.7.11-r1
+++ b/metadata/md5-cache/media-gfx/alembic-1.7.11-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=hdf5? ( zlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alembic/alembic/archive/1.7.11.tar.gz -> alembic-1.7.11.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15a11cebd634d4747fa9ef21342d2e19
diff --git a/metadata/md5-cache/media-gfx/alembic-1.7.12 b/metadata/md5-cache/media-gfx/alembic-1.7.12
index fcb245410268..228aa2050c82 100644
--- a/metadata/md5-cache/media-gfx/alembic-1.7.12
+++ b/metadata/md5-cache/media-gfx/alembic-1.7.12
@@ -12,5 +12,5 @@ REQUIRED_USE=hdf5? ( zlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alembic/alembic/archive/1.7.12.tar.gz -> alembic-1.7.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1fa8acfd9980ab12e621b5f13029e87d
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.61 b/metadata/md5-cache/media-gfx/asymptote-2.61
index 4abb1ac53a06..42b31921e241 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.61
+++ b/metadata/md5-cache/media-gfx/asymptote-2.61
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) offscreen?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.61.src.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	latex-package	e5f296c98696dd02059bc6a5a03282e2	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	latex-package	e5f296c98696dd02059bc6a5a03282e2	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5225a1db2b357d4ac186b96ac1ed25f3
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.62 b/metadata/md5-cache/media-gfx/asymptote-2.62
index cfe696149b28..dfc534dbaddf 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.62
+++ b/metadata/md5-cache/media-gfx/asymptote-2.62
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) offscreen?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.62.src.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	latex-package	e5f296c98696dd02059bc6a5a03282e2	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	latex-package	e5f296c98696dd02059bc6a5a03282e2	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=27d31f6c7de9dfa94409977e314e6e4c
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.65 b/metadata/md5-cache/media-gfx/asymptote-2.65
index ac4a2ad0429e..d6cf4c82411f 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.65
+++ b/metadata/md5-cache/media-gfx/asymptote-2.65
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.65.src.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	latex-package	e5f296c98696dd02059bc6a5a03282e2	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	latex-package	e5f296c98696dd02059bc6a5a03282e2	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=8ab73e14680c41a354585785bb0cd069
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.67 b/metadata/md5-cache/media-gfx/asymptote-2.67
index 4bd7e17a3d47..1ae650f58cf5 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.67
+++ b/metadata/md5-cache/media-gfx/asymptote-2.67
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.67.src.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	latex-package	e5f296c98696dd02059bc6a5a03282e2	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	latex-package	e5f296c98696dd02059bc6a5a03282e2	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fc1b4c98c762fc2c2ec9370d50849237
diff --git a/metadata/md5-cache/media-gfx/blender-2.83.4 b/metadata/md5-cache/media-gfx/blender-2.83.4
index 4d95027bcc3f..e3ecbdcc701b 100644
--- a/metadata/md5-cache/media-gfx/blender-2.83.4
+++ b/metadata/md5-cache/media-gfx/blender-2.83.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 ) alembic? ( openexr ) cuda? (
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.blender.org/source/blender-2.83.4.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d95090b8215c16f5857610fddb422028
diff --git a/metadata/md5-cache/media-gfx/cura-4.2.1 b/metadata/md5-cache/media-gfx/cura-4.2.1
index 5a8c6668689f..ad44f73e11c6 100644
--- a/metadata/md5-cache/media-gfx/cura-4.2.1
+++ b/metadata/md5-cache/media-gfx/cura-4.2.1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Cura/archive/4.2.1.tar.gz -> cura-4.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18bb3688a0139ea0faff5f7b303b4016
diff --git a/metadata/md5-cache/media-gfx/cura-4.3.0-r1 b/metadata/md5-cache/media-gfx/cura-4.3.0-r1
index 2f36d26ac7f7..5b2ae37cd1af 100644
--- a/metadata/md5-cache/media-gfx/cura-4.3.0-r1
+++ b/metadata/md5-cache/media-gfx/cura-4.3.0-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Cura/archive/4.3.0.tar.gz -> cura-4.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18bb3688a0139ea0faff5f7b303b4016
diff --git a/metadata/md5-cache/media-gfx/cura-4.6.1 b/metadata/md5-cache/media-gfx/cura-4.6.1
index b00772d97c9a..735a7dae003f 100644
--- a/metadata/md5-cache/media-gfx/cura-4.6.1
+++ b/metadata/md5-cache/media-gfx/cura-4.6.1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Cura/archive/4.6.1.tar.gz -> cura-4.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12f61ee9a5312c2d196556765610adb7
diff --git a/metadata/md5-cache/media-gfx/curaengine-4.2.0 b/metadata/md5-cache/media-gfx/curaengine-4.2.0
index 0f37e3d13fed..00649cd926f1 100644
--- a/metadata/md5-cache/media-gfx/curaengine-4.2.0
+++ b/metadata/md5-cache/media-gfx/curaengine-4.2.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-libs/libarcus-4.2.0:* dev-libs/protobuf dev-libs/stb
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/4.2.0.tar.gz -> curaengine-4.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ed9d935489d093d1782ae9f568d1d34
diff --git a/metadata/md5-cache/media-gfx/curaengine-4.3.0 b/metadata/md5-cache/media-gfx/curaengine-4.3.0
index 7145b859f9f8..bdc27896988b 100644
--- a/metadata/md5-cache/media-gfx/curaengine-4.3.0
+++ b/metadata/md5-cache/media-gfx/curaengine-4.3.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-libs/libarcus-4.3.0:* dev-libs/protobuf dev-libs/stb
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/4.3.0.tar.gz -> curaengine-4.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61c30b58f8134a70449f5ba7b05bebcb
diff --git a/metadata/md5-cache/media-gfx/curaengine-4.6.1 b/metadata/md5-cache/media-gfx/curaengine-4.6.1
index ff3fca2c47f0..36cb550beed3 100644
--- a/metadata/md5-cache/media-gfx/curaengine-4.6.1
+++ b/metadata/md5-cache/media-gfx/curaengine-4.6.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-libs/libarcus-4.6.1:* dev-libs/protobuf dev-libs/stb
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/4.6.1.tar.gz -> curaengine-4.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27155590c0cc8bcbd4f3863e3b443be8
diff --git a/metadata/md5-cache/media-gfx/curaengine-4.7.0 b/metadata/md5-cache/media-gfx/curaengine-4.7.0
index 043d99e4f1f9..0e3892af22fb 100644
--- a/metadata/md5-cache/media-gfx/curaengine-4.7.0
+++ b/metadata/md5-cache/media-gfx/curaengine-4.7.0
@@ -11,5 +11,5 @@ RDEPEND=arcus? ( ~dev-libs/libarcus-4.7.0:* dev-libs/protobuf:= ) dev-libs/clipp
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/CuraEngine/archive/4.7.0.tar.gz -> curaengine-4.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9974512fc657aff830d09bd64385ef29
diff --git a/metadata/md5-cache/media-gfx/darktable-2.6.2 b/metadata/md5-cache/media-gfx/darktable-2.6.2
index a83ff9a71a66..c0ad422995fc 100644
--- a/metadata/md5-cache/media-gfx/darktable-2.6.2
+++ b/metadata/md5-cache/media-gfx/darktable-2.6.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 dev-libs/pugixml:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.14:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-2.6.2/darktable-2.6.2.tar.xz https://dev.gentoo.org/~asturm/distfiles/darktable-2.6.2-gcc9.patch.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-2.6.0/darktable-usermanual.pdf -> darktable-usermanual-2.6.0.pdf )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=69d43105ec0c90a203ae488d7f8ea191
diff --git a/metadata/md5-cache/media-gfx/darktable-3.0.2 b/metadata/md5-cache/media-gfx/darktable-3.0.2
index 993c70ede90d..0f75808968ff 100644
--- a/metadata/md5-cache/media-gfx/darktable-3.0.2
+++ b/metadata/md5-cache/media-gfx/darktable-3.0.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml-1.8:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-3.0.2/darktable-3.0.2.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual.pdf -> darktable-usermanual-3.0.0.pdf )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6879b0ed914cdb45f2c923a7c9ff549
diff --git a/metadata/md5-cache/media-gfx/darktable-3.2.1 b/metadata/md5-cache/media-gfx/darktable-3.2.1
index 96865fa93da6..9af4d0502e7f 100644
--- a/metadata/md5-cache/media-gfx/darktable-3.2.1
+++ b/metadata/md5-cache/media-gfx/darktable-3.2.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml-1.8:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 SLOT=0
 SRC_URI=https://github.com/darktable-org/darktable/releases/download/release-3.2.1/darktable-3.2.1.tar.xz doc? ( https://github.com/darktable-org/darktable/releases/download/release-3.0.0/darktable-usermanual.pdf -> darktable-usermanual-3.0.0.pdf )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2446659ac3c4541f1d49558fe3c95ac8
diff --git a/metadata/md5-cache/media-gfx/darktable-9999 b/metadata/md5-cache/media-gfx/darktable-9999
index 125db9c0a478..d9b1c5d3e7b8 100644
--- a/metadata/md5-cache/media-gfx/darktable-9999
+++ b/metadata/md5-cache/media-gfx/darktable-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3 CC-BY-3.0
 PROPERTIES=live
 RDEPEND=dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 >=dev-libs/pugixml-1.8:0= gnome-base/librsvg:2 >=media-gfx/exiv2-0.25-r2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3:0= media-libs/libpng:0= media-libs/tiff:0 net-libs/libsoup:2.4 net-misc/curl sys-libs/zlib:= virtual/jpeg:0 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango colord? ( x11-libs/colord-gtk:0= ) cups? ( net-print/cups ) flickr? ( media-libs/flickcurl ) geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) webp? ( media-libs/libwebp:0= ) kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2762db865ed39b7b958c809e56c074d3
diff --git a/metadata/md5-cache/media-gfx/digikam-6.4.0-r1 b/metadata/md5-cache/media-gfx/digikam-6.4.0-r1
index 6ce0ff6d7f8b..d11e6baf0c6d 100644
--- a/metadata/md5-cache/media-gfx/digikam-6.4.0-r1
+++ b/metadata/md5-cache/media-gfx/digikam-6.4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/6.4.0/digikam-6.4.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=506e2059081e2e29d4e3f8488ed3edf7
diff --git a/metadata/md5-cache/media-gfx/digikam-7.1.0 b/metadata/md5-cache/media-gfx/digikam-7.1.0
index 684848f628f6..4cec1e3e1fb2 100644
--- a/metadata/md5-cache/media-gfx/digikam-7.1.0
+++ b/metadata/md5-cache/media-gfx/digikam-7.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/7.1.0/digikam-7.1.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42adcb5b287f6c1214f74e52e9b680d4
diff --git a/metadata/md5-cache/media-gfx/enblend-4.2.0_p20161007-r1 b/metadata/md5-cache/media-gfx/enblend-4.2.0_p20161007-r1
index 43f0621ea32c..9d364abe3e2e 100644
--- a/metadata/md5-cache/media-gfx/enblend-4.2.0_p20161007-r1
+++ b/metadata/md5-cache/media-gfx/enblend-4.2.0_p20161007-r1
@@ -11,5 +11,5 @@ RDEPEND=media-libs/lcms:2 media-libs/openexr:= media-libs/tiff:0 media-libs/vigr
 REQUIRED_USE=tcmalloc? ( !debug )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~soap/distfiles/enblend-4.2.0_p20161007.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=48371eb8cdc49c990d688f18b54aac26
diff --git a/metadata/md5-cache/media-gfx/eom-1.24.1 b/metadata/md5-cache/media-gfx/eom-1.24.1
new file mode 100644
index 000000000000..d5caf8dae305
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/eom-1.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk >=dev-libs/glib-2.52:2 >=dev-libs/libpeas-1.8.0[gtk] >=dev-libs/libxml2-2:2 gnome-base/dconf >=mate-base/mate-desktop-1.17.0 sys-libs/zlib x11-libs/cairo >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?] >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 >=x11-misc/shared-mime-info-0.20 exif? ( >=media-libs/libexif-0.6.14 virtual/jpeg:0 ) imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) app-text/yelp-tools dev-util/glib-utils dev-util/gtk-doc dev-util/gtk-doc-am >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=The MATE image viewer
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X debug exif imagemagick +introspection jpeg lcms svg tiff xmp
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.1+ GPL-2+ IJG LGPL-2+
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.52:2 >=dev-libs/libpeas-1.8.0[gtk] >=dev-libs/libxml2-2:2 gnome-base/dconf >=mate-base/mate-desktop-1.17.0 sys-libs/zlib x11-libs/cairo >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?] >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 >=x11-misc/shared-mime-info-0.20 exif? ( >=media-libs/libexif-0.6.14 virtual/jpeg:0 ) imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) virtual/libintl !!media-gfx/mate-image-viewer
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/eom-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cc3aedfa0fcb901198308295e9993bf7
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.27.3 b/metadata/md5-cache/media-gfx/exiv2-0.27.3
index 6a8aaf00a918..d1f60c7293ff 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.27.3
+++ b/metadata/md5-cache/media-gfx/exiv2-0.27.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webready? ( >net-libs/libssh-0.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/27
 SRC_URI=https://exiv2.org/builds/exiv2-0.27.3-Source.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=29b0ca7453609b60437397648cba62d3
diff --git a/metadata/md5-cache/media-gfx/fdm-materials-4.2.0 b/metadata/md5-cache/media-gfx/fdm-materials-4.2.0
index bf29304c6256..6dc8cb5c4302 100644
--- a/metadata/md5-cache/media-gfx/fdm-materials-4.2.0
+++ b/metadata/md5-cache/media-gfx/fdm-materials-4.2.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=CC0-1.0
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/fdm_materials/archive/4.2.0.tar.gz -> fdm-materials-4.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5777487c5916138f47915700742d9f2
diff --git a/metadata/md5-cache/media-gfx/fdm-materials-4.3.0 b/metadata/md5-cache/media-gfx/fdm-materials-4.3.0
index 37402652a77e..f48b3be9e02c 100644
--- a/metadata/md5-cache/media-gfx/fdm-materials-4.3.0
+++ b/metadata/md5-cache/media-gfx/fdm-materials-4.3.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=CC0-1.0
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/fdm_materials/archive/4.3.0.tar.gz -> fdm-materials-4.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5777487c5916138f47915700742d9f2
diff --git a/metadata/md5-cache/media-gfx/fdm-materials-4.6.1 b/metadata/md5-cache/media-gfx/fdm-materials-4.6.1
index 373c4fc08aa3..0370d5de4377 100644
--- a/metadata/md5-cache/media-gfx/fdm-materials-4.6.1
+++ b/metadata/md5-cache/media-gfx/fdm-materials-4.6.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=CC0-1.0
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/fdm_materials/archive/4.6.1.tar.gz -> fdm-materials-4.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5777487c5916138f47915700742d9f2
diff --git a/metadata/md5-cache/media-gfx/fdm-materials-4.6.1-r1 b/metadata/md5-cache/media-gfx/fdm-materials-4.6.1-r1
index 13ed15701355..e3715e56a679 100644
--- a/metadata/md5-cache/media-gfx/fdm-materials-4.6.1-r1
+++ b/metadata/md5-cache/media-gfx/fdm-materials-4.6.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=CC0-1.0
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/fdm_materials/archive/4.6.1.tar.gz -> fdm-materials-4.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea6a8df9f6c26e1beb38e8912118370c
diff --git a/metadata/md5-cache/media-gfx/fdm-materials-4.7.0 b/metadata/md5-cache/media-gfx/fdm-materials-4.7.0
new file mode 100644
index 000000000000..c4415eda5c73
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/fdm-materials-4.7.0
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=FDM materials for media-gfx/cura
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/fdm_materials
+IUSE=embedded
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC0-1.0
+SLOT=0
+SRC_URI=https://github.com/Ultimaker/fdm_materials/archive/4.7.0.tar.gz -> fdm-materials-4.7.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ea6a8df9f6c26e1beb38e8912118370c
diff --git a/metadata/md5-cache/media-gfx/fontforge-20200314 b/metadata/md5-cache/media-gfx/fontforge-20200314
index 79785da111ab..8ef1c1ac615e 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20200314
+++ b/metadata/md5-cache/media-gfx/fontforge-20200314
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20200314/fontforge-20200314.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=225b9c234cbb41def21b325090450e65
diff --git a/metadata/md5-cache/media-gfx/freewrl-1.22.13-r5 b/metadata/md5-cache/media-gfx/freewrl-1.22.13-r5
deleted file mode 100644
index 7791722d7fa9..000000000000
--- a/metadata/md5-cache/media-gfx/freewrl-1.22.13-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa glew? ( media-libs/glew:0= ) virtual/opengl media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) dev-lang/spidermonkey:0= virtual/pkgconfig java? ( >=virtual/jdk-1.4 ) nsplugin? ( net-misc/npapi-sdk ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=VRML97 and X3D compliant browser, library, and web-browser plugin
-EAPI=5
-HOMEPAGE=http://freewrl.sourceforge.net/
-IUSE=curl debug +glew java libeai motif +nsplugin osc +sox static-libs elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa glew? ( media-libs/glew:0= ) virtual/opengl media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) dev-lang/spidermonkey:0= media-fonts/dejavu app-arch/unzip virtual/imagemagick-tools java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/freewrl/freewrl-1.22.13.1.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozextension	798d8c84c9e7a8105e56c9eb6626e643	multilib	98584e405e2b0264d37e8f728327fed1	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=09535ac79e8125f8adae6afe1e587f94
diff --git a/metadata/md5-cache/media-gfx/freewrl-2.3.3-r2 b/metadata/md5-cache/media-gfx/freewrl-2.3.3-r2
deleted file mode 100644
index 41f76af70bf4..000000000000
--- a/metadata/md5-cache/media-gfx/freewrl-2.3.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) dev-lang/spidermonkey:0= virtual/pkgconfig java? ( >=virtual/jdk-1.4 ) nsplugin? ( net-misc/npapi-sdk ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/unzip java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=VRML97 and X3D compliant browser, library, and web-browser plugin
-EAPI=5
-HOMEPAGE=http://freewrl.sourceforge.net/
-IUSE=curl debug java libeai motif +nsplugin opencl osc +sox static-libs elibc_FreeBSD java
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libX11 motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) dev-lang/spidermonkey:0= media-fonts/dejavu app-arch/unzip virtual/imagemagick-tools java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/freewrl/freewrl-2.3.3.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozextension	798d8c84c9e7a8105e56c9eb6626e643	multilib	98584e405e2b0264d37e8f728327fed1	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cc3c47e418351414d09bdff9dd5c1fe6
diff --git a/metadata/md5-cache/media-gfx/gmic-2.9.0 b/metadata/md5-cache/media-gfx/gmic-2.9.0
index 1537e60ef3e8..08e5629ff49b 100644
--- a/metadata/md5-cache/media-gfx/gmic-2.9.0
+++ b/metadata/md5-cache/media-gfx/gmic-2.9.0
@@ -11,5 +11,5 @@ RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( >=
 REQUIRED_USE=|| ( cli gimp krita qt5 ) gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
 SLOT=0
 SRC_URI=https://gmic.eu/files/source/gmic_2.9.0.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a54295f0bd3cf41844990cb8b0e294c7
diff --git a/metadata/md5-cache/media-gfx/gmic-2.9.1 b/metadata/md5-cache/media-gfx/gmic-2.9.1
index 16cabd9498ed..9245be80bda2 100644
--- a/metadata/md5-cache/media-gfx/gmic-2.9.1
+++ b/metadata/md5-cache/media-gfx/gmic-2.9.1
@@ -11,5 +11,5 @@ RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( >=
 REQUIRED_USE=|| ( cli gimp krita qt5 ) gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
 SLOT=0
 SRC_URI=https://gmic.eu/files/source/gmic_2.9.1.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a54295f0bd3cf41844990cb8b0e294c7
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1 b/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
index 8ff0959f25ba..76fbd8f8048a 100644
--- a/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
+++ b/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup t
 DEPEND=media-libs/libpng:0= virtual/jpeg:0 doc? ( app-text/docbook-xsl-stylesheets python_single_target_python3_6? ( dev-python/pygobject[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject[python_targets_python3_8(-)] ) dev-libs/libxslt x11-libs/gtk+:3[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A program for drawing beautiful mathematically-based images known as fractals
 EAPI=7
-HOMEPAGE=http://edyoung.github.io/gnofract4d/
+HOMEPAGE=https://github.com/fract4d/gnofract4d
 IUSE=+doc test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
 KEYWORDS=amd64 x86
 LICENSE=BSD
@@ -11,6 +11,6 @@ RDEPEND=media-libs/libpng:0= virtual/jpeg:0 python_single_target_python3_6? ( de
 REQUIRED_USE=test? ( doc ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/edyoung/gnofract4d/archive/bd600c20921afff7b02fc0a76ab79242ebd0896d.tar.gz -> gnofract4d-4.0.1_p1.tar.gz
+SRC_URI=https://github.com/fract4d/gnofract4d/archive/bd600c20921afff7b02fc0a76ab79242ebd0896d.tar.gz -> gnofract4d-4.0.1_p1.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fcaa7c2c174a84d58af070336ca9fd63
+_md5_=da6d4150910ba1f608e9091955310310
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.3.14 b/metadata/md5-cache/media-gfx/graphite2-1.3.14
index 50be3c2de1b7..1932c764278a 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.3.14
+++ b/metadata/md5-cache/media-gfx/graphite2-1.3.14
@@ -11,5 +11,5 @@ RDEPEND=perl? ( dev-lang/perl:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.3.14.tgz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07da7b178c181b7e2a45750631c9c7bb
diff --git a/metadata/md5-cache/media-gfx/inkscape-1.0-r1 b/metadata/md5-cache/media-gfx/inkscape-1.0-r1
index 2973dbf5c9c6..50536e102bb3 100644
--- a/metadata/md5-cache/media-gfx/inkscape-1.0-r1
+++ b/metadata/md5-cache/media-gfx/inkscape-1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://inkscape.org/gallery/item/18460/inkscape-1.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdd4cd9b709110d643a144a0da5b8702
diff --git a/metadata/md5-cache/media-gfx/inkscape-1.0.1 b/metadata/md5-cache/media-gfx/inkscape-1.0.1
index 672853dae538..ef241944bd8b 100644
--- a/metadata/md5-cache/media-gfx/inkscape-1.0.1
+++ b/metadata/md5-cache/media-gfx/inkscape-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test
 SLOT=0
 SRC_URI=https://inkscape.org/gallery/item/21571/inkscape-1.0.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=149484a3d71a78fa194c77965c4581c1
diff --git a/metadata/md5-cache/media-gfx/inkscape-9999 b/metadata/md5-cache/media-gfx/inkscape-9999
index b490aa2d77b6..b37ff73da94b 100644
--- a/metadata/md5-cache/media-gfx/inkscape-9999
+++ b/metadata/md5-cache/media-gfx/inkscape-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/py
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e2a09a4308cead997f8c3023307ddf3
diff --git a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121-r1 b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121-r1
index b6b6c598a997..070aaaaa5d58 100644
--- a/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121-r1
+++ b/metadata/md5-cache/media-gfx/kcoloredit-2.0.0_p20171121-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kactivities-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/kdelibs4support-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/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 !media-gfx/kcoloredit:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://github.com/KDE/kcoloredit/archive/50ac0509891343bc01a0aeffda5a44a1e65d9d04.tar.gz -> kcoloredit-2.0.0_p20171121.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=969beb00ce47b55eba450f3b676c56af
diff --git a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1 b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1
index 8a836558360c..d947ffdf98c4 100644
--- a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1
+++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-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 >=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/kparts-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=media-gfx/graphviz-2.30 !media-gfx/kgraphviewer:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kgraphviewer/2.4.3/kgraphviewer-2.4.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=356378342aeae589d50ce35ea3eca844
diff --git a/metadata/md5-cache/media-gfx/kphotoalbum-5.7.0 b/metadata/md5-cache/media-gfx/kphotoalbum-5.7.0
index b090bc5e07c4..061bf3be3d16 100644
--- a/metadata/md5-cache/media-gfx/kphotoalbum-5.7.0
+++ b/metadata/md5-cache/media-gfx/kphotoalbum-5.7.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ FDL-1.2
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-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/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-gfx/exiv2:= media-libs/phonon[qt5(+)] virtual/jpeg:0 map? ( kde-apps/marble:5 ) raw? ( kde-apps/libkdcraw:5 ) share? ( >=kde-frameworks/kxmlgui-5.60.0:5 ) media-video/ffmpeg || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kphotoalbum/5.7.0/kphotoalbum-5.7.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=daaa394554e2a8f6c851eafd7e098f8f
diff --git a/metadata/md5-cache/media-gfx/krita-4.2.9 b/metadata/md5-cache/media-gfx/krita-4.2.9
index 1f077ba402d8..784ac22e673b 100644
--- a/metadata/md5-cache/media-gfx/krita-4.2.9
+++ b/metadata/md5-cache/media-gfx/krita-4.2.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/4.2.9/krita-4.2.9.tar.xz https://dev.gentoo.org/~asturm/distfiles/krita-4.2.9-patchset.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f96098e64248300894c1886a615c7c5
diff --git a/metadata/md5-cache/media-gfx/krita-4.3.0 b/metadata/md5-cache/media-gfx/krita-4.3.0
index 1c62a58ced9e..66472699b85a 100644
--- a/metadata/md5-cache/media-gfx/krita-4.3.0
+++ b/metadata/md5-cache/media-gfx/krita-4.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/4.3.0/krita-4.3.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/krita-4.2.9-patchset.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0cbb4222ce8ad056ca7833bbf2b3260c
diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.10.1 b/metadata/md5-cache/media-gfx/kuickshow-0.10.1
index 2200e367033e..13ab9fef6e2b 100644
--- a/metadata/md5-cache/media-gfx/kuickshow-0.10.1
+++ b/metadata/md5-cache/media-gfx/kuickshow-0.10.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3: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/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/kjobwidgets-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 media-libs/imlib x11-libs/libX11 !media-gfx/kuickshow:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kuickshow/0.10.1/kuickshow-0.10.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=daa55e750af80ca4dba5fecf4a782f9f
diff --git a/metadata/md5-cache/media-gfx/kxstitch-2.2.0 b/metadata/md5-cache/media-gfx/kxstitch-2.2.0
index f0770d89273e..571d72f8af49 100644
--- a/metadata/md5-cache/media-gfx/kxstitch-2.2.0
+++ b/metadata/md5-cache/media-gfx/kxstitch-2.2.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-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 >=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/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-gfx/imagemagick[cxx] x11-libs/libX11 !media-gfx/kxstitch:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kxstitch/2.2.0/kxstitch-2.2.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=69e76b63f21cd2eaf8747505f3495fb4
diff --git a/metadata/md5-cache/media-gfx/llgal-0.13.17-r2 b/metadata/md5-cache/media-gfx/llgal-0.13.17-r2
deleted file mode 100644
index 324b7fc65206..000000000000
--- a/metadata/md5-cache/media-gfx/llgal-0.13.17-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Command-line static web gallery generator
-EAPI=5
-HOMEPAGE=http://home.gna.org/llgal
-IUSE=exif
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=media-gfx/imagemagick dev-perl/Image-Size dev-perl/URI dev-perl/Locale-gettext exif? ( media-libs/exiftool ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://download.gna.org/llgal/llgal-0.13.17.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=823f121b825c6e8f5740d042c0c53d57
diff --git a/metadata/md5-cache/media-gfx/llgal-0.13.18 b/metadata/md5-cache/media-gfx/llgal-0.13.18
deleted file mode 100644
index 3f4489627787..000000000000
--- a/metadata/md5-cache/media-gfx/llgal-0.13.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=Command-line static web gallery generator
-EAPI=5
-HOMEPAGE=http://home.gna.org/llgal
-IUSE=exif
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=media-gfx/imagemagick dev-perl/Image-Size dev-perl/URI dev-perl/Locale-gettext exif? ( media-libs/exiftool ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://download.gna.org/llgal/llgal-0.13.18.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=295383c077acce296a2ee2d26802ecca
diff --git a/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0 b/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0
index 376eef0b0565..1e1a67ddca84 100644
--- a/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0
+++ b/metadata/md5-cache/media-gfx/luminance-hdr-2.6.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclara
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/qtpfsgui/luminance-hdr-2.6.0.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dffa2f171b56c76ca477d5a2862062ff
diff --git a/metadata/md5-cache/media-gfx/lximage-qt-0.15.0 b/metadata/md5-cache/media-gfx/lximage-qt-0.15.0
index a166c7d32010..e77d30abc2d9 100644
--- a/metadata/md5-cache/media-gfx/lximage-qt-0.15.0
+++ b/metadata/md5-cache/media-gfx/lximage-qt-0.15.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+
 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.15.0:= x11-libs/libX11 x11-libs/libXfixes !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/lximage-qt/releases/download/0.15.0/lximage-qt-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=686392af2180408a71171f156f7ec2b0
diff --git a/metadata/md5-cache/media-gfx/maim-5.6.3 b/metadata/md5-cache/media-gfx/maim-5.6.3
index 05817a43ca95..83e95f3b5505 100644
--- a/metadata/md5-cache/media-gfx/maim-5.6.3
+++ b/metadata/md5-cache/media-gfx/maim-5.6.3
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libglvnd media-libs/libpng:0= virtual/jpeg:0 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender >=x11-misc/slop-7.5:= icu? ( dev-libs/icu:= )
 SLOT=0
 SRC_URI=https://github.com/naelstrof/maim/archive/v5.6.3.tar.gz -> maim-5.6.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8888487303faf2a9accddb4ee5f732c7
diff --git a/metadata/md5-cache/media-gfx/maim-9999 b/metadata/md5-cache/media-gfx/maim-9999
index 3cf477d77c4f..e89a89685711 100644
--- a/metadata/md5-cache/media-gfx/maim-9999
+++ b/metadata/md5-cache/media-gfx/maim-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=media-libs/libglvnd media-libs/libpng:0= virtual/jpeg:0 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender >=x11-misc/slop-7.5:= icu? ( dev-libs/icu:= )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8888487303faf2a9accddb4ee5f732c7
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.2.1-r5 b/metadata/md5-cache/media-gfx/mypaint-1.2.1-r5
deleted file mode 100644
index 747239665840..000000000000
--- a/metadata/md5-cache/media-gfx/mypaint-1.2.1-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/pygobject:3[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) >=dev-python/pycairo-1.4[python_targets_python2_7(-)] dev-python/protobuf-python[python_targets_python2_7(-)] ) >=dev-libs/json-c-0.11:= media-libs/lcms:2 >=media-libs/libmypaint-1.3.0 media-libs/libpng:0= gnome-base/librsvg sys-libs/libomp x11-libs/gtk+:3 dev-lang/swig virtual/pkgconfig dev-util/scons[python_targets_python2_7] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=fast and easy graphics application for digital painters
-EAPI=6
-HOMEPAGE=http://mypaint.org/
-IUSE=+python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/pygobject:3[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) >=dev-python/pycairo-1.4[python_targets_python2_7(-)] dev-python/protobuf-python[python_targets_python2_7(-)] ) >=dev-libs/json-c-0.11:= media-libs/lcms:2 >=media-libs/libmypaint-1.3.0 media-libs/libpng:0= gnome-base/librsvg sys-libs/libomp x11-libs/gtk+:3
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/mypaint/mypaint/releases/download/v1.2.1/mypaint-1.2.1.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0166d48f6cba963885482edfc72599a
diff --git a/metadata/md5-cache/media-gfx/mypaint-2.0.1-r2 b/metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
index 0ababce3b75e..8f6c1c8b01a5 100644
--- a/metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
+++ b/metadata/md5-cache/media-gfx/mypaint-2.0.1-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Fast and easy graphics application for digital painters
 EAPI=7
 HOMEPAGE=http://mypaint.org/
 IUSE=openmp test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] >=dev-python/pycairo-1.4[python_targets_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] >=dev-python/pycairo-1.4[python_targets_python3_7(-)] dev-python/protobuf-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pycairo-1.4[python_targets_python3_8(-)] dev-python/protobuf-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pycairo-1.4[python_targets_python3_9(-)] dev-python/protobuf-python[python_targets_python3_9(-)] ) >=dev-libs/json-c-0.11:= gnome-base/librsvg media-gfx/mypaint-brushes:2.0 media-libs/lcms:2 >=media-libs/libmypaint-1.5.0[openmp?] media-libs/libpng:0= sys-devel/gettext sys-libs/libomp x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mypaint/mypaint/releases/download/v2.0.1/mypaint-2.0.1.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d050aa97b617631f7a2650b9fc34943
+_md5_=50dd3d6eee2ccd61fdcd55077ecfec2d
diff --git a/metadata/md5-cache/media-gfx/mypaint-brushes-1.3.0-r1 b/metadata/md5-cache/media-gfx/mypaint-brushes-1.3.0-r1
deleted file mode 100644
index 9a9e2184ab94..000000000000
--- a/metadata/md5-cache/media-gfx/mypaint-brushes-1.3.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Default MyPaint brushes
-EAPI=6
-HOMEPAGE=https://github.com/mypaint/mypaint-brushes
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86
-LICENSE=CC0-1.0
-SLOT=1.0
-SRC_URI=https://github.com/mypaint/mypaint-brushes/archive/v1.3.0.tar.gz -> mypaint-brushes-1.3.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d5adb5e0490060af48022c736cf18740
diff --git a/metadata/md5-cache/media-gfx/mypaint-brushes-2.0.2 b/metadata/md5-cache/media-gfx/mypaint-brushes-2.0.2
index 58a2a860850e..476c6eadd497 100644
--- a/metadata/md5-cache/media-gfx/mypaint-brushes-2.0.2
+++ b/metadata/md5-cache/media-gfx/mypaint-brushes-2.0.2
@@ -3,9 +3,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=Default MyPaint brushes
 EAPI=7
 HOMEPAGE=https://github.com/mypaint/mypaint-brushes
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86
 LICENSE=CC0-1.0
 SLOT=2.0
 SRC_URI=https://github.com/mypaint/mypaint-brushes/archive/v2.0.2.tar.gz -> mypaint-brushes-2.0.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ff688454fc98b0e66d3e5b010729191c
+_md5_=bb000063aed9f885df5a2b74cebb280e
diff --git a/metadata/md5-cache/media-gfx/nomacs-3.14.2 b/metadata/md5-cache/media-gfx/nomacs-3.14.2
index e38f4576bd76..5db66f5e5afd 100644
--- a/metadata/md5-cache/media-gfx/nomacs-3.14.2
+++ b/metadata/md5-cache/media-gfx/nomacs-3.14.2
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnet
 REQUIRED_USE=raw? ( opencv ) tiff? ( opencv )
 SLOT=0
 SRC_URI=https://github.com/nomacs/nomacs/archive/3.14.2.tar.gz -> nomacs-3.14.2.tar.gz plugins? ( https://github.com/nomacs/nomacs-plugins/archive/3.14.tar.gz -> nomacs-plugins-3.14.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d7e8e81a2a4591abc7c1f4a575e08b7
diff --git a/metadata/md5-cache/media-gfx/nomacs-3.16.224 b/metadata/md5-cache/media-gfx/nomacs-3.16.224
index ee9b57437f45..9926811585b5 100644
--- a/metadata/md5-cache/media-gfx/nomacs-3.16.224
+++ b/metadata/md5-cache/media-gfx/nomacs-3.16.224
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[jpeg?] dev-qt/qtnet
 REQUIRED_USE=raw? ( opencv ) tiff? ( opencv )
 SLOT=0
 SRC_URI=https://github.com/nomacs/nomacs/archive/3.16.224.tar.gz -> nomacs-3.16.224.tar.gz plugins? ( https://github.com/nomacs/nomacs-plugins/archive/3.16.tar.gz -> nomacs-plugins-3.16.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=884ec37bc1526f6f51b4252d21a47fc4
diff --git a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.1.2 b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.1.2
index c329520be217..901158da1640 100644
--- a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.1.2
+++ b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.1.2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=media-libs/ilmbase:= media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/castano/nvidia-texture-tools/archive/2.1.2.tar.gz -> nvidia-texture-tools-2.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b520acd2c0b79f03ea7c2eb2b4ed5b75
diff --git a/metadata/md5-cache/media-gfx/openscad-2019.05-r2 b/metadata/md5-cache/media-gfx/openscad-2019.05-r2
index 95337dc3ec82..8aa1d2abadef 100644
--- a/metadata/md5-cache/media-gfx/openscad-2019.05-r2
+++ b/metadata/md5-cache/media-gfx/openscad-2019.05-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/gmp:0= dev-libs/hidapi dev-libs/libspnav dev-libs/libzip:= dev-libs/mpfr:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-gfx/opencsg media-libs/fontconfig media-libs/freetype >=media-libs/glew-2.0.0:0= media-libs/harfbuzz:= sci-mathematics/cgal:= >=x11-libs/qscintilla-2.10.3:= emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://github.com/openscad/openscad/releases/download/openscad-2019.05/openscad-2019.05.src.tar.gz -> openscad-2019.05.tar.gz
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba	estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=63b14c58228e8e17d3d9807b9c45b5e3
diff --git a/metadata/md5-cache/media-gfx/openscad-2019.05-r3 b/metadata/md5-cache/media-gfx/openscad-2019.05-r3
index 06a437e4d1a6..fa88b45bc72c 100644
--- a/metadata/md5-cache/media-gfx/openscad-2019.05-r3
+++ b/metadata/md5-cache/media-gfx/openscad-2019.05-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/g
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openscad/openscad/releases/download/openscad-2019.05/openscad-2019.05.src.tar.gz -> openscad-2019.05.tar.gz
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba	estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e74b1d02dde450c2c700fa5278d892e
diff --git a/metadata/md5-cache/media-gfx/openscad-9999 b/metadata/md5-cache/media-gfx/openscad-9999
index 2b21d795b782..7a782801d1c5 100644
--- a/metadata/md5-cache/media-gfx/openscad-9999
+++ b/metadata/md5-cache/media-gfx/openscad-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/gmp:0= dev-libs/hidapi dev-libs/libspnav dev-libs/libzip:= dev-libs/mpfr:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-gfx/opencsg media-libs/fontconfig media-libs/freetype >=media-libs/glew-2.0.0:0= media-libs/harfbuzz:= media-libs/lib3mf sci-mathematics/cgal:= >=x11-libs/qscintilla-2.10.3:= emacs? ( >=app-editors/emacs-23.1:* )
 RESTRICT=test
 SLOT=0
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba	estack	686eaab303305a908fd57b2fd7617800	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	estack	686eaab303305a908fd57b2fd7617800	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=75325f0207d4328c509ed976519423e4
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.4.0 b/metadata/md5-cache/media-gfx/opentoonz-1.4.0
index d2b952f90d0c..b0bce1b5cb3b 100644
--- a/metadata/md5-cache/media-gfx/opentoonz-1.4.0
+++ b/metadata/md5-cache/media-gfx/opentoonz-1.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD libtiff
 RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2 >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut media-libs/freetype:2 media-libs/glew:= media-libs/libjpeg-turbo >=media-libs/libmypaint-1.3.0:= media-libs/libpng:= >=sci-libs/superlu-4.1:= sys-libs/zlib virtual/cblas virtual/libusb:1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.4.0.tar.gz -> opentoonz-1.4.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=924f5f00dd783d3c07bda533be14fc92
diff --git a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r4 b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r4
index 8e71188537aa..61f08dc20516 100644
--- a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r4
+++ b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AcademySoftwareFoundation/openvdb/archive/v4.0.2.tar.gz -> openvdb-4.0.2.tar.gz https://dev.gentoo.org/~dracwyrm/patches/openvdb-4.0.2-patchset-02.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8841f561656b6245c095a783ebefc376
diff --git a/metadata/md5-cache/media-gfx/openvdb-5.2.0-r2 b/metadata/md5-cache/media-gfx/openvdb-5.2.0-r2
index 09cf189d7302..a883ced0922b 100644
--- a/metadata/md5-cache/media-gfx/openvdb-5.2.0-r2
+++ b/metadata/md5-cache/media-gfx/openvdb-5.2.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AcademySoftwareFoundation/openvdb/archive/v5.2.0.tar.gz -> openvdb-5.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3269dca1605017a92ba1c00b99a460a
diff --git a/metadata/md5-cache/media-gfx/openvdb-6.2.1-r1 b/metadata/md5-cache/media-gfx/openvdb-6.2.1-r1
index bb2b175b1ba9..7ae0b1c79420 100644
--- a/metadata/md5-cache/media-gfx/openvdb-6.2.1-r1
+++ b/metadata/md5-cache/media-gfx/openvdb-6.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AcademySoftwareFoundation/openvdb/archive/v6.2.1.tar.gz -> openvdb-6.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d5ff43d7ea27041fc14916bc6970955
diff --git a/metadata/md5-cache/media-gfx/openvdb-7.0.0-r1 b/metadata/md5-cache/media-gfx/openvdb-7.0.0-r1
index 7dd3ee0a7be7..d0210bdeec97 100644
--- a/metadata/md5-cache/media-gfx/openvdb-7.0.0-r1
+++ b/metadata/md5-cache/media-gfx/openvdb-7.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=numpy? ( python ) ^^ ( abi5-compat abi6-compat abi7-compat ) python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AcademySoftwareFoundation/openvdb/archive/v7.0.0.tar.gz -> openvdb-7.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6922d5cf46ed155be2f5d948dd633e0
diff --git a/metadata/md5-cache/media-gfx/openvdb-7.1.0-r1 b/metadata/md5-cache/media-gfx/openvdb-7.1.0-r1
index 498b8bd2ff0c..d317853cf276 100644
--- a/metadata/md5-cache/media-gfx/openvdb-7.1.0-r1
+++ b/metadata/md5-cache/media-gfx/openvdb-7.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=numpy? ( python ) ^^ ( abi6-compat abi7-compat ) python? ( ^^ ( pyt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AcademySoftwareFoundation/openvdb/archive/v7.1.0.tar.gz -> openvdb-7.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5ebccad072fefa7773bd87910d198329
diff --git a/metadata/md5-cache/media-gfx/photoqt-1.7.1-r1 b/metadata/md5-cache/media-gfx/photoqt-1.7.1-r1
index 98eaaaed69ca..f024defc8b6c 100644
--- a/metadata/md5-cache/media-gfx/photoqt-1.7.1-r1
+++ b/metadata/md5-cache/media-gfx/photoqt-1.7.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtimageformats:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-arch/libarchive:= app-arch/unrar devil? ( media-libs/devil ) exif? ( media-gfx/exiv2:= ) freeimage? ( media-libs/freeimage ) graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= ) pdf? ( app-text/poppler[qt5] ) raw? ( media-libs/libraw:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://photoqt.org/pkgs/photoqt-1.7.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7835834db2b6099185fcb5c3ac978b07
diff --git a/metadata/md5-cache/media-gfx/qimgv-0.9.1 b/metadata/md5-cache/media-gfx/qimgv-0.9.1
index 12c0018599b9..3e6bd5725db0 100644
--- a/metadata/md5-cache/media-gfx/qimgv-0.9.1
+++ b/metadata/md5-cache/media-gfx/qimgv-0.9.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 exif? ( media-gfx/exiv2:= ) kde? ( kde-frameworks/kwindowsystem:5 ) opencv? ( media-libs/opencv:= ) video? ( media-video/mpv[libmpv] )
 SLOT=0
 SRC_URI=https://github.com/easymodo/qimgv/archive/v0.9.1.tar.gz -> qimgv-0.9.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6cdf5e81f160da535343acbe35524026
diff --git a/metadata/md5-cache/media-gfx/qiv-2.3.2 b/metadata/md5-cache/media-gfx/qiv-2.3.2
deleted file mode 100644
index eaa7bb9be04b..000000000000
--- a/metadata/md5-cache/media-gfx/qiv-2.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare unpack
-DEPEND=media-libs/imlib2[X] >=x11-libs/gtk+-2.12:2 exif? ( media-libs/libexif ) lcms? ( media-libs/lcms:2 media-libs/tiff:0 virtual/jpeg:0 ) magic? ( sys-apps/file ) virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Quick Image Viewer
-EAPI=6
-HOMEPAGE=http://spiegl.de/qiv/ https://bitbucket.org/ciberandy/qiv
-IUSE=exif lcms magic
-KEYWORDS=~amd64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/imlib2[X] >=x11-libs/gtk+-2.12:2 exif? ( media-libs/libexif ) lcms? ( media-libs/lcms:2 media-libs/tiff:0 virtual/jpeg:0 ) magic? ( sys-apps/file )
-SLOT=0
-SRC_URI=https://bitbucket.org/ciberandy/qiv/get/v2.3.2.tar.gz -> qiv-2.3.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18d15ab6a984b8401b21d49d56b57601
diff --git a/metadata/md5-cache/media-gfx/qiv-2.3.2-r1 b/metadata/md5-cache/media-gfx/qiv-2.3.2-r1
new file mode 100644
index 000000000000..7ea76e81f8c9
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/qiv-2.3.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=media-libs/imlib2[X] >=x11-libs/gtk+-2.12:2 exif? ( media-libs/libexif ) lcms? ( media-libs/lcms:2 media-libs/tiff:0 virtual/jpeg:0 ) magic? ( sys-apps/file ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Quick Image Viewer
+EAPI=7
+HOMEPAGE=https://spiegl.de/qiv/ https://codeberg.org/ciberandy/qiv
+IUSE=exif lcms magic
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/imlib2[X] >=x11-libs/gtk+-2.12:2 exif? ( media-libs/libexif ) lcms? ( media-libs/lcms:2 media-libs/tiff:0 virtual/jpeg:0 ) magic? ( sys-apps/file )
+SLOT=0
+SRC_URI=https://spiegl.de/qiv/download/qiv-2.3.2.tgz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=97260abb8069c09a4fb137a496b5db5f
diff --git a/metadata/md5-cache/media-gfx/qrencode-4.1.1 b/metadata/md5-cache/media-gfx/qrencode-4.1.1
new file mode 100644
index 000000000000..d958626a01dd
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/qrencode-4.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install test
+DEPEND=media-libs/libpng:0= virtual/pkgconfig
+DESCRIPTION=C library for encoding data in a QR Code symbol
+EAPI=7
+HOMEPAGE=https://fukuchi.org/works/qrencode/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=media-libs/libpng:0=
+RESTRICT=!test? ( test )
+SLOT=0/4
+SRC_URI=https://fukuchi.org/works/qrencode/qrencode-4.1.1.tar.bz2
+_md5_=d504b1fc848af947b5c1a83740d3aae5
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-5.6 b/metadata/md5-cache/media-gfx/rawtherapee-5.6
index 4e40455cc413..dd408f4e41be 100644
--- a/metadata/md5-cache/media-gfx/rawtherapee-5.6
+++ b/metadata/md5-cache/media-gfx/rawtherapee-5.6
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/expat dev-libs/libsigc++:2 media-libs/lcms:2 media-libs/lensfun media-libs/libcanberra[gtk3] media-libs/libiptcdata media-libs/libpng:0 media-libs/tiff:0 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://rawtherapee.com/shared/source/rawtherapee-5.6.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96b04c436ee7e073af209984d7ab3d7b
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-5.7 b/metadata/md5-cache/media-gfx/rawtherapee-5.7
index ef4088b4a0b3..593649fe4a9b 100644
--- a/metadata/md5-cache/media-gfx/rawtherapee-5.7
+++ b/metadata/md5-cache/media-gfx/rawtherapee-5.7
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/expat dev-libs/libsigc++:2 media-libs/lcms:2 media-libs/lensfun media-libs/libcanberra[gtk3] media-libs/libiptcdata media-libs/libpng:0 media-libs/tiff:0 sci-libs/fftw:3.0 sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://rawtherapee.com/shared/source/rawtherapee-5.7.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25e53d9beb69117b0fb65d00ad5501a4
diff --git a/metadata/md5-cache/media-gfx/rawtherapee-5.8 b/metadata/md5-cache/media-gfx/rawtherapee-5.8
index 01271ee79e30..25afde120f12 100644
--- a/metadata/md5-cache/media-gfx/rawtherapee-5.8
+++ b/metadata/md5-cache/media-gfx/rawtherapee-5.8
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/expat dev-libs/libsigc++:2 media-libs/lcms:2 media-libs/lensfun media-libs/libcanberra[gtk3] media-libs/libiptcdata media-libs/libpng:0= media-libs/tiff:0 sci-libs/fftw:3.0= sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:3 tcmalloc? ( dev-util/google-perftools )
 SLOT=0
 SRC_URI=https://rawtherapee.com/shared/source/rawtherapee-5.8.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=20c85b3daf1c9dc5cbc23b137559347a
diff --git a/metadata/md5-cache/media-gfx/scantailor-advanced-1.0.16-r1 b/metadata/md5-cache/media-gfx/scantailor-advanced-1.0.16-r1
index 9a9d55723052..0fc2512ff9ec 100644
--- a/metadata/md5-cache/media-gfx/scantailor-advanced-1.0.16-r1
+++ b/metadata/md5-cache/media-gfx/scantailor-advanced-1.0.16-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/4lex4/scantailor-advanced/archive/v1.0.16.tar.gz -> scantailor-advanced-1.0.16.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d3eb724a73ba5003a91e2ad6e485aa3
diff --git a/metadata/md5-cache/media-gfx/symboleditor-2.1.0 b/metadata/md5-cache/media-gfx/symboleditor-2.1.0
index 28d40b80fe7a..2b9994defebc 100644
--- a/metadata/md5-cache/media-gfx/symboleditor-2.1.0
+++ b/metadata/md5-cache/media-gfx/symboleditor-2.1.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=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/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/symboleditor/2.1.0/symboleditor-2.1.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4743b6ab45f49ca0af45e75b580dce85
diff --git a/metadata/md5-cache/media-gfx/synnefo-1.1.0 b/metadata/md5-cache/media-gfx/synnefo-1.1.0
index 4d17c218243b..b89078d6325e 100644
--- a/metadata/md5-cache/media-gfx/synnefo-1.1.0
+++ b/metadata/md5-cache/media-gfx/synnefo-1.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/oyranos-0.9.6 x11-misc/xcalib
 SLOT=0
 SRC_URI=https://github.com/oyranos-cms/Synnefo/archive/1.1.0.tar.gz -> synnefo-1.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7254e01cddb7fd7a9ddc9745365854e
diff --git a/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200224 b/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200224
index 37ad498e9bf3..0e8457bab89e 100644
--- a/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200224
+++ b/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200224
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/ncnn media-libs/vulkan-loader
 SLOT=0
 SRC_URI=https://github.com/nihui/waifu2x-ncnn-vulkan/archive/20200224.tar.gz -> waifu2x-ncnn-vulkan-20200224.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9705ad6bc0c4d24481a9c98ddaa25dec
diff --git a/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200414 b/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200414
index ac322e3cba80..67f8bbd10990 100644
--- a/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200414
+++ b/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200414
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/ncnn media-libs/vulkan-loader
 SLOT=0
 SRC_URI=https://github.com/nihui/waifu2x-ncnn-vulkan/archive/20200414.tar.gz -> waifu2x-ncnn-vulkan-20200414.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9705ad6bc0c4d24481a9c98ddaa25dec
diff --git a/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200818 b/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200818
index 38b2b67a55cb..27c74e9ba180 100644
--- a/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200818
+++ b/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20200818
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/ncnn-20200727 media-libs/vulkan-loader media-libs/libwebp dev-util/glslang
 SLOT=0
 SRC_URI=https://github.com/nihui/waifu2x-ncnn-vulkan/archive/20200818.tar.gz -> waifu2x-ncnn-vulkan-20200818.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5ad1eccb1ed56bbb37bff6c4022d3627
diff --git a/metadata/md5-cache/media-gfx/yafaray-3.4.1 b/metadata/md5-cache/media-gfx/yafaray-3.4.1
index 08e691781b3b..7a6986c8005a 100644
--- a/metadata/md5-cache/media-gfx/yafaray-3.4.1
+++ b/metadata/md5-cache/media-gfx/yafaray-3.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=blender? ( python ) python? ( ^^ ( python_single_target_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/YafaRay/Core/archive/v3.4.1.tar.gz -> yafaray-core-3.4.1.tar.gz blender? ( https://github.com/YafaRay/Blender-Exporter/archive/v3.4.1.tar.gz -> yafaray-blender-exporter-3.4.1.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=831dcdbeaee66167453a05511ffa3d8c
diff --git a/metadata/md5-cache/media-libs/Field3D-1.7.2 b/metadata/md5-cache/media-libs/Field3D-1.7.2
index 573d50ce60ea..61bfa4043b2f 100644
--- a/metadata/md5-cache/media-libs/Field3D-1.7.2
+++ b/metadata/md5-cache/media-libs/Field3D-1.7.2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/boost-1.62:= >=media-libs/ilmbase-2.2.0:= sci-libs/hdf5:= mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://github.com/imageworks/Field3D/archive/v1.7.2.tar.gz -> Field3D-1.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cce6fd42af0b056b6b2adfd38ce15e37
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index a5bb728bf9f7..a1f6272215ef 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/SoXt-1.4.0 b/metadata/md5-cache/media-libs/SoXt-1.4.0
index 05d200dabe22..04cbf2455f42 100644
--- a/metadata/md5-cache/media-libs/SoXt-1.4.0
+++ b/metadata/md5-cache/media-libs/SoXt-1.4.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/coin x11-libs/motif:0 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/coin3d/soxt/releases/download/SoXt-1.4.0/SoXt-1.4.0-src.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b853103d26950e295cc303138b03f41
diff --git a/metadata/md5-cache/media-libs/allegro-4.4.3.1 b/metadata/md5-cache/media-libs/allegro-4.4.3.1
index 5b74c3739798..72695ac5e176 100644
--- a/metadata/md5-cache/media-libs/allegro-4.4.3.1
+++ b/metadata/md5-cache/media-libs/allegro-4.4.3.1
@@ -10,5 +10,5 @@ LICENSE=Allegro MIT GPL-2+ ZLIB
 RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svga? ( media-libs/svgalib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86dga[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 SRC_URI=https://github.com/liballeg/allegro5/releases/download/4.4.3.1/allegro-4.4.3.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ca14aee1b766c57e15ef5672ef428ee
diff --git a/metadata/md5-cache/media-libs/alure-1.2-r1 b/metadata/md5-cache/media-libs/alure-1.2-r1
index 0c008c6a2bc9..cb8c14d85e4b 100644
--- a/metadata/md5-cache/media-libs/alure-1.2-r1
+++ b/metadata/md5-cache/media-libs/alure-1.2-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=media-libs/openal-1.1 dumb? ( =media-libs/dumb-0.9*:= ) flac? ( media-libs/flac ) fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= ) mp3? ( media-sound/mpg123 ) sndfile? ( media-libs/libsndfile ) vorbis? ( media-libs/libvorbis )
 SLOT=0
 SRC_URI=https://kcat.strangesoft.net/alure-releases/alure-1.2.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff4af673bdbaa2198da26e930e55428f
diff --git a/metadata/md5-cache/media-libs/alure-1.2-r2 b/metadata/md5-cache/media-libs/alure-1.2-r2
index 32b4e1e6643d..4a240a1dfd8c 100644
--- a/metadata/md5-cache/media-libs/alure-1.2-r2
+++ b/metadata/md5-cache/media-libs/alure-1.2-r2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=media-libs/openal-1.1 dumb? ( media-libs/dumb:= ) flac? ( media-libs/flac ) fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= ) mp3? ( media-sound/mpg123 ) sndfile? ( media-libs/libsndfile ) vorbis? ( media-libs/libvorbis )
 SLOT=0
 SRC_URI=https://kcat.strangesoft.net/alure-releases/alure-1.2.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01e4e4daf402866d9cd439f2e6f81c9f
diff --git a/metadata/md5-cache/media-libs/assimp-5.0.1 b/metadata/md5-cache/media-libs/assimp-5.0.1
index 81415e182f68..35c7b98769d7 100644
--- a/metadata/md5-cache/media-libs/assimp-5.0.1
+++ b/metadata/md5-cache/media-libs/assimp-5.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= sys-libs/zlib[minizip] samples? ( media-libs/freeglut v
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/assimp/assimp/archive/v5.0.1.tar.gz -> assimp-5.0.1.tar.gz doc? ( https://github.com/assimp/assimp/releases/download/v5.0.1/assimp-docs-5.0.1.pdf )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8af5e0aedb8ea828bd32ce25b9af4d46
diff --git a/metadata/md5-cache/media-libs/avidemux-core-2.7.4-r1 b/metadata/md5-cache/media-libs/avidemux-core-2.7.4-r1
index a6a4884e1613..a18d29413e48 100644
--- a/metadata/md5-cache/media-libs/avidemux-core-2.7.4-r1
+++ b/metadata/md5-cache/media-libs/avidemux-core-2.7.4-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
 RDEPEND=dev-db/sqlite:3 nvenc? ( media-video/nvidia_video_sdk ) sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) vaapi? ( x11-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 ) !<media-libs/avidemux-core-2.7.4 !<media-video/avidemux-2.7.4 nls? ( virtual/libintl:0 )
 SLOT=2.7
 SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.4.tar.gz -> avidemux-2.7.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01ba5f478bd348be179df55df79aa8ff
diff --git a/metadata/md5-cache/media-libs/avidemux-core-2.7.6 b/metadata/md5-cache/media-libs/avidemux-core-2.7.6
index 97d8a84d697a..863d1add2109 100644
--- a/metadata/md5-cache/media-libs/avidemux-core-2.7.6
+++ b/metadata/md5-cache/media-libs/avidemux-core-2.7.6
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
 RDEPEND=dev-db/sqlite:3 nvenc? ( media-video/nvidia_video_sdk ) sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) vaapi? ( x11-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 ) !<media-libs/avidemux-core-2.7.6 !<media-video/avidemux-2.7.6 nls? ( virtual/libintl:0 )
 SLOT=2.7
 SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.6.tar.gz -> avidemux-2.7.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de72b902b9a8d3bb03bc64580c7d49f3
diff --git a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4-r1 b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4-r1
index 525b6eb95072..56c08aa84c16 100644
--- a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4-r1
+++ b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=2.7
 SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.4.tar.gz -> avidemux-2.7.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e251b2f14e22b23dfd7302117c0599c2
diff --git a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.6 b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.6
index 1c3ab14836ca..8f9bcc72f93f 100644
--- a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.6
+++ b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.6
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=2.7
 SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.6.tar.gz -> avidemux-2.7.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d8d62f97cabf50d8d951906a20d3df74
diff --git a/metadata/md5-cache/media-libs/chromaprint-1.4.3 b/metadata/md5-cache/media-libs/chromaprint-1.4.3
index d4e9568ab761..de7c59893cf4 100644
--- a/metadata/md5-cache/media-libs/chromaprint-1.4.3
+++ b/metadata/md5-cache/media-libs/chromaprint-1.4.3
@@ -11,5 +11,5 @@ RDEPEND=>=media-video/ffmpeg-2.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/acoustid/chromaprint/releases/download/v1.4.3/chromaprint-1.4.3.tar.gz test? ( https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e01dee34d76100c849231328b3dcd9d
diff --git a/metadata/md5-cache/media-libs/chromaprint-1.5.0 b/metadata/md5-cache/media-libs/chromaprint-1.5.0
index 88113157056e..5e48a0f3babc 100644
--- a/metadata/md5-cache/media-libs/chromaprint-1.5.0
+++ b/metadata/md5-cache/media-libs/chromaprint-1.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=media-video/ffmpeg-2.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/acoustid/chromaprint/releases/download/v1.5.0/chromaprint-1.5.0.tar.gz test? ( https://github.com/google/googletest/archive/v1.10.x.tar.gz -> gtest-1.10.0.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a16f5f9d760832318ea7d10213a6879
diff --git a/metadata/md5-cache/media-libs/codec2-0.8.1 b/metadata/md5-cache/media-libs/codec2-0.8.1
index f6c0160edb22..07153dcdff6e 100644
--- a/metadata/md5-cache/media-libs/codec2-0.8.1
+++ b/metadata/md5-cache/media-libs/codec2-0.8.1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://hobbes1069.fedorapeople.org/freetel/codec2/codec2-0.8.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9323d1a01061f809b083d0935eabc887
diff --git a/metadata/md5-cache/media-libs/codec2-0.9.2 b/metadata/md5-cache/media-libs/codec2-0.9.2
index df1c782f17ff..fbd433684a61 100644
--- a/metadata/md5-cache/media-libs/codec2-0.9.2
+++ b/metadata/md5-cache/media-libs/codec2-0.9.2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/drowe67/codec2/archive/v0.9.2.tar.gz -> codec2-0.9.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61d17ce2c1204d8adaa1dea19c2c01f8
diff --git a/metadata/md5-cache/media-libs/coin-4.0.0 b/metadata/md5-cache/media-libs/coin-4.0.0
index 1f4ecff18859..b41d9bca6bc3 100644
--- a/metadata/md5-cache/media-libs/coin-4.0.0
+++ b/metadata/md5-cache/media-libs/coin-4.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=man? ( doc ) qthelp? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/coin3d/coin/releases/download/Coin-4.0.0/coin-4.0.0-src.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cbc7bb4db1f45591a555e4aa7ec99f2a
diff --git a/metadata/md5-cache/media-libs/dumb-2.0.3 b/metadata/md5-cache/media-libs/dumb-2.0.3
index 0a8691cdc65a..abcf136a6fdd 100644
--- a/metadata/md5-cache/media-libs/dumb-2.0.3
+++ b/metadata/md5-cache/media-libs/dumb-2.0.3
@@ -10,5 +10,5 @@ LICENSE=DUMB-0.9.3
 RDEPEND=allegro? ( media-libs/allegro:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-libs/aldumb ) examples? ( >=dev-libs/argtable-2 media-libs/libsdl2[sound] )
 SLOT=0/2
 SRC_URI=https://github.com/kode54/dumb/archive/2.0.3.tar.gz -> dumb-2.0.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64395139da2f707c095736177d1f12c5
diff --git a/metadata/md5-cache/media-libs/glfw-3.3.2 b/metadata/md5-cache/media-libs/glfw-3.3.2
index bac859106845..882ceec6db22 100644
--- a/metadata/md5-cache/media-libs/glfw-3.3.2
+++ b/metadata/md5-cache/media-libs/glfw-3.3.2
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=x11-libs/libxkbcommon !wayland? ( virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXxf86vm ) wayland? ( dev-libs/wayland media-libs/mesa[egl,wayland] )
 SLOT=0
 SRC_URI=https://github.com/glfw/glfw/archive/3.3.2.tar.gz -> glfw-3.3.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=512e6e4abe6339c43e18dd1cbc0d4971
diff --git a/metadata/md5-cache/media-libs/glm-0.9.9.8 b/metadata/md5-cache/media-libs/glm-0.9.9.8
index 6f9d8af00059..9acb9589779d 100644
--- a/metadata/md5-cache/media-libs/glm-0.9.9.8
+++ b/metadata/md5-cache/media-libs/glm-0.9.9.8
@@ -9,5 +9,5 @@ LICENSE=|| ( HappyBunny MIT )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/g-truc/glm/archive/0.9.9.8.tar.gz -> glm-0.9.9.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1ce9aff056824f2a0be0413048dd303
diff --git a/metadata/md5-cache/media-libs/glm-0.9.9.8-r1 b/metadata/md5-cache/media-libs/glm-0.9.9.8-r1
index 052f6ee38aff..f2d10456eaa8 100644
--- a/metadata/md5-cache/media-libs/glm-0.9.9.8-r1
+++ b/metadata/md5-cache/media-libs/glm-0.9.9.8-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( HappyBunny MIT )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/g-truc/glm/archive/0.9.9.8.tar.gz -> glm-0.9.9.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc58e9870ba5187e7aed112d8411ead8
diff --git a/metadata/md5-cache/media-libs/glpng-1.46-r1 b/metadata/md5-cache/media-libs/glpng-1.46-r1
index b4760e0b8d69..cc10a9e5154b 100644
--- a/metadata/md5-cache/media-libs/glpng-1.46-r1
+++ b/metadata/md5-cache/media-libs/glpng-1.46-r1
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://repo.or.cz/w/glpng.git/snapshot/v1.46.tar.gz -> glpng-1.46.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f47059e2598928fc6b36c860a516583a
diff --git a/metadata/md5-cache/media-libs/gmmlib-20.2.2 b/metadata/md5-cache/media-libs/gmmlib-20.2.2
index 5908be8fb1d6..53b2f102dfa4 100644
--- a/metadata/md5-cache/media-libs/gmmlib-20.2.2
+++ b/metadata/md5-cache/media-libs/gmmlib-20.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-20.2.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=439f9d79e3fe55ccc57a51d1ab810c5d
diff --git a/metadata/md5-cache/media-libs/gmmlib-20.2.5 b/metadata/md5-cache/media-libs/gmmlib-20.2.5
index 5c02c62a9f3d..68fd7ae913b4 100644
--- a/metadata/md5-cache/media-libs/gmmlib-20.2.5
+++ b/metadata/md5-cache/media-libs/gmmlib-20.2.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-20.2.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a8b2ba631e6336424ea4ff7f1bfedec
diff --git a/metadata/md5-cache/media-libs/gmmlib-20.3.2 b/metadata/md5-cache/media-libs/gmmlib-20.3.2
index 9a0be1d58f10..77f95cd98298 100644
--- a/metadata/md5-cache/media-libs/gmmlib-20.3.2
+++ b/metadata/md5-cache/media-libs/gmmlib-20.3.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intel/gmmlib/archive/intel-gmmlib-20.3.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a8b2ba631e6336424ea4ff7f1bfedec
diff --git a/metadata/md5-cache/media-libs/gmmlib-9999 b/metadata/md5-cache/media-libs/gmmlib-9999
index e0a6c093c0a4..c292a5b71cb0 100644
--- a/metadata/md5-cache/media-libs/gmmlib-9999
+++ b/metadata/md5-cache/media-libs/gmmlib-9999
@@ -7,5 +7,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 LICENSE=MIT
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d8bb5aa2457d7b0f6656268e6882516
diff --git a/metadata/md5-cache/media-libs/ilmbase-2.5.2 b/metadata/md5-cache/media-libs/ilmbase-2.5.2
index 568f31ac2620..25f8192e51e9 100644
--- a/metadata/md5-cache/media-libs/ilmbase-2.5.2
+++ b/metadata/md5-cache/media-libs/ilmbase-2.5.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.2.tar.gz -> ilmbase-2.5.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12b724b2ea94beb008f43ad49525b871
diff --git a/metadata/md5-cache/media-libs/kodi-platform-18.0_pre20190429 b/metadata/md5-cache/media-libs/kodi-platform-18.0_pre20190429
index 36ea761cd188..5da9e4ec5fb2 100644
--- a/metadata/md5-cache/media-libs/kodi-platform-18.0_pre20190429
+++ b/metadata/md5-cache/media-libs/kodi-platform-18.0_pre20190429
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/xbmc/kodi-platform/tarball/915da08 -> kodi-platform-18.0_pre20190429.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea05261539aac521a344550414c0c60f
diff --git a/metadata/md5-cache/media-libs/kodi-platform-9999 b/metadata/md5-cache/media-libs/kodi-platform-9999
index e8ac9cb931e7..b695be05174e 100644
--- a/metadata/md5-cache/media-libs/kodi-platform-9999
+++ b/metadata/md5-cache/media-libs/kodi-platform-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=515ee412ad742c5feb3921677f2823cf
diff --git a/metadata/md5-cache/media-libs/lcms-2.11 b/metadata/md5-cache/media-libs/lcms-2.11
index 14b667b37aad..bc150efd5b61 100644
--- a/metadata/md5-cache/media-libs/lcms-2.11
+++ b/metadata/md5-cache/media-libs/lcms-2.11
@@ -5,11 +5,11 @@ DESCRIPTION=A lightweight, speed optimized color management engine
 EAPI=7
 HOMEPAGE=http://www.littlecms.com/
 IUSE=doc jpeg static-libs test +threads tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=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_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://sourceforge/lcms/lcms2-2.11.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=90a93e2b88becc2b5137a530435f29f0
+_md5_=f8b8a34f0764a67d05fbf7c86fd11108
diff --git a/metadata/md5-cache/media-libs/lensfun-0.3.2-r1 b/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
index 293c1dee7033..bdcff51dc26b 100644
--- a/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
+++ b/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lensfun/lensfun/archive/v0.3.2.tar.gz -> lensfun-0.3.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c733e4a2873555f2709c9f81c5c136e8
diff --git a/metadata/md5-cache/media-libs/lib3mf-1.8.1 b/metadata/md5-cache/media-libs/lib3mf-1.8.1
index c68e2b630e17..e70dc871a9f0 100644
--- a/metadata/md5-cache/media-libs/lib3mf-1.8.1
+++ b/metadata/md5-cache/media-libs/lib3mf-1.8.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libzip:= sys-apps/util-linux sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/3MFConsortium/lib3mf/archive/v1.8.1.tar.gz -> lib3mf-1.8.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b628c9711651857c9a41107c8febe700
diff --git a/metadata/md5-cache/media-libs/libaom-1.0.0-r2 b/metadata/md5-cache/media-libs/libaom-1.0.0-r2
index 5495517d6fdb..67cdd49a39f2 100644
--- a/metadata/md5-cache/media-libs/libaom-1.0.0-r2
+++ b/metadata/md5-cache/media-libs/libaom-1.0.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0/0
 SRC_URI=mirror://gentoo/libaom-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ca6193e15886b4102e0a23340c3c4aa
diff --git a/metadata/md5-cache/media-libs/libaom-2.0.0 b/metadata/md5-cache/media-libs/libaom-2.0.0
index e1edc4422503..74f0029af237 100644
--- a/metadata/md5-cache/media-libs/libaom-2.0.0
+++ b/metadata/md5-cache/media-libs/libaom-2.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0/2
 SRC_URI=https://dev.gentoo.org/~lu_zero/libaom/libaom-2.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=67e29c6421c4e6a46ccffa36332307db
diff --git a/metadata/md5-cache/media-libs/libaom-9999 b/metadata/md5-cache/media-libs/libaom-9999
index 8b55dcf8f4a9..c32a555ea51f 100644
--- a/metadata/md5-cache/media-libs/libaom-9999
+++ b/metadata/md5-cache/media-libs/libaom-9999
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 PROPERTIES=live
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0/2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=511222b4c564d7ce672f42741b615c32
diff --git a/metadata/md5-cache/media-libs/libavif-0.8.1 b/metadata/md5-cache/media-libs/libavif-0.8.1
new file mode 100644
index 000000000000..bfc8eb9216ce
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libavif-0.8.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=media-libs/libpng sys-libs/zlib virtual/jpeg aom? ( >=media-libs/libaom-2.0.0 ) dav1d? ( media-libs/dav1d ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) rav1e? ( media-video/rav1e[capi] )
+DESCRIPTION=Library for encoding and decoding .avif files
+EAPI=7
+HOMEPAGE=https://github.com/AOMediaCodec/libavif
+IUSE=+aom dav1d examples extras gdk-pixbuf rav1e
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=media-libs/libpng sys-libs/zlib virtual/jpeg aom? ( >=media-libs/libaom-2.0.0 ) dav1d? ( media-libs/dav1d ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) rav1e? ( media-video/rav1e[capi] )
+REQUIRED_USE=|| ( aom dav1d )
+SLOT=0
+SRC_URI=https://github.com/AOMediaCodec/libavif/archive/v0.8.1.tar.gz -> libavif-0.8.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b3260ef66229ecebd532c71552474ebc
diff --git a/metadata/md5-cache/media-libs/libavif-9999 b/metadata/md5-cache/media-libs/libavif-9999
new file mode 100644
index 000000000000..9b49f22f1766
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libavif-9999
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=media-libs/libpng sys-libs/zlib virtual/jpeg aom? ( >=media-libs/libaom-2.0.0 ) dav1d? ( media-libs/dav1d ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) rav1e? ( media-video/rav1e[capi] )
+DESCRIPTION=Library for encoding and decoding .avif files
+EAPI=7
+HOMEPAGE=https://github.com/AOMediaCodec/libavif
+IUSE=+aom dav1d examples extras gdk-pixbuf rav1e
+LICENSE=BSD-2
+PROPERTIES=live
+RDEPEND=media-libs/libpng sys-libs/zlib virtual/jpeg aom? ( >=media-libs/libaom-2.0.0 ) dav1d? ( media-libs/dav1d ) gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) rav1e? ( media-video/rav1e[capi] )
+REQUIRED_USE=|| ( aom dav1d )
+SLOT=0
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=55484a8d54ee9afaa726c662fcea5cbe
diff --git a/metadata/md5-cache/media-libs/libcue-2.2.1 b/metadata/md5-cache/media-libs/libcue-2.2.1
index a819d20138d4..c2483e3bd90a 100644
--- a/metadata/md5-cache/media-libs/libcue-2.2.1
+++ b/metadata/md5-cache/media-libs/libcue-2.2.1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0/2
 SRC_URI=https://github.com/lipnitsk/libcue/archive/v2.2.1.tar.gz -> libcue-2.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c7faa25769d33a7d4053a9966704dc6
diff --git a/metadata/md5-cache/media-libs/libcuefile-477-r1 b/metadata/md5-cache/media-libs/libcuefile-477-r1
index ac8a9da60296..70cb0f3fb0a3 100644
--- a/metadata/md5-cache/media-libs/libcuefile-477-r1
+++ b/metadata/md5-cache/media-libs/libcuefile-477-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/libcuefile-477.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dcda24676c8fed34f69a15088da3418a
diff --git a/metadata/md5-cache/media-libs/libffado-2.4.1-r1 b/metadata/md5-cache/media-libs/libffado-2.4.1-r1
deleted file mode 100644
index 13ecd39f632f..000000000000
--- a/metadata/md5-cache/media-libs/libffado-2.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-cpp/libxmlpp:2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/dbus-c++ dev-libs/libconfig[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/PyQt5[dbus,python_targets_python3_6(-)] ) x11-misc/xdg-utils ) virtual/pkgconfig python_single_target_python3_6? ( dev-util/scons[python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) virtual/pkgconfig
-DESCRIPTION=Driver for IEEE1394 (Firewire) audio interfaces
-EAPI=6
-HOMEPAGE=http://www.ffado.org
-IUSE=debug qt5 test-programs +python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2 GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-cpp/libxmlpp:2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/dbus-c++ dev-libs/libconfig[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/PyQt5[dbus,python_targets_python3_6(-)] ) x11-misc/xdg-utils ) !<media-sound/jack-audio-connection-kit-0.122.0:0 !<media-sound/jack-audio-connection-kit-1.9.9:2
-REQUIRED_USE=^^ ( python_single_target_python3_6 )
-SLOT=0
-SRC_URI=http://www.ffado.org/files/libffado-2.4.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=532afc3e7c5a5a239a26e1d3a391c0e6
diff --git a/metadata/md5-cache/media-libs/libffado-2.4.4 b/metadata/md5-cache/media-libs/libffado-2.4.4
index 057cd111b94c..d8559154dab1 100644
--- a/metadata/md5-cache/media-libs/libffado-2.4.4
+++ b/metadata/md5-cache/media-libs/libffado-2.4.4
@@ -5,11 +5,11 @@ DESCRIPTION=Driver for IEEE1394 (Firewire) audio interfaces
 EAPI=7
 HOMEPAGE=http://www.ffado.org
 IUSE=debug qt5 test-programs python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2 GPL-3
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-cpp/libxmlpp:2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/dbus-c++ dev-libs/libconfig[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/PyQt5[dbus,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/PyQt5[dbus,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/PyQt5[dbus,python_targets_python3_8(-)] ) x11-misc/xdg-utils )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=http://www.ffado.org/files/libffado-2.4.4.tgz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=d00f69dc8685196cbb3fa360171bed7a
+_md5_=723aa0da376df97178da4bcad16130ee
diff --git a/metadata/md5-cache/media-libs/libglvnd-9999 b/metadata/md5-cache/media-libs/libglvnd-9999
index f1d46ddf0ec1..9baa1c4e74f9 100644
--- a/metadata/md5-cache/media-libs/libglvnd-9999
+++ b/metadata/md5-cache/media-libs/libglvnd-9999
@@ -1,14 +1,14 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!media-libs/mesa[-libglvnd(-)] !<media-libs/mesa-19.2.2 X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
+DEPEND=|| ( >=media-libs/mesa-20.3 <media-libs/mesa-20.3[libglvnd(-)] ) !<media-libs/mesa-19.2.2 X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
 DESCRIPTION=The GL Vendor-Neutral Dispatch library
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/glvnd/libglvnd
 IUSE=test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=!media-libs/mesa[-libglvnd(-)] !<media-libs/mesa-19.2.2 X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=|| ( >=media-libs/mesa-20.3 <media-libs/mesa-20.3[libglvnd(-)] ) !<media-libs/mesa-19.2.2 X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=7f3e956d3a058f3e5682315d0cf76ad3
+_md5_=787e536e5dc73bb618b50b65c237ac47
diff --git a/metadata/md5-cache/media-libs/libharu-2.3.0-r2 b/metadata/md5-cache/media-libs/libharu-2.3.0-r2
index 5e9c96af7a51..99f0ce40979f 100644
--- a/metadata/md5-cache/media-libs/libharu-2.3.0-r2
+++ b/metadata/md5-cache/media-libs/libharu-2.3.0-r2
@@ -10,5 +10,5 @@ LICENSE=ZLIB
 RDEPEND=media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/2.3.0
 SRC_URI=https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz -> libharu-2.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a97b1001f7aea786c4e12fd2c11c7909
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3
index a00a3039c1dc..547ffc986250 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3
@@ -10,5 +10,5 @@ LICENSE=BSD IJG ZLIB
 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	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbbef2f75909d0572a1e1e4f6bea25f2
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.4-r1 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.4-r1
index 097ed98de7f7..be6b418a67d3 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.4-r1
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.4-r1
@@ -10,5 +10,5 @@ LICENSE=BSD IJG ZLIB
 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.4.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=92a8679da5eab65e8dde7690861778d2
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.5-r1 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.5-r1
index 9c439f630535..b8af9fb48de3 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.5-r1
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.5-r1
@@ -10,5 +10,5 @@ LICENSE=BSD IJG ZLIB
 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.5.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d08025e7948c64cb7a121f9a567a29f0
diff --git a/metadata/md5-cache/media-libs/liblastfm-1.1.0_pre20150206 b/metadata/md5-cache/media-libs/liblastfm-1.1.0_pre20150206
index cb1cc666de89..277ca3479cd1 100644
--- a/metadata/md5-cache/media-libs/liblastfm-1.1.0_pre20150206
+++ b/metadata/md5-cache/media-libs/liblastfm-1.1.0_pre20150206
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 f
 RESTRICT=test
 SLOT=0/0
 SRC_URI=https://github.com/lastfm/liblastfm/archive/44331654256df83bc1d3cbb271a8ce3d4c464686.tar.gz -> liblastfm-1.1.0_pre20150206.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2e91ed2cd62197c1cf1f32794abf356
diff --git a/metadata/md5-cache/media-libs/libmatemixer-1.24.1 b/metadata/md5-cache/media-libs/libmatemixer-1.24.1
new file mode 100644
index 000000000000..48ff73f721eb
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmatemixer-1.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8:* alsa? ( >=media-libs/alsa-lib-1.0.5 ) pulseaudio? ( >=media-sound/pulseaudio-5.0.0:0[alsa?,glib] ) app-text/docbook-xml-dtd:4.1.2 dev-util/gtk-doc dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=Mixer library for MATE Desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=+alsa oss pulseaudio
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8:* alsa? ( >=media-libs/alsa-lib-1.0.5 ) pulseaudio? ( >=media-sound/pulseaudio-5.0.0:0[alsa?,glib] ) virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/libmatemixer-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=729042926d7f0449e6f3e934dcdbf23e
diff --git a/metadata/md5-cache/media-libs/libmatroska-1.5.2 b/metadata/md5-cache/media-libs/libmatroska-1.5.2
index 076d0f751ab2..b3b551a1408e 100644
--- a/metadata/md5-cache/media-libs/libmatroska-1.5.2
+++ b/metadata/md5-cache/media-libs/libmatroska-1.5.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libebml-1.3.9:=
 SLOT=0/6
 SRC_URI=https://dl.matroska.org/downloads/libmatroska/libmatroska-1.5.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4a21ebdd661e7277a542ebc83fecc63
diff --git a/metadata/md5-cache/media-libs/libmatroska-1.6.2 b/metadata/md5-cache/media-libs/libmatroska-1.6.2
index db96d4575417..ed333bf97726 100644
--- a/metadata/md5-cache/media-libs/libmatroska-1.6.2
+++ b/metadata/md5-cache/media-libs/libmatroska-1.6.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libebml-1.4.0:=
 SLOT=0/7
 SRC_URI=https://dl.matroska.org/downloads/libmatroska/libmatroska-1.6.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a03ccdf392f22f7eda6da50c31beae64
diff --git a/metadata/md5-cache/media-libs/libmygpo-qt-9999 b/metadata/md5-cache/media-libs/libmygpo-qt-9999
index ae946e025bc9..ee165e4714f6 100644
--- a/metadata/md5-cache/media-libs/libmygpo-qt-9999
+++ b/metadata/md5-cache/media-libs/libmygpo-qt-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd5820b76bc2a24d9e50cae95c35035b
diff --git a/metadata/md5-cache/media-libs/libmypaint-1.4.0-r1 b/metadata/md5-cache/media-libs/libmypaint-1.4.0-r1
deleted file mode 100644
index 6174f29b088f..000000000000
--- a/metadata/md5-cache/media-libs/libmypaint-1.4.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 dev-libs/json-c:= gegl? ( media-libs/babl >=media-libs/gegl-0.4.14:0.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) openmp? ( >sys-devel/gcc-5:*[openmp] ) nls? ( sys-devel/gettext ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) nls? ( dev-util/intltool )
-DESCRIPTION=Library for making brushstrokes
-EAPI=7
-HOMEPAGE=https://github.com/mypaint/libmypaint
-IUSE=gegl introspection nls openmp
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86
-LICENSE=ISC
-RDEPEND=dev-libs/glib:2 dev-libs/json-c:= gegl? ( media-libs/babl >=media-libs/gegl-0.4.14:0.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) openmp? ( >sys-devel/gcc-5:*[openmp] ) nls? ( sys-devel/gettext ) !<media-gfx/mypaint-1.2.1
-SLOT=0/1.4
-SRC_URI=https://github.com/mypaint/libmypaint/releases/download/v1.4.0/libmypaint-1.4.0.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=98832b60c0d5761e5a819643e0b3e063
diff --git a/metadata/md5-cache/media-libs/libmypaint-1.6.1 b/metadata/md5-cache/media-libs/libmypaint-1.6.1
index 97e66a0b5e23..91f16870dfe5 100644
--- a/metadata/md5-cache/media-libs/libmypaint-1.6.1
+++ b/metadata/md5-cache/media-libs/libmypaint-1.6.1
@@ -5,10 +5,10 @@ DESCRIPTION=Library for making brushstrokes
 EAPI=7
 HOMEPAGE=https://github.com/mypaint/libmypaint
 IUSE=gegl introspection nls openmp
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-libs/glib:2 dev-libs/json-c:= gegl? ( media-libs/babl >=media-libs/gegl-0.4.14:0.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) openmp? ( >sys-devel/gcc-5:*[openmp] ) nls? ( sys-devel/gettext ) !<media-gfx/mypaint-1.2.1
 SLOT=0/0.0.0
 SRC_URI=https://github.com/mypaint/libmypaint/releases/download/v1.6.1/libmypaint-1.6.1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=26d415058542b7eae3cbe2bbc2c4ac3a
+_md5_=8aa0231b0fb79af34dd68dd0bb26da6c
diff --git a/metadata/md5-cache/media-libs/libopenglrecorder-0.1.0 b/metadata/md5-cache/media-libs/libopenglrecorder-0.1.0
index 48d34f13017c..fb6eeb1719fd 100644
--- a/metadata/md5-cache/media-libs/libopenglrecorder-0.1.0
+++ b/metadata/md5-cache/media-libs/libopenglrecorder-0.1.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] openh264? ( media-libs/openh264[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound? ( media-libs/libvorbis[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( media-libs/libvpx:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/Benau/libopenglrecorder/archive/v0.1.0.tar.gz -> libopenglrecorder-0.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=31a3f1a3be9a337a65affe48d9e298d9
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.2.4 b/metadata/md5-cache/media-libs/libopenshot-0.2.4
index 18d21880e7ea..a4e7b2568cb9 100644
--- a/metadata/md5-cache/media-libs/libopenshot-0.2.4
+++ b/metadata/md5-cache/media-libs/libopenshot-0.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=https://github.com/OpenShot/libopenshot/archive/v0.2.4.tar.gz -> libopenshot-0.2.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68f804808212619f16ad713540dd510c
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609 b/metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609
index 7acee1fbc84f..4881ef5775a2 100644
--- a/metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609
+++ b/metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/17
 SRC_URI=https://github.com/OpenShot/libopenshot/archive/0d4ea7fe71e88bcee4a7fd1404bd52c8e2169997.tar.gz -> libopenshot-0.2.4_pre20190609.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e750b70d1f36825cc0e46fdcbb268cdf
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.2.5 b/metadata/md5-cache/media-libs/libopenshot-0.2.5
index 7c5f4a0228d3..8a93c4940dcf 100644
--- a/metadata/md5-cache/media-libs/libopenshot-0.2.5
+++ b/metadata/md5-cache/media-libs/libopenshot-0.2.5
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=https://github.com/OpenShot/libopenshot/archive/v0.2.5.tar.gz -> libopenshot-0.2.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=268bdf1a1d0c898132f7e245f2600dff
diff --git a/metadata/md5-cache/media-libs/libopenshot-audio-0.1.9 b/metadata/md5-cache/media-libs/libopenshot-audio-0.1.9
index 9aa149f9c3ea..6e46e8676f26 100644
--- a/metadata/md5-cache/media-libs/libopenshot-audio-0.1.9
+++ b/metadata/md5-cache/media-libs/libopenshot-audio-0.1.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=media-libs/alsa-lib media-libs/freetype sys-libs/zlib x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0/7
 SRC_URI=https://github.com/OpenShot/libopenshot-audio/archive/v0.1.9.tar.gz -> libopenshot-audio-0.1.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1360f620d7db9fa2d31deedd346ff20
diff --git a/metadata/md5-cache/media-libs/libopenshot-audio-0.1.9_pre20190502 b/metadata/md5-cache/media-libs/libopenshot-audio-0.1.9_pre20190502
index a80b0e475808..f09fa1650e79 100644
--- a/metadata/md5-cache/media-libs/libopenshot-audio-0.1.9_pre20190502
+++ b/metadata/md5-cache/media-libs/libopenshot-audio-0.1.9_pre20190502
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=media-libs/alsa-lib media-libs/freetype x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0/6
 SRC_URI=https://github.com/OpenShot/libopenshot-audio/archive/77edb1f14dde35e1facecc309dbc4fb7f07d7014.tar.gz -> libopenshot-audio-0.1.9_pre20190502.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d922bffd2c7df1bed33fba0d7730bcc
diff --git a/metadata/md5-cache/media-libs/libopenshot-audio-0.2.0 b/metadata/md5-cache/media-libs/libopenshot-audio-0.2.0
index 7b9dd07c6fc3..be3b1bfe8d6f 100644
--- a/metadata/md5-cache/media-libs/libopenshot-audio-0.2.0
+++ b/metadata/md5-cache/media-libs/libopenshot-audio-0.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=media-libs/alsa-lib media-libs/freetype sys-libs/zlib x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0/7
 SRC_URI=https://github.com/OpenShot/libopenshot-audio/archive/v0.2.0.tar.gz -> libopenshot-audio-0.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1360f620d7db9fa2d31deedd346ff20
diff --git a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1 b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1
index 385b114fbb71..b4dcc8d53cf0 100644
--- a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1
+++ b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/libqaccessibilityclient/libqaccessibilityclient-0.4.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8dcc84e34f1cca3802ac8037ea1e8ac9
diff --git a/metadata/md5-cache/media-libs/libraw-0.20.0 b/metadata/md5-cache/media-libs/libraw-0.20.0
index 974ad5df537e..cf6f2bc5d96e 100644
--- a/metadata/md5-cache/media-libs/libraw-0.20.0
+++ b/metadata/md5-cache/media-libs/libraw-0.20.0
@@ -4,10 +4,10 @@ DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital phot
 EAPI=7
 HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
 IUSE=examples jpeg +lcms openmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1 CDDL
 RDEPEND=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_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/20
 SRC_URI=https://www.libraw.org/data/LibRaw-0.20.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f2d5a79849788b399ae639f31ea57b2b
+_md5_=8ed960b1e579c7d0464a5bed4af57cfc
diff --git a/metadata/md5-cache/media-libs/libreplaygain-477-r1 b/metadata/md5-cache/media-libs/libreplaygain-477-r1
index 6f85b9d98117..3b90bc34a8a6 100644
--- a/metadata/md5-cache/media-libs/libreplaygain-477-r1
+++ b/metadata/md5-cache/media-libs/libreplaygain-477-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/libreplaygain-477.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=246291b4a15a4e3e9ec2de32ea0fa39a
diff --git a/metadata/md5-cache/media-libs/libsoundio-2.0.0 b/metadata/md5-cache/media-libs/libsoundio-2.0.0
index 681e82b3e2c4..04b079f9aed8 100644
--- a/metadata/md5-cache/media-libs/libsoundio-2.0.0
+++ b/metadata/md5-cache/media-libs/libsoundio-2.0.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/2
 SRC_URI=https://github.com/andrewrk/libsoundio/archive/2.0.0.tar.gz -> libsoundio-2.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4b7356bc47186b61ff66241989c834e
diff --git a/metadata/md5-cache/media-libs/libyami-1.0.1 b/metadata/md5-cache/media-libs/libyami-1.0.1
deleted file mode 100644
index 618ccfddb84b..000000000000
--- a/metadata/md5-cache/media-libs/libyami-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-1.7.2[drm,X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( >=dev-cpp/gtest-1.7 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Yet Another Media Infrastructure: Media codec with hardware acceleration
-EAPI=5
-HOMEPAGE=https://github.com/01org/libyami
-IUSE=debug dmabuf doc md5 v4l X test wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=x11-libs/libva-1.7.2[drm,X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/01org/libyami/archive/libyami-1.0.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4bf12e4f2f29d65416ca876462ec7ae2
diff --git a/metadata/md5-cache/media-libs/libyami-1.1.0 b/metadata/md5-cache/media-libs/libyami-1.1.0
deleted file mode 100644
index 2a677e400e72..000000000000
--- a/metadata/md5-cache/media-libs/libyami-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-1.7.2[drm,X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( >=dev-cpp/gtest-1.7 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Yet Another Media Infrastructure: Media codec with hardware acceleration
-EAPI=5
-HOMEPAGE=https://github.com/01org/libyami
-IUSE=debug egl dmabuf doc md5 v4l X test wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=x11-libs/libva-1.7.2[drm,X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/01org/libyami/archive/libyami-1.1.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=72b509e9bddf18b42f4ad846fb8bb034
diff --git a/metadata/md5-cache/media-libs/libyami-1.2.0 b/metadata/md5-cache/media-libs/libyami-1.2.0
deleted file mode 100644
index 01253307b63d..000000000000
--- a/metadata/md5-cache/media-libs/libyami-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-1.7.2[drm,X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( >=dev-cpp/gtest-1.7 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Yet Another Media Infrastructure: Media codec with hardware acceleration
-EAPI=5
-HOMEPAGE=https://github.com/01org/libyami
-IUSE=debug egl dmabuf doc md5 v4l X test wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=x11-libs/libva-1.7.2[drm,X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/01org/libyami/archive/1.2.0.tar.gz -> libyami-1.2.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=dfa524af1b565780752f7f376aa8e470
diff --git a/metadata/md5-cache/media-libs/libyami-1.3.0 b/metadata/md5-cache/media-libs/libyami-1.3.0
deleted file mode 100644
index c4e01caf846b..000000000000
--- a/metadata/md5-cache/media-libs/libyami-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libva-1.7.2:=[drm,X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( >=dev-cpp/gtest-1.7 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Yet Another Media Infrastructure: Media codec with hardware acceleration
-EAPI=5
-HOMEPAGE=https://github.com/01org/libyami
-IUSE=debug egl dmabuf doc md5 v4l X test wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=x11-libs/libva-1.7.2:=[drm,X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] v4l? ( >=virtual/opengl-7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libv4l-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-10[egl,gles2,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) md5? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dmabuf? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/01org/libyami/archive/libyami-1.3.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bcd187ead6dbec4510170e0980bc3726
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.8-r1 b/metadata/md5-cache/media-libs/lilv-0.24.8-r1
index 6c94e8c2815f..168ba19bdb33 100644
--- a/metadata/md5-cache/media-libs/lilv-0.24.8-r1
+++ b/metadata/md5-cache/media-libs/lilv-0.24.8-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for app
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/lilv/
 IUSE=doc +dyn-manifest static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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=ISC
 RDEPEND=>=dev-libs/serd-0.30.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile >=media-libs/lv2-1.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/sratom[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/lilv-0.24.8.tar.bz2
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=c389335617109894ebc04b466e51242f
+_md5_=c21ee792df37475d05675c16f8ccc43a
diff --git a/metadata/md5-cache/media-libs/mesa-20.0.8 b/metadata/md5-cache/media-libs/mesa-20.0.8
deleted file mode 100644
index cc4fc3792bf2..000000000000
--- a/metadata/md5-cache/media-libs/mesa-20.0.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( 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-util/meson-0.54.0 >=dev-util/ninja-1.8.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_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_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[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_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_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_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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( 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_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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
-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 selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~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_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_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[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_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_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_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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( 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_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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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-20.0.8.tar.xz
-_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=82459d5b5fd48e020e6b00957dee9107
diff --git a/metadata/md5-cache/media-libs/mesa-20.1.6 b/metadata/md5-cache/media-libs/mesa-20.1.6
deleted file mode 100644
index 9fa605543e23..000000000000
--- a/metadata/md5-cache/media-libs/mesa-20.1.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( 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-util/meson-0.54.0 >=dev-util/ninja-1.8.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_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_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[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_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_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_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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( 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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
-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 selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~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_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_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[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_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_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_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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( 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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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-20.1.6.tar.xz
-_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ab6f3df9474975e929a619d8f6323183
diff --git a/metadata/md5-cache/media-libs/mesa-20.1.8 b/metadata/md5-cache/media-libs/mesa-20.1.8
index 36eec17bac4f..73f27e4fac04 100644
--- a/metadata/md5-cache/media-libs/mesa-20.1.8
+++ b/metadata/md5-cache/media-libs/mesa-20.1.8
@@ -5,7 +5,7 @@ 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 selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~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_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_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[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_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_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_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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( 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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-20.1.8.tar.xz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8256996d268a4441c684d7a913bc0cc6
+_md5_=54918c512ebb13bc6bcaf6192a3e6731
diff --git a/metadata/md5-cache/media-libs/mesa-20.2.0_rc2 b/metadata/md5-cache/media-libs/mesa-20.2.0_rc2
deleted file mode 100644
index ebe4f5c81a8a..000000000000
--- a/metadata/md5-cache/media-libs/mesa-20.2.0_rc2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( 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-util/meson-0.54.0 >=dev-util/ninja-1.8.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_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_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[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_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_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_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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( 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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
-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_v3d 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 selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~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_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_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[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_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_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_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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( 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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mesa.freedesktop.org/archive/mesa-20.2.0-rc2.tar.xz
-_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=26276e9e84ec8e4db35e1d588ca3c2f2
diff --git a/metadata/md5-cache/media-libs/mesa-20.2.0_rc3 b/metadata/md5-cache/media-libs/mesa-20.2.0_rc3
deleted file mode 100644
index 1d2b8eaeb2ed..000000000000
--- a/metadata/md5-cache/media-libs/mesa-20.2.0_rc3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( 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-util/meson-0.54.0 >=dev-util/ninja-1.8.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_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_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[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_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_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_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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( 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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
-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_v3d 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 selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~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_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_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[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_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_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_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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( 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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mesa.freedesktop.org/archive/mesa-20.2.0-rc3.tar.xz
-_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=26276e9e84ec8e4db35e1d588ca3c2f2
diff --git a/metadata/md5-cache/media-libs/mesa-20.2.0_rc4 b/metadata/md5-cache/media-libs/mesa-20.2.0_rc4
index 0ef377e6f714..a0b9061625d1 100644
--- a/metadata/md5-cache/media-libs/mesa-20.2.0_rc4
+++ b/metadata/md5-cache/media-libs/mesa-20.2.0_rc4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-20.2.0-rc4.tar.xz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=59231cd2558d8dcf5ded550582ff7267
+_md5_=2f3ff6cffd21887f3a1598eaa927025a
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index cbdb2014dba5..447c741b7cba 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.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( 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-util/meson-0.54.0 >=dev-util/ninja-1.8.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_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_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[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_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_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_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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( 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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+DEFINED_PHASES=compile configure install 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_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[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_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_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_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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( 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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
 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_v3d 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 selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
+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_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
 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_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_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[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_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_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_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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( 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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[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_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_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_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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( 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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) zink? ( gallium vulkan )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm	21d8c0949a2693d7109cc6a25fabfcaf	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=59231cd2558d8dcf5ded550582ff7267
+_md5_=dc087ddb13c1ed30bf1b404828d9d2b8
diff --git a/metadata/md5-cache/media-libs/musicbrainz-5.1.0 b/metadata/md5-cache/media-libs/musicbrainz-5.1.0
index 44aea5d53fc6..9514fe74a236 100644
--- a/metadata/md5-cache/media-libs/musicbrainz-5.1.0
+++ b/metadata/md5-cache/media-libs/musicbrainz-5.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2 net-libs/neon
 RESTRICT=!test? ( test )
 SLOT=5/1
 SRC_URI=https://github.com/metabrainz/libmusicbrainz/releases/download/release-5.1.0/libmusicbrainz-5.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f7787db7461cb9767693959597655ba
diff --git a/metadata/md5-cache/media-libs/mutagen-1.44.0 b/metadata/md5-cache/media-libs/mutagen-1.44.0
index 0141b0fb77a6..a81a0b79e8c4 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.44.0
+++ b/metadata/md5-cache/media-libs/mutagen-1.44.0
@@ -4,7 +4,7 @@ DESCRIPTION=Audio metadata tag reader and writer implemented in pure Python
 EAPI=7
 HOMEPAGE=https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen/
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.44.0/mutagen-1.44.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8369d99465e43392d310ebb0aa360e50
+_md5_=e2bc3455287f1bfa77e94e74044552c1
diff --git a/metadata/md5-cache/media-libs/netpbm-10.66.00 b/metadata/md5-cache/media-libs/netpbm-10.66.00
deleted file mode 100644
index 4a332c3a0c77..000000000000
--- a/metadata/md5-cache/media-libs/netpbm-10.66.00
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 ) app-arch/xz-utils sys-devel/flex
-DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) formats
-EAPI=4
-HOMEPAGE=http://netpbm.sourceforge.net/
-IUSE=doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0 ) rle? ( media-libs/urt ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=mirror://gentoo/netpbm-10.66.00.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=509b3898ea2e2b3fafc8ef16f59a7b0f
diff --git a/metadata/md5-cache/media-libs/noise-suppression-for-voice-0.9_p20200705 b/metadata/md5-cache/media-libs/noise-suppression-for-voice-0.9_p20200705
index 481713696861..4ba900997d69 100644
--- a/metadata/md5-cache/media-libs/noise-suppression-for-voice-0.9_p20200705
+++ b/metadata/md5-cache/media-libs/noise-suppression-for-voice-0.9_p20200705
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://github.com/werman/noise-suppression-for-voice/archive/453a8af82a31a5361f6a13bf95c97686f0a2acd1.tar.gz -> noise-suppression-for-voice-0.9_p20200705.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3441af46b01646b4fef3efb016ee3fb
diff --git a/metadata/md5-cache/media-libs/noise-suppression-for-voice-9999 b/metadata/md5-cache/media-libs/noise-suppression-for-voice-9999
index 9d347250e610..ce077f617a07 100644
--- a/metadata/md5-cache/media-libs/noise-suppression-for-voice-9999
+++ b/metadata/md5-cache/media-libs/noise-suppression-for-voice-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/werman/noise-suppression-for-voice
 LICENSE=GPL-3+
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0cd8fde94a0d6bf2c8982e987cbfcf9c
diff --git a/metadata/md5-cache/media-libs/openal-1.20.0 b/metadata/md5-cache/media-libs/openal-1.20.0
index 01f3f977cb4d..44aa51459942 100644
--- a/metadata/md5-cache/media-libs/openal-1.20.0
+++ b/metadata/md5-cache/media-libs/openal-1.20.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 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_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://www.openal-soft.org/openal-releases/openal-soft-1.20.0.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ccd6453bfd4960377fc0f106b016fb1
diff --git a/metadata/md5-cache/media-libs/openal-1.20.1 b/metadata/md5-cache/media-libs/openal-1.20.1
index 539af47c32e0..c6318ef1cb63 100644
--- a/metadata/md5-cache/media-libs/openal-1.20.1
+++ b/metadata/md5-cache/media-libs/openal-1.20.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2+
 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_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://www.openal-soft.org/openal-releases/openal-soft-1.20.1.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ccd6453bfd4960377fc0f106b016fb1
diff --git a/metadata/md5-cache/media-libs/opencollada-1.6.68 b/metadata/md5-cache/media-libs/opencollada-1.6.68
index d0299a7a4880..821eee3ab564 100644
--- a/metadata/md5-cache/media-libs/opencollada-1.6.68
+++ b/metadata/md5-cache/media-libs/opencollada-1.6.68
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libpcre:= dev-libs/libxml2:= dev-libs/zziplib media-libs/lib3ds sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.68.tar.gz -> opencollada-1.6.68.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3fe404e38694b2c55c3cdac6b20765ad
diff --git a/metadata/md5-cache/media-libs/opencolorio-1.1.0-r4 b/metadata/md5-cache/media-libs/opencolorio-1.1.0-r4
index 6d137edbb097..d8087eccac6e 100644
--- a/metadata/md5-cache/media-libs/opencolorio-1.1.0-r4
+++ b/metadata/md5-cache/media-libs/opencolorio-1.1.0-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=doc? ( python ) python? ( ^^ ( python_single_target_python3_6 pytho
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/imageworks/OpenColorIO/archive/v1.1.0.tar.gz -> opencolorio-1.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a4ffdac2ceca554e823d4f9f1bf8199
diff --git a/metadata/md5-cache/media-libs/opencore-amr-0.1.4 b/metadata/md5-cache/media-libs/opencore-amr-0.1.4
deleted file mode 100644
index 2688a6849506..000000000000
--- a/metadata/md5-cache/media-libs/opencore-amr-0.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170815
-DESCRIPTION=Implementation of Adaptive Multi Rate Narrowband and Wideband speech codec
-EAPI=5
-HOMEPAGE=http://opencore-amr.sourceforge.net/
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/opencore-amr/opencore-amr-0.1.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5dab85af8db9235ed8a8f33179c9b4d8
diff --git a/metadata/md5-cache/media-libs/openexr-2.5.2 b/metadata/md5-cache/media-libs/openexr-2.5.2
index 82869f8bdedc..9a1bf1f34f67 100644
--- a/metadata/md5-cache/media-libs/openexr-2.5.2
+++ b/metadata/md5-cache/media-libs/openexr-2.5.2
@@ -11,5 +11,5 @@ RDEPEND=media-libs/ilmbase:= sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.2.tar.gz -> openexr-2.5.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11d0f48c979d6c21a37993504b6651bb
diff --git a/metadata/md5-cache/media-libs/openicc-0.1.0 b/metadata/md5-cache/media-libs/openicc-0.1.0
index 5fb0c71dc1d0..6ae13623dc5c 100644
--- a/metadata/md5-cache/media-libs/openicc-0.1.0
+++ b/metadata/md5-cache/media-libs/openicc-0.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenICC/config/archive/0.1.0.tar.gz -> openicc-0.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ab7521391a4d520bc176301b3a998f6
diff --git a/metadata/md5-cache/media-libs/openimageio-1.8.17-r2 b/metadata/md5-cache/media-libs/openimageio-1.8.17-r2
index cde8b2e2e20d..144e3d3f3fc0 100644
--- a/metadata/md5-cache/media-libs/openimageio-1.8.17-r2
+++ b/metadata/md5-cache/media-libs/openimageio-1.8.17-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.8.17.tar.gz -> openimageio-1.8.17.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3d672cd01b6d4d15b59ed80839e9818
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.1-r1 b/metadata/md5-cache/media-libs/openjpeg-2.3.1-r1
index 22a4becc32d0..687cd277eeda 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.3.1-r1
+++ b/metadata/md5-cache/media-libs/openjpeg-2.3.1-r1
@@ -11,5 +11,5 @@ RDEPEND=media-libs/lcms:2 media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib:=
 RESTRICT=!test? ( test )
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz -> openjpeg-2.3.1.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/25632d6deca2e567d30ef476b4abe63916c36f6e.tar.gz -> openjpeg-data_20180620.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df0ff4ef98a4c822bcbce3ce202ccc67
diff --git a/metadata/md5-cache/media-libs/opensubdiv-3.3.3-r1 b/metadata/md5-cache/media-libs/opensubdiv-3.3.3-r1
index 33b46daf1232..fe60c803f740 100644
--- a/metadata/md5-cache/media-libs/opensubdiv-3.3.3-r1
+++ b/metadata/md5-cache/media-libs/opensubdiv-3.3.3-r1
@@ -11,5 +11,5 @@ RDEPEND=media-libs/glew:= media-libs/glfw:= x11-libs/libXinerama cuda? ( dev-uti
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_3_3.tar.gz -> opensubdiv-3.3.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3f8c21e1af2b58422f928d7b911925cf
diff --git a/metadata/md5-cache/media-libs/opensubdiv-3.4.3 b/metadata/md5-cache/media-libs/opensubdiv-3.4.3
index e9735b3a2455..9e8e337bed52 100644
--- a/metadata/md5-cache/media-libs/opensubdiv-3.4.3
+++ b/metadata/md5-cache/media-libs/opensubdiv-3.4.3
@@ -11,5 +11,5 @@ RDEPEND=media-libs/glew:= media-libs/glfw:= x11-libs/libXinerama cuda? ( dev-uti
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v3_4_3.tar.gz -> opensubdiv-3.4.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3f8c21e1af2b58422f928d7b911925cf
diff --git a/metadata/md5-cache/media-libs/osl-1.10.10 b/metadata/md5-cache/media-libs/osl-1.10.10
index d7f7c3512bf9..d7c4c0e37341 100644
--- a/metadata/md5-cache/media-libs/osl-1.10.10
+++ b/metadata/md5-cache/media-libs/osl-1.10.10
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-libs/pugixml media-libs/openexr:= media-libs/openim
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.10.10.tar.gz -> osl-1.10.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e1583e0a52aaa64095325d2bf61c40a
diff --git a/metadata/md5-cache/media-libs/partio-1.1.0_p20170829 b/metadata/md5-cache/media-libs/partio-1.1.0_p20170829
index 18bed7def817..6213015e99c8 100644
--- a/metadata/md5-cache/media-libs/partio-1.1.0_p20170829
+++ b/metadata/md5-cache/media-libs/partio-1.1.0_p20170829
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/wdas/partio/archive/2774ef3958da46d9f8a4230ebda9e04b1aa8f4e5.tar.gz -> partio-1.1.0_p20170829.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5ae05d798b04191bb5f39bc99104df4a
diff --git a/metadata/md5-cache/media-libs/partio-1.10.1 b/metadata/md5-cache/media-libs/partio-1.10.1
index 209b1691692c..bb93f49011c8 100644
--- a/metadata/md5-cache/media-libs/partio-1.10.1
+++ b/metadata/md5-cache/media-libs/partio-1.10.1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/wdas/partio/archive/v1.10.1.tar.gz -> partio-1.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c22eaaf292a834d0c66c27252c572cb7
diff --git a/metadata/md5-cache/media-libs/partio-1.5.4 b/metadata/md5-cache/media-libs/partio-1.5.4
index 2a2d70905914..68300665f70b 100644
--- a/metadata/md5-cache/media-libs/partio-1.5.4
+++ b/metadata/md5-cache/media-libs/partio-1.5.4
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/wdas/partio/archive/v1.5.4.tar.gz -> partio-1.5.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=146d4cbae958ad0e4725f10c2e79a204
diff --git a/metadata/md5-cache/media-libs/partio-9999 b/metadata/md5-cache/media-libs/partio-9999
index a0fe0d5485f1..b0dd459951aa 100644
--- a/metadata/md5-cache/media-libs/partio-9999
+++ b/metadata/md5-cache/media-libs/partio-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) media-libs/freeglut sys-libs/zlib:= virtual/opengl
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dbed4cbbc0ee63a98e9bfa25008c957c
diff --git a/metadata/md5-cache/media-libs/phonon-4.11.1-r1 b/metadata/md5-cache/media-libs/phonon-4.11.1-r1
index 57b3a287c311..7e13151a336a 100644
--- a/metadata/md5-cache/media-libs/phonon-4.11.1-r1
+++ b/metadata/md5-cache/media-libs/phonon-4.11.1-r1
@@ -11,5 +11,5 @@ PDEPEND=gstreamer? ( >=media-libs/phonon-gstreamer-4.9.60 ) vlc? ( >=media-libs/
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 media-sound/pulseaudio[glib] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/4.11.1/phonon-4.11.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b494b1570986f7eaf0304e83c606a10
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0 b/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0
index 6767e1848a5a..d3e81caf16fa 100644
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0
+++ b/metadata/md5-cache/media-libs/phonon-gstreamer-4.10.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 >=media-libs/phonon-4.10.60 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-gstreamer/4.10.0/phonon-backend-gstreamer-4.10.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=90310eed3be84553a07b608d1dcd311d
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.11.1 b/metadata/md5-cache/media-libs/phonon-vlc-0.11.1
index fda183ae6e37..28a29adbf58a 100644
--- a/metadata/md5-cache/media-libs/phonon-vlc-0.11.1
+++ b/metadata/md5-cache/media-libs/phonon-vlc-0.11.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.60 media-video/vlc:=[dbus,ogg,vorbis] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.11.1/phonon-backend-vlc-0.11.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=000c73effaaa3f5a8607aa1aaef3aad7
diff --git a/metadata/md5-cache/media-libs/plib-1.8.5-r2 b/metadata/md5-cache/media-libs/plib-1.8.5-r2
index 72034a4ab41c..4f0280457883 100644
--- a/metadata/md5-cache/media-libs/plib-1.8.5-r2
+++ b/metadata/md5-cache/media-libs/plib-1.8.5-r2
@@ -3,10 +3,10 @@ DEPEND=virtual/opengl >=app-portage/elt-patches-20170815 || ( >=sys-devel/automa
 DESCRIPTION=multimedia library used by many games
 EAPI=6
 HOMEPAGE=http://plib.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc sparc ~x86
 LICENSE=LGPL-2
 RDEPEND=virtual/opengl
 SLOT=0
 SRC_URI=http://plib.sourceforge.net/dist/plib-1.8.5.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=44bb9ae1c59412466de0a6fabbefd5c7
+_md5_=06af68af3676bb7cfe4c2858276bd546
diff --git a/metadata/md5-cache/media-libs/portmidi-217-r3 b/metadata/md5-cache/media-libs/portmidi-217-r3
index 86347332c087..86c567f84cc5 100644
--- a/metadata/md5-cache/media-libs/portmidi-217-r3
+++ b/metadata/md5-cache/media-libs/portmidi-217-r3
@@ -11,5 +11,5 @@ RDEPEND=media-libs/alsa-lib python? ( python_targets_python3_6? ( dev-lang/pytho
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/portmedia/portmidi-src-217.zip
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b43d6711596e82187349d4fb862f7253
diff --git a/metadata/md5-cache/media-libs/ptex-2.3.2 b/metadata/md5-cache/media-libs/ptex-2.3.2
index 2bf794f696cb..e03313ad75ef 100644
--- a/metadata/md5-cache/media-libs/ptex-2.3.2
+++ b/metadata/md5-cache/media-libs/ptex-2.3.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wdas/ptex/archive/v2.3.2.tar.gz -> ptex-2.3.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=841112ec83052098304bc4444af4c3a6
diff --git a/metadata/md5-cache/media-libs/pulseaudio-qt-1.2 b/metadata/md5-cache/media-libs/pulseaudio-qt-1.2
index 5f3669f76675..2d05ccc92a33 100644
--- a/metadata/md5-cache/media-libs/pulseaudio-qt-1.2
+++ b/metadata/md5-cache/media-libs/pulseaudio-qt-1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 media-s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/pulseaudio-qt/pulseaudio-qt-1.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e2a4c8eb5d3697087cbdf88c2fd4ae5
diff --git a/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r4 b/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r4
index a1c45e95bdb6..d5532c329264 100644
--- a/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r4
+++ b/metadata/md5-cache/media-libs/qt-gstreamer-1.2.0-r4
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdeclarative:5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gstreamer.freedesktop.org/src/qt-gstreamer/qt-gstreamer-1.2.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b11285cc87d89a9db477eb489940f6b
diff --git a/metadata/md5-cache/media-libs/qtav-1.12.0-r2 b/metadata/md5-cache/media-libs/qtav-1.12.0-r2
index 8f25b2904226..34c65d86c0ee 100644
--- a/metadata/md5-cache/media-libs/qtav-1.12.0-r2
+++ b/metadata/md5-cache/media-libs/qtav-1.12.0-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 REQUIRED_USE=gui? ( opengl )
 SLOT=0/1
 SRC_URI=https://github.com/wang-bin/QtAV/archive/v1.12.0.tar.gz -> qtav-1.12.0.tar.gz https://dev.gentoo.org/~johu/distfiles/qtav-1.12.0-capi.h-b43aa93.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3aa0630abd4cea324d92fe7cc6c6179c
diff --git a/metadata/md5-cache/media-libs/rlottie-0.1-r1 b/metadata/md5-cache/media-libs/rlottie-0.1-r1
deleted file mode 100644
index b5ee88fdfb3b..000000000000
--- a/metadata/md5-cache/media-libs/rlottie-0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install test
-DEPEND=test? ( dev-cpp/gtest )
-DESCRIPTION=A platform independent standalone library that plays Lottie Animations
-EAPI=7
-HOMEPAGE=https://www.tizen.org/ https://github.com/Samsung/rlottie
-IUSE=debug examples test
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=BSD FTL JSON LGPL-2.1 MIT
-RESTRICT=!test? ( test )
-SLOT=0/0.0.1
-SRC_URI=https://github.com/Samsung/rlottie/archive/v0.1.tar.gz -> rlottie-0.1-1.tar.gz
-_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d3ecae4020dff83236e267731bb238d3
diff --git a/metadata/md5-cache/media-libs/rlottie-0.2 b/metadata/md5-cache/media-libs/rlottie-0.2
index d3222f236167..b636c093c2e3 100644
--- a/metadata/md5-cache/media-libs/rlottie-0.2
+++ b/metadata/md5-cache/media-libs/rlottie-0.2
@@ -5,10 +5,10 @@ DESCRIPTION=A platform independent standalone library that plays Lottie Animatio
 EAPI=7
 HOMEPAGE=https://www.tizen.org/ https://github.com/Samsung/rlottie
 IUSE=debug examples test
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD FTL JSON MIT
 RESTRICT=!test? ( test )
 SLOT=0/0.2
 SRC_URI=https://github.com/Samsung/rlottie/archive/v0.2.tar.gz -> rlottie-0.2-1.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fa1ea1578cb452c5549c16da385c2748
+_md5_=e18a054f7059b5a004f2c59d153d9309
diff --git a/metadata/md5-cache/media-libs/rubberband-1.9.0 b/metadata/md5-cache/media-libs/rubberband-1.9.0
index a9c74e9cac07..c4d3bcb23621 100644
--- a/metadata/md5-cache/media-libs/rubberband-1.9.0
+++ b/metadata/md5-cache/media-libs/rubberband-1.9.0
@@ -11,4 +11,4 @@ RDEPEND=media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 SLOT=0
 SRC_URI=https://breakfastquay.com/files/releases/rubberband-1.9.0.tar.bz2
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a56181adead40d50961d7a9d6763763e
+_md5_=552632bb938ca27c149f5320fa60396a
diff --git a/metadata/md5-cache/media-libs/sdl-gfx-2.0.26 b/metadata/md5-cache/media-libs/sdl-gfx-2.0.26
index 2b72bbc88bdc..7900ef4348c3 100644
--- a/metadata/md5-cache/media-libs/sdl-gfx-2.0.26
+++ b/metadata/md5-cache/media-libs/sdl-gfx-2.0.26
@@ -4,10 +4,10 @@ DESCRIPTION=Graphics drawing primitives library for SDL
 EAPI=6
 HOMEPAGE=http://www.ferzkopp.net/joomla/content/view/19/14/
 IUSE=doc cpu_flags_x86_mmx static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl-1.2.15-r4[video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.26.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=eb65b59b8fa97a3e45c8d140787e0aec
+_md5_=9b82a6fa48ad0d99238598f5cf118b5f
diff --git a/metadata/md5-cache/media-libs/shaderc-2020.2 b/metadata/md5-cache/media-libs/shaderc-2020.2
index 4a0d940c2918..47d400c069c5 100644
--- a/metadata/md5-cache/media-libs/shaderc-2020.2
+++ b/metadata/md5-cache/media-libs/shaderc-2020.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-util/glslang-8.13.3560_pre20200404[abi_x86_32(-)?,abi_x86_64(-)?,a
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/shaderc/archive/v2020.2.tar.gz -> shaderc-2020.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=520f83b3ac27ab38d3db30416fd782d2
diff --git a/metadata/md5-cache/media-libs/simage-1.8.0 b/metadata/md5-cache/media-libs/simage-1.8.0
index 8198e702033b..27c1af798bd9 100644
--- a/metadata/md5-cache/media-libs/simage-1.8.0
+++ b/metadata/md5-cache/media-libs/simage-1.8.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:= gif? ( media-libs/giflib:= ) jpeg? ( virtual/jpeg:0 ) pn
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/coin3d/simage/archive/simage-1.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe002acb81eda996c9d1ee0b801a070d
diff --git a/metadata/md5-cache/media-libs/taglib-1.11.1_p20190920-r1 b/metadata/md5-cache/media-libs/taglib-1.11.1_p20190920-r1
index 630fcb781509..738b11c7d93f 100644
--- a/metadata/md5-cache/media-libs/taglib-1.11.1_p20190920-r1
+++ b/metadata/md5-cache/media-libs/taglib-1.11.1_p20190920-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/taglib/taglib/archive/54508df30bc888c4d2359576ceb0cc8f2fa8dbdf.tar.gz -> taglib-1.11.1_p20190920.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=211b94b9ee26f3a3c34eff35e79e5c43
diff --git a/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1 b/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
index d24f4f1e8f4f..385b33f5ae9b 100644
--- a/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
+++ b/metadata/md5-cache/media-libs/taglib-extras-1.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=media-libs/taglib
 SLOT=0
 SRC_URI=mirror://kde/stable/taglib-extras/1.0.1/src/taglib-extras-1.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d774a036934ac6e0357a0fa891c140a
diff --git a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10 b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10
index c9aff8b8fe56..5a0721615800 100644
--- a/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10
+++ b/metadata/md5-cache/media-libs/vamp-plugin-sdk-2.10
@@ -5,10 +5,10 @@ DESCRIPTION=Audio processing system for plugins to extract information from audi
 EAPI=7
 HOMEPAGE=https://www.vamp-plugins.org
 IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 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=BSD
 RDEPEND=media-libs/libsndfile:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/c4dm/vamp-plugin-sdk/archive/vamp-plugin-sdk-v2.10.tar.gz -> vamp-plugin-sdk-2.10.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=086ab2beba78af2a51e03936bc878c2b
+_md5_=d3b1f2d74a793672c61f88794101d5f6
diff --git a/metadata/md5-cache/media-libs/vidstab-1.1.0-r2 b/metadata/md5-cache/media-libs/vidstab-1.1.0-r2
index 4026bdbdf451..b7c5033fcbef 100644
--- a/metadata/md5-cache/media-libs/vidstab-1.1.0-r2
+++ b/metadata/md5-cache/media-libs/vidstab-1.1.0-r2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://github.com/georgmartius/vid.stab/archive/v1.1.0.tar.gz -> vidstab-1.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53b5956f78f26ca7c49f1fcc04b83d16
diff --git a/metadata/md5-cache/media-libs/vidstab-9999 b/metadata/md5-cache/media-libs/vidstab-9999
index 6ae30caabe83..221d9fe6056a 100644
--- a/metadata/md5-cache/media-libs/vidstab-9999
+++ b/metadata/md5-cache/media-libs/vidstab-9999
@@ -7,5 +7,5 @@ IUSE=openmp cpu_flags_x86_sse2 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 ab
 LICENSE=GPL-2+
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=600115fd63ae503a8a83aed3e64b0b72
diff --git a/metadata/md5-cache/media-libs/vigra-1.11.1-r3 b/metadata/md5-cache/media-libs/vigra-1.11.1-r3
index 65e8816d1fcb..98393b4fc9e6 100644
--- a/metadata/md5-cache/media-libs/vigra-1.11.1-r3
+++ b/metadata/md5-cache/media-libs/vigra-1.11.1-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( hdf5 || ( python_targets_python3_6 python_targets_python3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3282fffdb951dcf182b378d874fd17de
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.2.141 b/metadata/md5-cache/media-libs/vulkan-layers-1.2.141
index eda5143614b5..f79017567f70 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.2.141
+++ b/metadata/md5-cache/media-libs/vulkan-layers-1.2.141
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/v1.2.141.tar.gz -> vulkan-layers-1.2.141.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=156614d86ea939ef1a52389f0ffe04ec
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-9999 b/metadata/md5-cache/media-libs/vulkan-layers-9999
index 080e29079a9d..60374aa842b1 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-9999
+++ b/metadata/md5-cache/media-libs/vulkan-layers-9999
@@ -8,5 +8,5 @@ IUSE=wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_m
 LICENSE=Apache-2.0
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06d83fef7003a6a8518ceb840e09ddaf
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.2.141-r1 b/metadata/md5-cache/media-libs/vulkan-loader-1.2.141-r1
index 59a046820712..f85873aad56f 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.2.141-r1
+++ b/metadata/md5-cache/media-libs/vulkan-loader-1.2.141-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.2.141.tar.gz -> vulkan-loader-1.2.141.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1f7e7c6b0616170b41e77bd71d5458b
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-9999 b/metadata/md5-cache/media-libs/vulkan-loader-9999
index 8a5e83718395..e185d87efbec 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-9999
+++ b/metadata/md5-cache/media-libs/vulkan-loader-9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05d3bf7c2235220fe0f6aaa1d6fc610a
diff --git a/metadata/md5-cache/media-libs/x265-3.4 b/metadata/md5-cache/media-libs/x265-3.4
index 29ab5a4a104e..a244c9fb26e7 100644
--- a/metadata/md5-cache/media-libs/x265-3.4
+++ b/metadata/md5-cache/media-libs/x265-3.4
@@ -11,5 +11,5 @@ RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,ab
 RESTRICT=!test? ( test )
 SLOT=0/192
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_3.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01acbf0ef088798b6fdb39893f94d36d
diff --git a/metadata/md5-cache/media-libs/x265-9999 b/metadata/md5-cache/media-libs/x265-9999
index 964f59a4742c..93a7649ae10a 100644
--- a/metadata/md5-cache/media-libs/x265-9999
+++ b/metadata/md5-cache/media-libs/x265-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/195
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0179b7244c7247ae004c992cf43fa4b
diff --git a/metadata/md5-cache/media-libs/zmusic-1.1.2 b/metadata/md5-cache/media-libs/zmusic-1.1.2
index 99ef47d50acf..d5a4e6659405 100644
--- a/metadata/md5-cache/media-libs/zmusic-1.1.2
+++ b/metadata/md5-cache/media-libs/zmusic-1.1.2
@@ -10,5 +10,5 @@ LICENSE=BSD DUMB-0.9.3 GPL-3 LGPL-2.1+ LGPL-3 MIT
 RDEPEND=sys-libs/zlib alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth:= ) mpg123? ( media-sound/mpg123 ) sndfile? ( media-libs/libsndfile )
 SLOT=0
 SRC_URI=https://github.com/coelckers/ZMusic/archive/1.1.2.tar.gz -> zmusic-1.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=be4d93f361c90d950bb7d61892cbe8ee
diff --git a/metadata/md5-cache/media-libs/zxing-cpp-1.0.8-r1 b/metadata/md5-cache/media-libs/zxing-cpp-1.0.8-r1
index 76a11997ed51..888a3fb3e29f 100644
--- a/metadata/md5-cache/media-libs/zxing-cpp-1.0.8-r1
+++ b/metadata/md5-cache/media-libs/zxing-cpp-1.0.8-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm64 x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/nu-book/zxing-cpp/archive/v1.0.8.tar.gz -> zxing-cpp-1.0.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df05f44887ed0a683d3b8b1193b0c15f
diff --git a/metadata/md5-cache/media-libs/zxing-cpp-1.1.1 b/metadata/md5-cache/media-libs/zxing-cpp-1.1.1
index e99da96e1d06..08c9e5573fc4 100644
--- a/metadata/md5-cache/media-libs/zxing-cpp-1.1.1
+++ b/metadata/md5-cache/media-libs/zxing-cpp-1.1.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/nu-book/zxing-cpp/archive/v1.1.1.tar.gz -> zxing-cpp-1.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11ebee15046f800c993872dd16fc3754
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index f79bc19be6dc..f9fbd6b73d2f 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-modplug-2.0.3 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.3
index f249556f0c0a..490321d4c926 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.3
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18* >=media-libs/libmodplug-0.8.9.0
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.modplug/archive/2.0.3-Leia.tar.gz -> kodi-audiodecoder-modplug-2.0.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ca259e173211a41f08f1e8f62779d4ba
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-3.0.0
index a4cf9339faa1..7e8526ee48a1 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-libs/libmodplug-0.8.9.0
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.modplug/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-modplug-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=217c055b74395997e56139df4e52d178
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999
index 40c619c1028d..a8df23595c37 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/libmodplug-0.8.9.0
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=217c055b74395997e56139df4e52d178
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.1
index 90eefa0e0f14..58e3c4e1202c 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.nosefart/archive/2.0.1-Leia.tar.gz -> kodi-audiodecoder-nosefart-2.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=334528c99c1a263aec742f1ce7e46747
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.2
index 06e7c332f3b6..97c9f9b215ab 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.2
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.nosefart/archive/2.0.2-Leia.tar.gz -> kodi-audiodecoder-nosefart-2.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=334528c99c1a263aec742f1ce7e46747
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-3.0.0
index 2282f3eb6ce3..42b6f2d675e1 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.nosefart/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-nosefart-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c34f88411da870c7d7c508252013cd0b
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999
index 0bee750d383c..e553e556bc98 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1573b46fabab110d166d428240172ea
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-0.1.1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-0.1.1
index 0a1eec3dfcc0..642ce3049456 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-0.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* media-sound/wavpack virtual/libiconv
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.sacd/archive/0.1.1-Matrix.tar.gz -> kodi-audiodecoder-sacd-0.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=174a7c2fa4f0695dd12845f87fc608a3
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-9999
index 9d9242424826..42aefed9b6fc 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sacd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 media-sound/wavpack virtual/libiconv
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=174a7c2fa4f0695dd12845f87fc608a3
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.2 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.2
index 9ccc5bde4e4d..66c18a3a668c 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.2
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.2
@@ -9,5 +9,5 @@ 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.2-Leia.tar.gz -> kodi-audiodecoder-sidplay-1.2.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=370ce4b297531aec437aa166ce97fec1
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-2.1.3 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-2.1.3
index 1c3f8912ebb4..8840b156a4dc 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-2.1.3
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-2.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* media-libs/libsidplay:2
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.sidplay/archive/2.1.3-Matrix.tar.gz -> kodi-audiodecoder-sidplay-2.1.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7620a2b76cf36e8245c127fe869aa7a
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-3.0.0
index 4c58f00991ce..0119b825fb3f 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* media-libs/libsidplay:2
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.sidplay/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-sidplay-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7620a2b76cf36e8245c127fe869aa7a
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
index 465a7970e9d6..047b438ec957 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 media-libs/libsidplay:2
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26fbc6a442445c0be1956d5ce5d20005
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
index b0d6273cd43a..214e94a1df7f 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.1
@@ -9,5 +9,5 @@ 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	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ebccb2b3178585d06b99a3c5d761e66
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.2
index 761aed9c4a8a..b837bbad2704 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.2
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.snesapu/archive/2.0.2-Leia.tar.gz -> kodi-audiodecoder-snesapu-2.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ebccb2b3178585d06b99a3c5d761e66
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.1.3 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.1.3
index 1593fd010c5a..dc081f9fcc2f 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.1.3
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.snesapu/archive/2.1.3-Matrix.tar.gz -> kodi-audiodecoder-snesapu-2.1.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9035dbbc65f5b78eece52352876a9448
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-3.0.0
index 943d7067dcc0..3b1a19a009e5 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.snesapu/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-snesapu-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9035dbbc65f5b78eece52352876a9448
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
index 4b727d5412d2..56fe57096357 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f541b876f25f2e08ca6be443d14dfca3
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.2
index 12878a759f47..bb6bbad279bd 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.2
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.stsound/archive/2.0.2-Leia.tar.gz -> kodi-audiodecoder-stsound-2.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83075dbe3ec7fbc49da9cb5c67ec8d0d
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.1.3 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.1.3
index 1842a9d706d9..6caad50b69de 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.1.3
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.stsound/archive/2.1.3-Matrix.tar.gz -> kodi-audiodecoder-stsound-2.1.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8e476996b1ea9a66e79f924594884d3
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-3.0.0
index 21b7d5736b85..c5bcb426851d 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.stsound/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-stsound-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8e476996b1ea9a66e79f924594884d3
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
index 5ee91cf95658..dd3660b7ec21 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=553b79585ba9f85b877804ce9b0fe346
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.5 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.5
index eddf68b92539..1776df8d263b 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.5
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.timidity/archive/2.0.5-Leia.tar.gz -> kodi-audiodecoder-timidity-2.0.5-Leia.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a797b695acd2e15df834e10785f3bcbf
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.3.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.3.0
index 05a45e15f22c..1aa7b2decf74 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.timidity/archive/2.3.0-Matrix.tar.gz -> kodi-audiodecoder-timidity-2.3.0-Matrix.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1a7441d56a360a9ba8492b24262ad3b
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-3.0.0
index 43eaf5a68486..49acb042e102 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.timidity/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-timidity-3.0.0-Matrix.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=056f4cce952c3d1f97105a7577aa311a
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
index 9728c0ea4c4d..6c3167eaeb24 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8fbbdb76e0fae835ad01f5adb956edc
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.4 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.4
index f801de42639d..b9de88c6d3d4 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.4
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.vgmstream/archive/1.1.4-Leia.tar.gz -> kodi-audiodecoder-vgmstream-1.1.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cea769a4ad2c298df9ebbd4b2cdb3a38
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.5 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.5
index 37a2daa2b0c9..0bf48b439895 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.5
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/notspiff/audiodecoder.vgmstream/archive/1.1.5-Leia.tar.gz -> kodi-audiodecoder-vgmstream-1.1.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cea769a4ad2c298df9ebbd4b2cdb3a38
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-2.1.2 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-2.1.2
index 0399018f3cf0..f00938bbed1d 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-2.1.2
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-2.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.vgmstream/archive/2.1.2-Matrix.tar.gz -> kodi-audiodecoder-vgmstream-2.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd822441b63c906c11d821c6b3b29916
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-3.0.0
index 3f7a35d304a5..e01bbd7595bc 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audiodecoder.vgmstream/archive/3.0.0-Matrix.tar.gz -> kodi-audiodecoder-vgmstream-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd822441b63c906c11d821c6b3b29916
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999
index 677846893562..f4a9fd6f5ca8 100644
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07e556d5cab6f8f4e98a774bc96b1e12
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.6 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.6
index 516f1be2e7a8..039e00633c01 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.6
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 media-libs/flac
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/2.0.6-Leia.tar.gz -> kodi-audioencoder-flac-2.0.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a362531c708f630fca377473f1b3015c
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.1.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.1.1
index 153e5425ccbb..e075a5308f4e 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.4 media-libs/flac
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/2.1.1-Matrix.tar.gz -> kodi-audioencoder-flac-2.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bfc1679efe8dba62469840bd9a305cd4
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-3.0.0
index b03880b3f14c..a1339b1ef65e 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.4 media-libs/flac
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/3.0.0-Matrix.tar.gz -> kodi-audioencoder-flac-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03aa0ccdaacf4bb2759445d1019eb23e
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999
index 9664d2104353..efb45cdc702f 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/libogg-1.3.4 media-libs/flac
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bfc1679efe8dba62469840bd9a305cd4
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.2
index 3d0eb1f16b6a..8d39aa670581 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.2
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* >=media-sound/lame-3.100
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/2.0.2-Leia.tar.gz -> kodi-audioencoder-lame-2.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a3e27e2ec3730e4087daac0c69c565f9
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.4 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.4
index b1d2ce8eadf5..520d08549d5c 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.4
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18* >=media-sound/lame-3.100
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/2.0.4-Leia.tar.gz -> kodi-audioencoder-lame-2.0.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4653a0c8b4e47823d17d9d83aa8e984d
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.1.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.1.1
index 96dbddb0b15a..6655edba0794 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-sound/lame-3.100
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/2.1.1-Matrix.tar.gz -> kodi-audioencoder-lame-2.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=396941fb6bfd38f0135c8d6699257107
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.0
index 2ee59369b53d..2fca2b8549f7 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-sound/lame-3.100
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/3.0.0-Matrix.tar.gz -> kodi-audioencoder-lame-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=396941fb6bfd38f0135c8d6699257107
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.1
index 19d6db82d3fd..b6c321dc4a04 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-sound/lame-3.100
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/3.0.1-Matrix.tar.gz -> kodi-audioencoder-lame-3.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3bfb9cecab672b6f8d5e02ceef7b2a9e
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999
index 68f8073a89d3..0c2d28867133 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-sound/lame-3.100
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=396941fb6bfd38f0135c8d6699257107
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.4 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.4
index 0de1a05a27b3..10d5f55c6f4e 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.4
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/2.0.4-Leia.tar.gz -> kodi-audioencoder-vorbis-2.0.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=415bf5f5a66105104b2acfe54867c1c1
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.1.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.1.1
index ef619036d455..b409894625de 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/2.1.1-Matrix.tar.gz -> kodi-audioencoder-vorbis-2.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f29d6b1fe9088ea12fb31132e45a3d1
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-3.0.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-3.0.1
index a614c0426bdb..6dce2714fc39 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-3.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-3.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/3.0.1-Matrix.tar.gz -> kodi-audioencoder-vorbis-3.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49d921238bae7eee1b0711a4132007d0
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999
index d3e783f4ed1e..beea47459d44 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f29d6b1fe9088ea12fb31132e45a3d1
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.2
index ef85a6160ad2..90dce0c099cb 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.2
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.wav/archive/2.0.2-Leia.tar.gz -> kodi-audioencoder-wav-2.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffad2233eebc6b3f2949163cce7de692
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.3 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.3
index 1637c66512d4..50d2bac86c4e 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.3
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.wav/archive/2.0.3-Leia.tar.gz -> kodi-audioencoder-wav-2.0.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffad2233eebc6b3f2949163cce7de692
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.1.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.1.1
index 40938f5e328e..969215e10d2d 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.wav/archive/2.1.1-Matrix.tar.gz -> kodi-audioencoder-wav-2.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ae135ec47c89c09900fb17fcf3a935d
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-3.0.0
index fb18e5e5dca0..30484dcbbb00 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-3.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/audioencoder.wav/archive/3.0.0-Matrix.tar.gz -> kodi-audioencoder-wav-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ae135ec47c89c09900fb17fcf3a935d
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999
index e7f12ded8c64..8e9f146226d2 100644
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f68412babd0b4401950279d88bab254e
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-2.0.2 b/metadata/md5-cache/media-plugins/kodi-game-libretro-2.0.2
index 26a5f84b9be2..e111b6386a05 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-2.0.2
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-2.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro/archive/2.0.2-Matrix.tar.gz -> kodi-game-libretro-2.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12078c24f0e0791b35bcc8ef557aa05b
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-2.1.0 b/metadata/md5-cache/media-plugins/kodi-game-libretro-2.1.0
index f307ef2a1f4a..972b29b67739 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-2.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-2.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro/archive/2.1.0-Matrix.tar.gz -> kodi-game-libretro-2.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12078c24f0e0791b35bcc8ef557aa05b
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-2.2.0 b/metadata/md5-cache/media-plugins/kodi-game-libretro-2.2.0
index 531821f80a15..9552c4c0d82b 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-2.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro/archive/2.2.0-Matrix.tar.gz -> kodi-game-libretro-2.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12078c24f0e0791b35bcc8ef557aa05b
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
index 17aa0a232940..346ace2f6d95 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebe35956bfc45a3ef368ba718004eb9f
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999
index 5661436a3459..43ef5174bd1a 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-bnes-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-bnes
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=585b7c137de4133262dcfb5a98c90ade
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999
index db3cd602219e..1be6af248c7c 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-dosbox-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-dosbox
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2713682e411714382e9c5e64dccc463
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999
index 1d1f5c6cded4..f5c4902042a4 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-fceumm-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-fceumm
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d6a18ef4f0a6bed5428a1bc74d735a4
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.8 b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.8
index 18ee9a33e392..6c870511b644 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.8
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-nestopia
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.nestopia/archive/1.50.0.8-Leia.tar.gz -> kodi-game-libretro-nestopia-1.50.0.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf86414f2b80a2f3f32c0d41f0949ed1
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.9 b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.9
index bf64ac4ee761..54a0a9b99c50 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.9
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-1.50.0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-18* games-emulation/libretro-nestopia
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.nestopia/archive/1.50.0.9-Leia.tar.gz -> kodi-game-libretro-nestopia-1.50.0.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf86414f2b80a2f3f32c0d41f0949ed1
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999
index 3d609441e324..c94336909406 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-nestopia-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-nestopia
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=053751537705520f7bba7190a96a3cfa
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999
index e92d39ef8d40..86e26dd0f949 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-snes9x-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-snes9x
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d28e3b039e6ea2ecebf8833d38468845
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.113 b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.113
index beb55dd4eea5..1801b3974209 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.113
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-1.0.0.113
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-plugins/kodi-game-libretro =media-tv/kodi-19* games-emulation/libretro-twentyfortyeight
 SLOT=0
 SRC_URI=https://github.com/kodi-game/game.libretro.2048/archive/1.0.0.113-Matrix.tar.gz -> kodi-game-libretro-twentyfortyeight-1.0.0.113.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae8cdef58813a3c45b37168e6d815ffb
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999 b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999
index a1ddcf0159f6..6c5cd8cf6a75 100644
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999
+++ b/metadata/md5-cache/media-plugins/kodi-game-libretro-twentyfortyeight-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-plugins/kodi-game-libretro ~media-tv/kodi-9999 games-emulation/libretro-twentyfortyeight
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=04f9ade6d1e9c2af766fd356a856855f
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.1.0 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.1.0
index f286060abe46..38c366b8fa46 100644
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18* >=media-libs/libde265-1.0.5 >=media-libs/libheif-1.6.2
 SLOT=0
 SRC_URI=https://github.com/xbmc/imagedecoder.heif/archive/1.1.0-Leia.tar.gz -> kodi-imagedecoder-heif-1.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e36fe40225ed7bc57a44f6d1abf9b737
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.3.0 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.3.0
index ee7a1dc5a2e8..218d829d9cef 100644
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-libs/libde265-1.0.5 >=media-libs/libheif-1.6.2
 SLOT=0
 SRC_URI=https://github.com/xbmc/imagedecoder.heif/archive/1.3.0-Matrix.tar.gz -> kodi-imagedecoder-heif-1.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49e1ad9883808d8e8544c910cae78a1d
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-9999 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-9999
index c4f202b30d77..65b6b817332d 100644
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-9999
+++ b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND==media-tv/kodi-9999* >=media-libs/libde265-1.0.5 >=media-libs/libheif-1.6.2
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7dd28b09fca241e0697c7d53f47205bc
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-2.1.2 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-2.1.2
index 5eeb47f49dc5..2d2f0e1bc056 100644
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-2.1.2
+++ b/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-2.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18* >=media-libs/libraw-0.19.5[jpeg,lcms] >=media-libs/lcms-2.9
 SLOT=0
 SRC_URI=https://github.com/xbmc/imagedecoder.raw/archive/2.1.2-Leia.tar.gz -> kodi-imagedecoder-raw-2.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d1c5b26e18a88197f34a5d2e3341fda
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-3.0.1 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-3.0.1
index 7e1c4d1b730a..5efcd1f2cab2 100644
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-3.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-3.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19* >=media-libs/libraw-0.19.5[jpeg,lcms] >=media-libs/lcms-2.9
 SLOT=0
 SRC_URI=https://github.com/xbmc/imagedecoder.raw/archive/3.0.1-Matrix.tar.gz -> kodi-imagedecoder-raw-3.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=064c37ae7c4b8fc3b8845b34cafda8ba
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-9999 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-9999
index 1899e2fac2b9..37470426dcd6 100644
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-9999
+++ b/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/libraw-0.19.5[jpeg,lcms] >=media-libs/lcms-2.9
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd019d46e9331bfd09ce01b60a10ea40
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.4.5-r1 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.4.5-r1
index 836cd7a7d24a..dd0f67c4e4de 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.4.5-r1
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.4.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18*:= dev-libs/expat
 SLOT=0
 SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.4.5-Leia.tar.gz -> kodi-inputstream-adaptive-2.4.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c5c0e5b09b1c91f653dfd20f5d321719
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.0 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.0
index 981def241451..134d593478f6 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.0
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/expat =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/peak3d/inputstream.adaptive/archive/2.6.0-Matrix.tar.gz -> kodi-inputstream-adaptive-2.6.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f40f3be04e42204a3c2efa5f960197b3
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
index b559f483b445..9a1748e65392 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/expat
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7bd8306301b0d684ad39718927e12b82
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.9 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.9
index 868f875fe7c0..0ae7b6a6d663 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.9
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* media-video/rtmpdump
 SLOT=0
 SRC_URI=https://github.com/xbmc/inputstream.rtmp/archive/2.0.9-Leia.tar.gz -> kodi-inputstream-rtmp-2.0.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7031d9ce60f5204a8fa09584200cb0ca
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.9-r1 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.9-r1
index 804f966040af..36befbc271e4 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.9-r1
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18*:= media-video/rtmpdump[ssl]
 SLOT=0
 SRC_URI=https://github.com/xbmc/inputstream.rtmp/archive/2.0.9-Leia.tar.gz -> kodi-inputstream-rtmp-2.0.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=687fcb2583e4d6dff03b835d9821a887
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-3.1.1-r1 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-3.1.1-r1
index 0355a98b07b8..e9311c02e914 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-3.1.1-r1
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-3.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= media-video/rtmpdump[ssl]
 SLOT=0
 SRC_URI=https://github.com/xbmc/inputstream.rtmp/archive/3.1.1-Matrix.tar.gz -> kodi-inputstream-rtmp-3.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51aa8e0d6e6ce35ea74895abb738758c
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999
index c1e1ecf0973b..7f97e69bf866 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 media-video/rtmpdump[ssl]
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51aa8e0d6e6ce35ea74895abb738758c
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.9 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.9
index 12c1590c4743..8aaca4c4a6a2 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.9
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.4.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/libpcre
 SLOT=0
 SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/1.4.9-Leia.tar.gz -> kodi-peripheral-joystick-1.4.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26686a1f4cf492aa0c3a595d6aaddad7
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.6.0 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.6.0
index 61e0db03c5ca..5bceb85e77ce 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.6.0
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/libpcre dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/1.6.0-Matrix.tar.gz -> kodi-peripheral-joystick-1.6.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b952bcdf26b9479a8935a63fa7a2c75e
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.6.1 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.6.1
index fb52b5f8fbd3..bd830f2b78ba 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.6.1
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/libpcre dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/1.6.1-Matrix.tar.gz -> kodi-peripheral-joystick-1.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b952bcdf26b9479a8935a63fa7a2c75e
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.7.0 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.7.0
index 5d111a692342..6ec808b7d603 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.7.0
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/libpcre dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/1.7.0-Matrix.tar.gz -> kodi-peripheral-joystick-1.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b952bcdf26b9479a8935a63fa7a2c75e
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
index 82c47e4385c6..c5f348d57070 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/libpcre dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c178a6bd6db9bccc9e7dc733c3d12401
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999 b/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999
index 99f5fdf570d0..dc87ba615a91 100644
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999
+++ b/metadata/md5-cache/media-plugins/kodi-peripheral-steamcontroller-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* virtual/libusb:1
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=028f2fe5c212f055fcb3d98171ca30d5
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1
index c7a50dd8f63e..583a5ef4dcbe 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/6.0.1-Matrix.tar.gz -> kodi-pvr-argustv-6.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f26c506c599eb92a6556e98c93155378
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
index 6ce4a04d3489..142c7c5f37e6 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/jsoncpp
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6cfb504107e26694cfdfa34f142986b
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-3.6.1 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-3.6.1
index cb19e9155fc2..da17e602c0a7 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-3.6.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-demo-3.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.demo/archive/3.6.1-Leia.tar.gz -> kodi-pvr-demo-3.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f9b2425cdafae7a27240a456ffd4e75
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-6.0.1 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-6.0.1
index 5a4a820ba22b..6388399840bd 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-6.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-demo-6.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.demo/archive/6.0.1-Matrix.tar.gz -> kodi-pvr-demo-6.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae5a1a8d39f453d14051dc93ecf04d21
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
index 54db4bb40ce2..179a533a76fa 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-demo-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89159a91b8e077e83496d71b692ae9db
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-7.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-7.0.0
index f52c24da1130..6abbec8d1aab 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-7.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-7.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/7.0.0-Matrix.tar.gz -> kodi-pvr-dvblink-7.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13543830c91c73f559baac3d4ca04038
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-8.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-8.0.0
index 70029a1d068e..7672e7b0c0a8 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-8.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-8.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/8.0.0-Matrix.tar.gz -> kodi-pvr-dvblink-8.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13543830c91c73f559baac3d4ca04038
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
index 9584acd00182..f5bfbe92cbc7 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml2
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4d4e54839bcb5c7a1c62491cf4964add
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.6 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.6
index 295db974c5ea..41200cacff79 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.6
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/6.0.6-Matrix.tar.gz -> kodi-pvr-dvbviewer-6.0.6-Matrix.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d056bb44c05330ffe4a0387fda8750d5
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
index 4368347b0a4c..ad8e1b3f1b8d 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e16066c6cf49a1fd887ae265e719e825
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-5.1.0 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-5.1.0
index 588d752c1471..b6269b6bc48f 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-5.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-5.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.filmon/archive/5.1.0-Matrix.tar.gz -> kodi-pvr-filmon-5.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a5ab0d56942da68f9688a8948e96db8b
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
index a7bb5feb0361..7bdba8e71ac4 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3087614c5a1464d00a07a54e4f83ea22
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-7.1.1 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-7.1.1
index a107bad0aac3..6d309833f705 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-7.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-7.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/7.1.1-Matrix.tar.gz -> kodi-pvr-hts-7.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43b4165b07ab63a8029f8658b0cb507a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-7.1.4 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-7.1.4
index 469c7487cb66..fcbd8cbe04c1 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-7.1.4
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-7.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/7.1.4-Matrix.tar.gz -> kodi-pvr-hts-7.1.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43b4165b07ab63a8029f8658b0cb507a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
index 48773674da59..7609f91a8f8f 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND==dev-libs/libplatform-2* ~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=29ea2d242c9957dc61f7e0c28f879ae0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.8 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.8
index 91cd21724a89..d624e5369ef7 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.8
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-3.8.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* =media-libs/kodi-platform-18* sys-libs/zlib dev-libs/rapidxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/3.8.8-Leia.tar.gz -> kodi-pvr-iptvsimple-3.8.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9dc72d6b0de7de2a3efb1af17d20c947
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.2.4 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.2.4
index 8ad7e3d9ab2e..1e51450fb585 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.2.4
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/6.2.4-Matrix.tar.gz -> kodi-pvr-iptvsimple-6.2.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=77aacc9e4ec699b4ee88edc5acd21862
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.3.0 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.3.0
index 8af02c77db19..0b92331633f9 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/6.3.0-Matrix.tar.gz -> kodi-pvr-iptvsimple-6.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=77aacc9e4ec699b4ee88edc5acd21862
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.3.1 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.3.1
index 2d84247e3a07..e1ed82a58de5 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.3.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-6.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/6.3.1-Matrix.tar.gz -> kodi-pvr-iptvsimple-6.3.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=77aacc9e4ec699b4ee88edc5acd21862
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
index 45e1d1a71899..7dba353978fb 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND==dev-libs/libplatform-2* dev-libs/pugixml ~media-tv/kodi-9999 sys-libs/zlib
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dbe322f2f0b12c786f8dae8e5628467a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.0
index 6143ca6645ec..d3ab1ca82378 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/6.0.0-Matrix.tar.gz -> kodi-pvr-mediaportal-tvserver-6.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34543d523f85ad11097bf7d1a2038939
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.1 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.1
index 2e0fa0e3c3a0..0bda56ad1430 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-6.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/6.0.1-Matrix.tar.gz -> kodi-pvr-mediaportal-tvserver-6.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34543d523f85ad11097bf7d1a2038939
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
index aee54462c169..bb3969cfc613 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=051c9888bc284e5f7b8a55f313b7b1b6
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.15 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.15
index ce2c35716b09..4d1297776366 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.15
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.15
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18*
 SLOT=0
 SRC_URI=https://github.com/janbar/pvr.mythtv/archive/5.10.15-Leia.tar.gz -> kodi-pvr-mythtv-5.10.15.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6971b305070609a19330cd081c7d5415
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.16 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.16
index 13fff5844e50..87ed915415ea 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.16
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.16
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18*
 SLOT=0
 SRC_URI=https://github.com/janbar/pvr.mythtv/archive/5.10.16-Leia.tar.gz -> kodi-pvr-mythtv-5.10.16.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6971b305070609a19330cd081c7d5415
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.18 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.18
index f669d6230915..8347d12902bf 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.18
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18*
 SLOT=0
 SRC_URI=https://github.com/janbar/pvr.mythtv/archive/5.10.18-Leia.tar.gz -> kodi-pvr-mythtv-5.10.18.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6971b305070609a19330cd081c7d5415
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.19 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.19
index 13c3cc861049..72916971565c 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.19
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-5.10.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib =media-tv/kodi-18* =media-libs/kodi-platform-18*
 SLOT=0
 SRC_URI=https://github.com/janbar/pvr.mythtv/archive/5.10.19-Leia.tar.gz -> kodi-pvr-mythtv-5.10.19.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6971b305070609a19330cd081c7d5415
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.0.5 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.0.5
index 7424f6f3b770..062a4c2e3e48 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.0.5
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/janbar/pvr.mythtv/archive/7.0.5-Matrix.tar.gz -> kodi-pvr-mythtv-7.0.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88349025c79c8158983c04bfd55229ab
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.1.1 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.1.1
index d79a58ce1b1c..c39bf3cf5ef5 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/janbar/pvr.mythtv/archive/7.1.1-Matrix.tar.gz -> kodi-pvr-mythtv-7.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88349025c79c8158983c04bfd55229ab
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
index 46b55bcf54ce..c0ab0cfb38b3 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-mythtv-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sys-libs/zlib ~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0294532edebfcf0e5e6465e2c601cc54
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-7.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-7.0.0
index a4900afed08d..25c61ffde965 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-7.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-7.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/7.0.0-Matrix.tar.gz -> kodi-pvr-nextpvr-7.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=90e3a1a5b1ffff1804173fd7136be58f
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
index 1c5cc38d5eab..3e386bd8b36d 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml2
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0a3f9078ac2f93ab79b4e7be928f209
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-3.4.2 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-3.4.2
index f5f239094060..9073022d638d 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-3.4.2
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-3.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.njoy/archive/3.4.2-Leia.tar.gz -> kodi-pvr-njoy-3.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb9bf884b93504c12a1ca4d823c3f813
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-6.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-6.0.0
index a1dd0b1a7eb1..180462dd1a66 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-6.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-6.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.njoy/archive/6.0.0-Matrix.tar.gz -> kodi-pvr-njoy-6.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a15f8e055149f9dd79d39c2461fd20b
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
index a9a9ceada157..eb5a2893268a 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ab5e04331fee9e6a4f13c53f6354999
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-5.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-5.0.0
index 9035caee56a5..e3335c04f2bd 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-5.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-5.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.pctv/archive/5.0.0-Matrix.tar.gz -> kodi-pvr-pctv-5.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b40cb56ee49aad293d1dd5662c585897
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999
index a849b9191c70..9e2c767f9e47 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc7d16e070e36df168e9a21f653cc9db
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.10 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.10
index 6f5e8fcbe52e..d4dc4c9489a1 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.10
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-3.4.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/jsoncpp dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/3.4.10-Leia.tar.gz -> kodi-pvr-stalker-3.4.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1cac11f1565e5e7bea7f1c67dbf15149
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.0
index 12213c1a2b0d..bd5b0fb00941 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml =dev-libs/libplatform-2*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/6.0.0-Matrix.tar.gz -> kodi-pvr-stalker-6.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11fd1952b8bfecfb6df8c36c53f2606f
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
index 21db261dd110..12d5593da68f 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/jsoncpp dev-libs/tinyxml =dev-libs/libplatform-2*
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7ac2301adfd99f61865c806e642817f
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.5.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.5.0
index 4be422391536..06be78d79a70 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.5.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/4.5.0-Leia.tar.gz -> kodi-pvr-vbox-4.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c360cf0f4e94e63e62b3907de076280
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.6.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.6.0
index d915bfc8ca02..414dc3839b3e 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.6.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/4.6.0-Leia.tar.gz -> kodi-pvr-vbox-4.6.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c360cf0f4e94e63e62b3907de076280
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.7.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.7.0
index 582ba731d32a..b095dfa73d36 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.7.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-4.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml2
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/4.7.0-Leia.tar.gz -> kodi-pvr-vbox-4.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c360cf0f4e94e63e62b3907de076280
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.0
index e7b5055bac5e..a76f434683e1 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2 =dev-libs/libplatform-2*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/7.0.0-Matrix.tar.gz -> kodi-pvr-vbox-7.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99faadace00664867833ff3030aa59c1
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
index b00f56da3e0b..496c7736a109 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml2 =dev-libs/libplatform-2*
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df52d50d107427f5de26062e3dc94c69
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-3.6.3-r1 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-3.6.3-r1
index 137fc9ae9aae..7e0682404b05 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-3.6.3-r1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-3.6.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/3.6.3-Leia.tar.gz -> kodi-pvr-vdr-vnsi-3.6.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb6c717717e9c8bc9e87e66675169e30
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-6.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-6.0.0
index ed8e56b17487..5144c18c6a11 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-6.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-6.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-19* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/6.0.0-Matrix.tar.gz -> kodi-pvr-vdr-vnsi-6.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13aeca663b4d7b4b2232d4773e86e454
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-7.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-7.0.0
index 3c29ca113e5e..5202ded32937 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-7.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-7.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-19* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/7.0.0-Matrix.tar.gz -> kodi-pvr-vdr-vnsi-7.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13aeca663b4d7b4b2232d4773e86e454
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
index f41ad901b181..0a029a884aa3 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND==dev-libs/libplatform-2* ~media-tv/kodi-9999 virtual/opengl
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3163e0d77e0b5301914cbe6a6a659ed9
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
index 7451e858bd71..5adba6a02906 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.0
@@ -9,5 +9,5 @@ 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	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=488edc8adc98822e8cae27060899fcef
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.1 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.1
index 42dd543ece2f..0eec96700f0c 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.1
@@ -9,5 +9,5 @@ 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.1-Leia.tar.gz -> kodi-pvr-vuplus-3.28.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7f29263b74cb94356f1f8709ecb78c4
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.2 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.2
index 02559ef71245..bac149bd2a43 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.2
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.2
@@ -9,5 +9,5 @@ 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.2-Leia.tar.gz -> kodi-pvr-vuplus-3.28.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7f29263b74cb94356f1f8709ecb78c4
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.4 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.4
index cda300a99f48..6c7a6852b076 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.4
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.4
@@ -9,5 +9,5 @@ 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.4-Leia.tar.gz -> kodi-pvr-vuplus-3.28.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7f29263b74cb94356f1f8709ecb78c4
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.5 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.5
index 03491ef8fa3e..ddfc27799def 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.5
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.5
@@ -9,5 +9,5 @@ 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.5-Leia.tar.gz -> kodi-pvr-vuplus-3.28.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7f29263b74cb94356f1f8709ecb78c4
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.6 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.6
index f054f5680c47..e916c59848ed 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.6
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.6
@@ -9,5 +9,5 @@ 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.6-Leia.tar.gz -> kodi-pvr-vuplus-3.28.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7f29263b74cb94356f1f8709ecb78c4
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.7 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.7
index fe756ff6c2f1..b98ee633c0ee 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.7
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.7
@@ -9,5 +9,5 @@ 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.7-Leia.tar.gz -> kodi-pvr-vuplus-3.28.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7f29263b74cb94356f1f8709ecb78c4
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.8 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.8
index b516c6fcb6b2..365a78871ba6 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.8
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.8
@@ -9,5 +9,5 @@ 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.8-Leia.tar.gz -> kodi-pvr-vuplus-3.28.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7f29263b74cb94356f1f8709ecb78c4
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.9 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.9
index 6154a31c782a..8a3d3fedc56a 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.9
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-3.28.9
@@ -9,5 +9,5 @@ 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.9-Leia.tar.gz -> kodi-pvr-vuplus-3.28.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7f29263b74cb94356f1f8709ecb78c4
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-6.1.1 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-6.1.1
index 0fa8e8845d77..5c2fd2337222 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-6.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-6.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/6.1.1-Matrix.tar.gz -> kodi-pvr-vuplus-6.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1771f5d1036bb451c53a858e3f76dd14
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-6.1.2 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-6.1.2
index 7428ff305af9..377c5b4cd15f 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-6.1.2
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-6.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/6.1.2-Matrix.tar.gz -> kodi-pvr-vuplus-6.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1771f5d1036bb451c53a858e3f76dd14
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
index 387a4d9799ed..ff77c974573c 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4cfd3aa71b7780e0f91c300e075c2ad3
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.5 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.5
index 9777b5e2d3b2..92b71ac87290 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.5
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.wmc/archive/2.4.5-Leia.tar.gz -> kodi-pvr-wmc-2.4.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2650a371fe528c989fce818622016b60
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.6 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.6
index e2c1fffef65d..263d355034b6 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.6
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-2.4.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.wmc/archive/2.4.6-Leia.tar.gz -> kodi-pvr-wmc-2.4.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2650a371fe528c989fce818622016b60
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-5.0.1 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-5.0.1
index cc18df1ca44f..f6139610ee72 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-5.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-5.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.wmc/archive/5.0.1-Matrix.tar.gz -> kodi-pvr-wmc-5.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=67325750c9b37f43e714eb398dbb37ec
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-5.0.2 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-5.0.2
index 60de4ce8cf92..8de671cb6ffd 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-5.0.2
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-5.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2*
 SLOT=0
 SRC_URI=https://github.com/kodi-pvr/pvr.wmc/archive/5.0.2-Matrix.tar.gz -> kodi-pvr-wmc-5.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=67325750c9b37f43e714eb398dbb37ec
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
index 295bc95392e2..aad6afb2037d 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 =dev-libs/libplatform-2*
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e8db33841c5c89d5c8169144adc1365
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.3.2 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.3.2
index c9f50d4bbddc..4be2d54abf65 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.3.2
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18*:= >=media-libs/glm-0.9.9.8-r1
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.asteroids/archive/2.3.2-Leia.tar.gz -> kodi-screensaver-asteroids-2.3.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aceea592c0501e05ea0c70e744192ab6
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2
index 7fc1f08c8cd6..ae155fd86245 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.asteroids/archive/2.4.2-Matrix.tar.gz -> kodi-screensaver-asteroids-2.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7abc6fdd371c4e630c9c2d6ef17d24f
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2-r1
index ca51cd5ea7f4..a55becadf8ff 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2-r1
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-2.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.asteroids/archive/2.4.2-Matrix.tar.gz -> kodi-screensaver-asteroids-2.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dede65626323cb615b6ae68a152f6527
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
index db8c60a14229..bef715347f53 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-asteroids-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dede65626323cb615b6ae68a152f6527
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.2.3 b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.2.3
index 86ef9cf6a6ed..d5d1785c6ab6 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.2.3
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18*:=
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.biogenesis/archive/2.2.3-Leia.tar.gz -> kodi-screensaver-biogenesis-2.2.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ff3d4edb3526947177a6aa965521328
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2 b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2
index 6d1a76cba40e..e06febbbb936 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.biogenesis/archive/2.3.2-Matrix.tar.gz -> kodi-screensaver-biogenesis-2.3.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43a086c45ccb47bcf8c2646979ab141c
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2-r1
index 38e8f377b418..4fc0ba2038a9 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2-r1
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-2.3.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:=
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.biogenesis/archive/2.3.2-Matrix.tar.gz -> kodi-screensaver-biogenesis-2.3.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d127c0cfd164c99fa9641cdd6320b5f1
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999
index fc6d65d46c23..b7ed87ee01f2 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-biogenesis-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d127c0cfd164c99fa9641cdd6320b5f1
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-crystalmorph-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-crystalmorph-9999
index a37b440c89ba..f31b2a4738e3 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-crystalmorph-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-crystalmorph-9999
@@ -7,5 +7,5 @@ HOMEPAGE=https://github.com/notspiff/screensaver.crystalmorph
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=079fade7d241f79c9b6b0163a5b47fa3
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.2.2 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.2.2
index 6fcd1bdd2466..bcf065514945 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.2.2
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18*:= >=media-libs/glm-0.9.9.8-r1
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.greynetic/archive/2.2.2-Leia.tar.gz -> kodi-screensaver-greynetic-2.2.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=20646e437a137e93173f3f8bcc060caa
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1
index ec1ed506dbf0..1420382246f0 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.greynetic/archive/2.3.1-Matrix.tar.gz -> kodi-screensaver-greynetic-2.3.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2fb4455af8c71f63e5d506411f014342
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1-r1
index 9ba095b67ee8..72fbd7f959be 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1-r1
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.greynetic/archive/2.3.1-Matrix.tar.gz -> kodi-screensaver-greynetic-2.3.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f0b3ad46cb73f7ad9e2b7911b0968a7
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
index b9f588ff128e..a45a756bf02c 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-greynetic-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f0b3ad46cb73f7ad9e2b7911b0968a7
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.2.3 b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.2.3
index d76290468fea..23e857cd1218 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.2.3
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18*:= virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.matrixtrails/archive/2.2.3-Leia.tar.gz -> kodi-screensaver-matrixtrails-2.2.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d5193a290f782a3cef65c06beb441b60
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.4.2 b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.4.2
index e2cfad345061..8451ebcecf83 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.4.2
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.matrixtrails/archive/2.4.2-Matrix.tar.gz -> kodi-screensaver-matrixtrails-2.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b61b3e0bcff6603a6581c30420dc246
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.5.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.5.0
index 4249f670a087..44ffb3bd64a3 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.5.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.matrixtrails/archive/2.5.0-Matrix.tar.gz -> kodi-screensaver-matrixtrails-2.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b61b3e0bcff6603a6581c30420dc246
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.5.1 b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.5.1
index 753e0ff36813..6d7021d892d2 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.5.1
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.matrixtrails/archive/2.5.1-Matrix.tar.gz -> kodi-screensaver-matrixtrails-2.5.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b61b3e0bcff6603a6581c30420dc246
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.6.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.6.0
index 5b7a1e7da8b0..199fbb0b9955 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.6.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.matrixtrails/archive/2.6.0-Matrix.tar.gz -> kodi-screensaver-matrixtrails-2.6.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b61b3e0bcff6603a6581c30420dc246
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-9999
index 8c1494b91883..194e904eb60d 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-matrixtrails-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 virtual/opengl
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b61b3e0bcff6603a6581c30420dc246
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.1.2 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.1.2
index b90b0be7006a..289aaba4e8e3 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.1.2
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18*:= >=media-libs/glm-0.9.9.8-r1
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.pingpong/archive/2.1.2-Leia.tar.gz -> kodi-screensaver-pingpong-2.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f78fcc1976af281b4a82fa369db56948
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2
index 9166560c0a3c..706734a5d953 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.pingpong/archive/2.2.2-Matrix.tar.gz -> kodi-screensaver-pingpong-2.2.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=876c4600cd55a66cc1c751e01654ec77
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2-r1 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2-r1
index 03f2994edcb6..5ec0e3339d5c 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2-r1
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-2.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.pingpong/archive/2.2.2-Matrix.tar.gz -> kodi-screensaver-pingpong-2.2.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a68882ed13e769e373af1c03228162f
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
index 63dc563ddd79..6820c01e0323 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pingpong-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a68882ed13e769e373af1c03228162f
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.1.2 b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.1.2
index 25fc82a076bb..e2b7c9e08407 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.1.2
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.1.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.pyro/archive/3.1.2-Matrix.tar.gz -> kodi-screensaver-pyro-3.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b1f116859e4049e61dc8c1d4a0f5b69
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.2.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.2.0
index 3504355f0991..5d9c445c0db6 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.2.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.pyro/archive/3.2.0-Matrix.tar.gz -> kodi-screensaver-pyro-3.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b1f116859e4049e61dc8c1d4a0f5b69
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.3.0 b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.3.0
index 86c579ead587..160d5b90ef56 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-3.3.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/screensaver.pyro/archive/3.3.0-Matrix.tar.gz -> kodi-screensaver-pyro-3.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b1f116859e4049e61dc8c1d4a0f5b69
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999
index f8e2d7e0cb4f..366ce0165a90 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-pyro-9999
@@ -7,5 +7,5 @@ HOMEPAGE=https://github.com/xbmc/screensaver.pyro
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb9c7038a0a0fa767b60ec4a06802405
diff --git a/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-9999 b/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-9999
index 344fb57912e6..17542be5e8d5 100644
--- a/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-9999
+++ b/metadata/md5-cache/media-plugins/kodi-screensaver-rsxs-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=media-libs/libpng:= sys-libs/zlib virtual/opengl media-libs/glu
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aafaf92ffa9a180304d3b028d635498b
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-1.3.0 b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-1.3.0
index 267ecbb67ba4..aa8d484fc204 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-1.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-1.3.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/libarchive[bzip2,lz4,lzma,lzo,zlib] app-arch/lzma app-arch/bzip2 sys-libs/zlib app-arch/lz4 dev-libs/lzo:2 !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= app-arch/libarchive[libressl] ) =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.libarchive/archive/1.3.0-Matrix.tar.gz -> kodi-vfs-libarchive-1.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b904a80bf6afa22f14a5b9ec6897cde1
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-2.0.0 b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-2.0.0
index 67ef831c85e7..b4dfc823160b 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-2.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-2.0.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/libarchive[bzip2,lz4,lzma,lzo,zlib] app-arch/lzma app-arch/bzip2 sys-libs/zlib app-arch/lz4 dev-libs/lzo:2 !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= app-arch/libarchive[libressl] ) =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.libarchive/archive/2.0.0-Matrix.tar.gz -> kodi-vfs-libarchive-2.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b904a80bf6afa22f14a5b9ec6897cde1
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999
index 852f77cf161e..25380b591432 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-libarchive-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=app-arch/libarchive[bzip2,lz4,lzma,lzo,zlib] app-arch/lzma app-arch/bzip2 sys-libs/zlib app-arch/lz4 dev-libs/lzo:2 !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= app-arch/libarchive[libressl] ) ~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1792db55a9093f38e7187f54231d0c4
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.0 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.0
index b4c381dc0da7..c458b6bba11b 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.rar/archive/2.2.0-Leia.tar.gz -> kodi-vfs-rar-2.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3fc8eac900b52e34a3c7d000020b2ff4
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.1 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.1
index f5e6bd28da6e..d96e1072a8b1 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.1
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.rar/archive/2.2.1-Leia.tar.gz -> kodi-vfs-rar-2.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3fc8eac900b52e34a3c7d000020b2ff4
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.2 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.2
index 0f42ae00ccc2..04cea98ebc5f 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.2
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.rar/archive/2.2.2-Leia.tar.gz -> kodi-vfs-rar-2.2.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3fc8eac900b52e34a3c7d000020b2ff4
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.3 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.3
index b7448f2d600e..7abcc34f701c 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.3
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.2.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.rar/archive/2.2.3-Leia.tar.gz -> kodi-vfs-rar-2.2.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3fc8eac900b52e34a3c7d000020b2ff4
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.3.0 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.3.0
index 16ed6b848f63..30c034a97b02 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.3.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.rar/archive/2.3.0-Leia.tar.gz -> kodi-vfs-rar-2.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3fc8eac900b52e34a3c7d000020b2ff4
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.3.1 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.3.1
index f0cf1b83e5ad..1aeb01eb9e32 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.3.1
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18*:= dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.rar/archive/2.3.1-Leia.tar.gz -> kodi-vfs-rar-2.3.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=513f451f89c49655272ba0ad2a52862b
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-3.4.0 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-3.4.0
index 34551f0568f8..82a3e854f6a4 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-3.4.0
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-3.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.rar/archive/3.4.0-Matrix.tar.gz -> kodi-vfs-rar-3.4.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05418d2abcd6e72b9cb7464b3d0f1c9d
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-4.0.0 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-4.0.0
index 6467a4ecb1b3..54df39f5e8a1 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-4.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-4.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= dev-libs/tinyxml
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.rar/archive/4.0.0-Matrix.tar.gz -> kodi-vfs-rar-4.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05418d2abcd6e72b9cb7464b3d0f1c9d
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999
index 3fb38071a70d..5927a5e10ab8 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-rar-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 dev-libs/tinyxml
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05418d2abcd6e72b9cb7464b3d0f1c9d
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-1.0.3 b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-1.0.3
index 3327118df756..58c2b7e37728 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-1.0.3
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-1.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-libs/kodi-platform-18* =media-tv/kodi-18* virtual/libiconv
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.sacd/archive/1.0.3-Leia.tar.gz -> kodi-vfs-sacd-1.0.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6dd647ae1a5edfe8e3e3308de8ac778b
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-1.0.4 b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-1.0.4
index 379c360c3cff..dfb2b2009881 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-1.0.4
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-1.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-libs/kodi-platform-18* =media-tv/kodi-18* virtual/libiconv
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.sacd/archive/1.0.4-Leia.tar.gz -> kodi-vfs-sacd-1.0.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6dd647ae1a5edfe8e3e3308de8ac778b
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-1.3.0 b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-1.3.0
index 52b91e0eb26c..e59c4cfcb0f3 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-1.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-1.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* virtual/libiconv
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.sacd/archive/1.3.0-Matrix.tar.gz -> kodi-vfs-sacd-1.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19958974fc56b7e55c4f44e8311e232e
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-2.0.0 b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-2.0.0
index fd0c1861a07d..6d3f9b877c65 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-2.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* virtual/libiconv
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.sacd/archive/2.0.0-Matrix.tar.gz -> kodi-vfs-sacd-2.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19958974fc56b7e55c4f44e8311e232e
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-9999
index bec14bab0b7d..1c38e60d3848 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sacd-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sacd-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 virtual/libiconv
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9fe9efebc5cacf91926e2b29bdd85ec6
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.3 b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.3
index 01f459bf6a20..b203691e8d6d 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.3
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.sftp/archive/1.0.3-Leia.tar.gz -> kodi-vfs-sftp-1.0.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a83207b113a876319257bb333dfd434
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.4 b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.4
index b937c3b40fb4..ac2978db6a06 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.4
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libssh[sftp] =media-libs/kodi-platform-18* =media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.sftp/archive/1.0.4-Leia.tar.gz -> kodi-vfs-sftp-1.0.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1621b8650b18af5ffab95752f69a95a
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.5 b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.5
index c01125c42d77..b4ea09b6a7f2 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.5
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libssh[sftp] =media-libs/kodi-platform-18* =media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.sftp/archive/1.0.5-Leia.tar.gz -> kodi-vfs-sftp-1.0.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1621b8650b18af5ffab95752f69a95a
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.6 b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.6
index b1082be614e7..4931bc0ec457 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.6
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libssh[sftp] =media-libs/kodi-platform-18* =media-tv/kodi-18*
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.sftp/archive/1.0.6-Leia.tar.gz -> kodi-vfs-sftp-1.0.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1621b8650b18af5ffab95752f69a95a
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.3.0 b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.3.0
index 2d25e8621c2e..c11670f46dda 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-1.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libssh[sftp] =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.sftp/archive/1.3.0-Matrix.tar.gz -> kodi-vfs-sftp-1.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0aa61d143e649eec34bc9769a39e478
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-2.0.0 b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-2.0.0
index 50ff9377b210..9fb8e40766d5 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-2.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libssh[sftp] =media-tv/kodi-19*
 SLOT=0
 SRC_URI=https://github.com/xbmc/vfs.sftp/archive/2.0.0-Matrix.tar.gz -> kodi-vfs-sftp-2.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0aa61d143e649eec34bc9769a39e478
diff --git a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999 b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999
index 80b6bf33bfc8..ec8a140fdde1 100644
--- a/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999
+++ b/metadata/md5-cache/media-plugins/kodi-vfs-sftp-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=net-libs/libssh[sftp] ~media-tv/kodi-9999
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f8ea423949e8da62407a04c7bde59485
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-5.1.1 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-5.1.1
index 5bb8ca06d0f5..5a446194b9d4 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-5.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-5.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* virtual/opengl media-libs/glm
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.fishbmc/archive/5.1.1-Leia.tar.gz -> kodi-visualization-fishbmc-5.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ad5bfb3d5f1541a3ae2e80e9420f271
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-5.1.2 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-5.1.2
index 0f9e20b79922..d28386d4dec2 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-5.1.2
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-5.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.fishbmc/archive/5.1.2-Leia.tar.gz -> kodi-visualization-fishbmc-5.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4698493a1df2cc8917a25dab9fa47dd5
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.1.0 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.1.0
index 84cd477bdea3..d7d6a7ff674a 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.fishbmc/archive/6.1.0-Matrix.tar.gz -> kodi-visualization-fishbmc-6.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebbbd8aca8ace586546a901a28f869fe
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.1.0-r1
index 84cd477bdea3..d7d6a7ff674a 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.1.0-r1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.fishbmc/archive/6.1.0-Matrix.tar.gz -> kodi-visualization-fishbmc-6.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebbbd8aca8ace586546a901a28f869fe
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.2.0 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.2.0
index 19974fb673ac..6e1d45ea8cd4 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.fishbmc/archive/6.2.0-Matrix.tar.gz -> kodi-visualization-fishbmc-6.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebbbd8aca8ace586546a901a28f869fe
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.2.1 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.2.1
index 2d497a72ae26..1ec85ad67840 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.2.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.fishbmc/archive/6.2.1-Matrix.tar.gz -> kodi-visualization-fishbmc-6.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebbbd8aca8ace586546a901a28f869fe
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.3.0 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.3.0
index 213cc1d9cdc2..5a267c920657 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.fishbmc/archive/6.3.0-Matrix.tar.gz -> kodi-visualization-fishbmc-6.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebbbd8aca8ace586546a901a28f869fe
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999
index 1949c3744dca..cac09af2e408 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebbbd8aca8ace586546a901a28f869fe
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.1.0 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.1.0
index 9a935d2de91c..03e44d775f72 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.goom/archive/2.1.0-Leia.tar.gz -> kodi-visualization-goom-2.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=450618a40ef30594382ed514e49b57e3
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.2.0 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.2.0
index 79938d2e448a..1d2d03dfd111 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.goom/archive/2.2.0-Leia.tar.gz -> kodi-visualization-goom-2.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=450618a40ef30594382ed514e49b57e3
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.2.1 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.2.1
index 81ce1c929351..3561ed10c0c4 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.2.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.goom/archive/2.2.1-Leia.tar.gz -> kodi-visualization-goom-2.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=450618a40ef30594382ed514e49b57e3
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.2.1-r1 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.2.1-r1
index 7497846507d0..3cb791afce09 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.2.1-r1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-2.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.goom/archive/2.2.1-Leia.tar.gz -> kodi-visualization-goom-2.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f975d50e520b884d6e7008d672e258d5
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.2.0 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.2.0
index 84c80f30f6ef..18d370a80130 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.goom/archive/3.2.0-Matrix.tar.gz -> kodi-visualization-goom-3.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=541fee7b3aecb0c9dfa7618105154f9c
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.3.0 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.3.0
index 6c886ace55c7..cf5b10d54a8d 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.goom/archive/3.3.0-Matrix.tar.gz -> kodi-visualization-goom-3.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=541fee7b3aecb0c9dfa7618105154f9c
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.3.1 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.3.1
index 679bc95877dd..370968dddfad 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.3.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.goom/archive/3.3.1-Matrix.tar.gz -> kodi-visualization-goom-3.3.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=541fee7b3aecb0c9dfa7618105154f9c
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.4.0 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.4.0
index 20c275b63ede..d270494717d2 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.4.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.goom/archive/3.4.0-Matrix.tar.gz -> kodi-visualization-goom-3.4.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=541fee7b3aecb0c9dfa7618105154f9c
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999
index 4de7dbb26932..fe47e9b3e0a0 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-goom-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=541fee7b3aecb0c9dfa7618105154f9c
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-9999
index 4e40509edb7a..c16e8570c475 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 virtual/opengl
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a7ffa533fd62679cc86b13f56fb244cc
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.3.5 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.3.5
index 62a32f5d0391..55d24359a17f 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.3.5
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.3.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* >=media-libs/libprojectm-3.1.2:= >=media-libs/glm-0.9.9.5 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.projectm/archive/2.3.5-Leia.tar.gz -> kodi-visualization-projectm-2.3.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1fba1b9585c2bae76d524166473aef56
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.3.5-r1 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.3.5-r1
index c3671e109eb4..7aaa10c3b482 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.3.5-r1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-2.3.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18*:= virtual/opengl >=media-libs/libprojectm-3.1.2:=
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.projectm/archive/2.3.5-Leia.tar.gz -> kodi-visualization-projectm-2.3.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74bde5cb16569dded59bd8798c9649d8
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.1.0 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.1.0
index b6971e7e1184..5161cd987c0e 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* >=media-libs/libprojectm-3.1.2:= >=media-libs/glm-0.9.9.5 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.projectm/archive/3.1.0-Matrix.tar.gz -> kodi-visualization-projectm-3.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=45e7493e7f326021a38cb3a42ae4f741
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.1.0-r1 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.1.0-r1
index cb638d6b5623..628f72e201ab 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.1.0-r1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= virtual/opengl >=media-libs/libprojectm-3.1.2:=
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.projectm/archive/3.1.0-Matrix.tar.gz -> kodi-visualization-projectm-3.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83928399c16be07c5ce8fff252567456
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.2.0 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.2.0
index 38e65a34fdcf..881e839388a9 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= virtual/opengl >=media-libs/libprojectm-3.1.2:=
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.projectm/archive/3.2.0-Matrix.tar.gz -> kodi-visualization-projectm-3.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83928399c16be07c5ce8fff252567456
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.3.0 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.3.0
index 04977dfbd430..650cd02f7c03 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= virtual/opengl >=media-libs/libprojectm-3.1.2:=
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.projectm/archive/3.3.0-Matrix.tar.gz -> kodi-visualization-projectm-3.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83928399c16be07c5ce8fff252567456
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999
index ee235681f3b1..054e8e24a551 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 virtual/opengl >=media-libs/libprojectm-3.1.2:=
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83928399c16be07c5ce8fff252567456
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.2.1 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.2.1
index dc46e8b53312..a0f84d95af4a 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.2.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* media-libs/glm virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.shadertoy/archive/1.2.1-Leia.tar.gz -> kodi-visualization-shadertoy-1.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb8652b59056273ae2cb97d3db37da55
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.2.2 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.2.2
index e58a894ffe03..fad623877cff 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.2.2
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* media-libs/glm virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.shadertoy/archive/1.2.2-Leia.tar.gz -> kodi-visualization-shadertoy-1.2.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb8652b59056273ae2cb97d3db37da55
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.2.3 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.2.3
index 80eabb8be653..e4d038678f9c 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.2.3
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-1.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==dev-libs/libplatform-2* =media-tv/kodi-18* >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.shadertoy/archive/1.2.3-Leia.tar.gz -> kodi-visualization-shadertoy-1.2.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9fc729336a631370b6dda331a3f355b4
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.1.1 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.1.1
index 62b5f8ba58bd..8b7ddb685267 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.shadertoy/archive/2.1.1-Matrix.tar.gz -> kodi-visualization-shadertoy-2.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb9d0d8ba1f6db9783d6a46a3f95f4a7
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.2.0 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.2.0
index 77b300e839f8..d5760f7c14a3 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.shadertoy/archive/2.2.0-Matrix.tar.gz -> kodi-visualization-shadertoy-2.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb9d0d8ba1f6db9783d6a46a3f95f4a7
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.2.1 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.2.1
index cc3de768135b..d298f713664c 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.2.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.shadertoy/archive/2.2.1-Matrix.tar.gz -> kodi-visualization-shadertoy-2.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb9d0d8ba1f6db9783d6a46a3f95f4a7
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.3.0 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.3.0
index d69d5bfcb983..70387ad03315 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-2.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.shadertoy/archive/2.3.0-Matrix.tar.gz -> kodi-visualization-shadertoy-2.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb9d0d8ba1f6db9783d6a46a3f95f4a7
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999
index 55a97005f211..24955cef7a82 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-shadertoy-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc5fcb5de7ddfa7d0e6b953b39eba5e6
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.0.3 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.0.3
index 231dba559f66..32f4903992f2 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.0.3
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.spectrum/archive/3.0.3-Leia.tar.gz -> kodi-visualization-spectrum-3.0.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf7a2c0a638f4176b0d935b59f3057c5
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.2.0 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.2.0
index 2ded431f5ab1..38e4a75eb4de 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.spectrum/archive/3.2.0-Matrix.tar.gz -> kodi-visualization-spectrum-3.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79d8e2ef4139d44fc2cd352db5c6c72b
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.3.0 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.3.0
index 9c64178e1533..11aa02e1deae 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.spectrum/archive/3.3.0-Matrix.tar.gz -> kodi-visualization-spectrum-3.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79d8e2ef4139d44fc2cd352db5c6c72b
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.4.0 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.4.0
index 9b5190cbfd85..0e94042ea346 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.4.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.spectrum/archive/3.4.0-Matrix.tar.gz -> kodi-visualization-spectrum-3.4.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79d8e2ef4139d44fc2cd352db5c6c72b
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999
index 47df8d2f9203..6941fc98917b 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79d8e2ef4139d44fc2cd352db5c6c72b
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.0.0
index ef50f8aed6cd..4608f9b1ced0 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.0.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* media-libs/glm virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.starburst/archive/2.0.0-Leia.tar.gz -> kodi-visualization-starburst-2.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=30ffcb7fa4fa9718724bb3571db6b1e5
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.0.1 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.0.1
index ecadea93a80c..3ee321d3325d 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.0.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* media-libs/glm virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/notspiff/visualization.starburst/archive/2.0.1-Leia.tar.gz -> kodi-visualization-starburst-2.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=67fb1fbb6b908e2a32a751a7033c80c7
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.0.2 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.0.2
index 37b278aaaf16..f7e99102ca19 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.0.2
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.starburst/archive/2.0.2-Leia.tar.gz -> kodi-visualization-starburst-2.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=727f118e679c672b7c9291f13cc6a0b2
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.2.0 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.2.0
index b06f29a2d284..40a3747ec6ac 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.starburst/archive/2.2.0-Matrix.tar.gz -> kodi-visualization-starburst-2.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=edcdcc5756db5db55d9f4b55231a7034
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.3.0 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.3.0
index bc4cd2414bcf..102b55c54a71 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.starburst/archive/2.3.0-Matrix.tar.gz -> kodi-visualization-starburst-2.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=edcdcc5756db5db55d9f4b55231a7034
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.3.1 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.3.1
index 43121c29e472..13e2b2e71c36 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.3.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.starburst/archive/2.3.1-Matrix.tar.gz -> kodi-visualization-starburst-2.3.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=edcdcc5756db5db55d9f4b55231a7034
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.4.0 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.4.0
index b4830e6dbcd0..b5f28d780940 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.4.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.starburst/archive/2.4.0-Matrix.tar.gz -> kodi-visualization-starburst-2.4.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=edcdcc5756db5db55d9f4b55231a7034
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999
index 82ec103d952c..068fef95494b 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=edcdcc5756db5db55d9f4b55231a7034
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-3.0.2 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-3.0.2
index d39bdf51bfd1..fdd3104f4f69 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-3.0.2
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-3.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* virtual/opengl media-libs/glm
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.waveform/archive/3.0.2-Leia.tar.gz -> kodi-visualization-waveform-3.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb81c4ccd1d362886ef1daa9cd11de3d
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-3.1.0 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-3.1.0
index a4018090ae92..3a277ac63d00 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-3.1.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-3.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==media-tv/kodi-18* virtual/opengl media-libs/glm
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.waveform/archive/3.1.0-Leia.tar.gz -> kodi-visualization-waveform-3.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb81c4ccd1d362886ef1daa9cd11de3d
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-3.1.1 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-3.1.1
index 2a95905f3001..95bffa571183 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-3.1.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-3.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-18*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.waveform/archive/3.1.1-Leia.tar.gz -> kodi-visualization-waveform-3.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aaca7a260dfd3ed9f452da6f3e90866a
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.2.0 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.2.0
index d0313787f5e0..ff349aea9096 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.2.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.waveform/archive/4.2.0-Matrix.tar.gz -> kodi-visualization-waveform-4.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74dacc948ce3c07cfdd8b0b64323818f
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.3.0 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.3.0
index 8dc10d40c56e..22a82d357b7e 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.3.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.waveform/archive/4.3.0-Matrix.tar.gz -> kodi-visualization-waveform-4.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74dacc948ce3c07cfdd8b0b64323818f
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.3.1 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.3.1
index c1223a6ef3fb..d0c11ef861e3 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.3.1
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.waveform/archive/4.3.1-Matrix.tar.gz -> kodi-visualization-waveform-4.3.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74dacc948ce3c07cfdd8b0b64323818f
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.4.0 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.4.0
index 2da3ecd8e6cf..80b3a78abd09 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.4.0
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/xbmc/visualization.waveform/archive/4.4.0-Matrix.tar.gz -> kodi-visualization-waveform-4.4.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74dacc948ce3c07cfdd8b0b64323818f
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
index 7d1601d9c93e..aea5758717f6 100644
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
+++ b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=~media-tv/kodi-9999 >=media-libs/glm-0.9.9.8-r1 virtual/opengl
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74dacc948ce3c07cfdd8b0b64323818f
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.3.0 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.3.0
deleted file mode 100644
index c430e693dad3..000000000000
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libsamplerate >=media-libs/taglib-1.10 =media-sound/qmmp-1.3* dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-lang/yasm dev-qt/linguist-tools:5
-DESCRIPTION=A set of extra plugins for Qmmp
-EAPI=7
-HOMEPAGE=http://qmmp.ylsoftware.com/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsamplerate >=media-libs/taglib-1.10 =media-sound/qmmp-1.3* dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-1.3.0.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=859aff36fc1515d810edde9cf2403805
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.3.2 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.3.2
deleted file mode 100644
index 5fbaaa8ccb05..000000000000
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libsamplerate >=media-libs/taglib-1.10 =media-sound/qmmp-1.3* dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-lang/yasm dev-qt/linguist-tools:5
-DESCRIPTION=A set of extra plugins for Qmmp
-EAPI=7
-HOMEPAGE=http://qmmp.ylsoftware.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsamplerate >=media-libs/taglib-1.10 =media-sound/qmmp-1.3* dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-1.3.2.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c73ba19bd29944ec04f30632beb7d640
diff --git a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.4.0 b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.4.0
index 59e08409cfcd..44d297b24280 100644
--- a/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.4.0
+++ b/metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libsamplerate >=media-libs/taglib-1.10 =media-sound/qmmp-1.4* media-video/ffmpeg
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/plugins/qmmp-plugin-pack-1.4.0.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=811eb137d16c512b48d280f78f3266af
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.1.1 b/metadata/md5-cache/media-plugins/vdr-femon-2.1.1
deleted file mode 100644
index 3c8c683646a0..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.1.6 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: DVB Frontend Status Monitor (signal strengt/noise)
-EAPI=5
-HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/femon/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.1.6 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.1.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fe9e057731e22bbb7cd8d28ee6355fa4
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.2.0 b/metadata/md5-cache/media-plugins/vdr-femon-2.2.0
deleted file mode 100644
index c3c61c1e4606..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: DVB Frontend Status Monitor (signal strengt/noise)
-EAPI=5
-HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/femon/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.2.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=209e7a92984367c9c8f20a683126a26e
diff --git a/metadata/md5-cache/media-plugins/vdr-femon-2.2.1 b/metadata/md5-cache/media-plugins/vdr-femon-2.2.1
deleted file mode 100644
index 877f6413331a..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-femon-2.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: DVB Frontend Status Monitor (signal strengt/noise)
-EAPI=5
-HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/femon/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/vdr-femon-2.2.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0dd40595b762c197d59d709f129f3f89
diff --git a/metadata/md5-cache/media-plugins/vdr-remote-0.6.0-r1 b/metadata/md5-cache/media-plugins/vdr-remote-0.6.0-r1
deleted file mode 100644
index a3550f3fa1df..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-remote-0.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: use various devices for controlling vdr (keyboards, lirc, remotes bundled with tv-cards)
-EAPI=5
-HOMEPAGE=http://www.escape-edv.de/endriss/vdr/
-IUSE=systemd
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.escape-edv.de/endriss/vdr/vdr-remote-0.6.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1f4bebc960c01c9cb13ffd9e04646392
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.0 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.0
deleted file mode 100644
index e7feb48546e5..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: RSS reader
-EAPI=5
-HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.0.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b089105b16b23d274e0f949cbacc0184
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1
deleted file mode 100644
index c352744431a8..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: RSS reader
-EAPI=5
-HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.0.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8caa2808970f823b9d88d60754ee9cd1
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.0 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.0
deleted file mode 100644
index 0996b6b23f07..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: RSS reader
-EAPI=5
-HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.2.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5c072f5eef43ebf28e3892aab4fa97bd
diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1
deleted file mode 100644
index 78d1456931ad..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: RSS reader
-EAPI=5
-HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.2.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r1 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.2.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5c072f5eef43ebf28e3892aab4fa97bd
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.3 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.3
deleted file mode 100644
index d5766c34540c..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.0.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Skin Plugin: soppalusikka
-EAPI=5
-HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.0.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.0.3.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=489da1878f4418af51880565902f6609
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.0 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.0
deleted file mode 100644
index 597b9cf4b714..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Skin Plugin: soppalusikka
-EAPI=5
-HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.2.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.2.0.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=165d8cc21c444501cac9d1a9c3b1e97c
diff --git a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.1 b/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.1
deleted file mode 100644
index e847573d3ca2..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Skin Plugin: soppalusikka
-EAPI=5
-HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.2.0 x11-themes/vdr-channel-logos >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/vdr-skinsoppalusikka-2.2.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=165d8cc21c444501cac9d1a9c3b1e97c
diff --git a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1 b/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
deleted file mode 100644
index c66eae439b80..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.4.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: systeminfo
-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
-SLOT=0
-SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_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
deleted file mode 100644
index 72ed55e74d3d..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-systeminfo-0.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-1.4.7 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: systeminfo
-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
-SLOT=0
-SRC_URI=http://firefly.vdr-developer.org/systeminfo/vdr-systeminfo-0.1.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vdr-plugin-2	ade3484daa974237ce8f3ac2d064988f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=34e6f37109139b7a910a2aa24f2ec180
diff --git a/metadata/md5-cache/media-radio/KochMorse-3.4.0-r1 b/metadata/md5-cache/media-radio/KochMorse-3.4.0-r1
index 462470efa284..284c0659664a 100644
--- a/metadata/md5-cache/media-radio/KochMorse-3.4.0-r1
+++ b/metadata/md5-cache/media-radio/KochMorse-3.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/hmatuschek/kochmorse/archive/v3.4.0.tar.gz -> KochMorse-3.4.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5142a358d071b7756983c762f3d4a6b4
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index dcd9b1c7b286..c7167bf3c726 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/grig-0.8.1 b/metadata/md5-cache/media-radio/grig-0.8.1
index d90a82d27752..c276c3cf289f 100644
--- a/metadata/md5-cache/media-radio/grig-0.8.1
+++ b/metadata/md5-cache/media-radio/grig-0.8.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/hamlib
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 <media-libs/hamlib-3.4
 DESCRIPTION=A tool for controlling amateur radios
 EAPI=5
 HOMEPAGE=http://groundstation.sourceforge.net/grig/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 media-libs/hamlib
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 <media-libs/hamlib-3.4
 SLOT=0
 SRC_URI=mirror://sourceforge/groundstation/grig-0.8.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=77161f078ef48ffc35f9a69017a3a39b
+_md5_=1814a285593662b1759537816d2fa996
diff --git a/metadata/md5-cache/media-radio/tucnak-4.23 b/metadata/md5-cache/media-radio/tucnak-4.23
new file mode 100644
index 000000000000..8816d86fa151
--- /dev/null
+++ b/metadata/md5-cache/media-radio/tucnak-4.23
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) virtual/pkgconfig
+DESCRIPTION=Amateur Radio VHF Contest Logbook
+EAPI=7
+HOMEPAGE=http://tucnak.nagano.cz
+IUSE=alsa fftw gpm hamlib suid
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib )
+SLOT=0
+SRC_URI=http://tucnak.nagano.cz/tucnak-4.23.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=bf409551c237e267e7979f2c1fa90867
diff --git a/metadata/md5-cache/media-radio/wsjtx-2.2.2 b/metadata/md5-cache/media-radio/wsjtx-2.2.2
index 27d979acec8a..126ec0763c0f 100644
--- a/metadata/md5-cache/media-radio/wsjtx-2.2.2
+++ b/metadata/md5-cache/media-radio/wsjtx-2.2.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtsql:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/hamlib media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc doc? ( dev-ruby/asciidoctor )
 SLOT=0
 SRC_URI=mirror://sourceforge/wsjt/wsjtx-2.2.2.tgz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34f3be27425f4f8171368ad3d1003f87
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 3a9fa1e74870..5e3daea9245a 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/apulse-0.1.13 b/metadata/md5-cache/media-sound/apulse-0.1.13
index 8b37ea3def42..7a789c2e0c22 100644
--- a/metadata/md5-cache/media-sound/apulse-0.1.13
+++ b/metadata/md5-cache/media-sound/apulse-0.1.13
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/i-rinat/apulse/archive/v0.1.13.tar.gz -> apulse-0.1.13.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23756d4b78be02ea4d5816233222a38a
diff --git a/metadata/md5-cache/media-sound/aqualung-1.1 b/metadata/md5-cache/media-sound/aqualung-1.1
new file mode 100644
index 000000000000..7cb6545578a4
--- /dev/null
+++ b/metadata/md5-cache/media-sound/aqualung-1.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( dev-lang/lua:0= ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Music player for a wide range of formats designed for gapless playback
+EAPI=7
+HOMEPAGE=http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung
+IUSE=alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( dev-lang/lua:0= ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack )
+SLOT=0
+SRC_URI=https://github.com/jeremyevans/aqualung/releases/download/1.1/aqualung-1.1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a8f9ced57fb8d82bb11383eb3380af3e
diff --git a/metadata/md5-cache/media-sound/audacity-2.4.2-r1 b/metadata/md5-cache/media-sound/audacity-2.4.2-r1
index 333c46d6be18..56c92132d8e1 100644
--- a/metadata/md5-cache/media-sound/audacity-2.4.2-r1
+++ b/metadata/md5-cache/media-sound/audacity-2.4.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=portmidi? ( portsmf )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/audacity/audacity/archive/Audacity-2.4.2.tar.gz doc? ( https://dev.gentoo.org/~fordfrog/distfiles/audacity-manual-2.4.2.zip )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b52ef3531f2bd6e127f8709b38347042
diff --git a/metadata/md5-cache/media-sound/audex-0.95_pre20190721 b/metadata/md5-cache/media-sound/audex-0.95_pre20190721
index 4005b4e9af78..e7353195b82d 100644
--- a/metadata/md5-cache/media-sound/audex-0.95_pre20190721
+++ b/metadata/md5-cache/media-sound/audex-0.95_pre20190721
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://github.com/KDE/audex/archive/1389389e7341a749f95b313045f9d0cd809748b4.tar.gz -> audex-0.95_pre20190721.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fcb3091481b0c2778430d6b5f8d41900
diff --git a/metadata/md5-cache/media-sound/cantata-2.4.1 b/metadata/md5-cache/media-sound/cantata-2.4.1
index 6c27ad245f16..013ebbfeb9fb 100644
--- a/metadata/md5-cache/media-sound/cantata-2.4.1
+++ b/metadata/md5-cache/media-sound/cantata-2.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( cdda cdio ) cdda? ( udisks || ( cddb musicbrainz ) ) cddb? ( |
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CDrummond/cantata/releases/download/v2.4.1/cantata-2.4.1.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b83cfbd43a382b3b7ef1511746a967a9
diff --git a/metadata/md5-cache/media-sound/cantata-2.4.2 b/metadata/md5-cache/media-sound/cantata-2.4.2
index b15460e3c100..b2ec028d610c 100644
--- a/metadata/md5-cache/media-sound/cantata-2.4.2
+++ b/metadata/md5-cache/media-sound/cantata-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( cdda cdio ) cdda? ( udisks || ( cddb musicbrainz ) ) cddb? ( |
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CDrummond/cantata/releases/download/v2.4.2/cantata-2.4.2.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49b4a7f759ed6f9ff2f8c32572c15a33
diff --git a/metadata/md5-cache/media-sound/clementine-1.4.0_rc1 b/metadata/md5-cache/media-sound/clementine-1.4.0_rc1
index 1e49b12b14ec..0bcf7301cb15 100644
--- a/metadata/md5-cache/media-sound/clementine-1.4.0_rc1
+++ b/metadata/md5-cache/media-sound/clementine-1.4.0_rc1
@@ -12,5 +12,5 @@ REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/clementine-player/Clementine/releases/download/1.4.0rc1/clementine-1.4.0rc1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9eccea247b6c876a44a9d84066d81e84
diff --git a/metadata/md5-cache/media-sound/clementine-9999 b/metadata/md5-cache/media-sound/clementine-9999
index d1f13c0bb32d..de7f4e03d952 100644
--- a/metadata/md5-cache/media-sound/clementine-9999
+++ b/metadata/md5-cache/media-sound/clementine-9999
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++:= dev-libs/gli
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6498ca5a432ef3d83df204c19dfebc16
diff --git a/metadata/md5-cache/media-sound/csound-6.15.0 b/metadata/md5-cache/media-sound/csound-6.15.0
index dd0a12b2cc4f..c62cc7dd8fa0 100644
--- a/metadata/md5-cache/media-sound/csound-6.15.0
+++ b/metadata/md5-cache/media-sound/csound-6.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=linear? ( double-precision ) lua? ( cxx ) python? ( ^^ ( python_sin
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/csound-6.15.0-distributable.tar.xz doc? ( https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual_html.zip )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b25027417a4a538d2c59ea74cabc440
diff --git a/metadata/md5-cache/media-sound/csound-9999 b/metadata/md5-cache/media-sound/csound-9999
index 1ef69da8ec0a..f7d04b80347c 100644
--- a/metadata/md5-cache/media-sound/csound-9999
+++ b/metadata/md5-cache/media-sound/csound-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate
 REQUIRED_USE=linear? ( double-precision ) lua? ( cxx ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) cxx )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9728a5672b16b2c359bfa06c3739881d
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.8.4 b/metadata/md5-cache/media-sound/deadbeef-1.8.4
new file mode 100644
index 000000000000..d857d52e23f5
--- /dev/null
+++ b/metadata/md5-cache/media-sound/deadbeef-1.8.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=DeaDBeeF is a modular audio player similar to foobar2000
+EAPI=7
+HOMEPAGE=https://deadbeef.sourceforge.io/
+IUSE=aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio shellexec +supereq threads vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=x11-libs/gtk+:3 net-misc/curl:0= dev-libs/jansson aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:0= media-libs/libcddb dev-libs/libcdio-paranoia:0= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis )
+REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
+SLOT=0
+SRC_URI=https://github.com/DeaDBeeF-Player/deadbeef/archive/1.8.4.tar.gz -> deadbeef-1.8.4.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e21e298376d1520a587dcfbdc816bfb7
diff --git a/metadata/md5-cache/media-sound/drumstick-1.1.3 b/metadata/md5-cache/media-sound/drumstick-1.1.3
index cc1000801aec..332076f38e97 100644
--- a/metadata/md5-cache/media-sound/drumstick-1.1.3
+++ b/metadata/md5-cache/media-sound/drumstick-1.1.3
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/drumstick/drumstick-1.1.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2bc2c8608486c73f27d292e29f3540b
diff --git a/metadata/md5-cache/media-sound/elisa-20.04.3 b/metadata/md5-cache/media-sound/elisa-20.04.3
index afd6d3245e72..3b40196e89a3 100644
--- a/metadata/md5-cache/media-sound/elisa-20.04.3
+++ b/metadata/md5-cache/media-sound/elisa-20.04.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare
 DEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdeclarative-5.70.0:5 >=kde-frameworks/kfilemetadata-5.70.0:5[taglib] >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kirigami-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 mpris? ( >=dev-qt/qtdbus-5.14.2:5 >=kde-frameworks/kdbusaddons-5.70.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.70.0:5 ) vlc? ( media-video/vlc:= ) !vlc? ( >=dev-qt/qtmultimedia-5.14.2:5[gstreamer] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Simple music player by KDE
 EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.elisa https://community.kde.org/Elisa
+HOMEPAGE=https://elisa.kde.org/ https://kde.org/applications/en/elisa
 IUSE=mpris semantic-desktop +vlc debug +handbook test
 KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-3+
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmulti
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.04.3/src/elisa-20.04.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1a267d70471ea1a920778d6c9ff25f8
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5b12705e0dc7861637013d8de2d684a9
diff --git a/metadata/md5-cache/media-sound/elisa-20.08.1 b/metadata/md5-cache/media-sound/elisa-20.08.1
index 6653ec68065f..13a0f623c44c 100644
--- a/metadata/md5-cache/media-sound/elisa-20.08.1
+++ b/metadata/md5-cache/media-sound/elisa-20.08.1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare
 DEPEND=>=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtmultimedia-5.14.2:5 >=dev-qt/qtsql-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kconfig-5.72.0:5 >=kde-frameworks/kconfigwidgets-5.72.0:5 >=kde-frameworks/kcoreaddons-5.72.0:5 >=kde-frameworks/kcrash-5.72.0:5 >=kde-frameworks/kdeclarative-5.72.0:5 >=kde-frameworks/kfilemetadata-5.72.0:5[taglib] >=kde-frameworks/ki18n-5.72.0:5 >=kde-frameworks/kio-5.72.0:5 >=kde-frameworks/kirigami-5.72.0:5 >=kde-frameworks/kitemviews-5.72.0:5 >=kde-frameworks/kxmlgui-5.72.0:5 mpris? ( >=dev-qt/qtdbus-5.14.2:5 >=kde-frameworks/kdbusaddons-5.72.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.72.0:5 ) vlc? ( media-video/vlc:= ) !vlc? ( >=dev-qt/qtmultimedia-5.14.2:5[gstreamer] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Simple music player by KDE
 EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.elisa https://community.kde.org/Elisa
+HOMEPAGE=https://elisa.kde.org/ https://kde.org/applications/en/elisa
 IUSE=mpris semantic-desktop +vlc debug +handbook test
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-3+
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.14.2:5[widgets] >=dev-qt/qtgui-5.14.2:5 >=dev-q
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/20.08.1/src/elisa-20.08.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60fd105b5af878b3c404795b43fae4c6
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a5c1100d303bf90be791bdba9281dca8
diff --git a/metadata/md5-cache/media-sound/flacon-5.5.1 b/metadata/md5-cache/media-sound/flacon-5.5.1
index 07f6b72a569c..f82f519a2ec3 100644
--- a/metadata/md5-cache/media-sound/flacon-5.5.1
+++ b/metadata/md5-cache/media-sound/flacon-5.5.1
@@ -11,5 +11,5 @@ RDEPEND=app-i18n/uchardet dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flacon/flacon/archive/v5.5.1.tar.gz -> flacon-5.5.1.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59bc7daeca9dde4802e7b37651a3bfd4
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.1.0 b/metadata/md5-cache/media-sound/fluidsynth-2.1.0
index 2f8681b84ab9..43e3605b7ea6 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-2.1.0
+++ b/metadata/md5-cache/media-sound/fluidsynth-2.1.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/2
 SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.1.0.tar.gz -> fluidsynth-2.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d53ec320037222783fd4e4672638a8a
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.1.4 b/metadata/md5-cache/media-sound/fluidsynth-2.1.4
index e990b7f9fe1b..e08387235596 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-2.1.4
+++ b/metadata/md5-cache/media-sound/fluidsynth-2.1.4
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/2
 SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.1.4.tar.gz -> fluidsynth-2.1.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=02f6eaa53f1ec6e66c53b8ade68d0d66
diff --git a/metadata/md5-cache/media-sound/gogglesmm-1.2.1-r1 b/metadata/md5-cache/media-sound/gogglesmm-1.2.1-r1
index 8000e6c195e1..f8189420735a 100644
--- a/metadata/md5-cache/media-sound/gogglesmm-1.2.1-r1
+++ b/metadata/md5-cache/media-sound/gogglesmm-1.2.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=x11-libs/fox:1.7 x11-libs/libSM x11-libs/libICE dev-db/sqlite media-libs/taglib dev-libs/expat dev-libs/libgcrypt:= dbus? ( sys-apps/dbus ) flac? ( media-libs/flac ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis ) ogg? ( media-libs/libogg ) opus? ( media-libs/opus ) aac? ( media-libs/faad2 ) pulseaudio? ( media-sound/pulseaudio ) opengl? ( media-libs/libepoxy virtual/glu )
 SLOT=0
 SRC_URI=https://github.com/gogglesmm/gogglesmm/archive/1.2.1.tar.gz -> gogglesmm-1.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e0fd367851b09fdad65993173c23e1f
diff --git a/metadata/md5-cache/media-sound/guayadeque-0.4.6 b/metadata/md5-cache/media-sound/guayadeque-0.4.6
index 031503bd956a..1941bb45947c 100644
--- a/metadata/md5-cache/media-sound/guayadeque-0.4.6
+++ b/metadata/md5-cache/media-sound/guayadeque-0.4.6
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite:3 dev-db/wxsqlite3 dev-libs/glib:2 media-libs/flac media-l
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/anonbeat/guayadeque/archive/v0.4.6.tar.gz -> guayadeque-0.4.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07208f07462d47a79b3572f4d19214e3
diff --git a/metadata/md5-cache/media-sound/guayadeque-9999 b/metadata/md5-cache/media-sound/guayadeque-9999
index 5b21d2bca303..9615b4c10fbc 100644
--- a/metadata/md5-cache/media-sound/guayadeque-9999
+++ b/metadata/md5-cache/media-sound/guayadeque-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-db/sqlite:3 dev-db/wxsqlite3 dev-libs/glib:2 media-libs/flac media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/taglib net-misc/curl sys-apps/dbus x11-libs/wxGTK:3.0[X] appindicator? ( >=dev-libs/libindicate-0.7 ) ipod? ( media-libs/libgpod ) !minimal? ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-libnice:1.0 media-plugins/gst-plugins-pulse:1.0 media-plugins/gst-plugins-soup:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1006eb8ec9ac47c61a27e715a3f079e7
diff --git a/metadata/md5-cache/media-sound/hydrogen-1.0.0 b/metadata/md5-cache/media-sound/hydrogen-1.0.0
index a2df3ab79a0b..92f842da21ab 100644
--- a/metadata/md5-cache/media-sound/hydrogen-1.0.0
+++ b/metadata/md5-cache/media-sound/hydrogen-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
 SRC_URI=https://github.com/hydrogen-music/hydrogen/archive/1.0.0.tar.gz -> hydrogen-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7df9e7c42fe65ffde78859677f0ab5db
diff --git a/metadata/md5-cache/media-sound/hydrogen-1.0.1 b/metadata/md5-cache/media-sound/hydrogen-1.0.1
index b9b59d895e33..5f0fb2a2be42 100644
--- a/metadata/md5-cache/media-sound/hydrogen-1.0.1
+++ b/metadata/md5-cache/media-sound/hydrogen-1.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
 SRC_URI=https://github.com/hydrogen-music/hydrogen/archive/1.0.1.tar.gz -> hydrogen-1.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce5f9f593c20677e142487fa977a03e9
diff --git a/metadata/md5-cache/media-sound/hydrogen-9999 b/metadata/md5-cache/media-sound/hydrogen-9999
index ddd1754929fb..c5c0721a8cd3 100644
--- a/metadata/md5-cache/media-sound/hydrogen-9999
+++ b/metadata/md5-cache/media-sound/hydrogen-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/libsndfile-1.0.18 alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) !archive? ( >=dev-libs/libtar-1.2.11-r3 ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lash? ( media-sound/lash ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=lash? ( alsa )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e1fe34e31075f0884fd81a5cff3425d8
diff --git a/metadata/md5-cache/media-sound/jack-keyboard-2.7.2-r1 b/metadata/md5-cache/media-sound/jack-keyboard-2.7.2-r1
index 8e927fbf1271..1ab28e01a151 100644
--- a/metadata/md5-cache/media-sound/jack-keyboard-2.7.2-r1
+++ b/metadata/md5-cache/media-sound/jack-keyboard-2.7.2-r1
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=dev-libs/glib:2 virtual/jack x11-libs/gtk+:2 lash? ( media-sound/lash ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://sourceforge/jack-keyboard/jack-keyboard/2.7.2/jack-keyboard-2.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8b1a46b46572daacc146abb1f491ba3
diff --git a/metadata/md5-cache/media-sound/kid3-3.8.3 b/metadata/md5-cache/media-sound/kid3-3.8.3
index ae5d3e60e729..56f060650b46 100644
--- a/metadata/md5-cache/media-sound/kid3-3.8.3
+++ b/metadata/md5-cache/media-sound/kid3-3.8.3
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedi
 REQUIRED_USE=flac? ( vorbis )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.8.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c83885f22fa226fa8cedd331ae2872d0
diff --git a/metadata/md5-cache/media-sound/kid3-3.8.4 b/metadata/md5-cache/media-sound/kid3-3.8.4
new file mode 100644
index 000000000000..9a4906ae8e28
--- /dev/null
+++ b/metadata/md5-cache/media-sound/kid3-3.8.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 kde? ( kde-frameworks/extra-cmake-modules:5 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare test unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint media-video/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) mpris? ( dev-qt/qtdbus:5 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple tag editor based on Qt
+EAPI=7
+HOMEPAGE=https://kid3.kde.org/
+IUSE=acoustid flac kde mp3 mp4 +mpris +taglib vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint media-video/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) mpris? ( dev-qt/qtdbus:5 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !media-sound/kid3:4
+REQUIRED_USE=flac? ( vorbis )
+SLOT=5
+SRC_URI=mirror://sourceforge/kid3/kid3-3.8.4.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b09be6e2604cadf2267e38a7aa99b594
diff --git a/metadata/md5-cache/media-sound/kmetronome-1.0.1 b/metadata/md5-cache/media-sound/kmetronome-1.0.1
index 12ed0db68b2b..c5b9f2407374 100644
--- a/metadata/md5-cache/media-sound/kmetronome-1.0.1
+++ b/metadata/md5-cache/media-sound/kmetronome-1.0.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib >=media-sound/drumstick-1.0.0
 SLOT=5
 SRC_URI=mirror://sourceforge/kmetronome/kmetronome-1.0.1.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d771598a3d0a805be2a117dd14153dc7
diff --git a/metadata/md5-cache/media-sound/lilypond-2.21.4-r1 b/metadata/md5-cache/media-sound/lilypond-2.21.4-r1
index 5ef0ad388379..48ff06e98378 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.21.4-r1
+++ b/metadata/md5-cache/media-sound/lilypond-2.21.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=http://lilypond.org/download/sources/v2.21/lilypond-2.21.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb7e715b09e545140b0f6e2b9a8200ec
diff --git a/metadata/md5-cache/media-sound/lilypond-2.21.5 b/metadata/md5-cache/media-sound/lilypond-2.21.5
index 1336eea8771b..dba55b3c05e7 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.21.5
+++ b/metadata/md5-cache/media-sound/lilypond-2.21.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=http://lilypond.org/download/sources/v2.21/lilypond-2.21.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e0017ff9e4d8e36c992b126de55d068
diff --git a/metadata/md5-cache/media-sound/lilypond-2.21.6 b/metadata/md5-cache/media-sound/lilypond-2.21.6
index 563f81db5a4b..27d298946f0b 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.21.6
+++ b/metadata/md5-cache/media-sound/lilypond-2.21.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=http://lilypond.org/download/sources/v2.21/lilypond-2.21.6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93ef08670034f899629ff705097edc00
diff --git a/metadata/md5-cache/media-sound/lilypond-9999 b/metadata/md5-cache/media-sound/lilypond-9999
index 9ff6731ce17a..0aad1f350557 100644
--- a/metadata/md5-cache/media-sound/lilypond-9999
+++ b/metadata/md5-cache/media-sound/lilypond-9999
@@ -11,5 +11,5 @@ RDEPEND=app-text/ghostscript-gpl dev-scheme/guile:12=[deprecated,regex] media-fo
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93ef08670034f899629ff705097edc00
diff --git a/metadata/md5-cache/media-sound/lmms-1.2.2 b/metadata/md5-cache/media-sound/lmms-1.2.2
index 7228ad8e5a00..64208d3d3a12 100644
--- a/metadata/md5-cache/media-sound/lmms-1.2.2
+++ b/metadata/md5-cache/media-sound/lmms-1.2.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) mp3? ( media-sound/lame ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) media-plugins/calf media-plugins/caps-plugins media-plugins/cmt-plugins media-plugins/swh-plugins media-plugins/tap-plugins
 SLOT=0
 SRC_URI=https://github.com/LMMS/lmms/releases/download/v1.2.2/lmms_1.2.2.tar.xz -> lmms-1.2.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6e1312ce24c9a01f73d0eaa5504635a
diff --git a/metadata/md5-cache/media-sound/lmms-9999 b/metadata/md5-cache/media-sound/lmms-9999
index 35657ff987d9..ea58757d5b78 100644
--- a/metadata/md5-cache/media-sound/lmms-9999
+++ b/metadata/md5-cache/media-sound/lmms-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) mp3? ( media-sound/lame ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) media-plugins/calf media-plugins/caps-plugins media-plugins/cmt-plugins media-plugins/swh-plugins media-plugins/tap-plugins
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=860d99163f1d7b46287cdf3fd2e57fd8
diff --git a/metadata/md5-cache/media-sound/loudness-scanner-0.5.1_p20190709 b/metadata/md5-cache/media-sound/loudness-scanner-0.5.1_p20190709
index f1faffe7b4ae..55fabdcfa444 100644
--- a/metadata/md5-cache/media-sound/loudness-scanner-0.5.1_p20190709
+++ b/metadata/md5-cache/media-sound/loudness-scanner-0.5.1_p20190709
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib media-libs/libebur128 media-libs/taglib ffmpeg? ( media-vi
 REQUIRED_USE=|| ( sndfile ffmpeg mpg123 musepack )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tamiko/distfiles/loudness-scanner-0.5.1_p20190709.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c4645c7f66e7a3ce105129241ba5f7b
diff --git a/metadata/md5-cache/media-sound/loudness-scanner-9999 b/metadata/md5-cache/media-sound/loudness-scanner-9999
index 37ef7361b4a6..250a0186b421 100644
--- a/metadata/md5-cache/media-sound/loudness-scanner-9999
+++ b/metadata/md5-cache/media-sound/loudness-scanner-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib media-libs/libebur128 media-libs/taglib ffmpeg? ( media-video/ffmpeg ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) sndfile? ( media-libs/libsndfile ) gtk? ( gnome-base/librsvg:2 x11-libs/cairo x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=|| ( sndfile ffmpeg mpg123 musepack )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6abe957c105f0104469b88e5a7a1cf1b
diff --git a/metadata/md5-cache/media-sound/milkytracker-1.02.00-r1 b/metadata/md5-cache/media-sound/milkytracker-1.02.00-r1
index 703d84fce613..7d665a790821 100644
--- a/metadata/md5-cache/media-sound/milkytracker-1.02.00-r1
+++ b/metadata/md5-cache/media-sound/milkytracker-1.02.00-r1
@@ -10,5 +10,5 @@ LICENSE=|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT
 RDEPEND=dev-libs/zziplib media-libs/libsdl2[X] sys-libs/zlib alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
 SLOT=0
 SRC_URI=https://github.com/milkytracker/MilkyTracker/archive/v1.02.00.tar.gz -> milkytracker-1.02.00.tar.gz https://github.com/milkytracker/MilkyTracker/commit/2b145b074581ddf3b4ad78a402cdf5fab500b125.patch -> milkytracker-1.02.00-cmake.patch
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c20d9a8322bb167437d15c11280a576d
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.22 b/metadata/md5-cache/media-sound/mpd-0.21.22
deleted file mode 100644
index e26658faf8cc..000000000000
--- a/metadata/md5-cache/media-sound/mpd-0.21.22
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/meson-0.49.2 virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-user/mpd alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tidal? ( dev-libs/yajl net-misc/curl ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= ) >=dev-libs/boost-1.58:= test? ( dev-cpp/gtest )
-DESCRIPTION=The Music Player Daemon (mpd)
-EAPI=7
-HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
-IUSE=+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp zeroconf zip zlib kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=acct-user/mpd alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tidal? ( dev-libs/yajl net-misc/curl ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) upnp? ( expat ) webdav? ( curl expat )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.22.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40095dad4ba9e321bc9b47292d2e6df1
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.24 b/metadata/md5-cache/media-sound/mpd-0.21.24
deleted file mode 100644
index 82a176c486f6..000000000000
--- a/metadata/md5-cache/media-sound/mpd-0.21.24
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/meson-0.49.2 virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-user/mpd alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tidal? ( dev-libs/yajl net-misc/curl ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= ) >=dev-libs/boost-1.58:= test? ( dev-cpp/gtest )
-DESCRIPTION=The Music Player Daemon (mpd)
-EAPI=7
-HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
-IUSE=+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp zeroconf zip zlib kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-user/mpd alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tidal? ( dev-libs/yajl net-misc/curl ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) upnp? ( expat ) webdav? ( curl expat )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.24.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce4e0d3209e2febdb118026f16dfbea6
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.25 b/metadata/md5-cache/media-sound/mpd-0.21.25
index b4f19eeb4827..e14d728be2ea 100644
--- a/metadata/md5-cache/media-sound/mpd-0.21.25
+++ b/metadata/md5-cache/media-sound/mpd-0.21.25
@@ -5,7 +5,7 @@ DESCRIPTION=The Music Player Daemon (mpd)
 EAPI=7
 HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
 IUSE=+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp zeroconf zip zlib kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=acct-user/mpd alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tidal? ( dev-libs/yajl net-misc/curl ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) upnp? ( expat ) webdav? ( curl expat )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.25.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce4e0d3209e2febdb118026f16dfbea6
+_md5_=40095dad4ba9e321bc9b47292d2e6df1
diff --git a/metadata/md5-cache/media-sound/mpd-0.21.26 b/metadata/md5-cache/media-sound/mpd-0.21.26
new file mode 100644
index 000000000000..ccf39102f373
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpd-0.21.26
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.49.2 virtual/pkgconfig >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=acct-user/mpd alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tidal? ( dev-libs/yajl net-misc/curl ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= ) >=dev-libs/boost-1.58:= test? ( dev-cpp/gtest )
+DESCRIPTION=The Music Player Daemon (mpd)
+EAPI=7
+HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
+IUSE=+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl +dbus debug +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp zeroconf zip zlib kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/mpd alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( media-libs/libshout ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) sndfile? ( media-libs/libsndfile ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd ) tidal? ( dev-libs/yajl net-misc/curl ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio recorder ) || ( audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) upnp? ( expat ) webdav? ( curl expat )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/mpd/0.21/mpd-0.21.26.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce4e0d3209e2febdb118026f16dfbea6
diff --git a/metadata/md5-cache/media-sound/musepack-tools-465-r1 b/metadata/md5-cache/media-sound/musepack-tools-465-r1
index 8f7c91110738..6c7e683c9eee 100644
--- a/metadata/md5-cache/media-sound/musepack-tools-465-r1
+++ b/metadata/md5-cache/media-sound/musepack-tools-465-r1
@@ -10,5 +10,5 @@ LICENSE=BSD LGPL-2.1
 RDEPEND=>=media-libs/libcuefile-465[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libreplaygain-465[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-libs/libmpcdec !media-libs/libmpcdecsv7
 SLOT=0
 SRC_URI=mirror://gentoo/musepack-tools-465.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a009b8318843f5f5909566a2295d90d1
diff --git a/metadata/md5-cache/media-sound/musescore-3.5 b/metadata/md5-cache/media-sound/musescore-3.5
index e78464ef882a..b7d229a1c0e8 100644
--- a/metadata/md5-cache/media-sound/musescore-3.5
+++ b/metadata/md5-cache/media-sound/musescore-3.5
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclara
 REQUIRED_USE=portmidi? ( portaudio )
 SLOT=0
 SRC_URI=https://github.com/musescore/MuseScore/archive/v3.5.tar.gz -> musescore-3.5.tar.gz https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb3dcd4bd71bad0d914365bda3af7ee2
diff --git a/metadata/md5-cache/media-sound/musescore-9999 b/metadata/md5-cache/media-sound/musescore-9999
index 5c5363bffc69..71a79f22b3aa 100644
--- a/metadata/md5-cache/media-sound/musescore-9999
+++ b/metadata/md5-cache/media-sound/musescore-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclara
 REQUIRED_USE=portmidi? ( portaudio )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4582d5d033ae95ecd8d86c527c6e551
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.39 b/metadata/md5-cache/media-sound/ncmpc-0.39
new file mode 100644
index 000000000000..58361075b366
--- /dev/null
+++ b/metadata/md5-cache/media-sound/ncmpc-0.39
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:0=[unicode] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre ) >=dev-libs/boost-1.62
+DESCRIPTION=Ncurses client for the Music Player Daemon (MPD)
+EAPI=7
+HOMEPAGE=https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc
+IUSE=async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:0=[unicode] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre )
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/ncmpc/0/ncmpc-0.39.tar.xz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=7be1a0e40d0546dd0d0c779d644500d4
diff --git a/metadata/md5-cache/media-sound/pamix-9999 b/metadata/md5-cache/media-sound/pamix-9999
index 09e0b0a48ca4..8246a2db3bda 100644
--- a/metadata/md5-cache/media-sound/pamix-9999
+++ b/metadata/md5-cache/media-sound/pamix-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=media-sound/pulseaudio sys-libs/ncurses:0=[unicode?]
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b1a1724818a3307a50bc9496e409f4e
diff --git a/metadata/md5-cache/media-sound/pavucontrol-qt-0.15.0 b/metadata/md5-cache/media-sound/pavucontrol-qt-0.15.0
index c22d7d9325f0..be77b844c5f8 100644
--- a/metadata/md5-cache/media-sound/pavucontrol-qt-0.15.0
+++ b/metadata/md5-cache/media-sound/pavucontrol-qt-0.15.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 media-sound/pulseaudio[glib] !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/pavucontrol-qt/releases/download/0.15.0/pavucontrol-qt-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d653348cd98fb520e8defac407d4b7e5
diff --git a/metadata/md5-cache/media-sound/picard-2.4.2 b/metadata/md5-cache/media-sound/picard-2.4.2
index 0f74779f5026..0582112ec6e0 100644
--- a/metadata/md5-cache/media-sound/picard-2.4.2
+++ b/metadata/md5-cache/media-sound/picard-2.4.2
@@ -5,7 +5,7 @@ DESCRIPTION=Cross-platform music tagger
 EAPI=7
 HOMEPAGE=https://picard.musicbrainz.org
 IUSE=discid fingerprints nls python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_7? ( dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_7(-)] dev-python/python-dateutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] ) dev-qt/qtgui:5 media-libs/mutagen discid? ( dev-python/python-discid ) fingerprints? ( media-libs/chromaprint[tools] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.4.2.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d61b1939ecb06992deb42c5aec6de2c3
+_md5_=ee297b9d229befdbed8e74eba1fc9e5a
diff --git a/metadata/md5-cache/media-sound/qastools-0.22.0 b/metadata/md5-cache/media-sound/qastools-0.22.0
index 802852c09aa7..590dba235453 100644
--- a/metadata/md5-cache/media-sound/qastools-0.22.0
+++ b/metadata/md5-cache/media-sound/qastools-0.22.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib virtual/libudev:=
 SLOT=0
 SRC_URI=https://gitlab.com/sebholt/qastools/-/archive/v0.22.0/qastools-v0.22.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5555081fddf4a5e3660956a344c75bab
diff --git a/metadata/md5-cache/media-sound/qastools-0.23.0 b/metadata/md5-cache/media-sound/qastools-0.23.0
index fd5837e6c79f..e1f8e9966947 100644
--- a/metadata/md5-cache/media-sound/qastools-0.23.0
+++ b/metadata/md5-cache/media-sound/qastools-0.23.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib virtual/libudev:=
 SLOT=0
 SRC_URI=https://gitlab.com/sebholt/qastools/-/archive/v0.23.0/qastools-v0.23.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ca203ce25451bb780995b208d6491e0
diff --git a/metadata/md5-cache/media-sound/qmmp-1.3.2-r1 b/metadata/md5-cache/media-sound/qmmp-1.3.2-r1
deleted file mode 100644
index df30a45c2494..000000000000
--- a/metadata/md5-cache/media-sound/qmmp-1.3.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-plugins/cmt-plugins ) mad? ( || ( media-libs/libmad media-sound/mpg123 ) ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-qt/linguist-tools:5
-DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
-EAPI=7
-HOMEPAGE=http://qmmp.ylsoftware.com
-IUSE=aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-plugins/cmt-plugins ) mad? ( || ( media-libs/libmad media-sound/mpg123 ) ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
-REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.3.2.tar.bz2 mirror://sourceforge/qmmp-dev/files/qmmp-1.3.2.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62779592c95fd342b0d6124f25a3ee02
diff --git a/metadata/md5-cache/media-sound/qmmp-1.3.7 b/metadata/md5-cache/media-sound/qmmp-1.3.7
deleted file mode 100644
index c6054dc11744..000000000000
--- a/metadata/md5-cache/media-sound/qmmp-1.3.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-plugins/cmt-plugins ) mad? ( || ( media-libs/libmad media-sound/mpg123 ) ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-qt/linguist-tools:5
-DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
-EAPI=7
-HOMEPAGE=http://qmmp.ylsoftware.com
-IUSE=aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) ladspa? ( media-plugins/cmt-plugins ) mad? ( || ( media-libs/libmad media-sound/mpg123 ) ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
-REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
-SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.3.7.tar.bz2 mirror://sourceforge/qmmp-dev/files/qmmp-1.3.7.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24389aed4e3ea402711349a913ba8bb7
diff --git a/metadata/md5-cache/media-sound/qmmp-1.4.1 b/metadata/md5-cache/media-sound/qmmp-1.4.1
index fbfe776687d1..fae816a8cfbd 100644
--- a/metadata/md5-cache/media-sound/qmmp-1.4.1
+++ b/metadata/md5-cache/media-sound/qmmp-1.4.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) mad? ( || ( media-libs/libmad media-sound/mpg123 ) ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-qt/linguist-tools:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) mad? ( media-libs/libmad:= media-sound/mpg123:= ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-qt/linguist-tools:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
 EAPI=7
 HOMEPAGE=http://qmmp.ylsoftware.com
 IUSE=aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) mad? ( || ( media-libs/libmad media-sound/mpg123 ) ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) mad? ( media-libs/libmad:= media-sound/mpg123:= ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
 REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
 SLOT=0
 SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.4.1.tar.bz2 mirror://sourceforge/qmmp-dev/files/qmmp-1.4.1.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11fc755a96ed98437f46ca0576a078d3
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=15fc324c2e14d46d6490e99873232ab1
diff --git a/metadata/md5-cache/media-sound/qmmp-1.4.2 b/metadata/md5-cache/media-sound/qmmp-1.4.2
new file mode 100644
index 000000000000..084b41526982
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qmmp-1.4.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) mad? ( media-libs/libmad:= media-sound/mpg123:= ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-qt/linguist-tools:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Qt5-based audio player with winamp/xmms skins support
+EAPI=7
+HOMEPAGE=http://qmmp.ylsoftware.com
+IUSE=aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) mad? ( media-libs/libmad:= media-sound/mpg123:= ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
+REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
+SLOT=0
+SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.4.2.tar.bz2 mirror://sourceforge/qmmp-dev/files/qmmp-1.4.2.tar.bz2
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4f80866c497e69b6e747b08ebc55a64a
diff --git a/metadata/md5-cache/media-sound/qmmp-9999 b/metadata/md5-cache/media-sound/qmmp-9999
index 803226ac496d..1efae6197a3d 100644
--- a/metadata/md5-cache/media-sound/qmmp-9999
+++ b/metadata/md5-cache/media-sound/qmmp-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/taglib x11-libs/libX11 aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) curl? ( net-misc/curl ) dbus? ( dev-qt/qtdbus:5 ) enca? ( app-i18n/enca ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) jack? ( media-libs/libsamplerate virtual/jack ) ladspa? ( media-plugins/cmt-plugins ) mad? ( || ( media-libs/libmad media-sound/mpg123 ) ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) modplug? ( >=media-libs/libmodplug-0.8.4 ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) projectm? ( dev-qt/qtgui:5[-gles2-only] dev-qt/qtopengl:5 media-libs/libprojectm:= ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) shout? ( media-libs/libshout ) sid? ( >=media-libs/libsidplayfp-1.1.0 ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
 REQUIRED_USE=gnome? ( dbus ) shout? ( soxr vorbis ) udisks? ( dbus )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	subversion	ed3498da4fb92dcfb0d6089c85d1465f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	subversion	ed3498da4fb92dcfb0d6089c85d1465f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61d20f8eb592dea9fccbf968e412e0ae
diff --git a/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402 b/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
index ab01580e24b5..10adf2b692ee 100644
--- a/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
+++ b/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/taglib
 SLOT=0
 SRC_URI=https://github.com/DOOMer/qtagger/archive/0e74fe022ddbb689f7bae0460a21be303114029b.tar.gz -> qtagger-1.0.1_p20150402.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4d0b865e491f9670ca8a4f485a75ce8c
diff --git a/metadata/md5-cache/media-sound/redoflacs-0.16.2 b/metadata/md5-cache/media-sound/redoflacs-0.16.2
deleted file mode 100644
index 5a049a8208ac..000000000000
--- a/metadata/md5-cache/media-sound/redoflacs-0.16.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=Bash commandline flac verifier, organizer, analyzer
-EAPI=5
-HOMEPAGE=https://github.com/sirjaren/redoflacs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-shells/bash media-libs/flac sys-apps/coreutils sys-apps/findutils
-SLOT=0
-SRC_URI=https://github.com/sirjaren/redoflacs/tarball/v0.16.2 -> redoflacs-0.16.2.tar.gz
-_eclasses_=vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=3fadaf7c218f0d2a65a581d8435c9792
diff --git a/metadata/md5-cache/media-sound/redoflacs-0.19 b/metadata/md5-cache/media-sound/redoflacs-0.19
deleted file mode 100644
index 66af2ca889e4..000000000000
--- a/metadata/md5-cache/media-sound/redoflacs-0.19
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=Bash commandline flac compressor, verifier, organizer, analyzer, retagger
-EAPI=5
-HOMEPAGE=https://github.com/sirjaren/redoflacs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-shells/bash-4 media-libs/flac sys-apps/coreutils
-SLOT=0
-SRC_URI=https://github.com/sirjaren/redoflacs/tarball/v0.19 -> redoflacs-0.19.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	273fa5d1a8ed000a29d79323e2ed0dc1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fcfb196198b96c2d14c94908170f839c
diff --git a/metadata/md5-cache/media-sound/rosegarden-20.06 b/metadata/md5-cache/media-sound/rosegarden-20.06
index 0449f9e51ca1..6c6b52588baf 100644
--- a/metadata/md5-cache/media-sound/rosegarden-20.06
+++ b/metadata/md5-cache/media-sound/rosegarden-20.06
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden-20.06.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0accfb6bb6a2b7d3796f564b07870414
diff --git a/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r2 b/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r2
index 44c4d1d5aa37..2754f68a27d9 100644
--- a/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r2
+++ b/metadata/md5-cache/media-sound/soundkonverter-3.0.1-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-apps/libkcddb-19.04.3: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/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-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/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.10 media-sound/cdparanoia !media-sound/soundkonverter:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=https://github.com/dfaust/soundkonverter/archive/v3.0.1.tar.gz -> soundkonverter-3.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=342dc836cf0c2bead70fe3d62592a977
diff --git a/metadata/md5-cache/media-sound/strawberry-0.6.13 b/metadata/md5-cache/media-sound/strawberry-0.6.13
index 4dd954873788..1359cd6b0373 100644
--- a/metadata/md5-cache/media-sound/strawberry-0.6.13
+++ b/metadata/md5-cache/media-sound/strawberry-0.6.13
@@ -12,5 +12,5 @@ REQUIRED_USE=udisks? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jonaski/strawberry/releases/download/0.6.13/strawberry-0.6.13.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b99a48fe43a2277867e896b20fc2c6ac
diff --git a/metadata/md5-cache/media-sound/strawberry-0.7.2 b/metadata/md5-cache/media-sound/strawberry-0.7.2
index 560ca0f1fc76..e66ff4ad80d6 100644
--- a/metadata/md5-cache/media-sound/strawberry-0.7.2
+++ b/metadata/md5-cache/media-sound/strawberry-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=udisks? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jonaski/strawberry/releases/download/0.7.2/strawberry-0.7.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfefdf8772d3267c7de68f2cfaab4f50
diff --git a/metadata/md5-cache/media-sound/strawberry-9999 b/metadata/md5-cache/media-sound/strawberry-9999
index 00b4d5fb7e37..fabdfb74ed13 100644
--- a/metadata/md5-cache/media-sound/strawberry-9999
+++ b/metadata/md5-cache/media-sound/strawberry-9999
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/glib:2 dev-libs/libxml2
 REQUIRED_USE=udisks? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfefdf8772d3267c7de68f2cfaab4f50
diff --git a/metadata/md5-cache/media-sound/supercollider-3.11.0 b/metadata/md5-cache/media-sound/supercollider-3.11.0
index 9a3be15522da..9b5d52597b4d 100644
--- a/metadata/md5-cache/media-sound/supercollider-3.11.0
+++ b/metadata/md5-cache/media-sound/supercollider-3.11.0
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/yaml-cpp:= >=dev-libs/boost-1.70.0:= media-libs/alsa-lib sys-lib
 REQUIRED_USE=qt5? ( X ) webengine? ( qt5 )
 SLOT=0
 SRC_URI=https://github.com/supercollider/supercollider/releases/download/Version-3.11.0/SuperCollider-3.11.0-Source.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee0606e31c750ceb35775fda57ddefdb
diff --git a/metadata/md5-cache/media-sound/timidity++-2.14.0-r3 b/metadata/md5-cache/media-sound/timidity++-2.14.0-r3
index 2cda42956794..2b4c37cb1fd3 100644
--- a/metadata/md5-cache/media-sound/timidity++-2.14.0-r3
+++ b/metadata/md5-cache/media-sound/timidity++-2.14.0-r3
@@ -11,5 +11,5 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.5 ) emacs? (
 REQUIRED_USE=tk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.14.0.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8410cdc6152885afff22275bb45caf10
diff --git a/metadata/md5-cache/media-sound/timidity++-2.15.0 b/metadata/md5-cache/media-sound/timidity++-2.15.0
index 37ce0eb643a6..090a7eb92392 100644
--- a/metadata/md5-cache/media-sound/timidity++-2.15.0
+++ b/metadata/md5-cache/media-sound/timidity++-2.15.0
@@ -12,5 +12,5 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.5 ) emacs? (
 REQUIRED_USE=tk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=675deff0d2f1fe52fa2bc8f3fe9d55bd
diff --git a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20181030 b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20181030
index d251066fb118..6cd29a8df7bb 100644
--- a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20181030
+++ b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20181030
@@ -10,5 +10,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=app-crypt/qca:2[qt5(+)] dev-cpp/lucene++ dev-cpp/sparsehash dev-libs/boost:= dev-libs/qtkeychain:=[qt5(+)] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 kde-frameworks/extra-cmake-modules:5 kde-frameworks/attica:5 >=media-libs/liblastfm-1.1.0_pre20150206 >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] ) xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] ) app-crypt/qca:2[ssl]
 SLOT=0
 SRC_URI=https://github.com/tomahawk-player/tomahawk/archive/777b31219179b43f56c7b95857d2fbd7f33199aa.tar.gz -> tomahawk-0.9.0_pre20181030.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3b664347838f97d2fcddf6587a42799
diff --git a/metadata/md5-cache/media-sound/traverso-0.49.5 b/metadata/md5-cache/media-sound/traverso-0.49.5
deleted file mode 100644
index 75b308df150b..000000000000
--- a/metadata/md5-cache/media-sound/traverso-0.49.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/flac-1.1.2 >=media-libs/libogg-1.1.2 media-libs/libsamplerate >=media-libs/libsndfile-1.0.12 >=media-libs/libvorbis-1.1.2 >=media-sound/wavpack-4.40.0 >=sci-libs/fftw-3 alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) lame? ( media-sound/lame ) lv2? ( media-libs/lilv ) mad? ( >=media-libs/libmad-0.15.0 ) pulseaudio? ( >=media-sound/pulseaudio-0.9 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Professional Audio Tools for GNU/Linux
-EAPI=6
-HOMEPAGE=https://traverso-daw.org/
-IUSE=alsa debug jack lame lv2 mad pulseaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=media-libs/flac-1.1.2 >=media-libs/libogg-1.1.2 media-libs/libsamplerate >=media-libs/libsndfile-1.0.12 >=media-libs/libvorbis-1.1.2 >=media-sound/wavpack-4.40.0 >=sci-libs/fftw-3 alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) lame? ( media-sound/lame ) lv2? ( media-libs/lilv ) mad? ( >=media-libs/libmad-0.15.0 ) pulseaudio? ( >=media-sound/pulseaudio-0.9 )
-SLOT=0
-SRC_URI=https://traverso-daw.org/traverso-0.49.5.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e82d71e938262b514fe410649e9f4887
diff --git a/metadata/md5-cache/media-sound/vmpk-0.7.2 b/metadata/md5-cache/media-sound/vmpk-0.7.2
index 249e9703584e..adbe3354bb01 100644
--- a/metadata/md5-cache/media-sound/vmpk-0.7.2
+++ b/metadata/md5-cache/media-sound/vmpk-0.7.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=media-sound/drumstick-1.0.0 x11-libs/libxcb dbus? ( dev-qt/qtdbus:5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vmpk/vmpk-0.7.2.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=795964f39ac00d3433f958ff2b709ffb
diff --git a/metadata/md5-cache/media-sound/yarock-1.4.0-r1 b/metadata/md5-cache/media-sound/yarock-1.4.0-r1
index 802f4e39b9d0..cc4f6ee61909 100644
--- a/metadata/md5-cache/media-sound/yarock-1.4.0-r1
+++ b/metadata/md5-cache/media-sound/yarock-1.4.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-cpp/htmlcxx dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/taglib x11-libs/libX11 phonon? ( >=media-libs/phonon-4.11.0 ) vlc? ( media-video/vlc:= )
 SLOT=0
 SRC_URI=https://launchpad.net/yarock/1.x/1.4.0/+download/Yarock_1.4.0_Sources.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8efbea1b363768f9c5436a34ec305e32
diff --git a/metadata/md5-cache/media-sound/yoshimi-1.7.1-r1 b/metadata/md5-cache/media-sound/yoshimi-1.7.1-r1
index 52fe016a9c65..7a3be39f7a79 100644
--- a/metadata/md5-cache/media-sound/yoshimi-1.7.1-r1
+++ b/metadata/md5-cache/media-sound/yoshimi-1.7.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/mxml-2.5 media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
 SLOT=0
 SRC_URI=https://github.com/Yoshimi/yoshimi/archive/1.7.1.tar.gz -> yoshimi-1.7.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1c9d2ef0543547459c87031b6ce5933a
diff --git a/metadata/md5-cache/media-sound/yoshimi-1.7.2 b/metadata/md5-cache/media-sound/yoshimi-1.7.2
index 2edda65063f6..d28cd5285dad 100644
--- a/metadata/md5-cache/media-sound/yoshimi-1.7.2
+++ b/metadata/md5-cache/media-sound/yoshimi-1.7.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/mxml-2.5 media-libs/alsa-lib media-libs/fontconfig media-libs/libsndfile sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= sys-libs/zlib virtual/jack x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 )
 SLOT=0
 SRC_URI=https://github.com/Yoshimi/yoshimi/archive/1.7.2.tar.gz -> yoshimi-1.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a6b369bf6808c9985f9930240190567
diff --git a/metadata/md5-cache/media-sound/zynaddsubfx-3.0.5 b/metadata/md5-cache/media-sound/zynaddsubfx-3.0.5
index c9310ac89346..8f44b5a86614 100644
--- a/metadata/md5-cache/media-sound/zynaddsubfx-3.0.5
+++ b/metadata/md5-cache/media-sound/zynaddsubfx-3.0.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/mxml-2.2.1 media-libs/liblo sci-libs/fftw:3.0 sys-libs/zlib a
 REQUIRED_USE=|| ( alsa jack portaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/zynaddsubfx/zynaddsubfx-3.0.5.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ccec50990e67820f21769bf875545477
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 068d4af5e5c6..343e2d5d5035 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-18.7 b/metadata/md5-cache/media-tv/kodi-18.7
index 161390c13e9a..8df92f2c7a9c 100644
--- a/metadata/md5-cache/media-tv/kodi-18.7
+++ b/metadata/md5-cache/media-tv/kodi-18.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 ) || ( gles opengl ) ^^ ( gbm r
 RESTRICT=!test? ( test )
 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 ) https://dev.gentoo.org/~candrews/kodi-18-libmicrohttpd-0.9.71.patch https://github.com/xbmc/xbmc/archive/18.7-Leia.tar.gz -> kodi-18.7.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ae3b213f94dc41275c9db3e412f0a90
diff --git a/metadata/md5-cache/media-tv/kodi-18.8 b/metadata/md5-cache/media-tv/kodi-18.8
index 9be994e386c0..f134c5f47bb6 100644
--- a/metadata/md5-cache/media-tv/kodi-18.8
+++ b/metadata/md5-cache/media-tv/kodi-18.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 ) || ( gles opengl ) ^^ ( gbm r
 RESTRICT=!test? ( test )
 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 ) https://dev.gentoo.org/~candrews/kodi-18-libmicrohttpd-0.9.71.patch https://github.com/xbmc/xbmc/archive/18.8-Leia.tar.gz -> kodi-18.8.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4ddc865bf147be6789519e100d2c061
diff --git a/metadata/md5-cache/media-tv/kodi-19.0_alpha1_p20200920 b/metadata/md5-cache/media-tv/kodi-19.0_alpha1_p20200920
index 7bcace111016..2a93498a5c43 100644
--- a/metadata/md5-cache/media-tv/kodi-19.0_alpha1_p20200920
+++ b/metadata/md5-cache/media-tv/kodi-19.0_alpha1_p20200920
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 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.3.1-Matrix-Alpha1-2.tar.gz -> ffmpeg-kodi-4.3.1-Matrix-Alpha1-2.tar.gz ) https://github.com/xbmc/xbmc/archive/7f6bf8fdddaabcf911786099024ecc45df35c8bd.tar.gz -> kodi-19.0_alpha1_p20200920.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eabab2cb95f54b504477e70bae47960c
diff --git a/metadata/md5-cache/media-tv/kodi-19.9999 b/metadata/md5-cache/media-tv/kodi-19.9999
index 76d672c5f894..6a311b4aa27e 100644
--- a/metadata/md5-cache/media-tv/kodi-19.9999
+++ b/metadata/md5-cache/media-tv/kodi-19.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 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.3.1-Matrix-Alpha1-2.tar.gz -> ffmpeg-kodi-4.3.1-Matrix-Alpha1-2.tar.gz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68f8f6cdd2f5248e2cb63b12a1c9ac53
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index 76d672c5f894..6a311b4aa27e 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 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.3.1-Matrix-Alpha1-2.tar.gz -> ffmpeg-kodi-4.3.1-Matrix-Alpha1-2.tar.gz )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68f8f6cdd2f5248e2cb63b12a1c9ac53
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index b4e846ab79a9..8ff2ea363a22 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/avidemux-2.7.4-r1 b/metadata/md5-cache/media-video/avidemux-2.7.4-r1
index b3c8d4d9ff68..704a33def4d1 100644
--- a/metadata/md5-cache/media-video/avidemux-2.7.4-r1
+++ b/metadata/md5-cache/media-video/avidemux-2.7.4-r1
@@ -11,5 +11,5 @@ PDEPEND=~media-libs/avidemux-plugins-2.7.4:2.7[opengl?,qt5?]
 RDEPEND=~media-libs/avidemux-core-2.7.4:2.7[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) vaapi? ( x11-libs/libva:0= ) nls? ( virtual/libintl:0 ) !<media-video/avidemux-2.7.4
 SLOT=2.7
 SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.4.tar.gz -> avidemux-2.7.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f5c2a9cf9245579269c0b965878f976
diff --git a/metadata/md5-cache/media-video/avidemux-2.7.6-r1 b/metadata/md5-cache/media-video/avidemux-2.7.6-r1
index 5c3981b1e733..b4aedfdb4e3a 100644
--- a/metadata/md5-cache/media-video/avidemux-2.7.6-r1
+++ b/metadata/md5-cache/media-video/avidemux-2.7.6-r1
@@ -11,5 +11,5 @@ PDEPEND=~media-libs/avidemux-plugins-2.7.6:2.7[opengl?,qt5?]
 RDEPEND=~media-libs/avidemux-core-2.7.6:2.7[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) vaapi? ( x11-libs/libva:0= ) nls? ( virtual/libintl:0 ) !<media-video/avidemux-2.7.6
 SLOT=2.7
 SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.6.tar.gz -> avidemux-2.7.6.tar.gz https://github.com/mean00/avidemux2_i18n/archive/2.7.6.tar.gz -> avidemux-i18n-2.7.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c80095a1bfd680a7ec603a6aae63aeb
diff --git a/metadata/md5-cache/media-video/bashnapi-2.0.0 b/metadata/md5-cache/media-video/bashnapi-2.0.0
index c98076cc08d3..24b4c858c919 100644
--- a/metadata/md5-cache/media-video/bashnapi-2.0.0
+++ b/metadata/md5-cache/media-video/bashnapi-2.0.0
@@ -9,5 +9,5 @@ RDEPEND=app-arch/p7zip net-misc/wget sys-apps/debianutils sys-apps/file
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.sourceforge.net/bashnapi/napi-2.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f802e4cce33067c285868701a702da0
diff --git a/metadata/md5-cache/media-video/ffmpeg2theora-0.30 b/metadata/md5-cache/media-video/ffmpeg2theora-0.30
deleted file mode 100644
index 194b1d28506d..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg2theora-0.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=media-video/ffmpeg:0=[postproc] >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] kate? ( >=media-libs/libkate-0.3.7 ) virtual/pkgconfig dev-util/scons[python_targets_python2_7]
-DESCRIPTION=A simple converter to create Ogg Theora files
-EAPI=5
-HOMEPAGE=http://www.v2v.cc/~j/ffmpeg2theora/
-IUSE=kate
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-3
-RDEPEND=media-video/ffmpeg:0=[postproc] >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] kate? ( >=media-libs/libkate-0.3.7 )
-SLOT=0
-SRC_URI=http://www.v2v.cc/~j/ffmpeg2theora/downloads/ffmpeg2theora-0.30.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9ba5f3d0772791766d33a308140bbae5
diff --git a/metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1 b/metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1
new file mode 100644
index 000000000000..46d4c8a92abd
--- /dev/null
+++ b/metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.9 dev-util/scons[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-util/scons[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=media-video/ffmpeg:0=[postproc] >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] kate? ( >=media-libs/libkate-0.3.7 )
+DESCRIPTION=A simple converter to create Ogg Theora files
+EAPI=7
+HOMEPAGE=http://www.v2v.cc/~j/ffmpeg2theora/
+IUSE=kate
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-3
+RDEPEND=media-video/ffmpeg:0=[postproc] >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] kate? ( >=media-libs/libkate-0.3.7 )
+SLOT=0
+SRC_URI=http://www.v2v.cc/~j/ffmpeg2theora/downloads/ffmpeg2theora-0.30.tar.bz2
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fb2364d2bb4105f6b1a7dba2fc767a3e
diff --git a/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0-r1 b/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0-r1
index b1b4c4bc6031..85e1b8ae9bcb 100644
--- a/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0-r1
+++ b/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=gnome? ( gtk ) test? ( png jpeg )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/2.2.0/ffmpegthumbnailer-2.2.0.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e93e8ec940d8973df9463c1eae4769b
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.18 b/metadata/md5-cache/media-video/kaffeine-2.0.18
index 762039f4867d..9bd8c5786547 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.18
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.18
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.3 )
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3: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/kio-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 media-video/vlc[X] x11-libs/libXScrnSaver dvb? ( media-libs/libv4l ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/kaffeine-2.0.18.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a1410519208c7c8140ae73f189031ab
diff --git a/metadata/md5-cache/media-video/kmplayer-0.12.0b-r3 b/metadata/md5-cache/media-video/kmplayer-0.12.0b-r3
index c752f5e9ebe7..6b1409fe6de7 100644
--- a/metadata/md5-cache/media-video/kmplayer-0.12.0b-r3
+++ b/metadata/md5-cache/media-video/kmplayer-0.12.0b-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2 FDL-1.2 LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-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 >=kde-frameworks/kbookmarks-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/kdelibs4support-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/kmediaplayer-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libxcb cairo? ( x11-libs/cairo[X,xcb(+)] ) npp? ( dev-libs/dbus-glib dev-libs/glib:2 www-plugins/adobe-flash:* >=x11-libs/gtk+-2.10.14:2 ) media-video/mplayer || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmplayer/0.12/kmplayer-0.12.0b.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95889b8efdcf9bc4022c7dd0064f980f
diff --git a/metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012-r2 b/metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012-r2
index 7d26c3095bfa..fd56e074372d 100644
--- a/metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012-r2
+++ b/metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012-r2
@@ -10,5 +10,5 @@ PDEPEND=media-video/v4l2loopback
 RDEPEND=>=media-video/obs-studio-25.0.8-r1 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://github.com/CatxFish/obs-v4l2sink/archive/1ec3c8ada0e1040d867ce567f177be55cd278378.tar.gz -> obs-v4l2sink-0.1.0_p20181012.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c34048fbf3607481c43562e6dc7670e3
diff --git a/metadata/md5-cache/media-video/qmplay2-19.12.19-r2 b/metadata/md5-cache/media-video/qmplay2-19.12.19-r2
index 27deed89e82d..570e6bb3e441 100644
--- a/metadata/md5-cache/media-video/qmplay2-19.12.19-r2
+++ b/metadata/md5-cache/media-video/qmplay2-19.12.19-r2
@@ -11,5 +11,5 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dev-qt/qt
 REQUIRED_USE=audiofilters? ( || ( alsa portaudio pulseaudio ) ) avdevice? ( ffmpeg ) avresample? ( ffmpeg ) lastfm? ( extensions ) lyrics? ( extensions ) mediabrowser? ( extensions ) mpris2? ( extensions dbus ) vaapi? ( ffmpeg opengl ) vdpau? ( ffmpeg )
 SLOT=0
 SRC_URI=https://github.com/zaps166/QMPlay2/archive/19.12.19.tar.gz -> qmplay2-19.12.19.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b312ff6c307de361959e0c22d913b485
diff --git a/metadata/md5-cache/media-video/qmplay2-20.05.02 b/metadata/md5-cache/media-video/qmplay2-20.05.02
index d611bfbe4b78..e09073a147bc 100644
--- a/metadata/md5-cache/media-video/qmplay2-20.05.02
+++ b/metadata/md5-cache/media-video/qmplay2-20.05.02
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 m
 REQUIRED_USE=audiofilters? ( || ( alsa portaudio pulseaudio ) ) extensions? ( dbus ) shaders? ( vulkan )
 SLOT=0
 SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/20.05.02/QMPlay2-src-20.05.02.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ec19770039584e0595d0c24248a6428
diff --git a/metadata/md5-cache/media-video/qmplay2-20.07.04 b/metadata/md5-cache/media-video/qmplay2-20.07.04
index 65591b551417..c8682346b43e 100644
--- a/metadata/md5-cache/media-video/qmplay2-20.07.04
+++ b/metadata/md5-cache/media-video/qmplay2-20.07.04
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 m
 REQUIRED_USE=audiofilters? ( || ( alsa portaudio pulseaudio ) ) extensions? ( dbus ) shaders? ( vulkan )
 SLOT=0
 SRC_URI=https://github.com/zaps166/QMPlay2/releases/download/20.07.04/QMPlay2-src-20.07.04.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ec19770039584e0595d0c24248a6428
diff --git a/metadata/md5-cache/media-video/qmplay2-9999 b/metadata/md5-cache/media-video/qmplay2-9999
index b42b6306ee31..1d5b36e5df69 100644
--- a/metadata/md5-cache/media-video/qmplay2-9999
+++ b/metadata/md5-cache/media-video/qmplay2-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-video/ffmpeg || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) dbus? ( dev-qt/qtdbus:5 ) extensions? ( dev-qt/qtdeclarative:5 media-libs/taglib ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplayfp ) shaders? ( >=media-libs/shaderc-2020.1 ) vaapi? ( >=media-video/ffmpeg-4.1.3[vaapi] x11-libs/libva[drm,opengl] ) vdpau? ( media-video/ffmpeg[vdpau] ) videofilters? ( dev-qt/qtconcurrent:5 ) vulkan? ( >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) xv? ( x11-libs/libXv )
 REQUIRED_USE=audiofilters? ( || ( alsa portaudio pulseaudio ) ) extensions? ( dbus ) shaders? ( vulkan )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ec19770039584e0595d0c24248a6428
diff --git a/metadata/md5-cache/media-video/rav1e-0.3.3 b/metadata/md5-cache/media-video/rav1e-0.3.3
index a979a51d2d0e..41507a28cd0b 100644
--- a/metadata/md5-cache/media-video/rav1e-0.3.3
+++ b/metadata/md5-cache/media-video/rav1e-0.3.3
@@ -10,5 +10,5 @@ LICENSE=BSD-2 Apache-2.0 MIT Unlicense
 RDEPEND=capi? ( dev-util/cargo-c )
 SLOT=0
 SRC_URI=https://github.com/xiph/rav1e/archive/v0.3.3.tar.gz -> rav1e-0.3.3.tar.gz https://crates.io/api/v1/crates/addr2line/0.12.1/download -> addr2line-0.12.1.crate https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/aom-sys/0.1.4/download -> aom-sys-0.1.4.crate https://crates.io/api/v1/crates/arbitrary/0.2.0/download -> arbitrary-0.2.0.crate https://crates.io/api/v1/crates/arc-swap/0.4.7/download -> arc-swap-0.4.7.crate https://crates.io/api/v1/crates/arg_enum_proc_macro/0.3.0/download -> arg_enum_proc_macro-0.3.0.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/assert_cmd/1.0.1/download -> assert_cmd-1.0.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.48/download -> backtrace-0.3.48.crate https://crates.io/api/v1/crates/bindgen/0.53.3/download -> bindgen-0.53.3.crate https://crates.io/api/v1/crates/bindgen/0.54.0/download -> bindgen-0.54.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bitstream-io/0.8.5/download -> bitstream-io-0.8.5.crate https://crates.io/api/v1/crates/bstr/0.2.13/download -> bstr-0.2.13.crate https://crates.io/api/v1/crates/bumpalo/3.4.0/download -> bumpalo-3.4.0.crate https://crates.io/api/v1/crates/bytemuck/1.2.0/download -> bytemuck-1.2.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.54/download -> cc-1.0.54.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.11/download -> chrono-0.4.11.crate https://crates.io/api/v1/crates/clang-sys/0.29.3/download -> clang-sys-0.29.3.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/cmake/0.1.44/download -> cmake-0.1.44.crate https://crates.io/api/v1/crates/console/0.11.3/download -> console-0.11.3.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/criterion/0.3.2/download -> criterion-0.3.2.crate https://crates.io/api/v1/crates/criterion-plot/0.4.2/download -> criterion-plot-0.4.2.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.2/download -> crossbeam-queue-0.2.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.14/download -> ctor-0.1.14.crate https://crates.io/api/v1/crates/dav1d-sys/0.3.2/download -> dav1d-sys-0.3.2.crate https://crates.io/api/v1/crates/deflate/0.8.4/download -> deflate-0.8.4.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/error-chain/0.10.0/download -> error-chain-0.10.0.crate https://crates.io/api/v1/crates/fern/0.6.0/download -> fern-0.6.0.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gimli/0.21.0/download -> gimli-0.21.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/image/0.23.4/download -> image-0.23.4.crate https://crates.io/api/v1/crates/inflate/0.4.5/download -> inflate-0.4.5.crate https://crates.io/api/v1/crates/interpolate_name/0.2.3/download -> interpolate_name-0.2.3.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itertools/0.9.0/download -> itertools-0.9.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/ivf/0.1.0/download -> ivf-0.1.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/js-sys/0.3.40/download -> js-sys-0.3.40.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.71/download -> libc-0.2.71.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memoffset/0.5.4/download -> memoffset-0.5.4.crate https://crates.io/api/v1/crates/metadeps/1.1.2/download -> metadeps-1.1.2.crate https://crates.io/api/v1/crates/nasm-rs/0.1.7/download -> nasm-rs-0.1.7.crate https://crates.io/api/v1/crates/nom/5.1.1/download -> nom-5.1.1.crate https://crates.io/api/v1/crates/noop_proc_macro/0.2.1/download -> noop_proc_macro-0.2.1.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/num-derive/0.3.0/download -> num-derive-0.3.0.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-iter/0.1.40/download -> num-iter-0.1.40.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/object/0.19.0/download -> object-0.19.0.crate https://crates.io/api/v1/crates/oorandom/11.1.1/download -> oorandom-11.1.1.crate https://crates.io/api/v1/crates/output_vt100/0.1.2/download -> output_vt100-0.1.2.crate https://crates.io/api/v1/crates/paste/0.1.16/download -> paste-0.1.16.crate https://crates.io/api/v1/crates/paste-impl/0.1.16/download -> paste-impl-0.1.16.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/plotters/0.2.15/download -> plotters-0.2.15.crate https://crates.io/api/v1/crates/png/0.16.4/download -> png-0.16.4.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.8/download -> ppv-lite86-0.2.8.crate https://crates.io/api/v1/crates/predicates/1.0.4/download -> predicates-1.0.4.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/pretty_assertions/0.6.1/download -> pretty_assertions-0.6.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.18/download -> proc-macro2-1.0.18.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.16/download -> proc-macro-hack-0.5.16.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.6/download -> quote-1.0.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rav1e/0.3.3/download -> rav1e-0.3.3.crate https://crates.io/api/v1/crates/rayon/1.3.0/download -> rayon-1.3.0.crate https://crates.io/api/v1/crates/rayon-core/1.7.0/download -> rayon-core-1.7.0.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rust_hawktracer/0.7.0/download -> rust_hawktracer-0.7.0.crate https://crates.io/api/v1/crates/rust_hawktracer_normal_macro/0.4.1/download -> rust_hawktracer_normal_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_proc_macro/0.4.1/download -> rust_hawktracer_proc_macro-0.4.1.crate https://crates.io/api/v1/crates/rust_hawktracer_sys/0.4.2/download -> rust_hawktracer_sys-0.4.2.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scan_fmt/0.2.5/download -> scan_fmt-0.2.5.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.111/download -> serde-1.0.111.crate https://crates.io/api/v1/crates/serde_derive/1.0.111/download -> serde_derive-1.0.111.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.1.15/download -> signal-hook-0.1.15.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/simd_helpers/0.1.0/download -> simd_helpers-0.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.30/download -> syn-1.0.30.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/terminal_size/0.1.12/download -> terminal_size-0.1.12.crate https://crates.io/api/v1/crates/termios/0.3.2/download -> termios-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.19/download -> thiserror-1.0.19.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.19/download -> thiserror-impl-1.0.19.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinytemplate/1.1.0/download -> tinytemplate-1.1.0.crate https://crates.io/api/v1/crates/toml/0.2.1/download -> toml-0.2.1.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/vergen/3.1.0/download -> vergen-3.1.0.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.63/download -> wasm-bindgen-0.2.63.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.63/download -> wasm-bindgen-backend-0.2.63.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.63/download -> wasm-bindgen-macro-0.2.63.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.63/download -> wasm-bindgen-macro-support-0.2.63.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.63/download -> wasm-bindgen-shared-0.2.63.crate https://crates.io/api/v1/crates/web-sys/0.3.40/download -> web-sys-0.3.40.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/y4m/0.5.3/download -> y4m-0.5.3.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=1338e97e6a84424d94ab37653bb277ea
diff --git a/metadata/md5-cache/media-video/rav1e-9999 b/metadata/md5-cache/media-video/rav1e-9999
index dc6e72e1f3f7..2d79749a2e19 100644
--- a/metadata/md5-cache/media-video/rav1e-9999
+++ b/metadata/md5-cache/media-video/rav1e-9999
@@ -9,5 +9,5 @@ LICENSE=BSD-2 Apache-2.0 MIT Unlicense
 PROPERTIES=live
 RDEPEND=capi? ( dev-util/cargo-c )
 SLOT=0
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2c3edfe6b4ed2818d0c64ec7fd156e70
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-0.4.2 b/metadata/md5-cache/media-video/simplescreenrecorder-0.4.2
index 30ba418f2ef7..f3caefb34df9 100644
--- a/metadata/md5-cache/media-video/simplescreenrecorder-0.4.2
+++ b/metadata/md5-cache/media-video/simplescreenrecorder-0.4.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/MaartenBaert/ssr/archive/0.4.2.tar.gz -> simplescreenrecorder-0.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dae55af432bb0b2320b79744d3f84f22
diff --git a/metadata/md5-cache/media-video/simplescreenrecorder-9999 b/metadata/md5-cache/media-video/simplescreenrecorder-9999
index 615c1b01d4d4..cf512ae8eec2 100644
--- a/metadata/md5-cache/media-video/simplescreenrecorder-9999
+++ b/metadata/md5-cache/media-video/simplescreenrecorder-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib:0= media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,X] media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi x11-libs/libXinerama virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jack? ( virtual/jack ) pulseaudio? ( media-sound/pulseaudio )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dae55af432bb0b2320b79744d3f84f22
diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.7.0 b/metadata/md5-cache/media-video/subtitlecomposer-0.7.0
index 2d3419fe6bc1..36afa45b100a 100644
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.7.0
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.7.0
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup t
 DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcodecs-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/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/ktextwidgets-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 media-libs/phonon[qt5(+)] gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) media-video/ffmpeg:0= mpv? ( media-video/mpv[libmpv] ) unicode? ( dev-libs/icu:= ) xine? ( media-libs/xine-lib x11-libs/libX11 x11-libs/libxcb ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=Text-based subtitles editor
 EAPI=7
-HOMEPAGE=https://github.com/maxrd2/subtitlecomposer
+HOMEPAGE=https://subtitlecomposer.kde.org/
 IUSE=gstreamer mpv unicode xine test debug test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kco
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=https://github.com/maxrd2/subtitlecomposer/archive/v0.7.0.tar.gz -> subtitlecomposer-0.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=294560e50129ba03bcc406c8bd9b6392
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a691af1af973e9929967f3dde74a3527
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index b61e0739842d..55082d24d774 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/apinger-0.6.1 b/metadata/md5-cache/net-analyzer/apinger-0.6.1
new file mode 100644
index 000000000000..118add576744
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/apinger-0.6.1
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-devel/flex virtual/yacc
+DESCRIPTION=Alarm Pinger
+EAPI=7
+HOMEPAGE=https://github.com/Jajcus/apinger/
+KEYWORDS=~amd64
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jer/apinger-0.6.1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d1e3fc26313be977b72b8dff039e7c60
diff --git a/metadata/md5-cache/net-analyzer/arpon-2.7.2-r1 b/metadata/md5-cache/net-analyzer/arpon-2.7.2-r1
index 696723c09b74..bf54430299bb 100644
--- a/metadata/md5-cache/net-analyzer/arpon-2.7.2-r1
+++ b/metadata/md5-cache/net-analyzer/arpon-2.7.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/arpon/ArpON-2.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5532eabc9cc376832c6e55be5ad576bf
diff --git a/metadata/md5-cache/net-analyzer/arpon-3.0 b/metadata/md5-cache/net-analyzer/arpon-3.0
new file mode 100644
index 000000000000..2ba3a98e2e1c
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/arpon-3.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
+DESCRIPTION=ArpON (Arp handler inspectiON) is a portable Arp handler
+EAPI=7
+HOMEPAGE=http://arpon.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap
+SLOT=0
+SRC_URI=mirror://sourceforge/arpon/ArpON-3.0-ng.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dbc9f63c2077991a4683a77fcc2fbe5d
diff --git a/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2 b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2
new file mode 100644
index 000000000000..35d443c95ad3
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/bwm-ng-0.6.2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-apps/net-tools-1.60-r1 sys-libs/ncurses:0=
+DESCRIPTION=Bandwidth Monitor NG is a small and simple console-based bandwidth monitor
+EAPI=7
+HOMEPAGE=http://www.gropp.org/
+IUSE=+csv +html
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/net-tools-1.60-r1 sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://github.com/vgropp/bwm-ng/archive/v0.6.2.tar.gz -> bwm-ng-0.6.2.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9e04340d0e5fd33cb3f13ad2eed35ee4
diff --git a/metadata/md5-cache/net-analyzer/dnstracer-1.10 b/metadata/md5-cache/net-analyzer/dnstracer-1.10
new file mode 100644
index 000000000000..8edf37eb3057
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/dnstracer-1.10
@@ -0,0 +1,11 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile install
+DESCRIPTION=Determines where a given nameserver gets its information from
+EAPI=7
+HOMEPAGE=https://www.mavetju.org/unix/general.php
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://www.mavetju.org/download/dnstracer-1.10.tar.bz2 -> dnstracer-1.10.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2766dca52f8df9ea0e7701acf087f298
diff --git a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401 b/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401
deleted file mode 100644
index db5ae10b49f4..000000000000
--- a/metadata/md5-cache/net-analyzer/driftnet-0.1.6_p20090401
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap gtk? ( x11-libs/gtk+:2 virtual/jpeg media-libs/giflib media-libs/libpng ) virtual/pkgconfig
-DESCRIPTION=A program which listens to network traffic and picks out images from TCP streams it observes
-EAPI=5
-HOMEPAGE=http://www.ex-parrot.com/~chris/driftnet/
-IUSE=gtk mp3 suid
-KEYWORDS=~amd64 ppc -sparc x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap gtk? ( x11-libs/gtk+:2 virtual/jpeg media-libs/giflib media-libs/libpng ) mp3? ( media-sound/mpg123 )
-SLOT=0
-SRC_URI=https://github.com/downloads/rbu/driftnet/driftnet-0.1.6_p20090401.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=00c440c99aad129cf04136d6ade2d0d9
diff --git a/metadata/md5-cache/net-analyzer/driftnet-1.3.0 b/metadata/md5-cache/net-analyzer/driftnet-1.3.0
new file mode 100644
index 000000000000..b50db2f05511
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/driftnet-1.3.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=net-libs/libpcap net-libs/libwebsockets:=[client,http-proxy,socks5] gtk? ( media-libs/giflib:= media-libs/libpng:= virtual/jpeg:0 x11-libs/gtk+:2 ) test? ( dev-util/cmocka )
+DESCRIPTION=Watches network traffic and displays media from TCP streams observed
+EAPI=7
+HOMEPAGE=http://www.ex-parrot.com/~chris/driftnet/
+IUSE=debug gtk suid test +filecaps
+KEYWORDS=~amd64 ~arm64 -sparc ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap net-libs/libwebsockets:=[client,http-proxy,socks5] gtk? ( media-libs/giflib:= media-libs/libpng:= virtual/jpeg:0 x11-libs/gtk+:2 ) filecaps? ( sys-libs/libcap )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/deiv/driftnet/archive/v1.3.0.tar.gz -> driftnet-1.3.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9f44ff2ea4cde09d80532c1e429e8c7a
diff --git a/metadata/md5-cache/net-analyzer/ettercap-0.8.3 b/metadata/md5-cache/net-analyzer/ettercap-0.8.3
deleted file mode 100644
index 559134db5a90..000000000000
--- a/metadata/md5-cache/net-analyzer/ettercap-0.8.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib geoip? ( dev-libs/geoip ) gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) plugins? ( >=net-misc/curl-7.26.0 ) doc? ( app-text/ghostscript-gpl sys-apps/groff ) test? ( dev-libs/check ) sys-devel/flex virtual/yacc
-DESCRIPTION=A suite for man in the middle attacks
-EAPI=7
-HOMEPAGE=https://github.com/Ettercap/ettercap
-IUSE=doc geoip gtk ipv6 libressl ncurses +plugins test
-KEYWORDS=~alpha amd64 arm ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib geoip? ( dev-libs/geoip ) gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) plugins? ( >=net-misc/curl-7.26.0 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Ettercap/ettercap/archive/v0.8.3.tar.gz -> ettercap-0.8.3.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0101c00ddb39be4af866cfe2ce202195
diff --git a/metadata/md5-cache/net-analyzer/ettercap-0.8.3.1 b/metadata/md5-cache/net-analyzer/ettercap-0.8.3.1
index bb329e3f67c2..10482106e987 100644
--- a/metadata/md5-cache/net-analyzer/ettercap-0.8.3.1
+++ b/metadata/md5-cache/net-analyzer/ettercap-0.8.3.1
@@ -5,11 +5,11 @@ DESCRIPTION=A suite for man in the middle attacks
 EAPI=7
 HOMEPAGE=https://github.com/Ettercap/ettercap
 IUSE=doc geoip gtk ipv6 libressl ncurses +plugins test
-KEYWORDS=~alpha ~amd64 arm ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ppc ppc64 sparc x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib geoip? ( dev-libs/geoip ) gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) plugins? ( >=net-misc/curl-7.26.0 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ettercap/ettercap/archive/v0.8.3.1.tar.gz -> ettercap-0.8.3.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=516c8a0aa02059349d3ad270f784d907
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=016305011ecf44dfe7b18e501e9bf771
diff --git a/metadata/md5-cache/net-analyzer/ettercap-9999 b/metadata/md5-cache/net-analyzer/ettercap-9999
index 8c1173b12a02..bd17af55e2fc 100644
--- a/metadata/md5-cache/net-analyzer/ettercap-9999
+++ b/metadata/md5-cache/net-analyzer/ettercap-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/libbsd dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib geoip? ( dev-libs/geoip ) gtk? ( >=dev-libs/atk-1.2.4 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.2.2:2 >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) plugins? ( >=net-misc/curl-7.26.0 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdfccc2b5740901b4f96fa313bfb6102
diff --git a/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r4 b/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r4
new file mode 100644
index 000000000000..4bb3dd1a3837
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/fragroute-1.2.6-r4
@@ -0,0 +1,13 @@
+BDEPEND=virtual/awk >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/libdnet-1.14-r1 dev-libs/libevent:= net-libs/libpcap
+DESCRIPTION=Testing of network intrusion detection systems, firewalls and TCP/IP stacks
+EAPI=7
+HOMEPAGE=https://github.com/stsi/fragroute-ipv6
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/libdnet-1.14-r1 dev-libs/libevent:= net-libs/libpcap
+SLOT=0
+SRC_URI=https://fragroute-ipv6.googlecode.com/files/fragroute-1.2.6-ipv6.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f1c9702717a745b5fa7b4c4d05eb597c
diff --git a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-8.0.1-r1 b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-8.0.1-r1
index 9b2435df05db..f488df9ccf4d 100644
--- a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-8.0.1-r1
+++ b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-8.0.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/libgcrypt:0= dev-libs/libxslt >=net-analyzer/gvm-libs-10.0.1 net-libs/gnutls:= net-libs/libmicrohttpd ~net-analyzer/openvas-scanner-6.0.1 >=net-analyzer/gvmd-8.0.1
 SLOT=0
 SRC_URI=https://github.com/greenbone/gsa/archive/v8.0.1.tar.gz -> greenbone-security-assistant-8.0.1.tar.gz https://github.com/greenbone/gsa/releases/download/v8.0.1/gsa-node-modules-8.0.1.tar.gz -> greenbone-security-assistant-8.0.1-node_modules.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfae771be0aee74f5a8f5f4436dfeacc
diff --git a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-9.0.1 b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-9.0.1
index c45dd786a30e..4908b90963d5 100644
--- a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-9.0.1
+++ b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-9.0.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/libgcrypt:0= dev-libs/libxml2 dev-libs/libxslt >=net-analyzer/gvm-libs-11.0.1 net-libs/gnutls:= net-libs/libmicrohttpd >=net-analyzer/gvmd-9.0.1 net-analyzer/ospd-openvas
 SLOT=0
 SRC_URI=https://github.com/greenbone/gsa/archive/v9.0.1.tar.gz -> greenbone-security-assistant-9.0.1.tar.gz https://github.com/greenbone/gsa/releases/download/v9.0.1/gsa-node-modules-9.0.1.tar.gz -> greenbone-security-assistant-9.0.1-node_modules.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0de0b1c64d61beb61036d1eb17581a0f
diff --git a/metadata/md5-cache/net-analyzer/gvm-libs-10.0.1 b/metadata/md5-cache/net-analyzer/gvm-libs-10.0.1
index eba768bfab01..5b99fa9e8b33 100644
--- a/metadata/md5-cache/net-analyzer/gvm-libs-10.0.1
+++ b/metadata/md5-cache/net-analyzer/gvm-libs-10.0.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-crypt/gpgme:= dev-libs/hiredis dev-libs/libgcrypt:= dev-perl/UUID net-libs/gnutls:= net-libs/libssh:= sys-libs/zlib ldap? ( net-nds/openldap ) radius? ( net-dialup/freeradius-client )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvm-libs/archive/v10.0.1.tar.gz -> gvm-libs-10.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bcba10dbc933121aabb493e282414fc
diff --git a/metadata/md5-cache/net-analyzer/gvm-libs-11.0.1 b/metadata/md5-cache/net-analyzer/gvm-libs-11.0.1
index bc80b6bae8ee..435d8069c42d 100644
--- a/metadata/md5-cache/net-analyzer/gvm-libs-11.0.1
+++ b/metadata/md5-cache/net-analyzer/gvm-libs-11.0.1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/gvm app-crypt/gpgme:= dev-libs/glib dev-libs/hiredis dev-libs/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvm-libs/archive/v11.0.1.tar.gz -> gvm-libs-11.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54756ed4c294b27114f59702d0e28c5a
diff --git a/metadata/md5-cache/net-analyzer/gvmd-8.0.1 b/metadata/md5-cache/net-analyzer/gvmd-8.0.1
index 9b5e05188090..e941d94d39af 100644
--- a/metadata/md5-cache/net-analyzer/gvmd-8.0.1
+++ b/metadata/md5-cache/net-analyzer/gvmd-8.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libgcrypt:0= dev-libs/libical >=net-analyzer/gvm-libs-10.0.1 ne
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvmd/archive/v8.0.1.tar.gz -> gvmd-8.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=67ab31042a77efaccfa8801f77b144f5
diff --git a/metadata/md5-cache/net-analyzer/gvmd-9.0.1 b/metadata/md5-cache/net-analyzer/gvmd-9.0.1
index afb6b12cb17e..8a14c1e51e05 100644
--- a/metadata/md5-cache/net-analyzer/gvmd-9.0.1
+++ b/metadata/md5-cache/net-analyzer/gvmd-9.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=postgres !sqlite
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvmd/archive/v9.0.1.tar.gz -> gvmd-9.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c89c1f6b58b59d0f3e47e83d2c5be479
diff --git a/metadata/md5-cache/net-analyzer/labrea-2.5_p1 b/metadata/md5-cache/net-analyzer/labrea-2.5_p1
new file mode 100644
index 000000000000..53a4b87f910c
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/labrea-2.5_p1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=postinst prepare
+DEPEND=net-libs/libpcap >=dev-libs/libdnet-1.7
+DESCRIPTION='Sticky' Honeypot and IDS
+EAPI=7
+HOMEPAGE=http://labrea.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap >=dev-libs/libdnet-1.7
+SLOT=0
+SRC_URI=mirror://sourceforge/labrea/labrea-2.5-stable-1.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=be32bee77fae31346fd6ca9bc9befc84
diff --git a/metadata/md5-cache/net-analyzer/mtr-0.94 b/metadata/md5-cache/net-analyzer/mtr-0.94
new file mode 100644
index 000000000000..1cd305cedf0e
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/mtr-0.94
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap )
+DEFINED_PHASES=configure postinst prepare
+DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson ) ncurses? ( sys-libs/ncurses:0= )
+DESCRIPTION=My TraceRoute, an Excellent network diagnostic tool
+EAPI=7
+HOMEPAGE=https://www.bitwizard.nl/mtr/
+IUSE=+gtk +ipinfo +ipv6 +jansson +ncurses +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson ) ncurses? ( sys-libs/ncurses:0= ) filecaps? ( sys-libs/libcap )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/traviscross/mtr/archive/v0.94.tar.gz -> mtr-0.94.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1452c4b1b0ea55fcccadad6a359bc165
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1-r1
deleted file mode 100644
index e9935b50174f..000000000000
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-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? ( python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_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 )
-DESCRIPTION=Software for generating and retrieving SNMP data
-EAPI=7
-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_single_target_python2_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 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? ( python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 ) ) rpm? ( bzip2 zlib )
-RESTRICT=test
-SLOT=0/35
-SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.8.1-pre-releases/net-snmp-5.8.1.pre1.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=30001595bd73ea131f80e466a636636f
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r2 b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r2
index 1f790ebc2745..b2ef2de19d53 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.9-r2
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.9-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=7
 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_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-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=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? ( python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) 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_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) rpm? ( bzip2 zlib )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/40
 SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz https://dev.gentoo.org/~jer/net-snmp-5.9.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	distutils-r1	409cd1220f9f980d21980293a50e2a8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=920742b1643a9036bc876f960a6fe6a8
+_md5_=d759c7dabae96e632eaee5689ba62246
diff --git a/metadata/md5-cache/net-analyzer/netio-1.33 b/metadata/md5-cache/net-analyzer/netio-1.33
new file mode 100644
index 000000000000..16ab8ed81f4d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/netio-1.33
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Network benchmark using TCP and UDP protocols
+EAPI=7
+HOMEPAGE=https://web.ars.de/netio/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=free-noncomm
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://www.ars.de/netio133.zip
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f6fa129364ae917223268a13e31cce60
diff --git a/metadata/md5-cache/net-analyzer/nikto-2.1.6_p20200901 b/metadata/md5-cache/net-analyzer/nikto-2.1.6_p20200901
new file mode 100644
index 000000000000..6b60f70ed92a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nikto-2.1.6_p20200901
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Web server vulnerability scanner
+EAPI=7
+HOMEPAGE=https://www.cirt.net/Nikto2
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/Net-SSLeay net-analyzer/nmap virtual/perl-JSON-PP
+SLOT=0
+SRC_URI=https://github.com/sullo/nikto/archive/fb2655b8316097723d4977c792817a21117b2736.tar.gz -> nikto-2.1.6_p20200901.tar.gz
+_md5_=e108077e064261e078bd66155c1ca02d
diff --git a/metadata/md5-cache/net-analyzer/nmapsi-0.5_alpha2 b/metadata/md5-cache/net-analyzer/nmapsi-0.5_alpha2
index 02c1ba006938..730c3109d31d 100644
--- a/metadata/md5-cache/net-analyzer/nmapsi-0.5_alpha2
+++ b/metadata/md5-cache/net-analyzer/nmapsi-0.5_alpha2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 net-analyzer/nmap net-dns/bind-tools
 SLOT=0
 SRC_URI=https://github.com/nmapsi4/nmapsi4/archive/v0.5-alpha2.tar.gz -> nmapsi-0.5_alpha2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f6375086676e536fc01a517f5672884
diff --git a/metadata/md5-cache/net-analyzer/openvas-scanner-6.0.1 b/metadata/md5-cache/net-analyzer/openvas-scanner-6.0.1
index 9b8d9982c355..efd28874f268 100644
--- a/metadata/md5-cache/net-analyzer/openvas-scanner-6.0.1
+++ b/metadata/md5-cache/net-analyzer/openvas-scanner-6.0.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=app-crypt/gpgme:= dev-db/redis dev-libs/libgcrypt:= dev-libs/libksba >=net-analyzer/gvm-libs-10.0.1 net-analyzer/net-snmp net-libs/gnutls:= net-libs/libpcap net-libs/libssh:=
 SLOT=0
 SRC_URI=https://github.com/greenbone/openvas-scanner/archive/v6.0.1.tar.gz -> openvas-scanner-6.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffbef8ae22d02b8a8dd2ece3b7a23f1a
diff --git a/metadata/md5-cache/net-analyzer/openvas-scanner-7.0.1 b/metadata/md5-cache/net-analyzer/openvas-scanner-7.0.1
index a1c87f402800..298f45f2dd29 100644
--- a/metadata/md5-cache/net-analyzer/openvas-scanner-7.0.1
+++ b/metadata/md5-cache/net-analyzer/openvas-scanner-7.0.1
@@ -11,5 +11,5 @@ RDEPEND=acct-user/gvm app-crypt/gpgme:= dev-db/redis dev-libs/glib dev-libs/libg
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/openvas-scanner/archive/v7.0.1.tar.gz -> openvas-scanner-7.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b607f4714005a90936043f6615ceb327
diff --git a/metadata/md5-cache/net-analyzer/rrdcollect-0.2.10 b/metadata/md5-cache/net-analyzer/rrdcollect-0.2.10
new file mode 100644
index 000000000000..603d7f1c74de
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/rrdcollect-0.2.10
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=librrd? ( net-analyzer/rrdtool ) pcre? ( dev-libs/libpcre )
+DESCRIPTION=Read system statistical data and feed it to RRDtool
+EAPI=7
+HOMEPAGE=http://rrdcollect.sourceforge.net/
+IUSE=exec librrd pcre
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=librrd? ( net-analyzer/rrdtool ) pcre? ( dev-libs/libpcre )
+SLOT=0
+SRC_URI=mirror://sourceforge/rrdcollect/rrdcollect-0.2.10.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0019c1cab116494650b6629ffed3dbdf
diff --git a/metadata/md5-cache/net-analyzer/sancp-1.6.1-r4 b/metadata/md5-cache/net-analyzer/sancp-1.6.1-r4
deleted file mode 100644
index d9789420d8a7..000000000000
--- a/metadata/md5-cache/net-analyzer/sancp-1.6.1-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=net-libs/libpcap
-DESCRIPTION=collect network traffic statistics and store them in pcap format
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/sancp/
-IUSE=sguil
-KEYWORDS=~amd64 ~x86
-LICENSE=QPL GPL-2
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=http://www.metre.net/files/sancp-1.6.1.tar.gz http://sancp.sourceforge.net/sancp-1.6.1.fix200511.a.patch http://sancp.sourceforge.net/sancp-1.6.1.fix200511.b.patch http://sancp.sourceforge.net/sancp-1.6.1.fix200601.c.patch http://sancp.sourceforge.net/sancp-1.6.1.fix200606.d.patch
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8390af9a7951f01d4f74050f184ba417
diff --git a/metadata/md5-cache/net-analyzer/sflowtool-5.06 b/metadata/md5-cache/net-analyzer/sflowtool-5.06
new file mode 100644
index 000000000000..ecb93bf7cc0e
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sflowtool-5.06
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=sflowtool is a utility for collecting and processing sFlow data
+EAPI=7
+HOMEPAGE=https://inmon.com/technology/sflowTools.php https://github.com/sflow/sflowtool
+IUSE=debug
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=inmon-sflow
+SLOT=0
+SRC_URI=https://github.com/sflow/sflowtool/archive/v5.06.tar.gz -> sflowtool-5.06.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=363ef17144d92951fdfb823646722ac6
diff --git a/metadata/md5-cache/net-analyzer/sguil-client-0.8.0 b/metadata/md5-cache/net-analyzer/sguil-client-0.8.0
deleted file mode 100644
index 9dd566209f8d..000000000000
--- a/metadata/md5-cache/net-analyzer/sguil-client-0.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=GUI Console for sguil Network Security Monitoring
-EAPI=5
-HOMEPAGE=http://sguil.sf.net
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=QPL
-RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-lang/tk-8.3:0= >=dev-tcltk/itcl-3.2 >=dev-tcltk/tclx-8.3 dev-tcltk/itk dev-tcltk/iwidgets dev-tcltk/tcllib net-analyzer/wireshark ssl? ( >=dev-tcltk/tls-1.4.1 )
-SLOT=0
-SRC_URI=mirror://sourceforge/sguil/sguil-client-0.8.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=94fc57f2e36ea3fa6f946e420aadc4b4
diff --git a/metadata/md5-cache/net-analyzer/sguil-client-0.9.0 b/metadata/md5-cache/net-analyzer/sguil-client-0.9.0
deleted file mode 100644
index 9fcc69f4737d..000000000000
--- a/metadata/md5-cache/net-analyzer/sguil-client-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=GUI Console for sguil Network Security Monitoring
-EAPI=5
-HOMEPAGE=http://sguil.sf.net
-IUSE=ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=QPL
-RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-lang/tk-8.3:0= >=dev-tcltk/itcl-3.2 >=dev-tcltk/tclx-8.3 dev-tcltk/itk dev-tcltk/iwidgets dev-tcltk/tcllib net-analyzer/wireshark ssl? ( >=dev-tcltk/tls-1.4.1 )
-SLOT=0
-SRC_URI=https://github.com/bammv/sguil/archive/v0.9.0.tar.gz -> sguil-0.9.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=32f8134f2481265b434980d0e5ce569a
diff --git a/metadata/md5-cache/net-analyzer/sguil-sensor-0.8.0 b/metadata/md5-cache/net-analyzer/sguil-sensor-0.8.0
deleted file mode 100644
index f3a638f8c4ae..000000000000
--- a/metadata/md5-cache/net-analyzer/sguil-sensor-0.8.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DESCRIPTION=Sensor part of sguil Network Security Monitoring
-EAPI=5
-HOMEPAGE=http://sguil.sourceforge.net
-KEYWORDS=~x86
-LICENSE=GPL-2 QPL
-RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 >=net-analyzer/barnyard-0.2.0-r1 >=net-analyzer/snort-2.4.1-r1 dev-ml/pcre-ocaml net-analyzer/sancp
-SLOT=0
-SRC_URI=mirror://sourceforge/sguil/sguil-sensor-0.8.0.tar.gz
-_eclasses_=user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=7e9baa9d8c186fa33c6b7e0dde61d2f9
diff --git a/metadata/md5-cache/net-analyzer/sguil-sensor-0.9.0 b/metadata/md5-cache/net-analyzer/sguil-sensor-0.9.0
deleted file mode 100644
index f62d9bc809b8..000000000000
--- a/metadata/md5-cache/net-analyzer/sguil-sensor-0.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DESCRIPTION=Sensor part of sguil Network Security Monitoring
-EAPI=5
-HOMEPAGE=http://sguil.sourceforge.net
-KEYWORDS=~x86
-LICENSE=GPL-2 QPL
-RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 >=net-analyzer/barnyard-0.2.0-r1 >=net-analyzer/snort-2.4.1-r1 dev-ml/pcre-ocaml net-analyzer/sancp
-SLOT=0
-SRC_URI=https://github.com/bammv/sguil/archive/v0.9.0.tar.gz -> sguil-0.9.0.tar.gz
-_eclasses_=user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=48b10d1835f218d0c4d1443129d1e1e9
diff --git a/metadata/md5-cache/net-analyzer/sguil-server-0.8.0 b/metadata/md5-cache/net-analyzer/sguil-server-0.8.0
deleted file mode 100644
index 44d3bd10f240..000000000000
--- a/metadata/md5-cache/net-analyzer/sguil-server-0.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-tcltk/mysqltcl ssl? ( >=dev-tcltk/tls-1.4.1 ) ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
-DESCRIPTION=Daemon for Sguil Network Security Monitoring
-EAPI=5
-HOMEPAGE=http://sguil.sourceforge.net
-IUSE=ssl ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 QPL
-RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-tcltk/mysqltcl ssl? ( >=dev-tcltk/tls-1.4.1 ) net-analyzer/p0f net-analyzer/tcpflow net-misc/openssh
-SLOT=0
-SRC_URI=mirror://sourceforge/sguil/sguil-server-0.8.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=1559717984ccddd6cbfbd7dfb40cfadc
diff --git a/metadata/md5-cache/net-analyzer/sguil-server-0.9.0 b/metadata/md5-cache/net-analyzer/sguil-server-0.9.0
deleted file mode 100644
index 4a5045874196..000000000000
--- a/metadata/md5-cache/net-analyzer/sguil-server-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-tcltk/mysqltcl ssl? ( >=dev-tcltk/tls-1.4.1 ) ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
-DESCRIPTION=Daemon for Sguil Network Security Monitoring
-EAPI=5
-HOMEPAGE=http://sguil.sourceforge.net
-IUSE=ssl ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 QPL
-RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-tcltk/mysqltcl ssl? ( >=dev-tcltk/tls-1.4.1 ) net-analyzer/p0f net-analyzer/tcpflow net-misc/openssh
-SLOT=0
-SRC_URI=https://github.com/bammv/sguil/archive/v0.9.0.tar.gz -> sguil-0.9.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=a9c9cab363b6e17b2f5798a66b85dadb
diff --git a/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6 b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
new file mode 100644
index 000000000000..9c7ba5a0b910
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=net-libs/libpcap
+DESCRIPTION=A Tool for analyzing network packet dumps
+EAPI=7
+HOMEPAGE=http://www.tcptrace.org/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap
+SLOT=0
+SRC_URI=http://www.tcptrace.org/download/tcptrace-6.6.7.tar.gz http://www.tcptrace.org/download/old/6.6/tcptrace-6.6.7.tar.gz mirror://debian/pool/main/t/tcptrace/tcptrace_6.6.7-6.debian.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5dd7f0f50843e2b95b919b7af6efb13a
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.2.6 b/metadata/md5-cache/net-analyzer/wireshark-3.2.6
index fdef79da3122..f1812e852663 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.2.6
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.2.6
@@ -12,5 +12,5 @@ REQUIRED_USE=plugin-ifdemo? ( plugins )
 RESTRICT=test
 SLOT=0/3.2.6
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.2.6.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57db767ca3a8d993285a7ef4b62b3562
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.2.7 b/metadata/md5-cache/net-analyzer/wireshark-3.2.7
new file mode 100644
index 000000000000..e55d79173639
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.2.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl sys-devel/bison sys-devel/flex virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) filecaps? ( sys-libs/libcap ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) 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 ) zstd? ( app-arch/zstd ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
+DESCRIPTION=A network protocol analyzer formerly known as ethereal
+EAPI=7
+HOMEPAGE=https://www.wireshark.org/
+IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) 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 ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=plugin-ifdemo? ( plugins )
+RESTRICT=test
+SLOT=0/3.2.7
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.2.7.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6dcf3ba25c88f16bdbbfc679f9415f67
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.3.0 b/metadata/md5-cache/net-analyzer/wireshark-3.3.0
index 37a3b3db0f0b..33509100a9ac 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.3.0
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=plugin-ifdemo? ( plugins )
 RESTRICT=test
 SLOT=0/3.3.0
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.3.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d14533d30eed63b75075bcb45f63d5bb
diff --git a/metadata/md5-cache/net-analyzer/wireshark-99999999 b/metadata/md5-cache/net-analyzer/wireshark-99999999
index 020d0666eed0..3dbd75bef07a 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-99999999
+++ b/metadata/md5-cache/net-analyzer/wireshark-99999999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) 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 ) zstd? ( app-arch/zstd ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=plugin-ifdemo? ( plugins )
 SLOT=0/99999999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=690ff5a211671049348ebbe6785bdb10
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index c98aa8fa796a..1c67287ba839 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20200913 b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20200913
index ec972c8ce798..196f651b2ae7 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20200913
+++ b/metadata/md5-cache/net-dialup/accel-ppp-1.12.0_p20200913
@@ -12,5 +12,5 @@ RDEPEND=lua? ( dev-lang/lua:0 ) postgres? ( dev-db/postgresql:* ) snmp? ( net-an
 REQUIRED_USE=valgrind? ( debug )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/accel-ppp-1.12.0_p20200913.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5fa1a699b267c542f0dfca7404c685f
diff --git a/metadata/md5-cache/net-dialup/accel-ppp-9999 b/metadata/md5-cache/net-dialup/accel-ppp-9999
index 6b2dcfb388e9..a7d7e1187010 100644
--- a/metadata/md5-cache/net-dialup/accel-ppp-9999
+++ b/metadata/md5-cache/net-dialup/accel-ppp-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=lua? ( dev-lang/lua:0 ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre dev-libs/openssl:0= kernel_linux? ( sys-apps/kmod[tools] )
 REQUIRED_USE=valgrind? ( debug )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98038c472704211338118dbeb09e4508
diff --git a/metadata/md5-cache/net-dialup/cutecom-0.51.0-r1 b/metadata/md5-cache/net-dialup/cutecom-0.51.0-r1
index 7049338a08ae..f2edc4199b71 100644
--- a/metadata/md5-cache/net-dialup/cutecom-0.51.0-r1
+++ b/metadata/md5-cache/net-dialup/cutecom-0.51.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 net-dialup/lrzsz
 SLOT=0
 SRC_URI=https://gitlab.com/cutecom/cutecom/-/archive/v0.51.0/cutecom-v0.51.0.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76df5b543edbb97b185cbd09e621f905
diff --git a/metadata/md5-cache/net-dialup/xc-4.3.2-r3 b/metadata/md5-cache/net-dialup/xc-4.3.2-r3
deleted file mode 100644
index f3e755700e85..000000000000
--- a/metadata/md5-cache/net-dialup/xc-4.3.2-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses virtual/pkgconfig
-DESCRIPTION=Modem dialout & serial terminal program
-EAPI=5
-HOMEPAGE=http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/
-KEYWORDS=amd64 ~mips ppc ppc64 sparc x86
-LICENSE=xc-radley
-RDEPEND=sys-libs/ncurses
-SLOT=0
-SRC_URI=http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/xc-4.3.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0f020a01eb50926a8d0eb351fac0c383
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 45bfd41a520c..e2baf0e8036a 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/bind-9.16.6-r3 b/metadata/md5-cache/net-dns/bind-9.16.6-r3
new file mode 100644
index 000000000000..2b035ee666c8
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-9.16.6-r3
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare
+DEPEND=acct-group/named acct-user/named !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ply[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-libs/libuv:=
+DESCRIPTION=Berkeley Internet Name Domain - Name Server
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+IUSE=-berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=acct-group/named acct-user/named !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb ) geoip2? ( dev-libs/libmaxminddb ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ply[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc
+REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.6/bind-9.16.6.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	db-use	501a5d0963e0d17f30260023f292ae8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=02ea05269f68a00e0c39d4253042188c
diff --git a/metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r2 b/metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r2
new file mode 100644
index 000000000000..46157409bcbf
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:= dev-perl/CGI 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 dev-lang/perl
+DESCRIPTION=Tools to ease the deployment of DNSSEC related technologies
+EAPI=7
+HOMEPAGE=https://dnssec-tools.org/
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/perl:= dev-perl/CGI 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 dev-lang/perl:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/dnssec-tools-2.2.3.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=056bd0bb0e197d52643781cfc81431e9
diff --git a/metadata/md5-cache/net-dns/getdns-1.6.0_beta1-r2 b/metadata/md5-cache/net-dns/getdns-1.6.0_beta1-r2
index eacf5ab19cf6..53c3eb3c3cd5 100644
--- a/metadata/md5-cache/net-dns/getdns-1.6.0_beta1-r2
+++ b/metadata/md5-cache/net-dns/getdns-1.6.0_beta1-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libbsd dev-libs/libyaml dev-libs/openssl:= idn? ( net-dns/libid
 RESTRICT=test
 SLOT=0
 SRC_URI=https://getdnsapi.net/releases/getdns-1-6-0-beta-1/getdns-1.6.0-beta.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	fcaps	da689a8e04bbbb3518888ff668fee45b	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1815eba0c0f20362c4175a356925651
diff --git a/metadata/md5-cache/net-dns/knot-2.9.5 b/metadata/md5-cache/net-dns/knot-2.9.5
deleted file mode 100644
index 322f079f379e..000000000000
--- a/metadata/md5-cache/net-dns/knot-2.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
-DESCRIPTION=High-performance authoritative-only DNS server
-EAPI=7
-HOMEPAGE=https://www.knot-dns.cz/
-IUSE=doc caps +fastparser idn +libidn2 systemd +utils +cookies +dnsproxy dnstap geoip +noudp +onlinesign +queryacl +rrl +stats +synthrecord +whoami
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
-SLOT=0
-SRC_URI=https://secure.nic.cz/files/knot-dns/knot-2.9.5.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9f8a67f34a1e7dc0cb7218f538d8495a
diff --git a/metadata/md5-cache/net-dns/knot-2.9.6 b/metadata/md5-cache/net-dns/knot-2.9.6
new file mode 100644
index 000000000000..a28cc523edd6
--- /dev/null
+++ b/metadata/md5-cache/net-dns/knot-2.9.6
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
+DESCRIPTION=High-performance authoritative-only DNS server
+EAPI=7
+HOMEPAGE=https://www.knot-dns.cz/
+IUSE=doc caps +fastparser idn +libidn2 systemd +utils +cookies +dnsproxy dnstap geoip +noudp +onlinesign +queryacl +rrl +stats +synthrecord +whoami
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=acct-group/knot acct-user/knot dev-db/lmdb dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb net-libs/gnutls:= caps? ( sys-libs/libcap-ng ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) geoip? ( dev-libs/libmaxminddb:= ) idn? ( !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) systemd? ( sys-apps/systemd:= )
+SLOT=0
+SRC_URI=https://secure.nic.cz/files/knot-dns/knot-2.9.6.tar.xz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9f8a67f34a1e7dc0cb7218f538d8495a
diff --git a/metadata/md5-cache/net-dns/libidn-1.35 b/metadata/md5-cache/net-dns/libidn-1.35
index 7dcb76db62b4..6125390ddd46 100644
--- a/metadata/md5-cache/net-dns/libidn-1.35
+++ b/metadata/md5-cache/net-dns/libidn-1.35
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/12
 SRC_URI=mirror://gnu/libidn/libidn-1.35.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4422911117f09fb219e85662c800f4da
diff --git a/metadata/md5-cache/net-dns/libidn-1.36 b/metadata/md5-cache/net-dns/libidn-1.36
index 106a04b518f6..d198fdbf5cd8 100644
--- a/metadata/md5-cache/net-dns/libidn-1.36
+++ b/metadata/md5-cache/net-dns/libidn-1.36
@@ -10,5 +10,5 @@ LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) mono? ( >=dev-lang/mono-0.95 ) java? ( >=virtual/jre-1.5 ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/12
 SRC_URI=mirror://gnu/libidn/libidn-1.36.tar.gz
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	libtool	f143db5a74ccd9ca28c1234deffede96	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f39e6f8e3ff13bc7c214a7f3d4e8bc70
diff --git a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5 b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
index 5bf592535417..dbd5f6ac8b57 100644
--- a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
+++ b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.5
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/resolv_wrapper-1.1.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38821d0a0e3c6ca4efca796a15737eb9
diff --git a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.6 b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.6
index 7dcf575d5490..387b56c5112d 100644
--- a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.6
+++ b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.6
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/resolv_wrapper-1.1.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54151ed11c8814a796e797f12f72e810
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 05b1db802900..31401b5adf1f 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/itval-1.2_p20121104-r1 b/metadata/md5-cache/net-firewall/itval-1.2_p20121104-r1
index 3a3d5bc3c429..2f2a73a78574 100644
--- a/metadata/md5-cache/net-firewall/itval-1.2_p20121104-r1
+++ b/metadata/md5-cache/net-firewall/itval-1.2_p20121104-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/fddl
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/ITVal-20121104.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=533040575fe734b95792fdf1d20a0e8e
diff --git a/metadata/md5-cache/net-firewall/nftables-0.9.6-r1 b/metadata/md5-cache/net-firewall/nftables-0.9.6-r1
new file mode 100644
index 000000000000..e9f19ce88542
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftables-0.9.6-r1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-text/asciidoc >=app-text/docbook2X-0.8.8-r4 ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=net-libs/libmnl-1.0.4:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.7:0= xtables? ( >=net-firewall/iptables-1.6.1 )
+DESCRIPTION=Linux kernel (3.13+) firewall, NAT and packet mangling tools
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/nftables/
+IUSE=debug doc +gmp json +modern-kernel python +readline static-libs xtables kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libmnl-1.0.4:0= gmp? ( dev-libs/gmp:0= ) json? ( dev-libs/jansson ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) readline? ( sys-libs/readline:0= ) >=net-libs/libnftnl-1.1.7:0= xtables? ( >=net-firewall/iptables-1.6.1 )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
+SLOT=0
+SRC_URI=https://netfilter.org/projects/nftables/files/nftables-0.9.6.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b72fa2d6b6483780e2dc0c2dd6f21b21
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.2.8 b/metadata/md5-cache/net-firewall/shorewall-5.2.8
new file mode 100644
index 000000000000..11761a1dc2a2
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/shorewall-5.2.8
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DESCRIPTION=A high-level tool for configuring Netfilter
+EAPI=7
+HOMEPAGE=https://shorewall.org/
+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=https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-core-5.2.8.tar.bz2 ipv4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-5.2.8.tar.bz2 ) ipv6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall6-5.2.8.tar.bz2 ) lite4? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-lite-5.2.8.tar.bz2 ) lite6? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall6-lite-5.2.8.tar.bz2 ) init? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-init-5.2.8.tar.bz2 ) doc? ( https://shorewall.org/pub/shorewall/5.2/shorewall-5.2.8/shorewall-docs-html-5.2.8.tar.bz2 )
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1e4c8c77c1edf6f4a7be7f6da92c8930
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 4d2411df2708..59692c6fb511 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/autofs-5.1.6-r1 b/metadata/md5-cache/net-fs/autofs-5.1.6-r1
index 59405a790bb8..63478eb5b5fe 100644
--- a/metadata/md5-cache/net-fs/autofs-5.1.6-r1
+++ b/metadata/md5-cache/net-fs/autofs-5.1.6-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Kernel based automounter
 EAPI=7
 HOMEPAGE=https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html
 IUSE=-dmalloc ldap +libtirpc mount-locking sasl systemd kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) systemd? ( sys-apps/systemd ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-5.1.6.tar.xz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d5dbd018b5be271beeea4773f109c442
+_md5_=0e415f519eb7043c01a64771c316e597
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.10-r1 b/metadata/md5-cache/net-fs/cifs-utils-6.10-r1
deleted file mode 100644
index a87f51787b93..000000000000
--- a/metadata/md5-cache/net-fs/cifs-utils-6.10-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/docutils >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install 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? ( sys-libs/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 ~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? ( sys-libs/pam )
-REQUIRED_USE=acl? ( ads )
-SLOT=0
-SRC_URI=https://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-6.10.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8ed0934c8f6ec2fb518df91745e87426
diff --git a/metadata/md5-cache/net-fs/cifs-utils-6.9-r1 b/metadata/md5-cache/net-fs/cifs-utils-6.9-r1
deleted file mode 100644
index 285fe8394f19..000000000000
--- a/metadata/md5-cache/net-fs/cifs-utils-6.9-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure 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? ( sys-libs/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 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? ( sys-libs/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	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=85c783847483619ebf2ac81078544d59
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.7.2-r1 b/metadata/md5-cache/net-fs/cvmfs-2.7.2-r1
index 58878f2ea974..b319b9786a7e 100644
--- a/metadata/md5-cache/net-fs/cvmfs-2.7.2-r1
+++ b/metadata/md5-cache/net-fs/cvmfs-2.7.2-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
 SLOT=0
 SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.7.2/source.tar.gz -> cvmfs-2.7.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bea9c23ecc50536414dcdabf5e5d8d81
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.7.3 b/metadata/md5-cache/net-fs/cvmfs-2.7.3
index a3c48a5b9b6d..81ea03efd2d2 100644
--- a/metadata/md5-cache/net-fs/cvmfs-2.7.3
+++ b/metadata/md5-cache/net-fs/cvmfs-2.7.3
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
 SLOT=0
 SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.7.3/source.tar.gz -> cvmfs-2.7.3.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e527df1cccff52bf1e674880e9427ef
diff --git a/metadata/md5-cache/net-fs/davfs2-1.5.6-r1 b/metadata/md5-cache/net-fs/davfs2-1.5.6-r1
index c85003e5b25a..e584c22f8305 100644
--- a/metadata/md5-cache/net-fs/davfs2-1.5.6-r1
+++ b/metadata/md5-cache/net-fs/davfs2-1.5.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Linux FUSE (or coda) driver that allows you to mount a WebDAV resour
 EAPI=7
 HOMEPAGE=https://savannah.nongnu.org/projects/davfs2
 IUSE=nls
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/libxml2 net-libs/neon sys-libs/zlib nls? ( virtual/libintl virtual/libiconv ) acct-group/davfs2 acct-user/davfs2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://nongnu/davfs2/davfs2-1.5.6.tar.gz
-_md5_=fddcd373e376bfc0b77477e025fcba9e
+_md5_=aee32480f5c9af6fc785d90308d30f21
diff --git a/metadata/md5-cache/net-fs/samba-4.11.13 b/metadata/md5-cache/net-fs/samba-4.11.13
index 634fcc0348a7..bcc6f96a8ff6 100644
--- a/metadata/md5-cache/net-fs/samba-4.11.13
+++ b/metadata/md5-cache/net-fs/samba-4.11.13
@@ -4,7 +4,7 @@ DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
 IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux snapper syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.12[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.1.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
 REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.11.13.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=af5c3cb1d5cd6848e5f0bf1cbcab4399
+_md5_=08a6dddbd90095f05bd4a2c793654df5
diff --git a/metadata/md5-cache/net-fs/samba-4.13.0 b/metadata/md5-cache/net-fs/samba-4.13.0
index f8120ad971cb..4ac967cc97cc 100644
--- a/metadata/md5-cache/net-fs/samba-4.13.0
+++ b/metadata/md5-cache/net-fs/samba-4.13.0
@@ -7,9 +7,9 @@ IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.2.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.3.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba )
-REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) !ads? ( !addc ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.13.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=8fc0e448c7c02a6ab17e9ea82ea8c315
+_md5_=ef11b4cfdc72f5517995ecbc5c9c6d09
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index e8eb1948bfed..769074d7a904 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/tftp-hpa-5.2-r2 b/metadata/md5-cache/net-ftp/tftp-hpa-5.2-r2
index cd6777bf882c..385a113f698b 100644
--- a/metadata/md5-cache/net-ftp/tftp-hpa-5.2-r2
+++ b/metadata/md5-cache/net-ftp/tftp-hpa-5.2-r2
@@ -7,8 +7,8 @@ HOMEPAGE=https://www.kernel.org/pub/software/network/tftp/
 IUSE=ipv6 readline selinux tcpd +client +server
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos
 LICENSE=BSD-4
-RDEPEND=readline? ( sys-libs/readline:0= ) tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-tftp ) !net-ftp/atftp !net-ftp/uftpd server? ( !net-misc/iputils[tftpd(+)] )
+RDEPEND=readline? ( sys-libs/readline:0= ) tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-tftp ) !net-ftp/atftp server? ( !net-misc/iputils[tftpd(+)] !net-ftp/uftpd )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-5.2.tar.xz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=405619fc410e1dae487de9fa40e2b60e
+_md5_=7cfc967462746154dfa44e98964b339c
diff --git a/metadata/md5-cache/net-ftp/uftpd-2.13 b/metadata/md5-cache/net-ftp/uftpd-2.13
index 9941987a7123..82b9bede43c3 100644
--- a/metadata/md5-cache/net-ftp/uftpd-2.13
+++ b/metadata/md5-cache/net-ftp/uftpd-2.13
@@ -1,11 +1,13 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-libs/libite-1.5 >=dev-libs/libuev-2.2
+DEFINED_PHASES=test
+DEPEND=>=dev-libs/libite-1.5 >=dev-libs/libuev-2.2 !net-misc/uftp !net-ftp/atftp !net-ftp/tftp-hpa[server(+)] test? ( net-ftp/ftp net-ftp/tnftp >=net-ftp/tftp-hpa-5.2-r2[client] )
 DESCRIPTION=The no nonsense TFTP/FTP server
 EAPI=7
 HOMEPAGE=https://github.com/troglobit/uftpd
-KEYWORDS=~amd64 ~x86
+IUSE=test
+KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-libs/libite-1.5 >=dev-libs/libuev-2.2 !net-misc/uftp !net-ftp/atftp
+RDEPEND=>=dev-libs/libite-1.5 >=dev-libs/libuev-2.2
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/troglobit/uftpd/releases/download/v2.13/uftpd-2.13.tar.xz
-_md5_=b0b6ed1fd9ffb917892fdf9ab159e576
+_md5_=febdcd2bca7c5b43cba1012b37cfb796
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index b5620aba24c2..27f2c4f481cc 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/choqok-1.7.0 b/metadata/md5-cache/net-im/choqok-1.7.0
index b1c297fb094a..ce92de34da0c 100644
--- a/metadata/md5-cache/net-im/choqok-1.7.0
+++ b/metadata/md5-cache/net-im/choqok-1.7.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-crypt/qca[qt5(+)] >=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 >=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 attica? ( >=kde-frameworks/attica-5.60.0:5 ) konqueror? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kdewebkit-5.60.0:5 ) share? ( >=kde-frameworks/purpose-5.60.0:5 ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/choqok/1.7/src/choqok-1.7.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd03065ce42f9ca4fec4df494208e4ea
diff --git a/metadata/md5-cache/net-im/pidgin-2.14.1 b/metadata/md5-cache/net-im/pidgin-2.14.1
index fced4dd06be3..9af2c4e99337 100644
--- a/metadata/md5-cache/net-im/pidgin-2.14.1
+++ b/metadata/md5-cache/net-im/pidgin-2.14.1
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:0=[unicode] dbus? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls(+)] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) !<x11-plugins/pidgin-facebookchat-1.69-r1 gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:0=[unicode] dbus? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) !<x11-plugins/pidgin-facebookchat-1.69-r1 gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GTK Instant Messenger client
 EAPI=7
 HOMEPAGE=https://pidgin.im/
 IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:0=[unicode] dbus? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls(+)] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) !<x11-plugins/pidgin-facebookchat-1.69-r1
+RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( >=dev-libs/libgnt-2.14 sys-libs/ncurses:0=[unicode] dbus? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( >=net-libs/libgadu-1.11.0 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) !<x11-plugins/pidgin-facebookchat-1.69-r1
 REQUIRED_USE=dbus? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/pidgin/pidgin-2.14.1.tar.bz2 https://dev.gentoo.org/~polynomial-c/pidgin-eds-3.6.patch.bz2 https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> pidgin-2.10.9-irc_join_sleep.patch
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f2d5ecdaaf7da690d2b5b6d298256a6c
+_md5_=0c5a9dd1ba4233f3d0ac7d1bbec8864d
diff --git a/metadata/md5-cache/net-im/psi-9999 b/metadata/md5-cache/net-im/psi-9999
index 997062699468..4d1afe34acc8 100644
--- a/metadata/md5-cache/net-im/psi-9999
+++ b/metadata/md5-cache/net-im/psi-9999
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/qca:2[ssl] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:
 REQUIRED_USE=?? ( aspell enchant hunspell ) iconsets? ( extras )
 RESTRICT=test iconsets? ( bindist )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef1e327e0cc93bec53408ac40fdead02
diff --git a/metadata/md5-cache/net-im/psimedia-9999 b/metadata/md5-cache/net-im/psimedia-9999
index 5bc9cf00cf96..9f054cbc5ed6 100644
--- a/metadata/md5-cache/net-im/psimedia-9999
+++ b/metadata/md5-cache/net-im/psimedia-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/glib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-opus:1.0 media-plugins/gst-plugins-v4l2:1.0 ~net-im/psi-9999[extras?]
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a1135e3033aa029b58edc11cb29e177
diff --git a/metadata/md5-cache/net-im/qtox-1.16.3-r1 b/metadata/md5-cache/net-im/qtox-1.16.3-r1
index eeb89d0800dd..fafeb9923211 100644
--- a/metadata/md5-cache/net-im/qtox-1.16.3-r1
+++ b/metadata/md5-cache/net-im/qtox-1.16.3-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcor
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qTox/qTox/archive/v1.16.3.tar.gz -> qTox-1.16.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d302f3b9d31076092ff539c49e398ce7
diff --git a/metadata/md5-cache/net-im/qtox-9999 b/metadata/md5-cache/net-im/qtox-9999
index f5a9ef254613..cf3adce36cc4 100644
--- a/metadata/md5-cache/net-im/qtox-9999
+++ b/metadata/md5-cache/net-im/qtox-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-db/sqlcipher dev-libs/libsodium:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 || ( dev-qt/qtgui:5[gif,jpeg,png,X(-)] dev-qt/qtgui:5[gif,jpeg,png,xcb(-)] ) dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/qrencode:= media-libs/libexif:= media-libs/openal >=media-video/ffmpeg-2.6.3:=[webp,v4l] net-libs/tox:0/0.2[av] notification? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXScrnSaver )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7260c0d0ea6b2580d3158b088db08578
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.36.1 b/metadata/md5-cache/net-im/signal-desktop-bin-1.36.1
deleted file mode 100644
index ed64ac1043d1..000000000000
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.36.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-admin/chrpath
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
-EAPI=7
-HOMEPAGE=https://signal.org/ https://github.com/signalapp/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=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libxcb 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/pango
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.36.1_amd64.deb
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ccd805858d6cfec9fbca0cf267f5c8ca
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.36.2 b/metadata/md5-cache/net-im/signal-desktop-bin-1.36.2
new file mode 100644
index 000000000000..2b4a02b77f9c
--- /dev/null
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.36.2
@@ -0,0 +1,14 @@
+BDEPEND=app-admin/chrpath
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Allows you to send and receive messages of Signal Messenger on your computer
+EAPI=7
+HOMEPAGE=https://signal.org/ https://github.com/signalapp/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=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libxcb 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/pango
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.36.2_amd64.deb
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ccd805858d6cfec9fbca0cf267f5c8ca
diff --git a/metadata/md5-cache/net-im/spectrum2-2.0.13-r2 b/metadata/md5-cache/net-im/spectrum2-2.0.13-r2
index 956502484587..91fd89f17fb1 100644
--- a/metadata/md5-cache/net-im/spectrum2-2.0.13-r2
+++ b/metadata/md5-cache/net-im/spectrum2-2.0.13-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( irc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SpectrumIM/spectrum2/archive/2.0.13.tar.gz -> spectrum2-2.0.13.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01cefabc2736a7e2edc02b7c33e9e19a
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.1.13 b/metadata/md5-cache/net-im/telegram-desktop-2.1.13
index 36372c47c939..19282e141fa1 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-2.1.13
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.1.13
@@ -11,5 +11,5 @@ RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= app-arch/xz-utils !libressl?
 REQUIRED_USE=|| ( alsa pulseaudio ) || ( X wayland ) spell? ( ^^ ( enchant hunspell ) )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.1.13/tdesktop-2.1.13-full.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=333c29b7dd3da7dce99bfcb9f7b9dee7
diff --git a/metadata/md5-cache/net-im/telegram-desktop-2.2.0-r1 b/metadata/md5-cache/net-im/telegram-desktop-2.2.0-r1
index ebd43310d979..a0f6bf830e59 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-2.2.0-r1
+++ b/metadata/md5-cache/net-im/telegram-desktop-2.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= app-arch/xz-utils !libressl?
 REQUIRED_USE=|| ( alsa pulseaudio ) spell? ( ^^ ( enchant hunspell ) )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v2.2.0/tdesktop-2.2.0-full.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=40e6cda8b9dd891ad96b7507b5862a9c
diff --git a/metadata/md5-cache/net-im/zoom-5.2.454870.0831 b/metadata/md5-cache/net-im/zoom-5.2.454870.0831
deleted file mode 100644
index 36ac8a9d17d4..000000000000
--- a/metadata/md5-cache/net-im/zoom-5.2.454870.0831
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=!pulseaudio? ( dev-util/bbe )
-DEFINED_PHASES=install postinst postrm prepare
-DESCRIPTION=Video conferencing and web conferencing service
-EAPI=7
-HOMEPAGE=https://zoom.us/
-IUSE=bundled-libjpeg-turbo pulseaudio
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved Apache-2.0
-RDEPEND=!games-engines/zoom dev-libs/glib:2 dev-libs/icu dev-qt/qtcore:5 dev-qt/qtdbus:5 amd64? ( dev-qt/qtdeclarative:5[widgets] ) x86? ( dev-qt/qtdeclarative:5 ) dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-sound/mpg123 sys-apps/dbus sys-apps/util-linux virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/xcb-util-image x11-libs/xcb-util-keysyms !bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib )
-RESTRICT=mirror bindist strip
-SLOT=0
-SRC_URI=amd64? ( https://zoom.us/client/5.2.454870.0831/zoom_x86_64.tar.xz -> zoom-5.2.454870.0831_x86_64.tar.xz ) x86? ( https://zoom.us/client/5.2.454870.0831/zoom_i686.tar.xz -> zoom-5.2.454870.0831_i686.tar.xz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a23993102d208d06529c1fb3ab00a0be
diff --git a/metadata/md5-cache/net-im/zoom-5.3.465578.0920-r1 b/metadata/md5-cache/net-im/zoom-5.3.465578.0920-r1
new file mode 100644
index 000000000000..89a0afb7860b
--- /dev/null
+++ b/metadata/md5-cache/net-im/zoom-5.3.465578.0920-r1
@@ -0,0 +1,14 @@
+BDEPEND=!pulseaudio? ( dev-util/bbe )
+DEFINED_PHASES=install postinst postrm prepare
+DESCRIPTION=Video conferencing and web conferencing service
+EAPI=7
+HOMEPAGE=https://zoom.us/
+IUSE=bundled-libjpeg-turbo pulseaudio
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved Apache-2.0
+RDEPEND=!games-engines/zoom dev-libs/glib:2 dev-libs/icu dev-libs/quazip dev-qt/qtcore:5 dev-qt/qtdbus:5 amd64? ( dev-qt/qtdeclarative:5[widgets] ) x86? ( dev-qt/qtdeclarative:5 ) dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-sound/mpg123 sys-apps/dbus sys-apps/util-linux virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/xcb-util-image x11-libs/xcb-util-keysyms !bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=amd64? ( https://zoom.us/client/5.3.465578.0920/zoom_x86_64.tar.xz -> zoom-5.3.465578.0920_x86_64.tar.xz ) x86? ( https://zoom.us/client/5.3.465578.0920/zoom_i686.tar.xz -> zoom-5.3.465578.0920_i686.tar.xz )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b56c1090ae9ffbc2748d3db01a7dd4c9
diff --git a/metadata/md5-cache/net-im/zoom-5.3.469451.0927 b/metadata/md5-cache/net-im/zoom-5.3.469451.0927
new file mode 100644
index 000000000000..3c6eab348036
--- /dev/null
+++ b/metadata/md5-cache/net-im/zoom-5.3.469451.0927
@@ -0,0 +1,14 @@
+BDEPEND=!pulseaudio? ( dev-util/bbe )
+DEFINED_PHASES=install postinst postrm prepare
+DESCRIPTION=Video conferencing and web conferencing service
+EAPI=7
+HOMEPAGE=https://zoom.us/
+IUSE=bundled-libjpeg-turbo pulseaudio
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved Apache-2.0
+RDEPEND=!games-engines/zoom dev-libs/glib:2 dev-libs/icu dev-libs/quazip dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtdiag:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtscript:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-sound/mpg123 sys-apps/dbus sys-apps/util-linux virtual/opengl x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/xcb-util-image x11-libs/xcb-util-keysyms !bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio ) !pulseaudio? ( media-libs/alsa-lib )
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=amd64? ( https://zoom.us/client/5.3.469451.0927/zoom_x86_64.tar.xz -> zoom-5.3.469451.0927_x86_64.tar.xz ) x86? ( https://zoom.us/client/5.3.469451.0927/zoom_i686.tar.xz -> zoom-5.3.469451.0927_i686.tar.xz )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bc04fec428f9de89ff01ad419a158b80
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 6699f341cddd..dc0f49118469 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/anope-2.0.7 b/metadata/md5-cache/net-irc/anope-2.0.7
index 9f74e5b5729c..afc814423193 100644
--- a/metadata/md5-cache/net-irc/anope-2.0.7
+++ b/metadata/md5-cache/net-irc/anope-2.0.7
@@ -11,5 +11,5 @@ RDEPEND=acct-group/anope acct-user/anope mysql? ( dev-db/mysql-connector-c:0= )
 REQUIRED_USE=sql? ( || ( mysql sqlite ) )
 SLOT=0
 SRC_URI=https://github.com/anope/anope/releases/download/2.0.7/anope-2.0.7-source.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=22d84d8b4633a268f13f9863e2376c6c
diff --git a/metadata/md5-cache/net-irc/ii-1.8 b/metadata/md5-cache/net-irc/ii-1.8
index be319a1fdc9c..ef464734814b 100644
--- a/metadata/md5-cache/net-irc/ii-1.8
+++ b/metadata/md5-cache/net-irc/ii-1.8
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A minimalist FIFO and filesystem-based IRC client
 EAPI=6
 HOMEPAGE=https://tools.suckless.org/ii/
-KEYWORDS=~amd64 arm ~x86 ~amd64-linux
+KEYWORDS=~amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/ii-1.8.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e75fe625f4890f25abcb73639b4585a8
+_md5_=8be5f78b07ce0a36ead6497efbb819db
diff --git a/metadata/md5-cache/net-irc/irc-server-2.11.1_p1-r4 b/metadata/md5-cache/net-irc/irc-server-2.11.1_p1-r4
deleted file mode 100644
index 89f7e7dd7fa2..000000000000
--- a/metadata/md5-cache/net-irc/irc-server-2.11.1_p1-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=sys-libs/ncurses:0 zlib? ( sys-libs/zlib ) sys-apps/sed sys-apps/grep
-DESCRIPTION=RFC compliant IRC server
-EAPI=6
-HOMEPAGE=http://www.irc.org/
-IUSE=zlib ipv6
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-1 GPL-2
-RDEPEND=sys-libs/ncurses:0 zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=ftp://ftp.irc.org/irc/server/irc2.11.1p1.tgz ftp://ftp.irc.org/irc/server/Old/irc2.11/irc2.11.1p1.tgz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=337e7e77e36f24b04ec94f37ae4f6f8b
diff --git a/metadata/md5-cache/net-irc/konversation-1.7.5-r2 b/metadata/md5-cache/net-irc/konversation-1.7.5-r2
index ace78fadb3c5..88d129287529 100644
--- a/metadata/md5-cache/net-irc/konversation-1.7.5-r2
+++ b/metadata/md5-cache/net-irc/konversation-1.7.5-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5= >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kidletime-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 media-libs/phonon[qt5(+)] crypt? ( app-crypt/qca:2[qt5(+)] ) crypt? ( app-crypt/qca:2[ssl] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/konversation/1.7.5/src/konversation-1.7.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b9edccee6d03ae52958929173a224736
diff --git a/metadata/md5-cache/net-irc/konversation-1.7.6 b/metadata/md5-cache/net-irc/konversation-1.7.6
new file mode 100644
index 000000000000..9df81e80e780
--- /dev/null
+++ b/metadata/md5-cache/net-irc/konversation-1.7.6
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.70.0:5 ) >=kde-frameworks/extra-cmake-modules-5.70.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=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 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kbookmarks-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=media-libs/phonon-4.11.0 crypt? ( >=app-crypt/qca-2.3.0:2 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=User friendly IRC Client
+EAPI=7
+HOMEPAGE=https://konversation.kde.org
+IUSE=+crypt debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=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 >=kde-frameworks/karchive-5.70.0:5 >=kde-frameworks/kbookmarks-5.70.0:5 >=kde-frameworks/kcodecs-5.70.0:5 >=kde-frameworks/kcompletion-5.70.0:5 >=kde-frameworks/kconfig-5.70.0:5 >=kde-frameworks/kconfigwidgets-5.70.0:5 >=kde-frameworks/kcoreaddons-5.70.0:5 >=kde-frameworks/kcrash-5.70.0:5 >=kde-frameworks/kdbusaddons-5.70.0:5 >=kde-frameworks/kglobalaccel-5.70.0:5 >=kde-frameworks/ki18n-5.70.0:5 >=kde-frameworks/kidletime-5.70.0:5 >=kde-frameworks/kio-5.70.0:5 >=kde-frameworks/kitemviews-5.70.0:5 >=kde-frameworks/knotifications-5.70.0:5 >=kde-frameworks/knotifyconfig-5.70.0:5 >=kde-frameworks/kparts-5.70.0:5 >=kde-frameworks/kservice-5.70.0:5 >=kde-frameworks/ktextwidgets-5.70.0:5 >=kde-frameworks/kwallet-5.70.0:5 >=kde-frameworks/kwidgetsaddons-5.70.0:5 >=kde-frameworks/kwindowsystem-5.70.0:5 >=kde-frameworks/kxmlgui-5.70.0:5 >=media-libs/phonon-4.11.0 crypt? ( >=app-crypt/qca-2.3.0:2 ) crypt? ( >=app-crypt/qca-2.3.0:2[ssl] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/konversation/1.7.6/src/konversation-1.7.6.tar.xz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b9f10a24a1dfa613e9f1c0c727fb91a
diff --git a/metadata/md5-cache/net-irc/kvirc-5.2_pre20200605155236 b/metadata/md5-cache/net-irc/kvirc-5.2_pre20200605155236
index 88cb69fbeb1b..01784b664adb 100644
--- a/metadata/md5-cache/net-irc/kvirc-5.2_pre20200605155236
+++ b/metadata/md5-cache/net-irc/kvirc-5.2_pre20200605155236
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5
 REQUIRED_USE=audiofile? ( oss ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/kvirc/KVIrc/archive/e66a5106ef55a92e2532c38aa255ac376ba6afe1.tar.gz -> kvirc-5.2_pre20200605155236.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=955da4129824d5b894d6b8f74148f4af
diff --git a/metadata/md5-cache/net-irc/kvirc-9999 b/metadata/md5-cache/net-irc/kvirc-9999
index ace18dff32b2..60c399cfd0e7 100644
--- a/metadata/md5-cache/net-irc/kvirc-9999
+++ b/metadata/md5-cache/net-irc/kvirc-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) spell? ( app-text/enchant:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) webkit? ( dev-qt/qtwebkit:5 ) gsm? ( media-sound/gsm )
 REQUIRED_USE=audiofile? ( oss ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d247fdf3703fd96ca54a96e6e3f57e2
diff --git a/metadata/md5-cache/net-irc/nebula-0.5 b/metadata/md5-cache/net-irc/nebula-0.5
deleted file mode 100644
index 8d7e4332db41..000000000000
--- a/metadata/md5-cache/net-irc/nebula-0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=x11-libs/motif-2.3:0
-DESCRIPTION=An IRC client for X11 and Motif
-EAPI=4
-HOMEPAGE=http://nebula-irc.sourceforge.net/
-KEYWORDS=~amd64 x86
-LICENSE=BSD
-RDEPEND=>=x11-libs/motif-2.3:0
-SLOT=0
-SRC_URI=mirror://sourceforge/nebula-irc/nebula-0.5.tar.gz
-_md5_=fb614745d0c25516488e022d1bd38cfc
diff --git a/metadata/md5-cache/net-irc/ptlink-ircd-6.19.6-r3 b/metadata/md5-cache/net-irc/ptlink-ircd-6.19.6-r3
deleted file mode 100644
index 7ee95c608d99..000000000000
--- a/metadata/md5-cache/net-irc/ptlink-ircd-6.19.6-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=sys-libs/zlib ssl? ( dev-libs/openssl:0= ) ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )
-DESCRIPTION=Secure IRC daemon with many advanced features
-EAPI=6
-HOMEPAGE=http://www.ptlink.net/
-IUSE=ssl ssl
-KEYWORDS=~ppc ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.sunsite.dk/projects/ptlink/ircd/PTlink6.19.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=43111d5ead58073e2595a4358e388aa2
diff --git a/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r1 b/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r1
deleted file mode 100644
index ea992427c10e..000000000000
--- a/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=PTlink Open Proxy Monitor
-EAPI=6
-HOMEPAGE=http://www.ptlink.net/
-KEYWORDS=~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.sunsite.dk/projects/ptlink/ptopm/PTlink.OPM1.3.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e35ed00019916f4822796e05a00df44b
diff --git a/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r2 b/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r2
deleted file mode 100644
index d6d4216734f7..000000000000
--- a/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=PTlink Open Proxy Monitor
-EAPI=7
-HOMEPAGE=http://www.ptlink.net/
-KEYWORDS=~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.sunsite.dk/projects/ptlink/ptopm/PTlink.OPM1.3.1.tar.gz
-_eclasses_=user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=7e1ef6149be3f10badfe33f8d162fce0
diff --git a/metadata/md5-cache/net-irc/quassel-0.13.1-r2 b/metadata/md5-cache/net-irc/quassel-0.13.1-r2
index b84795654d45..fb966f963cb7 100644
--- a/metadata/md5-cache/net-irc/quassel-0.13.1-r2
+++ b/metadata/md5-cache/net-irc/quassel-0.13.1-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( acc
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) dbus ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
 SLOT=0
 SRC_URI=https://quassel-irc.org/pub/quassel-0.13.1.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9597328acdd594a45cd6f8d0b365da21
diff --git a/metadata/md5-cache/net-irc/quassel-9999 b/metadata/md5-cache/net-irc/quassel-9999
index d579454d7220..d3320b803c3f 100644
--- a/metadata/md5-cache/net-irc/quassel-9999
+++ b/metadata/md5-cache/net-irc/quassel-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) X? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:5 oxygen? ( kde-frameworks/oxygen-icons:5 ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) snorenotify? ( >=x11-libs/snorenotify-0.7.0 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
 REQUIRED_USE=|| ( X server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( || ( X monolithic ) dbus ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) snorenotify? ( || ( X monolithic ) ) syslog? ( || ( server monolithic ) )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=197b92ecd03d37ef29c258cec4286721
diff --git a/metadata/md5-cache/net-irc/quasselgrep-0_p20190211 b/metadata/md5-cache/net-irc/quasselgrep-0_p20190211
deleted file mode 100644
index fc16d65f9aab..000000000000
--- a/metadata/md5-cache/net-irc/quasselgrep-0_p20190211
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=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/setuptools-42.0.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 prepare test
-DESCRIPTION=Tool for searching quassel logs from the commandline
-EAPI=7
-HOMEPAGE=https://github.com/fish-face/quasselgrep
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[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[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=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=https://github.com/fish-face/quasselgrep/tarball/9b6b0bc1252daa6e574363d87d04eebd981215a5 -> quasselgrep-0_p20190211.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6044d2bcb5ce285992f793684486f698
diff --git a/metadata/md5-cache/net-irc/quasselgrep-0_p20200830 b/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
new file mode 100644
index 000000000000..3a5ffeb71da8
--- /dev/null
+++ b/metadata/md5-cache/net-irc/quasselgrep-0_p20200830
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Tool for searching quassel logs from the commandline
+EAPI=7
+HOMEPAGE=https://github.com/fish-face/quasselgrep
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/fish-face/quasselgrep/archive/9b6b0bc1252daa6e574363d87d04eebd981215a5.tar.gz -> quasselgrep-0_p20200830.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=61ab453c5ea63ae71d7a9331bb620c17
diff --git a/metadata/md5-cache/net-irc/weechat-2.9 b/metadata/md5-cache/net-irc/weechat-2.9
index 151fe8d0ceb3..040363211582 100644
--- a/metadata/md5-cache/net-irc/weechat-2.9
+++ b/metadata/md5-cache/net-irc/weechat-2.9
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://weechat.org/files/src/weechat-2.9.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b794dfb48543a9f9cd3d37da3439ceb5
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index 927312d7fafa..b0e95498b32f 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libgcrypt:0= net-libs/gnutls:= sys-libs/ncurses:0= sys-libs/zli
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b249fb6a2ce12b0fd139dea3882f3647
diff --git a/metadata/md5-cache/net-irc/xaric-0.13.6 b/metadata/md5-cache/net-irc/xaric-0.13.6
deleted file mode 100644
index bb7d2eeba21c..000000000000
--- a/metadata/md5-cache/net-irc/xaric-0.13.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses dev-libs/openssl >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An IRC client similar to ircII, BitchX, or ircII EPIC
-EAPI=5
-HOMEPAGE=https://xaric.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses dev-libs/openssl
-SLOT=0
-SRC_URI=https://xaric.org/software/xaric/releases/xaric-0.13.6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c44bcd4d045041d956db0f4637365f8e
diff --git a/metadata/md5-cache/net-irc/znc-1.8.1 b/metadata/md5-cache/net-irc/znc-1.8.1
index eafa3a448585..2842d0e977b2 100644
--- a/metadata/md5-cache/net-irc/znc-1.8.1
+++ b/metadata/md5-cache/net-irc/znc-1.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://znc.in/releases/archive/znc-1.8.1.tar.gz test? ( https://github.com/google/googletest/archive/1.8.1.tar.gz -> gtest-1.8.1.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53b29db1424f2af95fe6c3da7a392559
diff --git a/metadata/md5-cache/net-irc/znc-1.8.2 b/metadata/md5-cache/net-irc/znc-1.8.2
index 1e957367ac94..2062ba3e5134 100644
--- a/metadata/md5-cache/net-irc/znc-1.8.2
+++ b/metadata/md5-cache/net-irc/znc-1.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/1.8.2
 SRC_URI=https://znc.in/releases/archive/znc-1.8.2.tar.gz test? ( https://github.com/google/googletest/archive/1.8.1.tar.gz -> gtest-1.8.1.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=274fe8b64bd76f6f57d4b9e9f0fec0e7
diff --git a/metadata/md5-cache/net-irc/znc-9999 b/metadata/md5-cache/net-irc/znc-9999
index 101c3b107c91..0cf3629ceb91 100644
--- a/metadata/md5-cache/net-irc/znc-9999
+++ b/metadata/md5-cache/net-irc/znc-9999
@@ -11,5 +11,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lan
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) icu )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2a894b6944424360a0ec0ef667bacdd
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 4ea4d701ca5a..dd0d4418c2a4 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/biblesync-2.1.0 b/metadata/md5-cache/net-libs/biblesync-2.1.0
index b41ddf21971d..1b8713975930 100644
--- a/metadata/md5-cache/net-libs/biblesync-2.1.0
+++ b/metadata/md5-cache/net-libs/biblesync-2.1.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/karlkleinpaste/biblesync/releases/download/2.1.0/biblesync-2.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43f5d7ff582d6bdcdb1e59d17f7c1d37
diff --git a/metadata/md5-cache/net-libs/cppzmq-4.6.0 b/metadata/md5-cache/net-libs/cppzmq-4.6.0
index 3b6e52704b6d..91aa31c7ea8c 100644
--- a/metadata/md5-cache/net-libs/cppzmq-4.6.0
+++ b/metadata/md5-cache/net-libs/cppzmq-4.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/zeromq-4.3.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zeromq/cppzmq/archive/v4.6.0.tar.gz -> cppzmq-4.6.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=46e12ffe0a3011bf6e6b45285466422a
diff --git a/metadata/md5-cache/net-libs/grpc-1.26.0-r1 b/metadata/md5-cache/net-libs/grpc-1.26.0-r1
deleted file mode 100644
index a467e1df4e4d..000000000000
--- a/metadata/md5-cache/net-libs/grpc-1.26.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.8.0:= >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
-DESCRIPTION=Modern open source high performance RPC framework
-EAPI=7
-HOMEPAGE=https://www.grpc.io
-IUSE=examples doc perftools systemtap static-libs
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.8.0:= >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/grpc/grpc/archive/v1.26.0.tar.gz -> grpc-1.26.0.tar.gz https://dev.gentoo.org/~gyakovlev/distfiles/grpc-1.26-fix-odr-violation.patch.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=644fdbc7e028b048e7d353ec12c14032
diff --git a/metadata/md5-cache/net-libs/grpc-1.28.1-r1 b/metadata/md5-cache/net-libs/grpc-1.28.1-r1
index 885a579477d5..225d26f0ed4b 100644
--- a/metadata/md5-cache/net-libs/grpc-1.28.1-r1
+++ b/metadata/md5-cache/net-libs/grpc-1.28.1-r1
@@ -11,5 +11,5 @@ RDEPEND==dev-cpp/abseil-cpp-20200225*:= >=dev-libs/protobuf-3.11.2:= >=net-dns/c
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/grpc/grpc/archive/v1.28.1.tar.gz -> grpc-1.28.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=10d0dfc7d1a6a2a28877dfa9b836c846
diff --git a/metadata/md5-cache/net-libs/grpc-1.32.0 b/metadata/md5-cache/net-libs/grpc-1.32.0
new file mode 100644
index 000000000000..4cceb249b8b6
--- /dev/null
+++ b/metadata/md5-cache/net-libs/grpc-1.32.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-cpp/abseil-cpp-20200225*:= dev-libs/re2:= >=dev-libs/protobuf-3.13.0:= >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= !libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) test? ( dev-cpp/benchmark dev-cpp/gflags )
+DESCRIPTION=Modern open source high performance RPC framework
+EAPI=7
+HOMEPAGE=https://www.grpc.io
+IUSE=doc examples libressl test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND==dev-cpp/abseil-cpp-20200225*:= dev-libs/re2:= >=dev-libs/protobuf-3.13.0:= >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= !libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist] ) libressl? ( dev-libs/libressl:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/grpc/grpc/archive/v1.32.0.tar.gz -> grpc-1.32.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4b050f596213221dab808845f4edffaf
diff --git a/metadata/md5-cache/net-libs/ignition-msgs-5.3.0 b/metadata/md5-cache/net-libs/ignition-msgs-5.3.0
index a609e6a5214f..e15acc0a9c46 100644
--- a/metadata/md5-cache/net-libs/ignition-msgs-5.3.0
+++ b/metadata/md5-cache/net-libs/ignition-msgs-5.3.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/protobuf:= sci-libs/ignition-math:6= dev-libs/tinyxml2:=
 SLOT=5
 SRC_URI=https://github.com/ignitionrobotics/ign-msgs/archive/ignition-msgs5_5.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec51fe8e714d420d9afc30c8c6e8eaea
diff --git a/metadata/md5-cache/net-libs/jreen-1.3.0-r1 b/metadata/md5-cache/net-libs/jreen-1.3.0-r1
index c67ac1b99b31..78abb3ff8c50 100644
--- a/metadata/md5-cache/net-libs/jreen-1.3.0-r1
+++ b/metadata/md5-cache/net-libs/jreen-1.3.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 media-libs/speex net-libs/libgsasl sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/euroelessar/jreen/archive/v1.3.0.tar.gz -> jreen-1.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5907b017b49be266f3fd6a9c528fad8d
diff --git a/metadata/md5-cache/net-libs/kdav2-0.3.0 b/metadata/md5-cache/net-libs/kdav2-0.3.0
index 766a266f42c1..4feeb9956266 100644
--- a/metadata/md5-cache/net-libs/kdav2-0.3.0
+++ b/metadata/md5-cache/net-libs/kdav2-0.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/q
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/unstable/kdav2/0.3.0/src/kdav2-0.3.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=017742dca66d3b57d983403a61ff730e
diff --git a/metadata/md5-cache/net-libs/kdsoap-1.9.50_pre20200317 b/metadata/md5-cache/net-libs/kdsoap-1.9.50_pre20200317
index fdaf67e5deaa..d4cabf8b6bfc 100644
--- a/metadata/md5-cache/net-libs/kdsoap-1.9.50_pre20200317
+++ b/metadata/md5-cache/net-libs/kdsoap-1.9.50_pre20200317
@@ -9,5 +9,5 @@ LICENSE=GPL-3 AGPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=https://github.com/KDAB/KDSoap/archive/8fde0425e38bf58922b6054768b4a7e5f349500b.tar.gz -> kdsoap-1.9.50_pre20200317.tar.gz https://github.com/cornelius/libkode/archive/dfe0d565cb58cfb25da77853d9694097aa8e5882.tar.gz -> kdsoap-1.9.50_pre20200317-libkode-dfe0d565cb58cfb25da77853d9694097aa8e5882.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b923cbdd87698c6a76f7650a6c7ab51a
diff --git a/metadata/md5-cache/net-libs/kdsoap-ws-discovery-client-0.2_pre20200317 b/metadata/md5-cache/net-libs/kdsoap-ws-discovery-client-0.2_pre20200317
index 21b235ff6acb..26f0e07780ed 100644
--- a/metadata/md5-cache/net-libs/kdsoap-ws-discovery-client-0.2_pre20200317
+++ b/metadata/md5-cache/net-libs/kdsoap-ws-discovery-client-0.2_pre20200317
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5 >=net-libs/kdsoap-1.9.0 || ( kde-fram
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://gitlab.com/caspermeijn/kdsoap-ws-discovery-client/repository/14287e92e80a77aa4c0adee2871e6b87c9c3055e/archive.tar.gz -> kdsoap-ws-discovery-client-0.2_pre20200317.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0aa77780bfc2cac4f62428786d968ec9
diff --git a/metadata/md5-cache/net-libs/kimap2-0.3.0 b/metadata/md5-cache/net-libs/kimap2-0.3.0
index d3b36ae6c11a..d07a5a7d5411 100644
--- a/metadata/md5-cache/net-libs/kimap2-0.3.0
+++ b/metadata/md5-cache/net-libs/kimap2-0.3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/cyrus-sasl:2 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=kde-apps/kmime-
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kimap2/0.3.0/src/kimap2-0.3.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfff926b38810b2898cec029c4d1ce79
diff --git a/metadata/md5-cache/net-libs/libblkmaker-0.4.2 b/metadata/md5-cache/net-libs/libblkmaker-0.4.2
deleted file mode 100644
index 1f09b220f8ec..000000000000
--- a/metadata/md5-cache/net-libs/libblkmaker-0.4.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/jansson-2.0.0
-DESCRIPTION=C implementation of getblocktemplate (BIP 22)
-EAPI=5
-HOMEPAGE=https://github.com/bitcoin/libblkmaker
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/jansson-2.0.0 !<net-misc/bfgminer-3.0.3
-SLOT=0
-SRC_URI=https://github.com/bitcoin/libblkmaker/archive/v0.4.2.tar.gz -> libblkmaker-0.4.2-github.tgz
-_md5_=0ac07a6891aa116163c71cb788d223b7
diff --git a/metadata/md5-cache/net-libs/libblkmaker-0.5.0 b/metadata/md5-cache/net-libs/libblkmaker-0.5.0
deleted file mode 100644
index f86232204b74..000000000000
--- a/metadata/md5-cache/net-libs/libblkmaker-0.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/jansson-2.0.0 dev-libs/libbase58
-DESCRIPTION=C implementation of getblocktemplate (BIP 22)
-EAPI=5
-HOMEPAGE=https://github.com/bitcoin/libblkmaker
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/jansson-2.0.0 dev-libs/libbase58 !<net-misc/bfgminer-3.0.3
-SLOT=0/7
-SRC_URI=https://github.com/bitcoin/libblkmaker/archive/v0.5.0.tar.gz -> libblkmaker-0.5.0-github.tgz
-_md5_=9d578f01789fb3645934b0bd4ab37e8f
diff --git a/metadata/md5-cache/net-libs/libblkmaker-0.5.1 b/metadata/md5-cache/net-libs/libblkmaker-0.5.1
deleted file mode 100644
index 19eef5ec9d5f..000000000000
--- a/metadata/md5-cache/net-libs/libblkmaker-0.5.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/jansson-2.0.0 dev-libs/libbase58
-DESCRIPTION=C implementation of getblocktemplate (BIP 22)
-EAPI=5
-HOMEPAGE=https://github.com/bitcoin/libblkmaker
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/jansson-2.0.0 dev-libs/libbase58 !<net-misc/bfgminer-3.0.3
-SLOT=0/7
-SRC_URI=https://github.com/bitcoin/libblkmaker/archive/v0.5.1.tar.gz -> libblkmaker-0.5.1-github.tgz
-_md5_=9d578f01789fb3645934b0bd4ab37e8f
diff --git a/metadata/md5-cache/net-libs/libblkmaker-0.5.2 b/metadata/md5-cache/net-libs/libblkmaker-0.5.2
deleted file mode 100644
index 05bb6fa2cff8..000000000000
--- a/metadata/md5-cache/net-libs/libblkmaker-0.5.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-libs/jansson-2.0.0 dev-libs/libbase58
-DESCRIPTION=C implementation of getblocktemplate (BIP 22)
-EAPI=5
-HOMEPAGE=https://github.com/bitcoin/libblkmaker
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/jansson-2.0.0 dev-libs/libbase58 !<net-misc/bfgminer-3.0.3
-SLOT=0/7
-SRC_URI=https://github.com/bitcoin/libblkmaker/archive/v0.5.2.tar.gz -> libblkmaker-0.5.2-github.tgz
-_md5_=9d578f01789fb3645934b0bd4ab37e8f
diff --git a/metadata/md5-cache/net-libs/libbloom-1.5-r1 b/metadata/md5-cache/net-libs/libbloom-1.5-r1
deleted file mode 100644
index 3ce886e4d961..000000000000
--- a/metadata/md5-cache/net-libs/libbloom-1.5-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A simple and small bloom filter implementation in plain C.
-EAPI=6
-HOMEPAGE=https://github.com/jvirkki/libbloom
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/jvirkki/libbloom/archive/v1.5.tar.gz -> libbloom-1.5.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8be2fbf0977f39a206aa227efd0702ac
diff --git a/metadata/md5-cache/net-libs/libbloom-1.6 b/metadata/md5-cache/net-libs/libbloom-1.6
new file mode 100644
index 000000000000..3eb9bd474ef0
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libbloom-1.6
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=A simple and small bloom filter implementation in plain C.
+EAPI=7
+HOMEPAGE=https://github.com/jvirkki/libbloom
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/jvirkki/libbloom/archive/v1.6.tar.gz -> libbloom-1.6.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9a1d51bdefa9ea672e7923390aacff89
diff --git a/metadata/md5-cache/net-libs/libgadu-1.11.4 b/metadata/md5-cache/net-libs/libgadu-1.11.4
index 3f833bcdbf86..99cf73d2b4a8 100644
--- a/metadata/md5-cache/net-libs/libgadu-1.11.4
+++ b/metadata/md5-cache/net-libs/libgadu-1.11.4
@@ -1,15 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m:0 ) ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/zlib ssl? ( net-libs/gnutls:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=This library implements the client side of the Gadu-Gadu protocol
 EAPI=5
 HOMEPAGE=http://toxygen.net/libgadu/
-IUSE=doc gnutls ssl static-libs threads
+IUSE=doc ssl static-libs threads
 KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
-RDEPEND=sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m:0 ) ) !=net-im/kadu-0.6.0.2 !=net-im/kadu-0.6.0.1
-REQUIRED_USE=gnutls? ( ssl )
+RDEPEND=sys-libs/zlib ssl? ( net-libs/gnutls:= ) !=net-im/kadu-0.6.0.2 !=net-im/kadu-0.6.0.1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wojtekka/libgadu/archive/1.11.4.tar.gz -> libgadu-1.11.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f9f34f46daf9161d655d76423bb4d6de
+_md5_=968c99372cbc6d81b3ed6281d46a00cc
diff --git a/metadata/md5-cache/net-libs/libktorrent-2.2.0-r1 b/metadata/md5-cache/net-libs/libktorrent-2.2.0-r1
index 5114afe3a9f0..625976d4760c 100644
--- a/metadata/md5-cache/net-libs/libktorrent-2.2.0-r1
+++ b/metadata/md5-cache/net-libs/libktorrent-2.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/qca:2[qt5(+)] >=dev-libs/gmp-6.0.0a:0= dev-libs/libgcrypt:0= >
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.2.0/libktorrent-2.2.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0653c0b028b0ecd56bbb56119ddeb3bb
diff --git a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0-r1 b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0-r1
index fdb75f82d940..0b41262cac8b 100644
--- a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0-r1
+++ b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebkit-5.
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/libkvkontakte/5.0.0/src/libkvkontakte-5.0.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07fdee903900804d17c77fcc9c423949
diff --git a/metadata/md5-cache/net-libs/libmbim-1.10.0 b/metadata/md5-cache/net-libs/libmbim-1.10.0
deleted file mode 100644
index 6432abc6b739..000000000000
--- a/metadata/md5-cache/net-libs/libmbim-1.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgudev:= dev-util/glib-utils dev-util/gtk-doc-am virtual/pkgconfig
-DESCRIPTION=MBIM modem protocol helper library
-EAPI=5
-HOMEPAGE=https://cgit.freedesktop.org/libmbim/
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm ~mips x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgudev:=
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.10.0.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0c0e3324b29e9329a4a14a543d3ca4b0
diff --git a/metadata/md5-cache/net-libs/libmbim-1.12.2 b/metadata/md5-cache/net-libs/libmbim-1.12.2
deleted file mode 100644
index 9b30d01cceb8..000000000000
--- a/metadata/md5-cache/net-libs/libmbim-1.12.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgudev:= dev-util/glib-utils dev-util/gtk-doc-am virtual/pkgconfig
-DESCRIPTION=MBIM modem protocol helper library
-EAPI=5
-HOMEPAGE=https://cgit.freedesktop.org/libmbim/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~mips ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgudev:=
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.12.2.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=661c7fcc4143a0328a0b986c7a282378
diff --git a/metadata/md5-cache/net-libs/libmbim-1.12.4 b/metadata/md5-cache/net-libs/libmbim-1.12.4
deleted file mode 100644
index a05643cff8fa..000000000000
--- a/metadata/md5-cache/net-libs/libmbim-1.12.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgudev:= dev-util/glib-utils dev-util/gtk-doc-am virtual/pkgconfig
-DESCRIPTION=MBIM modem protocol helper library
-EAPI=5
-HOMEPAGE=https://cgit.freedesktop.org/libmbim/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgudev:=
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.12.4.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9cf5c5a3ecabde6c00b073e2e2d94861
diff --git a/metadata/md5-cache/net-libs/libmbim-1.6.0 b/metadata/md5-cache/net-libs/libmbim-1.6.0
deleted file mode 100644
index 338866686194..000000000000
--- a/metadata/md5-cache/net-libs/libmbim-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.32 dev-libs/libgudev:= dev-util/glib-utils doc? ( dev-util/gtk-doc ) virtual/pkgconfig
-DESCRIPTION=MBIM modem protocol helper library
-EAPI=5
-HOMEPAGE=https://cgit.freedesktop.org/libmbim/
-IUSE=doc static-libs test
-KEYWORDS=~alpha amd64 arm ~mips x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.32 dev-libs/libgudev:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.6.0.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=54f1554a17b800d3521646ff06d19266
diff --git a/metadata/md5-cache/net-libs/libmediawiki-5.37.0-r1 b/metadata/md5-cache/net-libs/libmediawiki-5.37.0-r1
index 867eb8889583..838121f111cf 100644
--- a/metadata/md5-cache/net-libs/libmediawiki-5.37.0-r1
+++ b/metadata/md5-cache/net-libs/libmediawiki-5.37.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kcoreaddons-5.60.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/libmediawiki/libmediawiki-5.37.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=295377c16ee97106d790d467f50bd1b3
diff --git a/metadata/md5-cache/net-libs/libnma-1.8.30 b/metadata/md5-cache/net-libs/libnma-1.8.30
index be0983da1886..8bd72e0d68e1 100644
--- a/metadata/md5-cache/net-libs/libnma-1.8.30
+++ b/metadata/md5-cache/net-libs/libnma-1.8.30
@@ -5,11 +5,11 @@ DESCRIPTION=NetworkManager GUI library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk-doc +introspection +pkcs11 vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.10:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-3.14:= ) introspection? ( >=dev-libs/gobject-introspection-1.56:= ) !<gnome-extra/nm-applet-1.16.0
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libnma/1.8/libnma-1.8.30.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b6df27caaac3e0469e1458a5fd336d0
+_md5_=3c61fe23ee0b2357ee1311f2db9875fb
diff --git a/metadata/md5-cache/net-libs/libproxy-0.4.15-r1 b/metadata/md5-cache/net-libs/libproxy-0.4.15-r1
index 2b2b811edc96..5362daad1c60 100644
--- a/metadata/md5-cache/net-libs/libproxy-0.4.15-r1
+++ b/metadata/md5-cache/net-libs/libproxy-0.4.15-r1
@@ -12,5 +12,5 @@ RDEPEND=gnome? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libproxy/libproxy/archive/0.4.15.tar.gz -> libproxy-0.4.15.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0aeec23324a586b7079a5fb5326afc54
diff --git a/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1 b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
index 6b388745cc3b..95fcca3ef158 100644
--- a/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
+++ b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/haiwen/libsearpc/archive/v3.2.0.tar.gz -> libsearpc-3.2.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f15220d4636886519172a61b1d1d1794
+_md5_=ca7df4dcabae925d08bddad1dba9a833
diff --git a/metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.2 b/metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.2
index f72773a556b7..39be07daf84c 100644
--- a/metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.2
+++ b/metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/signalapp/libsignal-protocol-c/archive/v2.3.2.tar.gz -> libsignal-protocol-c-2.3.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57f9b4050e0a26ba22cd0f3afcd4f909
diff --git a/metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.3 b/metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.3
index c8ff19023e01..17ee3b4742f8 100644
--- a/metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.3
+++ b/metadata/md5-cache/net-libs/libsignal-protocol-c-2.3.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://github.com/signalapp/libsignal-protocol-c/archive/v2.3.3.tar.gz -> libsignal-protocol-c-2.3.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57f9b4050e0a26ba22cd0f3afcd4f909
diff --git a/metadata/md5-cache/net-libs/libsignal-protocol-c-9999 b/metadata/md5-cache/net-libs/libsignal-protocol-c-9999
index a9adea142231..0588a84155a6 100644
--- a/metadata/md5-cache/net-libs/libsignal-protocol-c-9999
+++ b/metadata/md5-cache/net-libs/libsignal-protocol-c-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://www.whispersystems.org/
 LICENSE=GPL-3
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f2f7a3e2ce2c8c5d11005f3766c66c8
diff --git a/metadata/md5-cache/net-libs/libssh-0.9.4 b/metadata/md5-cache/net-libs/libssh-0.9.4
index 7957dee14e12..33040feaf72a 100644
--- a/metadata/md5-cache/net-libs/libssh-0.9.4
+++ b/metadata/md5-cache/net-libs/libssh-0.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( gcrypt mbedtls )
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://www.libssh.org/files/0.9/libssh-0.9.4.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de0deea32f6acb8b16db267d1f659e16
diff --git a/metadata/md5-cache/net-libs/libssh-0.9.5 b/metadata/md5-cache/net-libs/libssh-0.9.5
index 458a4b414d2f..73a493111f9d 100644
--- a/metadata/md5-cache/net-libs/libssh-0.9.5
+++ b/metadata/md5-cache/net-libs/libssh-0.9.5
@@ -5,12 +5,12 @@ DESCRIPTION=Access a working SSH implementation by means of a library
 EAPI=7
 HOMEPAGE=https://www.libssh.org/
 IUSE=debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=!gcrypt? ( !mbedtls? ( !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_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_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=?? ( gcrypt mbedtls )
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://www.libssh.org/files/0.9/libssh-0.9.5.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75c6818cf4f9363357d751773461ac2c
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=468d1a7694fec55e7e646f4492b1ff11
diff --git a/metadata/md5-cache/net-libs/libssh-9999 b/metadata/md5-cache/net-libs/libssh-9999
index 89ec27cb7edd..31862b86d4a5 100644
--- a/metadata/md5-cache/net-libs/libssh-9999
+++ b/metadata/md5-cache/net-libs/libssh-9999
@@ -11,5 +11,5 @@ RDEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_
 REQUIRED_USE=?? ( gcrypt mbedtls )
 RESTRICT=!test? ( test )
 SLOT=0/4
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=75c6818cf4f9363357d751773461ac2c
diff --git a/metadata/md5-cache/net-libs/libssh2-1.9.0_p20190913 b/metadata/md5-cache/net-libs/libssh2-1.9.0_p20190913
index b1d6abd51724..00e84ef57147 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.9.0_p20190913
+++ b/metadata/md5-cache/net-libs/libssh2-1.9.0_p20190913
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( gcrypt mbedtls )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libssh2/libssh2/archive/336bd86d2ca4030b808d76e56a0387914982e289.tar.gz -> libssh2-1.9.0_p20190913.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=add9ff77038733b406efcb7834caad52
diff --git a/metadata/md5-cache/net-libs/libssh2-9999 b/metadata/md5-cache/net-libs/libssh2-9999
index 2268072d6e77..a4a9c9e4ca24 100644
--- a/metadata/md5-cache/net-libs/libssh2-9999
+++ b/metadata/md5-cache/net-libs/libssh2-9999
@@ -11,5 +11,5 @@ RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi
 REQUIRED_USE=?? ( gcrypt mbedtls )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95fd85cfcdc61061e77289332a5abdf2
diff --git a/metadata/md5-cache/net-libs/libtelnet-9999 b/metadata/md5-cache/net-libs/libtelnet-9999
index 0c084f29b489..40ab008cdff0 100644
--- a/metadata/md5-cache/net-libs/libtelnet-9999
+++ b/metadata/md5-cache/net-libs/libtelnet-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/seanmiddleditch/libtelnet
 LICENSE=public-domain
 PROPERTIES=live
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af0133d6fc86481df8cbcc166af8b025
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.13 b/metadata/md5-cache/net-libs/libvncserver-0.9.13
index f687e5b684e3..1bb292bf218b 100644
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.13
+++ b/metadata/md5-cache/net-libs/libvncserver-0.9.13
@@ -11,5 +11,5 @@ RDEPEND=gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0= ) ssl? ( !gnutls? ( !libressl? (
 REQUIRED_USE=filetransfer? ( threads ) jpeg? ( zlib ) png? ( zlib ) ssl? ( !gnutls? ( threads ) )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.13.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a63f1392deaa7f808e9cdad232e9d7fe
diff --git a/metadata/md5-cache/net-libs/libwebsockets-3.2.1 b/metadata/md5-cache/net-libs/libwebsockets-3.2.1
index 0ba357ba1a24..07328bedcf0a 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-3.2.1
+++ b/metadata/md5-cache/net-libs/libwebsockets-3.2.1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) http-proxy? ( net-libs/libhubbub
 REQUIRED_USE=generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) smtp? ( libuv ) ?? ( libev libevent )
 SLOT=0/15
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v3.2.1.tar.gz -> libwebsockets-3.2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38f773d1fe935b653b65e24ed8d5476a
diff --git a/metadata/md5-cache/net-libs/libwebsockets-4.0.20 b/metadata/md5-cache/net-libs/libwebsockets-4.0.20
index f8c4a7e665f2..884c37e69305 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-4.0.20
+++ b/metadata/md5-cache/net-libs/libwebsockets-4.0.20
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) http-pro
 REQUIRED_USE=access-log? ( http2 ) generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) smtp? ( libuv ) ssl? ( ?? ( libressl mbedtls ) ) mbedtls? ( ssl ) ?? ( libev libevent )
 SLOT=0/16
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v4.0.20.tar.gz -> libwebsockets-4.0.20.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7df7da1ef446338b2efb684164af164
diff --git a/metadata/md5-cache/net-libs/libwebsockets-4.1.0 b/metadata/md5-cache/net-libs/libwebsockets-4.1.0
index ceef52bf8b64..cdcc0f255688 100644
--- a/metadata/md5-cache/net-libs/libwebsockets-4.1.0
+++ b/metadata/md5-cache/net-libs/libwebsockets-4.1.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) http-pro
 REQUIRED_USE=access-log? ( http2 ) generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) smtp? ( libuv ) ssl? ( ?? ( libressl mbedtls ) ) mbedtls? ( ssl ) ?? ( libev libevent )
 SLOT=0/17
 SRC_URI=https://github.com/warmcat/libwebsockets/archive/v4.1.0.tar.gz -> libwebsockets-4.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1850e87b9d330b15be67136d129d4433
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.16.7-r1 b/metadata/md5-cache/net-libs/mbedtls-2.16.7-r1
index 446c2cc4d980..7b7f4d8a2313 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.16.7-r1
+++ b/metadata/md5-cache/net-libs/mbedtls-2.16.7-r1
@@ -11,5 +11,5 @@ RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libr
 RESTRICT=!test? ( test )
 SLOT=0/3.12.0
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0dd39d53e627e72797f142714e69aba
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.16.8 b/metadata/md5-cache/net-libs/mbedtls-2.16.8
index d1da0de6c7b9..c0f16705591e 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.16.8
+++ b/metadata/md5-cache/net-libs/mbedtls-2.16.8
@@ -11,5 +11,5 @@ RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libr
 RESTRICT=!test? ( test )
 SLOT=0/3.12.0
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0dd39d53e627e72797f142714e69aba
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.23.0-r1 b/metadata/md5-cache/net-libs/mbedtls-2.23.0-r1
index 4c8186e8c423..2441e1238afa 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.23.0-r1
+++ b/metadata/md5-cache/net-libs/mbedtls-2.23.0-r1
@@ -11,5 +11,5 @@ RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libr
 RESTRICT=!test? ( test )
 SLOT=0/5.13.1
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.23.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7295c0625f42bbd8c619d8648c044fc0
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.24.0 b/metadata/md5-cache/net-libs/mbedtls-2.24.0
index 0421776e26b3..85dee3e3349e 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.24.0
+++ b/metadata/md5-cache/net-libs/mbedtls-2.24.0
@@ -11,5 +11,5 @@ RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libr
 RESTRICT=!test? ( test )
 SLOT=0/5.13.1
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.24.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7295c0625f42bbd8c619d8648c044fc0
diff --git a/metadata/md5-cache/net-libs/nghttp3-0_pre20190912 b/metadata/md5-cache/net-libs/nghttp3-0_pre20190912
index 26a69c037531..96a4fd6892fd 100644
--- a/metadata/md5-cache/net-libs/nghttp3-0_pre20190912
+++ b/metadata/md5-cache/net-libs/nghttp3-0_pre20190912
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/ngtcp2/nghttp3/archive/51379a041174ad953dc6ad437712f3b279f81919.tar.gz -> nghttp3-0_pre20190912.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1cca8553e5e9280067eac44a84edfe14
diff --git a/metadata/md5-cache/net-libs/nghttp3-9999 b/metadata/md5-cache/net-libs/nghttp3-9999
index 3b364b69982b..3df669daeb7a 100644
--- a/metadata/md5-cache/net-libs/nghttp3-9999
+++ b/metadata/md5-cache/net-libs/nghttp3-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ed146449eea90a54915722a1a7b16ec1
diff --git a/metadata/md5-cache/net-libs/ngtcp2-0_pre20190912 b/metadata/md5-cache/net-libs/ngtcp2-0_pre20190912
index 102d4e2a555e..ade93b0e40c0 100644
--- a/metadata/md5-cache/net-libs/ngtcp2-0_pre20190912
+++ b/metadata/md5-cache/net-libs/ngtcp2-0_pre20190912
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/ngtcp2/ngtcp2/archive/5122d9e5e1e91c718ebc3933252ee42522c6e942.tar.gz -> ngtcp2-0_pre20190912.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d34c8a03e4902ac0dcd11621354d2ad9
diff --git a/metadata/md5-cache/net-libs/ngtcp2-9999 b/metadata/md5-cache/net-libs/ngtcp2-9999
index 0b50d4e5982a..6f03ca1949ff 100644
--- a/metadata/md5-cache/net-libs/ngtcp2-9999
+++ b/metadata/md5-cache/net-libs/ngtcp2-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0/0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=349d189775857247a8ace8c2a2230d74
diff --git a/metadata/md5-cache/net-libs/nodejs-12.18.3 b/metadata/md5-cache/net-libs/nodejs-12.18.3
deleted file mode 100644
index f1ee032305f9..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-12.18.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.38.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.38.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v12.18.3/node-v12.18.3.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae4148135518a3508fe7916f5182eaac
diff --git a/metadata/md5-cache/net-libs/nodejs-12.18.4 b/metadata/md5-cache/net-libs/nodejs-12.18.4
deleted file mode 100644
index baa419e8aa4b..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-12.18.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v12.18.4/node-v12.18.4.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c1fefc004b0b3f08ba58d8019386c53
diff --git a/metadata/md5-cache/net-libs/nodejs-12.18.4-r1 b/metadata/md5-cache/net-libs/nodejs-12.18.4-r1
new file mode 100644
index 000000000000..60a9f321a080
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-12.18.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.7 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.7 >=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v12.18.4/node-v12.18.4.tar.xz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f77e5d6c80f44b27c1e7c0224fab40cd
diff --git a/metadata/md5-cache/net-libs/nodejs-14.10.0 b/metadata/md5-cache/net-libs/nodejs-14.10.0
deleted file mode 100644
index f7f493d74bdf..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-14.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v14.10.0/node-v14.10.0.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57530e3e0123068db3a6d483da9e32e0
diff --git a/metadata/md5-cache/net-libs/nodejs-14.10.1 b/metadata/md5-cache/net-libs/nodejs-14.10.1
deleted file mode 100644
index d175a2b917c3..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-14.10.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v14.10.1/node-v14.10.1.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57530e3e0123068db3a6d483da9e32e0
diff --git a/metadata/md5-cache/net-libs/nodejs-14.11.0 b/metadata/md5-cache/net-libs/nodejs-14.11.0
index c8ba16de1f70..8918e2290895 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.11.0
+++ b/metadata/md5-cache/net-libs/nodejs-14.11.0
@@ -5,7 +5,7 @@ DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v14.11.0/node-v14.11.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57530e3e0123068db3a6d483da9e32e0
+_md5_=bce543ca738273d637d30e59b9454b95
diff --git a/metadata/md5-cache/net-libs/nodejs-14.13.0-r1 b/metadata/md5-cache/net-libs/nodejs-14.13.0-r1
new file mode 100644
index 000000000000..fadad9ecba40
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-14.13.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v14.13.0/node-v14.13.0.tar.xz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f10f9b9e4861bfe008c6f2fee081cb43
diff --git a/metadata/md5-cache/net-libs/nodejs-14.8.0 b/metadata/md5-cache/net-libs/nodejs-14.8.0
deleted file mode 100644
index b294b19ebc3c..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-14.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.38.1:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.38.1:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v14.8.0/node-v14.8.0.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42c6ba4779a278cca9954f609c517b0a
diff --git a/metadata/md5-cache/net-libs/nodejs-14.9.0 b/metadata/md5-cache/net-libs/nodejs-14.9.0
deleted file mode 100644
index 10c8f51b5986..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-14.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v14.9.0/node-v14.9.0.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57530e3e0123068db3a6d483da9e32e0
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index 4969935c9866..7c55b0c410a7 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -1,15 +1,15 @@
 BDEPEND=|| ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67.1:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67.1:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=7
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 PROPERTIES=live
-RDEPEND=>=dev-libs/libuv-1.39.0:= >=net-dns/c-ares-1.16.0 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67.1:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+RDEPEND=>=app-arch/brotli-1.0.9 >=dev-libs/libuv-1.40.0:= >=net-dns/c-ares-1.16.1 >=net-libs/nghttp2-1.41.0 sys-libs/zlib icu? ( >=dev-libs/icu-67.1:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
 REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl ) system-ssl? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5f58ee59ff42f04ba4cffd3b2328d30c
+_md5_=49eb7f71442fe540c1f5a05b161b89f7
diff --git a/metadata/md5-cache/net-libs/ntirpc-1.7.4 b/metadata/md5-cache/net-libs/ntirpc-1.7.4
index a4cd1e88d75f..03c3b0228fce 100644
--- a/metadata/md5-cache/net-libs/ntirpc-1.7.4
+++ b/metadata/md5-cache/net-libs/ntirpc-1.7.4
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/mit-krb5 net-libs/libnsl rdma? ( sys-fabric/librdmacm )
 SLOT=0
 SRC_URI=https://github.com/nfs-ganesha/ntirpc/archive/v1.7.4.tar.gz -> ntirpc-1.7.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89b1f6433ccca534d76f3e60f3adf4e1
diff --git a/metadata/md5-cache/net-libs/ntirpc-1.8.1 b/metadata/md5-cache/net-libs/ntirpc-1.8.1
index 91f5f215c3e1..fa76e99dfe77 100644
--- a/metadata/md5-cache/net-libs/ntirpc-1.8.1
+++ b/metadata/md5-cache/net-libs/ntirpc-1.8.1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/userspace-rcu rdma? ( sys-fabric/librdmacm )
 SLOT=0
 SRC_URI=https://github.com/nfs-ganesha/ntirpc/archive/v1.8.1.tar.gz -> ntirpc-1.8.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28c238ae141a2f9868a805019806c6cd
diff --git a/metadata/md5-cache/net-libs/ntirpc-3.2 b/metadata/md5-cache/net-libs/ntirpc-3.2
index 7c25cd7145b8..87b2dd3e898b 100644
--- a/metadata/md5-cache/net-libs/ntirpc-3.2
+++ b/metadata/md5-cache/net-libs/ntirpc-3.2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/mit-krb5 dev-libs/userspace-rcu net-libs/libnsl rdma? ( sys-fabric/librdmacm )
 SLOT=0
 SRC_URI=https://github.com/nfs-ganesha/ntirpc/archive/v3.2.tar.gz -> ntirpc-3.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc9fb4457c5ed0bbfd1ecb71769c9dcc
diff --git a/metadata/md5-cache/net-libs/ntirpc-3.3 b/metadata/md5-cache/net-libs/ntirpc-3.3
index 65559e89b94b..fadbe1c309bd 100644
--- a/metadata/md5-cache/net-libs/ntirpc-3.3
+++ b/metadata/md5-cache/net-libs/ntirpc-3.3
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/userspace-rcu rdma? ( sys-fabric/librdmacm )
 SLOT=0
 SRC_URI=https://github.com/nfs-ganesha/ntirpc/archive/v3.3.tar.gz -> ntirpc-3.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7beda6e4732dbaf8ad4ea2d64ee2be92
diff --git a/metadata/md5-cache/net-libs/quiche-0.5.1 b/metadata/md5-cache/net-libs/quiche-0.5.1
index 76a5150a3ca1..b134f8bc4e37 100644
--- a/metadata/md5-cache/net-libs/quiche-0.5.1
+++ b/metadata/md5-cache/net-libs/quiche-0.5.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
 SLOT=0/0
 SRC_URI=https://crates.io/api/v1/crates/anyhow/1.0.26/download -> anyhow-1.0.26.crate https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.11/download -> arrayvec-0.4.11.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.37/download -> backtrace-0.3.37.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.31/download -> backtrace-sys-0.1.31.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/bumpalo/3.4.0/download -> bumpalo-3.4.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cast/0.2.3/download -> cast-0.2.3.crate https://crates.io/api/v1/crates/cc/1.0.58/download -> cc-1.0.58.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cmake/0.1.44/download -> cmake-0.1.44.crate https://crates.io/api/v1/crates/criterion/0.3.1/download -> criterion-0.3.1.crate https://crates.io/api/v1/crates/criterion-plot/0.4.1/download -> criterion-plot-0.4.1.crate https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download -> crossbeam-deque-0.7.3.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download -> crossbeam-epoch-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.2.1/download -> crossbeam-queue-0.2.1.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/csv/1.1.3/download -> csv-1.1.3.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.8/download -> hermit-abi-0.1.8.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/js-sys/0.3.42/download -> js-sys-0.3.42.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.72/download -> libc-0.2.72.crate https://crates.io/api/v1/crates/libm/0.2.1/download -> libm-0.2.1.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memoffset/0.5.3/download -> memoffset-0.5.3.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/num_cpus/1.12.0/download -> num_cpus-1.12.0.crate https://crates.io/api/v1/crates/once_cell/1.4.0/download -> once_cell-1.4.0.crate https://crates.io/api/v1/crates/oorandom/11.1.0/download -> oorandom-11.1.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/plotters/0.2.12/download -> plotters-0.2.12.crate https://crates.io/api/v1/crates/proc-macro2/1.0.18/download -> proc-macro2-1.0.18.crate https://crates.io/api/v1/crates/qlog/0.3.0/download -> qlog-0.3.0.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rayon/1.3.0/download -> rayon-1.3.0.crate https://crates.io/api/v1/crates/rayon-core/1.7.0/download -> rayon-core-1.7.0.crate https://crates.io/api/v1/crates/regex/1.3.5/download -> regex-1.3.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/ring/0.16.15/download -> ring-0.16.15.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.114/download -> serde-1.0.114.crate https://crates.io/api/v1/crates/serde_derive/1.0.114/download -> serde_derive-1.0.114.crate https://crates.io/api/v1/crates/serde_json/1.0.56/download -> serde_json-1.0.56.crate https://crates.io/api/v1/crates/serde_with/1.4.0/download -> serde_with-1.4.0.crate https://crates.io/api/v1/crates/serde_with_macros/1.1.0/download -> serde_with_macros-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.4.0/download -> smallvec-1.4.0.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/syn/1.0.34/download -> syn-1.0.34.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/tinytemplate/1.0.3/download -> tinytemplate-1.0.3.crate https://crates.io/api/v1/crates/tinyvec/0.3.3/download -> tinyvec-0.3.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.13/download -> unicode-normalization-0.1.13.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.65/download -> wasm-bindgen-0.2.65.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.65/download -> wasm-bindgen-backend-0.2.65.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.65/download -> wasm-bindgen-macro-0.2.65.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.65/download -> wasm-bindgen-macro-support-0.2.65.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.65/download -> wasm-bindgen-shared-0.2.65.crate https://crates.io/api/v1/crates/wasm-bindgen-webidl/0.2.65/download -> wasm-bindgen-webidl-0.2.65.crate https://crates.io/api/v1/crates/web-sys/0.3.42/download -> web-sys-0.3.42.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.3/download -> winapi-util-0.1.3.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/quiche/0.5.1/download -> quiche-0.5.1.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdb8e5a526268e4609ec9ac9de3ad366
diff --git a/metadata/md5-cache/net-libs/quiche-9999 b/metadata/md5-cache/net-libs/quiche-9999
index 6b4d21ae9078..bff84c843f8f 100644
--- a/metadata/md5-cache/net-libs/quiche-9999
+++ b/metadata/md5-cache/net-libs/quiche-9999
@@ -7,5 +7,5 @@ IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_
 LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT ) BSD-2 BSD ISC MIT || ( Unlicense MIT ) openssl
 PROPERTIES=live
 SLOT=0/0
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=767ba288356e62a7a1a364e020bb28c9
diff --git a/metadata/md5-cache/net-libs/qxmpp-1.2.0 b/metadata/md5-cache/net-libs/qxmpp-1.2.0
index 22d38afd5a81..7a2052fdb474 100644
--- a/metadata/md5-cache/net-libs/qxmpp-1.2.0
+++ b/metadata/md5-cache/net-libs/qxmpp-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 opus? ( media-lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qxmpp-project/qxmpp/archive/v1.2.0.tar.gz -> qxmpp-1.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dcb7637a5418b28991d6a9d24f20b1e2
diff --git a/metadata/md5-cache/net-libs/qxmpp-9999 b/metadata/md5-cache/net-libs/qxmpp-9999
index 2c69751e5f66..67f31b5ca964 100644
--- a/metadata/md5-cache/net-libs/qxmpp-9999
+++ b/metadata/md5-cache/net-libs/qxmpp-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtxml:5 opus? ( media-libs/opus ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) vpx? ( media-libs/libvpx:= )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3fb4fce2e5ae963b2fee7fa5e3651f04
diff --git a/metadata/md5-cache/net-libs/rabbitmq-c-0.10.0 b/metadata/md5-cache/net-libs/rabbitmq-c-0.10.0
index d1fd6d1ab0c9..236245da092d 100644
--- a/metadata/md5-cache/net-libs/rabbitmq-c-0.10.0
+++ b/metadata/md5-cache/net-libs/rabbitmq-c-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/alanxz/rabbitmq-c/archive/v0.10.0.tar.gz -> rabbitmq-c-0.10.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1c9a3b84e9ebda94a67cf2f6dcb20e8
diff --git a/metadata/md5-cache/net-libs/serf-1.3.9-r2 b/metadata/md5-cache/net-libs/serf-1.3.9-r2
index e689f2312c4a..e84cf537d724 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.9-r2
+++ b/metadata/md5-cache/net-libs/serf-1.3.9-r2
@@ -5,11 +5,11 @@ DESCRIPTION=HTTP client library
 EAPI=7
 HOMEPAGE=https://serf.apache.org/
 IUSE=kerberos static-libs libressl
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:0= kerberos? ( virtual/krb5 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.9.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=be781adaecd5954cae89bc8a20f9bdd0
+_md5_=91bdf4509191827248a9f9fd466f3d4d
diff --git a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0 b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
index 0b69dbd742d0..c9e787b56c66 100644
--- a/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
+++ b/metadata/md5-cache/net-libs/telepathy-logger-qt-17.09.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 >=dev-qt/qtdbus-5.12.3:5 net-im/telepathy-logger net-libs/telepathy-glib net-libs/telepathy-qt[qt5(+)] sys-apps/dbus || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/telepathy-logger-qt/17.09/src/telepathy-logger-qt-17.09.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a976b4583914e92eea11bc8aeef0371e
diff --git a/metadata/md5-cache/net-libs/telepathy-qt-0.9.8 b/metadata/md5-cache/net-libs/telepathy-qt-0.9.8
index a4e3ac6225c7..2e6e725c5e0d 100644
--- a/metadata/md5-cache/net-libs/telepathy-qt-0.9.8
+++ b/metadata/md5-cache/net-libs/telepathy-qt-0.9.8
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( farstream )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d47f21ca52a336bc3d64f859304e25b5
diff --git a/metadata/md5-cache/net-libs/telepathy-qt-9999 b/metadata/md5-cache/net-libs/telepathy-qt-9999
index c5abb218541d..a5ce66a82a67 100644
--- a/metadata/md5-cache/net-libs/telepathy-qt-9999
+++ b/metadata/md5-cache/net-libs/telepathy-qt-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt
 REQUIRED_USE=test? ( farstream )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc31b2e1f167cf4352f770119d46fbb5
diff --git a/metadata/md5-cache/net-libs/tox-0.2.11 b/metadata/md5-cache/net-libs/tox-0.2.11
index dcf3a2af976f..7d4a640acf76 100644
--- a/metadata/md5-cache/net-libs/tox-0.2.11
+++ b/metadata/md5-cache/net-libs/tox-0.2.11
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( log-debug log-error log-info log-trace log-warn ) daemon? ( dh
 RESTRICT=!test? ( test )
 SLOT=0/0.2
 SRC_URI=https://github.com/TokTok/c-toxcore/archive/v0.2.11.tar.gz -> c-toxcore-0.2.11.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0cf9bfc987bbddd47ca751a6a4fd265
diff --git a/metadata/md5-cache/net-libs/tox-0.2.12 b/metadata/md5-cache/net-libs/tox-0.2.12
index 9bc172fa7d55..5ec6a15132bb 100644
--- a/metadata/md5-cache/net-libs/tox-0.2.12
+++ b/metadata/md5-cache/net-libs/tox-0.2.12
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( log-debug log-error log-info log-trace log-warn ) daemon? ( dh
 RESTRICT=!test? ( test )
 SLOT=0/0.2
 SRC_URI=https://github.com/TokTok/c-toxcore/archive/v0.2.12.tar.gz -> c-toxcore-0.2.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb4cf4d5e3e08a997e52b3b2409f4eb2
diff --git a/metadata/md5-cache/net-libs/tox-9999 b/metadata/md5-cache/net-libs/tox-9999
index 81ae9be8785a..70409b12780b 100644
--- a/metadata/md5-cache/net-libs/tox-9999
+++ b/metadata/md5-cache/net-libs/tox-9999
@@ -11,5 +11,5 @@ RDEPEND=>dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal] av? ( media-libs/libvp
 REQUIRED_USE=^^ ( log-debug log-error log-info log-trace log-warn ) daemon? ( dht-node )
 RESTRICT=!test? ( test )
 SLOT=0/0.2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0773f67d1b6558bce15d8d88182881a
diff --git a/metadata/md5-cache/net-libs/xrootd-5.0.2 b/metadata/md5-cache/net-libs/xrootd-5.0.2
index 7194da24b1db..b26a1b4af31a 100644
--- a/metadata/md5-cache/net-libs/xrootd-5.0.2
+++ b/metadata/md5-cache/net-libs/xrootd-5.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python3_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v5.0.2/xrootd-5.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1c8dd3eb1168c6876168cb10737266e
diff --git a/metadata/md5-cache/net-libs/xrootd-ceph-4.12.0 b/metadata/md5-cache/net-libs/xrootd-ceph-4.12.0
index d4d596205685..b74f2cf72b9e 100644
--- a/metadata/md5-cache/net-libs/xrootd-ceph-4.12.0
+++ b/metadata/md5-cache/net-libs/xrootd-ceph-4.12.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3+
 RDEPEND=net-libs/xrootd !<net-libs/xrootd-4.10.0[rbd] sys-cluster/ceph
 SLOT=0
 SRC_URI=https://github.com/xrootd/xrootd-ceph/archive/v4.12.0.tar.gz -> xrootd-ceph-4.12.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e9c5d8c5780173f395f047db4ff92b4
diff --git a/metadata/md5-cache/net-libs/xrootd-ceph-4.12.4 b/metadata/md5-cache/net-libs/xrootd-ceph-4.12.4
index 5ecf0014478a..405e9f054b61 100644
--- a/metadata/md5-cache/net-libs/xrootd-ceph-4.12.4
+++ b/metadata/md5-cache/net-libs/xrootd-ceph-4.12.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-3+
 RDEPEND=net-libs/xrootd !<net-libs/xrootd-4.10.0[rbd] sys-cluster/ceph
 SLOT=0
 SRC_URI=https://github.com/xrootd/xrootd-ceph/archive/v4.12.4.tar.gz -> xrootd-ceph-4.12.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=912d799131f71002b0258bffd2ccb8e8
diff --git a/metadata/md5-cache/net-libs/xrootd-ceph-5.0.2 b/metadata/md5-cache/net-libs/xrootd-ceph-5.0.2
index 6df862f11acd..3b57c4eea8a9 100644
--- a/metadata/md5-cache/net-libs/xrootd-ceph-5.0.2
+++ b/metadata/md5-cache/net-libs/xrootd-ceph-5.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/xrootd-5.0.0 sys-cluster/ceph
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xrootd/xrootd-ceph/archive/v5.0.2.tar.gz -> xrootd-ceph-5.0.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=147d03268622813b34d7b91adb666b7b
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 9528abe3c36e..568c42302577 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/fetchmail-6.4.12-r1 b/metadata/md5-cache/net-mail/fetchmail-6.4.12-r1
new file mode 100644
index 000000000000..98eb034bde9d
--- /dev/null
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.12-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:= ) libressl? ( dev-libs/libressl:= ) ) kerberos? ( virtual/krb5 !libressl? ( >=dev-libs/openssl-1.0.2:= ) libressl? ( dev-libs/libressl:= ) ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) app-arch/xz-utils sys-devel/flex nls? ( sys-devel/gettext )
+DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
+EAPI=7
+HOMEPAGE=https://www.fetchmail.info/
+IUSE=ssl nls kerberos tk socks libressl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 public-domain
+RDEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.1.1:= ) libressl? ( dev-libs/libressl:= ) ) kerberos? ( virtual/krb5 !libressl? ( >=dev-libs/openssl-1.0.2:= ) libressl? ( dev-libs/libressl:= ) ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[tk] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/future[python_targets_python3_9(-)] ) ) virtual/tmpfiles
+REQUIRED_USE=tk? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.12.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=285367f3c652fd9044f08f9dc0ae299f
diff --git a/metadata/md5-cache/net-mail/maildirtree-0.6-r1 b/metadata/md5-cache/net-mail/maildirtree-0.6-r1
deleted file mode 100644
index e28de3ed67af..000000000000
--- a/metadata/md5-cache/net-mail/maildirtree-0.6-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=A utility that prints trees of Courier-style Maildirs
-EAPI=4
-HOMEPAGE=http://triplehelix.org/~joshk/maildirtree
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://triplehelix.org/~joshk/maildirtree/maildirtree-0.6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bbcd0d17a0f67f128af86e7eceadf172
diff --git a/metadata/md5-cache/net-mail/mailman-3.3.0 b/metadata/md5-cache/net-mail/mailman-3.3.0
deleted file mode 100644
index 2fba2d6ab665..000000000000
--- a/metadata/md5-cache/net-mail/mailman-3.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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(-)] >=dev-python/setuptools-42.0.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=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Mailman -- the GNU mailing list manager
-EAPI=7
-HOMEPAGE=https://www.list.org
-IUSE=python_targets_python3_6 python_targets_python3_7
-LICENSE=GPL-3+
-RDEPEND=>=dev-python/aiosmtpd-1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/alembic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/atpublic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/authheaders-0.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/authres-1.0.1[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/dnspython-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/falcon-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flufl-bounce[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flufl-i18n-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flufl-lock-3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-python/importlib_resources[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) www-servers/gunicorn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lazr-config[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[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/sqlalchemy-1.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-configuration[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-event[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[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/m/mailman/mailman-3.3.0.tar.gz https://dev.gentoo.org/~hanno/distfiles/mailman-3.3.0-importlib_resources-fix.diff.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=62bc01f9102e3faf08006d6158c3d276
diff --git a/metadata/md5-cache/net-mail/mailman-3.3.1 b/metadata/md5-cache/net-mail/mailman-3.3.1
deleted file mode 100644
index 13fdc716c01b..000000000000
--- a/metadata/md5-cache/net-mail/mailman-3.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=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(-)] >=dev-python/setuptools-42.0.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=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Mailman -- the GNU mailing list manager
-EAPI=7
-HOMEPAGE=https://www.list.org
-IUSE=python_targets_python3_6 python_targets_python3_7
-LICENSE=GPL-3+
-RDEPEND=>=dev-python/aiosmtpd-1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/alembic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/atpublic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/authheaders-0.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/authres-1.0.1[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/dnspython-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/falcon-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flufl-bounce[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flufl-i18n-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flufl-lock-3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/importlib_resources-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/gunicorn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lazr-config[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[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/sqlalchemy-1.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-configuration[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-event[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/zope-interface-5.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/m/mailman/mailman-3.3.1.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7cbb4a2dd295f98a7f3eccf2472e53ad
diff --git a/metadata/md5-cache/net-mail/mailman-3.3.1-r1 b/metadata/md5-cache/net-mail/mailman-3.3.1-r1
new file mode 100644
index 000000000000..a310e38caa17
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailman-3.3.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=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(-)] >=dev-python/setuptools-42.0.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=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Mailman -- the GNU mailing list manager
+EAPI=7
+HOMEPAGE=https://www.list.org
+IUSE=python_targets_python3_6 python_targets_python3_7
+LICENSE=GPL-3+
+RDEPEND=>=dev-python/aiosmtpd-1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/alembic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/atpublic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/authheaders-0.13.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/authres-1.0.1[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/dnspython-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/falcon-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flufl-bounce[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flufl-i18n-2.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flufl-lock-3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/importlib_resources-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/gunicorn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lazr-config[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[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/sqlalchemy-1.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-configuration[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-event[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/zope-interface-5.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=3
+SRC_URI=mirror://pypi/m/mailman/mailman-3.3.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=77b1999e3e1844df874168d2888ff809
diff --git a/metadata/md5-cache/net-mail/mailutils-3.10 b/metadata/md5-cache/net-mail/mailutils-3.10
index 1e64221b6c70..7266f0e1e44f 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.10
+++ b/metadata/md5-cache/net-mail/mailutils-3.10
@@ -11,5 +11,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.10.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=219d3f4b1c19f412bd3ae0407eb361aa
diff --git a/metadata/md5-cache/net-mail/mailutils-3.8 b/metadata/md5-cache/net-mail/mailutils-3.8
index 1c0063b1524e..769b5118fc7b 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.8
+++ b/metadata/md5-cache/net-mail/mailutils-3.8
@@ -11,5 +11,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.8.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8765d11e919031cb8416b1077f1d8f3b
diff --git a/metadata/md5-cache/net-mail/mailutils-3.9 b/metadata/md5-cache/net-mail/mailutils-3.9
index 741a4bc8b84f..a3fb53700c8a 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.9
+++ b/metadata/md5-cache/net-mail/mailutils-3.9
@@ -11,5 +11,5 @@ RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/n
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.9.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dfe0524eeff470e2d70148c8d50f66c4
diff --git a/metadata/md5-cache/net-mail/mu-1.4.10 b/metadata/md5-cache/net-mail/mu-1.4.10
index 0545cb6e33ab..0f9c5ac258e9 100644
--- a/metadata/md5-cache/net-mail/mu-1.4.10
+++ b/metadata/md5-cache/net-mail/mu-1.4.10
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4 emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2 ) mug? ( net-libs/webkit-gtk:4 x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=https://github.com/djcb/mu/archive/1.4.10.tar.gz -> mu-1.4.10.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=56fc5c3f8bbbf508be86a89657bbb771
diff --git a/metadata/md5-cache/net-mail/mu-1.4.12 b/metadata/md5-cache/net-mail/mu-1.4.12
index 0d74eafad920..169d0fd49627 100644
--- a/metadata/md5-cache/net-mail/mu-1.4.12
+++ b/metadata/md5-cache/net-mail/mu-1.4.12
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4 emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2 ) mug? ( net-libs/webkit-gtk:4 x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=https://github.com/djcb/mu/archive/1.4.12.tar.gz -> mu-1.4.12.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=3e80a56929362a61f5329bdee858fe61
diff --git a/metadata/md5-cache/net-mail/mu-1.4.13 b/metadata/md5-cache/net-mail/mu-1.4.13
index 3b16506bdf9b..464ad41304d6 100644
--- a/metadata/md5-cache/net-mail/mu-1.4.13
+++ b/metadata/md5-cache/net-mail/mu-1.4.13
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2= dev-libs/gmime:3.0= >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-24.4:* ) guile? ( >=dev-scheme/guile-2.2:* ) mug? ( net-libs/webkit-gtk:4= x11-libs/gtk+:3= )
 SLOT=0
 SRC_URI=https://github.com/djcb/mu/archive/1.4.13.tar.gz -> mu-1.4.13.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=9ff7e9bea53bf9b777322bb9d0025123
diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.3-r2 b/metadata/md5-cache/net-mail/notmuch-0.29.3-r2
index 7cd4a5a6d9d1..38dad2b370ee 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.29.3-r2
+++ b/metadata/md5-cache/net-mail/notmuch-0.29.3-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python3_6 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.3.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a0184d76e72c656f3956fe2565d4b75c
diff --git a/metadata/md5-cache/net-mail/notmuch-0.30-r1 b/metadata/md5-cache/net-mail/notmuch-0.30-r1
index 63d123616237..4a32bc8cae04 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.30-r1
+++ b/metadata/md5-cache/net-mail/notmuch-0.30-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python3_6 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.30.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=844c14bc4808a83cd84a1cacc0058867
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31 b/metadata/md5-cache/net-mail/notmuch-0.31
index acb9047543c2..6baa415540cd 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31
+++ b/metadata/md5-cache/net-mail/notmuch-0.31
@@ -12,5 +12,5 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python3_6 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=35dd0964dec04cb1208294f6e75be13e
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31-r1 b/metadata/md5-cache/net-mail/notmuch-0.31-r1
new file mode 100644
index 000000000000..ae80ce84a94b
--- /dev/null
+++ b/metadata/md5-cache/net-mail/notmuch-0.31-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx sys-apps/texinfo )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cffi ) test? ( >=app-editors/emacs-24.1:*[libxml2] app-misc/dtach sys-devel/gdb crypt? ( app-crypt/gnupg dev-libs/openssl ) ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
+EAPI=7
+HOMEPAGE=https://notmuchmail.org/
+IUSE=crypt doc emacs mutt nmbug python test valgrind python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-libs/talloc sys-libs/zlib emacs? ( >=app-editors/emacs-24.1:* ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cffi ) crypt? ( app-crypt/gnupg ) mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Pod-Parser ) nmbug? ( dev-vcs/git )
+REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) test? ( crypt emacs python valgrind )
+RESTRICT=!test? ( test )
+SLOT=0/5
+SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=14efa09cecdcc09b9d2f1b64fb69f5a5
diff --git a/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1 b/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1
deleted file mode 100644
index 60d955dbfb98..000000000000
--- a/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-DESCRIPTION=A toolkit for dealing with the qmail queue directory structure
-EAPI=6
-HOMEPAGE=http://pyropus.ca/software/queue-repair/
-IUSE=+python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=http://pyropus.ca/software/queue-repair/queue-repair-0.9.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ad5a9d4164d1e83e46486a6b2455ad49
diff --git a/metadata/md5-cache/net-mail/sendEmail-1.56-r1 b/metadata/md5-cache/net-mail/sendEmail-1.56-r1
deleted file mode 100644
index 27f23feb35fe..000000000000
--- a/metadata/md5-cache/net-mail/sendEmail-1.56-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=Command line based, SMTP email agent
-EAPI=5
-HOMEPAGE=http://caspian.dotconf.net/menu/Software/SendEmail/
-IUSE=ssl
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl ssl? ( dev-perl/IO-Socket-SSL )
-SLOT=0
-SRC_URI=http://caspian.dotconf.net/menu/Software/SendEmail/sendEmail-v1.56.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b645807f39aaf53b54eae43cd6bef5df
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 90668bac955d..a7674ee448aa 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/apt-cacher-ng-3.3.1_p2 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.3.1_p2
deleted file mode 100644
index efa2b27383f1..000000000000
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-3.3.1_p2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) dev-util/cmake >sys-devel/gcc-4.8 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DESCRIPTION=Yet another caching HTTP proxy for Debian/Ubuntu software packages
-EAPI=7
-HOMEPAGE=https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html
-IUSE=doc fuse systemd tcpd
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-4 ZLIB public-domain
-RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.3.1.orig.tar.xz mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.3.1-2.debian.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38567720d3bcc4f3947305f15eb421c1
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-3.4_p1 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.4_p1
deleted file mode 100644
index 50f8c5fa0f7a..000000000000
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-3.4_p1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) dev-util/cmake >sys-devel/gcc-4.8 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DESCRIPTION=Yet another caching HTTP proxy for Debian/Ubuntu software packages
-EAPI=7
-HOMEPAGE=https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html
-IUSE=doc fuse systemd tcpd
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-4 ZLIB public-domain
-RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.4.orig.tar.xz mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.4-1.debian.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38567720d3bcc4f3947305f15eb421c1
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-3.5_p1-r1 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.5_p1-r1
index 2ab9c619bd96..858830389a9f 100644
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-3.5_p1-r1
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-3.5_p1-r1
@@ -1,5 +1,5 @@
-BDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) dev-util/cmake >sys-devel/gcc-4.8 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare pretend setup test
+BDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Yet another caching HTTP proxy for Debian/Ubuntu software packages
 EAPI=7
 HOMEPAGE=https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html
@@ -9,5 +9,5 @@ LICENSE=BSD-4 ZLIB public-domain
 RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.5.orig.tar.xz mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.5-1.debian.tar.xz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=17fd852f09d2e303cce1dbb5c2218599
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=363c29c130e91ccb155c10a2ecab3030
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-9999999 b/metadata/md5-cache/net-misc/apt-cacher-ng-9999999
index 24520132a1d1..3e1ffea251c6 100644
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-9999999
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-9999999
@@ -1,5 +1,5 @@
-BDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) dev-util/cmake >sys-devel/gcc-4.8 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+BDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=Yet another caching HTTP proxy for Debian/Ubuntu software packages
 EAPI=7
 HOMEPAGE=https://www.unix-ag.uni-kl.de/~bloch/acng/ https://packages.qa.debian.org/a/apt-cacher-ng.html
@@ -8,5 +8,5 @@ LICENSE=BSD-4 ZLIB public-domain
 PROPERTIES=live
 RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/libevent:= dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a502c267d8e3f0d1e0bdc329ad59f76d
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a52f9f4579f538211111fa9f6f3a6dcb
diff --git a/metadata/md5-cache/net-misc/batctl-2020.1 b/metadata/md5-cache/net-misc/batctl-2020.1
deleted file mode 100644
index f2916a5da971..000000000000
--- a/metadata/md5-cache/net-misc/batctl-2020.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install setup
-DEPEND=dev-libs/libnl:3
-DESCRIPTION=BATMAN advanced control and management tool
-EAPI=7
-HOMEPAGE=https://www.open-mesh.org/
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 MIT ISC
-RDEPEND=dev-libs/libnl:3
-SLOT=0
-SRC_URI=https://downloads.open-mesh.org/batman/releases/batman-adv-2020.1/batctl-2020.1.tar.gz
-_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0f673928deb75c1e3eca7b80af90a056
diff --git a/metadata/md5-cache/net-misc/batctl-2020.3 b/metadata/md5-cache/net-misc/batctl-2020.3
new file mode 100644
index 000000000000..606b23e6a63b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/batctl-2020.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install setup
+DEPEND=dev-libs/libnl:3
+DESCRIPTION=BATMAN advanced control and management tool
+EAPI=7
+HOMEPAGE=https://www.open-mesh.org/
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 MIT ISC
+RDEPEND=dev-libs/libnl:3
+SLOT=0
+SRC_URI=https://downloads.open-mesh.org/batman/releases/batman-adv-2020.3/batctl-2020.3.tar.gz
+_eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0f673928deb75c1e3eca7b80af90a056
diff --git a/metadata/md5-cache/net-misc/dropbox-106.4.368 b/metadata/md5-cache/net-misc/dropbox-106.4.368
new file mode 100644
index 000000000000..430918fc5e53
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-106.4.368
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/patchelf virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
+EAPI=7
+HOMEPAGE=https://www.dropbox.com/
+IUSE=selinux X
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
+RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-106.4.368.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-106.4.368.tar.gz )
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6988e1d99f9bf049b53feb57c7e6e90e
diff --git a/metadata/md5-cache/net-misc/electrum-4.0.3 b/metadata/md5-cache/net-misc/electrum-4.0.3
deleted file mode 100644
index 72fb95ab7faf..000000000000
--- a/metadata/md5-cache/net-misc/electrum-4.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[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/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( 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-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[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/attrs-19.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/bitstring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/dnspython-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ecdsa-0.14[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/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-3.12[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] ) ) || ( dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.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[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/setuptools-42.0.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 test 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-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[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/attrs-19.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/bitstring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/dnspython-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ecdsa-0.14[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/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-3.12[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] ) ) || ( dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycryptodome[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[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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spesmilo/electrum/archive/4.0.3.tar.gz -> electrum-4.0.3.gh.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da7f23e79f95e78ac835d386f428c251
diff --git a/metadata/md5-cache/net-misc/electrum-4.0.3-r1 b/metadata/md5-cache/net-misc/electrum-4.0.3-r1
new file mode 100644
index 000000000000..3c5b564386e3
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-4.0.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyaes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] =dev-python/aiorpcX-0.18*[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/attrs-19.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/bitstring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/dnspython-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ecdsa-0.14[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PySocks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/qrcode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ncurses? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) ) || ( dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+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 test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+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?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] =dev-python/aiorpcX-0.18*[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/attrs-19.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/bitstring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/dnspython-2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ecdsa-0.14[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/PySocks[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/qrcode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ncurses? ( python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) ) || ( dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses?] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spesmilo/electrum/archive/4.0.3.tar.gz -> electrum-4.0.3.gh.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=659cfe3e2aee82bbb2506dcd39f8dd48
diff --git a/metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204 b/metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204
index be6675375391..2941ba565572 100644
--- a/metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204
+++ b/metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204
@@ -10,5 +10,5 @@ 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 dev-qt/qtxml:5 bittorrent? ( dev-qt/qtwebengine:5[widgets] >=net-libs/libtorrent-rasterbar-1.1.1 ) curl? ( >=net-misc/curl-7.18.2 ) doc? ( dev-qt/qthelp:5 ) xmpp? ( net-libs/gloox )
 SLOT=0
 SRC_URI=https://github.com/LubosD/fatrat/tarball/14a1a146df76d70c44dcc38363848a5b41a364d5 -> fatrat-1.2.0_beta2_p20161204.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9810cf687a8b0945b6d3d014ca01257c
diff --git a/metadata/md5-cache/net-misc/freerdp-2.2.0 b/metadata/md5-cache/net-misc/freerdp-2.2.0
index c7353f94ef51..6fb367177191 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.2.0
+++ b/metadata/md5-cache/net-misc/freerdp-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sy
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://pub.freerdp.com/releases/freerdp-2.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c4bd8eed7e7e293f5eca938f6bda1ac
diff --git a/metadata/md5-cache/net-misc/freerdp-2.9999 b/metadata/md5-cache/net-misc/freerdp-2.9999
index 017fb737bebe..17d8d0e4a839 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.9999
+++ b/metadata/md5-cache/net-misc/freerdp-2.9999
@@ -10,5 +10,5 @@ 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 ) 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? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo: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:0= ) 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 )
 RESTRICT=!test? ( test )
 SLOT=0/2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88f2eee0476b12c36399ad1b3bd8797e
diff --git a/metadata/md5-cache/net-misc/freerdp-9999 b/metadata/md5-cache/net-misc/freerdp-9999
index 017fb737bebe..17d8d0e4a839 100644
--- a/metadata/md5-cache/net-misc/freerdp-9999
+++ b/metadata/md5-cache/net-misc/freerdp-9999
@@ -10,5 +10,5 @@ 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 ) 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? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo: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:0= ) 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 )
 RESTRICT=!test? ( test )
 SLOT=0/2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88f2eee0476b12c36399ad1b3bd8797e
diff --git a/metadata/md5-cache/net-misc/gerbera-1.6.1 b/metadata/md5-cache/net-misc/gerbera-1.6.1
index 4d5283d38960..87e1dcfce7c3 100644
--- a/metadata/md5-cache/net-misc/gerbera-1.6.1
+++ b/metadata/md5-cache/net-misc/gerbera-1.6.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=acct-user/gerbera >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= 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? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/gerbera/gerbera/archive/v1.6.1.tar.gz -> gerbera-1.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7cc88d8359fb95732c5385dd5ed14704
diff --git a/metadata/md5-cache/net-misc/gerbera-9999 b/metadata/md5-cache/net-misc/gerbera-9999
index b6e8af0115e0..54370854c7c9 100644
--- a/metadata/md5-cache/net-misc/gerbera-9999
+++ b/metadata/md5-cache/net-misc/gerbera-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=acct-user/gerbera >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml dev-libs/libfmt:0= 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? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f09ab3c27593961f98f9931dc823461
diff --git a/metadata/md5-cache/net-misc/grive-0.5.1-r1 b/metadata/md5-cache/net-misc/grive-0.5.1-r1
index f308a045232c..7e75ae2a9152 100644
--- a/metadata/md5-cache/net-misc/grive-0.5.1-r1
+++ b/metadata/md5-cache/net-misc/grive-0.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= dev-libs/yajl || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc
 SLOT=0
 SRC_URI=https://github.com/vitalif/grive2/archive/v0.5.1.tar.gz -> grive-0.5.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=71efd2feb78665ee3afc62bc5d9152eb
diff --git a/metadata/md5-cache/net-misc/grive-0.5.2_pre20200205 b/metadata/md5-cache/net-misc/grive-0.5.2_pre20200205
new file mode 100644
index 000000000000..d5cfb9c2eff2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/grive-0.5.2_pre20200205
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= dev-libs/yajl || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc
+DESCRIPTION=An open source Linux client for Google Drive
+EAPI=7
+HOMEPAGE=https://github.com/vitalif/grive2
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-libs/json-c-0.11-r1:= dev-libs/libgcrypt:0= dev-libs/yajl || ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] ) sys-libs/binutils-libs:0= sys-libs/glibc
+SLOT=0
+SRC_URI=https://github.com/vitalif/grive2/archive/ffb744a59b1496f86ec71581345355715d846f7b.tar.gz -> grive-0.5.2_pre20200205.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4fd4ac070e06536604ce35b72e02eeea
diff --git a/metadata/md5-cache/net-misc/ipcalc-0.42_p2 b/metadata/md5-cache/net-misc/ipcalc-0.42_p2
new file mode 100644
index 000000000000..76347b6f2eb4
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ipcalc-0.42_p2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=IP Calculator prints broadcast/network/etc for an IP address and netmask
+EAPI=7
+HOMEPAGE=http://jodies.de/ipcalc
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2+
+RDEPEND=>=dev-lang/perl-5.6.0
+SLOT=0
+SRC_URI=mirror://debian/pool/main/i/ipcalc/ipcalc_0.42.orig.tar.gz mirror://debian/pool/main/i/ipcalc/ipcalc_0.42-2.debian.tar.xz
+_md5_=79d757c0d6eb9082e9740f90ef9b2eb5
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.5.20200928 b/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
new file mode 100644
index 000000000000..0ff021e75319
--- /dev/null
+++ b/metadata/md5-cache/net-misc/minissdpd-1.5.20200928
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure 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.20200928.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=131b916d62582ab8ce664805e06090d8
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2 b/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2
new file mode 100644
index 000000000000..6d816a052477
--- /dev/null
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.2.0_rc2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst
+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.2.0-RC2.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5a19d8c85e7b377f4d996c89a24ef726
diff --git a/metadata/md5-cache/net-misc/nemesis-1.4-r2 b/metadata/md5-cache/net-misc/nemesis-1.4-r2
index 2eeb6d4d0c86..dec202242e33 100644
--- a/metadata/md5-cache/net-misc/nemesis-1.4-r2
+++ b/metadata/md5-cache/net-misc/nemesis-1.4-r2
@@ -10,4 +10,4 @@ RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/nemesis/nemesis-1.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=412c96ea9414fb5ab2cf2d177dc2084d
+_md5_=24ac7804b803e814e5c52a2e8eee443c
diff --git a/metadata/md5-cache/net-misc/nemesis-1.7-r1 b/metadata/md5-cache/net-misc/nemesis-1.7-r1
new file mode 100644
index 000000000000..3790ed0f29fd
--- /dev/null
+++ b/metadata/md5-cache/net-misc/nemesis-1.7-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=net-libs/libnet:1.1 net-libs/libpcap
+DESCRIPTION=A commandline-based, portable human IP stack for UNIX/Linux
+EAPI=7
+HOMEPAGE=https://github.com/libnet/nemesis
+KEYWORDS=~alpha ~amd64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
+SLOT=0
+SRC_URI=https://github.com/libnet/nemesis/archive/v1.7.tar.gz -> nemesis-1.7.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=78cef500a1ae40ad1a53eab5e0748ddf
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.26.0 b/metadata/md5-cache/net-misc/networkmanager-1.26.0
index c4d97ca0aa26..39b2a7ad25c3 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.26.0
+++ b/metadata/md5-cache/net-misc/networkmanager-1.26.0
@@ -4,7 +4,7 @@ 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_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=>=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_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) 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_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_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_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 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.26/NetworkManager-1.26.0.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vala	2cd99cd72bb91f3f190fa4ca576be580	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f870421d8352e4691ce6469a67e720d
+_md5_=9f42414677b47f378540b229e4013235
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-2.6.5 b/metadata/md5-cache/net-misc/nextcloud-client-2.6.5
index 7f65ca9c7261..5d4257107325 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-2.6.5
+++ b/metadata/md5-cache/net-misc/nextcloud-client-2.6.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-db/sqlite-3.4:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain[qt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nextcloud/desktop/archive/v2.6.5.tar.gz -> nextcloud-client-2.6.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=225d7e4874da686bce445da47d4f50e9
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.0.0 b/metadata/md5-cache/net-misc/nextcloud-client-3.0.0
index 1a1eed41a3c3..938f37221bd0 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.0.0
+++ b/metadata/md5-cache/net-misc/nextcloud-client-3.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-db/sqlite-3.4:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain[qt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nextcloud/desktop/archive/v3.0.0.tar.gz -> nextcloud-client-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8e5588b3f70a215ad37a220fa148b1ff
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.0.1 b/metadata/md5-cache/net-misc/nextcloud-client-3.0.1
index 6d2f295c21cc..7b8a76c8cb69 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-3.0.1
+++ b/metadata/md5-cache/net-misc/nextcloud-client-3.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-db/sqlite-3.4:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain[qt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nextcloud/desktop/archive/v3.0.1.tar.gz -> nextcloud-client-3.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8e5588b3f70a215ad37a220fa148b1ff
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-3.0.2 b/metadata/md5-cache/net-misc/nextcloud-client-3.0.2
new file mode 100644
index 000000000000..c602fbeecbd5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/nextcloud-client-3.0.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) !libressl? ( >=dev-libs/openssl-1.1.0:0= ) libressl? ( >=dev-libs/libressl-3.1:0= ) nautilus? ( dev-python/nautilus-python ) shibboleth? ( dev-qt/qtwebkit:5 ) dev-qt/linguist-tools:5 doc? ( dev-python/sphinx dev-tex/latexmk dev-texlive/texlive-latexextra virtual/latex-base ) dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Desktop Syncing Client for Nextcloud
+EAPI=7
+HOMEPAGE=https://github.com/nextcloud/desktop
+IUSE=doc dolphin libressl nautilus shibboleth test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-3.0 GPL-2
+RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) !libressl? ( >=dev-libs/openssl-1.1.0:0= ) libressl? ( >=dev-libs/libressl-3.1:0= ) nautilus? ( dev-python/nautilus-python ) shibboleth? ( dev-qt/qtwebkit:5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nextcloud/desktop/archive/v3.0.2.tar.gz -> nextcloud-client-3.0.2.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bb27fc20c44a06cdd5de136c51df0cd0
diff --git a/metadata/md5-cache/net-misc/oidc-agent-3.3.5 b/metadata/md5-cache/net-misc/oidc-agent-3.3.5
deleted file mode 100644
index bc728370463a..000000000000
--- a/metadata/md5-cache/net-misc/oidc-agent-3.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-libs/check )
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/libseccomp
-DESCRIPTION=oidc-agent for managing OpenID Connect tokens on the command line
-EAPI=7
-HOMEPAGE=https://github.com/indigo-dc/oidc-agent
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/libseccomp
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/indigo-dc/oidc-agent/archive/v3.3.5.tar.gz -> oidc-agent-3.3.5.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5f5df3d768ae62cad3a57096c5778ef5
diff --git a/metadata/md5-cache/net-misc/oidc-agent-3.3.5-r1 b/metadata/md5-cache/net-misc/oidc-agent-3.3.5-r1
new file mode 100644
index 000000000000..31ab0049153d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/oidc-agent-3.3.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-libs/check )
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/libseccomp
+DESCRIPTION=oidc-agent for managing OpenID Connect tokens on the command line
+EAPI=7
+HOMEPAGE=https://github.com/indigo-dc/oidc-agent
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-crypt/libsecret dev-libs/libsodium net-libs/libmicrohttpd sys-libs/libseccomp
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/indigo-dc/oidc-agent/archive/v3.3.5.tar.gz -> oidc-agent-3.3.5.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=134c6cb6b4c0d0af5ac33aa41b55eeec
diff --git a/metadata/md5-cache/net-misc/omnisync-1.0_p20200130 b/metadata/md5-cache/net-misc/omnisync-1.0_p20200130
index 288aadb32267..ba531a8f80c1 100644
--- a/metadata/md5-cache/net-misc/omnisync-1.0_p20200130
+++ b/metadata/md5-cache/net-misc/omnisync-1.0_p20200130
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/gnutls:= net-analyzer/net-snmp:=
 SLOT=0
 SRC_URI=https://gitlab.com/grknight/omnisync/-/archive/c55215330b1e8a61af6d34d57d3d8236c8cc7d5b/omnisync-c55215330b1e8a61af6d34d57d3d8236c8cc7d5b.tar.bz2 -> omnisync-1.0_p20200130.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57fa30e4985c3945fb859c1193566c4c
diff --git a/metadata/md5-cache/net-misc/openssh-8.3_p1-r5 b/metadata/md5-cache/net-misc/openssh-8.3_p1-r5
index 12a1431e962f..c748064c7637 100644
--- a/metadata/md5-cache/net-misc/openssh-8.3_p1-r5
+++ b/metadata/md5-cache/net-misc/openssh-8.3_p1-r5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.3p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.3p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/hpnssh/HPN-SSH%2014v20%208.1p1/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff mirror://sourceforge/hpnssh/HPN-SSH%2014v20%208.1p1/openssh-8_1_P1-hpn-AES-CTR-14.20.diff mirror://sourceforge/hpnssh/HPN-SSH%2014v20%208.1p1/openssh-8_1_P1-hpn-PeakTput-14.20.diff ) X509? ( https://roumenpetrov.info/openssh/x509-12.5.1/openssh-8.3p1+x509-12.5.1.diff.gz )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=113b50e568d051f78c36e3f93f12b602
+_md5_=9e14a5d8c79761766db59012d844f598
diff --git a/metadata/md5-cache/net-misc/portspoof-1.1 b/metadata/md5-cache/net-misc/portspoof-1.1
deleted file mode 100644
index 7cf034f3a224..000000000000
--- a/metadata/md5-cache/net-misc/portspoof-1.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=return SYN+ACK for every port connection attempt
-EAPI=5
-HOMEPAGE=http://portspoof.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=https://github.com/drk1wi/portspoof/archive/v1.1.tar.gz -> portspoof-1.1.tar.gz
-_md5_=97396dab8f8ea34b3aaf9766732c08fd
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.5 b/metadata/md5-cache/net-misc/remmina-1.4.5
index 338b499ad02d..7c65e5b7545f 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.5
+++ b/metadata/md5-cache/net-misc/remmina-1.4.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129 <net-misc/freerdp-3 cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.5/Remmina-v1.4.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8997245c8636cac465b0363eb0429fe2
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.7 b/metadata/md5-cache/net-misc/remmina-1.4.7
index 0a642d3f4bb0..77f78a34e9ba 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.7
+++ b/metadata/md5-cache/net-misc/remmina-1.4.7
@@ -10,5 +10,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129 <net-misc/freerdp-3 cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.7/Remmina-v1.4.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e9ece412b8d14787f1593166b454b67
diff --git a/metadata/md5-cache/net-misc/remmina-1.4.8 b/metadata/md5-cache/net-misc/remmina-1.4.8
index 89e7a97cdaa5..40a0f72bbb46 100644
--- a/metadata/md5-cache/net-misc/remmina-1.4.8
+++ b/metadata/md5-cache/net-misc/remmina-1.4.8
@@ -10,5 +10,5 @@ LICENSE=GPL-2+-with-openssl-exception
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129 <net-misc/freerdp-3 cups? ( net-print/cups:= ) ) gnome-keyring? ( app-crypt/libsecret ) kwallet? ( kde-frameworks/kwallet ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) spice? ( net-misc/spice-gtk[gtk3] ) ssh? ( net-libs/libssh:0=[sftp] x11-libs/vte:2.91 ) telepathy? ( net-libs/telepathy-glib ) vnc? ( net-libs/libvncserver[jpeg] ) webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.4.8/Remmina-v1.4.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e9ece412b8d14787f1593166b454b67
diff --git a/metadata/md5-cache/net-misc/seafile-7.0.5-r1 b/metadata/md5-cache/net-misc/seafile-7.0.5-r1
index e1020ff3b623..b638b0dae4c0 100644
--- a/metadata/md5-cache/net-misc/seafile-7.0.5-r1
+++ b/metadata/md5-cache/net-misc/seafile-7.0.5-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/v7.0.5.tar.gz -> seafile-7.0.5.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ce8b1f87a19bf66c6c24804db696a54a
+_md5_=cdd21c1438782ed1853604342077c116
diff --git a/metadata/md5-cache/net-misc/seafile-client-7.0.5 b/metadata/md5-cache/net-misc/seafile-client-7.0.5
index 177881674e23..a883c0e08e2c 100644
--- a/metadata/md5-cache/net-misc/seafile-client-7.0.5
+++ b/metadata/md5-cache/net-misc/seafile-client-7.0.5
@@ -11,5 +11,5 @@ RDEPEND=net-libs/libsearpc ~net-misc/seafile-7.0.5 dev-libs/libevent dev-libs/ja
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile-client/archive/v7.0.5.tar.gz -> seafile-client-7.0.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1eaad5189c1a43fe6b2520d3b8c9c92a
diff --git a/metadata/md5-cache/net-misc/sipsak-0.9.6_p1-r1 b/metadata/md5-cache/net-misc/sipsak-0.9.6_p1-r1
deleted file mode 100644
index 54fd5640afbe..000000000000
--- a/metadata/md5-cache/net-misc/sipsak-0.9.6_p1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=gnutls? ( net-libs/gnutls ) net-dns/c-ares
-DESCRIPTION=small command line tool for testing SIP applications and devices
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/sipsak.berlios/
-IUSE=gnutls
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=gnutls? ( net-libs/gnutls ) net-dns/c-ares
-SLOT=0
-SRC_URI=mirror://sourceforge/sipsak.berlios/sipsak-0.9.6-1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=cd1a02533bc8ea931c638186c8b4fb4d
diff --git a/metadata/md5-cache/net-misc/smb4k-3.0.6 b/metadata/md5-cache/net-misc/smb4k-3.0.6
index a9ea446ae792..1cae430a3d3a 100644
--- a/metadata/md5-cache/net-misc/smb4k-3.0.6
+++ b/metadata/md5-cache/net-misc/smb4k-3.0.6
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kauth-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/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-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/kwallet-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 net-fs/samba[cups] plasma? ( >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/plasma-5.60.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://sourceforge/smb4k/smb4k-3.0.6.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c5fe1b7c8c4e0530228561039dba5b29
diff --git a/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.0-r1 b/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.0-r1
deleted file mode 100644
index b0c0f65ba1fd..000000000000
--- a/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/gtk+-2.10.0:2 x11-libs/libX11 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A small SSH Askpass replacement written with GTK2
-EAPI=4
-HOMEPAGE=https://github.com/atj/ssh-askpass-fullscreen
-KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/gtk+-2.10.0:2 x11-libs/libX11
-SLOT=0
-SRC_URI=https://github.com/downloads/atj/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d53d366e974c70c8c3ae1e49135f56d5
diff --git a/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.2 b/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.2
index 31dcd0131b8b..e221d426d241 100644
--- a/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.2
+++ b/metadata/md5-cache/net-misc/ssh-askpass-fullscreen-1.2
@@ -4,10 +4,10 @@ DEPEND=>=x11-libs/gtk+-2.10.0:2 x11-libs/libX11 virtual/pkgconfig
 DESCRIPTION=A small SSH Askpass replacement written with GTK2
 EAPI=7
 HOMEPAGE=https://github.com/atj/ssh-askpass-fullscreen
-KEYWORDS=~alpha ~amd64 ~ia64 ppc sparc x86
+KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-2.10.0:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/atj/ssh-askpass-fullscreen/releases/download/v1.2/ssh-askpass-fullscreen-1.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f317b928894a41352dec0d41a84a41b4
+_md5_=c1a7c2d37c7c01158b1517a3997fc340
diff --git a/metadata/md5-cache/net-misc/ucarp-1.5.2-r4 b/metadata/md5-cache/net-misc/ucarp-1.5.2-r4
deleted file mode 100644
index 65f7d1840b2b..000000000000
--- a/metadata/md5-cache/net-misc/ucarp-1.5.2-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=net-libs/libpcap nls? ( sys-devel/gettext )
-DESCRIPTION=Portable userland implementation of Common Address Redundancy Protocol (CARP)
-EAPI=5
-HOMEPAGE=http://www.ucarp.org
-IUSE=nls
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=ftp://ftp.ucarp.org/pub/ucarp/ucarp-1.5.2.tar.gz
-_md5_=30d039bab40ecb41b4cc2171478a7dd0
diff --git a/metadata/md5-cache/net-misc/vrrpd-1.0 b/metadata/md5-cache/net-misc/vrrpd-1.0
deleted file mode 100644
index 7d6f48ebdc5d..000000000000
--- a/metadata/md5-cache/net-misc/vrrpd-1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-devel/gcc
-DESCRIPTION=Virtual Router Redundancy Protocol Daemon
-EAPI=5
-HOMEPAGE=http://www.sourceforge.net/projects/vrrpd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://sourceforge/vrrpd/vrrpd/1.0/vrrpd-1.0.tar.gz
-_md5_=7dd7a5b96d7ed93228e9aaeb99c33a96
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 90bab5babf01..cf70825826c6 100644
--- a/metadata/md5-cache/net-news/Manifest.gz
+++ b/metadata/md5-cache/net-news/Manifest.gz
diff --git a/metadata/md5-cache/net-news/liferea-1.12.8 b/metadata/md5-cache/net-news/liferea-1.12.8
deleted file mode 100644
index 014676044d38..000000000000
--- a/metadata/md5-cache/net-news/liferea-1.12.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas[gtk,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/pango dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
-EAPI=7
-HOMEPAGE=https://lzone.de/liferea/
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas[gtk,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/pango
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12.8/liferea-1.12.8.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a18ca2727f893ff9abcb8c7fe9e53e15
diff --git a/metadata/md5-cache/net-news/liferea-1.12.9 b/metadata/md5-cache/net-news/liferea-1.12.9
new file mode 100644
index 000000000000..1b0d23110a48
--- /dev/null
+++ b/metadata/md5-cache/net-news/liferea-1.12.9
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas[gtk,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/pango dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
+EAPI=7
+HOMEPAGE=https://lzone.de/liferea/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas[gtk,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12.9/liferea-1.12.9.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=85b2dcbccd60de13d106d7eeb1b5cccb
diff --git a/metadata/md5-cache/net-news/newsboat-2.19-r1 b/metadata/md5-cache/net-news/newsboat-2.19-r1
index c88519e7510d..fc15a54ea73b 100644
--- a/metadata/md5-cache/net-news/newsboat-2.19-r1
+++ b/metadata/md5-cache/net-news/newsboat-2.19-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD-2 CC0-1.0 ISC MIT Unlicense
 RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode]
 SLOT=0
 SRC_URI=https://newsboat.org/releases/2.19/newsboat-2.19.tar.xz https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/argon2rs/0.2.5/download -> argon2rs-0.2.5.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/autocfg/0.1.2/download -> autocfg-0.1.2.crate https://crates.io/api/v1/crates/backtrace/0.3.13/download -> backtrace-0.3.13.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.28/download -> backtrace-sys-0.1.28.crate https://crates.io/api/v1/crates/bit-set/0.5.1/download -> bit-set-0.5.1.crate https://crates.io/api/v1/crates/bit-vec/0.5.1/download -> bit-vec-0.5.1.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/blake2-rfc/0.2.18/download -> blake2-rfc-0.2.18.crate https://crates.io/api/v1/crates/cc/1.0.29/download -> cc-1.0.29.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.3/download -> constant_time_eq-0.1.3.crate https://crates.io/api/v1/crates/curl-sys/0.4.12/download -> curl-sys-0.4.12.crate https://crates.io/api/v1/crates/dirs/1.0.4/download -> dirs-1.0.4.crate https://crates.io/api/v1/crates/failure/0.1.5/download -> failure-0.1.5.crate https://crates.io/api/v1/crates/failure_derive/0.1.5/download -> failure_derive-0.1.5.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gettext-rs/0.4.1/download -> gettext-rs-0.4.1.crate https://crates.io/api/v1/crates/gettext-sys/0.19.8/download -> gettext-sys-0.19.8.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/libc/0.2.66/download -> libc-0.2.66.crate https://crates.io/api/v1/crates/libz-sys/1.0.18/download -> libz-sys-1.0.18.crate https://crates.io/api/v1/crates/locale_config/0.2.2/download -> locale_config-0.2.2.crate https://crates.io/api/v1/crates/lock_api/0.1.5/download -> lock_api-0.1.5.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.1.3/download -> memchr-2.1.3.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/once_cell/0.1.8/download -> once_cell-0.1.8.crate https://crates.io/api/v1/crates/openssl-sys/0.9.53/download -> openssl-sys-0.9.53.crate https://crates.io/api/v1/crates/parking_lot/0.7.1/download -> parking_lot-0.7.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.4.0/download -> parking_lot_core-0.4.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/proc-macro2/0.4.27/download -> proc-macro2-0.4.27.crate https://crates.io/api/v1/crates/proptest/0.7.2/download -> proptest-0.7.2.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/quote/0.6.11/download -> quote-0.6.11.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.5.6/download -> rand-0.5.6.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.0/download -> rand_core-0.4.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.3/download -> rand_jitter-0.1.3.crate https://crates.io/api/v1/crates/rand_os/0.1.2/download -> rand_os-0.1.2.crate https://crates.io/api/v1/crates/rand_pcg/0.1.1/download -> rand_pcg-0.1.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_users/0.2.0/download -> redox_users-0.2.0.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex/1.1.0/download -> regex-1.1.0.crate https://crates.io/api/v1/crates/regex-syntax/0.4.2/download -> regex-syntax-0.4.2.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.5/download -> regex-syntax-0.6.5.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.13/download -> rustc-demangle-0.1.13.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rusty-fork/0.2.1/download -> rusty-fork-0.2.1.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/0.3.3/download -> scopeguard-0.3.3.crate https://crates.io/api/v1/crates/section_testing/0.0.4/download -> section_testing-0.0.4.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/smallvec/0.6.10/download -> smallvec-0.6.10.crate https://crates.io/api/v1/crates/syn/0.15.26/download -> syn-0.15.26.crate https://crates.io/api/v1/crates/synstructure/0.10.1/download -> synstructure-0.10.1.crate https://crates.io/api/v1/crates/tempfile/3.0.6/download -> tempfile-3.0.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/wait-timeout/0.1.5/download -> wait-timeout-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c7f15a5335b4b4e9f81140ca4a72fe73
diff --git a/metadata/md5-cache/net-news/newsboat-2.20.1 b/metadata/md5-cache/net-news/newsboat-2.20.1
index c2c858a5bee2..0aa18ebfdd6b 100644
--- a/metadata/md5-cache/net-news/newsboat-2.20.1
+++ b/metadata/md5-cache/net-news/newsboat-2.20.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD-2 Boost-1.0 CC0-1.0 ISC MIT Unlicense
 RDEPEND=>=dev-db/sqlite-3.5:3 >=dev-libs/stfl-0.21 >=net-misc/curl-7.21.6 >=dev-libs/json-c-0.11:= dev-libs/libxml2 sys-libs/ncurses:0=[unicode]
 SLOT=0
 SRC_URI=https://newsboat.org/releases/2.20.1/newsboat-2.20.1.tar.xz https://crates.io/api/v1/crates/aho-corasick/0.6.9/download -> aho-corasick-0.6.9.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.10/download -> arrayvec-0.4.10.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/autocfg/0.1.2/download -> autocfg-0.1.2.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/backtrace/0.3.13/download -> backtrace-0.3.13.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.28/download -> backtrace-sys-0.1.28.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bit-set/0.5.1/download -> bit-set-0.5.1.crate https://crates.io/api/v1/crates/bit-vec/0.5.1/download -> bit-vec-0.5.1.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.29/download -> cc-1.0.29.crate https://crates.io/api/v1/crates/cfg-if/0.1.6/download -> cfg-if-0.1.6.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/curl-sys/0.4.12/download -> curl-sys-0.4.12.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gettext-rs/0.4.1/download -> gettext-rs-0.4.1.crate https://crates.io/api/v1/crates/gettext-sys/0.19.8/download -> gettext-sys-0.19.8.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/0.2.11/download -> lazy_static-0.2.11.crate https://crates.io/api/v1/crates/lazy_static/1.2.0/download -> lazy_static-1.2.0.crate https://crates.io/api/v1/crates/lexical-core/0.6.2/download -> lexical-core-0.6.2.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/libz-sys/1.0.18/download -> libz-sys-1.0.18.crate https://crates.io/api/v1/crates/locale_config/0.2.2/download -> locale_config-0.2.2.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.1.3/download -> memchr-2.1.3.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nodrop/0.1.13/download -> nodrop-0.1.13.crate https://crates.io/api/v1/crates/nom/5.1.1/download -> nom-5.1.1.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/once_cell/1.3.1/download -> once_cell-1.3.1.crate https://crates.io/api/v1/crates/openssl-sys/0.9.53/download -> openssl-sys-0.9.53.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/proptest/0.9.6/download -> proptest-0.9.6.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.0/download -> rand_core-0.4.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.3/download -> rand_jitter-0.1.3.crate https://crates.io/api/v1/crates/rand_os/0.1.2/download -> rand_os-0.1.2.crate https://crates.io/api/v1/crates/rand_pcg/0.1.1/download -> rand_pcg-0.1.1.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.51/download -> redox_syscall-0.1.51.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/0.2.11/download -> regex-0.2.11.crate https://crates.io/api/v1/crates/regex-syntax/0.5.6/download -> regex-syntax-0.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.5/download -> regex-syntax-0.6.5.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.13/download -> rustc-demangle-0.1.13.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rusty-fork/0.2.1/download -> rusty-fork-0.2.1.crate https://crates.io/api/v1/crates/ryu/1.0.3/download -> ryu-1.0.3.crate https://crates.io/api/v1/crates/section_testing/0.0.4/download -> section_testing-0.0.4.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/smallvec/0.6.10/download -> smallvec-0.6.10.crate https://crates.io/api/v1/crates/static_assertions/0.3.4/download -> static_assertions-0.3.4.crate https://crates.io/api/v1/crates/tempfile/3.0.6/download -> tempfile-3.0.6.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wait-timeout/0.1.5/download -> wait-timeout-0.1.5.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=f331481b036f75d53881290281b0091a
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 3c21c5479bdc..c87914a0ea48 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/airdcpp-webclient-2.8.1 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.8.1
index bac9f02b0bc6..f7be52efc27e 100644
--- a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.8.1
+++ b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.8.1
@@ -11,5 +11,5 @@ PDEPEND=webui? ( www-apps/airdcpp-webui )
 RDEPEND=acct-user/airdcppd acct-group/airdcppd app-arch/bzip2 dev-cpp/websocketpp dev-libs/boost:= dev-libs/leveldb:= dev-libs/libmaxminddb:= dev-libs/openssl:0=[-bindist] net-libs/miniupnpc:= sys-libs/zlib virtual/libiconv nat-pmp? ( net-libs/libnatpmp:= ) tbb? ( dev-cpp/tbb:= )
 SLOT=0
 SRC_URI=https://github.com/airdcpp-web/airdcpp-webclient/archive/2.8.1.tar.gz -> airdcpp-webclient-2.8.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66cbaf00d02d1307ad4b21e5cb35540e
diff --git a/metadata/md5-cache/net-p2p/ktorrent-5.2.0-r1 b/metadata/md5-cache/net-p2p/ktorrent-5.2.0-r1
index 0b7146ec2290..491b1c006b4d 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-5.2.0-r1
+++ b/metadata/md5-cache/net-p2p/ktorrent-5.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.2.0/ktorrent-5.2.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e16b755caf82acb8ef0702ad88bbaf3
diff --git a/metadata/md5-cache/net-p2p/transmission-3.00-r1 b/metadata/md5-cache/net-p2p/transmission-3.00-r1
index 2ed421038651..3dec6c41072b 100644
--- a/metadata/md5-cache/net-p2p/transmission-3.00-r1
+++ b/metadata/md5-cache/net-p2p/transmission-3.00-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( !libressl? ( dev-libs/openssl:0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/transmission-3.00.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0895185630228a4a9067c480ec321e4e
diff --git a/metadata/md5-cache/net-p2p/transmission-9999 b/metadata/md5-cache/net-p2p/transmission-9999
index efd49e4d601e..331d191c4d00 100644
--- a/metadata/md5-cache/net-p2p/transmission-9999
+++ b/metadata/md5-cache/net-p2p/transmission-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/libevent-2.0.10:= !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 appindicator? ( >=dev-libs/libappindicator-0.4.30:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 ) systemd? ( >=sys-apps/systemd-209:= ) acct-group/transmission acct-user/transmission
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1c2b77949c849564388114c9fad56743
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.10.0 b/metadata/md5-cache/net-p2p/xmr-stak-2.10.0
index 0e6fe61d2e43..ef564974a667 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.10.0
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.10.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.10.0.tar.gz -> xmr-stak-2.10.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.10.1 b/metadata/md5-cache/net-p2p/xmr-stak-2.10.1
index 2a1204f328a6..728c13babe76 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.10.1
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.10.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.10.1.tar.gz -> xmr-stak-2.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.10.2 b/metadata/md5-cache/net-p2p/xmr-stak-2.10.2
index 5ca82b088080..24ece186c16f 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.10.2
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.10.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.10.2.tar.gz -> xmr-stak-2.10.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.10.3 b/metadata/md5-cache/net-p2p/xmr-stak-2.10.3
index 82ca2b34d35c..a5bf609f447b 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.10.3
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.10.3
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.10.3.tar.gz -> xmr-stak-2.10.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.10.4 b/metadata/md5-cache/net-p2p/xmr-stak-2.10.4
index 07a2bdf4dc82..cf62481e0b6a 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.10.4
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.10.4
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.10.4.tar.gz -> xmr-stak-2.10.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.10.5 b/metadata/md5-cache/net-p2p/xmr-stak-2.10.5
index 32b2746d3a0c..fcc4a379fb65 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.10.5
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.10.5
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.10.5.tar.gz -> xmr-stak-2.10.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.10.6 b/metadata/md5-cache/net-p2p/xmr-stak-2.10.6
index 89e2cc0cfd75..42d1c9c77e35 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.10.6
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.10.6
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.10.6.tar.gz -> xmr-stak-2.10.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.10.7 b/metadata/md5-cache/net-p2p/xmr-stak-2.10.7
index c64e87930b1f..9ca142991602 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.10.7
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.10.7
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.10.7.tar.gz -> xmr-stak-2.10.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.10.8 b/metadata/md5-cache/net-p2p/xmr-stak-2.10.8
index 418c6c3bce9b..297a60e51913 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.10.8
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.10.8
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.10.8.tar.gz -> xmr-stak-2.10.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.8.0 b/metadata/md5-cache/net-p2p/xmr-stak-2.8.0
index 50c839f3c01d..0ece0627b8f7 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.8.0
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.8.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.8.0.tar.gz -> xmr-stak-2.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.8.2 b/metadata/md5-cache/net-p2p/xmr-stak-2.8.2
index 010136591509..e58a91c3b010 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.8.2
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.8.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.8.2.tar.gz -> xmr-stak-2.8.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.8.3 b/metadata/md5-cache/net-p2p/xmr-stak-2.8.3
index cd8ae9c22704..b1ed72a5c202 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.8.3
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.8.3
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.8.3.tar.gz -> xmr-stak-2.8.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.9.0 b/metadata/md5-cache/net-p2p/xmr-stak-2.9.0
index cb571bc1367d..f19a2eb4997e 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-2.9.0
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.9.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.9.0.tar.gz -> xmr-stak-2.9.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-9999 b/metadata/md5-cache/net-p2p/xmr-stak-9999
index b7cce525fd91..c3ec808b1ae3 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-9999
+++ b/metadata/md5-cache/net-p2p/xmr-stak-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=556c305e67ab75cb34618bba44dc22ec
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.4 b/metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.4
index f0a87ee57f27..aa9c885e98f1 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.4
+++ b/metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.4
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/1.0.4-rx.tar.gz -> xmr-stak-rx-1.0.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74a062fc57a3399b730c17e7417a787c
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.5 b/metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.5
index d2569f84cb66..38772163bdaf 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.5
+++ b/metadata/md5-cache/net-p2p/xmr-stak-rx-1.0.5
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
 SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/1.0.5-rx.tar.gz -> xmr-stak-rx-1.0.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74a062fc57a3399b730c17e7417a787c
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-rx-9999 b/metadata/md5-cache/net-p2p/xmr-stak-rx-9999
index dc348e931232..e5f7dabbd745 100644
--- a/metadata/md5-cache/net-p2p/xmr-stak-rx-9999
+++ b/metadata/md5-cache/net-p2p/xmr-stak-rx-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74a062fc57a3399b730c17e7417a787c
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index d48638122ea6..bcb1dfc00a20 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/brlaser-6 b/metadata/md5-cache/net-print/brlaser-6
index af3d9beb1169..215d94256fae 100644
--- a/metadata/md5-cache/net-print/brlaser-6
+++ b/metadata/md5-cache/net-print/brlaser-6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-print/cups app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=https://github.com/pdewacht/brlaser/archive/v6.tar.gz -> brlaser-6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5fdb80d87bc1077d6fe0edc79f14b25
diff --git a/metadata/md5-cache/net-print/cups-bjnp-1.1 b/metadata/md5-cache/net-print/cups-bjnp-1.1
deleted file mode 100644
index 0a388f0fa287..000000000000
--- a/metadata/md5-cache/net-print/cups-bjnp-1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=net-print/cups
-DESCRIPTION=CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/cups-bjnp/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-print/cups
-SLOT=0
-SRC_URI=mirror://sourceforge/cups-bjnp/cups-bjnp-1.1.tar.gz
-_md5_=06b9d99b3b20bdd5d9c1b6d05fb19dfb
diff --git a/metadata/md5-cache/net-print/cups-bjnp-1.2.1 b/metadata/md5-cache/net-print/cups-bjnp-1.2.1
deleted file mode 100644
index a092551b44a4..000000000000
--- a/metadata/md5-cache/net-print/cups-bjnp-1.2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=net-print/cups
-DESCRIPTION=CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/cups-bjnp/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-print/cups
-SLOT=0
-SRC_URI=mirror://sourceforge/cups-bjnp/1.2.1/cups-bjnp-1.2.1.tar.gz
-_md5_=d02096afb71420717be8499106e2539f
diff --git a/metadata/md5-cache/net-print/cups-filters-1.28.3 b/metadata/md5-cache/net-print/cups-filters-1.28.3
new file mode 100644
index 000000000000..820224444115
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-filters-1.28.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen >=sys-devel/gettext-0.18.3 virtual/pkgconfig test? ( media-fonts/dejavu ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
+DESCRIPTION=Cups filters
+EAPI=7
+HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
+IUSE=dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint
+LICENSE=MIT GPL-2
+RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.28.3.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=81061621cd45bcd00708d34f65171c58
diff --git a/metadata/md5-cache/net-print/hplip-3.20.3 b/metadata/md5-cache/net-print/hplip-3.20.3
deleted file mode 100644
index e707189075a0..000000000000
--- a/metadata/md5-cache/net-print/hplip-3.20.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp:= ) )
-DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
-EAPI=7
-HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
-IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 arm ~ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp:= ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_6? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_6(-)] dev-python/distro[python_targets_python3_6(-)] fax? ( dev-python/reportlab[python_targets_python3_6(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_6(-)] libnotify? ( dev-python/notify2[python_targets_python3_6(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_6(-)] >=dev-python/pillow-3.1.1[python_targets_python3_6(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_7? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] fax? ( dev-python/reportlab[python_targets_python3_7(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_7(-)] libnotify? ( dev-python/notify2[python_targets_python3_7(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_7(-)] >=dev-python/pillow-3.1.1[python_targets_python3_7(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
-REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/hplip/hplip-3.20.3.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.12-patches-1.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=533838a0a86dc21e93854a994683b766
diff --git a/metadata/md5-cache/net-print/hplip-3.20.6-r2 b/metadata/md5-cache/net-print/hplip-3.20.6-r2
new file mode 100644
index 000000000000..175a5767cd39
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.20.6-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp:= ) )
+DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
+EAPI=7
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
+IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp:= ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_6? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_6(-)] dev-python/distro[python_targets_python3_6(-)] fax? ( dev-python/reportlab[python_targets_python3_6(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_6(-)] libnotify? ( dev-python/notify2[python_targets_python3_6(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_6(-)] >=dev-python/pillow-3.1.1[python_targets_python3_6(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_7? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] fax? ( dev-python/reportlab[python_targets_python3_7(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_7(-)] libnotify? ( dev-python/notify2[python_targets_python3_7(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_7(-)] >=dev-python/pillow-3.1.1[python_targets_python3_7(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_9? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] fax? ( dev-python/reportlab[python_targets_python3_9(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_9(-)] libnotify? ( dev-python/notify2[python_targets_python3_9(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_9(-)] >=dev-python/pillow-3.1.1[python_targets_python3_9(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
+REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/hplip/hplip-3.20.6.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.20.6-patches-1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=911c7ac5a5f7aa95a4731f2ef24a698a
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.20.3 b/metadata/md5-cache/net-print/hplip-plugin-3.20.3
deleted file mode 100644
index 156b8cb6c752..000000000000
--- a/metadata/md5-cache/net-print/hplip-plugin-3.20.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Proprietary plugins and firmware for HPLIP
-EAPI=7
-HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing/plugins
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=hplip-plugin
-RDEPEND=~net-print/hplip-3.20.3 virtual/libusb:0 virtual/udev
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.20.3-plugin.run
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=5bedc76ea9d6892f3fd27ce7f6f093f4
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 8e518bbe0d64..cdb7985ec732 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/rejik-3.2.10 b/metadata/md5-cache/net-proxy/rejik-3.2.10
index 55547e21654e..27bc21a1a5ac 100644
--- a/metadata/md5-cache/net-proxy/rejik-3.2.10
+++ b/metadata/md5-cache/net-proxy/rejik-3.2.10
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst prepare
 DEPEND=dev-libs/libpcre
 DESCRIPTION=A squid redirector used for blocking unwanted content
-EAPI=4
+EAPI=7
 HOMEPAGE=https://rejik.ru/
 IUSE=banlists
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre dev-perl/Text-Iconv dev-perl/XML-Parser net-proxy/squid
 SLOT=0
 SRC_URI=https://rejik.ru/download/redirector-3.2.10.tgz banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d810067efefe609e64a5d7a17545ce9e
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f018d427046033aad0dfd4dfee58b2af
diff --git a/metadata/md5-cache/net-proxy/rejik-3.2.11 b/metadata/md5-cache/net-proxy/rejik-3.2.11
new file mode 100644
index 000000000000..e4e3db166c60
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/rejik-3.2.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=dev-libs/libpcre
+DESCRIPTION=A squid redirector used for blocking unwanted content
+EAPI=7
+HOMEPAGE=https://rejik.ru/
+IUSE=banlists
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libpcre dev-perl/Text-Iconv dev-perl/XML-Parser net-proxy/squid
+SLOT=0
+SRC_URI=https://rejik.ru/download/redirector-3.2.11.tgz banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1b58e9f8e529a257fe0036606419ec63
diff --git a/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.4 b/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.4
deleted file mode 100644
index 786d40602117..000000000000
--- a/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=net-libs/mbedtls:= net-libs/libbloom net-libs/libcork net-libs/libcorkipset >=dev-libs/libsodium-1.0.8:= dev-libs/libev net-dns/c-ares dev-libs/libpcre sys-kernel/linux-headers doc? ( app-text/asciidoc app-text/xmlto )
-DESCRIPTION=A lightweight secured SOCKS5 proxy for embedded devices and low end boxes
-EAPI=7
-HOMEPAGE=https://github.com/shadowsocks/shadowsocks-libev
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=net-libs/mbedtls:= net-libs/libbloom net-libs/libcork net-libs/libcorkipset >=dev-libs/libsodium-1.0.8:= dev-libs/libev net-dns/c-ares dev-libs/libpcre
-SLOT=0
-SRC_URI=https://github.com/shadowsocks/shadowsocks-libev/archive/v3.3.4.tar.gz -> shadowsocks-libev-3.3.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a15356feb1929005967258e8c2afe099
diff --git a/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.4-r1 b/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.4-r1
new file mode 100644
index 000000000000..1f783de8d3a8
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.4-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=net-libs/mbedtls:= net-libs/libbloom net-libs/libcork net-libs/libcorkipset >=dev-libs/libsodium-1.0.8:= dev-libs/libev net-dns/c-ares dev-libs/libpcre sys-kernel/linux-headers doc? ( app-text/asciidoc app-text/xmlto )
+DESCRIPTION=A lightweight secured SOCKS5 proxy for embedded devices and low end boxes
+EAPI=7
+HOMEPAGE=https://github.com/shadowsocks/shadowsocks-libev
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=net-libs/mbedtls:= net-libs/libbloom net-libs/libcork net-libs/libcorkipset >=dev-libs/libsodium-1.0.8:= dev-libs/libev net-dns/c-ares dev-libs/libpcre
+SLOT=0
+SRC_URI=https://github.com/shadowsocks/shadowsocks-libev/archive/v3.3.4.tar.gz -> shadowsocks-libev-3.3.4.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8e58f789358b4f957ffb1357e438d55e
diff --git a/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.5 b/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.5
new file mode 100644
index 000000000000..2643ada31765
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/shadowsocks-libev-3.3.5
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=net-libs/mbedtls:= >=net-libs/libbloom-1.6 net-libs/libcork net-libs/libcorkipset >=dev-libs/libsodium-1.0.8:= dev-libs/libev net-dns/c-ares dev-libs/libpcre sys-kernel/linux-headers doc? ( app-text/asciidoc app-text/xmlto )
+DESCRIPTION=A lightweight secured SOCKS5 proxy for embedded devices and low end boxes
+EAPI=7
+HOMEPAGE=https://github.com/shadowsocks/shadowsocks-libev
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=net-libs/mbedtls:= >=net-libs/libbloom-1.6 net-libs/libcork net-libs/libcorkipset >=dev-libs/libsodium-1.0.8:= dev-libs/libev net-dns/c-ares dev-libs/libpcre
+SLOT=0
+SRC_URI=https://github.com/shadowsocks/shadowsocks-libev/archive/v3.3.5.tar.gz -> shadowsocks-libev-3.3.5.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=f2c591f4b7a37b4ea1bdb7d6a5ab4926
diff --git a/metadata/md5-cache/net-proxy/tinyproxy-1.11.0_rc1 b/metadata/md5-cache/net-proxy/tinyproxy-1.11.0_rc1
new file mode 100644
index 000000000000..2259191cce0b
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/tinyproxy-1.11.0_rc1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=acct-group/tinyproxy acct-user/tinyproxy
+DESCRIPTION=A lightweight HTTP/SSL proxy
+EAPI=7
+HOMEPAGE=https://github.com/tinyproxy/tinyproxy/
+IUSE=test debug +filter-proxy reverse-proxy transparent-proxy +upstream-proxy +xtinyproxy-header
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/tinyproxy acct-user/tinyproxy virtual/tmpfiles
+REQUIRED_USE=test? ( xtinyproxy-header )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tinyproxy/tinyproxy/releases/download/1.11.0-rc1/tinyproxy-1.11.0-rc1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8cbf88ef2dfb284fac3eb4266de14d34
diff --git a/metadata/md5-cache/net-proxy/trojan-1.15.1 b/metadata/md5-cache/net-proxy/trojan-1.15.1
deleted file mode 100644
index 7dbff9e5780b..000000000000
--- a/metadata/md5-cache/net-proxy/trojan-1.15.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( dev-lang/python:3.7 dev-lang/python:3.6 ) )
-DESCRIPTION=An unidentifiable mechanism that helps you bypass GFW
-EAPI=7
-HOMEPAGE=https://github.com/trojan-gfw/trojan
-IUSE=mysql test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/trojan-gfw/trojan/archive/v1.15.1.tar.gz -> trojan-1.15.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc46f37d0178e502d5e24f6cc9c89bec
diff --git a/metadata/md5-cache/net-proxy/trojan-1.16.0 b/metadata/md5-cache/net-proxy/trojan-1.16.0
deleted file mode 100644
index a866ba52cf72..000000000000
--- a/metadata/md5-cache/net-proxy/trojan-1.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( dev-lang/python:3.7 dev-lang/python:3.6 ) )
-DESCRIPTION=An unidentifiable mechanism that helps you bypass GFW
-EAPI=7
-HOMEPAGE=https://github.com/trojan-gfw/trojan
-IUSE=mysql test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/trojan-gfw/trojan/archive/v1.16.0.tar.gz -> trojan-1.16.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc46f37d0178e502d5e24f6cc9c89bec
diff --git a/metadata/md5-cache/net-proxy/trojan-1.16.0-r1 b/metadata/md5-cache/net-proxy/trojan-1.16.0-r1
new file mode 100644
index 000000000000..10c833263357
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/trojan-1.16.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= ) test? ( net-misc/curl || ( dev-lang/python:3.7 dev-lang/python:3.6 ) )
+DESCRIPTION=An unidentifiable mechanism that helps you bypass GFW
+EAPI=7
+HOMEPAGE=https://github.com/trojan-gfw/trojan
+IUSE=mysql test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/trojan-gfw/trojan/archive/v1.16.0.tar.gz -> trojan-1.16.0.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc46f37d0178e502d5e24f6cc9c89bec
diff --git a/metadata/md5-cache/net-proxy/trojan-9999 b/metadata/md5-cache/net-proxy/trojan-9999
index 5025fb716331..4c41f3bc87cd 100644
--- a/metadata/md5-cache/net-proxy/trojan-9999
+++ b/metadata/md5-cache/net-proxy/trojan-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/boost-1.66.0:= dev-libs/openssl:0= mysql? ( dev-db/mysql-connector-c:= )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ded78bd60e1aee297b54ec5c079db2ef
diff --git a/metadata/md5-cache/net-voip/Manifest.gz b/metadata/md5-cache/net-voip/Manifest.gz
index 62e97de9cd99..0a95f8f478e0 100644
--- a/metadata/md5-cache/net-voip/Manifest.gz
+++ b/metadata/md5-cache/net-voip/Manifest.gz
diff --git a/metadata/md5-cache/net-voip/telepathy-rakia-0.8.0 b/metadata/md5-cache/net-voip/telepathy-rakia-0.8.0
deleted file mode 100644
index eb5dea0c61d5..000000000000
--- a/metadata/md5-cache/net-voip/telepathy-rakia-0.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.30:2 >=net-libs/sofia-sip-1.12.11 >=net-libs/telepathy-glib-0.17.6 >=sys-apps/dbus-0.60 dev-libs/libxslt test? ( dev-python/twisted-core )
-DESCRIPTION=A SIP connection manager for Telepathy based around the Sofia-SIP library
-EAPI=5
-HOMEPAGE=https://telepathy.freedesktop.org/
-IUSE=test +python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.30:2 >=net-libs/sofia-sip-1.12.11 >=net-libs/telepathy-glib-0.17.6 >=sys-apps/dbus-0.60 !net-voip/telepathy-sofiasip
-REQUIRED_USE=^^ ( python_single_target_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-rakia/telepathy-rakia-0.8.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6b88d094110c7b81c9bc0f5456aae99c
diff --git a/metadata/md5-cache/net-voip/telepathy-rakia-0.8.0-r1 b/metadata/md5-cache/net-voip/telepathy-rakia-0.8.0-r1
new file mode 100644
index 000000000000..ce940849ea76
--- /dev/null
+++ b/metadata/md5-cache/net-voip/telepathy-rakia-0.8.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure setup
+DEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.30:2 >=net-libs/sofia-sip-1.12.11 >=net-libs/telepathy-glib-0.17.6 >=sys-apps/dbus-0.60 || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-libs/libxslt
+DESCRIPTION=A SIP connection manager for Telepathy based around the Sofia-SIP library
+EAPI=7
+HOMEPAGE=https://telepathy.freedesktop.org/
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.30:2 >=net-libs/sofia-sip-1.12.11 >=net-libs/telepathy-glib-0.17.6 >=sys-apps/dbus-0.60 !net-voip/telepathy-sofiasip
+RESTRICT=test
+SLOT=0
+SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-rakia/telepathy-rakia-0.8.0.tar.gz https://patch-diff.githubusercontent.com/raw/TelepathyIM/telepathy-rakia/pull/1.patch -> telepathy-rakia-0.8.0-py3.patch
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f66c5006ce4cd721619a9c87e048090d
diff --git a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r2 b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r2
deleted file mode 100644
index e342ced06c3d..000000000000
--- a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=>=dev-libs/dbus-glib-0.61 dev-libs/libxml2 >=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.1.0 >=net-libs/telepathy-glib-0.17.1 >=net-dns/avahi-0.6.22[dbus] net-libs/libsoup:2.4 sys-apps/util-linux dev-db/sqlite:3 gnutls? ( >=net-libs/gnutls-2.10.2 ) !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/libxslt virtual/pkgconfig test? ( >=dev-libs/check-0.9.4 net-libs/libgsasl || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/twisted[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DESCRIPTION=A link-local XMPP connection manager for Telepathy
-EAPI=6
-HOMEPAGE=https://telepathy.freedesktop.org/
-IUSE=gnutls test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/dbus-glib-0.61 dev-libs/libxml2 >=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.1.0 >=net-libs/telepathy-glib-0.17.1 >=net-dns/avahi-0.6.22[dbus] net-libs/libsoup:2.4 sys-apps/util-linux dev-db/sqlite:3 gnutls? ( >=net-libs/gnutls-2.10.2 ) !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-0.8.1.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=73a6f40a9c5c451b2c824ea67176edd1
diff --git a/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r3 b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r3
new file mode 100644
index 000000000000..568bc8868985
--- /dev/null
+++ b/metadata/md5-cache/net-voip/telepathy-salut-0.8.1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install setup
+DEPEND=>=dev-libs/dbus-glib-0.61 dev-libs/libxml2 >=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.1.0 >=net-libs/telepathy-glib-0.17.1 >=net-dns/avahi-0.6.22[dbus] net-libs/libsoup:2.4 sys-apps/util-linux dev-db/sqlite:3 gnutls? ( >=net-libs/gnutls-2.10.2 ) !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-libs/libxslt virtual/pkgconfig test? ( >=dev-libs/check-0.9.4 net-libs/libgsasl )
+DESCRIPTION=A link-local XMPP connection manager for Telepathy
+EAPI=7
+HOMEPAGE=https://telepathy.freedesktop.org/
+IUSE=gnutls test
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/dbus-glib-0.61 dev-libs/libxml2 >=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.1.0 >=net-libs/telepathy-glib-0.17.1 >=net-dns/avahi-0.6.22[dbus] net-libs/libsoup:2.4 sys-apps/util-linux dev-db/sqlite:3 gnutls? ( >=net-libs/gnutls-2.10.2 ) !gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-0.8.1.tar.gz https://src.fedoraproject.org/rpms/telepathy-salut/raw/master/f/telepathy-salut-0.8.1-python3.patch
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=65a5361fcafef9730a06e0c753ec5ff8
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 4e98de54d97f..f60ca9a34e3b 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/badvpn-1.999.126 b/metadata/md5-cache/net-vpn/badvpn-1.999.126
deleted file mode 100644
index 79f2df117d02..000000000000
--- a/metadata/md5-cache/net-vpn/badvpn-1.999.126
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=client? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) server? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) ncd? ( dev-libs/openssl ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Peer-to-peer VPN, NCD scripting language, tun2socks proxifier
-EAPI=5
-HOMEPAGE=https://code.google.com/p/badvpn/
-IUSE=+client +ncd +server +tun2socks +udpgw debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=client? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) server? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) ncd? ( dev-libs/openssl ) ncd? ( sys-apps/iproute2 >=virtual/udev-171 )
-REQUIRED_USE=|| ( client ncd server tun2socks udpgw )
-RESTRICT=!ncd? ( test )
-SLOT=0
-SRC_URI=https://badvpn.googlecode.com/files/badvpn-1.999.126.tar.bz2
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c5912b088c3d19166dfadf3117b42d94
diff --git a/metadata/md5-cache/net-vpn/badvpn-1.999.128 b/metadata/md5-cache/net-vpn/badvpn-1.999.128
deleted file mode 100644
index a9a99c8cc7ec..000000000000
--- a/metadata/md5-cache/net-vpn/badvpn-1.999.128
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=client? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) server? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) ncd? ( dev-libs/openssl ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=Peer-to-peer VPN, NCD scripting language, tun2socks proxifier
-EAPI=5
-HOMEPAGE=https://code.google.com/p/badvpn/
-IUSE=+client +ncd +server +tun2socks +udpgw debug
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=client? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) server? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) ncd? ( dev-libs/openssl ) ncd? ( sys-apps/iproute2 >=virtual/udev-171 )
-REQUIRED_USE=|| ( client ncd server tun2socks udpgw )
-RESTRICT=!ncd? ( test )
-SLOT=0
-SRC_URI=https://badvpn.googlecode.com/files/badvpn-1.999.128.tar.bz2
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d63f8f9a5c21a116048298d79785af63
diff --git a/metadata/md5-cache/net-vpn/corkscrew-2.0 b/metadata/md5-cache/net-vpn/corkscrew-2.0
deleted file mode 100644
index dc9d266ae1b2..000000000000
--- a/metadata/md5-cache/net-vpn/corkscrew-2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=a tool for tunneling SSH through HTTP proxies
-EAPI=4
-HOMEPAGE=http://www.agroman.net/corkscrew/
-KEYWORDS=amd64 ~arm ~ppc ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.agroman.net/corkscrew/corkscrew-2.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=135f18fc5948334ea459c8476fb5e614
diff --git a/metadata/md5-cache/net-vpn/corkscrew-2.0-r1 b/metadata/md5-cache/net-vpn/corkscrew-2.0-r1
index 5600ea12c2a7..99efbb968811 100644
--- a/metadata/md5-cache/net-vpn/corkscrew-2.0-r1
+++ b/metadata/md5-cache/net-vpn/corkscrew-2.0-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=prepare
 DESCRIPTION=a tool for tunneling SSH through HTTP proxies
 EAPI=7
 HOMEPAGE=https://github.com/patpadgett/corkscrew/
-KEYWORDS=~amd64 ~arm ~ppc ~sparc x86
+KEYWORDS=amd64 ~arm ~ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.agroman.net/corkscrew/corkscrew-2.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=48f4d6b68e0c3d465008636ba95c3f8a
+_md5_=d08025fa098f46c5660fab2840215bfa
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.31.0 b/metadata/md5-cache/net-vpn/i2pd-2.31.0
index 86a96a7840f4..ab83e7813b0a 100644
--- a/metadata/md5-cache/net-vpn/i2pd-2.31.0
+++ b/metadata/md5-cache/net-vpn/i2pd-2.31.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=acct-user/i2pd acct-group/i2pd !static? ( dev-libs/boost:=[threads] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( net-libs/miniupnpc ) )
 SLOT=0
 SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.31.0.tar.gz -> i2pd-2.31.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae67b4344ea8bc6ae6ed0b10e2e0e57f
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.32.0 b/metadata/md5-cache/net-vpn/i2pd-2.32.0
index 338a9229bd2f..51ec05caf98c 100644
--- a/metadata/md5-cache/net-vpn/i2pd-2.32.0
+++ b/metadata/md5-cache/net-vpn/i2pd-2.32.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=acct-user/i2pd acct-group/i2pd !static? ( dev-libs/boost:=[threads] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( net-libs/miniupnpc ) )
 SLOT=0
 SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.32.0.tar.gz -> i2pd-2.32.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bdcedd344a96ed77974ce3161f7cadb7
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.32.1 b/metadata/md5-cache/net-vpn/i2pd-2.32.1
index 03f160ca82cc..268f927667e1 100644
--- a/metadata/md5-cache/net-vpn/i2pd-2.32.1
+++ b/metadata/md5-cache/net-vpn/i2pd-2.32.1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=acct-user/i2pd acct-group/i2pd !static? ( dev-libs/boost:=[threads] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( net-libs/miniupnpc ) )
 SLOT=0
 SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.32.1.tar.gz -> i2pd-2.32.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a422ced39da215d486a9e532cbbd5137
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.33.0 b/metadata/md5-cache/net-vpn/i2pd-2.33.0
index b24fce39772e..bd55846c30b8 100644
--- a/metadata/md5-cache/net-vpn/i2pd-2.33.0
+++ b/metadata/md5-cache/net-vpn/i2pd-2.33.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=acct-user/i2pd acct-group/i2pd !static? ( dev-libs/boost:=[threads] !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) upnp? ( net-libs/miniupnpc:= ) )
 SLOT=0
 SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.33.0.tar.gz -> i2pd-2.33.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b32fbd0eff5b30690300ae3200f11299
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 306e35950de4..5ec50f9a77ae 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/gnuradio-3.8.1.0-r1 b/metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r1
index 1660e15baa56..672744107961 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r1
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0/3.8.1.0
 SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.8.1.0/gnuradio-3.8.1.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb08a973f2e4bce4443b7817bdf2b285
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r2 b/metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r2
index 0a1de593e101..4945b05028c5 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r2
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.8.1.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0/3.8.1.0
 SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.8.1.0/gnuradio-3.8.1.0.tar.xz https://dev.gentoo.org/~fordfrog/distfiles/0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07b5fb4bd1f7a46da3414e9fb08de073
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.8.2.0 b/metadata/md5-cache/net-wireless/gnuradio-3.8.2.0
index 4bd3b311767a..dcbfde42470e 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.8.2.0
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.8.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0/3.8.2.0
 SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.8.2.0/gnuradio-3.8.2.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82fd611e420f9e99524d5491a0286948
diff --git a/metadata/md5-cache/net-wireless/gnuradio-9999 b/metadata/md5-cache/net-wireless/gnuradio-9999
index dd22957bdc9f..d53a7118bd85 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) audio? ( || ( alsa oss jack portaudio ) ) alsa? ( audio ) jack? ( audio ) oss? ( audio ) portaudio? ( audio ) analog? ( filter ) channels? ( filter analog qt5 ) digital? ( filter analog ) dtv? ( filter analog fec ) modtool? ( utils ) qt5? ( filter ) trellis? ( analog digital ) uhd? ( filter analog ) vocoder? ( filter analog ) wavelet? ( analog )
 RESTRICT=test
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e0f29bce1c0f4c952d34057902dde2bb
diff --git a/metadata/md5-cache/net-wireless/gqrx-2.12.1-r1 b/metadata/md5-cache/net-wireless/gqrx-2.12.1-r1
index 29db438d4fcf..d809f3813f6f 100644
--- a/metadata/md5-cache/net-wireless/gqrx-2.12.1-r1
+++ b/metadata/md5-cache/net-wireless/gqrx-2.12.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-
 REQUIRED_USE=^^ ( pulseaudio portaudio gr-audio )
 SLOT=0
 SRC_URI=https://github.com/csete/gqrx/archive/v2.12.1.tar.gz -> gqrx-2.12.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f869ec143779f0a0d7cce1a0f5045e05
diff --git a/metadata/md5-cache/net-wireless/gqrx-9999 b/metadata/md5-cache/net-wireless/gqrx-9999
index bd119e4e1e91..1cc4083bfa44 100644
--- a/metadata/md5-cache/net-wireless/gqrx-9999
+++ b/metadata/md5-cache/net-wireless/gqrx-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter] >=net-wireless/gr-osmosdr-0.1.0:= dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 sci-libs/volk pulseaudio? ( media-sound/pulseaudio:= ) portaudio? ( media-libs/portaudio:= )
 REQUIRED_USE=^^ ( pulseaudio portaudio gr-audio )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f869ec143779f0a0d7cce1a0f5045e05
diff --git a/metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r1 b/metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r1
index 32c70e3899b1..ecdbb0a00407 100644
--- a/metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r1
+++ b/metadata/md5-cache/net-wireless/gr-iio-0.3_p20191219-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/analogdevicesinc/gr-iio/archive/733c8a05e74b7d10fbaef502cc82d025ae35a1fb.tar.gz -> gr-iio-0.3_p20191219.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53422a7754bf981a8136f0e33aba472b
diff --git a/metadata/md5-cache/net-wireless/gr-iio-9999 b/metadata/md5-cache/net-wireless/gr-iio-9999
index 228bbe21d492..fd40386e2028 100644
--- a/metadata/md5-cache/net-wireless/gr-iio-9999
+++ b/metadata/md5-cache/net-wireless/gr-iio-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) =net-wireless/gnuradio-3.8*:= dev-libs/boost:= net-libs/libiio:= dev-libs/gmp sci-libs/volk net-libs/libad9361-iio:=
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53422a7754bf981a8136f0e33aba472b
diff --git a/metadata/md5-cache/net-wireless/gr-iqbal-0.38.1 b/metadata/md5-cache/net-wireless/gr-iqbal-0.38.1
index 8da1cd85cc56..df28aca3fbae 100644
--- a/metadata/md5-cache/net-wireless/gr-iqbal-0.38.1
+++ b/metadata/md5-cache/net-wireless/gr-iqbal-0.38.1
@@ -11,5 +11,5 @@ RDEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0/0.38.1
 SRC_URI=https://github.com/osmocom/gr-iqbal/archive/v0.38.1.tar.gz -> gr-iqbal-0.38.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f81b3b77ce5e7becab6c3b220ec11fb
diff --git a/metadata/md5-cache/net-wireless/gr-iqbal-9999 b/metadata/md5-cache/net-wireless/gr-iqbal-9999
index 907cf04da4f7..1f8f7c268024 100644
--- a/metadata/md5-cache/net-wireless/gr-iqbal-9999
+++ b/metadata/md5-cache/net-wireless/gr-iqbal-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND==net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f81b3b77ce5e7becab6c3b220ec11fb
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.2.2 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.2.2
index ebe9ed1e7e44..eb20a577742b 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-0.2.2
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-0.2.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0/0.2.2
 SRC_URI=https://github.com/osmocom/gr-osmosdr/archive/v0.2.2.tar.gz -> gr-osmosdr-0.2.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=637b3fb57e0b5732fddfbedcf8095de9
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-9999 b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
index e53b17252154..962119a89282 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-9999
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:= =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] sci-libs/volk airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8c9b049c0928907f1bc802586096382
diff --git a/metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807 b/metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807
index 9d10717194ef..27510676dfdd 100644
--- a/metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807
+++ b/metadata/md5-cache/net-wireless/gr-rds-0.0_p20200807
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0/0.0_p20200807
 SRC_URI=https://github.com/bastibl/gr-rds/archive/ffbe3ea302c32a621f14329b7fcc09e868305e78.tar.gz -> gr-rds-0.0_p20200807.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e7e19bf9d02a7a0f98ab04cabc395f3
diff --git a/metadata/md5-cache/net-wireless/gr-rds-9999 b/metadata/md5-cache/net-wireless/gr-rds-9999
index a2f223e52ca1..55765916096f 100644
--- a/metadata/md5-cache/net-wireless/gr-rds-9999
+++ b/metadata/md5-cache/net-wireless/gr-rds-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-libs/boost:=[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/boost:=[python_targets_python3_8(-)] ) =net-wireless/gnuradio-3.8*:0=[python_single_target_python3_7(-)?,python_single_target_python3_8(-)?]
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e7e19bf9d02a7a0f98ab04cabc395f3
diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r2 b/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r2
index 910c5fbc602b..de87c37bce77 100644
--- a/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r2
+++ b/metadata/md5-cache/net-wireless/hackrf-tools-2018.01.1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=~net-libs/libhackrf-2018.01.1:= sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=https://github.com/mossmann/hackrf/releases/download/v2018.01.1/hackrf-2018.01.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57d20054592f7ec136ab8b2d4d753905
diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-9999 b/metadata/md5-cache/net-wireless/hackrf-tools-9999
index ec3dc9716020..b4537b6953e7 100644
--- a/metadata/md5-cache/net-wireless/hackrf-tools-9999
+++ b/metadata/md5-cache/net-wireless/hackrf-tools-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=~net-libs/libhackrf-9999:= sci-libs/fftw:3.0=
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95eb8e02f4725ae5b4fd60d4fcf96c14
diff --git a/metadata/md5-cache/net-wireless/hidclient-20120728 b/metadata/md5-cache/net-wireless/hidclient-20120728
index a84011d7fa28..dca2f6eb0def 100644
--- a/metadata/md5-cache/net-wireless/hidclient-20120728
+++ b/metadata/md5-cache/net-wireless/hidclient-20120728
@@ -1,12 +1,11 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=net-wireless/bluez
 DESCRIPTION=Use your machine as a bluetooh keyboard/mouse
-EAPI=4
+EAPI=7
 HOMEPAGE=http://anselm.hoffmeister.be/computer/hidclient/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=net-wireless/bluez x11-apps/xinput
 SLOT=0
 SRC_URI=http://anselm.hoffmeister.be/computer/hidclient/hidclient-20120728.tar.bz2
-_eclasses_=epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800
-_md5_=2eed64ed707e225d0cec147cdfb84f88
+_md5_=c01525bb080554c3b122c1a48c3636fb
diff --git a/metadata/md5-cache/net-wireless/horst-5.1 b/metadata/md5-cache/net-wireless/horst-5.1
index a040b3912031..9baf1573373f 100644
--- a/metadata/md5-cache/net-wireless/horst-5.1
+++ b/metadata/md5-cache/net-wireless/horst-5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/ncurses:0 pcap? ( net-libs/libpcap ) test? ( sys-devel/sparse ) virtual/pkgconfig
+DEPEND=dev-libs/libnl:3 sys-libs/ncurses:0 pcap? ( net-libs/libpcap ) test? ( sys-devel/sparse ) virtual/pkgconfig
 DESCRIPTION=Small 802.11 wireless LAN analyzer
 EAPI=6
-HOMEPAGE=http://br1.einfach.org/tech/horst/
+HOMEPAGE=https://github.com/br101/horst/
 IUSE=debug +pcap test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0 pcap? ( net-libs/libpcap )
+RDEPEND=dev-libs/libnl:3 sys-libs/ncurses:0 pcap? ( net-libs/libpcap )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/br101/horst/archive/v5.1.tar.gz -> horst-5.1.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=b43c6b2cd9c7eaa0f7dddb1f45bf971e
+_md5_=e99a24a71c2d9af65c62000cab701f3f
diff --git a/metadata/md5-cache/net-wireless/horst-9999 b/metadata/md5-cache/net-wireless/horst-9999
index a885ef5882e0..a774a613f2db 100644
--- a/metadata/md5-cache/net-wireless/horst-9999
+++ b/metadata/md5-cache/net-wireless/horst-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install unpack
-DEPEND=sys-libs/ncurses:0 pcap? ( net-libs/libpcap ) test? ( sys-devel/sparse ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/libnl:3 sys-libs/ncurses:0 pcap? ( net-libs/libpcap ) test? ( sys-devel/sparse ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Small 802.11 wireless LAN analyzer
 EAPI=6
-HOMEPAGE=http://br1.einfach.org/tech/horst/
+HOMEPAGE=https://github.com/br101/horst/
 IUSE=debug +pcap test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=sys-libs/ncurses:0 pcap? ( net-libs/libpcap )
+RDEPEND=dev-libs/libnl:3 sys-libs/ncurses:0 pcap? ( net-libs/libpcap )
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c4145e33eb6e3c2fea18b82cf76db037
+_md5_=c96f253bfd3efb8bb2bd6581b0f5b206
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.9-r1 b/metadata/md5-cache/net-wireless/hostapd-2.9-r1
index 3e77b32e5a66..3d7a1c1770f8 100644
--- a/metadata/md5-cache/net-wireless/hostapd-2.9-r1
+++ b/metadata/md5-cache/net-wireless/hostapd-2.9-r1
@@ -10,4 +10,4 @@ RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.7-r2_extras.tar.xz https://w1.fi/releases/hostapd-2.9.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a39fde897945ac9c0aa6bc97030da0ed
+_md5_=550c3970093e6409f36955dcb82c47cf
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.9-r2 b/metadata/md5-cache/net-wireless/hostapd-2.9-r2
deleted file mode 100644
index 24d69676fe4e..000000000000
--- a/metadata/md5-cache/net-wireless/hostapd-2.9-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend unpack
-DEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 ) virtual/pkgconfig
-DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon
-EAPI=6
-HOMEPAGE=http://w1.fi
-IUSE=internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda savedconfig
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~x86
-LICENSE=BSD
-RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
-REQUIRED_USE=?? ( libressl suiteb )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.7-r2_extras.tar.xz https://w1.fi/releases/hostapd-2.9.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5a2056977f1b651a20118ce3564e5533
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.9-r3 b/metadata/md5-cache/net-wireless/hostapd-2.9-r3
new file mode 100644
index 000000000000..936a814902bd
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/hostapd-2.9-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend unpack
+DEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 ) virtual/pkgconfig
+DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon
+EAPI=6
+HOMEPAGE=http://w1.fi
+IUSE=internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda savedconfig
+KEYWORDS=~amd64 ~arm arm64 ~mips ppc ~x86
+LICENSE=BSD
+RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
+REQUIRED_USE=?? ( libressl suiteb )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.7-r2_extras.tar.xz https://w1.fi/releases/hostapd-2.9.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4213fa9530347f2a07ec68792d4dad26
diff --git a/metadata/md5-cache/net-wireless/inspectrum-0.2.2 b/metadata/md5-cache/net-wireless/inspectrum-0.2.2
index 72891df08e7d..1cbd68720725 100644
--- a/metadata/md5-cache/net-wireless/inspectrum-0.2.2
+++ b/metadata/md5-cache/net-wireless/inspectrum-0.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/liquid-dsp sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=https://github.com/miek/inspectrum/archive/v0.2.2.tar.gz -> inspectrum-0.2.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5fa5b216365ebefc2b89bcf538179e1a
diff --git a/metadata/md5-cache/net-wireless/inspectrum-9999 b/metadata/md5-cache/net-wireless/inspectrum-9999
index 5572c881ee16..ae73617ea684 100644
--- a/metadata/md5-cache/net-wireless/inspectrum-9999
+++ b/metadata/md5-cache/net-wireless/inspectrum-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 net-libs/liquid-dsp sci-libs/fftw:3.0=
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57e78c237a025feac569d8b5d4eabb03
diff --git a/metadata/md5-cache/net-wireless/kismet-2020.09.3 b/metadata/md5-cache/net-wireless/kismet-2020.09.3
deleted file mode 100644
index e1631851646e..000000000000
--- a/metadata/md5-cache/net-wireless/kismet-2020.09.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) acct-user/kismet acct-group/kismet 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 ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_6? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/protobuf-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) virtual/pkgconfig
-DESCRIPTION=IEEE 802.11 wireless LAN sniffer
-EAPI=7
-HOMEPAGE=https://www.kismetwireless.net
-IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2
-PDEPEND=rtlsdr? ( python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) net-wireless/rtl-sdr )
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) acct-user/kismet acct-group/kismet 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 ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_6? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/protobuf-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) python_single_target_python3_6? ( dev-python/pyserial[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) selinux? ( sec-policy/selinux-kismet )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0/2020.09.3
-SRC_URI=https://www.kismetwireless.net/code/kismet-2020-09-R3.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3597d5f858804a852b87eb6c2b31ef66
diff --git a/metadata/md5-cache/net-wireless/kismet-2020.09.4 b/metadata/md5-cache/net-wireless/kismet-2020.09.4
new file mode 100644
index 000000000000..e36c73d5eb32
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/kismet-2020.09.4
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) acct-user/kismet acct-group/kismet 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 ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_6? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/protobuf-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) virtual/pkgconfig
+DESCRIPTION=IEEE 802.11 wireless LAN sniffer
+EAPI=7
+HOMEPAGE=https://www.kismetwireless.net
+IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+PDEPEND=rtlsdr? ( python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) net-wireless/rtl-sdr )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) acct-user/kismet acct-group/kismet 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 ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_6? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/protobuf-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/protobuf-python[python_targets_python3_8(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) python_single_target_python3_6? ( dev-python/pyserial[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) selinux? ( sec-policy/selinux-kismet )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0/2020.09.4
+SRC_URI=https://www.kismetwireless.net/code/kismet-2020-09-R4.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3597d5f858804a852b87eb6c2b31ef66
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802 b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802
index 360523472f36..8f65627f9ec2 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/osmocom/rtl-sdr/archive/ed0317e6a58c098874ac58b769cf2e609c18d9a5.tar.gz -> rtl-sdr-0.6.0_p2020802.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8184bb4e6c14675434589d481904f9d2
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-9999 b/metadata/md5-cache/net-wireless/rtl-sdr-9999
index 1d96ddbb338a..b41c115210aa 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-9999
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=virtual/libusb:1
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8184bb4e6c14675434589d481904f9d2
diff --git a/metadata/md5-cache/net-wireless/sigutils-0.1.0 b/metadata/md5-cache/net-wireless/sigutils-0.1.0
index 9332321a393f..658e2da9c632 100644
--- a/metadata/md5-cache/net-wireless/sigutils-0.1.0
+++ b/metadata/md5-cache/net-wireless/sigutils-0.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsndfile sci-libs/fftw:3.0= sci-libs/volk:=
 SLOT=0
 SRC_URI=https://github.com/BatchDrake/sigutils/archive/v0.1.0.tar.gz -> sigutils-0.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=511f71469ab893ce0cd214066fed9af6
diff --git a/metadata/md5-cache/net-wireless/soapyremote-0.5.0 b/metadata/md5-cache/net-wireless/soapyremote-0.5.0
index 1a477b091c54..02d01ca5a4f2 100644
--- a/metadata/md5-cache/net-wireless/soapyremote-0.5.0
+++ b/metadata/md5-cache/net-wireless/soapyremote-0.5.0
@@ -9,4 +9,4 @@ RDEPEND=net-wireless/soapysdr net-dns/avahi
 SLOT=0
 SRC_URI=https://github.com/pothosware/SoapyRemote/archive/soapy-remote-0.5.0.tar.gz -> soapyremote-0.5.0.tar.gz
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90a0b02076a775668f64cebfc1dab2a2
+_md5_=67e7ccd33b909a57a115e30e0382c0f7
diff --git a/metadata/md5-cache/net-wireless/soapyremote-9999 b/metadata/md5-cache/net-wireless/soapyremote-9999
index c93aaaa27dfc..8b6422dde3ad 100644
--- a/metadata/md5-cache/net-wireless/soapyremote-9999
+++ b/metadata/md5-cache/net-wireless/soapyremote-9999
@@ -8,4 +8,4 @@ PROPERTIES=live
 RDEPEND=net-wireless/soapysdr net-dns/avahi
 SLOT=0
 _eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90a0b02076a775668f64cebfc1dab2a2
+_md5_=67e7ccd33b909a57a115e30e0382c0f7
diff --git a/metadata/md5-cache/net-wireless/soapyuhd-0.4.1 b/metadata/md5-cache/net-wireless/soapyuhd-0.4.1
index a737be1623dc..7b8f501abb99 100644
--- a/metadata/md5-cache/net-wireless/soapyuhd-0.4.1
+++ b/metadata/md5-cache/net-wireless/soapyuhd-0.4.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=net-wireless/soapysdr:= net-wireless/uhd:= dev-libs/boost:=
 SLOT=0
 SRC_URI=https://github.com/pothosware/SoapyUHD/archive/soapy-uhd-0.4.1.tar.gz -> soapyuhd-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dafc9c9a4eae144f6c70525f7d35d415
diff --git a/metadata/md5-cache/net-wireless/soapyuhd-9999 b/metadata/md5-cache/net-wireless/soapyuhd-9999
index bb32b8778658..88463e6c3e19 100644
--- a/metadata/md5-cache/net-wireless/soapyuhd-9999
+++ b/metadata/md5-cache/net-wireless/soapyuhd-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=net-wireless/soapysdr:= net-wireless/uhd:= dev-libs/boost:=
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dafc9c9a4eae144f6c70525f7d35d415
diff --git a/metadata/md5-cache/net-wireless/srslte-19.09-r2 b/metadata/md5-cache/net-wireless/srslte-19.09-r2
index aea7dd185595..ec86a550c0d6 100644
--- a/metadata/md5-cache/net-wireless/srslte-19.09-r2
+++ b/metadata/md5-cache/net-wireless/srslte-19.09-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost dev-libs/libconfig net-misc/lksctp-tools net-libs/mbedtls:= sci-libs/fftw:3.0= bladerf? ( net-wireless/bladerf:= ) simcard? ( sys-apps/pcsc-lite ) soapysdr? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:= ) zeromq? ( net-libs/zeromq )
 SLOT=0
 SRC_URI=https://github.com/srsLTE/srsLTE/archive/release_19_09.tar.gz -> srslte-19.09.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98a4e15eaa7c1a97b7de917f098e50ed
diff --git a/metadata/md5-cache/net-wireless/srslte-20.04.2 b/metadata/md5-cache/net-wireless/srslte-20.04.2
index c5eb0d8e4703..071b7d6036c6 100644
--- a/metadata/md5-cache/net-wireless/srslte-20.04.2
+++ b/metadata/md5-cache/net-wireless/srslte-20.04.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost dev-libs/libconfig net-misc/lksctp-tools net-libs/mbedtls
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/srsLTE/srsLTE/archive/release_20_04_2.tar.gz -> srslte-20.04.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe85a17a7686c02ad60937ec349fa740
diff --git a/metadata/md5-cache/net-wireless/srslte-9999 b/metadata/md5-cache/net-wireless/srslte-9999
index 23e42e842242..6af1face1ad5 100644
--- a/metadata/md5-cache/net-wireless/srslte-9999
+++ b/metadata/md5-cache/net-wireless/srslte-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/boost dev-libs/libconfig net-misc/lksctp-tools net-libs/mbedtls:= sci-libs/fftw:3.0= bladerf? ( net-wireless/bladerf:= ) simcard? ( sys-apps/pcsc-lite ) soapysdr? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:= ) zeromq? ( net-libs/zeromq )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98a4e15eaa7c1a97b7de917f098e50ed
diff --git a/metadata/md5-cache/net-wireless/suscan-0.1.0 b/metadata/md5-cache/net-wireless/suscan-0.1.0
index 61859f317c77..f98913c86099 100644
--- a/metadata/md5-cache/net-wireless/suscan-0.1.0
+++ b/metadata/md5-cache/net-wireless/suscan-0.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsndfile dev-libs/libxml2 net-wireless/sigutils net-wireless/soapysdr:= sci-libs/fftw:3.0= sci-libs/volk:=
 SLOT=0
 SRC_URI=https://github.com/BatchDrake/suscan/archive/v0.1.0.tar.gz -> suscan-0.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f5e9e6d4ee1a0ccab963a2511c80801
diff --git a/metadata/md5-cache/net-wireless/ubertooth-2018.12.1 b/metadata/md5-cache/net-wireless/ubertooth-2018.12.1
index 37754f3d1674..6dfb6b673513 100644
--- a/metadata/md5-cache/net-wireless/ubertooth-2018.12.1
+++ b/metadata/md5-cache/net-wireless/ubertooth-2018.12.1
@@ -10,5 +10,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	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3068462e1567914cfc3e0eca0e88f5d9
diff --git a/metadata/md5-cache/net-wireless/ubertooth-9999 b/metadata/md5-cache/net-wireless/ubertooth-9999
index 0cfab4beb32e..8c37ade7dea4 100644
--- a/metadata/md5-cache/net-wireless/ubertooth-9999
+++ b/metadata/md5-cache/net-wireless/ubertooth-9999
@@ -9,5 +9,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	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b9e4f1957df8432243ad25efa9bb45fc
diff --git a/metadata/md5-cache/net-wireless/unifi-5.13.29 b/metadata/md5-cache/net-wireless/unifi-5.13.29
deleted file mode 100644
index ca86c0d49102..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.13.29
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-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=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.13
-SRC_URI=https://dl.ui.com/unifi/5.13.29-1fc0cd615f/UniFi.unix.zip -> unifi-5.13.29.zip
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e5227a8aa73f0318d35f88909b6c25c7
diff --git a/metadata/md5-cache/net-wireless/unifi-5.13.32 b/metadata/md5-cache/net-wireless/unifi-5.13.32
deleted file mode 100644
index c3ea89f37e0a..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.13.32
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-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=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.13
-SRC_URI=https://dl.ui.com/unifi/5.13.32-3e11950f9b/UniFi.unix.zip -> unifi-5.13.32.zip
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=37227a35cf972bdf57fe6088b0663854
diff --git a/metadata/md5-cache/net-wireless/unifi-5.14.22 b/metadata/md5-cache/net-wireless/unifi-5.14.22
deleted file mode 100644
index 55056b4937cb..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.14.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-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=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.14
-SRC_URI=https://dl.ui.com/unifi/5.14.22-9bf8d2f44f/UniFi.unix.zip -> unifi-5.14.22.zip
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a95ae49ddfeccf5cd8f323afc85e3645
diff --git a/metadata/md5-cache/net-wireless/unifi-5.14.23 b/metadata/md5-cache/net-wireless/unifi-5.14.23
deleted file mode 100644
index 5dc3c1828cf7..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-5.14.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-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=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/5.14
-SRC_URI=https://dl.ui.com/unifi/5.14.23-70ddb4015a/UniFi.unix.zip -> unifi-5.14.23.zip
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2eeb58ee9f981596617ec2a5dadb6561
diff --git a/metadata/md5-cache/net-wireless/unifi-6.0.20 b/metadata/md5-cache/net-wireless/unifi-6.0.20
deleted file mode 100644
index 34114ad5f70e..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-6.0.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-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=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/6.0
-SRC_URI=https://dl.ui.com/unifi/6.0.20-816b9dfcdd/UniFi.unix.zip -> unifi-6.0.20.zip
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2b43efd9ee774b526847d5ce93f961c5
diff --git a/metadata/md5-cache/net-wireless/unifi-6.0.22 b/metadata/md5-cache/net-wireless/unifi-6.0.22
deleted file mode 100644
index 45308af53cb0..000000000000
--- a/metadata/md5-cache/net-wireless/unifi-6.0.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-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=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
-RESTRICT=bindist mirror
-SLOT=0/6.0
-SRC_URI=https://dl.ui.com/unifi/6.0.22-5cc1d1cd11/UniFi.unix.zip -> unifi-6.0.22.zip
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4533ad4d386e37377c78373c706c8f19
diff --git a/metadata/md5-cache/net-wireless/unifi-6.0.23 b/metadata/md5-cache/net-wireless/unifi-6.0.23
index ca978a8e6645..8fe326b6b543 100644
--- a/metadata/md5-cache/net-wireless/unifi-6.0.23
+++ b/metadata/md5-cache/net-wireless/unifi-6.0.23
@@ -4,11 +4,11 @@ DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
 EAPI=6
 HOMEPAGE=https://www.ubnt.com
 IUSE=systemd
-KEYWORDS=~amd64
+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=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
 RESTRICT=bindist mirror
 SLOT=0/6.0
 SRC_URI=https://dl.ui.com/unifi/6.0.23-20b313f50d/UniFi.unix.zip -> unifi-6.0.23.zip
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9043df8796a726874f21eb9284813ad3
+_md5_=ba5f8848f85bcaddddd3655ab9ce73d2
diff --git a/metadata/md5-cache/net-wireless/unifi-6.0.24 b/metadata/md5-cache/net-wireless/unifi-6.0.24
new file mode 100644
index 000000000000..ca7597053a7e
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-6.0.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+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=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/6.0
+SRC_URI=https://dl.ui.com/unifi/6.0.24-b200bf6446/UniFi.unix.zip -> unifi-6.0.24.zip
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=84833ebe4151eda3c6645a959bc06e23
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index a5dd3434da6e..8a0200f8dca9 100644
--- a/metadata/md5-cache/ros-meta/Manifest.gz
+++ b/metadata/md5-cache/ros-meta/Manifest.gz
diff --git a/metadata/md5-cache/ros-meta/ament_cmake-0.9.6 b/metadata/md5-cache/ros-meta/ament_cmake-0.9.6
index 9eed40451799..1d90e41b7290 100644
--- a/metadata/md5-cache/ros-meta/ament_cmake-0.9.6
+++ b/metadata/md5-cache/ros-meta/ament_cmake-0.9.6
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_definitions dev-ros/
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/0.9.6.tar.gz -> ament_cmake-0.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2428c1bcd4817eb31edda89490decc6
diff --git a/metadata/md5-cache/ros-meta/ament_cmake-1.0.0 b/metadata/md5-cache/ros-meta/ament_cmake-1.0.0
index 91addc6dda32..f4236c82e16d 100644
--- a/metadata/md5-cache/ros-meta/ament_cmake-1.0.0
+++ b/metadata/md5-cache/ros-meta/ament_cmake-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_definitions dev-ros/
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.0.tar.gz -> ament_cmake-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2428c1bcd4817eb31edda89490decc6
diff --git a/metadata/md5-cache/ros-meta/ament_cmake-1.0.1 b/metadata/md5-cache/ros-meta/ament_cmake-1.0.1
new file mode 100644
index 000000000000..bff86d112061
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/ament_cmake-1.0.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_definitions dev-ros/ament_cmake_export_dependencies dev-ros/ament_cmake_export_include_directories dev-ros/ament_cmake_export_interfaces dev-ros/ament_cmake_export_libraries dev-ros/ament_cmake_export_link_flags dev-ros/ament_cmake_export_targets dev-ros/ament_cmake_libraries dev-ros/ament_cmake_python dev-ros/ament_cmake_target_dependencies dev-ros/ament_cmake_test[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_version python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/ament_package[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_definitions dev-ros/ament_cmake_export_dependencies dev-ros/ament_cmake_export_include_directories dev-ros/ament_cmake_export_interfaces dev-ros/ament_cmake_export_libraries dev-ros/ament_cmake_export_link_flags dev-ros/ament_cmake_export_targets dev-ros/ament_cmake_libraries dev-ros/ament_cmake_python dev-ros/ament_cmake_target_dependencies dev-ros/ament_cmake_test[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_version python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/ament_package[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=The entry point package for the ament buildsystem
+EAPI=7
+HOMEPAGE=https://github.com/ament/ament_cmake
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_definitions dev-ros/ament_cmake_export_dependencies dev-ros/ament_cmake_export_include_directories dev-ros/ament_cmake_export_interfaces dev-ros/ament_cmake_export_libraries dev-ros/ament_cmake_export_link_flags dev-ros/ament_cmake_export_targets dev-ros/ament_cmake_libraries dev-ros/ament_cmake_python dev-ros/ament_cmake_target_dependencies dev-ros/ament_cmake_test[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_version python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/ament_package[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/ament/ament_cmake/archive/1.0.1.tar.gz -> ament_cmake-1.0.1.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b2428c1bcd4817eb31edda89490decc6
diff --git a/metadata/md5-cache/ros-meta/ament_cmake-9999 b/metadata/md5-cache/ros-meta/ament_cmake-9999
index 4d28f95f458d..e45631b28981 100644
--- a/metadata/md5-cache/ros-meta/ament_cmake-9999
+++ b/metadata/md5-cache/ros-meta/ament_cmake-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-ros/ament_cmake_core dev-ros/ament_cmake_export_definitions dev-ros/ament_cmake_export_dependencies dev-ros/ament_cmake_export_include_directories dev-ros/ament_cmake_export_interfaces dev-ros/ament_cmake_export_libraries dev-ros/ament_cmake_export_link_flags dev-ros/ament_cmake_export_targets dev-ros/ament_cmake_libraries dev-ros/ament_cmake_python dev-ros/ament_cmake_target_dependencies dev-ros/ament_cmake_test[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-ros/ament_cmake_version python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/ament_package[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2428c1bcd4817eb31edda89490decc6
diff --git a/metadata/md5-cache/ros-meta/audio_common-0.3.6 b/metadata/md5-cache/ros-meta/audio_common-0.3.6
index fa3dc0371b06..884b559185b2 100644
--- a/metadata/md5-cache/ros-meta/audio_common-0.3.6
+++ b/metadata/md5-cache/ros-meta/audio_common-0.3.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.6.tar.gz -> audio_common-0.3.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0a4e22a7b24a8871e8492c4cf5f3888
diff --git a/metadata/md5-cache/ros-meta/audio_common-0.3.7 b/metadata/md5-cache/ros-meta/audio_common-0.3.7
index a79c819b8b04..edd8baa9a085 100644
--- a/metadata/md5-cache/ros-meta/audio_common-0.3.7
+++ b/metadata/md5-cache/ros-meta/audio_common-0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.7.tar.gz -> audio_common-0.3.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0a4e22a7b24a8871e8492c4cf5f3888
diff --git a/metadata/md5-cache/ros-meta/audio_common-9999 b/metadata/md5-cache/ros-meta/audio_common-9999
index 63642c4c89b8..82229ee7fb4c 100644
--- a/metadata/md5-cache/ros-meta/audio_common-9999
+++ b/metadata/md5-cache/ros-meta/audio_common-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0a4e22a7b24a8871e8492c4cf5f3888
diff --git a/metadata/md5-cache/ros-meta/bond_core-1.8.5 b/metadata/md5-cache/ros-meta/bond_core-1.8.5
index 115a3bfcf2c6..50b172525ff0 100644
--- a/metadata/md5-cache/ros-meta/bond_core-1.8.5
+++ b/metadata/md5-cache/ros-meta/bond_core-1.8.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.5.tar.gz -> bond_core-1.8.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39861f9b42e17be377440fafa2278ee4
diff --git a/metadata/md5-cache/ros-meta/bond_core-1.8.6 b/metadata/md5-cache/ros-meta/bond_core-1.8.6
index b51b07b86675..287a83e1321f 100644
--- a/metadata/md5-cache/ros-meta/bond_core-1.8.6
+++ b/metadata/md5-cache/ros-meta/bond_core-1.8.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.6.tar.gz -> bond_core-1.8.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39861f9b42e17be377440fafa2278ee4
diff --git a/metadata/md5-cache/ros-meta/bond_core-9999 b/metadata/md5-cache/ros-meta/bond_core-9999
index 9b462c1c56b3..c4d63c74e945 100644
--- a/metadata/md5-cache/ros-meta/bond_core-9999
+++ b/metadata/md5-cache/ros-meta/bond_core-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/bond dev-ros/bondcpp dev-ros/bondpy dev-ros/smclib dev-ros/test_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39861f9b42e17be377440fafa2278ee4
diff --git a/metadata/md5-cache/ros-meta/calibration-0.10.14 b/metadata/md5-cache/ros-meta/calibration-0.10.14
index d4dd51e4fe0d..8b4774d3eba0 100644
--- a/metadata/md5-cache/ros-meta/calibration-0.10.14
+++ b/metadata/md5-cache/ros-meta/calibration-0.10.14
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad797ad7da30269aec6f0542df12e634
diff --git a/metadata/md5-cache/ros-meta/calibration-9999 b/metadata/md5-cache/ros-meta/calibration-9999
index bb84a4b9205e..7d0105051c32 100644
--- a/metadata/md5-cache/ros-meta/calibration-9999
+++ b/metadata/md5-cache/ros-meta/calibration-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/calibration_estimation dev-ros/calibration_launch dev-ros/calibr
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad797ad7da30269aec6f0542df12e634
diff --git a/metadata/md5-cache/ros-meta/common_msgs-1.13.0 b/metadata/md5-cache/ros-meta/common_msgs-1.13.0
index edd09e4bd156..b2b80d50fd2e 100644
--- a/metadata/md5-cache/ros-meta/common_msgs-1.13.0
+++ b/metadata/md5-cache/ros-meta/common_msgs-1.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=acfa45cb68f0ca3beb516fe69a178b84
diff --git a/metadata/md5-cache/ros-meta/common_msgs-9999 b/metadata/md5-cache/ros-meta/common_msgs-9999
index 41ec57f2cf2a..4d55a66f3fee 100644
--- a/metadata/md5-cache/ros-meta/common_msgs-9999
+++ b/metadata/md5-cache/ros-meta/common_msgs-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/actionlib_msgs dev-ros/diagnostic_msgs dev-ros/geometry_msgs dev
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=acfa45cb68f0ca3beb516fe69a178b84
diff --git a/metadata/md5-cache/ros-meta/common_tutorials-0.1.12 b/metadata/md5-cache/ros-meta/common_tutorials-0.1.12
index 03877b36bb3d..5299e3bbb5a5 100644
--- a/metadata/md5-cache/ros-meta/common_tutorials-0.1.12
+++ b/metadata/md5-cache/ros-meta/common_tutorials-0.1.12
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4b37d2ee2106a601e3f543ea3ca94c9
diff --git a/metadata/md5-cache/ros-meta/common_tutorials-0.2.0 b/metadata/md5-cache/ros-meta/common_tutorials-0.2.0
index 85760eeafaf3..bbb5958cd584 100644
--- a/metadata/md5-cache/ros-meta/common_tutorials-0.2.0
+++ b/metadata/md5-cache/ros-meta/common_tutorials-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.2.0.tar.gz -> common_tutorials-0.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4b37d2ee2106a601e3f543ea3ca94c9
diff --git a/metadata/md5-cache/ros-meta/common_tutorials-9999 b/metadata/md5-cache/ros-meta/common_tutorials-9999
index 7acab803084a..0e0dfbfc1258 100644
--- a/metadata/md5-cache/ros-meta/common_tutorials-9999
+++ b/metadata/md5-cache/ros-meta/common_tutorials-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/plugin
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4b37d2ee2106a601e3f543ea3ca94c9
diff --git a/metadata/md5-cache/ros-meta/desktop-1.5.0 b/metadata/md5-cache/ros-meta/desktop-1.5.0
index d6786e5fc182..6614ed4e7a28 100644
--- a/metadata/md5-cache/ros-meta/desktop-1.5.0
+++ b/metadata/md5-cache/ros-meta/desktop-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f44394099d050492216fe7cfa23e817e
diff --git a/metadata/md5-cache/ros-meta/desktop-9999 b/metadata/md5-cache/ros-meta/desktop-9999
index 5ee8d5777101..298a85bef2bc 100644
--- a/metadata/md5-cache/ros-meta/desktop-9999
+++ b/metadata/md5-cache/ros-meta/desktop-9999
@@ -11,5 +11,5 @@ RDEPEND=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f44394099d050492216fe7cfa23e817e
diff --git a/metadata/md5-cache/ros-meta/desktop_full-1.5.0 b/metadata/md5-cache/ros-meta/desktop_full-1.5.0
index a4c7e21c704d..691e37896f78 100644
--- a/metadata/md5-cache/ros-meta/desktop_full-1.5.0
+++ b/metadata/md5-cache/ros-meta/desktop_full-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e0180973a3a0dd51f9a64ebbfad80fb
diff --git a/metadata/md5-cache/ros-meta/desktop_full-9999 b/metadata/md5-cache/ros-meta/desktop_full-9999
index 814264c2752d..2faf76ca1f12 100644
--- a/metadata/md5-cache/ros-meta/desktop_full-9999
+++ b/metadata/md5-cache/ros-meta/desktop_full-9999
@@ -11,5 +11,5 @@ RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tu
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e0180973a3a0dd51f9a64ebbfad80fb
diff --git a/metadata/md5-cache/ros-meta/diagnostics-1.10.1 b/metadata/md5-cache/ros-meta/diagnostics-1.10.1
index 486f96651771..4abc8dd09b02 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-1.10.1
+++ b/metadata/md5-cache/ros-meta/diagnostics-1.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.10.1.tar.gz -> diagnostics-1.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efc014029764662f42e65438b6cff928
diff --git a/metadata/md5-cache/ros-meta/diagnostics-1.9.4 b/metadata/md5-cache/ros-meta/diagnostics-1.9.4
index eb951bd8fa2f..fef34d0b6ee6 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-1.9.4
+++ b/metadata/md5-cache/ros-meta/diagnostics-1.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efc014029764662f42e65438b6cff928
diff --git a/metadata/md5-cache/ros-meta/diagnostics-1.9.6 b/metadata/md5-cache/ros-meta/diagnostics-1.9.6
index eb28850aeabe..1d8e990df6ab 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-1.9.6
+++ b/metadata/md5-cache/ros-meta/diagnostics-1.9.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.6.tar.gz -> diagnostics-1.9.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efc014029764662f42e65438b6cff928
diff --git a/metadata/md5-cache/ros-meta/diagnostics-9999 b/metadata/md5-cache/ros-meta/diagnostics-9999
index 438fddc7c52f..0a162b7192b7 100644
--- a/metadata/md5-cache/ros-meta/diagnostics-9999
+++ b/metadata/md5-cache/ros-meta/diagnostics-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_analysis dev-ros/diagno
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efc014029764662f42e65438b6cff928
diff --git a/metadata/md5-cache/ros-meta/driver_common-1.6.8 b/metadata/md5-cache/ros-meta/driver_common-1.6.8
index 895bcde1b590..95fe8542d6df 100644
--- a/metadata/md5-cache/ros-meta/driver_common-1.6.8
+++ b/metadata/md5-cache/ros-meta/driver_common-1.6.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/driver_common/archive/1.6.8.tar.gz -> driver_common-1.6.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae53d933235bce8ea8081a44339fe1a0
diff --git a/metadata/md5-cache/ros-meta/driver_common-9999 b/metadata/md5-cache/ros-meta/driver_common-9999
index 51e13142398d..d739da432ea5 100644
--- a/metadata/md5-cache/ros-meta/driver_common-9999
+++ b/metadata/md5-cache/ros-meta/driver_common-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/driver_base dev-ros/timestamp_tools python_single_target_python3
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae53d933235bce8ea8081a44339fe1a0
diff --git a/metadata/md5-cache/ros-meta/executive_smach-2.5.0 b/metadata/md5-cache/ros-meta/executive_smach-2.5.0
index cb15a5c6d2fe..344629f0b3fd 100644
--- a/metadata/md5-cache/ros-meta/executive_smach-2.5.0
+++ b/metadata/md5-cache/ros-meta/executive_smach-2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.5.0.tar.gz -> executive_smach-2.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39838bfd46f002ec4c9e4aeea7192b54
diff --git a/metadata/md5-cache/ros-meta/executive_smach-9999 b/metadata/md5-cache/ros-meta/executive_smach-9999
index 670cf0cb2be2..2671da182fda 100644
--- a/metadata/md5-cache/ros-meta/executive_smach-9999
+++ b/metadata/md5-cache/ros-meta/executive_smach-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/smach dev-ros/smach_ros dev-ros/smach_msgs python_single_target_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39838bfd46f002ec4c9e4aeea7192b54
diff --git a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.9.1 b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.9.1
index 10944a3f63c0..787a491d109a 100644
--- a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.9.1
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=daf0c7e796b36079ffbd6379764024d0
diff --git a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999 b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999
index 8e30aeb3fe64..a2d73cc99137 100644
--- a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/ga
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=daf0c7e796b36079ffbd6379764024d0
diff --git a/metadata/md5-cache/ros-meta/geographic_info-0.5.5 b/metadata/md5-cache/ros-meta/geographic_info-0.5.5
index 5fc55bda3e52..fa2b764ea0cf 100644
--- a/metadata/md5-cache/ros-meta/geographic_info-0.5.5
+++ b/metadata/md5-cache/ros-meta/geographic_info-0.5.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/0.5.5.tar.gz -> geographic_info-0.5.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b598195239c5c26edbff065f28c7475f
diff --git a/metadata/md5-cache/ros-meta/geographic_info-9999 b/metadata/md5-cache/ros-meta/geographic_info-9999
index 07293dea9ed5..f8224e4d554a 100644
--- a/metadata/md5-cache/ros-meta/geographic_info-9999
+++ b/metadata/md5-cache/ros-meta/geographic_info-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_single_target_python3_7?
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b598195239c5c26edbff065f28c7475f
diff --git a/metadata/md5-cache/ros-meta/geometry-1.13.2 b/metadata/md5-cache/ros-meta/geometry-1.13.2
index a9c300206487..5330ae618485 100644
--- a/metadata/md5-cache/ros-meta/geometry-1.13.2
+++ b/metadata/md5-cache/ros-meta/geometry-1.13.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.13.2.tar.gz -> geometry-1.13.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ea79f8d9fc8fd473ebf592afbe07d35
diff --git a/metadata/md5-cache/ros-meta/geometry-9999 b/metadata/md5-cache/ros-meta/geometry-9999
index d9781c283434..5fd366498449 100644
--- a/metadata/md5-cache/ros-meta/geometry-9999
+++ b/metadata/md5-cache/ros-meta/geometry-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/eigen_conversions dev-ros/kdl_conversions dev-ros/tf dev-ros/tf_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ea79f8d9fc8fd473ebf592afbe07d35
diff --git a/metadata/md5-cache/ros-meta/geometry2-0.7.2 b/metadata/md5-cache/ros-meta/geometry2-0.7.2
index c579751dc98d..0e179fa84b68 100644
--- a/metadata/md5-cache/ros-meta/geometry2-0.7.2
+++ b/metadata/md5-cache/ros-meta/geometry2-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6f473942950663a35a7b748695ab278
diff --git a/metadata/md5-cache/ros-meta/geometry2-0.7.3 b/metadata/md5-cache/ros-meta/geometry2-0.7.3
index a8b0c1715569..3905b12a2c98 100644
--- a/metadata/md5-cache/ros-meta/geometry2-0.7.3
+++ b/metadata/md5-cache/ros-meta/geometry2-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.3.tar.gz -> geometry2-0.7.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6f473942950663a35a7b748695ab278
diff --git a/metadata/md5-cache/ros-meta/geometry2-0.7.5 b/metadata/md5-cache/ros-meta/geometry2-0.7.5
index 5152493d1ee1..ad34a3a8db1a 100644
--- a/metadata/md5-cache/ros-meta/geometry2-0.7.5
+++ b/metadata/md5-cache/ros-meta/geometry2-0.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.5.tar.gz -> geometry2-0.7.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6f473942950663a35a7b748695ab278
diff --git a/metadata/md5-cache/ros-meta/geometry2-9999 b/metadata/md5-cache/ros-meta/geometry2-9999
index 2f5e73931115..161e2e89d5b5 100644
--- a/metadata/md5-cache/ros-meta/geometry2-9999
+++ b/metadata/md5-cache/ros-meta/geometry2-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ro
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6f473942950663a35a7b748695ab278
diff --git a/metadata/md5-cache/ros-meta/geometry_tutorials-0.2.3 b/metadata/md5-cache/ros-meta/geometry_tutorials-0.2.3
index da60781773b1..ba76523d9f22 100644
--- a/metadata/md5-cache/ros-meta/geometry_tutorials-0.2.3
+++ b/metadata/md5-cache/ros-meta/geometry_tutorials-0.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.3.tar.gz -> geometry_tutorials-0.2.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa34c2d2f1ba6adb2e925696de78168c
diff --git a/metadata/md5-cache/ros-meta/geometry_tutorials-9999 b/metadata/md5-cache/ros-meta/geometry_tutorials-9999
index 99274efd3db1..15e4a649d09d 100644
--- a/metadata/md5-cache/ros-meta/geometry_tutorials-9999
+++ b/metadata/md5-cache/ros-meta/geometry_tutorials-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/turtle_tf dev-ros/turtle_tf2 python_single_target_python3_7? ( d
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa34c2d2f1ba6adb2e925696de78168c
diff --git a/metadata/md5-cache/ros-meta/hector_localization-0.3.0 b/metadata/md5-cache/ros-meta/hector_localization-0.3.0
index 190f15b48717..48efd938bcb9 100644
--- a/metadata/md5-cache/ros-meta/hector_localization-0.3.0
+++ b/metadata/md5-cache/ros-meta/hector_localization-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7f5ad60663a6873bf77f528222517c19
diff --git a/metadata/md5-cache/ros-meta/hector_localization-9999 b/metadata/md5-cache/ros-meta/hector_localization-9999
index a709fb7e7e26..e374f6cb1206 100644
--- a/metadata/md5-cache/ros-meta/hector_localization-9999
+++ b/metadata/md5-cache/ros-meta/hector_localization-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/hector_pose_estimation dev-ros/hector_pose_estimation_core dev-r
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7f5ad60663a6873bf77f528222517c19
diff --git a/metadata/md5-cache/ros-meta/hector_slam-0.4.1 b/metadata/md5-cache/ros-meta/hector_slam-0.4.1
index b30477875dd0..9c1f05e0f6bc 100644
--- a/metadata/md5-cache/ros-meta/hector_slam-0.4.1
+++ b/metadata/md5-cache/ros-meta/hector_slam-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e54c2cd6802d678525c1ba6be8aa9700
diff --git a/metadata/md5-cache/ros-meta/hector_slam-9999 b/metadata/md5-cache/ros-meta/hector_slam-9999
index 136fe42d4ddb..9e867fb65e68 100644
--- a/metadata/md5-cache/ros-meta/hector_slam-9999
+++ b/metadata/md5-cache/ros-meta/hector_slam-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/hector_compressed_map_transport dev-ros/hector_geotiff_plugins d
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e54c2cd6802d678525c1ba6be8aa9700
diff --git a/metadata/md5-cache/ros-meta/image_common-1.12.0 b/metadata/md5-cache/ros-meta/image_common-1.12.0
index 9481c0364c85..8f12707ecfac 100644
--- a/metadata/md5-cache/ros-meta/image_common-1.12.0
+++ b/metadata/md5-cache/ros-meta/image_common-1.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7e63664474a48c6b7332aa9e19d6ae0
diff --git a/metadata/md5-cache/ros-meta/image_common-9999 b/metadata/md5-cache/ros-meta/image_common-9999
index 73eb2c82b637..3bb815067911 100644
--- a/metadata/md5-cache/ros-meta/image_common-9999
+++ b/metadata/md5-cache/ros-meta/image_common-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/i
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7e63664474a48c6b7332aa9e19d6ae0
diff --git a/metadata/md5-cache/ros-meta/image_pipeline-1.15.2 b/metadata/md5-cache/ros-meta/image_pipeline-1.15.2
index a018c86b5ae8..2e25f6b743a7 100644
--- a/metadata/md5-cache/ros-meta/image_pipeline-1.15.2
+++ b/metadata/md5-cache/ros-meta/image_pipeline-1.15.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c34047e3b356ba9d18d6b08b080fa15
diff --git a/metadata/md5-cache/ros-meta/image_pipeline-9999 b/metadata/md5-cache/ros-meta/image_pipeline-9999
index 18baf0bf8c85..2d7ea8d632fc 100644
--- a/metadata/md5-cache/ros-meta/image_pipeline-9999
+++ b/metadata/md5-cache/ros-meta/image_pipeline-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/camera_calibration dev-ros/depth_image_proc dev-ros/image_proc d
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c34047e3b356ba9d18d6b08b080fa15
diff --git a/metadata/md5-cache/ros-meta/image_transport_plugins-1.14.0 b/metadata/md5-cache/ros-meta/image_transport_plugins-1.14.0
index 3e7afd981af2..10d37b7ae614 100644
--- a/metadata/md5-cache/ros-meta/image_transport_plugins-1.14.0
+++ b/metadata/md5-cache/ros-meta/image_transport_plugins-1.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.14.0.tar.gz -> image_transport_plugins-1.14.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3ab4838001bc478577c689ec7db0a56
diff --git a/metadata/md5-cache/ros-meta/image_transport_plugins-9999 b/metadata/md5-cache/ros-meta/image_transport_plugins-9999
index 185b53d9c54a..065de0288f64 100644
--- a/metadata/md5-cache/ros-meta/image_transport_plugins-9999
+++ b/metadata/md5-cache/ros-meta/image_transport_plugins-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/compressed_depth_image_transport dev-ros/compressed_image_transp
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3ab4838001bc478577c689ec7db0a56
diff --git a/metadata/md5-cache/ros-meta/imu_pipeline-0.3.0 b/metadata/md5-cache/ros-meta/imu_pipeline-0.3.0
index fb2822b16742..b721cb6102e3 100644
--- a/metadata/md5-cache/ros-meta/imu_pipeline-0.3.0
+++ b/metadata/md5-cache/ros-meta/imu_pipeline-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.3.0.tar.gz -> imu_pipeline-0.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cba40ad7b6c7d268798e5b55d22ec184
diff --git a/metadata/md5-cache/ros-meta/imu_pipeline-9999 b/metadata/md5-cache/ros-meta/imu_pipeline-9999
index f544c5b0b02b..516c9b9b4172 100644
--- a/metadata/md5-cache/ros-meta/imu_pipeline-9999
+++ b/metadata/md5-cache/ros-meta/imu_pipeline-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_single_target_pyth
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cba40ad7b6c7d268798e5b55d22ec184
diff --git a/metadata/md5-cache/ros-meta/imu_tools-1.2.2 b/metadata/md5-cache/ros-meta/imu_tools-1.2.2
index e24b69f3356a..93091fbb5d36 100644
--- a/metadata/md5-cache/ros-meta/imu_tools-1.2.2
+++ b/metadata/md5-cache/ros-meta/imu_tools-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.2.tar.gz -> imu_tools-1.2.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cac88bf82170079549fd73049bead40
diff --git a/metadata/md5-cache/ros-meta/imu_tools-9999 b/metadata/md5-cache/ros-meta/imu_tools-9999
index 8349df95c08c..6e1bdc758741 100644
--- a/metadata/md5-cache/ros-meta/imu_tools-9999
+++ b/metadata/md5-cache/ros-meta/imu_tools-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/imu_complementary_filter dev-ros/imu_filter_madgwick dev-ros/rvi
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cac88bf82170079549fd73049bead40
diff --git a/metadata/md5-cache/ros-meta/laser_pipeline-1.6.4 b/metadata/md5-cache/ros-meta/laser_pipeline-1.6.4
index c3fd97e5400b..e3a8ac344778 100644
--- a/metadata/md5-cache/ros-meta/laser_pipeline-1.6.4
+++ b/metadata/md5-cache/ros-meta/laser_pipeline-1.6.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_pipeline/archive/1.6.4.tar.gz -> laser_pipeline-1.6.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7c6493f234962c559c75917bdb1d8f5
diff --git a/metadata/md5-cache/ros-meta/laser_pipeline-9999 b/metadata/md5-cache/ros-meta/laser_pipeline-9999
index b9045306d87c..4b0c7e7bcc5c 100644
--- a/metadata/md5-cache/ros-meta/laser_pipeline-9999
+++ b/metadata/md5-cache/ros-meta/laser_pipeline-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/laser_assembler dev-ros/laser_filters dev-ros/laser_geometry pyt
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7c6493f234962c559c75917bdb1d8f5
diff --git a/metadata/md5-cache/ros-meta/navigation-1.17.0 b/metadata/md5-cache/ros-meta/navigation-1.17.0
index d3661f314846..f519e67fdfbc 100644
--- a/metadata/md5-cache/ros-meta/navigation-1.17.0
+++ b/metadata/md5-cache/ros-meta/navigation-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=275c730493039f097cdd2d67f57700ed
diff --git a/metadata/md5-cache/ros-meta/navigation-9999 b/metadata/md5-cache/ros-meta/navigation-9999
index 6e0dc4359547..70882570f32a 100644
--- a/metadata/md5-cache/ros-meta/navigation-9999
+++ b/metadata/md5-cache/ros-meta/navigation-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/amcl dev-ros/base_local_planner dev-ros/carrot_planner dev-ros/c
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=275c730493039f097cdd2d67f57700ed
diff --git a/metadata/md5-cache/ros-meta/nodelet_core-1.10.0 b/metadata/md5-cache/ros-meta/nodelet_core-1.10.0
index 009be166d178..c5c1d6555a5c 100644
--- a/metadata/md5-cache/ros-meta/nodelet_core-1.10.0
+++ b/metadata/md5-cache/ros-meta/nodelet_core-1.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.0.tar.gz -> nodelet_core-1.10.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9006b179a2a5a1559312d34765807690
diff --git a/metadata/md5-cache/ros-meta/nodelet_core-9999 b/metadata/md5-cache/ros-meta/nodelet_core-9999
index 0e8103b0c737..f93ddb324c8a 100644
--- a/metadata/md5-cache/ros-meta/nodelet_core-9999
+++ b/metadata/md5-cache/ros-meta/nodelet_core-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/test_nodelet dev-ros
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9006b179a2a5a1559312d34765807690
diff --git a/metadata/md5-cache/ros-meta/perception-1.5.0 b/metadata/md5-cache/ros-meta/perception-1.5.0
index 8de1e30f0648..d2c75afd3f3d 100644
--- a/metadata/md5-cache/ros-meta/perception-1.5.0
+++ b/metadata/md5-cache/ros-meta/perception-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5f61dd0d92b9b3979905013fd0a78cb
diff --git a/metadata/md5-cache/ros-meta/perception-9999 b/metadata/md5-cache/ros-meta/perception-9999
index e003e2fded3d..c1b08c915cfd 100644
--- a/metadata/md5-cache/ros-meta/perception-9999
+++ b/metadata/md5-cache/ros-meta/perception-9999
@@ -11,5 +11,5 @@ RDEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5f61dd0d92b9b3979905013fd0a78cb
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-1.7.1 b/metadata/md5-cache/ros-meta/perception_pcl-1.7.1
index e0f9a925b788..29d4a9381734 100644
--- a/metadata/md5-cache/ros-meta/perception_pcl-1.7.1
+++ b/metadata/md5-cache/ros-meta/perception_pcl-1.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.7.1.tar.gz -> perception_pcl-1.7.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1039f907764f579605ed585fcc84a511
diff --git a/metadata/md5-cache/ros-meta/perception_pcl-9999 b/metadata/md5-cache/ros-meta/perception_pcl-9999
index 9394dfa48e81..e02573752988 100644
--- a/metadata/md5-cache/ros-meta/perception_pcl-9999
+++ b/metadata/md5-cache/ros-meta/perception_pcl-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/pcl_conversions dev-ros/pcl_ros python_single_target_python3_7?
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1039f907764f579605ed585fcc84a511
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.12.4 b/metadata/md5-cache/ros-meta/pr2_common-1.12.4
index d0b5a75c0b04..cf21aaecaea2 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-1.12.4
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.12.4
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae13f29d59fa7a528df52a0186e64ac7
diff --git a/metadata/md5-cache/ros-meta/pr2_common-9999 b/metadata/md5-cache/ros-meta/pr2_common-9999
index b9b35326e266..4ae960418815 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-9999
+++ b/metadata/md5-cache/ros-meta/pr2_common-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_descriptio
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae13f29d59fa7a528df52a0186e64ac7
diff --git a/metadata/md5-cache/ros-meta/qt_gui_core-0.4.1 b/metadata/md5-cache/ros-meta/qt_gui_core-0.4.1
index 52007288bb94..5964fea0b9c2 100644
--- a/metadata/md5-cache/ros-meta/qt_gui_core-0.4.1
+++ b/metadata/md5-cache/ros-meta/qt_gui_core-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f84d87d6b59a5a292b48a4a2ababb200
diff --git a/metadata/md5-cache/ros-meta/qt_gui_core-0.4.2 b/metadata/md5-cache/ros-meta/qt_gui_core-0.4.2
index 3c0a7652f5e7..eaaec4c02476 100644
--- a/metadata/md5-cache/ros-meta/qt_gui_core-0.4.2
+++ b/metadata/md5-cache/ros-meta/qt_gui_core-0.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f84d87d6b59a5a292b48a4a2ababb200
diff --git a/metadata/md5-cache/ros-meta/qt_gui_core-9999 b/metadata/md5-cache/ros-meta/qt_gui_core-9999
index e0b936369b60..10418e2c4ab2 100644
--- a/metadata/md5-cache/ros-meta/qt_gui_core-9999
+++ b/metadata/md5-cache/ros-meta/qt_gui_core-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/qt_dotgraph dev-ros/qt_gui dev-ros/qt_gui_app dev-ros/qt_gui_cpp
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f84d87d6b59a5a292b48a4a2ababb200
diff --git a/metadata/md5-cache/ros-meta/robot-1.5.0 b/metadata/md5-cache/ros-meta/robot-1.5.0
index ded25e0e774e..e041e8687264 100644
--- a/metadata/md5-cache/ros-meta/robot-1.5.0
+++ b/metadata/md5-cache/ros-meta/robot-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a57cbac7a12e98b92a39e18bd97de8a8
diff --git a/metadata/md5-cache/ros-meta/robot-9999 b/metadata/md5-cache/ros-meta/robot-9999
index 3e9ef42b36b6..fa76f02c0bbe 100644
--- a/metadata/md5-cache/ros-meta/robot-9999
+++ b/metadata/md5-cache/ros-meta/robot-9999
@@ -11,5 +11,5 @@ RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/exe
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a57cbac7a12e98b92a39e18bd97de8a8
diff --git a/metadata/md5-cache/ros-meta/robot_model-1.12.11 b/metadata/md5-cache/ros-meta/robot_model-1.12.11
index b6f83422e76b..63a46225f6e8 100644
--- a/metadata/md5-cache/ros-meta/robot_model-1.12.11
+++ b/metadata/md5-cache/ros-meta/robot_model-1.12.11
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.11.tar.gz -> robot_model-1.12.11.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7dac0f44a5ec5bd9192fa88b65c71a9
diff --git a/metadata/md5-cache/ros-meta/robot_model-9999 b/metadata/md5-cache/ros-meta/robot_model-9999
index e03905322f53..ba5d12514a5d 100644
--- a/metadata/md5-cache/ros-meta/robot_model-9999
+++ b/metadata/md5-cache/ros-meta/robot_model-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7dac0f44a5ec5bd9192fa88b65c71a9
diff --git a/metadata/md5-cache/ros-meta/ros-1.15.5 b/metadata/md5-cache/ros-meta/ros-1.15.5
index e8470bc0c7ef..a5f2094b9c36 100644
--- a/metadata/md5-cache/ros-meta/ros-1.15.5
+++ b/metadata/md5-cache/ros-meta/ros-1.15.5
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa6fb95b541e90417db5db44c9d57745
diff --git a/metadata/md5-cache/ros-meta/ros-1.15.6 b/metadata/md5-cache/ros-meta/ros-1.15.6
index 9ff1cd050d6a..622785e5205e 100644
--- a/metadata/md5-cache/ros-meta/ros-1.15.6
+++ b/metadata/md5-cache/ros-meta/ros-1.15.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa6fb95b541e90417db5db44c9d57745
diff --git a/metadata/md5-cache/ros-meta/ros-9999 b/metadata/md5-cache/ros-meta/ros-9999
index d4f76ff162ee..8f6473b22b63 100644
--- a/metadata/md5-cache/ros-meta/ros-9999
+++ b/metadata/md5-cache/ros-meta/ros-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosbash dev-ros/rosboost_cfg dev-ros/rosclean dev-ros/roscreate
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa6fb95b541e90417db5db44c9d57745
diff --git a/metadata/md5-cache/ros-meta/ros_base-1.5.0 b/metadata/md5-cache/ros-meta/ros_base-1.5.0
index e703b9bdbb73..383e462d2810 100644
--- a/metadata/md5-cache/ros-meta/ros_base-1.5.0
+++ b/metadata/md5-cache/ros-meta/ros_base-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97823f145dcfbb38964e58d2d7fcec01
diff --git a/metadata/md5-cache/ros-meta/ros_base-9999 b/metadata/md5-cache/ros-meta/ros_base-9999
index 6050096c83d8..7518351590c5 100644
--- a/metadata/md5-cache/ros-meta/ros_base-9999
+++ b/metadata/md5-cache/ros-meta/ros_base-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/dynamic_reconfigure ros-met
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97823f145dcfbb38964e58d2d7fcec01
diff --git a/metadata/md5-cache/ros-meta/ros_comm-1.15.7 b/metadata/md5-cache/ros-meta/ros_comm-1.15.7
index 505ae61129b6..c54f572b14e8 100644
--- a/metadata/md5-cache/ros-meta/ros_comm-1.15.7
+++ b/metadata/md5-cache/ros-meta/ros_comm-1.15.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e6495648345ccbac36335bbbfc6b33d
diff --git a/metadata/md5-cache/ros-meta/ros_comm-1.15.8 b/metadata/md5-cache/ros-meta/ros_comm-1.15.8
index 6ceead11cc28..c2b42e10de23 100644
--- a/metadata/md5-cache/ros-meta/ros_comm-1.15.8
+++ b/metadata/md5-cache/ros-meta/ros_comm-1.15.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e6495648345ccbac36335bbbfc6b33d
diff --git a/metadata/md5-cache/ros-meta/ros_comm-9999 b/metadata/md5-cache/ros-meta/ros_comm-9999
index b11dbec87da3..19209be13419 100644
--- a/metadata/md5-cache/ros-meta/ros_comm-9999
+++ b/metadata/md5-cache/ros-meta/ros_comm-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roslz4 dev-ros/xmlrpcpp dev-ros/roswtf dev-ros/message_filters d
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e6495648345ccbac36335bbbfc6b33d
diff --git a/metadata/md5-cache/ros-meta/ros_control-0.19.1 b/metadata/md5-cache/ros-meta/ros_control-0.19.1
index 3b17ed8beb6c..036e023261bc 100644
--- a/metadata/md5-cache/ros-meta/ros_control-0.19.1
+++ b/metadata/md5-cache/ros-meta/ros_control-0.19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8551898a67d667040c19e28359ee4b63
diff --git a/metadata/md5-cache/ros-meta/ros_control-0.19.2 b/metadata/md5-cache/ros-meta/ros_control-0.19.2
index c2ada9b77c24..b02343504e1b 100644
--- a/metadata/md5-cache/ros-meta/ros_control-0.19.2
+++ b/metadata/md5-cache/ros-meta/ros_control-0.19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.2.tar.gz -> ros_control-0.19.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8551898a67d667040c19e28359ee4b63
diff --git a/metadata/md5-cache/ros-meta/ros_control-9999 b/metadata/md5-cache/ros-meta/ros_control-9999
index ff67bdb1b9c4..285b533ae1ce 100644
--- a/metadata/md5-cache/ros-meta/ros_control-9999
+++ b/metadata/md5-cache/ros-meta/ros_control-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/combined_robot_hw dev-ros/combined_robot_hw_tests dev-ros/contro
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8551898a67d667040c19e28359ee4b63
diff --git a/metadata/md5-cache/ros-meta/ros_core-1.5.0 b/metadata/md5-cache/ros-meta/ros_core-1.5.0
index 48895e59c64c..b0dd49094bf3 100644
--- a/metadata/md5-cache/ros-meta/ros_core-1.5.0
+++ b/metadata/md5-cache/ros-meta/ros_core-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e72503ddd524116b924ce2640b9d59b2
diff --git a/metadata/md5-cache/ros-meta/ros_core-9999 b/metadata/md5-cache/ros-meta/ros_core-9999
index a3776802fbf0..37884055d895 100644
--- a/metadata/md5-cache/ros-meta/ros_core-9999
+++ b/metadata/md5-cache/ros-meta/ros_core-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-util/catkin dev-ros/class_loader dev-ros/cmake_modules ros-meta/comm
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e72503ddd524116b924ce2640b9d59b2
diff --git a/metadata/md5-cache/ros-meta/ros_tutorials-0.10.1 b/metadata/md5-cache/ros-meta/ros_tutorials-0.10.1
index 6f0441c8f3a0..b45336af9801 100644
--- a/metadata/md5-cache/ros-meta/ros_tutorials-0.10.1
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-0.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.1.tar.gz -> ros_tutorials-0.10.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3a8cbdcc1c1a631ab17d3943577c0e7
diff --git a/metadata/md5-cache/ros-meta/ros_tutorials-0.10.2 b/metadata/md5-cache/ros-meta/ros_tutorials-0.10.2
index a0729e074c8d..3ee76eca9fb6 100644
--- a/metadata/md5-cache/ros-meta/ros_tutorials-0.10.2
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-0.10.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.2.tar.gz -> ros_tutorials-0.10.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3a8cbdcc1c1a631ab17d3943577c0e7
diff --git a/metadata/md5-cache/ros-meta/ros_tutorials-9999 b/metadata/md5-cache/ros-meta/ros_tutorials-9999
index 5a53629a5f1f..87d95eca47b8 100644
--- a/metadata/md5-cache/ros-meta/ros_tutorials-9999
+++ b/metadata/md5-cache/ros-meta/ros_tutorials-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/roscpp_tutorials dev-ros/rospy_tutorials dev-ros/turtlesim pytho
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3a8cbdcc1c1a631ab17d3943577c0e7
diff --git a/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.10 b/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.10
index 1c04f70644b3..d9d968c2db8c 100644
--- a/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.10
+++ b/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.10
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.10.tar.gz -> rosbridge_suite-0.11.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e075512ae2d8e64d4391e8d4cecbde85
diff --git a/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.3 b/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.3
index 88c8a922296f..69e8c436acff 100644
--- a/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.3
+++ b/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.3.tar.gz -> rosbridge_suite-0.11.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e075512ae2d8e64d4391e8d4cecbde85
diff --git a/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.9 b/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.9
index 7ec2043441f9..0b0c36496329 100644
--- a/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.9
+++ b/metadata/md5-cache/ros-meta/rosbridge_suite-0.11.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.9.tar.gz -> rosbridge_suite-0.11.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e075512ae2d8e64d4391e8d4cecbde85
diff --git a/metadata/md5-cache/ros-meta/rosbridge_suite-9999 b/metadata/md5-cache/ros-meta/rosbridge_suite-9999
index 46bbbd3a0907..44ed62a51140 100644
--- a/metadata/md5-cache/ros-meta/rosbridge_suite-9999
+++ b/metadata/md5-cache/ros-meta/rosbridge_suite-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosapi dev-ros/rosbridge_library dev-ros/rosbridge_msgs dev-ros/
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e075512ae2d8e64d4391e8d4cecbde85
diff --git a/metadata/md5-cache/ros-meta/roscpp_core-0.7.2 b/metadata/md5-cache/ros-meta/roscpp_core-0.7.2
index 101ef011bb74..09565d0d5f29 100644
--- a/metadata/md5-cache/ros-meta/roscpp_core-0.7.2
+++ b/metadata/md5-cache/ros-meta/roscpp_core-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.7.2.tar.gz -> roscpp_core-0.7.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ffa200a8748494c9f0a796cb4c42ba2
diff --git a/metadata/md5-cache/ros-meta/roscpp_core-9999 b/metadata/md5-cache/ros-meta/roscpp_core-9999
index 09a72685776e..c2534b3336e4 100644
--- a/metadata/md5-cache/ros-meta/roscpp_core-9999
+++ b/metadata/md5-cache/ros-meta/roscpp_core-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ffa200a8748494c9f0a796cb4c42ba2
diff --git a/metadata/md5-cache/ros-meta/rosserial-0.8.0 b/metadata/md5-cache/ros-meta/rosserial-0.8.0
index 90e2d8409037..332036a57751 100644
--- a/metadata/md5-cache/ros-meta/rosserial-0.8.0
+++ b/metadata/md5-cache/ros-meta/rosserial-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8433dc239eb986468cae0d75a46e8f86
diff --git a/metadata/md5-cache/ros-meta/rosserial-9999 b/metadata/md5-cache/ros-meta/rosserial-9999
index 7582a64f140c..693ead5c3f6f 100644
--- a/metadata/md5-cache/ros-meta/rosserial-9999
+++ b/metadata/md5-cache/ros-meta/rosserial-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rosserial_arduino dev-ros/rosserial_client dev-ros/rosserial_emb
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8433dc239eb986468cae0d75a46e8f86
diff --git a/metadata/md5-cache/ros-meta/rqt-0.5.2 b/metadata/md5-cache/ros-meta/rqt-0.5.2
index 1e0a90336bc2..e7130eac8d65 100644
--- a/metadata/md5-cache/ros-meta/rqt-0.5.2
+++ b/metadata/md5-cache/ros-meta/rqt-0.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47ba1c67311a9643fdefa1ef189e1b1e
diff --git a/metadata/md5-cache/ros-meta/rqt-9999 b/metadata/md5-cache/ros-meta/rqt-9999
index 35041efcb568..5f8f75f3e7db 100644
--- a/metadata/md5-cache/ros-meta/rqt-9999
+++ b/metadata/md5-cache/ros-meta/rqt-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rqt_gui dev-ros/rqt_gui_cpp dev-ros/rqt_gui_py dev-ros/rqt_py_co
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47ba1c67311a9643fdefa1ef189e1b1e
diff --git a/metadata/md5-cache/ros-meta/rqt_common_plugins-0.4.9 b/metadata/md5-cache/ros-meta/rqt_common_plugins-0.4.9
index 6b8c2f3b63cf..9f1792d3d075 100644
--- a/metadata/md5-cache/ros-meta/rqt_common_plugins-0.4.9
+++ b/metadata/md5-cache/ros-meta/rqt_common_plugins-0.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.9.tar.gz -> rqt_common_plugins-0.4.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd2875906c0cd5b3f409bce8e6406c87
diff --git a/metadata/md5-cache/ros-meta/rqt_common_plugins-9999 b/metadata/md5-cache/ros-meta/rqt_common_plugins-9999
index d02bef7b4faa..d0a3707c09e3 100644
--- a/metadata/md5-cache/ros-meta/rqt_common_plugins-9999
+++ b/metadata/md5-cache/ros-meta/rqt_common_plugins-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rqt_action dev-ros/rqt_bag dev-ros/rqt_bag_plugins dev-ros/rqt_c
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd2875906c0cd5b3f409bce8e6406c87
diff --git a/metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.8 b/metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.8
index 43bab6c7933e..4376191efbdb 100644
--- a/metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.8
+++ b/metadata/md5-cache/ros-meta/rqt_robot_plugins-0.5.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.8.tar.gz -> rqt_robot_plugins-0.5.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebda70eced2e7d4c2d39cbb974ce06e5
diff --git a/metadata/md5-cache/ros-meta/rqt_robot_plugins-9999 b/metadata/md5-cache/ros-meta/rqt_robot_plugins-9999
index 194d146c5ab4..b3e1501fa902 100644
--- a/metadata/md5-cache/ros-meta/rqt_robot_plugins-9999
+++ b/metadata/md5-cache/ros-meta/rqt_robot_plugins-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/rqt_moveit dev-ros/rqt_nav_view dev-ros/rqt_pose_view dev-ros/rq
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebda70eced2e7d4c2d39cbb974ce06e5
diff --git a/metadata/md5-cache/ros-meta/simulators-1.5.0 b/metadata/md5-cache/ros-meta/simulators-1.5.0
index e91dae509f49..dba34cff5d5d 100644
--- a/metadata/md5-cache/ros-meta/simulators-1.5.0
+++ b/metadata/md5-cache/ros-meta/simulators-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a02bd1bcd53ebd0dea12e2975ef2c5d
diff --git a/metadata/md5-cache/ros-meta/simulators-9999 b/metadata/md5-cache/ros-meta/simulators-9999
index ce900f40bed9..44669eb550f6 100644
--- a/metadata/md5-cache/ros-meta/simulators-9999
+++ b/metadata/md5-cache/ros-meta/simulators-9999
@@ -11,5 +11,5 @@ RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a02bd1bcd53ebd0dea12e2975ef2c5d
diff --git a/metadata/md5-cache/ros-meta/slam_gmapping-1.4.0 b/metadata/md5-cache/ros-meta/slam_gmapping-1.4.0
index bdfed6b1391b..0c9790bc6e43 100644
--- a/metadata/md5-cache/ros-meta/slam_gmapping-1.4.0
+++ b/metadata/md5-cache/ros-meta/slam_gmapping-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.4.0.tar.gz -> slam_gmapping-1.4.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b39f323ee44f054c64e58f91ca513a91
diff --git a/metadata/md5-cache/ros-meta/slam_gmapping-1.4.1 b/metadata/md5-cache/ros-meta/slam_gmapping-1.4.1
index c1c3fdd5dcd6..05b069191cb1 100644
--- a/metadata/md5-cache/ros-meta/slam_gmapping-1.4.1
+++ b/metadata/md5-cache/ros-meta/slam_gmapping-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.4.1.tar.gz -> slam_gmapping-1.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b39f323ee44f054c64e58f91ca513a91
diff --git a/metadata/md5-cache/ros-meta/slam_gmapping-9999 b/metadata/md5-cache/ros-meta/slam_gmapping-9999
index 1f3be7cde501..21e1a93a25ec 100644
--- a/metadata/md5-cache/ros-meta/slam_gmapping-9999
+++ b/metadata/md5-cache/ros-meta/slam_gmapping-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/gmapping python_single_target_python3_7? ( dev-lang/python:3.7 >
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b39f323ee44f054c64e58f91ca513a91
diff --git a/metadata/md5-cache/ros-meta/unique_identifier-1.0.6 b/metadata/md5-cache/ros-meta/unique_identifier-1.0.6
index c47327087876..8ec63c2f8869 100644
--- a/metadata/md5-cache/ros-meta/unique_identifier-1.0.6
+++ b/metadata/md5-cache/ros-meta/unique_identifier-1.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.6.tar.gz -> unique_identifier-1.0.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=37dea4a160660aa5e674f05255250a07
diff --git a/metadata/md5-cache/ros-meta/unique_identifier-9999 b/metadata/md5-cache/ros-meta/unique_identifier-9999
index b312bc986829..022a7378097b 100644
--- a/metadata/md5-cache/ros-meta/unique_identifier-9999
+++ b/metadata/md5-cache/ros-meta/unique_identifier-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/unique_id dev-ros/uuid_msgs python_single_target_python3_7? ( de
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=37dea4a160660aa5e674f05255250a07
diff --git a/metadata/md5-cache/ros-meta/vision_opencv-1.15.0 b/metadata/md5-cache/ros-meta/vision_opencv-1.15.0
index c57d84e2a92d..3b4d95900503 100644
--- a/metadata/md5-cache/ros-meta/vision_opencv-1.15.0
+++ b/metadata/md5-cache/ros-meta/vision_opencv-1.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a682bcee6c4cc76a47e13f45ae7c571
diff --git a/metadata/md5-cache/ros-meta/vision_opencv-9999 b/metadata/md5-cache/ros-meta/vision_opencv-9999
index a7b9fb56e4a2..9e456ecb9278 100644
--- a/metadata/md5-cache/ros-meta/vision_opencv-9999
+++ b/metadata/md5-cache/ros-meta/vision_opencv-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests python_sin
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a682bcee6c4cc76a47e13f45ae7c571
diff --git a/metadata/md5-cache/ros-meta/vision_visp-0.11.1 b/metadata/md5-cache/ros-meta/vision_visp-0.11.1
index 1dab09f12fab..ec9cab145ed8 100644
--- a/metadata/md5-cache/ros-meta/vision_visp-0.11.1
+++ b/metadata/md5-cache/ros-meta/vision_visp-0.11.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3f316fe7dffe34861c706ddbc996bcb3
diff --git a/metadata/md5-cache/ros-meta/vision_visp-9999 b/metadata/md5-cache/ros-meta/vision_visp-9999
index b73576182285..c093bdd65689 100644
--- a/metadata/md5-cache/ros-meta/vision_visp-9999
+++ b/metadata/md5-cache/ros-meta/vision_visp-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/visp_auto_tracker dev-ros/visp_bridge dev-ros/visp_camera_calibr
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3f316fe7dffe34861c706ddbc996bcb3
diff --git a/metadata/md5-cache/ros-meta/visualization_tutorials-0.11.0 b/metadata/md5-cache/ros-meta/visualization_tutorials-0.11.0
index b487dadbe2b0..4c781b7c30c7 100644
--- a/metadata/md5-cache/ros-meta/visualization_tutorials-0.11.0
+++ b/metadata/md5-cache/ros-meta/visualization_tutorials-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb8fb11524d41cca4c2bb2da83b23051
diff --git a/metadata/md5-cache/ros-meta/visualization_tutorials-9999 b/metadata/md5-cache/ros-meta/visualization_tutorials-9999
index 783e2e112d50..1157c66f726f 100644
--- a/metadata/md5-cache/ros-meta/visualization_tutorials-9999
+++ b/metadata/md5-cache/ros-meta/visualization_tutorials-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rv
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb8fb11524d41cca4c2bb2da83b23051
diff --git a/metadata/md5-cache/ros-meta/viz-1.5.0 b/metadata/md5-cache/ros-meta/viz-1.5.0
index 14d216a42c10..5662bdd35d23 100644
--- a/metadata/md5-cache/ros-meta/viz-1.5.0
+++ b/metadata/md5-cache/ros-meta/viz-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/metapackages/archive/1.5.0.tar.gz -> metapackages-1.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f271f98f275e19e362975b248cca963
diff --git a/metadata/md5-cache/ros-meta/viz-9999 b/metadata/md5-cache/ros-meta/viz-9999
index 64e701e97a68..689583266d11 100644
--- a/metadata/md5-cache/ros-meta/viz-9999
+++ b/metadata/md5-cache/ros-meta/viz-9999
@@ -11,5 +11,5 @@ RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins
 REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ros-catkin	9288108ddefe6d63971edf53318f15ba	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f271f98f275e19e362975b248cca963
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index daf3e9ec5d04..96b11d003634 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316 b/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316
index dd3b17ed29bf..7a315858b9f0 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316
+++ b/metadata/md5-cache/sci-astronomy/celestia-1.7.0_pre20200316
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libfmt:= media-libs/glew:0= media-libs/libpng:0= sys-libs/zlib:
 REQUIRED_USE=|| ( glut qt5 )
 SLOT=0
 SRC_URI=https://github.com/CelestiaProject/Celestia/archive/df508a0c597a3d96c1c039fa4a973e294021cfba.tar.gz -> celestia-1.7.0_pre20200316.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d20e10ca225d7ad07b394b7a41fc0317
diff --git a/metadata/md5-cache/sci-astronomy/celestia-9999 b/metadata/md5-cache/sci-astronomy/celestia-9999
index 603e7bafd4ef..0f10c5b37c66 100644
--- a/metadata/md5-cache/sci-astronomy/celestia-9999
+++ b/metadata/md5-cache/sci-astronomy/celestia-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/libfmt:= media-libs/glew:0= media-libs/libpng:0= sys-libs/zlib:= virtual/glu virtual/jpeg:0 virtual/opengl glut? ( media-libs/freeglut ) lua? ( dev-lang/lua:* ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) theora? ( media-libs/libogg media-libs/libtheora )
 REQUIRED_USE=|| ( glut qt5 )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d20e10ca225d7ad07b394b7a41fc0317
diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.4.3 b/metadata/md5-cache/sci-astronomy/kstars-3.4.3
index 983f2941a522..ccb35cf2c492 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-3.4.3
+++ b/metadata/md5-cache/sci-astronomy/kstars-3.4.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdatavis3d-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclar
 REQUIRED_USE=indi? ( fits )
 SLOT=5
 SRC_URI=mirror://kde/stable/kstars/kstars-3.4.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=65dbdada5407b8a58be997edf4d3b839
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.20.1 b/metadata/md5-cache/sci-astronomy/stellarium-0.20.1
index c225a3fffc7a..969e7fd7d356 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.20.1
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.20.1
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v0.20.1/stellarium-0.20.1.tar.gz stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b265451239226ac0ea41de261aac6a4
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.20.2 b/metadata/md5-cache/sci-astronomy/stellarium-0.20.2
index a60f024c482d..adef8bbd0c33 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.20.2
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.20.2
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v0.20.2/stellarium-0.20.2.tar.gz deep-sky? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.10/catalog.dat -> stellarium-dso-catalog-3.10.dat ) stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1be00cf49de468e98c5a56b969ebc98
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index beb1b1472a31..0cdcda66495b 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/bamtools-2.5.1 b/metadata/md5-cache/sci-biology/bamtools-2.5.1
index 39cc9cd45f3f..dd2efa7ee0c7 100644
--- a/metadata/md5-cache/sci-biology/bamtools-2.5.1
+++ b/metadata/md5-cache/sci-biology/bamtools-2.5.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/jsoncpp-1.8.0:= sys-libs/zlib:=
 SLOT=0/2.5.1
 SRC_URI=https://github.com/pezmaster31/bamtools/archive/v2.5.1.tar.gz -> bamtools-2.5.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2299dc6ca850c1c25582656d7586681
diff --git a/metadata/md5-cache/sci-biology/bamtools-9999 b/metadata/md5-cache/sci-biology/bamtools-9999
index f7a2c3580007..445061016c75 100644
--- a/metadata/md5-cache/sci-biology/bamtools-9999
+++ b/metadata/md5-cache/sci-biology/bamtools-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-libs/jsoncpp-1.8.0:= sys-libs/zlib:=
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2299dc6ca850c1c25582656d7586681
diff --git a/metadata/md5-cache/sci-biology/bwa-0.7.16a b/metadata/md5-cache/sci-biology/bwa-0.7.16a
deleted file mode 100644
index 37a9ad4d0c4d..000000000000
--- a/metadata/md5-cache/sci-biology/bwa-0.7.16a
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Burrows-Wheeler Alignment Tool, a fast short genomic sequence aligner
-EAPI=7
-HOMEPAGE=https://bio-bwa.sourceforge.net/
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://sourceforge/bio-bwa/bwa-0.7.16a.tar.bz2
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6b21049857f301168f361c45510f8256
diff --git a/metadata/md5-cache/sci-biology/bwa-0.7.17 b/metadata/md5-cache/sci-biology/bwa-0.7.17
new file mode 100644
index 000000000000..0023fbac6b0f
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/bwa-0.7.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/zlib
+DESCRIPTION=Burrows-Wheeler Alignment Tool, a fast short genomic sequence aligner
+EAPI=7
+HOMEPAGE=https://github.com/lh3/bwa/
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=sys-libs/zlib dev-lang/perl
+SLOT=0
+SRC_URI=https://github.com/lh3/bwa/archive/v0.7.17.tar.gz -> bwa-0.7.17.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=620c3569e8293303737f7844385c7e82
diff --git a/metadata/md5-cache/sci-biology/seaview-4.3.5 b/metadata/md5-cache/sci-biology/seaview-4.3.5
deleted file mode 100644
index bef00e62e2eb..000000000000
--- a/metadata/md5-cache/sci-biology/seaview-4.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/zlib x11-libs/fltk:1 x11-libs/libX11 xft? ( x11-libs/libXft x11-libs/fltk:1[xft] ) virtual/pkgconfig
-DESCRIPTION=A graphical multiple sequence alignment editor
-EAPI=5
-HOMEPAGE=http://pbil.univ-lyon1.fr/software/seaview.html
-IUSE=+xft
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=sys-libs/zlib x11-libs/fltk:1 x11-libs/libX11 xft? ( x11-libs/libXft x11-libs/fltk:1[xft] ) sci-biology/clustalw || ( sci-libs/libmuscle sci-biology/muscle ) sci-biology/phyml
-SLOT=0
-SRC_URI=ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_4.3.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=38cc02682d853c813df2b6e81cbb51c5
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 7c614d3f02e6..39f1f97fc3c6 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
diff --git a/metadata/md5-cache/sci-calculators/keurocalc-1.3.0 b/metadata/md5-cache/sci-calculators/keurocalc-1.3.0
index dcbf1d622c2a..5fc926956f1b 100644
--- a/metadata/md5-cache/sci-calculators/keurocalc-1.3.0
+++ b/metadata/md5-cache/sci-calculators/keurocalc-1.3.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ FDL-1.2
 RDEPEND=>=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 >=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/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 !sci-calculators/keurocalc:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/keurocalc/keurocalc-1.3.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b2c452c435f0e98ef972f4f2170f78d
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index ccd5f37e3db8..2294e9f8834f 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/gromacs-2018.8 b/metadata/md5-cache/sci-chemistry/gromacs-2018.8
index b131e0c99cd3..8183fff9a9a2 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018.8
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision )
 RESTRICT=!test? ( test )
 SLOT=0/2018.8
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.8.tar.gz doc? ( ftp://ftp.gromacs.org/pub/manual/manual-2018.8.pdf ) test? ( http://gerrit.gromacs.org/download/regressiontests-2018.8.tar.gz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18bcc125fb875a479049f342a953f4a4
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1
index 8ec8bd0615fb..009e33b9637a 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision )
 RESTRICT=!test? ( test )
 SLOT=0/2019.5
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.5.tar.gz doc? ( ftp://ftp.gromacs.org/pub/manual/manual-2019.5.pdf ) test? ( http://gerrit.gromacs.org/download/regressiontests-2019.5.tar.gz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d49f81069a1a5f5a9f8000ebf307b57
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.6 b/metadata/md5-cache/sci-chemistry/gromacs-2019.6
index 44a7bfbcc73e..1e50eae5ed93 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019.6
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2019.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision )
 RESTRICT=!test? ( test )
 SLOT=0/2019.6
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.6.tar.gz doc? ( ftp://ftp.gromacs.org/pub/manual/manual-2019.6.pdf ) test? ( http://gerrit.gromacs.org/download/regressiontests-2019.6.tar.gz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bfebcb7bf4d886845438681d7d3a52fe
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.1-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2020.1-r1
index fa27dc0a4772..352215ff3585 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.1-r1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision )
 RESTRICT=!test? ( test )
 SLOT=0/2020.1
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.1.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2020.1.tar.gz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d5a53ced81507917dd3d0a316508cf03
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.2 b/metadata/md5-cache/sci-chemistry/gromacs-2020.2
index 6aa7896feaa0..3410729477e9 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision )
 RESTRICT=!test? ( test )
 SLOT=0/2020.2
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.2.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2020.2.tar.gz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d5a53ced81507917dd3d0a316508cf03
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.3 b/metadata/md5-cache/sci-chemistry/gromacs-2020.3
index ffec2bbeee82..531adba20db8 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.3
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision )
 RESTRICT=!test? ( test )
 SLOT=0/2020.3
 SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.3.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2020.3.tar.gz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d5a53ced81507917dd3d0a316508cf03
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
index a57bada1a8fd..ed013b929ca4 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/2020.9999
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a86848fc709e4d0151040710cdec520
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index a9cc33621b5c..31598507c872 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/bl
 REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=493fec40da67ac96271b2e4340e47b49
diff --git a/metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1 b/metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1
index 645c93e3a911..8a2eac44b298 100644
--- a/metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1
+++ b/metadata/md5-cache/sci-chemistry/molequeue-0.9.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=server? ( client ) test? ( server ) zeromq? ( || ( python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenChemistry/molequeue/archive/0.9.0.tar.gz -> molequeue-0.9.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc3e8c64088aa790e70ec73b41f67c52
diff --git a/metadata/md5-cache/sci-chemistry/molsketch-0.4.1-r1 b/metadata/md5-cache/sci-chemistry/molsketch-0.4.1-r1
index 54290ef4a505..97790e74ba1c 100644
--- a/metadata/md5-cache/sci-chemistry/molsketch-0.4.1-r1
+++ b/metadata/md5-cache/sci-chemistry/molsketch-0.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sci-chemistry/openbabel-2.2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=mirror://sourceforge/project/molsketch/Molsketch/Beryllium-7%200.4.1/Molsketch-0.4.1-src.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f6340089860392daa050ce98d1044b0
diff --git a/metadata/md5-cache/sci-chemistry/theseus-2.0.6 b/metadata/md5-cache/sci-chemistry/theseus-2.0.6
deleted file mode 100644
index f0ea2a732b99..000000000000
--- a/metadata/md5-cache/sci-chemistry/theseus-2.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sci-libs/gsl || ( sci-biology/muscle sci-biology/probcons sci-biology/mafft sci-biology/t-coffee sci-biology/kalign sci-biology/clustalw:2 ) virtual/pkgconfig
-DESCRIPTION=Maximum likelihood superpositioning and analysis of macromolecular structures
-EAPI=5
-HOMEPAGE=http://www.theseus3d.org/
-IUSE=examples
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=sci-libs/gsl || ( sci-biology/muscle sci-biology/probcons sci-biology/mafft sci-biology/t-coffee sci-biology/kalign sci-biology/clustalw:2 )
-SLOT=0
-SRC_URI=http://www.theseus3d.org/src/theseus_2.0.6.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=22ffce5b9a0c8872cf80116e05aed37a
diff --git a/metadata/md5-cache/sci-chemistry/theseus-3.0.0 b/metadata/md5-cache/sci-chemistry/theseus-3.0.0
deleted file mode 100644
index aed1ca22a86c..000000000000
--- a/metadata/md5-cache/sci-chemistry/theseus-3.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sci-libs/gsl || ( sci-biology/muscle sci-biology/probcons sci-biology/mafft sci-biology/t-coffee sci-biology/kalign sci-biology/clustalw:2 ) virtual/pkgconfig
-DESCRIPTION=Maximum likelihood superpositioning and analysis of macromolecular structures
-EAPI=5
-HOMEPAGE=http://www.theseus3d.org/
-IUSE=examples
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=sci-libs/gsl || ( sci-biology/muscle sci-biology/probcons sci-biology/mafft sci-biology/t-coffee sci-biology/kalign sci-biology/clustalw:2 )
-SLOT=0
-SRC_URI=http://www.theseus3d.org/src/theseus_3.0.0.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=29583bbf0f951fff5fba627c1939f76e
diff --git a/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha43 b/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha43
index 7f99818f5ca6..534aebd9ef12 100644
--- a/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha43
+++ b/metadata/md5-cache/sci-chemistry/vmd-1.9.4_alpha43
@@ -13,4 +13,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=vmd-1.9.4a43.src.tar https://dev.gentoo.org/~jlec/distfiles/vmd-1.9.3-gentoo-patches.tar.xz
 _eclasses_=cuda	c2f1b334711bbbf2130f339636dc7515	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=96ed023f719b882f2b147e8f9a8f96e9
+_md5_=89744ba5c8dd8ee827c8775ee8fd7de6
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-1.6.2 b/metadata/md5-cache/sci-chemistry/votca-csg-1.6.2
index 1d1e23624d65..a48d26756ceb 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-1.6.2
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-1.6.2
@@ -11,5 +11,5 @@ PDEPEND=extras? ( ~sci-chemistry/votca-csgapps-1.6.2 )
 RDEPEND=~sci-libs/votca-tools-1.6.2 >=dev-cpp/eigen-3.3 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 ) dev-lang/perl app-shells/bash:*
 SLOT=0
 SRC_URI=https://github.com/votca/csg/archive/v1.6.2.tar.gz -> votca-csg-1.6.2.tar.gz doc? ( https://github.com/votca/csg-manual/releases/download/v1.6.2/votca-csg-manual-1.6.2.pdf ) examples? ( https://github.com/votca/csg-tutorials/archive/v1.6.2.tar.gz -> votca-csg-tutorials-1.6.2.tar.gz )
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6835c642dea08e270c6ef920ad8524f6
diff --git a/metadata/md5-cache/sci-chemistry/votca-csg-9999 b/metadata/md5-cache/sci-chemistry/votca-csg-9999
index 9b950e7c109b..aa28b1920271 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csg-9999
+++ b/metadata/md5-cache/sci-chemistry/votca-csg-9999
@@ -10,5 +10,5 @@ PDEPEND=extras? ( ~sci-chemistry/votca-csgapps-9999 ) doc? ( ~app-doc/votca-csg-
 PROPERTIES=live
 RDEPEND=~sci-libs/votca-tools-9999 >=dev-cpp/eigen-3.3 gromacs? ( sci-chemistry/gromacs:= ) hdf5? ( sci-libs/hdf5 ) dev-lang/perl app-shells/bash:*
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6835c642dea08e270c6ef920ad8524f6
diff --git a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6.2 b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6.2
index 5e9229a9df65..2b37f412872b 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6.2
+++ b/metadata/md5-cache/sci-chemistry/votca-csgapps-1.6.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-1.6.2
 SLOT=0
 SRC_URI=https://github.com/votca/csgapps/archive/v1.6.2.tar.gz -> votca-csgapps-1.6.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f8d9205590ce5436d58c805fbb8a531a
diff --git a/metadata/md5-cache/sci-chemistry/votca-csgapps-9999 b/metadata/md5-cache/sci-chemistry/votca-csgapps-9999
index 7146164f7f3b..cab58181904d 100644
--- a/metadata/md5-cache/sci-chemistry/votca-csgapps-9999
+++ b/metadata/md5-cache/sci-chemistry/votca-csgapps-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=>=dev-cpp/eigen-3.3 ~sci-chemistry/votca-csg-9999
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f8d9205590ce5436d58c805fbb8a531a
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.2 b/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.2
index 54272471dfc5..39f20522a4c9 100644
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.2
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-1.6.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=~sci-libs/votca-tools-1.6.2 >=dev-cpp/eigen-3.3 sci-libs/hdf5[cxx] ~sci-chemistry/votca-csg-1.6.2 sci-libs/libxc
 SLOT=0
 SRC_URI=https://github.com/votca/xtp/archive/v1.6.2.tar.gz -> votca-xtp-1.6.2.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dba7a732311723dfdfe2ae68dc03ea32
diff --git a/metadata/md5-cache/sci-chemistry/votca-xtp-9999 b/metadata/md5-cache/sci-chemistry/votca-xtp-9999
index 1c21e5785dc7..373a9b31ca93 100644
--- a/metadata/md5-cache/sci-chemistry/votca-xtp-9999
+++ b/metadata/md5-cache/sci-chemistry/votca-xtp-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=~sci-libs/votca-tools-9999 >=dev-cpp/eigen-3.3 sci-libs/hdf5[cxx] ~sci-chemistry/votca-csg-9999 sci-libs/libxc
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dba7a732311723dfdfe2ae68dc03ea32
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 14156509c497..4c88160dabc6 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r1 b/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r1
deleted file mode 100644
index 97277a241a90..000000000000
--- a/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-gfx/imagemagick[cxx]
-DESCRIPTION=Command line tool for drawing timing diagrams
-EAPI=5
-HOMEPAGE=http://drawtiming.sourceforge.net/index.html
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-gfx/imagemagick[cxx]
-SLOT=0
-SRC_URI=mirror://sourceforge/drawtiming/drawtiming-0.7.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=18cf6d35f46254e705a86ef416bdee93
diff --git a/metadata/md5-cache/sci-electronics/gazebo-11.1.0-r1 b/metadata/md5-cache/sci-electronics/gazebo-11.1.0-r1
index d582b22d62d0..ffa7db503981 100644
--- a/metadata/md5-cache/sci-electronics/gazebo-11.1.0-r1
+++ b/metadata/md5-cache/sci-electronics/gazebo-11.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl d
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-11.1.0.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e38cefe3546cbc9afa475661ece27e5a
diff --git a/metadata/md5-cache/sci-electronics/kicad-4.0.7-r1 b/metadata/md5-cache/sci-electronics/kicad-4.0.7-r1
deleted file mode 100644
index c988c5acaee5..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-4.0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) media-libs/glew:0= media-libs/freeglut media-libs/mesa[X(+)] sys-libs/zlib x11-libs/cairo doc? ( app-doc/doxygen ) i18n? ( virtual/libintl ) python? ( dev-lang/swig:0 ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Electronic Schematic and PCB design tools.
-EAPI=6
-HOMEPAGE=http://www.kicad-pcb.org
-IUSE=debug doc examples github i18n libressl minimal +python l10n_bg l10n_ca l10n_cs l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_ko l10n_nl l10n_pl l10n_pt l10n_ru l10n_sk l10n_sl l10n_sv l10n_zh-CN +python_single_target_python2_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) media-libs/glew:0= media-libs/freeglut media-libs/mesa[X(+)] sys-libs/zlib x11-libs/cairo sci-electronics/electronics-menu
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
-SLOT=0
-SRC_URI=https://launchpad.net/kicad/4.0/4.0.7/+download/kicad-4.0.7.tar.xz !minimal? ( http://downloads.kicad-pcb.org/libraries/kicad-footprints-4.0.7.tar.gz http://downloads.kicad-pcb.org/libraries/kicad-library-4.0.7.tar.gz ) i18n? ( https://github.com/KiCad/kicad-i18n/archive/4.0.7.tar.gz -> kicad-4.0.7-i18n.tar.gz )
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1809193ebc15661a61dd104daf74f334
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.5-r2 b/metadata/md5-cache/sci-electronics/kicad-5.1.5-r2
index 0893c165fb30..1ea871803076 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.5-r2
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.5-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-l
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.1.5/+download/kicad-5.1.5.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ceed54b6d22cb1d72286134cfbc8e737
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.6 b/metadata/md5-cache/sci-electronics/kicad-5.1.6
index 602bc73ff4d5..ea3b18319375 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.6
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.6
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-l
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad/-/archive/5.1.6/kicad-5.1.6.tar.bz2
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6655985d5ebf7f6b1d2ca737f4f12303
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.5 b/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.5
index 33dbbe241139..9635253c099c 100644
--- a/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.5
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.5
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.1.0
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-footprints/archive/5.1.5.tar.gz -> kicad-footprints-5.1.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd086676420a0970525d29dc1a940714
diff --git a/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.6 b/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.6
index 95c2d3a7c5e4..f377921ac301 100644
--- a/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.6
+++ b/metadata/md5-cache/sci-electronics/kicad-footprints-5.1.6
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.1.0
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-footprints/archive/5.1.6.tar.gz -> kicad-footprints-5.1.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd086676420a0970525d29dc1a940714
diff --git a/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.5 b/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.5
index a2d4c6ecf6b0..36becd14d14c 100644
--- a/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.5
+++ b/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.5
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.1.0
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-i18n/archive/5.1.5.tar.gz -> kicad-i18n-5.1.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=088e3aa1fdfc8c97e9bb1b741712bb56
diff --git a/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.6 b/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.6
index 2552479e8840..5ea74db669a4 100644
--- a/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.6
+++ b/metadata/md5-cache/sci-electronics/kicad-i18n-5.1.6
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.1.6
 SLOT=0
 SRC_URI=https://gitlab.com/kicad/code/kicad-i18n/-/archive/5.1.6/kicad-i18n-5.1.6.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d7a9913098d6a8b9933b81e1fe292a5
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.5 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.5
index 04138fc33cc5..0f5e222d72c4 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.5
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.5
@@ -10,5 +10,5 @@ RDEPEND=>=sci-electronics/kicad-5.1.0[occ=,oce=]
 REQUIRED_USE=|| ( occ oce )
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-packages3d/archive/5.1.5.tar.gz -> kicad-packages3d-5.1.5.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9bc6ddf3abe0f36fd17c191e4917278
diff --git a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.6 b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.6
index 7af1ea2ac6c4..5a6aaa23363d 100644
--- a/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.6
+++ b/metadata/md5-cache/sci-electronics/kicad-packages3d-5.1.6
@@ -10,5 +10,5 @@ RDEPEND=>=sci-electronics/kicad-5.1.0[occ=,oce=]
 REQUIRED_USE=|| ( occ oce )
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-packages3d/archive/5.1.6.tar.gz -> kicad-packages3d-5.1.6.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9bc6ddf3abe0f36fd17c191e4917278
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.5 b/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.5
index 81a738d77bc4..87ce4f332949 100644
--- a/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.5
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.5
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.1.0
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-symbols/archive/5.1.5.tar.gz -> kicad-symbols-5.1.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb4ab49dc3224573e3c75a308bcd3a76
diff --git a/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.6 b/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.6
index cbdce9c5a91f..605549890c98 100644
--- a/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.6
+++ b/metadata/md5-cache/sci-electronics/kicad-symbols-5.1.6
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.1.0
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-symbols/archive/5.1.6.tar.gz -> kicad-symbols-5.1.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb4ab49dc3224573e3c75a308bcd3a76
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-5.1.5 b/metadata/md5-cache/sci-electronics/kicad-templates-5.1.5
index 6ae5f302fa19..3f3b3c73f7d9 100644
--- a/metadata/md5-cache/sci-electronics/kicad-templates-5.1.5
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-5.1.5
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.1.0
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-templates/archive/5.1.5.tar.gz -> kicad-templates-5.1.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=40e0c99cbbce1697e38730c1563bc006
diff --git a/metadata/md5-cache/sci-electronics/kicad-templates-5.1.6 b/metadata/md5-cache/sci-electronics/kicad-templates-5.1.6
index 073354e3bd13..b03ada170bb2 100644
--- a/metadata/md5-cache/sci-electronics/kicad-templates-5.1.6
+++ b/metadata/md5-cache/sci-electronics/kicad-templates-5.1.6
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-4.0
 RDEPEND=>=sci-electronics/kicad-5.1.0
 SLOT=0
 SRC_URI=https://github.com/KiCad/kicad-templates/archive/5.1.6.tar.gz -> kicad-templates-5.1.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=40e0c99cbbce1697e38730c1563bc006
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.26.4-r1 b/metadata/md5-cache/sci-electronics/klayout-0.26.4-r1
deleted file mode 100644
index c36cda7a0793..000000000000
--- a/metadata/md5-cache/sci-electronics/klayout-0.26.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
-EAPI=7
-HOMEPAGE=https://www.klayout.de/
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ruby_targets_ruby25
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) || ( ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=https://www.klayout.org/downloads/source/klayout-0.26.4.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=86b9f699c6a7e5303e842572c241466c
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.26.8 b/metadata/md5-cache/sci-electronics/klayout-0.26.8
new file mode 100644
index 000000000000..237691ffbe3d
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/klayout-0.26.8
@@ -0,0 +1,15 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
+EAPI=7
+HOMEPAGE=https://www.klayout.de/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ruby_targets_ruby26
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) || ( ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://www.klayout.org/downloads/source/klayout-0.26.8.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c42ce5652d688c1ed1586b307f2284a6
diff --git a/metadata/md5-cache/sci-electronics/klayout-9999 b/metadata/md5-cache/sci-electronics/klayout-9999
index 7562666e3561..d2d1624f3558 100644
--- a/metadata/md5-cache/sci-electronics/klayout-9999
+++ b/metadata/md5-cache/sci-electronics/klayout-9999
@@ -1,14 +1,14 @@
-BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
+DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
 DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
 EAPI=7
 HOMEPAGE=https://www.klayout.de/
-IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ruby_targets_ruby25
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ruby_targets_ruby26
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) || ( ruby_targets_ruby25 )
+RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) || ( ruby_targets_ruby26 )
 SLOT=0
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	ruby-ng	676004cfb6cdf3dedf1c778d56346624	ruby-utils	9991225e034c8185d67fbc7a8816559f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=52a53051e3f09c32f2a2fc9b53c59f4a
+_md5_=c42ce5652d688c1ed1586b307f2284a6
diff --git a/metadata/md5-cache/sci-electronics/ktechlab-0.50.0 b/metadata/md5-cache/sci-electronics/ktechlab-0.50.0
index 554d6e66faeb..94eb9e4e7a3f 100644
--- a/metadata/md5-cache/sci-electronics/ktechlab-0.50.0
+++ b/metadata/md5-cache/sci-electronics/ktechlab-0.50.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/unstable/ktechlab/ktechlab-0.50.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9fa18a0b72123a0ca3787e254ad3bd75
diff --git a/metadata/md5-cache/sci-electronics/magic-7.5.231 b/metadata/md5-cache/sci-electronics/magic-7.5.231
deleted file mode 100644
index fc0df40b3b18..000000000000
--- a/metadata/md5-cache/sci-electronics/magic-7.5.231
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt opengl? ( virtual/opengl ) app-shells/tcsh >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The VLSI design CAD tool
-EAPI=5
-HOMEPAGE=http://www.opencircuitdesign.com/magic/index.html
-IUSE=debug opengl
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=HPND GPL-2+
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt opengl? ( virtual/opengl )
-SLOT=0
-SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-7.5.231.tgz ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b61ef477d8e98d54b2f15173b9524462
diff --git a/metadata/md5-cache/sci-electronics/magic-8.0.138 b/metadata/md5-cache/sci-electronics/magic-8.0.138
deleted file mode 100644
index 7b33739ecdf7..000000000000
--- a/metadata/md5-cache/sci-electronics/magic-8.0.138
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt opengl? ( virtual/glu virtual/opengl ) app-shells/tcsh >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The VLSI design CAD tool
-EAPI=5
-HOMEPAGE=http://www.opencircuitdesign.com/magic/index.html
-IUSE=debug opengl
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=HPND GPL-2+
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt opengl? ( virtual/glu virtual/opengl )
-SLOT=0
-SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-8.0.138.tgz ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=336cb13f351253a1841dedca456eb2b6
diff --git a/metadata/md5-cache/sci-electronics/pulseview-0.4.2 b/metadata/md5-cache/sci-electronics/pulseview-0.4.2
index 78f1eb7146d0..868e5f934768 100644
--- a/metadata/md5-cache/sci-electronics/pulseview-0.4.2
+++ b/metadata/md5-cache/sci-electronics/pulseview-0.4.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-cpp/glibmm-2.28.0:2 >=dev-libs/boost-1.55:= >=dev-libs/glib-2.28.0
 REQUIRED_USE=decode? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
 SRC_URI=https://sigrok.org/download/source/pulseview/pulseview-0.4.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74e4b0312e515a5246db19a8247cbd9a
diff --git a/metadata/md5-cache/sci-electronics/pulseview-9999 b/metadata/md5-cache/sci-electronics/pulseview-9999
index ddbe2312e8b3..6361b0db9923 100644
--- a/metadata/md5-cache/sci-electronics/pulseview-9999
+++ b/metadata/md5-cache/sci-electronics/pulseview-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-cpp/glibmm-2.28.0:2 >=dev-libs/boost-1.55:= >=dev-libs/glib-2.28.0:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/libsigrok-0.6.0:=[cxx] decode? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) >=sci-libs/libsigrokdecode-0.6.0:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] )
 REQUIRED_USE=decode? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d3c485aa5944fd0696e6782a4c867d0
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 4ad21da133bb..fe12ed5d1d0e 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/gmt-5.4.4 b/metadata/md5-cache/sci-geosciences/gmt-5.4.4
index f868b531de9a..b82c1ce1dd86 100644
--- a/metadata/md5-cache/sci-geosciences/gmt-5.4.4
+++ b/metadata/md5-cache/sci-geosciences/gmt-5.4.4
@@ -11,5 +11,5 @@ RDEPEND=app-text/ghostscript-gpl net-misc/curl >=sci-libs/netcdf-4.1:=[hdf5] sys
 REQUIRED_USE=?? ( pcre pcre2 )
 SLOT=5
 SRC_URI=mirror://gmt/gmt-5.4.4-src.tar.xz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe4ac2e54a1ace915b1ec6888de52875
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
deleted file mode 100644
index 1c10e771bba2..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-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 )
-RESTRICT=!test? ( test )
-SLOT=0/23
-SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a6601760a9168d4fa9acfafdd7fd16c0
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4
deleted file mode 100644
index 49ef3b835202..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-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 )
-RESTRICT=!test? ( test )
-SLOT=0/23
-SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74db1790c84ed23008ec52d904aa3c46
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.18.1 b/metadata/md5-cache/sci-geosciences/gpsd-3.18.1
deleted file mode 100644
index 73a4a4b37794..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.18.1
+++ /dev/null
@@ -1,15 +0,0 @@
-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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) virtual/pkgconfig test? ( sys-devel/bc ) virtual/pkgconfig >=dev-util/scons-2.3.0[python_targets_python2_7]
-DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
-EAPI=5
-HOMEPAGE=https://gpsd.gitlab.io/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_greis +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_python3_6
-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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_6 ) ) qt5? ( cxx )
-RESTRICT=!test? ( test )
-SLOT=0/24
-SRC_URI=mirror://nongnu/gpsd/gpsd-3.18.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4dc19446d4a0c1c584525a792b5e925f
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.19 b/metadata/md5-cache/sci-geosciences/gpsd-3.19
deleted file mode 100644
index 753156e7791a..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.19
+++ /dev/null
@@ -1,15 +0,0 @@
-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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/pkgconfig test? ( sys-devel/bc ) virtual/pkgconfig >=dev-util/scons-2.3.0[python_targets_python2_7]
-DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
-EAPI=5
-HOMEPAGE=https://gpsd.gitlab.io/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_greis +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_python3_6 python_targets_python3_7 python_targets_python3_8
-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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) qt5? ( cxx )
-RESTRICT=!test? ( test )
-SLOT=0/24
-SRC_URI=mirror://nongnu/gpsd/gpsd-3.19.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2dc0b19e49ad5d1185a9f368828c1967
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.20 b/metadata/md5-cache/sci-geosciences/gpsd-3.20
deleted file mode 100644
index 2d078a01cf87..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.20
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=acct-user/gpsd >=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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/pkgconfig test? ( sys-devel/bc )
-DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
-EAPI=7
-HOMEPAGE=https://gpsd.gitlab.io/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_greis +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_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=acct-user/gpsd >=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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) qt5? ( cxx )
-RESTRICT=!test? ( test )
-SLOT=0/25
-SRC_URI=mirror://nongnu/gpsd/gpsd-3.20.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=000f587f16dc7cf1148cbf7ce1c5e3f5
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.21 b/metadata/md5-cache/sci-geosciences/gpsd-3.21
index c1107ce311e9..86fd881da215 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.21
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.21
@@ -5,12 +5,12 @@ DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping cl
 EAPI=7
 HOMEPAGE=https://gpsd.io/
 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_greis +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_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm ~ppc ~ppc64 ~sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=acct-user/gpsd >=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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) gpsd_protocols_ublox? ( dev-python/pyserial ) gpsd_protocols_greis? ( dev-python/pyserial ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) ) qt5? ( cxx )
 RESTRICT=!test? ( test )
 SLOT=0/27
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.21.tar.xz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7515fd53bdd51de77110559d10959a1e
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	scons-utils	0c3d02e3e56d99a17ac273db118e8a24	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=9b3d3e1d74141d4d6d87b4cef516ad7d
diff --git a/metadata/md5-cache/sci-geosciences/laszip-3.4.1 b/metadata/md5-cache/sci-geosciences/laszip-3.4.1
index b252244b0bdb..069407634e3c 100644
--- a/metadata/md5-cache/sci-geosciences/laszip-3.4.1
+++ b/metadata/md5-cache/sci-geosciences/laszip-3.4.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~ia64 ppc ppc64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/LASzip/LASzip/releases/download/3.4.1/laszip-src-3.4.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6dbcf3a46d74225f0c53fb59792ee59d
diff --git a/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r3 b/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r3
index 64558611f167..7bd43cb2029a 100644
--- a/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r3
+++ b/metadata/md5-cache/sci-geosciences/liblas-1.8.1-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= sci-geosciences/laszip sci-libs/libgeotiff:= gdal? ( sc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/libLAS/libLAS/archive/1.8.1.tar.gz -> liblas-1.8.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e6f10da7020672f6ea75495da05ef7e
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-0.96.0 b/metadata/md5-cache/sci-geosciences/osm2pgsql-0.96.0
index 45364eae534e..a7b35ef0a898 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-0.96.0
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-0.96.0
@@ -11,5 +11,5 @@ RDEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat sci-libs/proj:= sys-li
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/openstreetmap/osm2pgsql/archive/0.96.0.tar.gz -> osm2pgsql-0.96.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99cc793d1a2607d20e24be81139437b7
diff --git a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999 b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
index b7e0fbcfa42d..86899047f545 100644
--- a/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
+++ b/metadata/md5-cache/sci-geosciences/osm2pgsql-99999999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=app-arch/bzip2 dev-db/postgresql:= dev-libs/expat sci-libs/proj:= sys-libs/zlib lua? ( dev-lang/lua:= ) dev-db/postgis
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=607929364fd8ca0c1cac5b45df299b9e
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.10.7 b/metadata/md5-cache/sci-geosciences/qgis-3.10.7
index c7d356a32db2..7e556f0fbfb5 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.10.7
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.10.7
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-3.10.7.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3289275cba3662616c2f584c0bb96ec3
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.10.9 b/metadata/md5-cache/sci-geosciences/qgis-3.10.9
index 186cf2d0012f..a6b37c06471a 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.10.9
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.10.9
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-3.10.9.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44ef409f9146923758dd31c2462fa5b8
diff --git a/metadata/md5-cache/sci-geosciences/qgis-9999 b/metadata/md5-cache/sci-geosciences/qgis-9999
index 43eaec12ef90..fdf92c456b3e 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-9999
+++ b/metadata/md5-cache/sci-geosciences/qgis-9999
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 de
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) mapserver? ( python )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44ef409f9146923758dd31c2462fa5b8
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 6aae64794ff0..542d84059d7b 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/Shapely-1.7.0 b/metadata/md5-cache/sci-libs/Shapely-1.7.0
index e7b0052a7ee8..89d40324c155 100644
--- a/metadata/md5-cache/sci-libs/Shapely-1.7.0
+++ b/metadata/md5-cache/sci-libs/Shapely-1.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=Geometric objects, predicates, and operations
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Shapely/ https://github.com/Toblerity/Shapely
 IUSE=test doc python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/geos-3.3 python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Toblerity/Shapely/archive/1.7.0.tar.gz -> Shapely-1.7.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a822f6125044db7336e3b95b2929884b
+_md5_=e538c79f1650f91efa2d6b0951c3ad57
diff --git a/metadata/md5-cache/sci-libs/ViSP-3.3.0 b/metadata/md5-cache/sci-libs/ViSP-3.3.0
index e798c613bd8b..debb8ee4e059 100644
--- a/metadata/md5-cache/sci-libs/ViSP-3.3.0
+++ b/metadata/md5-cache/sci-libs/ViSP-3.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=motif? ( coin )
 RESTRICT=!test? ( test )
 SLOT=0/3.3
 SRC_URI=http://gforge.inria.fr/frs/download.php/latestfile/475/visp-3.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f453927c9be6c52f70722a2f1186b7d
diff --git a/metadata/md5-cache/sci-libs/brial-1.2.9 b/metadata/md5-cache/sci-libs/brial-1.2.9
new file mode 100644
index 000000000000..237e80c8ac74
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/brial-1.2.9
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install setup
+DEPEND=dev-libs/boost sci-libs/m4ri[png=]
+DESCRIPTION=A C++ library for polynomials over boolean rings
+EAPI=7
+HOMEPAGE=https://github.com/BRiAl/BRiAl
+IUSE=png static-libs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=BSD GPL-2+
+RDEPEND=dev-libs/boost sci-libs/m4ri[png=]
+SLOT=0
+SRC_URI=https://github.com/BRiAl/BRiAl/releases/download/1.2.9/brial-1.2.9.tar.bz2
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3454a45814a64fb179e5110c4e17ead3
diff --git a/metadata/md5-cache/sci-libs/ceres-solver-1.14.0 b/metadata/md5-cache/sci-libs/ceres-solver-1.14.0
index 5efb03735880..cf2be315562d 100644
--- a/metadata/md5-cache/sci-libs/ceres-solver-1.14.0
+++ b/metadata/md5-cache/sci-libs/ceres-solver-1.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://ceres-solver.org/ceres-solver-1.14.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=342a2bbc0f5e775f6248d0abc164b759
diff --git a/metadata/md5-cache/sci-libs/coinor-cppad-20140204 b/metadata/md5-cache/sci-libs/coinor-cppad-20140204
deleted file mode 100644
index 34cb1be289c9..000000000000
--- a/metadata/md5-cache/sci-libs/coinor-cppad-20140204
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/adolc:= sci-libs/ipopt:= virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=app-portage/elt-patches-20170815
-DESCRIPTION=COIN-OR C++ Algorithmic Differentiation
-EAPI=5
-HOMEPAGE=https://projects.coin-or.org/CppAD/
-IUSE=doc examples
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=sci-libs/adolc:= sci-libs/ipopt:=
-SLOT=0
-SRC_URI=http://www.coin-or.org/download/source/CppAD/cppad-20140204.gpl.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=408f3f4b6694053461fd5f362a830af5
diff --git a/metadata/md5-cache/sci-libs/coinor-cppad-20140519 b/metadata/md5-cache/sci-libs/coinor-cppad-20140519
deleted file mode 100644
index 87771c4d580a..000000000000
--- a/metadata/md5-cache/sci-libs/coinor-cppad-20140519
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/adolc:0= sci-libs/ipopt:0= virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=app-portage/elt-patches-20170815
-DESCRIPTION=COIN-OR C++ Algorithmic Differentiation
-EAPI=5
-HOMEPAGE=https://projects.coin-or.org/CppAD/
-IUSE=doc examples
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=sci-libs/adolc:0= sci-libs/ipopt:0=
-SLOT=0
-SRC_URI=http://www.coin-or.org/download/source/CppAD/cppad-20140519.gpl.tgz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4819d1b9e39e94f7f850284f614bf1a7
diff --git a/metadata/md5-cache/sci-libs/dcmtk-3.6.5 b/metadata/md5-cache/sci-libs/dcmtk-3.6.5
index 1a06d51a053b..ba269cf5fbd0 100644
--- a/metadata/md5-cache/sci-libs/dcmtk-3.6.5
+++ b/metadata/md5-cache/sci-libs/dcmtk-3.6.5
@@ -10,5 +10,5 @@ LICENSE=OFFIS
 RDEPEND=dev-libs/icu:= virtual/jpeg:0 png? ( media-libs/libpng:* ) ssl? ( dev-libs/openssl:0= ) tcpd? ( sys-apps/tcp-wrappers ) tiff? ( media-libs/tiff:0 ) xml? ( dev-libs/libxml2:2 ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://dicom.offis.de/download/dcmtk/release/dcmtk-3.6.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=caa49b7b67bb8f9823262a0ecbfddfa2
diff --git a/metadata/md5-cache/sci-libs/dlib-19.16-r1 b/metadata/md5-cache/sci-libs/dlib-19.16-r1
index 0050576f5e51..025507ae345a 100644
--- a/metadata/md5-cache/sci-libs/dlib-19.16-r1
+++ b/metadata/md5-cache/sci-libs/dlib-19.16-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( png || ( python_targets_python3_6 python_targets_python3_
 RESTRICT=!test? ( test )
 SLOT=0/19.16
 SRC_URI=https://github.com/davisking/dlib/archive/v19.16.tar.gz -> dlib-19.16.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e1af274e821413b468acbd474b456fba
diff --git a/metadata/md5-cache/sci-libs/fcl-0.6.1 b/metadata/md5-cache/sci-libs/fcl-0.6.1
index a66c62a6a4d3..df0375953a82 100644
--- a/metadata/md5-cache/sci-libs/fcl-0.6.1
+++ b/metadata/md5-cache/sci-libs/fcl-0.6.1
@@ -11,5 +11,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost:=[threads] sci-libs/flann sci-libs/libccd
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://github.com/flexible-collision-library/fcl/archive/v0.6.1.tar.gz -> fcl-0.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f1f2cb50e7ccf1025829c66a592953e
diff --git a/metadata/md5-cache/sci-libs/fcl-9999 b/metadata/md5-cache/sci-libs/fcl-9999
index d6fa878621c0..712b40e77176 100644
--- a/metadata/md5-cache/sci-libs/fcl-9999
+++ b/metadata/md5-cache/sci-libs/fcl-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-cpp/eigen:3 dev-libs/boost:=[threads] sci-libs/flann sci-libs/libccd[double-precision] octomap? ( sci-libs/octomap )
 RESTRICT=!test? ( test )
 SLOT=0/6
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a55c5f50f45eedc036d2ee0f386ca58c
diff --git a/metadata/md5-cache/sci-libs/flann-1.9.1-r3 b/metadata/md5-cache/sci-libs/flann-1.9.1-r3
index fb41bb36fee9..c3d314cc2303 100644
--- a/metadata/md5-cache/sci-libs/flann-1.9.1-r3
+++ b/metadata/md5-cache/sci-libs/flann-1.9.1-r3
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=app-arch/lz4:= cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) mpi? ( dev-libs/boost:=[mpi] sci-libs/hdf5[mpi] ) !mpi? ( !sci-libs/hdf5[mpi] ) octave? ( >=sci-mathematics/octave-3.6.4-r1 )
 SLOT=0
 SRC_URI=https://github.com/mariusmuja/flann/archive/1.9.1.tar.gz -> flann-1.9.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5136eae2df1c5da1ed4419a1cf9604ee
diff --git a/metadata/md5-cache/sci-libs/ignition-math-6.4.0 b/metadata/md5-cache/sci-libs/ignition-math-6.4.0
index 0ea13b2fc7b4..523ab1ff8571 100644
--- a/metadata/md5-cache/sci-libs/ignition-math-6.4.0
+++ b/metadata/md5-cache/sci-libs/ignition-math-6.4.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=6/6
 SRC_URI=https://github.com/ignitionrobotics/ign-math/archive/ignition-math6_6.4.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=773a186716e1720988f4d8731b55d914
diff --git a/metadata/md5-cache/sci-libs/ignition-math-6.5.0 b/metadata/md5-cache/sci-libs/ignition-math-6.5.0
index 62480db8b1f2..cca55be09190 100644
--- a/metadata/md5-cache/sci-libs/ignition-math-6.5.0
+++ b/metadata/md5-cache/sci-libs/ignition-math-6.5.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=6/6
 SRC_URI=https://github.com/ignitionrobotics/ign-math/archive/ignition-math6_6.5.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=773a186716e1720988f4d8731b55d914
diff --git a/metadata/md5-cache/sci-libs/indilib-1.8.3 b/metadata/md5-cache/sci-libs/indilib-1.8.3
index 90f1f669c201..ea55b7665e83 100644
--- a/metadata/md5-cache/sci-libs/indilib-1.8.3
+++ b/metadata/md5-cache/sci-libs/indilib-1.8.3
@@ -11,5 +11,5 @@ RDEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-l
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/indilib/indi/archive/v1.8.3.tar.gz -> indilib-1.8.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f25417a68b7209fc14c2341c0f03c2c
diff --git a/metadata/md5-cache/sci-libs/indilib-1.8.6 b/metadata/md5-cache/sci-libs/indilib-1.8.6
index 6fba1ee96e4e..a41492be4cee 100644
--- a/metadata/md5-cache/sci-libs/indilib-1.8.6
+++ b/metadata/md5-cache/sci-libs/indilib-1.8.6
@@ -11,5 +11,5 @@ RDEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-l
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/indilib/indi/archive/v1.8.6.tar.gz -> indilib-1.8.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbeae478102b16a25e951fb023516ebc
diff --git a/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1 b/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
new file mode 100644
index 000000000000..8b6538d9d501
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=Keras deep learning library reference implementations of deep learning models
+EAPI=6
+HOMEPAGE=https://keras.io/applications/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+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_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=328abed611e90724c02b6b8f264c61ad
diff --git a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0-r1 b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0-r1
new file mode 100644
index 000000000000..96cfec2a5a32
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=Easy data preprocessing and data augmentation for deep learning models
+EAPI=6
+HOMEPAGE=https://keras.io/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+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_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=852496460b7f01d4125ee8a8a64421e3
diff --git a/metadata/md5-cache/sci-libs/kim-api-2.1.3-r1 b/metadata/md5-cache/sci-libs/kim-api-2.1.3-r1
index d8adde9d1312..aa2658872588 100644
--- a/metadata/md5-cache/sci-libs/kim-api-2.1.3-r1
+++ b/metadata/md5-cache/sci-libs/kim-api-2.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=CDDL
 RDEPEND=app-editors/vim-core virtual/fortran
 SLOT=0
 SRC_URI=https://s3.openkim.org/kim-api/kim-api-2.1.3.txz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1cf81ed89487e38aaf1b5043a8718b33
diff --git a/metadata/md5-cache/sci-libs/lapack-3.9.0 b/metadata/md5-cache/sci-libs/lapack-3.9.0
index dcc5e2d128b3..d14597c1181a 100644
--- a/metadata/md5-cache/sci-libs/lapack-3.9.0
+++ b/metadata/md5-cache/sci-libs/lapack-3.9.0
@@ -11,5 +11,5 @@ RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lap
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Reference-LAPACK/lapack/archive/v3.9.0.tar.gz -> lapack-3.9.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d0b27ec3df55675b09c28a9ca42bd0d
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a5a284502f060abc423d37c763271c0c
diff --git a/metadata/md5-cache/sci-libs/libccd-2.1 b/metadata/md5-cache/sci-libs/libccd-2.1
index ed95ba210cde..eed1575e0453 100644
--- a/metadata/md5-cache/sci-libs/libccd-2.1
+++ b/metadata/md5-cache/sci-libs/libccd-2.1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/danfis/libccd/archive/v2.1.tar.gz -> libccd-2.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=60919246eb40817484f6927b6d487bcc
diff --git a/metadata/md5-cache/sci-libs/libccd-9999 b/metadata/md5-cache/sci-libs/libccd-9999
index f42cae38e779..f46602682dd6 100644
--- a/metadata/md5-cache/sci-libs/libccd-9999
+++ b/metadata/md5-cache/sci-libs/libccd-9999
@@ -9,5 +9,5 @@ LICENSE=BSD
 PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1f350f55cf12fedd590b0a90e09d09a
diff --git a/metadata/md5-cache/sci-libs/libgeodecomp-0.5.0_pre20200420 b/metadata/md5-cache/sci-libs/libgeodecomp-0.5.0_pre20200420
index 22392152424f..465bd88de1a2 100644
--- a/metadata/md5-cache/sci-libs/libgeodecomp-0.5.0_pre20200420
+++ b/metadata/md5-cache/sci-libs/libgeodecomp-0.5.0_pre20200420
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/STEllAR-GROUP/libgeodecomp/archive/69c5573ac7b2b654d649e8902fad73b05bf33644.tar.gz -> libgeodecomp-0.5.0_pre20200420.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d58ebcce8ba97d229e2f6eb9be6b792
diff --git a/metadata/md5-cache/sci-libs/libint-2.0.5 b/metadata/md5-cache/sci-libs/libint-2.0.5
deleted file mode 100644
index 80d9b2b0b614..000000000000
--- a/metadata/md5-cache/sci-libs/libint-2.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost dev-libs/gmp[cxx] doc? ( dev-texlive/texlive-latex dev-tex/latex2html ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
-DESCRIPTION=Matrix elements (integrals) evaluation over Cartesian Gaussian functions
-EAPI=5
-HOMEPAGE=https://github.com/evaleev/libint
-IUSE=static-libs doc
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=virtual/fortran
-SLOT=2
-SRC_URI=https://github.com/evaleev/libint/archive/release-2-0-5.tar.gz -> libint-2.0.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e30595f6304818047588482a112a683f
diff --git a/metadata/md5-cache/sci-libs/liborigin-3.0.0 b/metadata/md5-cache/sci-libs/liborigin-3.0.0
index 262f84b19852..14c61b8188f2 100644
--- a/metadata/md5-cache/sci-libs/liborigin-3.0.0
+++ b/metadata/md5-cache/sci-libs/liborigin-3.0.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-cpp/tree
 SLOT=2
 SRC_URI=http://downloads.sourceforge.net/liborigin/liborigin-3.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6d090740647abba154d5672b6672388
diff --git a/metadata/md5-cache/sci-libs/libspatialindex-1.9.3 b/metadata/md5-cache/sci-libs/libspatialindex-1.9.3
index 9d4b58f9042b..763ccf6e40d6 100644
--- a/metadata/md5-cache/sci-libs/libspatialindex-1.9.3
+++ b/metadata/md5-cache/sci-libs/libspatialindex-1.9.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f68ed8c05a1cc7e9f6f8d5cada9ca38c
diff --git a/metadata/md5-cache/sci-libs/libsvm-3.22 b/metadata/md5-cache/sci-libs/libsvm-3.22
deleted file mode 100644
index d0a335eb585f..000000000000
--- a/metadata/md5-cache/sci-libs/libsvm-3.22
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=java? ( >=virtual/jdk-1.4 ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Library for Support Vector Machines
-EAPI=6
-HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/libsvm/
-IUSE=java openmp python tools elibc_FreeBSD java python_targets_python3_6
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=java? ( >=virtual/jre-1.4 ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) tools? ( sci-visualization/gnuplot ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( || ( python_targets_python3_6 ) )
-SLOT=0/2
-SRC_URI=https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-3.22.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=47d72a34f419056d9f5ed5ca5031bf57
diff --git a/metadata/md5-cache/sci-libs/libticables2-1.3.3-r1 b/metadata/md5-cache/sci-libs/libticables2-1.3.3-r1
deleted file mode 100644
index 197da8964e6c..000000000000
--- a/metadata/md5-cache/sci-libs/libticables2-1.3.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=dev-libs/glib:2 usb? ( virtual/libusb:1 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Library to handle different link cables for TI calculators
-EAPI=5
-HOMEPAGE=http://lpg.ticalc.org/prj_tilp/
-IUSE=debug doc nls static-libs usb
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 usb? ( virtual/libusb:1 ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/tilp/tilp2-linux/libticables2-1.3.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5bf4455df49c81928f66fadf0e9f4a7d
diff --git a/metadata/md5-cache/sci-libs/libticables2-1.3.4 b/metadata/md5-cache/sci-libs/libticables2-1.3.4
deleted file mode 100644
index 493a2e430a2a..000000000000
--- a/metadata/md5-cache/sci-libs/libticables2-1.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/glib:2 usb? ( virtual/libusb:1 ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DESCRIPTION=Library to handle different link cables for TI calculators
-EAPI=5
-HOMEPAGE=http://lpg.ticalc.org/prj_tilp/
-IUSE=debug doc nls static-libs usb
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 usb? ( virtual/libusb:1 ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/tilp/tilp2-linux/libticables2-1.3.4.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f119dea3eaff1daed47dbf548e92eb7f
diff --git a/metadata/md5-cache/sci-libs/libxc-2.1.3 b/metadata/md5-cache/sci-libs/libxc-2.1.3
deleted file mode 100644
index 22673938fca8..000000000000
--- a/metadata/md5-cache/sci-libs/libxc-2.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
-DESCRIPTION=A library of exchange-correlation functionals for use in DFT
-EAPI=5
-HOMEPAGE=https://octopus-code.org/wiki/Libxc
-IUSE=fortran static-libs -test
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=LGPL-3
-RDEPEND=virtual/fortran
-SLOT=0
-SRC_URI=https://www.tddft.org/programs/octopus/download/libxc/libxc-2.1.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=eef403c681ebdbc9044ab9430c4f585b
diff --git a/metadata/md5-cache/sci-libs/med-4.0.0-r2 b/metadata/md5-cache/sci-libs/med-4.0.0-r2
index f2278702e38f..3c7b426b2aef 100644
--- a/metadata/md5-cache/sci-libs/med-4.0.0-r2
+++ b/metadata/md5-cache/sci-libs/med-4.0.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_
 RESTRICT=!test? ( test ) python? ( test )
 SLOT=0
 SRC_URI=https://files.salome-platform.org/Salome/other/med-4.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e17da2d05c24c07e22054de4b9ede9a4
diff --git a/metadata/md5-cache/sci-libs/metis-5.1.0-r4 b/metadata/md5-cache/sci-libs/metis-5.1.0-r4
index ca1757298dff..4a57bd8bbf6d 100644
--- a/metadata/md5-cache/sci-libs/metis-5.1.0-r4
+++ b/metadata/md5-cache/sci-libs/metis-5.1.0-r4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=!sci-libs/parmetis virtual/fortran
 SLOT=0
 SRC_URI=http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e36309af138938884d8c53a70e0faa1
diff --git a/metadata/md5-cache/sci-libs/nlopt-2.6.2-r1 b/metadata/md5-cache/sci-libs/nlopt-2.6.2-r1
index 596c5cf823d0..76fa4595436c 100644
--- a/metadata/md5-cache/sci-libs/nlopt-2.6.2-r1
+++ b/metadata/md5-cache/sci-libs/nlopt-2.6.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stevengj/nlopt/archive/v2.6.2.tar.gz -> nlopt-2.6.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f6f41fb9788f2e4882d657335633c48
diff --git a/metadata/md5-cache/sci-libs/oce-0.18.3-r2 b/metadata/md5-cache/sci-libs/oce-0.18.3-r2
index e5a9a55f7a64..4ced1438bae7 100644
--- a/metadata/md5-cache/sci-libs/oce-0.18.3-r2
+++ b/metadata/md5-cache/sci-libs/oce-0.18.3-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/ti
 REQUIRED_USE=?? ( openmp tbb )
 SLOT=0.18.3
 SRC_URI=https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5fd277101295dec87597250474db3ad9
diff --git a/metadata/md5-cache/sci-libs/octomap-1.9.5 b/metadata/md5-cache/sci-libs/octomap-1.9.5
index a30bc997cf66..50bd1f8eeffc 100644
--- a/metadata/md5-cache/sci-libs/octomap-1.9.5
+++ b/metadata/md5-cache/sci-libs/octomap-1.9.5
@@ -9,5 +9,5 @@ LICENSE=BSD qt5? ( GPL-2 )
 RDEPEND=qt5? ( virtual/opengl dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libQGLViewer:= )
 SLOT=0/19
 SRC_URI=https://github.com/OctoMap/octomap/archive/v1.9.5.tar.gz -> octomap-1.9.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=525bcd0437e1430c51700b85c9be5c16
diff --git a/metadata/md5-cache/sci-libs/opencascade-7.4.0-r2 b/metadata/md5-cache/sci-libs/opencascade-7.4.0-r2
index 3b4017fb8c73..583420fc08e1 100644
--- a/metadata/md5-cache/sci-libs/opencascade-7.4.0-r2
+++ b/metadata/md5-cache/sci-libs/opencascade-7.4.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=inspector? ( qt5 ) ?? ( optimize tbb )
 RESTRICT=test
 SLOT=7.4.0
 SRC_URI=https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_4_0;sf=tgz -> opencascade-7.4.0.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b409a6d9951680f4d79c170162dd12a
diff --git a/metadata/md5-cache/sci-libs/sundials-5.1.0 b/metadata/md5-cache/sci-libs/sundials-5.1.0
index 6010df888187..6841402fdd46 100644
--- a/metadata/md5-cache/sci-libs/sundials-5.1.0
+++ b/metadata/md5-cache/sci-libs/sundials-5.1.0
@@ -11,5 +11,5 @@ RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse?
 REQUIRED_USE=hypre? ( mpi )
 SLOT=0/5
 SRC_URI=https://computation.llnl.gov/projects/sundials/download/sundials-5.1.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8087f56fe7a3fa1d04ee6e872b45420b
diff --git a/metadata/md5-cache/sci-libs/sundials-5.2.0 b/metadata/md5-cache/sci-libs/sundials-5.2.0
index b559df285750..90e9bbf8c009 100644
--- a/metadata/md5-cache/sci-libs/sundials-5.2.0
+++ b/metadata/md5-cache/sci-libs/sundials-5.2.0
@@ -11,5 +11,5 @@ RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse?
 REQUIRED_USE=hypre? ( mpi )
 SLOT=0/5
 SRC_URI=https://computation.llnl.gov/projects/sundials/download/sundials-5.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8087f56fe7a3fa1d04ee6e872b45420b
diff --git a/metadata/md5-cache/sci-libs/symengine-0.6.0 b/metadata/md5-cache/sci-libs/symengine-0.6.0
index 336cf995b548..3d957ea36a17 100644
--- a/metadata/md5-cache/sci-libs/symengine-0.6.0
+++ b/metadata/md5-cache/sci-libs/symengine-0.6.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gmp:= sys-libs/binutils-libs:= arb? ( sci-mathematics/arb:= ) b
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://github.com/sympy/symengine/archive/v0.6.0.tar.gz -> symengine-0.6.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cbb1991f8660db301753d420429bca01
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.2.0-r2 b/metadata/md5-cache/sci-libs/tensorflow-2.2.0-r2
new file mode 100644
index 000000000000..4129e0716cab
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.2.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip >=dev-libs/protobuf-3.8.0 dev-java/java-config dev-lang/swig =dev-util/bazel-2.0* cuda? ( >=dev-util/nvidia-cuda-toolkit-9.1[profiler] ) !python? ( dev-lang/python ) python? ( dev-python/cython dev-python/mock >=dev-python/grpcio-tools-1.28 ) >=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/double-conversion dev-libs/icu >=dev-libs/jsoncpp-1.9.2 dev-libs/libpcre dev-libs/nsync dev-libs/openssl:0= >=dev-libs/protobuf-3.8.0:= >=dev-libs/re2-0.2019.06.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.28 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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-libs/flatbuffers-1.12.0 dev-python/absl-py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/astor-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/astunparse[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/gast-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/h5py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/numpy-1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-pasta-0.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/opt-einsum[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/termcolor[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/grpcio-1.28[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wrapt-1.11.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/keras-preprocessing-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-visualization/tensorboard-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python? ( dev-python/mock dev-python/setuptools )
+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_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+PDEPEND=python? ( >=sci-libs/tensorflow-estimator-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev-libs/icu >=dev-libs/jsoncpp-1.9.2 dev-libs/libpcre dev-libs/nsync dev-libs/openssl:0= >=dev-libs/protobuf-3.8.0:= >=dev-libs/re2-0.2019.06.01 media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.28 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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-libs/flatbuffers-1.12.0 dev-python/absl-py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/astor-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/astunparse[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/gast-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/h5py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/numpy-1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-pasta-0.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/opt-einsum[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/protobuf-python-3.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/termcolor[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/grpcio-1.28[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wrapt-1.11.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=net-libs/google-cloud-cpp-0.10.0 >=sci-libs/keras-applications-1.0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/keras-preprocessing-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-visualization/tensorboard-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
+SLOT=0
+SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.2.0.tar.gz -> tensorflow-2.2.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.2.0-r1.tar.bz2 https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz https://gitlab.com/libeigen/eigen/-/archive/52a2fbbb008a47c5e3fb8ac1c65c2feecb0c511c/eigen-52a2fbbb008a47c5e3fb8ac1c65c2feecb0c511c.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.9.0/bazel_skylib-0.9.0.tar.gz https://github.com/bazelbuild/rules_apple/releases/download/0.18.0/rules_apple.0.18.0.tar.gz -> bazelbuild-rules_apple.0.18.0.tar.gz https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz -> bazelbuild-apple_support.0.7.1.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip 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_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz -> bazelbuild-rules_swift.0.12.1.tar.gz https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.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/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/387c3f74fd8efdc0be464b0e1a8033cc1eeb739c.tar.gz -> llvm-387c3f74fd8efdc0be464b0e1a8033cc1eeb739c.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.tar.gz -> nvidia-nccl-3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.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	7ff48fa8c11c2b3dbac767397bda586a	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cuda	c2f1b334711bbbf2130f339636dc7515	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1642540b8b2dfa59f5a88376eb2e2733
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r2 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r2
new file mode 100644
index 000000000000..1881ed59350b
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.2.0-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-java/java-config >=dev-util/bazel-0.20 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sci-libs/tensorflow[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=A high-level TensorFlow API that greatly simplifies machine learning programming
+EAPI=7
+HOMEPAGE=https://www.tensorflow.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=sci-libs/tensorflow[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/tensorflow/estimator/archive/v2.2.0.tar.gz -> tensorflow-estimator-2.2.0.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
+_eclasses_=bazel	7ff48fa8c11c2b3dbac767397bda586a	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e351cb7e3e853a420f2f2d03a3cec3bf
diff --git a/metadata/md5-cache/sci-libs/volk-2.3.0-r2 b/metadata/md5-cache/sci-libs/volk-2.3.0-r2
index 17fd2fa63fa0..1027b75784d4 100644
--- a/metadata/md5-cache/sci-libs/volk-2.3.0-r2
+++ b/metadata/md5-cache/sci-libs/volk-2.3.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gnuradio/volk/archive/v2.3.0.tar.gz -> volk-2.3.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2019bf6980eb0d43dd97bc54ca2884d5
diff --git a/metadata/md5-cache/sci-libs/votca-tools-1.6.2 b/metadata/md5-cache/sci-libs/votca-tools-1.6.2
index a2d8679f3d1b..9e1758599e95 100644
--- a/metadata/md5-cache/sci-libs/votca-tools-1.6.2
+++ b/metadata/md5-cache/sci-libs/votca-tools-1.6.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-cpp/eigen-3.3 sci-libs/fftw:3.0
 SLOT=0
 SRC_URI=https://github.com/votca/tools/archive/v1.6.2.tar.gz -> votca-tools-1.6.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0ce425a0fc040ec0dcd64b836329578
diff --git a/metadata/md5-cache/sci-libs/votca-tools-9999 b/metadata/md5-cache/sci-libs/votca-tools-9999
index 8f9426e93f1a..d703c4318e63 100644
--- a/metadata/md5-cache/sci-libs/votca-tools-9999
+++ b/metadata/md5-cache/sci-libs/votca-tools-9999
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-libs/expat >=dev-cpp/eigen-3.3 sci-libs/fftw:3.0
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0ce425a0fc040ec0dcd64b836329578
diff --git a/metadata/md5-cache/sci-libs/vtk-8.2.0 b/metadata/md5-cache/sci-libs/vtk-8.2.0
index 149dbda20118..2195e498036a 100644
--- a/metadata/md5-cache/sci-libs/vtk-8.2.0
+++ b/metadata/md5-cache/sci-libs/vtk-8.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( ^^ ( py
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.vtk.org/files/release/8.2/VTK-8.2.0.tar.gz doc? ( https://www.vtk.org/files/release/8.2/vtkDocHtml-8.2.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.2/VTKData-8.2.0.tar.gz https://www.vtk.org/files/release/8.2/VTKLargeData-8.2.0.tar.gz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83440dd6692a1e4cab123cfc2b7b583a
diff --git a/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r4 b/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r4
index 1acc7ef4fcff..24a12ced81ea 100644
--- a/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r4
+++ b/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r4
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-libs/libxml2:2 sci-libs/hdf5:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/xdmf2-1.0_p141226.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bd33a9a8f71f0519fcff11aa892cb19
diff --git a/metadata/md5-cache/sci-libs/xkaapi-2.1 b/metadata/md5-cache/sci-libs/xkaapi-2.1
deleted file mode 100644
index 64f72426488e..000000000000
--- a/metadata/md5-cache/sci-libs/xkaapi-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-apps/hwloc dev-libs/libffi >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
-DESCRIPTION=Kernel for Adaptative, Asynchronous Parallel and Interactive programming
-EAPI=5
-HOMEPAGE=http://kaapi.gforge.inria.fr
-IUSE=blas cxx fortran gpu openmp static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=CeCILL-2
-RDEPEND=sys-apps/hwloc dev-libs/libffi fortran? ( virtual/fortran )
-SLOT=0
-SRC_URI=https://gforge.inria.fr/frs/download.php/32735/xkaapi-2.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=18aee8110a875380c5e885781328d5b3
diff --git a/metadata/md5-cache/sci-mathematics/4ti2-1.6.5 b/metadata/md5-cache/sci-mathematics/4ti2-1.6.5
deleted file mode 100644
index 4f0358bd8582..000000000000
--- a/metadata/md5-cache/sci-mathematics/4ti2-1.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-mathematics/glpk:0[gmp] dev-libs/gmp[cxx] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Software package for algebraic, geometric and combinatorial problems
-EAPI=5
-HOMEPAGE=http://www.4ti2.de/
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86 ~x86-macos
-LICENSE=GPL-2
-RDEPEND=sci-mathematics/glpk:0[gmp] dev-libs/gmp[cxx]
-SLOT=0
-SRC_URI=http://4ti2.de/version_1.6.5/4ti2-1.6.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1f55748278c8db19242a88cc80ee514b
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index e46c9ccbf058..ce2b7a8707bc 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/agda-2.4.2.5-r2 b/metadata/md5-cache/sci-mathematics/agda-2.4.2.5-r2
index 8e1fb76c5093..5fa6f476b870 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.4.2.5-r2
+++ b/metadata/md5-cache/sci-mathematics/agda-2.4.2.5-r2
@@ -10,5 +10,5 @@ PDEPEND=stdlib? ( ~sci-mathematics/agda-stdlib-2.4.2.5 )
 RDEPEND=>=dev-haskell/binary-0.7.2.1:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?] >=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?] >=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?] >=dev-haskell/equivalence-0.2.5:=[profile?] <dev-haskell/equivalence-0.4:=[profile?] >=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?] >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.7.1.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/haskell-src-exts-1.16.0.1:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] >=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?] >=dev-haskell/quickcheck-2.8:2=[profile?] <dev-haskell/quickcheck-2.9:2=[profile?] >=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.4:=[profile?] >=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.3.3.3:=[profile?] >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/void-0.5.4:=[profile?] <dev-haskell/void-0.9:=[profile?] >=dev-haskell/xhtml-3000.2.1:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] >=dev-haskell/zlib-0.4.0.1:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/hashtables-1.0.1.8:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] >=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] emacs? ( >=app-editors/emacs-23.1:* app-emacs/haskell-mode ) !sci-mathematics/agda-executable
 SLOT=0/2.4.2.5
 SRC_URI=https://hackage.haskell.org/package/Agda-2.4.2.5/Agda-2.4.2.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ef9277d10beb5a74b02958390a904c7f
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.5.2-r1 b/metadata/md5-cache/sci-mathematics/agda-2.5.2-r1
index c8dc00402f39..071543ff698f 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.5.2-r1
+++ b/metadata/md5-cache/sci-mathematics/agda-2.5.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?]
 RESTRICT=test
 SLOT=0/2.5.2
 SRC_URI=https://hackage.haskell.org/package/Agda-2.5.2/Agda-2.5.2.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9d2baea2dba3c8a6466cb413206afa75
diff --git a/metadata/md5-cache/sci-mathematics/agda-2.5.2-r2 b/metadata/md5-cache/sci-mathematics/agda-2.5.2-r2
index 23d52b8987cd..f48d9ed41ca7 100644
--- a/metadata/md5-cache/sci-mathematics/agda-2.5.2-r2
+++ b/metadata/md5-cache/sci-mathematics/agda-2.5.2-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?]
 RESTRICT=test
 SLOT=0/2.5.2
 SRC_URI=https://hackage.haskell.org/package/Agda-2.5.2/Agda-2.5.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=95e61a26cb4aaa45c0a27c0a45ffa1e0
diff --git a/metadata/md5-cache/sci-mathematics/agda-stdlib-2.4.2.5 b/metadata/md5-cache/sci-mathematics/agda-stdlib-2.4.2.5
index a49cdccbb1e8..10a5d4e18e79 100644
--- a/metadata/md5-cache/sci-mathematics/agda-stdlib-2.4.2.5
+++ b/metadata/md5-cache/sci-mathematics/agda-stdlib-2.4.2.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=~sci-mathematics/agda-2.4.2.5:=[profile?] >=dev-haskell/filemanip-0.3.6.2[profile?] <dev-haskell/filemanip-0.4[profile?] >=dev-lang/ghc-6.12.1 ffi? ( sci-mathematics/agda-lib-ffi )
 SLOT=0
 SRC_URI=https://github.com/agda/agda-stdlib/archive/2.4.2.5.tar.gz -> agda-stdlib-2.4.2.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=13c6e1ace5c2cfedfa579a8c7450d0c9
diff --git a/metadata/md5-cache/sci-mathematics/agda-stdlib-2.5.2.0.13 b/metadata/md5-cache/sci-mathematics/agda-stdlib-2.5.2.0.13
index 165fd9ebb22e..a3481b959202 100644
--- a/metadata/md5-cache/sci-mathematics/agda-stdlib-2.5.2.0.13
+++ b/metadata/md5-cache/sci-mathematics/agda-stdlib-2.5.2.0.13
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=sci-mathematics/agda-2.5.2:=[profile?] ffi? ( sci-mathematics/agda-lib-ffi )
 SLOT=0
 SRC_URI=https://github.com/agda/agda-stdlib/archive/v0.13.tar.gz -> agda-stdlib-2.5.2.0.13.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	ghc-package	e3a4a688accbd5f1226e46b379cc1c3e	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=6622a20f8b8d7283808d6d00ddfca395
diff --git a/metadata/md5-cache/sci-mathematics/fricas-1.3.4 b/metadata/md5-cache/sci-mathematics/fricas-1.3.4
index fb38cf60c74f..bc5a6dbd989d 100644
--- a/metadata/md5-cache/sci-mathematics/fricas-1.3.4
+++ b/metadata/md5-cache/sci-mathematics/fricas-1.3.4
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( >=app-editors/emacs-23.1
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/fricas/fricas-1.3.4-full.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=572e8b67c5c0b3e6e1eb96bb1417aaa8
diff --git a/metadata/md5-cache/sci-mathematics/fricas-1.3.5 b/metadata/md5-cache/sci-mathematics/fricas-1.3.5
index 7b9ba2d3f148..4d6413577b46 100644
--- a/metadata/md5-cache/sci-mathematics/fricas-1.3.5
+++ b/metadata/md5-cache/sci-mathematics/fricas-1.3.5
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( >=app-editors/emacs-23.1
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/fricas/fricas-1.3.5-full.tar.bz2
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=572e8b67c5c0b3e6e1eb96bb1417aaa8
diff --git a/metadata/md5-cache/sci-mathematics/fricas-1.3.6 b/metadata/md5-cache/sci-mathematics/fricas-1.3.6
index a0ac2ca4ced6..e99666203a8b 100644
--- a/metadata/md5-cache/sci-mathematics/fricas-1.3.6
+++ b/metadata/md5-cache/sci-mathematics/fricas-1.3.6
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-libs/libXpm x11-libs/libICE ) emacs? ( >=app-editors/emacs-23.1
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/fricas/fricas-1.3.6-full.tar.bz2
-_eclasses_=elisp-common	848a95b01913ff6374bcb5eae09c52ba	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=elisp-common	34cc2b6f6d8914019a353fe39cff43ce	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e6cab1953113fb8f580268ea62aa9803
diff --git a/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1 b/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
index b10dc3295195..a1a94dda6309 100644
--- a/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
+++ b/metadata/md5-cache/sci-mathematics/geomview-1.9.5-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=x11-libs/motif:0 virtual/glu virtual/opengl emacs? ( >=app-editors/emacs-23.1:* ) zlib? ( sys-libs/zlib ) x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/geomview/geomview-1.9.5.tar.bz2 https://dev.gentoo.org/~jlec/distfiles/geomview.png.tar
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=c10b3c5791135339bc14de0ca2c1f970
diff --git a/metadata/md5-cache/sci-mathematics/gretl-1.9.14 b/metadata/md5-cache/sci-mathematics/gretl-1.9.14
index b70331345743..fc4cbe5a8732 100644
--- a/metadata/md5-cache/sci-mathematics/gretl-1.9.14
+++ b/metadata/md5-cache/sci-mathematics/gretl-1.9.14
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/gmp:0= dev-libs/libxml2:2 dev-libs/mpfr:0 sci-l
 REQUIRED_USE=emacs? ( gtk )
 SLOT=0
 SRC_URI=mirror://sourceforge/gretl/gretl-1.9.14.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=92b46e72caae37b28cf7c97e290b42a0
diff --git a/metadata/md5-cache/sci-mathematics/gretl-1.9.90 b/metadata/md5-cache/sci-mathematics/gretl-1.9.90
index 51e98c907dbe..19b20b1268c3 100644
--- a/metadata/md5-cache/sci-mathematics/gretl-1.9.90
+++ b/metadata/md5-cache/sci-mathematics/gretl-1.9.90
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/glib:2= dev-libs/gmp:0= dev-libs/libxml2:2= dev-libs/mpfr:0= sc
 REQUIRED_USE=emacs? ( gtk ) !curl? ( !gtk )
 SLOT=0/10
 SRC_URI=mirror://sourceforge/gretl/gretl-1.9.90.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=fc7b59646d3b24bfc4a987c268a9a9f9
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.38.1 b/metadata/md5-cache/sci-mathematics/maxima-5.38.1
index 58573e7c64aa..9ffd2781bbea 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.38.1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.38.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( >=app-editors/emacs-23.1:* virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.38.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=b5059ddfc28fcf98c92b911efd0539ad
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.42.1 b/metadata/md5-cache/sci-mathematics/maxima-5.42.1
index 8a7a4d666167..00e1ee65993c 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.42.1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.42.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( >=app-editors/emacs-23.1:* virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.42.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b1728a482df789b983aa05a10dea46b
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.42.2 b/metadata/md5-cache/sci-mathematics/maxima-5.42.2
index 6e464c934e51..ced9dacdd169 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.42.2
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.42.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( >=app-editors/emacs-23.1:* virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.42.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b6cb337c7e840060c8428ab35bc1289
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.43.2 b/metadata/md5-cache/sci-mathematics/maxima-5.43.2
index 8af54d979f25..56e2bf06d42e 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.43.2
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.43.2
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.43.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8de3f84f5f2ce1aa82bb8df535717cca
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.44.0 b/metadata/md5-cache/sci-mathematics/maxima-5.44.0
index d557295f1325..0c1dd7ae04e0 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.44.0
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.44.0
@@ -10,5 +10,5 @@ RDEPEND=X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.44.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19f7469854c90b660eeb1118c6e069fa
diff --git a/metadata/md5-cache/sci-mathematics/pspp-1.2.0 b/metadata/md5-cache/sci-mathematics/pspp-1.2.0
index b887dfdfffbf..ea03ec1a324e 100644
--- a/metadata/md5-cache/sci-mathematics/pspp-1.2.0
+++ b/metadata/md5-cache/sci-mathematics/pspp-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/libxml2:2= sci-libs/gsl:0= sys-devel/gettext:0= sys-libs/readline:0= sys-libs/zlib:0= virtual/libiconv cairo? ( x11-libs/cairo:0=[svg] ) emacs? ( >=app-editors/emacs-23.1:* ) gtk? ( x11-libs/gtk+:3= x11-libs/gtksourceview:3.0= x11-libs/spread-sheet-widget ) ncurses? ( sys-libs/ncurses:0= ) postgres? ( dev-db/postgresql:=[server] )
 SLOT=0/1.2.0
 SRC_URI=mirror://gnu/pspp/pspp-1.2.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=dbde3a7500fb0be1b8c4e2ab5dfc1955
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.7.1b b/metadata/md5-cache/sci-mathematics/rkward-0.7.1b
index a6e8ba756e7d..a6a7f734db40 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.7.1b
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.7.1b
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ LGPL-2
 RDEPEND=dev-lang/R dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kdewebkit:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kjobwidgets:5 kde-frameworks/knotifications:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 kde-frameworks/ktexteditor:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 virtual/libintl || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/rkward/0.7.1b/src/rkward-0.7.1b.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4999c72965fd0cd29575f9cf32ef5c5c
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.3.1056 b/metadata/md5-cache/sci-mathematics/rstudio-1.3.1056
index 8c5935eedcaa..cc13f855dbf7 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-1.3.1056
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.3.1056
@@ -10,5 +10,5 @@ LICENSE=AGPL-3
 RDEPEND=>=app-text/pandoc-1.19.2.1 dev-java/aopalliance:1 dev-java/gin:2.1 dev-java/javax-inject =dev-java/validation-api-1.0*:1.0[source] dev-haskell/pandoc-citeproc dev-lang/R dev-libs/boost:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux sys-devel/clang:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.12.6:5 >=dev-qt/qtdeclarative-5.12.6:5 >=dev-qt/qtdbus-5.12.6:5 >=dev-qt/qtgui-5.12.6:5 >=dev-qt/qtnetwork-5.12.6:5 >=dev-qt/qtopengl-5.12.6:5 >=dev-qt/qtpositioning-5.12.6:5 >=dev-qt/qtprintsupport-5.12.6:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.12.6:5 >=dev-qt/qtsql-5.12.6:5 >=dev-qt/qtsvg-5.12.6:5 >=dev-qt/qtwebchannel-5.12.6:5 >=dev-qt/qtwebengine-5.12.6:5[widgets] >=dev-qt/qtwidgets-5.12.6:5 >=dev-qt/qtxml-5.12.6:5 >=dev-qt/qtxmlpatterns-5.12.6:5 server? ( sys-libs/pam ) ) dedicated? ( sys-libs/pam ) dedicated? ( sys-libs/pam acct-user/rstudio-server acct-group/rstudio-server ) server? ( acct-user/rstudio-server acct-group/rstudio-server ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/rstudio/rstudio/archive/v1.3.1056.tar.gz -> rstudio-1.3.1056.tar.gz https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d089916d8d2708092b0db7481499990
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093 b/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093
new file mode 100644
index 000000000000..ccafd2131806
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.3.1093
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-text/pandoc-2.9.2.1 dev-java/aopalliance:1 dev-java/gin:2.1 dev-java/javax-inject =dev-java/validation-api-1.0*:1.0[source] dev-haskell/pandoc-citeproc dev-lang/R dev-libs/boost:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux sys-devel/clang:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.12.6:5 >=dev-qt/qtdeclarative-5.12.6:5 >=dev-qt/qtdbus-5.12.6:5 >=dev-qt/qtgui-5.12.6:5 >=dev-qt/qtnetwork-5.12.6:5 >=dev-qt/qtopengl-5.12.6:5 >=dev-qt/qtpositioning-5.12.6:5 >=dev-qt/qtprintsupport-5.12.6:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.12.6:5 >=dev-qt/qtsql-5.12.6:5 >=dev-qt/qtsvg-5.12.6:5 >=dev-qt/qtwebchannel-5.12.6:5 >=dev-qt/qtwebengine-5.12.6:5[widgets] >=dev-qt/qtwidgets-5.12.6:5 >=dev-qt/qtxml-5.12.6:5 >=dev-qt/qtxmlpatterns-5.12.6:5 server? ( sys-libs/pam ) ) dedicated? ( sys-libs/pam ) dedicated? ( sys-libs/pam acct-user/rstudio-server acct-group/rstudio-server ) server? ( acct-user/rstudio-server acct-group/rstudio-server ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) app-arch/unzip dev-java/ant-core >=virtual/jdk-1.8:= virtual/pkgconfig >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=IDE for the R language
+EAPI=7
+HOMEPAGE=http://www.rstudio.org https://github.com/rstudio/rstudio/
+IUSE=dedicated libressl server elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=AGPL-3
+RDEPEND=>=app-text/pandoc-2.9.2.1 dev-java/aopalliance:1 dev-java/gin:2.1 dev-java/javax-inject =dev-java/validation-api-1.0*:1.0[source] dev-haskell/pandoc-citeproc dev-lang/R dev-libs/boost:= >=dev-libs/mathjax-2.7.4 sys-apps/util-linux sys-devel/clang:* sys-libs/zlib >=virtual/jre-1.8:= x11-libs/pango !dedicated? ( >=dev-qt/qtcore-5.12.6:5 >=dev-qt/qtdeclarative-5.12.6:5 >=dev-qt/qtdbus-5.12.6:5 >=dev-qt/qtgui-5.12.6:5 >=dev-qt/qtnetwork-5.12.6:5 >=dev-qt/qtopengl-5.12.6:5 >=dev-qt/qtpositioning-5.12.6:5 >=dev-qt/qtprintsupport-5.12.6:5 >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] >=dev-qt/qtsensors-5.12.6:5 >=dev-qt/qtsql-5.12.6:5 >=dev-qt/qtsvg-5.12.6:5 >=dev-qt/qtwebchannel-5.12.6:5 >=dev-qt/qtwebengine-5.12.6:5[widgets] >=dev-qt/qtwidgets-5.12.6:5 >=dev-qt/qtxml-5.12.6:5 >=dev-qt/qtxmlpatterns-5.12.6:5 server? ( sys-libs/pam ) ) dedicated? ( sys-libs/pam ) dedicated? ( sys-libs/pam acct-user/rstudio-server acct-group/rstudio-server ) server? ( acct-user/rstudio-server acct-group/rstudio-server ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://github.com/rstudio/rstudio/archive/v1.3.1093.tar.gz -> rstudio-1.3.1093.tar.gz https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=536541ec34a1153cab3ec6944ae32482
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.0.2 b/metadata/md5-cache/sci-mathematics/singular-4.0.2
index b83208ff89e2..5ae346b6de94 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? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-mathematics/4ti2 sci-libs/cddlib
 SLOT=0
 SRC_URI=https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2.tar.gz https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2-share.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a2e8eb245d60a0af896a1657bde297d9
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.0.3 b/metadata/md5-cache/sci-mathematics/singular-4.0.3
index fe2ae73778ad..0dc6ff42147a 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? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-mathematics/4ti2 sci-libs/cddlib
 SLOT=0
 SRC_URI=https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-3/singular-4.0.3.tar.gz https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-3/singular-4.0.3-share.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=8b62bea3f706f27107723a8c4ba9c7c2
diff --git a/metadata/md5-cache/sci-mathematics/twelf-1.7.1 b/metadata/md5-cache/sci-mathematics/twelf-1.7.1
index e8dad95b2908..e34f099b1468 100644
--- a/metadata/md5-cache/sci-mathematics/twelf-1.7.1
+++ b/metadata/md5-cache/sci-mathematics/twelf-1.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/mlton doc? ( virtual/latex-base app-text/texi2html ) emacs? ( >
 RESTRICT=test
 SLOT=0/1.7.1
 SRC_URI=http://twelf.plparty.org/releases/twelf-src-1.7.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=65ba6032bb1c7525560e8291e3e621be
diff --git a/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1 b/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1
index 5e74f4ffb02a..7549c18009fe 100644
--- a/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1
+++ b/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/mlton-20180207 doc? ( virtual/latex-base app-text/texi2html )
 RESTRICT=test
 SLOT=0/1.7.1
 SRC_URI=http://twelf.plparty.org/releases/twelf-src-1.7.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a1987f8d95dd1a3bb1f46796568add50
diff --git a/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1 b/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
index ccf4897ee907..27c4fc7ad6c3 100644
--- a/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
+++ b/metadata/md5-cache/sci-mathematics/yacas-1.7.0-r1
@@ -11,5 +11,5 @@ RDEPEND=gui? ( dev-qt/qtcore:5[icu] dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://codeload.github.com/grzegorzmazur/yacas/tar.gz/v1.7.0 -> yacas-1.7.0.tar.gz gui? ( https://dev.gentoo.org/~asturm/distfiles/yacas-bundled-1.7.0.tar.xz )
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=428ba1aab526b9a32662fbdb3a17ac5d
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.8 b/metadata/md5-cache/sci-mathematics/z3-4.8.8
index c0c1240f31be..a027bba637c9 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.8
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.8
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0/4.8
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66676e0a8436ab9bdde209ab418ee9e2
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.9 b/metadata/md5-cache/sci-mathematics/z3-4.8.9
index 1a9af92873a1..828b63a4e5f9 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.9
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.9
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0/4.8
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a1264ab130376b90fb6073e1c3df70e
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 9c1f88f856ab..84e01d78d0e6 100644
--- a/metadata/md5-cache/sci-misc/Manifest.gz
+++ b/metadata/md5-cache/sci-misc/Manifest.gz
diff --git a/metadata/md5-cache/sci-misc/vitables-3.0.0-r2 b/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
new file mode 100644
index 000000000000..72d02813e17b
--- /dev/null
+++ b/metadata/md5-cache/sci-misc/vitables-3.0.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] dev-python/pytables[python_targets_python3_6(-)] dev-python/QtPy[gui,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] dev-python/pytables[python_targets_python3_7(-)] dev-python/QtPy[gui,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] dev-python/pytables[python_targets_python3_8(-)] dev-python/QtPy[gui,python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] )
+DESCRIPTION=A graphical tool for browsing / editing files in both PyTables and HDF5 formats
+EAPI=6
+HOMEPAGE=https://vitables.org/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] dev-python/pytables[python_targets_python3_6(-)] dev-python/QtPy[gui,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] dev-python/pytables[python_targets_python3_7(-)] dev-python/QtPy[gui,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] dev-python/pytables[python_targets_python3_8(-)] dev-python/QtPy[gui,python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=mirror://sourceforge/vitables/ViTables-3.0.0.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8e653dad40c4c6a2fe72465356344c2b
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 872a01b7fbd3..8c0d17d568e3 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/bullet-2.86 b/metadata/md5-cache/sci-physics/bullet-2.86
index f62668dd2e17..85b4b2365271 100644
--- a/metadata/md5-cache/sci-physics/bullet-2.86
+++ b/metadata/md5-cache/sci-physics/bullet-2.86
@@ -11,5 +11,5 @@ RDEPEND=virtual/opengl media-libs/freeglut
 RESTRICT=test
 SLOT=0/2.86
 SRC_URI=https://github.com/bulletphysics/bullet3/archive/2.86.tar.gz -> bullet-2.86.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=739b07dd66aa466649b2fcadfbd202b9
diff --git a/metadata/md5-cache/sci-physics/bullet-2.89 b/metadata/md5-cache/sci-physics/bullet-2.89
index 78ebf9e9cbf9..9cb5d12ec4b0 100644
--- a/metadata/md5-cache/sci-physics/bullet-2.89
+++ b/metadata/md5-cache/sci-physics/bullet-2.89
@@ -5,12 +5,12 @@ DESCRIPTION=Continuous Collision Detection and Physics Library
 EAPI=7
 HOMEPAGE=http://www.bulletphysics.com/
 IUSE=+bullet3 doc double-precision examples extras openmp tbb test threads
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=ZLIB
 RDEPEND=virtual/opengl media-libs/freeglut tbb? ( dev-cpp/tbb )
 REQUIRED_USE=openmp? ( threads ) tbb? ( threads )
 RESTRICT=test
 SLOT=0/2.89
 SRC_URI=https://github.com/bulletphysics/bullet3/archive/2.89.tar.gz -> bullet-2.89.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=59f51b8a5f4d26f81537153eae9c6d6b
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2d397b1e1ce4dd5436feccaf119450c3
diff --git a/metadata/md5-cache/sci-physics/espresso-4.1.3 b/metadata/md5-cache/sci-physics/espresso-4.1.3
index 96abdbad2b12..67cd0a587ccc 100644
--- a/metadata/md5-cache/sci-physics/espresso-4.1.3
+++ b/metadata/md5-cache/sci-physics/espresso-4.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressomd/espresso/releases/download/4.1.3/espresso-4.1.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c9d80614d2e80198d6d44e5c94dac12d
diff --git a/metadata/md5-cache/sci-physics/espresso-9999 b/metadata/md5-cache/sci-physics/espresso-9999
index 448031488ae5..80981ccf3203 100644
--- a/metadata/md5-cache/sci-physics/espresso-9999
+++ b/metadata/md5-cache/sci-physics/espresso-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c9d80614d2e80198d6d44e5c94dac12d
diff --git a/metadata/md5-cache/sci-physics/fastjet-3.0.3-r1 b/metadata/md5-cache/sci-physics/fastjet-3.0.3-r1
deleted file mode 100644
index e9b1dffd0d64..000000000000
--- a/metadata/md5-cache/sci-physics/fastjet-3.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cgal? ( sci-mathematics/cgal ) doc? ( app-doc/doxygen[dot] ) plugins? ( sci-physics/siscone ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 plugins? ( virtual/fortran )
-DESCRIPTION=Fast implementation of several recombination jet algorithms
-EAPI=5
-HOMEPAGE=http://www.fastjet.fr/
-IUSE=cgal doc examples +plugins static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 QPL
-RDEPEND=cgal? ( sci-mathematics/cgal ) plugins? ( virtual/fortran )
-SLOT=0
-SRC_URI=http://www.fastjet.fr/repo/fastjet-3.0.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=74933282e1b8aa85a1e49a37eb841f23
diff --git a/metadata/md5-cache/sci-physics/geant-vmc-4.4.0 b/metadata/md5-cache/sci-physics/geant-vmc-4.4.0
index 34ae205207b3..cdcf5b13b3da 100644
--- a/metadata/md5-cache/sci-physics/geant-vmc-4.4.0
+++ b/metadata/md5-cache/sci-physics/geant-vmc-4.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=sci-physics/geant-4.10.03:=[opengl,geant3?] sci-physics/root:=[c++11,v
 RESTRICT=!examples? ( test ) !geant3? ( test ) !g4root? ( test ) !mtroot? ( test ) !test? ( test ) !vgm? ( test )
 SLOT=4
 SRC_URI=http://root.cern.ch/download/vmc/geant4_vmc.4.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad2d99d4d79a14e48adffe365cef70cb
diff --git a/metadata/md5-cache/sci-physics/geant-vmc-4.5.1_p1 b/metadata/md5-cache/sci-physics/geant-vmc-4.5.1_p1
index 1ab85871d719..c48c8ee3654f 100644
--- a/metadata/md5-cache/sci-physics/geant-vmc-4.5.1_p1
+++ b/metadata/md5-cache/sci-physics/geant-vmc-4.5.1_p1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 )
 RESTRICT=!examples? ( test ) !geant3? ( test ) !g4root? ( test ) !mtroot? ( test ) !test? ( test ) !vgm? ( test )
 SLOT=4
 SRC_URI=https://github.com/vmc-project/geant4-vmc/archive/v5-1-p1.tar.gz -> geant-vmc-4.5.1_p1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9617ae52356fa2f9e678885984f8bae
diff --git a/metadata/md5-cache/sci-physics/geant-vmc-9999 b/metadata/md5-cache/sci-physics/geant-vmc-9999
index 50ae55d7c4bb..3b4abf59af3e 100644
--- a/metadata/md5-cache/sci-physics/geant-vmc-9999
+++ b/metadata/md5-cache/sci-physics/geant-vmc-9999
@@ -11,5 +11,5 @@ RDEPEND=rootvmc? ( >=sci-physics/root-6.18:=[vmc] !!sci-physics/vmc ) !rootvmc?
 REQUIRED_USE=^^ ( c++11 c++14 c++17 )
 RESTRICT=!examples? ( test ) !geant3? ( test ) !g4root? ( test ) !mtroot? ( test ) !test? ( test ) !vgm? ( test )
 SLOT=4
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9617ae52356fa2f9e678885984f8bae
diff --git a/metadata/md5-cache/sci-physics/root-6.18.04-r3 b/metadata/md5-cache/sci-physics/root-6.18.04-r3
index 529509f32526..442d97fbf105 100644
--- a/metadata/md5-cache/sci-physics/root-6.18.04-r3
+++ b/metadata/md5-cache/sci-physics/root-6.18.04-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !open
 RESTRICT=!test? ( test )
 SLOT=6.18/04
 SRC_URI=https://root.cern/download/root_v6.18.04.source.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	cuda	c2f1b334711bbbf2130f339636dc7515	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	cuda	c2f1b334711bbbf2130f339636dc7515	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ca6f89ac8151ea00844c87a951492db
diff --git a/metadata/md5-cache/sci-physics/root-6.20.06 b/metadata/md5-cache/sci-physics/root-6.20.06
index 1ef6ae5f57bf..5e53410c5b09 100644
--- a/metadata/md5-cache/sci-physics/root-6.20.06
+++ b/metadata/md5-cache/sci-physics/root-6.20.06
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asim
 RESTRICT=!test? ( test )
 SLOT=6.20/06
 SRC_URI=https://root.cern/download/root_v6.20.06.source.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd40366ee8a9079e0dda3226be544789
diff --git a/metadata/md5-cache/sci-physics/root-6.20.08 b/metadata/md5-cache/sci-physics/root-6.20.08
index 17919a04ba02..3da1e5ac5bfc 100644
--- a/metadata/md5-cache/sci-physics/root-6.20.08
+++ b/metadata/md5-cache/sci-physics/root-6.20.08
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asim
 RESTRICT=!test? ( test )
 SLOT=6.20/08
 SRC_URI=https://root.cern/download/root_v6.20.08.source.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd40366ee8a9079e0dda3226be544789
diff --git a/metadata/md5-cache/sci-physics/root-6.22.00 b/metadata/md5-cache/sci-physics/root-6.22.00
index 159f91bd2cd1..59c0521f122a 100644
--- a/metadata/md5-cache/sci-physics/root-6.22.00
+++ b/metadata/md5-cache/sci-physics/root-6.22.00
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asim
 RESTRICT=!test? ( test )
 SLOT=6.22/00
 SRC_URI=https://root.cern/download/root_v6.22.00.source.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c5d4ec20b88b9154f8395bbb1edb4dde
diff --git a/metadata/md5-cache/sci-physics/root-6.22.02-r1 b/metadata/md5-cache/sci-physics/root-6.22.02-r1
index 722ec875c1b8..e14b79fafd54 100644
--- a/metadata/md5-cache/sci-physics/root-6.22.02-r1
+++ b/metadata/md5-cache/sci-physics/root-6.22.02-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asim
 RESTRICT=!test? ( test )
 SLOT=6.22/02
 SRC_URI=https://root.cern/download/root_v6.22.02.source.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b87588a5ca16e1d3302ab6edde8abeab
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
index 8a397dec8c55..35dfe7098397 100644
--- a/metadata/md5-cache/sci-physics/root-9999
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -11,5 +11,5 @@ RDEPEND=app-arch/lz4 app-arch/zstd app-arch/xz-utils fortran? ( dev-lang/cfortra
 REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva ) cudnn? ( cuda ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cuda	c2f1b334711bbbf2130f339636dc7515	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2968604932e94842c3b7cce4c1056df7
diff --git a/metadata/md5-cache/sci-physics/thepeg-1.9.2 b/metadata/md5-cache/sci-physics/thepeg-1.9.2
index ad58e2ceff3a..f57d9f38733b 100644
--- a/metadata/md5-cache/sci-physics/thepeg-1.9.2
+++ b/metadata/md5-cache/sci-physics/thepeg-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-phy
 RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=http://www.hepforge.org/archive/thepeg/ThePEG-1.9.2.tar.bz2 test? ( hepmc? ( http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq5l.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/GRV98nlo.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/MRST2001nlo.LHgrid ) )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=518ccc097e45f742bc8e3720987a9297
diff --git a/metadata/md5-cache/sci-physics/thepeg-2.0.0 b/metadata/md5-cache/sci-physics/thepeg-2.0.0
index f83817044bc2..27a02be84059 100644
--- a/metadata/md5-cache/sci-physics/thepeg-2.0.0
+++ b/metadata/md5-cache/sci-physics/thepeg-2.0.0
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-phy
 RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=http://www.hepforge.org/archive/thepeg/ThePEG-2.0.0.tar.bz2 test? ( hepmc? ( http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq5l.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/GRV98nlo.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/MRST2001nlo.LHgrid ) )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=bfc182536cceffa97f636064d894e46a
diff --git a/metadata/md5-cache/sci-physics/thepeg-2.0.4 b/metadata/md5-cache/sci-physics/thepeg-2.0.4
index 35af792165c7..aef97b31acb8 100644
--- a/metadata/md5-cache/sci-physics/thepeg-2.0.4
+++ b/metadata/md5-cache/sci-physics/thepeg-2.0.4
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/gsl:0= emacs? ( >=app-editors/emacs-23.1:* ) fastjet? ( sci-phy
 RESTRICT=!test? ( test )
 SLOT=0/20
 SRC_URI=http://www.hepforge.org/archive/thepeg/ThePEG-2.0.4.tar.bz2 test? ( hepmc? ( http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq5l.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/GRV98nlo.LHgrid http://www.hepforge.org/archive/lhapdf/pdfsets/current/MRST2001nlo.LHgrid ) )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=9163c314a3a38f56254e3e1082004232
diff --git a/metadata/md5-cache/sci-physics/vgm-4.5 b/metadata/md5-cache/sci-physics/vgm-4.5
index c1dad926f2c7..42cf5fc53d43 100644
--- a/metadata/md5-cache/sci-physics/vgm-4.5
+++ b/metadata/md5-cache/sci-physics/vgm-4.5
@@ -11,5 +11,5 @@ RDEPEND=sci-physics/clhep:= root? ( >=sci-physics/root-6.14:=[c++11] ) geant4? (
 RESTRICT=!geant4? ( test ) !root? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vmc-project/vgm/archive/v4-5.tar.gz -> vgm-4.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f51727018e944d2011f7b06e61792e20
diff --git a/metadata/md5-cache/sci-physics/vgm-4.8 b/metadata/md5-cache/sci-physics/vgm-4.8
index acef19b3607f..b68f0b9cdced 100644
--- a/metadata/md5-cache/sci-physics/vgm-4.8
+++ b/metadata/md5-cache/sci-physics/vgm-4.8
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( c++11 c++14 c++17 )
 RESTRICT=!geant4? ( test ) !root? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vmc-project/vgm/archive/v4-8.tar.gz -> vgm-4.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=754ff165f5212e872fe85251e5379e30
diff --git a/metadata/md5-cache/sci-physics/vgm-9999 b/metadata/md5-cache/sci-physics/vgm-9999
index 822019418a10..0c91ebece174 100644
--- a/metadata/md5-cache/sci-physics/vgm-9999
+++ b/metadata/md5-cache/sci-physics/vgm-9999
@@ -11,5 +11,5 @@ RDEPEND=sci-physics/clhep:= geant4? ( >=sci-physics/geant-4.10.6[c++11?,c++14?,c
 REQUIRED_USE=^^ ( c++11 c++14 c++17 )
 RESTRICT=!geant4? ( test ) !root? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=754ff165f5212e872fe85251e5379e30
diff --git a/metadata/md5-cache/sci-physics/vmc-1.0_p2 b/metadata/md5-cache/sci-physics/vmc-1.0_p2
index 344136634143..ec947537a3fa 100644
--- a/metadata/md5-cache/sci-physics/vmc-1.0_p2
+++ b/metadata/md5-cache/sci-physics/vmc-1.0_p2
@@ -11,5 +11,5 @@ RDEPEND=>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?,-vmc]
 REQUIRED_USE=^^ ( c++11 c++14 c++17 )
 SLOT=0
 SRC_URI=https://github.com/vmc-project/vmc/archive/v1-0-p2.tar.gz -> vmc-1.0_p2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4614ba4aac9d8ce87fad7ccf01199bf
diff --git a/metadata/md5-cache/sci-physics/vmc-9999 b/metadata/md5-cache/sci-physics/vmc-9999
index 88c722e67f5e..c04ff0fa5526 100644
--- a/metadata/md5-cache/sci-physics/vmc-9999
+++ b/metadata/md5-cache/sci-physics/vmc-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=sci-physics/root-6.18:=[c++11?,c++14?,c++17?,-vmc]
 REQUIRED_USE=^^ ( c++11 c++14 c++17 )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4614ba4aac9d8ce87fad7ccf01199bf
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index bdeebaa3c1f8..b96ec5d995d6 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/epix-1.2.11-r2 b/metadata/md5-cache/sci-visualization/epix-1.2.11-r2
index e755e05c48c2..c725c3d8227c 100644
--- a/metadata/md5-cache/sci-visualization/epix-1.2.11-r2
+++ b/metadata/md5-cache/sci-visualization/epix-1.2.11-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=https://mathcs.holycross.edu/~ahwang/epix/epix-1.2.11_withpdf.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=95b289831efcb82bc053ed0cf2c39779
diff --git a/metadata/md5-cache/sci-visualization/gle-4.2.5-r1 b/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
index 351e56b9d0e5..fe6412082f33 100644
--- a/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
+++ b/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2 emacs? ( GPL-2 )
 RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) doc? ( dev-texlive/texlive-latexextra ) emacs? ( >=app-editors/emacs-23.1:* ) app-text/ghostscript-gpl virtual/latex-base vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/glx/gle-graphics-4.2.5f-src.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=ce35930ca2410d436b628e37c9dbc097
diff --git a/metadata/md5-cache/sci-visualization/gr-0.50.0-r1 b/metadata/md5-cache/sci-visualization/gr-0.50.0-r1
index 3a31872c98ea..3a849eb4d453 100644
--- a/metadata/md5-cache/sci-visualization/gr-0.50.0-r1
+++ b/metadata/md5-cache/sci-visualization/gr-0.50.0-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-qt/qtgui:5 media-libs/fontconfig media-libs/glfw media-libs/libjpeg-turbo media-libs/libpng media-libs/qhull sys-libs/zlib virtual/opengl cairo? ( x11-libs/cairo ) ffmpeg? ( media-video/ffmpeg ) postscript? ( app-text/ghostscript-gpl ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=https://github.com/sciapp/gr/archive/v0.50.0.tar.gz -> gr-0.50.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7473c5e2fee1f63c45308855e6a182c
diff --git a/metadata/md5-cache/sci-visualization/gri-2.12.23-r1 b/metadata/md5-cache/sci-visualization/gri-2.12.23-r1
index 534414993bf7..e4d843972e1f 100644
--- a/metadata/md5-cache/sci-visualization/gri-2.12.23-r1
+++ b/metadata/md5-cache/sci-visualization/gri-2.12.23-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl >=sci-libs/netcdf-4 virtual/latex-base virtual/imagemagick-tools[png] emacs? ( >=app-editors/emacs-23.1:* )
 SLOT=0
 SRC_URI=mirror://sourceforge/gri/gri-2.12.23.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=56811b1e97452f1a413db35b3a7669ea
diff --git a/metadata/md5-cache/sci-visualization/labplot-2.7.0 b/metadata/md5-cache/sci-visualization/labplot-2.7.0
index 6d7152a9824a..d090b7f013e1 100644
--- a/metadata/md5-cache/sci-visualization/labplot-2.7.0
+++ b/metadata/md5-cache/sci-visualization/labplot-2.7.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwor
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/labplot/2.7.0/labplot-2.7.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbc6512d77a67e6e58621aa8777821b8
diff --git a/metadata/md5-cache/sci-visualization/labplot-9999 b/metadata/md5-cache/sci-visualization/labplot-9999
index a0f85888ae44..7598738fd935 100644
--- a/metadata/md5-cache/sci-visualization/labplot-9999
+++ b/metadata/md5-cache/sci-visualization/labplot-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtserialport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/karchive-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/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/syntax-highlighting-5.60.0:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-19.08.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) root? ( app-arch/lz4 sys-libs/zlib ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbc6512d77a67e6e58621aa8777821b8
diff --git a/metadata/md5-cache/sci-visualization/tensorboard-2.2.1-r1 b/metadata/md5-cache/sci-visualization/tensorboard-2.2.1-r1
new file mode 100644
index 000000000000..4566fbd016e9
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/tensorboard-2.2.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=install prepare
+DESCRIPTION=TensorFlow's Visualization Toolkit
+EAPI=7
+HOMEPAGE=https://www.tensorflow.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+PDEPEND=sci-libs/tensorflow[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/bleach[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-auth-1.6.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/google-auth-oauthlib-0.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/grpcio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-41[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/scipy-1.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/py3/t/tensorboard/tensorboard-2.2.1-py3-none-any.whl -> tensorboard-2.2.1.zip
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=77ddca9113c1d27c01e8ce0dd05b1832
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 016c2c2c6191..49ab5cdb6e10 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/bat-0.15.4 b/metadata/md5-cache/sys-apps/bat-0.15.4
index 2e6ab3186fe2..2a816560c2cc 100644
--- a/metadata/md5-cache/sys-apps/bat-0.15.4
+++ b/metadata/md5-cache/sys-apps/bat-0.15.4
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlice
 RDEPEND=>=dev-libs/libgit2-0.99:= dev-libs/oniguruma:= sys-libs/zlib:= !>app-backup/bacula-9.2[qt5]
 SLOT=0
 SRC_URI=https://github.com/sharkdp/bat/archive/v0.15.4.tar.gz -> bat-0.15.4.tar.gz https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_colours/1.0.1/download -> ansi_colours-1.0.1.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anymap/0.12.1/download -> anymap-0.12.1.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/assert_cmd/1.0.1/download -> assert_cmd-1.0.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/base64/0.12.1/download -> base64-0.12.1.crate https://crates.io/api/v1/crates/bincode/1.2.1/download -> bincode-1.2.1.crate https://crates.io/api/v1/crates/bit-set/0.5.1/download -> bit-set-0.5.1.crate https://crates.io/api/v1/crates/bit-vec/0.5.1/download -> bit-vec-0.5.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/block-buffer/0.7.3/download -> block-buffer-0.7.3.crate https://crates.io/api/v1/crates/block-padding/0.1.5/download -> block-padding-0.1.5.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/byte-tools/0.3.1/download -> byte-tools-0.3.1.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.52/download -> cc-1.0.52.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.11/download -> chrono-0.4.11.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/console/0.11.2/download -> console-0.11.2.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/digest/0.8.1/download -> digest-0.8.1.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.5/download -> dtoa-0.4.5.crate https://crates.io/api/v1/crates/either/1.5.3/download -> either-1.5.3.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/error-chain/0.12.2/download -> error-chain-0.12.2.crate https://crates.io/api/v1/crates/fake-simd/0.1.2/download -> fake-simd-0.1.2.crate https://crates.io/api/v1/crates/fancy-regex/0.3.3/download -> fancy-regex-0.3.3.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/generic-array/0.12.3/download -> generic-array-0.12.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/git2/0.13.5/download -> git2-0.13.5.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.11/download -> hermit-abi-0.1.11.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.3.2/download -> indexmap-1.3.2.crate https://crates.io/api/v1/crates/itertools/0.8.2/download -> itertools-0.8.2.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/kstring/0.1.0/download -> kstring-0.1.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.5+1.0.0/download -> libgit2-sys-0.12.5+1.0.0.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.2/download -> linked-hash-map-0.5.2.crate https://crates.io/api/v1/crates/liquid/0.20.0/download -> liquid-0.20.0.crate https://crates.io/api/v1/crates/liquid-core/0.20.0/download -> liquid-core-0.20.0.crate https://crates.io/api/v1/crates/liquid-derive/0.20.0/download -> liquid-derive-0.20.0.crate https://crates.io/api/v1/crates/liquid-lib/0.20.0/download -> liquid-lib-0.20.0.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/maplit/1.0.2/download -> maplit-1.0.2.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/once_cell/1.3.1/download -> once_cell-1.3.1.crate https://crates.io/api/v1/crates/onig/6.0.0/download -> onig-6.0.0.crate https://crates.io/api/v1/crates/onig_sys/69.5.0/download -> onig_sys-69.5.0.crate https://crates.io/api/v1/crates/opaque-debug/0.2.3/download -> opaque-debug-0.2.3.crate https://crates.io/api/v1/crates/path_abs/0.5.0/download -> path_abs-0.5.0.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/pest_derive/2.1.0/download -> pest_derive-2.1.0.crate https://crates.io/api/v1/crates/pest_generator/2.1.3/download -> pest_generator-2.1.3.crate https://crates.io/api/v1/crates/pest_meta/2.1.3/download -> pest_meta-2.1.3.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/plist/1.0.0/download -> plist-1.0.0.crate https://crates.io/api/v1/crates/predicates/1.0.4/download -> predicates-1.0.4.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.15/download -> proc-macro-hack-0.5.15.crate https://crates.io/api/v1/crates/proc-macro2/1.0.10/download -> proc-macro2-1.0.10.crate https://crates.io/api/v1/crates/proc-quote/0.3.2/download -> proc-quote-0.3.2.crate https://crates.io/api/v1/crates/proc-quote-impl/0.3.2/download -> proc-quote-impl-0.3.2.crate https://crates.io/api/v1/crates/quote/1.0.3/download -> quote-1.0.3.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/ryu/1.0.3/download -> ryu-1.0.3.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.51/download -> serde_json-1.0.51.crate https://crates.io/api/v1/crates/serde_yaml/0.8.12/download -> serde_yaml-0.8.12.crate https://crates.io/api/v1/crates/sha-1/0.8.2/download -> sha-1-0.8.2.crate https://crates.io/api/v1/crates/shell-words/1.0.0/download -> shell-words-1.0.0.crate https://crates.io/api/v1/crates/smallvec/1.3.0/download -> smallvec-1.3.0.crate https://crates.io/api/v1/crates/std_prelude/0.2.12/download -> std_prelude-0.2.12.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.17/download -> syn-1.0.17.crate https://crates.io/api/v1/crates/syntect/4.2.0/download -> syntect-4.2.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.12/download -> terminal_size-0.1.12.crate https://crates.io/api/v1/crates/termios/0.3.2/download -> termios-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/typenum/1.12.0/download -> typenum-1.12.0.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.crate https://crates.io/api/v1/crates/unicode-segmentation/1.6.0/download -> unicode-segmentation-1.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wild/2.0.3/download -> wild-2.0.3.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.2/download -> xml-rs-0.8.2.crate https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=2413bfd455616592bb1cdd81e0973ade
diff --git a/metadata/md5-cache/sys-apps/debianutils-4.11.2 b/metadata/md5-cache/sys-apps/debianutils-4.11.2
new file mode 100644
index 000000000000..1bb6887ea9fc
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/debianutils-4.11.2
@@ -0,0 +1,12 @@
+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 ~sparc ~x86 ~x86-linux
+LICENSE=BSD GPL-2 SMAIL
+PDEPEND=installkernel? ( || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debianutils/debianutils_4.11.2.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c91c86acd3878c8fb380515262270e2e
diff --git a/metadata/md5-cache/sys-apps/exa-0.9.0-r1 b/metadata/md5-cache/sys-apps/exa-0.9.0-r1
index df2a08199190..611283121e3f 100644
--- a/metadata/md5-cache/sys-apps/exa-0.9.0-r1
+++ b/metadata/md5-cache/sys-apps/exa-0.9.0-r1
@@ -11,5 +11,5 @@ RDEPEND=git? ( dev-libs/libgit2:= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.3/download -> aho-corasick-0.7.3.crate https://crates.io/api/v1/crates/ansi_term/0.12.0/download -> ansi_term-0.12.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.4/download -> autocfg-0.1.4.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/byteorder/1.3.2/download -> byteorder-1.3.2.crate https://crates.io/api/v1/crates/cc/1.0.35/download -> cc-1.0.35.crate https://crates.io/api/v1/crates/cfg-if/0.1.7/download -> cfg-if-0.1.7.crate https://crates.io/api/v1/crates/datetime/0.4.7/download -> datetime-0.4.7.crate https://crates.io/api/v1/crates/env_logger/0.6.1/download -> env_logger-0.6.1.crate https://crates.io/api/v1/crates/exa/0.9.0/download -> exa-0.9.0.crate https://crates.io/api/v1/crates/git2/0.9.1/download -> git2-0.9.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/humantime/1.2.0/download -> humantime-1.2.0.crate https://crates.io/api/v1/crates/idna/0.1.5/download -> idna-0.1.5.crate https://crates.io/api/v1/crates/iso8601/0.1.1/download -> iso8601-0.1.1.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.3.0/download -> lazy_static-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.51/download -> libc-0.2.51.crate https://crates.io/api/v1/crates/libgit2-sys/0.8.1/download -> libgit2-sys-0.8.1.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/locale/0.2.2/download -> locale-0.2.2.crate https://crates.io/api/v1/crates/log/0.4.6/download -> log-0.4.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.2.0/download -> memchr-2.2.0.crate https://crates.io/api/v1/crates/natord/1.0.9/download -> natord-1.0.9.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.crate https://crates.io/api/v1/crates/num-traits/0.1.43/download -> num-traits-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/num_cpus/1.10.0/download -> num_cpus-1.10.0.crate https://crates.io/api/v1/crates/number_prefix/0.3.0/download -> number_prefix-0.3.0.crate https://crates.io/api/v1/crates/openssl-src/111.3.0+1.1.1c/download -> openssl-src-111.3.0+1.1.1c.crate https://crates.io/api/v1/crates/openssl-sys/0.9.47/download -> openssl-sys-0.9.47.crate https://crates.io/api/v1/crates/pad/0.1.5/download -> pad-0.1.5.crate https://crates.io/api/v1/crates/percent-encoding/1.0.1/download -> percent-encoding-1.0.1.crate https://crates.io/api/v1/crates/pkg-config/0.3.14/download -> pkg-config-0.3.14.crate https://crates.io/api/v1/crates/quick-error/1.2.2/download -> quick-error-1.2.2.crate https://crates.io/api/v1/crates/redox_syscall/0.1.54/download -> redox_syscall-0.1.54.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/regex/1.1.6/download -> regex-1.1.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.6/download -> regex-syntax-0.6.6.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/smallvec/0.6.9/download -> smallvec-0.6.9.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/termcolor/1.0.4/download -> termcolor-1.0.4.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/ucd-util/0.1.3/download -> ucd-util-0.1.3.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.8/download -> unicode-normalization-0.1.8.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/url/1.7.2/download -> url-1.7.2.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/utf8-ranges/1.0.2/download -> utf8-ranges-1.0.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.6/download -> vcpkg-0.2.6.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.7/download -> winapi-0.3.7.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/wincolor/1.0.1/download -> wincolor-1.0.1.crate https://crates.io/api/v1/crates/zoneinfo_compiled/0.4.8/download -> zoneinfo_compiled-0.4.8.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=64438df04b38609a951a7b3f5a2f0c7e
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.25.1 b/metadata/md5-cache/sys-apps/fakeroot-1.25.1
new file mode 100644
index 000000000000..cc5918f629f8
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.25.1
@@ -0,0 +1,14 @@
+BDEPEND=app-text/po4a >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/libcap acl? ( sys-apps/acl ) test? ( app-arch/sharutils )
+DESCRIPTION=A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery
+EAPI=7
+HOMEPAGE=https://packages.qa.debian.org/f/fakeroot.html
+IUSE=acl debug static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.25.1.orig.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=132d576b275d83e7ce86d0ac3fa8a72f
diff --git a/metadata/md5-cache/sys-apps/fd-8.1.1 b/metadata/md5-cache/sys-apps/fd-8.1.1
index 08e97f25c8ad..098c42b25264 100644
--- a/metadata/md5-cache/sys-apps/fd-8.1.1
+++ b/metadata/md5-cache/sys-apps/fd-8.1.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD-2 ISC MIT Unlicense
 RDEPEND=!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )
 SLOT=0
 SRC_URI=https://github.com/sharkdp/fd/archive/v8.1.1.tar.gz -> fd-8.1.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.31/download -> anyhow-1.0.31.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/bstr/0.2.13/download -> bstr-0.2.13.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/ctrlc/3.1.4/download -> ctrlc-3.1.4.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/fd-find/8.1.1/download -> fd-find-8.1.1.crate https://crates.io/api/v1/crates/filetime/0.2.10/download -> filetime-0.2.10.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fs_extra/1.1.0/download -> fs_extra-1.1.0.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/humantime/2.0.0/download -> humantime-2.0.0.crate https://crates.io/api/v1/crates/ignore/0.4.15/download -> ignore-0.4.15.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.70/download -> libc-0.2.70.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lscolors/0.7.0/download -> lscolors-0.7.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/users/0.10.0/download -> users-0.10.0.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=734c2fc32d582dd84f3d1086df0ee364
diff --git a/metadata/md5-cache/sys-apps/grep-3.5 b/metadata/md5-cache/sys-apps/grep-3.5
new file mode 100644
index 000000000000..4a887c52cfde
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/grep-3.5
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure prepare
+DEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl ) virtual/libiconv static? ( pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] ) )
+DESCRIPTION=GNU regular expression matcher
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/grep/
+IUSE=nls pcre static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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-3
+RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl ) virtual/libiconv
+SLOT=0
+SRC_URI=mirror://gnu/grep/grep-3.5.tar.xz mirror://gentoo/grep-3.5.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3a91b76babab702f6f65f5dc4b17d5fb
diff --git a/metadata/md5-cache/sys-apps/hprofile-3.0.6 b/metadata/md5-cache/sys-apps/hprofile-3.0.6
deleted file mode 100644
index da29e70a5f76..000000000000
--- a/metadata/md5-cache/sys-apps/hprofile-3.0.6
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Utility to manage hardware, network, power or other profiles (fork)
-EAPI=5
-HOMEPAGE=https://github.com/tokiclover/hprofile
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/tokiclover/hprofile/archive/3.0.6.tar.gz -> hprofile-3.0.6.tar.gz
-_md5_=774e558249cbbf302b47a57235ad1aa3
diff --git a/metadata/md5-cache/sys-apps/hprofile-3.1.1 b/metadata/md5-cache/sys-apps/hprofile-3.1.1
deleted file mode 100644
index 2a3fabecf4c4..000000000000
--- a/metadata/md5-cache/sys-apps/hprofile-3.1.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Utility to manage hardware, network, power or other profiles (fork)
-EAPI=5
-HOMEPAGE=https://github.com/tokiclover/hprofile
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/tokiclover/hprofile/archive/3.1.1.tar.gz -> hprofile-3.1.1.tar.gz
-_md5_=774e558249cbbf302b47a57235ad1aa3
diff --git a/metadata/md5-cache/sys-apps/hprofile-3.2.2 b/metadata/md5-cache/sys-apps/hprofile-3.2.2
deleted file mode 100644
index 0770acb25be0..000000000000
--- a/metadata/md5-cache/sys-apps/hprofile-3.2.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Utility to manage hardware, network, power or other profiles (fork)
-EAPI=5
-HOMEPAGE=https://github.com/tokiclover/hprofile
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/tokiclover/hprofile/archive/3.2.2.tar.gz -> hprofile-3.2.2.tar.gz
-_md5_=774e558249cbbf302b47a57235ad1aa3
diff --git a/metadata/md5-cache/sys-apps/hw-probe-1.5 b/metadata/md5-cache/sys-apps/hw-probe-1.5
deleted file mode 100644
index 893e481f6414..000000000000
--- a/metadata/md5-cache/sys-apps/hw-probe-1.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=A tool to probe for hardware, check it's operability and find drivers
-EAPI=7
-HOMEPAGE=https://github.com/linuxhw/hw-probe/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-lang/perl dev-perl/Digest-SHA1 net-misc/curl sys-apps/dmidecode sys-apps/edid-decode sys-apps/hwinfo sys-apps/pciutils sys-apps/smartmontools sys-apps/usbutils virtual/perl-Data-Dumper
-SLOT=0
-SRC_URI=https://github.com/linuxhw/hw-probe/archive/1.5.tar.gz -> hw-probe-1.5.tar.gz
-_eclasses_=optfeature	6c9aa35fc16df43d7142ef2660e00e25	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=3523dc5c19c0a02e396708ddd579038f
diff --git a/metadata/md5-cache/sys-apps/hw-probe-1.5-r1 b/metadata/md5-cache/sys-apps/hw-probe-1.5-r1
new file mode 100644
index 000000000000..bbf8844200c2
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hw-probe-1.5-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=A tool to probe for hardware, check it's operability and find drivers
+EAPI=7
+HOMEPAGE=https://github.com/linuxhw/hw-probe/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-lang/perl dev-perl/Digest-SHA1 net-misc/curl sys-apps/dmidecode sys-apps/edid-decode sys-apps/hwinfo sys-apps/pciutils sys-apps/smartmontools sys-apps/usbutils virtual/perl-Data-Dumper
+SLOT=0
+SRC_URI=https://github.com/linuxhw/hw-probe/archive/1.5.tar.gz -> hw-probe-1.5.tar.gz
+_eclasses_=optfeature	6c9aa35fc16df43d7142ef2660e00e25	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=1f3640d5b03761fff0542ea8d783e535
diff --git a/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2 b/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2
deleted file mode 100644
index b0e90402d0a5..000000000000
--- a/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=A tool to probe for hardware, check it's operability and find drivers
-EAPI=7
-HOMEPAGE=https://github.com/linuxhw/hw-probe/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-lang/perl dev-perl/Digest-SHA1 net-misc/curl sys-apps/dmidecode sys-apps/edid-decode sys-apps/hwinfo sys-apps/pciutils sys-apps/smartmontools sys-apps/usbutils virtual/perl-Data-Dumper
-SLOT=0
-SRC_URI=https://github.com/linuxhw/hw-probe/archive/1.6-beta.tar.gz -> hw-probe-1.6_beta2.tar.gz
-_eclasses_=optfeature	6c9aa35fc16df43d7142ef2660e00e25	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=901879c5dde5571666506c9d87ba80f5
diff --git a/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1 b/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1
new file mode 100644
index 000000000000..79d2d0f8fa70
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hw-probe-1.6_beta2-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=A tool to probe for hardware, check it's operability and find drivers
+EAPI=7
+HOMEPAGE=https://github.com/linuxhw/hw-probe/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-lang/perl dev-perl/Digest-SHA1 net-misc/curl sys-apps/dmidecode sys-apps/edid-decode sys-apps/hwinfo sys-apps/pciutils sys-apps/smartmontools sys-apps/usbutils virtual/perl-Data-Dumper
+SLOT=0
+SRC_URI=https://github.com/linuxhw/hw-probe/archive/1.6-beta.tar.gz -> hw-probe-1.6_beta2.tar.gz
+_eclasses_=optfeature	6c9aa35fc16df43d7142ef2660e00e25	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=58f6dc723c97c6c2001aac1f7e9be087
diff --git a/metadata/md5-cache/sys-apps/init-system-helpers-1.49-r1 b/metadata/md5-cache/sys-apps/init-system-helpers-1.49-r1
index 4faf6120caff..d8541deb6619 100644
--- a/metadata/md5-cache/sys-apps/init-system-helpers-1.49-r1
+++ b/metadata/md5-cache/sys-apps/init-system-helpers-1.49-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Helper scripts useful for both OpenRC and systemd
 EAPI=6
 HOMEPAGE=https://packages.debian.org/sid/init-system-helpers
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD GPL-2+
 RDEPEND=!<sys-apps/openrc-0.33
 SLOT=0
 SRC_URI=http://http.debian.net/debian/pool/main/i/init-system-helpers/init-system-helpers_1.49.tar.xz
-_md5_=edc3769cbbc49384adc99083ebbd3f4e
+_md5_=d9f4208517ea894ebe6acf648901723e
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-3.18 b/metadata/md5-cache/sys-apps/linux-misc-apps-3.18
deleted file mode 100644
index 781873b18dec..000000000000
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-3.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=sys-apps/hwids >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools virtual/pkgconfig
-DESCRIPTION=Misc tools bundled with kernel sources
-EAPI=5
-HOMEPAGE=https://kernel.org/
-IUSE=static-libs tcpd kernel_linux
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.18.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7744704fcbf2ba10cfeafdbd6aa3ea25
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r2 b/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r2
deleted file mode 100644
index dc87523063f2..000000000000
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-3.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=sys-apps/hwids >=sys-fs/sysfsutils-2 >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools !net-misc/usbip virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Misc tools bundled with kernel sources
-EAPI=5
-HOMEPAGE=https://kernel.org/
-IUSE=static-libs tcpd kernel_linux
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/hwids >=sys-fs/sysfsutils-2 >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools !net-misc/usbip
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.6/linux-3.6.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=750fdaefde8b62f90325cbff5aece22c
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-4.19 b/metadata/md5-cache/sys-apps/linux-misc-apps-4.19
deleted file mode 100644
index d5f4d8acb103..000000000000
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-4.19
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=sys-apps/hwids >=dev-libs/glib-2.6 >=sys-kernel/linux-headers-4.19 usbip? ( !net-misc/usbip tcpd? ( sys-apps/tcp-wrappers ) virtual/libudev ) !sys-power/pmtools virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Misc tools bundled with kernel sources
-EAPI=5
-HOMEPAGE=https://kernel.org/
-IUSE=static-libs tcpd usbip kernel_linux
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 >=sys-kernel/linux-headers-4.19 usbip? ( !net-misc/usbip tcpd? ( sys-apps/tcp-wrappers ) virtual/libudev ) !sys-power/pmtools
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-4.19.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=192fa59fe3f4f464657e06ad5a4a4327
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-4.4 b/metadata/md5-cache/sys-apps/linux-misc-apps-4.4
deleted file mode 100644
index b178846d6db1..000000000000
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=sys-apps/hwids >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools virtual/pkgconfig
-DESCRIPTION=Misc tools bundled with kernel sources
-EAPI=5
-HOMEPAGE=https://kernel.org/
-IUSE=static-libs tcpd kernel_linux
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 tcpd? ( sys-apps/tcp-wrappers ) !sys-power/pmtools
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-4.4.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=caff69b624656d2febdae7d93c0a6685
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-4.4-r1 b/metadata/md5-cache/sys-apps/linux-misc-apps-4.4-r1
deleted file mode 100644
index 8059424e29aa..000000000000
--- a/metadata/md5-cache/sys-apps/linux-misc-apps-4.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=sys-apps/hwids >=dev-libs/glib-2.6 >=sys-kernel/linux-headers-4.4 usbip? ( !net-misc/usbip tcpd? ( sys-apps/tcp-wrappers ) virtual/libudev ) !sys-power/pmtools virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Misc tools bundled with kernel sources
-EAPI=5
-HOMEPAGE=https://kernel.org/
-IUSE=static-libs tcpd usbip kernel_linux
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 >=sys-kernel/linux-headers-4.4 usbip? ( !net-misc/usbip tcpd? ( sys-apps/tcp-wrappers ) virtual/libudev ) !sys-power/pmtools
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-4.4.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=884b0e6aa30827e551102f7e03230a3c
diff --git a/metadata/md5-cache/sys-apps/linux-misc-apps-5.8 b/metadata/md5-cache/sys-apps/linux-misc-apps-5.8
new file mode 100644
index 000000000000..f4023cd8f83a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/linux-misc-apps-5.8
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=sys-apps/hwids >=dev-libs/glib-2.6 >=sys-kernel/linux-headers-5.8 usbip? ( !net-misc/usbip tcpd? ( sys-apps/tcp-wrappers ) virtual/libudev ) !sys-power/pmtools virtual/pkgconfig
+DESCRIPTION=Misc tools bundled with kernel sources
+EAPI=7
+HOMEPAGE=https://kernel.org/
+IUSE=static-libs tcpd usbip kernel_linux
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/hwids >=dev-libs/glib-2.6 >=sys-kernel/linux-headers-5.8 usbip? ( !net-misc/usbip tcpd? ( sys-apps/tcp-wrappers ) virtual/libudev ) !sys-power/pmtools
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-5.8.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e0d634041180a5fa51ec8a82a7668b28
diff --git a/metadata/md5-cache/sys-apps/lmctfy-0.2.0 b/metadata/md5-cache/sys-apps/lmctfy-0.2.0
deleted file mode 100644
index d8a9c2670ef8..000000000000
--- a/metadata/md5-cache/sys-apps/lmctfy-0.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/protobuf dev-cpp/gflags dev-libs/re2
-DESCRIPTION=Linux application container management from Google
-EAPI=5
-HOMEPAGE=https://github.com/google/lmctfy
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/protobuf dev-cpp/gflags dev-libs/re2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/lmctfy/archive/0.2.0.tar.gz -> lmctfy-0.2.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=83fe1dcb8810ea80f41cc8b4f5b5d76a
diff --git a/metadata/md5-cache/sys-apps/lmctfy-0.3.0 b/metadata/md5-cache/sys-apps/lmctfy-0.3.0
deleted file mode 100644
index bf3330165092..000000000000
--- a/metadata/md5-cache/sys-apps/lmctfy-0.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/protobuf dev-cpp/gflags dev-libs/re2
-DESCRIPTION=Linux application container management from Google
-EAPI=5
-HOMEPAGE=https://github.com/google/lmctfy
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/protobuf dev-cpp/gflags dev-libs/re2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/lmctfy/archive/0.3.0.tar.gz -> lmctfy-0.3.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=83fe1dcb8810ea80f41cc8b4f5b5d76a
diff --git a/metadata/md5-cache/sys-apps/lmctfy-0.3.1 b/metadata/md5-cache/sys-apps/lmctfy-0.3.1
deleted file mode 100644
index 93d32eead578..000000000000
--- a/metadata/md5-cache/sys-apps/lmctfy-0.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/protobuf dev-cpp/gflags dev-libs/re2
-DESCRIPTION=Linux application container management from Google
-EAPI=5
-HOMEPAGE=https://github.com/google/lmctfy
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/protobuf dev-cpp/gflags dev-libs/re2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/lmctfy/archive/0.3.1.tar.gz -> lmctfy-0.3.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=83fe1dcb8810ea80f41cc8b4f5b5d76a
diff --git a/metadata/md5-cache/sys-apps/lmctfy-0.5.0 b/metadata/md5-cache/sys-apps/lmctfy-0.5.0
deleted file mode 100644
index 7247e097ff54..000000000000
--- a/metadata/md5-cache/sys-apps/lmctfy-0.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/protobuf >=dev-cpp/gflags-2.1.1 dev-libs/re2 dev-lang/go sys-libs/libapparmor
-DESCRIPTION=Linux application container management from Google
-EAPI=5
-HOMEPAGE=https://github.com/google/lmctfy
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/protobuf >=dev-cpp/gflags-2.1.1 dev-libs/re2 dev-lang/go sys-libs/libapparmor
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/lmctfy/archive/0.5.0.tar.gz -> lmctfy-0.5.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a723aed3fe881a1e1d86061a1b9b3bc2
diff --git a/metadata/md5-cache/sys-apps/lsd-0.16.0 b/metadata/md5-cache/sys-apps/lsd-0.16.0
index a9bbf1852790..20f6d6c51aeb 100644
--- a/metadata/md5-cache/sys-apps/lsd-0.16.0
+++ b/metadata/md5-cache/sys-apps/lsd-0.16.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0 BSD-2 ISC MIT
 SLOT=0
 SRC_URI=https://github.com/Peltoche/lsd/archive/0.16.0.tar.gz -> lsd-0.16.0.tar.gz https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/atty/0.2.11/download -> atty-0.2.11.crate https://crates.io/api/v1/crates/autocfg/0.1.4/download -> autocfg-0.1.4.crate https://crates.io/api/v1/crates/bitflags/1.0.4/download -> bitflags-1.0.4.crate https://crates.io/api/v1/crates/cfg-if/0.1.9/download -> cfg-if-0.1.9.crate https://crates.io/api/v1/crates/chrono/0.4.6/download -> chrono-0.4.6.crate https://crates.io/api/v1/crates/chrono-humanize/0.0.11/download -> chrono-humanize-0.0.11.crate https://crates.io/api/v1/crates/clap/2.32.0/download -> clap-2.32.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/glob/0.2.11/download -> glob-0.2.11.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.55/download -> libc-0.2.55.crate https://crates.io/api/v1/crates/lscolors/0.5.0/download -> lscolors-0.5.0.crate https://crates.io/api/v1/crates/lsd/0.16.0/download -> lsd-0.16.0.crate https://crates.io/api/v1/crates/num-integer/0.1.39/download -> num-integer-0.1.39.crate https://crates.io/api/v1/crates/num-traits/0.2.6/download -> num-traits-0.2.6.crate https://crates.io/api/v1/crates/rand/0.6.5/download -> rand-0.6.5.crate https://crates.io/api/v1/crates/rand_chacha/0.1.1/download -> rand_chacha-0.1.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.0/download -> rand_core-0.4.0.crate https://crates.io/api/v1/crates/rand_hc/0.1.0/download -> rand_hc-0.1.0.crate https://crates.io/api/v1/crates/rand_isaac/0.1.1/download -> rand_isaac-0.1.1.crate https://crates.io/api/v1/crates/rand_jitter/0.1.4/download -> rand_jitter-0.1.4.crate https://crates.io/api/v1/crates/rand_os/0.1.3/download -> rand_os-0.1.3.crate https://crates.io/api/v1/crates/rand_pcg/0.1.2/download -> rand_pcg-0.1.2.crate https://crates.io/api/v1/crates/rand_xorshift/0.1.1/download -> rand_xorshift-0.1.1.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.43/download -> redox_syscall-0.1.43.crate https://crates.io/api/v1/crates/redox_termios/0.1.1/download -> redox_termios-0.1.1.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.1/download -> remove_dir_all-0.5.1.crate https://crates.io/api/v1/crates/strsim/0.7.0/download -> strsim-0.7.0.crate https://crates.io/api/v1/crates/tempfile/3.0.8/download -> tempfile-3.0.8.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.8/download -> terminal_size-0.1.8.crate https://crates.io/api/v1/crates/termion/1.5.1/download -> termion-1.5.1.crate https://crates.io/api/v1/crates/textwrap/0.10.0/download -> textwrap-0.10.0.crate https://crates.io/api/v1/crates/time/0.1.40/download -> time-0.1.40.crate https://crates.io/api/v1/crates/unicode-width/0.1.5/download -> unicode-width-0.1.5.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/wild/2.0.1/download -> wild-2.0.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.6/download -> winapi-0.3.6.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=fa32ddaf1d7e4da703fd6d2301d11bcf
diff --git a/metadata/md5-cache/sys-apps/lsd-0.17.0 b/metadata/md5-cache/sys-apps/lsd-0.17.0
index 8df9045e3343..1d58447479f5 100644
--- a/metadata/md5-cache/sys-apps/lsd-0.17.0
+++ b/metadata/md5-cache/sys-apps/lsd-0.17.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0 BSD-2 ISC MIT
 SLOT=0
 SRC_URI=https://github.com/Peltoche/lsd/archive/0.17.0.tar.gz -> lsd-0.17.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.6/download -> aho-corasick-0.7.6.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/assert_cmd/0.11.1/download -> assert_cmd-0.11.1.crate https://crates.io/api/v1/crates/assert_fs/0.11.3/download -> assert_fs-0.11.3.crate https://crates.io/api/v1/crates/atty/0.2.13/download -> atty-0.2.13.crate https://crates.io/api/v1/crates/autocfg/0.1.7/download -> autocfg-0.1.7.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.8/download -> bstr-0.2.8.crate https://crates.io/api/v1/crates/c2-chacha/0.2.3/download -> c2-chacha-0.2.3.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.9/download -> chrono-0.4.9.crate https://crates.io/api/v1/crates/chrono-humanize/0.0.11/download -> chrono-humanize-0.0.11.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.3.9/download -> crossbeam-channel-0.3.9.crate https://crates.io/api/v1/crates/crossbeam-utils/0.6.6/download -> crossbeam-utils-0.6.6.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/escargot/0.4.0/download -> escargot-0.4.0.crate https://crates.io/api/v1/crates/float-cmp/0.4.0/download -> float-cmp-0.4.0.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/getrandom/0.1.12/download -> getrandom-0.1.12.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.4/download -> globset-0.4.4.crate https://crates.io/api/v1/crates/globwalk/0.5.0/download -> globwalk-0.5.0.crate https://crates.io/api/v1/crates/ignore/0.4.10/download -> ignore-0.4.10.crate https://crates.io/api/v1/crates/itoa/0.4.4/download -> itoa-0.4.4.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.65/download -> libc-0.2.65.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lscolors/0.6.0/download -> lscolors-0.6.0.crate https://crates.io/api/v1/crates/lsd/0.17.0/download -> lsd-0.17.0.crate https://crates.io/api/v1/crates/memchr/2.2.1/download -> memchr-2.2.1.crate https://crates.io/api/v1/crates/normalize-line-endings/0.2.2/download -> normalize-line-endings-0.2.2.crate https://crates.io/api/v1/crates/num-integer/0.1.41/download -> num-integer-0.1.41.crate https://crates.io/api/v1/crates/num-traits/0.2.8/download -> num-traits-0.2.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/predicates/1.0.1/download -> predicates-1.0.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.6/download -> proc-macro2-1.0.6.crate https://crates.io/api/v1/crates/quote/1.0.2/download -> quote-1.0.2.crate https://crates.io/api/v1/crates/rand/0.7.2/download -> rand-0.7.2.crate https://crates.io/api/v1/crates/rand_chacha/0.2.1/download -> rand_chacha-0.2.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.1/download -> regex-1.3.1.crate https://crates.io/api/v1/crates/regex-syntax/0.6.12/download -> regex-syntax-0.6.12.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/ryu/1.0.2/download -> ryu-1.0.2.crate https://crates.io/api/v1/crates/same-file/1.0.5/download -> same-file-1.0.5.crate https://crates.io/api/v1/crates/serde/1.0.101/download -> serde-1.0.101.crate https://crates.io/api/v1/crates/serde_derive/1.0.101/download -> serde_derive-1.0.101.crate https://crates.io/api/v1/crates/serde_json/1.0.41/download -> serde_json-1.0.41.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.5/download -> syn-1.0.5.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.8/download -> terminal_size-0.1.8.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/0.3.6/download -> thread_local-0.3.6.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.6/download -> unicode-width-0.1.6.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/walkdir/2.2.9/download -> walkdir-2.2.9.crate https://crates.io/api/v1/crates/wasi/0.7.0/download -> wasi-0.7.0.crate https://crates.io/api/v1/crates/wild/2.0.2/download -> wild-2.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.2/download -> winapi-util-0.1.2.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=5161828779db264fd3cf8295226fc6c7
diff --git a/metadata/md5-cache/sys-apps/lsd-0.18.0 b/metadata/md5-cache/sys-apps/lsd-0.18.0
index 95a61c1f375d..0968cb8bdb21 100644
--- a/metadata/md5-cache/sys-apps/lsd-0.18.0
+++ b/metadata/md5-cache/sys-apps/lsd-0.18.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=Apache-2.0 BSD-2 ISC MIT
 SLOT=0
 SRC_URI=https://github.com/Peltoche/lsd/archive/0.18.0.tar.gz -> lsd-0.18.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/assert_cmd/1.0.1/download -> assert_cmd-1.0.1.crate https://crates.io/api/v1/crates/assert_fs/1.0.0/download -> assert_fs-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.12/download -> bstr-0.2.12.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/chrono/0.4.11/download -> chrono-0.4.11.crate https://crates.io/api/v1/crates/chrono-humanize/0.0.11/download -> chrono-humanize-0.0.11.crate https://crates.io/api/v1/crates/clap/2.33.0/download -> clap-2.33.0.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/difference/2.0.0/download -> difference-2.0.0.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/float-cmp/0.6.0/download -> float-cmp-0.6.0.crate https://crates.io/api/v1/crates/fnv/1.0.6/download -> fnv-1.0.6.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.5/download -> globset-0.4.5.crate https://crates.io/api/v1/crates/globwalk/0.7.3/download -> globwalk-0.7.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.10/download -> hermit-abi-0.1.10.crate https://crates.io/api/v1/crates/ignore/0.4.14/download -> ignore-0.4.14.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.68/download -> libc-0.2.68.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/lscolors/0.7.0/download -> lscolors-0.7.0.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/normalize-line-endings/0.3.0/download -> normalize-line-endings-0.3.0.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/predicates/1.0.4/download -> predicates-1.0.4.crate https://crates.io/api/v1/crates/predicates-core/1.0.0/download -> predicates-core-1.0.0.crate https://crates.io/api/v1/crates/predicates-tree/1.0.0/download -> predicates-tree-1.0.0.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.6/download -> regex-1.3.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/term_grid/0.1.7/download -> term_grid-0.1.7.crate https://crates.io/api/v1/crates/term_size/0.3.1/download -> term_size-0.3.1.crate https://crates.io/api/v1/crates/terminal_size/0.1.12/download -> terminal_size-0.1.12.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.42/download -> time-0.1.42.crate https://crates.io/api/v1/crates/treeline/0.1.0/download -> treeline-0.1.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/users/0.10.0/download -> users-0.10.0.crate https://crates.io/api/v1/crates/vec_map/0.8.1/download -> vec_map-0.8.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wild/2.0.2/download -> wild-2.0.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.4/download -> winapi-util-0.1.4.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=179e6e8f8c9f6250ab196c591d5e8641
diff --git a/metadata/md5-cache/sys-apps/opal-utils-6.5.2 b/metadata/md5-cache/sys-apps/opal-utils-6.5.2
index f5f1e440f433..30fc8043b73a 100644
--- a/metadata/md5-cache/sys-apps/opal-utils-6.5.2
+++ b/metadata/md5-cache/sys-apps/opal-utils-6.5.2
@@ -1,5 +1,5 @@
 BDEPEND=doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup
+DEFINED_PHASES=compile configure install setup
 DESCRIPTION=OPAL firmware utilities
 EAPI=7
 HOMEPAGE=https://github.com/open-power/skiboot
@@ -9,4 +9,4 @@ LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/open-power/skiboot/archive/v6.5.2.tar.gz -> opal-utils-6.5.2.tar.gz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b1af54666fbb80e3dabe37f9443efa15
+_md5_=7950c87b54edd079bebc5f72c005fe28
diff --git a/metadata/md5-cache/sys-apps/opal-utils-6.6.2 b/metadata/md5-cache/sys-apps/opal-utils-6.6.2
index 6aed49eb463e..13a74ba3f0cf 100644
--- a/metadata/md5-cache/sys-apps/opal-utils-6.6.2
+++ b/metadata/md5-cache/sys-apps/opal-utils-6.6.2
@@ -1,5 +1,5 @@
 BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/recommonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install setup test
 DESCRIPTION=OPAL firmware utilities
 EAPI=7
 HOMEPAGE=https://github.com/open-power/skiboot
@@ -9,4 +9,4 @@ LICENSE=Apache-2.0 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/open-power/skiboot/archive/v6.6.2.tar.gz -> opal-utils-6.6.2.tar.gz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9fdf96150dde1c5d4628b5c1026b2887
+_md5_=6e5f2ae9bdfe8de29b83be01d0d7b52d
diff --git a/metadata/md5-cache/sys-apps/opal-utils-6.6.3 b/metadata/md5-cache/sys-apps/opal-utils-6.6.3
index a5c030d100e9..1bfe46f8edfe 100644
--- a/metadata/md5-cache/sys-apps/opal-utils-6.6.3
+++ b/metadata/md5-cache/sys-apps/opal-utils-6.6.3
@@ -1,5 +1,5 @@
 BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/recommonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install setup test
 DESCRIPTION=OPAL firmware utilities
 EAPI=7
 HOMEPAGE=https://github.com/open-power/skiboot
@@ -9,4 +9,4 @@ LICENSE=Apache-2.0 GPL-2+
 SLOT=0
 SRC_URI=https://github.com/open-power/skiboot/archive/v6.6.3.tar.gz -> opal-utils-6.6.3.tar.gz
 _eclasses_=linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c884b421b3c817863c5156c47467729f
+_md5_=96e24ae99879cfdf32080d5cac7633db
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.7 b/metadata/md5-cache/sys-apps/portage-3.0.7
deleted file mode 100644
index 086c3e9db203..000000000000
--- a/metadata/md5-cache/sys-apps/portage-3.0.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[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 ) apidoc? ( dev-python/sphinx dev-python/sphinx-epytext )
-DESCRIPTION=Portage is the package management and distribution system for Gentoo
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
-IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-RDEPEND=app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gentoo/portage-3.0.7.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.7.tar.bz2
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=721d2ce89272d3732cabe65a5a7e4c89
diff --git a/metadata/md5-cache/sys-apps/qingy-1.0.0-r4 b/metadata/md5-cache/sys-apps/qingy-1.0.0-r4
index fe747e836802..060938f8ea46 100644
--- a/metadata/md5-cache/sys-apps/qingy-1.0.0-r4
+++ b/metadata/md5-cache/sys-apps/qingy-1.0.0-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.7-r7:= opensslcrypt? ( dev-libs/openssl:0= ) crypt? ( >=dev-libs/libgcrypt-1.2.1:0= ) emacs? ( >=app-editors/emacs-23.1:* ) pam? ( >=sys-libs/pam-0.75-r11 ) X? ( x11-libs/libX11:= x11-libs/libXScrnSaver:= ) consolekit? ( sys-auth/consolekit sys-apps/dbus ) pam? ( sys-auth/pambase )
 SLOT=0
 SRC_URI=mirror://sourceforge/qingy/qingy-1.0.0.tar.bz2 mirror://gentoo/qingy-gentoo-theme-2.1.tar.bz2 https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/qingy-1.0.0-screensavers.patch.gz https://dev.gentoo.org/~gienah/2big4tree/sys-apps/qingy/qingy-1.0.0-consolekit-pam.patch.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=0454013c29ce455dfa21f94bb1f45ee0
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.42 b/metadata/md5-cache/sys-apps/razercfg-0.42
index afaef434c16d..833a6366216c 100644
--- a/metadata/md5-cache/sys-apps/razercfg-0.42
+++ b/metadata/md5-cache/sys-apps/razercfg-0.42
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://bues.ch/razercfg/razercfg-0.42.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39a9a9f6714a8307ee5325b2450f0fcc
diff --git a/metadata/md5-cache/sys-apps/ripgrep-12.1.1 b/metadata/md5-cache/sys-apps/ripgrep-12.1.1
index c2424c79cbcf..fbc1f518b22b 100644
--- a/metadata/md5-cache/sys-apps/ripgrep-12.1.1
+++ b/metadata/md5-cache/sys-apps/ripgrep-12.1.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )
 RDEPEND=pcre? ( dev-libs/libpcre2 )
 SLOT=0
 SRC_URI=https://github.com/BurntSushi/ripgrep/archive/12.1.1.tar.gz -> ripgrep-12.1.1.tar.gz https://github.com/BurntSushi/ripgrep/releases/download/12.1.1/ripgrep-12.1.1-x86_64-unknown-linux-musl.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.12.1/download -> base64-0.12.1.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.13/download -> bstr-0.2.13.crate https://crates.io/api/v1/crates/bytecount/0.6.0/download -> bytecount-0.6.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/cc/1.0.54/download -> cc-1.0.54.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.4.2/download -> crossbeam-channel-0.4.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/encoding_rs/0.8.23/download -> encoding_rs-0.8.23.crate https://crates.io/api/v1/crates/encoding_rs_io/0.1.7/download -> encoding_rs_io-0.1.7.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/fs_extra/1.1.0/download -> fs_extra-1.1.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jemallocator/0.3.2/download -> jemallocator-0.3.2.crate https://crates.io/api/v1/crates/jemalloc-sys/0.3.2/download -> jemalloc-sys-0.3.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.71/download -> libc-0.2.71.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/packed_simd/0.3.3/download -> packed_simd-0.3.3.crate https://crates.io/api/v1/crates/pcre2/0.2.3/download -> pcre2-0.2.3.crate https://crates.io/api/v1/crates/pcre2-sys/0.2.2/download -> pcre2-sys-0.2.2.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/proc-macro2/1.0.17/download -> proc-macro2-1.0.17.crate https://crates.io/api/v1/crates/quote/1.0.6/download -> quote-1.0.6.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.27/download -> syn-1.0.27.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=546b08aeb19e13e52d1db1fd29f75a71
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.10 b/metadata/md5-cache/sys-apps/rng-tools-6.10
index abc4af2448c3..21ee1295df60 100644
--- a/metadata/md5-cache/sys-apps/rng-tools-6.10
+++ b/metadata/md5-cache/sys-apps/rng-tools-6.10
@@ -5,10 +5,10 @@ DESCRIPTION=Daemon to use hardware random number generators
 EAPI=7
 HOMEPAGE=https://github.com/nhorman/rng-tools
 IUSE=jitterentropy nistbeacon pkcs11 selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= sys-fs/sysfsutils jitterentropy? ( app-crypt/jitterentropy:= ) nistbeacon? ( dev-libs/jansson dev-libs/libxml2:2= net-misc/curl[ssl] ) pkcs11? ( dev-libs/libp11:= ) elibc_musl? ( sys-libs/argp-standalone ) selinux? ( sec-policy/selinux-rngd )
 SLOT=0
 SRC_URI=https://github.com/nhorman/rng-tools/archive/v6.10.tar.gz -> rng-tools-6.10.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=417657682fb6fa69e5420293ffe2d5fd
+_md5_=8feb66144dd45d65ab0c2c9974780645
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 903d132d90c7..84c1cbb71bea 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 dev-libs/libgudev:= sys-apps/dbus x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 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	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6fb5b9482bac4b54fe6517c3b608aaa
diff --git a/metadata/md5-cache/sys-apps/systemd-244.3 b/metadata/md5-cache/sys-apps/systemd-244.3
deleted file mode 100644
index 88829562a0b6..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-244.3
+++ /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 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.8 dev-python/lxml[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( 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-util/meson-0.54.0 >=dev-util/ninja-1.8.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_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_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1: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_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_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_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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 static-libs +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_s390_32 abi_s390_64 split-usr
-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_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_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1: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_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_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_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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-fs/eudev !sys-fs/udev
-REQUIRED_USE=importd? ( curl gcrypt lzma )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v244.3/systemd-stable-244.3.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9b2023a3eee1ae729306dfa723d78737
diff --git a/metadata/md5-cache/sys-apps/systemd-245.5 b/metadata/md5-cache/sys-apps/systemd-245.5
deleted file mode 100644
index 5344a82bfc95..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-245.5
+++ /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 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.8 dev-python/lxml[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( 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-util/meson-0.54.0 >=dev-util/ninja-1.8.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_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_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0: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_s390_32(-)?,abi_s390_64(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0: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 homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +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_s390_32 abi_s390_64 split-usr
-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] hwdb? ( >=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_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_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0: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_s390_32(-)?,abi_s390_64(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) 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_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_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0: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-fs/eudev !sys-fs/udev
-REQUIRED_USE=homed? ( cryptsetup ) importd? ( curl gcrypt lzma )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v245.5/systemd-stable-245.5.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=355c319c643b92cca70ebbbd90a3450f
diff --git a/metadata/md5-cache/sys-apps/systemd-245.7-r1 b/metadata/md5-cache/sys-apps/systemd-245.7-r1
index 1547fa06d0c2..fa25f0b3b8d2 100644
--- a/metadata/md5-cache/sys-apps/systemd-245.7-r1
+++ b/metadata/md5-cache/sys-apps/systemd-245.7-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v245.7/systemd-stable-245.7.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9473f773fa1b326c466a0056f9d39c7f
+_md5_=e36facec754f90a7216170f453caa6fe
diff --git a/metadata/md5-cache/sys-apps/systemd-246-r1 b/metadata/md5-cache/sys-apps/systemd-246-r1
index 71022f52bdd2..96cdf2d95d08 100644
--- a/metadata/md5-cache/sys-apps/systemd-246-r1
+++ b/metadata/md5-cache/sys-apps/systemd-246-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v246/systemd-246.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4a229bc294250847d6c8a049536c3909
+_md5_=1cc899f690ad6d601e51596fc61a346c
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 9e8670bb3af1..2f7e1c45cd2b 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=homed? ( cryptsetup ) importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4a229bc294250847d6c8a049536c3909
+_md5_=1cc899f690ad6d601e51596fc61a346c
diff --git a/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1 b/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1
index caf09d7c5e8b..5b93830d24b8 100644
--- a/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1
+++ b/metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=
 SLOT=0
 SRC_URI=https://github.com/intel/thunderbolt-software-user-space/archive/v0.9.3.tar.gz -> thunderbolt-software-user-space-0.9.3.tar.gz https://dev.gentoo.org/~asturm/distfiles/thunderbolt-software-user-space-0.9.3-tbtadm.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f07df4ba1b33cd7131af37d7e2ee85aa
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
deleted file mode 100644
index f42431623a89..000000000000
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=virtual/udev virtual/libusb:1 virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks
-EAPI=5
-HOMEPAGE=https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt
-IUSE=jimtcl kernel_linux
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
-SLOT=0
-SRC_URI=https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.2.6.tar.bz2 https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20151101.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2c6c34daf1ced9964b93ddf26b8bd3c8
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
deleted file mode 100644
index c64cc5cdb4a9..000000000000
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=virtual/udev virtual/libusb:1 virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks
-EAPI=5
-HOMEPAGE=https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt
-IUSE=jimtcl kernel_linux
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
-SLOT=0
-SRC_URI=https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.3.0.tar.bz2 https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20160112.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=64c03181c6c0d8035b7798ad07c4d501
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
deleted file mode 100644
index 516d8de316cb..000000000000
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.4.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=virtual/udev virtual/libusb:1 virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks
-EAPI=5
-HOMEPAGE=https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt
-IUSE=jimtcl kernel_linux
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
-SLOT=0
-SRC_URI=https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.4.0.tar.bz2 https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20160803.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0f25a487f2c1395f5b90c36dc3582c02
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-1.20.1 b/metadata/md5-cache/sys-auth/AusweisApp2-1.20.1
index 7d875787024f..8819b5d6dc51 100644
--- a/metadata/md5-cache/sys-auth/AusweisApp2-1.20.1
+++ b/metadata/md5-cache/sys-auth/AusweisApp2-1.20.1
@@ -9,5 +9,5 @@ LICENSE=EUPL-1.2
 RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
 SLOT=0
 SRC_URI=https://github.com/Governikus/AusweisApp2/archive/1.20.1.tar.gz -> AusweisApp2-1.20.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8439ab0c9177708855dfb0a05cbe1766
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-1.20.2 b/metadata/md5-cache/sys-auth/AusweisApp2-1.20.2
index 741abbf7ca1f..e9e5dc358194 100644
--- a/metadata/md5-cache/sys-auth/AusweisApp2-1.20.2
+++ b/metadata/md5-cache/sys-auth/AusweisApp2-1.20.2
@@ -9,5 +9,5 @@ LICENSE=EUPL-1.2
 RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
 SLOT=0
 SRC_URI=https://github.com/Governikus/AusweisApp2/archive/1.20.2.tar.gz -> AusweisApp2-1.20.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6da17e264ef092df6480b786cf626019
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-9999 b/metadata/md5-cache/sys-auth/AusweisApp2-9999
index 8e96a89c539e..6d54f39bec0a 100644
--- a/metadata/md5-cache/sys-auth/AusweisApp2-9999
+++ b/metadata/md5-cache/sys-auth/AusweisApp2-9999
@@ -8,5 +8,5 @@ LICENSE=EUPL-1.2
 PROPERTIES=live
 RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43895960cdfbc9a546ff60bf80606168
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index d4a8ffa10949..53154c3310e0 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/google-authenticator-wrappers-1 b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-1
index 2070237ccef8..5a91e27907f2 100644
--- a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-1
+++ b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-1
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-auth/google-authenticator
 SLOT=0
 SRC_URI=https://github.com/mgorny/google-authenticator-wrappers/archive/v1.tar.gz -> google-authenticator-wrappers-1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=878486b464432d265fc1f15092b56056
diff --git a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-2 b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-2
index f62916698ce0..438db66c2c9b 100644
--- a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-2
+++ b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-2
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-auth/google-authenticator
 SLOT=0
 SRC_URI=https://github.com/mgorny/google-authenticator-wrappers/archive/v2.tar.gz -> google-authenticator-wrappers-2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=878486b464432d265fc1f15092b56056
diff --git a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3 b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
index 0492144d9cf0..6e2610eaeaad 100644
--- a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
+++ b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=sys-auth/google-authenticator
 SLOT=0
 SRC_URI=https://github.com/mgorny/google-authenticator-wrappers/archive/v3.tar.gz -> google-authenticator-wrappers-3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47090817313d9e92d9efb93bf698e77d
diff --git a/metadata/md5-cache/sys-auth/polkit-qt-0.113.0 b/metadata/md5-cache/sys-auth/polkit-qt-0.113.0
index 6bb0e83a9642..67260dcc1c09 100644
--- a/metadata/md5-cache/sys-auth/polkit-qt-0.113.0
+++ b/metadata/md5-cache/sys-auth/polkit-qt-0.113.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-0.103
 SLOT=0
 SRC_URI=mirror://kde/stable/polkit-qt-1/polkit-qt-1-0.113.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b36bb4f1a06e0d76eb3e1545cc4c21fc
diff --git a/metadata/md5-cache/sys-auth/sssd-2.3.1 b/metadata/md5-cache/sys-auth/sssd-2.3.1-r1
index 6f3949e67e38..6f3949e67e38 100644
--- a/metadata/md5-cache/sys-auth/sssd-2.3.1
+++ b/metadata/md5-cache/sys-auth/sssd-2.3.1-r1
diff --git a/metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1 b/metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1
index 7c74da20f953..076539a45d5d 100644
--- a/metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1
+++ b/metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0=[-bindist] sys-apps/pcsc-lite
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-2.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8117dbaf302c9a587efd64b6fb31df5c
diff --git a/metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1-r1 b/metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1-r1
index e9baadaacf4a..8b413c27e33e 100644
--- a/metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1-r1
+++ b/metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0=[-bindist] sys-apps/pcsc-lite
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-2.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bef72db213a8a51d82138ebc6da735a6
diff --git a/metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1-r2 b/metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1-r2
index 636a54f5f3f9..0ccaa0a39e33 100644
--- a/metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1-r2
+++ b/metadata/md5-cache/sys-auth/yubico-piv-tool-2.1.1-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/pcsc-lite libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-l
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-2.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=716b1e249e75c878b6438f4a99f694c9
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 4fd43c679bfc..6fcb98c812a1 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/megacli-8.07.10 b/metadata/md5-cache/sys-block/megacli-8.07.10
deleted file mode 100644
index 9b293e8bbbfa..000000000000
--- a/metadata/md5-cache/sys-block/megacli-8.07.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst unpack
-DEPEND=app-arch/unzip app-admin/chrpath >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=LSI Logic MegaRAID Command Line Interface management tool
-EAPI=5
-HOMEPAGE=http://www.lsi.com/
-KEYWORDS=amd64 x86
-LICENSE=LSI
-RDEPEND=sys-libs/ncurses-compat:5
-RESTRICT=mirror fetch
-SLOT=0
-SRC_URI=http://www.lsi.com/downloads/Public/RAID%20Controllers/RAID%20Controllers%20Common%20Files/8.07.10_MegaCLI_Linux.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4d407857292c1dff9525570a9adf4f6e
diff --git a/metadata/md5-cache/sys-block/megacli-8.07.14 b/metadata/md5-cache/sys-block/megacli-8.07.14
deleted file mode 100644
index c845cd48399f..000000000000
--- a/metadata/md5-cache/sys-block/megacli-8.07.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst unpack
-DEPEND=app-arch/unzip app-admin/chrpath >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=LSI Logic MegaRAID Command Line Interface management tool
-EAPI=5
-HOMEPAGE=http://www.lsi.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=LSI
-RDEPEND=sys-libs/ncurses-compat:5
-RESTRICT=mirror fetch
-SLOT=0
-SRC_URI=http://www.lsi.com/downloads/Public/RAID%20Controllers/RAID%20Controllers%20Common%20Files/8.07.14_MegaCLI.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=131923c1457a53879fe185ffb534861a
diff --git a/metadata/md5-cache/sys-block/megacli-8.07.14-r1 b/metadata/md5-cache/sys-block/megacli-8.07.14-r1
deleted file mode 100644
index 86a86d7acfc7..000000000000
--- a/metadata/md5-cache/sys-block/megacli-8.07.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DEPEND=app-arch/unzip app-admin/chrpath >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=LSI Logic MegaRAID Command Line Interface management tool
-EAPI=5
-HOMEPAGE=http://www.avagotech.com/cs/Satellite?pagename=AVG2/searchLayout&SearchKeyWord=8.07&searchType=DocumentFileExtension-zip&locale=avg_en&srchradio=within&within=8.07
-KEYWORDS=~amd64 ~x86
-LICENSE=LSI
-RDEPEND=sys-libs/ncurses-compat:5
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=http://docs.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/8-07-14_MegaCLI.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	760ff223c2c4299b68ea901e24c4cabd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=da5d2828b6c46a0166f4a5be9b3e6a59
diff --git a/metadata/md5-cache/sys-block/megacli-8.07.14-r3 b/metadata/md5-cache/sys-block/megacli-8.07.14-r3
new file mode 100644
index 000000000000..cf43f07b3a55
--- /dev/null
+++ b/metadata/md5-cache/sys-block/megacli-8.07.14-r3
@@ -0,0 +1,14 @@
+BDEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DEFINED_PHASES=install postinst unpack
+DEPEND=app-arch/unzip app-admin/chrpath
+DESCRIPTION=LSI Logic MegaRAID Command Line Interface management tool
+EAPI=7
+HOMEPAGE=https://www.broadcom.com/support/knowledgebase/1211161498596/megacli-cheat-sheet--live-examples https://www.broadcom.com/support/knowledgebase/1211161496959/megacli-commands
+KEYWORDS=~amd64 ~x86
+LICENSE=LSI
+RDEPEND=sys-libs/ncurses-compat:5
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/8-07-14_MegaCLI.zip
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	rpm	760ff223c2c4299b68ea901e24c4cabd	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=66b39bae11897b7c36716ae2fd3bfc85
diff --git a/metadata/md5-cache/sys-block/partitionmanager-4.1.0 b/metadata/md5-cache/sys-block/partitionmanager-4.1.0
index e67b460ad7e7..8985d0064a4d 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-4.1.0
+++ b/metadata/md5-cache/sys-block/partitionmanager-4.1.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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/kjobwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=sys-libs/kpmcore-4.1.0:5= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/partitionmanager/4.1.0/src/partitionmanager-4.1.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=788edda551e6bf5667dd7ff264ae153d
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 04e8876b2d7a..4bd8a8f78028 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/elilo-3.16-r4 b/metadata/md5-cache/sys-boot/elilo-3.16-r4
new file mode 100644
index 000000000000..ae0ff09fef93
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/elilo-3.16-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=>=sys-boot/gnu-efi-3.0g dev-util/patchutils
+DESCRIPTION=Linux boot loader for EFI-based systems such as IA-64
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/elilo/
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-boot/efibootmgr sys-fs/dosfstools[compat]
+SLOT=0
+SRC_URI=mirror://sourceforge/elilo/elilo-3.16-all.tar.gz mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=65cb199e455cb36ef4df7cc28ef26bdb
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index e7ce2bc1d442..9ba9005167ac 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-14.2.11 b/metadata/md5-cache/sys-cluster/ceph-14.2.11
index 865e65d4b278..0a63f241b1f6 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.11
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.11
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.11.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6daf1a3fdb9007ee5643e5fdbeb4d43
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.11-r1 b/metadata/md5-cache/sys-cluster/ceph-14.2.11-r1
new file mode 100644
index 000000000000..7a107aff5ba3
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.11-r1
@@ -0,0 +1,16 @@
+BDEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/virtualenv[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make dev-util/cmake virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=Ceph distributed filesystem
+EAPI=7
+HOMEPAGE=https://ceph.com/
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl spdk system-boost systemd +tcmalloc test xfs zfs 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_ssse3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cherrypy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pecan[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/prettytable[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikits_learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.11.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=45f68c1450a00f8e818868052c6e4369
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.4-r3 b/metadata/md5-cache/sys-cluster/ceph-15.2.4-r3
index d0b0dfec5d9d..f435bd056f26 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.4-r3
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.4-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.4.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1e07b8d108624e156f7811c53e67b81c
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.5 b/metadata/md5-cache/sys-cluster/ceph-15.2.5
deleted file mode 100644
index 19f696229808..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/virtualenv[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make dev-util/cmake virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=Ceph distributed filesystem
-EAPI=7
-HOMEPAGE=https://ceph.com/
-IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs 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_ssse3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cherrypy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pecan[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/prettytable[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/jsonpatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikits_learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.5.tar.gz
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=efd892542d437b55a256a5b4bcb31eeb
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.5-r1 b/metadata/md5-cache/sys-cluster/ceph-15.2.5-r1
new file mode 100644
index 000000000000..d341953878ce
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/virtualenv[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make dev-util/cmake virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=Ceph distributed filesystem
+EAPI=7
+HOMEPAGE=https://ceph.com/
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs 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_ssse3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/xmlsec:=[!openssl?,!libressl?] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= openssl? ( dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) libressl? ( dev-libs/libressl:= net-misc/curl:=[curl_ssl_libressl] ) ) ssl? ( openssl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) system-boost? ( =dev-libs/boost-1.72*[threads,context,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cherrypy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pecan[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/prettytable[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] mgr? ( dev-python/jsonpatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/more-itertools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyjwt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/routes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] diskprediction? ( python_targets_python3_6? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/scipy-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) sci-libs/scikits_learn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ?? ( jemalloc tcmalloc ) ^^ ( openssl libressl ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.5.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8e8811513d3c6af9d7766d819487dec5
diff --git a/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2 b/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2
new file mode 100644
index 000000000000..5b530b68c1d3
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ganglia-3.7.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/confuse dev-libs/expat >=dev-libs/apr-1.0 net-libs/libnsl:0= net-libs/libtirpc:0= !dev-db/firebird pcre? ( dev-libs/libpcre ) 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(-)] )
+DESCRIPTION=A scalable distributed monitoring system for clusters and grids
+EAPI=7
+HOMEPAGE=http://ganglia.sourceforge.net/
+IUSE=minimal pcre python examples python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/confuse dev-libs/expat >=dev-libs/apr-1.0 net-libs/libnsl:0= net-libs/libtirpc:0= !dev-db/firebird pcre? ( dev-libs/libpcre ) 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(-)] ) !minimal? ( net-analyzer/rrdtool )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/ganglia/ganglia-3.7.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=8d0c687db03dba3573fdab0c59ee2eed
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-6.8 b/metadata/md5-cache/sys-cluster/glusterfs-6.8
index f79943f01be7..112e4153a34d 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-6.8
+++ b/metadata/md5-cache/sys-cluster/glusterfs-6.8
@@ -12,5 +12,5 @@ REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/6/6.8/glusterfs-6.8.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=e9d4868d50a12b8a72819e5698f9f70c
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-6.9 b/metadata/md5-cache/sys-cluster/glusterfs-6.9
index 0b1f0e3d2592..6a61d8cc0078 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-6.9
+++ b/metadata/md5-cache/sys-cluster/glusterfs-6.9
@@ -12,5 +12,5 @@ REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/6/6.9/glusterfs-6.9.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af0435fda9dfb9a24bdb9a1755a2fbfc
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-7.5 b/metadata/md5-cache/sys-cluster/glusterfs-7.5
index 51d4254f720b..4e7eece2c7e3 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.5
+++ b/metadata/md5-cache/sys-cluster/glusterfs-7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.5/glusterfs-7.5.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=504893801ff487352ff0be437aacd201
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-7.6 b/metadata/md5-cache/sys-cluster/glusterfs-7.6
index 1e836e487ce7..60a1c1634e64 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.6
+++ b/metadata/md5-cache/sys-cluster/glusterfs-7.6
@@ -12,5 +12,5 @@ REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.6/glusterfs-7.6.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=af0435fda9dfb9a24bdb9a1755a2fbfc
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-7.7 b/metadata/md5-cache/sys-cluster/glusterfs-7.7
index 80f5bf387fa9..7d2fc1d5aa36 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.7
+++ b/metadata/md5-cache/sys-cluster/glusterfs-7.7
@@ -12,5 +12,5 @@ REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.7/glusterfs-7.7.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=acd3555c63d2664e953e7b4c372e3304
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-9999 b/metadata/md5-cache/sys-cluster/glusterfs-9999
index 621e4eba66f2..e462debb5f6d 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-9999
+++ b/metadata/md5-cache/sys-cluster/glusterfs-9999
@@ -11,5 +11,5 @@ RDEPEND=acct-group/gluster acct-user/gluster dev-libs/libaio dev-libs/userspace-
 REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) ipv6? ( libtirpc )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=694cdf3d1722f22d9a2d8081eaba5e52
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.4.1 b/metadata/md5-cache/sys-cluster/hpx-1.4.1
index d76ae72e8592..0040ba6a2ffa 100644
--- a/metadata/md5-cache/sys-cluster/hpx-1.4.1
+++ b/metadata/md5-cache/sys-cluster/hpx-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://stellar.cct.lsu.edu/files/hpx_1.4.1.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=be72bda19ff5afd479a9c68179688334
diff --git a/metadata/md5-cache/sys-cluster/hpx-9999 b/metadata/md5-cache/sys-cluster/hpx-9999
index fdd640551e3a..b704b4655255 100644
--- a/metadata/md5-cache/sys-cluster/hpx-9999
+++ b/metadata/md5-cache/sys-cluster/hpx-9999
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ?? ( jemalloc perftools tbb )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	fortran-2	b4796813ccda91c9c0d3463fc90aa969	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e1da0e39f52c8897d5662793b3d85e7
diff --git a/metadata/md5-cache/sys-cluster/kubeletctl-1.2 b/metadata/md5-cache/sys-cluster/kubeletctl-1.2
deleted file mode 100644
index acd3c0cc6c1d..000000000000
--- a/metadata/md5-cache/sys-cluster/kubeletctl-1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=A client for kubelet
-EAPI=7
-HOMEPAGE=https://github.com/cyberark/kubeletctl
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
-RESTRICT=strip test
-SLOT=0
-SRC_URI=https://github.com/cyberark/kubeletctl/archive/v1.2.tar.gz -> kubeletctl-1.2.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20191004114745-ee4c978eae7e.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20191004114745-ee4c978eae7e.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20200322175846-f7e751efca13.zip -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20200322175846-f7e751efca13.zip mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20200322175846-f7e751efca13.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20200322175846-f7e751efca13.mod mirror://goproxy//github.com/c-bata/go-prompt/@v/v0.2.3.zip -> github.com%2Fc-bata%2Fgo-prompt%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/c-bata/go-prompt/@v/v0.2.3.mod -> github.com%2Fc-bata%2Fgo-prompt%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.zip -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.zip mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20170728041850-787624de3eb7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20170728041850-787624de3eb7.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jedib0t/go-pretty/@v/v4.3.0+incompatible.zip -> github.com%2Fjedib0t%2Fgo-pretty%2F@v%2Fv4.3.0+incompatible.zip mirror://goproxy//github.com/jedib0t/go-pretty/@v/v4.3.0+incompatible.mod -> github.com%2Fjedib0t%2Fgo-pretty%2F@v%2Fv4.3.0+incompatible.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.6.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-tty/@v/v0.0.3.zip -> github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mattn/go-tty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/term/@v/v0.0.0-20190109203006-aa71e9d9e942.zip -> github.com%2Fpkg%2Fterm%2F@v%2Fv0.0.0-20190109203006-aa71e9d9e942.zip mirror://goproxy//github.com/pkg/term/@v/v0.0.0-20190109203006-aa71e9d9e942.mod -> github.com%2Fpkg%2Fterm%2F@v%2Fv0.0.0-20190109203006-aa71e9d9e942.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.7.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.7.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20191025225708-5524a3672fbb.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20191025225708-5524a3672fbb.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20200403220253-fa879b399cd0.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20200403220253-fa879b399cd0.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20200403220253-fa879b399cd0.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20200403220253-fa879b399cd0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20191025225532-af6325b3a843.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20191025225532-af6325b3a843.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20200403220105-fa0d5bf06730.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20200403220105-fa0d5bf06730.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20200403220105-fa0d5bf06730.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20200403220105-fa0d5bf06730.mod mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20191026065934-0bdba2f91880.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20191026065934-0bdba2f91880.mod mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20200404181738-fe32aa3b9449.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20200404181738-fe32aa3b9449.zip mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20200404181738-fe32aa3b9449.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20200404181738-fe32aa3b9449.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200401025727-01dfbe2eec3d.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200401025727-01dfbe2eec3d.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191010214722-8d271d903fe4.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191010214722-8d271d903fe4.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.zip -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
-_eclasses_=go-module	92660621959e7fab813173772987588b
-_md5_=cf727fb0625c5a811f8ce424fd7b3513
diff --git a/metadata/md5-cache/sys-cluster/kubeletctl-1.6 b/metadata/md5-cache/sys-cluster/kubeletctl-1.6
new file mode 100644
index 000000000000..58b80aa857c0
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeletctl-1.6
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A client for kubelet
+EAPI=7
+HOMEPAGE=https://github.com/cyberark/kubeletctl
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/cyberark/kubeletctl/archive/v1.6.tar.gz -> kubeletctl-1.6.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.9.6.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.6.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.8.2.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.2.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.5.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20191004114745-ee4c978eae7e.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20191004114745-ee4c978eae7e.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20200322175846-f7e751efca13.zip -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20200322175846-f7e751efca13.zip mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20200322175846-f7e751efca13.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20200322175846-f7e751efca13.mod mirror://goproxy//github.com/c-bata/go-prompt/@v/v0.2.3.zip -> github.com%2Fc-bata%2Fgo-prompt%2F@v%2Fv0.2.3.zip mirror://goproxy//github.com/c-bata/go-prompt/@v/v0.2.3.mod -> github.com%2Fc-bata%2Fgo-prompt%2F@v%2Fv0.2.3.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/go-etcd/@v/v2.0.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/@v/v1.0.10.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v0.0.0-20151105211317-5215b55f46b2.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.zip -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20170405201442-c4fc26588b6e.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.zip -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.zip mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.zip -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.2-0.20190723190241-65acae22fc9d.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20161122191042-44d81051d367.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.4.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20170728041850-787624de3eb7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20170728041850-787624de3eb7.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jedib0t/go-pretty/@v/v4.3.0+incompatible.zip -> github.com%2Fjedib0t%2Fgo-pretty%2F@v%2Fv4.3.0+incompatible.zip mirror://goproxy//github.com/jedib0t/go-pretty/@v/v4.3.0+incompatible.mod -> github.com%2Fjedib0t%2Fgo-pretty%2F@v%2Fv4.3.0+incompatible.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v0.0.0-20180612202835-f2b4162afba3.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.6.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.6.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-tty/@v/v0.0.3.zip -> github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/mattn/go-tty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/gox/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180320133207-05fbef0ca5da.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/term/@v/v0.0.0-20190109203006-aa71e9d9e942.zip -> github.com%2Fpkg%2Fterm%2F@v%2Fv0.0.0-20190109203006-aa71e9d9e942.zip mirror://goproxy//github.com/pkg/term/@v/v0.0.0-20190109203006-aa71e9d9e942.mod -> github.com%2Fpkg%2Fterm%2F@v%2Fv0.0.0-20190109203006-aa71e9d9e942.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v0.0.0-20151028094244-d8ed2627bdf0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.5.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.7.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.7.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.7.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.3.2.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v0.0.0-20151208002404-e3a8ff8ce365.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.zip -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.1.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v0.0.0-20181204163529-d75b2dcb6bc8.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.zip -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.zip mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181203042331-505ab145d0a9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190211182817-74369b46fc67.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190611184440-5c40567a22f8.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191206172530-e9b2fee46413.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200220183623-bac4c82f6975.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190813141303-74dc4d7220e7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181205085412-a5c9d58dba9a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190209173611-3b5209105503.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190826190057-c7b8b68b1456.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190307195333-5fe7a883aa19.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190418145605-e7d98fc518a7.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.0.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20191025225708-5524a3672fbb.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20191025225708-5524a3672fbb.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20200403220253-fa879b399cd0.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20200403220253-fa879b399cd0.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20200403220253-fa879b399cd0.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20200403220253-fa879b399cd0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20191025225532-af6325b3a843.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20191025225532-af6325b3a843.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20200403220105-fa0d5bf06730.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20200403220105-fa0d5bf06730.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20200403220105-fa0d5bf06730.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20200403220105-fa0d5bf06730.mod mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20191026065934-0bdba2f91880.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20191026065934-0bdba2f91880.mod mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20200404181738-fe32aa3b9449.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20200404181738-fe32aa3b9449.zip mirror://goproxy//k8s.io/client-go/@v/v0.0.0-20200404181738-fe32aa3b9449.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20200404181738-fe32aa3b9449.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v0.3.0.mod -> k8s.io%2Fklog%2F@v%2Fv0.3.0.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.zip -> k8s.io%2Fklog%2F@v%2Fv1.0.0.zip mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20190816220812-743ec37842bf.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200401025727-01dfbe2eec3d.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200401025727-01dfbe2eec3d.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191010214722-8d271d903fe4.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191010214722-8d271d903fe4.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20200324210504-a9aa75ae1b89.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.zip -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/@v/v0.0.0-20190525122527-15d366b2352e.mod -> sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
+_eclasses_=go-module	92660621959e7fab813173772987588b
+_md5_=e40bf357f3b1b77bcd71a6ec27bc8214
diff --git a/metadata/md5-cache/sys-cluster/libqb-1.0.1 b/metadata/md5-cache/sys-cluster/libqb-1.0.1
deleted file mode 100644
index 3be4c13bf63b..000000000000
--- a/metadata/md5-cache/sys-cluster/libqb-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 app-arch/xz-utils test? ( dev-libs/check ) doc? ( app-doc/doxygen[dot] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library providing high performance logging, tracing, ipc, and poll
-EAPI=5
-HOMEPAGE=https://github.com/ClusterLabs/libqb
-IUSE=debug doc examples static-libs test
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ClusterLabs/libqb/releases/download/v1.0.1/libqb-1.0.1.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b1b1f5201abc3583737ed2afb3526572
diff --git a/metadata/md5-cache/sys-cluster/libquo-1.2 b/metadata/md5-cache/sys-cluster/libquo-1.2
deleted file mode 100644
index e45a369ac816..000000000000
--- a/metadata/md5-cache/sys-cluster/libquo-1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/mpi sys-process/numactl sys-apps/hwloc[numa,xml] >=app-portage/elt-patches-20170815
-DESCRIPTION=run-time tuning of process binding policies made easy
-EAPI=5
-HOMEPAGE=https://lanl.github.io/libquo/
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=virtual/mpi sys-process/numactl sys-apps/hwloc[numa,xml]
-SLOT=0
-SRC_URI=https://lanl.github.io/libquo/dists/libquo-1.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1a1ee38b71c19dca55433586beb24885
diff --git a/metadata/md5-cache/sys-cluster/libquo-1.2.2 b/metadata/md5-cache/sys-cluster/libquo-1.2.2
deleted file mode 100644
index 285c66ddce95..000000000000
--- a/metadata/md5-cache/sys-cluster/libquo-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] >=app-portage/elt-patches-20170815
-DESCRIPTION=run-time tuning of process binding policies made easy
-EAPI=5
-HOMEPAGE=https://lanl.github.io/libquo/
-IUSE=fortran
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml]
-SLOT=0
-SRC_URI=https://lanl.github.io/libquo/dists/libquo-1.2.2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4f55fdf43c8f030b2267f52a1ae4dc7a
diff --git a/metadata/md5-cache/sys-cluster/libquo-1.2.3 b/metadata/md5-cache/sys-cluster/libquo-1.2.3
deleted file mode 100644
index e7ee3a76a1e9..000000000000
--- a/metadata/md5-cache/sys-cluster/libquo-1.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] >=app-portage/elt-patches-20170815
-DESCRIPTION=run-time tuning of process binding policies made easy
-EAPI=5
-HOMEPAGE=https://lanl.github.io/libquo/
-IUSE=fortran static-libs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml]
-SLOT=0
-SRC_URI=https://lanl.github.io/libquo/dists/libquo-1.2.3.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f8d6353687d49f93ab849a14c5c6b5d6
diff --git a/metadata/md5-cache/sys-cluster/libquo-1.2.4-r1 b/metadata/md5-cache/sys-cluster/libquo-1.2.4-r1
deleted file mode 100644
index fb01f3db2b04..000000000000
--- a/metadata/md5-cache/sys-cluster/libquo-1.2.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] >=app-portage/elt-patches-20170815 fortran? ( virtual/fortran )
-DESCRIPTION=run-time tuning of process binding policies made easy
-EAPI=5
-HOMEPAGE=https://lanl.github.io/libquo/
-IUSE=fortran static-libs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=virtual/mpi[fortran?] sys-process/numactl sys-apps/hwloc[numa,xml] fortran? ( virtual/fortran )
-SLOT=0
-SRC_URI=https://lanl.github.io/libquo/dists/libquo-1.2.4.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	fortran-2	b4796813ccda91c9c0d3463fc90aa969	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=03ba6050c7cf09fb2f251aadada21b9b
diff --git a/metadata/md5-cache/sys-cluster/neutron-16.0.0 b/metadata/md5-cache/sys-cluster/neutron-16.0.0
deleted file mode 100644
index d87686f807eb..000000000000
--- a/metadata/md5-cache/sys-cluster/neutron-16.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile config configure install postinst prepare pretend setup test
-DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] app-admin/sudo
-DESCRIPTION=A virtual network service for Openstack
-EAPI=7
-HOMEPAGE=https://launchpad.net/neutron
-IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres python_targets_python3_7 kernel_linux
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.19.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pecan-1.3.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/neutron-lib-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tenacity-4.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.0[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/alembic-0.8.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.37.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.35.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/osprofiler-2.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-ken-0.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ovs-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ovsdbapp-1.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyroute2-0.5.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.31.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-vif-1.15.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pyudev[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( net-misc/openvswitch ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) acct-group/neutron acct-user/neutron python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-16.0.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-16.0.0.tar.gz https://tarballs.openstack.org/neutron/neutron-16.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0676e578a3d1daf93db67350b2a42995
diff --git a/metadata/md5-cache/sys-cluster/neutron-16.1.0 b/metadata/md5-cache/sys-cluster/neutron-16.1.0
index 030d8219a499..89c18773268e 100644
--- a/metadata/md5-cache/sys-cluster/neutron-16.1.0
+++ b/metadata/md5-cache/sys-cluster/neutron-16.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=A virtual network service for Openstack
 EAPI=7
 HOMEPAGE=https://launchpad.net/neutron
 IUSE=compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres python_targets_python3_7 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.19.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pecan-1.3.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/neutron-lib-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tenacity-4.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.0[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/alembic-0.8.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.37.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.35.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/osprofiler-2.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-ken-0.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ovs-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ovsdbapp-1.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyroute2-0.5.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.31.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-designateclient-2.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-xenapi-0.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-vif-1.15.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pyudev[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sys-apps/iproute2 net-misc/iputils[arping] net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools haproxy? ( net-proxy/haproxy ) openvswitch? ( net-misc/openvswitch ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) acct-group/neutron acct-user/neutron python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-16.1.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-16.1.0.tar.gz https://tarballs.openstack.org/neutron/neutron-16.1.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d7848b664075c8dbd613c08a0fef1cc6
+_md5_=0676e578a3d1daf93db67350b2a42995
diff --git a/metadata/md5-cache/sys-cluster/nova-21.0.0-r1 b/metadata/md5-cache/sys-cluster/nova-21.0.0-r1
deleted file mode 100644
index 95bc6e915e1d..000000000000
--- a/metadata/md5-cache/sys-cluster/nova-21.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] app-admin/sudo
-DESCRIPTION=Cloud computing fabric controller
-EAPI=7
-HOMEPAGE=https://launchpad.net/nova
-IUSE=+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python3_7 kernel_linux
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.19[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/lxml-2.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-2.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/greenlet-0.4.14[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-migrate-0.13.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/python-cinderclient-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/websockify-0.9.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-6.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.21.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.21.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-4.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.44.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-10.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-3.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.33.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.40.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/rfc3986-1.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.35.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-brick-3.0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-resource-classes-0.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-traits-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-vif-1.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/microversion-parse-0.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-xenapi-0.3.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pypowervm-1.1.15[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/retrying-1.3.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-service-types-1.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/zVMCloudConnector-1.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.35.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] app-emulation/libvirt[iscsi?] app-emulation/spice-html5 novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) acct-user/nova acct-group/nova python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-21.0.0 https://tarballs.openstack.org/nova/nova-21.0.0.tar.gz
-_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=af6d7d8e1f6895ac262e77012d79d009
diff --git a/metadata/md5-cache/sys-cluster/nova-21.1.0 b/metadata/md5-cache/sys-cluster/nova-21.1.0
index 89834b544ecd..d45332b056da 100644
--- a/metadata/md5-cache/sys-cluster/nova-21.1.0
+++ b/metadata/md5-cache/sys-cluster/nova-21.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=Cloud computing fabric controller
 EAPI=7
 HOMEPAGE=https://launchpad.net/nova
 IUSE=+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python3_7 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.19[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/lxml-2.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-2.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/greenlet-0.4.14[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-migrate-0.13.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/python-cinderclient-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/websockify-0.9.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-6.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.21.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.21.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-4.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.44.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-10.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-3.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.33.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.40.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/rfc3986-1.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.35.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-brick-3.0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-resource-classes-0.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-traits-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-vif-1.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/microversion-parse-0.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-xenapi-0.3.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pypowervm-1.1.15[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/retrying-1.3.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-service-types-1.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/zVMCloudConnector-1.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.35.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] app-emulation/libvirt[iscsi?] app-emulation/spice-html5 novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) acct-user/nova acct-group/nova python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-21.1.0 https://tarballs.openstack.org/nova/nova-21.1.0.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f4637996f3f44e87feb4d2cd54314858
+_md5_=67f1cba29e4c99413928f13993e85043
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.16 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.16
index df3373911c14..8072073d19db 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.16
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.1.16
@@ -4,11 +4,11 @@ DESCRIPTION=Pacemaker CRM
 EAPI=6
 HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
 IUSE=acl heartbeat smtp snmp static-libs +python_single_target_python2_7
-KEYWORDS=amd64 hppa x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp )
 REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-1.1.16.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6f27e866b800d9e8e9fcc655bcf7e24b
+_md5_=fcc6c52f1dfa576d3164c7f317731352
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-30.0-r2 b/metadata/md5-cache/sys-cluster/rdma-core-30.0-r2
index 893f5cc80ded..11a764bf8e4f 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-30.0-r2
+++ b/metadata/md5-cache/sys-cluster/rdma-core-30.0-r2
@@ -11,5 +11,5 @@ RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/system
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v30.0.tar.gz -> rdma-core-30.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=376bad55231a74360b2cfc75a55bf06c
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-31.0 b/metadata/md5-cache/sys-cluster/rdma-core-31.0
index f88d02249acd..f0b2ef411a44 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-31.0
+++ b/metadata/md5-cache/sys-cluster/rdma-core-31.0
@@ -11,5 +11,5 @@ RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/system
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v31.0.tar.gz -> rdma-core-31.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56c47e8dd6b5dcb949e9486be8980fba
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-9999 b/metadata/md5-cache/sys-cluster/rdma-core-9999
index 51acbdef68de..9ad853b1a190 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-9999
+++ b/metadata/md5-cache/sys-cluster/rdma-core-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) !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_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=376bad55231a74360b2cfc75a55bf06c
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 2c4d3ec4bec7..a904ebbd43d0 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/automake-1.10.3-r3 b/metadata/md5-cache/sys-devel/automake-1.10.3-r3
index eb2989823a29..29f5fa184248 100644
--- a/metadata/md5-cache/sys-devel/automake-1.10.3-r3
+++ b/metadata/md5-cache/sys-devel/automake-1.10.3-r3
@@ -1,14 +1,13 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+BDEPEND=app-arch/gzip
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
-IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=1.10
 SRC_URI=mirror://gnu/automake/automake-1.10.3.tar.bz2
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=11a31a887b198849107f8ea6c6e8d577
+_md5_=597221443793d9d9dbd230ef101631cb
diff --git a/metadata/md5-cache/sys-devel/automake-1.11.6-r3 b/metadata/md5-cache/sys-devel/automake-1.11.6-r3
index c475c63ca0c6..35e3f977c87b 100644
--- a/metadata/md5-cache/sys-devel/automake-1.11.6-r3
+++ b/metadata/md5-cache/sys-devel/automake-1.11.6-r3
@@ -1,14 +1,13 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+BDEPEND=app-arch/gzip
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
-IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=1.11
 SRC_URI=mirror://gnu/automake/automake-1.11.6.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=04d3322ef595be75fb0fad6fbf7b2f15
+_md5_=c0532f58250053f300c9f21df40d6653
diff --git a/metadata/md5-cache/sys-devel/automake-1.12.6-r2 b/metadata/md5-cache/sys-devel/automake-1.12.6-r2
index 4fc95ba5ce6b..3275fcd42894 100644
--- a/metadata/md5-cache/sys-devel/automake-1.12.6-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.12.6-r2
@@ -1,14 +1,13 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+BDEPEND=app-arch/gzip
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
-IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=1.12
 SRC_URI=mirror://gnu/automake/automake-1.12.6.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5fb263dd4936224eaeaa603fcd52a503
+_md5_=485d68d462353da06ea13740fac5c257
diff --git a/metadata/md5-cache/sys-devel/automake-1.13.4-r2 b/metadata/md5-cache/sys-devel/automake-1.13.4-r2
index 10bab8c25899..cb8c219cd403 100644
--- a/metadata/md5-cache/sys-devel/automake-1.13.4-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.13.4-r2
@@ -1,14 +1,13 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+BDEPEND=app-arch/gzip
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
-IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=1.13
 SRC_URI=mirror://gnu/automake/automake-1.13.4.tar.xz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=275520305b84c040331a29f03b526c6d
+_md5_=c1ad9fa44d67223b17bbed1247bc2988
diff --git a/metadata/md5-cache/sys-devel/automake-1.14.1-r2 b/metadata/md5-cache/sys-devel/automake-1.14.1-r2
index bfda32da9d51..58857c8db901 100644
--- a/metadata/md5-cache/sys-devel/automake-1.14.1-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.14.1-r2
@@ -1,14 +1,13 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+BDEPEND=app-arch/gzip
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
-IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 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=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=1.14
 SRC_URI=mirror://gnu/automake/automake-1.14.1.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.14.1.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e633ddad661d0eae97a2422ceb908826
+_md5_=0f64012941bea04de48d89869f5e2786
diff --git a/metadata/md5-cache/sys-devel/automake-1.15.1-r2 b/metadata/md5-cache/sys-devel/automake-1.15.1-r2
index 369bced79c61..0adcd3a3cffe 100644
--- a/metadata/md5-cache/sys-devel/automake-1.15.1-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.15.1-r2
@@ -1,14 +1,13 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+BDEPEND=app-arch/gzip
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
-IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 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=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=1.15
 SRC_URI=mirror://gnu/automake/automake-1.15.1.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.15.1.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6a7285fb9606f4f538c88cc219a665c4
+_md5_=5d4db460fe7cc29a78435af747c09978
diff --git a/metadata/md5-cache/sys-devel/automake-1.16.1-r1 b/metadata/md5-cache/sys-devel/automake-1.16.1-r1
index d88ab9e4363e..3a95707725b6 100644
--- a/metadata/md5-cache/sys-devel/automake-1.16.1-r1
+++ b/metadata/md5-cache/sys-devel/automake-1.16.1-r1
@@ -1,14 +1,12 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig sys-apps/help2man
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
-IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=1.16
 SRC_URI=mirror://gnu/automake/automake-1.16.1.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.16.1.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=aa004b3ce62d2e55f96ccee512bfab6a
+_md5_=7baef0208a695597dbb002a5a584fb0a
diff --git a/metadata/md5-cache/sys-devel/automake-1.4_p6-r2 b/metadata/md5-cache/sys-devel/automake-1.4_p6-r2
index 6d259c602891..d3d6ca8c4db8 100644
--- a/metadata/md5-cache/sys-devel/automake-1.4_p6-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.4_p6-r2
@@ -1,12 +1,11 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=4
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
+RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.4
 SRC_URI=mirror://gnu/automake/automake-1.4-p6.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=3276e8a98076514f838b922d0bd3b829
+_md5_=1ced4aef3543ffcc13b3392c0a54b7b4
diff --git a/metadata/md5-cache/sys-devel/automake-1.5-r2 b/metadata/md5-cache/sys-devel/automake-1.5-r2
index c9cef1a961a8..adfc93f3be3f 100644
--- a/metadata/md5-cache/sys-devel/automake-1.5-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.5-r2
@@ -1,12 +1,11 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=4
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
+RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.5
 SRC_URI=mirror://gnu/automake/automake-1.5.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=33c9ed4ac8120f95848294010b1883af
+_md5_=ffa6174f8dfba1762b402f07662e56ad
diff --git a/metadata/md5-cache/sys-devel/automake-1.6.3-r2 b/metadata/md5-cache/sys-devel/automake-1.6.3-r2
index 230a93fb382c..f6dbb1893e94 100644
--- a/metadata/md5-cache/sys-devel/automake-1.6.3-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.6.3-r2
@@ -1,12 +1,11 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=4
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
+RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.6
 SRC_URI=mirror://gnu/automake/automake-1.6.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=280656d7763a9d0f4797e19805d804d6
+_md5_=3b4057919d6cdc74c4d8509a7357d6fa
diff --git a/metadata/md5-cache/sys-devel/automake-1.7.9-r3 b/metadata/md5-cache/sys-devel/automake-1.7.9-r3
index c2eafc874992..a0b10c4622d5 100644
--- a/metadata/md5-cache/sys-devel/automake-1.7.9-r3
+++ b/metadata/md5-cache/sys-devel/automake-1.7.9-r3
@@ -1,12 +1,11 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=4
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
+RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.7
 SRC_URI=mirror://gnu/automake/automake-1.7.9.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e3b83a094d6e5c9ac3b28f918eacb4fb
+_md5_=7e7640c9f935185c9c92879fceaf84a6
diff --git a/metadata/md5-cache/sys-devel/automake-1.8.5-r5 b/metadata/md5-cache/sys-devel/automake-1.8.5-r5
index 67621a79074e..8160d0efa93d 100644
--- a/metadata/md5-cache/sys-devel/automake-1.8.5-r5
+++ b/metadata/md5-cache/sys-devel/automake-1.8.5-r5
@@ -1,12 +1,11 @@
 DEFINED_PHASES=install prepare
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=4
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69 sys-devel/gnuconfig
+RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.8
 SRC_URI=mirror://gnu/automake/automake-1.8.5.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a97667ddfba2cbba1b499b832221efde
+_md5_=7f7a725104d8a7b73b00fbac8dde92f8
diff --git a/metadata/md5-cache/sys-devel/automake-1.9.6-r5 b/metadata/md5-cache/sys-devel/automake-1.9.6-r5
index cae05f9c6d41..448af0f11c6b 100644
--- a/metadata/md5-cache/sys-devel/automake-1.9.6-r5
+++ b/metadata/md5-cache/sys-devel/automake-1.9.6-r5
@@ -1,14 +1,12 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* >=sys-apps/texinfo-4.7 sys-devel/gnuconfig sys-apps/help2man test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* >=sys-apps/texinfo-4.7 sys-devel/gnuconfig sys-apps/help2man
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/automake/
-IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-10 >=sys-devel/autoconf-2.69:* >=sys-apps/texinfo-4.7 sys-devel/gnuconfig
-RESTRICT=!test? ( test )
+RESTRICT=test
 SLOT=1.9
 SRC_URI=mirror://gnu/automake/automake-1.9.6.tar.bz2
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ca3fd70f5adbf608993cfd2c9f9b3b19
+_md5_=16026191a5030e1cf9196ee4e14b52c3
diff --git a/metadata/md5-cache/sys-devel/automake-9999 b/metadata/md5-cache/sys-devel/automake-9999
index bc0242fe14f7..8f03466a0823 100644
--- a/metadata/md5-cache/sys-devel/automake-9999
+++ b/metadata/md5-cache/sys-devel/automake-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install prepare setup unpack
 DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8c0e5e363d9f6d15c04218b653c8f1e7
+_md5_=6f4d07a63de71fc1c1bbc2c28fb853a8
diff --git a/metadata/md5-cache/sys-devel/automake-wrapper-10 b/metadata/md5-cache/sys-devel/automake-wrapper-10
deleted file mode 100644
index 7585028f55f5..000000000000
--- a/metadata/md5-cache/sys-devel/automake-wrapper-10
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=wrapper for automake to manage multiple automake versions
-EAPI=4
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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
-SLOT=0
-_md5_=2ca97fa062d6ab516bbb24fbc10cea0e
diff --git a/metadata/md5-cache/sys-devel/binutils-2.34-r2 b/metadata/md5-cache/sys-devel/binutils-2.34-r2
index 9ada43394ea7..5b5645eb5a26 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.34-r2
+++ b/metadata/md5-cache/sys-devel/binutils-2.34-r2
@@ -5,7 +5,7 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=default-gold doc +gold multitarget +nls +plugins static-libs test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=default-gold? ( gold )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.34
 SRC_URI=mirror://gnu/binutils/binutils-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.34-patches-6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fd3294dc3e894449b360d68199c9551c
+_md5_=bdce8aede8a12d22d758ba4733cecd86
diff --git a/metadata/md5-cache/sys-devel/binutils-2.35 b/metadata/md5-cache/sys-devel/binutils-2.35
deleted file mode 100644
index d0cf28f7afe6..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-2.35
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib sys-devel/gnuconfig
-DESCRIPTION=Tools necessary to build programs
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=default-gold doc +gold multitarget +nls +plugins static-libs test vanilla
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-REQUIRED_USE=default-gold? ( gold )
-RESTRICT=!test? ( test )
-SLOT=2.35
-SRC_URI=mirror://gnu/binutils/binutils-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.35-patches-1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c8929b3c7189e77675b167a46474875b
diff --git a/metadata/md5-cache/sys-devel/binutils-2.35.1 b/metadata/md5-cache/sys-devel/binutils-2.35.1
index 35bfc9df9263..1bfd301a9b77 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.35.1
+++ b/metadata/md5-cache/sys-devel/binutils-2.35.1
@@ -5,6 +5,7 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=default-gold doc +gold multitarget +nls +plugins static-libs test vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=default-gold? ( gold )
@@ -12,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.35
 SRC_URI=mirror://gnu/binutils/binutils-2.35.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.35.1-patches-1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c8929b3c7189e77675b167a46474875b
+_md5_=e4e0f38e6833dfbfd411a2bcfea14c82
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index 5c6664402073..1e45275a6fb9 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=default-gold? ( gold )
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c8929b3c7189e77675b167a46474875b
+_md5_=48b5be30c05f630f09ea6d7d2ad7394b
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.35 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.35
deleted file mode 100644
index 834432267eb2..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.35
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib sys-devel/gnuconfig
-DESCRIPTION=Tools necessary to build programs
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=default-gold doc +gold multitarget +nls +plugins static-libs test
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-REQUIRED_USE=default-gold? ( gold )
-RESTRICT=!test? ( test )
-SLOT=2.35
-SRC_URI=mirror://gnu/binutils/binutils-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.35-patches-1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=01a93f978c2439de6943d0aad9558e03
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.35.1 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.35.1
index 354a39089c7b..e7196d190e05 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.35.1
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.35.1
@@ -5,6 +5,7 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=default-gold doc +gold multitarget +nls +plugins static-libs test
+KEYWORDS=-* ~hppa
 LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 REQUIRED_USE=default-gold? ( gold )
@@ -12,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.35
 SRC_URI=mirror://gnu/binutils/binutils-2.35.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.35.1-patches-1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=01a93f978c2439de6943d0aad9558e03
+_md5_=684be6b7bd248bde6f9abefe9f15c828
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.1 b/metadata/md5-cache/sys-devel/clang-10.0.1
index 2ee46956efa2..da48ba7b9cf3 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.1
+++ b/metadata/md5-cache/sys-devel/clang-10.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d97c49780611e4cfabc7223042f96f9
diff --git a/metadata/md5-cache/sys-devel/clang-11.0.0.9999 b/metadata/md5-cache/sys-devel/clang-11.0.0.9999
index 7a2492e4a750..43e00a816d61 100644
--- a/metadata/md5-cache/sys-devel/clang-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-11.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-11.0.0.9999:11=[debug=,llvm_targets_AArch64?,llvm_target
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE )
 RESTRICT=!test? ( test )
 SLOT=11
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f957106c3a7ee5261d6105f290f3d846
diff --git a/metadata/md5-cache/sys-devel/clang-11.0.0_rc3 b/metadata/md5-cache/sys-devel/clang-11.0.0_rc3
index 23e7106f363c..b91b43a5bdeb 100644
--- a/metadata/md5-cache/sys-devel/clang-11.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/clang-11.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f957106c3a7ee5261d6105f290f3d846
diff --git a/metadata/md5-cache/sys-devel/clang-11.0.0_rc4 b/metadata/md5-cache/sys-devel/clang-11.0.0_rc4
new file mode 100644
index 000000000000..d31e2f46ae4a
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-11.0.0_rc4
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/sphinx xml? ( virtual/pkgconfig ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-11.0.0_rc4:11=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_AVR?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_VE?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !!sys-devel/llvm:0
+DESCRIPTION=C language family frontend for LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug default-compiler-rt default-libcxx default-lld doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-11.0.0_rc4 default-compiler-rt? ( =sys-libs/compiler-rt-11.0.0* ) default-libcxx? ( >=sys-libs/libcxx-11.0.0_rc4 ) default-lld? ( sys-devel/lld )
+RDEPEND=~sys-devel/llvm-11.0.0_rc4:11=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_AVR?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_VE?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f957106c3a7ee5261d6105f290f3d846
diff --git a/metadata/md5-cache/sys-devel/clang-12.0.0.9999 b/metadata/md5-cache/sys-devel/clang-12.0.0.9999
index 6ab602a63dc8..cc2c49009a82 100644
--- a/metadata/md5-cache/sys-devel/clang-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-12.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-12.0.0.9999:12=[debug=,llvm_targets_AArch64?,llvm_target
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE )
 RESTRICT=!test? ( test )
 SLOT=12
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41f93faa4895a4b3f3a11252a0e4579a
diff --git a/metadata/md5-cache/sys-devel/clang-common-11.0.0_rc4 b/metadata/md5-cache/sys-devel/clang-common-11.0.0_rc4
new file mode 100644
index 000000000000..b34507ac94ab
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-11.0.0_rc4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of clang
+EAPI=7
+HOMEPAGE=https://llvm.org/
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=sys-devel/clang:*
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a6513b1aae1caeb77b1491bb87b5058a
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-11.0.0_rc4 b/metadata/md5-cache/sys-devel/clang-runtime-11.0.0_rc4
new file mode 100644
index 000000000000..3966e8dfcf4d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-11.0.0_rc4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=7
+HOMEPAGE=https://clang.llvm.org/
+IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=metapackage
+PROPERTIES=live
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-11.0.0_rc4:11.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-11.0.0_rc4:11.0.0 ) ) libcxx? ( >=sys-libs/libcxx-11.0.0_rc4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-11.0.0_rc4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sanitize? ( compiler-rt )
+SLOT=11.0.0
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=227477f42947a65af543cd73da80bf66
diff --git a/metadata/md5-cache/sys-devel/dwz-0.13 b/metadata/md5-cache/sys-devel/dwz-0.13
index e384023eafe8..dcd302b15f9f 100644
--- a/metadata/md5-cache/sys-devel/dwz-0.13
+++ b/metadata/md5-cache/sys-devel/dwz-0.13
@@ -1,12 +1,15 @@
+BDEPEND=test? ( dev-util/dejagnu dev-libs/elfutils[utils] )
 DEFINED_PHASES=prepare
 DEPEND=dev-libs/elfutils
 DESCRIPTION=DWARF optimization and duplicate removal tool
 EAPI=7
 HOMEPAGE=https://sourceware.org/dwz
+IUSE=test
 KEYWORDS=~amd64
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=dev-libs/elfutils
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sourceware.org/ftp/dwz/releases/dwz-0.13.tar.xz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=30d724699380ed4caf27adff4cdd05dd
+_md5_=1aad987f55fcdb5ea74777d79596a786
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
deleted file mode 100644
index fb37eb635ebb..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/binutils-2.20 sys-devel/gnuconfig sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= gcj? ( awt? ( x11-base/xorg-proto x11-libs/libXt x11-libs/libX11 x11-libs/libXtst =x11-libs/gtk+-2* virtual/pkgconfig x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-IUSE=test vanilla +nls altivec debug +cxx +nptl nopie nossp +fortran doc hardened multilib objc awt gcj pgo objc-gc libssp objc++ +openmp fixed-point go cilk ada +vtv
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0=
-RESTRICT=!test? ( test )
-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-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-3.tar.bz2 mirror://gentoo/gcc-4.9.4-piepatches-v2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-piepatches-v2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-piepatches-v2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-piepatches-v2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-piepatches-v2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-piepatches-v2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-piepatches-v2.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_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	95b9d37e17621738d2113a52fb4f59dd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e56ef13b35e6dc5646c59df8c9414676
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.1 b/metadata/md5-cache/sys-devel/lld-10.0.1
index d4d16c74921c..176269418101 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.1
+++ b/metadata/md5-cache/sys-devel/lld-10.0.1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-10.0.1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a054f4dc26436f84e096316f86f1242b
diff --git a/metadata/md5-cache/sys-devel/lld-11.0.0.9999 b/metadata/md5-cache/sys-devel/lld-11.0.0.9999
index 8fb3f6f0847b..3ec3a27b7880 100644
--- a/metadata/md5-cache/sys-devel/lld-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-11.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-11.0.0.9999
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd9b7d2b488a31c2bafc58ce3384a4a1
diff --git a/metadata/md5-cache/sys-devel/lld-11.0.0_rc3 b/metadata/md5-cache/sys-devel/lld-11.0.0_rc3
index 40eb91295441..bbfa2f7d6aaf 100644
--- a/metadata/md5-cache/sys-devel/lld-11.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/lld-11.0.0_rc3
@@ -10,5 +10,5 @@ RDEPEND=~sys-devel/llvm-11.0.0_rc3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd9b7d2b488a31c2bafc58ce3384a4a1
diff --git a/metadata/md5-cache/sys-devel/lld-11.0.0_rc4 b/metadata/md5-cache/sys-devel/lld-11.0.0_rc4
new file mode 100644
index 000000000000..9d1cbf430a46
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-11.0.0_rc4
@@ -0,0 +1,14 @@
+BDEPEND=test? ( || ( ( dev-lang/python:3.9 ~dev-python/lit-11.0.0_rc4[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 ~dev-python/lit-11.0.0_rc4[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 ~dev-python/lit-11.0.0_rc4[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 ~dev-python/lit-11.0.0_rc4[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-11.0.0_rc4 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=test
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=~sys-devel/llvm-11.0.0_rc4
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd9b7d2b488a31c2bafc58ce3384a4a1
diff --git a/metadata/md5-cache/sys-devel/lld-12.0.0.9999 b/metadata/md5-cache/sys-devel/lld-12.0.0.9999
index e798573ed9fb..cd3500599eb8 100644
--- a/metadata/md5-cache/sys-devel/lld-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-12.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=~sys-devel/llvm-12.0.0.9999
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd9b7d2b488a31c2bafc58ce3384a4a1
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ed5315f61ea7eebf4a9de221261dd470
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.1 b/metadata/md5-cache/sys-devel/llvm-10.0.1
index e429cd10b2dc..7b67dc1d18ba 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=37b71bf36452644d88eb16f787c6605e
diff --git a/metadata/md5-cache/sys-devel/llvm-11.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
index 2edf56afbc99..45624a8264c7 100644
--- a/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE )
 RESTRICT=!test? ( test )
 SLOT=11
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=582102f687941bb6f2575493c0df12d9
diff --git a/metadata/md5-cache/sys-devel/llvm-11.0.0_rc3 b/metadata/md5-cache/sys-devel/llvm-11.0.0_rc3
index 22245051b60a..e1cf8aabfe6b 100644
--- a/metadata/md5-cache/sys-devel/llvm-11.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/llvm-11.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=582102f687941bb6f2575493c0df12d9
diff --git a/metadata/md5-cache/sys-devel/llvm-11.0.0_rc4 b/metadata/md5-cache/sys-devel/llvm-11.0.0_rc4
new file mode 100644
index 000000000000..a94ba807a2ba
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-11.0.0_rc4
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-11.0.0.9999 >=sys-devel/binutils-apple-5.1 ) libffi? ( virtual/pkgconfig ) || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] doc? ( dev-python/recommonmark[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] doc? ( dev-python/recommonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] doc? ( dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] doc? ( dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/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_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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_s390_32(-)?,abi_s390_64(-)?] ) gold? ( sys-libs/binutils-libs )
+DESCRIPTION=Low Level Virtual Machine
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-11 )
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/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_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_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_s390_32(-)?,abi_s390_64(-)?] ) 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_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=582102f687941bb6f2575493c0df12d9
diff --git a/metadata/md5-cache/sys-devel/llvm-12.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-12.0.0.9999
index 040c2937b7de..3ec93344307b 100644
--- a/metadata/md5-cache/sys-devel/llvm-12.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-12.0.0.9999
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_VE )
 RESTRICT=!test? ( test )
 SLOT=12
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8c3103ad12f586271abd8d23c812732f
diff --git a/metadata/md5-cache/sys-devel/llvm-common-11.0.0_rc4 b/metadata/md5-cache/sys-devel/llvm-common-11.0.0_rc4
new file mode 100644
index 000000000000..e3c0bbdb18e0
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-11.0.0_rc4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=7
+HOMEPAGE=https://llvm.org/
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multiprocessing	cac3169468f893670dac3e7cb940e045
+_md5_=c8c5ff1b18ab0822fe355d25c5b2b6e6
diff --git a/metadata/md5-cache/sys-devel/llvm-roc-3.7.0-r1 b/metadata/md5-cache/sys-devel/llvm-roc-3.7.0-r1
index 88fa51d41abc..6ff6a1b7d401 100644
--- a/metadata/md5-cache/sys-devel/llvm-roc-3.7.0-r1
+++ b/metadata/md5-cache/sys-devel/llvm-roc-3.7.0-r1
@@ -11,5 +11,5 @@ PDEPEND=dev-libs/rocr-runtime
 RDEPEND=virtual/cblas dev-libs/libxml2 sys-libs/zlib sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-3.7.0.tar.gz -> llvm-rocm-ocl-3.7.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d40ed4b1e00b30aecf2e632d7dd8abf
diff --git a/metadata/md5-cache/sys-devel/llvm-roc-3.8.0 b/metadata/md5-cache/sys-devel/llvm-roc-3.8.0
index 13d87818c374..d468b3521721 100644
--- a/metadata/md5-cache/sys-devel/llvm-roc-3.8.0
+++ b/metadata/md5-cache/sys-devel/llvm-roc-3.8.0
@@ -4,12 +4,12 @@ DEPEND=virtual/cblas dev-libs/libxml2 sys-libs/zlib sys-libs/ncurses:=
 DESCRIPTION=Radeon Open Compute llvm,lld,clang
 EAPI=7
 HOMEPAGE=https://github.com/RadeonOpenCompute/ROCm/
-IUSE=debug
+IUSE=debug runtime
 KEYWORDS=~amd64
 LICENSE=UoI-NCSA rc BSD public-domain
 PDEPEND=dev-libs/rocr-runtime
 RDEPEND=virtual/cblas dev-libs/libxml2 sys-libs/zlib sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-3.8.0.tar.gz -> llvm-rocm-ocl-3.8.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35a64bfb091b065644692a6a6c8b760b
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6d8372a2e8ac6ba1aa04d73e82a99aee
diff --git a/metadata/md5-cache/sys-devel/prelink-20151030 b/metadata/md5-cache/sys-devel/prelink-20151030
deleted file mode 100644
index 4694419fcb5e..000000000000
--- a/metadata/md5-cache/sys-devel/prelink-20151030
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/elfutils-0.100 selinux? ( sys-libs/libselinux ) !dev-libs/libelf sys-libs/binutils-libs
-DESCRIPTION=Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times
-EAPI=7
-HOMEPAGE=https://git.yoctoproject.org/cgit/cgit.cgi/prelink-cross/ https://people.redhat.com/jakub/prelink
-IUSE=doc selinux
-KEYWORDS=amd64 ~arm ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/elfutils-0.100 selinux? ( sys-libs/libselinux ) !dev-libs/libelf
-RESTRICT=test
-SLOT=0
-SRC_URI=https://git.yoctoproject.org/cgit/cgit.cgi/prelink-cross/snapshot/prelink-cross-20151030.tar.bz2 doc? ( https://people.redhat.com/jakub/prelink/prelink.pdf )
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f2557395bd9c6efa98a89eabc19195d4
diff --git a/metadata/md5-cache/sys-devel/rust-std-1.46.0 b/metadata/md5-cache/sys-devel/rust-std-1.46.0
new file mode 100644
index 000000000000..08136ba281d0
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/rust-std-1.46.0
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) ~dev-lang/rust-1.46.0:=
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=|| ( >=sys-devel/gcc-4.7:* >=sys-devel/clang-3.5:* )
+DESCRIPTION=Rust standard library, standalone (for crossdev)
+EAPI=7
+HOMEPAGE=https://www.rust-lang.org
+IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=|| ( >=sys-devel/gcc-4.7:* >=sys-devel/clang-3.5:* )
+RESTRICT=test
+SLOT=stable/1.46
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.46.0-src.tar.xz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=7441981ab596754d3c40fd8cf058d6ad
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 480461596fc8..edc5b08f386c 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/iwl3160-7260-bt-ucode-37.8.10 b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10
deleted file mode 100644
index d5d430be33cf..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=0
-SRC_URI=mirror://gentoo/iwl3160-7260-bt-ucode-37.8.10.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9955f31f0b108c2d0091a3cf983a6ccb
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p1 b/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p1
deleted file mode 100644
index 77898a23d8f6..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-7260-bt-ucode-37.8.10_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=0
-SRC_URI=mirror://gentoo/iwl3160-7260-bt-ucode-37.8.10_p1.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f7c85bcc35c7613656b7393ec6269177
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.11.23 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.11.23
deleted file mode 100644
index 355363b566c8..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.11.23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 3160
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=10
-SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-23.11.10.0.tgz -> iwl3160-ucode-0.10.11.23.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6d0eb92de71c28270eb3601df051067b
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.15.23 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.15.23
deleted file mode 100644
index a3900e40a1a0..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.10.15.23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 3160
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=10
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-23.15.10.0.tgz -> iwl3160-ucode-0.10.15.23.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e4b1b0d7bf66c55c578f8ea9dca93ac4
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.16.25 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.16.25
deleted file mode 100644
index 954cfbc73b35..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.16.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 3160
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=12
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-25.16.12.0.tgz -> iwl3160-ucode-0.12.16.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9535695a42f56fbbddeed890d5be9c8f
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.17.25 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.17.25
deleted file mode 100644
index 93932c97bda9..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.12.17.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 3160
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=12
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-25.17.12.0.tgz -> iwl3160-ucode-0.12.17.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3b852a06be90fea9bc7d1bfec1cdda72
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.13.30.25 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.13.30.25
deleted file mode 100644
index 8f8f8bc01f91..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.13.30.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 3160
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=13
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-25.30.13.0.tgz -> iwl3160-ucode-0.13.30.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fba1653bf0d32498802056419200d674
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.15.227938 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.15.227938
deleted file mode 100644
index c4db8df351f6..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.15.227938
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 3160
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=15
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-3160-ucode-15.227938.0.tgz -> iwl3160-ucode-0.15.227938.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ccd8415ceccb857420aac4c5b412faa6
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.7.1.22 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.7.1.22
deleted file mode 100644
index 94c391277c3c..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.7.1.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 3160
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=7
-SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-22.1.7.0.tgz -> iwl3160-ucode-0.7.1.22.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fc5062b8308806bac2f538bc63a7e384
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.15.22 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.15.22
deleted file mode 100644
index 7dd3f41487fd..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.15.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 3160
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=8
-SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-22.15.8.0.tgz -> iwl3160-ucode-0.8.15.22.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b64240c5acb39bd7598a0f63c8301ba8
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.24.22 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.24.22
deleted file mode 100644
index 4ecd58f4ecb5..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.8.24.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 3160
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=8
-SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-22.24.8.0.tgz -> iwl3160-ucode-0.8.24.22.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4befe044d6cfef4f031fb841e1360c22
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.214.23 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.214.23
deleted file mode 100644
index 8c0be1305042..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.214.23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 3160
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=9
-SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-23.214.9.0.tgz -> iwl3160-ucode-0.9.214.23.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2a47852f8a4e1d31fd36e8d30d253c92
diff --git a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.228.25 b/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.228.25
deleted file mode 100644
index 65037502cc6f..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl3160-ucode-0.9.228.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 3160
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=9
-SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-3160-ucode-25.228.9.0.tgz -> iwl3160-ucode-0.9.228.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b152ad27535f63c79852edc812e7b5ea
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.11.23 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.11.23
deleted file mode 100644
index 7a3ecb45a752..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.11.23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7260
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=10
-SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-23.11.10.0.tgz -> iwl7260-ucode-0.10.11.23.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6d0eb92de71c28270eb3601df051067b
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.15.23 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.15.23
deleted file mode 100644
index 911900f38407..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.10.15.23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7260
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=10
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-23.15.10.0.tgz -> iwl7260-ucode-0.10.15.23.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e4b1b0d7bf66c55c578f8ea9dca93ac4
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.16.25 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.16.25
deleted file mode 100644
index c97fad73624b..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.16.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7260
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=12
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-25.16.12.0.tgz -> iwl7260-ucode-0.12.16.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9535695a42f56fbbddeed890d5be9c8f
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.17.25 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.17.25
deleted file mode 100644
index 49e95cec0f0a..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.12.17.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7260
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=12
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-25.17.12.0.tgz -> iwl7260-ucode-0.12.17.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3b852a06be90fea9bc7d1bfec1cdda72
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.13.30.25 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.13.30.25
deleted file mode 100644
index 37dfc3ff69ad..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.13.30.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7260
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=13
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-25.30.13.0.tgz -> iwl7260-ucode-0.13.30.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fba1653bf0d32498802056419200d674
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.15.227938 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.15.227938
deleted file mode 100644
index 4f01aabe6ac9..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.15.227938
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7260
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=15
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7260-ucode-15.227938.0.tgz -> iwl7260-ucode-0.15.227938.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ccd8415ceccb857420aac4c5b412faa6
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.7.1.22 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.7.1.22
deleted file mode 100644
index 21c77ad1c732..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.7.1.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7260
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=7
-SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-22.1.7.0.tgz -> iwl7260-ucode-0.7.1.22.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6ae1ff4f62c0e2ca4fd4898083b280a0
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.15.22 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.15.22
deleted file mode 100644
index 5ab54cf27e26..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.15.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7260
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=8
-SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-22.15.8.0.tgz -> iwl7260-ucode-0.8.15.22.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4befe044d6cfef4f031fb841e1360c22
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.24.22 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.24.22
deleted file mode 100644
index 9ce52d4febee..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.8.24.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7260
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=8
-SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-22.24.8.0.tgz -> iwl7260-ucode-0.8.24.22.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4befe044d6cfef4f031fb841e1360c22
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.214.23 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.214.23
deleted file mode 100644
index 0d76eb3e74cb..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.214.23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7260
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=9
-SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-23.214.9.0.tgz -> iwl7260-ucode-0.9.214.23.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ee20b0cb3a457882e43ea0bd732ef1e0
diff --git a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.228.25 b/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.228.25
deleted file mode 100644
index 4a30798607d2..000000000000
--- a/metadata/md5-cache/sys-firmware/iwl7260-ucode-0.9.228.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7260
-EAPI=5
-HOMEPAGE=https://wireless.kernel.org/en/users/Drivers/iwlwifi
-IUSE=bluetooth kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode ) !sys-kernel/linux-firmware[-savedconfig]
-SLOT=9
-SRC_URI=https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-7260-ucode-25.228.9.0.tgz -> iwl7260-ucode-0.9.228.25.tgz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e9ae3c3909b8baf5e8caa80039222aa5
diff --git a/metadata/md5-cache/sys-firmware/vgabios-0.7a b/metadata/md5-cache/sys-firmware/vgabios-0.7a
index 907aafdcba80..3eda7b4836b7 100644
--- a/metadata/md5-cache/sys-firmware/vgabios-0.7a
+++ b/metadata/md5-cache/sys-firmware/vgabios-0.7a
@@ -1,12 +1,11 @@
+BDEPEND=amd64? ( sys-devel/dev86 ) x86? ( sys-devel/dev86 )
 DEFINED_PHASES=compile install prepare
-DEPEND=amd64? ( sys-devel/dev86 ) x86? ( sys-devel/dev86 )
 DESCRIPTION=VGA BIOS implementation
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.nongnu.org/vgabios/
 IUSE=debug
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://savannah.gnu.org/download/vgabios/vgabios-0.7a.tgz https://dev.gentoo.org/~cardoe/distfiles/vgabios-0.7a-fixes-1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=694279fa5fef4a452f0c3f13b93220df
+_md5_=de8d1e79ce0df15113c12625e7855cfe
diff --git a/metadata/md5-cache/sys-firmware/vgabios-0.7a-r1 b/metadata/md5-cache/sys-firmware/vgabios-0.7a-r1
index 274fe2336ba2..c034104e1852 100644
--- a/metadata/md5-cache/sys-firmware/vgabios-0.7a-r1
+++ b/metadata/md5-cache/sys-firmware/vgabios-0.7a-r1
@@ -1,12 +1,11 @@
+BDEPEND=!binary? ( sys-devel/dev86 )
 DEFINED_PHASES=compile install prepare
-DEPEND=!binary? ( sys-devel/dev86 )
 DESCRIPTION=VGA BIOS implementation
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.nongnu.org/vgabios/
 IUSE=binary debug
 KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://savannah.gnu.org/download/vgabios/vgabios-0.7a.tgz https://dev.gentoo.org/~cardoe/distfiles/vgabios-0.7a-fixes-1.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7c41590c5cbfb78d97e87e1494182264
+_md5_=2aac90d7fc84995d44b44b80e634989c
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 6757404ec2cc..08d5ebd25bc4 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/android-file-transfer-linux-3.8 b/metadata/md5-cache/sys-fs/android-file-transfer-linux-3.8
index e7e8d8791eef..76933e6a711a 100644
--- a/metadata/md5-cache/sys-fs/android-file-transfer-linux-3.8
+++ b/metadata/md5-cache/sys-fs/android-file-transfer-linux-3.8
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-apps/file sys-libs/readline:0= fuse? ( sys-fs/fuse:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=https://github.com/whoozle/android-file-transfer-linux/archive/v3.8.tar.gz -> android-file-transfer-linux-3.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aebdf7dc143dd01ebffa9b67a937eede
diff --git a/metadata/md5-cache/sys-fs/android-file-transfer-linux-3.9 b/metadata/md5-cache/sys-fs/android-file-transfer-linux-3.9
index 7b9a91961a8e..56f0eeb8eec8 100644
--- a/metadata/md5-cache/sys-fs/android-file-transfer-linux-3.9
+++ b/metadata/md5-cache/sys-fs/android-file-transfer-linux-3.9
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-apps/file sys-libs/readline:0= fuse? ( sys-fs/fuse:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=https://github.com/whoozle/android-file-transfer-linux/archive/v3.9.tar.gz -> android-file-transfer-linux-3.9.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc1517903ff54557dea755df478ba3f0
diff --git a/metadata/md5-cache/sys-fs/android-file-transfer-linux-9999 b/metadata/md5-cache/sys-fs/android-file-transfer-linux-9999
index 3328d324320e..556029912e6d 100644
--- a/metadata/md5-cache/sys-fs/android-file-transfer-linux-9999
+++ b/metadata/md5-cache/sys-fs/android-file-transfer-linux-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=sys-apps/file sys-libs/readline:0= fuse? ( sys-fs/fuse:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aebdf7dc143dd01ebffa9b67a937eede
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-1.0.5 b/metadata/md5-cache/sys-fs/bcache-tools-1.0.5
deleted file mode 100644
index b8459a7b8acd..000000000000
--- a/metadata/md5-cache/sys-fs/bcache-tools-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=sys-apps/util-linux-2.24 virtual/pkgconfig
-DESCRIPTION=Tools for bcachefs
-EAPI=5
-HOMEPAGE=https://bcache.evilpiepirate.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-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	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=a38a720ca147b368237f245dffa42c98
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-1.0.8 b/metadata/md5-cache/sys-fs/bcache-tools-1.0.8
deleted file mode 100644
index bac1e38a789e..000000000000
--- a/metadata/md5-cache/sys-fs/bcache-tools-1.0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=sys-apps/util-linux-2.24 virtual/pkgconfig
-DESCRIPTION=Tools for bcachefs
-EAPI=5
-HOMEPAGE=https://bcache.evilpiepirate.org/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-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	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=a38a720ca147b368237f245dffa42c98
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-1.1 b/metadata/md5-cache/sys-fs/bcache-tools-1.1
new file mode 100644
index 000000000000..6cce4301dc50
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/bcache-tools-1.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-apps/util-linux
+DESCRIPTION=Tools for bcache
+EAPI=7
+HOMEPAGE=https://bcache.evilpiepirate.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-apps/util-linux
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/snapshot/bcache-tools-1.1.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fdcfceb49eedf26b6edea6746d227caf
diff --git a/metadata/md5-cache/sys-fs/bcache-tools-9999 b/metadata/md5-cache/sys-fs/bcache-tools-9999
deleted file mode 100644
index 2824facf3ca7..000000000000
--- a/metadata/md5-cache/sys-fs/bcache-tools-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare unpack
-DEPEND=>=sys-apps/util-linux-2.24 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
-DESCRIPTION=Tools for bcachefs
-EAPI=5
-HOMEPAGE=https://bcache.evilpiepirate.org/
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=>=sys-apps/util-linux-2.24
-SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=876105bd45f521e3a1d1ead92a01985c
diff --git a/metadata/md5-cache/sys-fs/bindfs-1.14.8 b/metadata/md5-cache/sys-fs/bindfs-1.14.8
new file mode 100644
index 000000000000..9ddfb47c91f8
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/bindfs-1.14.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=>=sys-fs/fuse-2.9:0 virtual/pkgconfig
+DESCRIPTION=FUSE filesystem for bind mounting with altered permissions
+EAPI=7
+HOMEPAGE=https://bindfs.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-fs/fuse-2.9:0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://bindfs.org/downloads/bindfs-1.14.8.tar.gz
+_md5_=c10285b96b500a929f108b6eeca76a0e
diff --git a/metadata/md5-cache/sys-fs/cryfs-0.10.2 b/metadata/md5-cache/sys-fs/cryfs-0.10.2
index bfe6ae9703e5..89322366d446 100644
--- a/metadata/md5-cache/sys-fs/cryfs-0.10.2
+++ b/metadata/md5-cache/sys-fs/cryfs-0.10.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.65.1:= >=dev-libs/crypto++-8.2.0:= net-misc/curl:= >=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cryfs/cryfs/releases/download/0.10.2/cryfs-0.10.2.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88ac6ade1245eeb8153cd7f28d003477
diff --git a/metadata/md5-cache/sys-fs/dislocker-0.7.1-r3 b/metadata/md5-cache/sys-fs/dislocker-0.7.1-r3
index d1213336c1db..7b8c9e15c873 100644
--- a/metadata/md5-cache/sys-fs/dislocker-0.7.1-r3
+++ b/metadata/md5-cache/sys-fs/dislocker-0.7.1-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/fuse:0= net-libs/mbedtls:0= ruby? ( dev-lang/ruby:* )
 SLOT=0
 SRC_URI=https://github.com/Aorimn/dislocker/archive/v0.7.1.tar.gz -> dislocker-0.7.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=daa74b891c737acf04e8724cb7fc003a
diff --git a/metadata/md5-cache/sys-fs/dislocker-9999 b/metadata/md5-cache/sys-fs/dislocker-9999
index 44e92a2b2d8d..bec7fc6285b8 100644
--- a/metadata/md5-cache/sys-fs/dislocker-9999
+++ b/metadata/md5-cache/sys-fs/dislocker-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=sys-fs/fuse:0= net-libs/mbedtls:0= ruby? ( dev-lang/ruby:* )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=daa74b891c737acf04e8724cb7fc003a
diff --git a/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14 b/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14
index 6814235412cd..225c5254e9ca 100644
--- a/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14
+++ b/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14
@@ -5,11 +5,11 @@ DESCRIPTION=HFS FS Access utils
 EAPI=7
 HOMEPAGE=https://www.mars.org/home/rob/proj/hfs/
 IUSE=tcl tk
-KEYWORDS=amd64 ~arm ppc ppc64 sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= )
 REQUIRED_USE=tk? ( tcl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/h/hfsutils/hfsutils_3.2.6.orig.tar.gz mirror://debian/pool/main/h/hfsutils/hfsutils_3.2.6-14.debian.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d451471f4d36f579ee0c12b4aca4794d
+_md5_=7d9cc019484108b93b530f1edf0d443a
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2 b/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2
index e14f96473fb2..d86b80c8e510 100644
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2
+++ b/metadata/md5-cache/sys-fs/inotify-tools-3.20.2.2
@@ -10,4 +10,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/inotify-tools/inotify-tools/archive/3.20.2.2.tar.gz -> inotify-tools-3.20.2.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8ac6c99bb2f8f683924043d5fce88b09
+_md5_=4ccd9f3b6c6d657e1e45294acac37121
diff --git a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.2.5-r1 b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.2.5-r1
deleted file mode 100644
index 2304f8e5ffa6..000000000000
--- a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.2.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=JDiskReport helps you to understand disk drive usage
-EAPI=5
-HOMEPAGE=http://www.jgoodies.com/freeware/jdiskreport/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_2_5.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=badb124d5ad5635868b6c9d4a4dc4c20
diff --git a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0 b/metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
deleted file mode 100644
index a5f88bfb791f..000000000000
--- a/metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=JDiskReport helps you to understand disk drive usage
-EAPI=5
-HOMEPAGE=http://www.jgoodies.com/freeware/jdiskreport/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_3_0.zip
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	ec7a89849c84f93e9c6db27812923888	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=badb124d5ad5635868b6c9d4a4dc4c20
diff --git a/metadata/md5-cache/sys-fs/sandboxfs-0.2.0 b/metadata/md5-cache/sys-fs/sandboxfs-0.2.0
index a178bdb7f883..626992b05052 100644
--- a/metadata/md5-cache/sys-fs/sandboxfs-0.2.0
+++ b/metadata/md5-cache/sys-fs/sandboxfs-0.2.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense
 RDEPEND=sys-fs/fuse:0 profile? ( dev-util/google-perftools )
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/sandboxfs/archive/sandboxfs-0.2.0.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/arc-swap/0.4.6/download -> arc-swap-0.4.6.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/backtrace/0.3.46/download -> backtrace-0.3.46.crate https://crates.io/api/v1/crates/backtrace-sys/0.1.37/download -> backtrace-sys-0.1.37.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/cc/1.0.52/download -> cc-1.0.52.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cpuprofiler/0.0.4/download -> cpuprofiler-0.0.4.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/error-chain/0.12.2/download -> error-chain-0.12.2.crate https://crates.io/api/v1/crates/failure/0.1.7/download -> failure-0.1.7.crate https://crates.io/api/v1/crates/failure_derive/0.1.7/download -> failure_derive-0.1.7.crate https://crates.io/api/v1/crates/fuse/0.3.1/download -> fuse-0.3.1.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/hermit-abi/0.1.12/download -> hermit-abi-0.1.12.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.69/download -> libc-0.2.69.crate https://crates.io/api/v1/crates/log/0.3.9/download -> log-0.3.9.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/nix/0.12.1/download -> nix-0.12.1.crate https://crates.io/api/v1/crates/num_cpus/1.13.0/download -> num_cpus-1.13.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.6/download -> ppv-lite86-0.2.6.crate https://crates.io/api/v1/crates/proc-macro2/1.0.12/download -> proc-macro2-1.0.12.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.4/download -> quote-1.0.4.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.16/download -> rustc-demangle-0.1.16.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/sandboxfs/0.2.0/download -> sandboxfs-0.2.0.crate https://crates.io/api/v1/crates/serde/1.0.106/download -> serde-1.0.106.crate https://crates.io/api/v1/crates/serde_derive/1.0.106/download -> serde_derive-1.0.106.crate https://crates.io/api/v1/crates/serde_json/1.0.52/download -> serde_json-1.0.52.crate https://crates.io/api/v1/crates/signal-hook/0.1.14/download -> signal-hook-0.1.14.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/syn/1.0.18/download -> syn-1.0.18.crate https://crates.io/api/v1/crates/synstructure/0.12.3/download -> synstructure-0.12.3.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/thread-scoped/1.0.2/download -> thread-scoped-1.0.2.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/threadpool/1.8.0/download -> threadpool-1.8.0.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/users/0.9.1/download -> users-0.9.1.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xattr/0.2.2/download -> xattr-0.2.2.crate
-_eclasses_=cargo	16808adb27d34df9e5106842af29c73c	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=12bc3a9f4a15934a7989b274b7c9a63f
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.0_rc2 b/metadata/md5-cache/sys-fs/zfs-2.0.0_rc2
deleted file mode 100644
index 6d4524cf26de..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-2.0.0_rc2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=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?] ) !minimal? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Userland utilities for ZFS Linux kernel module
-EAPI=7
-HOMEPAGE=https://github.com/openzfs/zfs
-IUSE=custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 kernel_linux split-usr
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=BSD-2 CDDL MIT
-RDEPEND=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?] ) !minimal? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.0.0_rc2 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
-REQUIRED_USE=!minimal? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) python? ( !minimal ) test-suite? ( !minimal )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.0-rc2/zfs-2.0.0-rc2.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5e0fc89948f3e4ebbca05004bbfc9e59
diff --git a/metadata/md5-cache/sys-fs/zfs-2.0.0_rc2-r1 b/metadata/md5-cache/sys-fs/zfs-2.0.0_rc2-r1
new file mode 100644
index 000000000000..8d0e08dc26cd
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-2.0.0_rc2-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=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?] ) !minimal? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Userland utilities for ZFS Linux kernel module
+EAPI=7
+HOMEPAGE=https://github.com/openzfs/zfs
+IUSE=custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 kernel_linux split-usr
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=BSD-2 CDDL MIT
+RDEPEND=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?] ) !minimal? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) pam? ( sys-libs/pam ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-2.0.0_rc2 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/kmod[tools] sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps )
+REQUIRED_USE=!minimal? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) python? ( !minimal ) test-suite? ( !minimal )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.0.0-rc2/zfs-2.0.0-rc2.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	distutils-r1	409cd1220f9f980d21980293a50e2a8e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c79d801ff05add8fd2db970abba22a52
diff --git a/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r1 b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r1
new file mode 100644
index 000000000000..627644e9e61c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst
+DESCRIPTION=ZFS Automatic Snapshot Service for Linux
+EAPI=7
+HOMEPAGE=https://github.com/zfsonlinux/zfs-auto-snapshot
+IUSE=+cron +default-exclude systemd
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=GPL-2+
+RDEPEND=sys-fs/zfs !systemd? ( virtual/cron )
+REQUIRED_USE=!systemd? ( cron )
+SLOT=0
+SRC_URI=https://github.com/zfsonlinux/zfs-auto-snapshot/archive/upstream/1.2.4.tar.gz -> zfs-auto-snapshot-upstream-1.2.4.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=120a1d6ae18a33aeb11385d3539996a1
diff --git a/metadata/md5-cache/sys-fs/zfs-auto-snapshot-9999 b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-9999
index 76f3dcd2793b..72281a858622 100644
--- a/metadata/md5-cache/sys-fs/zfs-auto-snapshot-9999
+++ b/metadata/md5-cache/sys-fs/zfs-auto-snapshot-9999
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=ZFS Automatic Snapshot Service for Linux
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/zfsonlinux/zfs-auto-snapshot
-IUSE=+default-exclude
+IUSE=+cron +default-exclude systemd
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=sys-fs/zfs virtual/cron
+RDEPEND=sys-fs/zfs !systemd? ( virtual/cron )
+REQUIRED_USE=!systemd? ( cron )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=7bb07925a7a800c7a4a30343e484d249
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	prefix	c2993e4c430c1ee24f278983d6189501	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=120a1d6ae18a33aeb11385d3539996a1
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 2dacdf618a71..4ac6fde6d10b 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/dracut-050-r2 b/metadata/md5-cache/sys-kernel/dracut-050-r2
index 0470f8d2fb9b..ff7bc4f49940 100644
--- a/metadata/md5-cache/sys-kernel/dracut-050-r2
+++ b/metadata/md5-cache/sys-kernel/dracut-050-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Generic initramfs generation tool
 EAPI=7
 HOMEPAGE=https://dracut.wiki.kernel.org
 IUSE=selinux kernel_linux
-KEYWORDS=~alpha ~amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys-apps/kmod-23[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/openrc[sysv-utils(-),selinux?] sys-apps/systemd[sysv-utils] ) >=sys-apps/util-linux-2.21 virtual/pkgconfig virtual/udev elibc_musl? ( sys-libs/fts-standalone ) selinux? ( sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-050.tar.xz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c38c0c22dd2942f7fd99a96abe83b5f6
+_md5_=624877f49a72e3281f98348fdd6dfaae
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.60 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.60
deleted file mode 100644
index dc6c860bb5b0..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.60
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.4.60 !sys-kernel/vanilla-kernel-bin:5.4.60 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.60
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-61.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-61.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0571f3fce5e8630ebfff2f47516828b7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.61 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.61
deleted file mode 100644
index d0b6a9664d29..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.61
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.4.61 !sys-kernel/vanilla-kernel-bin:5.4.61 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.61
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-62.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-62.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f56ce2b71c9827f057570d8788f38278
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.62 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.62
deleted file mode 100644
index 7f2836eb8de9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.62
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.4.62 !sys-kernel/vanilla-kernel-bin:5.4.62 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.62
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-63.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-63.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=66400096bc1755429a4ef8d2f568f735
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.63 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.63
deleted file mode 100644
index 3a99120088c8..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.63
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.4.63 !sys-kernel/vanilla-kernel-bin:5.4.63 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.63
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-64.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-64.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=66400096bc1755429a4ef8d2f568f735
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.65 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.65
deleted file mode 100644
index b0995d004f34..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.65
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.4.65 !sys-kernel/vanilla-kernel-bin:5.4.65 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.65
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-66.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-66.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ce9b00d2a221f54ba0f3676bfc5f315b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.67 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.67
deleted file mode 100644
index 56dcbffcfb2d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.67
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.4.67 !sys-kernel/vanilla-kernel-bin:5.4.67 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.67
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-68.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-68.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ce9b00d2a221f54ba0f3676bfc5f315b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.68 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.68
new file mode 100644
index 000000000000..603550b4ce1d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.68
@@ -0,0 +1,14 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.4.68 !sys-kernel/vanilla-kernel-bin:5.4.68 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.68
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-69.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-69.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ce9b00d2a221f54ba0f3676bfc5f315b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.17
deleted file mode 100644
index 6bde135541e8..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.7.17 !sys-kernel/vanilla-kernel-bin:5.7.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.7.17
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-18.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-18.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-aarch64-fedora.config -> kernel-aarch64.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1f494760e6c76b4ce63e6233dab28891
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.18
deleted file mode 100644
index 1793578c4894..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.7.18 !sys-kernel/vanilla-kernel-bin:5.7.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.7.18
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-19.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-19.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-aarch64-fedora.config -> kernel-aarch64.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1f494760e6c76b4ce63e6233dab28891
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.19
deleted file mode 100644
index a44aea927eef..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.7.19 !sys-kernel/vanilla-kernel-bin:5.7.19 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.7.19
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-20.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-aarch64-fedora.config -> kernel-aarch64.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=858ded9fb5ab386db8c71a20a75127ec
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.10 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.10
deleted file mode 100644
index 42bec4a49467..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.8.10 !sys-kernel/vanilla-kernel-bin:5.8.10 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.10
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-13.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d212fbc8495cd9e8c7e3bc55776788f7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.11 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.11
deleted file mode 100644
index 2f9c330d5007..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.8.11 !sys-kernel/vanilla-kernel-bin:5.8.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.11
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-14.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d212fbc8495cd9e8c7e3bc55776788f7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.12
new file mode 100644
index 000000000000..271b5e24f531
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.12
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.8.12 !sys-kernel/vanilla-kernel-bin:5.8.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.8.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-15.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d212fbc8495cd9e8c7e3bc55776788f7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.3
deleted file mode 100644
index f80c1bab6d99..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.8.3 !sys-kernel/vanilla-kernel-bin:5.8.3 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.3
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-5.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-5.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.1 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=73e1f8f25a7d9b541338358c716c017e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.4
deleted file mode 100644
index 9e91bfc30035..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.8.4 !sys-kernel/vanilla-kernel-bin:5.8.4 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.4
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-6.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.1 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=73e1f8f25a7d9b541338358c716c017e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.5
deleted file mode 100644
index 61d9eb7de6a1..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.8.5 !sys-kernel/vanilla-kernel-bin:5.8.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.5
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-7.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.4 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.4 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d9562c849f7fb596b11e23ca57d75f93
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.6
deleted file mode 100644
index f8a36611b064..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.8.6 !sys-kernel/vanilla-kernel-bin:5.8.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.6
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-9.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.4 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.4 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d1798bb5d233811a70b6c9545bd4c183
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.7
deleted file mode 100644
index b6dd34d2c5e1..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.8.7 !sys-kernel/vanilla-kernel-bin:5.8.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.7
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-10.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a1319f7e280870a20edd58f3154b8697
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.8 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.8
deleted file mode 100644
index b83864bebaea..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.8.8 !sys-kernel/vanilla-kernel-bin:5.8.8 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.8
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-11.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-11.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c1b8db5c72bbc180afc34634bd963e7e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.9 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.9
deleted file mode 100644
index 5044c26c143f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.8.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel:5.8.9 !sys-kernel/vanilla-kernel-bin:5.8.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.9
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-12.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-12.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d212fbc8495cd9e8c7e3bc55776788f7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.60 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.60
deleted file mode 100644
index 89662cd512af..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.60
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.60 !sys-kernel/vanilla-kernel:5.4.60 !sys-kernel/vanilla-kernel-bin:5.4.60 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.60
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.60-1.xpak -> gentoo-kernel-5.4.60-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.60-1.xpak -> gentoo-kernel-5.4.60-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.60-1.xpak -> gentoo-kernel-5.4.60-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8e99bc29948348c07cc11bfc3103bc55
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.61 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.61
deleted file mode 100644
index d53df2b3532c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.61
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.61 !sys-kernel/vanilla-kernel:5.4.61 !sys-kernel/vanilla-kernel-bin:5.4.61 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.61
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61-1.xpak -> gentoo-kernel-5.4.61-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61-1.xpak -> gentoo-kernel-5.4.61-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61-1.xpak -> gentoo-kernel-5.4.61-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0ad591fac6454a22e1a4723569a709b3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.62 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.62
deleted file mode 100644
index 4355b154172e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.62
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.62 !sys-kernel/vanilla-kernel:5.4.62 !sys-kernel/vanilla-kernel-bin:5.4.62 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.62
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.62-1.xpak -> gentoo-kernel-5.4.62-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.62-1.xpak -> gentoo-kernel-5.4.62-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.62-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.62-r1
deleted file mode 100644
index 006acfbac567..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.62-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.62 !sys-kernel/vanilla-kernel:5.4.62 !sys-kernel/vanilla-kernel-bin:5.4.62 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.62
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.62-1.xpak -> gentoo-kernel-5.4.62-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.62-1.xpak -> gentoo-kernel-5.4.62-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.62-1.xpak -> gentoo-kernel-5.4.62-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a233ac0f8da53036540d5f704213ef4e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.63 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.63
deleted file mode 100644
index 7a97418e4782..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.63
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.63 !sys-kernel/vanilla-kernel:5.4.63 !sys-kernel/vanilla-kernel-bin:5.4.63 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.63
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.63-1.xpak -> gentoo-kernel-5.4.63-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.63-1.xpak -> gentoo-kernel-5.4.63-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.63-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.63-r1
deleted file mode 100644
index 6ecce3ffe57c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.63-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.63 !sys-kernel/vanilla-kernel:5.4.63 !sys-kernel/vanilla-kernel-bin:5.4.63 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.63
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.63-1.xpak -> gentoo-kernel-5.4.63-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.63-1.xpak -> gentoo-kernel-5.4.63-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.63-1.xpak -> gentoo-kernel-5.4.63-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a233ac0f8da53036540d5f704213ef4e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.65 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.65
deleted file mode 100644
index 87caf3d33620..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.65
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.65 !sys-kernel/vanilla-kernel:5.4.65 !sys-kernel/vanilla-kernel-bin:5.4.65 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.65
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.65-1.xpak -> gentoo-kernel-5.4.65-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.65-1.xpak -> gentoo-kernel-5.4.65-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.65-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.65-r1
deleted file mode 100644
index 93b3af730ce4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.65-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.65 !sys-kernel/vanilla-kernel:5.4.65 !sys-kernel/vanilla-kernel-bin:5.4.65 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.65
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.65-1.xpak -> gentoo-kernel-5.4.65-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.65-1.xpak -> gentoo-kernel-5.4.65-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.65-1.xpak -> gentoo-kernel-5.4.65-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a233ac0f8da53036540d5f704213ef4e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.67 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.67
deleted file mode 100644
index 25373499e60d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.67
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.67 !sys-kernel/vanilla-kernel:5.4.67 !sys-kernel/vanilla-kernel-bin:5.4.67 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.67
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.67-1.xpak -> gentoo-kernel-5.4.67-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.67-1.xpak -> gentoo-kernel-5.4.67-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.68 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.68
new file mode 100644
index 000000000000..85bcaa6c387c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.68
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.68 !sys-kernel/vanilla-kernel:5.4.68 !sys-kernel/vanilla-kernel-bin:5.4.68 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.68
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.68-1.xpak -> gentoo-kernel-5.4.68-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.68-1.xpak -> gentoo-kernel-5.4.68-1.x86.xpak )
+_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.68-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.68-r1
new file mode 100644
index 000000000000..64aee546d902
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.68-r1
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.68 !sys-kernel/vanilla-kernel:5.4.68 !sys-kernel/vanilla-kernel-bin:5.4.68 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.68
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.68-1.xpak -> gentoo-kernel-5.4.68-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.68-1.xpak -> gentoo-kernel-5.4.68-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.68-1.xpak -> gentoo-kernel-5.4.68-1.x86.xpak )
+_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a233ac0f8da53036540d5f704213ef4e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.17
deleted file mode 100644
index 0ef862d9fe87..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.17
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.7.17 !sys-kernel/vanilla-kernel:5.7.17 !sys-kernel/vanilla-kernel-bin:5.7.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.7.17
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.17-1.xpak -> gentoo-kernel-5.7.17-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.17-1.xpak -> gentoo-kernel-5.7.17-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.17-1.xpak -> gentoo-kernel-5.7.17-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e9f51bbb0f4a8ee82790a39129455310
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.18
deleted file mode 100644
index 28833f5de4ee..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.18
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.7.18 !sys-kernel/vanilla-kernel:5.7.18 !sys-kernel/vanilla-kernel-bin:5.7.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.7.18
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.18-1.xpak -> gentoo-kernel-5.7.18-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.18-1.xpak -> gentoo-kernel-5.7.18-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.18-1.xpak -> gentoo-kernel-5.7.18-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e9f51bbb0f4a8ee82790a39129455310
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19
deleted file mode 100644
index a80dcb0b0b93..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.7.19 !sys-kernel/vanilla-kernel:5.7.19 !sys-kernel/vanilla-kernel-bin:5.7.19 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.7.19
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.19-1.xpak -> gentoo-kernel-5.7.19-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.19-1.xpak -> gentoo-kernel-5.7.19-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19-r1
deleted file mode 100644
index d2cf3f72172b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.19-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.7.19 !sys-kernel/vanilla-kernel:5.7.19 !sys-kernel/vanilla-kernel-bin:5.7.19 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.7.19
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.19-1.xpak -> gentoo-kernel-5.7.19-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.19-1.xpak -> gentoo-kernel-5.7.19-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.19-1.xpak -> gentoo-kernel-5.7.19-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3806e2ed456ede6d96c872a75f7d1e0b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.10 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.10
deleted file mode 100644
index fb33616fe5df..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.10 !sys-kernel/vanilla-kernel:5.8.10 !sys-kernel/vanilla-kernel-bin:5.8.10 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.10
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.10-1.xpak -> gentoo-kernel-5.8.10-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.10-1.xpak -> gentoo-kernel-5.8.10-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.10-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.10-r1
deleted file mode 100644
index 587bdaa51f2c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.10-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.10 !sys-kernel/vanilla-kernel:5.8.10 !sys-kernel/vanilla-kernel-bin:5.8.10 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.10
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.10-1.xpak -> gentoo-kernel-5.8.10-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.10-1.xpak -> gentoo-kernel-5.8.10-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.10-1.xpak -> gentoo-kernel-5.8.10-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3806e2ed456ede6d96c872a75f7d1e0b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.11 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.11
deleted file mode 100644
index 12f832ea6b06..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.11
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.11 !sys-kernel/vanilla-kernel:5.8.11 !sys-kernel/vanilla-kernel-bin:5.8.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.11
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.11-1.xpak -> gentoo-kernel-5.8.11-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.11-1.xpak -> gentoo-kernel-5.8.11-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.12
new file mode 100644
index 000000000000..9920bca6d7e4
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.12
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.8.12 !sys-kernel/vanilla-kernel:5.8.12 !sys-kernel/vanilla-kernel-bin:5.8.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.8.12
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.12-1.xpak -> gentoo-kernel-5.8.12-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.12-1.xpak -> gentoo-kernel-5.8.12-1.x86.xpak )
+_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.12-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.12-r1
new file mode 100644
index 000000000000..e557f42a91c2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.12-r1
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~arm64
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.8.12 !sys-kernel/vanilla-kernel:5.8.12 !sys-kernel/vanilla-kernel-bin:5.8.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.8.12
+SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.12-1.xpak -> gentoo-kernel-5.8.12-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.12-1.xpak -> gentoo-kernel-5.8.12-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.12-1.xpak -> gentoo-kernel-5.8.12-1.x86.xpak )
+_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3806e2ed456ede6d96c872a75f7d1e0b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.3
deleted file mode 100644
index 9d070f9f6b88..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.3 !sys-kernel/vanilla-kernel:5.8.3 !sys-kernel/vanilla-kernel-bin:5.8.3 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.3
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.3-1.xpak -> gentoo-kernel-5.8.3-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.3-1.xpak -> gentoo-kernel-5.8.3-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.3-1.xpak -> gentoo-kernel-5.8.3-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e9f51bbb0f4a8ee82790a39129455310
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.4
deleted file mode 100644
index a182975ddd39..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.4 !sys-kernel/vanilla-kernel:5.8.4 !sys-kernel/vanilla-kernel-bin:5.8.4 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.4
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.4-1.xpak -> gentoo-kernel-5.8.4-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.4-1.xpak -> gentoo-kernel-5.8.4-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.4-1.xpak -> gentoo-kernel-5.8.4-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e9f51bbb0f4a8ee82790a39129455310
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5
deleted file mode 100644
index e5de142af7d9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.5 !sys-kernel/vanilla-kernel:5.8.5 !sys-kernel/vanilla-kernel-bin:5.8.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.5
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5-1.xpak -> gentoo-kernel-5.8.5-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5-1.xpak -> gentoo-kernel-5.8.5-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5-r1
deleted file mode 100644
index 2851c7356098..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.5 !sys-kernel/vanilla-kernel:5.8.5 !sys-kernel/vanilla-kernel-bin:5.8.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.5
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5-1.xpak -> gentoo-kernel-5.8.5-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5-1.xpak -> gentoo-kernel-5.8.5-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5-1.xpak -> gentoo-kernel-5.8.5-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3806e2ed456ede6d96c872a75f7d1e0b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.6 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.6
deleted file mode 100644
index 17940b0fe2bd..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.6 !sys-kernel/vanilla-kernel:5.8.6 !sys-kernel/vanilla-kernel-bin:5.8.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.6
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.6-1.xpak -> gentoo-kernel-5.8.6-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.6-1.xpak -> gentoo-kernel-5.8.6-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.6-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.6-r1
deleted file mode 100644
index 524395a0b59d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.6 !sys-kernel/vanilla-kernel:5.8.6 !sys-kernel/vanilla-kernel-bin:5.8.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.6
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.6-1.xpak -> gentoo-kernel-5.8.6-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.6-1.xpak -> gentoo-kernel-5.8.6-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.6-1.xpak -> gentoo-kernel-5.8.6-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3806e2ed456ede6d96c872a75f7d1e0b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.7
deleted file mode 100644
index a081d0fd4515..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.7 !sys-kernel/vanilla-kernel:5.8.7 !sys-kernel/vanilla-kernel-bin:5.8.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.7
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.7-1.xpak -> gentoo-kernel-5.8.7-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.7-1.xpak -> gentoo-kernel-5.8.7-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.7-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.7-r1
deleted file mode 100644
index 4d14fd63c0a5..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.7 !sys-kernel/vanilla-kernel:5.8.7 !sys-kernel/vanilla-kernel-bin:5.8.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.7
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.7-1.xpak -> gentoo-kernel-5.8.7-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.7-1.xpak -> gentoo-kernel-5.8.7-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.7-1.xpak -> gentoo-kernel-5.8.7-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3806e2ed456ede6d96c872a75f7d1e0b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.8 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.8
deleted file mode 100644
index 12eccd182da5..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.8 !sys-kernel/vanilla-kernel:5.8.8 !sys-kernel/vanilla-kernel-bin:5.8.8 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.8
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.8-1.xpak -> gentoo-kernel-5.8.8-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.8-1.xpak -> gentoo-kernel-5.8.8-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.8-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.8-r1
deleted file mode 100644
index a72874af1dfb..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.8 !sys-kernel/vanilla-kernel:5.8.8 !sys-kernel/vanilla-kernel-bin:5.8.8 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.8
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.8-1.xpak -> gentoo-kernel-5.8.8-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.8-1.xpak -> gentoo-kernel-5.8.8-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.8-1.xpak -> gentoo-kernel-5.8.8-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3806e2ed456ede6d96c872a75f7d1e0b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.9 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.9
deleted file mode 100644
index fe4b35da5b40..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.9 !sys-kernel/vanilla-kernel:5.8.9 !sys-kernel/vanilla-kernel-bin:5.8.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.9
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.9-1.xpak -> gentoo-kernel-5.8.9-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.9-1.xpak -> gentoo-kernel-5.8.9-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.9-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.9-r1
deleted file mode 100644
index 392ee8df6869..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.8.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with genpatches
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=+initramfs test
-KEYWORDS=~arm64
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/gentoo-kernel:5.8.9 !sys-kernel/vanilla-kernel:5.8.9 !sys-kernel/vanilla-kernel-bin:5.8.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.9
-SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.9-1.xpak -> gentoo-kernel-5.8.9-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.9-1.xpak -> gentoo-kernel-5.8.9-1.arm64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.9-1.xpak -> gentoo-kernel-5.8.9-1.x86.xpak )
-_eclasses_=kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3806e2ed456ede6d96c872a75f7d1e0b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.195 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.195
deleted file mode 100644
index f5cac598dc3f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.195
+++ /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 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.14.195
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-205.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-205.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-205.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-205.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-205.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-205.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-205.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-205.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-205.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1f23849e99c3c8ddc0a8606b75ad1604
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.196 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.196
deleted file mode 100644
index 647db0ca4455..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.196
+++ /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 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.14.196
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-206.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-206.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-206.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-206.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-206.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-206.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-206.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-206.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-206.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cbfa395202fb941cfc1d0120072d301a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.197 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.197
deleted file mode 100644
index a41c52cc81e9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.197
+++ /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 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.14.197
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-207.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-207.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-207.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-207.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-207.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-207.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-207.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-207.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-207.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=eea4e73084b28630108d8de6554051ac
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.198 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.198
index c79be2882115..37cc2914ed63 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.198
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.198
@@ -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 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 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 virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.14.198
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-208.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-208.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-208.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-208.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-208.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-208.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-208.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-208.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-208.experimental.tar.xz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f2638614f99023c551bcfab06f67f636
+_md5_=0893c6cbb167af62f3daae41610c3932
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.142 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.142
deleted file mode 100644
index 6f697c444e45..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.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 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.19.142
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-141.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-141.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-141.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-141.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-141.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-141.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-141.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-141.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-141.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=48ad6b0fd18b8e83339a540f59393950
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.143 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.143
deleted file mode 100644
index 7e5022771d92..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.143
+++ /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 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.19.143
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-142.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-142.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-142.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-142.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-142.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-142.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-142.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-142.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-142.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a2fef76c9c2f11e7e494778cdceeb0de
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.144 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.144
deleted file mode 100644
index 58a66c77cb1d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.144
+++ /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 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.19.144
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-143.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-143.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-143.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-143.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-143.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-143.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-143.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-143.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-143.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f087d38ed32b8d5431f7e7ce0257daf6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.145 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.145
deleted file mode 100644
index 72d7dc9a9af4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.145
+++ /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 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.19.145
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-144.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-144.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-144.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-144.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-144.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-144.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-144.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-144.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-144.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d37d88ff61ffa39e3c28c306d1ed8055
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.146 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.146
index ca1936354137..f83b016609f4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.146
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.146
@@ -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 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 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 virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.19.146
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-145.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-145.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-145.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-145.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-145.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-145.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-145.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-145.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-145.experimental.tar.xz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1f6fbd55ec2219fd0b19d5d85fb7c636
+_md5_=e3280bd2eb03109f25fc2fe8d86dcc82
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.148 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.148
new file mode 100644
index 000000000000..cfbea4f06532
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.148
@@ -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 ~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 virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.148
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-147.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-147.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-147.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-147.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-147.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-147.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-147.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-147.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-147.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=b58fb94a4e2d373bc5f2d356f0e06592
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.234 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.234
deleted file mode 100644
index 5dbdc0757229..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.234
+++ /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 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.4.234
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-235.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-235.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-235.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-235.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-235.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-235.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-235.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-235.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-235.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=215fe933d50610b2acbba1e6f11e7ba9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.235 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.235
deleted file mode 100644
index 7acee72db5ec..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.235
+++ /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 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.4.235
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-236.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-236.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-236.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-236.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-236.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-236.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-236.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-236.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-236.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=486a3ab98873aacda9c2acf71487d388
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.236 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.236
index e695cb3f932d..3b56bd2123df 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.236
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.236
@@ -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 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 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 virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.4.236
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-237.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-237.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-237.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-237.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-237.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-237.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-237.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-237.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-237.experimental.tar.xz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6df2ebe9a4adf018903bfb7fdc8a0fdf
+_md5_=f40ef70050f189f8668ac5d4fe63f7ca
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.234 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.234
deleted file mode 100644
index 55e0bbe816aa..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.234
+++ /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 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.9.234
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-238.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-238.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-238.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-238.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-238.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-238.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-238.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-238.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-238.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=52e2dc7bdedc99cefae82f44ae2a930f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.235 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.235
deleted file mode 100644
index 638abb7f6670..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.235
+++ /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 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.9.235
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-239.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-239.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-239.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-239.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-239.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-239.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-239.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-239.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-239.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f7ff30af3e0ec503ebda11d8144fd0f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.236 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.236
index 82ab41fe98db..7e0fb6779f1b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.236
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.236
@@ -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 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 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 virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=4.9.236
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-240.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-240.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-240.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-240.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-240.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-240.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-240.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-240.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-240.experimental.tar.xz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5ee490a3c2ed890df78729590ea26b16
+_md5_=13f6290d7167f6bfb1c35ef5c825736a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.61 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.61
deleted file mode 100644
index 161cbe33c6fd..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.61
+++ /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 including the Gentoo patchset for the 5.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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.61
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-62.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-62.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-62.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-62.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-62.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-62.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-62.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-62.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-62.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=048278800e29eaaea1050f04c9dba14b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.62 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.62
deleted file mode 100644
index 34e16d382964..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.62
+++ /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 including the Gentoo patchset for the 5.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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.62
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-63.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-63.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-63.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-63.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-63.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-63.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-63.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-63.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-63.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=510e9cc975a339b382cc2dc825178edf
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.63 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.63
deleted file mode 100644
index 0cd761baa160..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.63
+++ /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 including the Gentoo patchset for the 5.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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.63
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-64.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-64.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-64.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-64.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-64.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-64.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-64.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-64.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-64.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0ab4f5eab72d73a5df61bd7db4de0811
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.64 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.64
deleted file mode 100644
index 28b39361ec9c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.64
+++ /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 including the Gentoo patchset for the 5.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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.64
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-65.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-65.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-65.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-65.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-65.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-65.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-65.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-65.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-65.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8cc1b1f22731b3abdabc794895b87227
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.65 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.65
deleted file mode 100644
index 8e025c538eea..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.65
+++ /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 including the Gentoo patchset for the 5.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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.65
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-66.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-66.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-66.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-66.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-66.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-66.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-66.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-66.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-66.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ffd275be691ca7ac5d5c2fba7117084d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.66 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.66
index e81f5e2835a3..66f2f6268beb 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.66
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.66
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 5.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 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 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 virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.4.66
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-67.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-67.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-67.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-67.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-67.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-67.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-67.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-67.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-67.experimental.tar.xz )
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=13a59f549ed2dea0d4484ec512ed6b2a
+_md5_=88fd05af7aa55a23ee7d6fa78d0efbbd
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.68 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.68
new file mode 100644
index 000000000000..23fbee42f408
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.68
@@ -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.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 ~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 virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.68
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-69.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-69.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-69.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-69.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-69.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-69.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-69.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-69.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-69.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d5b9cb03f5ae4303c8a9ad8b55831357
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.19 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.19
deleted file mode 100644
index f4e64f973869..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.19
+++ /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 including the Gentoo patchset for the 5.7 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.7.19
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-20.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-20.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-20.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-20.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-20.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-20.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-20.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-20.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=623a5d4cde78e9675103508c1cb7fbb2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.12 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.12
new file mode 100644
index 000000000000..ae9b092c5dd8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.12
@@ -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.8 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 ~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 virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.8.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-15.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-15.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-15.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-15.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-15.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-15.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-15.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-15.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f8381e972ba5855a50b034e6143a9571
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.3 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.3
deleted file mode 100644
index 6ff5fde9376c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.3
+++ /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 including the Gentoo patchset for the 5.8 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.8.3
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-5.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-5.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-5.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-5.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-5.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-5.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-5.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-5.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4b1333b605556c2c82cef6e856a4abdb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.4
deleted file mode 100644
index 8140fe01e612..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.4
+++ /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 including the Gentoo patchset for the 5.8 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.8.4
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-6.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-6.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-6.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-6.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-6.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-6.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-6.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0651c9fbd9db2a5b27c29f7f2d249f6c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.5 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.5
deleted file mode 100644
index c30522c9ff10..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.5
+++ /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 including the Gentoo patchset for the 5.8 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 ~riscv ~s390 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.8.5
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-7.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-7.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-7.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-7.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-7.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-7.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-7.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-7.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5f3131c5a65fae34b9b0c85ea65448e2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.6
deleted file mode 100644
index 4d4731e35178..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.6
+++ /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 including the Gentoo patchset for the 5.8 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.8.6
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-9.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-9.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-9.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-9.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-9.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-9.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-9.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f2f9d30699386348ef248fd2da352bbe
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.7
deleted file mode 100644
index 6f073f31839f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.8.7
+++ /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 including the Gentoo patchset for the 5.8 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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.8.7
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-10.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-10.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-10.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-10.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-10.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.8-10.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.8-10.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.8-10.experimental.tar.xz )
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fc1f4a11868da89143c7788987d8dd2c
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.9_rc7 b/metadata/md5-cache/sys-kernel/git-sources-5.9_rc7
new file mode 100644
index 000000000000..cf0067290250
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.9_rc7
@@ -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 ~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 virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.9_rc7
+SRC_URI=https://git.kernel.org/torvalds/p/v5.9-rc7/v5.8 -> patch-5.9-rc7.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=393fa1d56befc275fe056b07abd20d57
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.8_p6 b/metadata/md5-cache/sys-kernel/pf-sources-5.8_p6
new file mode 100644
index 000000000000..9aa0165d9177
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.8_p6
@@ -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://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 virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.8_p6
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.8...v5.8-pf6.diff -> pf-sources-5.8_p6.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.8-1.extras.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=81909829d73580edff12101160a473b2
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.60 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.60
deleted file mode 100644
index 87875304cb63..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.60
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.60 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.60
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.60.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=66910460fab07d90ae307dfc08343409
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.61 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.61
deleted file mode 100644
index a7461c9dc83b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.61
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.61 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.61
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.61.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=66910460fab07d90ae307dfc08343409
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.62 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.62
deleted file mode 100644
index 82a2f32aa869..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.62
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.62 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.62
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.62.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=66910460fab07d90ae307dfc08343409
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.63 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.63
deleted file mode 100644
index d1c795cfed73..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.63
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.63 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.63
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.63.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=80e0b2477d80d0d08238cfc1c4d5579f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.65 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.65
deleted file mode 100644
index 96033877fc5a..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.65
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.65 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.65
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.65.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=43f7e754c45ff9b39b00f5af8fc58a29
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.67 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.67
deleted file mode 100644
index 300fb9c123e8..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.67
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.67 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.67
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.67.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=43f7e754c45ff9b39b00f5af8fc58a29
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.68 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.68
new file mode 100644
index 000000000000..6b16669b660b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.68
@@ -0,0 +1,14 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.68 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.68
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.68.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=43f7e754c45ff9b39b00f5af8fc58a29
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.17 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.17
deleted file mode 100644
index 903b7d77e32b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.7.17 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.7.17
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.17.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7178f9b8a3f286738e718855d0b5dec1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.18 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.18
deleted file mode 100644
index 25946252f56c..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.7.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.7.18
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.18.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7178f9b8a3f286738e718855d0b5dec1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.19 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.19
deleted file mode 100644
index 7fb0e3ff2659..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.19
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.7.19 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.7.19
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.19.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7178f9b8a3f286738e718855d0b5dec1
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.10 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.10
deleted file mode 100644
index 8626920ee883..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.10 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.10
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.10.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3d1467b077d0185046ec4d00d412e772
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.11 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.11
deleted file mode 100644
index e8d76ac2b984..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.11 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.11
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.11.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3d1467b077d0185046ec4d00d412e772
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.12 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.12
new file mode 100644
index 000000000000..634a633eab36
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.12
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.8.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.12.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
+_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3d1467b077d0185046ec4d00d412e772
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.3 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.3
deleted file mode 100644
index ac4d572de176..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.3 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.3
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.3.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.1 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a9921630db6969080d8b1a6b8ca55ca6
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.4 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.4
deleted file mode 100644
index c44b717336e8..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.4 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.4
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.4.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.1 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.1 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/47a895f435cccb2cb14eb5d0c52d2f6d4d904907/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.1 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a9921630db6969080d8b1a6b8ca55ca6
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.5 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.5
deleted file mode 100644
index 304fbc54b8dd..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.5 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.5
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.5.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.4 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9f5dcb465f089871de7c82fa20b55526
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.6 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.6
deleted file mode 100644
index f537b208c086..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.6 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.6
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.6.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.4 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.4 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/d5f320566eb00901161a51fbd50b5ebbc51f47be/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.4 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9f5dcb465f089871de7c82fa20b55526
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.7 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.7
deleted file mode 100644
index 56e648d2872a..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.7
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.7.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0ea81ba407c6d298b32f9b76508f2b96
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.8 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.8
deleted file mode 100644
index 05530179c7dc..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.8 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.8
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.8.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f8a888da4f3c6b3a292179ef3783f58c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.9 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.9
deleted file mode 100644
index c7fe7f2a2b63..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.8.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=7
-HOMEPAGE=https://www.kernel.org/
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-kernel/vanilla-kernel-bin:5.8.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.8.9
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.9.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.8.5 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.8.5 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.8.5 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/af8da8d54d21231fd8c7b943216bb985f0a4e223/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.8.5 )
-_eclasses_=kernel-build	8313686ad2b467fc26c11eef8543f683	kernel-install	2a4af308756b3204b376d8b3fd5adbbf	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	98584e405e2b0264d37e8f728327fed1	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3d1467b077d0185046ec4d00d412e772
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.147 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.147
deleted file mode 100644
index f0256f966b6b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.147
+++ /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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.19.147
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.147.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.148 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.148
new file mode 100644
index 000000000000..10cefc86fb4e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.148
@@ -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 ~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 virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.148
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.148.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.67 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.67
deleted file mode 100644
index 31ca768169ae..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.67
+++ /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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.67
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.67.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.68 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.68
new file mode 100644
index 000000000000..854f3d20dee1
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.68
@@ -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 ~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 virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.68
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.68.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.11 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.11
deleted file mode 100644
index 54e743823a1b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.11
+++ /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 ~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 virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.8.11
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.8.11.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.12 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.12
new file mode 100644
index 000000000000..e1195ce56b93
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.8.12
@@ -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 ~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 virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.8.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.8.12.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.8.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 8e6c139b6581..6668fe063c69 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/binutils-libs-2.34-r2 b/metadata/md5-cache/sys-libs/binutils-libs-2.34-r2
index 38a4e1849c18..092186ef2aee 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.34-r2
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.34-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=64-bit-bfd multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5
 SLOT=0/2.34
 SRC_URI=mirror://gnu/binutils/binutils-2.34.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.34-patches-6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7c67ff4b22ff0f1e4836dbe5ea46fb8e
+_md5_=7119d2e5e0ee5d2e0fb15197c2c963b8
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.35 b/metadata/md5-cache/sys-libs/binutils-libs-2.35
deleted file mode 100644
index 7597b993e9f1..000000000000
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.35
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-IUSE=64-bit-bfd multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5
-SLOT=0/2.35
-SRC_URI=mirror://gnu/binutils/binutils-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.35-patches-1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=193ba67b46a723071533e4e27fb43e87
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.35.1 b/metadata/md5-cache/sys-libs/binutils-libs-2.35.1
index 2eec9a2ce595..1daa34f5e6c1 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.35.1
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.35.1
@@ -5,9 +5,10 @@ DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external
 EAPI=7
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=64-bit-bfd multitarget nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5
 SLOT=0/2.35.1
 SRC_URI=mirror://gnu/binutils/binutils-2.35.1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.35.1-patches-1.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=193ba67b46a723071533e4e27fb43e87
+_md5_=bba70efceaa77ab93029075f507b8060
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-10.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.1
index 0634163334e4..4d315052d54d 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e9629bd67b4a629129231e638518dcb
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999
index 74fe5d286a5a..4923719ddc44 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=11.0.0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01fbe8c55e93e332661d01b00bd429a6
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-11.0.0_rc3 b/metadata/md5-cache/sys-libs/compiler-rt-11.0.0_rc3
index 6e4bbe7d31f9..29d1b5b8803d 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-11.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/compiler-rt-11.0.0_rc3
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=11.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01fbe8c55e93e332661d01b00bd429a6
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-11.0.0_rc4 b/metadata/md5-cache/sys-libs/compiler-rt-11.0.0_rc4
new file mode 100644
index 000000000000..5e61f99bb5da
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-11.0.0_rc4
@@ -0,0 +1,13 @@
+BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.9 >=dev-python/lit-9.0.1[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 >=dev-python/lit-9.0.1[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-11.0.0*:11 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=11.0.0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01fbe8c55e93e332661d01b00bd429a6
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-12.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-12.0.0.9999
index c22c707de9b7..dd73139f1fbd 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-12.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-12.0.0.9999
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=12.0.0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01fbe8c55e93e332661d01b00bd429a6
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1
index 2df332b1017a..955d29ff8bca 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70cc56a647a89f97798e8f0da6fe8e53
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999
index dee171da1dcb..5406b156bfcf 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=11.0.0
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e6fd014a8efd48dfffce61058ddc182
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0_rc3 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0_rc3
index e0533c6caaf2..0aeb849ecd7a 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0_rc3
@@ -10,5 +10,5 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=11.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc3.tar.gz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e6fd014a8efd48dfffce61058ddc182
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0_rc4 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0_rc4
new file mode 100644
index 000000000000..b9c72828a1df
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0_rc4
@@ -0,0 +1,14 @@
+BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.9 >=dev-python/lit-5[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 >=dev-python/lit-5[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/lit-5[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-5[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-11.0.0*:11 sys-libs/compiler-rt:11.0.0 ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=11.0.0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2e6fd014a8efd48dfffce61058ddc182
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0.9999
index 249ee096a062..7dcdf5aee227 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-12.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=12.0.0
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e6fd014a8efd48dfffce61058ddc182
diff --git a/metadata/md5-cache/sys-libs/glibc-2.31-r7 b/metadata/md5-cache/sys-libs/glibc-2.31-r7
index 7d9a2ea57219..a0252fa1fc67 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.31-r7
+++ b/metadata/md5-cache/sys-libs/glibc-2.31-r7
@@ -5,6 +5,7 @@ DESCRIPTION=GNU libc C library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
@@ -12,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.31.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.31-patches-9.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.00.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=db257ed613fdb401cae762b40f24a01b
+_md5_=cf4b7a467b31be84b379b621cf7104ad
diff --git a/metadata/md5-cache/sys-libs/glibc-2.32 b/metadata/md5-cache/sys-libs/glibc-2.32
deleted file mode 100644
index b6d7b0560201..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.32
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers sys-devel/gnuconfig
-DESCRIPTION=GNU libc C library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/libc/
-IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
-PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
-RESTRICT=!test? ( test )
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.32.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.32-patches-1.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=be02f7c36c50300163eede1152f20327
diff --git a/metadata/md5-cache/sys-libs/glibc-2.32-r2 b/metadata/md5-cache/sys-libs/glibc-2.32-r2
new file mode 100644
index 000000000000..023ec5f151de
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/glibc-2.32-r2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) >=sys-devel/binutils-2.24 >=sys-devel/gcc-6 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers sys-devel/gnuconfig
+DESCRIPTION=GNU libc C library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libc/
+IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
+PDEPEND=!vanilla? ( sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<net-misc/openssh-8.1_p1-r2 sys-apps/gentoo-functions >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RESTRICT=!test? ( test )
+SLOT=2.2
+SRC_URI=mirror://gnu/glibc/glibc-2.32.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.32-patches-2.tar.xz riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnuconfig	f9125410be4c062f2fcefc8ec59fc223	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3d897e94cbdb3a729869dba6fe9c27a9
diff --git a/metadata/md5-cache/sys-libs/kpmcore-4.1.0 b/metadata/md5-cache/sys-libs/kpmcore-4.1.0
index 0895e8bee1e1..c2b545e0deaa 100644
--- a/metadata/md5-cache/sys-libs/kpmcore-4.1.0
+++ b/metadata/md5-cache/sys-libs/kpmcore-4.1.0
@@ -11,5 +11,5 @@ RDEPEND=|| ( app-crypt/qca[botan] app-crypt/qca[ssl] ) >=dev-qt/qtdbus-5.12.3:5
 RESTRICT=test
 SLOT=5/9
 SRC_URI=mirror://kde/stable/kpmcore/4.1.0/src/kpmcore-4.1.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce13a8bde147715974488f65f102b526
diff --git a/metadata/md5-cache/sys-libs/libcxx-10.0.1 b/metadata/md5-cache/sys-libs/libcxx-10.0.1
index f9f230c1156f..666c556e05d9 100644
--- a/metadata/md5-cache/sys-libs/libcxx-10.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-10.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=24d69d5dbd098d20148ae73eedeed1b6
diff --git a/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
index 8055c34bfe69..8cbaec9cfa01 100644
--- a/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-11.0.0.9999[libunwind=,static-libs?,abi
 REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=60bef60670e5a51ea9a5ee43824d67ff
diff --git a/metadata/md5-cache/sys-libs/libcxx-11.0.0_rc3 b/metadata/md5-cache/sys-libs/libcxx-11.0.0_rc3
index be575790aa8a..03d1c469b457 100644
--- a/metadata/md5-cache/sys-libs/libcxx-11.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/libcxx-11.0.0_rc3
@@ -11,5 +11,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=60bef60670e5a51ea9a5ee43824d67ff
diff --git a/metadata/md5-cache/sys-libs/libcxx-11.0.0_rc4 b/metadata/md5-cache/sys-libs/libcxx-11.0.0_rc4
new file mode 100644
index 000000000000..a446d61e13b1
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-11.0.0_rc4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-11.0.0_rc4[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=7
+HOMEPAGE=https://libcxx.llvm.org/
+IUSE=elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-11.0.0_rc4[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=libunwind? ( libcxxabi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=60bef60670e5a51ea9a5ee43824d67ff
diff --git a/metadata/md5-cache/sys-libs/libcxx-12.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-12.0.0.9999
index eb6d4f22a441..2d6a5d3bafea 100644
--- a/metadata/md5-cache/sys-libs/libcxx-12.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-12.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-12.0.0.9999[libunwind=,static-libs?,abi
 REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=60bef60670e5a51ea9a5ee43824d67ff
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-10.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-10.0.1
index b36b96823722..415ecab4e200 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-10.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-10.0.1
@@ -11,5 +11,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7cdfbcff1de6d8f7ac9a131d087b7365
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999
index db18e6c6ffa5..2cc05f4e7ac4 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 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_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_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe5e9339c0b00384c5a5c9c0db72d5d0
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-11.0.0_rc3 b/metadata/md5-cache/sys-libs/libcxxabi-11.0.0_rc3
index 8b5207407df1..577fb912c4a9 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-11.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/libcxxabi-11.0.0_rc3
@@ -10,5 +10,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe5e9339c0b00384c5a5c9c0db72d5d0
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-11.0.0_rc4 b/metadata/md5-cache/sys-libs/libcxxabi-11.0.0_rc4
new file mode 100644
index 000000000000..099a6ee8dca4
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-11.0.0_rc4
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_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_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=7
+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_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( 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_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_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe5e9339c0b00384c5a5c9c0db72d5d0
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-12.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-12.0.0.9999
index db18e6c6ffa5..2cc05f4e7ac4 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-12.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-12.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 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_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_s390_32(-)?,abi_s390_64(-)?] ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe5e9339c0b00384c5a5c9c0db72d5d0
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.1 b/metadata/md5-cache/sys-libs/libomp-10.0.1
index a98af42d23c2..24f328c855d1 100644
--- a/metadata/md5-cache/sys-libs/libomp-10.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6e2b7ef5965b3f5f87cf3018863dfa0
diff --git a/metadata/md5-cache/sys-libs/libomp-11.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-11.0.0.9999
index 839f1457e39b..2689d62de6cc 100644
--- a/metadata/md5-cache/sys-libs/libomp-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-11.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c2b66326e1c98ab7ec04eb6df7e0716
diff --git a/metadata/md5-cache/sys-libs/libomp-11.0.0_rc3 b/metadata/md5-cache/sys-libs/libomp-11.0.0_rc3
index 5e3b91edf682..df67eec0da5c 100644
--- a/metadata/md5-cache/sys-libs/libomp-11.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/libomp-11.0.0_rc3
@@ -11,5 +11,5 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c2b66326e1c98ab7ec04eb6df7e0716
diff --git a/metadata/md5-cache/sys-libs/libomp-11.0.0_rc4 b/metadata/md5-cache/sys-libs/libomp-11.0.0_rc4
new file mode 100644
index 000000000000..31c36700d735
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-11.0.0_rc4
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig ) test? ( || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=7
+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_s390_32 abi_s390_64 kernel_linux
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+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_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_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c2b66326e1c98ab7ec04eb6df7e0716
diff --git a/metadata/md5-cache/sys-libs/libomp-12.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-12.0.0.9999
index 839f1457e39b..2689d62de6cc 100644
--- a/metadata/md5-cache/sys-libs/libomp-12.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-12.0.0.9999
@@ -11,5 +11,5 @@ RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c2b66326e1c98ab7ec04eb6df7e0716
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1
index a5bfd71e129f..32f710758c0f 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.1
@@ -11,5 +11,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d50c80be26a6887845927e8876448f0
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999
index ebc81cf10292..7fdfdac9bf26 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2bc455a315eb7e4e54cebd94c549cabc
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0_rc3 b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0_rc3
index b6a81a942d90..a4edce20ef2b 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0_rc3
@@ -10,5 +10,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2bc455a315eb7e4e54cebd94c549cabc
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0_rc4 b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0_rc4
new file mode 100644
index 000000000000..06bfdafa0ff4
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0_rc4
@@ -0,0 +1,14 @@
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.9 dev-python/lit[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/lit[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=7
+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_s390_32 abi_s390_64
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-11.0.0-rc4.tar.gz
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2bc455a315eb7e4e54cebd94c549cabc
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0.9999
index ebc81cf10292..7fdfdac9bf26 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-12.0.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2bc455a315eb7e4e54cebd94c549cabc
diff --git a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.10 b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.10
index 191146408dc5..ba7583c99dd9 100644
--- a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.10
+++ b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.10
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/nss_wrapper-1.1.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=495b126de6e938dc72f520745651870d
diff --git a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.6 b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.6
index 66735aa8d156..6ee32534e4ed 100644
--- a/metadata/md5-cache/sys-libs/nss_wrapper-1.1.6
+++ b/metadata/md5-cache/sys-libs/nss_wrapper-1.1.6
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://ftp.samba.org/pub/cwrap/nss_wrapper-1.1.6.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19ce07698cfc7b3d2cab92202c612042
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1 b/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1
index 6ecc5ca7aebd..8e394b8859f2 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) tcl? ( dev-lang/tcl:0= ) >=dev-lang/swig-1.3.21
+DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) tcl? ( dev-lang/tcl:0= ) >=dev-lang/swig-1.3.21
 DESCRIPTION=Library interface to IPMI
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/openipmi/
-IUSE=crypt snmp perl python static-libs tcl python_single_target_python3_6 python_single_target_python3_7
+IUSE=crypt snmp perl python static-libs tcl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64 hppa ~ia64 ppc x86
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.27.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1896e159f9825928f68222854dcb70f0
+_md5_=e973847df581484559d8c0864cf1dca1
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.28 b/metadata/md5-cache/sys-libs/openipmi-2.0.28
index 1ac9abe50e67..0057aebcd8e1 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.28
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.28
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) tcl? ( dev-lang/tcl:0= ) >=dev-lang/swig-1.3.21
+DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) tcl? ( dev-lang/tcl:0= ) >=dev-lang/swig-1.3.21
 DESCRIPTION=Library interface to IPMI
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/openipmi/
-IUSE=crypt snmp perl python static-libs tcl python_single_target_python3_6 python_single_target_python3_7
+IUSE=crypt snmp perl python static-libs tcl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.28.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=adfa632301646739c17af3a0b4ec451d
+_md5_=5a74f40626b55ad16a538e7421dd24e0
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.29 b/metadata/md5-cache/sys-libs/openipmi-2.0.29
index a819dbd2cc04..26f22648432a 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.29
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.29
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) tcl? ( dev-lang/tcl:0= ) >=dev-lang/swig-1.3.21
+DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) tcl? ( dev-lang/tcl:0= ) >=dev-lang/swig-1.3.21
 DESCRIPTION=Library interface to IPMI
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/openipmi/
-IUSE=crypt snmp perl python static-libs tcl python_single_target_python3_6 python_single_target_python3_7
+IUSE=crypt snmp perl python static-libs tcl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.29.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6a8efeab004c8b31cba18b2ab3254037
+_md5_=2045328a1794739e5be994ab2999c75c
diff --git a/metadata/md5-cache/sys-libs/pam_wrapper-1.1.3 b/metadata/md5-cache/sys-libs/pam_wrapper-1.1.3
index 5b2135f776bb..8beab8197488 100644
--- a/metadata/md5-cache/sys-libs/pam_wrapper-1.1.3
+++ b/metadata/md5-cache/sys-libs/pam_wrapper-1.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/pub/cwrap/pam_wrapper-1.1.3.tar.gz https://ftp.samba.org/pub/cwrap/pam_wrapper-1.1.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98c395a8ff49db8a0243075d01e819aa
diff --git a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.7 b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.7
index 78cfc60c9d48..e3c5c97acc80 100644
--- a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.7
+++ b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.7
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/pub/cwrap/uid_wrapper-1.2.7.tar.gz https://ftp.samba.org/pub/cwrap/uid_wrapper-1.2.7.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b129c4aaf3d8706547720eddc16a59b
diff --git a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.8 b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.8
index 7f72e399c338..dd10cde64f81 100644
--- a/metadata/md5-cache/sys-libs/uid_wrapper-1.2.8
+++ b/metadata/md5-cache/sys-libs/uid_wrapper-1.2.8
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/pub/cwrap/uid_wrapper-1.2.8.tar.gz https://ftp.samba.org/pub/cwrap/uid_wrapper-1.2.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79d612f898abba90716195b4ddc9b303
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index fedd51b9a55a..fc1e6aa004fa 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/acpi_call-1.1.0-r3 b/metadata/md5-cache/sys-power/acpi_call-1.1.0-r3
deleted file mode 100644
index f999ebb8b24e..000000000000
--- a/metadata/md5-cache/sys-power/acpi_call-1.1.0-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup unpack
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=A kernel module that enables you to call ACPI methods
-EAPI=5
-HOMEPAGE=https://github.com/mkottman/acpi_call
-IUSE=kernel_linux kernel_linux kernel_linux
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] )
-SLOT=0
-SRC_URI=https://github.com/mkottman/acpi_call/archive/v1.1.0.tar.gz -> acpi_call-1.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=67849a4a256c97a3bd00c79baed45178
diff --git a/metadata/md5-cache/sys-power/acpi_call-1.1.0-r4 b/metadata/md5-cache/sys-power/acpi_call-1.1.0-r4
deleted file mode 100644
index 03c6ba6156fe..000000000000
--- a/metadata/md5-cache/sys-power/acpi_call-1.1.0-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=kernel_linux? ( sys-apps/kmod[tools] ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=A kernel module that enables you to call ACPI methods
-EAPI=5
-HOMEPAGE=https://github.com/mkottman/acpi_call
-IUSE=kernel_linux kernel_linux kernel_linux
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] )
-SLOT=0
-SRC_URI=https://github.com/mkottman/acpi_call/archive/v1.1.0.tar.gz -> acpi_call-1.1.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	63c06dfa12648f13855f5f4348af824c	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=494a781e43d6bfcc6448d99d4fc06e8d
diff --git a/metadata/md5-cache/sys-power/pm-utils-1.4.1-r6 b/metadata/md5-cache/sys-power/pm-utils-1.4.1-r6
deleted file mode 100644
index a7f883f9ec9a..000000000000
--- a/metadata/md5-cache/sys-power/pm-utils-1.4.1-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!<app-laptop/laptop-mode-tools-1.55-r1 !sys-power/powermgmt-base[-pm-utils(+)] sys-apps/dbus >=sys-apps/util-linux-2.13 sys-power/pm-quirks alsa? ( media-sound/alsa-utils ) ntp? ( || ( net-misc/ntp net-misc/openntpd ) ) amd64? ( !video_cards_intel? ( sys-apps/vbetool ) ) x86? ( !video_cards_intel? ( sys-apps/vbetool ) ) video_cards_radeon? ( app-laptop/radeontool )
-DESCRIPTION=Suspend and hibernation utilities
-EAPI=5
-HOMEPAGE=https://pm-utils.freedesktop.org/
-IUSE=alsa debug ntp video_cards_intel video_cards_radeon
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=!<app-laptop/laptop-mode-tools-1.55-r1 !sys-power/powermgmt-base[-pm-utils(+)] sys-apps/dbus >=sys-apps/util-linux-2.13 sys-power/pm-quirks alsa? ( media-sound/alsa-utils ) ntp? ( || ( net-misc/ntp net-misc/openntpd ) ) amd64? ( !video_cards_intel? ( sys-apps/vbetool ) ) x86? ( !video_cards_intel? ( sys-apps/vbetool ) ) video_cards_radeon? ( app-laptop/radeontool )
-SLOT=0
-SRC_URI=https://pm-utils.freedesktop.org/releases/pm-utils-1.4.1.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=05c3f75a4a08c518b5dd79c66e5b76e8
diff --git a/metadata/md5-cache/sys-power/powertop-2.10 b/metadata/md5-cache/sys-power/powertop-2.10
deleted file mode 100644
index ea2b5a06cae2..000000000000
--- a/metadata/md5-cache/sys-power/powertop-2.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare setup
-DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?]
-DESCRIPTION=tool to diagnose issues with power consumption and power management
-EAPI=7
-HOMEPAGE=https://01.org/powertop/ https://github.com/fenrus75/powertop/
-IUSE=nls unicode X kernel_linux
-KEYWORDS=amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
-SLOT=0
-SRC_URI=https://01.org/sites/default/files/downloads/powertop-v2.10.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=609c49525f11453eb6d02f6baa1d2220
diff --git a/metadata/md5-cache/sys-power/powertop-2.11 b/metadata/md5-cache/sys-power/powertop-2.11
deleted file mode 100644
index 482e2de52e55..000000000000
--- a/metadata/md5-cache/sys-power/powertop-2.11
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare setup
-DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?]
-DESCRIPTION=tool to diagnose issues with power consumption and power management
-EAPI=7
-HOMEPAGE=https://01.org/powertop/ https://github.com/fenrus75/powertop/
-IUSE=nls unicode X kernel_linux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
-SLOT=0
-SRC_URI=https://github.com/fenrus75/powertop/archive/v2.11.tar.gz -> powertop-2.11.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2a20297c7f7f1e95596809482e710749
diff --git a/metadata/md5-cache/sys-power/powertop-2.13 b/metadata/md5-cache/sys-power/powertop-2.13
deleted file mode 100644
index 8e6aac4da457..000000000000
--- a/metadata/md5-cache/sys-power/powertop-2.13
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive >=sys-devel/gettext-0.20.2 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure prepare setup
-DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?]
-DESCRIPTION=tool to diagnose issues with power consumption and power management
-EAPI=7
-HOMEPAGE=https://01.org/powertop/ https://github.com/fenrus75/powertop/
-IUSE=nls unicode X kernel_linux
-KEYWORDS=amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
-SLOT=0
-SRC_URI=https://github.com/fenrus75/powertop/archive/v2.13.tar.gz -> powertop-2.13.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4a1cac8007f71de2f1a71186177b73b5
diff --git a/metadata/md5-cache/sys-power/powertop-2.13-r1 b/metadata/md5-cache/sys-power/powertop-2.13-r1
new file mode 100644
index 000000000000..e4a6d84284c0
--- /dev/null
+++ b/metadata/md5-cache/sys-power/powertop-2.13-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/autoconf-archive >=sys-devel/gettext-0.20.2 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare setup
+DEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?]
+DESCRIPTION=tool to diagnose issues with power consumption and power management
+EAPI=7
+HOMEPAGE=https://01.org/powertop/ https://github.com/fenrus75/powertop/
+IUSE=nls unicode X kernel_linux
+KEYWORDS=amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/libnl:3 sys-apps/pciutils sys-libs/ncurses:=[unicode?] X? ( x11-apps/xset ) virtual/libintl
+SLOT=0
+SRC_URI=https://github.com/fenrus75/powertop/archive/v2.13.tar.gz -> powertop-2.13.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a40049aff5f22c7d94398cce1942b52f
diff --git a/metadata/md5-cache/sys-power/suspend-1.0_p20200924 b/metadata/md5-cache/sys-power/suspend-1.0_p20200924
new file mode 100644
index 000000000000..21979218875f
--- /dev/null
+++ b/metadata/md5-cache/sys-power/suspend-1.0_p20200924
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/perl-5.10 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/libx86 >=sys-apps/pciutils-2.2.4 crypt? ( >=dev-libs/libgcrypt-1.6.3:0[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( >=dev-libs/lzo-2[static-libs] )
+DESCRIPTION=Userspace Software Suspend and S2Ram
+EAPI=7
+HOMEPAGE=http://suspend.sourceforge.net https://github.com/bircoph/suspend
+IUSE=crypt +lzo threads
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libx86 >=sys-apps/pciutils-2.2.4 crypt? ( >=dev-libs/libgcrypt-1.6.3:0[static-libs] dev-libs/libgpg-error[static-libs] ) lzo? ( >=dev-libs/lzo-2[static-libs] )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/suspend-1.0_p20120915.tar.xz https://dev.gentoo.org/~bircoph/patches/suspend-1.0_p20200924.patch.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3bdb87609cbc39864e2dfed8092fdab8
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index a4633b0b362c..95ee8a078903 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/criu-3.11 b/metadata/md5-cache/sys-process/criu-3.11
deleted file mode 100644
index 5c20de8ffc1b..000000000000
--- a/metadata/md5-cache/sys-process/criu-3.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) selinux? ( sys-libs/libselinux ) setproctitle? ( dev-libs/libbsd ) doc? ( app-text/asciidoc app-text/xmlto )
-DESCRIPTION=utility to checkpoint/restore a process tree
-EAPI=6
-HOMEPAGE=https://criu.org/
-IUSE=doc python selinux setproctitle static-libs kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=GPL-2
-RDEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) selinux? ( sys-libs/libselinux ) setproctitle? ( dev-libs/libbsd ) python? ( dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.openvz.org/criu/criu-3.11.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7feef2e5eec68e0d431a6b4930de2f01
diff --git a/metadata/md5-cache/sys-process/criu-3.12 b/metadata/md5-cache/sys-process/criu-3.12
deleted file mode 100644
index 38fbbb7208b9..000000000000
--- a/metadata/md5-cache/sys-process/criu-3.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) selinux? ( sys-libs/libselinux ) setproctitle? ( dev-libs/libbsd ) doc? ( app-text/asciidoc app-text/xmlto )
-DESCRIPTION=utility to checkpoint/restore a process tree
-EAPI=6
-HOMEPAGE=https://criu.org/
-IUSE=doc python selinux setproctitle static-libs kernel_linux python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=GPL-2
-RDEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) selinux? ( sys-libs/libselinux ) setproctitle? ( dev-libs/libbsd ) python? ( dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.openvz.org/criu/criu-3.12.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=4276073f0f67f1dbe77b993d126cdd38
diff --git a/metadata/md5-cache/sys-process/criu-3.14-r2 b/metadata/md5-cache/sys-process/criu-3.14-r2
index d22c177b2a74..44cbac84095f 100644
--- a/metadata/md5-cache/sys-process/criu-3.14-r2
+++ b/metadata/md5-cache/sys-process/criu-3.14-r2
@@ -4,7 +4,7 @@ DESCRIPTION=utility to checkpoint/restore a process tree
 EAPI=7
 HOMEPAGE=https://criu.org/
 IUSE=doc selinux setproctitle static-libs kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap selinux? ( sys-libs/libselinux ) setproctitle? ( dev-libs/libbsd ) dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/ipaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.openvz.org/criu/criu-3.14.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7b8f722f4876c9061625642138039093
+_md5_=cb196a6620bd94ecbe83957860923749
diff --git a/metadata/md5-cache/sys-process/criu-3.6 b/metadata/md5-cache/sys-process/criu-3.6
deleted file mode 100644
index d9524e814f5b..000000000000
--- a/metadata/md5-cache/sys-process/criu-3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) selinux? ( sys-libs/libselinux ) setproctitle? ( dev-libs/libbsd ) app-text/asciidoc app-text/xmlto
-DESCRIPTION=utility to checkpoint/restore a process tree
-EAPI=6
-HOMEPAGE=http://criu.org/
-IUSE=python selinux setproctitle static-libs kernel_linux python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64
-LICENSE=GPL-2
-RDEPEND=dev-libs/protobuf-c dev-libs/libnl:3 net-libs/libnet:1.1 sys-libs/libcap 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(-)] ) selinux? ( sys-libs/libselinux ) setproctitle? ( dev-libs/libbsd ) python? ( dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.openvz.org/criu/criu-3.6.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=9c8cfc49d66ee8d1db05f2de0491951d
diff --git a/metadata/md5-cache/sys-process/parallel-20200922 b/metadata/md5-cache/sys-process/parallel-20200922
new file mode 100644
index 000000000000..4afc6312ad0a
--- /dev/null
+++ b/metadata/md5-cache/sys-process/parallel-20200922
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure
+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/ https://git.savannah.gnu.org/cgit/parallel.git
+KEYWORDS=~amd64 ~arm ~arm64 ~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-20200922.tar.bz2
+_md5_=3c378f580bc9ac30126c26e5080d4621
diff --git a/metadata/md5-cache/sys-process/psmisc-23.3-r1 b/metadata/md5-cache/sys-process/psmisc-23.3-r1
index a0494192b5e5..e8253bbb4290 100644
--- a/metadata/md5-cache/sys-process/psmisc-23.3-r1
+++ b/metadata/md5-cache/sys-process/psmisc-23.3-r1
@@ -5,9 +5,9 @@ DESCRIPTION=A set of tools that use the proc filesystem
 EAPI=7
 HOMEPAGE=http://psmisc.sourceforge.net/
 IUSE=ipv6 nls selinux X
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.7-r7:0= nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://sourceforge/psmisc/psmisc-23.3.tar.xz
-_md5_=300e6dc2076a3b0b612609a90ff38fb3
+_md5_=bea5c06ff9244f3220d0ad644dab5a2f
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.14 b/metadata/md5-cache/sys-process/systemd-cron-1.5.14
index ce1da2cecd75..fd278095886b 100644
--- a/metadata/md5-cache/sys-process/systemd-cron-1.5.14
+++ b/metadata/md5-cache/sys-process/systemd-cron-1.5.14
@@ -5,7 +5,7 @@ DESCRIPTION=systemd units to create timers for cron directories and crontab
 EAPI=7
 HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
 IUSE=cron-boot etc-crontab-systemd minutely setgid test yearly python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~arm64 sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !sys-process/cronie[anacron] !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=dev-python/pypy3-7.3.0:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) sys-process/cronbase
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd-cron/systemd-cron/archive/v1.5.14.tar.gz -> systemd-cron-1.5.14.tar.gz
 _eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fc821ff04501dbf358d2f8d0c193de8e
+_md5_=aa29309a1b2dd54f4b95f802c5cbdd1e
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 0c7ab38f6d97..022c2d1c34c2 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/pypy-7.3.0 b/metadata/md5-cache/virtual/pypy-7.3.0
deleted file mode 100644
index 7c6b8f87cdd9..000000000000
--- a/metadata/md5-cache/virtual/pypy-7.3.0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=An obsolete virtual for PyPy Python implementation
-EAPI=7
-IUSE=bzip2 gdbm ncurses sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-RDEPEND=>=dev-python/pypy-7.3.0:0/73[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-SLOT=0/73
-_md5_=522817e9af031db21aaa4f823641eb76
diff --git a/metadata/md5-cache/virtual/pypy3-7.3.0 b/metadata/md5-cache/virtual/pypy3-7.3.0
deleted file mode 100644
index 33a12cb4faeb..000000000000
--- a/metadata/md5-cache/virtual/pypy3-7.3.0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=An obsolete virtual for PyPy3 Python implementation
-EAPI=7
-IUSE=bzip2 gdbm ncurses sqlite tk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-RDEPEND=>=dev-python/pypy3-7.3.0:0/pypy36-pp73[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]
-SLOT=0/pypy36-pp73
-_md5_=7a2c261b4c764402f8d6e6d86f5826a6
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 9269dfb0c768..0ea5c6d96a2e 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_common_redirect-0.1.1 b/metadata/md5-cache/www-apache/mod_common_redirect-0.1.1
deleted file mode 100644
index 3832f71baa68..000000000000
--- a/metadata/md5-cache/www-apache/mod_common_redirect-0.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND==www-servers/apache-2*
-DESCRIPTION=mod_common_redirect implements common redirects without mod_rewrite overhead
-EAPI=4
-HOMEPAGE=https://github.com/hollow/mod_common_redirect
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND==www-servers/apache-2*
-SLOT=0
-SRC_URI=https://nodeload.github.com/hollow/mod_common_redirect/tarball/v0.1.1 -> mod_common_redirect-0.1.1.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=befb0ea050393cce703d00b11576fc16
diff --git a/metadata/md5-cache/www-apache/mod_common_redirect-0.1.1-r1 b/metadata/md5-cache/www-apache/mod_common_redirect-0.1.1-r1
new file mode 100644
index 000000000000..219c8c5abc9a
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_common_redirect-0.1.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND==www-servers/apache-2*
+DESCRIPTION=mod_common_redirect implements common redirects without mod_rewrite overhead
+EAPI=6
+HOMEPAGE=https://github.com/hollow/mod_common_redirect
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND==www-servers/apache-2*
+SLOT=0
+SRC_URI=https://nodeload.github.com/hollow/mod_common_redirect/tarball/v0.1.1 -> mod_common_redirect-0.1.1.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de
+_md5_=5f8b388dbf51dbc63fc0d1ca27599f97
diff --git a/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1 b/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1
deleted file mode 100644
index 259632b7d29b..000000000000
--- a/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND==www-servers/apache-2*
-DESCRIPTION=Apache module that processes X-SENDFILE headers registered by the output handler
-EAPI=4
-HOMEPAGE=https://tn123.org/mod_xsendfile/
-KEYWORDS=amd64 sparc x86 ~amd64-linux
-LICENSE=Apache-2.0
-RDEPEND==www-servers/apache-2*
-SLOT=0
-SRC_URI=https://tn123.org/mod_xsendfile/beta/mod_xsendfile-1.0b1.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bba26cdf984d1367e08fe9cecabf0fb0
diff --git a/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1-r1 b/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1-r1
new file mode 100644
index 000000000000..206ff6b17131
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND==www-servers/apache-2*
+DESCRIPTION=Apache module that processes X-SENDFILE headers registered by the output handler
+EAPI=6
+HOMEPAGE=https://tn123.org/mod_xsendfile/
+KEYWORDS=amd64 sparc x86 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND==www-servers/apache-2*
+SLOT=0
+SRC_URI=https://tn123.org/mod_xsendfile/beta/mod_xsendfile-1.0b1.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de
+_md5_=b544bb64accc34657c5ab2454e052b30
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 3accb2656d6a..cac5cd751f43 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/ikiwiki-3.20170111 b/metadata/md5-cache/www-apps/ikiwiki-3.20170111
deleted file mode 100644
index dd73b3e519d6..000000000000
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20170111
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Scrubber dev-perl/HTML-Template dev-perl/URI dev-perl/Text-Markdown dev-perl/TimeDate dev-perl/YAML-LibYAML test? ( dev-perl/File-chdir dev-perl/File-ReadBackwards dev-perl/File-MimeInfo dev-perl/HTML-LinkExtractor dev-perl/HTML-Tree dev-perl/Net-OpenID-Consumer dev-perl/RPC-XML dev-perl/XML-Feed dev-perl/XML-Twig dev-vcs/cvs[server] dev-vcs/cvsps ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=A wiki compiler
-EAPI=5
-HOMEPAGE=http://ikiwiki.info/
-IUSE=extras minimal test
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Scrubber dev-perl/HTML-Template dev-perl/URI dev-perl/Text-Markdown dev-perl/TimeDate dev-perl/YAML-LibYAML !minimal? ( dev-perl/CGI >=dev-perl/CGI-FormBuilder-3.0202 >=dev-perl/CGI-Session-4.14 dev-perl/Mail-Sendmail dev-perl/Term-ReadLine-Gnu dev-perl/XML-Simple media-gfx/imagemagick[perl] extras? ( dev-python/docutils dev-perl/Digest-SHA1 dev-perl/File-MimeInfo dev-perl/RPC-XML dev-perl/XML-Feed dev-perl/LWPx-ParanoidAgent dev-perl/Net-OpenID-Consumer ) ) dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/i/ikiwiki/ikiwiki_3.20170111.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a1f8be3e449e7a27fd87207983a76265
diff --git a/metadata/md5-cache/www-apps/ikiwiki-3.20171001 b/metadata/md5-cache/www-apps/ikiwiki-3.20171001
deleted file mode 100644
index 3c6ca76f3a3a..000000000000
--- a/metadata/md5-cache/www-apps/ikiwiki-3.20171001
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Scrubber dev-perl/HTML-Template dev-perl/URI dev-perl/Text-Markdown dev-perl/TimeDate dev-perl/YAML-LibYAML test? ( dev-perl/File-chdir dev-perl/File-ReadBackwards dev-perl/File-MimeInfo dev-perl/HTML-LinkExtractor dev-perl/HTML-Tree dev-perl/Net-OpenID-Consumer dev-perl/RPC-XML dev-perl/XML-Feed dev-perl/XML-Twig dev-vcs/cvs[server] dev-vcs/cvsps ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=A wiki compiler
-EAPI=5
-HOMEPAGE=http://ikiwiki.info/
-IUSE=extras minimal test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10 app-text/po4a dev-perl/HTML-Parser dev-perl/HTML-Scrubber dev-perl/HTML-Template dev-perl/URI dev-perl/Text-Markdown dev-perl/TimeDate dev-perl/YAML-LibYAML !minimal? ( dev-perl/CGI >=dev-perl/CGI-FormBuilder-3.0202 >=dev-perl/CGI-Session-4.14 dev-perl/Mail-Sendmail dev-perl/Term-ReadLine-Gnu dev-perl/XML-Simple media-gfx/imagemagick[perl] extras? ( dev-python/docutils dev-perl/Digest-SHA1 dev-perl/File-MimeInfo dev-perl/RPC-XML dev-perl/XML-Feed dev-perl/LWPx-ParanoidAgent dev-perl/Net-OpenID-Consumer ) ) dev-lang/perl:=[-build(-)]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/i/ikiwiki/ikiwiki_3.20171001.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f8480baa5e6cb1111df717546ec79280
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.34.4 b/metadata/md5-cache/www-apps/mediawiki-1.34.4
new file mode 100644
index 000000000000..a1e3a29a030f
--- /dev/null
+++ b/metadata/md5-cache/www-apps/mediawiki-1.34.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prerm setup unpack
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=The MediaWiki wiki web application (as used on wikipedia.org)
+EAPI=7
+HOMEPAGE=http://www.mediawiki.org
+IUSE=imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[ctype,fileinfo,iconv,json,postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) mysql? ( dev-lang/php[mysql,mysqli] ) sqlite? ( dev-db/sqlite[fts3(+)] dev-lang/php[pdo,sqlite] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+RESTRICT=test
+SLOT=1.34.4
+SRC_URI=http://releases.wikimedia.org/mediawiki/1.34/mediawiki-1.34.4.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=233eacf5a934a971d7c386e5287b8bfa
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.35.0 b/metadata/md5-cache/www-apps/mediawiki-1.35.0
new file mode 100644
index 000000000000..4c3a5990888c
--- /dev/null
+++ b/metadata/md5-cache/www-apps/mediawiki-1.35.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prerm setup unpack
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=The MediaWiki wiki web application (as used on wikipedia.org)
+EAPI=7
+HOMEPAGE=http://www.mediawiki.org
+IUSE=imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/php-7.3.19[ctype,fileinfo,iconv,json,postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) mysql? ( dev-lang/php[mysql,mysqli] ) sqlite? ( dev-db/sqlite[fts3(+)] dev-lang/php[pdo,sqlite] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+RESTRICT=test
+SLOT=1.35.0
+SRC_URI=http://releases.wikimedia.org/mediawiki/1.35/mediawiki-1.35.0.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=a13f2e3615d5e00b62bf6086fb9fb25b
diff --git a/metadata/md5-cache/www-apps/tt-rss-20180105 b/metadata/md5-cache/www-apps/tt-rss-20180105
deleted file mode 100644
index 85c5feb1b2a8..000000000000
--- a/metadata/md5-cache/www-apps/tt-rss-20180105
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prerm setup
-DEPEND=!vhosts? ( daemon? ( acl? ( sys-apps/acl ) ) ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX
-EAPI=6
-HOMEPAGE=https://tt-rss.org/
-IUSE=+acl daemon +mysqli postgres vhosts
-KEYWORDS=~amd64 ~arm ~mips ~x86
-LICENSE=GPL-3
-RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,pcntl,pdo] ) !daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,pdo] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-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	c2993e4c430c1ee24f278983d6189501	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=11f53d1c564f8684d7496f5d2bacf560
diff --git a/metadata/md5-cache/www-apps/tt-rss-20190523 b/metadata/md5-cache/www-apps/tt-rss-20190523
deleted file mode 100644
index ca15a8ca0891..000000000000
--- a/metadata/md5-cache/www-apps/tt-rss-20190523
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prerm setup
-DEPEND=!vhosts? ( daemon? ( acl? ( sys-apps/acl ) ) ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX
-EAPI=7
-HOMEPAGE=https://tt-rss.org/
-IUSE=+acl daemon +mysqli postgres vhosts
-KEYWORDS=~amd64 ~arm ~mips ~x86
-LICENSE=GPL-3
-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=20190523
-SRC_URI=https://git.tt-rss.org/git/tt-rss/archive/4a2836ea90c4c471029d189a8c9fe5ec10a9521b.tar.gz -> tt-rss-20190523.tar.gz
-_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=4889666c45d4d5f540407bca1302e41f
diff --git a/metadata/md5-cache/www-apps/tt-rss-20200922 b/metadata/md5-cache/www-apps/tt-rss-20200922
new file mode 100644
index 000000000000..52bce486bcc0
--- /dev/null
+++ b/metadata/md5-cache/www-apps/tt-rss-20200922
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prerm setup
+DEPEND=!vhosts? ( daemon? ( acl? ( sys-apps/acl ) ) ) || ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX
+EAPI=7
+HOMEPAGE=https://tt-rss.org/
+IUSE=+acl daemon gd +mysqli postgres vhosts
+KEYWORDS=~amd64 ~arm ~mips ~x86
+LICENSE=GPL-3
+RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( acct-user/ttrssd acct-group/ttrssd dev-lang/php:*[gd?,mysqli?,postgres?,curl,fileinfo,intl,json,pdo,unicode,xml,cli,pcntl] ) !daemon? ( dev-lang/php:*[gd?,mysqli?,postgres?,curl,fileinfo,intl,json,pdo,unicode,xml] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysqli postgres )
+SLOT=20200922
+SRC_URI=https://dev.gentoo.org/~chewi/distfiles/tt-rss-20200922.tar.gz
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=8a361b5f98de5e8ba29e3cf8ddb9c156
diff --git a/metadata/md5-cache/www-apps/tt-rss-99999999 b/metadata/md5-cache/www-apps/tt-rss-99999999
index 35dc01fea128..1a979d07e262 100644
--- a/metadata/md5-cache/www-apps/tt-rss-99999999
+++ b/metadata/md5-cache/www-apps/tt-rss-99999999
@@ -4,11 +4,11 @@ DEPEND=!vhosts? ( daemon? ( acl? ( sys-apps/acl ) ) ) || ( virtual/httpd-cgi vir
 DESCRIPTION=Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX
 EAPI=7
 HOMEPAGE=https://tt-rss.org/
-IUSE=+acl daemon +mysqli postgres vhosts
+IUSE=+acl daemon gd +mysqli postgres vhosts
 LICENSE=GPL-3
 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
+RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( acct-user/ttrssd acct-group/ttrssd dev-lang/php:*[gd?,mysqli?,postgres?,curl,fileinfo,intl,json,pdo,unicode,xml,cli,pcntl] ) !daemon? ( dev-lang/php:*[gd?,mysqli?,postgres?,curl,fileinfo,intl,json,pdo,unicode,xml] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysqli postgres )
 SLOT=99999999
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	prefix	c2993e4c430c1ee24f278983d6189501	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=15732b2927bbee0903215752c2191054
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	prefix	c2993e4c430c1ee24f278983d6189501	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=98f7997c77595afb52880f89e6a0b0d0
diff --git a/metadata/md5-cache/www-apps/webdavcgi-0.8.3 b/metadata/md5-cache/www-apps/webdavcgi-0.8.3
deleted file mode 100644
index 29ea07abae60..000000000000
--- a/metadata/md5-cache/www-apps/webdavcgi-0.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A Perl CGI for accessing and sharing files, or calendar/addressbooks via WebDAV
-EAPI=4
-HOMEPAGE=http://webdavcgi.sourceforge.net/
-IUSE=mysql postgres rcs samba +sqlite +suid vhosts
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-perl/Archive-Zip dev-perl/File-Copy-Link dev-perl/PerlIO-gzip dev-perl/Quota dev-perl/TimeDate dev-perl/URI dev-perl/UUID-Tiny dev-perl/XML-Simple media-gfx/graphicsmagick[perl] mysql? ( dev-perl/DBD-mysql ) virtual/perl-Module-Load postgres? ( dev-perl/DBD-Pg ) rcs? ( dev-perl/Rcs ) samba? ( dev-perl/Filesys-SmbClient ) sqlite? ( dev-perl/DBD-SQLite ) dev-perl/CGI virtual/perl-File-Spec >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=0
-SRC_URI=mirror://sourceforge/webdavcgi/webdavcgi-0.8.3.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c280db203f4862bbc46a44d72db3d0fd
diff --git a/metadata/md5-cache/www-apps/webdavcgi-0.8.4 b/metadata/md5-cache/www-apps/webdavcgi-0.8.4
deleted file mode 100644
index 484ed6fb606e..000000000000
--- a/metadata/md5-cache/www-apps/webdavcgi-0.8.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=A Perl CGI for accessing and sharing files, or calendar/addressbooks via WebDAV
-EAPI=5
-HOMEPAGE=http://webdavcgi.sourceforge.net/
-IUSE=afs kerberos mysql postgres rcs samba +sqlite +suid
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=!www-apps/webdavcgi:0 afs? ( net-fs/openafs ) dev-lang/perl dev-perl/Archive-Zip dev-perl/File-Copy-Link dev-perl/PerlIO-gzip dev-perl/Quota dev-perl/TimeDate dev-perl/URI dev-perl/UUID-Tiny dev-perl/XML-Simple kerberos? ( virtual/krb5 ) media-gfx/graphicsmagick[perl] mysql? ( dev-perl/DBD-mysql ) virtual/perl-Module-Load postgres? ( dev-perl/DBD-Pg ) rcs? ( dev-perl/Rcs ) samba? ( dev-perl/Filesys-SmbClient ) sqlite? ( dev-perl/DBD-SQLite ) dev-perl/CGI virtual/perl-File-Spec || ( virtual/httpd-cgi virtual/httpd-fastcgi )
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=0.8
-SRC_URI=mirror://sourceforge/webdavcgi/webdavcgi-0.8.4.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=fe8d0d465c0c513b865b82e9c164eb34
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 98d5409d812b..ef7d24c896fd 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-86.0.4240.42 b/metadata/md5-cache/www-client/chromium-86.0.4240.42
deleted file mode 100644
index 2f542032632c..000000000000
--- a/metadata/md5-cache/www-client/chromium-86.0.4240.42
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1807 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 virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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-1.8.2:=[postproc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) ozone? ( !headless? ( media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= x11-libs/gtk+:3[X] ozone-wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/libdrm:= x11-libs/gtk+:3[wayland,X] x11-libs/libxkbcommon:= ) ) ) !ozone? ( >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official ozone ozone-wayland 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-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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-1.8.2:=[postproc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) ozone? ( !headless? ( media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= x11-libs/gtk+:3[X] ozone-wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/libdrm:= x11-libs/gtk+:3[wayland,X] x11-libs/libxkbcommon:= ) ) ) !ozone? ( >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
-REQUIRED_USE=component-build? ( !suid ) headless? ( ozone ) ozone-wayland? ( ozone )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-86.0.4240.42.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-86-patchset-6/chromium-86-patchset-6.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=897a9683f74991a87473c4e4fa0d937c
diff --git a/metadata/md5-cache/www-client/chromium-86.0.4240.53 b/metadata/md5-cache/www-client/chromium-86.0.4240.53
new file mode 100644
index 000000000000..edd6ced7b56a
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-86.0.4240.53
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1807 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 virtual/pkgconfig js-type-check? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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-1.8.2:=[postproc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) ozone? ( !headless? ( media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= x11-libs/gtk+:3[X] ozone-wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/libdrm:= x11-libs/gtk+:3[wayland,X] x11-libs/libxkbcommon:= ) ) ) !ozone? ( >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official ozone ozone-wayland 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-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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-1.8.2:=[postproc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) ozone? ( !headless? ( media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= x11-libs/gtk+:3[X] ozone-wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/libdrm:= x11-libs/gtk+:3[wayland,X] x11-libs/libxkbcommon:= ) ) ) !ozone? ( >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
+REQUIRED_USE=component-build? ( !suid ) headless? ( ozone ) ozone-wayland? ( ozone )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-86.0.4240.53.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-86-patchset-6/chromium-86-patchset-6.tar.xz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=897a9683f74991a87473c4e4fa0d937c
diff --git a/metadata/md5-cache/www-client/chromium-87.0.4263.3 b/metadata/md5-cache/www-client/chromium-87.0.4263.3
deleted file mode 100644
index 24d5d8ab2dbf..000000000000
--- a/metadata/md5-cache/www-client/chromium-87.0.4263.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1807 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 virtual/pkgconfig js-type-check? ( virtual/jre )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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-1.8.2:=[postproc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=https://chromium.org/
-IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc wayland 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-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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-1.8.2:=[postproc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
-REQUIRED_USE=component-build? ( !suid )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-87.0.4263.3.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-87-patchset-3/chromium-87-patchset-3.tar.xz
-_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91625b23b2cbba6585a4836064384090
diff --git a/metadata/md5-cache/www-client/chromium-87.0.4270.0 b/metadata/md5-cache/www-client/chromium-87.0.4270.0
new file mode 100644
index 000000000000..910c661434d2
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-87.0.4270.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 app-arch/unzip dev-lang/perl >=dev-util/gn-0.1807 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 virtual/pkgconfig js-type-check? ( virtual/jre )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=7
+HOMEPAGE=https://chromium.org/
+IUSE=component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland 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-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=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:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] 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/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) app-arch/snappy:= dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-67.1:= )
+REQUIRED_USE=component-build? ( !suid )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-87.0.4270.0.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-87-patchset-4/chromium-87-patchset-4.tar.xz
+_eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	199d6bc7f8b84ac7c00aca900739e570	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0884f8f21c63969aeea96e567745ed1a
diff --git a/metadata/md5-cache/www-client/falkon-3.1.0-r1 b/metadata/md5-cache/www-client/falkon-3.1.0-r1
index 2c9ee2d021b3..cfc560e27c4e 100644
--- a/metadata/md5-cache/www-client/falkon-3.1.0-r1
+++ b/metadata/md5-cache/www-client/falkon-3.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-q
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=0
 SRC_URI=mirror://kde/stable/falkon/3.1/falkon-3.1.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7141f9921720ece0bfc332aa08a76c2
diff --git a/metadata/md5-cache/www-client/firefox-78.3.0 b/metadata/md5-cache/www-client/firefox-78.3.0
new file mode 100644
index 000000000000..47e9360f6e18
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-78.3.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] dev-lang/python:3.6[ncurses,sqlite,ssl] ) app-arch/unzip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.19.0 virtual/pkgconfig >=virtual/rust-1.43.0 || ( ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 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 >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.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.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia 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_ne 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_tl l10n_tr l10n_trs 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.53.1 >=dev-libs/nspr-4.25 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 >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.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.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=screencast? ( wayland )
+SLOT=0/esr78
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/source/firefox-78.3.0esr.source.tar.xz https://dev.gentoo.org/~axz/mozilla/patchsets/firefox-esr-78-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-esr-78-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-esr-78-patches-02.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ach.xpi -> firefox-78.3.0esr-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/af.xpi -> firefox-78.3.0esr-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/an.xpi -> firefox-78.3.0esr-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ar.xpi -> firefox-78.3.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ast.xpi -> firefox-78.3.0esr-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/az.xpi -> firefox-78.3.0esr-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/be.xpi -> firefox-78.3.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/bg.xpi -> firefox-78.3.0esr-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/bn.xpi -> firefox-78.3.0esr-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/br.xpi -> firefox-78.3.0esr-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/bs.xpi -> firefox-78.3.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ca-valencia.xpi -> firefox-78.3.0esr-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ca.xpi -> firefox-78.3.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/cak.xpi -> firefox-78.3.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/cs.xpi -> firefox-78.3.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/cy.xpi -> firefox-78.3.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/da.xpi -> firefox-78.3.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/de.xpi -> firefox-78.3.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/dsb.xpi -> firefox-78.3.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/el.xpi -> firefox-78.3.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/en-CA.xpi -> firefox-78.3.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/en-GB.xpi -> firefox-78.3.0esr-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/eo.xpi -> firefox-78.3.0esr-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/es-AR.xpi -> firefox-78.3.0esr-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/es-CL.xpi -> firefox-78.3.0esr-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/es-ES.xpi -> firefox-78.3.0esr-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/es-MX.xpi -> firefox-78.3.0esr-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/et.xpi -> firefox-78.3.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/eu.xpi -> firefox-78.3.0esr-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/fa.xpi -> firefox-78.3.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ff.xpi -> firefox-78.3.0esr-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/fi.xpi -> firefox-78.3.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/fr.xpi -> firefox-78.3.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/fy-NL.xpi -> firefox-78.3.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ga-IE.xpi -> firefox-78.3.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/gd.xpi -> firefox-78.3.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/gl.xpi -> firefox-78.3.0esr-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/gn.xpi -> firefox-78.3.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/gu-IN.xpi -> firefox-78.3.0esr-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/he.xpi -> firefox-78.3.0esr-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/hi-IN.xpi -> firefox-78.3.0esr-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/hr.xpi -> firefox-78.3.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/hsb.xpi -> firefox-78.3.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/hu.xpi -> firefox-78.3.0esr-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/hy-AM.xpi -> firefox-78.3.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ia.xpi -> firefox-78.3.0esr-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/id.xpi -> firefox-78.3.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/is.xpi -> firefox-78.3.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/it.xpi -> firefox-78.3.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ja.xpi -> firefox-78.3.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ka.xpi -> firefox-78.3.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/kab.xpi -> firefox-78.3.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/kk.xpi -> firefox-78.3.0esr-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/km.xpi -> firefox-78.3.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/kn.xpi -> firefox-78.3.0esr-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ko.xpi -> firefox-78.3.0esr-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/lij.xpi -> firefox-78.3.0esr-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/lt.xpi -> firefox-78.3.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/lv.xpi -> firefox-78.3.0esr-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/mk.xpi -> firefox-78.3.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/mr.xpi -> firefox-78.3.0esr-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ms.xpi -> firefox-78.3.0esr-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/my.xpi -> firefox-78.3.0esr-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/nb-NO.xpi -> firefox-78.3.0esr-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ne-NP.xpi -> firefox-78.3.0esr-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/nl.xpi -> firefox-78.3.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/nn-NO.xpi -> firefox-78.3.0esr-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/oc.xpi -> firefox-78.3.0esr-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/pa-IN.xpi -> firefox-78.3.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/pl.xpi -> firefox-78.3.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/pt-BR.xpi -> firefox-78.3.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/pt-PT.xpi -> firefox-78.3.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/rm.xpi -> firefox-78.3.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ro.xpi -> firefox-78.3.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ru.xpi -> firefox-78.3.0esr-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/si.xpi -> firefox-78.3.0esr-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/sk.xpi -> firefox-78.3.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/sl.xpi -> firefox-78.3.0esr-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/son.xpi -> firefox-78.3.0esr-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/sq.xpi -> firefox-78.3.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/sr.xpi -> firefox-78.3.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/sv-SE.xpi -> firefox-78.3.0esr-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ta.xpi -> firefox-78.3.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/te.xpi -> firefox-78.3.0esr-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/th.xpi -> firefox-78.3.0esr-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/tl.xpi -> firefox-78.3.0esr-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/tr.xpi -> firefox-78.3.0esr-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/trs.xpi -> firefox-78.3.0esr-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/uk.xpi -> firefox-78.3.0esr-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/ur.xpi -> firefox-78.3.0esr-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/uz.xpi -> firefox-78.3.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/vi.xpi -> firefox-78.3.0esr-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/xh.xpi -> firefox-78.3.0esr-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/zh-CN.xpi -> firefox-78.3.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/78.3.0esr/linux-i686/xpi/zh-TW.xpi -> firefox-78.3.0esr-zh-TW.xpi )
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1460304210b2effa456c9cf03643acf3
diff --git a/metadata/md5-cache/www-client/firefox-81.0 b/metadata/md5-cache/www-client/firefox-81.0
new file mode 100644
index 000000000000..70e314c24380
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-81.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] dev-lang/python:3.6[ncurses,sqlite,ssl] ) app-arch/unzip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.19.0 virtual/pkgconfig >=virtual/rust-1.43.0 || ( ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.56 >=dev-libs/nspr-4.28 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 >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.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.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Firefox Web Browser
+EAPI=7
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia 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_ne 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_tl l10n_tr l10n_trs 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.56 >=dev-libs/nspr-4.28 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 >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) screencast? ( media-video/pipewire:0/0.3 ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.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.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
+REQUIRED_USE=screencast? ( wayland )
+SLOT=0/81
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/81.0/source/firefox-81.0.source.tar.xz https://dev.gentoo.org/~axz/mozilla/patchsets/firefox-81-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-81-patches-01.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-81-patches-01.tar.xz l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ach.xpi -> firefox-81.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/af.xpi -> firefox-81.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/an.xpi -> firefox-81.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ar.xpi -> firefox-81.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ast.xpi -> firefox-81.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/az.xpi -> firefox-81.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/be.xpi -> firefox-81.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/bg.xpi -> firefox-81.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/bn.xpi -> firefox-81.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/br.xpi -> firefox-81.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/bs.xpi -> firefox-81.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ca-valencia.xpi -> firefox-81.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ca.xpi -> firefox-81.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/cak.xpi -> firefox-81.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/cs.xpi -> firefox-81.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/cy.xpi -> firefox-81.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/da.xpi -> firefox-81.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/de.xpi -> firefox-81.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/dsb.xpi -> firefox-81.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/el.xpi -> firefox-81.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/en-CA.xpi -> firefox-81.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/en-GB.xpi -> firefox-81.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/eo.xpi -> firefox-81.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/es-AR.xpi -> firefox-81.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/es-CL.xpi -> firefox-81.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/es-ES.xpi -> firefox-81.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/es-MX.xpi -> firefox-81.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/et.xpi -> firefox-81.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/eu.xpi -> firefox-81.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/fa.xpi -> firefox-81.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ff.xpi -> firefox-81.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/fi.xpi -> firefox-81.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/fr.xpi -> firefox-81.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/fy-NL.xpi -> firefox-81.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ga-IE.xpi -> firefox-81.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/gd.xpi -> firefox-81.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/gl.xpi -> firefox-81.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/gn.xpi -> firefox-81.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/gu-IN.xpi -> firefox-81.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/he.xpi -> firefox-81.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/hi-IN.xpi -> firefox-81.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/hr.xpi -> firefox-81.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/hsb.xpi -> firefox-81.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/hu.xpi -> firefox-81.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/hy-AM.xpi -> firefox-81.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ia.xpi -> firefox-81.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/id.xpi -> firefox-81.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/is.xpi -> firefox-81.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/it.xpi -> firefox-81.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ja.xpi -> firefox-81.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ka.xpi -> firefox-81.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/kab.xpi -> firefox-81.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/kk.xpi -> firefox-81.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/km.xpi -> firefox-81.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/kn.xpi -> firefox-81.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ko.xpi -> firefox-81.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/lij.xpi -> firefox-81.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/lt.xpi -> firefox-81.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/lv.xpi -> firefox-81.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/mk.xpi -> firefox-81.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/mr.xpi -> firefox-81.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ms.xpi -> firefox-81.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/my.xpi -> firefox-81.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/nb-NO.xpi -> firefox-81.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ne-NP.xpi -> firefox-81.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/nl.xpi -> firefox-81.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/nn-NO.xpi -> firefox-81.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/oc.xpi -> firefox-81.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/pa-IN.xpi -> firefox-81.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/pl.xpi -> firefox-81.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/pt-BR.xpi -> firefox-81.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/pt-PT.xpi -> firefox-81.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/rm.xpi -> firefox-81.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ro.xpi -> firefox-81.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ru.xpi -> firefox-81.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/si.xpi -> firefox-81.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/sk.xpi -> firefox-81.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/sl.xpi -> firefox-81.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/son.xpi -> firefox-81.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/sq.xpi -> firefox-81.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/sr.xpi -> firefox-81.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/sv-SE.xpi -> firefox-81.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ta.xpi -> firefox-81.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/te.xpi -> firefox-81.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/th.xpi -> firefox-81.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/tl.xpi -> firefox-81.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/tr.xpi -> firefox-81.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/trs.xpi -> firefox-81.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/uk.xpi -> firefox-81.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/ur.xpi -> firefox-81.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/uz.xpi -> firefox-81.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/vi.xpi -> firefox-81.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/xh.xpi -> firefox-81.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/zh-CN.xpi -> firefox-81.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xpi/zh-TW.xpi -> firefox-81.0-zh-TW.xpi )
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	21d8c0949a2693d7109cc6a25fabfcaf	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e30029db7a4827c6d0c338234e7bf38c
diff --git a/metadata/md5-cache/www-client/luakit-2.2.1 b/metadata/md5-cache/www-client/luakit-2.2.1
new file mode 100644
index 000000000000..1c36f423acd7
--- /dev/null
+++ b/metadata/md5-cache/www-client/luakit-2.2.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-lua/luafilesystem[luajit=] net-libs/webkit-gtk:4= x11-libs/gtk+:3 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) test? ( dev-lua/luassert[luajit=] dev-lua/luacheck[luajit=] x11-base/xorg-server[xvfb] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast, extensible, and customizable web browser
+EAPI=7
+HOMEPAGE=https://luakit.github.io/luakit
+IUSE=doc luajit test
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-lua/luafilesystem[luajit=] net-libs/webkit-gtk:4= x11-libs/gtk+:3 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/luakit/luakit/archive/2.2.1.tar.gz -> luakit-2.2.1.tar.gz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a17f1a99c7c396b7c36214579243ee9f
diff --git a/metadata/md5-cache/www-client/luakit-2017.08.10 b/metadata/md5-cache/www-client/luakit-2017.08.10
deleted file mode 100644
index a263a9f7c2de..000000000000
--- a/metadata/md5-cache/www-client/luakit-2017.08.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-lua/luafilesystem[luajit=] net-libs/webkit-gtk:4= x11-libs/gtk+:3 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-lua/luassert[luajit=] dev-lua/luacheck[luajit=] x11-base/xorg-server[xvfb] )
-DESCRIPTION=A fast, light, simple to use micro-browser using WebKit and Lua
-EAPI=6
-HOMEPAGE=https://luakit.github.io/luakit
-IUSE=doc luajit test
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-lua/luafilesystem[luajit=] net-libs/webkit-gtk:4= x11-libs/gtk+:3 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/luakit/luakit/archive/2017.08.10.tar.gz -> luakit-2017.08.10.tar.gz
-_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=700f083a8f0097d8661426eb0a71645d
diff --git a/metadata/md5-cache/www-client/luakit-9999 b/metadata/md5-cache/www-client/luakit-9999
index 39bbdadd190a..fd484ec196a9 100644
--- a/metadata/md5-cache/www-client/luakit-9999
+++ b/metadata/md5-cache/www-client/luakit-9999
@@ -1,7 +1,7 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install postrm test unpack
-DEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-lua/luafilesystem[luajit=] net-libs/webkit-gtk:4= x11-libs/gtk+:3 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-lua/luassert[luajit=] dev-lua/luacheck[luajit=] x11-base/xorg-server[xvfb] )
-DESCRIPTION=A fast, light, simple to use micro-browser using WebKit and Lua
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-lua/luafilesystem[luajit=] net-libs/webkit-gtk:4= x11-libs/gtk+:3 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) test? ( dev-lua/luassert[luajit=] dev-lua/luacheck[luajit=] x11-base/xorg-server[xvfb] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fast, extensible, and customizable web browser
 EAPI=7
 HOMEPAGE=https://luakit.github.io/luakit
 IUSE=doc luajit test
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-lua/luafilesystem[luajit=] net-libs/webkit-gtk:4= x11-libs/gtk+:3 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=681370196af168006bdb121fe6cf64cb
+_eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=28fe7d04453f0d56a90a365643c1e4e9
diff --git a/metadata/md5-cache/www-client/netsurf-3.10-r3 b/metadata/md5-cache/www-client/netsurf-3.10-r3
index 3dd48a7b9eee..f2cf911597cb 100644
--- a/metadata/md5-cache/www-client/netsurf-3.10-r3
+++ b/metadata/md5-cache/www-client/netsurf-3.10-r3
@@ -4,11 +4,11 @@ DESCRIPTION=a free, open source web browser
 EAPI=7
 HOMEPAGE=https://www.netsurf-browser.org/
 IUSE=bmp +duktape fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng +png +psl rosprite +svg +svgtiny +webp
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=~amd64 ~arm ~ppc64
 LICENSE=GPL-2 MIT
 RDEPEND=>=dev-libs/libcss-0.9 >=net-libs/libdom-0.3 >=net-libs/libhubbub-0.3 >=dev-libs/libnsutils-0.1.0 >=dev-libs/libutf8proc-2.4 dev-libs/libxml2:2 net-misc/curl bmp? ( >=media-libs/libnsbmp-0.1 ) fbcon? ( >=dev-libs/libnsfb-0.2.2 truetype? ( media-fonts/dejavu >=media-libs/freetype-2.5.0.1 ) ) gif? ( >=media-libs/libnsgif-0.1 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) gtk2? ( dev-libs/glib:2 x11-libs/gtk+:2 ) javascript? ( >=dev-libs/nsgenbind-0.7 duktape? ( dev-lang/duktape ) !duktape? ( dev-lang/spidermonkey:0= ) ) jpeg? ( >=virtual/jpeg-0-r2:0 ) mng? ( >=media-libs/libmng-1.0.10-r2 ) png? ( >=media-libs/libpng-1.2.51:0 ) psl? ( media-libs/libnspsl ) rosprite? ( >=media-libs/librosprite-0.1.2-r1 ) svg? ( svgtiny? ( >=media-libs/libsvgtiny-0.1.3-r1 ) !svgtiny? ( gnome-base/librsvg:2 ) ) webp? ( >=media-libs/libwebp-0.3.0 )
 REQUIRED_USE=|| ( fbcon gtk gtk2 ) duktape? ( javascript )
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.10-src.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	netsurf	8d6ce5a28a5af61bfb3a264ac8d46867	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=21a922b94d620a65403254eb057ee743
+_md5_=3ab6849400f19a976f32ea916608a317
diff --git a/metadata/md5-cache/www-client/opera-70.0.3728.154 b/metadata/md5-cache/www-client/opera-70.0.3728.154
deleted file mode 100644
index 2f2018514401..000000000000
--- a/metadata/md5-cache/www-client/opera-70.0.3728.154
+++ /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 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/70.0.3728.154/linux/opera-stable_70.0.3728.154_amd64.deb https://download2.operacdn.com/pub/opera/desktop/70.0.3728.154/linux/opera-stable_70.0.3728.154_amd64.deb https://download3.operacdn.com/pub/opera/desktop/70.0.3728.154/linux/opera-stable_70.0.3728.154_amd64.deb https://download4.operacdn.com/pub/opera/desktop/70.0.3728.154/linux/opera-stable_70.0.3728.154_amd64.deb
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=706af59742ff5910e0221a1771d821c0
diff --git a/metadata/md5-cache/www-client/opera-70.0.3728.178 b/metadata/md5-cache/www-client/opera-70.0.3728.178
deleted file mode 100644
index 2fc92ca27382..000000000000
--- a/metadata/md5-cache/www-client/opera-70.0.3728.178
+++ /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 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/70.0.3728.178/linux/opera-stable_70.0.3728.178_amd64.deb https://download2.operacdn.com/pub/opera/desktop/70.0.3728.178/linux/opera-stable_70.0.3728.178_amd64.deb https://download3.operacdn.com/pub/opera/desktop/70.0.3728.178/linux/opera-stable_70.0.3728.178_amd64.deb https://download4.operacdn.com/pub/opera/desktop/70.0.3728.178/linux/opera-stable_70.0.3728.178_amd64.deb
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=807ea2165349f373f6c075a66ed12235
diff --git a/metadata/md5-cache/www-client/opera-71.0.3770.148 b/metadata/md5-cache/www-client/opera-71.0.3770.148
deleted file mode 100644
index e803a85aa77d..000000000000
--- a/metadata/md5-cache/www-client/opera-71.0.3770.148
+++ /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 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/71.0.3770.148/linux/opera-stable_71.0.3770.148_amd64.deb https://download2.operacdn.com/pub/opera/desktop/71.0.3770.148/linux/opera-stable_71.0.3770.148_amd64.deb https://download3.operacdn.com/pub/opera/desktop/71.0.3770.148/linux/opera-stable_71.0.3770.148_amd64.deb https://download4.operacdn.com/pub/opera/desktop/71.0.3770.148/linux/opera-stable_71.0.3770.148_amd64.deb
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=807ea2165349f373f6c075a66ed12235
diff --git a/metadata/md5-cache/www-client/opera-71.0.3770.171 b/metadata/md5-cache/www-client/opera-71.0.3770.171
new file mode 100644
index 000000000000..49b1f99f78fa
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-71.0.3770.171
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+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 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/71.0.3770.171/linux/opera-stable_71.0.3770.171_amd64.deb https://download2.operacdn.com/pub/opera/desktop/71.0.3770.171/linux/opera-stable_71.0.3770.171_amd64.deb https://download3.operacdn.com/pub/opera/desktop/71.0.3770.171/linux/opera-stable_71.0.3770.171_amd64.deb https://download4.operacdn.com/pub/opera/desktop/71.0.3770.171/linux/opera-stable_71.0.3770.171_amd64.deb
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f4878cf7620878c900cd1d159bc789d5
diff --git a/metadata/md5-cache/www-client/opera-71.0.3770.198 b/metadata/md5-cache/www-client/opera-71.0.3770.198
new file mode 100644
index 000000000000..22d69c00723c
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-71.0.3770.198
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+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 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/71.0.3770.198/linux/opera-stable_71.0.3770.198_amd64.deb https://download2.operacdn.com/pub/opera/desktop/71.0.3770.198/linux/opera-stable_71.0.3770.198_amd64.deb https://download3.operacdn.com/pub/opera/desktop/71.0.3770.198/linux/opera-stable_71.0.3770.198_amd64.deb https://download4.operacdn.com/pub/opera/desktop/71.0.3770.198/linux/opera-stable_71.0.3770.198_amd64.deb
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f7ad068b5d9ee42df822ee0c4086b8c7
diff --git a/metadata/md5-cache/www-client/opera-beta-71.0.3770.126 b/metadata/md5-cache/www-client/opera-beta-71.0.3770.126
index 280104760b2a..983acba0a7d9 100644
--- a/metadata/md5-cache/www-client/opera-beta-71.0.3770.126
+++ b/metadata/md5-cache/www-client/opera-beta-71.0.3770.126
@@ -1,4 +1,5 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A fast and secure web browser
 EAPI=7
 HOMEPAGE=https://www.opera.com/
@@ -8,5 +9,5 @@ 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/71.0.3770.126/linux/opera-beta_71.0.3770.126_amd64.deb https://download2.operacdn.com/pub/opera-beta/71.0.3770.126/linux/opera-beta_71.0.3770.126_amd64.deb https://download3.operacdn.com/pub/opera-beta/71.0.3770.126/linux/opera-beta_71.0.3770.126_amd64.deb https://download4.operacdn.com/pub/opera-beta/71.0.3770.126/linux/opera-beta_71.0.3770.126_amd64.deb )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b9146bb7876262cb23b575125f532c8
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ad9039bbd4098e2ad37ae4bb2b3f606
diff --git a/metadata/md5-cache/www-client/opera-beta-71.0.3770.50 b/metadata/md5-cache/www-client/opera-beta-71.0.3770.50
deleted file mode 100644
index ba7cf6be5d87..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-71.0.3770.50
+++ /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-beta/71.0.3770.50/linux/opera-beta_71.0.3770.50_amd64.deb https://download2.operacdn.com/pub/opera-beta/71.0.3770.50/linux/opera-beta_71.0.3770.50_amd64.deb https://download3.operacdn.com/pub/opera-beta/71.0.3770.50/linux/opera-beta_71.0.3770.50_amd64.deb https://download4.operacdn.com/pub/opera-beta/71.0.3770.50/linux/opera-beta_71.0.3770.50_amd64.deb )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/opera-beta-71.0.3770.81 b/metadata/md5-cache/www-client/opera-beta-71.0.3770.81
deleted file mode 100644
index ed58413e9518..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-71.0.3770.81
+++ /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-beta/71.0.3770.81/linux/opera-beta_71.0.3770.81_amd64.deb https://download2.operacdn.com/pub/opera-beta/71.0.3770.81/linux/opera-beta_71.0.3770.81_amd64.deb https://download3.operacdn.com/pub/opera-beta/71.0.3770.81/linux/opera-beta_71.0.3770.81_amd64.deb https://download4.operacdn.com/pub/opera-beta/71.0.3770.81/linux/opera-beta_71.0.3770.81_amd64.deb )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/opera-beta-71.0.3770.97 b/metadata/md5-cache/www-client/opera-beta-71.0.3770.97
deleted file mode 100644
index f93f62a188fb..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-71.0.3770.97
+++ /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-beta/71.0.3770.97/linux/opera-beta_71.0.3770.97_amd64.deb https://download2.operacdn.com/pub/opera-beta/71.0.3770.97/linux/opera-beta_71.0.3770.97_amd64.deb https://download3.operacdn.com/pub/opera-beta/71.0.3770.97/linux/opera-beta_71.0.3770.97_amd64.deb https://download4.operacdn.com/pub/opera-beta/71.0.3770.97/linux/opera-beta_71.0.3770.97_amd64.deb )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/opera-developer-73.0.3820.0 b/metadata/md5-cache/www-client/opera-developer-73.0.3820.0
index fd963d05b414..1f9b287bdfb7 100644
--- a/metadata/md5-cache/www-client/opera-developer-73.0.3820.0
+++ b/metadata/md5-cache/www-client/opera-developer-73.0.3820.0
@@ -1,4 +1,5 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A fast and secure web browser
 EAPI=7
 HOMEPAGE=https://www.opera.com/
@@ -8,5 +9,5 @@ LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/wayland 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/libxkbcommon x11-libs/pango[X]
 SLOT=0
 SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/73.0.3820.0/linux/opera-developer_73.0.3820.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/73.0.3820.0/linux/opera-developer_73.0.3820.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/73.0.3820.0/linux/opera-developer_73.0.3820.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/73.0.3820.0/linux/opera-developer_73.0.3820.0_amd64.deb )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d1e38e863c153077d3dae903998d12d
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=08350325917c4d9010f7f3229d21d7bb
diff --git a/metadata/md5-cache/www-client/opera-developer-73.0.3827.0 b/metadata/md5-cache/www-client/opera-developer-73.0.3827.0
new file mode 100644
index 000000000000..7aa448c88d5e
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-73.0.3827.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+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 dev-libs/wayland 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/libxkbcommon x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-developer/73.0.3827.0/linux/opera-developer_73.0.3827.0_amd64.deb https://download2.operacdn.com/pub/opera-developer/73.0.3827.0/linux/opera-developer_73.0.3827.0_amd64.deb https://download3.operacdn.com/pub/opera-developer/73.0.3827.0/linux/opera-developer_73.0.3827.0_amd64.deb https://download4.operacdn.com/pub/opera-developer/73.0.3827.0/linux/opera-developer_73.0.3827.0_amd64.deb )
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=08350325917c4d9010f7f3229d21d7bb
diff --git a/metadata/md5-cache/www-client/otter-1.0.01-r1 b/metadata/md5-cache/www-client/otter-1.0.01-r1
index 536e68855ead..882a8c452179 100644
--- a/metadata/md5-cache/www-client/otter-1.0.01-r1
+++ b/metadata/md5-cache/www-client/otter-1.0.01-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) >=dev-qt/qtwebengine-5.9:5[widgets]
 SLOT=0
 SRC_URI=https://github.com/OtterBrowser/otter-browser/archive/v1.0.01.tar.gz -> otter-1.0.01.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d097e77fdfeefffad7c001cf00c9f92
diff --git a/metadata/md5-cache/www-client/otter-9999 b/metadata/md5-cache/www-client/otter-9999
index 2922e2d5bc12..5288934a5c37 100644
--- a/metadata/md5-cache/www-client/otter-9999
+++ b/metadata/md5-cache/www-client/otter-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) >=dev-qt/qtwebengine-5.9:5[widgets]
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95df257c4e640c793ac083aa6e9bb2dd
diff --git a/metadata/md5-cache/www-client/surfraw-2.3.0-r3 b/metadata/md5-cache/www-client/surfraw-2.3.0-r3
new file mode 100644
index 000000000000..f0aa1029111f
--- /dev/null
+++ b/metadata/md5-cache/www-client/surfraw-2.3.0-r3
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst preinst prepare
+DESCRIPTION=A fast unix command line interface to WWW
+EAPI=7
+HOMEPAGE=https://gitlab.com/surfraw/Surfraw
+KEYWORDS=~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=public-domain
+RDEPEND=dev-lang/perl
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/surfraw/Surfraw/-/archive/surfraw-2.3.0/Surfraw-surfraw-2.3.0.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=72d57ffca17fe4a3b2d58fc67c3e6d21
diff --git a/metadata/md5-cache/www-client/surfraw-99999 b/metadata/md5-cache/www-client/surfraw-99999
index f197d755d227..c8f6b999f16e 100644
--- a/metadata/md5-cache/www-client/surfraw-99999
+++ b/metadata/md5-cache/www-client/surfraw-99999
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/perl
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=88af90bc3c80be7e20e423771a239cdb
+_md5_=1d2b31c609f4bf5e6f42fc13152d8ab5
diff --git a/metadata/md5-cache/www-client/vivaldi-3.3.2022.47_p1 b/metadata/md5-cache/www-client/vivaldi-3.3.2022.47_p1
index 38f315c7bf5a..c5811e406fdd 100644
--- a/metadata/md5-cache/www-client/vivaldi-3.3.2022.47_p1
+++ b/metadata/md5-cache/www-client/vivaldi-3.3.2022.47_p1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A browser for our friends
 EAPI=7
 HOMEPAGE=https://vivaldi.com/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.3.2022.47-1_amd64.deb -> vivaldi-3.3.2022.47_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.3.2022.47-1_arm64.deb -> vivaldi-3.3.2022.47_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.3.2022.47-1_armhf.deb -> vivaldi-3.3.2022.47_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_3.3.2022.47-1_i386.deb -> vivaldi-3.3.2022.47_p1-i386.deb )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=73a663b7d29ffe75f41cddd168c25245
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8e28ef6eecad72dd49bb5af130c4de22
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2049.2_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2049.2_p1
index 250374c8745d..8e32ea0febda 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2049.2_p1
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2049.2_p1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A browser for our friends
 EAPI=7
 HOMEPAGE=https://vivaldi.com/
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/als
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2049.2-1_amd64.deb -> vivaldi-snapshot-3.4.2049.2_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2049.2-1_arm64.deb -> vivaldi-snapshot-3.4.2049.2_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2049.2-1_armhf.deb -> vivaldi-snapshot-3.4.2049.2_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2049.2-1_i386.deb -> vivaldi-snapshot-3.4.2049.2_p1-i386.deb )
-_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ef3b4bd883acc7a7dbc0824c73ebbbf
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8b6850c0cd923015cdb28366a21fd330
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2056.19_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2056.19_p1
new file mode 100644
index 000000000000..4720cda607e6
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-3.4.2056.19_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=virtual/libiconv dev-util/desktop-file-utils x11-misc/shared-mime-info
+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 ~arm ~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_3.4.2056.19-1_amd64.deb -> vivaldi-snapshot-3.4.2056.19_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2056.19-1_arm64.deb -> vivaldi-snapshot-3.4.2056.19_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2056.19-1_armhf.deb -> vivaldi-snapshot-3.4.2056.19_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_3.4.2056.19-1_i386.deb -> vivaldi-snapshot-3.4.2056.19_p1-i386.deb )
+_eclasses_=chromium-2	199d6bc7f8b84ac7c00aca900739e570	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8b6850c0cd923015cdb28366a21fd330
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 983c56774042..86903f32355a 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/mergelog-4.5-r2 b/metadata/md5-cache/www-misc/mergelog-4.5-r2
index 3b7632df3270..0839afc6697c 100644
--- a/metadata/md5-cache/www-misc/mergelog-4.5-r2
+++ b/metadata/md5-cache/www-misc/mergelog-4.5-r2
@@ -3,10 +3,10 @@ DEFINED_PHASES=prepare
 DESCRIPTION=A utility to merge apache logs in chronological order
 EAPI=7
 HOMEPAGE=http://mergelog.sourceforge.net
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 ~arm64 ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/mergelog/mergelog-4.5.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=19cf2b2c5e417bf9d8b4e23b21603c81
+_md5_=42ab66bb3beb3705516d787a75fec1fb
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 41b798c5d188..e730809322eb 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/google-talkplugin-5.41.0.0 b/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
deleted file mode 100644
index 1a24ab46f5a6..000000000000
--- a/metadata/md5-cache/www-plugins/google-talkplugin-5.41.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Video chat browser plug-in for Google Talk
-EAPI=5
-HOMEPAGE=https://www.google.com/chat/video
-IUSE=libnotify selinux
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Google-TOS openssl BSD
-RDEPEND=|| ( media-sound/pulseaudio media-libs/alsa-lib ) dev-libs/expat dev-libs/glib:2 sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/pango sys-apps/lsb-release selinux? ( sec-policy/selinux-googletalk ) libnotify? ( x11-libs/libnotify )
-RESTRICT=bindist fetch strip
-SLOT=0
-SRC_URI=x86? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.0.0-1_i386.deb ) amd64? ( https://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin/google-talkplugin_5.41.0.0-1_amd64.deb )
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mozextension	798d8c84c9e7a8105e56c9eb6626e643	multilib	98584e405e2b0264d37e8f728327fed1	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=2c61e6e1daedf68606ecc28b97b93f99
diff --git a/metadata/md5-cache/www-plugins/lightspark-0.8.2-r1 b/metadata/md5-cache/www-plugins/lightspark-0.8.2-r1
index f44aa974d8f6..e81521a55db4 100644
--- a/metadata/md5-cache/www-plugins/lightspark-0.8.2-r1
+++ b/metadata/md5-cache/www-plugins/lightspark-0.8.2-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=app-arch/xz-utils:0= dev-cpp/glibmm:2= >=dev-libs/boost-1.42:0= dev-libs/glib:2= dev-libs/libpcre:3=[cxx] media-fonts/liberation-fonts media-libs/freetype:2= media-libs/libpng:0= media-libs/libsdl2:0= media-libs/sdl2-mixer:0= sys-libs/zlib:0= x11-libs/cairo:0= x11-libs/libX11:0= x11-libs/pango:0= virtual/jpeg:0= curl? ( net-misc/curl:0= ) ffmpeg? ( media-video/ffmpeg:0= ) gles2-only? ( media-libs/mesa:0=[gles2] ) !gles2-only? ( >=media-libs/glew-1.5.3:0= virtual/opengl:0= ) rtmp? ( media-video/rtmpdump:0= )
 SLOT=0
 SRC_URI=https://github.com/lightspark/lightspark/archive/0.8.2.tar.gz -> lightspark-0.8.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5051ab97fb86b898486df493e48a5a52
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index e1ebe1db4b75..92225c941ba8 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/civetweb-1.12 b/metadata/md5-cache/www-servers/civetweb-1.12
index 963fd7b3c18b..578d6aaf57fb 100644
--- a/metadata/md5-cache/www-servers/civetweb-1.12
+++ b/metadata/md5-cache/www-servers/civetweb-1.12
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/civetweb/civetweb/archive/v1.12.tar.gz -> civetweb-1.12.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e6c74d9d14a1d4ee3ce2d63af8bfc99
diff --git a/metadata/md5-cache/www-servers/gunicorn-20.0.4 b/metadata/md5-cache/www-servers/gunicorn-20.0.4
index 5e7ad5973ef3..f24b0c5bc231 100644
--- a/metadata/md5-cache/www-servers/gunicorn-20.0.4
+++ b/metadata/md5-cache/www-servers/gunicorn-20.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=A WSGI HTTP Server for UNIX
 EAPI=7
 HOMEPAGE=https://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT PSF-2 doc? ( BSD )
 RDEPEND=dev-python/setproctitle[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-20.0.4.tar.gz
 _eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=365a74a56c08f2da96cc7055cca4272b
+_md5_=20efa9a35598723ca8487d870034c040
diff --git a/metadata/md5-cache/www-servers/pshs-0.3.4 b/metadata/md5-cache/www-servers/pshs-0.3.4
index 28cd54f09320..f0723cc38592 100644
--- a/metadata/md5-cache/www-servers/pshs-0.3.4
+++ b/metadata/md5-cache/www-servers/pshs-0.3.4
@@ -4,9 +4,9 @@ DESCRIPTION=Pretty small HTTP server -- a command-line tool to share files
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/pshs/
 IUSE=libressl +magic +netlink qrcode ssl upnp
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-2:0= magic? ( sys-apps/file:0= ) qrcode? ( media-gfx/qrencode:0= ) ssl? ( >=dev-libs/libevent-2.1:0=[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) upnp? ( net-libs/miniupnpc:0= )
 SLOT=0
 SRC_URI=https://github.com/mgorny/pshs/releases/download/v0.3.4/pshs-0.3.4.tar.bz2
-_md5_=673bf45965168dceb5e960c1a31bdd4e
+_md5_=ad186eb0dfa9cff8bffd9d9485390aee
diff --git a/metadata/md5-cache/www-servers/pshs-0.3.5 b/metadata/md5-cache/www-servers/pshs-0.3.5
new file mode 100644
index 000000000000..f344e463fa44
--- /dev/null
+++ b/metadata/md5-cache/www-servers/pshs-0.3.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=>=dev-libs/libevent-2:0= magic? ( sys-apps/file:0= ) qrcode? ( media-gfx/qrencode:0= ) ssl? ( >=dev-libs/libevent-2.1:0=[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) upnp? ( net-libs/miniupnpc:0= )
+DESCRIPTION=Pretty small HTTP server -- a command-line tool to share files
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/pshs/
+IUSE=libressl +magic qrcode ssl upnp
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/libevent-2:0= magic? ( sys-apps/file:0= ) qrcode? ( media-gfx/qrencode:0= ) ssl? ( >=dev-libs/libevent-2.1:0=[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) upnp? ( net-libs/miniupnpc:0= )
+SLOT=0
+SRC_URI=https://github.com/mgorny/pshs/releases/download/v0.3.5/pshs-0.3.5.tar.bz2
+_md5_=d1efcc9dd5afdc30389a2e994b766c93
diff --git a/metadata/md5-cache/www-servers/pshs-0.4.1 b/metadata/md5-cache/www-servers/pshs-0.4.1
new file mode 100644
index 000000000000..1df3456cb8ee
--- /dev/null
+++ b/metadata/md5-cache/www-servers/pshs-0.4.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/libevent-2:0= magic? ( sys-apps/file:0= ) qrcode? ( media-gfx/qrencode:0= ) ssl? ( >=dev-libs/libevent-2.1:0=[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) upnp? ( net-libs/miniupnpc:0= )
+DESCRIPTION=Pretty small HTTP server -- a command-line tool to share files
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/pshs/
+IUSE=libressl +magic qrcode ssl upnp
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/libevent-2:0= magic? ( sys-apps/file:0= ) qrcode? ( media-gfx/qrencode:0= ) ssl? ( >=dev-libs/libevent-2.1:0=[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) upnp? ( net-libs/miniupnpc:0= )
+SLOT=0
+SRC_URI=https://github.com/mgorny/pshs/archive/v0.4.1.tar.gz -> pshs-0.4.1.tar.gz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=05b7f3eb015a795eb4f84a9c4a0ebd06
diff --git a/metadata/md5-cache/www-servers/pshs-9999 b/metadata/md5-cache/www-servers/pshs-9999
deleted file mode 100644
index 8cefb7dbecdf..000000000000
--- a/metadata/md5-cache/www-servers/pshs-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare unpack
-DEPEND=>=dev-libs/libevent-2:0= magic? ( sys-apps/file:0= ) qrcode? ( media-gfx/qrencode:0= ) ssl? ( >=dev-libs/libevent-2.1:0=[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) upnp? ( net-libs/miniupnpc:0= ) netlink? ( sys-apps/iproute2 >=sys-kernel/linux-headers-2.6.27 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Pretty small HTTP server -- a command-line tool to share files
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/pshs/
-IUSE=libressl +magic +netlink qrcode ssl upnp
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=>=dev-libs/libevent-2:0= magic? ( sys-apps/file:0= ) qrcode? ( media-gfx/qrencode:0= ) ssl? ( >=dev-libs/libevent-2.1:0=[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) upnp? ( net-libs/miniupnpc:0= )
-SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bd8cb7823e9bbebe1f5ac6e751d5418a
diff --git a/metadata/md5-cache/www-servers/servefile-0.5.1 b/metadata/md5-cache/www-servers/servefile-0.5.1
new file mode 100644
index 000000000000..42d7f5e0b591
--- /dev/null
+++ b/metadata/md5-cache/www-servers/servefile-0.5.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ssl? ( dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sys-apps/grep sys-apps/iproute2 sys-apps/net-tools sys-apps/sed >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( ssl? ( dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sys-apps/grep sys-apps/iproute2 sys-apps/net-tools sys-apps/sed dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Serve a single file via HTTP
+EAPI=7
+HOMEPAGE=https://github.com/sebageek/servefile
+IUSE=ssl test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=ssl? ( dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sys-apps/grep sys-apps/iproute2 sys-apps/net-tools sys-apps/sed python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/sebageek/servefile/archive/v0.5.1.tar.gz -> servefile-0.5.1.tar.gz
+_eclasses_=distutils-r1	409cd1220f9f980d21980293a50e2a8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=887c2d30465556c7ea6de7506d2ca15c
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index f1fd39a15537..7284baed14a9 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/copyq-3.10.0 b/metadata/md5-cache/x11-apps/copyq-3.10.0
index 66c1aa515130..9138a2d2d67d 100644
--- a/metadata/md5-cache/x11-apps/copyq-3.10.0
+++ b/metadata/md5-cache/x11-apps/copyq-3.10.0
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hluk/CopyQ/archive/v3.10.0.tar.gz -> CopyQ-3.10.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c8a6bb47bd207cf2404f1196aad18d0
diff --git a/metadata/md5-cache/x11-apps/xev-1.2.3 b/metadata/md5-cache/x11-apps/xev-1.2.3
deleted file mode 100644
index 7d2fb18721fd..000000000000
--- a/metadata/md5-cache/x11-apps/xev-1.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-base/xorg-proto
-DESCRIPTION=Print contents of X events
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xev
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXrandr
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xev-1.2.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	8cad61092536d3b5fcfc558b8c5d44cc
-_md5_=3dd38770cd1563b2c97a957d61830358
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 55dbad9958e1..4b7a10e6ddef 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/xf86-video-fbdev-0.5.0 b/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0
deleted file mode 100644
index 03170255cfdc..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-server x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-base/xorg-proto x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=video driver for framebuffer device
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=x11-base/xorg-server x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=d4a7224a57f4d7e005f1e25e9d5356ff
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 3c66aec0643a..552faefb5a7f 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/gl2ps-1.4.2 b/metadata/md5-cache/x11-libs/gl2ps-1.4.2
index f91f02109a93..6eb1f17c5b93 100644
--- a/metadata/md5-cache/x11-libs/gl2ps-1.4.2
+++ b/metadata/md5-cache/x11-libs/gl2ps-1.4.2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=media-libs/freeglut x11-libs/libXmu png? ( media-libs/libpng:0= ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://geuz.org/gl2ps/src/gl2ps-1.4.2.tgz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bce3f28ca44c8077d0d8f775224c0617
diff --git a/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r4 b/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r4
deleted file mode 100644
index 58dff510f997..000000000000
--- a/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/glib-utils >=sys-devel/autoconf-archive-2014.02.28 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GL extensions for Gtk+ 2.0
-EAPI=6
-HOMEPAGE=http://gtkglext.sourceforge.net/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=mirror://sourceforge/gtkglext/gtkglext-1.2.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20d52d4160829af665f1d02e0ec92c2c
diff --git a/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r5 b/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r5
new file mode 100644
index 000000000000..0af77bcfc027
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/glib-utils >=sys-devel/autoconf-archive-2014.02.28 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GL extensions for Gtk+ 2.0
+EAPI=6
+HOMEPAGE=http://gtkglext.sourceforge.net/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=mirror://sourceforge/gtkglext/gtkglext-1.2.0.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc5cc7923c625e8d84799085c899536b
diff --git a/metadata/md5-cache/x11-libs/libfm-qt-0.15.1-r1 b/metadata/md5-cache/x11-libs/libfm-qt-0.15.1-r1
index 4d132a306139..cc08a7474f68 100644
--- a/metadata/md5-cache/x11-libs/libfm-qt-0.15.1-r1
+++ b/metadata/md5-cache/x11-libs/libfm-qt-0.15.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxde-base/menu-cache-1.1.0:= media-libs/libexif x11-libs/libxcb !lxqt-base/lxqt-l10n
 SLOT=0/7
 SRC_URI=https://github.com/lxqt/libfm-qt/releases/download/0.15.1/libfm-qt-0.15.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=101306d6713fbddda61f48c94c864144
diff --git a/metadata/md5-cache/x11-libs/libva-2.7.1 b/metadata/md5-cache/x11-libs/libva-2.7.1
index ac0afdd7d295..ab82a15ea4a4 100644
--- a/metadata/md5-cache/x11-libs/libva-2.7.1
+++ b/metadata/md5-cache/x11-libs/libva-2.7.1
@@ -5,7 +5,7 @@ DESCRIPTION=Video Acceleration (VA) API for Linux
 EAPI=7
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 IUSE=+drm opengl utils vdpau wayland X video_cards_nvidia video_cards_intel video_cards_i965 video_cards_nouveau abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( media-video/libva-utils )
 RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
 SLOT=0/2
 SRC_URI=https://github.com/intel/libva/releases/download/2.7.1/libva-2.7.1.tar.bz2
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9e77d147d273b9e7f858718e07c6c107
+_md5_=ebc43f5eb5772398aa5f4c7bf9cc8241
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-1.0.1 b/metadata/md5-cache/x11-libs/libxkbcommon-1.0.1
deleted file mode 100644
index 3192e5aa6d88..000000000000
--- a/metadata/md5-cache/x11-libs/libxkbcommon-1.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison doc? ( app-doc/doxygen ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=X? ( >=x11-libs/libxcb-1.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,xkb] ) X? ( x11-base/xorg-proto )
-DESCRIPTION=keymap handling library for toolkits and window systems
-EAPI=7
-HOMEPAGE=https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/
-IUSE=X doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=X? ( >=x11-libs/libxcb-1.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,xkb] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xkbcommon.org/download/libxkbcommon-1.0.1.tar.xz
-_eclasses_=meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=61196898798df6bddebffd3502bdbb8c
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-1.0.1-r1 b/metadata/md5-cache/x11-libs/libxkbcommon-1.0.1-r1
new file mode 100644
index 000000000000..b48a84c40ec4
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-1.0.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison doc? ( app-doc/doxygen ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=X? ( >=x11-libs/libxcb-1.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,xkb] ) dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-base/xorg-proto )
+DESCRIPTION=keymap handling library for toolkits and window systems
+EAPI=7
+HOMEPAGE=https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/
+IUSE=X doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=X? ( >=x11-libs/libxcb-1.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,xkb] ) dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://xkbcommon.org/download/libxkbcommon-1.0.1.tar.xz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3e4b54e54893de282e5eb481cb5f8ea1
diff --git a/metadata/md5-cache/x11-libs/qtermwidget-0.14.1 b/metadata/md5-cache/x11-libs/qtermwidget-0.14.1
index 94dffc06eef8..3968853fe80d 100644
--- a/metadata/md5-cache/x11-libs/qtermwidget-0.14.1
+++ b/metadata/md5-cache/x11-libs/qtermwidget-0.14.1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2 LGPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !lxqt-base/lxqt-l10n
 SLOT=0/0.14.1
 SRC_URI=https://downloads.lxqt.org/downloads/qtermwidget/0.14.1/qtermwidget-0.14.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e72d650354adf8335e023f14ae58dad
diff --git a/metadata/md5-cache/x11-libs/qtermwidget-0.15.0 b/metadata/md5-cache/x11-libs/qtermwidget-0.15.0
index 79ddbae4134f..39ac66f50380 100644
--- a/metadata/md5-cache/x11-libs/qtermwidget-0.15.0
+++ b/metadata/md5-cache/x11-libs/qtermwidget-0.15.0
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2 LGPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0/0.15.0
 SRC_URI=https://github.com/lxqt/qtermwidget/releases/download/0.15.0/qtermwidget-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=32ab8ee983e7b0dcb930cfc29d514f61
diff --git a/metadata/md5-cache/x11-libs/qtermwidget-9999 b/metadata/md5-cache/x11-libs/qtermwidget-9999
index de172b4eac04..0d3d3a3eeee0 100644
--- a/metadata/md5-cache/x11-libs/qtermwidget-9999
+++ b/metadata/md5-cache/x11-libs/qtermwidget-9999
@@ -8,5 +8,5 @@ LICENSE=BSD GPL-2 LGPL-2+
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=63401fc24c07e676a92447751c657062
diff --git a/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1 b/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
index 7258099a183e..c927f29673fb 100644
--- a/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
+++ b/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://kde/stable/snorenotify/0.7.0/src/snorenotify-0.7.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=876a02f5b20b72c0ddb7c6ebc951850d
diff --git a/metadata/md5-cache/x11-libs/vte-0.28.2-r208 b/metadata/md5-cache/x11-libs/vte-0.28.2-r208
deleted file mode 100644
index bf58c376c4ce..000000000000
--- a/metadata/md5-cache/x11-libs/vte-0.28.2-r208
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-2.20:2[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= x11-libs/libX11 x11-libs/libXft introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) 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(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME terminal widget
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE
-IUSE=debug +introspection python python_targets_python2_7
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-PDEPEND=x11-libs/gnome-pty-helper
-RDEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-2.20:2[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= x11-libs/libX11 x11-libs/libXft introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) 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(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/vte/0.28/vte-0.28.2.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e98281724d4f02dd23b5d829018fefe3
diff --git a/metadata/md5-cache/x11-libs/vte-0.28.2-r209 b/metadata/md5-cache/x11-libs/vte-0.28.2-r209
new file mode 100644
index 000000000000..2d5e71b2798b
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/vte-0.28.2-r209
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-2.20:2[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= x11-libs/libX11 x11-libs/libXft introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME terminal widget
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE
+IUSE=debug +introspection
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+PDEPEND=x11-libs/gnome-pty-helper
+RDEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-2.20:2[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= x11-libs/libX11 x11-libs/libXft introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/vte/0.28/vte-0.28.2.tar.xz
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2d065eccf91e65909ef81a2fc943db01
diff --git a/metadata/md5-cache/x11-libs/xcb-util-0.4.0-r1 b/metadata/md5-cache/x11-libs/xcb-util-0.4.0-r1
deleted file mode 100644
index aaa5ccd946d8..000000000000
--- a/metadata/md5-cache/x11-libs/xcb-util-0.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X C-language Bindings sample implementations
-EAPI=5
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-util
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-PDEPEND=>=x11-libs/xcb-util-cursor-0.1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-keysyms-0.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-renderutil-0.3.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-wm-0.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RDEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xcb.freedesktop.org/dist//xcb-util-0.4.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=347ca795323c69b2c870f9f9712a9323
diff --git a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r2 b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r2
deleted file mode 100644
index 1e213dbb987a..000000000000
--- a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.3.9-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-renderutil-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-base/xcb-proto-1.8-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X C-language Bindings sample implementations
-EAPI=5
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=>=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-image-0.3.9-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-renderutil-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xcb.freedesktop.org/dist//xcb-util-cursor-0.1.3.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=9f6931330097cef790003ac298fb25e5
diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0-r1 b/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0-r1
deleted file mode 100644
index 654ea05b959b..000000000000
--- a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-0.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X C-language Bindings sample implementations
-EAPI=5
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/xcb-util-0.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xcb.freedesktop.org/dist//xcb-util-image-0.4.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=176bd9204ae02926c5616dcf16e514d6
diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0-r1 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0-r1
deleted file mode 100644
index 0380cdc08d5d..000000000000
--- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/gperf-3.0.1 x11-base/xorg-proto test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X C-language Bindings sample implementations
-EAPI=5
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xcb.freedesktop.org/dist//xcb-util-keysyms-0.4.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=79b6cefe783dbafe207e20228e700343
diff --git a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r2 b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r2
deleted file mode 100644
index f63fab1ec0a1..000000000000
--- a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X C-language Bindings sample implementations
-EAPI=5
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xcb.freedesktop.org/dist//xcb-util-renderutil-0.3.9.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=b82ca17acfc7513627e6a339eeeb8b66
diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r2 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r2
deleted file mode 100644
index 963f1b8b5567..000000000000
--- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/gperf-3.0.1 test? ( >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X C-language Bindings sample implementations
-EAPI=5
-HOMEPAGE=https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xcb.freedesktop.org/dist//xcb-util-wm-0.4.1.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	autotools-multilib	dd33c3299bb81aa8dcb97f66f24a29bc	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-2	e6d2349188531f9269a34fe438392e90
-_md5_=2e2d2cf9caf5c5b8b525f1317561a452
diff --git a/metadata/md5-cache/x11-libs/xpa-2.1.15 b/metadata/md5-cache/x11-libs/xpa-2.1.15
deleted file mode 100644
index 20eb989ae0ea..000000000000
--- a/metadata/md5-cache/x11-libs/xpa-2.1.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tcl:0= x11-libs/libXt !<sci-astronomy/ds9-5.3 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Messaging system providing communication between programs
-EAPI=5
-HOMEPAGE=http://hea-www.harvard.edu/RD/xpa/
-IUSE=doc static-libs
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/tcl:0= x11-libs/libXt !<sci-astronomy/ds9-5.3
-SLOT=0
-SRC_URI=http://hea-www.harvard.edu/saord/download/xpa/xpa-2.1.15.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=1556fac764583138da8962a424f36a53
diff --git a/metadata/md5-cache/x11-libs/xpa-2.1.17 b/metadata/md5-cache/x11-libs/xpa-2.1.17
deleted file mode 100644
index 970f88c570cf..000000000000
--- a/metadata/md5-cache/x11-libs/xpa-2.1.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tcl:0= x11-libs/libXt:0 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Messaging system providing communication between programs
-EAPI=5
-HOMEPAGE=https://github.com/ericmandel/xpa
-IUSE=doc static-libs
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/tcl:0= x11-libs/libXt:0
-SLOT=0/1
-SRC_URI=https://github.com/ericmandel/xpa/archive/v2.1.17.tar.gz -> xpa-2.1.17.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ef8fe615b4a793e05858fb43cd733240
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index ae58c4abde52..b2181a7bb11a 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/appmenu-gtk-module-0.7.3-r1 b/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
index 8730239e05ea..159765487845 100644
--- a/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
+++ b/metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/glib[dbus] >=x11-libs/gtk+-2.24.0:2 >=x11-libs/gtk+-3.22.0:3
 SLOT=0
 SRC_URI=https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d1a65e77d42cb19e5972d0d1b84/appmenu-gtk-module-0.7.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a3d3bdfa9e15648b2c594aa1d98f06f
diff --git a/metadata/md5-cache/x11-misc/barrier-2.3.3 b/metadata/md5-cache/x11-misc/barrier-2.3.3
index 863792d8bc95..ddc06aca4ee0 100644
--- a/metadata/md5-cache/x11-misc/barrier-2.3.3
+++ b/metadata/md5-cache/x11-misc/barrier-2.3.3
@@ -11,5 +11,5 @@ RDEPEND=net-misc/curl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/debauchee/barrier/archive/v2.3.3.tar.gz -> barrier-2.3.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=459b0a0fe5550d578070e8a2b8211d04
diff --git a/metadata/md5-cache/x11-misc/birdtray-1.8.1 b/metadata/md5-cache/x11-misc/birdtray-1.8.1
index e7b628d598a6..968a34f008cf 100644
--- a/metadata/md5-cache/x11-misc/birdtray-1.8.1
+++ b/metadata/md5-cache/x11-misc/birdtray-1.8.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/gyunaev/birdtray/archive/1.8.1.tar.gz -> birdtray-1.8.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc587c1c201de17a784dda638e764507
diff --git a/metadata/md5-cache/x11-misc/birdtray-9999 b/metadata/md5-cache/x11-misc/birdtray-9999
index 614942b813f2..f3ce85a92415 100644
--- a/metadata/md5-cache/x11-misc/birdtray-9999
+++ b/metadata/md5-cache/x11-misc/birdtray-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-db/sqlite:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55130a963e9cca3dfae32787be27754a
diff --git a/metadata/md5-cache/x11-misc/evolvotron-0.7.1 b/metadata/md5-cache/x11-misc/evolvotron-0.7.1
deleted file mode 100644
index 106934b7ca63..000000000000
--- a/metadata/md5-cache/x11-misc/evolvotron-0.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
-DESCRIPTION=Generative art image evolver
-EAPI=6
-HOMEPAGE=http://www.bottlenose.net/share/evolvotron/index.htm https://sourceforge.net/projects/evolvotron/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
-SLOT=0
-SRC_URI=mirror://sourceforge/evolvotron/evolvotron-0.7.1.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d1aafe177842290ab69f9eb2374ca5ba
diff --git a/metadata/md5-cache/x11-misc/evolvotron-0.7.1-r1 b/metadata/md5-cache/x11-misc/evolvotron-0.7.1-r1
index 529a6c092dc2..e8ad0f2bb90f 100644
--- a/metadata/md5-cache/x11-misc/evolvotron-0.7.1-r1
+++ b/metadata/md5-cache/x11-misc/evolvotron-0.7.1-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt
 DESCRIPTION=Generative art image evolver
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/evolvotron/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=mirror://sourceforge/evolvotron/evolvotron-0.7.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=946e78a29afdc438ae6ed055cdefc8d3
+_md5_=4bc6b4d942bc4b22fd960848db3828e4
diff --git a/metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0-r1 b/metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0-r1
index b210ba8cb000..2237cf6e4cd0 100644
--- a/metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0-r1
+++ b/metadata/md5-cache/x11-misc/flow-pomodoro-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/iamsergio/flow-pomodoro/archive/v1.2.0.tar.gz -> flow-pomodoro-1.2.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a3d71be51482dbe3ea21598d9608cc6f
diff --git a/metadata/md5-cache/x11-misc/gpaste-3.36.3 b/metadata/md5-cache/x11-misc/gpaste-3.36.3
new file mode 100644
index 000000000000..d87cfe4f7d93
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/gpaste-3.36.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig gnome? ( gnome-base/gnome-control-center:2 ) systemd? ( sys-apps/systemd ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.48:2 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.34:2 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXi x11-libs/pango gnome? ( >=x11-wm/mutter-3.36 ) introspection? ( dev-libs/gjs >=dev-libs/gobject-introspection-1.48.0 >=x11-wm/mutter-3.36[introspection] )
+DESCRIPTION=Clipboard management system
+EAPI=7
+HOMEPAGE=https://github.com/Keruspe/GPaste
+IUSE=+gnome +introspection systemd vala
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.48:2 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.34:2 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXi x11-libs/pango gnome? ( >=x11-wm/mutter-3.36 ) introspection? ( dev-libs/gjs >=dev-libs/gobject-introspection-1.48.0 >=x11-wm/mutter-3.36[introspection] ) gnome? ( gnome-base/gnome-control-center:2 gnome-base/gnome-shell ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=gnome? ( introspection ) vala? ( introspection )
+SLOT=0
+SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.36.3.tar.gz -> gpaste-3.36.3.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	2cd99cd72bb91f3f190fa4ca576be580	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=166a2708d8a7a836e135b52f137fc105
diff --git a/metadata/md5-cache/x11-misc/gxmessage-2.20.3 b/metadata/md5-cache/x11-misc/gxmessage-2.20.3
deleted file mode 100644
index 711f748b321a..000000000000
--- a/metadata/md5-cache/x11-misc/gxmessage-2.20.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=>=x11-libs/gtk+-2.20:2 virtual/pkgconfig >=dev-util/intltool-0.40.1 sys-devel/gettext
-DESCRIPTION=A GTK+ based xmessage clone
-EAPI=5
-HOMEPAGE=https://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-3 public-domain
-RDEPEND=>=x11-libs/gtk+-2.20:2
-SLOT=0
-SRC_URI=mirror://gnu/gxmessage/gxmessage-2.20.3.tar.gz http://homepages.ihug.co.nz/~trmusson/stuff/gxmessage-2.20.3.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6475ddb2d3a5df01add877be8869bbc8
diff --git a/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.17-r1 b/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.17-r1
index 384bbf85a660..a1a68415dcb4 100644
--- a/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.17-r1
+++ b/metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.17-r1
@@ -11,5 +11,5 @@ RDEPEND=dmenu? ( x11-misc/dmenu )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/enkore/j4-dmenu-desktop/archive/r2.17.tar.gz -> j4-dmenu-desktop-2.17.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7610187724a875aca935889b2af30f59
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.2.3 b/metadata/md5-cache/x11-misc/kronometer-2.2.3
index 1544396dc046..560b09fcb0a0 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.2.3
+++ b/metadata/md5-cache/x11-misc/kronometer-2.2.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.2.3/src/kronometer-2.2.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	ecm	f6ac7d31239fbaacf94ec10be0fb8066	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=383b71ee4c3df7cfd997d6a03790948c
diff --git a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.24.1 b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.24.1
new file mode 100644
index 000000000000..8ac6eaebb164
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.24.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.9.0 >=sys-apps/dbus-1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7 x11-libs/libX11 virtual/libintl >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] app-arch/xz-utils dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2.6:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=MATE Notification daemon
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.9.0 >=sys-apps/dbus-1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7 x11-libs/libX11 virtual/libintl >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] virtual/libintl !x11-misc/notify-osd !x11-misc/qtnotifydaemon !x11-misc/notification-daemon
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-notification-daemon-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d485e768a7876058bb7b291b3e19fcf7
diff --git a/metadata/md5-cache/x11-misc/mozo-1.24.0-r1 b/metadata/md5-cache/x11-misc/mozo-1.24.0-r1
new file mode 100644
index 000000000000..40a742177e84
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/mozo-1.24.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygobject-3:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=Mozo menu editor for MATE
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pygobject-3:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] !!x11-misc/mate-menu-editor virtual/libintl
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mozo-1.24.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	8d03325e7e3cf3e1465d9c32031e2517	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=905bf322481072fa68b35ef491aa2db0
diff --git a/metadata/md5-cache/x11-misc/notification-daemon-0.5.0 b/metadata/md5-cache/x11-misc/notification-daemon-0.5.0
deleted file mode 100644
index 0514c2a973de..000000000000
--- a/metadata/md5-cache/x11-misc/notification-daemon-0.5.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2 >=x11-libs/gtk+-2.18:2 >=gnome-base/gconf-2 >=dev-libs/dbus-glib-0.100 >=sys-apps/dbus-1 >=media-libs/libcanberra-0.4[gtk] x11-libs/libnotify x11-libs/libwnck:1 x11-libs/libX11 !x11-misc/notify-osd !x11-misc/qtnotifydaemon >=dev-util/intltool-0.50 gnome-base/gnome-common >=sys-devel/gettext-0.18 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Notification daemon
-EAPI=5
-HOMEPAGE=https://gitlab.gnome.org/GNOME/notification-daemon/
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2 >=x11-libs/gtk+-2.18:2 >=gnome-base/gconf-2 >=dev-libs/dbus-glib-0.100 >=sys-apps/dbus-1 >=media-libs/libcanberra-0.4[gtk] x11-libs/libnotify x11-libs/libwnck:1 x11-libs/libX11 !x11-misc/notify-osd !x11-misc/qtnotifydaemon
-SLOT=0
-SRC_URI=mirror://gnome/sources/notification-daemon/0.5/notification-daemon-0.5.0.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1dfd65af2748e1932f8e89f9988bf384
diff --git a/metadata/md5-cache/x11-misc/notification-daemon-3.14.1 b/metadata/md5-cache/x11-misc/notification-daemon-3.14.1
deleted file mode 100644
index 90a8b2633f57..000000000000
--- a/metadata/md5-cache/x11-misc/notification-daemon-3.14.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-libs/glib-2.28 >=x11-libs/gtk+-3.8:3 sys-apps/dbus media-libs/libcanberra[gtk3] >=x11-libs/libnotify-0.7 x11-libs/libX11 !x11-misc/notify-osd !x11-misc/qtnotifydaemon dev-util/intltool sys-devel/gettext virtual/pkgconfig app-arch/xz-utils
-DESCRIPTION=Notification daemon
-EAPI=5
-HOMEPAGE=https://gitlab.gnome.org/GNOME/notification-daemon/
-KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.28 >=x11-libs/gtk+-3.8:3 sys-apps/dbus media-libs/libcanberra[gtk3] >=x11-libs/libnotify-0.7 x11-libs/libX11 !x11-misc/notify-osd !x11-misc/qtnotifydaemon
-SLOT=0
-SRC_URI=mirror://gnome/sources/notification-daemon/3.14/notification-daemon-3.14.1.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=eee9267dc88a8739483e27fff1bd62cc
diff --git a/metadata/md5-cache/x11-misc/notification-daemon-3.18.2 b/metadata/md5-cache/x11-misc/notification-daemon-3.18.2
deleted file mode 100644
index 8666b59ebff9..000000000000
--- a/metadata/md5-cache/x11-misc/notification-daemon-3.18.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.15.2:3[X] sys-apps/dbus x11-libs/libX11 !x11-misc/notify-osd !x11-misc/qtnotifydaemon dev-util/gdbus-codegen >=sys-devel/gettext-0.19.4 virtual/pkgconfig app-arch/xz-utils
-DESCRIPTION=Notification daemon
-EAPI=5
-HOMEPAGE=https://gitlab.gnome.org/GNOME/notification-daemon/
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.15.2:3[X] sys-apps/dbus x11-libs/libX11 !x11-misc/notify-osd !x11-misc/qtnotifydaemon
-SLOT=0
-SRC_URI=mirror://gnome/sources/notification-daemon/3.18/notification-daemon-3.18.2.tar.xz
-_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3689dced95d76e79655a05a13d9e7401
diff --git a/metadata/md5-cache/x11-misc/obconf-qt-0.15.0 b/metadata/md5-cache/x11-misc/obconf-qt-0.15.0
index 928ab23369bd..be4ff9451e0c 100644
--- a/metadata/md5-cache/x11-misc/obconf-qt-0.15.0
+++ b/metadata/md5-cache/x11-misc/obconf-qt-0.15.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 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://github.com/lxqt/obconf-qt/releases/download/0.15.0/obconf-qt-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee4278f5ef8c46657b878972b3aba017
diff --git a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.15.1 b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.15.1
index 7d6eca238ed3..537662a4b436 100644
--- a/metadata/md5-cache/x11-misc/pcmanfm-qt-0.15.1
+++ b/metadata/md5-cache/x11-misc/pcmanfm-qt-0.15.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 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.15* x11-libs/libxcb:= x11-misc/xdg-utils virtual/eject virtual/freedesktop-icon-theme !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/pcmanfm-qt/releases/download/0.15.1/pcmanfm-qt-0.15.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34924ad09472dc32d27757b07467974f
diff --git a/metadata/md5-cache/x11-misc/polybar-3.4.3 b/metadata/md5-cache/x11-misc/polybar-3.4.3
index c590a9213c46..9dc550d352e6 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.4.3
+++ b/metadata/md5-cache/x11-misc/polybar-3.4.3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/polybar/polybar/archive/3.4.3.tar.gz -> polybar-3.4.3.tar.gz https://github.com/polybar/xpp/archive/8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz -> xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz https://github.com/polybar/i3ipcpp/archive/21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz -> i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc6b3934e93d1e3ec58f2b194f93d2d2
diff --git a/metadata/md5-cache/x11-misc/projecteur-0.8 b/metadata/md5-cache/x11-misc/projecteur-0.8
index 07d4b4418151..f42ab9ef07ca 100644
--- a/metadata/md5-cache/x11-misc/projecteur-0.8
+++ b/metadata/md5-cache/x11-misc/projecteur-0.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 || ( dev-qt/qtgui:5[X(-)] dev-qt/qtgui:5[xcb(-)] ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/udev x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/jahnf/Projecteur/archive/v0.8.tar.gz -> projecteur-0.8.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=170506ea2965e009e193343b3ebc2069
diff --git a/metadata/md5-cache/x11-misc/qlipper-5.1.2 b/metadata/md5-cache/x11-misc/qlipper-5.1.2
index 5f935da197c8..2f2e58410b8b 100644
--- a/metadata/md5-cache/x11-misc/qlipper-5.1.2
+++ b/metadata/md5-cache/x11-misc/qlipper-5.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/pvanek/qlipper/archive/5.1.2.tar.gz -> qlipper-5.1.2.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=150de0ea2caf8a9bbee1ad90f509c14f
diff --git a/metadata/md5-cache/x11-misc/qps-2.1.0-r1 b/metadata/md5-cache/x11-misc/qps-2.1.0-r1
index 2f854a8a182f..347e2af975f6 100644
--- a/metadata/md5-cache/x11-misc/qps-2.1.0-r1
+++ b/metadata/md5-cache/x11-misc/qps-2.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=lxqt-base/liblxqt-0.15.0
 SLOT=0
 SRC_URI=https://github.com/lxqt/qps/releases/download/2.1.0/qps-2.1.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc8bb97e5c832c84aafcf4c84c2b36ad
diff --git a/metadata/md5-cache/x11-misc/qtfm-99999 b/metadata/md5-cache/x11-misc/qtfm-99999
index 2770c9a418df..8383fe44dd03 100644
--- a/metadata/md5-cache/x11-misc/qtfm-99999
+++ b/metadata/md5-cache/x11-misc/qtfm-99999
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-apps/file dbus? ( dev-qt/qtdbus:5 ) ffmpeg? ( media-video/ffmpeg ) imagemagick? ( >=media-gfx/imagemagick-7:= )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6594342ff3cf386138cd7da624ad327
diff --git a/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20190821 b/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20190821
index 70086e09c551..c64128679e0d 100644
--- a/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20190821
+++ b/metadata/md5-cache/x11-misc/qxkb-0.5.1_pre20190821
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxkbfile x11-apps/setxkbmap
 SLOT=0
 SRC_URI=https://github.com/disels/qxkb/archive/ee9a1eee9dc810b33b931601203051d841bc3e7a.tar.gz -> qxkb-0.5.1_pre20190821.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3d19af1e83e402fc1d037538be8b214
diff --git a/metadata/md5-cache/x11-misc/screengrab-1.101 b/metadata/md5-cache/x11-misc/screengrab-1.101
index e9ae4d1bb750..4189bd10f44c 100644
--- a/metadata/md5-cache/x11-misc/screengrab-1.101
+++ b/metadata/md5-cache/x11-misc/screengrab-1.101
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ 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/qtnetwork:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libxcb x11-libs/libX11
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/screengrab/1.101/screengrab-1.101.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea3dcad4f8f46b212097f78972a7e01a
diff --git a/metadata/md5-cache/x11-misc/screengrab-2.0.0 b/metadata/md5-cache/x11-misc/screengrab-2.0.0
index 0bba2bd0f8a2..44f56b6eefa4 100644
--- a/metadata/md5-cache/x11-misc/screengrab-2.0.0
+++ b/metadata/md5-cache/x11-misc/screengrab-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ 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/qtnetwork:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libxcb x11-libs/libX11 x11-libs/libXfixes
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/screengrab/2.0.0/screengrab-2.0.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=555b383e22294bb4185f57ee8cea9b1f
diff --git a/metadata/md5-cache/x11-misc/screengrab-2.0.1 b/metadata/md5-cache/x11-misc/screengrab-2.0.1
index 1b58676963ea..5d3faaaf9043 100644
--- a/metadata/md5-cache/x11-misc/screengrab-2.0.1
+++ b/metadata/md5-cache/x11-misc/screengrab-2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/libqtxdg-3.5.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtnetwork:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libxcb x11-libs/libX11 x11-libs/libXfixes
 SLOT=0
 SRC_URI=https://github.com/lxqt/screengrab/releases/download/2.0.1/screengrab-2.0.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b6e7200396e9a4845d55e6f664b19c1
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 2b819a681f03..8132147cd70a 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
+++ b/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d55063771960ebb36798924fa032d375
diff --git a/metadata/md5-cache/x11-misc/sddm-0.18.1-r3 b/metadata/md5-cache/x11-misc/sddm-0.18.1-r3
index ec16c4d0116b..c1f91b173880 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.18.1-r3
+++ b/metadata/md5-cache/x11-misc/sddm-0.18.1-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e7b3a8080783c57030138995cb15e17
diff --git a/metadata/md5-cache/x11-misc/slop-7.5 b/metadata/md5-cache/x11-misc/slop-7.5
index 8ef11adcd9f5..0c2a801d4a57 100644
--- a/metadata/md5-cache/x11-misc/slop-7.5
+++ b/metadata/md5-cache/x11-misc/slop-7.5
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= x11-libs/libX11 x11-libs/libXext opengl? ( media-libs/glew:0= media-libs/libglvnd virtual/opengl x11-libs/libXrender:= )
 SLOT=0/7.5
 SRC_URI=https://github.com/naelstrof/slop/archive/v7.5.tar.gz -> slop-7.5.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87e9d58577d843ac14f0ff638c0f0a97
diff --git a/metadata/md5-cache/x11-misc/slop-9999 b/metadata/md5-cache/x11-misc/slop-9999
index bdd76bb25d7e..1ab8aa2f438e 100644
--- a/metadata/md5-cache/x11-misc/slop-9999
+++ b/metadata/md5-cache/x11-misc/slop-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/icu:= x11-libs/libX11 x11-libs/libXext opengl? ( media-libs/glew:0= media-libs/libglvnd virtual/opengl x11-libs/libXrender:= )
 SLOT=0/9999
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87e9d58577d843ac14f0ff638c0f0a97
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.6.1-r1 b/metadata/md5-cache/x11-misc/virtualgl-2.6.1-r1
index 4ed72ebd5a06..455ccb6c6669 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.6.1-r1
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.6.1-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/virtualgl/2.6.1/VirtualGL-2.6.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=126b2c0b1bc1221bf491df28196b1f99
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.6.3-r1 b/metadata/md5-cache/x11-misc/virtualgl-2.6.3-r1
index 01abfb0acde9..b89f6d1d234c 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.6.3-r1
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.6.3-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] virtual/opencl[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/virtualgl/2.6.3/VirtualGL-2.6.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5c6a2205cdea6f3ababfb3df330da2b
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.6.4-r1 b/metadata/md5-cache/x11-misc/virtualgl-2.6.4-r1
index 611cb94fd2c7..6f555c4c64ea 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.6.4-r1
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.6.4-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util-keysyms[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] x11-libs/xcb-util-keysyms[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] virtual/opencl[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/virtualgl/2.6.4/VirtualGL-2.6.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76fecaf3d10f7d07ae494fbe38d70659
diff --git a/metadata/md5-cache/x11-misc/virtualgl-9999 b/metadata/md5-cache/x11-misc/virtualgl-9999
index 2f1e1b8b1f5b..4f835b84ec8c 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-9999
+++ b/metadata/md5-cache/x11-misc/virtualgl-9999
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
 PROPERTIES=live
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_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_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXtst-1.2.3[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	69be00334d73f9f50261554b94be0879	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae02bc07f70325604667d241a42392d5
diff --git a/metadata/md5-cache/x11-misc/xcalib-0.10 b/metadata/md5-cache/x11-misc/xcalib-0.10
index 4e5e7690388f..ecd1c92e0876 100644
--- a/metadata/md5-cache/x11-misc/xcalib-0.10
+++ b/metadata/md5-cache/x11-misc/xcalib-0.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXrandr x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=https://github.com/OpenICC/xcalib/archive/0.10.tar.gz -> xcalib-0.10.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=597b0c07d2e0414b0f5de3cc90c02e7e
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.62 b/metadata/md5-cache/x11-misc/xlockmore-5.62
deleted file mode 100644
index 25e53f76b291..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.62
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-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? ( sys-libs/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=https://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? ( sys-libs/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=https://www.sillycycle.com/xlock/xlockmore-5.62.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.62.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=67a9d4b2deacacc2161f937619b588c3
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.63 b/metadata/md5-cache/x11-misc/xlockmore-5.63
deleted file mode 100644
index 1c33bd60d0fb..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.63
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-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? ( sys-libs/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=https://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? ( sys-libs/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=https://www.sillycycle.com/xlock/xlockmore-5.63.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.63.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d7baa2c692394e1f7b5485d6eb4446ed
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.64 b/metadata/md5-cache/x11-misc/xlockmore-5.64
deleted file mode 100644
index 495bc1749479..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.64
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-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? ( sys-libs/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=https://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? ( sys-libs/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=https://www.sillycycle.com/xlock/xlockmore-5.64.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.64.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e74321a731dc4484c29daba2f76a02dd
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha00 b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha00
deleted file mode 100644
index 51f93a7575ba..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha00
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-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? ( sys-libs/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=https://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? ( sys-libs/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=https://www.sillycycle.com/xlock/xlockmore-5.66ALPHA00.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66ALPHA00.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5f9b163dc95066422a2bce1b7cd2c49c
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha04 b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha04
deleted file mode 100644
index 116e2095719d..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha04
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-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? ( sys-libs/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=https://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? ( sys-libs/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=https://www.sillycycle.com/xlock/xlockmore-5.66ALPHA04.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66ALPHA04.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a1dc4376a63da7fbdf8a2f4a30e88c44
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha06 b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha06
new file mode 100644
index 000000000000..f97b74c58b4d
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha06
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=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? ( sys-libs/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=https://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? ( sys-libs/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=https://www.sillycycle.com/xlock/xlockmore-5.66ALPHA06.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66ALPHA06.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=762879e97bb174537f75608be56c2781
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha08 b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha08
new file mode 100644
index 000000000000..7730cae9829d
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.66_alpha08
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=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? ( sys-libs/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=https://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? ( sys-libs/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=https://www.sillycycle.com/xlock/xlockmore-5.66ALPHA08.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.66ALPHA08.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=a1dc4376a63da7fbdf8a2f4a30e88c44
diff --git a/metadata/md5-cache/x11-misc/xsettingsd-1.0.0 b/metadata/md5-cache/x11-misc/xsettingsd-1.0.0
index f21dfb9af892..0456ed9f11a6 100644
--- a/metadata/md5-cache/x11-misc/xsettingsd-1.0.0
+++ b/metadata/md5-cache/x11-misc/xsettingsd-1.0.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/derat/xsettingsd/archive/v1.0.0.tar.gz -> xsettingsd-1.0.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d66c28830fbe48da62c5b4e086e4f468
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 2a820a82a992..e63f2dee03ad 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/pidgin-skypeweb-1.1 b/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.1
deleted file mode 100644
index 91fae68fb5c4..000000000000
--- a/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=net-im/pidgin dev-libs/json-glib virtual/pkgconfig
-DESCRIPTION=SkypeWeb Plugin for Pidgin
-EAPI=5
-HOMEPAGE=https://github.com/EionRobb/skype4pidgin
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=net-im/pidgin dev-libs/json-glib
-SLOT=0
-SRC_URI=https://github.com/EionRobb/skype4pidgin/archive/1.1.tar.gz -> pidgin-skypeweb-1.1.tar.gz
-_md5_=e935f17fa93579d625dd591284f12335
diff --git a/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.2 b/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.2
deleted file mode 100644
index 2d96885215ae..000000000000
--- a/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=net-im/pidgin dev-libs/json-glib virtual/pkgconfig
-DESCRIPTION=SkypeWeb Plugin for Pidgin
-EAPI=5
-HOMEPAGE=https://github.com/EionRobb/skype4pidgin
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=net-im/pidgin dev-libs/json-glib
-SLOT=0
-SRC_URI=https://github.com/EionRobb/skype4pidgin/archive/v1.2.tar.gz -> pidgin-skypeweb-1.2.tar.gz
-_md5_=d447b5169e24e9f36187687be0278a22
diff --git a/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.2.2 b/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.2.2
deleted file mode 100644
index 3049e0ba8f91..000000000000
--- a/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=net-im/pidgin dev-libs/json-glib virtual/pkgconfig
-DESCRIPTION=SkypeWeb Plugin for Pidgin
-EAPI=5
-HOMEPAGE=https://github.com/EionRobb/skype4pidgin
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=net-im/pidgin dev-libs/json-glib
-SLOT=0
-SRC_URI=https://github.com/EionRobb/skype4pidgin/archive/1.2.2.tar.gz -> pidgin-skypeweb-1.2.2.tar.gz
-_md5_=16285ad5f73820927e54fafb5e91e519
diff --git a/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.4 b/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.4
deleted file mode 100644
index ee8564ea2848..000000000000
--- a/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DEPEND=net-im/pidgin dev-libs/json-glib virtual/pkgconfig
-DESCRIPTION=SkypeWeb Plugin for Pidgin
-EAPI=6
-HOMEPAGE=https://github.com/EionRobb/skype4pidgin
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=net-im/pidgin dev-libs/json-glib
-SLOT=0
-SRC_URI=https://github.com/EionRobb/skype4pidgin/archive/1.4.tar.gz -> pidgin-skypeweb-1.4.tar.gz
-_md5_=4d6679ffd4f50933db7e1f0d33409942
diff --git a/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2-r1 b/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2-r1
index 8d1e921a4b2a..c31e2ecf2a42 100644
--- a/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2-r1
+++ b/metadata/md5-cache/x11-plugins/wmcpuwatch-0.2-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=x11-libs/libdockapp-0.7:=
 SLOT=0
 SRC_URI=https://bitbucket-archive.softwareheritage.org/static/83/8395d160-de4b-42d6-a7d9-939eade4f58a/attachments/wmcpuwatch-0.2.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd6308970a3e2253d4d4d02994ee0997
diff --git a/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r3 b/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r3
index a994996e3e52..3d88edea3beb 100644
--- a/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r3
+++ b/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r3
@@ -4,11 +4,11 @@ DEPEND=x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext ses
 DESCRIPTION=Load monitoring dockapp displaying dancing flame
 EAPI=7
 HOMEPAGE=http://www.improbability.net/#wmfire
-IUSE=session
+IUSE=+session
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE )
 SLOT=0
 SRC_URI=http://www.improbability.net/wmfire/wmfire-1.2.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3efe7caaf089e9ca1a1636425b9cf194
+_md5_=71272afe3e70b7efa70e48ec9e7d5ab9
diff --git a/metadata/md5-cache/x11-plugins/wmxres-1.4 b/metadata/md5-cache/x11-plugins/wmxres-1.4
new file mode 100644
index 000000000000..2dff90291b4f
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmxres-1.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXxf86vm x11-base/xorg-proto
+DESCRIPTION=Dock application to select your display mode among those possible
+EAPI=7
+HOMEPAGE=https://www.dockapps.net/wmxres
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-1
+RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXxf86vm
+SLOT=0
+SRC_URI=https://www.dockapps.net/download/wmxres-1.4.tar.gz
+_md5_=7e02e461994ac8320e4f0595f49d2fc8
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 51c31fa33c95..2c616d603fe7 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.4.3 b/metadata/md5-cache/x11-terms/alacritty-0.4.3
index c6c90172b1cc..9c710d30a663 100644
--- a/metadata/md5-cache/x11-terms/alacritty-0.4.3
+++ b/metadata/md5-cache/x11-terms/alacritty-0.4.3
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 SRC_URI=https://github.com/alacritty/alacritty/archive/v0.4.3.tar.gz -> alacritty-0.4.3.tar.gz https://crates.io/api/v1/crates/adler32/1.0.4/download -> adler32-1.0.4.crate https://crates.io/api/v1/crates/aho-corasick/0.7.10/download -> aho-corasick-0.7.10.crate https://crates.io/api/v1/crates/andrew/0.2.1/download -> andrew-0.2.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/android_log-sys/0.1.2/download -> android_log-sys-0.1.2.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.3.2/download -> approx-0.3.2.crate https://crates.io/api/v1/crates/arc-swap/0.4.6/download -> arc-swap-0.4.6.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.4.12/download -> arrayvec-0.4.12.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/bindgen/0.53.2/download -> bindgen-0.53.2.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/bytemuck/1.2.0/download -> bytemuck-1.2.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.8+1.0.8/download -> bzip2-sys-0.1.8+1.0.8.crate https://crates.io/api/v1/crates/calloop/0.4.4/download -> calloop-0.4.4.crate https://crates.io/api/v1/crates/cc/1.0.53/download -> cc-1.0.53.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clang-sys/0.29.3/download -> clang-sys-0.29.3.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.43/download -> cmake-0.1.43.crate https://crates.io/api/v1/crates/cocoa/0.19.1/download -> cocoa-0.19.1.crate https://crates.io/api/v1/crates/cocoa/0.20.0/download -> cocoa-0.20.0.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/copypasta/0.6.3/download -> copypasta-0.6.3.crate https://crates.io/api/v1/crates/core-foundation/0.6.4/download -> core-foundation-0.6.4.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.6.2/download -> core-foundation-sys-0.6.2.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-graphics/0.17.3/download -> core-graphics-0.17.3.crate https://crates.io/api/v1/crates/core-graphics/0.19.0/download -> core-graphics-0.19.0.crate https://crates.io/api/v1/crates/core-text/15.0.0/download -> core-text-15.0.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/deflate/0.8.4/download -> deflate-0.8.4.crate https://crates.io/api/v1/crates/derivative/2.1.1/download -> derivative-2.1.1.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.4/download -> dirs-sys-0.3.4.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.4.1/download -> dlib-0.4.1.crate https://crates.io/api/v1/crates/downcast-rs/1.1.1/download -> downcast-rs-1.1.1.crate https://crates.io/api/v1/crates/dtoa/0.4.5/download -> dtoa-0.4.5.crate https://crates.io/api/v1/crates/dwrote/0.9.0/download -> dwrote-0.9.0.crate https://crates.io/api/v1/crates/embed-resource/1.3.3/download -> embed-resource-1.3.3.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/euclid/0.20.11/download -> euclid-0.20.11.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.10/download -> filetime-0.2.10.crate https://crates.io/api/v1/crates/flate2/1.0.14/download -> flate2-1.0.14.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/font/0.1.0/download -> font-0.1.0.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.23.0/download -> freetype-rs-0.23.0.crate https://crates.io/api/v1/crates/freetype-sys/0.9.0/download -> freetype-sys-0.9.0.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gl_generator/0.13.1/download -> gl_generator-0.13.1.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glutin/0.24.0/download -> glutin-0.24.0.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.4/download -> glutin_egl_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.4/download -> glutin_gles2_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.6/download -> glutin_glx_sys-0.1.6.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.4/download -> glutin_wgl_sys-0.1.4.crate https://crates.io/api/v1/crates/hermit-abi/0.1.13/download -> hermit-abi-0.1.13.crate https://crates.io/api/v1/crates/http_req/0.5.5/download -> http_req-0.5.5.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/image/0.23.4/download -> image-0.23.4.crate https://crates.io/api/v1/crates/inflate/0.4.5/download -> inflate-0.4.5.crate https://crates.io/api/v1/crates/inotify/0.7.0/download -> inotify-0.7.0.crate https://crates.io/api/v1/crates/inotify-sys/0.1.3/download -> inotify-sys-0.1.3.crate https://crates.io/api/v1/crates/instant/0.1.3/download -> instant-0.1.3.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.5/download -> itoa-0.4.5.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.1.0/download -> khronos_api-3.1.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/lexical-core/0.6.2/download -> lexical-core-0.6.2.crate https://crates.io/api/v1/crates/libc/0.2.70/download -> libc-0.2.70.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/libz-sys/1.0.25/download -> libz-sys-1.0.25.crate https://crates.io/api/v1/crates/line_drawing/0.7.0/download -> line_drawing-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lock_api/0.3.4/download -> lock_api-0.3.4.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.6/download -> miniz_oxide-0.3.6.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.6/download -> mio-named-pipes-0.1.6.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.3/download -> miow-0.3.3.crate https://crates.io/api/v1/crates/native-tls/0.2.4/download -> native-tls-0.2.4.crate https://crates.io/api/v1/crates/ndk/0.1.0/download -> ndk-0.1.0.crate https://crates.io/api/v1/crates/ndk-glue/0.1.0/download -> ndk-glue-0.1.0.crate https://crates.io/api/v1/crates/ndk-sys/0.1.0/download -> ndk-sys-0.1.0.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/nom/5.1.1/download -> nom-5.1.1.crate https://crates.io/api/v1/crates/notify/4.0.15/download -> notify-4.0.15.crate https://crates.io/api/v1/crates/num-integer/0.1.42/download -> num-integer-0.1.42.crate https://crates.io/api/v1/crates/num-iter/0.1.40/download -> num-iter-0.1.40.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-traits/0.2.11/download -> num-traits-0.2.11.crate https://crates.io/api/v1/crates/num_enum/0.4.3/download -> num_enum-0.4.3.crate https://crates.io/api/v1/crates/num_enum_derive/0.4.3/download -> num_enum_derive-0.4.3.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/openssl/0.10.29/download -> openssl-0.10.29.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.56/download -> openssl-sys-0.9.56.crate https://crates.io/api/v1/crates/ordered-float/1.0.2/download -> ordered-float-1.0.2.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/parking_lot/0.10.2/download -> parking_lot-0.10.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.7.2/download -> parking_lot_core-0.7.2.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/png/0.16.3/download -> png-0.16.3.crate https://crates.io/api/v1/crates/podio/0.1.6/download -> podio-0.1.6.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.7/download -> ppv-lite86-0.2.7.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.4/download -> proc-macro-crate-0.1.4.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.13/download -> proc-macro2-1.0.13.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.5/download -> quote-1.0.5.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.3/download -> raw-window-handle-0.3.3.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.7/download -> regex-1.3.7.crate https://crates.io/api/v1/crates/regex-syntax/0.6.17/download -> regex-syntax-0.6.17.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.2/download -> remove_dir_all-0.5.2.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_tools_util/0.2.0/download -> rustc_tools_util-0.2.0.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rusttype/0.7.9/download -> rusttype-0.7.9.crate https://crates.io/api/v1/crates/rusttype/0.8.3/download -> rusttype-0.8.3.crate https://crates.io/api/v1/crates/ryu/1.0.4/download -> ryu-1.0.4.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/security-framework/0.4.4/download -> security-framework-0.4.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.4.3/download -> security-framework-sys-0.4.3.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.110/download -> serde-1.0.110.crate https://crates.io/api/v1/crates/serde_derive/1.0.110/download -> serde_derive-1.0.110.crate https://crates.io/api/v1/crates/serde_json/1.0.53/download -> serde_json-1.0.53.crate https://crates.io/api/v1/crates/serde_yaml/0.8.12/download -> serde_yaml-0.8.12.crate https://crates.io/api/v1/crates/servo-fontconfig/0.4.0/download -> servo-fontconfig-0.4.0.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/4.0.9/download -> servo-fontconfig-sys-4.0.9.crate https://crates.io/api/v1/crates/servo-freetype-sys/4.0.3/download -> servo-freetype-sys-4.0.3.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.1.15/download -> signal-hook-0.1.15.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/siphasher/0.3.3/download -> siphasher-0.3.3.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.4.0/download -> smallvec-1.4.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.6.6/download -> smithay-client-toolkit-0.6.6.crate https://crates.io/api/v1/crates/smithay-clipboard/0.4.0/download -> smithay-clipboard-0.4.0.crate https://crates.io/api/v1/crates/socket2/0.3.12/download -> socket2-0.3.12.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/static_assertions/0.3.4/download -> static_assertions-0.3.4.crate https://crates.io/api/v1/crates/stb_truetype/0.3.1/download -> stb_truetype-0.3.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.22/download -> syn-1.0.22.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/terminfo/0.7.2/download -> terminfo-0.7.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.12/download -> unicode-normalization-0.1.12.crate https://crates.io/api/v1/crates/unicode-width/0.1.7/download -> unicode-width-0.1.7.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.0/download -> unicode-xid-0.2.0.crate https://crates.io/api/v1/crates/url/2.1.1/download -> url-2.1.1.crate https://crates.io/api/v1/crates/urlocator/0.1.3/download -> urlocator-0.1.3.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.8/download -> vcpkg-0.2.8.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.1/download -> version_check-0.9.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.8.0/download -> vte-0.8.0.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wayland-client/0.23.6/download -> wayland-client-0.23.6.crate https://crates.io/api/v1/crates/wayland-commons/0.23.6/download -> wayland-commons-0.23.6.crate https://crates.io/api/v1/crates/wayland-protocols/0.23.6/download -> wayland-protocols-0.23.6.crate https://crates.io/api/v1/crates/wayland-scanner/0.23.6/download -> wayland-scanner-0.23.6.crate https://crates.io/api/v1/crates/wayland-sys/0.23.6/download -> wayland-sys-0.23.6.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.8/download -> winapi-0.3.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.22.2/download -> winit-0.22.2.crate https://crates.io/api/v1/crates/winpty/0.2.0/download -> winpty-0.2.0.crate https://crates.io/api/v1/crates/winpty-sys/0.5.0/download -> winpty-sys-0.5.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.1/download -> x11-clipboard-0.5.1.crate https://crates.io/api/v1/crates/x11-dl/2.18.5/download -> x11-dl-2.18.5.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.0/download -> xml-rs-0.8.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.3/download -> yaml-rust-0.4.3.crate https://crates.io/api/v1/crates/zip/0.5.5/download -> zip-0.5.5.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	16808adb27d34df9e5106842af29c73c	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=c5347d793fde8c546de6ea6f2289f430
diff --git a/metadata/md5-cache/x11-terms/alacritty-0.5.0 b/metadata/md5-cache/x11-terms/alacritty-0.5.0
index db79da906481..01b91e17afc5 100644
--- a/metadata/md5-cache/x11-terms/alacritty-0.5.0
+++ b/metadata/md5-cache/x11-terms/alacritty-0.5.0
@@ -11,5 +11,5 @@ RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 SRC_URI=https://github.com/alacritty/alacritty/archive/v0.5.0.tar.gz -> alacritty-0.5.0.tar.gz https://crates.io/api/v1/crates/adler/0.2.2/download -> adler-0.2.2.crate https://crates.io/api/v1/crates/adler32/1.1.0/download -> adler32-1.1.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.13/download -> aho-corasick-0.7.13.crate https://crates.io/api/v1/crates/andrew/0.2.1/download -> andrew-0.2.1.crate https://crates.io/api/v1/crates/android_glue/0.2.3/download -> android_glue-0.2.3.crate https://crates.io/api/v1/crates/android_log-sys/0.1.2/download -> android_log-sys-0.1.2.crate https://crates.io/api/v1/crates/ansi_term/0.11.0/download -> ansi_term-0.11.0.crate https://crates.io/api/v1/crates/approx/0.3.2/download -> approx-0.3.2.crate https://crates.io/api/v1/crates/arc-swap/0.4.7/download -> arc-swap-0.4.7.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/arrayvec/0.5.1/download -> arrayvec-0.5.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.0/download -> autocfg-1.0.0.crate https://crates.io/api/v1/crates/base64/0.11.0/download -> base64-0.11.0.crate https://crates.io/api/v1/crates/base64/0.12.3/download -> base64-0.12.3.crate https://crates.io/api/v1/crates/bindgen/0.53.3/download -> bindgen-0.53.3.crate https://crates.io/api/v1/crates/bitflags/1.2.1/download -> bitflags-1.2.1.crate https://crates.io/api/v1/crates/blake2b_simd/0.5.10/download -> blake2b_simd-0.5.10.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/bytemuck/1.2.0/download -> bytemuck-1.2.0.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bzip2/0.3.3/download -> bzip2-0.3.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.9+1.0.8/download -> bzip2-sys-0.1.9+1.0.8.crate https://crates.io/api/v1/crates/calloop/0.4.4/download -> calloop-0.4.4.crate https://crates.io/api/v1/crates/cc/1.0.58/download -> cc-1.0.58.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cgl/0.3.2/download -> cgl-0.3.2.crate https://crates.io/api/v1/crates/clang-sys/0.29.3/download -> clang-sys-0.29.3.crate https://crates.io/api/v1/crates/clap/2.33.1/download -> clap-2.33.1.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/cloudabi/0.0.3/download -> cloudabi-0.0.3.crate https://crates.io/api/v1/crates/cmake/0.1.44/download -> cmake-0.1.44.crate https://crates.io/api/v1/crates/cocoa/0.20.2/download -> cocoa-0.20.2.crate https://crates.io/api/v1/crates/constant_time_eq/0.1.5/download -> constant_time_eq-0.1.5.crate https://crates.io/api/v1/crates/copypasta/0.7.0/download -> copypasta-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-text/15.0.0/download -> core-text-15.0.0.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/crc32fast/1.2.0/download -> crc32fast-1.2.0.crate https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download -> crossbeam-utils-0.7.2.crate https://crates.io/api/v1/crates/crossfont/0.1.0/download -> crossfont-0.1.0.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/derivative/2.1.1/download -> derivative-2.1.1.crate https://crates.io/api/v1/crates/dirs/2.0.2/download -> dirs-2.0.2.crate https://crates.io/api/v1/crates/dirs-sys/0.3.5/download -> dirs-sys-0.3.5.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.4.2/download -> dlib-0.4.2.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dtoa/0.4.6/download -> dtoa-0.4.6.crate https://crates.io/api/v1/crates/dwrote/0.11.0/download -> dwrote-0.11.0.crate https://crates.io/api/v1/crates/embed-resource/1.3.3/download -> embed-resource-1.3.3.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/euclid/0.20.14/download -> euclid-0.20.14.crate https://crates.io/api/v1/crates/expat-sys/2.1.6/download -> expat-sys-2.1.6.crate https://crates.io/api/v1/crates/filetime/0.2.10/download -> filetime-0.2.10.crate https://crates.io/api/v1/crates/flate2/1.0.16/download -> flate2-1.0.16.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types/0.5.0/download -> foreign-types-0.5.0.crate https://crates.io/api/v1/crates/foreign-types-macros/0.2.1/download -> foreign-types-macros-0.2.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/foreign-types-shared/0.3.0/download -> foreign-types-shared-0.3.0.crate https://crates.io/api/v1/crates/freetype-rs/0.26.0/download -> freetype-rs-0.26.0.crate https://crates.io/api/v1/crates/freetype-sys/0.13.1/download -> freetype-sys-0.13.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/getrandom/0.1.14/download -> getrandom-0.1.14.crate https://crates.io/api/v1/crates/gl_generator/0.13.1/download -> gl_generator-0.13.1.crate https://crates.io/api/v1/crates/gl_generator/0.14.0/download -> gl_generator-0.14.0.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glutin/0.24.1/download -> glutin-0.24.1.crate https://crates.io/api/v1/crates/glutin_egl_sys/0.1.4/download -> glutin_egl_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_emscripten_sys/0.1.1/download -> glutin_emscripten_sys-0.1.1.crate https://crates.io/api/v1/crates/glutin_gles2_sys/0.1.4/download -> glutin_gles2_sys-0.1.4.crate https://crates.io/api/v1/crates/glutin_glx_sys/0.1.6/download -> glutin_glx_sys-0.1.6.crate https://crates.io/api/v1/crates/glutin_wgl_sys/0.1.4/download -> glutin_wgl_sys-0.1.4.crate https://crates.io/api/v1/crates/hermit-abi/0.1.15/download -> hermit-abi-0.1.15.crate https://crates.io/api/v1/crates/http_req/0.5.5/download -> http_req-0.5.5.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/image/0.23.6/download -> image-0.23.6.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.3/download -> inotify-sys-0.1.3.crate https://crates.io/api/v1/crates/instant/0.1.6/download -> instant-0.1.6.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itoa/0.4.6/download -> itoa-0.4.6.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/khronos_api/3.1.0/download -> khronos_api-3.1.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.2.1/download -> lazycell-1.2.1.crate https://crates.io/api/v1/crates/libc/0.2.72/download -> libc-0.2.72.crate https://crates.io/api/v1/crates/libloading/0.5.2/download -> libloading-0.5.2.crate https://crates.io/api/v1/crates/libloading/0.6.2/download -> libloading-0.6.2.crate https://crates.io/api/v1/crates/line_drawing/0.7.0/download -> line_drawing-0.7.0.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/lock_api/0.3.4/download -> lock_api-0.3.4.crate https://crates.io/api/v1/crates/log/0.4.8/download -> log-0.4.8.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download -> maybe-uninit-2.0.0.crate https://crates.io/api/v1/crates/memchr/2.3.3/download -> memchr-2.3.3.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.0/download -> miniz_oxide-0.4.0.crate https://crates.io/api/v1/crates/mio/0.6.22/download -> mio-0.6.22.crate https://crates.io/api/v1/crates/mio-anonymous-pipes/0.1.0/download -> mio-anonymous-pipes-0.1.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/mio-named-pipes/0.1.7/download -> mio-named-pipes-0.1.7.crate https://crates.io/api/v1/crates/miow/0.2.1/download -> miow-0.2.1.crate https://crates.io/api/v1/crates/miow/0.3.5/download -> miow-0.3.5.crate https://crates.io/api/v1/crates/native-tls/0.2.4/download -> native-tls-0.2.4.crate https://crates.io/api/v1/crates/ndk/0.1.0/download -> ndk-0.1.0.crate https://crates.io/api/v1/crates/ndk-glue/0.1.0/download -> ndk-glue-0.1.0.crate https://crates.io/api/v1/crates/ndk-sys/0.1.0/download -> ndk-sys-0.1.0.crate https://crates.io/api/v1/crates/net2/0.2.34/download -> net2-0.2.34.crate https://crates.io/api/v1/crates/nix/0.14.1/download -> nix-0.14.1.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/notify/4.0.15/download -> notify-4.0.15.crate https://crates.io/api/v1/crates/num-integer/0.1.43/download -> num-integer-0.1.43.crate https://crates.io/api/v1/crates/num-iter/0.1.41/download -> num-iter-0.1.41.crate https://crates.io/api/v1/crates/num-rational/0.3.0/download -> num-rational-0.3.0.crate https://crates.io/api/v1/crates/num-traits/0.2.12/download -> num-traits-0.2.12.crate https://crates.io/api/v1/crates/num_enum/0.4.3/download -> num_enum-0.4.3.crate https://crates.io/api/v1/crates/num_enum_derive/0.4.3/download -> num_enum_derive-0.4.3.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.4.0/download -> once_cell-1.4.0.crate https://crates.io/api/v1/crates/openssl/0.10.30/download -> openssl-0.10.30.crate https://crates.io/api/v1/crates/openssl-probe/0.1.2/download -> openssl-probe-0.1.2.crate https://crates.io/api/v1/crates/openssl-sys/0.9.58/download -> openssl-sys-0.9.58.crate https://crates.io/api/v1/crates/ordered-float/1.1.0/download -> ordered-float-1.1.0.crate https://crates.io/api/v1/crates/osmesa-sys/0.1.2/download -> osmesa-sys-0.1.2.crate https://crates.io/api/v1/crates/parking_lot/0.10.2/download -> parking_lot-0.10.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.7.2/download -> parking_lot_core-0.7.2.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.17/download -> pkg-config-0.3.17.crate https://crates.io/api/v1/crates/png/0.16.6/download -> png-0.16.6.crate https://crates.io/api/v1/crates/podio/0.1.7/download -> podio-0.1.7.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.8/download -> ppv-lite86-0.2.8.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.4/download -> proc-macro-crate-0.1.4.crate https://crates.io/api/v1/crates/proc-macro2/0.4.30/download -> proc-macro2-0.4.30.crate https://crates.io/api/v1/crates/proc-macro2/1.0.18/download -> proc-macro2-1.0.18.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/0.6.13/download -> quote-0.6.13.crate https://crates.io/api/v1/crates/quote/1.0.7/download -> quote-1.0.7.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/raw-window-handle/0.3.3/download -> raw-window-handle-0.3.3.crate https://crates.io/api/v1/crates/redox_syscall/0.1.56/download -> redox_syscall-0.1.56.crate https://crates.io/api/v1/crates/redox_users/0.3.4/download -> redox_users-0.3.4.crate https://crates.io/api/v1/crates/regex/1.3.9/download -> regex-1.3.9.crate https://crates.io/api/v1/crates/regex-automata/0.1.9/download -> regex-automata-0.1.9.crate https://crates.io/api/v1/crates/regex-syntax/0.6.18/download -> regex-syntax-0.6.18.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rust-argon2/0.7.0/download -> rust-argon2-0.7.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_tools_util/0.2.0/download -> rustc_tools_util-0.2.0.crate https://crates.io/api/v1/crates/rusttype/0.7.9/download -> rusttype-0.7.9.crate https://crates.io/api/v1/crates/rusttype/0.8.3/download -> rusttype-0.8.3.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/security-framework/0.4.4/download -> security-framework-0.4.4.crate https://crates.io/api/v1/crates/security-framework-sys/0.4.3/download -> security-framework-sys-0.4.3.crate https://crates.io/api/v1/crates/serde/1.0.114/download -> serde-1.0.114.crate https://crates.io/api/v1/crates/serde_derive/1.0.114/download -> serde_derive-1.0.114.crate https://crates.io/api/v1/crates/serde_json/1.0.56/download -> serde_json-1.0.56.crate https://crates.io/api/v1/crates/serde_yaml/0.8.13/download -> serde_yaml-0.8.13.crate https://crates.io/api/v1/crates/servo-fontconfig/0.5.1/download -> servo-fontconfig-0.5.1.crate https://crates.io/api/v1/crates/servo-fontconfig-sys/5.1.0/download -> servo-fontconfig-sys-5.1.0.crate https://crates.io/api/v1/crates/shared_library/0.1.9/download -> shared_library-0.1.9.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.1.16/download -> signal-hook-0.1.16.crate https://crates.io/api/v1/crates/signal-hook-registry/1.2.0/download -> signal-hook-registry-1.2.0.crate https://crates.io/api/v1/crates/siphasher/0.3.3/download -> siphasher-0.3.3.crate https://crates.io/api/v1/crates/slab/0.4.2/download -> slab-0.4.2.crate https://crates.io/api/v1/crates/smallvec/1.4.1/download -> smallvec-1.4.1.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.10.0/download -> smithay-client-toolkit-0.10.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.6.6/download -> smithay-client-toolkit-0.6.6.crate https://crates.io/api/v1/crates/smithay-clipboard/0.5.1/download -> smithay-clipboard-0.5.1.crate https://crates.io/api/v1/crates/socket2/0.3.12/download -> socket2-0.3.12.crate https://crates.io/api/v1/crates/spsc-buffer/0.1.1/download -> spsc-buffer-0.1.1.crate https://crates.io/api/v1/crates/stb_truetype/0.3.1/download -> stb_truetype-0.3.1.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.33/download -> syn-1.0.33.crate https://crates.io/api/v1/crates/tempfile/3.1.0/download -> tempfile-3.1.0.crate https://crates.io/api/v1/crates/termcolor/1.1.0/download -> termcolor-1.1.0.crate https://crates.io/api/v1/crates/terminfo/0.7.3/download -> terminfo-0.7.3.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thread_local/1.0.1/download -> thread_local-1.0.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/toml/0.5.6/download -> toml-0.5.6.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.8/download -> unicode-width-0.1.8.crate https://crates.io/api/v1/crates/unicode-xid/0.1.0/download -> unicode-xid-0.1.0.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/urlocator/0.1.4/download -> urlocator-0.1.4.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.10/download -> vcpkg-0.2.10.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.0/download -> vswhom-sys-0.1.0.crate https://crates.io/api/v1/crates/vte/0.8.0/download -> vte-0.8.0.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wayland-client/0.23.6/download -> wayland-client-0.23.6.crate https://crates.io/api/v1/crates/wayland-client/0.27.0/download -> wayland-client-0.27.0.crate https://crates.io/api/v1/crates/wayland-commons/0.23.6/download -> wayland-commons-0.23.6.crate https://crates.io/api/v1/crates/wayland-commons/0.27.0/download -> wayland-commons-0.27.0.crate https://crates.io/api/v1/crates/wayland-cursor/0.27.0/download -> wayland-cursor-0.27.0.crate https://crates.io/api/v1/crates/wayland-protocols/0.23.6/download -> wayland-protocols-0.23.6.crate https://crates.io/api/v1/crates/wayland-protocols/0.27.0/download -> wayland-protocols-0.27.0.crate https://crates.io/api/v1/crates/wayland-scanner/0.23.6/download -> wayland-scanner-0.23.6.crate https://crates.io/api/v1/crates/wayland-scanner/0.27.0/download -> wayland-scanner-0.27.0.crate https://crates.io/api/v1/crates/wayland-sys/0.23.6/download -> wayland-sys-0.23.6.crate https://crates.io/api/v1/crates/wayland-sys/0.27.0/download -> wayland-sys-0.27.0.crate https://crates.io/api/v1/crates/which/3.1.1/download -> which-3.1.1.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winit/0.22.2/download -> winit-0.22.2.crate https://crates.io/api/v1/crates/winpty/0.2.0/download -> winpty-0.2.0.crate https://crates.io/api/v1/crates/winpty-sys/0.5.0/download -> winpty-sys-0.5.0.crate https://crates.io/api/v1/crates/winreg/0.6.2/download -> winreg-0.6.2.crate https://crates.io/api/v1/crates/wio/0.2.2/download -> wio-0.2.2.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.1/download -> x11-clipboard-0.5.1.crate https://crates.io/api/v1/crates/x11-dl/2.18.5/download -> x11-dl-2.18.5.crate https://crates.io/api/v1/crates/xcb/0.9.0/download -> xcb-0.9.0.crate https://crates.io/api/v1/crates/xcursor/0.3.2/download -> xcursor-0.3.2.crate https://crates.io/api/v1/crates/xdg/2.2.0/download -> xdg-2.2.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.4/download -> yaml-rust-0.4.4.crate https://crates.io/api/v1/crates/zip/0.5.6/download -> zip-0.5.6.crate
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	16808adb27d34df9e5106842af29c73c	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=98108a03cab798ebddbe6ad25f25b1b2
diff --git a/metadata/md5-cache/x11-terms/alacritty-9999 b/metadata/md5-cache/x11-terms/alacritty-9999
index 6a177afc95cf..f96dcf340fb0 100644
--- a/metadata/md5-cache/x11-terms/alacritty-9999
+++ b/metadata/md5-cache/x11-terms/alacritty-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=media-libs/fontconfig:= media-libs/freetype:2 X? ( x11-libs/libxcb:=[xkb] ) media-libs/mesa[X?,wayland?] sys-libs/zlib sys-libs/ncurses:0 wayland? ( dev-libs/wayland ) X? ( x11-libs/libXcursor x11-libs/libXi x11-libs/libXrandr )
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
-_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	16808adb27d34df9e5106842af29c73c	desktop	7fd20552ce4cc97e8acb132a499a7dd8	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	cargo	1718e7e65d7fe0fe3fd34abbf3c3310b	desktop	7fd20552ce4cc97e8acb132a499a7dd8	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=abb06108a4b75cc09fad6250d529b3af
diff --git a/metadata/md5-cache/x11-terms/mate-terminal-1.24.1 b/metadata/md5-cache/x11-terms/mate-terminal-1.24.1
new file mode 100644
index 000000000000..c8a258ed2575
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/mate-terminal-1.24.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=gnome-base/dconf-0.13.4 x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango >=x11-libs/gtk+-3.22:3[X] >=x11-libs/vte-0.48:2.91 app-text/rarian >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=The MATE Terminal
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.1+ GPL-3+ LGPL-3+
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=gnome-base/dconf-0.13.4 x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango >=x11-libs/gtk+-3.22:3[X] >=x11-libs/vte-0.48:2.91 >=mate-base/mate-desktop-1.6 virtual/libintl
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-terminal-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d7be8359703d4ac47bc9a0df651c984d
diff --git a/metadata/md5-cache/x11-terms/pangoterm-0.0_pre20150323 b/metadata/md5-cache/x11-terms/pangoterm-0.0_pre20150323
deleted file mode 100644
index 2808693ee68e..000000000000
--- a/metadata/md5-cache/x11-terms/pangoterm-0.0_pre20150323
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND==dev-libs/libvterm-neovim-0.0_pre20150309
-DESCRIPTION=A GTK/Pango-based terminal that uses libvterm to provide terminal emulation
-EAPI=5
-HOMEPAGE=http://www.leonerd.org.uk/code/pangoterm/
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND==dev-libs/libvterm-neovim-0.0_pre20150309 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tranquility/distfiles/pangoterm-0.0_pre20150323.tar.gz
-_md5_=7e309db93f026b48c7ba842211b44b80
diff --git a/metadata/md5-cache/x11-terms/pangoterm-0.0_pre20150913 b/metadata/md5-cache/x11-terms/pangoterm-0.0_pre20150913
deleted file mode 100644
index 7b08a62d8058..000000000000
--- a/metadata/md5-cache/x11-terms/pangoterm-0.0_pre20150913
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/libvterm-neovim
-DESCRIPTION=A GTK/Pango-based terminal that uses libvterm to provide terminal emulation
-EAPI=5
-HOMEPAGE=http://www.leonerd.org.uk/code/pangoterm/
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-libs/libvterm-neovim dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tranquility/distfiles/pangoterm-0.0_pre20150913.tar.gz
-_md5_=ca59fad5a454e91e147c9a48ff71f2ab
diff --git a/metadata/md5-cache/x11-terms/pangoterm-0.0_pre20151022 b/metadata/md5-cache/x11-terms/pangoterm-0.0_pre20151022
deleted file mode 100644
index 77620c2f9cf6..000000000000
--- a/metadata/md5-cache/x11-terms/pangoterm-0.0_pre20151022
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-libs/libvterm-0.0_pre20151022
-DESCRIPTION=A GTK/Pango-based terminal that uses libvterm to provide terminal emulation
-EAPI=5
-HOMEPAGE=http://www.leonerd.org.uk/code/pangoterm/
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-libs/libvterm-0.0_pre20151022 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tranquility/distfiles/pangoterm-0.0_pre20151022.tar.gz
-_md5_=15fa82732d32f8f766c9b45cbd34fe81
diff --git a/metadata/md5-cache/x11-terms/pangoterm-0.0_pre20160305 b/metadata/md5-cache/x11-terms/pangoterm-0.0_pre20160305
deleted file mode 100644
index d2de08be2ccb..000000000000
--- a/metadata/md5-cache/x11-terms/pangoterm-0.0_pre20160305
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-libs/libvterm-0.0_pre20151022
-DESCRIPTION=A GTK/Pango-based terminal that uses libvterm to provide terminal emulation
-EAPI=5
-HOMEPAGE=http://www.leonerd.org.uk/code/pangoterm/
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-libs/libvterm-0.0_pre20151022 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tranquility/distfiles/pangoterm-0.0_pre20160305.tar.gz
-_md5_=f5670cdb619e5ed032517bb306b60444
diff --git a/metadata/md5-cache/x11-terms/qterminal-0.14.1-r1 b/metadata/md5-cache/x11-terms/qterminal-0.14.1-r1
index 6128b6b2f223..e2828d19dcd4 100644
--- a/metadata/md5-cache/x11-terms/qterminal-0.14.1-r1
+++ b/metadata/md5-cache/x11-terms/qterminal-0.14.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 ~x11-libs/qtermwidget-0.14.1 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://downloads.lxqt.org/downloads/qterminal/0.14.1/qterminal-0.14.1.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=251b53e479bfb8ac7a36fc75c47cf5a7
diff --git a/metadata/md5-cache/x11-terms/qterminal-0.15.0 b/metadata/md5-cache/x11-terms/qterminal-0.15.0
index ef5531ae78f4..0ceabb3bc08c 100644
--- a/metadata/md5-cache/x11-terms/qterminal-0.15.0
+++ b/metadata/md5-cache/x11-terms/qterminal-0.15.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 ~x11-libs/qtermwidget-0.15.0 !lxqt-base/lxqt-l10n
 SLOT=0
 SRC_URI=https://github.com/lxqt/qterminal/releases/download/0.15.0/qterminal-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79393b205573eba870b55b513e618c08
diff --git a/metadata/md5-cache/x11-terms/qterminal-9999 b/metadata/md5-cache/x11-terms/qterminal-9999
index 30616f09b2d6..48c00d5aabb1 100644
--- a/metadata/md5-cache/x11-terms/qterminal-9999
+++ b/metadata/md5-cache/x11-terms/qterminal-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-2+
 PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 ~x11-libs/qtermwidget-9999 !lxqt-base/lxqt-l10n
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b175f5045b633c4f98da382bcdc2fb5
diff --git a/metadata/md5-cache/x11-terms/roxterm-3.9.3 b/metadata/md5-cache/x11-terms/roxterm-3.9.3
index 44f75ee3add4..a1ab1661aca5 100644
--- a/metadata/md5-cache/x11-terms/roxterm-3.9.3
+++ b/metadata/md5-cache/x11-terms/roxterm-3.9.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-3
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libpcre2 sys-apps/dbus x11-libs/gtk+:3 x11-libs/vte:2.91[vanilla]
 SLOT=1
 SRC_URI=https://github.com/realh/roxterm/archive/3.9.3.tar.gz -> roxterm-3.9.3.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0f5fda5484cc68cd5aa5b2f11109402
diff --git a/metadata/md5-cache/x11-terms/roxterm-3.9.4 b/metadata/md5-cache/x11-terms/roxterm-3.9.4
index a897b66340bd..ef59ab442e24 100644
--- a/metadata/md5-cache/x11-terms/roxterm-3.9.4
+++ b/metadata/md5-cache/x11-terms/roxterm-3.9.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-3
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libpcre2 sys-apps/dbus x11-libs/cairo x11-libs/gtk+:3 x11-libs/pango x11-libs/vte:2.91[vanilla]
 SLOT=1
 SRC_URI=https://github.com/realh/roxterm/archive/3.9.4.tar.gz -> roxterm-3.9.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf643b53dea0aaa3e03b26688dce9205
diff --git a/metadata/md5-cache/x11-terms/sakura-3.7.1 b/metadata/md5-cache/x11-terms/sakura-3.7.1
index fb1e660291d6..b1913666c9f6 100644
--- a/metadata/md5-cache/x11-terms/sakura-3.7.1
+++ b/metadata/md5-cache/x11-terms/sakura-3.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.20:2 >=x11-libs/gtk+-3.20:3[X] x11-libs/libX11 >=x11-libs/vte-0.50:2.91
 SLOT=0
 SRC_URI=https://launchpad.net/sakura/trunk/3.7.1/+download/sakura-3.7.1.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4215b3179379df839539d929d00b5ba
diff --git a/metadata/md5-cache/x11-terms/terminology-1.7.0-r1 b/metadata/md5-cache/x11-terms/terminology-1.7.0-r1
deleted file mode 100644
index 1e8af47363f6..000000000000
--- a/metadata/md5-cache/x11-terms/terminology-1.7.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=|| ( || ( >=dev-libs/efl-1.24.3[gles2-only] <dev-libs/efl-1.24.3[gles2] ) dev-libs/efl[opengl] ) || ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 dev-libs/efl[eet,fontconfig]
-DESCRIPTION=Feature rich terminal emulator using the Enlightenment Foundation Libraries
-EAPI=7
-HOMEPAGE=https://www.enlightenment.org/about-terminology
-IUSE=extras nls
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=BSD-2
-RDEPEND=|| ( || ( >=dev-libs/efl-1.24.3[gles2-only] <dev-libs/efl-1.24.3[gles2] ) dev-libs/efl[opengl] ) || ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 dev-libs/efl[eet,fontconfig]
-SLOT=0
-SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.7.0.tar.xz
-_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=21e0752f448a39ace518b582538e63da
diff --git a/metadata/md5-cache/x11-terms/terminology-1.8.1 b/metadata/md5-cache/x11-terms/terminology-1.8.1
index 3768cbd53c1b..fa36fb710b30 100644
--- a/metadata/md5-cache/x11-terms/terminology-1.8.1
+++ b/metadata/md5-cache/x11-terms/terminology-1.8.1
@@ -5,10 +5,10 @@ DESCRIPTION=Feature rich terminal emulator using the Enlightenment Foundation Li
 EAPI=7
 HOMEPAGE=https://www.enlightenment.org/about-terminology
 IUSE=extras nls
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=|| ( dev-libs/efl[gles2-only] dev-libs/efl[opengl] ) || ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 dev-libs/efl[eet,fontconfig]
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.8.1.tar.xz https://downloads.terminolo.gy/terminology-1.8.1.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bfffb40b9c710ac3491caf2f7e7b2db5
+_md5_=1a32670ee68788380ac7898dee0c7dfc
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 461e2b4d0264..c637de2729b3 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/adwaita-qt-1.1.1 b/metadata/md5-cache/x11-themes/adwaita-qt-1.1.1
index 06fe96721c4a..4125f303945d 100644
--- a/metadata/md5-cache/x11-themes/adwaita-qt-1.1.1
+++ b/metadata/md5-cache/x11-themes/adwaita-qt-1.1.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gnome? ( x11-themes/QGnomePlatform )
 SLOT=0
 SRC_URI=https://github.com/FedoraQt/adwaita-qt/archive/1.1.1/adwaita-qt-1.1.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a2f43a6288e91e938852aae098772cd
diff --git a/metadata/md5-cache/x11-themes/adwaita-qt-1.1.4 b/metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
index ba64af31e2a5..d82f5835b0a3 100644
--- a/metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
+++ b/metadata/md5-cache/x11-themes/adwaita-qt-1.1.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gnome? ( x11-themes/QGnomePlatform )
 SLOT=0
 SRC_URI=https://github.com/FedoraQt/adwaita-qt/archive/1.1.4/adwaita-qt-1.1.4.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a2f43a6288e91e938852aae098772cd
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20121212 b/metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20121212
deleted file mode 100644
index 2b735060212e..000000000000
--- a/metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20121212
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.10[glib] >=x11-libs/gtk+-3.5.2:3 virtual/pkgconfig
-DESCRIPTION=The Unico GTK+ 3.x theming engine
-EAPI=5
-HOMEPAGE=https://launchpad.net/unico
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/cairo-1.10[glib] >=x11-libs/gtk+-3.5.2:3
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tetromino/distfiles/gtk-engines-unico/unico-1.0.3_pre20121212.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=40e44f5850cb1f90db88f80841347f02
diff --git a/metadata/md5-cache/x11-themes/kvantum-0.16.1 b/metadata/md5-cache/x11-themes/kvantum-0.16.1
index 95feb5bae981..fc18d1919e26 100644
--- a/metadata/md5-cache/x11-themes/kvantum-0.16.1
+++ b/metadata/md5-cache/x11-themes/kvantum-0.16.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kwindowsystem:5 x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=https://github.com/tsujan/Kvantum/archive/V0.16.1.tar.gz -> kvantum-0.16.1.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cca38d49f8193324983b1a747c431cf4
diff --git a/metadata/md5-cache/x11-themes/lxqt-themes-0.15.0 b/metadata/md5-cache/x11-themes/lxqt-themes-0.15.0
index 894930670c14..315ecb80e274 100644
--- a/metadata/md5-cache/x11-themes/lxqt-themes-0.15.0
+++ b/metadata/md5-cache/x11-themes/lxqt-themes-0.15.0
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/lxqt/lxqt-themes/releases/download/0.15.0/lxqt-themes-0.15.0.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0c2118c128c4f03759b5d3cfe7e5844
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-1.24.0-r1 b/metadata/md5-cache/x11-themes/mate-icon-theme-1.24.0-r1
new file mode 100644
index 000000000000..ab52d5d1682a
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/mate-icon-theme-1.24.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7:0 >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=MATE default icon themes
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=CC-BY-SA-3.0 CC-PD GPL-1+
+RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/mate-icon-theme-1.24.0.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c229bf83352ca46a64bd3dc9380de24c
diff --git a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1 b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
index 25752f3be1ac..4c7434690de9 100644
--- a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
+++ b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.1-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/dbus-glib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_s390_32(-)?,abi_s390_64(-)?] !x11-themes/oxygen-gtk:0
 SLOT=3
 SRC_URI=mirror://kde/stable/oxygen-gtk3/1.4.1/src/oxygen-gtk3-1.4.1.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=faa96f470a7ef99969f05590c4325964
diff --git a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1 b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
index 497f550cbefa..880ac04acb14 100644
--- a/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
+++ b/metadata/md5-cache/x11-themes/oxygen-gtk-1.4.6-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/dbus-glib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,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_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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_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_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_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_s390_32(-)?,abi_s390_64(-)?] !x11-themes/oxygen-gtk:0
 SLOT=2
 SRC_URI=mirror://kde/stable/oxygen-gtk2/1.4.6/src/oxygen-gtk2-1.4.6.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	b2c915190b051f55a23b9354b9849847	multilib	98584e405e2b0264d37e8f728327fed1	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8bb507aafc237edcac112168aa0aaf99
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200901 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200901
new file mode 100644
index 000000000000..065338d999c5
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200901
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst postrm preinst
+DESCRIPTION=icon theme for Linux
+EAPI=7
+HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20200901.tar.gz -> papirus-icon-theme-20200901.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=763f6c5277b87852b438d9d268dff26e
diff --git a/metadata/md5-cache/x11-themes/qtcurve-1.9.0-r1 b/metadata/md5-cache/x11-themes/qtcurve-1.9.0-r1
index 9a4bf672b84e..6c865de8559d 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-1.9.0-r1
+++ b/metadata/md5-cache/x11-themes/qtcurve-1.9.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=gtk? ( X ) || ( gtk qt5 ) plasma? ( qt5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KDE/qtcurve/archive/1.9.0.tar.gz -> qtcurve-1.9.0.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a14467c3a116d6accf6af3e4f9f93c99
diff --git a/metadata/md5-cache/x11-themes/qtcurve-9999 b/metadata/md5-cache/x11-themes/qtcurve-9999
index a8e4110e9560..88ba7dba90bf 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-9999
+++ b/metadata/md5-cache/x11-themes/qtcurve-9999
@@ -11,5 +11,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( dev-qt/qtprintsupport:5 kde-framework
 REQUIRED_USE=gtk? ( X ) || ( gtk qt5 ) plasma? ( qt5 )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	kde.org	074252323c6185f751658b74c09b68ff	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53b1d9c047b2a7e5798b995ea67b4429
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 23e82bdd9166..7125f000b979 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/ctwm-4.0.3 b/metadata/md5-cache/x11-wm/ctwm-4.0.3
index 19b849016afd..343796897b67 100644
--- a/metadata/md5-cache/x11-wm/ctwm-4.0.3
+++ b/metadata/md5-cache/x11-wm/ctwm-4.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt
 SLOT=0
 SRC_URI=https://ctwm.org/dist/ctwm-4.0.3.tar.xz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c79a70e53d87dca40fa1bfe817577219
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.24.2 b/metadata/md5-cache/x11-wm/enlightenment-0.24.2
index 61f9438d15ae..bca6d1c87c1f 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.24.2
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.24.2
@@ -5,11 +5,11 @@ DESCRIPTION=Enlightenment window manager
 EAPI=7
 HOMEPAGE=https://www.enlightenment.org
 IUSE=acpi bluetooth connman doc geolocation nls pam policykit systemd udisks wayland wifi xwayland
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.24.1[eet,fontconfig,X] virtual/udev x11-libs/libXext x11-libs/libxcb x11-libs/xcb-util-keysyms x11-misc/xkeyboard-config acpi? ( sys-power/acpid ) bluetooth? ( net-wireless/bluez ) connman? ( dev-libs/efl[connman] ) geolocation? ( app-misc/geoclue:2.0 ) pam? ( sys-libs/pam ) policykit? ( sys-auth/polkit ) systemd? ( sys-apps/systemd ) udisks? ( sys-fs/udisks:2 ) wayland? ( >=dev-libs/efl-1.22.0[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman ) xwayland? ( dev-libs/efl[X,wayland] x11-base/xorg-server[wayland] )
 REQUIRED_USE=xwayland? ( wayland )
 SLOT=0.17/0.24.2
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.2.tar.xz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	optfeature	6c9aa35fc16df43d7142ef2660e00e25	python-utils-r1	e41e32d357e5bdd388b5be2ce24f3883	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18b9d2613c385b9730ac6922e97bab59
+_md5_=8aa16ee860ced1804e8c3696d039c3bb
diff --git a/metadata/md5-cache/x11-wm/lumina-1.6.0 b/metadata/md5-cache/x11-wm/lumina-1.6.0
index d978343cd1cb..d872a9232c34 100644
--- a/metadata/md5-cache/x11-wm/lumina-1.6.0
+++ b/metadata/md5-cache/x11-wm/lumina-1.6.0
@@ -1,13 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5
 DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtsvg:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5 dev-qt/qtdeclarative:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm desktop-utils? ( app-text/poppler[qt5] ) dev-qt/linguist-tools:5
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm desktop-utils? ( app-text/poppler[qt5] )
 DESCRIPTION=Lumina desktop environment
-EAPI=6
+EAPI=7
 HOMEPAGE=https://lumina-desktop.org/
 IUSE=desktop-utils
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtsvg:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5 dev-qt/qtdeclarative:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm desktop-utils? ( app-text/poppler[qt5] ) sys-fs/inotify-tools x11-misc/numlockx x11-wm/fluxbox || ( x11-apps/xbacklight sys-power/acpilight ) media-sound/alsa-utils sys-power/acpi app-admin/sysstat
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm desktop-utils? ( app-text/poppler[qt5] ) app-admin/sysstat media-sound/alsa-utils sys-fs/inotify-tools sys-power/acpi || ( x11-apps/xbacklight sys-power/acpilight ) x11-misc/numlockx x11-wm/fluxbox
 SLOT=0
 SRC_URI=https://github.com/trueos/lumina/archive/v1.6.0.tar.gz -> lumina-1.6.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f94a6387250c033b4bafa2b16544fc9d
+_md5_=e11bc947dd7b9cdb79f758e72117894e
diff --git a/metadata/md5-cache/x11-wm/lumina-9999 b/metadata/md5-cache/x11-wm/lumina-9999
index 0d5bcc5655b6..39ac26fc27e4 100644
--- a/metadata/md5-cache/x11-wm/lumina-9999
+++ b/metadata/md5-cache/x11-wm/lumina-9999
@@ -1,12 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtsvg:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5 dev-qt/qtdeclarative:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm dev-qt/linguist-tools:5 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm
 DESCRIPTION=Lumina desktop environment
-EAPI=6
+EAPI=7
 HOMEPAGE=https://lumina-desktop.org/
 IUSE=desktop-utils
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtsvg:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5 dev-qt/qtdeclarative:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm sys-fs/inotify-tools x11-misc/numlockx x11-wm/fluxbox || ( x11-apps/xbacklight sys-power/acpilight ) media-sound/alsa-utils sys-power/acpi app-admin/sysstat
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm app-admin/sysstat media-sound/alsa-utils sys-fs/inotify-tools sys-power/acpi || ( x11-apps/xbacklight sys-power/acpilight ) x11-misc/numlockx x11-wm/fluxbox
 SLOT=0
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c8db7f79d5149a5080fee3ff6d27f0a3
+_md5_=9c70b8a7acbed017c6b88cfb8649c0a1
diff --git a/metadata/md5-cache/x11-wm/marco-1.24.1-r1 b/metadata/md5-cache/x11-wm/marco-1.24.1-r1
new file mode 100644
index 000000000000..fd8c519897b3
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/marco-1.24.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk >=dev-libs/glib-2.58:2 >=gnome-base/libgtop-2:2= media-libs/libcanberra[gtk3] x11-libs/cairo >=x11-libs/pango-1.2[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXpresent x11-libs/libXrandr x11-libs/libXrender >=x11-libs/startup-notification-0.7 xinerama? ( x11-libs/libXinerama ) !!x11-wm/mate-window-manager app-text/yelp-tools >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.0.0 virtual/pkgconfig x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=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.24
+DESCRIPTION=MATE default window manager
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=startup-notification test xinerama
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=FDL-1.2+ GPL-2+ LGPL-2+ MIT
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.58:2 >=gnome-base/libgtop-2:2= media-libs/libcanberra[gtk3] x11-libs/cairo >=x11-libs/pango-1.2[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXpresent x11-libs/libXrandr x11-libs/libXrender >=x11-libs/startup-notification-0.7 xinerama? ( x11-libs/libXinerama ) !!x11-wm/mate-window-manager gnome-extra/zenity >=mate-base/mate-desktop-1.20.0 virtual/libintl
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://pub.mate-desktop.org/releases/1.24/marco-1.24.1.tar.xz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	5e9aaae6eb511a4c4d9964fe8259110d	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	mate	0746707eb54b01af9c594947527af4eb	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=92eebffd59873a7c1c3893c799f2e076
diff --git a/metadata/md5-cache/x11-wm/notion-3_p2013030200 b/metadata/md5-cache/x11-wm/notion-3_p2013030200
deleted file mode 100644
index 51d5033fbb3a..000000000000
--- a/metadata/md5-cache/x11-wm/notion-3_p2013030200
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-lang/lua-5.1:0= x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) virtual/pkgconfig
-DESCRIPTION=Notion is a tiling, tabbed window manager for the X window system
-EAPI=5
-HOMEPAGE=https://notionwm.net/
-IUSE=nls xinerama +xrandr
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/lua-5.1:0= x11-libs/libSM x11-libs/libX11 x11-libs/libXext nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/notion/files/notion-3-2013030200-src.tar.bz2
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=95dc2b4c4df783ef5e40b5f433b2cb11
diff --git a/metadata/md5-cache/x11-wm/ratpoison-1.4.8-r1 b/metadata/md5-cache/x11-wm/ratpoison-1.4.8-r1
index cecb172e1271..c07d885afc9f 100644
--- a/metadata/md5-cache/x11-wm/ratpoison-1.4.8-r1
+++ b/metadata/md5-cache/x11-wm/ratpoison-1.4.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) virtual/perl-Pod-Parser x11-libs/libXinerama x11-libs/libXtst
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/ratpoison/ratpoison-1.4.8.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=2d8f960a8ccfeb78acfcdc5d68a37d3d
diff --git a/metadata/md5-cache/x11-wm/ratpoison-1.4.9 b/metadata/md5-cache/x11-wm/ratpoison-1.4.9
index c27f5f4b8186..3fc285f1036e 100644
--- a/metadata/md5-cache/x11-wm/ratpoison-1.4.9
+++ b/metadata/md5-cache/x11-wm/ratpoison-1.4.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libXtst
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/ratpoison/ratpoison-1.4.9.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=a53f6833c874a22bc585cb07a6194b69
diff --git a/metadata/md5-cache/x11-wm/ratpoison-9999 b/metadata/md5-cache/x11-wm/ratpoison-9999
index 41ac69da1703..b52f01c9f85e 100644
--- a/metadata/md5-cache/x11-wm/ratpoison-9999
+++ b/metadata/md5-cache/x11-wm/ratpoison-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) history? ( sys-libs/readline:= ) xft? ( x11-libs/libXft ) xrandr? ( x11-libs/libXrandr ) virtual/perl-Pod-Parser x11-libs/libXtst
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	848a95b01913ff6374bcb5eae09c52ba	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	git-r3	3e7ec3d6619213460c85e2aa48398441	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=cdb861ecefd8b274b54b2d8256be0f20
diff --git a/metadata/md5-cache/x11-wm/sawfish-1.12.0-r1 b/metadata/md5-cache/x11-wm/sawfish-1.12.0-r1
index a0613eb177c1..83f2020c485a 100644
--- a/metadata/md5-cache/x11-wm/sawfish-1.12.0-r1
+++ b/metadata/md5-cache/x11-wm/sawfish-1.12.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 Artistic-2
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) >=dev-libs/librep-0.92.1 >=x11-libs/rep-gtk-0.90.7 x11-libs/gdk-pixbuf:2[X] >=x11-libs/gtk+-2.24.0:2 x11-libs/libXtst kde? ( kde-frameworks/kdelibs4support ) nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/sawfish/sawfish_1.12.0.tar.xz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=1ad6d96940dcb42260fb0ba776a2add0
diff --git a/metadata/md5-cache/x11-wm/sawfish-1.12.90 b/metadata/md5-cache/x11-wm/sawfish-1.12.90
index 0f7af701a5f2..b44cdbc4e76d 100644
--- a/metadata/md5-cache/x11-wm/sawfish-1.12.90
+++ b/metadata/md5-cache/x11-wm/sawfish-1.12.90
@@ -9,5 +9,5 @@ LICENSE=GPL-2 Artistic-2
 RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) >=dev-libs/librep-0.92.1 >=x11-libs/rep-gtk-0.90.7 x11-libs/gdk-pixbuf:2[X] >=x11-libs/gtk+-2.24.0:2 x11-libs/libXtst kde? ( kde-frameworks/kdelibs4support ) nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/sawfish/sawfish_1.12.90.tar.xz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6ad6939b03fa62da81826eb2f5a97fb
diff --git a/metadata/md5-cache/x11-wm/stumpwm-18.05 b/metadata/md5-cache/x11-wm/stumpwm-18.05
index f418c58db66f..6eb84e6fdfec 100644
--- a/metadata/md5-cache/x11-wm/stumpwm-18.05
+++ b/metadata/md5-cache/x11-wm/stumpwm-18.05
@@ -11,5 +11,5 @@ RDEPEND=dev-lisp/alexandria dev-lisp/cl-ppcre dev-lisp/clx >=dev-lisp/sbcl-1.3.0
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=https://github.com/stumpwm/stumpwm/archive/18.05.tar.gz -> stumpwm-18.05.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	common-lisp-3	267124db452231b7e159152d88c6674d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	848a95b01913ff6374bcb5eae09c52ba	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	common-lisp-3	267124db452231b7e159152d88c6674d	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	34cc2b6f6d8914019a353fe39cff43ce	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	db8b7ce9d0e663594bcb4a4e72131a79	multilib	98584e405e2b0264d37e8f728327fed1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bfbe165f138147235de2728b12309b86
diff --git a/metadata/md5-cache/x11-wm/wmfs-201003 b/metadata/md5-cache/x11-wm/wmfs-201003
index c5fd5a43dc48..44a7fdbd573e 100644
--- a/metadata/md5-cache/x11-wm/wmfs-201003
+++ b/metadata/md5-cache/x11-wm/wmfs-201003
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
 SRC_URI=https://github.com/xorg62/wmfs/archive/201003.tar.gz -> wmfs-201003.tar.gz
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd3c150a1dd87966f7770b893122abb6
diff --git a/metadata/md5-cache/x11-wm/wmfs-20180520 b/metadata/md5-cache/x11-wm/wmfs-20180520
new file mode 100644
index 000000000000..697a19ea9950
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/wmfs-20180520
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=Window Manager From Scratch, A tiling window manager highly configurable
+EAPI=7
+HOMEPAGE=https://github.com/xorg62/wmfs
+IUSE=+imlib2 +xinerama
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jer/wmfs-20180520.tar.xz
+_eclasses_=multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6ba0613d890a7a82876664dacd98430b
diff --git a/metadata/md5-cache/x11-wm/wmfs-99999999 b/metadata/md5-cache/x11-wm/wmfs-99999999
index 92a157cf89b0..b004590a31af 100644
--- a/metadata/md5-cache/x11-wm/wmfs-99999999
+++ b/metadata/md5-cache/x11-wm/wmfs-99999999
@@ -1,5 +1,5 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=configure install unpack
+DEFINED_PHASES=configure unpack
 DEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr virtual/pkgconfig x11-base/xorg-proto
 DESCRIPTION=Window Manager From Scratch, A tiling window manager highly configurable
 EAPI=7
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=media-libs/freetype media-libs/imlib2[X] x11-libs/libX11 x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	98584e405e2b0264d37e8f728327fed1	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1b8dad9a80b4a41fa32439099df03ac9
+_md5_=763d90f6d447429c2e83b3042916f4a1
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index a51e0fc7c446..28cbaf6f5152 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/xfdesktop-4.14.2 b/metadata/md5-cache/xfce-base/xfdesktop-4.14.2
deleted file mode 100644
index 1c4750193489..000000000000
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.14.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=>=x11-libs/cairo-1.12 >=dev-libs/glib-2.42 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.14:3 x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-1.7:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Desktop manager for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://www.xfce.org/projects/
-IUSE=debug libnotify +thunar
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/cairo-1.12 >=dev-libs/glib-2.42 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.14:3 x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-1.7:= )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.14/xfdesktop-4.14.2.tar.bz2
-_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7df752e7760a0c3682a66be95afaf69c
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.14.2-r1 b/metadata/md5-cache/xfce-base/xfdesktop-4.14.2-r1
new file mode 100644
index 000000000000..d9cd4cbf0ade
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.14.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=x11-libs/cairo-1.12 >=dev-libs/glib-2.42 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.14:3 x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-1.7:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Desktop manager for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=debug libnotify +thunar
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/cairo-1.12 >=dev-libs/glib-2.42 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.14:3 x11-libs/libX11 >=xfce-base/exo-0.11:= >=xfce-base/garcon-0.6:= >=xfce-base/libxfce4ui-4.13:= >=xfce-base/libxfce4util-4.13:= >=xfce-base/xfconf-4.12.1:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=xfce-base/thunar-1.7:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/xfce/xfdesktop/4.14/xfdesktop-4.14.2.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5317ae7826e52b02802b79aba646fc21
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.14.5 b/metadata/md5-cache/xfce-base/xfwm4-4.14.5
index ab1edb252d26..0e6862c92c6b 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.14.5
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.14.5
@@ -4,10 +4,10 @@ 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-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~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/libXres 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.5.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dda4d57d225aedc1e871ed65c2c31db9
+_md5_=05835e906aa01b5c526ccb5b0f9a3be2
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 74ca32f0c09e..b721860301ff 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/tumbler-0.2.9 b/metadata/md5-cache/xfce-extra/tumbler-0.2.9
index de102d7fc8e2..af42ad5afad3 100644
--- a/metadata/md5-cache/xfce-extra/tumbler-0.2.9
+++ b/metadata/md5-cache/xfce-extra/tumbler-0.2.9
@@ -4,9 +4,9 @@ DESCRIPTION=A thumbnail service for Thunar
 EAPI=7
 HOMEPAGE=https://docs.xfce.org/xfce/thunar/start
 IUSE=curl ffmpeg gstreamer jpeg odf pdf raw
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42:2 media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6 >=x11-libs/gdk-pixbuf-2.14:2 curl? ( >=net-misc/curl-7.25:= ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) >=xfce-base/thunar-1.4 gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/tumbler/0.2/tumbler-0.2.9.tar.bz2
-_md5_=235525ebf136ddb2436a3020c62e2afd
+_md5_=5c5c4030ed78ae3c7632e52e8d96fb7a
diff --git a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.6 b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.6
index bb5fefea4aef..1a9dd36861f7 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.6
+++ b/metadata/md5-cache/xfce-extra/xfce4-whiskermenu-plugin-2.4.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/libintl x11-libs/gtk+:3 xfce-base/exo:= xfce-base/garcon:= xfce-base/libxfce4ui:= xfce-base/libxfce4util:= xfce-base/xfce4-panel:=
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.4/xfce4-whiskermenu-plugin-2.4.6.tar.bz2
-_eclasses_=cmake	9f6da23aab151395c55f018fb13a11b2	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	ac7cb516f6a288b6a82bc0649ce49878	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	98584e405e2b0264d37e8f728327fed1	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f93d2174ab9b6409c88a2c2d48af8b76
diff --git a/metadata/news/2020-02-07-python-2-7-eol/2020-02-07-python-2-7-eol.en.txt b/metadata/news/2020-02-07-python-2-7-eol/2020-02-07-python-2-7-eol.en.txt
deleted file mode 100644
index fb9c16ed55f8..000000000000
--- a/metadata/news/2020-02-07-python-2-7-eol/2020-02-07-python-2-7-eol.en.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-Title: Python 2.7 went EOL
-Author: Michał Górny <mgorny@gentoo.org>
-Posted: 2020-02-07
-Revision: 1
-News-Item-Format: 2.0
-Display-If-Installed: dev-lang/python:2.7
-
-Python 2.7 has reached its end-of-life by 2019-12-31.  Python package
-upstreams have started removing Python 2 compatibility code from their
-packages more aggressively.  This includes common dependencies such as
-dev-python/pytest, dev-python/setuptools and dev-python/sphinx.  While
-we realize that many packages are still dependent on Python 2, providing
-full support for it exceeds our maintenance capabilities.
-
-Upstream is planning to make one more release of dev-lang/python:2.7
-in April 2020.  We are going to continue maintaining and patching
-the interpreter for as long as it is feasible, most likely even after
-all Python 2 packages are gone from Gentoo.
-
-At the same time, we are actively working towards switching
-the distribution to Python 3.  Whenever possible, we are removing
-Python 2 support from packages.  It will remain available for
-the packages missing Python 3 compatibility and their dependencies
-for some more time.  However, packages that have little chances of being
-ported will eventually be removed.
-
-If you are still using Python 2 for your projects, we strongly recommend
-you to migrate away.  For the time being, it is preferable to use
-dev-python/virtualenv or a similar solution rather than ebuilds,
-to install the dependencies for your projects locally.
-
-Regular Gentoo systems will be migrated off Python 2 gracefully.  It may
-be necessary to use --changed-deps or a similar option during system
-upgrades whenever they become blocked by Python 2 packages installed
-earlier.
-
-If you wish to remove Python 2.7 entirely sooner, you can try removing
-python2_7 from PYTHON_TARGETS.  However, this will require adding
-explicit package.use entries if some of the installed packages still
-require Python 2.  An example package.use entry follows:
-
-  # disable py2.7 without altering the other flags
-  */* PYTHON_TARGETS: -python2_7
-  # enable py2.7 for setuptools
-  dev-python/setuptools PYTHON_TARGETS: python2_7
-  # switch a single-impl package to 2.7
-  dev-embedded/libftdi PYTHON_TARGETS: python2_7
-  dev-embedded/libftdi PYTHON_SINGLE_TARGET: -* python2_7
-
-Note that package.use entries are not necessary for packages that
-support one implementation only (i.e. do not support Python 3 at all).
diff --git a/metadata/news/2020-09-28-python-2-7-cleanup/2020-09-28-python-2-7-cleanup.en.txt b/metadata/news/2020-09-28-python-2-7-cleanup/2020-09-28-python-2-7-cleanup.en.txt
new file mode 100644
index 000000000000..5a6e9bc89cf0
--- /dev/null
+++ b/metadata/news/2020-09-28-python-2-7-cleanup/2020-09-28-python-2-7-cleanup.en.txt
@@ -0,0 +1,59 @@
+Title: Python 2.7 cleanup is progressing
+Author: Michał Górny <mgorny@gentoo.org>
+Posted: 2020-09-28
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: dev-lang/python:2.7
+
+Python 2.7 has reached its end-of-life by 2019-12-31, and many projects
+have removed Python 2 support since.  During the last few months we have
+been working hard to migrate Gentoo to Python 3, and we have finally
+reached the point making it possible for the vast majority of our users
+to run a system free of Python 2.7 packages (except for the interpreter
+itself).
+
+The few remaining high profile packages (e.g. dev-python/cython)
+are preserving Python 2.7 only for a very few uncommon packages.
+For this reason, we have decided to create new revisions of them having
+Python 2.7 removed.  If you do not need Python 2.7 there, your package
+manager should upgrade these packages to the new revisions.
+
+Please note that you may need to manually uninstall any Python 2.7
+packages installed from third-party repositories and/or run `emerge
+--depclean` first to remove orphan packages.  The recommended process
+for Portage users is:
+
+    emerge --depclean
+    emerge -vDuU @world
+    emerge --depclean
+
+Please note that the Python 2.7 interpreter (without additional Python
+packages) remains necessary to build a few high profile packages,
+in particular Chromium, Mozilla software and PyPy.  If you build either
+of these packages from source, you will not be able to permanently
+remove Python 2.7 from your system.
+
+We are going to preserve CPython 2.7 (and PyPy2.7) for as long
+as necessary and provide security fixes to the best of our ability.
+However, please note that we are not able to dedicate resources to
+auditing Python 2.7's code and with little community interest in that,
+it should be considered potentially vulnerable.
+
+If your projects still rely on Python 2.7, we would like to once again
+encourage you to migrate them to Python 3.  However, if you really need
+to run them, we suggest using a virtualenv.  To create a new Python 2.7
+environment, install dev-python/virtualenv and use the following option:
+
+    virtualenv -p /usr/bin/python2.7 ...
+
+To create a PyPy2.7 environment:
+
+    virtualenv -p /usr/bin/pypy ...
+
+Modern versions of pip should be able to automatically select older
+versions of packages that still support Python 2.7.  Please note that
+these versions are generally no longer supported.  They can be buggy,
+vulnerable or simply incompatible with one another.
+
+Please do not forget to add dev-lang/python:2.7 to your @world set
+or it may get depcleaned once all package dependencies are gone.
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 91356f75f26d..83cdda9ff3ad 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 12235 BLAKE2B dbb60bbb8f87fff007fe44224c2735eb946d061155e7239779e7ab2f73fa33264cea331b66bc73c360c40e80378b814649d169b243b848f9c0672acf7aeac90d SHA512 e634fed7d907071bc7b2c21ddf7367fb5d246d619d7af9c4d07a68ee8d16dad912b5953d0a543cbb93d9f2800013ef0c73196e210c4e8bebebf3b4436ff905ee
-TIMESTAMP 2020-09-23T21:38:30Z
+MANIFEST Manifest.files.gz 12242 BLAKE2B 63708e1e51b16a34a3f2a50a323f3af5b5b915560c0d248ae23b0b8063bdc4daa42999e12540ecf402753557b8be008f183bd9a3362df2a8f759d0570eb42801 SHA512 ae0f4bf6ad260e68b33f0fea3cb44d30aa724f573ded1559f1d30ca00b5a8f42e24129f34d4bfdd6c445dcfbfce001adc85474be53ed6ee989e703f11ff64aba
+TIMESTAMP 2020-09-30T15:38:36Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl9rwFZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl90pnxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBpog/+Pgscgh/gzydcp2PAV18vHD9NfwdgTR7G04SicnX3l43uLRDFivgklgAW
-3/7Lf7g6qQZQCED4DOTWGJRQD2SCrl0EiwpQAtyBiqR9DzUPGeT/kGkb8VedD/6t
-dEqA2UbRDb2YkS0b0zRWgR3VfVBcfPNpuJt4cOZjgvE/Zv4Y2yOb4ulZiJ9yFp62
-8vbtSYdZu3Ge5F9JrAWfJq0nyLIK/c6TOdvPNAiRV8t5ixxzFkn7MKDHU2sbaAY/
-j4MhfvA2u9OHt8rqv88dEGRXNlfpOBwP7z3i6ygKjWKmaZ3tAtPMFLnP5xO1gnM0
-eunO8kG313WufImYfDd/5cYV9hxEP4m12FvoxL5I6zXnqR/T2vuZRhZi401k6mFP
-T7DilDUtYk3NFkXL0/fD9JoPCgcPgLX0fw96TdbrXiDmhD3VOvIuHSotX/GmTvGU
-f09OOCi0OXqSQCegg7wU2kEDUCmx3AFJ1HuPU2555oXtdzDeFJUkzB0pAXYBwWvI
-ixUDfOQekPot27EjTjjB5vWHxd3dprlSUYDyB/oxx9rneG6Opkxyum9RhwnbUiax
-ro8TIb1PwHYw0zO4c1riypvnK14iCVok4721LXy57NmnSb3D/F826HiGc0Mgx21V
-JIkvZ18vbMQ4ofjnZXjs7T/QCOwaJgdCsuOE2D4z1mBNL0ORK+M=
-=80Ii
+klArwg//SCz525mHZOi6NZrhwX+OlOGZUSliB8f1CALiqhkDHsG1G0PAiIpPm3V4
+SROlwGxsSWDVIKZqLWQWlihthBUbOOuWXxbrEsjNVnFXs7+JoNhkracNgBTy0A9N
+t/Ax3/0++91VIit0wX/7o36UnqVZjwIyx57tRK4duiLXDhnjuttPsEWYjj4+qbqm
+hfAS77qRFL/38rPbomgQVht3A5BJFdhzZX4bTLBc4c9fPtfzeXBmMZju/jxvpvA3
+VAZ4Bg4SgfeKfFldojaosn4Nf27SWxo1ssP7vHKp4UtzThJO6LOkCr9CKmmeJOlR
+MHPMUlToerSxoiFpDdGlfAjr4Lv1zzQB1YtRHtuowsgdHCpbmBHFc/eLINyHKxaV
+tqzMLc9OjiX2rJmU2UbwbfguL1fVIC7BepXsDWYw+A80DOoaEsDwmA9M3VaeZYx3
+ndAt8ygMj3HG9XiPLUDZTjjOhvf5EhPBGBM9nJxhsrtnERb9mXCiUREl+/bzxUHd
+ijAY6taPbmjcRvqZJTK+04m7T88SSwvWZ3SWtbMelkPe0V34Zb6WMPVg9wZB0m9p
+caqswYl+eQlDd3yIzpFmm4T3PdbifqyHwCwDjIjc4lVGix8XW/0BNgyBZkCwjd07
+g7gZE8h4kb9vamoNcHaTGUeV0kz9WY9vXVjm/q+i6BkiudYGh3E=
+=L3Fx
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index eafb949ba680..fbbe9a9a6eb3 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b272585312a4..ef606278e760 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Sep 2020 21:38:27 +0000
+Wed, 30 Sep 2020 15:38:33 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 8f0cff7f3706..be0a717ea9c3 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-28c8d820d4912d5e86d6b64d6ed5ae19dee5ace8 1599388904 2020-09-06T10:41:44+00:00
+33358d385bbf206509e018b9208f126d647a1702 1601308260 2020-09-28T15:51:00+00:00
diff --git a/metadata/qa-policy.conf b/metadata/qa-policy.conf
index 4ba561f4cce0..4ba634a40fb5 100644
--- a/metadata/qa-policy.conf
+++ b/metadata/qa-policy.conf
@@ -71,6 +71,7 @@ autotools-multilib = multilib-minimal
 autotools-utils = (none)
 base = (none)
 epatch = (eapply since EAPI 6)
+eutils = (split into several eclasses)
 fdo-mime = xdg-utils
 games = (none)
 ltprune = (inline find ... -delete)
diff --git a/metadata/timestamp b/metadata/timestamp
index 945ebd6d2392..8fcc6fae6e8e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed 23 Sep 2020 09:38:26 PM UTC
+Wed 30 Sep 2020 03:38:33 PM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b1c6d1cb717c..2249c5e428c1 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Sep 2020 21:45:01 +0000
+Wed, 30 Sep 2020 15:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f9304413ccc4..a5206360bbcf 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3353db751dea4c7a1795e75ec3b6f20b143cb66f 1600892706 2020-09-23T20:25:06+00:00
+fec7291fc8e3442ce5a65276c7a947006639a0b7 1601479838 2020-09-30T15:30:38+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5021c6e6204f..c5f7720ae329 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1600896901 Wed 23 Sep 2020 09:35:01 PM UTC
+1601480101 Wed 30 Sep 2020 03:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b272585312a4..ef606278e760 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 23 Sep 2020 21:38:27 +0000
+Wed, 30 Sep 2020 15:38:33 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 80da0c8e0e3f..7579f131d900 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/apinger/Manifest b/net-analyzer/apinger/Manifest
index eeb25e4286fb..14db19686077 100644
--- a/net-analyzer/apinger/Manifest
+++ b/net-analyzer/apinger/Manifest
@@ -1,6 +1,8 @@
 AUX apinger-0.4.1-fno-common.patch 193 BLAKE2B c13aa8e654dc58b9802a4b2b56b2bb4f9004a5556c46997dcee1e028b67d226057d9e09e779f91d08629bb5ff447ed6cc70739d8bcd5da39b5e59fa3bedf3e38 SHA512 f80653f38f9d4e5d6196f3c4d7643c8b9ed4198b56125a1348ea458faba7e202ffce8d36b5cc58223b76bbb5a4957405b4087d26cc67e203b55be7fe1eb1bf7a
-AUX apinger-0.4.1-stray-backslash.patch 433 BLAKE2B 99eb5ad5765fdc0f12aee3a1a537579d222a8ea986305710841bcf7a9a7dc84b834357d6edbde4be39e89e8afa0978175fb0f007123bc0d857f1376e91ccf749 SHA512 f84c0b789ca3918b5f8679553448f0d4f4cbf018c46b86b388c8aa05cd656b675d3edf93fba042940143f5b53ce4f1fa711b7978896870d42a2ef64e885e0924
+AUX apinger-0.4.1-stray-backslash.patch 435 BLAKE2B 1a2cd0437152455ae965cdc86220a2eba3a3f30b8bb7515077982c03ba44a17a0e4de059432e0bcefc790d190d69bd128c192c01addc938a249a9573080fcaa2 SHA512 433521183c32c6bd414d5317e9c69fa2b28f3afeadaf47fdccb238a24cc245d347581d021e167bb58b191825547e349bee8b07d8a071f30771262e0abb62bb09
 DIST apinger-0.4.1.tar.gz 26328 BLAKE2B 72eb19c043642dc00e02f24bfd8f3f9f704cc8a2fb5b5937756706db561dd7dc5173706c7ede73dde778964a516b7b138fe664c243db5351ac440fc80244c843 SHA512 b8a67149f43da5b6e240dee97315c31a3e6257f1de70da81a6aa63d1e1d7d5bff0b54abe5085a57e90eb7789b7fa8b83c09a51411a6247a81b6f99de3d83120f
+DIST apinger-0.6.1.tar.gz 134127 BLAKE2B 8f54d5514a5410973b5f44166741582fc16a2b0b1398eab001943e2924704ae5400e2c0ce4ca1694cadfc6fa3e47d395aa3d6affd7e4873fb172bf027c26c251 SHA512 eca6cee186d538200619188d9481154114ef9d7eae4f11f389eb61382f507d108bc64622fe99b1bae17ecc3ca7b2bc4ff4d0a3156ebf2913803e7be24b0d3f94
 EBUILD apinger-0.4.1-r1.ebuild 733 BLAKE2B 51db5b417614c778eb4ec100eed95ddac2d8049756cba6e45a97be97a11126a969a3d4f9355cd93a74f1b75cc92cafbf16dac4f37238adfae4b85128197d2fc7 SHA512 23c71ab5e2d1582b0b0f69b7044d1c6a5425f98bfa60a5a874ceb1e81764520ce96ab73e224e9c98a4fa0af519a9f9d648477c7bf8bcf0d42188c3c390b7e07d
 EBUILD apinger-0.4.1.ebuild 743 BLAKE2B 57eb7e4a4ce2dfbe0a29b4e78c901253b5ce423295818411b83d4abc7c4fa14e442fa89d63d0826ea8442470922c06727e9e262bf977b7ae838213203800be0b SHA512 adfff7423e594620a5697c86dce8fc3a274f31041fc1886a135622b299f1a809bed79d4bb64288e899b42702228559919cf88353bbf1d3a7b57de313e9736376
+EBUILD apinger-0.6.1.ebuild 653 BLAKE2B ec8919aa06aed60b9d708db4cebc956f33b1edd4cfe3a9747ab18692cac5e6e3e87d25d7cb35a87c6bf6dbffc6e91a74660bab96c53527ac9c4b0050dfdd2a7b SHA512 35a1debe8187771a35beea8771698bea355e3f27388b2c4bd4efc3d53a34f49fe67a007f5f2555b13b1aebbc18a58fd9beb3d5be407d149cd99743c4d91c1770
 MISC metadata.xml 359 BLAKE2B 929365ca07ce887876998e51742a78e8f4a9250c42367ad458458d450b4f08ccc91d510bd6269b916f788ffb59c3ec61f0792722c83cfd54020b2913b7ea8773 SHA512 d4166ecf10d6c588adc68ccd871986e7de28191c76a18b45922925552d30534e1631b61974e21a477f9c9facedf698a964256f08b04ad3e0bbdfec87c5246d8b
diff --git a/net-analyzer/apinger/apinger-0.6.1.ebuild b/net-analyzer/apinger/apinger-0.6.1.ebuild
new file mode 100644
index 000000000000..46661a8ba3e7
--- /dev/null
+++ b/net-analyzer/apinger/apinger-0.6.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Alarm Pinger"
+HOMEPAGE="https://github.com/Jajcus/apinger/"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.1-fno-common.patch
+	"${FILESDIR}"/${PN}-0.4.1-stray-backslash.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	emake -C src/ cfgparser1.h
+	default
+}
+
+src_install() {
+	default
+	insinto /etc
+	doins src/${PN}.conf
+}
diff --git a/net-analyzer/apinger/files/apinger-0.4.1-stray-backslash.patch b/net-analyzer/apinger/files/apinger-0.4.1-stray-backslash.patch
index 61db76fb9232..3c5d5158563a 100644
--- a/net-analyzer/apinger/files/apinger-0.4.1-stray-backslash.patch
+++ b/net-analyzer/apinger/files/apinger-0.4.1-stray-backslash.patch
@@ -1,4 +1,4 @@
---- acinclude.m4
+--- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -39,8 +39,8 @@
  		[$jk_inet_includes
diff --git a/net-analyzer/arpon/Manifest b/net-analyzer/arpon/Manifest
index 634481321085..c56c66009953 100644
--- a/net-analyzer/arpon/Manifest
+++ b/net-analyzer/arpon/Manifest
@@ -1,8 +1,14 @@
 AUX arpon-2.7.2-CFLAGS.patch 407 BLAKE2B 5cb747ba4f8153a1f1e13da49fc9cb8f55b75b8f80b17ea3c336d4feb863f23dfe08d93209a646b85301d8d0ba7d76a958e5d5468b47b08dcb6ec8be307d7b92 SHA512 9029ddc9b024e62f21a49faab5c39008bec22b88cd6fac5f31ebb7327357159d6ec36f0f750bb4d5e985115d553b95b8c1daf2794e9edb7c40dae06fd8872a07
 AUX arpon-2.7.2-etc.patch 356 BLAKE2B 5cbec9b24dfd2a75f1a743e7a08031945fbadb7f6f50d3b62c611fa797abf3f866fca7f4f2e8d880544effa5411c1fec408ef4e43d96af2859bcb16215ae4121 SHA512 2bafa030d87d9b216902246053d2521ed4395c89d12b2bddef4e38671442a5d1e54afc8bde3a77944e93f93b703f1f60b0f6f84535fefc8331ec59aecb69e492
+AUX arpon-3.0-CFLAGS.patch 1787 BLAKE2B 234bc1d6d991e17458c4abbdba64afcc4edde4cdd70f734fade44e50059545b453f2ce93b9f46b180db8e671287045aeafda9158f78541b699a888d81effe8c4 SHA512 032959619ac5a33aa52ef589661659d4ad3842a7778bb40dd1c8d45fa6f1edac02dc8b4078fbdb41b8af52d2f7423c1d54ac2246582aec563fab42ae8859295e
+AUX arpon-3.0-gentoo.patch 4736 BLAKE2B 854efd88ff29b13defdae4d57ca97f00066a9a21528d23df2014f031dfe6467fe60de06bf9f99f72eed8745a9c1df86bb6f9d362ce0e637a0d221c3ea59ce304 SHA512 63f9122d1cfb5e05bb32f7dbf9a9fde9e7f155b16d0f42fc890cbccaf8409773bbcd2907e08f69fdc3739d0683c7495d132a663f8f9f6ce83405b6380f02f807
 AUX arpon.confd 128 BLAKE2B 864417d8892d037f005123938b3ffd970c69f6ad06fdc6e031872250a126fb92a63ccb247e6f49a8e6e716a1138443df29d2838e5a1c73e44e04632977f78789 SHA512 1300ffd903366a5970c5c2b6b7a570ee6e1e696d18a5f16340c7f192c5ff4e41694a180e0d5ab86c1fb64bd015dab94eb52ef5ff429280b56f5ec4112abe3b11
+AUX arpon.confd-3 75 BLAKE2B 3a054d7d5392a9a877aafc25687f15ddf6a483122fc29ba34a4399e31be2ce009b42a5a8b69fd4a1486f1b37d917221a7c7121449006210b8a38213709c1a2e9 SHA512 c13b5fd267ac0e96a30d235917ba644035d05e13c4cd8121081fa7a0d97fc921a1f828727e462245e701ae84b75738fb39dbc95c133f11d53641412669d3c584
 AUX arpon.initd 406 BLAKE2B b519b05207a2cf54301493d85a5b50205d27bacc5c4eb2dedb18ccc450a01b74b9d159da0c66b6aed20a31ec454747e0ab533906633cd8dc7ab6bdaaa9d44ca0 SHA512 5a889f94fa495ee63475a8ca2774b09247548a0a7170b32b0c74ed5808822818fda23516959ad4c3598ed39f31ad2a2ab68b81f00a715267b0d12e194532324a
+AUX arpon.initd-3 472 BLAKE2B 159774908987a99ce884248d1a972d0c74395b29637f7adc638429925daa98bcd52b6393a73d7e81177c0b9c108ebbc251087587e866d484cd10d60a18af68b0 SHA512 22216841bd716052a25195e2ae693c13b9f1da503195b2a22a1fc0dcab3377c94a02c4e9c1115359b4e40eb63a56fe207767815edb11c42d01bdd75411b5a057
 DIST ArpON-2.7.2.tar.gz 2780607 BLAKE2B 58d7a0db475658d90112441508d4c4d9babd601533a6ab9a22b24f07e037b6f3debcbe0f3c1f09a87b7e0cdf9217a38f52b85431db023d12b0f1ee58765e0bfb SHA512 7518f8f8920817725c9b3e0a6420190dcc101b1c0c7cd9eec50870b3f893fe2322eddc90cb71e9c3c35326b4e1730aa02797ca51775caa9401807da3978628b4
+DIST ArpON-3.0-ng.tar.gz 8795979 BLAKE2B 81b1fe9a426b5b0960911cbbac984482aeea15a957fac72a10e7dd9a45a609da90ca14163957cc008541be4cfaf426f07fa9c64ac4dff933f568b20284c5211d SHA512 e6338018d65f3f8300958e168a9eb6f6be85cba21ae0aee4b03e9838a29a06afbf2448c2f104367aa18389cc549e4489bcf8dad384ad46eadf2884a0908238af
 EBUILD arpon-2.7.2-r1.ebuild 727 BLAKE2B e401df619a1da645dad882e67b69451a01d2837475d39a755b453575698f90cf021bb7165016aff0805f4fa7d6fd2852ac6ecfeddb43deb7cd86b68d0aa94965 SHA512 a81ed2f8a530ffb3a9781ca5785c58d0adc01867f650eedda0511fc94376b3f077ef8fb99e221ce1e82b04c796a466c0c2c579203820f5ee8a400867f236b8b6
 EBUILD arpon-2.7.2.ebuild 884 BLAKE2B e83db5a744d62b0a7f7f3e7441a300345f81799617c93f220f320cb61f653c209aaa631fb0525d159c95337d83d339ca19e979a8cd3f4a35580e487c8085101d SHA512 4427110fc2ac7557d57d2bf9b453bb2b121ac5121e287d4273f1aea4bdc503ab38f64092c1776ca64d2ad66fddbeae4a25c82b53b98d6734b3a3347b070adbbe
-MISC metadata.xml 242 BLAKE2B ff85d6f7c94b7a327031d666c89344f6d69ed7a8c5cac45f89650c5f3aeb43edd3a4c7b5814ace420c7804a411235ba0f7deda58424e417681f74f9468e0ef0e SHA512 a01133ba691e36e58aa94e18a91db4a4a42b8ae621540319cab84241a07cc541263f753268ab759430699332a77018423c1a54d886d9c2fd3fab24537b64742d
+EBUILD arpon-3.0.ebuild 836 BLAKE2B 8a6da8f0a5a6b82d0908dbeacf5309f5ec657e8e0c61966aaad40595da2a324102015cba0160b5b7d20bfc1541d19795c3a6cc8d35ec842316820daddd54c590 SHA512 bc05ddc3562710bbe8cb5a94b03fd74cd880dd62c8a0a5182e51d15fc231bee00248db728273d81ae6bb624d3f38deb7dea05ad7b658789c97524a7d8b1c19ca
+MISC metadata.xml 285 BLAKE2B d232c837f5b78009aedc859ac2aa78da0775cb937b3742bec976767463c738db4054feb51e08725449432ef4c74add9697e2781938819d6e35cdccdfaaa2b590 SHA512 16762a0e8ae17a8f288d969f0f8d9dc15ce522c2c0e007007830dd3efe1ae96dc53f0d034f591fb6b6f7eb039fbde52f37f596bf9a34805900952391540bee4a
diff --git a/net-analyzer/arpon/arpon-3.0.ebuild b/net-analyzer/arpon/arpon-3.0.ebuild
new file mode 100644
index 000000000000..6d1866670e89
--- /dev/null
+++ b/net-analyzer/arpon/arpon-3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler"
+
+MY_PN="ArpON"
+MY_P="${MY_PN}-${PV}"
+HOMEPAGE="http://arpon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-ng.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/libdnet
+	net-libs/libnet:1.1
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0-CFLAGS.patch
+	"${FILESDIR}"/${PN}-3.0-gentoo.patch
+)
+DOCS=( AUTHOR CHANGELOG README THANKS )
+S="${WORKDIR}"/${MY_P}-ng
+
+src_install() {
+	cmake_src_install
+	newinitd "${FILESDIR}"/${PN}.initd-3 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-3 ${PN}
+
+	rm -r "${ED}"/var/{log,run} || die
+	mv "${ED}"/usr/share/doc/{${PN},${PF}} || die
+}
diff --git a/net-analyzer/arpon/files/arpon-3.0-CFLAGS.patch b/net-analyzer/arpon/files/arpon-3.0-CFLAGS.patch
new file mode 100644
index 000000000000..7cc917b305c7
--- /dev/null
+++ b/net-analyzer/arpon/files/arpon-3.0-CFLAGS.patch
@@ -0,0 +1,17 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -88,12 +88,12 @@
+     message(STATUS "Build type: Debug")
+ 
+     set(CMAKE_BUILD_TYPE "Debug")
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wextra -Wformat=2 -Winit-self -Wreturn-type -Wswitch-default -Wswitch-enum -Wunused-parameter -Wuninitialized -Wstrict-aliasing=3 -Wstrict-overflow=5 -Wdeclaration-after-statement -Wundef -Wpointer-arith -Wunsafe-loop-optimizations -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsizeof-pointer-memaccess -Wlogical-op -Waggregate-return -Wstrict-prototypes -Wold-style-declaration -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wlong-long -Wvariadic-macros -Wvarargs -Wvla -Wdisabled-optimization -Woverlength-strings -O0 -g -ggdb")
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat=2 -Winit-self -Wreturn-type -Wswitch-default -Wswitch-enum -Wunused-parameter -Wuninitialized -Wstrict-aliasing=3 -Wstrict-overflow=5 -Wdeclaration-after-statement -Wundef -Wpointer-arith -Wunsafe-loop-optimizations -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsizeof-pointer-memaccess -Wlogical-op -Waggregate-return -Wstrict-prototypes -Wold-style-declaration -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wlong-long -Wvariadic-macros -Wvarargs -Wvla -Wdisabled-optimization -Woverlength-strings")
+ else(cmake_build_type_tolower STREQUAL "debug")
+     message(STATUS "Build type: Release")
+ 
+     set(CMAKE_BUILD_TYPE "Release")
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wextra -O3 -DNDEBUG")
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -DNDEBUG")
+ endif(cmake_build_type_tolower STREQUAL "debug")
+ 
+ find_package(Headers)
diff --git a/net-analyzer/arpon/files/arpon-3.0-gentoo.patch b/net-analyzer/arpon/files/arpon-3.0-gentoo.patch
new file mode 100644
index 000000000000..1deda181acf0
--- /dev/null
+++ b/net-analyzer/arpon/files/arpon-3.0-gentoo.patch
@@ -0,0 +1,146 @@
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -31,7 +31,7 @@
+ 
+ set(arpon_doc_src "${CMAKE_SOURCE_DIR}/doc/arpon")
+ 
+-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+     install(DIRECTORY ${arpon_doc_src}
+         DESTINATION /usr/share/doc
+         FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
+@@ -41,7 +41,7 @@
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc
+         FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
+         COMPONENT Doc)
+-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+ 
+ #
+ # EOF
+--- a/log/CMakeLists.txt
++++ b/log/CMakeLists.txt
+@@ -31,7 +31,7 @@
+ 
+ set(arpon_log_src "${CMAKE_SOURCE_DIR}/log/arpon.log")
+ 
+-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+     install(FILES ${arpon_log_src}
+         DESTINATION /var/log
+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
+@@ -41,7 +41,7 @@
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/log
+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
+         COMPONENT Log)
+-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+ 
+ #
+ # EOF
+--- a/etc/CMakeLists.txt
++++ b/etc/CMakeLists.txt
+@@ -31,7 +31,7 @@
+ 
+ set(arpon_etc_src "${CMAKE_SOURCE_DIR}/etc/arpon.conf")
+ 
+-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+     install(FILES ${arpon_etc_src}
+         DESTINATION /etc
+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+@@ -41,7 +41,7 @@
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/etc
+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+         COMPONENT Etc)
+-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+ 
+ #
+ # EOF
+--- a/run/CMakeLists.txt
++++ b/run/CMakeLists.txt
+@@ -31,7 +31,7 @@
+ 
+ set(arpon_run_src "${CMAKE_SOURCE_DIR}/run/arpon.pid")
+ 
+-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+     install(FILES ${arpon_run_src}
+         DESTINATION /var/run
+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+@@ -41,7 +41,7 @@
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/run
+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+         COMPONENT Run)
+-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+ 
+ #
+ # EOF
+--- a/man8/CMakeLists.txt
++++ b/man8/CMakeLists.txt
+@@ -31,7 +31,7 @@
+ 
+ set(arpon_man_src "${CMAKE_SOURCE_DIR}/man8/arpon.8")
+ 
+-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+     set(ARPON_DOC_FILE
+         "/usr/share/doc/arpon/index.html")
+     set(ARPON_ETC_FILE
+@@ -49,7 +49,7 @@
+         "${CMAKE_INSTALL_PREFIX}/log/arpon.log")
+     set(ARPON_PID_FILE
+         "${CMAKE_INSTALL_PREFIX}/run/arpon.pid")
+-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+ 
+ file(READ ${arpon_man_src} FILE_CONTENT)
+ string(REGEX REPLACE "ARPON_DOC" "${ARPON_DOC_FILE}"
+@@ -65,7 +65,7 @@
+     MODIFIED_FILE_CONTENT4 "${MODIFIED_FILE_CONTENT3}")
+ file(WRITE ${PROJECT_BINARY_DIR}/man8/arpon.8 "${MODIFIED_FILE_CONTENT4}")
+ 
+-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+     install(FILES
+         ${PROJECT_BINARY_DIR}/man8/arpon.8 DESTINATION /usr/share/man/man8
+         PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
+@@ -76,7 +76,7 @@
+         ${CMAKE_INSTALL_PREFIX}/share/man/man8
+         PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
+         COMPONENT Man)
+-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+ 
+ #
+ # EOF
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -29,13 +29,13 @@
+ # $ArpON: CMakeLists.txt,v 3.0-ng 01/29/2016 03:07:40 spikey Exp $
+ #
+ 
+-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
+-    set(ARPON_SBIN /sbin/arpon)
++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
++    set(ARPON_SBIN /usr/sbin/arpon)
+     set(ARPON_DOC /usr/share/doc/arpon/index.html)
+     set(ARPON_ETC /etc/arpon.conf)
+     set(ARPON_LOG /var/log/arpon.log)
+     set(ARPON_PID /var/run/arpon.pid)
+-    set(install_prefix /sbin)
++    set(install_prefix /usr/sbin)
+ else(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
+     set(ARPON_SBIN ${CMAKE_INSTALL_PREFIX}/sbin/arpon)
+     set(ARPON_DOC ${CMAKE_INSTALL_PREFIX}/share/doc/arpon/index.html)
+@@ -43,7 +43,7 @@
+     set(ARPON_LOG ${CMAKE_INSTALL_PREFIX}/log/arpon.log)
+     set(ARPON_PID ${CMAKE_INSTALL_PREFIX}/run/arpon.pid)
+     set(install_prefix ${CMAKE_INSTALL_PREFIX}/sbin)
+-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr")
+ 
+ configure_file(
+     "${PROJECT_SOURCE_DIR}/src/config.h.in"
diff --git a/net-analyzer/arpon/files/arpon.confd-3 b/net-analyzer/arpon/files/arpon.confd-3
new file mode 100644
index 000000000000..9508cb644ddf
--- /dev/null
+++ b/net-analyzer/arpon/files/arpon.confd-3
@@ -0,0 +1,4 @@
+METHOD="--darpi"
+IFACE="eth0"
+
+ARPON_OPTS="${METHOD} --interface ${IFACE}"
diff --git a/net-analyzer/arpon/files/arpon.initd-3 b/net-analyzer/arpon/files/arpon.initd-3
new file mode 100644
index 000000000000..0fad4cebb3bf
--- /dev/null
+++ b/net-analyzer/arpon/files/arpon.initd-3
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	checkpath -f /var/log/arpon.log
+	checkpath -f /var/run/arpon.pid
+	ebegin "Starting arpon"
+	start-stop-daemon --start --background --make-pidfile --pidfile "/var/run/arpon.pid" \
+		--exec /usr/sbin/arpon -- ${ARPON_OPTS} >/dev/null 2>&1
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping arpon"
+	start-stop-daemon --stop --pidfile "/var/run/arpon.pid"
+	eend $?
+}
diff --git a/net-analyzer/arpon/metadata.xml b/net-analyzer/arpon/metadata.xml
index d587671b9bf6..68ff631bb172 100644
--- a/net-analyzer/arpon/metadata.xml
+++ b/net-analyzer/arpon/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">arpon</remote-id>
-	</upstream>
+<maintainer type='project'>
+<email>netmon@gentoo.org</email>
+</maintainer>
+<upstream>
+<remote-id type="sourceforge">arpon</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest
index b545876a8630..5516b113052d 100644
--- a/net-analyzer/bwm-ng/Manifest
+++ b/net-analyzer/bwm-ng/Manifest
@@ -1,5 +1,8 @@
 AUX bwm-ng-0.6.1-fix-buildsystem.patch 3173 BLAKE2B 6484e256f77efdfcf7e52bb4137601d214a099c0ace750f326a2b3c21acce57e107354cc9fb4fb175b4b10c0ede098c88db7d1ab91aba1f0a15dcb764dc3e554 SHA512 5d58ef94633a65629485a6742b70e8eb819435957604c7877bcdeb1a842f6ad0a6cd99cf1d90572c9254ea6d9aaf431a4328cfab32809fa2654194486084520e
 AUX bwm-ng-0.6.1-static-inline.patch 9852 BLAKE2B df28ff66f2ccdac422803b119ddbd3385cabb615a8e50233162e82277e7a0ad6a99313e49689237ec82bd54c12edbbde2db6a72c90bcf0590397c8f21dd173bc SHA512 75c7f52121c8f05737f59c96c99c8e9f4fd72209007ea2b9884ac2aeaa151431475d70f312b41100993d6bd4f16e430b2a79628b37c249344be8ab4ed5f2d2ba
+AUX bwm-ng-0.6.2-tinfo.patch 274 BLAKE2B 9c4d5e5f94aab191fd6f68488a5ed48c08fec6520058c42e517f80dffae1bb15d063e32adbf1688929a21da5af78374e1966b4f0c29e0ad0b7b0b50c9844182d SHA512 47f601284da95f3148322157292a86f425cc4846d17547025fd5677e6ffc8b2f6f01cdf4403cf6ca5d701b0ab322ce9c345e26e3382afc6dea189afaa57b77aa
 DIST bwm-ng-0.6.1.tar.gz 162620 BLAKE2B 28e201ac681fcb1d79afead8a7d2c31d52bfa9ee1ebc132d3cd1080a7edd8ddcc8c0cd6df1897d23a1c79a4a5d9157214a8f3224bd5f8f2c1a12cad96ec188bd SHA512 3f8d4a10f5cbf743d6aee9c6170f334c4274224a2f1886f04338c9a1bf0cf13af5be4aaea0445c9e5b5d361915cc3a93bbfe7c4abf69a0d24e42bc414d8056cd
+DIST bwm-ng-0.6.2.tar.gz 70079 BLAKE2B 4e0c5dd73bdcaabf5138ce842e5ce50709ba3bc0792f11ebee2640b6246f5bd740fcf8ad79b7dcffabdbc8f44c5ec2d925b20cf28609f8735e537f6920f92aba SHA512 4a7f141692f96dfab0c1729a7df36f5213a75ddb891b967b2cf951419daea7b84354c276705a0ee7c09f4ed26948ca068f65a04b8f9d18b2b8ed2df97b5e3b0a
 EBUILD bwm-ng-0.6.1-r1.ebuild 741 BLAKE2B fd85473caf7dd8e2e969ef87c0add7359ee90c32ccc92e5f69b77453976b5fa823756af1b45fce884ced51ad4f94d6d435a209c251869ab1a39952b5c8b8ba0b SHA512 8d816d7b53c86f03170db7753cbd5ecaddf7bf1c2e794aaad963116fb7caac698fdc5acc5e5077b61d2f7c54316e15c08ed20d650366d18c9af461f94f3da19f
+EBUILD bwm-ng-0.6.2.ebuild 702 BLAKE2B f254640c5d92d6c0117cc5cf466b3b4710c6ea4d9fbe2eea5d919f14b295c719fbd797decd1c72d75c71b1d6df1904d254906bfb18faf053b89d103abe67c159 SHA512 552032878a9f18660318a343b8fed3b0004b873cfe8d36b2dad7914b64f8c04b1ef55497f216ab01652cd2c4e8a118c4f9a436cd1cc33a6a3c2d31b229202b9b
 MISC metadata.xml 373 BLAKE2B 81fc968d44df8cb58d98e139757ec6290640c64702c7b184123cf6e9edcc330d7789099453bb6865d728779fcb674080be65b86c68f1f1cdeda2e05068d7ccd9 SHA512 cab403ed79bc8eedcbff2160e8cc0af1c9ef4e8a4311a81b51e201537b22344d1d2ee8f18d96b9fcb23118ba60443f87461c1b471aae42119ae99eeb6d440bc0
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
new file mode 100644
index 000000000000..23c71582d272
--- /dev/null
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor"
+HOMEPAGE="http://www.gropp.org/"
+SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+csv +html"
+
+RDEPEND="
+	>=sys-apps/net-tools-1.60-r1
+	sys-libs/ncurses:0=
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.2-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable csv) \
+		$(use_enable html) \
+		--with-ncurses \
+		--with-procnetdev
+}
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.2-tinfo.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.2-tinfo.patch
new file mode 100644
index 000000000000..a51f9c0596aa
--- /dev/null
+++ b/net-analyzer/bwm-ng/files/bwm-ng-0.6.2-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -52,6 +52,7 @@
+         CPPFLAGS="$CPPFLAGS -I$withval"
+     fi
+     AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
++    AC_SEARCH_LIBS([wtimeout],[tinfo])
+     CURSES_CHECKED="1"
+ else
+     CURSES_CHECKED="1"
diff --git a/net-analyzer/dnstracer/Manifest b/net-analyzer/dnstracer/Manifest
index b0351778d9dc..6c7323975181 100644
--- a/net-analyzer/dnstracer/Manifest
+++ b/net-analyzer/dnstracer/Manifest
@@ -1,4 +1,6 @@
 AUX dnstracer-1.9-argv0.patch 343 BLAKE2B d3a1fe5b9aec3099ef2e385fdbd4e638cd8877bf533e59abbbfdf46bb80d6c0a64f4d3ad6ebc96e83bb007bc3bd22a1c26815fc7a7e98e63d8ef7a975f0307f4 SHA512 6871b93a4ebf1d307c4ef56ca134d8e39c152fe22564e6845ead6d7d97c96ff21982649808618d098b7105159a9bf09a201c4147c61be0b98676a69a9f4bfaa2
+DIST dnstracer-1.10.tar.gz 19169 BLAKE2B 8d549f7968b313778f4ee28a5dae0d782b23ff6ce874d343c079c178e9e7516d37af61c14ac6d4f00888dffa98f50768acd2d3fa2d221358d4db8aea82bc830f SHA512 8174f92c5c1b300c1011a24f0cf2f16dc2b52a082729e52d1033a047e20d132d6005b89618ecbbd25cbdc1c95cdc0748cf666bdc56b769b240d8885469bc6e05
 DIST dnstracer-1.9.tar.gz 130884 BLAKE2B cf08795eed59851c6da5d5c0ecc1a0b8445584ab10a9adf3cc526f5f831ceef9ed8deee8728ec964c35808a71e865f841f698403bcc0f16346e3abd5e13cac8b SHA512 e69fe772062ff315ff3148c26df78bd41c75d11dcfa6431f1e9374e6069182bd80826b22dc116011d975838d9527913d46edd78de049edd25e3ac9247d5f3473
+EBUILD dnstracer-1.10.ebuild 678 BLAKE2B 82841c2e0abef131577d632693f65be2e6102b64e599d28d8cae1e648293c2ac2e96b16eb4f4e72b172dff8fe1e5d49643d525ae9f9f95e1cd4dc3c30516ebcf SHA512 5378dba0eba308532f288cd457b83b8dd292589bf4d66f8bcfa5b5bfe7a1416f375b6782a0f8eb4d3f7bef716b512b01adba8033e5772d5ec449c7dbdbbfdb12
 EBUILD dnstracer-1.9-r2.ebuild 529 BLAKE2B 98b954fd431a19ac9bdcc6c4a03b205a26a8e2a6976ee021887b6924be2d1aad4f24489b5ca5ba503f9afd1f47b8ce8d79a8862a1aa7f7ada2d8752158b91d44 SHA512 0de06d1dd0e15f6f71f733a24f24e6fcb13b950fd3e4bd584ccc4686503609f668f25f0fbf6337b537b542ead4de1c426fc160fd597739f7029cf543c1fd730c
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/dnstracer/dnstracer-1.10.ebuild b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
new file mode 100644
index 000000000000..733c4c9cc2d7
--- /dev/null
+++ b/net-analyzer/dnstracer/dnstracer-1.10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Determines where a given nameserver gets its information from"
+HOMEPAGE="https://www.mavetju.org/unix/general.php"
+SRC_URI="https://www.mavetju.org/download/${P}.tar.bz2 -> ${P}.tar.gz"
+LICENSE="BSD-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
+
+BDEPEND="
+	dev-lang/perl
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9-argv0.patch
+)
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.8
+
+	dodoc CHANGES CONTACT README
+}
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index e67095232e1d..001a078f3a54 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -1,5 +1,8 @@
 AUX driftnet-0.1.6-giflib-5.patch 1060 BLAKE2B 6bd972e9c7e66eda935058daf75b5667f93f1a808499023e70087d7dd3a904762cd7139f23338321a0f7292974cd8dd206a97b33e665944fd32c9b14aae3908a SHA512 80dc8c0696f022e9034b01e48017f884f57e0044388cdc4d08c87fbd33bfdc7d3cad0bee332a3b7486cb06b9127469a0c6f088cde6e484d7873f3f59cfb5e97c
+AUX driftnet-1.3.0-CFLAGS.patch 451 BLAKE2B 80e4a2dd8afe6b82e95926e28c4c616b04c098c6d7ad637fd4301a9d34b77985c4ad2eead7fbfa9e565ea9983e0afe51312b756f9917260aeac5b366c7bb1af2 SHA512 2b0e50e2db056247ed83b2a8bef3116a8f9880f8539a33b4a696f312c5872098ac50c20f5a3de8ba07dffb935d450ea55ed3d1f291752de45983b85a62f55c04
+AUX driftnet-1.3.0-gtk.patch 298 BLAKE2B 1ccfbe96a69e21f18fa55535996704bd441247f9b109ddc2afd8c826102a0c3a246115c5178276f770b668ca1d8e191fe46858715987fe72f84b20a24f9be1ab SHA512 a43a926d5c289c75b7e942be6d1226a939e0e22e6da8640ebfa2ffd3d08c34fe3dfa525c425831d200bd5e536c73fec02c2c48fd0a6bfaf64f9cb92c9e62b95b
 DIST driftnet-0.1.6_p20090401.tar.gz 43683 BLAKE2B a3f5c57c5f57247feca37815b84630422f9fdb9ec978791eadaaf0f0b51d1f744674931ea9bb1b9291fc9e556ec9758ff44210a442d219ceeabf71e0ea3a193f SHA512 93b2f7b644603bf2fea09163c3c8cc6eed7ed61f3ad7f6770a754e1a31afde5a75e27464c399261bfdafbe37729f201e6bbcb06bb6c59bf52ac0ede4393a15fa
+DIST driftnet-1.3.0.tar.gz 4971618 BLAKE2B 1cf0a46caac2267c093bf21a0d8e150518dbfe0e76acbe21ef87cd760ccbe964313116ee24d25ad7759b3eeba19ef7925200caee4fd06bb28f9836217d889256 SHA512 45f1016a850cf9e5e294756e47e40eccb13f57a316ae7fa885eac2d5e53f68b9d9ef86868415eca76b108f7aa1f4080c550a91f789265edb0f6e3a55e05f5f0c
 EBUILD driftnet-0.1.6_p20090401-r1.ebuild 1818 BLAKE2B cfaa0f1513e946a3ab25d88735f42f3d7c4c0fafd9b8eacb31c7ba4bef35c46f0196a3e4dd2f084e83717abe854fa977a7694170d6b486c7fe6063746571c684 SHA512 344eab963fbaccc2cfbd020fcdf962f6e590c86d77654df5b0eb805d31649126a5bb432de1000ea080488e0d13d2b1905855383372439a3a72c63fc316aace60
-EBUILD driftnet-0.1.6_p20090401.ebuild 1504 BLAKE2B 5074d44094102c0a9026f9506e5c230f662ffa927dc15319607e38c574d6da4f8d3ffad3f9a34f351fb655d52194bb50bbc1aa13f3d1862c1d2fd0551b580861 SHA512 1ac56e06f09a71d7a6c62793ce455ad3ebbfd803bc18a6c1327cf0b3cbe739a13a80d7d51659f68e63de349a4f7d345ce8b31c18fdb6360889904dbfb738b889
+EBUILD driftnet-1.3.0.ebuild 1345 BLAKE2B af0fd32a79845b824a57ed6e059caae0c330efacfd89944733996e5ef448b76f7c9de32fc55c400ad1b2b0983df11ff56a7c839163360c26b25430213cc9fd6e SHA512 4c1085b74a40d3af3265a829f6c146f6b7f6cc3cc34fb425ce8c83396c2385d1c43074c86245a615df16b88434b5a243f9a7bcebb263c373c8d4857e20466f83
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
deleted file mode 100644
index 9de58dda9d5f..000000000000
--- a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A program which listens to network traffic and picks out images from TCP streams it observes"
-HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
-SRC_URI="https://github.com/downloads/rbu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc -sparc x86"
-SLOT="0"
-IUSE="gtk mp3 suid"
-
-CDEPEND="net-libs/libpcap
-	gtk? ( x11-libs/gtk+:2
-		virtual/jpeg
-		media-libs/giflib
-		media-libs/libpng )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	mp3? ( media-sound/mpg123 )"
-
-src_prepare() {
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
-		png.c || die
-	# With newer libpng, --cflags causes build failures.
-	sed -i \
-		-e 's:pkg-config --cflags libpng:pkg-config --libs libpng:' \
-		Makefile || die
-}
-
-src_compile() {
-	export CC=$(tc-getCC)
-	if use gtk; then
-		emake
-		mv driftnet driftnet-gtk || die
-		emake clean
-	fi
-
-	# build a non-gtk version for all users
-	sed -i 's:^\(.*gtk.*\)$:#\1:g' Makefile || die "sed disable gtk failed"
-	append-flags -DNO_DISPLAY_WINDOW
-	emake
-}
-
-src_install() {
-	dosbin driftnet
-	doman driftnet.1
-
-	use gtk && dosbin driftnet-gtk
-
-	dodoc CHANGES CREDITS README TODO
-
-	if use suid ; then
-		elog "marking the no-display driftnet as setuid root."
-		fowners root:wheel "/usr/sbin/driftnet"
-		fperms 710 "/usr/sbin/driftnet"
-		fperms u+s "/usr/sbin/driftnet"
-	fi
-}
diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
new file mode 100644
index 000000000000..5472c3464801
--- /dev/null
+++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools fcaps toolchain-funcs
+
+DESCRIPTION="Watches network traffic and displays media from TCP streams observed"
+HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
+SRC_URI="https://github.com/deiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 -sparc ~x86"
+SLOT="0"
+IUSE="debug gtk suid test"
+
+RDEPEND="
+	net-libs/libpcap
+	net-libs/libwebsockets:=[client,http-proxy,socks5]
+	gtk? (
+		media-libs/giflib:=
+		media-libs/libpng:=
+		virtual/jpeg:0
+		x11-libs/gtk+:2
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+RESTRICT="!test? ( test )"
+DOCS="
+	Changelog CREDITS README.md TODO
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.0-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.3.0-gtk.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable gtk display)
+}
+
+src_install() {
+	default
+
+	gzip -d "${ED}"/usr/share/man/man1/${PN}.1.gz || die
+
+	if use suid ; then
+		elog "marking the no-display driftnet as setuid root."
+		fowners root:wheel "/usr/bin/driftnet"
+		fperms 710 "/usr/bin/driftnet"
+		fperms u+s "/usr/bin/driftnet"
+	fi
+}
+
+pkg_postinst() {
+	fcaps \
+		cap_dac_read_search,cap_net_raw,cap_net_admin \
+		"${EROOT}"/usr/bin/driftnet
+}
diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch
new file mode 100644
index 000000000000..2b25ed45833a
--- /dev/null
+++ b/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,12 +68,12 @@
+     ,
+     [enable_debug=yes])
+ 
+-if test "x$enable_debug" = xyes; then
+-    CFLAGS="-O2 -g -DDEBUG"
+-else
+-	CFLAGS="-O2 -DNDEBUG"
+-fi
+-#AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
++#if test "x$enable_debug" = xyes; then
++#    CFLAGS="-O2 -g -DDEBUG"
++#else
++#	CFLAGS="-O2 -DNDEBUG"
++#fi
++AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
+ 
+ #
+ # Checks for programs.
diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch
new file mode 100644
index 000000000000..2a8a294e8dbe
--- /dev/null
+++ b/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch
@@ -0,0 +1,13 @@
+--- a/src/options.h
++++ b/src/options.h
+@@ -32,10 +32,8 @@
+     char *audio_mpeg_player;
+     int mpeg_player_specified;
+     int newpfx;
+-#ifndef NO_DISPLAY_WINDOW
+     char *savedimgpfx;
+     int enable_gtk_display;
+-#endif
+     char *drop_username;
+ 	int list_interfaces;
+     int monitor_mode;
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index 9db367ca2e9c..4845a0d451a3 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -1,8 +1,6 @@
 AUX ettercap-0.8.3-fno-common.patch 741 BLAKE2B 907c78c720e2a55bc7325f8611ec0bd8a869b9b0a172445e45f064faa988c5e2863bd46d3f2a724613c9f6311e4d925472d701aee4963546a2b4e771b4a04255 SHA512 6c896bdbfac24bd698f49ed33617f2a9b43f4ec080b292e9d1b06e038b53b3dfaeadc3d6d0e08a968f8a1e9ccc71cff266412a1858bbf4bfbb9c294947c795cf
 AUX ettercap-0.8.3.1-libressl.patch 1147 BLAKE2B bb3cf4e73f9a03cb13a82e6569d05f52ffe2bf438fc834f5793057c9aab85a5edff7a2c5830a5aecddce8646e9a5d370be4654610516bdbbdcfaff63a2b8ea04 SHA512 57c8c6c04f4b49598fedc702d119963e7633ebec4008d4c3467749e7f5053572f9d8fe1254f7ed6554975791300ba2e96e481a86a656f6ec0d80d5a011254b92
 DIST ettercap-0.8.3.1.tar.gz 6678653 BLAKE2B 2680b97454626a6f1af3b21f689ba8eed7a023c3ef5cd84d5b2b5859382f398b3a6fc622270ca41941a8a18a7bdd260af64165344a33b2e195c86ee61567f2eb SHA512 9bd71dcc1730293ee83934aca3587dfde662cb3890c12fafa557b6359f12226e5cb6f59a0db1aa11245a132b275e355e3bcc8952db921171d27b792827f148b5
-DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c SHA512 1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7
-EBUILD ettercap-0.8.3.1.ebuild 1851 BLAKE2B aebcd0be22f8fda3158d21d721874cb20672301af9993f96ae309f3cc5c24270071c87e2d80f031b785a2a039db0d08f1c1c6fcc8d73bc8ceaf3e1db8947d07b SHA512 01b1e02b01f6c38fec77595d65937aa910240a6964d8d889d8f6d4993884d1d5fc90bfdadda515faaa5c1bc4283e6c18c3e686b64e73d40c9a2696da41cc775c
-EBUILD ettercap-0.8.3.ebuild 1825 BLAKE2B 67ea7421490b802862350501d505722efcfce8779a0e65a6815980ca4e25f3be75f8a50d94f3c2478375a79d04721d2b0ac9718932cb569a3050b5c91e6b592b SHA512 ef4f1d1488fd92569f42e699494eef056ed0252b287ec6c94eb21f92ef071772158a07fec18a1387c7a77d9ef01b4c3e73fb426df4886fa8eb8eecdf92c291f6
+EBUILD ettercap-0.8.3.1.ebuild 1850 BLAKE2B 2bd65f9b1dee27731671f7b1f7e669a9be0968f45e8682833f2076cbd8319bc21f67f281932f3ab72c7a2a13845f36bc392df00576e56fbdd948e2dac47c2b24 SHA512 ab334f8a0e70726703d3d82562ccd160e6488e908c2fe415386484150116e600ff5079bee7fbf854bcbe5501531e399415e85f753d59f1972a3b7884660351d9
 EBUILD ettercap-9999.ebuild 1809 BLAKE2B 2dcdca206b6ec876b887c0d4b126f4f0800ca9ac9e3b4801d3d2e4475f07d66683396320fdd3be51106bbf1c0151734d1cc1c9f9ccece788327e13e5f0b5d531 SHA512 d709b14a46a70723f0f72a2615bc97f720babf5900e177ded948a9c00e627db9a66fe6aeb80fb406bfd9e7ca966e01b9bb20aa85154a162e56763a035785c394
 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
index aa5cb4b852ff..7d5c3ac6c11e 100644
--- a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
 else
 	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 fi
 
 IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test"
diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.ebuild
deleted file mode 100644
index f49ef8cf2e4f..000000000000
--- a/net-analyzer/ettercap/ettercap-0.8.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="A suite for man in the middle attacks"
-HOMEPAGE="https://github.com/Ettercap/ettercap"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git"
-else
-	SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
-fi
-
-IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libbsd
-	dev-libs/libpcre
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libnet:1.1
-	>=net-libs/libpcap-0.8.1
-	sys-libs/zlib
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		>=dev-libs/atk-1.2.4
-		>=dev-libs/glib-2.2.2:2
-		media-libs/freetype
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.2.2:2
-		>=x11-libs/pango-1.2.3
-	)
-	ncurses? ( >=sys-libs/ncurses-5.3:= )
-	plugins? ( >=net-misc/curl-7.26.0 )"
-DEPEND="${RDEPEND}
-	doc? ( app-text/ghostscript-gpl
-		sys-apps/groff )
-	test? ( dev-libs/check )
-	sys-devel/flex
-	virtual/yacc"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
-)
-
-src_prepare() {
-	sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CURSES="$(usex ncurses)"
-		-DENABLE_GTK="$(usex gtk)"
-		-DENABLE_PLUGINS="$(usex plugins)"
-		-DENABLE_IPV6="$(usex ipv6)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_PDF_DOCS="$(usex doc)"
-		-DENABLE_GEOIP="$(usex geoip)"
-		-DBUNDLED_LIBS=OFF
-		-DSYSTEM_LIBS=ON
-		-DINSTALL_SYSCONFDIR="${EPREFIX}"/etc
-	)
-		#right now we only support gtk2, but ettercap also supports gtk3
-		#do we care? do we want to support both?
-	cmake-utils_src_configure
-}
diff --git a/net-analyzer/fragroute/Manifest b/net-analyzer/fragroute/Manifest
index c256bb6717c5..14448334565e 100644
--- a/net-analyzer/fragroute/Manifest
+++ b/net-analyzer/fragroute/Manifest
@@ -3,4 +3,5 @@ AUX fragroute-1.2.6-pcap_open.patch 1171 BLAKE2B cdd664bea732c2abab0813526eba79a
 DIST fragroute-1.2.6-ipv6.tar.gz 163309 BLAKE2B c1927fdb6fbe6873b62fa48c5355b0b0d2be7b2183c94f259b8e0b4b3dec8a171defc4c6fbde507e522b28dffcc86dd68ae0ffe380a9d21eb478ebe7068d4beb SHA512 76c6fbe37100a43df477f0ba455a2bed6ac53c1f369e147d220562a34eca0eb273171e4b9ff4f3fc473c3f99a8344f6d49963c20d7cfaf6879200322a491ffc3
 EBUILD fragroute-1.2.6-r1.ebuild 1037 BLAKE2B 81e3443bdd270b36cbf94e88412cd3220befc5faf843bf1619e3ba2f8fca3a5eadaf5cf40983e265bb214c12fb7af9bc2e59780f26bb5992f4dbdbf38514b687 SHA512 49b02420969d14fcba01898ac514f8fe2342a0cb9eae0e74eb3f685930d9bd7802200c3d9c4b9f62061ab1422018a8b93a45ef0819547fd092c5f134b26ce534
 EBUILD fragroute-1.2.6-r3.ebuild 1084 BLAKE2B b8474ef0ce515758463ad4b7bfaea6f1834c201ea17273fc9f86bc5698cbe729a32d64cb6902d44b293d7c3c210f6772d49ab7fbaee27dddf19423189c08c8aa SHA512 ed76c00c900f281715fa38ed7d254e290b7cade2f152ab007faa76f99be4d53cdf86f1242cdcc14efb06ed13211c1e64cc8d6a5b591ac8c263615f8c76d72ceb
+EBUILD fragroute-1.2.6-r4.ebuild 1079 BLAKE2B ec7b1b983de3ad65d0e7dec0c2ed2d2860360af485c973677f77e81a89eb3203a0d90489d05ab7581ddd9039598395733ebf9fbd953ff5b413cb769f26c664d1 SHA512 20ba8dd271f209770ac2fe8c55b2f7232419173dbec127f53e9910842fb430a1b88b2e01a353de79bb020b3ea25707c28b82413ee8723350650abd4aca59f976
 MISC metadata.xml 364 BLAKE2B 6f99923afef64e689bb2169801086f433f54879999551e8ac7e74f3c49ae10b2381041e626a024efe57b167a9394219b3ff3f313b049b2d40ba5404134b766c1 SHA512 3b38ee5be21d5a6957e39fea01461187f01f5b34a0538df8b6f6c217e0832a5d6cb5dbd9b6508cb5a977618dd9f8ffb0d0feefb0ec6c050efcfb4fa68a00ed78
diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
new file mode 100644
index 000000000000..58e9d754203b
--- /dev/null
+++ b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_P="${P}-ipv6"
+inherit autotools
+
+DESCRIPTION="Testing of network intrusion detection systems, firewalls and TCP/IP stacks"
+HOMEPAGE="https://github.com/stsi/fragroute-ipv6"
+SRC_URI="https://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-libs/libdnet-1.14-r1
+	dev-libs/libevent:=
+	net-libs/libpcap
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/awk
+"
+DOCS=( INSTALL README TODO )
+PATCHES=(
+	"${FILESDIR}"/${P}-libdir.patch
+	"${FILESDIR}"/${P}-pcap_open.patch
+)
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Remove broken and old files, autotools will regen needed files
+	rm *.m4 acconfig.h missing Makefile.in || die
+
+	# Add missing includes
+	sed -i -e "/#define IPUTIL_H/a#include <stdio.h>\n#include <stdint.h>" iputil.h || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		DNETINC='' \
+		DNETLIB=-ldnet \
+		EVENTINC='' \
+		EVENTLIB=-levent \
+		PCAPINC='' \
+		PCAPLIB=-lpcap
+}
diff --git a/net-analyzer/labrea/Manifest b/net-analyzer/labrea/Manifest
index 9439c2657530..eeb6a901bdfc 100644
--- a/net-analyzer/labrea/Manifest
+++ b/net-analyzer/labrea/Manifest
@@ -3,4 +3,5 @@ AUX labrea-2.5-stable-1-incdir.patch 218 BLAKE2B c0b795e5c2010b733522873c8e78ce1
 DIST labrea-2.5-stable-1.tar.gz 210494 BLAKE2B 3db2f4c014c578446fd9d6303f8c17245d3d9a7e8e481bf64195693f21eb30b9e0e2d6cf59ae124982e358d4aad2d22654ee46544957ab783f33a13c951d6a3d SHA512 63523f59e9e6ca31d2a5ea781f7b7087e7e41835aec24cd8cbf1cf7b65893fb1cedb2b13aa5fcfab458375ef27f5521a9ab88a71734b7317edf8eda2746c566c
 EBUILD labrea-2.5-r2.ebuild 797 BLAKE2B e951f243097015fd039e03711f83346cd65b57b9d9b1ea799df0182093b34581c6c0f75eca3833eaa87826a59eb5330a18a924c6164e00515e07d53faef28062 SHA512 e2d5cdf2c81b941f62c54832a8f2b03774540474491694b243581693fa61391174c14ce2947d4cfa7d95e1450a8d7ab075ab26001f96f6b5d5518cd4db10afd1
 EBUILD labrea-2.5-r3.ebuild 845 BLAKE2B d4a799401c9aac57385191dfef319bf17a92dd836db1bd10266d0b902e41c7dbeb7f7781482f6885d84dd84998e9602d349a96017bfd77675f409e465cf3c2ab SHA512 9c0f79e5552afb66cf0900582f4cf0dbe2c61a331dc0a9e563628e0ebb415f6d03c4de285c3dfcdbba01fedb61cdd7837ce2d25bc06aa24bdecfbc4f2250413c
+EBUILD labrea-2.5_p1.ebuild 903 BLAKE2B ecadc9d77f4dc4e372a767268bf8e792a6495d8dc1f4d4d63800c7b61337ee05ee0632a767691e792d84f9e409fc9d08f86ab75ac1238ca2aa72fc079a90b0e4 SHA512 767b6eb21e1db806ce432ad98a218ae242ec3f536995f6d726d946ac0922947c3d84b47eb5f251a2118cb198d713d772454761e31ac34e08dd84f4eab9d704e3
 MISC metadata.xml 356 BLAKE2B c78b737ba6e150b7abd18c22da130c805177c64bcb197c2d7909b5a74a35484d87a5a45b4b968cbb0aea0bdc3af6499d9f8376f39dab4df33bdcf3cf82f28e2c SHA512 1b4738687beee35bb3fd628d1d5c1fa9e16b7d938f21644343b23a6c7aaa5b6e760c5342cf88485265ae11f6d00c073e8564b37fe1dde4543323de069f8115a3
diff --git a/net-analyzer/labrea/labrea-2.5_p1.ebuild b/net-analyzer/labrea/labrea-2.5_p1.ebuild
new file mode 100644
index 000000000000..5c375b86225b
--- /dev/null
+++ b/net-analyzer/labrea/labrea-2.5_p1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="'Sticky' Honeypot and IDS"
+HOMEPAGE="http://labrea.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_p*}-stable-${PV/*_p}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+	net-libs/libpcap
+	>=dev-libs/libdnet-1.7
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( AUTHORS ChangeLog README{,.first} TODO NEWS )
+PATCHES=(
+	"${FILESDIR}"/${P/_p/-stable-}-incdir.patch
+	"${FILESDIR}"/${P/_p*}-pcap_open.patch
+)
+S=${WORKDIR}/${P/_p/-stable-}
+
+src_prepare() {
+	default
+
+	# autotools will overwrite this with the generic version
+	mv INSTALL README.first || die
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	ewarn "Before using this package please read the README.first and README as"
+	ewarn "the author states that it can cause serious problems on your network"
+}
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 5c9b4a76279e..29ba411ebc24 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -4,7 +4,9 @@ AUX mtr-0.87-tinfo.patch 380 BLAKE2B b81110442dde3e7d0337c2b6e6685a377593b6c91c3
 AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f384258339495abcd937271ad29b429bebe5922f5288113683e5910c5ea513d2a131aa50b230ab51bfaf332e31379 SHA512 996905be6f96f71a742d3a00c0a5c6730b69709f50db4132284e12030dd80929ed838f7a7a94bf3634698bd17234a1324a84f81a5dfe5f4a71ab70e9f8f294aa
 DIST mtr-0.87.tar.gz 184645 BLAKE2B e96535b0bd46ee63c5e6110ee465195a9ead6ff7c7ea3629b2668631f25e9181cf4236ba0e2cfc0517e7c70683bbb6347d9c26a2b09701d89e225c27aa2faae4 SHA512 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9
 DIST mtr-0.93.tar.gz 291015 BLAKE2B 6ac0e21f9e06fbfee9e9ada4cddb6cd9685ae669a05d1ed257a2c238ab78ac16e1a1e152ef1359ca530b0eced14c9333df2b691c27cbc29173c843ebc64eaaa9 SHA512 046e98a661bd6248ce819411ceb6e2b875b92877de38523594898df507836c113573cf40d7d4cc548370f515abe99e0aa4d8b3ba44ad54dd00f8e93c8a96c021
+DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
 EBUILD mtr-0.87.ebuild 1154 BLAKE2B 7dabf8118eb039767ee7f67948667de349928e053525f41af128db531bfe92192613ad5047ef0836deca9b23da72816b9fbd628546cc76131c9bb4b7b6ce8948 SHA512 51b6c6ed2710f98729551d2ba2ff4d79f048d31c31fd839a9ec8268be675e940d7e91cf2e9f1255d6b6a715ef43f1a5cb2b1a1817ac72c63b8b413091b2a85c0
 EBUILD mtr-0.93-r2.ebuild 1331 BLAKE2B aa44ba0f4126312bbfed53cf22fab692f84775f966c61b5b3b3cfb76d476cc6ef7db231194d957a7e5f7c5c140f4217b08737a31f250c4e984b1e981267d0283 SHA512 bc24e0412acc8f0a5c1dfbe556ec9ee0fe9044b2ce8e39366f555068a1471b80517f0d443a21e36bdc542d255f594d336c9817f5cfa75f21a0da8c38247f5612
+EBUILD mtr-0.94.ebuild 1400 BLAKE2B 94552b00fc43e56e85008543c297f64ef2b41364f27ed80951207de9437ec36fb8a7482747f4b41987585468bca308d7e951850ae5fbcedeaea97473371a3804 SHA512 0172ac41ce736541ce8bd6591f3900525f4c5934dc3db117304af72ea069a1120ef68a2e15afa03a0ed7b77c1722cadaff72eb4de6e9c80fbe529315f33710cf
 EBUILD mtr-9999.ebuild 1244 BLAKE2B e46c8c9f5b2159ca0eaeb13067bf15e27da71de31acc37610d9e95dfd04e3c7171d124f5daaafa407317027ab81fb6bb1e4bec79251a3414493a950fc895c24a SHA512 7c27c9fec1561e657210dd74f1b9398fe7e56a0a8f3c4a31fb67cd7c60b46870a7bf6642116e7454e5ea3b006fa1074c1d23ee258b3b3f9697884494ffcdbe76
 MISC metadata.xml 444 BLAKE2B a5e09136f19f4b7958c9aa882d3501bcd6f592e501540cc4949e00388a095df82f4978dd75cf611d7e4c533841398237f36e839085c64bec997a9ccc947b0273 SHA512 1178be0331a735aec9b0c45323cfc8c83eaa7dde375c3de9fe858e9d0a95d4b894e3cef7a09fe3e0c33527145ec7e3833c1c42804643b4cdf94d21f4d69080bc
diff --git a/net-analyzer/mtr/mtr-0.94.ebuild b/net-analyzer/mtr/mtr-0.94.ebuild
new file mode 100644
index 000000000000..f7343a7d970d
--- /dev/null
+++ b/net-analyzer/mtr/mtr-0.94.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1 fcaps
+
+DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
+HOMEPAGE="https://www.bitwizard.nl/mtr/"
+SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="+gtk +ipinfo +ipv6 +jansson +ncurses"
+
+RDEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:3
+	)
+	jansson? ( dev-libs/jansson )
+	ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO )
+FILECAPS=( cap_net_raw usr/sbin/mtr-packet )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.88-tinfo.patch
+)
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		$(use_with gtk) \
+		$(use_with ipinfo) \
+		$(use_with jansson) \
+		$(use_with ncurses) \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "mtr needs root privileges to run.  To grant them:"
+		ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr"
+		ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr"
+	fi
+}
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index c5ec8b50cd76..6a96c83b6e1a 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -15,9 +15,7 @@ AUX snmptrapd.conf 517 BLAKE2B dced765351c6fbd74166da9c3631993a06135569e8bc7b237
 AUX snmptrapd.init.2 338 BLAKE2B 893a510af4cb7f4115c5995ecd40c6ac3c5d2fd4cf9252404b49f8c58355b4def5d751df0b3c7878bcce0bf703ccb7ba022db108eb1496b68eb2bb4a035612da SHA512 316964703559082b1626280bd0532a32533185741d1919f255473ae6bfe30f82b71bee79093cb0b341c99427e14a5ed201b6aa2886a9123c89d5f5f78496f706
 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.1.pre1.tar.gz 6630615 BLAKE2B 32ae7177fc08a773928da7f19cd06617feb1358c0dd21d39e08db460fa4267b6353f4afede1f5a500a628235a6a94d95700c84df6e85bda18b7a7a6e7bf3781f SHA512 e1ad421970abb67490a08fa735bbe9ff77a6fc5a19b8bf6942bef80f5b328f8038373cd5995970085177bcfe939dfa309019512b2abce0e8cf779e693f7d6dbd
 DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173
-EBUILD net-snmp-5.8.1_pre1-r1.ebuild 5662 BLAKE2B 92cc1484aa8572cbb265682d451f699afcaa92858d5dac8fc7b22723dead6a4974b1dfa6f192d33e5432b4aa11e9793d606dffb4f4908a9dd8f2ebed7a5a258d SHA512 a395ce9e3e814cc1f1da2b14bd70cc49b2b39a096fc256bc8e59ffe3dcce0af3c7536c9481dd8f0eecdfd7969b859abf888c16602973ea17ae0ff8b70a8082cd
-EBUILD net-snmp-5.9-r2.ebuild 5668 BLAKE2B 0d17d82366ef0236c2e4a1a3383292e1ce3900475e5891889e6850ad06b3839b9765565908da890701d3ab4680d2787196992701987539e595c73364e4ef7bb0 SHA512 e7f7c5053d117672412e05d8c0ff3c1048b7b875fc2148a18191463183cb1c41c12c99c3e9b41387becd7893cc8bf159c3d91b1044de94cd36f2c790a9ef9769
+EBUILD net-snmp-5.9-r2.ebuild 5667 BLAKE2B 56d363f8e669ed84b134d6808188a66d121490d2bd21ead5ad2621314c5df9ec6722bc361f18603de05691149584b99a2279a5c7a6709f4f513741e34d90a047 SHA512 c568a2142e2c40e8b7662f1a248800c416b83f5d4db02250d0b2a84ed42c174b474f38746c1b82f8ba03dda8cdb6cc721b4712cd90702d63aa070c4fdb075ff4
 EBUILD net-snmp-99999999.ebuild 5667 BLAKE2B 96a45e763d4cd9e418288be6b86fb6884c3c05f99c8f01fac296b48af35cba79199eee4e5bb3984402c5847b9a8f91d7cdcfcb2164f6d6564dc06d93914ad751 SHA512 c08359fed122095229bea052ecad54a07228a862d532aae62315a5d7c563f7e02556d814cb5c97900656ee2736becc92e7b7fb3248f4e78bc3470b1586a9f91d
 MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0
diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild
deleted file mode 100644
index 48c7448ff414..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 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*/}-pre-releases/${P/_pre/.pre}.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 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
-"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 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? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_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 )
-"
-S=${WORKDIR}/${P/_pre/.pre}
-RESTRICT=test
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
-	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
-	"${FILESDIR}"/${PN}-5.8-pcap.patch
-	"${FILESDIR}"/${PN}-5.8-tinfo.patch
-	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
-	"${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch
-	"${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch
-)
-
-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
-
-	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
-
-	default
-
-	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
-
-	use python && python_optimize
-
-	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
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
index 78db91b26805..389a8f5e207f 100644
--- a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 # GPL-2 for the init scripts
 LICENSE="HPND BSD GPL-2"
 SLOT="0/40"
-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="
 	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
diff --git a/net-analyzer/netio/Manifest b/net-analyzer/netio/Manifest
index 251bd40bdd26..4008dab38b09 100644
--- a/net-analyzer/netio/Manifest
+++ b/net-analyzer/netio/Manifest
@@ -1,4 +1,6 @@
-AUX netio-1.26-linux-include.patch 237 BLAKE2B abd0e69d0d0024625be43ce36332f06dfc7b0dc129d27bf35886492fb98a790ae3eec98f5f9f72aaea96edf401a14b0efa1b3281125fae8de06b821f5193c597 SHA512 9b8b75f9b4a74690ec4cffaf777bd4f5a46e12880c8919edd91fa853d0b1edcb034b7baa96eafbc7f43d85046d7d4cebb15fca5e6b7402c71f629b56681d0de2
+AUX netio-1.26-linux-include.patch 195 BLAKE2B 4f6837a9194692658f82f50e3d3a59b4f815af2a0d32ec5d24f09c14e06cbf93a2f09e8d149dd9e65c58b41cc2bb55ff0beeb9c701304c37f6d1f95639678aca SHA512 719f65026c4d14b2f2252a9ca917fe7b46a1788d0ee84c763313f0e40fed7027c7e6d73de298735c05160f2ce0f08c8f5a49503369d3cd80d8ea26ce6c82263d
 DIST netio132.zip 162484 BLAKE2B 921b28d25a8042b5567393b088fbede3f8bff2d4bf6c8afcaab03a76487ddc48e6cd640b2cbe7114b022cacef9fcf5ccc3deaa9eed2b648898d7f2dfb40e133c SHA512 3473b6b41c4a1e054fa0eb3316bc16e799034b4b9402c7751f29724d8ec70c674d3de59140fdbdc301c53f2a24b44d58e8cd50a68f107bd892b1d17b6e695232
+DIST netio133.zip 235931 BLAKE2B e664700b5991e38ad056333b13ba6ec40efd2a9a496dd9235ad40482b281f21ca54f49e037a0155d3ca0b1d77bd54330462d08abe5f809c6ee337b672c979995 SHA512 79a4d8ad5a5d9750a19bf7f8f4cc762e6d1a866a63138bfc1cf8614057eb8ade147817e489f93210990ce9d82be03a5053821663212fbee71c4cd46c2f9c9232
 EBUILD netio-1.32-r1.ebuild 922 BLAKE2B 14c181aadf3992d6e06de81354320c5bb842ac86d36281f664f0d6df021f49e822c13430a3c18ed15d920b66c71af256fa196ead1144af45dd2a9f8fa79a7e9a SHA512 fec36c735b6a6d7ba12c53bf5bc26ddf02fae03c1f4e3dd56f79de173a247969798506e99400b802e2bb1a6f9ad20172a0e8f2abd63039e514bb54cc1832b705
+EBUILD netio-1.33.ebuild 822 BLAKE2B c42c4fc4661ceee1240c9033d4393f42b03b4f9a6bbf59c99e2323fac1ac0ae897616a41d097513228223cabe5f05dded0f2d46e9d7d8b81d4f25592c8be7eff SHA512 c3fb33cc1265afbf3c1ddace19b1b30e810a44d06ba039b731b0dc13eb082c00d0ec5b180597b37978b033183d210692f43a81ff1cf0ed52f96412674018723a
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/netio/files/netio-1.26-linux-include.patch b/net-analyzer/netio/files/netio-1.26-linux-include.patch
index e006c82d71aa..591cae323842 100644
--- a/net-analyzer/netio/files/netio-1.26-linux-include.patch
+++ b/net-analyzer/netio/files/netio-1.26-linux-include.patch
@@ -1,6 +1,3 @@
-Add missing include (see inet(3)) - JeR
-
-
 --- a/netio.c
 +++ b/netio.c
 @@ -199,6 +199,7 @@
diff --git a/net-analyzer/netio/netio-1.33.ebuild b/net-analyzer/netio/netio-1.33.ebuild
new file mode 100644
index 000000000000..b1b367dca376
--- /dev/null
+++ b/net-analyzer/netio/netio-1.33.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit edos2unix toolchain-funcs
+
+DESCRIPTION="Network benchmark using TCP and UDP protocols"
+HOMEPAGE="https://web.ars.de/netio/"
+SRC_URI="https://www.ars.de/${PN}${PV/.}.zip"
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+RESTRICT="mirror" # bug #391789 comment #1
+
+DEPEND="
+	app-arch/unzip
+	>=sys-apps/sed-4
+"
+S=${WORKDIR}
+
+src_prepare() {
+	edos2unix *.c *.h *.doc
+
+	default
+
+	sed -i \
+		-e "s|LFLAGS=\"\"|LFLAGS?=\"${LDFLAGS}\"|g" \
+		-e 's|\(CC\)=|\1?=|g' \
+		-e 's|\(CFLAGS\)=|\1+=|g' \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		linux
+}
+
+src_install() {
+	dobin netio
+	dodoc netio.doc
+}
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
new file mode 100644
index 000000000000..eee995aa8e10
--- /dev/null
+++ b/net-analyzer/nikto/Manifest
@@ -0,0 +1,3 @@
+DIST nikto-2.1.6_p20200901.tar.gz 521285 BLAKE2B 243f0baf5835e5586b8270fc9dd1005c08e903f478666359c34bb0d30c0645f5ab9a19109718dbbd2f6015dcb64c3a98b832b5412c9151720dedd102fb1936d1 SHA512 88b9e681ce4588e3473f90c93ea41d46fc99a54b895185465cfe1a28152ad944edbadfcf5cee4540b4ec48eb78ca73a1952637c3da9038e52d837c0de5d0260c
+EBUILD nikto-2.1.6_p20200901.ebuild 1112 BLAKE2B b3969fd79c055b84513820eff4d1c8b5675a8f40044be1d145f1421555153fc82ab1ef1f86d80fc5f38578c5d55139efeaa3d01e25228a7cfb51544c01ddf11d SHA512 182e2651e059a4d12e26bc7c49eb1555364d7a536879d86312efe91a518ad10f4c7c16652c9a356a2c9bf0deebacb8b868d729d6fa7f4bd554ef31dfa7d4f35c
+MISC metadata.xml 368 BLAKE2B 1b830b9fc3837ed7b4706a646f08e1edb316c264b82232740467c341b54c14d49d4dd936d8c24c32256f3235dde2ee5ebbdfadb0fb117136d5e49af353590fab SHA512 2f1a7954d7f6360a4b83f22933cb45e800ab2fc7a7725569736fcc4e64d3d3603dcc64a0ebe888ebb824a51fef81d7220599f525a8e316df762e874ccbd51efd
diff --git a/net-analyzer/nikto/metadata.xml b/net-analyzer/nikto/metadata.xml
new file mode 100644
index 000000000000..91f5940d4d0a
--- /dev/null
+++ b/net-analyzer/nikto/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>gentoo@retornaz.com</email>
+		<name>Quentin Retornaz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-analyzer/nikto/nikto-2.1.6_p20200901.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20200901.ebuild
new file mode 100644
index 000000000000..5d64088ea896
--- /dev/null
+++ b/net-analyzer/nikto/nikto-2.1.6_p20200901.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Web server vulnerability scanner"
+HOMEPAGE="https://www.cirt.net/Nikto2"
+COMMIT="fb2655b8316097723d4977c792817a21117b2736"
+MY_P="${PN}-${COMMIT}"
+SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+# nikto provides its own libwhisker, do no use net-libs/libwhisker[ssl]
+# https://bugs.gentoo.org/533900
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Net-SSLeay
+	net-analyzer/nmap
+	virtual/perl-JSON-PP
+"
+
+S="${WORKDIR}/${MY_P}/program"
+
+src_prepare() {
+	sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' nikto.pl || die
+	sed -i -e 's:# EXECDIR=/opt/nikto:EXECDIR=/usr/share/nikto:' nikto.conf.default || die
+
+	default
+}
+
+src_install() {
+	insinto /etc/nikto
+	newins nikto.conf.default nikto.conf
+
+	dobin nikto.pl replay.pl
+	dosym nikto.pl /usr/bin/nikto
+
+	insinto /usr/share/nikto
+	doins -r plugins templates databases
+
+	dodoc docs/*.txt
+	dodoc docs/nikto_manual.html
+}
diff --git a/net-analyzer/rrdcollect/Manifest b/net-analyzer/rrdcollect/Manifest
index a23e1ba20bb3..96314021a064 100644
--- a/net-analyzer/rrdcollect/Manifest
+++ b/net-analyzer/rrdcollect/Manifest
@@ -1,4 +1,6 @@
 AUX rrdcollect-0.2.9-include.patch 206 BLAKE2B 81b31a4bf3a03f55d9ae4bcf6d80eff86608142b537789788b96d5219d14632d0307230d1b39d5fd8355059b67e152e7f378950fc66c8b15723bf2910067fb07 SHA512 e3092bfe72977cd67cbb4654a44a504d532fbcf3914c3d339e99d9d61d704d7d6954e233d6d5f04cd02ef4fb827cde0835dddca519e3cd26cbc9b7aa74eb72ac
+DIST rrdcollect-0.2.10.tar.bz2 114312 BLAKE2B 8e75a44e6ea2dcf57eec7418912383fe1ed846eda5ac2e402b7ed3b0f47f3f169d84b563821380fcb1ee87b70fcdf881dd48763fbb4ab3c8ef301ca9ef5f2a74 SHA512 c926ccfdbf98a4de114b80012151bf6859644742a97e14ce06f3c44c3b48bb242d47fda54deef8069d57aa8d207389e788e6021ce337559c0185e7cdb680b26e
 DIST rrdcollect-0.2.9.tar.gz 137397 BLAKE2B 5fa7e3c90f168c4839227f4578c0bb309c9e1d5ac440026b10aa5ea9f62ed23db63f20cd506c87fb6bf4b969e9aaa0a0a33e882818bc558e1e99432ce3e6e855 SHA512 5f01b93a469d32f095b501c3611d4e31d354025848aeffd913db9625d0186a3e7d394dae1a2383449836c37e758a39a3473710a1855411288659fa6ac249e10f
+EBUILD rrdcollect-0.2.10.ebuild 707 BLAKE2B 1474b932b1360595674194a6ef4e53ec4e5f6aa71ad03d023849653f436ef64fcb0f96def3ff1e94f52180d3724d4a7047e03fd7dc6a13b9647a5fd7b0076c70 SHA512 c5a2df5dcab7a58c9ace1e4741bdecf3c36ba54301622d5cf4ebdc54a64bc7a09fe1b7203c4032bca15e71637a3bd11cbb650a773e828579c19b69c13ebda229
 EBUILD rrdcollect-0.2.9.ebuild 727 BLAKE2B 23ce3d5c74674a06a9ab5e8fa5c7e1880fc5133d3b7ee5e50d453c3c0c0b616d1ffdb92417ecc96c3b7a96bce3af426b650f5c376de55e2e7a5feacf9fae9365 SHA512 249fabf46c1ba7cc293bf0238b8b0a09eea689746878a3c3d521beee9a58a659a0b5fa5d348cb72232b4b49d42bc3907b5d8ae62260fdd5127b8eaa3b2133a54
 MISC metadata.xml 515 BLAKE2B 4dd541000df2c92fd88fe509cd2f84dc88b2c939af53eda8cf0e9a18e56be6df06a6f8e07b0eba4b7f9d7b285b585d2266ec79bf6243612cb1ee468b59b6b986 SHA512 68fc73d6b069e077b672c34aaa99f0c1a07c861573a123458fd5953efd71134a7b93bb81d93a41b6d1e5b51228e304eed40d6cb36c795f0f20549e700914d051
diff --git a/net-analyzer/rrdcollect/rrdcollect-0.2.10.ebuild b/net-analyzer/rrdcollect/rrdcollect-0.2.10.ebuild
new file mode 100644
index 000000000000..ef89a773d134
--- /dev/null
+++ b/net-analyzer/rrdcollect/rrdcollect-0.2.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Read system statistical data and feed it to RRDtool"
+HOMEPAGE="http://rrdcollect.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rrdcollect/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="exec librrd pcre"
+
+DEPEND="
+	librrd? ( net-analyzer/rrdtool )
+	pcre? ( dev-libs/libpcre )
+"
+RDEPEND="${DEPEND}"
+DOCS=( AUTHORS ChangeLog NEWS TODO )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable exec) \
+		$(use_with librrd) \
+		$(use_with pcre libpcre)
+}
+
+src_install() {
+	default
+	docinto examples
+	dodoc doc/examples/*
+}
diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest
index fc3f6a8efaf4..c24c69fd7a7e 100644
--- a/net-analyzer/sancp/Manifest
+++ b/net-analyzer/sancp/Manifest
@@ -9,6 +9,5 @@ DIST sancp-1.6.1.fix200511.b.patch 870 BLAKE2B 18ad38c37f11aa1c4804400db5475323d
 DIST sancp-1.6.1.fix200601.c.patch 3578 BLAKE2B 7c7e5ef0e1967d41f731d3c79f4273a4ebfc922159ada1940ba4635f6f82e63ed55faeffe53636d2c8fd96d57e1516211fff8852c73876d019fc13d59f4ace9d SHA512 3d15028d33e7dbddc74d8c6eefac6d66e357f024dca15afdfb8156b0cf969ab093c26baa43ebf7c1ac88f4275ef4bdc91c1cc69c5aa7b439a042ed966edea30f
 DIST sancp-1.6.1.fix200606.d.patch 6847 BLAKE2B 2d3d2369738adef1ae5ea37cfcab5952be243af269574292e042e361d7d4d02174bbaea2769f5fa6bf802eea6ae9559a3b637ee4dbce1b53715f1e4b66f9df51 SHA512 474a69052a2b9642fdc59e28c0237852d49b7b05445f0ffbbd2ea3f01b70a44e10ee49fba6294b413a53afe50271aaf88f979f8c479fb4b464b3ba5a70534276
 DIST sancp-1.6.1.tar.gz 69986 BLAKE2B 66ed4f5817f1bc299edc66441eea97fa0deeb0fffb15aeb251e3b0351d35f1c25aa452b30e0ba3feb80d306929687448228d0b6ac96e8deaf16c83322b73916a SHA512 41c6b35a2e7295d3b8185b9cc556c56b285cae7542c7ace78e663e54cef8d470bfa2ee083d9837fa34cf5ad1e7c325fb838b00e4f776f5662cade7d61e07145c
-EBUILD sancp-1.6.1-r4.ebuild 1717 BLAKE2B b2453eb7cfe66a10ec3761c23fa704ff1a75c1194f4bc1c1c30c4f6e747d64fe81f300f1bdf15c9c535a2c63422ff07786335f915331e346799810e18f52dce2 SHA512 20507210264c2b4aa7692916442e565b1128e960bc953a6ee2c3bb63e752caf6596fc2edf7a0e5ec530eea801b15a08c3eda33d2c00423d5c429a91f0fe14828
 EBUILD sancp-1.6.1-r5.ebuild 1814 BLAKE2B f16f379c88b9807221810e5fd3c89c5eb56d26670fcb19e441185c9583f69f4e9ecab41f4ee5d9cf720ab35632c77e1abbf3e4cd21a8ba2740be0dd2e7fd3d6e SHA512 437ab1a97e4323d582e26f82a555ca31aea878a3100d9d1ae955b03483cb98d546a7d29cb5a5009b5a0d086b7fb3bd2064dc0c2eb53d734216ac0afb65c7f03c
 MISC metadata.xml 473 BLAKE2B 2d145ab771bc6ec7572cfc0523c7d9630638909cdd4a8eba60a5ba47bd0d74d14985cca1cb435c26d1f2cf9893d22e8001066d17cbf763014def308c787cad99 SHA512 3328fdd1dc68198464db9730005254454691ac8f4fbdd76dc09eb21c12f21fcd011ce7fb6cb1ce06262eb79fcc3c43abddd2314bdc64e2022fc8e5bb58360a85
diff --git a/net-analyzer/sancp/sancp-1.6.1-r4.ebuild b/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
deleted file mode 100644
index 686e16f2ea80..000000000000
--- a/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="collect network traffic statistics and store them in pcap format"
-HOMEPAGE="https://sourceforge.net/projects/sancp/"
-SRC_URI="
-	http://www.metre.net/files/${P}.tar.gz
-	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch
-	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch
-	http://sancp.sourceforge.net/${PN}-1.6.1.fix200601.c.patch
-	http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch
-"
-
-LICENSE="QPL GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="sguil"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup sancp
-	enewuser sancp -1 -1 /dev/null sancp
-}
-
-src_prepare() {
-	epatch "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
-	epatch "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
-	# bug 138337
-	epatch "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
-	epatch "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
-	epatch "${FILESDIR}"/${P}-compiler.patch
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-
-	tc-export CXX CC
-}
-
-src_install() {
-	keepdir /var/log/sancp/
-	dodoc docs/CHANGES docs/fields.LIST docs/README docs/SETUP \
-		"${FILESDIR}"/sguil_sancp.conf etc/sancp/sancp.conf
-
-	insinto /etc/sancp
-	if use sguil ; then
-		newins "${FILESDIR}"/sguil_sancp.conf sancp.conf
-	else
-		doins etc/sancp/sancp.conf
-	fi
-
-	dobin sancp
-
-	newinitd "${FILESDIR}"/sancp.rc1 sancp
-	newconfd "${FILESDIR}"/sancp.confd sancp
-	if use sguil ; then
-		sed -i -e /^SANCP_OPTS/s:'sancp':"sguil":g \
-			-e s:'-d $LOGDIR/today':"-d /var/lib/sguil/$(hostname)/sancp": \
-			"${D}/etc/conf.d/sancp"
-	fi
-
-	fowners sancp:sancp /var/log/sancp
-	fperms 0770 /var/log/sancp
-}
diff --git a/net-analyzer/sflowtool/Manifest b/net-analyzer/sflowtool/Manifest
index 8efaf1802e28..141e02a58a01 100644
--- a/net-analyzer/sflowtool/Manifest
+++ b/net-analyzer/sflowtool/Manifest
@@ -3,9 +3,11 @@ DIST sflowtool-3.41.tar.gz 187119 BLAKE2B 3ba9d1baf8da4be14361ce82f7a783d7d1dde1
 DIST sflowtool-5.02.tar.gz 192907 BLAKE2B 100745fb7f4eb4e40edf93e66a0f3fb26e2cdc26d2d3808d6bf5fa4a92d2b973e6fd8947f39a1695898abf647f4012cbb1577af281f8b51fc6d008ed4643986e SHA512 9b2369c8d30b9cdcd1cdfca29e2f8405ac8ea3bba22243ce62d708f943b726865fbf6ba2eee2f0e00e5df1d1b6fd4977f636bbdbe9676424183e1f973bd64dde
 DIST sflowtool-5.04.tar.gz 187733 BLAKE2B 8298bbbf23d2ce30b5954a73fc8fed9e9e3510e77d80e02cff9fdab2330260cd3960db76ed7c1e9266b47f964e5724eb2fef9dd89514d9abbbf050df28e1e133 SHA512 611c3c23ed7a586997b1622b4d1c48eb0e0784a0667e5f7d17f2862c071ff5a34a55c6e537eba99e1c281d9ab870c95c805b764122b623520c81870d730b1688
 DIST sflowtool-5.05.tar.gz 187876 BLAKE2B 895d9ff10cf7fbf7219d18849abe6ffbf6a0b00aba7f50e69beaa15a1dc7aae317bb879a2b4d50a4ad0e88bcb889e1f0f946e18d16f977eda63d5acd98ff5c98 SHA512 7089f075dda7571100aa41e1f016a83a3dba62392e251f4c3f9a1eef0f9f5c02b189ca12b0c3ac77add78b83ca5ecc70b39d7317cd5feea2b4f3580121206937
+DIST sflowtool-5.06.tar.gz 78044 BLAKE2B db4a14d3e94660c803399f99b486bc04579b8dacf4e01f484ebeb31cbeec0ad279efdbd85b5a242a4dd9016e36428992344af50275dfd15c89b3337351d5fdb0 SHA512 365922e09544928bbf5893c04e05bc5b3d632290804711cc248d6bbd52c8ed30646bb9bdfd7b231a357f88bd5592473b95edff6ab3b50121809f909b4b65c7a2
 EBUILD sflowtool-3.34.ebuild 478 BLAKE2B a1e8ad0768cb72a2093dd937ee6a7bd36d6a0fc70a1bbc0b5f663fe4cbef8062c4e6d6e72100670a02c11c9035d572c95efebd4e38d703681f8b20c57bc5d760 SHA512 4089eb7326499d15d3bf2703f3764d35e1db32f5eda2a18b0455685f844f85a599f3ce9c5bc37bf61df08fdd1fb6aedce0e1f509142d870dca89cb1ac6c7ed3a
 EBUILD sflowtool-3.41.ebuild 562 BLAKE2B c525f5cae45cc62891d9647f71c0f1a9afcbe8eb24925244c01ba5c359090c506108658ad0ecba566f02772c9adbacf8d219906036d6466344f4585560c31553 SHA512 93c748e0bc9a40de73df9b4eea7e2bced91f06aa17fadda708e6cb8c8860e65ab54e5b0a22c10e402911e01b5b18ddefc646decbdfd06826786ddd55662cb47e
 EBUILD sflowtool-5.02.ebuild 557 BLAKE2B 0f6e476f19e4345720099fb3a8fff93645e4c1110541230a99f06df978bb871a48570b2a65e9e90eb8147e322c590d1a85da9c9ccb3424cf44cc4fc0110ddc7b SHA512 a465c43c462480e90dd379d3eedeb8625df606725489519b0ec67251de998573b5063cfc96db520a4cb29c918cff324d7b00415064ed181fb9de012fd756e184
 EBUILD sflowtool-5.04.ebuild 557 BLAKE2B 0f6e476f19e4345720099fb3a8fff93645e4c1110541230a99f06df978bb871a48570b2a65e9e90eb8147e322c590d1a85da9c9ccb3424cf44cc4fc0110ddc7b SHA512 a465c43c462480e90dd379d3eedeb8625df606725489519b0ec67251de998573b5063cfc96db520a4cb29c918cff324d7b00415064ed181fb9de012fd756e184
 EBUILD sflowtool-5.05.ebuild 557 BLAKE2B 334b464adfd17787de5f914a0c052257e697962b7ab781b88fe1d2778f083f0343f7eba7a784190eebbe727027ea966c0d851066b1552debde24f5fd731df364 SHA512 66b4d3002c78e74eab4fe13a44130f7875a0e23f4f31e4705f29606ed9c78e02f21e8202d3a463012c35d406a54849f84bd6648add64b5211b6a12296bf6a7e6
+EBUILD sflowtool-5.06.ebuild 662 BLAKE2B 2d95782d018a9ec75ef6e9af5261ee868f4285948e6c12b3142dbe06b3531907be8a15bad554892c3f3fbd21a31da392aa314027f3d2769f1795a2bbef8aa9e1 SHA512 a1a5920606a2b408c84b88c64e9b6a63f881eb0d747f7ceecb56b266bd84440a7217471243c7f49c0d53c47a4a807838b2cb957bb596322b85e6d5f0f46d1ba9
 MISC metadata.xml 370 BLAKE2B 54ac4c209077f5fa6d73a231013370ac06ce05d5f1ce8704291c0b7631fe8eafe6212065876287850e5ffcf56b532bf2fc7c678fb30dda1c8f6dd969bbb63c99 SHA512 7e6c6628a82ae6cb1cc52c362df66bda90edcfeff7af2a52b2aeb6eaf7703aa092ddb1a9b9ecbca5aa34ba9b07ff27ca69dd47832b67e90505c932bdc27c811d
diff --git a/net-analyzer/sflowtool/sflowtool-5.06.ebuild b/net-analyzer/sflowtool/sflowtool-5.06.ebuild
new file mode 100644
index 000000000000..1f5a093d2111
--- /dev/null
+++ b/net-analyzer/sflowtool/sflowtool-5.06.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
+HOMEPAGE="
+	https://inmon.com/technology/sflowTools.php
+	https://github.com/sflow/sflowtool
+"
+SRC_URI="https://github.com/sflow/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="inmon-sflow"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+src_configure() {
+	append-cppflags -DSPOOFSOURCE
+	use debug && append-cppflags -DDEBUG
+
+	default
+}
+
+src_install() {
+	default
+	dobin scripts/sflowenable
+}
diff --git a/net-analyzer/sguil-client/Manifest b/net-analyzer/sguil-client/Manifest
index e581b8b18536..b3f918f3e0d9 100644
--- a/net-analyzer/sguil-client/Manifest
+++ b/net-analyzer/sguil-client/Manifest
@@ -1,7 +1,3 @@
-DIST sguil-0.9.0.tar.gz 464204 BLAKE2B 147b743fd8f70969ee560a3f6995775c40cfbaf543d8292f16aa6f02289edde54207a3cddb4969229e0a123dad2fb589eaef3bddb016e6ff408a3d9be4c7820d SHA512 3f300901d0f0260fbc950b4c7604e3dc3eeb2d088ff45171db84e2d58e281242bf3582eac51162968f1f3766961aec4d0a7af54e85773102ee643a52e879cfa6
 DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
-DIST sguil-client-0.8.0.tar.gz 216433 BLAKE2B 65403d7c0de38fd4c010129ee692ab4af6853299566e3ffc6ac9a7f4e64b781830dad41f76dcaf4567bf5f217c5bd59396040cf36017b0ecdac733bc02c179db SHA512 44e14273cb7506b89d3138a1c50160de99576e77d6d18e3cdab9f257a1d00d5a100c8d9790f6e93aea8312fab51d52260aedfaa00facf54107249686d93e09b3
-EBUILD sguil-client-0.8.0.ebuild 1146 BLAKE2B a1b0ea60b014ba9e87a7f61b599d2d0d6096c4668e31a2da969155209641b48816cadf1947fe71c408267faea457913ea9ab9f945e52e59ccdab965fd1b6ba22 SHA512 128c4a4f45e7359e0275e8fc33a3984ef1aeab5171015526dcfd34d48d79a8aeb7c0a0e277c032f3a6fea9fec26b54fd9dff08bf539cce9d536bafab78073ba0
-EBUILD sguil-client-0.9.0.ebuild 1102 BLAKE2B fbf995943267883c71ce8d03730fd732da63f11c0ccde412384916c0711d664801b58def85413ac26b3932ffeae0625d20bb7a7bb34ca6c77ce8988740ac97e3 SHA512 0a287f755f98e56312696acfa83e69bf274d2719f539ed36e10d6c4c50a75fff3d7dd610e03ee984bef19a7420d9f02ab0a2671a13d4bc5cfa8bae41bbdd0932
 EBUILD sguil-client-1.0.0.ebuild 1093 BLAKE2B 83b978b9eb65dc8578259d2b19dac479c0e75b3d38bd7fd93c2167ecd4e01fb9bd86e15d5116431cc67b250c01df6e205c8d66958f6b2779150343f00e5ef05d SHA512 b3dd6e5a199bfc89480de64de547458b9143501b7107292af4849b03f620f72627ef6c2087d5f7aca53109e181cd01afcd59fdf94957a6b23ece0b291c8ee776
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-client/sguil-client-0.8.0.ebuild b/net-analyzer/sguil-client/sguil-client-0.8.0.ebuild
deleted file mode 100644
index 486064c7fd78..000000000000
--- a/net-analyzer/sguil-client/sguil-client-0.8.0.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 multilib
-
-MY_PV="${PV/_p/p}"
-DESCRIPTION="GUI Console for sguil Network Security Monitoring"
-HOMEPAGE="http://sguil.sf.net"
-SRC_URI="mirror://sourceforge/sguil/sguil-client-${MY_PV}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND="
-	>=dev-lang/tcl-8.3:0=[-threads]
-	>=dev-lang/tk-8.3:0=
-	>=dev-tcltk/itcl-3.2
-	>=dev-tcltk/tclx-8.3
-	dev-tcltk/itk
-	dev-tcltk/iwidgets
-	dev-tcltk/tcllib
-	net-analyzer/wireshark
-	ssl? ( >=dev-tcltk/tls-1.4.1 )
-"
-
-S=${WORKDIR}/sguil-${MY_PV}
-
-src_prepare() {
-	sed -i \
-		-e "/^set SGUILLIB /s:./lib:/usr/$(get_libdir)/sguil:" \
-		-e '/^set ETHEREAL_PATH /s:/usr/sbin/ethereal:/usr/bin/wireshark:' \
-		-e '/^set SERVERHOST /s:demo.sguil.net:localhost:' \
-		-e '/^set MAILSERVER /s:mail.example.com:localhost:' \
-		-e '/^set GPG_PATH /s:/usr/local/bin/gpg:/usr/bin/gpg:' \
-		client/sguil.conf || die
-}
-
-src_install() {
-	dobin client/sguil.tk
-	insinto /etc/sguil
-	doins client/sguil.conf
-	insinto "/usr/$(get_libdir)/sguil"
-	doins -r "${S}"/client/lib/*
-	dodoc doc/*
-}
diff --git a/net-analyzer/sguil-client/sguil-client-0.9.0.ebuild b/net-analyzer/sguil-client/sguil-client-0.9.0.ebuild
deleted file mode 100644
index 0eff0c582b96..000000000000
--- a/net-analyzer/sguil-client/sguil-client-0.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib
-
-MY_PV="${PV/_p/p}"
-DESCRIPTION="GUI Console for sguil Network Security Monitoring"
-HOMEPAGE="http://sguil.sf.net"
-SRC_URI="https://github.com/bammv/${PN/-client}/archive/v${PV}.tar.gz -> ${P/-client}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-RDEPEND="
-	>=dev-lang/tcl-8.3:0=[-threads]
-	>=dev-lang/tk-8.3:0=
-	>=dev-tcltk/itcl-3.2
-	>=dev-tcltk/tclx-8.3
-	dev-tcltk/itk
-	dev-tcltk/iwidgets
-	dev-tcltk/tcllib
-	net-analyzer/wireshark
-	ssl? ( >=dev-tcltk/tls-1.4.1 )
-"
-
-S=${WORKDIR}/sguil-${MY_PV}
-
-src_prepare() {
-	sed -i \
-		-e "/^set SGUILLIB /s:./lib:/usr/$(get_libdir)/sguil:" \
-		-e '/^set SERVERHOST /s:demo.sguil.net:localhost:' \
-		-e '/^set MAILSERVER /s:mail.example.com:localhost:' \
-		-e '/^set GPG_PATH /s:/usr/local/bin/gpg:/usr/bin/gpg:' \
-		client/sguil.conf || die
-}
-
-src_install() {
-	dobin client/sguil.tk
-	insinto /etc/sguil
-	doins client/sguil.conf
-	insinto "/usr/$(get_libdir)/sguil"
-	doins -r "${S}"/client/lib/*
-	dodoc doc/*
-}
diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest
index c4a51462882b..d152ae72b318 100644
--- a/net-analyzer/sguil-sensor/Manifest
+++ b/net-analyzer/sguil-sensor/Manifest
@@ -1,10 +1,6 @@
 AUX log_packets.confd 527 BLAKE2B 568a785fab6f027218269378d345986c354246dad66673ef9968e2188ea3f2f0377cdd84db0a1a4a165a428ba9f4270eb28096361291ac2bcddfbf0430916b03 SHA512 a4f9ed9abb050184773c59271d7e13f6bcbf853341dd31c72909ee6d31bb92990d84f31bf3111d8950fb4311747694c714498552eb26ca8a82ed3cb645847e82
 AUX log_packets.initd 2093 BLAKE2B a251bc9692a599e66943d5b3f6615f281d7872da22a76699875853f72836102cdb94fdf558250ee74e8618f8c45725dea0410e5fb635f153aadf5499575b4fe9 SHA512 43bc027f4769e986641a9820a1dfcb8a794ae417cb49efe333fd6a960953e1f9854c660e95ae9c0e14f4c1ec59da9e3096ae7352bbbb77805dc71729ed76514d
 AUX sensor_agent.initd 742 BLAKE2B 6d8a1aee38f81f4d9d971ec3a2d56112c0789ca60d5ee51ff7444109e55ddac889db81199e5883070031fe247cc06506febcb3ae27b5a215974a4f953121b887 SHA512 3a025479579ee9eec6a26d2a2c70efc362d37b7821dfa211236d8fe9dc2ea7b7b0694dccfd9b208655702401c1b0e3ecb08bac9e3b177ee77f161e5c774c1611
-DIST sguil-0.9.0.tar.gz 464204 BLAKE2B 147b743fd8f70969ee560a3f6995775c40cfbaf543d8292f16aa6f02289edde54207a3cddb4969229e0a123dad2fb589eaef3bddb016e6ff408a3d9be4c7820d SHA512 3f300901d0f0260fbc950b4c7604e3dc3eeb2d088ff45171db84e2d58e281242bf3582eac51162968f1f3766961aec4d0a7af54e85773102ee643a52e879cfa6
 DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
-DIST sguil-sensor-0.8.0.tar.gz 142829 BLAKE2B f753c1bf6a95ba7b12d3a91d2d6ddf506b9dfb09208d08ad5ffcea95210525f014c3807d3e79df10739b00466e5e10e88d2e2494cfbbbb7c7145f2800df62600 SHA512 9b90598f2a3fdcf8652ccb92123944ffbda61c00f131bc951b12a95002f84f555f8c63cc1235fd7bb90875d00edbecbda02750bcca3bba7d16e1b1a150eb74ae
-EBUILD sguil-sensor-0.8.0.ebuild 2129 BLAKE2B 398b1e178cccc0814579378a69de2ab129d5f0b8c145e3c778f5a4076ec1ddccece005fdd4dbbe9f7cc2f2365d4e85748fc795238f538b331d3f54a75a271040 SHA512 5f8b73a592c21266b4cab281861f5c4173443a0bb05a91498394f5dc2561776e30152d790710448583555f0ebb91575335811d7a644cbed4c4c59e3e4491a9c9
-EBUILD sguil-sensor-0.9.0.ebuild 2161 BLAKE2B ee8cbc4719f3891f58297d89415609964db35649f3da01d16bde68fd7d918c50b1dddd0d5b5067bd0e4dc32aa930ae46a3e7159268cabb029b82aa2a444812e3 SHA512 8f9934b42fa92264c4eef6c6436b10b4686de6d612e26ee458cf4cba170ce172f66e40dbda3730f74410341a8d95101f6ca396e931bc03fc9abf6fee8c4abccb
 EBUILD sguil-sensor-1.0.0.ebuild 2160 BLAKE2B 3bf6a6883318a36854dce49c5868381e36413ee3730f04d1523d5140683a7d57b41c3456943aad451d0cbede13c472f20d0ee09c24bae9879ce1aa33d09ab628 SHA512 f99cb77ca20604dc0b26ee038ab200472ba883e44185262833fdf3b4094f6599e30d20451c54784607a4601d529d151e87ab798cb6705b04442c586bd3bbddae
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild
deleted file mode 100644
index 2589f9861647..000000000000
--- a/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user
-
-MY_PV="${PV/_p/p}"
-DESCRIPTION="Sensor part of sguil Network Security Monitoring"
-HOMEPAGE="http://sguil.sourceforge.net"
-SRC_URI="mirror://sourceforge/sguil/sguil-sensor-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2 QPL"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-lang/tcl-8.3:0=[-threads]
-	>=dev-tcltk/tclx-8.3
-	>=net-analyzer/barnyard-0.2.0-r1
-	>=net-analyzer/snort-2.4.1-r1
-	dev-ml/pcre-ocaml
-	net-analyzer/sancp
-"
-
-S="${WORKDIR}/sguil-${MY_PV}"
-
-pkg_setup() {
-	enewgroup sguil
-	enewuser sguil -1 -1 /var/lib/sguil sguil
-}
-
-src_prepare() {
-	sed -i \
-		-e "s:gateway:${HOSTNAME}:" \
-		-e 's:/snort_data:/var/lib/sguil:' \
-		-e 's:DAEMON 0:DAEMON 1:' \
-		-e 's:DEBUG 1:DEBUG 0:g' \
-		sensor/sensor_agent.conf || die
-	sed -i \
-		-e 's:/run/sensor_agent.pid:/run/sguil-sensor.pid:' \
-		sensor/sensor_agent.tcl || die
-}
-
-src_install() {
-	dodoc doc/*
-
-	dobin sensor/sensor_agent.tcl
-
-	newinitd "${FILESDIR}/log_packets.initd" log_packets
-	newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent
-	newconfd "${FILESDIR}/log_packets.confd" log_packets
-	insinto /etc/sguil
-	doins sensor/sensor_agent.conf
-
-	# Create the directory structure
-	diropts -g sguil -o sguil
-	keepdir /var/lib/sguil /var/lib/sguil/archive \
-		"/var/lib/sguil/${HOSTNAME}" \
-		"/var/lib/sguil/${HOSTNAME}/portscans" \
-		"/var/lib/sguil/${HOSTNAME}/ssn_logs" \
-		"/var/lib/sguil/${HOSTNAME}/dailylogs" \
-		"/var/lib/sguil/${HOSTNAME}/sancp"
-
-}
-
-pkg_postinst() {
-	elog
-	elog "You should check /etc/sguil/sensor_agent.conf and"
-	elog "/etc/init.d/logpackets and ensure that they are accurate"
-	elog "for your environment. They should work providing that you"
-	elog "are running the sensor on the same machine as the server."
-	elog "This ebuild assumes that you are running a single sensor"
-	elog "environment, if this is not the case then you must make sure"
-	elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable."
-	elog "You should crontab the /etc/init.d/log_packets script to restart"
-	elog "each hour."
-	elog
-}
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-0.9.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-0.9.0.ebuild
deleted file mode 100644
index 3235c34d475a..000000000000
--- a/net-analyzer/sguil-sensor/sguil-sensor-0.9.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user
-
-MY_PV="${PV/_p/p}"
-DESCRIPTION="Sensor part of sguil Network Security Monitoring"
-HOMEPAGE="http://sguil.sourceforge.net"
-SRC_URI="https://github.com/bammv/${PN/-sensor}/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz"
-
-LICENSE="GPL-2 QPL"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-lang/tcl-8.3:0=[-threads]
-	>=dev-tcltk/tclx-8.3
-	>=net-analyzer/barnyard-0.2.0-r1
-	>=net-analyzer/snort-2.4.1-r1
-	dev-ml/pcre-ocaml
-	net-analyzer/sancp
-"
-
-S="${WORKDIR}/sguil-${MY_PV}"
-
-pkg_setup() {
-	enewgroup sguil
-	enewuser sguil -1 -1 /var/lib/sguil sguil
-}
-
-src_prepare() {
-	sed -i \
-		-e "s:gateway:${HOSTNAME}:" \
-		-e 's:/snort_data:/var/lib/sguil:' \
-		-e 's:DAEMON 0:DAEMON 1:' \
-		-e 's:DEBUG 1:DEBUG 0:g' \
-		sensor/sensor_agent.conf || die
-	sed -i \
-		-e 's:/var/run/sensor_agent.pid:/run/sguil-sensor.pid:' \
-		sensor/sensor_agent.tcl || die
-}
-
-src_install() {
-	dodoc doc/*
-
-	dobin sensor/sensor_agent.tcl
-
-	newinitd "${FILESDIR}/log_packets.initd" log_packets
-	newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent
-	newconfd "${FILESDIR}/log_packets.confd" log_packets
-	insinto /etc/sguil
-	doins sensor/sensor_agent.conf
-
-	# Create the directory structure
-	diropts -g sguil -o sguil
-	keepdir /var/lib/sguil /var/lib/sguil/archive \
-		"/var/lib/sguil/${HOSTNAME}" \
-		"/var/lib/sguil/${HOSTNAME}/portscans" \
-		"/var/lib/sguil/${HOSTNAME}/ssn_logs" \
-		"/var/lib/sguil/${HOSTNAME}/dailylogs" \
-		"/var/lib/sguil/${HOSTNAME}/sancp"
-
-}
-
-pkg_postinst() {
-	elog
-	elog "You should check /etc/sguil/sensor_agent.conf and"
-	elog "/etc/init.d/logpackets and ensure that they are accurate"
-	elog "for your environment. They should work providing that you"
-	elog "are running the sensor on the same machine as the server."
-	elog "This ebuild assumes that you are running a single sensor"
-	elog "environment, if this is not the case then you must make sure"
-	elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable."
-	elog "You should crontab the /etc/init.d/log_packets script to restart"
-	elog "each hour."
-	elog
-}
diff --git a/net-analyzer/sguil-server/Manifest b/net-analyzer/sguil-server/Manifest
index eb33059a4832..ac6ad6f58711 100644
--- a/net-analyzer/sguil-server/Manifest
+++ b/net-analyzer/sguil-server/Manifest
@@ -1,9 +1,5 @@
 AUX sguild.confd 718 BLAKE2B b2ac186865f8fbe20c920b8f493fe6b7fd5736244e8d5574c8362e9c663baecd270821d024f124cb952d49a2ea80513d0bf961db9bf1fa5a93262b2236051037 SHA512 48bf64ed2335367c6b11dafb7f157fc507398e2466e186602e3319891848b3b47a5f9a70a39d8d94ecba170a7604252f689d116442572c3bc71441b01e3c0e34
 AUX sguild.initd 1198 BLAKE2B bd1225afa2e9544a818d234270fa1179db899b400492cea5efce91d59b7f211ba44cf4014eb7b5b785fa5da318cf7c52ca87d961ac4cd0c90e354219de270d8f SHA512 73bc162660ec36e568071026b6578a6e46215720cafdf957356307a341fcb159f201ba075d3f97563c81384da119f88a002f0f9e990071aef18026ad77e2e101
-DIST sguil-0.9.0.tar.gz 464204 BLAKE2B 147b743fd8f70969ee560a3f6995775c40cfbaf543d8292f16aa6f02289edde54207a3cddb4969229e0a123dad2fb589eaef3bddb016e6ff408a3d9be4c7820d SHA512 3f300901d0f0260fbc950b4c7604e3dc3eeb2d088ff45171db84e2d58e281242bf3582eac51162968f1f3766961aec4d0a7af54e85773102ee643a52e879cfa6
 DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab
-DIST sguil-server-0.8.0.tar.gz 102236 BLAKE2B 15dfe03f79bba92486e12fa85a368e01005c8587abd7119ef5264c14efaf8f8861346c1744590316a2a40160d11b3042abe8456f911fee677d83846561a8ee70 SHA512 84161365579e3b4227314d9f61afad6ad220261525d7fc8016210a13ee607815eb33178bab026f8a217c43a42f2e623c41d579c5898f58207a18e31685426710
-EBUILD sguil-server-0.8.0.ebuild 2716 BLAKE2B 78b73df05a2d73d390dddc051e78a80031a0bf48263f2bb43e1dbac6180d67a5ecea9e76d1c80590b46f8860360253eab5180b4dbe3e5a3dea0df9ce248792fd SHA512 796f7ff1160ebfeaebad19bc778a54cc8d44cf7376ff74dda704f9dc25018a1277500cb3e3e5a08a1dd70a87842a3fe3e1fbeef318ce9cafb01466b534da67c4
-EBUILD sguil-server-0.9.0.ebuild 2744 BLAKE2B 5d64790bf018e24fc99a59beb386f49d4c0f0e97e6ca59c1c183b8228d720e83d3fbd3045da664cb953e51a72938f28dfc6a5d911c0d8f5dc4a74cc39e891583 SHA512 c7a3d412059c9c436a04312cac698559ba6b135ac72fd83b798bceb19ebcb7bb485b106ff91466cc7a94d219051dbbaa873de421b884e88f9b1c936cb5d362e2
 EBUILD sguil-server-1.0.0.ebuild 2696 BLAKE2B 73d8065d9cbf487839c61c85169de7a41fc267a334a191bad48aed2bcbe643e5f01b7f39853699c3f4a52639f4b854de58d035d30140e598942c4648ba8e8e3a SHA512 3faf9efbd2832e93e988e367bbe7161d4028232406eeabe43e45c7cb306abf3c3dfd1efc6068bb104bc23570a29893d2e9362169a1f850470773a14cf0dc5cc0
 MISC metadata.xml 418 BLAKE2B 7d1502fb438a75e29db9a29cd469c6ded1cb6566e374bd9ec0aa1ba4902b160a6e2f568bbacf78956db116df52e7bf647fc9c1b69a3e38b254c60ebc74fc6ea0 SHA512 bbe71ed5ce17f337808f82d4fe54ef68b94723a808c597a52d049b88b7334be9abb066911accf9175886405f3f02d37d838422a933afe8e00eeeac2c74ba5ed3
diff --git a/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild b/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild
deleted file mode 100644
index 916e85a177ae..000000000000
--- a/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib ssl-cert user
-
-MY_PV="${PV/_p/p}"
-DESCRIPTION="Daemon for Sguil Network Security Monitoring"
-HOMEPAGE="http://sguil.sourceforge.net"
-SRC_URI="mirror://sourceforge/sguil/sguil-server-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2 QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND="
-	>=dev-lang/tcl-8.3:0=[-threads]
-	>=dev-tcltk/tclx-8.3
-	dev-tcltk/tcllib
-	dev-tcltk/mysqltcl
-	ssl? ( >=dev-tcltk/tls-1.4.1 )"
-RDEPEND="${DEPEND}
-	net-analyzer/p0f
-	net-analyzer/tcpflow
-	net-misc/openssh"
-
-S="${WORKDIR}/sguil-${MY_PV}"
-
-pkg_setup() {
-	enewgroup sguil
-	enewuser sguil -1 -1 /var/lib/sguil sguil
-}
-
-src_prepare() {
-	sed -i \
-		-e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \
-		-e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/lib/sguild:g' \
-		-e 's:/sguild_data/rules:/var/lib/sguil/rules:g' \
-		-e 's:/sguild_data/archive:/var/lib/sguil/archive:g' \
-		-e 's:/usr/lib/sguild:/usr/'$(get_libdir)'/sguild:g' \
-		server/sguild.conf || die
-}
-
-src_install() {
-	dodoc server/sql_scripts/*
-	dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \
-	doc/TODO doc/sguildb.dia
-
-	insopts -m640
-	insinto /etc/sguil
-	doins server/{sguild.email,sguild.users,sguild.conf,sguild.queries,sguild.access,autocat.conf}
-
-	insinto /usr/$(get_libdir)/sguild
-	doins server/lib/*
-	dobin server/sguild
-	newinitd "${FILESDIR}/sguild.initd" sguild
-	newconfd "${FILESDIR}/sguild.confd" sguild
-
-	if use ssl; then
-		sed -i -e "s/#OPENSSL/OPENSSL/" "${D}/etc/conf.d/sguild"
-	fi
-
-	diropts -g sguil -o sguil
-	keepdir \
-		/var/lib/sguil \
-		/var/lib/sguil/archive \
-		/var/lib/sguil/rules
-
-}
-
-pkg_postinst() {
-	if use ssl && ! [ -f "${ROOT}"/etc/sguil/sguild.key ]; then
-		install_cert /etc/sguil/sguild
-	fi
-
-	chown -R sguil:sguil "${ROOT}"/etc/sguil/sguild.*
-	chown -R sguil:sguil "${ROOT}"/usr/lib/sguild
-
-	if [ -d "${ROOT}"/etc/snort/rules ] ; then
-		ln -s /etc/snort/rules "${ROOT}"/var/lib/sguil/rules/${HOSTNAME}
-	fi
-
-	elog
-	elog "Please customize the sguild configuration files in /etc/sguild before"
-	elog "trying to run the daemon. Additionally you will need to setup the"
-	elog "mysql database. See /usr/share/doc/${PF}/INSTALL.gz for information."
-	elog "Please note that it is STRONGLY recommended to mount a separate"
-	elog "filesystem at /var/lib/sguil for both space and performance reasons"
-	elog "as a large amount of data will be kept in the directory structure"
-	elog "underneath that top directory."
-	elog
-	elog "You should create the sguild db as per the install instructions in"
-	elog "/usr/share/doc/${PF}/ and use the appropriate"
-	elog "database setup script located in the same directory."
-
-	elog
-}
diff --git a/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild b/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild
deleted file mode 100644
index 2e7c27e1fe29..000000000000
--- a/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib ssl-cert user
-
-MY_PV="${PV/_p/p}"
-DESCRIPTION="Daemon for Sguil Network Security Monitoring"
-HOMEPAGE="http://sguil.sourceforge.net"
-SRC_URI="https://github.com/bammv/${PN/-server}/archive/v${PV}.tar.gz -> ${P/-server}.tar.gz"
-
-LICENSE="GPL-2 QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssl"
-
-DEPEND="
-	>=dev-lang/tcl-8.3:0=[-threads]
-	>=dev-tcltk/tclx-8.3
-	dev-tcltk/tcllib
-	dev-tcltk/mysqltcl
-	ssl? ( >=dev-tcltk/tls-1.4.1 )"
-RDEPEND="${DEPEND}
-	net-analyzer/p0f
-	net-analyzer/tcpflow
-	net-misc/openssh"
-
-S="${WORKDIR}/sguil-${MY_PV}"
-
-pkg_setup() {
-	enewgroup sguil
-	enewuser sguil -1 -1 /var/lib/sguil sguil
-}
-
-src_prepare() {
-	sed -i \
-		-e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \
-		-e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/lib/sguild:g' \
-		-e 's:/sguild_data/rules:/var/lib/sguil/rules:g' \
-		-e 's:/sguild_data/archive:/var/lib/sguil/archive:g' \
-		-e 's:/usr/lib/sguild:/usr/'$(get_libdir)'/sguild:g' \
-		server/sguild.conf || die
-}
-
-src_install() {
-	dodoc server/sql_scripts/*
-	dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \
-	doc/TODO doc/sguildb.dia
-
-	insopts -m640
-	insinto /etc/sguil
-	doins server/{sguild.email,sguild.users,sguild.conf,sguild.queries,sguild.access,autocat.conf}
-
-	insinto /usr/$(get_libdir)/sguild
-	doins server/lib/*
-	dobin server/sguild
-	newinitd "${FILESDIR}/sguild.initd" sguild
-	newconfd "${FILESDIR}/sguild.confd" sguild
-
-	if use ssl; then
-		sed -i -e "s/#OPENSSL/OPENSSL/" "${D}/etc/conf.d/sguild"
-	fi
-
-	diropts -g sguil -o sguil
-	keepdir \
-		/var/lib/sguil \
-		/var/lib/sguil/archive \
-		/var/lib/sguil/rules
-
-}
-
-pkg_postinst() {
-	if use ssl && ! [ -f "${ROOT}"/etc/sguil/sguild.key ]; then
-		install_cert /etc/sguil/sguild
-	fi
-
-	chown -R sguil:sguil "${ROOT}"/etc/sguil/sguild.*
-	chown -R sguil:sguil "${ROOT}"/usr/lib/sguild
-
-	if [ -d "${ROOT}"/etc/snort/rules ] ; then
-		ln -s /etc/snort/rules "${ROOT}"/var/lib/sguil/rules/${HOSTNAME}
-	fi
-
-	elog
-	elog "Please customize the sguild configuration files in /etc/sguild before"
-	elog "trying to run the daemon. Additionally you will need to setup the"
-	elog "mysql database. See /usr/share/doc/${PF}/INSTALL.gz for information."
-	elog "Please note that it is STRONGLY recommended to mount a separate"
-	elog "filesystem at /var/lib/sguil for both space and performance reasons"
-	elog "as a large amount of data will be kept in the directory structure"
-	elog "underneath that top directory."
-	elog
-	elog "You should create the sguild db as per the install instructions in"
-	elog "/usr/share/doc/${PF}/ and use the appropriate"
-	elog "database setup script located in the same directory."
-
-	elog
-}
diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest
index 8e78f033e794..b9a4d5011fa0 100644
--- a/net-analyzer/tcptrace/Manifest
+++ b/net-analyzer/tcptrace/Manifest
@@ -3,6 +3,8 @@ AUX tcptrace-6.6.7-cross-compile.patch 1348 BLAKE2B f38a64ed02c45482db7b0fb18865
 DIST tcptrace-6.6.7.tar.gz 3773308 BLAKE2B cae5816cb25c33f71c316d14de3c18ff26f0e7452375a962b88c4818ca7c43425e7298e788bd8cb43f2e22ac7dc9b89ed1921b7bd70d0e8befab3ee791453fb1 SHA512 3638770c342aea6c71aa556e758ed22e1fd44730f6c652cf82d3861eb1c31b186952c660071bd1df45020b80eaf9dd090a4ff58c979cc907eb8154dcb7b9b432
 DIST tcptrace_6.6.7-4.1.diff.gz 29161 BLAKE2B 83768d0a6f14525f20b484421181078a3cf7ac3adeada3cf02a7441530593632743c6e515dd8738f5a4692422d97f4eb718dda076a234489096a10defb97dd5f SHA512 2f6dfeb8e15faa0151bdbb18194587e51de040f63117eb1b469a826091d5c1e5eb41a306bdc94e89ce993d0d04ec31324e5f7eea0a1a52852e07ee80006b2087
 DIST tcptrace_6.6.7-5.debian.tar.xz 6236 BLAKE2B 21d35b625fdc7b94c29b2be595ac39488578f08c53e5dde98953bbebaa2d8d96de968b746dd107ea78365a77f1fe7aa5abfeb3aeef4473c9020587f93066000c SHA512 6265d0bfb25f256c8f356cda731c48f869fe3e9d9504ed6afd0e98a3c2caf5dbcff73373c338be111712713b9a501fae886bb06723796103bac4dec5d8fcfaf6
+DIST tcptrace_6.6.7-6.debian.tar.xz 6056 BLAKE2B a46a8a8a8f804066486566bccd10e33dc372a1fc30f37f401913c2b3038cf917891472e93a509cac8bdd2928d473c3ce21d0c4048c96ae54967fc48780384221 SHA512 82eebc2e297130cbafab0bb1757402d8b210885320ded1cd9b7ff064248d145c93196820564d4d1d7f1b1f7391cc5f734a0e0bf6275ddcae106d0bd540e32b61
 EBUILD tcptrace-6.6.7_p4_p1.ebuild 1482 BLAKE2B bdb5cbfdefd511b1a25e5c9ad5419a3da024c45b66fba910ef4878e7c1ce049344c0a69f9d3a3598a3c834e99d1196400c6a002a93dc7263b7dc20bfa68131c0 SHA512 3d9fd141afe03bc7f729ab47871d6c55f3c7ea7ff3a2e50a2f3855e2b964a2559e9e12917f45d13a5ca53556114bad0ce4288f3ff01f60a28ee5e2f36b883888
 EBUILD tcptrace-6.6.7_p5.ebuild 1250 BLAKE2B 786c6ff2d34b2155830acb942d3a37731335ccc81642ab9c43118ea39e3ac01df8cfdb7824c67ce1994cd93572f9cf6b34d75ffe0bce12fa14c9ac3ab05b4a37 SHA512 3ec354b314768b594e3b31eef8df45d41af4faa84db0b0100c30bebfca2e5078eadacad0481da923dac53956f3b385b69ed0d285ae0726382ae4e410756c71ac
+EBUILD tcptrace-6.6.7_p6.ebuild 1250 BLAKE2B f61f5bbfebe1a66782042c56cab408f77b2798e8b78850a31a968751f42507ae9c9fe4b0a70fea5c74fee9df111c8cf63a117f900d588211894eb538f4e3d728 SHA512 bf523deb713bc0abb6df55bbc02dee5cc41c2b77dccf464b0c3881fcf1f025fd3c0ca6c8e9a504e32bd54ba3be8e9141dc4b3c9db0718eddd5c8347a53d2fe8e
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
new file mode 100644
index 000000000000..f08f5f8fd7de
--- /dev/null
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A Tool for analyzing network packet dumps"
+HOMEPAGE="http://www.tcptrace.org/"
+SRC_URI="
+	http://www.tcptrace.org/download/${P/_p*}.tar.gz
+	http://www.tcptrace.org/download/old/6.6/${P/_p*}.tar.gz
+	mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${P/_p*}-cross-compile.patch
+	"${FILESDIR}"/${P/_p*}-_DEFAULT_SOURCE.patch
+)
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+	default
+
+	eapply \
+		$(awk '{ print "'"${WORKDIR}"'/debian/patches/" $0; }' < "${WORKDIR}"/debian/patches/series)
+
+	eautoreconf
+}
+
+src_compile() {
+	emake CCOPT="${CFLAGS}"
+}
+
+src_install() {
+	dobin tcptrace xpl2gpl
+
+	newman tcptrace.man tcptrace.1
+	dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Note: tcptrace outputs its graphs in the xpl (xplot)"
+		elog "format. Since xplot is unavailable, you will have to"
+		elog "use the included xpl2gpl utility to convert it to"
+		elog "the gnuplot format."
+	fi
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 76d97854e27b..a76b2933fe8c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -5,8 +5,10 @@ AUX wireshark-99999999-androiddump-wsutil.patch 428 BLAKE2B 1385ce244836fa79c88d
 AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e
 AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
 DIST wireshark-3.2.6.tar.xz 31635628 BLAKE2B 216623d4f357e755b9c032bef45b30c373bb0e2de773daabb78725491bd8eb0290d25a9016081dc62844c1be63e3afd273a8a6b8d16e70e589465fd837cc7442 SHA512 71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78
+DIST wireshark-3.2.7.tar.xz 31659996 BLAKE2B 69ed148e5cc6403b3948f4851164033163d0817626feaeaa0abf09b749c9e37c036786ed91f04add1ceeb80b69b7d05316b648d339c8c86f0818e0ee0afdf4ad SHA512 c17913fe6c193ccc6b0dbf86932d625a1f3b670aef805296e5db2639118218e06d513910ad50ab3926204f94a0010425b0d498176f987516d64fdd6a52d2517b
 DIST wireshark-3.3.0.tar.xz 32795500 BLAKE2B 1f5b7711e76464403a9ed11f2f72a858716e177334b036bf5f2b2aa9f41b197fded04ff18a3841f3d6fdab9acf331a5bc4dfee3adc8eca775c4eeedbbc163ece SHA512 1ca59d951b3b3c18f55f21023a775124639fbc99a0396e3b2ecf3569213659a039836c6bdaf82b802668b5108f455106a22e83ab26ee18ed882dfa564594df5a
 EBUILD wireshark-3.2.6.ebuild 7045 BLAKE2B 2a0720dae27a7107ee5d4befc453381bbe823f5ca5a79ead2064922ed124901f03060b631b56d28f08b8ff62dffd6b83fb829aed035d4a856d733e93c6c98647 SHA512 f06a5f4253320cfd44cfdd55fa03cba0222fab6310ae7fdfafb475c95e9c879e1c889370f5a67a757c73a3f71e68b67f4f1493044adfc6d810256b1ee5a9c2cc
+EBUILD wireshark-3.2.7.ebuild 7049 BLAKE2B 27333a50c3ddc495611adc472e28b161378a41f544a571c256f99bbefda4e36ecd3a71ca75d848674b94ef820786e3c136b5ac279e5e42fa5e0fe7c65f6fcafc SHA512 19cc1d7536fd75a1ee67e4d035c22afe0e73e85ccc4b8658eba07b2a5166a08dfa933ef9dd4d287837264bdcb22ecfa4030a39322ed646ed983118836eed9296
 EBUILD wireshark-3.3.0.ebuild 6958 BLAKE2B 7cc52200981228568376a3ffdab962a7d610ead91dfa67237fcf313f5fe8a564acf8d578f82c9815dded47795ca1b43f082938896b04a3f6e41d95bfcd20bac3 SHA512 50af2109a63fb3672afa55906a9d7aa7dfe0c5a7cee6fc4b06b4e9d429af664949e258bd3478aeb46ad1f2decece5b9dfbd3487183d39a3d21c106ecbe4bc8ea
 EBUILD wireshark-99999999.ebuild 6883 BLAKE2B 93a85e82b44a92298cde281cdcaa4e1ebfc26a832b922850fdce3438409cbf8a2e2b68ba3b3bf74c2975dce89a8948cc24571df551889f4b54fc81484a5fb127 SHA512 013ceac4f3c654df13a0b3bc2b03a99488b68bc0901ece57c6a2684c753577abcec1b82bc657cc9f4da13020e07b53fbe4748cf9fc9a9edb5566c929c3229e94
 MISC metadata.xml 5040 BLAKE2B f90a667752c84ec9f7098916a62d280caa2abde9c02eb751e9564ace0e4832f58a277d0a379fc549145488442463e7885d89c235ed707f09e167afe98fb0a380 SHA512 67a13228dcbecbeff78cabdf8de7f6b6dd0836321f5d17e09f65866d8258688dea033cdbccd8447c8f857637da55228c5c74ac9311543b74f574510aa0d6935c
diff --git a/net-analyzer/wireshark/wireshark-3.2.7.ebuild b/net-analyzer/wireshark/wireshark-3.2.7.ebuild
new file mode 100644
index 000000000000..5b16741cb38c
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.2.7.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+IUSE="
+	androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon
+	+dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
+	+minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump
+	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
+	test +text2pcap tfshark +tshark +udpdump zlib +zstd
+"
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-dns/c-ares-1.5
+	dev-libs/libgcrypt:0
+	bcg729? ( media-libs/bcg729 )
+	brotli? ( app-arch/brotli )
+	ciscodump? ( >=net-libs/libssh-0.6 )
+	filecaps? ( sys-libs/libcap )
+	http2? ( net-libs/nghttp2 )
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	maxminddb? ( dev-libs/libmaxminddb )
+	minizip? ( sys-libs/zlib[minizip] )
+	netlink? ( dev-libs/libnl:3 )
+	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 )
+	zstd? ( app-arch/zstd )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-ruby/asciidoctor
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	test? (
+		dev-python/pytest
+		dev-python/pytest-xdist
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+	plugin-ifdemo? ( plugins )
+"
+RESTRICT="test"
+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
+
+	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_BROTLI=$(usex brotli)
+		-DENABLE_CAP=$(usex filecaps caps)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_KERBEROS=$(usex kerberos)
+		-DENABLE_LIBXML2=$(usex libxml2)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_LZ4=$(usex lz4)
+		-DENABLE_MINIZIP=$(usex minizip)
+		-DENABLE_NETLINK=$(usex netlink)
+		-DENABLE_NGHTTP2=$(usex http2)
+		-DENABLE_PCAP=$(usex pcap)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+		-DENABLE_SBC=$(usex sbc)
+		-DENABLE_SMI=$(usex smi)
+		-DENABLE_SNAPPY=$(usex snappy)
+		-DENABLE_SPANDSP=$(usex spandsp)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_ZSTD=$(usex zstd)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build test-programs
+
+	myctestargs=( --disable-capture --skip-missing-programs=all --verbose )
+	cmake_src_test
+}
+
+src_install() {
+	cmake_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
+
+	if [[ -d "${D}"/usr/share/appdata ]]; then
+		rm -r "${D}"/usr/share/appdata || die
+	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 20c37586e773..86816116d9fc 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/xc/Manifest b/net-dialup/xc/Manifest
index 31eda610b659..8f76ac72f9e1 100644
--- a/net-dialup/xc/Manifest
+++ b/net-dialup/xc/Manifest
@@ -3,6 +3,5 @@ AUX xc-4.3.2-fix-set_bps-overflow.patch 418 BLAKE2B 15f4bdd51a42a6501ab2953f5076
 AUX xc-4.3.2-gentoo.patch 3222 BLAKE2B 43b119862c643f480548cba7822c8d45b6a87ba4c140e5baf23363cd63e82c46cf85d5b2dc797a643831acacf8a54190b282ea2022a84b4d3b6fd8f7b70fdd56 SHA512 543d21ff9b6f37bcfcaf9b7d8e700761cc9e3e92cc229d500275c92d7377640293648b48e8d424716bbc0b7b08ec416a75244e6a661b3d54cee68cbd5d838efc
 AUX xc-4.3.2-implicit-decl.patch 434 BLAKE2B 7397c9e2e308093c99454eb22ffaa7f8fc7939500e419c809bfb14ef5369ab6ffcbf4385aa2e2cac141db62fc1d017959d827610307351058bca232fffefc299 SHA512 5c470a0b936576a3c90ca84317f4b1237855e475a5c63b62e94f55f2dc7f1c5561fa512ae1a46fa5b9d9df146abd1e58f04399b6b04c6fadf2a12cd6665855a6
 DIST xc-4.3.2.tar.gz 162098 BLAKE2B d3ce005bea46cff7673d8c9c4c288356cf340a04658917934a3553705f0554ffcc433379a8fdbbe2cb8a456cf15a73c5bcdd1719c0f9f3b7d41623b535b45ee6 SHA512 89de05a82f54ffd89a6950f9cb4aea732573ac1b15a27aaba4e25293a5d0b763052287700e4499f7f2adf9acc952ecea572239c8403c86c5871efd363d68710a
-EBUILD xc-4.3.2-r3.ebuild 990 BLAKE2B 6a0ca5d3aaae80bddf077bab7397887cc7c35ff10027c5c954dac58a61dd16fa81fc305999a5a8952fc190ccd0a98ad8af2e13304a9abf2d1026bf18af1a597b SHA512 0f14f2cf4c7103fb0db9926496edee7009f60f4aab5f22f4cf37d5e5f2dc667ac5db3cfc8c438eaa07a64c1f9875e13cc10cf3e5ad957d853541e718d4a0d9d5
 EBUILD xc-4.3.2-r4.ebuild 1050 BLAKE2B 3659c8d0830e4512fe5c6609306373031fad08d87d89e90e59a30680e1b75989494ca496f8618a5f40e62e550d3f61ebe0c1807e3a8ba1caa14d6d752e135402 SHA512 6be6426d5944d9db01cec408675ffb77591f44ed3c899483e814e4a63a5813762c52e33b99030effeaec9f725961a37bcc9a0b5bd4c54a28ac5e6a0fb8d7d0d5
 MISC metadata.xml 358 BLAKE2B 3d76b6b9d649f45a1b31f5e1ec3238ed9ef233539d3fefdb07829b4b2845ba67f24ad34987912b92bd93c0566317b6cc381ec3b68f11b7025488b4fc0409d455 SHA512 4d695e92ba66886be964c96cabd894ef44cc93d62f053422f14909b953bf7bcf9321fcb745c33d5af716308f61df3154c1eadb78ce306439463cd2ee6528f6f0
diff --git a/net-dialup/xc/xc-4.3.2-r3.ebuild b/net-dialup/xc/xc-4.3.2-r3.ebuild
deleted file mode 100644
index 5b5159d399cc..000000000000
--- a/net-dialup/xc/xc-4.3.2-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Modem dialout & serial terminal program"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/${P}.tar.gz"
-
-LICENSE="xc-radley"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-implicit-decl.patch
-	epatch "${FILESDIR}"/${P}-add-115200.patch
-
-	sed -i \
-		-e "/^libdir/s:/lib/:/$(get_libdir)/:" \
-		-e "/strip/d" \
-		Makefile || die
-	# bug 459796
-	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_compile() {
-	tc-export AR CC RANLIB
-	emake WARN="" all
-}
-
-src_install() {
-	default
-	insinto /usr/$(get_libdir)/xc
-	doins phonelist xc.init dotfiles/.[a-z]*
-}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 6a3d0a91eef5..6c88698ca804 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index d3b21f2054a4..0d701ce40710 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -12,5 +12,6 @@ AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826b
 DIST bind-9.16.6.tar.xz 3228368 BLAKE2B 0c2265fe0e006679733a4f7610b0c33bb8e2bd32caf26dca8cfedbea0e08df9e7665cbbbf5321199bd2e30b97ad5b0146ae4e8a9a78abadbe6d067bbd1ad8a3a SHA512 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.16.6-r2.ebuild 11015 BLAKE2B f33043400501d72dc1f85cdf5c45c9a5b27851d112f21e99c2cc59e31b7b699099c82e13ae08d9331c4f6ac9cfc0d599d42f0162df7bfdd580c525b58c49b53c SHA512 d4454404172a98224d2323dc46e590b61f792b9c6341037d5d3ac03731baba6f8d011c2c2e2c66428734ae836285e076b49531fa7d6d32cb92d0321948cad962
+EBUILD bind-9.16.6-r3.ebuild 11278 BLAKE2B b9caa0f8b32b0145f7ad8b3607d148b67bfd7342453d6de2289856176dc730b6ca5bcf77bb049a63becf619df0a0e9d2d8f203a185beea213feb018bebc3d975 SHA512 fdbdcde04a3cad843cdbd886329184ebfdb52b962800fa620b7624e3338e7164648d48105c716e5508dd6c2d0901809e629f08c1baa728f30dc4e9405b709892
 EBUILD bind-9.16.6.ebuild 10766 BLAKE2B 83963e592f2ab27789a0f4642ba5dd9d2cd6dab28e444b502962d140694293c4ef7d7bf60c68e709093fd2e9cf34af3f28b3768683e2bde20aaf208abbedefa2 SHA512 5de5ce0d73fba42a52c9e516682f50878033e4a9cdc6866f9b7d159efb640feb29b2643b43bc4542a5e2b46349ba2e11593dac9d767eb37d4ad5dd9e45ba5f2d
 MISC metadata.xml 1043 BLAKE2B 3bf699db16f6883700e32e5f0debc534fa2d763aca0cf8fe3878dedcbb110410d88c2dbb69b4d4df09df62943416de3aaed7d53a2371d004b8c19a2a5a609bc1 SHA512 137093eabcbda1feb7cdac0cb0b2eeb808a47062b4e8d114874ee4019847ecbf5996c7b19055981a5ebffd099b5a96ce6ada919719017d83f93bc679334845b9
diff --git a/net-dns/bind/bind-9.16.6-r3.ebuild b/net-dns/bind/bind-9.16.6-r3.ebuild
new file mode 100644
index 000000000000..ff2089ac70ad
--- /dev/null
+++ b/net-dns/bind/bind-9.16.6-r3.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use systemd
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+# -berkdb by default re bug 602682
+IUSE="-berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
+json ldap libressl lmdb mysql odbc postgres python selinux static-libs
+urandom xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+# Upstream dropped the old geoip library, but the BIND configuration for using
+# GeoIP remained the same.
+REQUIRED_USE="
+	postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	dnsrps? ( dlz )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	acct-group/named
+	acct-user/named
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap )
+	postgres? ( dev-db/postgresql:= )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( dev-libs/libmaxminddb )
+	geoip2? ( dev-libs/libmaxminddb )
+	gssapi? ( virtual/krb5 )
+	json? ( dev-libs/json-c:= )
+	lmdb? ( dev-db/lmdb )
+	zlib? ( sys-libs/zlib )
+	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/ply[${PYTHON_USEDEP}]
+	)
+	dev-libs/libuv:=
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	sys-process/psmisc"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# should fix https://bugs.gentoo.org/741162 taken from:
+	# https://gitlab.isc.org/isc-projects/bind9/-/merge_requests/4073
+	"${FILESDIR}/bind-9.16.6-bug-741162.patch"
+
+	"${FILESDIR}/ldap-library-path-on-multilib-machines.patch"
+)
+
+# bug 479092, requires networking
+# bug 710840, cmocka fails LDFLAGS='-Wl,-O1'
+#RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+	eautoreconf
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	bind_configure --without-python
+	use python && python_foreach_impl python_configure
+}
+
+bind_configure() {
+	local myeconfargs=(
+		AR="$(type -P $(tc-getAR))"
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir=/etc/bind
+		--localstatedir=/var
+		--with-libtool
+		--enable-full-report
+		--without-readline
+		--with-openssl="${EPREFIX}"/usr
+		--without-cmocka
+		$(use_enable caps linux-caps)
+		$(use_enable dnsrps)
+		$(use_enable dnstap)
+		$(use_enable fixed-rrset)
+		# $(use_enable static-libs static)
+		$(use_with berkdb dlz-bdb)
+		$(use_with dlz dlopen)
+		$(use_with dlz dlz-filesystem)
+		$(use_with dlz dlz-stub)
+		$(use_with gssapi)
+		$(use_with json json-c)
+		$(use_with ldap dlz-ldap)
+		$(use_with mysql dlz-mysql)
+		$(use_with odbc dlz-odbc)
+		$(use_with postgres dlz-postgres)
+		$(use_with lmdb)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+		"${@}"
+	)
+	# This is for users to start to migrate back to USE=geoip, rather than
+	# USE=geoip2
+	if use geoip ; then
+		myeconfargs+=( $(use_with geoip maxminddb) )
+	elif use geoip2 ; then
+		myeconfargs+=( $(use_with geoip2 maxminddb) )
+	else
+		myeconfargs+=( --without-maxminddb )
+	fi
+
+	# bug #158664
+#	gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+python_configure() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	bind_configure --with-python
+	popd >/dev/null || die
+}
+
+src_compile() {
+	default
+	use python && python_foreach_impl python_compile
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake
+	popd >/dev/null || die
+}
+
+src_install() {
+	default
+
+	# don't create /var/run
+	rmdir "${ED}"/var/run || die
+
+	dodoc CHANGES README
+
+	if use doc; then
+		docinto misc
+		dodoc -r doc/misc/
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dodoc -r doc/arm/
+
+		docinto contrib
+		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+		# some handy-dandy dynamic dns examples
+		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null || die
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r3 named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r13 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die
+	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	revoke settime signzone verify; do
+		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
+		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
+	done
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	use python && python_foreach_impl python_install
+
+	# bug 450406
+	dosym named.cache /var/bind/root.cache
+
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+	dosym ../../var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn} /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	systemd_dotmpfilesd "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+python_install() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_scriptinto /usr/sbin
+	python_doscript dnssec-{checkds,coverage}
+	python_optimize
+	popd >/dev/null || die
+}
+
+pkg_postinst() {
+	if [ ! -f '/etc/bind/rndc.key' ]; then
+		if use urandom; then
+			einfo "Using /dev/urandom for generating rndc.key"
+			/usr/sbin/rndc-confgen -r /dev/urandom -a
+			echo
+		else
+			einfo "Using /dev/random for generating rndc.key"
+			/usr/sbin/rndc-confgen -a
+			echo
+		fi
+		chown root:named /etc/bind/rndc.key || die
+		chmod 0640 /etc/bind/rndc.key || die
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT} || die
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
+	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
+
+	chown root:named \
+		${CHROOT} \
+		${CHROOT}/var/{bind,log/named} \
+		${CHROOT}/run/named/ \
+		${CHROOT}/etc/bind \
+		|| die
+
+	mknod ${CHROOT}/dev/null c 1 3 || die
+	chmod 0666 ${CHROOT}/dev/null || die
+
+	mknod ${CHROOT}/dev/zero c 1 5 || die
+	chmod 0666 ${CHROOT}/dev/zero || die
+
+	if use urandom; then
+		mknod ${CHROOT}/dev/urandom c 1 9 || die
+		chmod 0666 ${CHROOT}/dev/urandom || die
+	else
+		mknod ${CHROOT}/dev/random c 1 8 || die
+		chmod 0666 ${CHROOT}/dev/random || die
+	fi
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/ || die
+		cp -a /var/bind ${CHROOT}/var/ || die
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		if use geoip; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+		elif use geoip2; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
+		fi
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/dnssec-tools/Manifest b/net-dns/dnssec-tools/Manifest
index 8875e5c99659..a508476a977e 100644
--- a/net-dns/dnssec-tools/Manifest
+++ b/net-dns/dnssec-tools/Manifest
@@ -7,4 +7,5 @@ AUX rollerd.initd 409 BLAKE2B d3f545fa48d061c0bff8d7a73352f4307678e14006ecb51cb7
 AUX rollerd.service 202 BLAKE2B 8d3841fdaa9a8a5503eba707e22ba66d62a5b28fea3ab1b7a689958f66dd4a3ae53a613f622093846f2dbfa1fdb52fc30bfe772def34d6180e88079b5b3d2bd6 SHA512 5eb0786a0fcad3fe88db3d2391a2ec3dd272818aed0c17a664fff7f126da467ef2e47671212c86c7cc27f0e62873c63968cdbdff6c561499639f8a608e93648b
 DIST dnssec-tools-2.2.3.tar.gz 42941393 BLAKE2B b7b6a54113fb5cf030bd60e18f5446b02d1ceba3564ac854b0305225672545e802fecfa1169dc81e68ffe195533e06082dc22500a51b48965aa9c0fc32c915ed SHA512 fd2467f116f77089bddf9311706f356957f4ae735d827d393534e4001b621c9dfc904ff3d4da698d37e8e97b1be9448ab2fd5455c124656399aac30f1f642baf
 EBUILD dnssec-tools-2.2.3-r1.ebuild 1843 BLAKE2B 777cc6ada38ce13c3ca90ba3cd71375839fa9784c6e128f2493993bacaf661393d817f30c159f9aab9ff674468a006e769a08ac896b86f3735dc20c814015b0c SHA512 e1cca26301d6ed2e67a497c3563998f87832e7b0153a1f4185ee038c050bf18304895c1e5dedbd2d6e5c39557eb91a93b9991cc07ab9a7901fcef13e76c2a2bd
+EBUILD dnssec-tools-2.2.3-r2.ebuild 2016 BLAKE2B b14ff103894ce190715519f53acc275b7437d743da5687595b12c0232a3e707fc2fb8f5407b57679820a929558c1c891cf456972bc4befc4e653e115ec10f171 SHA512 7b2fe30e3f220d079a762341a94636c866d1161459d0d500309d01ebceafa1bb100c5dbc75254e5993451ea192b0212e1cd83078d215dd6f8ea3baf370a0f7dd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/dnssec-tools/dnssec-tools-2.2.3-r2.ebuild b/net-dns/dnssec-tools/dnssec-tools-2.2.3-r2.ebuild
new file mode 100644
index 000000000000..98a0b38d1ce2
--- /dev/null
+++ b/net-dns/dnssec-tools/dnssec-tools-2.2.3-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-module readme.gentoo-r1 systemd
+
+DESCRIPTION="Tools to ease the deployment of DNSSEC related technologies"
+HOMEPAGE="https://dnssec-tools.org/"
+SRC_URI="https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static-libs"
+
+# There is no test case to be generated.
+RESTRICT="test"
+
+RDEPEND="
+	dev-lang/perl:=
+	dev-perl/CGI
+	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}"
+
+S="${WORKDIR}/DNSSEC-Tools-${P}/${PN}"
+
+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() {
+	local myeconfargs=(
+		--disable-bind-checks
+		--without-validator
+		--with-perl-build-args=INSTALLDIRS=vendor
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+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
+
+	# Remove perllocal.pod to avoid file collisions (bugs #612268 and
+	# #603338).
+	perl_delete_localpod
+}
+
+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/knot/Manifest b/net-dns/knot/Manifest
index e07826308cad..d8af6f8b2ce6 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -2,7 +2,7 @@ AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
 DIST knot-2.8.5.tar.xz 1209076 BLAKE2B 7454499745caa04a9454f023bed0ce6d8ccc54fc2c264aada72a842c39b056a91caee908eb1b036fe77b97d8cea4f03b9afcd084a69846a2632e717f7c3591fd SHA512 f45e62816ddc1f534e724d2fa71831100efc01b415ec2ea8301d02cf44d8f104a248deccdb706ebad6853404aee2a209c2bf51b07076aa69340af6812e5a79de
-DIST knot-2.9.5.tar.xz 1190872 BLAKE2B 4c60972676efb2e6cef5431ab688ffff9eeda4fe5f9a02bba10fbfced50c1edc9e15b9cea9e018428f3d075ab241128748fa1f777e6fc9de0dbdca1033c8d92a SHA512 6bfd6a720eb512983f934c3bf853ac310391805a102546ed18b3e805d10339837569e970e0e51f64e9d938bc362c8f9d01acb15ca4dca0a66dea9deb6b59cc73
+DIST knot-2.9.6.tar.xz 1188412 BLAKE2B 95b165bf37079fbda91cc8e81b8a4a5e662d53bf5efdf9a96cfd59646fe246f0c59e2438d42f9566dcf6dbe675400d450e131f66bfa88769b1c3fcf55b09d849 SHA512 95164a8ec913b3e3f01355d7f41f08caf6048c39317e63b2968e2bf8cf2ed08791ea0136b1e721add07f183b81a241ab2c2b8779c44368079d8eac082f49e368
 EBUILD knot-2.8.5.ebuild 1887 BLAKE2B 7eb58953ff6217a867692a88112fadfbccab09822786c9bcc5a3b049f9ad300d7406edca1122c326a2127811dc8af7c74de0625174ff1968645e91cf54c9ecc4 SHA512 c9e51d696c0e0d50b5b40ac76cd950eb7ca21a7a679f1655440d7a77af46aeec59697d12a84b8becf0f0de1a1a4e425bc4af4e51331a83e9fd724aab92b467bb
-EBUILD knot-2.9.5.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
+EBUILD knot-2.9.6.ebuild 1892 BLAKE2B 77b85a932381fcc4e31c4d245fe991d69502e8328fd76ae4efb111da584355d524e29fa03fc43cac694d5576a6736ece2754699c1ebd1a708dec25d84d2f539f SHA512 7c6bcaeb1bcd98160bd83fae71e3d07162d571fec51b558056e5c16553838a9f0742e84ffdc95e7a71ae94a762e84d4bd6902ab369a5e2ae0572897907dc78e7
 MISC metadata.xml 1677 BLAKE2B 89c3190781cf6b6d6217c84dd45f78ebd86695e9c224c7fa7f5112b246b95b982fb025c6c30b065d59b11f3acdcabda8e92b0da001cf1a7ad3e67ee9b2207d3c SHA512 d1e480d3e5d422b94a952a8fd0a679052d24724cccdda0bf13808f1a6b47b129a1db6ad17a0a42d9a6d315e9cbe64293a1a22077b7affc36862313ff8715d9e1
diff --git a/net-dns/knot/knot-2.9.5.ebuild b/net-dns/knot/knot-2.9.6.ebuild
index 2cc9e9753dfc..2cc9e9753dfc 100644
--- a/net-dns/knot/knot-2.9.5.ebuild
+++ b/net-dns/knot/knot-2.9.6.ebuild
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 618317c77a1d..660373cc89f4 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/nftables/Manifest b/net-firewall/nftables/Manifest
index d1b65de31fdf..49e887338b11 100644
--- a/net-firewall/nftables/Manifest
+++ b/net-firewall/nftables/Manifest
@@ -4,8 +4,10 @@ AUX man-pages/gen-manpages.bash 1797 BLAKE2B c93cc311570abd674a12eb88711cf01664f
 AUX nftables-0.9.4-Allow-building-from-tarballs-without-yacc-lex.patch 1132 BLAKE2B 49d938450bd0e7b09266c2e49ac09aa2bde5f4ab945478a1c973cc05368a9338a5aee222c9638bd44a27f6e81233f3843e672ef3177e25f8e851a2c10edfda36 SHA512 31dce9d6508f36d8411ea834cbb35989067a93b0af2366f278d12aaf30b6fd9b70995e6ad21836e4b44ba009a77900057139d292053533330826ec496009de24
 AUX nftables-mk.confd 899 BLAKE2B f4c3d82fbae87fb0d755af786a98db591b6a667cf33660ba9275ada2e6417fad1899a7f29762f23c112fc5c9e178bc7590c3b2ba26617853c3577917bd7d3edf SHA512 505ed05674a04367f1a3d5cf6447596ad1c3b2e9c920697f12f58a20d94c2a39b0041bb4911678511c4548566a69d964661d4afc3e7e27997943b875f204c602
 AUX nftables-mk.init 2090 BLAKE2B 62f56586ca4ba0acbd3ac41f4904041d625388771bbafc32833055a5f3c00f251e1d9a04bb41dd672f33d13a0825f7e4470a30d7e874df1abd41508148ef42b0 SHA512 819b2d60b42207cb70d95b700557e873fe18c5f6e8437683240beb317f773cf8e18755086e24652a9bcff49c6f96af8cd9e3f3b62c9f433779eff4e3f3935197
+AUX nftables-mk.init-r1 2125 BLAKE2B 2c7af02866a36de3e4312005eb139805bf3a6100e1825d05232436fa206b2961e02b47ab71d9f94300c151b561b5ac00c919cd84db76df0ab6bcf618b2fbf8c8 SHA512 97b9a154c35a088a9c866e2be7689448439490f4cb26fe50ef49ab6900564ea231cba137f3585bcb51cb2344d6f7d3e8ca8a7ed2e06d144a8359fb9564361d24
 AUX nftables.confd 655 BLAKE2B 5512be1edd43e270941de3d9b66fda69e4afd7c7e6e970b232a044c2fd64f8e50b9b55a4fe670174c3eabf3d176ee0158c1043baec4b76b0802e7e97bc862fcf SHA512 8370abcdc89fcd9da5dc7d1620be6afb4633b8bcd0a8a120b464cc1a7e1fab6f34956c293da3f6d3cbe1f7a2e03038fd0c94a614137ae5657d29ffdb5f3fa144
 AUX nftables.init 3069 BLAKE2B 68c6b2b81995bd909c00cc3527f891f04d0dd30532cd821c89b59fc7e3ea0dff0e98d767cee2c00a5462023fdf6f59e813dec7063768a34187f2404377e498f7 SHA512 ca761be0440945b21d5b002468baffb3299d0a3ac244aa895734dfdfaf442e7a73b757bcda99d958582064411d1b80b2cbcb4eb532bb219b4df407c9ed892661
+AUX nftables.init-r1 2125 BLAKE2B 2c7af02866a36de3e4312005eb139805bf3a6100e1825d05232436fa206b2961e02b47ab71d9f94300c151b561b5ac00c919cd84db76df0ab6bcf618b2fbf8c8 SHA512 97b9a154c35a088a9c866e2be7689448439490f4cb26fe50ef49ab6900564ea231cba137f3585bcb51cb2344d6f7d3e8ca8a7ed2e06d144a8359fb9564361d24
 AUX systemd/nftables-restore.service 394 BLAKE2B 1c1f358eb2eff789e68c051098c971f11a8df6621c3c919e30a1ec1213f6db822c390609c01827fe9fc75c540effa3e3a7b6f93bd24e16ea19841bbfaab796ed SHA512 18da6a770bb3e94fd6b2c9e6f033450aaff9fe886c8846f780d08a21e2fc884ac078652743b50b3d4ea8c9500f92d272bdd27e2881e438c2b223d40816c100a0
 DIST nftables-0.9.3.tar.bz2 786759 BLAKE2B 578276d861fdb2b843223aca1276bbc1dda9627d0058259a966e324e30ee64d8c102d1e2cceb82d29143caa9dcd1a4492df168f1c87b136fc7b3a1a7dc8568a8 SHA512 d264f6fc75c95510e29fe7d5b82ae418d502f40437b098ba6117ffb1374d9989d70a7296e2e58c5fb25142145a987bb9c160902637899f892589809f9541db43
 DIST nftables-0.9.4-manpages.tar.xz 38580 BLAKE2B bb561c7824d032ecfff5c98af10c95af6f5188377f43de8398be7e503adff0441d49fa3e2cefcb646927cc1a4222957f0cc75d5ad4c770ef3a3f8cb8a677c5ce SHA512 1b94ff06ceccf75bbefbf64496d5fa0b492907d7ec5fe41f7808c6e239b2a0a42e88d61e35e22485abee7e4bd382178e962a7c5b113433247ca329cbfa408bca
@@ -14,6 +16,7 @@ DIST nftables-0.9.6.tar.bz2 859481 BLAKE2B 0ede36370d9f8b75d0179f8f28077124d4713
 EBUILD nftables-0.9.3-r1.ebuild 3755 BLAKE2B 38553f667a6726ff06e3c92392357c73470d0cf79f2929ab2c96d7955dbd94259f966a86f5db2409aa1f6600bd88d8fb96959ccde7b99c462e3afd239e956e7c SHA512 45fd13e018453f1f9d78284454f677920a3fa11c7bad32670592d669836bc0465b54e2f949499e4a362e7a261911321a088d4d15abfadc7858ab7117454e3d72
 EBUILD nftables-0.9.4-r1.ebuild 3782 BLAKE2B aa3edaa13d0c0032819476c5fdfbe3a1119b815d8d167eafe48c49f36dd49780c80020045418e084ce1c6bdc5b56ffc7a511c50c356b6ccdb44c36ef41899465 SHA512 741af7b9f7b07ee5b6133170637ae819e5d8d190cda398087b7b26f7e7e377df975f2cc72f0b706707073e029b905a8284bb9a13875cda869ec7df9767faa55e
 EBUILD nftables-0.9.4-r2.ebuild 4131 BLAKE2B d30066d0eef62040e79e2099bb1db6f49667177e0f7099f0a928ee87f80664b6069b26a6ba954b38e32179e6734b564290ae8466cd8f90d79b2ee1bbc3126d2b SHA512 f777309e620845e89d32596adcd270c2961111168d11d68d9b1cd75b97a60fb3213238b60d7190559eec478d9e08e09c89de8e54bb048c59a51cfb1b412831fc
+EBUILD nftables-0.9.6-r1.ebuild 4232 BLAKE2B 5b5f45650c133f374ba23e550a96b0e44f114d754aeeb15368139de6746d558206a899aa5e5cf1af70631eee4feccbc944a1132e9e5b35ac18ad7fae9071cf45 SHA512 a7adb1f95aecb0e0ad9b8876b4b9b9a8768a9072f99ae1d36f4bfbf3716834d0cac70673c5df902b89300073de31f4bb6aee0f0f37b5c01d71dd0d3391f171d0
 EBUILD nftables-0.9.6.ebuild 4225 BLAKE2B f1138e820093a380fd9e4410e7dee42be398e1e59b15da5f93ab108d2b872c56a76b773745d682ba44b3af1aad9dc9f14c118c7a2600c19121a969fbdfdb45ec SHA512 10ed38eb158b2a55831da59ae392da2b41c6e57e296a7ab015f7d890ae21beb5d2aa03c584bb6637213f0e2fa5b07c2638a4587df838949224001f00cd2116ac
 EBUILD nftables-9999.ebuild 4422 BLAKE2B 2385d84bddc4a46e89d3bea0c8aadc9d0ec09ac8802110c72c44006f6271c0ef1bd54a26b4f78e79a2c769b28fb034da27348cbc30fce6b12ad2e1a0779d1db8 SHA512 5792064de6860d4004ca1d68f0c8db49e850cf4bb14307d857ffb9f4d3c047ea4a20357cc9c2282328feaa5b121707408991f7fbbec05e345ba24aa2a38d6d09
 MISC metadata.xml 918 BLAKE2B 8c2c39f04e2c5591ea06788788d244bddc1cdc25780810b2a19e131d43d0bdf964d2129c01605fc536451cb9a3354420a1c2f656dad45c56dec4f360a95fe473 SHA512 08de9d11f48dcb132eb5423de56b458dd4c4122329b84b56c252436c882b7670233f2217cc01755649f27e14ff9346cf99e3a742224567e712f5cb3678165dcf
diff --git a/net-firewall/nftables/files/nftables-mk.init-r1 b/net-firewall/nftables/files/nftables-mk.init-r1
new file mode 100644
index 000000000000..45b2abdbda77
--- /dev/null
+++ b/net-firewall/nftables/files/nftables-mk.init-r1
@@ -0,0 +1,105 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="check clear list panic save soft_panic"
+extra_started_commands="reload"
+
+depend() {
+	need localmount #434774
+	before net
+}
+
+checkkernel() {
+	if ! /sbin/nft list ruleset >/dev/null 2>/dev/null ; then
+		eerror "Your kernel lacks nftables support, please load"
+		eerror "appropriate modules and try again."
+		return 1
+	fi
+	return 0
+}
+
+checkconfig() {
+	if [ -z "${NFTABLES_SAVE}" -o ! -f "${NFTABLES_SAVE}" ] ; then
+		eerror "Not starting nftables. First create some rules then run:"
+		eerror "/etc/init.d/${SVCNAME} save"
+		return 1
+	fi
+	return 0
+}
+
+start_pre() {
+	checkconfig || return 1
+	checkkernel || return 1
+	check || return 1
+}
+
+start() {
+	ebegin "Loading ${SVCNAME} state and starting firewall"
+	/usr/libexec/nftables/nftables.sh load "${NFTABLES_SAVE}"
+	eend $?
+}
+
+stop() {
+	if [ "${SAVE_ON_STOP}" = "yes" ] ; then
+		save || return 1
+	fi
+
+	ebegin "Stopping firewall"
+	if [ "${PANIC_ON_STOP}" = "hard" ]; then
+		/usr/libexec/nftables/nftables.sh panic
+	elif [ "${PANIC_ON_STOP}" = "soft" ]; then
+		/usr/libexec/nftables/nftables.sh soft_panic
+	else
+		/usr/libexec/nftables/nftables.sh clear
+	fi
+	eend $?
+}
+
+reload() {
+	start_pre || return 1
+	start
+}
+
+clear() {
+	ebegin "Clearing rules"
+	/usr/libexec/nftables/nftables.sh clear
+	eend $?
+}
+
+list() {
+	/usr/libexec/nftables/nftables.sh list
+}
+
+check() {
+	ebegin "Checking rules"
+	/usr/libexec/nftables/nftables.sh check "${NFTABLES_SAVE}"
+	eend $?
+}
+
+save() {
+	ebegin "Saving ${SVCNAME} state"
+	checkpath -q -d "$(dirname "${NFTABLES_SAVE}")"
+	checkpath -q -m 0600 -f "${NFTABLES_SAVE}"
+	SAVE_OPTIONS="${SAVE_OPTIONS}" \
+		/usr/libexec/nftables/nftables.sh store "${NFTABLES_SAVE}"
+	eend $?
+}
+
+panic() {
+	if service_started ${SVCNAME}; then
+		rc-service ${SVCNAME} zap
+	fi
+	ebegin "Dropping all packets"
+	/usr/libexec/nftables/nftables.sh panic
+	eend $?
+}
+
+soft_panic() {
+	if service_started ${SVCNAME}; then
+		rc-service ${SVCNAME} zap
+	fi
+	ebegin "Dropping new connections"
+	/usr/libexec/nftables/nftables.sh soft_panic
+	eend $?
+}
diff --git a/net-firewall/nftables/files/nftables.init-r1 b/net-firewall/nftables/files/nftables.init-r1
new file mode 100644
index 000000000000..45b2abdbda77
--- /dev/null
+++ b/net-firewall/nftables/files/nftables.init-r1
@@ -0,0 +1,105 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="check clear list panic save soft_panic"
+extra_started_commands="reload"
+
+depend() {
+	need localmount #434774
+	before net
+}
+
+checkkernel() {
+	if ! /sbin/nft list ruleset >/dev/null 2>/dev/null ; then
+		eerror "Your kernel lacks nftables support, please load"
+		eerror "appropriate modules and try again."
+		return 1
+	fi
+	return 0
+}
+
+checkconfig() {
+	if [ -z "${NFTABLES_SAVE}" -o ! -f "${NFTABLES_SAVE}" ] ; then
+		eerror "Not starting nftables. First create some rules then run:"
+		eerror "/etc/init.d/${SVCNAME} save"
+		return 1
+	fi
+	return 0
+}
+
+start_pre() {
+	checkconfig || return 1
+	checkkernel || return 1
+	check || return 1
+}
+
+start() {
+	ebegin "Loading ${SVCNAME} state and starting firewall"
+	/usr/libexec/nftables/nftables.sh load "${NFTABLES_SAVE}"
+	eend $?
+}
+
+stop() {
+	if [ "${SAVE_ON_STOP}" = "yes" ] ; then
+		save || return 1
+	fi
+
+	ebegin "Stopping firewall"
+	if [ "${PANIC_ON_STOP}" = "hard" ]; then
+		/usr/libexec/nftables/nftables.sh panic
+	elif [ "${PANIC_ON_STOP}" = "soft" ]; then
+		/usr/libexec/nftables/nftables.sh soft_panic
+	else
+		/usr/libexec/nftables/nftables.sh clear
+	fi
+	eend $?
+}
+
+reload() {
+	start_pre || return 1
+	start
+}
+
+clear() {
+	ebegin "Clearing rules"
+	/usr/libexec/nftables/nftables.sh clear
+	eend $?
+}
+
+list() {
+	/usr/libexec/nftables/nftables.sh list
+}
+
+check() {
+	ebegin "Checking rules"
+	/usr/libexec/nftables/nftables.sh check "${NFTABLES_SAVE}"
+	eend $?
+}
+
+save() {
+	ebegin "Saving ${SVCNAME} state"
+	checkpath -q -d "$(dirname "${NFTABLES_SAVE}")"
+	checkpath -q -m 0600 -f "${NFTABLES_SAVE}"
+	SAVE_OPTIONS="${SAVE_OPTIONS}" \
+		/usr/libexec/nftables/nftables.sh store "${NFTABLES_SAVE}"
+	eend $?
+}
+
+panic() {
+	if service_started ${SVCNAME}; then
+		rc-service ${SVCNAME} zap
+	fi
+	ebegin "Dropping all packets"
+	/usr/libexec/nftables/nftables.sh panic
+	eend $?
+}
+
+soft_panic() {
+	if service_started ${SVCNAME}; then
+		rc-service ${SVCNAME} zap
+	fi
+	ebegin "Dropping new connections"
+	/usr/libexec/nftables/nftables.sh soft_panic
+	eend $?
+}
diff --git a/net-firewall/nftables/nftables-0.9.6-r1.ebuild b/net-firewall/nftables/nftables-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..be001c0ddd6b
--- /dev/null
+++ b/net-firewall/nftables/nftables-0.9.6-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools linux-info python-r1 systemd
+
+DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://netfilter.org/projects/nftables/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="debug doc +gmp json +modern-kernel python +readline static-libs xtables"
+
+RDEPEND="
+	>=net-libs/libmnl-1.0.4:0=
+	gmp? ( dev-libs/gmp:0= )
+	json? ( dev-libs/jansson )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	>=net-libs/libnftnl-1.1.7:0=
+	xtables? ( >=net-firewall/iptables-1.6.1 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		>=app-text/docbook2X-0.8.8-r4
+	)
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+python_make() {
+	emake \
+		-C py \
+		abs_builddir="${S}" \
+		DESTDIR="${D}" \
+		PYTHON_BIN="${PYTHON}" \
+		"${@}"
+}
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		if use modern-kernel && kernel_is lt 3 18; then
+			eerror "The modern-kernel USE flag requires kernel version 3.18 or newer to work properly."
+		fi
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# fix installation path for doc stuff
+	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels@' \
+		-i files/nftables/Makefile.am || die
+	sed '/^pkgsysconfdir/s@${sysconfdir}.*$@${docdir}/skels/osf@' \
+		-i files/osf/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		# We handle python separately
+		--disable-python
+		--sbindir="${EPREFIX}"/sbin
+		$(use_enable debug)
+		$(use_enable doc man-doc)
+		$(use_with !gmp mini_gmp)
+		$(use_with json)
+		$(use_with readline cli readline)
+		$(use_enable static-libs static)
+		$(use_with xtables)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		python_foreach_impl python_make
+	fi
+}
+
+src_install() {
+	default
+
+	if ! use doc; then
+		pushd doc >/dev/null || die
+		doman *.?
+		popd >/dev/null || die
+	fi
+
+	local mksuffix="$(usex modern-kernel '-mk' '')"
+
+	exeinto /usr/libexec/${PN}
+	newexe "${FILESDIR}"/libexec/${PN}${mksuffix}.sh ${PN}.sh
+	newconfd "${FILESDIR}"/${PN}${mksuffix}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}${mksuffix}.init-r1 ${PN}
+	keepdir /var/lib/nftables
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}-restore.service
+
+	if use python ; then
+		python_foreach_impl python_make install
+		python_foreach_impl python_optimize
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	local save_file
+	save_file="${EROOT}/var/lib/nftables/rules-save"
+
+	# In order for the nftables-restore systemd service to start
+	# the save_file must exist.
+	if [[ ! -f "${save_file}" ]]; then
+		( umask 177; touch "${save_file}" )
+	elif [[ $(( "$( stat --printf '%05a' "${save_file}" )" & 07177 )) -ne 0 ]]; then
+		ewarn "Your system has dangerous permissions for ${save_file}"
+		ewarn "It is probably affected by bug #691326."
+		ewarn "You may need to fix the permissions of the file. To do so,"
+		ewarn "you can run the command in the line below as root."
+		ewarn "    'chmod 600 \"${save_file}\"'"
+	fi
+
+	if has_version 'sys-apps/systemd'; then
+		elog "If you wish to enable the firewall rules on boot (on systemd) you"
+		elog "will need to enable the nftables-restore service."
+		elog "    'systemctl enable ${PN}-restore.service'"
+		elog
+		elog "If you are creating firewall rules before the next system restart"
+		elog "the nftables-restore service must be manually started in order to"
+		elog "save those rules on shutdown."
+	fi
+	if has_version 'sys-apps/openrc'; then
+		elog "If you wish to enable the firewall rules on boot (on openrc) you"
+		elog "will need to enable the nftables service."
+		elog "    'rc-update add ${PN} default'"
+		elog
+		elog "If you are creating or updating the firewall rules and wish to save"
+		elog "them to be loaded on the next restart, use the \"save\" functionality"
+		elog "in the init script."
+		elog "    'rc-service ${PN} save'"
+	fi
+}
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index aad06152c9d2..ae406b548bc6 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -16,11 +16,19 @@ AUX shorewall6-lite.systemd 612 BLAKE2B e658af2b6d399fe527a58201b80997651954df67
 AUX shorewall6.systemd 577 BLAKE2B 5c755c0105954a34e39e077af0e012d9d6e647715a4b12fbae4fc47f4ae19afd6a63266b3684ddead689b2d4f7450b7a12906258fc86ef33fc36a4dac3771274 SHA512 96b69df246a18e8b7dbfdbe78959da1baa8f2a97eb290853d4040a895f2ae91b97addd2ab4e4e19345960ffe8f1b099442f40ce319b27f0d4d8d7d4780d2e78d
 AUX shorewallrc-r3 2035 BLAKE2B 6f4e4c93cee1f25405cc3ac76958064f1241a325c8b530c30f6dbd94423577d592e88613f463c4b41c1af1db22c7e53512fd8509931bb6527a8da669f2dbe773 SHA512 eaa32bf6baca0d3555db918d6221c7678f5ba67e78bf9dcdc1bf96deded8f64838d3a332226fa6605f0c1ae82e51e0f2c1540fa6188fd9bced22460a631f48a8
 DIST shorewall-5.2.7.tar.bz2 585135 BLAKE2B 614a993d34927b6f976f8d783608832014e1e2c94d02f53904cc977d3a05cc7ef21bc3dd32545c11b705da7c84ca472f0dc2ec6438af6b60eb705f741d432269 SHA512 abe3f2bfa8944cdecf24e8a2b3bcc5a786bc6bafb1e85e10257f4ff3002689b1e0ed23ddf866f63ce301c6bec43959b6ce77bbbbe8ffeb0f48a18c858be226a2
+DIST shorewall-5.2.8.tar.bz2 574427 BLAKE2B 1ea97c8d8ed4619af1ffe0e502c6871a2c14e6e75a12b5e702315aa67411efb6d0c3049017ea48f02e302a7d4af72d06b635dcc8314a4d4325a24cc8f7abd344 SHA512 d5fc562f59e97cb462c6c0d7cf2b0f6211d413c2e3db72d93e8ad4f23cd1d0f69c90fff602d6891bbee1725c2505a72f3677c3050758e36f38f0248e8c6c7e52
 DIST shorewall-core-5.2.7.tar.bz2 76504 BLAKE2B 5456b0f844c3f1c99cd8a89dff58ab5cf86d085a763a8de3918c2cf6fb5e59779912fae103f8b4284ba7a2c474beb786422a5de77eb3a67480d1d6ee0b316839 SHA512 0ed2f2e05abafa60e5d1560c5ee8419e7a3d0afe20192597a1efd263cfbe9331369682d6caa22ebdda128a410197010bb4429a3fa1500f9ac06ce8afcc1e6cc8
+DIST shorewall-core-5.2.8.tar.bz2 77980 BLAKE2B 141ac2baf5b466c31d90bb73e8aa4f3f8688656f3734b85dcd392196559a70a9550f125595c488e90e2a34c8ab7067106d728b349fbcb7e42fdd0a8d11c749da SHA512 f0d4f41b2614cc4c6f834ac2a7bdfae181789bc97044171b0fa1e968cda930cfdc86fa1ff4b54b43a8ae22b7b6f80b66b77888644c5a7751edf814cc49d491c6
 DIST shorewall-docs-html-5.2.7.tar.bz2 4316006 BLAKE2B a981e050501d7fa9bdd2ecfc3fba279989089b1e6977abc881c2bc04df698e88cf7260acb28a06ce90d296e17944140ab24af98914839717811f2eb6af84da33 SHA512 4e381ad8fe8db5fe614c6dd6e4b595539519091c4aac2f7aa7ff8655e97fa8d07bec651c428492f334f632968ad94e1c863aeb1888964d696aca011e980fcbc6
+DIST shorewall-docs-html-5.2.8.tar.bz2 4322407 BLAKE2B 42daa490ac8b14a93a56b6a2beb388600e7be4336e46bdbadf417c638873f8c362171a6c2b388044fa3bc551cc446832e3773459183eaf31d096af575b85631f SHA512 c6bf1d3d6d2e08c483d72662fef66a0db8dd3cc3637c6731e97d6150bcc24762864bd51eaa9a3ff0f75d7599c7a56a467668a6907c4bdaa9f90d8bf9453e127b
 DIST shorewall-init-5.2.7.tar.bz2 41377 BLAKE2B d39cf687ed4a5592fb8ea7b2d0a4b1313cb80ba81000e3692700a5a95d8035260991626c3e7466d3b9d1a9e8b3e61c559286f08b20494b81b59e5edbc8383378 SHA512 2dd81a4ae87496079990864a7b7a42814855d13210b996e3881e34d7cfb692035a2394adc912337800c72bc8565ae90426a0f1ddbf3e0384048a7c2d3e18aa43
+DIST shorewall-init-5.2.8.tar.bz2 42589 BLAKE2B 74e265ed9d938b6130800f548f5f47658b641a76906a40d1980331f78648650a2165c43d232ab8d817ee5bcd63e1920e2e8b6f97b279a48baba1b72908816bc3 SHA512 eda8648ae5e67b2d6bc29f770e4ba791b6befaf85020445fb38d9837d65d8dcc90db79220e8d6a4c4918151ca2d33375cb3f3b7127e300cb9a37a572d154093c
 DIST shorewall-lite-5.2.7.tar.bz2 45949 BLAKE2B 9d56d57c8bbf0d6478aa2b834750c6545fb323bb8ac513eb8df4f377ec70faa1c71c2105ac40bb5c88272bf56e34f39d93d41215b96b889a4fa9bd80339993ac SHA512 9e48d6d48a0a12577518a3b729cb2ad63e5be9a748fd58ef4c450d9f31527773f2fa790f38e7b1547257b49786a56dc293a16fe97b9c6eddd007edcd35efaee8
+DIST shorewall-lite-5.2.8.tar.bz2 47250 BLAKE2B 2fff00d7a6248a3db0aa5d6b3ed041b06bdfa35b71195088659afd4036cf61c6bc2f3de739803d4e26e56785aa90c87ec6a2120239183351fae7a54065f1a629 SHA512 d72f260b095f1dfb2b0a0c967ae80bfd7f5f3469a08eb446c0b3e1b1e662cb500510b75f2979a00a9ef57b16e6a23a95483c34e2a5c5d2d090bc1e071ea87292
 DIST shorewall6-5.2.7.tar.bz2 203996 BLAKE2B b8b721d54c5aafae773d0d80b38106a17000793ff16f217ac6ec21f8702afe7a3fd8e99941056e508a8d8c93819e0e5644f1f8ce83c61dc6e3be49fb8fcd70c9 SHA512 039e0092770262f22ba08c2cfd536eccb9530da48306791fa6683e34c34f862001ca827dcb79b535243e68a24bffe92dbd866cf9d7ea8754161b5a8326a86d8e
+DIST shorewall6-5.2.8.tar.bz2 203102 BLAKE2B d9117d42cd25e18aa1104ec3f4498227eedcce5c3531623e2e4d6ec27ba5221f98e1ae2e596ac90d7415cd366b2dbfdd024adaaef0c1c2756900188bde105903 SHA512 7044efe84b2c585fcd0bfb661666c71cea140157f22ba7d4881006e24d785eb0091c071c825fa5948bc1383e7fd4617cc8f3d4e68865cf472ddea3811bf1833d
 DIST shorewall6-lite-5.2.7.tar.bz2 45989 BLAKE2B ae698fb3b580bcc373958932d07b8e27bc805616dabe3b6cbf349fd29fa10299f91fffa6d1a74530b008d8806c62cdaf3868d1830cb3869bcfc6ca422cd9a2ef SHA512 c694c00c96e45d437e62ff600f85bb70b9431211ef9ff84753e880b165d694c5cd1a581a8163ed580cee78e790893b6239a8504b422554f14b4d4b7dd3c70601
+DIST shorewall6-lite-5.2.8.tar.bz2 47178 BLAKE2B 47026c3fdab7564c8e48b653a4c67db99fe5ff07de723169f65185aea563691806164a637a38c419d19619cf1380462fa7287b0993d9389dd311393bac911602 SHA512 a80ffc7baf7800e024e41a0f9736543b15d10f2d403540e48e8a2cd2ba0196ce04ff01ac98fc03852c7d268bb4954714dd428375e768b80aa4792683b8775935
 EBUILD shorewall-5.2.7.ebuild 16949 BLAKE2B 40c143a0265318201ec0d2186b6a1e75c0cf368e87e2544ade3ff7db49b03134434e27d628453692e33fbddaa34ec3bcb42c9375524be92fb1cbda5f37077bc4 SHA512 055dd811b6ea964f3cd44e9d312684438e17b9a5aae7a1dfd60ea863c8537e4bdc9cd80d7a129b9fa23f2483c7943c91ce3adf8ac872bb3b58e3e562654a415b
+EBUILD shorewall-5.2.8.ebuild 16955 BLAKE2B 492e4680f686a2e733bcc135644882abbc04a1f0e5cdc12cff69bd2f561d88e58fdef36a162f462a7e602b8fc2bcf1c8af1329aab24df9f00d966c0e8fd34d43 SHA512 0f694217f51006e9a7872d8130b849e2461ab07fb84e64bf97a060765cd16b8f3f5cbac4728822ba65cb4dde34158480b7ffbe9ee4a3d0da8df6514a186ad33e
 MISC metadata.xml 2254 BLAKE2B e9d48407a0f055415070f5b0266ed9f534768f6d17d52b7070de30a037b89dbd08daac40b0ec313b8dfc65ba40ff38dae96c9758b78ec66d100ac8fa6b870d5f SHA512 0a201cf40dd1282b52897f751903baf28a2eb284b94316a45d8af6879f995dde1cdd4a7d474293835a0bde801ce41497bde558a51035a5e3650f0ec098688f33
diff --git a/net-firewall/shorewall/shorewall-5.2.8.ebuild b/net-firewall/shorewall/shorewall-5.2.8.ebuild
new file mode 100644
index 000000000000..95a3c0906eab
--- /dev/null
+++ b/net-firewall/shorewall/shorewall-5.2.8.ebuild
@@ -0,0 +1,482 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info prefix systemd
+
+DESCRIPTION='A high-level tool for configuring Netfilter'
+HOMEPAGE="https://shorewall.org/"
+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=$(ver_cut 1-2)
+MY_MAJORMINOR_RELEASE_NUMBER=$(ver_cut 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/'
+
+	if [[ ${MY_PV} = *-Beta* ]] ; then
+		MY_URL_SUFFIX="-Beta${MY_PV##*-Beta}"
+	elif [[ ${MY_PV} = *-RC* ]] ; then
+		MY_URL_SUFFIX="-RC${MY_PV##*-RC}"
+	fi
+
+	# Cleaning up temporary variables
+	unset _tmp_last_index
+	unset _tmp_suffix
+else
+	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SRC_URI="
+	https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2
+	ipv4? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 )
+	ipv6? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 )
+	lite4? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 )
+	lite6? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 )
+	init? ( https://shorewall.org/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 )
+	doc? ( https://shorewall.org/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 https://shorewall.org/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-r2.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="${ED}" ${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="${ED}" ${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="${ED}" ${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="${ED}" ${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="${ED}" ${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="${ED}" ${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 "${ED}/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 \"${ED}/etc/logrotate.d/shorewall-init\" ..."
+			rm -rf "${ED}"/etc/logrotate.d/shorewall-init || die "Removing \"${ED}/etc/logrotate.d/shorewall-init\" failed"
+		fi
+
+		if [[ -d "${ED}/etc/NetworkManager" ]]; then
+			# On Gentoo, we don't support NetworkManager
+			# so we don't need this folder at all
+			einfo "Removing unused \"${ED}/etc/NetworkManager\" ..."
+			rm -rf "${ED}"/etc/NetworkManager || die "Removing \"${ED}/etc/NetworkManager\" failed"
+		fi
+
+		if [[ -f "${ED}/usr/share/shorewall-init/ifupdown" ]]; then
+			# This script isn't supported on Gentoo
+			rm -rf "${ED}"/usr/share/shorewall-init/ifupdown || die "Removing \"${ED}/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 "  https://shorewall.org/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 "  - https://shorewall.org/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 "  https://shorewall.org/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-fs/Manifest.gz b/net-fs/Manifest.gz
index 964b0d34e639..1f2efdafd536 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index e0309d25c5c8..7a236def2217 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -3,6 +3,6 @@ AUX autofs-5.1.6-pid.patch 453 BLAKE2B 292388f1d192a1e8763402dbc4d5738d112fbbf44
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
 AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa
 DIST autofs-5.1.6.tar.xz 315316 BLAKE2B 0c5e2351462505c6de0b12e510f0c08a625a0235e1ff8eeaff825946c4530c258449d26aaf6a3794aa82a97e8860711226168f434dd31bfb8a4e70287beb3ca4 SHA512 dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2
-EBUILD autofs-5.1.6-r1.ebuild 3070 BLAKE2B 04834c9c58fe8c386e4f955fb4999c76dbd1486ce8e0a89522df4ae953cff9da3131d6a7d7c26fea99a211ed396362542f443e2e0337281d7ba5c84d6039834f SHA512 7016800f8cca798ffacacae575436fbf262956c5b84df898582259539d555a750042bf39c660fa3eda8af0277c7a5fc06ef1e2f9cd7ff58596daa30db18d0cab
+EBUILD autofs-5.1.6-r1.ebuild 3077 BLAKE2B 33e14909121b1d948c88083d4f4c38283cf86dcb6f91cba59cd73f3da22828017d43e197f56971a028d2e3236f62316a0fec2ee67d92850c0119b0a24ca47efb SHA512 1bd3495ad5124c47a111d0524c63cb37e3bfc70d21eb78a71661c3644696c3b686759cb2fa33457b4935145007107898df879fac5f43eea8831484199e42ac00
 EBUILD autofs-5.1.6.ebuild 2940 BLAKE2B b8b1eca82edae68a82bfc8ef366ecbd13c4506dce5070fb39a8e97c675a1938759645a673f3c56706e2ebbaa49e8c183f0e9e2ff7a52af2be7fbfa853fc707e6 SHA512 3fdf8a340ecf55787bf8bd20d200b0756c6813dbbf1bf6b7ba6c4ac56ca6c1c7496e130e08a28456beb956b44f9130e0dea373021d705d5a67293fdb69987ec6
 MISC metadata.xml 976 BLAKE2B 4aa6e19a7966c42af8daca6be175f33769d75b6342a114d42b47e374f6b8df3ec0cc5c25d1c7a295f3d11f54555e4a2b1dc654aa335a89ee79bdb47fb796eaf1 SHA512 23aff908ddf72ab528f025b750bc48af90864c39c7ffb44537b87992d7b5d802d46f355ee7af38d57514a66894596a91a027b2db13940106d3a74ffa53d6758d
diff --git a/net-fs/autofs/autofs-5.1.6-r1.ebuild b/net-fs/autofs/autofs-5.1.6-r1.ebuild
index 051a07e4bdfe..7096688957cc 100644
--- a/net-fs/autofs/autofs-5.1.6-r1.ebuild
+++ b/net-fs/autofs/autofs-5.1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd"
 
 # currently, sasl code assumes the presence of kerberosV
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 339e83a59565..e19667521b9a 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,9 +1,5 @@
 AUX cifs-utils-6.10-ln_in_destdir.patch 813 BLAKE2B 71ac0215407a2350c19a15545d96f77115357c04bbcae2d1e09b7fbe54fd344d40638d3778195865eff3f9686b1fa9a0a13e188fdd4cc3d25c7a100fc5c376a1 SHA512 f9ccbd0d4d14cde1d07cc165533c51cc2876ed65e651a797a8b7c69958f6ee827090731888cbc425aecbb879b41e87a0e9ed1fce6817e1907cc7b114c53b8fc9
 AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672b37a0e8ac0b999aa7aaf180ac051f6745ee68373948b266ad359e1ba3b58552eda6314b5a4339673bd04656ab6090 SHA512 e3364e05fba6aff57ea2f09b530692f4f5ec95213e91794388fff9382d210db9bacb28dae1440d3b35a570c0b3bc21084a067e0ce8333febd5246c52aa9260ae
-DIST cifs-utils-6.10.tar.bz2 364221 BLAKE2B 45b692fb85217a25b7042fbe7e40cc8c4fe0d6cc9c905acde2c6fc9c3048343064e376f47128bcacba88f745452148040ad3f5e8ca15e297531f0dc868e1b75b SHA512 e19ca69b7948f01c1fd6a4ed069e00511588b903a5b8b0dc35ac1e00743170b9ca180b747c47d56cfacf273b296da21df60e1957404f26ebf2ba80bfa7e275cc
 DIST cifs-utils-6.11.tar.bz2 408903 BLAKE2B 5ee7cd87b54a266750bf938396ee90b3f20c2a3446aca295ccb58cb667fbfb68be9aa0e2bbc20aa5e18ffd7f1fcd5fbb0aef3bc25fd13bb96abc5a57a0b45b4b SHA512 064c0ac75572fb44908390508462e4fdfe0686751149fd8b656a209dd961a5a24a7d9774c38c0e72fa5f9875b43aea7bf2de038c4e4a63a11664e71d9003100e
-DIST cifs-utils-6.9.tar.bz2 400430 BLAKE2B fc8cc55fae54d84fc1f1d4a14a9d666d87a3da78d1502f0d72ac9cb44ff1424ca2c5b15b0be510579d4c9f5181980627efedd00e0e5cfb1b3e47188ba307ad28 SHA512 b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a
-EBUILD cifs-utils-6.10-r1.ebuild 3150 BLAKE2B ac64dfce87fef3bbd040cbacd39d1da49ba515835c72dec1e97486a7015584409137639a388449aa45acca17a4e3e8d4968864d1feaf9729abd98c5d14734045 SHA512 d800e881ce6a9f23f3d6deb2b8e779bea83d91f3b2903bc4d44e8c0369d2555eeaf130289ceaaa52634a35bb103434ac827124b963f99bac266d002430a796ef
 EBUILD cifs-utils-6.11.ebuild 3212 BLAKE2B a87a72d144e834998197802c23e3ad2c8f94f10fb54adc5654b1cde63d0a13104e3993ff250df710c710e5b0873a55fa823b7baa75f3f0fc04871ee32a56b50c SHA512 a4a06f59ae9f0c37c0084df205345647d1e9803e5973b54922803c5c8016607940669ed5a23ca11ae52fcef01a08d6da9c53bd809c2bc29807a357e4962941b3
-EBUILD cifs-utils-6.9-r1.ebuild 2999 BLAKE2B ab685dc316b4541f1c2b8c8a6c4804bd7618988ccf25ea4ad0ea45a90204f1ede1672143d4b9572d5ccd9139447f8bd7514c308da94b3a7a27060d6ba0453cdf SHA512 df98e0e70572601330f2a75deb4f934eb468e8dd398f961cfd1e76244b06bf4a408b010c7accc15ebc4070bd2c06930e6a9ebe04f1bd3b0d5e8a7cc76922ef05
 MISC metadata.xml 886 BLAKE2B 2ddb0ff3b0da3392b23743f3804c1d63651904c05a17e69f105c7b062d33befca62a13a1a93f631b314143a60bca8e2b20ec9b331646f0e6804a2f8cfce3bb81 SHA512 36019a5885034309e16198a154fc0fc16de2ff507eec81f4d63840bf56e9f67cf67dbf4ba7662a6f64daeb17541604d5f588ec67cca134b7ff07e0612817072b
diff --git a/net-fs/cifs-utils/cifs-utils-6.10-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.10-r1.ebuild
deleted file mode 100644
index d9225eafc90c..000000000000
--- a/net-fs/cifs-utils/cifs-utils-6.10-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 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 ~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? ( sys-libs/pam )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-python/docutils"
-PDEPEND="
-	acl? ( >=net-fs/samba-4.0.0_alpha1 )
-"
-
-REQUIRED_USE="acl? ( ads )"
-
-DOCS="doc/linux-cifs-client-guide.odt"
-
-PATCHES=( "${FILESDIR}/${PN}-6.10-ln_in_destdir.patch" )
-
-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
-
-	dobashcomp bash-completion/smbinfo
-}
-
-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-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
deleted file mode 100644
index 121a2f961098..000000000000
--- a/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 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 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? ( sys-libs/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/davfs2/Manifest b/net-fs/davfs2/Manifest
index e403abdc074b..4ca6957444ca 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -5,5 +5,5 @@ DIST davfs2-1.5.5.tar.gz 481021 BLAKE2B bff2f1a48caa74009209ea1422b20d4602235833
 DIST davfs2-1.5.6.tar.gz 481448 BLAKE2B 44a36d78f77222356dcde7733bd2aacc1b643c14d9d441b480002140881007f26fe4addb8dc70f3d3d185bdbe6eb4e74c7e8cb0539c035f220ed865c4526d3c1 SHA512 97c3f2eef93b418d89bb387a441d0624d4eb3de614973e3f25ded5e29d6913c7aa724022b610ff36d050ca11db63c47651413a93297e235725a42879bc8ac0c2
 EBUILD davfs2-1.5.4.ebuild 961 BLAKE2B f0c89f050a3dda0e73e42b118cf346bf82cf8d1f86e749076752f6112221d3b1cfd301b58e2bd78b76df4c7f2acebd8c852445f7f330b07d86fc97eb5b07c8fb SHA512 091a3ecccad50cce164b486d827c47d9eaf01457cfa661e71351e3f7de0e4a93c95484be19aab37701f14511286a06ded54da5863211102c86def249135739eb
 EBUILD davfs2-1.5.5.ebuild 1211 BLAKE2B b3bcaf6f15c6c0beb5c1648ade215113506d60472dbe0b7fe2935e4c19d0b08dcdde16a3171c455870d6ea0737300eb42d92e0096e0baf6b6c1787eb05c6fafe SHA512 9e9ad73032913cc922f15884e70f1a2e5c0120ce0117e8a2c6fabfeb73df1f32631f17f1ab49cb6b28246efd4d2482620c76a851fb97761ab3c44f9f0086d46b
-EBUILD davfs2-1.5.6-r1.ebuild 1307 BLAKE2B 6955f1947c98a9883f9a2de99353be0496f521b2bdd6c3b53d3b2cb88bef8385ff980733988efc586927a9d5f54dfb7dff28437ea3715d08c91aca082dd7479a SHA512 5becf72f33e02c3417c6ad8c0c94298a69b5f23961f4ad5a89f04e5c12d2dd0f4b3310d10b41de9c70c825d88d8a99b7ed2707c7fff2f924ef5af5f3b650f6b6
+EBUILD davfs2-1.5.6-r1.ebuild 1314 BLAKE2B ef9f5e670563a3ab72c3dfc75017a4f240622beb6c00c275d2e57ef4119b30e226b9e823e5b4c660de95db422b1c81b0b3176b935b6fe187eb7525556ef94e0d SHA512 8771bdca97c94164606881acd0145368f74ca2337186ea09fece428937992aefbf3f81ad13e595cf03407d59e0879eae7127711b91fa405069e7dc6e6d3483cd
 MISC metadata.xml 251 BLAKE2B 50ac338c9f09535de32ea2a1300195c358edff81cc3517de13846dbbc8b34331fa634e33633828beefb727a53bce0299ed784f4d0e18c07c977abfcfdd312074 SHA512 6d9ef84f36e3ce79747ee806d0194543d1c5a004e612ecbe308644829cf03234d7f52ef0dbbe57144da5d4af86e3a9a5df297a01c95c4d9938f49605e92aea32
diff --git a/net-fs/davfs2/davfs2-1.5.6-r1.ebuild b/net-fs/davfs2/davfs2-1.5.6-r1.ebuild
index 20bcd705f607..5879a1c7cd9d 100644
--- a/net-fs/davfs2/davfs2-1.5.6-r1.ebuild
+++ b/net-fs/davfs2/davfs2-1.5.6-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="nls"
 RESTRICT="test"
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 002ded917844..0faf4788e6ed 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -12,8 +12,8 @@ DIST samba-4.12.6.tar.gz 18224870 BLAKE2B 5a8086c3575dd46cc8f428db818dc3db8772fa
 DIST samba-4.12.7.tar.gz 18230157 BLAKE2B cf0ed50177e1e0d840892753537d8fab8c31ed4a6ba9b4e6bfc12e56c9f14a760c9e3dd230dc8e6caf2d7493e204bffb2fbd1bfa0931ae3fd93311ae2d5b3e32 SHA512 5afb1f24b029e665bb4f6bd7b7cf915243476b09b304942b2105586fa99adc6a19b46b4753ca116e230e5bb7b82e011fbe296c62bc70a8a897e56aece55a7f0b
 DIST samba-4.13.0.tar.gz 18406380 BLAKE2B d54db52102c6d507c3e6f32fc6c64051a95ef8ccfdb1e81a379d2c0325f6f9fe79c64ce9a26ddf48ae11351912ad988f6f532474a81284c7a7147521ceacc509 SHA512 0c15e887efa79ba8c1d24eda2f03898a1a080cb947056df12abc361f12eb5659f9ee37132767f5ef7e4ecb9c431759e5b619cb785921276fda17f4a9411af81c
 EBUILD samba-4.11.11.ebuild 9507 BLAKE2B 0b7db425eb6ef3183c7574d16227928877addbdadcc88ff87d84786d0011179e4a8d6ec4cbfef885974de638ed175a577678b3e76fde49f58c8b77a97c42877b SHA512 13d5c274e40d7e87081c4884cde042f8ccc0d07471415000a34dbbf453be46eeeb04fc12fcf9899a311babc8eac0dc4d836a9bc11b7ebcf874c3f77e275bc2c9
-EBUILD samba-4.11.13.ebuild 9514 BLAKE2B 65c47d9863bf57641de1175e395dcbfd539921cda81844f481d6ad61f8060834a2b8efb3fee71704cf2daf190f0887f7362fa51ffb07438298520464b05a6177 SHA512 115480e02c93829acd29edcf2e2191550d00ee00198cf8e234d5af888125bb4370eb5dbd13c00d8540233835aa15bd96d44af4a580450607bdc66402c0643770
+EBUILD samba-4.11.13.ebuild 9508 BLAKE2B 6de73c6d30018cddcbbe6c5dd567a9028606d8363159108cc10ff58e401937905bcee8ac17911b5bba466a40a4b367613f22e7c621f706965856b894af10e8cc SHA512 f130d0baccec67e11fc231e1ba1dd5a2b520d664c191af99dcd8ba6f8e7b1b37c709ab6bd1a63ea752984e748057b2dfbaf3ed34b878f86a602031501dcfcb7e
 EBUILD samba-4.12.6.ebuild 9505 BLAKE2B 5d3c61a5cf21dee15b67c390b927bd47e0246a06e22243465e7731e2ce8bbf0353bfb3224176cd499e2f8b87ca463dc371e0496b5f0fd2be7187ec835f739066 SHA512 95e54513ff1cecd34c9625527785c34395caad11dc37ee39c22a060fb101c34101d21e0d16ef6aff879feb85834cddb0e211a2afb04c8c2d059a52d2cab37bfc
 EBUILD samba-4.12.7.ebuild 9505 BLAKE2B 5d3c61a5cf21dee15b67c390b927bd47e0246a06e22243465e7731e2ce8bbf0353bfb3224176cd499e2f8b87ca463dc371e0496b5f0fd2be7187ec835f739066 SHA512 95e54513ff1cecd34c9625527785c34395caad11dc37ee39c22a060fb101c34101d21e0d16ef6aff879feb85834cddb0e211a2afb04c8c2d059a52d2cab37bfc
-EBUILD samba-4.13.0.ebuild 9390 BLAKE2B 911f343e6c0b8f8a655cee98e3217719e39d1643bbbe79d85c8fc7a2ebac82e073d77304a18f218c60e0888884c2df16b1b24ac0681b68f11dfdcc55211e5a74 SHA512 2a2b666d24ff807f412789927e3c7b14cd9d70b555c6a9abb88028761f377438296fdb6934e9eeaad4e6c5a397be59feecdcef48e8c696276bdee88aece7654d
+EBUILD samba-4.13.0.ebuild 9407 BLAKE2B 3239b18d7448abd0c9d00bff3698449d72b8c307291c17a464ac1ad7b3297414dee3752fcb13a7c54989ef47c04261b27c839ad2d4f0255583f3200cc5d2d841 SHA512 f923e719848c8dd60fc454cf6993220a1666aa4a9548bbd5ad947639ae3d51bf87fc54ce95545b791a53e5431f1830a6aab02ce9e77a5ee1a1dad0e1c717fd7f
 MISC metadata.xml 1848 BLAKE2B 2ae9d28a0ea8d1b53f4999e23044713b42f0fc829dd2df20c301acefe9d2c9334c97121ed85c50a5d0734cec834652b1f8ec8d0bd5cca30afbecc4730cb4d1a8 SHA512 48ac3deb48a2188836be87c485f1ba988788814aa1b495e89d70eb17f67fa80163132ac788d3bc0d586ba1957b22e4094036186c40af0cfc48aa453490021ec5
diff --git a/net-fs/samba/samba-4.11.13.ebuild b/net-fs/samba/samba-4.11.13.ebuild
index 3a2dc8d2c1e7..6916d566573c 100644
--- a/net-fs/samba/samba-4.11.13.ebuild
+++ b/net-fs/samba/samba-4.11.13.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/samba/samba-4.13.0.ebuild b/net-fs/samba/samba-4.13.0.ebuild
index edb967449d4c..654358f9e14e 100644
--- a/net-fs/samba/samba-4.13.0.ebuild
+++ b/net-fs/samba/samba-4.13.0.ebuild
@@ -119,6 +119,7 @@ REQUIRED_USE="
 	cluster? ( ads )
 	gpg? ( addc )
 	test? ( python )
+	!ads? ( !addc )
 	?? ( system-heimdal system-mitkrb5 )
 	${PYTHON_REQUIRED_USE}
 "
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index a284ee7c7bc7..0a40e07381c7 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/tftp-hpa/Manifest b/net-ftp/tftp-hpa/Manifest
index 77baa1f22f4a..db68a420209c 100644
--- a/net-ftp/tftp-hpa/Manifest
+++ b/net-ftp/tftp-hpa/Manifest
@@ -6,5 +6,5 @@ AUX tftp.socket 112 BLAKE2B 11e8c6e77819ba772b709843af11449e768db16fe866dc67e420
 AUX tftp.xinetd 219 BLAKE2B d348f13fdfa749b10ec765d5cd90a65a46d266a132dde47dad00fbd1ef4046c250cd9246e7b1fe9590e974a2bc7fcc817535fd2e9447a10c5286f7c4148eec93 SHA512 26883a4feffe8f66fe2c21c05892beeb93fa4511ca5ce18e92273badd4b93afefb0d9cef48e07503037ca37b2ff0cdb24d35e5c24d2e32d8027a5e74c49426f5
 DIST tftp-hpa-5.2.tar.xz 89564 BLAKE2B 45917ca3d710f8a4b584dbe1e9a912e06fd181e4ffcfd8fba13008f08dbbce0fe339b61fb6f97236b8012e755025d05700214e365adac81dfce42b0edd636e80 SHA512 a5198e923a6e58281f749dc77b3f3ed8579e56b6f0fd6a17482cc88bdc8d34b6702c7c709717885b9b937ecae459d9a832328a49a2e3536dc7432cdb39d2a394
 EBUILD tftp-hpa-5.2-r1.ebuild 1359 BLAKE2B 8d23615339df9e236c357bc31ec30787fb41910abc4806e4bdb411aec60c2294d357e9a3fa580eec8c3708046eab84eac507b2327ed71bc11f59bddd73e69236 SHA512 7ab446cc7bef3cd7a6826e85e0967a32d2819537c48146412aa9b54562ff0bda3c6a3e63706ffc1836a6c89611263b1e4ab5749204cc00178f467b802fac1b52
-EBUILD tftp-hpa-5.2-r2.ebuild 1619 BLAKE2B 3b6709d1c7ec574a4815a5f587063488b5a1b4f274ea7e9a9204549e89366510d7061011ee17f89eeecbad15d55dfdade8dcd122f5e40b017597acd17e4c208c SHA512 560062a79372b0ad40ca5fab781e0947fef99e884a719d4d932a31509b087911871e8b2d16de8cd5a6f2e2d2afe9a8200a37c5ca93a7fa211fa180987ead7348
+EBUILD tftp-hpa-5.2-r2.ebuild 1623 BLAKE2B 6e10533dab6e9ae828a32a3a510d9e7988f8d6d46ee95e4d0d2e2a1dd1c25843b93c581efd65bcda92a9bce014cf1d2fecb1e10ef5f92603d8cc6ff1be1c78cb SHA512 9d7ffca2a535b93bf827c5b55f29acd3de0d51f03d9f79a0a84e7c43b71723f7391dfbf08d06a78ca7bdee26309addcfc128e1f89de9f4c4c5f08e559272536c
 MISC metadata.xml 394 BLAKE2B 87202528ec85f2d4931e861cbb0ee6a69653502c2ab33ae5def46e32786cff1fa90b5102546254a03f71c84c970757591da6f883e49f63580ccca837f8c5181e SHA512 0a866135a65f2c41c97a5991a4f041989a5c9b13c74cf327a3a6ec66d1589da64f31f2d8ec2f3848ecd32faebb790092a39a33f1806335b2f267e41501209321
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
index 3381ec42a76b..b242ee021199 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r2.ebuild
@@ -22,8 +22,10 @@ DEPEND="
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-tftp )
 	!net-ftp/atftp
-	!net-ftp/uftpd
-	server? ( !net-misc/iputils[tftpd(+)] )
+	server? (
+		!net-misc/iputils[tftpd(+)]
+		!net-ftp/uftpd
+	)
 "
 
 PATCHES=(
diff --git a/net-ftp/uftpd/Manifest b/net-ftp/uftpd/Manifest
index 5b1f2bb2bc13..a465396fb869 100644
--- a/net-ftp/uftpd/Manifest
+++ b/net-ftp/uftpd/Manifest
@@ -1,3 +1,3 @@
 DIST uftpd-2.13.tar.xz 101128 BLAKE2B 2a948b993ed827b0bb53433c6dd9b49a7ddeb4d0b0a8e1e0061d417c9082094ab17e6116244af625de5ee2cbec4570eaa15ab0a68db95a959b471caade2b7aa2 SHA512 91152129ce1deb4db8e929aa75ffa88d69fe2d0ee1fd90242d1ecf02ee31a64bd3389d7d6699f9dab957d86389db87ecd9bc16dd37d0f8d0684007b43aa8a05c
-EBUILD uftpd-2.13.ebuild 454 BLAKE2B c72336d1ad331c59c67f40167cb966dc9d9ffe4bf51b58bc567c0ae775c650df75b55cc6926744515f73918422c0489bd7b7c32180a2e951472d587c80bcecd7 SHA512 bc3c6f1b80b80e975f659ea52514c3485f1103d1ebdea2e868ba88e7f6388643072985bf96eb06e92abd9003fe48fe90668df8b61c8f87d7ce5692fb6edebc3c
+EBUILD uftpd-2.13.ebuild 682 BLAKE2B 258f20398d63700df6c5dc1d25bd41df4de752f0252414a79707ae59c5dcb4ea48b7d51e437b5de62649e8212964a9717677e182cfd1a27a5fbfde22bd8f4da5 SHA512 1ab3852309f42125a7187982ea90398582db2ef6f9381f8e82cd313b2c4f65657ce6648ba21f54608742ade2dc4f92e645c4d8dd375256d0ac03781099ea217f
 MISC metadata.xml 919 BLAKE2B b8bb2ddc64dc727547cf908e62df335d5cdf71132a2292e14a7e995d48364de64adde5d0035af3ddbdbdd8b64640b929cd3de0cdd62f49e2480154b1e5d543e4 SHA512 fec60605c1a67eee40734f15395129e76cfd0d0fbde24e977a61973e960704cd5be83e68094d45b0b2ce9b688c5d27cf41c4fb540094b7be532e1563ab622d31
diff --git a/net-ftp/uftpd/uftpd-2.13.ebuild b/net-ftp/uftpd/uftpd-2.13.ebuild
index fc8503685308..f6666d43c1ee 100644
--- a/net-ftp/uftpd/uftpd-2.13.ebuild
+++ b/net-ftp/uftpd/uftpd-2.13.ebuild
@@ -9,14 +9,26 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	>=dev-libs/libite-1.5
 	>=dev-libs/libuev-2.2"
 
-RDEPEND="
-	${DEPEND}
+DEPEND="
+	${RDEPEND}
 	!net-misc/uftp
-	!net-ftp/atftp"
+	!net-ftp/atftp
+	!net-ftp/tftp-hpa[server(+)]
+	test? (
+		net-ftp/ftp
+		net-ftp/tnftp
+		>=net-ftp/tftp-hpa-5.2-r2[client]
+	)"
+
+src_test() {
+	# can't run the tests in parallel since the order matters
+	emake -j 1 check
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index b6602c0640b5..d0f42d6a2cf1 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 69e0e94fe3cd..93334b13deb6 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -7,5 +7,5 @@ AUX pidgin-2.14.0-gold.patch 284 BLAKE2B 3d658d69f4d226adf238cd6e624067741ea9d80
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
 DIST pidgin-2.14.1.tar.bz2 8849275 BLAKE2B 27cd58a79f36c0176147c2e5bac7c4c18ec74c446c556e2326465c3607a95c3a58c1bdbbf9b4fb9741783ae982a6ce8fe0556ccff5b1608c9bba98626560412c SHA512 6ce5c58f32fa680d7f67e37a42b0f77c8253018cee21df2895d52166d9eb6ecaf0458b1610adbd46f337d00e75933db7578c2f9808654bd22838ba5db0a13030
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
-EBUILD pidgin-2.14.1.ebuild 7948 BLAKE2B 051d5ec657df62dad67b223c3c825d37a69d47ccfcf84c0e188e7febbc71f8f1daca5b35ded6ea9281f2471550a93f6165908f531ffaa56a2712a867a1d47b2f SHA512 7802fd4fdc0543187bbe1b1d3c1e18d934d45de254a5b835414d8bcb50144b06683db315cca932e2982db7d3fba58826907748544a501d84c32c39baa50c6cd3
+EBUILD pidgin-2.14.1.ebuild 7889 BLAKE2B 6e1c1101a93d0175a18601a4d7cf7f3e23b3597d1e42d4afcbee08802f278ee7a8323c12d6bd8bf5c2c665ff9ea6b21a77e3b0c064964283374e6c8e3c63ce1d SHA512 c39343d6269c58d141359dc550f8cf7c5bb532461e9a246152bde49b4ecc650748b905664ee90a5001fdb9464150a68df8a82577e7b5166b0eef9aaf57d07157
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/pidgin-2.14.1.ebuild b/net-im/pidgin/pidgin-2.14.1.ebuild
index 107090103e03..b162dd029552 100644
--- a/net-im/pidgin/pidgin-2.14.1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.1.ebuild
@@ -60,10 +60,7 @@ RDEPEND="
 		')
 	)
 	perl? ( >=dev-lang/perl-5.16:= )
-	gadu? ( || (
-		>=net-libs/libgadu-1.11.0[ssl,gnutls(+)]
-		>=net-libs/libgadu-1.11.0[-ssl]
-	) )
+	gadu? ( >=net-libs/libgadu-1.11.0 )
 	gnutls? ( net-libs/gnutls:= )
 	!gnutls? (
 		dev-libs/nspr
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 968bd1fa7132..08e725639527 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.36.1_amd64.deb 108956366 BLAKE2B 6f268351d731dfd02353f0bef5112f969b2601b11b8c22ea269735c3bcde55b6d89295292d08a8b2d4d6de6ac91a8b345de9af3b6544363ec3fe9031d9501837 SHA512 b609b5f83b1353516e3f274e190c862fbc4153171ce581719543f9c8ac7ccc450285353a2b89005a855a267667702c767778904de401800c0228612915208992
-EBUILD signal-desktop-bin-1.36.1.ebuild 3402 BLAKE2B 1f16761c27b8c9bedacad015bcbf6025e40ae715cec5392cf52d9b59f6f79836faa31389affb62bc28764ccd3eef8276f3971e44eb8f9bec73f3cf407222ef06 SHA512 c3d8d2019e506b57f74c2d933a9c0dc77c0ceb1808327ac97279a56cbcf1b92e477ec0a172715f633c1d49b380a7f863c2b1f9f6f0843bea56f6aa242309ca97
+DIST signal-desktop_1.36.2_amd64.deb 108652236 BLAKE2B 60447e0783ed52839c996b364972433a992de9fee45861cfafb5e6509283364eaa0628227754acea7d1f93a21289abfe9bb9bb62d7c4e32f7104fa8c97fe20b5 SHA512 581e904d37b17c6179e7bd677cc716f2ad48b6d210a2117a94a30066334f601159a73245bff91b503e3819b083364292aca34329d40287bd7655ccadb166792f
+EBUILD signal-desktop-bin-1.36.2.ebuild 3402 BLAKE2B 1f16761c27b8c9bedacad015bcbf6025e40ae715cec5392cf52d9b59f6f79836faa31389affb62bc28764ccd3eef8276f3971e44eb8f9bec73f3cf407222ef06 SHA512 c3d8d2019e506b57f74c2d933a9c0dc77c0ceb1808327ac97279a56cbcf1b92e477ec0a172715f633c1d49b380a7f863c2b1f9f6f0843bea56f6aa242309ca97
 MISC metadata.xml 366 BLAKE2B ed902f5cc030be09d1d839f3192009f6ed195718c28e3e4bca1c80f157b20ff63ec9f83a9ceb187ba1e0d203785ae60ba6777278fe833644e7cb11b3fb7bc786 SHA512 776e1f9b4fee54973687d8179b554598a9cd4d983b9515a0003f641fbe8e497b9ceef54d1fd5d09a665098b0717ccd7c9687ae96e0011619959fb5ad945c302b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.36.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.36.2.ebuild
index 7a50112a339f..7a50112a339f 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.36.1.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.36.2.ebuild
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 6b7e8832a7be..4eba45999917 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,10 +1,13 @@
 AUX README.gentoo 323 BLAKE2B d76300068625c3946641d76000f9ed59a5ad93bfefbbdd6e7dc284d98d234ff11007261a1e5676b5b40890f99c9929dcc179fb1cbaeb5eb3bf5a25cb08c5f233 SHA512 53b60206207913af6bcd31fe78b6ea68468cbc5cd01bde46b62e22f119dda19e66d990e3f75ab8a0f67faff50064ed895d67fc43d64df19186145c6a8220ac0e
 AUX zoom-videocam.svg 284 BLAKE2B fa118d489cafa1c14841c27ab4962c41d52987ee49b8ad0fb3e4c33d7cf376920e16a8f7358807d0809231fbf7ef8cafd4752ac90e85cc7395a56fbe07f6340d SHA512 a60345de0c86003dc49484fd5d3d22e3228b8b1c107796690289a7779769436809dd22b02b4951df2fc1e3a98c541dec4b0788ab7d112b2b9c8c29a46493a98d
 AUX zoom-videocam.xpm 806 BLAKE2B dcb9d7e2a90f564ed6b7f0b733efb72867ecf2418177b25ecd5a00e204ab9f0f89c2b1f3b3078b3cf326c8c523480f183170a82d896b73848e7596b32a351a9b SHA512 a49e7cce25e6b3a1492b2ed834f7fe8f533b5374b0c4eea4089003459ac011ef264175c5c2322cceb77f8fb67e939e90e9abddeef415d2f570add8301cd10a48
-DIST zoom-5.2.454870.0831_i686.tar.xz 39596492 BLAKE2B 4b0e0ba01b7865a721b4a7e54196be781db5ec161cec40f30a2f39437ee58e6b1ebd02b08259390f4bf78f5f5a575d58cdacb018a3cf85ad2f20cb3bfa12ca04 SHA512 1dbc0c95b3d376dafa9020bb4f02ad7c64bcfdcf25ea9ee3393bc404731a9c19aa0073b81bfaca7eaa040afa6e3c5df116d45f337de1f776f32d8da31faf0271
-DIST zoom-5.2.454870.0831_x86_64.tar.xz 38984928 BLAKE2B 9cf4f6903287909d4aeaa3437e3a25eebd4e9ea1b4e7eb2f8ba7fdce174b25e570c8aa12d0e4555a43b94a3056506f1a09d45122090a3183d4a934935630fa5a SHA512 44f7fba85c991ac017a8bf61216a7b51d8ae526631be95a25611f6116e3e4b4e1257f8f72b88172539e1ad3d831d58bc87b9858d868a271d4f9ae64b4061d27e
 DIST zoom-5.2.458699.0906_i686.tar.xz 39597652 BLAKE2B 594dde9f4246e3a1f52bdf0fe45df1557c476a64167f7aa879c8cee39b7a46f65d86265f7b4c18de8028f96b3c74d7e2d6af0d53e8ffea95dc8fc1e0a9e3d679 SHA512 d987913c1680f772eb13362d9b356ee3deb99c67f267a7d15c6907a8693901439e1309e4e6f9eaebd22b2480ca4fa6e68fea96c6e2642a0a7e717211dac90e22
 DIST zoom-5.2.458699.0906_x86_64.tar.xz 38982472 BLAKE2B 45645ffd3a105e2e3c801750490ba57a5b509748d7c6f12699bab540410e08b4dd677d3be3f581ea94a66a0e80348ad1dfd739eeb5c543d2d68d172ab6b85154 SHA512 c9f73bb58eaf591df0675c9518bf97bb1c0a7a902107411e6c6ba4d06e51081155abc50f950a0bf234bf1d1a234cc4476dfbf95d08ac8f7dc0b08abc40c7564c
-EBUILD zoom-5.2.454870.0831.ebuild 2908 BLAKE2B 11dba4e86f91f2c42976643926371c739b27cc3c8a7c233cefac4c68a0569f209b91d7aca6cf4d8e1add4856ee00c507ed90f235c6f143079d7c67654d805287 SHA512 4c2741fa72ea2de0211ec5aa26dd63800ca36bdcb637df41b35a1aad60db85de5b0c2b4479c2dde68610a4319e343807662a1d4fe1bb4bc1053e7025177f6b3d
+DIST zoom-5.3.465578.0920_i686.tar.xz 39756188 BLAKE2B c14efb485096af16dfcbd80bcbd643e48fcea784568d231a37e9dd7bf57337f0171981de209ebc1482518cc6f7216c425e43fcd36c43c30732b39928057ec7cc SHA512 cbdc35e8124a558a084e89483e0150cfb9585668f6e259e75b7d6f6323849c3dcdae75b1525c5e86eba5cf05867e8ce8a0cb2f4e8406a16fcb5a30673aa7102c
+DIST zoom-5.3.465578.0920_x86_64.tar.xz 40086928 BLAKE2B 78df8a807a951b2d82806a46a90f12ce0287adf77bfd31ead5bd11b642c24012b1692e1dd4bd8c83208c091581040d245b05f518318f9aa175046a0e000ff75b SHA512 b98e6783e5189c296857dd7b19708c70004fd38b1bc68f4ecf53d531b4209cdbce1348b8bdb601df78113d38bdc669271ccb267fc2ae1b2d7683abf8d95ad550
+DIST zoom-5.3.469451.0927_i686.tar.xz 39797144 BLAKE2B 74e7eb541e1ac4c304f5d1faae342078f7ede92e0af84efa2150b9be0db3d69bf78ead639225cba4017a684f94dc505e28aad481ccd0cbeacbfa30ac1aa38faa SHA512 8593d66e214df2c8b6038ce32e2561b035eab6408affcb6bf4ec1f61113a422ec2e710cb2c6ed178034500f96900685bdb10994bc7554462f2899561e54f2e47
+DIST zoom-5.3.469451.0927_x86_64.tar.xz 40206068 BLAKE2B 82a97ad9a908767edddb6ef3b5331b502e5644ce7116d6683ddd810b442080790a4745493e40d7dc82d63515373f3dc6af4cd1665622022f8a8e61d2f65891fc SHA512 922903e576325754b8d7814866c1a06a17e8bfcaee872b6e72f6645a3655832ff6e1f244b5635305ad9286f8472dc82168d3567e816c998981042de00acb574d
 EBUILD zoom-5.2.458699.0906.ebuild 2908 BLAKE2B 11dba4e86f91f2c42976643926371c739b27cc3c8a7c233cefac4c68a0569f209b91d7aca6cf4d8e1add4856ee00c507ed90f235c6f143079d7c67654d805287 SHA512 4c2741fa72ea2de0211ec5aa26dd63800ca36bdcb637df41b35a1aad60db85de5b0c2b4479c2dde68610a4319e343807662a1d4fe1bb4bc1053e7025177f6b3d
+EBUILD zoom-5.3.465578.0920-r1.ebuild 2921 BLAKE2B ce06deca03f557717e6b83e93afb80b67be000820cdeb05de5817facf7f929b795359f3d9e9f950a0446943c5e1a4881c0f6143d4adf694c4d169296fd6be482 SHA512 4b65221249b5da35388d240a546c0998a047517d877966e066fedb2f6450b65f7f2329f35f7d52c34df7721b88d89c64c81942ef5b7ddc52d2a9d5f115c8a649
+EBUILD zoom-5.3.469451.0927.ebuild 2877 BLAKE2B e477df27c26d6b7db8026f8120437bf2db5388acfc0074c497e3a7777de258c25a0d2415f9af04dfc7d49b5b183e70d25b6c53885cd0b45d5d57f86e02105c29 SHA512 fcf0c2c6d8864c30746ecd724fde4147639a62df59d5681f0b5b69cb1552a8df8971e9ed69ee064e1313cc1db6f029fd598675c37982ea66d52a607d3e368933
 MISC metadata.xml 523 BLAKE2B f258ebdf8e4a2e067f202ede6324203b640c6a7fce843cc4b42cf4eef6efd97620e50c22c80f885d09254e403f016758d7dd3ba1deeef0c26692487a2ca9ba35 SHA512 9746752364f19f9e17516315231c8efef278f4d77ddcbfde213b5a65b012d6e320a20536e44ac5a111b2370a21cb59eb7a88c5c3fd2a1dd44064702d5e7bca38
diff --git a/net-im/zoom/zoom-5.2.454870.0831.ebuild b/net-im/zoom/zoom-5.2.454870.0831.ebuild
deleted file mode 100644
index c11afe99432c..000000000000
--- a/net-im/zoom/zoom-5.2.454870.0831.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz )
-	x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libjpeg-turbo pulseaudio"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	amd64? ( dev-qt/qtdeclarative:5[widgets] )
-	x86? ( dev-qt/qtdeclarative:5 )
-	dev-qt/qtdiag:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-sound/mpg123
-	sys-apps/dbus
-	sys-apps/util-linux
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	!bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo )
-	pulseaudio? ( media-sound/pulseaudio )
-	!pulseaudio? ( media-libs/alsa-lib )"
-
-BDEPEND="!pulseaudio? ( dev-util/bbe )"
-
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
-	default
-	if ! use pulseaudio; then
-		# For some strange reason, zoom cannot use any ALSA sound devices if
-		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
-		# is installed. So, force zoom to ignore libpulse.
-		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
-		mv zoom.tmp zoom || die
-	fi
-}
-
-src_install() {
-	insinto /opt/zoom
-	exeinto /opt/zoom
-	doins -r json sip timezones translations
-	doins *.pcm *.pem *.sh Embedded.properties version.txt
-	doexe zoom zoom.sh zopen ZoomLauncher
-	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-
-	if use bundled-libjpeg-turbo; then
-		doexe libturbojpeg.so.0.1.0
-		dosym libturbojpeg.so.0.1.0 /opt/zoom/libturbojpeg.so
-	else
-		dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
-	fi
-
-	make_wrapper zoom ./zoom /opt/zoom
-	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
-		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
-	# The tarball doesn't contain an icon, so take a generic camera icon
-	# from https://github.com/google/material-design-icons, modified to be
-	# white on a blue background
-	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
-	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	local FORCE_PRINT_ELOG v
-	for v in ${REPLACING_VERSIONS}; do
-		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-im/zoom/zoom-5.3.465578.0920-r1.ebuild b/net-im/zoom/zoom-5.3.465578.0920-r1.ebuild
new file mode 100644
index 000000000000..63ad690a864c
--- /dev/null
+++ b/net-im/zoom/zoom-5.3.465578.0920-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="Video conferencing and web conferencing service"
+HOMEPAGE="https://zoom.us/"
+SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz )
+	x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )"
+S="${WORKDIR}/${PN}"
+
+LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libjpeg-turbo pulseaudio"
+RESTRICT="mirror bindist strip"
+
+RDEPEND="!games-engines/zoom
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-libs/quazip
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	amd64? ( dev-qt/qtdeclarative:5[widgets] )
+	x86? ( dev-qt/qtdeclarative:5 )
+	dev-qt/qtdiag:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-sound/mpg123
+	sys-apps/dbus
+	sys-apps/util-linux
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	!bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo )
+	pulseaudio? ( media-sound/pulseaudio )
+	!pulseaudio? ( media-libs/alsa-lib )"
+
+BDEPEND="!pulseaudio? ( dev-util/bbe )"
+
+QA_PREBUILT="opt/zoom/*"
+
+src_prepare() {
+	default
+	if ! use pulseaudio; then
+		# For some strange reason, zoom cannot use any ALSA sound devices if
+		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
+		# is installed. So, force zoom to ignore libpulse.
+		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
+		mv zoom.tmp zoom || die
+	fi
+}
+
+src_install() {
+	insinto /opt/zoom
+	exeinto /opt/zoom
+	doins -r json sip timezones translations
+	doins *.pcm *.pem *.sh Embedded.properties version.txt
+	doexe zoom zoom.sh zopen ZoomLauncher
+	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
+	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libquazip.so
+
+	if use bundled-libjpeg-turbo; then
+		doexe libturbojpeg.so
+	else
+		dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
+	fi
+
+	make_wrapper zoom ./zoom /opt/zoom
+	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
+		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
+	# The tarball doesn't contain an icon, so take a generic camera icon
+	# from https://github.com/google/material-design-icons, modified to be
+	# white on a blue background
+	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
+	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	local FORCE_PRINT_ELOG v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
+	done
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-im/zoom/zoom-5.3.469451.0927.ebuild b/net-im/zoom/zoom-5.3.469451.0927.ebuild
new file mode 100644
index 000000000000..58b926df6a20
--- /dev/null
+++ b/net-im/zoom/zoom-5.3.469451.0927.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="Video conferencing and web conferencing service"
+HOMEPAGE="https://zoom.us/"
+SRC_URI="amd64? ( https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz )
+	x86? ( https://zoom.us/client/${PV}/${PN}_i686.tar.xz -> ${P}_i686.tar.xz )"
+S="${WORKDIR}/${PN}"
+
+LICENSE="all-rights-reserved Apache-2.0" # Apache-2.0 for icon
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libjpeg-turbo pulseaudio"
+RESTRICT="mirror bindist strip"
+
+RDEPEND="!games-engines/zoom
+	dev-libs/glib:2
+	dev-libs/icu
+	dev-libs/quazip
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtdiag:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-sound/mpg123
+	sys-apps/dbus
+	sys-apps/util-linux
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	!bundled-libjpeg-turbo? ( media-libs/libjpeg-turbo )
+	pulseaudio? ( media-sound/pulseaudio )
+	!pulseaudio? ( media-libs/alsa-lib )"
+
+BDEPEND="!pulseaudio? ( dev-util/bbe )"
+
+QA_PREBUILT="opt/zoom/*"
+
+src_prepare() {
+	default
+	if ! use pulseaudio; then
+		# For some strange reason, zoom cannot use any ALSA sound devices if
+		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
+		# is installed. So, force zoom to ignore libpulse.
+		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
+		mv zoom.tmp zoom || die
+	fi
+}
+
+src_install() {
+	insinto /opt/zoom
+	exeinto /opt/zoom
+	doins -r json sip timezones translations
+	doins *.pcm *.pem *.sh Embedded.properties version.txt
+	doexe zoom zoom.sh zopen ZoomLauncher
+	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libmpg123.so
+	dosym {"../../usr/$(get_libdir)",/opt/zoom}/libquazip.so
+
+	if use bundled-libjpeg-turbo; then
+		doexe libturbojpeg.so
+	else
+		dosym {"../../usr/$(get_libdir)",/opt/zoom}/libturbojpeg.so #715106
+	fi
+
+	make_wrapper zoom ./zoom /opt/zoom
+	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
+		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
+	# The tarball doesn't contain an icon, so take a generic camera icon
+	# from https://github.com/google/material-design-icons, modified to be
+	# white on a blue background
+	doicon -s scalable "${FILESDIR}"/zoom-videocam.svg
+	doicon -s 24 "${FILESDIR}"/zoom-videocam.xpm
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	local FORCE_PRINT_ELOG v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test ${v} -le 5.0.403652.0509 && FORCE_PRINT_ELOG=1
+	done
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 207d50cd7186..c9e477974946 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/ii/Manifest b/net-irc/ii/Manifest
index 2c17a1f117e3..57740db3f4f1 100644
--- a/net-irc/ii/Manifest
+++ b/net-irc/ii/Manifest
@@ -1,4 +1,4 @@
 DIST ii-1.8.tar.gz 12326 BLAKE2B 7ae90d788aaec0a359ce46370f27c0ce62c6f77e8cda61d9d168d0ebd7de927a478b42a591631f2c193f3816b2a1b39cf79607326b073bcbeefe4291e0fb95f6 SHA512 2b41a0611ac76612c9333e8490709ee22d17506f0c5d7e680a0d8f3f8b511bd5b279555cf609c1543aba71948819369a3c306b1168086890aa49c145b7860e17
-EBUILD ii-1.8.ebuild 679 BLAKE2B 12b44633b9b0df1ccda872f6645ebb973557ffa9a41a4b2394bf21457f21956179ffe37f8175bf0d2c509d2e39ae59e5965c1a0e865b285b11f74aaeb5997d2c SHA512 b9456865280625c6ffddf6cc6faeea3f55cf3058933f93ba9ed13ea168264c9571b9e8259f77bd80ea4a3b5bc2e6572063701fa6af3a1529a4e1df2a57dd9b88
+EBUILD ii-1.8.ebuild 697 BLAKE2B 5bf58333b62042b53070269898b63c9fd99b0aab09f12d0bf723a4d76a9945e8efa812025992fdb6f7e1c4a070ea6c58c4a9257276dc1624c109e891ba8e971a SHA512 3b304b910445d37a829c1f01ae370faf0e3f78bdd04b92ee4d3a0018a48d82d63801f1b92854dc2588f531f15a0d6829d79900d95d03b743ecc1aeba556cff37
 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.8.ebuild b/net-irc/ii/ii-1.8.ebuild
index 55703a78a38b..c079034f9bfb 100644
--- a/net-irc/ii/ii-1.8.ebuild
+++ b/net-irc/ii/ii-1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm ~x86 ~amd64-linux"
+KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 
 src_prepare() {
 	default
diff --git a/net-irc/irc-server/Manifest b/net-irc/irc-server/Manifest
deleted file mode 100644
index 010b458291b8..000000000000
--- a/net-irc/irc-server/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 2.10.3_p3-gentoo.patch 475 BLAKE2B 23d67f7e3aefac20b4ce15305c6276bd905cbc254b9891ec815dd1e02877d1ef3495e2060d6482145a59e76517160f97530e43e62bfb7d156f83bd4c7a11a917 SHA512 5ce98259c1b8666ca1df50f6c89004fc0c667d5e86355e632d97f1432ee9e4f16b75570b7bd17e954c51ea3385bcb8f3dd58a55e9d34ffcaabef0c5249ec2f6b
-AUX ircd.confd 202 BLAKE2B 109e2d7e7c3d5380e960be0ea17ec328d71a395090092316cc6d9c7549136f4483e0ddf6a4114138be856d30539df19bc7fc100292339d4ad089acc390f233b4 SHA512 a490883237ecef81be35278612d9cd1431a2ff597448a7c506ea4a6b8e9a9a595f043c9b5f601a47cd3c22ab453e6f79526aea2ec64c4f3ed5092e5f63d367bf
-AUX ircd.rc 663 BLAKE2B d3f608ec2d7d9e7654f5aac6ef36db44f5b8da8874de00b329abc4968c5c4d1354f021821b717350c729b9a1b8f0eb55ccef6d2bf69506cabac80217145ea5c4 SHA512 f6b0ef2ff03632cfd31f23781745facba6f92d67f243682c0f63314932dca9bbff6aead430788fc9faa107f17bde500072d5291227cf51ccf4596bf8a9c2b347
-DIST irc2.11.1p1.tgz 770458 BLAKE2B a70b2123bfd82c66c5b699985e4b553b3601d129849a76ca100b61933c1ef53b31dc76fe2d8c91fb1e7403a31162223b4092a7d454f62a777eb147e4b4ca1458 SHA512 cc398ddd0129a044bb681504986f3d4d6f6e9b9b703495d62ec237c2e26a81250986336ae6076236eec7576eb0939ad931b45f09779e852cf69d101569c31c2c
-EBUILD irc-server-2.11.1_p1-r4.ebuild 2917 BLAKE2B 80dec381dd702f36acdf0253eb85be8d8214352bab621925388dd774b9675c71914be369a8ad0bf1654cd5233f380b7a9c2f180e9fcc0865281253f08480b300 SHA512 5a0a36020bab851f1e67358c6581f1cc8a3b1a8a7b8b1bce16f3f9738656c437c82346fe1ec6f7448a4814659cacaac2d3cc7308ed804377a062cbe08097969a
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/irc-server/files/2.10.3_p3-gentoo.patch b/net-irc/irc-server/files/2.10.3_p3-gentoo.patch
deleted file mode 100644
index 36f558a70470..000000000000
--- a/net-irc/irc-server/files/2.10.3_p3-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur irc2.10.3p3.orig/contrib/tkserv/tkserv.c irc2.10.3p3/contrib/tkserv/tkserv.c
---- irc2.10.3p3.orig/contrib/tkserv/tkserv.c	2001-03-09 07:55:38.000000000 -0600
-+++ irc2.10.3p3/contrib/tkserv/tkserv.c	2004-06-08 00:14:33.648900488 -0500
-@@ -549,6 +549,7 @@
-         case -1:
-             sendto_user("You are not allowed to tkline \"%s\".", host); break;
-         default:
-+	  break;
-     }
- 
-     retv = retv < 0 ? 0 : retv;    /* errors do not allow authorization */
diff --git a/net-irc/irc-server/files/ircd.confd b/net-irc/irc-server/files/ircd.confd
deleted file mode 100644
index 19766668e76c..000000000000
--- a/net-irc/irc-server/files/ircd.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# /etc/conf.d/ircd: configuration for /etc/init.d/ircd
-
-# User account to run ircd as.
-
-#IRCD_USER="ircd"
-
-# Put any additional options for ircd here.
-# See ircd(8) for more information.
-
-#IRCD_OPTS=""
diff --git a/net-irc/irc-server/files/ircd.rc b/net-irc/irc-server/files/ircd.rc
deleted file mode 100644
index 0e3a05d5728f..000000000000
--- a/net-irc/irc-server/files/ircd.rc
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-}
-
-IRCD_USER=${IRCD_USER:-ircd}
-
-checkconfig() {
-	if [ ! -e /etc/ircd/ircd.conf ] ; then
-		eerror "You need to create /etc/ircd/ircd.conf first."
-		eerror "An example can be found in /etc/ircd/ircd.conf.example"
-		return 1
-	fi
-}
-
-start() {
-        checkconfig || return $?
-	ebegin "Starting ircd"
-	start-stop-daemon --start --quiet --chuid "${IRCD_USER}" --exec /usr/sbin/ircd -- ${IRCD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ircd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/ircd/ircd.pid
-	eend $?
-}
diff --git a/net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild b/net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild
deleted file mode 100644
index a92ca4280fc5..000000000000
--- a/net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator user
-
-MY_P="irc${PV/_/}"
-
-DESCRIPTION="RFC compliant IRC server"
-HOMEPAGE="http://www.irc.org/"
-SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}.tgz
-	ftp://ftp.irc.org/irc/server/Old/irc$(get_version_component_range 1-2)/${MY_P}.tgz"
-
-# GPL-2 is for the init script, bug 426038.
-LICENSE="GPL-1 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="zlib ipv6"
-
-RDEPEND="sys-libs/ncurses:0
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	sys-apps/grep"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/2.10.3_p3-gentoo.patch )
-
-pkg_setup() {
-	enewgroup ircd
-	enewuser ircd -1 -1 -1 ircd
-}
-
-src_configure() {
-	sed -i \
-		-e "s/^#undef\tOPER_KILL$/#define\tOPER_KILL/" \
-		-e "s/^#undef\tOPER_RESTART$/#define\tOPER_RESTART/" \
-		-e "s/^#undef TIMEDKLINES$/#define\tTIMEDKLINES\t60/" \
-		-e "s/^#undef\tR_LINES$/#define\tR_LINES/" \
-		-e "s/^#undef\tCRYPT_OPER_PASSWORD$/#define\tCRYPT_OPER_PASSWORD/" \
-		-e "s/^#undef\tCRYPT_LINK_PASSWORD$/#define\tCRYPT_LINK_PASSWORD/" \
-		-e "s/^#undef\tIRC_UID$/#define\tIRC_UID\t$IRCUID/" \
-		-e "s/^#undef\tIRC_GID$/#define\tIRC_GID\t$IRCGID/" \
-		-e "s/^#undef USE_SERVICES$/#define\tUSE_SERVICES/" \
-		"${S}"/support/config.h.dist \
-		|| die "failed to sed definitions in config.h.dist"
-
-	if use zlib ; then
-		sed -i -e "s/^#undef\tZIP_LINKS$/#define\tZIP_LINKS/" \
-			"${S}"/support/config.h.dist \
-			|| die "failed to sed ZIP_LINKS definition in config.h.dist"
-	fi
-
-	# The --mandir has single quotes around it, the $prefix is NOT
-	# interpolated into the string.
-	econf \
-		--sysconfdir=/etc/ircd \
-		--localstatedir=/var/run/ircd \
-		--with-logdir=/var/log/ircd \
-		--with-rundir=/var/run/ircd \
-		--mandir='${prefix}/share/man' \
-		$(use_with zlib) \
-		$(use_enable ipv6 ip6)
-}
-
-src_compile() {
-	cd $(support/config.guess) \
-		|| die "failed to change into the source directory in src_compile"
-	emake ircd iauth chkconf ircd-mkpasswd ircdwatch tkserv
-}
-
-src_install() {
-	cd $(support/config.guess) \
-		|| die "failed to change into the source directory in src_install"
-
-	emake \
-		prefix="${D}"/usr \
-		ircd_conf_dir="${D}"/etc/ircd \
-		ircd_var_dir="${D}"/var/run/ircd \
-		ircd_log_dir="${D}"/var/log/ircd \
-		install-server \
-		install-tkserv
-
-	fowners ircd:ircd /var/run/ircd
-	fowners ircd:ircd /var/log/ircd
-
-	cd ../doc || die "failed to change into the doc directory in src_install"
-
-	dodoc \
-		*-New alt-irc-faq Authors BUGS ChangeLog Etiquette \
-		iauth-internals.txt INSTALL.appendix INSTALL.* \
-		m4macros README RELEASE* rfc* SERVICE*
-
-	docinto Juped
-	dodoc Juped/Advertisement Juped/ChangeLog.* Juped/INSTALL
-
-	docinto Juped/US-Admin
-	dodoc Juped/US-Admin/Networking
-
-	docinto Nets
-	dodoc Nets/IRCNet
-
-	docinto Nets/Europe
-	dodoc Nets/Europe/*
-
-	newinitd "${FILESDIR}"/ircd.rc ircd
-	newconfd "${FILESDIR}"/ircd.confd ircd
-}
diff --git a/net-irc/irc-server/metadata.xml b/net-irc/irc-server/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-irc/irc-server/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 15ac51a89228..c429412ec45e 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -5,7 +5,10 @@ AUX konversation-1.7.5-kf5windowsystem-5.63.patch 1074 BLAKE2B cd24488b5892d75fd
 AUX konversation-1.7.5-missing-header.patch 574 BLAKE2B a2a88b4d071685301fcf071f676eac814ab21ce4dcdcd9af7ced5ea2e595d0335f73a36011393fa7c54ae26d60486d9b4319d2e197bee79adda79c6158b1a0d5 SHA512 b9b1b2e4b231d2a4beb63a6e757467ec0d32bfc9005dd990d7649cc6ac9c34d106b0b15bc3918490ef4ded81699e5d84161b3a1d8541aa6232ba485124b65386
 AUX konversation-1.7.5-qt-5.15.patch 814 BLAKE2B 3c5ddf41f0dc05244b69546616e7df2b98e2b51125954f7c5c9a75aaae750ee45a8a3fc3175dea6e0c171c4ee06d43002fdbcd6d08fc8e1bd9e316c25774ca4c SHA512 056a3d6c17b04734e446b623b88dfa9fd4a90133c251b427460f5c6f3f85a52ad46abe92b055e8a5eb86f433f67e4645f9999d6124d3343466b741d99c11b076
 AUX konversation-1.7.5-unused-kemoticons.patch 3192 BLAKE2B b1882f31639e17e2927ca7b7eecde12511a122ca6ebcc8fc2ab70cd38b28f973ba07e043aeed16dd029281b3c413515df707120c964105257960d23feee24e1f SHA512 3158d47aad3920715bd9dc010585e4a2e7488872a24cac8f69bff8ebafc4445d54611756ad05399d8bbd1b4be37fb28d8566577fbc040559fdad3ab18927e3df
+AUX konversation-1.7.6-no-kiconthemes.patch 13035 BLAKE2B a8f15af27cb86f8f8de3b4539de4bba891bf8434e8e1cc3941b11778b3ba35967afd05aa404d9f72888d9477321e45d0f34f7157c4236faf652f1026d8a55d4a SHA512 5a3fefb32f98a87b5c1d6272750c619318c28b650f0a334032b2454fb4aa77b24cc81b7b1161ad54f046b979edcb665e6fa4e5f1d303f9c1e39005efacef730e
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
 DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
+DIST konversation-1.7.6.tar.xz 3354800 BLAKE2B cad571f5d55e030de0d8610417d7c2473f9d3f0b81cfc2c8f730324d73ef0eee17e2f11a6d5714ff541170fa3eab6f4eaa3ecde117a65e9af143e13c1e8afd66 SHA512 69c4b67a186f4242c74e2027d1faca6be7a30719287b960888751a5522da5abe24c6ada076bb097233cf0254c5cff12cc70c9a7a85875f80c0eb1637c6de6613
 EBUILD konversation-1.7.5-r2.ebuild 2270 BLAKE2B 32af7e63e381ecc1dced71e185fcde58c40b04a441df6f6cbc9b0d03502221f1dab4cc634f3dc1eabc9e57748655a4028dcc6e24a91a2aac39a926fa703a081d SHA512 07217bc16ffb0b54adff8ff8d8adda619a1b57ece9b6033caa4200afebbacf49f1e3c5a0ea0ffd5c1440d2f44dd2eeff70dd7e5e58e68596224d17bb8d576aa1
+EBUILD konversation-1.7.6.ebuild 2011 BLAKE2B 423b14d9e78ca566f3b990c37d66bd345ef9cfe13deaaf217d5702e61b0916a8eb9d9ea92f4da1086d489491c5f07e99c34a8eaa9e78b99870e25fdb52880633 SHA512 70eb988b22b44f297e9f1895020612a0a1c7b77cc0776abca0925e4e5a2000a6f1e1e07c8e58184621b0092ebbab6ca30efabe824ece6c2dfaaef5b2fe27abc8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch b/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch
new file mode 100644
index 000000000000..f631a9493483
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch
@@ -0,0 +1,347 @@
+From 2104a776203d32b49512b303506f94085e0e4d89 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sat, 19 Sep 2020 22:50:48 +0200
+Subject: [PATCH] Port away from KIconthemes
+
+Use appropriate QIcon/QStyle API instead
+
+Incorporates:
+
+commit 5cd6c690e005a040e5fd3ccfca7ae23593c6dfe6
+Author: Nicolas Fella <nicolas.fella@gmx.de>
+Date:   Sat Sep 19 22:50:48 2020 +0200
+Subject: Remove unneeded system tray icon update
+
+  The system tray icon is specified by name.
+  We don't need to do anything when the theme changes.
+
+commit d1bce09605c255f7b96fa677ece363b3053d085e
+Author: Peter Simonsson <peter.simonsson@gmail.com>
+Date:   Tue Oct 22 21:35:25 2019 +0200
+Subject: Don't use deprecated SmallIcon
+
+---
+ CMakeLists.txt                |  1 -
+ src/CMakeLists.txt            |  1 -
+ src/dcc/recipientdialog.cpp   |  5 ++---
+ src/dcc/transferlistmodel.cpp | 25 ++++---------------------
+ src/dcc/transferlistmodel.h   |  3 +--
+ src/irc/channel.cpp           |  4 ++--
+ src/irc/nicksonline.cpp       |  1 -
+ src/irc/query.cpp             |  4 ++--
+ src/mainwindow.cpp            |  2 --
+ src/statusbar.cpp             |  4 ++--
+ src/viewer/ircview.cpp        |  5 ++---
+ src/viewer/ircviewbox.cpp     |  1 -
+ src/viewer/topiclabel.cpp     |  6 ++----
+ src/viewer/viewcontainer.cpp  |  4 +---
+ 14 files changed, 18 insertions(+), 48 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f0cd4b4f..3a1f5274 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,7 +37,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+     DBusAddons
+     Notifications
+     WindowSystem
+-    IconThemes
+     ItemViews
+ )
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 04f28971..36de36b0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -238,7 +238,6 @@ target_link_libraries(konversation
+     KF5::CoreAddons
+     KF5::Notifications
+     KF5::WindowSystem
+-    KF5::IconThemes
+     KF5::ItemViews
+     Phonon::phonon4qt5)
+ 
+diff --git a/src/dcc/recipientdialog.cpp b/src/dcc/recipientdialog.cpp
+index 3e6eeae7..e81e91ea 100644
+--- a/src/dcc/recipientdialog.cpp
++++ b/src/dcc/recipientdialog.cpp
+@@ -28,7 +28,6 @@
+ #include <KLineEdit>
+ #include <KSharedConfig>
+ #include <KWindowConfig>
+-#include <KIconLoader>
+ 
+ namespace Konversation
+ {
+@@ -64,12 +63,12 @@ namespace Konversation
+             dialogLayout->addWidget(buttonBox);
+             QPushButton* button = buttonBox->addButton(QDialogButtonBox::Ok);
+             button->setToolTip(i18n("Select nickname and close the window"));
+-            button->setIcon(SmallIcon("dialog-ok"));
++            button->setIcon(QIcon::fromTheme("dialog-ok"));
+             button->setShortcut(Qt::CTRL | Qt::Key_Return);
+             button->setDefault(true);
+             button = buttonBox->addButton(QDialogButtonBox::Cancel);
+             button->setToolTip(i18n("Close the window without changes"));
+-            button->setIcon(SmallIcon("dialog-cancel"));
++            button->setIcon(QIcon::fromTheme("dialog-cancel"));
+ 
+             KWindowConfig::restoreWindowSize(windowHandle(), KConfigGroup(KSharedConfig::openConfig(), "DCCRecipientDialog"));
+ 
+diff --git a/src/dcc/transferlistmodel.cpp b/src/dcc/transferlistmodel.cpp
+index cc1763f9..2a7e3b15 100644
+--- a/src/dcc/transferlistmodel.cpp
++++ b/src/dcc/transferlistmodel.cpp
+@@ -21,7 +21,6 @@
+ #include <KCategorizedSortFilterProxyModel>
+ #include <KLocalizedString>
+ #include <KCategoryDrawer>
+-#include <KIconLoader>
+ 
+ namespace Konversation
+ {
+@@ -313,15 +312,11 @@ namespace Konversation
+                     {
+                         case TransferHeaderData::Status:
+                         {
+-                            QVariant decoration(QVariant::Pixmap);
+-                            decoration.setValue<QPixmap>(getStatusIcon(transfer->getStatus()));
+-                            return decoration;
++                            return getStatusIcon(transfer->getStatus());
+                         }
+                         case TransferHeaderData::TypeIcon:
+                         {
+-                            QVariant decoration(QVariant::Pixmap);
+-                            decoration.setValue<QPixmap>(getTypeIcon(transfer->getType()));
+-                            return decoration;
++                            return transfer->getType() == Transfer::Send ? QIcon::fromTheme("arrow-up") : QIcon::fromTheme("arrow-down");
+                         }
+                         default:
+                             return QVariant();
+@@ -384,19 +379,7 @@ namespace Konversation
+             }
+         }
+ 
+-        QPixmap TransferListModel::getTypeIcon(Transfer::Type type) const
+-        {
+-            if (type == Transfer::Send)
+-            {
+-                return KIconLoader::global()->loadIcon("arrow-up", KIconLoader::Small);
+-            }
+-            else
+-            {
+-                return KIconLoader::global()->loadIcon("arrow-down", KIconLoader::Small);
+-            }
+-        }
+-
+-        QPixmap TransferListModel::getStatusIcon(Transfer::Status status) const
++        QIcon TransferListModel::getStatusIcon(Transfer::Status status) const
+         {
+             QString icon;
+             switch (status)
+@@ -422,7 +405,7 @@ namespace Konversation
+                 default:
+                 break;
+             }
+-            return KIconLoader::global()->loadIcon(icon, KIconLoader::Small);
++            return QIcon::fromTheme(icon);
+         }
+ 
+         QString TransferListModel::getSpeedPrettyText (transferspeed_t speed)
+diff --git a/src/dcc/transferlistmodel.h b/src/dcc/transferlistmodel.h
+index 3a8a945c..b8bc0d25 100644
+--- a/src/dcc/transferlistmodel.h
++++ b/src/dcc/transferlistmodel.h
+@@ -164,8 +164,7 @@ namespace Konversation
+             inline QString getPositionPrettyText(KIO::fileoffset_t position,
+                                                  KIO::filesize_t filesize) const;
+             inline QString getSenderAddressPrettyText(Transfer *transfer) const;
+-            inline QPixmap getStatusIcon(Transfer::Status status) const;
+-            inline QPixmap getTypeIcon(Transfer::Type type) const;
++            inline QIcon getStatusIcon(Transfer::Status status) const;
+             inline QString getStatusDescription(Transfer::Status status, Transfer::Type type, const QString& errorMessage = QString()) const;
+ 
+             QList<TransferItemData> m_transferList;
+diff --git a/src/irc/channel.cpp b/src/irc/channel.cpp
+index 6488a0c1..595d0adc 100644
+--- a/src/irc/channel.cpp
++++ b/src/irc/channel.cpp
+@@ -38,7 +38,6 @@
+ #include <KLineEdit>
+ #include <KPasswordDialog>
+ #include <KMessageBox>
+-#include <KIconLoader>
+ #include <KComboBox>
+ 
+ #define DELAYED_SORT_TRIGGER    10
+@@ -237,7 +236,8 @@ Channel::Channel(QWidget* parent, const QString& _name) : ChatWindow(parent)
+     awayLabel->hide();
+     cipherLabel = new QLabel(commandLineBox);
+     cipherLabel->hide();
+-    cipherLabel->setPixmap(KIconLoader::global()->loadIcon(QStringLiteral("document-encrypt"), KIconLoader::Toolbar));
++    const int toolBarIconSize = cipherLabel->style()->pixelMetric(QStyle::PixelMetric::PM_ToolBarIconSize);
++    cipherLabel->setPixmap(QIcon::fromTheme(QStringLiteral("document-encrypt")).pixmap(toolBarIconSize));
+     m_inputBar = new IRCInput(commandLineBox);
+ 
+     commandLineLayout->addWidget(nicknameCombobox);
+diff --git a/src/irc/nicksonline.cpp b/src/irc/nicksonline.cpp
+index e23deab4..bb4cf00e 100644
+--- a/src/irc/nicksonline.cpp
++++ b/src/irc/nicksonline.cpp
+@@ -31,7 +31,6 @@
+ #include <QToolTip>
+ #include <QTreeWidget>
+ 
+-#include <KIconLoader>
+ #include <KToolBar>
+ 
+ 
+diff --git a/src/irc/query.cpp b/src/irc/query.cpp
+index 8c1845e6..56310642 100644
+--- a/src/irc/query.cpp
++++ b/src/irc/query.cpp
+@@ -25,7 +25,6 @@
+ 
+ #include <QSplitter>
+ 
+-#include <KIconLoader>
+ #include <KMessageBox>
+ #include <KSqueezedTextLabel>
+ 
+@@ -75,7 +74,8 @@ Query::Query(QWidget* parent, const QString& _name) : ChatWindow(parent)
+     blowfishLabel = new QLabel(inputBox);
+     inputBoxLayout->addWidget(blowfishLabel);
+     blowfishLabel->hide();
+-    blowfishLabel->setPixmap(KIconLoader::global()->loadIcon(QStringLiteral("document-encrypt"), KIconLoader::Toolbar));
++    const int toolBarIconSize = blowfishLabel->style()->pixelMetric(QStyle::PixelMetric::PM_ToolBarIconSize);
++    blowfishLabel->setPixmap(QIcon::fromTheme(QStringLiteral("document-encrypt")).pixmap(toolBarIconSize));
+     m_inputBar=new IRCInput(inputBox);
+     inputBoxLayout->addWidget(m_inputBar);
+ 
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
+index 40423d29..a876de30 100644
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -49,7 +49,6 @@
+ #include <KActionMenu>
+ #include <KNotifyConfigWidget>
+ #include <KGlobalAccel>
+-#include <KIconLoader>
+ 
+ MainWindow::MainWindow() : KXmlGuiWindow(0)
+ {
+@@ -743,7 +742,6 @@ void MainWindow::updateTrayIcon()
+             // set up system tray
+             m_trayIcon = new Konversation::TrayIcon(this);
+             connect(this, SIGNAL(endNotification()), m_trayIcon, SLOT(endNotification()));
+-            connect(KIconLoader::global(), SIGNAL(iconChanged(int)), m_trayIcon, SLOT(updateAppearance()));
+             QMenu *trayMenu = qobject_cast<QMenu*>(m_trayIcon->contextMenu());
+             trayMenu->addAction(actionCollection()->action(QLatin1String(KStandardAction::name(KStandardAction::Preferences))));
+             trayMenu->addAction(actionCollection()->action(QLatin1String(KStandardAction::name(KStandardAction::ConfigureNotifications))));
+diff --git a/src/statusbar.cpp b/src/statusbar.cpp
+index 07a22fc6..e0efb02f 100644
+--- a/src/statusbar.cpp
++++ b/src/statusbar.cpp
+@@ -19,7 +19,6 @@
+ #include <KLocalizedString>
+ #include <QStatusBar>
+ #include <KSqueezedTextLabel>
+-#include <KIconLoader>
+ 
+ namespace Konversation
+ {
+@@ -52,7 +51,8 @@ namespace Konversation
+ 
+         m_sslLabel = new SSLLabel(m_window->statusBar());
+         m_sslLabel->setObjectName(QStringLiteral("sslLabel"));
+-        m_sslLabel->setPixmap(SmallIcon(QStringLiteral("security-high")));
++        const int smallIconSize = m_sslLabel->style()->pixelMetric(QStyle::PixelMetric::PM_SmallIconSize);
++        m_sslLabel->setPixmap(QIcon::fromTheme(QStringLiteral("security-high")).pixmap(smallIconSize));
+         m_sslLabel->hide();
+         m_sslLabel->setWhatsThis(i18n("All communication with the server is encrypted.  This makes it harder for someone to listen in on your communications."));
+ 
+diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp
+index 73f5305f..86bbc3ae 100644
+--- a/src/viewer/ircview.cpp
++++ b/src/viewer/ircview.cpp
+@@ -30,9 +30,7 @@
+ #include <QTextDocumentFragment>
+ #include <QMimeData>
+ 
+-#include <KIconLoader>
+ #include <KStandardShortcut>
+-#include <kio/pixmaploader.h>
+ #include <KUrlMimeData>
+ #include <QLocale>
+ 
+@@ -2000,7 +1998,8 @@ void IRCView::mouseMoveEvent(QMouseEvent* ev)
+ 
+         drag->setMimeData(mimeData);
+ 
+-        QPixmap pixmap = KIO::pixmapForUrl(url, 0, KIconLoader::Desktop, KIconLoader::SizeMedium);
++        const QString iconName = KIO::iconNameForUrl(url);
++        const QPixmap pixmap = QIcon::fromTheme(iconName).pixmap(32);
+         drag->setPixmap(pixmap);
+ 
+         drag->exec();
+diff --git a/src/viewer/ircviewbox.cpp b/src/viewer/ircviewbox.cpp
+index 463c9fd3..6c10d976 100644
+--- a/src/viewer/ircviewbox.cpp
++++ b/src/viewer/ircviewbox.cpp
+@@ -14,7 +14,6 @@
+ #include "ircview.h"
+ #include "searchbar.h"
+ 
+-#include <KIconLoader>
+ #include <QPixmap>
+ #include <QVBoxLayout>
+ 
+diff --git a/src/viewer/topiclabel.cpp b/src/viewer/topiclabel.cpp
+index 6a8b4331..c96edc6e 100644
+--- a/src/viewer/topiclabel.cpp
++++ b/src/viewer/topiclabel.cpp
+@@ -20,9 +20,6 @@
+ #include <QTextDocument>
+ #include <QMimeData>
+ 
+-#include <KIconLoader>
+-#include <kio/pixmaploader.h>
+-
+ namespace Konversation
+ {
+     TopicLabel::TopicLabel(QWidget *parent, const char *name)
+@@ -181,7 +178,8 @@ namespace Konversation
+ 
+             drag->setMimeData(mimeData);
+ 
+-            QPixmap pixmap = KIO::pixmapForUrl(url, 0, KIconLoader::Desktop, KIconLoader::SizeMedium);
++            const QString iconName = KIO::iconNameForUrl(url);
++            const QPixmap pixmap = QIcon::fromTheme(iconName).pixmap(32);
+             drag->setPixmap(pixmap);
+ 
+             drag->exec();
+diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp
+index 94d498ea..fd7be5bc 100644
+--- a/src/viewer/viewcontainer.cpp
++++ b/src/viewer/viewcontainer.cpp
+@@ -52,8 +52,6 @@
+ #include <KToggleAction>
+ #include <KSelectAction>
+ #include <KWindowSystem>
+-#include <KIconLoader>
+-
+ 
+ using namespace Konversation;
+ 
+@@ -241,7 +239,7 @@ void ViewContainer::setupTabWidget()
+     m_vbox->hide();
+ 
+     QToolButton* closeBtn = new QToolButton(m_tabWidget);
+-    closeBtn->setIcon(SmallIcon("tab-close"));
++    closeBtn->setIcon(QIcon::fromTheme("tab-close"));
+     closeBtn->adjustSize();
+     m_tabWidget->setCornerWidget(closeBtn, Qt::BottomRightCorner);
+     connect(closeBtn, SIGNAL(clicked()), this, SLOT(closeCurrentView()));
+-- 
+2.28.0
+
diff --git a/net-irc/konversation/konversation-1.7.6.ebuild b/net-irc/konversation/konversation-1.7.6.ebuild
new file mode 100644
index 000000000000..f088c5bfd39d
--- /dev/null
+++ b/net-irc/konversation/konversation-1.7.6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.70.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="User friendly IRC Client"
+HOMEPAGE="https://konversation.kde.org"
+SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+crypt"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=media-libs/phonon-4.11.0
+	crypt? ( >=app-crypt/qca-2.3.0:2 )
+"
+RDEPEND="${DEPEND}
+	crypt? ( >=app-crypt/qca-2.3.0:2[ssl] )
+"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}"/${PN}-1.7.5-kf5bookmarks-5.69.patch
+	"${FILESDIR}"/${PN}-1.7.5-unused-kemoticons.patch
+	"${FILESDIR}"/${P}-no-kiconthemes.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package crypt Qca-qt5)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# Bug 616162
+	insinto /etc/xdg
+	doins "${FILESDIR}"/konversationrc
+}
diff --git a/net-irc/nebula/Manifest b/net-irc/nebula/Manifest
deleted file mode 100644
index dd8f56c18e93..000000000000
--- a/net-irc/nebula/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nebula-0.5.tar.gz 115950 BLAKE2B f2765ecfaaad726b9535f1d7d1caab0f3c4c7a825747ddde408e93f83f041797904120499ebd78d7ed45ba962448bf7406896656fc128cea68e6af008b92a054 SHA512 ae97aae4e878b6a20343ac3b8be235367cbce990e2858a59220f477cd8f57b4aad28527454c6dca1f509675b4a48b5f8ace06c3f867b1e0458126f418911ef83
-EBUILD nebula-0.5.ebuild 408 BLAKE2B d0bc8879016585758a8ed9706453ab29443f4746e3c7cb048313647aae3c58f320555eddf21158e64bdb4d0728aea46c18b6799f15bb1e63a996a9ca5d6aadd1 SHA512 41a5c70fc89158ef638c0a8bd8ab7650017d3c747ce0f1bfd88aa5fa111985b97c1ffe5f4d3445f908064cffdac3835cc1407c929a59a8dde8dfc196265de28b
-MISC metadata.xml 627 BLAKE2B c6a32b419e69d5943337590a6586973d9700740414ea0d23ac1ec94a4c2c98528957260f1d4b48d97951fa618947f0c2af94d821ee269d7e3ad9496d04f2cab9 SHA512 ce422588d7c22186e53a7b120f5334301b15fed9508e9a81682c92f7298c03d91e66b062d7a18a1b28dffa27113cef99198f8664e3414fe86b9b90ad9e8289b3
diff --git a/net-irc/nebula/metadata.xml b/net-irc/nebula/metadata.xml
deleted file mode 100644
index 93de494624ab..000000000000
--- a/net-irc/nebula/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-Nebula aims to be a graphical IRC client, aimed at the unix and compatible platforms and using the motif/openmotif or the lesstif ToolKit.
-The goals are
-- portability to various unix systems (planned are already Linux, *BSD, Solaris, Irix and AIX)
-- small footprint and low system resource usage
-- speed
-- clear, non intrusive GUI
-- security
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">nebula-irc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-irc/nebula/nebula-0.5.ebuild b/net-irc/nebula/nebula-0.5.ebuild
deleted file mode 100644
index 94f2f3fc71f4..000000000000
--- a/net-irc/nebula/nebula-0.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="An IRC client for X11 and Motif"
-HOMEPAGE="http://nebula-irc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-irc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=x11-libs/motif-2.3:0"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/net-irc/ptlink-ircd/Manifest b/net-irc/ptlink-ircd/Manifest
deleted file mode 100644
index 4327f1e9ac6e..000000000000
--- a/net-irc/ptlink-ircd/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ptlink-ircd.confd 167 BLAKE2B 76b7be82695bc94e17dadcfacbf77eaf7f4e30aeeceea537da849094295f6d86234a4bce51ff3d56d08176136e8794aa906417f723c8eee5d53c07d3bc05a681 SHA512 21059ef835fc56e4c8d2780dcc94abbb4951d6a10b89aa1d27cb702489ab1ac398f0928f63392f45e7b0b27949a59f07e9c0c280ef42abededc65749fc5f68e6
-AUX ptlink-ircd.initd 505 BLAKE2B 2820f478cbffed9d3c362c0dcbcf115baa5849a4fd05718953ff231b0368f7a7e9bee04b09219c450e7fba0ba9eadca53850e154b28646b3eea14e6a4999b241 SHA512 c1d9848181c9c91024b6e54e242b200b9eaee0823f5e39deb3ab0e5cbcafa16de03085c4a13a0a574886b14711feebcbcda96deebeb9b70dab0aacb0342b0472
-DIST PTlink6.19.6.tar.gz 799388 BLAKE2B 709f07f8af79aeb844609556de2f81d38c8e56df0ec5d8a9d568f162ae6347d914677fc3fa3cee7bb27b14e14d284111dd88e320fb31891042adbe65ddd8d4f6 SHA512 5036efc429d8c5dbb5076cc690221b9409990bfe71a710bf6f8ce60e8779ff8f55e695c1fc1ca56435928d416bc1907c91105cf533538dafeea4344cd038d4d5
-EBUILD ptlink-ircd-6.19.6-r3.ebuild 2336 BLAKE2B 7f4f1a203394f60e4eaf9fcf2f53d75aba295caa4156c9fccdf2ff7daa11ec7102ede8ecd07e531e574794aecc997ff7ae0c9271b6e3fd57a3a9dadc12ff8632 SHA512 cf1925bc25b5122ad8537d27d43fb9adf1fe0da07ea0ddc36cbd045a3fd77af0351bc67dbe8ae2e8785647e95960a8b6c4216513f17a5483064787248c38f597
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/ptlink-ircd/files/ptlink-ircd.confd b/net-irc/ptlink-ircd/files/ptlink-ircd.confd
deleted file mode 100644
index a14466cc412b..000000000000
--- a/net-irc/ptlink-ircd/files/ptlink-ircd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# User to run ptlink-ircd as
-PTLINKIRCD_USER="ptlink-ircd"
diff --git a/net-irc/ptlink-ircd/files/ptlink-ircd.initd b/net-irc/ptlink-ircd/files/ptlink-ircd.initd
deleted file mode 100644
index 5b7c1f441d7e..000000000000
--- a/net-irc/ptlink-ircd/files/ptlink-ircd.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use dns
-	provide ircd
-}
-
-start() {
-	ebegin "Starting ptlink-ircd"
-	start-stop-daemon --start --quiet --exec /usr/bin/ptlink-ircd \
-		--chuid ${PTLINKIRCD_USER} -- -l /var/lib/ptlink-ircd \
-		-e /etc/ptlink-ircd >/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Shutting down ptlink-ircd"
-	start-stop-daemon --stop --pidfile /var/lib/ptlink-ircd/ircd.pid
-	eend $?
-}
diff --git a/net-irc/ptlink-ircd/metadata.xml b/net-irc/ptlink-ircd/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-irc/ptlink-ircd/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r3.ebuild b/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r3.ebuild
deleted file mode 100644
index b608a84138e2..000000000000
--- a/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ssl-cert user vcs-clean
-
-MY_P="PTlink${PV}"
-
-DESCRIPTION="Secure IRC daemon with many advanced features"
-HOMEPAGE="http://www.ptlink.net/"
-SRC_URI="ftp://ftp.sunsite.dk/projects/ptlink/ircd/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
-IUSE="ssl"
-
-DEPEND="
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl:0= )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	ecvs_clean
-
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-ipv6 \
-		$(use_with ssl ssl openssl)
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	newbin src/ircd ptlink-ircd
-	newbin tools/fixklines ptlink-ircd-fixklines
-	newbin tools/mkpasswd ptlink-ircd-mkpasswd
-
-	insinto /etc/ptlink-ircd
-	fperms 700 /etc/ptlink-ircd
-	doins samples/{kline.conf,{opers,ptlink}.motd,help.{admin,oper,user}}
-	newins samples/example.conf.short ircd.conf
-	newins samples/example.conf.trillian ircd.conf.trillian
-	newins samples/main.dconf.sample main.dconf
-	newins samples/network.dconf.sample network.dconf
-
-	insinto /usr/share/ptlink-ircd/codepage
-	doins src/codepage/*.enc
-	dosym /usr/share/ptlink-ircd/codepage /etc/ptlink-ircd/codepage
-
-	rm -rf doc/old
-	dodoc doc/* doc_hybrid6/* ircdcron/* CHANGES README
-
-	keepdir /var/log/ptlink-ircd /var/lib/ptlink-ircd
-	dosym /var/log/ptlink-ircd /var/lib/ptlink-ircd/log
-
-	newinitd "${FILESDIR}/ptlink-ircd.initd" ptlink-ircd
-	newconfd "${FILESDIR}/ptlink-ircd.confd" ptlink-ircd
-}
-
-pkg_postinst() {
-	# Move docert from src_install() to install_cert for bug #201678
-	use ssl && (
-		if [[ ! -f "${ROOT}"/etc/ptlink-ircd/server.key.pem ]]; then
-			install_cert /etc/ptlink-ircd/server || die "install_cert failed"
-			mv "${ROOT}"/etc/ptlink-ircd/server.{crt,cert.pem}
-			mv "${ROOT}"/etc/ptlink-ircd/server.{csr,req.pem}
-			mv "${ROOT}"/etc/ptlink-ircd/server.key{,.pem}
-		fi
-	)
-
-	enewuser ptlink-ircd
-
-	chown ptlink-ircd \
-		"${ROOT}"/{etc,var/{log,lib}}/ptlink-ircd \
-		"${ROOT}"/etc/ptlink-ircd/server.key.pem
-
-	echo
-	elog "PTlink IRCd will run without configuration, although this is strongly"
-	elog "advised against."
-	echo
-	elog "You can find example cron script ircd.cron here:"
-	elog "   /usr/share/doc/${PF}"
-	echo
-	elog "You can also use /etc/init.d/ptlink-ircd to start at boot"
-	echo
-}
diff --git a/net-irc/ptlink-opm/Manifest b/net-irc/ptlink-opm/Manifest
deleted file mode 100644
index a42a54904e38..000000000000
--- a/net-irc/ptlink-opm/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ptlink-opm-1.3.1-fno-common.patch 292 BLAKE2B 318a0e991bd634dec7efda3b41b3c47f4cb1c57f2175778fae2ec0ca0016cb0419764d673ca4e02360066fb30bc5206fa3afa59e4a99eaf8fe3af7f0a0584053 SHA512 c474cbc1963ec78c1ccac32d3947daa6cc37c522fde329bcfe9efb0f7510815881fbec2cd4e9c51424dcae2a0556acacf7cc65e35d84d60f0f963ddd0f02da17
-AUX ptlink-opm.conf.d 164 BLAKE2B e7a3faec359c78cb13c8a1c05383586a79d615a9ada1f6ca9e12c1ad61870cfc4d9098f5a6462c826d23fa9c81f8587ad5c490f5ab071e0a9ae7cb8a605347b9 SHA512 a0fd7fca178cc1b8416c7f08d0d86e756c84bfed8256b77051a05d3a1aed95406c4eb759438b50a05cf81b4e3755b606265e2fb1cb2d1edf92b442a1aebc2f4a
-AUX ptlink-opm.init.d 428 BLAKE2B af23dd6900040472e8d06ace9de5e05716ac5e53825cb12fe38e18f95f47a6b401d865e0fbac49161579dcd33fe5daaa65e8f66ac340ea0b711fcd05a231b202 SHA512 411034db9dec378ddfe2692fb85eba1fc6f2124fd9dd4ec79224dcd3cf6219748e6dfd43151a99f86978f8eb577cb304f1fde6b7b835156d9dee7c22ce3ece6d
-DIST PTlink.OPM1.3.1.tar.gz 156068 BLAKE2B 2b74391e5dc45ef3a9e37b4390b0a39e61c8f041bfcb549cf9951cb216975e6b398b31a9fe1d8932bac732ad70c65595d6154157c010d330e3a7d77f2d2a50e6 SHA512 1a8955486db8c1a318dda1b7bfdaf1be9f55d68a5acafde37a5f15e80e21b8d45c51138efb9d5ca1d1fad9f46d0ccdc4b91cf9128ba2ca7086f1c0925a36a141
-EBUILD ptlink-opm-1.3.1-r1.ebuild 979 BLAKE2B 1f0718facdbdaae3ae8d14a3a0005064519f098c531112f68c651be6f53a3c209e2bca1e8f488a725ad4e73b067935f4c1619e077a199927d7b7c225fc1d6ccd SHA512 6f23f03b8149135a86fdaeda853f4cf2a870878f7c747b4532331c2fc643ed1168fbc189301aa4b00411f6e762b42df832faa442d52569ddd386065b5a68dda8
-EBUILD ptlink-opm-1.3.1-r2.ebuild 1009 BLAKE2B 82b320667cbf1faa3488792d06ea545ce417a2c7d1850f5c9076ea1dbee94786b300a4e02f66b296c3b6a15b753ee7edb3b58df4be72272647c68e8b10878161 SHA512 e83336ff0c9009e90524dddcbdd357fd188320434ae7885b86600f56ee53beaad6d99ea05bf97715f5c0c3ae6242d85810bb601034231f513caa7ecbc25e5b6e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/ptlink-opm/files/ptlink-opm-1.3.1-fno-common.patch b/net-irc/ptlink-opm/files/ptlink-opm-1.3.1-fno-common.patch
deleted file mode 100644
index 6d4aaacb8a38..000000000000
--- a/net-irc/ptlink-opm/files/ptlink-opm-1.3.1-fno-common.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Three of these are not like the others
-
---- a/include/dconf_vars.h
-+++ b/include/dconf_vars.h
-@@ -42,9 +42,9 @@
- E char*     DNSBLZoneMsg;
- 
- /* PT */
--char *PT_Nick;
--char *PT_Mask;
--char *PT_Info;
-+E char *PT_Nick;
-+E char *PT_Mask;
-+E char *PT_Info;
- #undef E
- 
- #endif /* conf_vars_h_ */
diff --git a/net-irc/ptlink-opm/files/ptlink-opm.conf.d b/net-irc/ptlink-opm/files/ptlink-opm.conf.d
deleted file mode 100644
index 939c3cb518e6..000000000000
--- a/net-irc/ptlink-opm/files/ptlink-opm.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# User to run ptlink-opm as
-PTLINKOPM_USER="ptlink-opm"
diff --git a/net-irc/ptlink-opm/files/ptlink-opm.init.d b/net-irc/ptlink-opm/files/ptlink-opm.init.d
deleted file mode 100644
index 70e0f0970c14..000000000000
--- a/net-irc/ptlink-opm/files/ptlink-opm.init.d
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use dns ircd
-}
-
-start() {
-	ebegin "Starting ptlink-opm"
-	start-stop-daemon --start --quiet --exec /usr/bin/ptlink-opm \
-		--chuid ${PTLINKOPM_USER} >/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Shutting down ptlink-opm"
-	start-stop-daemon --stop --exec /usr/bin/ptlink-opm
-	eend $?
-}
diff --git a/net-irc/ptlink-opm/metadata.xml b/net-irc/ptlink-opm/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-irc/ptlink-opm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild b/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild
deleted file mode 100644
index 7ad9abad1cc4..000000000000
--- a/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.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 eutils user
-
-MY_P="PTlink.OPM${PV}"
-
-DESCRIPTION="PTlink Open Proxy Monitor"
-HOMEPAGE="http://www.ptlink.net/"
-SRC_URI="ftp://ftp.sunsite.dk/projects/ptlink/ptopm/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/ptlink-opm \
-		--localstatedir=/var/lib/ptlink-opm
-}
-
-src_install() {
-	newbin src/ptopm ptlink-opm
-
-	insinto /etc/ptlink-opm
-	newins samples/ptopm.dconf.sample ptopm.dconf
-	doins samples/scan_rules.dconf
-
-	keepdir /var/{lib,log}/ptlink-opm
-	dosym /var/log/ptlink-opm /var/lib/ptlink-opm/log
-
-	dodoc CHANGES README
-
-	newinitd "${FILESDIR}"/ptlink-opm.init.d ptlink-opm
-	newconfd "${FILESDIR}"/ptlink-opm.conf.d ptlink-opm
-}
-
-pkg_postinst() {
-	enewuser ptlink-opm
-	chown ptlink-opm "${ROOT}"/var/{log,lib}/ptlink-opm
-}
diff --git a/net-irc/ptlink-opm/ptlink-opm-1.3.1-r2.ebuild b/net-irc/ptlink-opm/ptlink-opm-1.3.1-r2.ebuild
deleted file mode 100644
index b23d0aa8942e..000000000000
--- a/net-irc/ptlink-opm/ptlink-opm-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit user
-
-MY_P="PTlink.OPM${PV}"
-
-DESCRIPTION="PTlink Open Proxy Monitor"
-HOMEPAGE="http://www.ptlink.net/"
-SRC_URI="ftp://ftp.sunsite.dk/projects/ptlink/ptopm/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-DEPEND=">=sys-apps/sed-4"
-
-S=${WORKDIR}/${MY_P}
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.1-fno-common.patch
-)
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/ptlink-opm \
-		--localstatedir=/var/lib/ptlink-opm
-}
-
-src_install() {
-	newbin src/ptopm ptlink-opm
-
-	insinto /etc/ptlink-opm
-	newins samples/ptopm.dconf.sample ptopm.dconf
-	doins samples/scan_rules.dconf
-
-	keepdir /var/{lib,log}/ptlink-opm
-	dosym ../../log/ptlink-opm /var/lib/ptlink-opm/log
-
-	dodoc CHANGES README
-
-	newinitd "${FILESDIR}"/ptlink-opm.init.d ptlink-opm
-	newconfd "${FILESDIR}"/ptlink-opm.conf.d ptlink-opm
-}
-
-pkg_postinst() {
-	enewuser ptlink-opm
-	chown ptlink-opm "${ROOT}"/var/{log,lib}/ptlink-opm
-}
diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest
index c0d7b5ff31c3..9adde26ab3d3 100644
--- a/net-irc/quasselgrep/Manifest
+++ b/net-irc/quasselgrep/Manifest
@@ -1,3 +1,3 @@
-DIST quasselgrep-0_p20190211.tar.gz 29954 BLAKE2B 33862b642d6a24bd7ab8cc4f3628e19cf332feb24e0dba17849f4ee85af4d1d17a641e6ccaef89bcb44c47f28a674ab620610b8b624f9de71b8460b197953e27 SHA512 0d2bfccb87b7463ba032b9515c4a089518a3ca57f9ef6cbb0f00db9c5d0404cc9fe128329b12e1dbe022cbddeb6a3db473564ee734ddc30be56d4c1da5036f56
-EBUILD quasselgrep-0_p20190211.ebuild 897 BLAKE2B 818b7a0a43f1717e2087a7328830699409e0498c2232bce66cd1986776ae46590e3881230eb0d7d0010d046cb93cf7ed2bf343b41ca636d7d8d646b18e14b263 SHA512 cab300247c0947b78c09ccfd00edfcb65938bd07b9e8e8ad5b34c053d964d47dab7cb6f979d94efe98553b39a0c268990c1cdd058346c5dfc4aa5c2f510810ef
-MISC metadata.xml 337 BLAKE2B c37cb1554be7305dd495441947f001f72094595dea87cc7b1da483f6f57b40ca227ff0635ec594f3943384e0980a624418ed633de8f7c582458ec34e84f0212c SHA512 e17f17fadcbc243db54d9db5a49d9720feff4bfd92e3ea91526600e46bc6c96b3b79c1491146356287893ca71dfee73336d8c88b7e7047d8f5d41d3d1a5e6bf1
+DIST quasselgrep-0_p20200830.tar.gz 29944 BLAKE2B 011633afee9d9519b0c343c5d0b1a9ba775c870802532515a42a7c22d39af5138a051707a82f2b6a19dda3523fe9f04d2b56b62a36c554ff873275c095e7dd94 SHA512 88f568852cc9e85e0019335d3362f192766a2ce3e94ff1947485ad6eaf43d49873d94396791165f74e95edb25601c078a947a7740b4ae2e40424b5bdfecc2a48
+EBUILD quasselgrep-0_p20200830.ebuild 799 BLAKE2B 26852451da7296458ca30cdfa42099c517d6c02da118c4ed4c4abc67ab27da4e8c7877e82763a5a46c5605ddab821a317b297972f6c05e17f2a80e47e825864e SHA512 4532af1f925e6c5f3000440e21ec9ff0ba0249eaf56eddc8188759788018e6bfe17cc13433bd7fdfb2189c3feeaef55686d752ba9956a9ed9a3f40b0cd58e766
+MISC metadata.xml 538 BLAKE2B 8cbdcf099828e3b700badf7c8e7bbeb0ae54275025f7aae9688fd6eeb080c1a13b8335b710c70b218f589f3ccaf2381f126d2fcab052a5bebc8178717e197487 SHA512 7f2a8b3e829135593b687fd69b0d1d7ba4142c2b2b832e90ca56e64967ebbf67f8451711030bd59fe092ab3dc7d585e5868f74d15af4bb3e0954d69ccfb0a087
diff --git a/net-irc/quasselgrep/metadata.xml b/net-irc/quasselgrep/metadata.xml
index eb320bd71e29..8cdbffdc53bd 100644
--- a/net-irc/quasselgrep/metadata.xml
+++ b/net-irc/quasselgrep/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/fish-face/quasselgrep/issues</bugs-to>
 		<doc>https://github.com/fish-face/quasselgrep/blob/master/README.md</doc>
diff --git a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
deleted file mode 100644
index 0d8f12d972b9..000000000000
--- a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE=( sqlite )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Tool for searching quassel logs from the commandline"
-HOMEPAGE="https://github.com/fish-face/quasselgrep"
-
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/65278/quasselgrep.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_COMMIT=9b6b0bc1252daa6e574363d87d04eebd981215a5
-	SRC_URI="https://github.com/fish-face/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
-	S="${WORKDIR}/fish-face-${PN}-${MY_COMMIT:0:7}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
-	optfeature "access postgres db" dev-python/psycopg:2
-}
diff --git a/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild
new file mode 100644
index 000000000000..4ade54031303
--- /dev/null
+++ b/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE=( sqlite )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Tool for searching quassel logs from the commandline"
+HOMEPAGE="https://github.com/fish-face/quasselgrep"
+
+MY_COMMIT="9b6b0bc1252daa6e574363d87d04eebd981215a5"
+SRC_URI="https://github.com/fish-face/quasselgrep/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+	optfeature "access postgres db" dev-python/psycopg:2
+}
diff --git a/net-irc/xaric/Manifest b/net-irc/xaric/Manifest
deleted file mode 100644
index 5cec73395fab..000000000000
--- a/net-irc/xaric/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xaric-0.13.6-tinfo.patch 740 BLAKE2B fa63d104abdb8db87ca54cd12519fa3009e74f7a8771158f184b2490f521cd1f3b782de31e51d3e81166d20892adb8f3cf2e633cdb6a16a1b060b42903b53489 SHA512 bf74a17c714e38c84bdaefd2183928918c221e5bcbcf292ceb8427e719b148d0e0ebb7114d636ba42b0bcfc3a6a021613b4eb648c8d9ba137817f0700043b27a
-DIST xaric-0.13.6.tar.gz 479754 BLAKE2B f9fe9fd67b66f922a61be1e793b66af0d3b809f07fa48be6fd74b9f8cd59bb435df2545ef12ddbc36e3fbb57f3491ece4fb7ff939de738d8a87cdcb8cbb3a403 SHA512 1c52e30cfab49d82306cd0b4402175f68cfc411b7ef04156b2361fadeea01648476742015306a0c242c13f4ab29916e8ac48a59f481ecdb5475584ef6cdf028f
-EBUILD xaric-0.13.6.ebuild 569 BLAKE2B 864dfaa9d7f2581732cc517a9985287418fabc4d12dfe69819b8ffb3936fdf06f1a4e5316adbb9eb4afb2412a9fea46b322282058c96fc84563536e5c2297bc1 SHA512 e2c6ffda0686c392d64a8b1f22068822f5359762a99cbe9265ce9f59e4badb8a1ef6bd29cf1437cd33417be89690cb6aec23e7d8b139fbb9d7b2823be8e78e0f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/xaric/files/xaric-0.13.6-tinfo.patch b/net-irc/xaric/files/xaric-0.13.6-tinfo.patch
deleted file mode 100644
index 0fcfe3aa1846..000000000000
--- a/net-irc/xaric/files/xaric-0.13.6-tinfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -279,9 +279,10 @@
-   olibs="$LIBS"
-   AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $olibs",
-     AC_CHECK_LIB(termlib, tgetent, LIBS="-ltermlib $olibs",
--      AC_CHECK_LIB(curses, tgetent, LIBS="-lcurses $olibs",
--        AC_CHECK_LIB(xtermcap, tgetent, LIBS="-lxtermcap $olibs",
--          AC_MSG_ERROR([i can not find tgetent.  you need to help me])))))
-+      AC_CHECK_LIB(tinfo, tgetent, LIBS="-ltinfo $olibs",
-+        AC_CHECK_LIB(curses, tgetent, LIBS="-lcurses $olibs",
-+          AC_CHECK_LIB(xtermcap, tgetent, LIBS="-lxtermcap $olibs",
-+            AC_MSG_ERROR([i can not find tgetent.  you need to help me]))))))
- fi
- 
- dnl ----------------------------------------------------------
diff --git a/net-irc/xaric/metadata.xml b/net-irc/xaric/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-irc/xaric/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-irc/xaric/xaric-0.13.6.ebuild b/net-irc/xaric/xaric-0.13.6.ebuild
deleted file mode 100644
index 447c6e62ae29..000000000000
--- a/net-irc/xaric/xaric-0.13.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="An IRC client similar to ircII, BitchX, or ircII EPIC"
-HOMEPAGE="https://xaric.org/"
-SRC_URI="https://xaric.org/software/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses
-	dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	doicon xaric.xpm
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 23bb4da995ca..9b852e6dbc17 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 3682c2b465c9..b8fef70f76ed 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,10 +1,6 @@
-AUX grpc-1.21.0-fix-host-ar-handling.patch 1827 BLAKE2B f85c3c291f6a62b1b8edd4995bd3870ff8f7aac309d72842ab0e8a3bada377b049422e00d95e420b466fe64d2fe6e6ec44d87d0878805111e87cb2d603e909bd SHA512 2c54890e7c167359c2ff40541d3d071edf0775bcc14594c0ad132d17715bc75d2f9e946751f082dab0e9ff0ee73a9650f6bbd850bd34b2162254bec524d10493
-AUX grpc-1.22.0-cxx_arg_list_too_long_forloop.patch 1850 BLAKE2B b0a681c79bb4ee7cdb686718b4a789ef9aa63d342d5c2ae97beb648da7e1c393c5085def5594ec3361b50e79cf158fe3c557c6da1d979fa42e07fc482e683133 SHA512 3149797334f06b79fccb11ab9c4b18a5c5c4263ba36b01d3edb29981f562937fd3b4cf90ecc34188798da5ea6ae564a34161819e499b665425aadcd3995209e5
-AUX grpc-1.25.0-pkgconfig-libdir.patch 2199 BLAKE2B 4625e03eeeab9235fa1615bdfc485a5a0f0304ce4613b3f0ec0d0edf0d12d04d48a34fd30e680ff48bc1a7a7838d1b1b51ce58921a20472b5be0ad60dbce23e2 SHA512 93077a0cd6fd48694238b42fc60c2c986232ff863b09d068aac3f813733de5a7b4d3ac32929ad4e58e93e2990d5903cdf0b7491a0ea924402262d04b75fdb57a
-AUX grpc-1.3.0-Don-t-run-ldconfig.patch 1957 BLAKE2B 945ca98ffe0a55bd6e277d3c6d967014d77df8fdf7c708fa275e003df6fda5ce32206069a9a173c41f1d77d8eec38444190bdf15cdd5891142ec5d632bf9af8b SHA512 8e691f56cf6ac348d2516ffe022216fe92132c4266bdc55989238fca37ef3e4cb8c08f261ea41a3c4cd36b5e6dbd20122d75cff77a3924959b5e2e9302a494be
-DIST grpc-1.26-fix-odr-violation.patch.bz2 6320 BLAKE2B d7551a54c7a846cd8545a9cb0204e28f1d94b6a0a28b9093be1337127e76256c29e2ff9739ef1791740371d4b30520305c3c5908216030f4b23488c250248256 SHA512 c020eb40a3a494f8ef4a0ab6efc7a832c844c365d006a1d9512f0451af4ff33a11a185cd0ecd1afa0c546b190efcf8a0fef9e543f8fac35e65da10a2df34cd61
-DIST grpc-1.26.0.tar.gz 16673794 BLAKE2B f72d1997366e5e6e8b6b554149f90a187cbaea65da0070f4525739db38c053c6b280509f2faf2ec0e283ab9b7d000efda46b90b18143cd5ef8c1ec0881e00d3d SHA512 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb
+AUX use-pkg-config-to-find-re2.patch 730 BLAKE2B fb37a761c6aaf2ff00f3e9a6b791c58981ab9b5f16723a2057b83989fefc89496e9fa3d52260e221ba22142b7cd33d468fe4a63291308a0c7e8fcfbddfe3cdc7 SHA512 152ca478820d56065193cc47caedc00db17b069246f646546dc6e9ebb5d9023248ca6fc7a816bf2efd7a19e59309a1f0f6f4c508d80487b47e1e98734ecadf09
 DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 92d6f4a655183d34979c668bb7f4187a6670aa8ff5609df7b19fc7cadb57756fdc2322e57ef328623b1d91e63d8891ec0154ccef827c0302c14d986c6d9d179f SHA512 5cc4993470e2df21447d032ddeb65ab4175bb8acad5a06fdd22564068b80a5be255ef0e44d36732642d39dc3eaec02a93d2aaf6e369ad5dc43ff99b5023f357b
-EBUILD grpc-1.26.0-r1.ebuild 2685 BLAKE2B d2b51dc050788e587b9e0b631db41f0706cc1f0366b44bf5492fa6131fa8bac0866340cb60a6f83c7356e99a9faacc7174c49681a24bd8b3f0f38ac10c11c8c9 SHA512 95bde11e513f1ffe08969c8a50e8354ce41423fd08f7f659ba2024defe2311caa0878a7aebc1d421b77e1ae1ff48ed0e41b3df7aa42518765e20b5f31275d618
+DIST grpc-1.32.0.tar.gz 7174251 BLAKE2B 4ea1b2d6a92f71e0d3703b350778fa4ae78eaeefe4f9052b649abb42e3d5e02e0220695ce2ef52eaf4ecec4194d024bf1ce7a33d52594557c7cceec5b5a3c069 SHA512 90136042327cea4e3680e19484f23cc00322914a7aae7987bf00b6e0901721d14c487555fdd94888192d6beb950172361ac57fbd02d43b40552f7ff5cac442ed
 EBUILD grpc-1.28.1-r1.ebuild 1649 BLAKE2B feee01d962a31f7942b7673b9464f88542553ab8a4159cfac58e7158271979b13931d82cf19a7346d75b952637e16abc763904f4de239f44c4738ec67919c5b0 SHA512 533987b156f6dbd7f69c0eee45fd24de0f59ccd8babdcd0467d424137536a86afcb62584c3e6314e91f4e413c49f65faf9833f4940419b4bc5498016a0bc9e89
-MISC metadata.xml 630 BLAKE2B 1798e243492198d1a5df8cd8928ce592e243bdac8d68cf7089af016b0c7579d8e89ca90f81cda221a33d60f224d51e93b4cdb1464f8ed64cfefd3e1dccc695ef SHA512 f7c2aa3e76f18e30872d2ee9154290509b7d946d388bbf767505dfdb87dce9716b19cdbf53f2fc72dfcb79cc809b843b2660b6828682aa9f887cfba8c623fd93
+EBUILD grpc-1.32.0.ebuild 1992 BLAKE2B d2d96a96e7b15e260c293ccbf91f9d146c29c7ed7e8051fe56f25fa9a3d1dcbd822c07b3868428b6a0bac76ac06347fb02590526801ea18b41aec06e94119efe SHA512 a77974e64742d830f1c26050c287efdadc625679eb2a758959652ac209b6ccefc56a2cb58ac70f91f755de110255ce464ad2e0290682dd8da95cb5b6f4e6e9cb
+MISC metadata.xml 459 BLAKE2B e12d07ea4d2ecbaec9babc586e2417f1267067aff89d67debc7b4d5cd954bdffdd08f1cac4dbadbcde4dbdbc05147eea60f1dde419d207601bba123dfa59222f SHA512 f6c5483cf4bef3919ce69ca03d28cac0967b2b25d40a3c6d921764f8e451e191b60c5c769ab7554f536564b6b5bd4cb89abcac925d3a87779b0da10f94539bbe
diff --git a/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch
deleted file mode 100644
index 213a39a38438..000000000000
--- a/net-libs/grpc/files/grpc-1.21.0-fix-host-ar-handling.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 913486fddb5c2600f6ff83e549ee25e67579666f Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Wed, 22 May 2019 23:04:28 -0700
-Subject: [PATCH] Makefile: fix host ar handling
-
-picked lines from
-https://github.com/grpc/grpc/pull/11476
----
- Makefile | 236 ++++++++++++++++++++++++++++---------------------------
- 1 file changed, 119 insertions(+), 117 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 67495f2..e1c741c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -346,6 +346,7 @@ HOST_CC ?= $(CC)
- HOST_CXX ?= $(CXX)
- HOST_LD ?= $(LD)
- HOST_LDXX ?= $(LDXX)
-+HOST_AR ?= $(AR)
-
- CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
- CXXFLAGS += -std=c++11
-@@ -483,6 +484,7 @@ HOST_CFLAGS += $(CFLAGS)
- HOST_CXXFLAGS += $(CXXFLAGS)
- HOST_LDFLAGS += $(LDFLAGS)
- HOST_LDLIBS += $(LDLIBS)
-+HOST_AROPTS = $(AROPTS)
-
- # These are automatically computed variables.
- # There shouldn't be any need to change anything from now on.
-
-@@ -7381,11 +7383,11 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
-
- else
-
--$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
--	$(E) "[AR]      Creating $@"
-+$(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
-+	$(E) "[HOSTAR]  Creating $@"
- 	$(Q) mkdir -p `dirname $@`
- 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
--	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
-+	$(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS)
- ifeq ($(SYSTEM),Darwin)
- 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
- endif
diff --git a/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch b/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch
deleted file mode 100644
index 974d6fcc4351..000000000000
--- a/net-libs/grpc/files/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/Makefile	2018-06-26 11:07:45.948160976 +0200
-+++ b/Makefile	2019-06-26 11:04:25.798966336 +0200
-@@ -2820,13 +2820,15 @@
- 
- install-headers_c:
- 	$(E) "[INSTALL] Installing public C headers"
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) for h in $(PUBLIC_HEADERS_C); do \
-+	$(INSTALL) -D $$h $(prefix)/$$h ; \
-+	done
- 
- install-headers_cxx:
- 	$(E) "[INSTALL] Installing public C++ headers"
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) for h in $(PUBLIC_HEADERS_CXX); do \
-+	$(INSTALL) -D $$h $(prefix)/$$h ; \
-+	done
- 
- install-static: install-static_c install-static_cxx
- 
---- a/templates/Makefile.template	2019-06-26 12:38:36.777292299 +0200
-+++ b/templates/Makefile.template	2019-06-26 12:48:35.668550020 +0200
-@@ -1302,13 +1302,15 @@
- 
-   install-headers_c:
-   	$(E) "[INSTALL] Installing public C headers"
--  	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--  	$(Q) $(foreach h, $(PUBLIC_HEADERS_C), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+  	$(Q) for h in $(PUBLIC_HEADERS_C); do \
-+  	$(INSTALL) -D $$h $(prefix)/$$h ; \
-+  	done
- 
-   install-headers_cxx:
-   	$(E) "[INSTALL] Installing public C++ headers"
--  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--  	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+  	$(Q) for h in $(PUBLIC_HEADERS_CXX); do \
-+  	$(INSTALL) -D $$h $(prefix)/$$h ; \
-+  	done
- 
-   install-static: install-static_c install-static_cxx
- 
diff --git a/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch b/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch
deleted file mode 100644
index 28088713e5f8..000000000000
--- a/net-libs/grpc/files/grpc-1.25.0-pkgconfig-libdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Makefile	2018-05-28 17:59:34.631540261 +0800
-+++ b/Makefile	2018-05-28 18:01:31.266936000 +0800
-@@ -460,11 +460,11 @@
- CACHE_MK += HAS_PKG_CONFIG = true,
- endif
- 
--CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
- 
--CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
- 
--CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
-+CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires: $(PC_REQUIRES),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
- 
- ifeq ($(SYSTEM),MINGW32)
- EXECUTABLE_SUFFIX = .exe
diff --git a/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch b/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch
deleted file mode 100644
index d18063f2ef1b..000000000000
--- a/net-libs/grpc/files/grpc-1.3.0-Don-t-run-ldconfig.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 40f602c0beeb09197507d280b150174e09300d7f Mon Sep 17 00:00:00 2001
-From: Chirantan Ekbote <chirantan@google.com>
-Date: Mon, 10 Jul 2017 13:26:04 -0700
-Subject: [PATCH 5/5] grpc-1.3.0: Don't run ldconfig
-
-It doesn't make sense to run ldconfig for a staged install.  Remove it.
----
- Makefile | 15 ---------------
- 1 file changed, 15 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 86bd66a5e0..f4c2a5bcb9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2582,11 +2582,6 @@ else ifneq ($(SYSTEM),Darwin)
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so.3
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_unsecure.so
- endif
--ifneq ($(SYSTEM),MINGW32)
--ifneq ($(SYSTEM),Darwin)
--	$(Q) ldconfig || true
--endif
--endif
- 
- 
- install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-config_cxx
-@@ -2635,11 +2630,6 @@ else ifneq ($(SYSTEM),Darwin)
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so
- endif
--ifneq ($(SYSTEM),MINGW32)
--ifneq ($(SYSTEM),Darwin)
--	$(Q) ldconfig || true
--endif
--endif
- 
- 
- install-shared_csharp: shared_csharp strip-shared_csharp
-@@ -2652,11 +2642,6 @@ else ifneq ($(SYSTEM),Darwin)
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc_csharp_ext.so
- endif
--ifneq ($(SYSTEM),MINGW32)
--ifneq ($(SYSTEM),Darwin)
--	$(Q) ldconfig || true
--endif
--endif
- 
- 
- install-plugins: $(PROTOC_PLUGINS)
--- 
-2.14.0.rc0.284.gd933b75aa4-goog
-
diff --git a/net-libs/grpc/files/use-pkg-config-to-find-re2.patch b/net-libs/grpc/files/use-pkg-config-to-find-re2.patch
new file mode 100644
index 000000000000..33712d62ef01
--- /dev/null
+++ b/net-libs/grpc/files/use-pkg-config-to-find-re2.patch
@@ -0,0 +1,26 @@
+From 1f51d47b0ab2c0ac54c27b54f5e8e79910138a02 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 25 Sep 2020 15:10:26 -0700
+Subject: [PATCH] use pkg-config to find re2
+
+---
+ cmake/re2.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/re2.cmake b/cmake/re2.cmake
+index 3e83aae..94dfa5d 100644
+--- a/cmake/re2.cmake
++++ b/cmake/re2.cmake
+@@ -45,7 +45,8 @@ if(gRPC_RE2_PROVIDER STREQUAL "module")
+     set(gRPC_INSTALL FALSE)
+   endif()
+ elseif(gRPC_RE2_PROVIDER STREQUAL "package")
+-  find_package(re2 REQUIRED CONFIG)
++  find_package(PkgConfig REQUIRED)
++  pkg_check_modules(RE2 REQUIRED re2)
+ 
+   if(TARGET re2::re2)
+     set(_gRPC_RE2_LIBRARIES re2::re2)
+-- 
+2.28.0
+
diff --git a/net-libs/grpc/grpc-1.26.0-r1.ebuild b/net-libs/grpc/grpc-1.26.0-r1.ebuild
deleted file mode 100644
index d9352892adf1..000000000000
--- a/net-libs/grpc/grpc-1.26.0-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~gyakovlev/distfiles/grpc-1.26-fix-odr-violation.patch.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-3.8.0:=
-	>=net-dns/c-ares-1.15.0:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}/grpc-1.26-fix-odr-violation.patch" #705574
-	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.25.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.22.0-cxx_arg_list_too_long_forloop.patch" # https://github.com/grpc/grpc/issues/14844
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	rm -r third_party/cares || die
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	local myemakeargs=(
-		V=1
-		prefix=/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		AR="$(tc-getAR)"
-		AROPTS="rcs"
-		CFLAGS="${CFLAGS}"
-		CXXFLAGS="${CXXFLAGS}"
-		LD="${CC}"
-		LDXX="${CXX}"
-		STRIP=/bin/true
-		HOST_AR="$(tc-getBUILD_AR)"
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_CXX="$(tc-getBUILD_CXX)"
-		HOST_LD="$(tc-getBUILD_CC)"
-		HOST_LDXX="$(tc-getBUILD_CXX)"
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	local myemakeargs=(
-		V=1
-		prefix="${ED}"/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		STRIP=/bin/true
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.32.0.ebuild b/net-libs/grpc/grpc-1.32.0.ebuild
new file mode 100644
index 000000000000..e76d53897806
--- /dev/null
+++ b/net-libs/grpc/grpc-1.32.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc examples libressl test"
+
+RDEPEND="
+	=dev-cpp/abseil-cpp-20200225*:=
+	dev-libs/re2:=
+	>=dev-libs/protobuf-3.13.0:=
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	!libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/gflags
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+# requires sources of many google tools
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}/use-pkg-config-to-find-re2.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode libdir
+	sed -i "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" CMakeLists.txt || die
+	sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DgRPC_INSTALL=ON
+		-DgRPC_ABSL_PROVIDER=package
+		-DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF
+		-DgRPC_CARES_PROVIDER=package
+		-DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}"
+		-DgRPC_INSTALL_LIBDIR="$(get_libdir)"
+		-DgRPC_PROTOBUF_PROVIDER=package
+		-DgRPC_RE2_PROVIDER=package
+		-DgRPC_SSL_PROVIDER=package
+		-DgRPC_ZLIB_PROVIDER=package
+		-DgRPC_BUILD_TESTS=$(usex test)
+		$(usex test '-DgRPC_GFLAGS_PROVIDER=package' '')
+		$(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index 708220c8696a..08613524f7f3 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -8,10 +8,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<use>
-		<flag name="perftools">Enable profiling using <pkg>dev-util/google-perftools</pkg></flag>
-		<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>
diff --git a/net-libs/libblkmaker/Manifest b/net-libs/libblkmaker/Manifest
index 99f80443ddfa..db22859a8635 100644
--- a/net-libs/libblkmaker/Manifest
+++ b/net-libs/libblkmaker/Manifest
@@ -1,15 +1,7 @@
 DIST libblkmaker-0.3.2.tgz 17893 BLAKE2B 390ed56c7d77b904ec52d52cfa9dfff4e5c01c1662e0f5a5f17f92eb7b3d79619bd6ee64cfa28bbff5750db7cbc31d1cd5662b11a86ef63882063ddcb72cfb6b SHA512 e45c50c11676995171f6fb27346a42843a2c035c391ab84b5e565f5fff109a4ced6cdafb6c662572eb7243b25d2014400e9516cdbbd0d65f4ea31da7d0e74bdf
-DIST libblkmaker-0.4.2-github.tgz 13708 BLAKE2B b49fc4bf6c125c0f642fb1a8643f284369ef9195cad46818a2114eca38e68d36dbcfadda0a15a8da17732f1aa2f81c3d2cf079a8d11ce6c80a1bf53543c91013 SHA512 b5ac42ed1be14b10a93828c3c34f1d176d9128a8cb263bda1a55cd5c9d7157f8b501a3943ee60705f572aae7bec7098a9353032499457dbbec80c105796a95cf
 DIST libblkmaker-0.4.3-github.tgz 13712 BLAKE2B 4c93b8a74d25b5833371e2db78062f35c726b6ac89b8b22420a61d15a1d37cf0784b001e7061da4274ed34691021d5e92a27ce04260621cfdac6b4c7c49ce69f SHA512 a8686fc0cd757a214e24476c2fc8bac4511e6522ba977134150c0084dd2a3d7620f3378f4c454dcefb675840b71597f37d5b696a74ad0251b5d3921082c23285
-DIST libblkmaker-0.5.0-github.tgz 13577 BLAKE2B 54badd25f08ef3518b2a083e0527e17a85dc16498e7d7235a84259d9d6c9d9402ef6e684617946cdd6db9572966a8937ade4424d8ee03d45dbe886bc4affcdfd SHA512 64f90a652485f8c192a0d1e6184e44a0d4372907954f0abd855973099436f87a1c02a0ee383b86b22825427c7df5f46b06a9be9c55747942281cd6fc0e1aa33a
-DIST libblkmaker-0.5.1-github.tgz 13655 BLAKE2B 0854fb33030078f631c095c59e38a878d03820a32697baee9cb871ce0298682cb2d28e445c49fe491f8e616cdb9c2d59a975545b14d0ec6fc992d15cb4361d71 SHA512 45dd0638b3d1188131d9104a86230f87910fcde225198f4d23cc69f31fc1a86077d83a89780a9ddf686dd286bcbfcb59e1a94f4dfe4e6397236a76bef50f9b14
-DIST libblkmaker-0.5.2-github.tgz 13657 BLAKE2B ab1719232741a24322b34db5909768aa628afb93a9703eabbb4105d02379e522174778fff49bb1b90e35871d6c8d48b6dc3cf64d3c738337e7fd5ae768ddbce4 SHA512 ea3f3d2779d126c4ac55ba5bdf38dc0766559bb56609e0116e3221dd0ea058a2195c8f7b17d4d7611bb764044e79bc238130f8628f189e1f1169db11badbc824
 DIST libblkmaker-0.5.3-github.tgz 14161 BLAKE2B c8da4f7e3e2811cc88a03537ceb2e145ba3bb796520f4330d190e5935c13b73769cba73612d321f5c63b636bbd821e334b5a72ab893bd765edbcf49ce374f789 SHA512 57edcd583879d6abea716b6817a99dc345485392d149ddc6bb2ff9bac76d22f84cd960dc0746852e7c944a10b85d26c57fb107eac79680f77829c9bbc03c202d
 EBUILD libblkmaker-0.3.2.ebuild 539 BLAKE2B f82f0c021d3a6dcd6ecc7cd777c26d51a7dfc712a0e96b27caaae7d144379ce0050e84d91a55dcc35d32de8206eff3b65e99b711c5728711445ba1333276f2c6 SHA512 422a503f2b0d561f06d690f66803dbd6fae22d7413d3d08730e7e640ee266dba9dc5748a23ea254e221194e3882d879610129c144028e1d90e9a1923a2fb5c89
-EBUILD libblkmaker-0.4.2.ebuild 567 BLAKE2B 56c871b286f29d66df9adad39c1172eabc0d063997ea36092c62e6ef1830e5e5171fecccedea3a47b5770d2d57679be5161ac5869848bef207e56cd0a7a3ea0d SHA512 55aca7bb92f51a8d61be76e73dd7a54f7efc2568ea5c8793569b3161343eecdfedfb9f4bb26e354c46018430ea00c4578fae92cd27771ab4840c7a86004e986e
 EBUILD libblkmaker-0.4.3.ebuild 514 BLAKE2B b33abfa6b7cebd3af366855219d01ad6ab281e4bb4ba557c428d988594136f0a4f6c24296648e5a2ef51a55bb5b5b9ab03e5a7a2ead6b8686376eddc419de9d2 SHA512 60099192c78c29f4972d7dad77ddbf2452c4089df11a802a6fd1dd7531e4da4895f7218567bd7d15b950efef0db82160088a8de1a6afb6eb747324282045d615
-EBUILD libblkmaker-0.5.0.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072fc615b3da08bc400c774800d21e0b4e3c800a7cabcf1c84bbee9b8292533c433fc02a20bdc1f3f2a2c7bc106e85c SHA512 da67e1a7cb6458b115ae156c0d0ac52d36f1dc540c3ad5150afef80da4becaedfa34afca68ee94284e735dc03c58684b4ebffabe2bdbe171df34699ff915ae9e
-EBUILD libblkmaker-0.5.1.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072fc615b3da08bc400c774800d21e0b4e3c800a7cabcf1c84bbee9b8292533c433fc02a20bdc1f3f2a2c7bc106e85c SHA512 da67e1a7cb6458b115ae156c0d0ac52d36f1dc540c3ad5150afef80da4becaedfa34afca68ee94284e735dc03c58684b4ebffabe2bdbe171df34699ff915ae9e
-EBUILD libblkmaker-0.5.2.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072fc615b3da08bc400c774800d21e0b4e3c800a7cabcf1c84bbee9b8292533c433fc02a20bdc1f3f2a2c7bc106e85c SHA512 da67e1a7cb6458b115ae156c0d0ac52d36f1dc540c3ad5150afef80da4becaedfa34afca68ee94284e735dc03c58684b4ebffabe2bdbe171df34699ff915ae9e
 EBUILD libblkmaker-0.5.3.ebuild 536 BLAKE2B 1e4168c7c51fe5dfe5903d28127cc567e072fc615b3da08bc400c774800d21e0b4e3c800a7cabcf1c84bbee9b8292533c433fc02a20bdc1f3f2a2c7bc106e85c SHA512 da67e1a7cb6458b115ae156c0d0ac52d36f1dc540c3ad5150afef80da4becaedfa34afca68ee94284e735dc03c58684b4ebffabe2bdbe171df34699ff915ae9e
 MISC metadata.xml 458 BLAKE2B 6b0af9ae636522bc685b709e618ccf90343d3639211c2cd660de7f32934e04d672f0202c239dfcf91b10a27189a3f26694471007f7ad73adbfa5f1bf7a85af7c SHA512 55bf903c89e214eb664da1995053dbfc0dfd896c1cda51ec7ba38c0f8bcc20e9aa4142702c201ac57aec1a132ceb338c8137deaad9c8502e275ca517a63eebab
diff --git a/net-libs/libblkmaker/libblkmaker-0.4.2.ebuild b/net-libs/libblkmaker/libblkmaker-0.4.2.ebuild
deleted file mode 100644
index a4e0edb41baf..000000000000
--- a/net-libs/libblkmaker/libblkmaker-0.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="C implementation of getblocktemplate (BIP 22)"
-HOMEPAGE="https://gitorious.org/bitcoin/libblkmaker"
-HOMEPAGE="https://github.com/bitcoin/libblkmaker"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/bitcoin/libblkmaker/archive/v${PV}.tar.gz -> ${P}-github.tgz"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/jansson-2.0.0
-"
-RDEPEND="${DEPEND}
-	!<net-misc/bfgminer-3.0.3
-"
-
-src_prepare() {
-	./autogen.sh || die
-}
diff --git a/net-libs/libblkmaker/libblkmaker-0.5.0.ebuild b/net-libs/libblkmaker/libblkmaker-0.5.0.ebuild
deleted file mode 100644
index 653b6ed32c21..000000000000
--- a/net-libs/libblkmaker/libblkmaker-0.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="C implementation of getblocktemplate (BIP 22)"
-HOMEPAGE="https://github.com/bitcoin/libblkmaker"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/bitcoin/libblkmaker/archive/v${PV}.tar.gz -> ${P}-github.tgz"
-SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/jansson-2.0.0
-	dev-libs/libbase58
-"
-RDEPEND="${DEPEND}
-	!<net-misc/bfgminer-3.0.3
-"
-
-src_prepare() {
-	./autogen.sh || die
-}
diff --git a/net-libs/libblkmaker/libblkmaker-0.5.1.ebuild b/net-libs/libblkmaker/libblkmaker-0.5.1.ebuild
deleted file mode 100644
index 653b6ed32c21..000000000000
--- a/net-libs/libblkmaker/libblkmaker-0.5.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="C implementation of getblocktemplate (BIP 22)"
-HOMEPAGE="https://github.com/bitcoin/libblkmaker"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/bitcoin/libblkmaker/archive/v${PV}.tar.gz -> ${P}-github.tgz"
-SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/jansson-2.0.0
-	dev-libs/libbase58
-"
-RDEPEND="${DEPEND}
-	!<net-misc/bfgminer-3.0.3
-"
-
-src_prepare() {
-	./autogen.sh || die
-}
diff --git a/net-libs/libblkmaker/libblkmaker-0.5.2.ebuild b/net-libs/libblkmaker/libblkmaker-0.5.2.ebuild
deleted file mode 100644
index 653b6ed32c21..000000000000
--- a/net-libs/libblkmaker/libblkmaker-0.5.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="C implementation of getblocktemplate (BIP 22)"
-HOMEPAGE="https://github.com/bitcoin/libblkmaker"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/bitcoin/libblkmaker/archive/v${PV}.tar.gz -> ${P}-github.tgz"
-SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/jansson-2.0.0
-	dev-libs/libbase58
-"
-RDEPEND="${DEPEND}
-	!<net-misc/bfgminer-3.0.3
-"
-
-src_prepare() {
-	./autogen.sh || die
-}
diff --git a/net-libs/libbloom/Manifest b/net-libs/libbloom/Manifest
index b1245ebdb4d2..a45bb2f8cba5 100644
--- a/net-libs/libbloom/Manifest
+++ b/net-libs/libbloom/Manifest
@@ -1,5 +1,6 @@
 AUX libbloom-1.5-AR.patch 492 BLAKE2B 1149e58d6c333b0ae442633e1c4824fc37cd07eb29d75c18cd0509f36114c8e458773fb4aee38b9b01193a92ace06aa193dee133da49c007d42399c8977d9e48 SHA512 da775a1e99a161c8f3433930b224aafaff681ffd96f89441bbce9b39a789d75de055eea95e799cac3769c9f9c5d14308968ee65a7daf5121d5ef024f3350c2ed
 DIST libbloom-1.5.tar.gz 1210081 BLAKE2B 8af463c487c2898c5a4cf3f7541490e2b069d4667ccda4b536f347535be5c7f5664c8ee17e0789ac5325feb8f325ae30a89e2de34323962e89378724cf130a84 SHA512 0dd69e3ee102e5808ba4350c71d212876db56235e263f8d5a66d6c3616d2e51cc18b5ca3a5a946d79c12751d9cc5667f7c633d77645c4b88a4d16ea344b51929
-EBUILD libbloom-1.5-r1.ebuild 558 BLAKE2B 9cbdaed054ecabfe74c7bc1a055faeab93ad354e956147dbe981ef06f8bc3ad99203a5125edf6337ebd4630bb81a618f5858c764529fe12cba09367938e5d765 SHA512 4fb9a57f55112108bf17b9dd587a56631985d2d828fb3038143826217acffc9d31c7523e1813c352c0ac9879dda5a6036ae48fca4b4f87601320c61b18ffa1a0
+DIST libbloom-1.6.tar.gz 1872005 BLAKE2B de3368724e9c05489efae74ce36e880e2db29f78792b84b13325a24a3c302154fdbb621d672e9ef7f612ef00df1ec8fe010c59461822f5d04b4c5b27996ef773 SHA512 3dd4343d68def05800dd6ffc5a05b05d0702a8c0c9f0a397f105d4389c88a7bffa419734aeb4fa4e1a2c418b12a8192fa27ddcbaeee72906450d64cbfd64db15
 EBUILD libbloom-1.5-r2.ebuild 595 BLAKE2B 5d19e1dcc14096cb5190d151cbd55dca99e2e444e23516e3d6cb331efb1959a2e104ea0d5519440b92276c65c14707d8aac05a7e99829d2d09ad9d64ca28fa7b SHA512 3858e3f238c753c2da1ba6e8d717f870613a34c811ad76f2fb4813e9ab9bad9c4d4639c6d07183aa9f14835f8f0daa7ec3377d2666f587a3583dd5158c73c2e9
+EBUILD libbloom-1.6.ebuild 595 BLAKE2B 5d19e1dcc14096cb5190d151cbd55dca99e2e444e23516e3d6cb331efb1959a2e104ea0d5519440b92276c65c14707d8aac05a7e99829d2d09ad9d64ca28fa7b SHA512 3858e3f238c753c2da1ba6e8d717f870613a34c811ad76f2fb4813e9ab9bad9c4d4639c6d07183aa9f14835f8f0daa7ec3377d2666f587a3583dd5158c73c2e9
 MISC metadata.xml 321 BLAKE2B b9276958b83d4101521b0946b8cd6db70acfc4e7257fe1773cf0e85a1f6d9434c2d27022f3628578aad4156fedafd635f89c273b09933918149491c96918d207 SHA512 c744f0f8c72f05d96c85a7dade513d5aae40413450902b66d30a0eff88c92e4f9bbf2a1f0ccfef29bef817115dd85ff7ce4386592a25ee9f5e492a398a9ff4f8
diff --git a/net-libs/libbloom/libbloom-1.5-r1.ebuild b/net-libs/libbloom/libbloom-1.5-r1.ebuild
deleted file mode 100644
index 54311fad4a44..000000000000
--- a/net-libs/libbloom/libbloom-1.5-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A simple and small bloom filter implementation in plain C."
-HOMEPAGE="https://github.com/jvirkki/libbloom"
-SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	emake CC=$(tc-getCC) BITS=default OPT=
-}
-
-src_install() {
-	doheader bloom.h
-	dolib.so build/${PN}.so*
-}
diff --git a/net-libs/libbloom/libbloom-1.6.ebuild b/net-libs/libbloom/libbloom-1.6.ebuild
new file mode 100644
index 000000000000..9be6bd8a03a9
--- /dev/null
+++ b/net-libs/libbloom/libbloom-1.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A simple and small bloom filter implementation in plain C."
+HOMEPAGE="https://github.com/jvirkki/libbloom"
+SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=("${FILESDIR}"/${PN}-1.5-AR.patch)
+
+src_compile() {
+	tc-export AR CC
+	emake BITS=default OPT=
+}
+
+src_install() {
+	doheader bloom.h
+	dolib.so build/${PN}.so*
+}
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index e18ee61c0d80..1345fa31d90f 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,6 +1,6 @@
 AUX libgadu-1.12.2-fno-common.patch 907 BLAKE2B 22e147267c88ba1bd7fc1f289332517f7ea72f684fcaab1a74a0da0ee7ab8a1dc8e6e3fc5dd9853e22c11e326c65d08ff26a6f6fe85d44843398b6d574cbf629 SHA512 f4179768b86b80d71b6ede4608bbb598f7ec2d9d5e901d925436faea997ce23358707910a9b4f7adc1f290c369d2ae664f74f96b01de35e8220e96a79c5c26b7
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677
-EBUILD libgadu-1.11.4.ebuild 1290 BLAKE2B f360de4d3d93f538576aa0cf3bc7d7888a5a74da1758a465116338aaed0d899008b86518d34ac3d321bf74036e56ec10043a39a99c7d76727284b8315742ba90 SHA512 f6710a4fb1cfd290e30f310542ea34e1e18474d7de928082240c80220e787d4a234233ad8658eeed4bac34a59c2f4a4f62aebf7f59664076fdc0a2d5c6f536ed
+EBUILD libgadu-1.11.4.ebuild 1066 BLAKE2B 145511248de34d518797f37a88525409caef8e9db7576266608fa70ed524e133c17cd35a4df354fa4df714c714affb3f62b812be2f2450fe9da6d3679b104756 SHA512 a79988bf79bb4e1fa4bd3d41cf1e922ddf11134c255aa5b7b750c7d93c5e11ca0f6071c2de692cb119c804839b3b722ad5597756814825ab56b31ad313b37516
 EBUILD libgadu-1.12.2-r1.ebuild 1174 BLAKE2B 91701542fc2da10d0f2edfac28585eca79c6e410b2df68863d703f8b4c4d3173e25c67c57f77720ee763ed083b49d2afcc24f6d47c3a51b3c35770fd6421985b SHA512 799e5a6ec731501e4a6aa12a608861f0fec8d9c66f2f4f4cdc7c3069c40584cd99fa8d1e9c93935ed9ac972f4023f2216fef528e20e8d4f74ba71e3fe2353b95
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/libgadu-1.11.4.ebuild b/net-libs/libgadu/libgadu-1.11.4.ebuild
index 61ed84a41b1c..889a044752bf 100644
--- a/net-libs/libgadu/libgadu-1.11.4.ebuild
+++ b/net-libs/libgadu/libgadu-1.11.4.ebuild
@@ -17,17 +17,11 @@ RESTRICT="test"
 LICENSE="LGPL-2.1"
 KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
-IUSE="doc gnutls ssl static-libs threads"
+IUSE="doc ssl static-libs threads"
 
-REQUIRED_USE="
-	gnutls? ( ssl )
-"
 COMMON_DEPEND="
 	sys-libs/zlib
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( >=dev-libs/openssl-0.9.6m:0 )
-	)
+	ssl? ( net-libs/gnutls:= )
 "
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )
@@ -43,21 +37,11 @@ DOCS=(AUTHORS ChangeLog NEWS README)
 
 src_configure() {
 	local myeconfargs=(
+		--without-openssl
 		$(use_with threads pthread)
+		$(use_with ssl gnutls)
 	)
 
-	if use ssl; then
-		myeconfargs+=(
-			$(use_with gnutls gnutls)
-			$(use_with !gnutls openssl)
-		)
-	else
-		myeconfargs+=(
-			--without-gnutls
-			--without-openssl
-		)
-	fi
-
 	autotools-utils_src_configure
 }
 
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index c47cbbc2c179..f12ff90bde58 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,19 +1,11 @@
-DIST libmbim-1.10.0.tar.xz 384480 BLAKE2B 68e038b680613316a748fcae7be6a60241cb74be3bdfb800a179199a79220266f6a1cb7592ae2a77074f09dbef06ae71f6f3b6f4127f94e3434c2c9b349b31ba SHA512 648395a37621e51647878a6c86766a319e5f93080dde6fc41e0e280ffda95decb68352e6bfba946d0a1b441bc2a58e1cdef750274b1282b1f1183b1cbcd51d84
-DIST libmbim-1.12.2.tar.xz 397268 BLAKE2B 70d6ebfadda141b118ecb2c2476ba8c3b2ed1c8803295b6dfc4c32af4c4a0a14f8055ec0fd278e6be85676f4139823a01475ad5da56799425fa6adfd1b97c1f4 SHA512 d9ae50fecd39f2581ca8db21ec66ac6bfe13e10fe9298a7ec60338f66421ca8411dee3042f58692d60d491d17324d25233623674d322e81f0205c0dea486361a
-DIST libmbim-1.12.4.tar.xz 401816 BLAKE2B a9d28eea7e0cdd5aae1a6f38a3a80d9e84e9fe8e471d7637da6d2352ddc79c2df659c95a1a3d89c8794b9e6874ca32d7d912db06298be770203c0c5648d5b696 SHA512 74b0290eba3c83c13d1a8a07c1eaa979eae79cfadccd1b7acef0729c9d4c90e721dee9503a7cf69dd9c13a11c4a876716000cf78c22017d7e2d4e2b7906a3fbf
 DIST libmbim-1.14.0.tar.xz 401460 BLAKE2B 702bb0bbfeaf48f982986da9f5c57a09534d5fae8e42af2c8735822f832ce9a08473deb4fb20c65597d854aa73311ff317f8c99dd466d1874ed57bae1dbe684b SHA512 a9b1ba59828fd1c8cf39705717c56e3b75f34d6b3b9cd9f8be40fe245c07f4ea4d211727322c8b3c6d92f004c670e2fe6de76a3117e38b1e8de6673cfb6168bd
 DIST libmbim-1.14.4.tar.xz 402924 BLAKE2B 0dec5cc540c2d57a5f98d2619c0c478c2b1377fcf446a1d40d5f978ab99a79d83f1fc55831483269fc12225ea08f6f7516310b23ab7e068916b58ff6c352b589 SHA512 0471cf1647aeaa4ee5c304fc3719d4ad9a631752458d71dd7cd24bd17215fada4ee47aa65c05903f24bb2d4e2f637e577ff30cbf8c22b5de5af2107bb05970e3
 DIST libmbim-1.16.0.tar.xz 453532 BLAKE2B 68732c02f7ee56d898895fe61a1aac44b0c1e858d5bd8fbc4a962429d86ffd1e58442f8ab7c74211d312cc8efb549d3dda14f2c13e16d5d12f8b790299d268be SHA512 90dcb4bf0e4d1d8da5f8bdc0d5a788b51775c55289c416e4dde1020dc353604a4ce40d723c500f8fb9099d7e9061b5c83148106dfd167128bae2cbafbda1279c
 DIST libmbim-1.16.2.tar.xz 455096 BLAKE2B f29eaea16ab1f627ed7976fb84d6d1234bc58009e140e70e5ef4f3b9d2a37fcbc3a5492ccbf94d83c169cc64d4f7b545ce556704ce3c750bc00da80d5431119d SHA512 6081a5b40b7fc5cd21adf1948c16c57919c452bc2eccdccb561412ecada5aca7ff1fcac79568eb3dda83d49c780b0dab95a0b15bda0c4f2712b735cbe95402be
 DIST libmbim-1.18.0.tar.xz 474768 BLAKE2B 3dce8e1fa0e57cdf75174d0145006b38213fcd2de9166589f2d3ddd7a17dae3b308ce7a7338d388543c8ba83b6a9d2bf12051cbde1666fc43580314d9906704b SHA512 510af324563a6a4f9a9d656d6724398cf5c5ba07424962d5407dd05867ef36da40e1ee6c8be8040c6a67e764bc059d24282db45ce3d47075fcf4d7416245b28d
-DIST libmbim-1.6.0.tar.xz 360800 BLAKE2B 28b36b14ee8b28793ae0dbe2b2cd421b1d5cf7c2c8aa853d9920fb2f413239fcb5cff7c341f2841ee68052621b2a60e1dea3f212a0ba62a7310353f9215191b4 SHA512 60c20da65cb5e0e5e3d73434c8b7960ebb7138d6b004d4e6223ba63ea95fdc97b35697a329f12a81033c39c36efcbb3bcb5d8ae813a569dc6e6ca928a1cd79dd
-EBUILD libmbim-1.10.0.ebuild 979 BLAKE2B 058a9fb29064585ec9f2fcb92581a916d380d5e36086de0adda8fa5235a2046eaeca1791c3488b6f06ece04999974362e92b485838cc9ac87be1f024f020f81d SHA512 7881744c5e3d8c7edc33f4105cbcec269e39fd62f1dce458cfef346ba78d7a4457c7fe1e77809ffbdd1ffda2085498c235490c3e26885b1a851c6dee10c08ec8
-EBUILD libmbim-1.12.2.ebuild 988 BLAKE2B fa6ee4214c67581706d76391286f573c28e5f6b78bc923d00beb3e2168cc85fe354de92ab6f88dfb09e4f713b2e030b3beb9db8f2893451bb6722aced3ba7615 SHA512 ef6017ccc7856b8e8a0af519923aa472866f7967018483065cf8091eacdde852f38d0604e3fdcd82a39c6d1638cf721e6ce54415be7ec49fc8a49778e34b4618
-EBUILD libmbim-1.12.4.ebuild 989 BLAKE2B eda63b9b2012135245be21ba56d45d8493e1cb6faccb23ba476cd97c7720c4af17878759d8f16bbc11271b52eee7e335e55f7a45fa3b7898b4688015de507c45 SHA512 2596c64860e086c34159755761f978e886de761a6e04eff3883cab98d55d52efa05871b3cabb4f2bc235a5674c3f99bf110a973b5a5624f76b04a5da209edbc4
 EBUILD libmbim-1.14.0.ebuild 811 BLAKE2B 489a2c2d5a8fbde0a084631025ac8780c962407c9e07b27b83c7363a43792d4e0d1c0e4d9302fecc132d9cff45c4e191961a350115c2befb682e5c69a6ae175a SHA512 8e384e7ee4914adec14ff6ceab39bf0940d48a5e7d657c9a0f416429a6fc56ca33f0c691427a4155f447191a0695b0b8e325bbe431eee1665f85e522b918ef7f
 EBUILD libmbim-1.14.4.ebuild 816 BLAKE2B 398027b913bebfddd07a91335c9df5e58a584cf46b8fc364a7f7b23872a4349660b680956fae8b1301643e5072c01711ee1be561729145aa65c830676c758228 SHA512 057b2fdab9ef6784236e173b0b9dc21f6fa68d642c4acb7fcb32e4f55ba6f0fac365486489f4e5ba33fbb2aa38dd6780dd89924dd3910cc05b482c7e7692fa2d
 EBUILD libmbim-1.16.0.ebuild 816 BLAKE2B 398027b913bebfddd07a91335c9df5e58a584cf46b8fc364a7f7b23872a4349660b680956fae8b1301643e5072c01711ee1be561729145aa65c830676c758228 SHA512 057b2fdab9ef6784236e173b0b9dc21f6fa68d642c4acb7fcb32e4f55ba6f0fac365486489f4e5ba33fbb2aa38dd6780dd89924dd3910cc05b482c7e7692fa2d
 EBUILD libmbim-1.16.2.ebuild 810 BLAKE2B 81d677b03e4fa582cf7807102db9b7a44449c62fc024357e0c52d97730308411d474e35da970ab0f9de86e1492ec7636dce0c35e5d3fbc133ba7b73c66e61638 SHA512 a19fa48df208b1c7ac5136c7b0dcb9de41d74e898db8f0279fd1c07a3ca3cd69669c202eb9f742cebea4e1b950466e90a0a37a8f159661de3d263c01a7c16172
 EBUILD libmbim-1.18.0.ebuild 819 BLAKE2B d3b37644e4b06d321f51a145f0d23d6cb36232744bb766fb6beb0c738a7dcada12d733eb27b50622f6c4a5eae0392ce606b67a6f7f6668fc0b6a6f46d0252f24 SHA512 45ab3fbb709839c8834d5ce305ca358ad9ee6bce593b086a60b40d31998b1083e27336ba310e8d2d7b3cb2a99006059f77b601d140ed9c9eaeec54ba32149708
-EBUILD libmbim-1.6.0.ebuild 1051 BLAKE2B 00969447576acbbc3e932f130929107b825b277bf5b0696052e8b0b676871f8c85d975334c4edf48ff3c653cd777844754f0035f5c1aa76ddf10c35c814c7f7d SHA512 75f5fe88368645c5676feba980af14655cbad78fd36092fa3b5c1a80dba797997e7ac36ca24549f1d7077dc87122987bbfe4b4375efb9ff99334c63f8ca54b3e
 MISC metadata.xml 241 BLAKE2B 5323e3cc2a6d62c9fe301f465f7e03b145f6877adc893cf9e3f0fe4863fce3423f3471f62fce04fafc65428fb4781d2d74d796281d9332d0707e45bedec9a1a0 SHA512 d85c72d707e2c7290ff4bf18bbbd34b938cddb7e09528c5d10fa7f141122e3836687c2fff91c1000791457b7f808d3222fe671755a0fc25c157d80c908bc3cae
diff --git a/net-libs/libmbim/libmbim-1.10.0.ebuild b/net-libs/libmbim/libmbim-1.10.0.ebuild
deleted file mode 100644
index a91ced3b0bcf..000000000000
--- a/net-libs/libmbim/libmbim-1.10.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libmbim/libmbim.git"
-else
-	KEYWORDS="~alpha amd64 arm ~mips x86"
-	SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
-fi
-
-DESCRIPTION="MBIM modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libmbim/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	dev-libs/libgudev:="
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-gtk-doc \
-		$(use_enable static{-libs,})
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libmbim/libmbim-1.12.2.ebuild b/net-libs/libmbim/libmbim-1.12.2.ebuild
deleted file mode 100644
index f96e8c73e933..000000000000
--- a/net-libs/libmbim/libmbim-1.12.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libmbim/libmbim.git"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~mips ppc64 ~x86"
-	SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
-fi
-
-DESCRIPTION="MBIM modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libmbim/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	dev-libs/libgudev:="
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-gtk-doc \
-		$(use_enable static{-libs,})
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libmbim/libmbim-1.12.4.ebuild b/net-libs/libmbim/libmbim-1.12.4.ebuild
deleted file mode 100644
index 5f1e5580419b..000000000000
--- a/net-libs/libmbim/libmbim-1.12.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libmbim/libmbim.git"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc64 ~x86"
-	SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
-fi
-
-DESCRIPTION="MBIM modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libmbim/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	dev-libs/libgudev:="
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-gtk-doc \
-		$(use_enable static{-libs,})
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libmbim/libmbim-1.6.0.ebuild b/net-libs/libmbim/libmbim-1.6.0.ebuild
deleted file mode 100644
index 150265cda987..000000000000
--- a/net-libs/libmbim/libmbim-1.6.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libmbim/libmbim.git"
-else
-	KEYWORDS="~alpha amd64 arm ~mips x86"
-	SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
-fi
-
-DESCRIPTION="MBIM modem protocol helper library"
-HOMEPAGE="https://cgit.freedesktop.org/libmbim/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/glib-2.32
-	dev-libs/libgudev:="
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
-
-src_prepare() {
-	[[ -e configure ]] || eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		$(use_enable static{-libs,}) \
-		$(use_enable {,gtk-}doc) \
-		$(use_with test{,s})
-}
-
-src_install() {
-	default
-	use static-libs || rm -f "${ED}/usr/$(get_libdir)/${PN}-glib.la"
-}
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index a3cc655946fa..26e058ac933a 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -3,5 +3,5 @@ DIST libnma-1.8.28.tar.xz 1366584 BLAKE2B 598c2d310844930a5ed8b8d4b8bc0ae91193a8
 DIST libnma-1.8.30.tar.xz 1386248 BLAKE2B 7021e85595819b0cbd44b8c62087f49a5ecccc4bb230820d9a0159bf33b904df4f5c8021a79822c37d0933bdcde790a44f6d960b7f5f504e7506849aed35d54c SHA512 4d8f93d035fca4252e5c5dafc756ee6bc8f1d302aaeca77c5c0acb5d7f6cd4214224fb48e2706e69084c5a714aafa7837769be17d0642cc29eded9eb175a1107
 EBUILD libnma-1.8.24.ebuild 585 BLAKE2B 14955a958ecb2ef65e729f46dc4cabbedf020ca1ede426efd0291101fed11d8dc5ef70051143c4ea5f638cc1a08aeca5426f09595fcdc67d8127228c98af247e SHA512 e67925f59d07a5cba47cb44ec50721e8c365b5ec9d73882b31c2ddfa82ee5daee1241e152a7f2fe7a7f4035a8aa9ea563594d8722ed3e0bc340c9c8fe8e15c95
 EBUILD libnma-1.8.28.ebuild 1689 BLAKE2B 6da4564ecf1a70c90ffd4b9f46b67a062eefc031961ff05b702465065f6637da500ac4dc6bd41590d975c953ccac5fb2650068fc53d9334d43248ab37ad2e727 SHA512 194b9f092912f8a5df01b0f64962f87ca9b613984fe2b8ff8abde42e525dadd2c35411ee0311cccdb40d84486e5f1b2e2170d79dbd1a12c0b952dc8b9d83f4de
-EBUILD libnma-1.8.30.ebuild 1630 BLAKE2B c8b91e6e60370693dfe9b702833023d978c191479db5f7a94189f92e67d38690c6e37a81c6601695482cba7ff109dc810be5803c371bfa3a02b1159c58104371 SHA512 1462973e84cee0b09f88aa07b711c5bfa877ee2610dd9a3621e7a9e9b373a833b9131a28d6c8ec043014f0b6a4270523e182e34ff025a42f7284179809b54f08
+EBUILD libnma-1.8.30.ebuild 1629 BLAKE2B 8d649d41f282cca31526a45083bb7349cce319268f285d3c82f1164d6aa35e28a2d166de5af29aa41b6b494e7b908acd969714a7987c2081925c0e7887c46da1 SHA512 cc5825472c7ea3ee165a7532e11d9a2dfcab75b7124c5f28b841e18d787f812bec48f4a4bcdc5e1a5d64e6d11d574ec57b975ce8661e8a69084fcd9e1460c350
 MISC metadata.xml 372 BLAKE2B e55e51eff966d0806e416c520f700ab28219271b0b92cbab359e9b894813e0cf48b978279a4c3d0b460fe5477e12bd016cf2d401b22134c609432284d1e01ff3 SHA512 b644f5bbd965ea13b9097aec503e0d9448bd013feb1abc24cc2bf9b2b4612a984a4ec6b36b67bf0c8b920c82c812e79afcc9dceccde4b37652a61e71c6cdf16e
diff --git a/net-libs/libnma/libnma-1.8.30.ebuild b/net-libs/libnma/libnma-1.8.30.ebuild
index 88d64f8e23bc..9677e58eda6e 100644
--- a/net-libs/libnma/libnma-1.8.30.ebuild
+++ b/net-libs/libnma/libnma-1.8.30.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 # pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
 IUSE="gtk-doc +introspection +pkcs11 vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 DEPEND="
 	app-text/iso-codes
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index 774acb08d25b..3608f7de40f2 100644
--- a/net-libs/libsearpc/Manifest
+++ b/net-libs/libsearpc/Manifest
@@ -1,3 +1,3 @@
 DIST libsearpc-3.2.0.tar.gz 52303 BLAKE2B 34707b504b4e63017549e5ed04e8e1e8d1e98b873aebe2ad3f675fe88e209bb73d8b56d1aef137bc4bead2a2fbcf7410dfdf1d02a92a8f37efbaaf0d56d79a4c SHA512 071784b6d34f6ddf947748474c210f0f803e3451373e351b6a768b0cf4a17ddcdaf415ff4ce5f020f1a68df3f6f0a0e53a78ad9e2df286fafea870e303c8f6dd
-EBUILD libsearpc-3.2.0-r1.ebuild 886 BLAKE2B 2caa94cc7263c828db647057a4d57e6011ae4045234a293bffc9b8c816cc202eab634de78b9a9cf977277636a8bc99c1d5351d7f9ef659eb8dff4d7c99d5d89d SHA512 f0acfe1e1a026335c319fb1bcb512e810fd7fac670a1c06d76f22cd157c77c97ee2ef6baadfa54d2ea12addceb7a074a2f5c100eacc396ae87b9217b982b4d90
+EBUILD libsearpc-3.2.0-r1.ebuild 908 BLAKE2B 9841c1821d88c0749e51fc6910bfaa074556bca8ed68ddf7bc52f7a7f922701e3ddacf924bcb4a0a4ea7ba27f34d54131c5c0df3c0dc928a78d95bbeb4c971d0 SHA512 bae790d44c5e66961d226c06b93952db2165df96d449a3e2d3c567f67f501956410c4012488c46428a71d78c83cd028dec051e85c72a385d87920cdd9b708e6d
 MISC metadata.xml 248 BLAKE2B 95ce6c164ee8faf34471896ffcaad9a285d3418dcf763f778c5f58d38f545845c46c87cb3af4f3a8d71c542b127313a909e8f7972c15f930b1fdeffdb660478e SHA512 ffe6a49d28d3659fb952d60aff92836d3d1280f24dc340985d81a5b6600abe5ed8d961bee9ed1188b83be02e547676efcc06689b89ba5484a940a47fe48ed45c
diff --git a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
index 69f45d332ed7..ba693b98ae06 100644
--- a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
@@ -35,6 +35,6 @@ src_prepare() {
 
 src_install() {
 	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -delete || die
+	# Remove unnecessary .la and .a files, as recommended by ltprune.eclass
+	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
 }
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 2280c5882194..34b6b3caa1e6 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -2,6 +2,6 @@ AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a28
 DIST libssh-0.9.4.tar.xz 500776 BLAKE2B 56b21faac5d24f38c4fe695b31ec879ebab74f7cbfb8b8d336dee37766b7b0802ccac9b02726515ee29d44e18e832cfa322085d5669de1df94e5a428cf9add0f SHA512 38705c19c293ea5e6d286d22eb17021dbe58d88c1e647b699933aa0db9ca1174d43d1ff76c1a1b17bf2cc1a8297ec02f1a67dd9e969676dd69cf6fbdae9bc8d4
 DIST libssh-0.9.5.tar.xz 502876 BLAKE2B 8ea07bf25218563cbbdab31683e679f71298e2c7c9bb2430195e84892838cd55b9025ed292de65c4942ecec7d4037d5b92a414232fca6c8e41821776f4cf815c SHA512 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18
 EBUILD libssh-0.9.4.ebuild 3190 BLAKE2B 1e427a29c63f83cc1e12d4042c612dba16601ac1e8b9608999ca155c3bd95ce26ec9a9d73736704659548b5b6f8a830a413968753d87c2bcc2853b16b519e117 SHA512 255b96b1a34adf672c7bc1ae27572b3aacb918b607ad7eedbb631c72bc3b2a16dcdd1f4b0761f9e49e65d112224dc4ca768cd4f03e31d585632d0820af29ae24
-EBUILD libssh-0.9.5.ebuild 3198 BLAKE2B 7c0c30d1201aa21acc97be9d08529232c9e9b075dbe861e37b987307f7cfacb7540b59f99682fe1582b6dde44fea98740c4547cdaeca81c1861ad33a9060c48c SHA512 b2ed19610d62456c42d38544aa58a7ffc48b60ebc6424b6006e1eb3b668d3ed98bf05228c23cea8806bdc92a9bac0f4821fca2a7eb7f182b9489d840a45bc81f
+EBUILD libssh-0.9.5.ebuild 3195 BLAKE2B 470035a7852d16254fbff4b612325b460a7e72bfd5a7cded651f2dd1c2cd55d4da67cf11365e788f581aee67d71f6f4eb026f948f72a327e6a4cb4b77ce3624d SHA512 c9012b631301863f97e665d317382d3dd1487fcfe7bea3d2cd477a01955d62cfba7334a2add75549cfd89c4a8b573aaa5f2130b63910e602c17701dd842fa00b
 EBUILD libssh-9999.ebuild 3198 BLAKE2B 7c0c30d1201aa21acc97be9d08529232c9e9b075dbe861e37b987307f7cfacb7540b59f99682fe1582b6dde44fea98740c4547cdaeca81c1861ad33a9060c48c SHA512 b2ed19610d62456c42d38544aa58a7ffc48b60ebc6424b6006e1eb3b668d3ed98bf05228c23cea8806bdc92a9bac0f4821fca2a7eb7f182b9489d840a45bc81f
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.9.5.ebuild b/net-libs/libssh/libssh-0.9.5.ebuild
index 8496b7dfd382..f8f234b154ac 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index afb75f2f1c5d..a8cbf035daef 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -3,26 +3,18 @@ AUX nodejs-13.2.0-paxmarking.patch 2714 BLAKE2B 56371f934f40772845f2a7fb873d5952
 AUX nodejs-13.8.0-paxmarking.patch 4213 BLAKE2B 4235139400e33fbc0e9f9f965953ed1603283d86cea879b5bb67c60686b45ee26237970a13466d2f5392ee463660b318e53061701f916c4f2f2cc15756f21444 SHA512 c738c9ab15b0ce9b2356827a63d2d35eb1ddf9441b4fc7e9e3e07ed30bf7a6eec680cb3901ab8de6ca9a9377e6a04a520b6a88a08ff5cb2673ed50ae737e066d
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v12.16.1.tar.xz 23481768 BLAKE2B 29371b952c14907778c064269108f1da5e3818c32773e73090c61edcd07190c418189db6a505987ca71f99bb868880e297de5d2181b9a880774eaaf515985f26 SHA512 fe1e9fabb6fe52e3bc4275b33e6c5e4a761550b04964c0ae7dbef7172f5d415207bb2985751d068e357ce45a0ba414b07c0abd1531ef839b9463e98eeae8f9a4
-DIST node-v12.18.3.tar.xz 23679596 BLAKE2B 496a8fa0f0368634a900c5961b442cb9ef9e0cf7cb0fc974a9e29624fc40077a61bd6371851d5487b9eeeb50ebf6a238e5db5c801fef000c7cb15bd990cadae2 SHA512 a1c72d4664fbead4e63736abe46417b13dcd0581c7c9f8a94ca5c5b2bd782fefabac63e63f824dda6a771c3b5e647749e3156a611dcb100aad11c3f23e17ed5d
 DIST node-v12.18.4.tar.xz 23679924 BLAKE2B 14de3c83851b89f85f7d6f549d9e43e3e97c7a84de94eef8c3a2789e960595749726b8039fdff1be822377355ede2bb95bba4fd1d17c3e5165c844a80eb32e53 SHA512 07101a9acc8dee5189f8484746715b57d4227d819e38a79c100da33f803b0f061e7b37fbd4114ce2bc3eea647726f8786880d3096dfab187c177679f3e1c78e8
-DIST node-v14.10.0.tar.xz 33377228 BLAKE2B fc2e0b38c0cd56fa524cc01dd262003ba0dbb4f755b9b95079a4aedea75c75b1e588de8cee4503a9699b1fed9983db8827828fe622c1ea32f9d3ee21aeabc3e4 SHA512 902bfe3b142f11ef48076c4af6f3107fb20f617ef1f12a564fc3ea1870e6304458dd30fb9af67c3431b850caa496bbb55cb1d760e46c882603543685d316c733
-DIST node-v14.10.1.tar.xz 33383116 BLAKE2B 68959ad1ed576af327b53080099d8f1e520658f9c7aeb342ba4182f6f058e48d93b1c443e2a91348a221224bfa430a16cbe13b33f339b41eff4a6e41fc1e85db SHA512 fd094fb3ff1f94e913ee876de4365ba1f6d26abd33b60e964fbdf8a205ab8a44885bd69576ec997aee7b36b91a342daf3654bec41377d0ec66e752292aab4319
 DIST node-v14.11.0.tar.xz 33379456 BLAKE2B 99e2eba4ba2e54209836fa1e3b63e42caf854d7f3bc99f5836300b0795ef8c785b78bd7c6b99148604f0bb1b34a5169c72e8be0f8d4f62412e7d352fce15ca18 SHA512 5014ebaeb109b0ecaca8f795a4e1a626c03b1132f9b8bac8826b734633c14e9f99b4f079c185a1f43f6938a1e543e5838f520159c3e08ca454398039fd26ef11
 DIST node-v14.12.0.tar.xz 33390472 BLAKE2B 930b196ada16d21e2d2b43d030d936391e039cc985ee517b6b420277baa071ecef8c8cef7bd2f24b5e167465e9d4acc6b0da36ae4e7332fe179c47724e05ff50 SHA512 168141a3e3f20be98a0e800a8e8f70e1ff330ff087cc08c31d6ae185882615723166f445d6310a23e1bb5a023e671a74834b40e1b83f2b789f65c787c18762e2
+DIST node-v14.13.0.tar.xz 33418156 BLAKE2B 8a986a467b77485fbe2bc9d580c48ae72536d6d62c826319b787d2937c86358787ae452676b69df608adb9d9754f4cd068b729614989a4f2a93973380c4929d1 SHA512 7a75bff501520afbe15d6ceea4b4507717111c87cf03de47047af790df2e2e9d71da9501c7256d5dd9f58616c3d04db2e74401dfbcbd72abbd0c81778a588893
 DIST node-v14.2.0.tar.xz 32884616 BLAKE2B 7bcb07cb7623c5e08c20267c320cdf23ad110f124c5ad1f2447ef8b76ab8dc44ed50dab7c5651424d9d3a36f7eeecdf3292b07c02cb2e22c3fbe4ed633c4b842 SHA512 47e5ec0b7a207082d43419a7e0a6ea9242ec43b4d7c2217eb66d0b45e2f4d5cb561b3f6fe35fdc41a8be95c182dc122ba262f696ebd12833596d71b372ec85d2
 DIST node-v14.4.0.tar.xz 33005312 BLAKE2B bc1462d897e24a6b842e6f8146971866c73b54ff5383d76cfc5728a73e2c135d28ced068744174b3fb5af4a6ec05ef1f115ea51c2d65517cbe18e1d733460d04 SHA512 f1a7c788a8a149b942ec2b90a4314baaa5355c381029eda45002728ce7209925c016323b0ec1e0dfe2359fddb24f494df125805d0d266b738a333dcddb3f59c3
-DIST node-v14.8.0.tar.xz 33342288 BLAKE2B 4f8129beb16ece09f14c234395b29bc53e84896fdd9877821a27c80d88a0740d42ea4dcf65a0a5c52a98129262be236207f4c07d81f76cc5e4471f21227083e9 SHA512 ebb20f7163e20e8074dd9cc5d3ee7f3cbc536c55a7753d39c482ea90e9314d8fdfe1a88203be7f250f6d77b9f13da04d32d99770d300c2ab0dfdee3d7582f068
-DIST node-v14.9.0.tar.xz 33356264 BLAKE2B 61e4ad33ad5a80862730a89dbfab5c59395750f38d093944bbedc9ef167e09008e5f5f1545be3e01090d452eee3ab2ce6af9bb0455c731a0c6332c7d7b797e18 SHA512 2e628f4fea9d228e4e13d16166ba4e38a53d9a33edf0c26a63f55f61e99fd9069583613859e9b3ddbc87a6efe70803b723c310d064f9495359b450127b0c01b8
 EBUILD nodejs-12.16.1.ebuild 6199 BLAKE2B 401807f39cc6cb178a532cb99f73558c47916f766a45184ce63cd0260605d2977a164cafa8a1197b7177da6b8198ba3224e2ca96733b47e8ea104fe1d6465a4c SHA512 7ce5fd34dc047875994da88d022c693e599b379bd9bcd98ecaecd99dd8eb45e7bfafc303f4d328e5cd241e5486a015a29197df0a905bb67e84c6b943930e229c
-EBUILD nodejs-12.18.3.ebuild 6203 BLAKE2B 67947d6dbb631fa2534eafad1192f53d50985da88153a86e072843ecb6e9431a66c19fa587b746052a9e652cbc176e39495ac16a5d0a0e433d8287d06e44eabc SHA512 2c72ba3340dc906bbaddab7fca35dd0730d327af710b5d2551c974dc389c32b82e46ba281a848e68894000822d0d755fcffe2c9bb7c23c2354d1f91cb2790335
-EBUILD nodejs-12.18.4.ebuild 6203 BLAKE2B e139f3e4bcb74998e9c54a72f7df2a8bfc7692e764582b4dc8745cdb5646dcff7374df24eedb7791e3af1ca54496dcd15ba9836b1a0451532cb538df674937d0 SHA512 75bdbab170dd226bbcda1a02a2574ff29d227d7db498296ff83fc4a5f6a04c3124222686e7386d07c908bfae16e71b17b381a6290d0bac060fbc079332332221
-EBUILD nodejs-14.10.0.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
-EBUILD nodejs-14.10.1.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
-EBUILD nodejs-14.11.0.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
+EBUILD nodejs-12.18.4-r1.ebuild 6244 BLAKE2B fbac13ab6399a3dcdd076939e71f0f0482a9545e38d4d0536eb77a190a0115741c3bfee93a1a728ba789c98cbac5feaa4b638bbf5f74daadb9c37d66442c2f1b SHA512 b07a1468fa22fcf8f61edb26da10c448e89b9a1b33ca4e3fe2161f78bcf2069adaa6a1adf5e11ec2be9b46ebb8150da3dee3a69c93cb58cd8eb522a282d03463
+EBUILD nodejs-14.11.0.ebuild 5862 BLAKE2B dd587e60d5d2d7e7d3ea038bd810c53fa59965fce3256efaba3e1b11d45b10b51900494731f1b910e9ca1221fbb88d311ad10ceb36ccbfee00c4d0133ee7c277 SHA512 1e374d48b8198db55824e4267119fd997cefb9271319d098c8d0b755a52de06658a106db2cccac90481abf461d9caacc6554a829140a75488dad41635120029b
 EBUILD nodejs-14.12.0.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
+EBUILD nodejs-14.13.0-r1.ebuild 5913 BLAKE2B 25d3dd8ec6945dfe1a82914c2802ef3b7cf17614b8a43a81a5497b278094d256f35ce58cf159e1cc4da6abf8c6156f16a2e305a2335a72ef2de2ad80ce0dd219 SHA512 a0dc22fe39b2f3597bf7631d2de7af71a5a7b7dc4008a879be7a6d95aad3d709c1b8d39034fa2d819b91d199fe38da81c6a9c5b0c907e132fd94affe830ac6ee
 EBUILD nodejs-14.2.0.ebuild 5854 BLAKE2B b738a893013811417c3dfbc5b9a51541193c2152f60b2ea8989e59f51788be98580e3f300dcb752a89196bd1dced51bb577e63cc60ac25194bc00a3c00818524 SHA512 9f4403626435df54d28a0f0f20e10d1f90f601e9330ac6b94a4717bbd851caeb85db260c3b1967ca66778db29098056cf7641de4840976efaa38bf853083f5e8
 EBUILD nodejs-14.4.0.ebuild 5860 BLAKE2B 668d26dfe8d4c274274851f8b96e8d77dc69205dccdce38b188776ec3f72488f92790f4132a0e3da624b20a52763a67b50bf0b73804339b6a6713e4de23a5dfe SHA512 054656d522edaa005c1cf3efedf29c0cbcbd41ea2ee94aa7000b87b219ececaf4e2d0dc53f728a945b0028fcaac9c38467327f48c23e4d360c2a69a40e7bb7ba
-EBUILD nodejs-14.8.0.ebuild 5864 BLAKE2B 7ee566dff438cdb6e865e7e850baca0abbf3eed480d60c673a1e8cbbff652828a602561a4658b6923c328a1ce872cd4bf08098123329372ff2e811e854f689ef SHA512 cc2a1cf7b04a767e7cfa71b8308bc52763fe6ed8aca8fbab44e161048e59d5f45d946953c7f71d58b576b9c995b8d95fed5ce147988833f7560490ca1f3c12ae
-EBUILD nodejs-14.9.0.ebuild 5864 BLAKE2B a36b1e7ffe17bd4309c8ae7ae407ffdd65d2c936f7be937e8505512a51fe9ca65df6f992f336a428ab3db59b385e19317c0f3d34831a022c0fa82eb717aa9a2d SHA512 b86be5f135347fb61cae094e04706818b0a34f0e5b107ad0cb4b4eed16008c6d7c1a31f85b0aaa9c33ddb0a2b477bc67ca617f2f88a255121b73a3d2b731c969
-EBUILD nodejs-99999999.ebuild 5782 BLAKE2B 8be8e505f9fe119bbbd0d79b84b7a05d70bbfe08b239f6f14da7d4ae140c017755ac0c6d47dc8037b2760a4e606fc34c119ffec0c6e9a5fbab98ee823fd938bf SHA512 3ca3921d9c73a9d9916cf982171e7409a79912aa899025471532a2976c7c9c24f70cf7731a4abab3b989cc426ef9867c612465a833fa6cdc338cc7613e113947
+EBUILD nodejs-99999999.ebuild 5831 BLAKE2B ef49eabae7f794181094dd99639b59432651af166560b99f24e4a2105cdd54e92270551f60d1372f1ef03a2fb188eaeff547a08b61fc9bbf82384cbd0202b193 SHA512 64a233490cb20b53a2cffa1aa0f83793392ecef2d56a09b7665f5f02216ea09f61d3b3ba539ab4ec4e6b21e6534ecba5465c47ccf0c5bbc40c6eddc455a35f47
 MISC metadata.xml 628 BLAKE2B 0276a9cc8a0c7a08efb17e5635f561b50dec54e41ee239d96c026bc9609826a8f544faa43eb1b7244cffbdc052ca969b51b0540c08cc8276142dc8305eab2d00 SHA512 619954806c55cb873fd460bcf2f1edb4e4c2064dc60286cfb3292f3a583f5ca8d1d65d9fe0575ef3ed4148d73da817ee589750daf4b5a0147d276240db39ce87
diff --git a/net-libs/nodejs/nodejs-12.18.3.ebuild b/net-libs/nodejs/nodejs-12.18.3.ebuild
deleted file mode 100644
index 6148cf5bb503..000000000000
--- a/net-libs/nodejs/nodejs-12.18.3.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.38.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/http-parser-2.9.3:=
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares
-		--shared-http-parser
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-12.18.4-r1.ebuild b/net-libs/nodejs/nodejs-12.18.4-r1.ebuild
new file mode 100644
index 000000000000..8b94d6f307b4
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.18.4-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=app-arch/brotli-1.0.7
+	>=dev-libs/libuv-1.39.0:=
+	>=net-dns/c-ares-1.16.0
+	>=net-libs/http-parser-2.9.3:=
+	>=net-libs/nghttp2-1.40.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-http-parser
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-12.18.4.ebuild b/net-libs/nodejs/nodejs-12.18.4.ebuild
deleted file mode 100644
index af217c2f69dc..000000000000
--- a/net-libs/nodejs/nodejs-12.18.4.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.39.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/http-parser-2.9.3:=
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares
-		--shared-http-parser
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-14.10.0.ebuild b/net-libs/nodejs/nodejs-14.10.0.ebuild
deleted file mode 100644
index 43b934166628..000000000000
--- a/net-libs/nodejs/nodejs-14.10.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.39.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/nghttp2-1.41.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-14.10.1.ebuild b/net-libs/nodejs/nodejs-14.10.1.ebuild
deleted file mode 100644
index 43b934166628..000000000000
--- a/net-libs/nodejs/nodejs-14.10.1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.39.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/nghttp2-1.41.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-14.11.0.ebuild b/net-libs/nodejs/nodejs-14.11.0.ebuild
index 43b934166628..a1b0b0547ebe 100644
--- a/net-libs/nodejs/nodejs-14.11.0.ebuild
+++ b/net-libs/nodejs/nodejs-14.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
 REQUIRED_USE="
 	inspector? ( icu ssl )
diff --git a/net-libs/nodejs/nodejs-14.13.0-r1.ebuild b/net-libs/nodejs/nodejs-14.13.0-r1.ebuild
new file mode 100644
index 000000000000..1b229989974f
--- /dev/null
+++ b/net-libs/nodejs/nodejs-14.13.0-r1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+	system-ssl? ( ssl )
+"
+
+RDEPEND="
+	>=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.16.1
+	>=net-libs/nghttp2-1.41.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-67:= )
+	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export AR CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	if use ssl; then
+		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
+	else
+		myconf+=( --without-ssl )
+	fi
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
diff --git a/net-libs/nodejs/nodejs-14.8.0.ebuild b/net-libs/nodejs/nodejs-14.8.0.ebuild
deleted file mode 100644
index 9d912667e480..000000000000
--- a/net-libs/nodejs/nodejs-14.8.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.38.1:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/nghttp2-1.41.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-14.9.0.ebuild b/net-libs/nodejs/nodejs-14.9.0.ebuild
deleted file mode 100644
index 43b934166628..000000000000
--- a/net-libs/nodejs/nodejs-14.9.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc +icu inspector +npm pax_kernel +snapshot +ssl +system-ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-	system-ssl? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.39.0:=
-	>=net-dns/c-ares-1.16.0
-	>=net-libs/nghttp2-1.41.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-67:= )
-	system-ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export AR CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.8.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	if use ssl; then
-		use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store )
-	else
-		myconf+=( --without-ssl )
-	fi
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 70e923f68c04..87f5c52bddd6 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -22,8 +22,9 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.39.0:=
-	>=net-dns/c-ares-1.16.0
+	>=app-arch/brotli-1.0.9
+	>=dev-libs/libuv-1.40.0:=
+	>=net-dns/c-ares-1.16.1
 	>=net-libs/nghttp2-1.41.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-67.1:= )
@@ -95,7 +96,11 @@ src_configure() {
 	xdg_environment_reset
 
 	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+		--shared-brotli
+		--shared-cares
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
 	)
 	use debug && myconf+=( --debug )
 	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index 52097e7770a5..717b5dfba0d2 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -5,5 +5,5 @@ AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3
 AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
 DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
 EBUILD serf-1.3.9-r1.ebuild 2054 BLAKE2B 6f7d698e7e77eda30d0725d1ac55662ef69262e4d2599e2b74a867911c6b24deb29dce5a82eb75d53a2e8be52c62c0e03ef09ff40d27a1f3808a7a9aac8e9cac SHA512 ca6e8e60e6c587e35fdeffe0d231db79354f929b79953633cc4348d1b16fb3f4dacf5f5ce49ce6f19f31d8e87b4a112dcd56e9ea53e66ce6a2c5288352bdd334
-EBUILD serf-1.3.9-r2.ebuild 2098 BLAKE2B 8d021addc53e079fb4a455b68a3bf4145ed8c22834a9ccf84605f72c1067bd71594aa0b73c01fd33c6c853f9cd37d75108e702284946be0a7608c5d561798d61 SHA512 2fe5da265fc64a140935a349e6dcf530c80f108205d29056de422142c15cf524b5f3e7d4c1779a56945dd8e449fda57857cc7a136aa31786e932bf3e2a553ed8
+EBUILD serf-1.3.9-r2.ebuild 2096 BLAKE2B b789d66135b7449549b838cadc11aed704b89892268f4d83b661cb08a13a2e322430097504c41cf8d5cffefb3227bb24f1eceea83151dd35a033a7c597025536 SHA512 1f5cdaa4c6a13270119ff94a14b25e6e7288299ada259135c09bcc9a7a7421248e22f1bdd44a858954112917453789ec27b6cda28be5cf717f84c75d00052f9e
 MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-libs/serf/serf-1.3.9-r2.ebuild b/net-libs/serf/serf-1.3.9-r2.ebuild
index a39a528e3e76..e0703ec15916 100644
--- a/net-libs/serf/serf-1.3.9-r2.ebuild
+++ b/net-libs/serf/serf-1.3.9-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="kerberos static-libs libressl"
 RESTRICT="test"
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index ac995f1f6273..d58d4d8569b0 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index c73f26645d94..e96343c8460a 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -8,6 +8,7 @@ DIST fetchmail-6.4.11.tar.xz 1302708 BLAKE2B 660f05c54ea9772de2dd3e584d0d2ff9add
 DIST fetchmail-6.4.12.tar.xz 1303532 BLAKE2B d37c020b07b342ef4ba95a4b7f017217515e26ec06512350fea2bd58aa4d848a4865d98b1f9440ead544d9c377221f31f97f02499b7799ffa56c1e7dae7b73cf SHA512 277c324bab528a036f2896909b63baaa68d986b79baa24e2ee5cd8ca1d86082d4cd41ca371114fc8ae150eb0f97af50fd5238e88485ad5c701699b69964fe256
 DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
 EBUILD fetchmail-6.4.11.ebuild 2519 BLAKE2B d693548f12d13da5218deb137abe401690011e563d5a43914f323163a81fe5a75ed6c39fa57bf9544695688e60ac5430444251b3a71173b6e5352f0348c9cbb5 SHA512 13b7bdad5c1d1219c8dcf176181a59a180cdbbaaee0248cc6b3625cf6e07b226319ce6844e6e647673b43b9fafe3b962e71b81c1373e6f96d832cb8caab88e3f
+EBUILD fetchmail-6.4.12-r1.ebuild 2521 BLAKE2B 499bad8f4cb55b68e999e43fee86262f3a118b5bc9e2c5c712e0ea5610633d5919e8c10413d388ad425b30c5f02942e53a0b91bae36ca06ea8a6ed6d91e89da7 SHA512 27613ef04f854991f6187b7ca4172b926873270ebf47295210dafe712c97ed1b35496587140e2bee6e9b31b6e25cdae2e4de487016c70fda08960f2e7cffe67a
 EBUILD fetchmail-6.4.12.ebuild 2519 BLAKE2B d693548f12d13da5218deb137abe401690011e563d5a43914f323163a81fe5a75ed6c39fa57bf9544695688e60ac5430444251b3a71173b6e5352f0348c9cbb5 SHA512 13b7bdad5c1d1219c8dcf176181a59a180cdbbaaee0248cc6b3625cf6e07b226319ce6844e6e647673b43b9fafe3b962e71b81c1373e6f96d832cb8caab88e3f
 EBUILD fetchmail-6.4.8.ebuild 2511 BLAKE2B ebc8a846792c69dc12b7d8030efbd68994d41e1cab51ec8ef5007ec5b8f036f09ac12a69b5c02efb06fa2eb71e5d24655d844661b50737bb4cad5d8322acf9ec SHA512 03e1eb61afe94c73b103f3a56e016f28eb8ed719c44e2f75cf11d81acec5c911a2485d99a74de8bb6c37710f0e6be0daf55b8a675f98a330d02dceea21b0cea8
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.12-r1.ebuild b/net-mail/fetchmail/fetchmail-6.4.12-r1.ebuild
new file mode 100644
index 000000000000..157b8118f72b
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.12-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="tk"
+
+inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="https://www.fetchmail.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl nls kerberos tk socks libressl"
+REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.1.1:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	kerberos? (
+		virtual/krb5
+		!libressl? ( >=dev-libs/openssl-1.0.2:= )
+		libressl?  ( dev-libs/libressl:= )
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
+	socks? ( net-proxy/dante )
+	tk? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+HTML_DOCS="*.html"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
+)
+S=${WORKDIR}/${P/_/.}
+
+pkg_setup() {
+	use tk && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# don't compile during src_install
+	use tk && : > "${S}"/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	use tk || export PYTHON=:
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl ssl "${EPREFIX}/usr") \
+		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		--without-hesiod \
+		$(use_with socks)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+
+	systemd_dounit  "${FILESDIR}"/${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+	dotmpfiles "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+
+	use tk && python_optimize
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+		elog "the polling delay used by the fetchmail init script."
+	fi
+}
diff --git a/net-mail/maildirtree/Manifest b/net-mail/maildirtree/Manifest
deleted file mode 100644
index 4c70df32d587..000000000000
--- a/net-mail/maildirtree/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX maildirtree-0.6-ldflags.patch 554 BLAKE2B 7024bd5632de675fc2de91a9c53b709ae3f77395f35ee844b335a74750ee89ff169cba846084a850c487cf660d009cfe36c6012d1b70f4a7e3d626e9882c4b53 SHA512 7969cdf5887e5030c516ee07de057b33a974df912b457833618925a0c00bffe393de2df80fb67858710690d0ddbc877fe59a2a323b61008a5005b189304e3acc
-DIST maildirtree-0.6.tar.gz 52569 BLAKE2B d2505fe66378ca43c83df7bdef6b8afeb38671cb87ba3797c3ac96cdb6ad0d9b6b59e4fd69fba51e402d3c3318383ef3ad516c51c5c585142ea1ba5c0e5270f1 SHA512 13a897b416308b4da7f6e4cb0a93e201fd873b8c490d77ca4186a373fe101837a2b7ba70706775c2ccd717f4b513ba24efe56a94f3c1075f6c0db5729cec9f2f
-EBUILD maildirtree-0.6-r1.ebuild 527 BLAKE2B 8f540719da35337858c3fe951f8be473d8d016ebeb052ef364a0b24ea2f3426b426bc92b6f750ec97798e6229336f7987579f8a94089d51abcbf31aced3a1280 SHA512 ef1d8d4647f689ea831234411d3af6c06c05b1975cdc1fd5289bd18017c9694ff3b456a70ed7d37b819222d7ad1d0425c9ff7b3242d6ed227e1e8ac9026a08ac
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/maildirtree/files/maildirtree-0.6-ldflags.patch b/net-mail/maildirtree/files/maildirtree-0.6-ldflags.patch
deleted file mode 100644
index f6e0e17a7277..000000000000
--- a/net-mail/maildirtree/files/maildirtree-0.6-ldflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 631b3c687fe1558b88556a89838b9f264c2aed42
-Author: Eray Aslan <eras@gentoo.org>
-Date:   Mon Jun 6 22:09:23 2011 +0300
-
-    Respect LDFLAGS - bug #337243
-
-diff --git a/Makefile.in b/Makefile.in
-index 62f0673..b24a609 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -33,7 +33,7 @@ maildirtree.1: $(wildcard maildirtree.1.sgml)
- 	$(DBM) $< > $@
- 
- maildirtree: $(OBJS)
--	$(CC) $(CFLAGS) $(OBJS) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
- 
- maildirtree.o: maildirtree.c config.h maildirtree.h snprintf.h
- snprintf.o: snprintf.c config.h snprintf.h
diff --git a/net-mail/maildirtree/maildirtree-0.6-r1.ebuild b/net-mail/maildirtree/maildirtree-0.6-r1.ebuild
deleted file mode 100644
index d880ea1dc782..000000000000
--- a/net-mail/maildirtree/maildirtree-0.6-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A utility that prints trees of Courier-style Maildirs"
-HOMEPAGE="http://triplehelix.org/~joshk/maildirtree"
-SRC_URI="http://triplehelix.org/~joshk/maildirtree/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/maildirtree-0.6-ldflags.patch
-}
-
-src_install() {
-	make DESTDIR="${D}" install
-	dodoc ChangeLog INSTALL README TODO
-}
diff --git a/net-mail/maildirtree/metadata.xml b/net-mail/maildirtree/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/net-mail/maildirtree/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 44a7d2cbf7f8..0c0430cb871b 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,6 +1,3 @@
-DIST mailman-3.3.0-importlib_resources-fix.diff.xz 2120 BLAKE2B d455a88a922fe715cb3e3faf6d7f94115ab0e762b85a3195988c9bcb0d01b37d4495e4c30c566f10f65f47c55f18c8af46e21037fca042503167238c88e1ff77 SHA512 31e6f71ff700a3e648b78b75808ac40b333ed58f3d51819b959f48ef4598f0e5d07d3b4fc178745702c02fb3137941c9887a6bd1cdd9ea7d18cd50d32da6c57f
-DIST mailman-3.3.0.tar.gz 839241 BLAKE2B a9f972a5cd09be6e971b568066cf67980c050fc619bc0bba7956d65b9601613f2dd87bbf243072be2478367e2fecfd48b184dada6fc525dae8cf1414dc64cec0 SHA512 63cf30c102751c1cae086f4c046767c2d817ad57097bd60bc838ead19c4e29ed1bc5d4cc2c1eef40f41787daf60d8b98033f64064d6ad4567a9552b5fb2cabd8
 DIST mailman-3.3.1.tar.gz 1184548 BLAKE2B e9bf5cec5fec75ae01093003fa9b128f9415c55cc505eda841a807d72177d17dc7609e1e0c20305f5f38c40e01745b4cbc58d1c5ddc43d0799ec601bde92cb54 SHA512 31dc5d0fca7f28579a1e174010ea8ac83d17b5e7ace37f3a86fb73110de412af145a9c3d16cf7b446f80e44a3419b51cce7b56b8de93264751cf771b2c084ddc
-EBUILD mailman-3.3.0.ebuild 1742 BLAKE2B b528851e4d73acdcf459b0eae5224d3ef0ba14a7c13c3f9b92ab53e089dcc0ea2d23ce87fafd6aa1c4d5149d581e751010f0ace2ec1037d567027da13a18c416 SHA512 495fe29c164075fd7a4b85cba712115ea3e9193212a6e048febaf2b5ce1a719a765e99efeb17984659a03c3a93dc7c20a48df5c10a1e6a01667aaa6bb623c64a
-EBUILD mailman-3.3.1.ebuild 1474 BLAKE2B ff1f4e9c30bb04449413f387c37d0e3dabf62895ce8bdba42208ca2f85d0071e4320df2cae180ca1f62d880a6a3f67f5fa846de4534704369cedfa5b5adc89fe SHA512 afe16caa2ec32a4ded2acc05063393884c0409071a82505bc2efaff15941c8cbd03bb43a81a572a2cc7fc15ddd92cc1a86ac9bbdb2101a449dd1830c694871b7
+EBUILD mailman-3.3.1-r1.ebuild 1474 BLAKE2B 8a2fee127292f2d41fb76b328bb8426fcf4b137f92d8c8d1dca1715eaad95d2f52b7485bd84045ecbf458825d856fbe0cf21676ca7315d2bb94df79913fe621f SHA512 e72cc0b8c7bd17ec5776c0962153933ad494e1d1432bbeac271ed75eb4241ce1d2a5ca1b0c0a9c6dae6beda6baf92d87440b112ecfadd1201e4d98499b031546
 MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/mailman-3.3.0.ebuild b/net-mail/mailman/mailman-3.3.0.ebuild
deleted file mode 100644
index 2e2bf2af6d84..000000000000
--- a/net-mail/mailman/mailman-3.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mailman -- the GNU mailing list manager"
-HOMEPAGE="https://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~hanno/distfiles/${P}-importlib_resources-fix.diff.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-#KEYWORDS="~amd64 ~ppc ~x86"
-KEYWORDS=""  # nothing til this is finished
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/aiosmtpd-1.1[${PYTHON_USEDEP}]
-	dev-python/alembic[${PYTHON_USEDEP}]
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	>=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/falcon-2.0.0[${PYTHON_USEDEP}]
-	dev-python/flufl-bounce[${PYTHON_USEDEP}]
-	>=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	dev-python/lazr-config[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.3[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-configuration[${PYTHON_USEDEP}]
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-
-# Make it compatible with python 3.7 and 3.6, see
-# https://gitlab.com/mailman/mailman/-/issues/690
-PATCHES=( "${WORKDIR}/mailman-3.3.0-importlib_resources-fix.diff" )
diff --git a/net-mail/mailman/mailman-3.3.1-r1.ebuild b/net-mail/mailman/mailman-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..f2b0f734e408
--- /dev/null
+++ b/net-mail/mailman/mailman-3.3.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mailman -- the GNU mailing list manager"
+HOMEPAGE="https://www.list.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="3"
+#KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS=""  # nothing til this is finished
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/aiosmtpd-1.1[${PYTHON_USEDEP}]
+	dev-python/alembic[${PYTHON_USEDEP}]
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	>=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/falcon-2.0.0[${PYTHON_USEDEP}]
+	dev-python/flufl-bounce[${PYTHON_USEDEP}]
+	>=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
+	>=dev-python/importlib_resources-1.5.0[${PYTHON_USEDEP}]
+	www-servers/gunicorn[${PYTHON_USEDEP}]
+	dev-python/lazr-config[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/passlib[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.2.3[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-configuration[${PYTHON_USEDEP}]
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-5.0[${PYTHON_USEDEP}]
+"
diff --git a/net-mail/mailman/mailman-3.3.1.ebuild b/net-mail/mailman/mailman-3.3.1.ebuild
deleted file mode 100644
index f995b8d5bf69..000000000000
--- a/net-mail/mailman/mailman-3.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mailman -- the GNU mailing list manager"
-HOMEPAGE="https://www.list.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-#KEYWORDS="~amd64 ~ppc ~x86"
-KEYWORDS=""  # nothing til this is finished
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/aiosmtpd-1.1[${PYTHON_USEDEP}]
-	dev-python/alembic[${PYTHON_USEDEP}]
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	>=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/falcon-2.0.0[${PYTHON_USEDEP}]
-	dev-python/flufl-bounce[${PYTHON_USEDEP}]
-	>=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_resources-1.5.0[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	dev-python/lazr-config[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.3[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-configuration[${PYTHON_USEDEP}]
-	dev-python/zope-event[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-5.0[${PYTHON_USEDEP}]
-"
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 196358c21bae..cf5ca6ca88e4 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -6,5 +6,6 @@ DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff
 DIST notmuch-0.31.tar.xz 713144 BLAKE2B 91b0a01543e438e6ccb40a01ad0a100a5c6ae15fe832bb29367d4bc288dae5a915f89a743ecee814041caf53430e2593cb4b5f69faaec396ad6dacfe8cc67d2f SHA512 928acc07b9dbed4275e7d39d94202bea7685e9d433a7bf4c07e40e191ed4fe8cf15ac04c18792e46f4605ffac548b942998005d8176a58ad76c82d4085a408e5
 EBUILD notmuch-0.29.3-r2.ebuild 5062 BLAKE2B cdf68691f7dbc729d6c95dc974a3fb3b747a33d0b80338fc9b0474a970b78674628c242ce14af83b4d57eee1cba1f3c3d343dfcfffe2d8d0ee628f78b94f8767 SHA512 d76b455c44244eb1775604b0510f96c30aea175492ea4982d9a5b93d8601834a120286f29b8e41c6e694209a09be72727848e24bf5b8b3723729c2458095cc08
 EBUILD notmuch-0.30-r1.ebuild 4343 BLAKE2B f53eff50b205bffdb6016118997a5b5176a88ca704999e2b4f3bef4f107a79e7e89e68010fc35bd756aa8cbbe168f73700eba9b33ec8f1ce32a676b1b592e5da SHA512 bde0d770ca18d3c55c79be0b4e6fb360f61bf0f404397448fb311c1cf107b07b5f9633643a04a0e6615acd61934635845d1a2a47283795e3fd69c050939858b1
+EBUILD notmuch-0.31-r1.ebuild 4444 BLAKE2B 3bfc5bf340d8af0f4e351394d41d38de8b73cf959fee108de8ec53690e9b42ecedf0125f90ae2413384d65197f926beac1ced7a8120d2da48e20b85ef1289be0 SHA512 53854173c8b326d9d7e1c7ad826f2f77b61fc605bab54fa9084e41025a91ea14a671bfeaf036ba861b71ceeb83bc0661cd610600e4e9a971c9265ac7d6008c2f
 EBUILD notmuch-0.31.ebuild 4460 BLAKE2B 21bea26e7e287937cd45a553abb14cb40420b2bb93886165533f6808d4734e594bd0184fb4b8dd6230b2264dc09f80dd89eeea70f678e7a56981e11f743c1121 SHA512 e12a5c8403c7f7e0ce32a1f002a4e6153b01df9436a517f692b18860a919aac83787a59ae6a00820b2d6fae7661a14a4f822d16b79c2e037f539afddfba04f62
 MISC metadata.xml 1229 BLAKE2B 7a7bc05dd0bd1fbfca066e1041d56068c3e8dfd45359be606d0e7703876c831f0b0a39b0dcea4b44f3ec034a16c906bb1ad703143e244c95487d94d9bf9331b4 SHA512 d100677a61010239386889afd5c0f3444c77f5b42309738668c89409bec8f81f2856eb2e5d00d9d495b94a4111df7209f4cc84b830ef346e57c686e5ccbea24e
diff --git a/net-mail/notmuch/notmuch-0.31-r1.ebuild b/net-mail/notmuch/notmuch-0.31-r1.ebuild
new file mode 100644
index 000000000000..f5fd2cc5cf82
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.31-r1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+NEED_EMACS="24.1"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \
+	pax-utils toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz
+	test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 ~x86"
+REQUIRED_USE="
+	nmbug? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( crypt emacs python valgrind )
+"
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+"
+COMMON_DEPEND="
+	dev-libs/glib
+	dev-libs/gmime:3.0[crypt]
+	>=dev-libs/xapian-1.4.0:=
+	sys-libs/talloc
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/cffi
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		>=app-editors/emacs-${NEED_EMACS}:*[libxml2]
+		app-misc/dtach
+		sys-devel/gdb
+		crypt? (
+			app-crypt/gnupg
+			dev-libs/openssl
+		)
+	)
+	valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+	crypt? ( app-crypt/gnupg )
+	mutt? (
+		dev-perl/File-Which
+		dev-perl/Mail-Box
+		dev-perl/MailTools
+		dev-perl/String-ShellQuote
+		dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA
+		virtual/perl-File-Path
+		virtual/perl-Getopt-Long
+		virtual/perl-Pod-Parser
+	)
+	nmbug? ( dev-vcs/git )
+"
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+
+bindings() {
+	local rc=0
+	if use python; then
+		# CFFI based bindings (recommended)
+		pushd bindings/python-cffi || die
+		${@}
+		rc=${?}
+		popd || die
+
+		# Old deprecated bindings, #736204. These are known to cause
+		# memory loss and other issues. Avoid if at all possible.
+		pushd bindings/python || die
+		${@}
+		rc=${?}
+		popd || die
+	fi
+	return ${rc}
+}
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_unpack() {
+	unpack "${P}".tar.xz
+	if use test; then
+		mkdir -p "${S}"/test/test-databases || die
+		cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+	fi
+}
+
+src_prepare() {
+	local _deps=""
+	default
+
+	# Python bindings
+	bindings distutils-r1_src_prepare
+	mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+	# Override dependencies for 'install' target
+	use doc && _deps="install-info"
+	sed -e "s/^install:.\+/install: all ${_deps}/" -i Makefile.local || die
+
+	if use test; then
+		append-cflags -g
+		append-cxxflags -g
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Non-autoconf configure
+		append-ldflags -lnsl -lsocket
+	fi
+}
+
+src_configure() {
+	python_setup # For sphinx
+	local _args=(
+		--bashcompletiondir="$(get_bashcompdir)"
+		--emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+		--without-desktop
+		--without-ruby
+		--zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		$(use_with emacs)
+		$(use_with doc api-docs)
+	)
+	tc-export CC CXX
+	econf "${_args[@]}"
+}
+
+src_compile() {
+	python_setup # For sphinx
+	V=1 default
+	bindings distutils-r1_src_compile
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		emake notmuch-mutt.1
+		popd || die
+	fi
+}
+
+src_test() {
+	pax-mark -m notmuch
+	LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" V=1 default
+	pax-mark -ze notmuch
+}
+
+src_install() {
+	default
+	doman doc/_build/man/man?/*.?
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use nmbug; then
+		dobin devel/nmbug/nmbug
+		dobin devel/nmbug/notmuch-report
+	fi
+
+	if use mutt; then
+		pushd contrib/notmuch-mutt || die
+		dobin notmuch-mutt
+		doman notmuch-mutt.1
+		insinto /etc/mutt
+		doins notmuch-mutt.rc
+		dodoc README-mutt
+		popd || die
+	fi
+
+	DOCS="" bindings distutils-r1_src_install
+}
+
+pkg_preinst() {
+	local _rcfile="/etc/mutt/notmuch-mutt.rc"
+	if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then
+		elog "To enable notmuch support in mutt, add the following line"
+		elog "to your mutt config file:"
+		elog ""
+		elog "  source ${_rcfile}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index f41f219520cb..949f91345903 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,4 +1,3 @@
 DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
-EBUILD queue-repair-0.9.0-r1.ebuild 712 BLAKE2B 869ab7d7dac0a90708da400c680d206fe619d1798b0e23841922d4d8bb17cba3f8af7552dcccfce09a8c5935663c8a0e25a0d52c926f75b2f40f2bb34698dafb SHA512 ea2eae4c33583966571da8647761f80e6457f5110e1c81f3ac04f31dd4bf093977a456e5ee616c962edc0f107360d645cfc40b0795dee285a56e15cb018d5aed
 EBUILD queue-repair-0.9.0-r2.ebuild 816 BLAKE2B 947aff25964509108987b359546164b7fc8a8d43eac898ef0eda9ceb440e11a9057be5bf6dede3d1942ede7862cf4a53b6f0b182e0ec723764ae5e59c48048e6 SHA512 9b8bfd9c40480adce979a32d16b492cbe9ca27cb29173e44ffe3c8f6b30b64ad2ad7975d0e26dde2a41b49538679c0357d28b7f9ac97f3850754323e8947fcf5
 MISC metadata.xml 490 BLAKE2B 8ec4d8e23a4956f5679a0b5291b03262a4474f3d0d97a5fc3286189f5623c75d859ce8103708dfe3ed1e4e3721165a764b121364f06121289aff047cd60db281 SHA512 bf57215deceddaa74691029e05f52940c0bd1d9262c865980c35786f487d08351e24287c50685ef85514a1e7cc7cb68d527259b369a34d6d06bf8fd4474285b1
diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
deleted file mode 100644
index 25cd37ddd1f8..000000000000
--- a/net-mail/queue-repair/queue-repair-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A toolkit for dealing with the qmail queue directory structure"
-HOMEPAGE="http://pyropus.ca/software/queue-repair/"
-SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-DOCS=( BLURB TODO CHANGELOG )
-
-src_install() {
-	python_newscript queue_repair.py queue-repair.py
-	dosym queue-repair.py /usr/bin/queue-repair
-	einstalldocs
-}
diff --git a/net-mail/sendEmail/Manifest b/net-mail/sendEmail/Manifest
index c0c83b498c5e..1efa5a7cf411 100644
--- a/net-mail/sendEmail/Manifest
+++ b/net-mail/sendEmail/Manifest
@@ -1,6 +1,5 @@
 AUX 1.56-overzealous-verify-mode-check.patch 683 BLAKE2B b3b6de3432516007c7c6c8410d99bf51faa36d21b25b60217c1fc5302a21706980cc90e0b0d4f9d12aac3d03850a329cbedb1bf972d49f4972518ebc3063ff7b SHA512 472843ceaf90fb427d626abc4b8484b279d8613ccd39a57a72f689da2f73615a3080a22322ad5cd95d7a8ae10eede7fdb7b51246d810ad066a52b6d2f1498cd0
 AUX 1.56-overzealous-version-check.patch 668 BLAKE2B c05d17287b8b8960022d495769cb459a01af66f09b39ccdcab3a21f5b22f1a2fd78f65643d435614d0a3a5fc87c9ab94d3b5c53c6c45ddc4c22aee5a1cccae18 SHA512 51d43760d0f6bf8905a0c82a5e0a44035246a332e00ae472e3b37725e29fe461beb808f4d74542659e1a7998fbde30c24d4156770058d914b1c08934d5d6884c
 DIST sendEmail-v1.56.tar.gz 29740 BLAKE2B 443e80e0dcc500f8fed843749a504a0064f3cec9845cbb6d40e6c49d5a29dbf1874e2e03bbfaf6d511049addd9b3ed26170143dea966087575ad0ab61874c50b SHA512 0ee208857d6ffa4b9e0eecea0a94decf6d3935041fad23a084fba195f2016a18f3409086eefa8c35fb5dd01697eb29e4af0607754bf1c52bef727b8b670242fd
-EBUILD sendEmail-1.56-r1.ebuild 626 BLAKE2B fdf6f94ba202217a5cde09328fb66172db6d5021904700248ff5a7755065139f809316f1414d895c44ae5eef887707f985306b56767525e366ae7352c3f126f8 SHA512 2202dcf199c12594e4b8bf77a3e4e7eeb8ca24075249d8f16fca6e6bfa99f5e3382e799c100c4eda0d6b0874a20ec50c0f22e4c93d0ebe199e8f80be3dd1865c
 EBUILD sendEmail-1.56-r2.ebuild 685 BLAKE2B 2c545aec355b5630b954b901c274c7bc60819a7e3ea695e01f55424839aba4ede354f1bf2ca061ed4a3e9d67074788600a9418d71fc31505c729fc0f2753327b SHA512 a6a295c2e1d232e8fbbe9a73b3b3235c1f75a89aa8aa395fbd7b8fda3c4b8e8b21bd28727a590f4fe22b6a19edfd3824bc046aeb044ac82139793ecaefd0b4c3
 MISC metadata.xml 689 BLAKE2B db187f3a6d6dcedcaa0663b47292173ba69945905800205b7a9e9b468e2313c9ce1c69f36ceb6ad838d47073158d5781b5836f4b3f5b42f3fb7200c957c461cf SHA512 61fa434f59304fa18e844d02a363c5fa68e33755108523f9dc27ee9cb7199bcc69113c37d1fb3c5e6503dc36614b75d00aa38a20aec46a39d0577e4965352ea7
diff --git a/net-mail/sendEmail/sendEmail-1.56-r1.ebuild b/net-mail/sendEmail/sendEmail-1.56-r1.ebuild
deleted file mode 100644
index acc2cc71391d..000000000000
--- a/net-mail/sendEmail/sendEmail-1.56-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P="${PN}-v${PV}"
-
-inherit base
-
-DESCRIPTION="Command line based, SMTP email agent"
-HOMEPAGE="http://caspian.dotconf.net/menu/Software/SendEmail/"
-SRC_URI="http://caspian.dotconf.net/menu/Software/SendEmail/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="ssl"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	ssl? ( dev-perl/IO-Socket-SSL )"
-
-PATCHES=( "${FILESDIR}/${PV}-overzealous-version-check.patch" )
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	dobin sendEmail
-	dodoc CHANGELOG  README  TODO
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e486d0294b03..90f0aad91461 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index c4a09a5d78c1..6634b152654e 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -5,14 +5,8 @@ AUX confd-r1 100 BLAKE2B e5f0e9ca77d9d3b30a0a59a755e286a914d1ed81a2afd47ed0fd256
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
 AUX initd-r2 1003 BLAKE2B f8e87da524cb10358420de9bc7e76d5b954cdfa70ba54637ca0b4653c1f718eebe77bbc3220003691d7163374f3af0aa4ca8568b76218d7214e2e498c2998f79 SHA512 f57c58074bbe1c35b748f94bf2a8a4aa10f8264e662b61c1178582f16f5e53c38941e9b2c2c0a46718ab8615ff426a887f64fe170da42b7aaaa9bb3c23a0fc00
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
-DIST apt-cacher-ng_3.3.1-2.debian.tar.xz 49772 BLAKE2B b864859e7f0ad5eba24b2f1ced74dbdb7a1878fbc2190863929f45534163c18ed2a67c4c75b5fe8011d93312ab9a67d899b09669e7aacb1ad3ae15a2bc1fba12 SHA512 653ca59c1d9c89a9586ccf963da480524ff8195222435e4a89f0c08ca64586e1993a92d00a05dbf738b0814869a5e6b539a05d1d59cb956e66b2dbe5ad95eeb8
-DIST apt-cacher-ng_3.3.1.orig.tar.xz 321996 BLAKE2B b630a31414ee86256f2e2ebe950b56d182d61dffd1603ce8387b5cd677d18fcda3ed17864bb99c253b11e2d29163b172c2d0bc91a3f5b14fb9f0ef321d656b40 SHA512 0d412e4a488fa4c55f1292c1fc7346bdf88228528455ce1d2ad20137ddb84df211a3bc5911c12662428335d8f624979d166b0ed31f74e466228df3ab108e67f3
-DIST apt-cacher-ng_3.4-1.debian.tar.xz 49880 BLAKE2B a49dc9ca415cd00f275f8aab61836ef002b9463a8ce22b2fbf1379ce908737d0df813e9d112e64667790e0c9c29ae44ca12291ff531fa565a30b0345c3970824 SHA512 49879c8786ba5aa6398ce43d733a71529a5c2a93a0e8e3e856bb7bf6d6dd0d8dcf9f6a96b291a3e77e0a71a9a990b5d0ade9134e5ec670a33592c9a1ab61a48e
-DIST apt-cacher-ng_3.4.orig.tar.xz 324040 BLAKE2B 0164ac35815fb42a2197830134172c4b93677f6ee6add71d115e975a3b8538db18e635fae2fe9556346229dc076c732b3b3f6fb9958e347fee8876f0f2363c9e SHA512 956366431f4671afd46f3bc0cdb9acaf02378606a7e210a190902e519ed25d2d102a336032c31fcc8b71c879bd219f249f411af732bfb6f9213e485ba6981c5d
 DIST apt-cacher-ng_3.5-1.debian.tar.xz 49916 BLAKE2B c01c96e5cf46fa3b8c46145b34976f3c4a3b545819719a8de517fe53a91d6f65c460bee59d98de750912d7bb9e3416804a088bdf274d74352c35f757cdeb16ea SHA512 8a543f94ef5e206be40070eb757c950ad6915cfbd6cacfadb5bd91070d14b4bb1c3c550823cd088c15335963587cc34d414518ae0013f6561996f855ccf97359
 DIST apt-cacher-ng_3.5.orig.tar.xz 325260 BLAKE2B 1cf19bd575d4e3d320f73771b31e98977417713d57ceaaccb8b6c0eff7bd5e02c99a0c197ddbc09d14d8f6a70799525dedfe1fbacb00357f65f0c8c4d540bcab SHA512 0bbc78c128d353ec2504f4d898d0ffb339778e98ab9899d48c61c094b15cafd92e430f864c82b66049578f5dd3c9e74fc5c09883231faeddce453be64e6f8954
-EBUILD apt-cacher-ng-3.3.1_p2.ebuild 3008 BLAKE2B 8c3d1f980c2feb4f9e66987bf31a2b3160b2e6cc01c1a679192575b1c4d2cc8e4b4fc3cb07dc4535a5fbb3252ac6311720b6197b8df4aee0e1b4416f697a691f SHA512 de16ae9ad3f8bcd68e672d8bec28e7cc57df6920e12aa1e21ebbe4ec85d8afbf4dd964e3d0c6e740df1b8dec5cf9e93d7a84f073ecc60108b034d81af9b8aedc
-EBUILD apt-cacher-ng-3.4_p1.ebuild 3008 BLAKE2B 8c3d1f980c2feb4f9e66987bf31a2b3160b2e6cc01c1a679192575b1c4d2cc8e4b4fc3cb07dc4535a5fbb3252ac6311720b6197b8df4aee0e1b4416f697a691f SHA512 de16ae9ad3f8bcd68e672d8bec28e7cc57df6920e12aa1e21ebbe4ec85d8afbf4dd964e3d0c6e740df1b8dec5cf9e93d7a84f073ecc60108b034d81af9b8aedc
-EBUILD apt-cacher-ng-3.5_p1-r1.ebuild 3051 BLAKE2B b491d278e3b6353d07e3f626a43f54f030921ee2782680e74b3c375a7fb55a96c16ae6b40678d3571a4c01baee5d7a00ad3ae4697c466848310d5b70a1b8e088 SHA512 04f2f4c75b0a8977f171dc3b27e974678d9218c7423b2cfa51139576a0a8a6c9713aeeaa62aa94daac320a615e9ef9d9f8d10086d30cd1fe498841c45d0568e8
-EBUILD apt-cacher-ng-9999999.ebuild 2830 BLAKE2B b8f25d69a78c7c2833ab73fb0cc18a13336af60747e276c2c0348659bb918f594726979184797312343fa3e4feb3582e23699198712b1ed76648b8f3a83ada79 SHA512 dece416e0eff684007f95d758377f9310ec03962111544c003375d552aa0cfde0fcfccebd208a763820a668c6e09fc844e39df67106260fdf7642b1831e06724
+EBUILD apt-cacher-ng-3.5_p1-r1.ebuild 2654 BLAKE2B 12fc9530aeced18d71bc4b4a23fd4b5315170d2b499e4354db49ec0e818694245eeed7db8fd36327093d0114dcba175793aebcaf8cb543526df22079166316db SHA512 2cb8a2292d56d00385c6e1566a511574316339e57c94d95aba3140fbf657b3c96275bea75b0c895a06438b9d6f34c75ebb79e6ff65b0b0ad115366aa89b71cb8
+EBUILD apt-cacher-ng-9999999.ebuild 2433 BLAKE2B c0c38e832d015dbefb62d4d661269567dc69e00247913e54155442b28b992d6b49d03489f97454390eecc11ee695eabf1817573c5f13e968a3c845707f729e38 SHA512 d58313380be4cdb7931b9ea5426996ce9b0380c13f474eaacde7aaa8ae448b7690bd41fc79feaf572f1902a69983d7c4fc000956fe05aaa7df8e291635724d36
 MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
deleted file mode 100644
index 4061fff1f9ca..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils toolchain-funcs user
-
-DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
-HOMEPAGE="
-	https://www.unix-ag.uni-kl.de/~bloch/acng/
-	https://packages.qa.debian.org/a/apt-cacher-ng.html
-"
-LICENSE="BSD-4 ZLIB public-domain"
-SLOT="0"
-SRC_URI="
-	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
-	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
-"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse systemd tcpd"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/libevent:=
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	systemd? (
-		sys-apps/systemd
-	)
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	dev-util/cmake
-	>sys-devel/gcc-4.8
-	virtual/pkgconfig
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	fuse? ( sys-fs/fuse )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.1-flags.patch
-	"${WORKDIR}"/debian/patches/debian-changes
-)
-S=${WORKDIR}/${P/_*}
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	fi
-}
-
-pkg_setup() {
-	# add new user & group for daemon
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_configure() {
-	local mycmakeargs=()
-	if use fuse; then
-		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
-	else
-		mycmakeargs+=( "-DHAVE_FUSE_25=no" )
-	fi
-	if use tcpd; then
-		mycmakeargs+=( "-DHAVE_LIBWRAP=yes" )
-	else
-		mycmakeargs+=( "-DHAVE_LIBWRAP=no" )
-	fi
-	if tc-ld-is-gold; then
-		mycmakeargs+=( "-DUSE_GOLD=yes" )
-	else
-		mycmakeargs+=( "-DUSE_GOLD=no" )
-	fi
-
-	cmake-utils_src_configure
-
-	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
-}
-
-src_install() {
-	pushd "${BUILD_DIR}" || die
-	dosbin ${PN} acngtool
-	dolib.so libsupacng.so
-	if use fuse; then
-		dobin acngfs
-	fi
-	popd || die
-
-	newinitd "${FILESDIR}"/initd-r2 ${PN}
-	newconfd "${FILESDIR}"/confd-r1 ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate ${PN}
-
-	doman doc/man/${PN}*
-	if use fuse; then
-		doman doc/man/acngfs*
-	fi
-
-	# Documentation
-	dodoc doc/README TODO VERSION INSTALL ChangeLog
-	if use doc; then
-		dodoc doc/*.pdf
-
-		docinto html
-		dodoc doc/html/*
-
-		find conf -name '*.gz' -exec gzip -d {} \; || die
-		docinto examples/conf
-		dodoc conf/*
-	fi
-
-	newdoc "${WORKDIR}"/debian/changelog debian.changelog
-
-	# perl daily cron script
-	dosbin scripts/expire-caller.pl
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/cron.daily ${PN}
-
-	# default configuration
-	insinto /etc/${PN}
-	newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf
-	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
-
-	keepdir /var/log/${PN}
-	# Some directories must exists
-	keepdir /var/log/${PN}
-	fowners -R ${PN}:${PN} \
-		/etc/${PN} \
-		/var/log/${PN}
-}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.4_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.4_p1.ebuild
deleted file mode 100644
index 4061fff1f9ca..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.4_p1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils toolchain-funcs user
-
-DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
-HOMEPAGE="
-	https://www.unix-ag.uni-kl.de/~bloch/acng/
-	https://packages.qa.debian.org/a/apt-cacher-ng.html
-"
-LICENSE="BSD-4 ZLIB public-domain"
-SLOT="0"
-SRC_URI="
-	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
-	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
-"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse systemd tcpd"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/libevent:=
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	systemd? (
-		sys-apps/systemd
-	)
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	dev-util/cmake
-	>sys-devel/gcc-4.8
-	virtual/pkgconfig
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	fuse? ( sys-fs/fuse )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.1-flags.patch
-	"${WORKDIR}"/debian/patches/debian-changes
-)
-S=${WORKDIR}/${P/_*}
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	fi
-}
-
-pkg_setup() {
-	# add new user & group for daemon
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_configure() {
-	local mycmakeargs=()
-	if use fuse; then
-		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
-	else
-		mycmakeargs+=( "-DHAVE_FUSE_25=no" )
-	fi
-	if use tcpd; then
-		mycmakeargs+=( "-DHAVE_LIBWRAP=yes" )
-	else
-		mycmakeargs+=( "-DHAVE_LIBWRAP=no" )
-	fi
-	if tc-ld-is-gold; then
-		mycmakeargs+=( "-DUSE_GOLD=yes" )
-	else
-		mycmakeargs+=( "-DUSE_GOLD=no" )
-	fi
-
-	cmake-utils_src_configure
-
-	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
-}
-
-src_install() {
-	pushd "${BUILD_DIR}" || die
-	dosbin ${PN} acngtool
-	dolib.so libsupacng.so
-	if use fuse; then
-		dobin acngfs
-	fi
-	popd || die
-
-	newinitd "${FILESDIR}"/initd-r2 ${PN}
-	newconfd "${FILESDIR}"/confd-r1 ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate ${PN}
-
-	doman doc/man/${PN}*
-	if use fuse; then
-		doman doc/man/acngfs*
-	fi
-
-	# Documentation
-	dodoc doc/README TODO VERSION INSTALL ChangeLog
-	if use doc; then
-		dodoc doc/*.pdf
-
-		docinto html
-		dodoc doc/html/*
-
-		find conf -name '*.gz' -exec gzip -d {} \; || die
-		docinto examples/conf
-		dodoc conf/*
-	fi
-
-	newdoc "${WORKDIR}"/debian/changelog debian.changelog
-
-	# perl daily cron script
-	dosbin scripts/expire-caller.pl
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/cron.daily ${PN}
-
-	# default configuration
-	insinto /etc/${PN}
-	newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf
-	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
-
-	keepdir /var/log/${PN}
-	# Some directories must exists
-	keepdir /var/log/${PN}
-	fowners -R ${PN}:${PN} \
-		/etc/${PN} \
-		/var/log/${PN}
-}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
index f118d28f0119..362e497b3c1b 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils toolchain-funcs user
+inherit cmake user
 
 DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
 HOMEPAGE="
@@ -31,8 +31,6 @@ COMMON_DEPEND="
 "
 BDEPEND="
 	${COMMON_DEPEND}
-	dev-util/cmake
-	>sys-devel/gcc-4.8
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -48,14 +46,6 @@ PATCHES=(
 )
 S=${WORKDIR}/${P/_*}
 
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	fi
-}
-
 pkg_setup() {
 	# add new user & group for daemon
 	enewgroup ${PN}
@@ -80,7 +70,7 @@ src_configure() {
 		mycmakeargs+=( "-DUSE_GOLD=no" )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
 }
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
index 6ae025935bf9..8ecaae37d3c5 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils git-r3 toolchain-funcs user
+inherit cmake git-r3 user
 
 DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
 HOMEPAGE="
@@ -29,8 +29,6 @@ COMMON_DEPEND="
 "
 BDEPEND="
 	${COMMON_DEPEND}
-	dev-util/cmake
-	>sys-devel/gcc-4.8
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -45,14 +43,6 @@ PATCHES=(
 )
 S=${WORKDIR}/${P/_*}
 
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	fi
-}
-
 pkg_setup() {
 	# add new user & group for daemon
 	enewgroup ${PN}
@@ -74,7 +64,7 @@ src_configure() {
 		mycmakeargs+=( "-DHAVE_LIBWRAP=no" )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
 }
diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest
index f1f613d7f49d..c27caf6e2472 100644
--- a/net-misc/batctl/Manifest
+++ b/net-misc/batctl/Manifest
@@ -1,5 +1,5 @@
-DIST batctl-2020.1.tar.gz 112004 BLAKE2B fdf99b97edfb1b65df3b6cfd3b99148e21a6fc201c5a6b2d2bfeedddfa18e22903b33811d8b9adf6d4a2b53ab9ca35602fdb90b48f97fb40e4edf9643264609e SHA512 b6f4b98a3a8450badf7d8dda2c23e0f91a1f3e0c6d9db96d220451ee4f2f5ea703206a888d504cc3b8594c4255a6ccea851e4da6d1c7869842a62ee0bac6ce8b
 DIST batctl-2020.2.tar.gz 112155 BLAKE2B 9d36baf4f728163b12d63bf2b690b75633119ebc22a734668aaaae97d9c0a37ac1906dec40f62987d7c9db2ca6b0c7867164c989f3f3f5834bbc5c562b842852 SHA512 4990eece371320107cd522f5dc6ff4ecd2867d8b77ddb8a09b8c8fc81c6cf2a88df6635f026b16a2c59fc05532a82ecafae206fb1581ac7e1f863043eb3afa93
-EBUILD batctl-2020.1.ebuild 776 BLAKE2B c4f8c8d552d170acdf25f7df69c2adcb9a4b503dca10b181bd91049f5ad19e852826c7b79db801347359d8e4be059d884986e3c2a28f2f10c2fdf7eb6f21b5d9 SHA512 e304e3cd4430036f204cbe55db9a4ecb8d0c59e7f62db45afd419f40658314df92a00c1aa7defa1f2c92e443ec336301dba826809730805b04a6688c73256693
+DIST batctl-2020.3.tar.gz 112394 BLAKE2B 07774836244120bde930afd6cebc20712e7a59571d19a6ea67a88a17e0779df51d221742cbbbee5c1ee086c7b75e8d5452534c971f0f08f081dd2d7f607764bb SHA512 fc93d4951e2aff91b9a5dd6c7f815bf1faaa08e861ab0116091fa796eaf95ba1b636fb057642b7ae7cef57832841d2a3ab8cdb2675ed372a303f8f5e16430395
 EBUILD batctl-2020.2.ebuild 776 BLAKE2B c4f8c8d552d170acdf25f7df69c2adcb9a4b503dca10b181bd91049f5ad19e852826c7b79db801347359d8e4be059d884986e3c2a28f2f10c2fdf7eb6f21b5d9 SHA512 e304e3cd4430036f204cbe55db9a4ecb8d0c59e7f62db45afd419f40658314df92a00c1aa7defa1f2c92e443ec336301dba826809730805b04a6688c73256693
+EBUILD batctl-2020.3.ebuild 776 BLAKE2B c4f8c8d552d170acdf25f7df69c2adcb9a4b503dca10b181bd91049f5ad19e852826c7b79db801347359d8e4be059d884986e3c2a28f2f10c2fdf7eb6f21b5d9 SHA512 e304e3cd4430036f204cbe55db9a4ecb8d0c59e7f62db45afd419f40658314df92a00c1aa7defa1f2c92e443ec336301dba826809730805b04a6688c73256693
 MISC metadata.xml 375 BLAKE2B 63ed1708614d32491216fb627a3f16a07a9de5d8d4925e2676a61744c5ec3a6d398ee838c8bbea0b5d50101d27383c9484c508dc2f6a9f4d953b67d8d2d93235 SHA512 6a83a787d099e17f964e466cfbeed9ae40ba657d21c9881c289ddd318572e292fb3202e95f413e2e3807f9f35201f40458dd0da74adf5af790dd44a0242bb8b0
diff --git a/net-misc/batctl/batctl-2020.1.ebuild b/net-misc/batctl/batctl-2020.3.ebuild
index dc9f33ff9204..dc9f33ff9204 100644
--- a/net-misc/batctl/batctl-2020.1.ebuild
+++ b/net-misc/batctl/batctl-2020.3.ebuild
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index f61edd99df8a..b45608fb93c3 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -4,10 +4,13 @@ AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a521
 DIST dropbox-lnx.x86-104.4.175.tar.gz 96650490 BLAKE2B 4a74e3b8b31ba720ade57b685978c19827e53dc2eaf4519e10f736121c08e61de66caf1211568c52f624fb020ed8ba5c69c2dbf053bffa9e95d6c9308214d87d SHA512 30dbaa4061f673137f4659f201b62cabff94c827175d00fc348140926a9afe6f693e17237642988ccbe27988eb0aba516705cca65340d59d1d1889784660901c
 DIST dropbox-lnx.x86-105.4.649.tar.gz 96974503 BLAKE2B b14cd6891afcd7858ae7564e4f49753a60a70caef6f0c7ff56ecfef54bf1cfee629fd99f069679d210a3e16f48ab0387ca78bf49f92b2fce40ba4cdb0ec147df SHA512 5dfebc03d76465bc6a6cfd9fdb551385e0fa0b50908c8f2fab90a200815a8c5d90b2294cd8d8ff00284668b4d3e09aba031d124680b6780f5269224ee2e25376
 DIST dropbox-lnx.x86-105.4.651.tar.gz 96975853 BLAKE2B 63c37c22475127d06e5cabd9234818d5a54ca6ebb76b8e53616bc6642b6d9045ad1c0b4cbb364b181b2ccbfc4f6905fe39ce2092cb97978288c6c7e5ee9db771 SHA512 e6c4d02c268753b06613206086f9b4a1ff10202a7bca914a071921407fbd276f6a21352d9b43861966fdafd7dc08181bb0654575fcd0c5b344bd2e8f16ab9a47
+DIST dropbox-lnx.x86-106.4.368.tar.gz 97028969 BLAKE2B 915bd80dd3c09cef04fe1d2099975f8d5852fa058925803081ce38741965e4abeb94b9baa941904294970e224830b48934619b3ad7c01966d97b92154b7e12eb SHA512 c1755b919893ff337defd67e453c2550900d9f0d0585ee96871ce03c8dd07d6682da17f2be4a80978c282778a79cd8b1d8e49abce51f0ae7ede522edbf8a3fd8
 DIST dropbox-lnx.x86_64-104.4.175.tar.gz 100702526 BLAKE2B 49d89293ce5874a01fba14204acfd1234de87b4c5e3f5dfa93cd4041f9412e0801a3e232869e376e583d46d56ea9c7635ec756f005903786dffce1caba608350 SHA512 74e4061ac00881fee06ab7f978c27a2fd0e782db7efa63d10ed7c5ce28a679fe23084521d46f819cfc2a691df6e5aad1bd6706d3c2d604d4addd50ddb99e1b3d
 DIST dropbox-lnx.x86_64-105.4.649.tar.gz 101001350 BLAKE2B e6aeef5bf38649fca5fba35a88080e905a2d16276927bf9ae5952fbc79e32fe7aac5552b7a53fe3cc59170d0af711f2c9c412da8a4539f7bedea6cea47986b03 SHA512 b6f3e766ee9e2b138624bab5ffed9365163b8d33017cce27c9e0beab2b2f500288e6283c59da8a96421daca36b1c6e46925658b6ffab1fdde43efc92ccf1ce18
 DIST dropbox-lnx.x86_64-105.4.651.tar.gz 101001773 BLAKE2B 9cb07111fceec62b34faa7f9b258e9c60f63c7d3828986f9fe06e27c9df24da00d77ec61eed0318c33453a7a4254e89946504deb8e9c1078204a508c2e9ac7df SHA512 8ffdb4682950a643d3230ae07c73a2b6e862051d700af021cb14152b681c7d01164e821b2fd59978612aaf12843084912aae9d0a6fa127d2fcc01e49908a1c5b
+DIST dropbox-lnx.x86_64-106.4.368.tar.gz 101043233 BLAKE2B 781beb485914fd73d63ad5c909e43dc4ee24c13674c069ea51251ec0d63f731b13e4199c0cb1e536e485170375ec77664adf1ab11999f04fb1a9d864b7e5447c SHA512 08ce3b7e13d8ecd26212fc533d23e900b635a834fe4550dcdc50fc6a7852f0f372e6dd797b1f9553fb73545a78567ed60b8c503d50db00574a9729db3a8565be
 EBUILD dropbox-104.4.175.ebuild 2611 BLAKE2B bf627000c6058defb57ece27ca2ff7a496b98942a896c39d8fa8064c916052d4692c6c9d7ff82ebfea4964ee34ade283a6454d918f906d27a1a80b1c8b6daf6f SHA512 16776b54f81559f301424df3a1c6f8f5526422e07857ce8acf62e1d4be2195532190e69f734c673539762ef25d4077f90b1223f640616fcba52552509300aeb1
 EBUILD dropbox-105.4.649.ebuild 2619 BLAKE2B 0d69bf03e5039bdb5ae193deda12ab1a77c7acf20622f90075d14e61be8b019b8551ec3727cfc37b2d36fd6eb063697840b983f42b3b03fe5efc5b87d61f0cd0 SHA512 aad780d3b5e3daac4126915cd1622025d1734dc83af04f3eef8965cc2c5948298e3c9fbb0dd173d846424a8a09d490150a6f5b69c0e23116fba6513854563bb5
 EBUILD dropbox-105.4.651.ebuild 2619 BLAKE2B 0d69bf03e5039bdb5ae193deda12ab1a77c7acf20622f90075d14e61be8b019b8551ec3727cfc37b2d36fd6eb063697840b983f42b3b03fe5efc5b87d61f0cd0 SHA512 aad780d3b5e3daac4126915cd1622025d1734dc83af04f3eef8965cc2c5948298e3c9fbb0dd173d846424a8a09d490150a6f5b69c0e23116fba6513854563bb5
+EBUILD dropbox-106.4.368.ebuild 2619 BLAKE2B 0d69bf03e5039bdb5ae193deda12ab1a77c7acf20622f90075d14e61be8b019b8551ec3727cfc37b2d36fd6eb063697840b983f42b3b03fe5efc5b87d61f0cd0 SHA512 aad780d3b5e3daac4126915cd1622025d1734dc83af04f3eef8965cc2c5948298e3c9fbb0dd173d846424a8a09d490150a6f5b69c0e23116fba6513854563bb5
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-106.4.368.ebuild b/net-misc/dropbox/dropbox-106.4.368.ebuild
new file mode 100644
index 000000000000..7286be94a2dc
--- /dev/null
+++ b/net-misc/dropbox/dropbox-106.4.368.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 5f6636f5ed94..6121e0bbf7bc 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -5,5 +5,5 @@ DIST electrum-4.0.2.gh.tar.gz 4395620 BLAKE2B 27d5e74ea85d792f73a01d41528dc9a84a
 DIST electrum-4.0.3.gh.tar.gz 4408020 BLAKE2B ba28765683739dbdd865ad9ed034c7dd7c4f738fdc13fbb1b0c0312785d89a65c0252354fa6064d9964207ebef841dbbeb324966ad2d0b8ec26d693456d4a082 SHA512 4295a7ebb16d1809ca892a736a01e62722d3b44164b3acda4bd4cd5935dfa8c77106ddb9e32434db057d90d015d786b667949fe17d0ebba70cf6c13be13cf2ba
 EBUILD electrum-3.3.8.ebuild 1982 BLAKE2B c1db2a13135b445b0ffd37779025868fc2446039a527988052d10dd48e0e5fff86e0e04f6373ff4d12a3e0946493c1496677404e8b35643a1847da149cf2db9d SHA512 9f9844b2ca4b8a76d3de83684860c9f840d4da10787478c579d3cebc1d026c8d4989ec0ce8de0a976d46771597723653485604d4eb85427987cba2c3364f3e61
 EBUILD electrum-4.0.2.ebuild 2400 BLAKE2B 793cf0cb19ac8e0b2a75dc3563580a144fd6364104687d74980daa1caf5478041223494f8318939130e0f1f19984977e9b78c5617400c1716f3655c3f4a71c43 SHA512 0b7e7fd953a9823299667c8931792e9ef4ff814bc6fd0bf5da48ae1f99ab7d62a4e9f79ac27942f988a05a8c3b9c0ef00dd32182cb0b2fe27803e03f359f5c74
-EBUILD electrum-4.0.3.ebuild 2401 BLAKE2B 61166fb3e0040f3f42993c96aefe0f42efaa2eb8fef85074780ec74cb387f6f280b7c8494f044378d0344dbb8589ce702c1d5dd3edfcc527f7d605dc1f4ad09e SHA512 57ba5a3b51e08dc84981fd76889a7af9774ad51f3a81c298846d45ace7d070cf7b15792a6b6837790dc9984a9c3cf881af09b0ff0eba473ff08bffd7186d2b83
+EBUILD electrum-4.0.3-r1.ebuild 2402 BLAKE2B 0049acbc9a0a618dfc2d9be7e7cd637bbf020e19f161e2235b17514f19e43f2f9ed7e29f65c93f946f4a4b14c5523ee417149b25b1fd09871d537b13caedd31b SHA512 c42acd9643cd26b9fcc32a880e7e8db211ced5b3bba22e7708bc7a0c019b6cdf88eaa4b9759b137365b39bad2e003403da46b92e6b839c1b020c7eb978ab38e2
 MISC metadata.xml 629 BLAKE2B f1a4cf6cae2c3471b946b9a2966b0b3c8e7c2d39ce124fc100142b5d79d27377939094bb5b3ae9a7ff6c947b93ce12a38e3075e77110f1cad9a246e03159fed6 SHA512 c8e37976ca6a16a8d7f2326ff6d276814b5c4f5b7c1f39becb7a800f10b0c6aa7333d15f0d208a1ffd592b46db887dc77e95ffb5d1e01eea1ebfe6c478c8dfc6
diff --git a/net-misc/electrum/electrum-4.0.3-r1.ebuild b/net-misc/electrum/electrum-4.0.3-r1.ebuild
new file mode 100644
index 000000000000..0ed6a75d3617
--- /dev/null
+++ b/net-misc/electrum/electrum-4.0.3-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="
+	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libsecp256k1
+	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/bitstring[${PYTHON_USEDEP}]
+	<dev-python/dnspython-2[${PYTHON_USEDEP}]
+	>=dev-python/ecdsa-0.14[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${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-3.12[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+	|| (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+
+	# use backwards-compatible cryptodome API
+	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.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-4.0.3.ebuild b/net-misc/electrum/electrum-4.0.3.ebuild
deleted file mode 100644
index d6cf011a4580..000000000000
--- a/net-misc/electrum/electrum-4.0.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 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
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	<dev-python/dnspython-2[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.14[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${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-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-	|| (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-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
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.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/grive/Manifest b/net-misc/grive/Manifest
index 47e75566dd81..626f5c5977da 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -1,7 +1,9 @@
 AUX 299.patch 3435 BLAKE2B 04b4c27800ee95e185aff83e1fd2453c30559fce7034a42821482cac9b4d409d3945813fef736e7adb744b9d865e31afab60c6ac457af968d7dbc319872ad5ea SHA512 b425c524b28a3e245a4de6090b052a2b1e08a06b5b8227450f91a127d4ea67cc8b1f3a74ac802f1525126d236fa1ad2de0a171ef0fa241ad27b1164606ec0501
 DIST grive-0.5.1.tar.gz 169929 BLAKE2B a8f8fc9f3bcf019b7b713178f6a39ca6c62f6531054329d4ff8ac6fbfdfa5579f9e51aa8f9c493b90005194c3ab77934575e541c0986404a32e807c5c87c4cfd SHA512 609837fc93ad78d143dcb4d1f558743d413c887fec2e9aaac81edd58549b812db859aab5ce7f664f06564779cff4bae32d43529e47fcc36640f1a9b52c5b5888
 DIST grive-0.5.1_pre20171005.tar.gz 164450 BLAKE2B e8fde261ec419c1284575032ce326de4953ecf7b4824a70aec07b41f6013b4d26532ba0eae3897c910bd5bb51949dcc13fcb699013557f24c38c75fb251e868c SHA512 d1f2b3bb5206aef3afeebd48f198a287f97a016f5da00f954fbdcf366ea7178c0e2c6e48250cdb0869bc850380ed09790b5bbdc1ecf3cdd7b484fcf9b85c793c
+DIST grive-0.5.2_pre20200205.tar.gz 170384 BLAKE2B dac8d75bdefe0c206f443010093e73b34ae8257a5ced87917cca240fb7134a6aac8e5f018eeb7bf7dec46d5043e144efb2c9586ca2b5ff55a1d0fe022f72675a SHA512 d1058649d2a3dce773eab53b1704c5dd8bb1998089099ed9c3bacdaa5d3f995fa08c1b2c2b723bbce0efa2c9c04729d97aade6df6130da32f975e2bb45f339e6
 EBUILD grive-0.5.1-r1.ebuild 787 BLAKE2B 7737e8622f3779d8a121b18bd09fd3717b019576fa1ada046dc104e3f23445b297d749bf6a3557b58a212839c6611c916e872455890be7aae01be1cf1ffdf574 SHA512 41bfbcd2dc7038d879db312b4701b4bd37cbbb8fa065a720dd5de71903aac8745c9ff679e96df1accd9e316badb1e02fd4562ff734fe52e79c53f2133f054dfd
 EBUILD grive-0.5.1.ebuild 756 BLAKE2B e2d3f071ea93435ba19516baa1a138d6312f794133a8ce4edb811dd601daf7e129e73c13345c843d9a5c0af9346351d5c70df775a16d572f42c02913b8f82a77 SHA512 9e9c1fd7d8c34de9615f6a93af74caad6dbb5fe632ad4417aa7571a683099a3c3b8cb40dd984d6e57e2ca29473780e9bd0c3080c6c9cf6a569af68c1e179de08
 EBUILD grive-0.5.1_pre20171005.ebuild 810 BLAKE2B 75622d38abc90cb36ac0625bc113a4ae3e1841768d0392e24d45ffacd06c593ad96d4b366fad8f22d725eafa2bbb7324c9851f507c7af30660ec06202c1694f9 SHA512 d29f8d4cb9b1775b600469592378b0785de1dcc8a6afba3e142d95e47a8b3064576d1c2cd070f13b7fd9d14e0c668d2ebd67b9c153df91ba23036ba25379cd66
+EBUILD grive-0.5.2_pre20200205.ebuild 804 BLAKE2B 52c46fe6396ab3d8cbefd8591f6b02ca5dfaa0815812ddc5cdb284fb0faca5a160755a99ab94ed87582911baa1e920f1902ed3abb6fc41fffcf9c73e45cfcc74 SHA512 cc872fbc59c008773dc275eadf339db3f4d4b6ff92d974f1af55fd7f6f681ac238bc67c32db900d467d224ae294623dd5875ceb799bffc7bce06a7648eca5d26
 MISC metadata.xml 329 BLAKE2B 29317b0c9304da834a9876bf09262b2e6d8664978ec04973bfcb6b196efa71d3405f758176662a2af32b780f5819cf4980a4ed21f079609ed8b50109a176a438 SHA512 532fad0c5d87182dc633286d564f01cfe82a455b8514e2147de1bcc366d3d6655917936bedfb5ef8182266cd9a270efbe0e77fcab654b1472c244b260d2b3997
diff --git a/net-misc/grive/grive-0.5.2_pre20200205.ebuild b/net-misc/grive/grive-0.5.2_pre20200205.ebuild
new file mode 100644
index 000000000000..fdaaf8147839
--- /dev/null
+++ b/net-misc/grive/grive-0.5.2_pre20200205.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	COMMIT="ffb744a59b1496f86ec71581345355715d846f7b"
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	dev-libs/yajl
+	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest
index d2a02317b74d..17b516cb2e9d 100644
--- a/net-misc/ipcalc/Manifest
+++ b/net-misc/ipcalc/Manifest
@@ -1,3 +1,6 @@
 DIST ipcalc-0.41.tar.gz 21599 BLAKE2B 3b54df9bb38fa42c9b11d1192a8e23e6cd7c9cdadc07716f8ec2322f8ff60f6098b89727b6c08d8d0c810974a8f046c0487910073db3390b803802820453d9b7 SHA512 089eb2b9a38b07caa182ff11547a93d86aed570311fc8cd9e636c7546ab4d15acc854b9d79bbba9c797dcfbbedd1d6f4d521aec97bf613905fe5198a29c9889d
+DIST ipcalc_0.42-2.debian.tar.xz 6144 BLAKE2B 7fa1e32f9c713b4f3dfa8636f9bb4b0bd70e09e3d02e71f1f2186e8e2ab381638eb33e63c24f41dfa948db11b7e877a147d22363d105ac26e98ff509d1cd0aa2 SHA512 6b7049bc5e27e22dbbca12913716757cb3f5b91d0a8f729d35a67971c763b0bea8ab65c24fe31ad43755aedb68650c1d8b3f3e770228ed6517b43e83735086ec
+DIST ipcalc_0.42.orig.tar.gz 25903 BLAKE2B 5abff0f234829ef84345645634f1b12287456c26a42cb65856f26ac12699d5f100a2ef432a6d19627f72d800e65257d46bc0edd8ec1bf4054dcdf843d2ee158f SHA512 4e67ccdbb7e42ced39ee8ac83e47585d400c1b0a26e74a909c2e29e7f2256e37b06855cc29f0272b71c5ff6bdd8252e2563ad89562cd8d04ce0fa032f6f3fb34
 EBUILD ipcalc-0.41.ebuild 527 BLAKE2B 667a37107ed4f346d4a4f7b9f9c2b909a38dd90855ed336ffe7766668bba206229a856c2aba26f6edb36e474ecb00a509fc04185f238d72cdb788d6d5f0c75f4 SHA512 10133935b6510c91944acd7ff5b43e5dfce8eda29fc7ebd46aad529537da2d2d9414ddacb0b86d7451e9bfebbc8b8eeb577dbfe7a8631d79e3cc07a7f97101d2
+EBUILD ipcalc-0.42_p2.ebuild 761 BLAKE2B b090c2dd74ae6246ccd081047c9b58ba65a9869ec02d163dd3804d8999f4d50e66b3c7ff2c0852e117cc0d9c8ac2a017cd81a07c9e140df9df59ddf96981d143 SHA512 49ba805421d69ae6a5e59d62b8b56880b676105fa2eaff7ade7a81198b37a858e77670a2486d7a952acad03b1ebb70c3a2c3d5b828210c0eea99cc62d5c105df
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
new file mode 100644
index 000000000000..832a7b9c5242
--- /dev/null
+++ b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="IP Calculator prints broadcast/network/etc for an IP address and netmask"
+LICENSE="GPL-2+"
+HOMEPAGE="http://jodies.de/ipcalc"
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+SLOT="0"
+
+RDEPEND=">=dev-lang/perl-5.6.0"
+S=${WORKDIR}/${PN}-0.5
+
+src_prepare() {
+	eapply "${WORKDIR}"/debian/patches/*.patch
+	eapply_user
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc changelog contributors README.md
+}
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 51ba387b70c1..0c5061b598df 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -1,5 +1,7 @@
 AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46764c5b7b59a62776c16c93d4112821159835e9d9f174f2af443c0d07a10823b41182910d12899947 SHA512 5ac723cb5b3d3f8bb97989cffb174f22566fcebff304e40f12ca5144cfa94b00614fdf6925e2c5a1dd0f8fa533aac12e991bad0d0909cbdd90a9b7ed73e0c296
 AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191e29fa99ebb7d37b302578e492f705d4f724744ec3a9ca455730f01294e2a781529c3750193fd8e84cf50 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade
 DIST minissdpd-1.5.20190824.tar.gz 37300 BLAKE2B 3a04f6af0af8ce5d26e4860ceafe2c52f1ee562f179094fbcba3485c85ae75b7374fd7fa8f89ec6d9ce2a10bb94120618de40e0191fc7ecdd1e813a2b9c5d6af SHA512 79a14482b69a88b778e484a3b3e98964c420ff7576ac818ba60fd5e07f5b31754cdef3ee00d9189ba0a33f0268f11acd1f7c4222d8d0958920d1f568ec7755e2
+DIST minissdpd-1.5.20200928.tar.gz 37860 BLAKE2B fc80660ed84198d08d5879e276a0b5ab49c66344c8841f223990f704b6ebf70c8411da1d84ec51a9f69285a6b5a804ebe6b197555f5684d55cd0bf3abe250704 SHA512 e44142dcec4d0d4029a9d93748a8b3edec5482e2313d290956d3829b04e3637f6ba81292f27effad8829b29bb59f7fc43666338a8423d683ca6daa5807ea6362
 EBUILD minissdpd-1.5.20190824.ebuild 675 BLAKE2B e45aa1fc469be382e2b90c22d1af62522ebcc4059e89bc6a902fb7c25c0f07b3c8a2655b7237b3ac77f4aeca36681dba6d94cbb09f26c0a7dad2b4919def5342 SHA512 ca94ce5f8c01f040587ae4772cf80d3fc2977216d9d9e897c9cc0e62019e23c52619c77eba8b5ecb4faa2f5ba2d731ce0d16fbc84207e1f678cec9dcda2c58c6
+EBUILD minissdpd-1.5.20200928.ebuild 769 BLAKE2B e1f593ce0c940c315e92d516281747d103d7ee3de6fac8ad24ce443fb7cf9c60b7479d8ccab0624dc002e504ee52deb1398703f0195eabfcf26b7af8b0ca91c9 SHA512 85e3d092f256e8a15bfe44a62b3e8cb1fbfcc7635ae1a5087224c3ca7e689491dd2434fc76a623233ea86ff0b3a247fd9854ed14a5b2022c3fc341a9851bdf00
 MISC metadata.xml 360 BLAKE2B 7e083fa0362b52310ab298a0684308dbe220a6f6acb7b99c99cf6bf22cb9406da9d34e021a367d50eaefa67f133c5b57f01d4b63aa46887ea15bf4c66ad5e5e4 SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855
diff --git a/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild b/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
new file mode 100644
index 000000000000..fd2d7685e495
--- /dev/null
+++ b/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 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_configure() {
+	sed -i -e '/#define HAVE_IP_MREQN/{s:/[*]::;s:[*]/::;}' config.h || die
+}
+
+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 efd87c3d4e11..075e6b8fec6c 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,5 +1,7 @@
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
 DIST miniupnpd-2.1.20200510.tar.gz 245426 BLAKE2B 17b5335bb4cfb55a517c1f0aeb1eabd7515c729480ee737a8ba525988e59f067e18d2de78393df2ff62cc15201a742d17a17d5632601c1d98ea2a943dcc4a393 SHA512 36a5d1844075a93e76f13aba8820b3747bcc8f562c8cbcc562f991ac154e91c951b5caaa9b7c7066cf80534066c3ee6e20a066012b830143f0a7352cb9f5d71b
+DIST miniupnpd-2.2.0-RC2.tar.gz 248756 BLAKE2B 428f353496f4410ae2ddce96d8edca1d4addf4f77c1e794ba48b5ac7fbe12368f994d91c04eb5d54fbddd24f5e6d36aa87e4cfb4f60b8e3f08f3bf96b5b7f094 SHA512 17dd31477c018f3f26b05a9ab5370819f763bcab6c00f3bb13ea87bc3781f5dcd190e294837b85a9e41b4fe7d1bfa0b475ef8da2f1fa48c3fe357c284f585508
 EBUILD miniupnpd-2.1.20200510.ebuild 1843 BLAKE2B 94c397a041d7d7b6bfbe31691e1b7bf41f8f653eea88ff9f463b02f3a325e9ffe834c430a9ee7b80b90884c05b2d07d65bf206096e7cf09fa7a73deaf2f9dcef SHA512 ef68c939cb847d712c7953c65e9913b9ede642c9f1aee5b6ea92975ae3193a376ff8562ecdc804d74774d81ff22b7136dc3048d6a5bb1fb3c738311433298c1a
+EBUILD miniupnpd-2.2.0_rc2.ebuild 1877 BLAKE2B 8932e7d747cb064f04d7de06e51649a344cc2feebed2880c8a9afef85deaf62442b7c94dcfb5653a19cd2e080c1e14abf0cadaf9f8c69b84cda72305933f166e SHA512 dd355469690c59df2a19b74f75d58aabd0cbbc3056d53628fcef599be5bfb2db2c2a8d981f913db2a9dbbd51b6a5708ffd3a45d36246b1e66377fcc27c84236e
 MISC metadata.xml 902 BLAKE2B ec10dab38256289a3445ad960eb869fe01ad009e21f77e61ffa4e45cac71120df285461cc3515de395918635b8f76a5448d761f9644172064e1eea79aa926947 SHA512 931799b28d6b7b1676d7ed0b94ce6760b550087785885635cb03c656c20e51c810a75dd8d675e17e5b8fdb87e7909f2a972ba11e168310eef4f58efd0a065135
diff --git a/net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild
new file mode 100644
index 000000000000..e80efef5db1b
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 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/_rc/-RC}.tar.gz"
+S=${WORKDIR}/${P/_rc/-RC}
+
+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_configure() {
+	local opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+		--firewall=$(usex nftables nftables iptables)
+	)
+
+	# custom script
+	./configure "${opts[@]}" || die
+	# prevent gzipping manpage
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+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/nemesis/Manifest b/net-misc/nemesis/Manifest
index 297252fb021d..6df3739e1f91 100644
--- a/net-misc/nemesis/Manifest
+++ b/net-misc/nemesis/Manifest
@@ -2,7 +2,10 @@ AUX nemesis-1.4-fileio.patch 975 BLAKE2B 6f955ef14cff07d34ea5693a9dec680748d50c5
 AUX nemesis-1.4-fno-common.patch 4632 BLAKE2B 3a5352f58eaed5cd0120142c482551d15fe94a5660153c45c2ea79deedcf2fc535f4986a33a7a91fb21eb5f7275f762e8c800ac9e7f137932bf961e1b4b81d84 SHA512 e45442fea4d9f904a848e2529d401b296bf9c3d68e27ec464b6ce3160c49d73f96514d5211186158c8cbc0e9b5c2bc4d1a6cc1eb94d2301a4209d9c48f14cbbb
 AUX nemesis-1.4-libnet-1.0.patch 4627 BLAKE2B b2ab0e2c72bc24729912d60938dbd0f06ea7f93d78f0431baacab136b1a892ef8c5b0c1d6be96d03940b45aa8d058b05853db7f35832d7bbc53fc988fa019968 SHA512 aa94f7b9db756e636b671de2e0f56bcc145b73f808ef907d1f8965c78e8fd025a69e684d693a3095a751d6a3433c3f34c43c753624c0543c1c5b45bbb1c69eb9
 AUX nemesis-1.4-prototcp.patch 1287 BLAKE2B 0d50d3258f8a1c80cb9622c05ec8611e6f90491fc2d045c9a792630918f8bb73776555ce7714b6d5a2f0ee79b54d9d842db8f0ab3482b6d1fb18a92fe9fd257e SHA512 89f5bbd0506ff6ee15823631c254b9dc7049eccc31f9882485a6e07a9686f8d96f84ef7b56e366d1f3fccb302db9383b10ed3a17be3508a8ab4a001809e7876a
+AUX nemesis-1.7-fno-common.patch 2057 BLAKE2B c40c2b9549237432168f22d8d4f1903f4b6772b02466616df6b0951a7c6451ccd2adeb103a1931bfb82c7b1df78ff320de137ae0d522806e203ae9a7f7587377 SHA512 0d62b46676c3ebbe2e2bc8636a4d14de52ab9f94f8b67e86b7bcf3546a62b59503f4e1f23a18f25358bf0315983474f5ae602d87281802c30de00645ee56e700
 DIST nemesis-1.4.tar.gz 144187 BLAKE2B 9b16fa37283e4a659312bbd24e5ab850cf11cbee9c598f9e57bda517f462448a0a74721425144ec00afb2cde5ba86fcb020d2d7dbf4d6df688b67f7c282d9d38 SHA512 a8d4b434a9b0287e704ab923900c43051dc3aac4a7063e702aa93d7c89cfdeac287a6f40138bdca140e2c889e024f885288c4953940104ac12631cf7394501c8
+DIST nemesis-1.7.tar.gz 93423 BLAKE2B d46d19ae46852ea5a5f745b719779f3e4fbd77b918c8f53eaf743beb53d3ee345fa1663350d98095519481e819c5174fbe41b356da643b0aff9a2d5825494436 SHA512 6085cb91535c895325ca04e7583b29df9073731d8bee1d48ef46d09d25042d5220a73b2d02d77b4101de649877c0a2d0f4af5c06f125389fbd97c7350449134b
 EBUILD nemesis-1.4-r1.ebuild 626 BLAKE2B 0b7f3379705788d1873f67005011e0e6c8f54fa2ca7e96f22524ffc1ad67545e4e286991fd829db4a72bdfb0f9d22dad5ebdf93ff7537ffbc138e80490f9856a SHA512 d54b880507e5cfdc71fcc735d404758ffb9f466f1a633f410431ac2555b515238d35f76774ebf311f9378cddecd2c4feed9b1d00b596d36c1d7dde8756e652fc
-EBUILD nemesis-1.4-r2.ebuild 666 BLAKE2B 14e7e14141dbfff3fc419d00beaf5728f992bbd423ea772298dccb1c4d7b4839d0e9ce309c94352191569e93a135387cd509a4ec61f2fa483e62c13292ad17e6 SHA512 395dbb43b21367dc634319c8ba94f3f9461bc8e3f31cee318366066d4ea0709f9bca74be5848dec0210530844ac724c9357df1c3a14550953f84cf750e620ddd
+EBUILD nemesis-1.4-r2.ebuild 686 BLAKE2B 4379f65cdc3a45a0a9cf64f26e587e2591fbe9e50033ec5e525af5872e3485982d8c36ffaaabfc3031d3382b8c6c417e47ebb45582eaa8e66d3e2819e89e13e5 SHA512 ce6f875a66a18c5e4d0c7d2cb1774aceb6d10d7d17b6fc8d723715ae6a5c872ddd701b3709705148607ec14b1e08cbcd15e5ac4d1d781af0c38ee3420b01d2ce
+EBUILD nemesis-1.7-r1.ebuild 624 BLAKE2B a914021deacc4e92d24e8ca38754cf0525fd51b9dbd06e6243786700120d4e78de1e472eefc16868898e68b23b7da4feab788cf21792cd2f724b8db21bb66c38 SHA512 07ced0bdda5f237c5ae691c24d497c03ff62eae19a6a6f025c361466e8be244914d25eaa577a7b0c7c9a3558bd80eef4300e245eb386a042ed30345d5f4b8f66
 MISC metadata.xml 291 BLAKE2B 41178dcbae1f81d0bc5a8cfaacce0d5bdf65648775430d1b8828e3875e7322c7de7537983852485f3a091380a72b964e82f4cac91dc2281f1291662abfacd72a SHA512 7e39bc9868b0b6603f3a48d7905f47745656f96334e6fbaa66e314a6dbfb0c63e1ba33cbbc63fc61f8289fb756105dfd6cf9b990c113a8569a9997af29d2c2dc
diff --git a/net-misc/nemesis/files/nemesis-1.7-fno-common.patch b/net-misc/nemesis/files/nemesis-1.7-fno-common.patch
new file mode 100644
index 000000000000..fba7641a493a
--- /dev/null
+++ b/net-misc/nemesis/files/nemesis-1.7-fno-common.patch
@@ -0,0 +1,86 @@
+--- a/src/nemesis.h
++++ b/src/nemesis.h
+@@ -164,10 +164,10 @@
+ extern int         verbose;
+ extern int         interval;
+ extern int         count;
+-int                got_link;
+-int                got_payload;
+-int                got_ipoptions;
+-int                got_tcpoptions;
++extern int                got_link;
++extern int                got_payload;
++extern int                got_ipoptions;
++extern int                got_tcpoptions;
+ 
+ struct file {
+ 	uint8_t *file_buf; /* pointer to file memory */
+--- a/src/nemesis.c
++++ b/src/nemesis.c
+@@ -10,6 +10,9 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
++int got_payload;
++int mode;
++
+ extern int optind;
+ 
+ static int usage(char *arg)
+--- a/src/nemesis-icmp.c
++++ b/src/nemesis-icmp.c
+@@ -12,6 +12,8 @@
+ #include <pcap.h>
+ #endif
+ 
++int got_origoptions;
++
+ static ETHERhdr etherhdr;
+ static IPhdr    iphdr;
+ static IPhdr    ipunreach;
+--- a/src/nemesis-icmp.h
++++ b/src/nemesis-icmp.h
+@@ -39,8 +39,8 @@
+ #include "nemesis.h"
+ #include <libnet.h>
+ 
+-int mode; /* ICMP injection mode */
+-int got_origoptions;
++extern int mode; /* ICMP injection mode */
++extern int got_origoptions;
+ 
+ int buildicmp(ETHERhdr *, IPhdr *, ICMPhdr *, IPhdr *, struct file *, struct file *, struct file *, libnet_t *);
+ 
+--- a/src/nemesis-ospf.h
++++ b/src/nemesis-ospf.h
+@@ -43,7 +43,7 @@
+ extern NETLSAhdr    netlsahdr;
+ extern SUMLSAhdr    sumlsahdr;
+ 
+-int mode; /* OSPF injection mode */
++extern int mode; /* OSPF injection mode */
+ 
+ int buildospf(ETHERhdr *, IPhdr *, struct file *, struct file *, libnet_t *, int);
+ 
+--- a/src/nemesis-dns.c
++++ b/src/nemesis-dns.c
+@@ -12,6 +12,8 @@
+ #include <pcap.h>
+ #endif
+ 
++int state;
++
+ static ETHERhdr etherhdr;
+ static IPhdr    iphdr;
+ static TCPhdr   tcphdr;
+--- a/src/nemesis-dns.h
++++ b/src/nemesis-dns.h
+@@ -29,7 +29,7 @@
+ #include "nemesis.h"
+ #include <libnet.h>
+ 
+-int state; /* default to UDP */
++extern int state; /* default to UDP */
+ 
+ int builddns(ETHERhdr *, IPhdr *, TCPhdr *, UDPhdr *, DNShdr *, struct file *, struct file *, struct file *, libnet_t *);
+ 
diff --git a/net-misc/nemesis/nemesis-1.4-r2.ebuild b/net-misc/nemesis/nemesis-1.4-r2.ebuild
index 12ed858e34a0..0d74247451fd 100644
--- a/net-misc/nemesis/nemesis-1.4-r2.ebuild
+++ b/net-misc/nemesis/nemesis-1.4-r2.ebuild
@@ -23,10 +23,10 @@ DEPEND="
 DOCS="CREDITS ChangeLog README"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fileio.patch
-	"${FILESDIR}"/${P}-libnet-1.0.patch
-	"${FILESDIR}"/${P}-prototcp.patch
-	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${PN}-1.4-fileio.patch
+	"${FILESDIR}"/${PN}-1.4-libnet-1.0.patch
+	"${FILESDIR}"/${PN}-1.4-prototcp.patch
+	"${FILESDIR}"/${PN}-1.4-fno-common.patch
 )
 
 src_prepare() {
diff --git a/net-misc/nemesis/nemesis-1.7-r1.ebuild b/net-misc/nemesis/nemesis-1.7-r1.ebuild
new file mode 100644
index 000000000000..f34383cb354c
--- /dev/null
+++ b/net-misc/nemesis/nemesis-1.7-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A commandline-based, portable human IP stack for UNIX/Linux"
+HOMEPAGE="https://github.com/libnet/nemesis"
+SRC_URI="https://github.com/libnet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~sparc ~x86"
+
+RDEPEND="
+	net-libs/libnet:1.1
+	net-libs/libpcap
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS="ChangeLog.md docs/CONTRIBUTING.md docs/CREDITS README.md"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7-fno-common.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index f9ba7ab388e4..7df3d3a5c97d 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -20,6 +20,6 @@ EBUILD networkmanager-1.20.12.ebuild 11088 BLAKE2B 0dbdfd04968daad96115958bc1340
 EBUILD networkmanager-1.22.10-r11.ebuild 8778 BLAKE2B cfcb2044f5f9d7bfef67cfda7d58d032ca9e2cce7e9a0ee0fd64caa9875c6f6873a01823f4b56a1ecd25680dba145bf5688c580f5c465601eaef0313ebf65381 SHA512 a271e30d97f2effe6b12a168c10e4a898bb0c4105c73525db4c864cb9ab0b2a2bc3241a74f22f74fa7f1a5d6d99fdbbc528be5c28c77a2cd1adcfc159ed1e7d4
 EBUILD networkmanager-1.22.14.ebuild 11203 BLAKE2B d1a13257f060d03c6ff000777b0b04e422511e2c5c9f4ebf31ad49932b9b3fd47e3ece8850541c21cb70c2091381e130914a6660ebd815535122e6d864e54beb SHA512 7302dcc4bebee3787879cbb1bd6580e883d79d93e3e54a929106dd0ec4e607f9e957730db21e6851d2ef28726d636f47c12d2f52f44e1823cc20923e4c04a4fe
 EBUILD networkmanager-1.24.2.ebuild 11148 BLAKE2B 850dea825fca18780b8110ae09d61b07902b8fcbeff67cff7bd359e2e06a6641b2f3fc6e3b0ce7ab3ceaaf03fab3baec31d8690e380db4e8a85a11c5e9ed7f0b SHA512 bf1f69b2fa2656683498501d1705c249ac317dd19f729d17b8c82db643311d65056b8588714b22b330e694ee44340526771f052f76bf2ddbc6545f00531fe25a
-EBUILD networkmanager-1.26.0.ebuild 11143 BLAKE2B 79448029bf09bfd17122b94cb8854a0833595669b81f87dc8fc87100d0e3bc06643a8e7eb46ffcae998006bc37ba869bcd07155d859e8bf95466f142aa16f89f SHA512 48d3b4864a1c1fa6620c0d39c5b1eaf9b2dcb3ed7b642036e968943f8486e210a0e2cce56c8d7613e78980bbd74a6e0b4b7d4ac686897ca207863f1a6ccf7028
+EBUILD networkmanager-1.26.0.ebuild 11142 BLAKE2B d90518063b598948f8e2e738ed8840c2f343447ed5e94fa5013dbf9a990e232ffd261da6ad2a97d6d7567f32563292fc145e03ff92e78cec3015e3007187348e SHA512 ff34f2ab285394818399535fdda1d3e3752c72cb1c6b4bb0c5aa6ee97e5c46c1ad25fa6016f14d4deacdcef79aa207c51710cf74aa9d460312b0bd168d7de665
 EBUILD networkmanager-1.26.2.ebuild 11148 BLAKE2B 850dea825fca18780b8110ae09d61b07902b8fcbeff67cff7bd359e2e06a6641b2f3fc6e3b0ce7ab3ceaaf03fab3baec31d8690e380db4e8a85a11c5e9ed7f0b SHA512 bf1f69b2fa2656683498501d1705c249ac317dd19f729d17b8c82db643311d65056b8588714b22b330e694ee44340526771f052f76bf2ddbc6545f00531fe25a
 MISC metadata.xml 2274 BLAKE2B c7c338380ebe7344d1d41d83b843e33388d890fc497301657519643eeb63d3f0b739d367aa27ac3a5826c36bdea9f0b48c588d1779872337763f5aaa810a1107 SHA512 bb57e8de13843938e7218c85631be6796a6976e88da2ccb9197c0495e655f639a54ec5aec61c04c59564132876850f3e56b9b40a6de8a0420388345fe38c7e89
diff --git a/net-misc/networkmanager/networkmanager-1.26.0.ebuild b/net-misc/networkmanager/networkmanager-1.26.0.ebuild
index 771b8834bf2c..e3cf77c51fed 100644
--- a/net-misc/networkmanager/networkmanager-1.26.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.26.0.ebuild
@@ -27,7 +27,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
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index f1b12ae3db50..d7a6b0ab679b 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -2,7 +2,9 @@ AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c3
 DIST nextcloud-client-2.6.5.tar.gz 19134736 BLAKE2B 12defed7dc9a23622d49228c2e78586533f51d1cfd6209e263a0a8b94d307028b1afa76004768432a2bee68140602da003ef10133cd166fd3443a0a45ccccabc SHA512 fcb8ac368e064f9e9ffdc014faabb4f308045d2b047e1011e17bf2e54fa61f462f529eb48e5ec2aa638df8d9720bd7b88acef9b26aa3ba2b90e8977b3be45462
 DIST nextcloud-client-3.0.0.tar.gz 19060293 BLAKE2B 80c53e2db30c9a3a8bae8673a937448915010f9d736836a99660c498c0afe0f3e5d78faf80df4c2214f452c41c9d92357a341f00ecb8f4720f6c459a9d2ccb30 SHA512 5b03ad99feeb16dd7d22399df624da98bf6f2e758337aad5b4ff21f25e39e44d94fe0451101cbc8100e43adbd4a39f8d1bac64881d9e39ef3de58b018ccd35d6
 DIST nextcloud-client-3.0.1.tar.gz 19059671 BLAKE2B c85f9d1627a75745c5a450b1c59799716c17dad3ba5ce277a62bebbbb80f243236cb4d529ff8ce4af9371c7ab1948b5a86dfaa3fbeb9de8681c9df0f397044f7 SHA512 9d6f3d8977f411942703a2dea8990a5b37ef8892b142292720915f5d1937b0443e9cb8c17562eb30a16c31abf30efc023bbb9199079f3a9ca47bdfa51ea5f3a5
+DIST nextcloud-client-3.0.2.tar.gz 19114545 BLAKE2B a6aa041708d110fbdca082476e65ccc8fec189948aa64020a27beabe2d7b3df474ae3313b5aef0e15f3498cf974cf414eb4934417cea206b021e4e212351a088 SHA512 188f878457baba14f01ca6c0f83100bcc64feaf5e3da86903d59d8b7c553c89f88252c1410cd153952950f91429af680b1901f3f9de951bfd06a06c176d44e7d
 EBUILD nextcloud-client-2.6.5.ebuild 2013 BLAKE2B d2108ce06b9c25a56a13852fa5c8809217db7537346bb803311f5c034f483bcd050b8cb617c9bacde98b9e012cd91a2f130aa471b4190e013dca263080bef290 SHA512 338a289d30bbfb89619805425032142052860d86f415338d5e66e13ca05d6ca02d0ef0a41a41e5d889ce7ced734dc9a5ac50bfad6d00ed8b1e9fdaa0fc05df4d
 EBUILD nextcloud-client-3.0.0.ebuild 2022 BLAKE2B 7ee522c834b3e1ce046177e40c071cb15fdd940fd55b9124e22d9849f8ebf5c70c7a2a97003e1c707508b532c6c551dc7c6a11989182a2ad51b22fbdc07de1db SHA512 33858e8b186394ec736534eda2f972ce72c2c4fa57e489c2aeb78f70115d8f0bbb05ebf66c8fc5084af4539cd383981ce4264987297eed689dc3497e7e271a41
 EBUILD nextcloud-client-3.0.1.ebuild 2022 BLAKE2B 7ee522c834b3e1ce046177e40c071cb15fdd940fd55b9124e22d9849f8ebf5c70c7a2a97003e1c707508b532c6c551dc7c6a11989182a2ad51b22fbdc07de1db SHA512 33858e8b186394ec736534eda2f972ce72c2c4fa57e489c2aeb78f70115d8f0bbb05ebf66c8fc5084af4539cd383981ce4264987297eed689dc3497e7e271a41
+EBUILD nextcloud-client-3.0.2.ebuild 2088 BLAKE2B ad2d12f37cfc2d314b9b5a310eef4772874da94bf21385c1361d9cc1be8b9c6ff4787d94c1d7ea8b3dc1f015d68ff8acf21c8e894727413ae04e728fff683a36 SHA512 3e9d8be0cedb7549051b33b80aa85f17599e5cdd67d32b42aae1e17b223c9a0eb55c5eac14102ee4474e921ebb7aed3b43b100fb9d267c40b3ba91a96361b450
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild
new file mode 100644
index 000000000000..2c3d246de4b1
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin libressl nautilus shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	!libressl? ( >=dev-libs/openssl-1.1.0:0= )
+	libressl? ( >=dev-libs/libressl-3.1:0= )
+	nautilus? ( dev-python/nautilus-python )
+	shibboleth? ( dev-qt/qtwebkit:5 )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/desktop-${PV/_/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 7eaf4afbaeef..5790aa6deffd 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -6,5 +6,5 @@ AUX oidc-agent-3.3.5_makefile-toolchain-vars.patch 1342 BLAKE2B 4d2db2bc1711bcc9
 DIST oidc-agent-3.3.1.tar.gz 764721 BLAKE2B eea09b3b140ca81be0f3dc8f200120287682ddb328275be35bd736249b72eabb40c87ebd168e51c992ccd4b4a02138e17d3e20f3cebfb4d42bde01351aacead1 SHA512 75428bb52c0cf43256fddd3b33895d7c882ced367543763c68a385448dbe29805ee1fc035f3727e743a607ed4af851ae5db24b40cc6801fc31e45b6fec16bd66
 DIST oidc-agent-3.3.5.tar.gz 766803 BLAKE2B 4998820283d38e3cee76ab7c308075b74da735f6b2c05ed562c5d61006c5ba85f1c44d7e2c0bfb5e4ee60017835ecf331f8b82a45aa5d0105b7933eeec1025a0 SHA512 c58d9e61a99bf870ce4be0e4fde3faa90b8197d0714626412d162c2e09cca18df734a062b792f7fc92323b50677c64df4aeda5ee42a5ea4e44731ad0e15c8030
 EBUILD oidc-agent-3.3.1.ebuild 1480 BLAKE2B 0f4b36ef804e8bcb36f348ce49f2a68a624662eec6458f395e9c8a10ede2af28a6521c41807c42067d8c5dd0aff9e2fa6a7491644a5db082418b11bf9941e362 SHA512 e54e1cfc67d08ff943fcc89f9fa38e9a8f414af084baa8804c0ab2ee6d6a99a084f0a6e7e0be34c8f87ec78ac0a99f6b9ddd4fa80d52ee8f3d273736ada0b10e
-EBUILD oidc-agent-3.3.5.ebuild 1380 BLAKE2B 50b1b9e0cfca7bf9835c17b535b0893dc8092ea4abd2d9473d8aed6c86ad52c8edbdc1b0acf6108d8a91cd030ac1b76f81186307570a508b35b0e0341769d4c1 SHA512 7bc53811699355c369c1d0d5575e62c81c33aa76978a3f1fd5a8738edab8faad35fe6b32a39714f1613f6da720c14bc44ba945fda202a9ee0dbf5f56d3287104
+EBUILD oidc-agent-3.3.5-r1.ebuild 1542 BLAKE2B 4f652745197d9c2146a5d1e0b40985f58bdc88d51105c82f5c03927d6b34c64c1b07b51a3a91b8b75adea36240a3ba9906547024c09edc5a8c8e6dd9238bf28c SHA512 b6d223d502492a7c7f3a1227e6110baba3a6b0e5f3dc873401c8de2771101fa7e56837cebd2d50a1120bffe6a6963adf6f5be26c1bd8fb4ec4f841ac84680625
 MISC metadata.xml 779 BLAKE2B ef7a040559363a8012380b3f8568f963a612078c2d5e5129f54db724d414d6c7864e79e480eba5574fd36847caa13a09a7ac7013f5ceb406d83e3be5ebdb47e9 SHA512 f9465b4e88418ec276071683b5abbe8f7601e54daf0cb74da2d24d142e2307b1bb994ee4191eee48ed1b3fef724ad49b548cef12cc4c77088c2f2d07e1b8a776
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
new file mode 100644
index 000000000000..5d92fd75b2cc
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic xdg-utils
+
+DESCRIPTION="oidc-agent for managing OpenID Connect tokens on the command line"
+HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
+SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="app-crypt/libsecret
+	dev-libs/libsodium
+	net-libs/libmicrohttpd
+	sys-libs/libseccomp"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-libs/check )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.1_desktop-category.patch
+	"${FILESDIR}"/${PN}-3.3.1_install-perms.patch
+	"${FILESDIR}"/${PN}-3.3.5_makefile-toolchain-vars.patch
+)
+
+src_compile() {
+	# Parallel building doesn't work
+	emake -j1
+}
+
+src_install() {
+	emake \
+		PREFIX="${ED}" \
+		BIN_AFTER_INST_PATH="/usr" \
+		INCLUDE_PATH="${ED}"/usr/include \
+		LIB_PATH="${ED}"/usr/$(get_libdir) \
+		install
+
+	# This file is not compatible with Gentoo and in any case, we generally
+	# let the users load such agents themselves.
+	rm -f "${ED}"/etc/X11/Xsession.d/91${PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog
+	elog "You should use oidc-gen to initially generate your account configuration"
+	elog "before it can be loaded into oidc-agent using oidc-add. For details, please"
+	elog "consult the man page of oidc-gen, or full documentation at"
+	elog "    https://indigo-dc.gitbooks.io/oidc-agent/"
+	elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.5.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.5.ebuild
deleted file mode 100644
index 8c424ae08feb..000000000000
--- a/net-misc/oidc-agent/oidc-agent-3.3.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic xdg-utils
-
-DESCRIPTION="oidc-agent for managing OpenID Connect tokens on the command line"
-HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
-SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="app-crypt/libsecret
-	dev-libs/libsodium
-	net-libs/libmicrohttpd
-	sys-libs/libseccomp"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-libs/check )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3.1_desktop-category.patch
-	"${FILESDIR}"/${PN}-3.3.1_install-perms.patch
-	"${FILESDIR}"/${PN}-3.3.5_makefile-toolchain-vars.patch
-)
-
-src_compile() {
-	# Parallel building doesn't work
-	emake -j1
-}
-
-src_install() {
-	emake \
-		PREFIX="${ED}" \
-		BIN_AFTER_INST_PATH="/usr" \
-		INCLUDE_PATH="${ED}"/usr/include \
-		LIB_PATH="${ED}"/usr/$(get_libdir) \
-		install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog
-	elog "You should use oidc-gen to initially generate your account configuration"
-	elog "before it can be loaded into oidc-agent using oidc-add. For details, please"
-	elog "consult the man page of oidc-gen, or full documentation at"
-	elog "    https://indigo-dc.gitbooks.io/oidc-agent/"
-	elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 8cf41ee202fb..b3756a8a7701 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -42,5 +42,5 @@ DIST openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff 42696 BLAKE2B d8ac7fa1a4e4d1
 DIST openssh-8_1_P1-hpn-PeakTput-14.20.diff 2012 BLAKE2B e42c43128f1d82b4de1517e6a9219947da03cecb607f1bc45f0728547f17601a6ce2ec819b6434890efd19ceaf4d20cb98183596ab5ee79e104a52cda7db9cdc SHA512 238f9419efd3be80bd700f6ae7e210e522d747c363c4e670364f5191f144ae3aa8d1b1539c0bf87b3de36743aa73e8101c53c0ef1c6472d209569be389e7814d
 EBUILD openssh-8.1_p1-r4.ebuild 16480 BLAKE2B a5e5d62c92081c5295cbbe035a83da2def0cdf22bd13da5621108d642f5537fd8c0c88849639267b0ee345c67926b6de44dd195e51bd56fdab15200eb5be7081 SHA512 a62ac99608dd98656ccf03834026af28f279eb635d7852fe2b0aea42f0d83ee0c776b63e48b14f09aa5c746ef7647ab2069edd151384ab8a2c260580ebc70873
 EBUILD openssh-8.2_p1-r7.ebuild 16906 BLAKE2B 8cd3c1a0712ebc989497e7f45b39551d07ee29928f5c64719c96cd4d1ea460259fdf437d828827954961596c4255041a65a0965db48e62b63bdf4d48c313e882 SHA512 ce10e972fa022f40ed1800eedf9f946322a993d1183a22ddd636f819da6a000594d1602a89bb4bbc7788dffce2d4a366013ac29a2ac09f1c09588ccd62965f90
-EBUILD openssh-8.3_p1-r5.ebuild 17417 BLAKE2B 85b03f36185181d15570cab52910a13bcc679bbd16b78ccff41f6c28375d04c5ab03f95d6eb0dd8b9643fff3f4d8425a8e1bf2dd668c91e663bc67a16ad758ab SHA512 e40ec9459844b1838ba887e4c79180e8df87537397eddcf5ae6a74a352321168c9c69f5e3a220c5019f31627cc88f0732763fb9f0ca511ccc5568bd3a82f40eb
+EBUILD openssh-8.3_p1-r5.ebuild 17637 BLAKE2B 53dcc07031b2379c21ad59ab66f118a048b3b2a3843ae024e473c334e4ba2975caf5756340a77a9ea7989bc040e6b3b1edddde9ecb7b3f6f1cea2e37a7406e35 SHA512 54ea55d5e87cf9beaeee2f9e8d289117200c841581ee7372eb6f0acb8c84c4d81bfc265eb7d15186494c19c3f700b87208d5a9ecbc6d41e57a0aa785239daae2
 MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f
diff --git a/net-misc/openssh/openssh-8.3_p1-r5.ebuild b/net-misc/openssh/openssh-8.3_p1-r5.ebuild
index 86300b9d8105..fffc55544f4e 100644
--- a/net-misc/openssh/openssh-8.3_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-8.3_p1-r5.ebuild
@@ -290,6 +290,13 @@ src_configure() {
 	use static && append-ldflags -static
 	use xmss && append-cflags -DWITH_XMSS
 
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
+		# doesn't check for this, so force the replacement to be put in
+		# place
+		append-cppflags -DBROKEN_GLOB
+	fi
+
 	local myconf=(
 		--with-ldflags="${LDFLAGS}"
 		--disable-strip
diff --git a/net-misc/portspoof/Manifest b/net-misc/portspoof/Manifest
index 4449dea48893..cb43adec2ba9 100644
--- a/net-misc/portspoof/Manifest
+++ b/net-misc/portspoof/Manifest
@@ -1,6 +1,4 @@
-DIST portspoof-1.1.tar.gz 399119 BLAKE2B 7b6c7c39ed39e69acfdf14e91c3b4148e03a0ac574383719ee8ef984f30c6240f3cc09bca28485751f64a4dbd6b62554e85ef8352ea3f03265490bb6ea0d12d3 SHA512 ff78058d66aa142e34f70c6759bf04bfd69c5149e294803c41837276646fad21eea2d20b9eb1ba897e2fbd5f57f65b3a86fecb8ebbc25cdec7d31a2f7997f91b
 DIST portspoof-1.3.tar.gz 401187 BLAKE2B 340e7003e3ad36afeb53981d0628d13ec48afd9260fdd9f17b76b904b3da58d82dc23b455da24567545d60b29f2f358b11f4a07e83ae2192470fa40099f93c1c SHA512 8d537ecf2ae5de8388c2b9b7210a2d38fe614e525a2ba286321fcf3b237f0888e59bb79a80056e49cf7f850be8ef274e87f04597a50dc1b86350bbc094e8be6e
-EBUILD portspoof-1.1.ebuild 588 BLAKE2B 8803d0b9cddbbba432fd98b244bd48f929ab703be0ecec0a731af99fe2869137ad8c3ce216d5b10e9ca2b3b02038a7a71f78d6c64942cf315a1535f95dca0d3e SHA512 811b5d10336441119c8d0d1f48d45fed962221a2652d46971884b8fd8bcd28cc49b7f93bbe2653bda3ed53ffda70a18f801a8c2f47da11fd4a1f07700dd94070
 EBUILD portspoof-1.3.ebuild 913 BLAKE2B 595f2ad48fc12cc18f08cbc63f07af62ec35e8f18885e2337792657ba94941d981395a4d7ca7ff319ae230a368acd1661c7a50b9e4904872dbca1230ed11d76b SHA512 0dd22701c48035f16eec96e50147cc35a8b3b24fcec0136711c6309eddb8a711cce7a774e3f40b2c1162469ad76eda3053a615f620217707ee75833ab99ea34b
 EBUILD portspoof-9999.ebuild 913 BLAKE2B 595f2ad48fc12cc18f08cbc63f07af62ec35e8f18885e2337792657ba94941d981395a4d7ca7ff319ae230a368acd1661c7a50b9e4904872dbca1230ed11d76b SHA512 0dd22701c48035f16eec96e50147cc35a8b3b24fcec0136711c6309eddb8a711cce7a774e3f40b2c1162469ad76eda3053a615f620217707ee75833ab99ea34b
 MISC metadata.xml 328 BLAKE2B 3aa60baed442cec358463ee0f0755d4c6582b8059ae8c02417145ca8a723a5a6bf7ddc3de999b519128a4cea0fb2257faca126809115e3079f284c4094bc70a3 SHA512 328a86e4be2cc8a6de438e3684832d6dcfde5562581d65ddb88b68a56aa980be8b838f93ce9925accb239dd7d2fbb67249661b55db7631b6fd7906b0b63aedd3
diff --git a/net-misc/portspoof/portspoof-1.1.ebuild b/net-misc/portspoof/portspoof-1.1.ebuild
deleted file mode 100644
index 40f7b22b52d1..000000000000
--- a/net-misc/portspoof/portspoof-1.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=5
-
-DESCRIPTION="return SYN+ACK for every port connection attempt"
-HOMEPAGE="http://portspoof.org/"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://github.com/drk1wi/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/drk1wi/portspoof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 9bd0b16def92..611ef58f0634 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,3 +1,3 @@
 DIST seafile-7.0.5.tar.gz 706430 BLAKE2B 49402de13660bcda9a6fad35879bd0e9ba4e491e921525a9cb16498f833d0d8e4177e615afa95780da040c9617d2795a3aa97ce389edae54621d8079033fd24e SHA512 c51c5f3f4a4b316fdf21d8eec12d42e7e1c76cf1271393658dd447c4b0ba77e6149eb7770a99af6aa23f6ebcb1572f4b847f8de44320d8bae8960bde7f429920
-EBUILD seafile-7.0.5-r1.ebuild 1070 BLAKE2B 630903597a5ac4f4ac6f198e4ce2ecdf105f07c9f8f34e98435a7b546decec5db448796b227a3265ef0bb60781b5c5e686244eed355b59b2e6b8299c087a5412 SHA512 4f1008cfee991a89a778ab614d7d08babc38248422a80b22a8ae544008e480f5cf55bd460bba4d66242d9ade3a8b10c2689646d3ec14b2afe46876fcb9cd4b24
+EBUILD seafile-7.0.5-r1.ebuild 1081 BLAKE2B ccdf5d4f62b5c003452a1c0ef131aca64bd3e7e2d049ed47d7cada452b5638bdf28b336fc081d625c3c913da394bac1059db28cd4f76562c7679a42ecd5fae7a SHA512 c2617b833851e452bc549936848c34f0941c1b123da09633bfcecd191e6d43d3716ea1f76b5215020ecc1a2e73cc902dc245eaf39fdaaf242d33c5f9eb61026b
 MISC metadata.xml 246 BLAKE2B 982e99661e8894a8808c39c6ee396fbe1fcf4430ad6a4c820b357c5e96f45e008d92d3319734f94c7403b926bc7befaf231037e832bc3521952ecf9bc42f51bf SHA512 71bf99d5820faaf9004a517dffec80e1a2240e31b0db7449f672b68926c0e229cd710670468e95cf305d6136edc5e2d825e597d4648a90f68929bf8d82a1d61a
diff --git a/net-misc/seafile/seafile-7.0.5-r1.ebuild b/net-misc/seafile/seafile-7.0.5-r1.ebuild
index 10233ae8ba17..7b2a3788f56b 100644
--- a/net-misc/seafile/seafile-7.0.5-r1.ebuild
+++ b/net-misc/seafile/seafile-7.0.5-r1.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 
 src_install() {
 	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -delete || die
+	# Remove unnecessary files, as recommended by ltprune.eclass
+	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
 	python_fix_shebang "${ED}"/usr/bin
 }
diff --git a/net-misc/sipsak/Manifest b/net-misc/sipsak/Manifest
index eb5c7769ef1b..24194ee02df0 100644
--- a/net-misc/sipsak/Manifest
+++ b/net-misc/sipsak/Manifest
@@ -1,5 +1,4 @@
 AUX 0.9.6_p1-callback.patch 490 BLAKE2B 398728ea4fb79a0c8ab2e1920f08186df358bb7924674a38526432c487d453b4a679b731692cc06cff0e10b76b3558462901bf367993d0dbe90bb0d9dd8e739a SHA512 c10dec8410143ae5fee3b78fb65a83494e5b2539c41f2424455fdabce73a780e78ca159ce2e579db5e2344882e7472abd3f884f76863241218745451108fce4a
 DIST sipsak-0.9.6-1.tar.gz 158776 BLAKE2B c8bd37d63d55bc593a57455171ed2dd26c8a4e87746be7075af7c2912b400d49a44f25fad694e296c75ea9aa3e7b10cc81a457c448a3a9429a41d22b84fb794c SHA512 c2d62ddaf2ecc9616941cf002a0494d2f9c43747e6b527f8b1542e9b5ae143fc69b18fc140bd3f255896b0e8eb02f7d198cc1799a4041e2d0c95d90b653591fe
-EBUILD sipsak-0.9.6_p1-r1.ebuild 713 BLAKE2B 43166e8df8a2ad2af8e6a50f32db19665b5fc05bedc81b92540a3c2b0eb01ed79a2df4082adaf02e1ca678a03030fbe7327a4f0712f49fa49d301a738c6a252c SHA512 2d876a88048d9248aeedea7df1d0e1ff00cc9f8c5dc3cad14b9e19d4d7d95e86f16bf317c91260f513a22826b1e02774a67168faa46b058bf1117dc13ef66959
 EBUILD sipsak-0.9.6_p1-r2.ebuild 758 BLAKE2B 865664393847d687882c8d49b2bc833aa614afe0d5ef3aaa1633c591d791f02c08bdf72339c4a249f34810cef55028f5dd58fb3543b49e8ac31e46810eba41c8 SHA512 4503bf957062070935e67e2814d9d4f06731b81171865ff7ce09895e1d23ac85ca59ddc0cb8705b4dfb2b096f719c4fde1b446fe42f02ee23b6e7a4b6f73289b
 MISC metadata.xml 303 BLAKE2B cc764a44b688e208776c7e99220318ff09e0cafc4b49a9b8e1d105766425f7c4fe59d85fdee39601ef066d59669eb8e6259cb755f997d400e1a8e13366a2bc55 SHA512 82474d39e280eff65aee9c5d4ccb9bb513d56bb2d55b10b8f49b161d505387ab351d3228d0253a40c01a9c4f5f2c5104bb7f2c41b227b0aa653350e6facf07d4
diff --git a/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
deleted file mode 100644
index c82636600396..000000000000
--- a/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="small command line tool for testing SIP applications and devices"
-HOMEPAGE="https://sourceforge.net/projects/sipsak.berlios/"
-SRC_URI="mirror://sourceforge/sipsak.berlios/${P/_p/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gnutls"
-
-RDEPEND="gnutls? ( net-libs/gnutls )
-	net-dns/c-ares"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P/_p1}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-callback.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable gnutls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-misc/ssh-askpass-fullscreen/Manifest b/net-misc/ssh-askpass-fullscreen/Manifest
index 2e28cb5bdb47..0ca82e5a5789 100644
--- a/net-misc/ssh-askpass-fullscreen/Manifest
+++ b/net-misc/ssh-askpass-fullscreen/Manifest
@@ -1,7 +1,4 @@
-AUX ssh-askpass-fullscreen-1.0-libX11.patch 845 BLAKE2B d968d7f1abf69cc5c0fd3c72c690bca1e547b8f0a58424c59ce20c1570c5151b5313b18396f1462804ab0598672129ad31eb3036bb3590304eed733df69b18f9 SHA512 cbf89dba7398f735807f841f4df8534e8918c09e95bca43d4fcfe451e5697194712f723a081830eeccc01e5e389cb8ea319401e80d68365c3763c8294dbd69d7
 AUX ssh-askpass-fullscreen.1 2542 BLAKE2B 495c6ff6e90156962f697b4d4ac4a3a12e99eeee07f04a2d5420d08b3a65226b33cbdf5d16f3e80c720dd31dd0d284ee1c4c05e18d00ec896592ddfb89ec6f6b SHA512 84f28b5603a15a4d283b0980b4bc0dafd0c0eb3b889a579d51dab69577fe57eb0854c30adf358423731d2a2543647e28c1739bca04a77c8217299d6372f8d45e
-DIST ssh-askpass-fullscreen-1.0.tar.bz2 69301 BLAKE2B c47e3123f94504162cec237d6c2ff61825b655efaa9bff2710650cce3e2cb45b10ff842c4d88002461ab51c410dd9fc748ee4cdca7cea56e67bc22497b427e7b SHA512 272b7d8bcbfb997530afcb6c619180b625e6753e1dc86cba30f30fa594cd71ec8bfc522b0fb8aee5842cb7a4532a00fc1e0954def9ac81a1b521360d7140f52b
 DIST ssh-askpass-fullscreen-1.2.tar.gz 101597 BLAKE2B 86c632f83d99ed3d6934b921e499fdb75821659d5b54d380a9d7b04355b93602a481e94320d795b614f2e4c67e7a3ffe1e8380065840e31cb9f5e29c5ae8a75d SHA512 478ae81d8d8b174f9a7ba8f7071aca80503ee3ceed945f12fc44f69d08df4ede010de64ab96cacc901b5b29f4a0e4efb86c220e40f2903b8a4306acc4381f88d
-EBUILD ssh-askpass-fullscreen-1.0-r1.ebuild 978 BLAKE2B 4b30f111c943406b8277e8c2ab0aeb0e50202e71932fa29a6ad13e857275d3afc810a54e5746960dabd99ea1850e4ccede9516331e61f8574cbc1183398a55b5 SHA512 e284b3d0629ce7290fe1c6710809c2095e1b56203f2c94ec67fd1c4163074b3d7590263880ec513a13b2b522544d60b7f66f57510dea1f5daf74506442b0c1f9
-EBUILD ssh-askpass-fullscreen-1.2.ebuild 966 BLAKE2B 4f54a2a6ad99e91ca22f17acfdc3394d417f2f2e8f7d31bdd1e3e1d3f101b2729c7e1981664822fa955f4530ca24f15b22524421faf09caa5a53485eb424e369 SHA512 44795b1d72b00bf66ac248285cf38a567527c2205543b7f61f0a2825076fd80d72b72b3041540c229394c2b8bb53fa85ebca141f07a12ed1856e8bce859189d9
+EBUILD ssh-askpass-fullscreen-1.2.ebuild 965 BLAKE2B 1d122f4b01249363c7bd08afc56bf699d578a3d7d3409c21033f6cfd899ea5e67850917acc1136103f0eeb4fc6ef64f746a0fa258f2c0788b090399a997c4a84 SHA512 248b82cef128623d5e45c852809cdeeb4884f448e6c0947c5360586ec83e5cbe08c983bdf0667e221e5ad84275115fa1e5a8a8f637eddd7901ad948c5d5850d5
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-1.0-libX11.patch b/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-1.0-libX11.patch
deleted file mode 100644
index eadf2639b7a2..000000000000
--- a/net-misc/ssh-askpass-fullscreen/files/ssh-askpass-fullscreen-1.0-libX11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 313871922aefef489115967d634f991edfaad39c Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 12 Oct 2012 17:10:02 -0400
-Subject: [PATCH] Explicitly link to libX11 for XUngrabServer()
-
-Prevents underlinking failure when using recent ld.gold and recent
-versions of gtk+; see https://bugs.gentoo.org/show_bug.cgi?id=370019
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8f46279..01e36dd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,7 +8,7 @@ AC_PROG_CC
- AC_CHECK_HEADERS([stdio.h stdlib.h string.h unistd.h])
- AC_CHECK_FUNCS([memset])
- 
--PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.10.0],,
-+PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.10.0 x11],,
- 		  AC_MSG_ERROR([>=GTK+-2.10 is required to compile ${PACKAGE_NAME}]
- ))
- 
--- 
-1.7.12.3
-
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
deleted file mode 100644
index d8646cb79125..000000000000
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="A small SSH Askpass replacement written with GTK2"
-HOMEPAGE="https://github.com/atj/ssh-askpass-fullscreen"
-SRC_URI="https://github.com/downloads/atj/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.10.0:2
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# https://github.com/atj/ssh-askpass-fullscreen/pull/1
-	epatch "${FILESDIR}/${P}-libX11.patch"
-
-	# automake-1.13 fix, bug #468764
-	sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-	# Automatically display the passphrase dialog - see bug #437764
-	echo "SSH_ASKPASS='${EPREFIX}/usr/bin/ssh-askpass-fullscreen'" >> "${T}/99ssh_askpass" \
-		|| die "envd file creation failed"
-	doenvd "${T}"/99ssh_askpass
-}
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild
index 211cecc3e3b2..07e2e0b9e2bf 100644
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/atj/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.10.0:2
diff --git a/net-misc/ucarp/Manifest b/net-misc/ucarp/Manifest
index b9246c305f3f..7b6b21198e9c 100644
--- a/net-misc/ucarp/Manifest
+++ b/net-misc/ucarp/Manifest
@@ -8,6 +8,5 @@ AUX vip-up-default.sh 132 BLAKE2B 01d0976bc4029250a481ad22db0432b62604030ed2d6d3
 AUX vip-up-default.sh-r1 131 BLAKE2B b0067bf6a9c442fe536564fc50f589be00caf7dbacfe1bb2370d467a5f5e706a548bfb5db8d2f5d21bf946ab543e0a2f84c74d07d737772c70713c583ec551a1 SHA512 d00a2acaa44567f936e029af96a841bf815b75e18f5d2563800e996acdea68ef3265e7ea7b67e7cba3fe671e7809ec905e9cc39ad5fe2c807170cfa1fa6595ff
 DIST ucarp-1.5.2.tar.gz 429089 BLAKE2B 2e30b5c2f1f4e51662e9dab0e3b32eae636fbaeb533df2c8753dd1df8199101aa75b146bda1035fd77b0d209617eb9eb1d3a8b2fc4bd5089e6c1478c4a821ef8 SHA512 568ff2061e59d314c72a160ccb42eb099bf7cdf04bc30f405b5b62322dff3ceb4fa037c2b430fdb4cee25f0dcacf9309a15bd814b4b70b640840400bda20b253
 EBUILD ucarp-1.5.2-r3.ebuild 1247 BLAKE2B 067f4cab17d51e15ffc2abd8407450ded183e6e6ac7d82af3994b0b1ebea0f0da3e3ef25ed2b954cb07379a2249ee050b62913493821bfd3c97c7785740589d1 SHA512 66ab66b2db551c97bee096a2f1d81767c10e6beb96c2268504db219c2b01b4edae118c82ca04c3fa2d153d486673ab108caba5ff43d5168530f9a5a0eea75bc4
-EBUILD ucarp-1.5.2-r4.ebuild 1294 BLAKE2B 53095b7a6574d52a10521949e4023b98727452e0655c382058ed447bc3f49bfeac4495fa271da48701da8d4f47ec0fb02822627384bf34ca1b2f67d7c9eb2738 SHA512 e0176e08f11170c9ea5523b2e644eefdf0c2d1178333ed547587407454cfb94e8cfdc287d4b76e7c7ed1fc602d146c707083effdb4b72e03174e5fbbed841261
 EBUILD ucarp-1.5.2-r5.ebuild 1294 BLAKE2B 478a6329804bbeb059dc3fbf83e2159ecfc4d7792f214a481720ddb150aa3762dd0d1b26153af493ced9ec615ca157e8411510accce218f08723a1d0be0f645e SHA512 0da1ba75ab1b8e877067814e8fb7551f6bdd19c430e6e2a85381ac4e284a642d261c9f41ebb7509ca71737e105b1a24efc06bfb3896c42663759ce99244bbea8
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/net-misc/ucarp/ucarp-1.5.2-r4.ebuild b/net-misc/ucarp/ucarp-1.5.2-r4.ebuild
deleted file mode 100644
index 7fbb7e97c10b..000000000000
--- a/net-misc/ucarp/ucarp-1.5.2-r4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)"
-HOMEPAGE="http://www.ucarp.org"
-SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-
-	doman "${FILESDIR}"/ucarp.8
-
-	exeinto /usr/libexec/ucarp
-	newexe "${FILESDIR}"/vip-up-default.sh-r1 vip-up-default.sh
-	newexe "${FILESDIR}"/vip-down-default.sh-r1 vip-down-default.sh
-
-	keepdir /etc/ucarp
-
-	newinitd "${FILESDIR}"/ucarp.initd-r1 ucarp
-	newconfd "${FILESDIR}"/ucarp.confd ucarp
-}
-
-pkg_postinst() {
-	elog "The provided init script needs to be configured first."
-	elog "Edit /etc/conf.d/ucarp to suite your environment."
-	elog "You will also have to set a shared password within /etc/ucarp/ucarp.pass"
-	elog "or whatever file you have set \$UCARP_PASSFILE to."
-
-	elog "If you need more than one instance of ucarp running, simply symlink"
-	elog "the init script and create a copy of the init script configuration"
-	elog "which corresponds to the name of the init script."
-}
diff --git a/net-misc/vrrpd/Manifest b/net-misc/vrrpd/Manifest
index 81423774307b..3a2cc49bc485 100644
--- a/net-misc/vrrpd/Manifest
+++ b/net-misc/vrrpd/Manifest
@@ -1,6 +1,4 @@
 AUX vrrpd-1.9-rollup.patch 820 BLAKE2B 4862766d23aa2811023c5f7a37fd3ed08f74701a6b434ae1d6ae84dd1aa72f31d599db6779edd6216fa0e1b499c701f0f442dce7ae150173b74b370e8a03a880 SHA512 20dd64876125707cb0cca6c45363a4db05a9472a0bec7bded2665229ee9db44a8429703294cf39b53a703fa9c66b6644e89edf98d1e87c090d763da2a3b07b7a
-DIST vrrpd-1.0.tar.gz 68819 BLAKE2B 96d5d7b4e5aaf6670c48c472a6e886c7a78502b3c3f3c83192e865f3a6784790484ac30358a1f593dd3dfa46bdfa73288e17fda2ae21b0d04dc67d2e59fd2021 SHA512 bf855d4d196fe7ee2d6fb8db02d86941ce6e0ddac59896c649df99eb20002d23a42a60dc11ddb1a35da6bb6b20099df81e2e6114915e71d06cbc82d93a0ff82f
 DIST vrrpd-1.9.tar.gz 542249 BLAKE2B a412559be70791515c6b82639a8e1d5fc33954963fbf00aa3c549434ac0748b9d0ea657b2d02b1a3537a30742c18fe6d6db832a11c23b6989151c5f04c771d05 SHA512 8c719cabbd6a799e4e439dbb698af9d6e24cf2635cfbd71a204b46bd2b65c1384e53f130b663d0fcfc903d89080ff25d9c97ae4cd9f6b2434d5462cf678a306b
-EBUILD vrrpd-1.0.ebuild 639 BLAKE2B d8c34021aaa36dacf7913e8db50b3efcf902082b67f036d2a9e7f9de7d7f6b51ecf88b729324dbbf563145e89747aed0f740d9a3ce1ff2973389cf14f55edde0 SHA512 0e5cfaefda17231bc9f6a26698ec713a0b61fb20445c877323b3a89f69e265afe2a9009fd5244b5e0b2a6bf2623ee204c6e257f61e0e85eb1741d1f10c96c5b3
 EBUILD vrrpd-1.9.ebuild 859 BLAKE2B 65feca5595a6067691f4a51521713a0a715aa75eeb6ce8fa14589c1a46d050ac807875a55de17de707188d5d8a7ef0c54e8576522a026445d38d3a6b7627efd7 SHA512 1799b975303ca607e1c4bf9de722ac9e29c4f8cd3c9f08c4dffa6f5ed53416f006adf1e8ceac76f85b316fa7c508bd46d9fb6d640f649a090c2ed0ad2f1739a7
 MISC metadata.xml 392 BLAKE2B 476ecd46527b390c48296ad27b9771efaacd8f508bcfe5397a7731b968df34bc260846d18c21bdf9cdd96687be0dc9ab9d946bb9a81cd9b0838b7e919732ea8b SHA512 1e3efb18e8680a55af393d09389ce819d187cf18e8c196be5acf9bd831afb1440d23d490c3b1137a4f7faadd734a8858c671a59ed0451430e0dcd928ee75b338
diff --git a/net-misc/vrrpd/vrrpd-1.0.ebuild b/net-misc/vrrpd/vrrpd-1.0.ebuild
deleted file mode 100644
index 34654623edac..000000000000
--- a/net-misc/vrrpd/vrrpd-1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual Router Redundancy Protocol Daemon"
-HOMEPAGE="http://www.sourceforge.net/projects/vrrpd"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/1.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="sys-devel/gcc"
-RDEPEND=""
-
-src_compile() {
-	emake DBG_OPT="" MACHINEOPT="${CFLAGS}" PROF_OPT="${LDFLAGS}"
-}
-
-src_install() {
-	dosbin vrrpd
-	doman vrrpd.8
-	dodoc FAQ Changes TODO scott_example doc/draft-ietf-vrrp-spec-v2-05.txt doc/rfc2338.txt.vrrp doc/draft-jou-duplicate-ip-address-02.txt
-}
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 48f895d33d72..b79e391f085a 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 6b4513c788e8..18138c1b1201 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -26,4 +26,4 @@ DIST openldap-2.4.53.tgz 5883013 BLAKE2B 09d17d2a5438b09a4aa7f4a815e858d8b17ae78
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
 EBUILD openldap-2.4.50.ebuild 29256 BLAKE2B 8ee3667ab41c623278998b07f813d8f9065eb2fe83eacc38109c9c35200582054efb70e0719f48490ac838a7304319f544e48decc28fcd2ce7c951216b85ccc1 SHA512 3a51676b27d60722c0765e9d9feee78457706c8d84627756a1465ca2b894d906e2847479f109976f043eb8cd9412146353a19b89ea2a9c48edd1f7e135580f6f
 EBUILD openldap-2.4.53.ebuild 29265 BLAKE2B 68c03f4c15278adc7030c56af1bd0cb608a87e2061f2a438a77f68902cb04109a2a0347be4392db878d3fe730cef086f982deceef0db093e89a2ad21231cde7f SHA512 133ef17ee44205d33baffb86f2f6edbf6ad904f18ef5211c9170d96743a698b97b730bfae5e25d7021dd7c2ac8db1ecc9112bc436ce7866ad4473b65cf7829b4
-MISC metadata.xml 922 BLAKE2B f99c4b3703f1a22dccbc0bbb109d11ba747c61229ebc811b036784dee829c4f7ce4bd85d4f5b8d7780cf20194d5175511129b9256416eea7daf4094e20d8c1a7 SHA512 fc9eb245cde878a93e08b8213f58b829266b2171ee73a74a39b47e700e506225da36e7d51952586f3d97ad6e0a3b3792fa59b5620bad0749afc87b8d59678ff9
+MISC metadata.xml 1030 BLAKE2B b940261c1e1fac05fceffc80673100d3102e53b532b8936b2e51bbf5a6bdf2ff5cfe633c53b494856d973a86c8d0f2b5acf8f2c26d2c62d16f1313fb8dab798a SHA512 c031e0cbe8d8f6d5fcdd8d4c4e036e5087068c35ae44264b5e244c0d6dee429836f493d75f6bb2cb422d14ccd0a7934b13748cf83517791e61c51fd6d924deb3
diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml
index 6cea2f2e325f..38186cd8f1b6 100644
--- a/net-nds/openldap/metadata.xml
+++ b/net-nds/openldap/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>ldap-bugs@gentoo.org</email>
 	</maintainer>
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index f815561c0012..96639de474be 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index c82558455b0f..9dd6ddb817e8 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,5 +1,5 @@
 DIST liferea-1.12.7.tar.bz2 1495627 BLAKE2B 36e95d270e3c3f68499073c7f2b1b6c987b67fc40517bfeb95c7ce02fc0c66daccb8e7d15709f1a047b36eea3d6d0cfe4af2e37f6809051f1be7613a36e0234f SHA512 7628f089940cd285ae6269b8d788b230572a0f5cab8a81ea1e92010de98a3ecd21d39596be6c18c055469579468fe3df7fca4e917a6a1ef3644a5e24c8e55109
-DIST liferea-1.12.8.tar.bz2 1496590 BLAKE2B 8b2f7298b58bd400a3daffc48c0f6b907cbcade054f08a57da7ca8f291fb9f2a86b9e2dbcacab58a43c3a0c19d05304f6d5fc0f77acd7cced51090bcf3a0e154 SHA512 46f70bed9b9ae1a6d578dbda3d3e7751b839bee91443c245cc83a17d89f3a1c59fe6346f0ee4e72103511404620fcd65733121527cb841ba0c2be2f4d182b51b
+DIST liferea-1.12.9.tar.bz2 1496593 BLAKE2B a0887a7b04c47a69166396f06305342232b16eefba04df1a0cda7c9d84880e025d73786a55aaa528a143fccef213fa2de9474fb6fab3f301e54a12dba4a705f1 SHA512 09156e0e5e4342741b6290be17ee94a3204d431c687c17688e23067d151d36a178193f5cf01da222974810a48626c877b0cf917fbdd9ecb6e81254e85750be9b
 EBUILD liferea-1.12.7-r1.ebuild 1471 BLAKE2B a1aa550ec73b0db372d5b02789ea4c272b977b5e2ed2ff3473d621f5bdac71acff0939ef63403232ca7b1e89a807bb8a622c4b1a4f373cde2db689e53456be9f SHA512 2a9b6e6e7d91f762806345fd219e15f1ce7ee71a4aae3fe7be7d72abeeb71a17cba62f900e56a5d7771a871f224526a9a728c318b22ca9c790cd28a445096800
-EBUILD liferea-1.12.8.ebuild 1701 BLAKE2B c780b75240a0367618e2675e3961710fcaa3dcc6aea388b7c6055efef27e75aa220dc546a07bc8a328eb6fb786b672c2fdb9c3c6b5bbcec98783cf6f4e29721d SHA512 47354030a2ce0fa470842a8b486bbd35cd6ba9bedfd2944d0d237639f9ac5972d83d0ef2cf709085cc80e013a6c10f5ddf448befed02ca20b7b6fe18b006f5cb
+EBUILD liferea-1.12.9.ebuild 1754 BLAKE2B cc572ac16406c3cd4a402e26f1855a2ff1dff4a74a96871e50a92073babaf3ba14460cccdb5366bff69f3b83e91c164bbda4d5a1efcad27e8211acf7360128e5 SHA512 b7982a03de9446bcc9c9df392b74e0fcf3147f4e5eb5fb4203b67e1631527246d7ae8f72d91ceef14b1cc3eced28adfb87622aedd12b8bd7f185c830836cb483
 MISC metadata.xml 598 BLAKE2B e6c962c4f6324f1e260256a64970926a9de2e0e24ba6fb53673c40d2aea969a6a779a77a00752a948d41e2923ab844c894b82880921f95a46bce94ba2d84e02c SHA512 d8d877c107353ca9a7a28fdc00a5df495dcd49ac80f111190362ee1e5f7e8bfe1eb2b5f0db298cb71c91d2a567dda5e83cb06178dc44f92704b30be0044a6512
diff --git a/net-news/liferea/liferea-1.12.8.ebuild b/net-news/liferea/liferea-1.12.8.ebuild
deleted file mode 100644
index aed265798b1a..000000000000
--- a/net-news/liferea/liferea-1.12.8.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
-HOMEPAGE="https://lzone.de/liferea/"
-SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	dev-libs/json-glib
-	dev-libs/libpeas[gtk,python,${PYTHON_SINGLE_USEDEP}]
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	gnome-base/gsettings-desktop-schemas
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/intltool
-	virtual/pkgconfig"
-
-src_prepare() {
-	xdg_src_prepare
-
-	sed -i -e 's#$(datadir)/appdata#$(datadir)/metainfo#g' \
-		Makefile.am || die
-	eautoreconf
-}
-
-src_compile() {
-	# Workaround crash in libwebkit2gtk-4.0.so
-	# https://bugs.gentoo.org/704594
-	WEBKIT_DISABLE_COMPOSITING_MODE=1 \
-		default
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	elog "Additional features can be enabled via"
-	elog "\tapp-crypt/libsecret[introspection] for Libsecret Support plugin"
-	elog "\tdev-python/pycairo and x11-libs/gdk-pixbuf[introspection] for Tray Icon (GNOME Classic) plugin"
-	elog "\tmedia-libs/gstreamer[introspection] for Media Player plugin"
-	elog "\tnet-misc/networkmanager for monitoring network status"
-	elog "\tx11-libs/libnotify[introspection] for Popup Notifications plugin"
-}
diff --git a/net-news/liferea/liferea-1.12.9.ebuild b/net-news/liferea/liferea-1.12.9.ebuild
new file mode 100644
index 000000000000..d76fac71716d
--- /dev/null
+++ b/net-news/liferea/liferea-1.12.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
+HOMEPAGE="https://lzone.de/liferea/"
+SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	dev-libs/json-glib
+	dev-libs/libpeas[gtk,python,${PYTHON_SINGLE_USEDEP}]
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	gnome-base/gsettings-desktop-schemas
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	xdg_src_prepare
+
+	sed -i -e 's#$(datadir)/appdata#$(datadir)/metainfo#g' \
+		Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_compile() {
+	# Workaround crash in libwebkit2gtk-4.0.so
+	# https://bugs.gentoo.org/704594
+	WEBKIT_DISABLE_COMPOSITING_MODE=1 \
+		default
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	elog "Additional features can be enabled via"
+	elog "\tapp-crypt/libsecret[introspection] for Libsecret Support plugin"
+	elog "\tdev-python/pycairo and x11-libs/gdk-pixbuf[introspection] for Tray Icon (GNOME Classic) plugin"
+	elog "\tmedia-libs/gstreamer[introspection] for Media Player plugin"
+	elog "\tnet-misc/networkmanager for monitoring network status"
+	elog "\tx11-libs/libnotify[introspection] for Popup Notifications plugin"
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index cd3dfa3aaa71..870ef1ed8ba6 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-bjnp/Manifest b/net-print/cups-bjnp/Manifest
index 7e6807bcca12..f2943a047d91 100644
--- a/net-print/cups-bjnp/Manifest
+++ b/net-print/cups-bjnp/Manifest
@@ -1,7 +1,3 @@
-DIST cups-bjnp-1.1.tar.gz 139838 BLAKE2B 6613ca080afe2ec2cb72cf695aa4144ef16225d2e24077d209cd65e584e5d134b65224c93c636e3289949520787308406debedc3cc4506fb7f573685df02957a SHA512 9a1558c7f2530e14ecab3143e0e03239d430d261486309cbf12f28a43b6358e704f60fdbcfeb0150b3ca80d31bf03b0c628179fbf37d313ca23d2f6e1d28265d
-DIST cups-bjnp-1.2.1.tar.gz 140536 BLAKE2B a47fac5c9550de024b817401b7844c5f1812b9105f2e79534b78a840e5ac394ad5ac8eb5e8eab15cbadcf24c56f2fb5070d8c4229c10dbb549786189a5aea2cd SHA512 c14152592255f9092d543f00f67a8fdd71cc9b27bc12cc6e66d3d94e1112920feafba35b7f7a830b07666b9b2d8d070f52757a3e150195e71ec989985a74d489
 DIST cups-bjnp-2.0.tar.gz 140617 BLAKE2B 7d280346a6f29a3530b605d8e259007c004dc5c53386904db93e5302303a158b8a5a4ed86e8cf72692fb4d64f4b041625b224a1325d5c77e4ecc82cd59bfa0d2 SHA512 60b7c58828c736eab6986896730db7635d3364e94d6d7c4992eb7f49f22ced6a5643153c069d3823d4dc663ee7de8748b8e8ec527e04afc65389c521b791c8d0
-EBUILD cups-bjnp-1.1.ebuild 432 BLAKE2B 7c1993cf1053036750e47319e06015a666bf4422cd8f2ff826b1dc573bc3206270df02fd66aa28b6c05772ea8035926c5f75236d995039a6df5437ed6704a134 SHA512 d5c1ab4d82b7602c844c14d83c84b773ab92757e1766f93e64fec0f2b37c57d3ed35b26cafb71a2171ee81c7cad715fb4ed185c1bca2cf9f338880a7c6c1a6e8
-EBUILD cups-bjnp-1.2.1.ebuild 483 BLAKE2B 2be553cd6e1f21e532a687490f0f21a5db3b7a8502eb1b935287ef835da541773962283b23fba2bd1fe3cef577d5b09b049aca236c83980de78fc4d96af7fa1c SHA512 bc9b8d18009d951e7781463e0ea2150ee264beb23121f6acdecb0fcf43733b751df07bb978dfc2f0e27281e290bc4da78aa8b0e5a4b6b38a08ed0b19f1a10c0d
 EBUILD cups-bjnp-2.0.ebuild 481 BLAKE2B 75ff24ed8dba8575f614745ad86913156077eb877bbb0a35f58bf307c9429e90064ead3919c2795e675248c65c69673cfb0ca854bd62a47eddb0e66b38918d8a SHA512 4eab0921680a478ad9f4fe8217e5acd41acf787334743c53050076b139d4c6aed4e1d406e5b76d1b87c4d1f840719dc7d7f522ec327ec04bef0404d4388ad269
 MISC metadata.xml 338 BLAKE2B 672c0b7535be027177912e73ba4978fa3fbc6a7ff597f664ef719d0b11e3d95b6a0fa630385ff371ec2567aa016063c017cf8f38c4a2046214aa3d958b675b96 SHA512 be2e9f37b6456136fedac3ee2bcf004d8bf5ac644dd5154714aba02fa3dbc026b5c8f0e0518e494d9bc5d22902339c97cd8df8955df814306337883a68a87a84
diff --git a/net-print/cups-bjnp/cups-bjnp-1.1.ebuild b/net-print/cups-bjnp/cups-bjnp-1.1.ebuild
deleted file mode 100644
index ad806f5cf6c4..000000000000
--- a/net-print/cups-bjnp/cups-bjnp-1.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol"
-HOMEPAGE="https://sourceforge.net/projects/cups-bjnp/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
diff --git a/net-print/cups-bjnp/cups-bjnp-1.2.1.ebuild b/net-print/cups-bjnp/cups-bjnp-1.2.1.ebuild
deleted file mode 100644
index d720b507f029..000000000000
--- a/net-print/cups-bjnp/cups-bjnp-1.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol"
-HOMEPAGE="https://sourceforge.net/projects/cups-bjnp/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf --disable-Werror
-}
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index c5c3e10fd4ad..1606838be0e7 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -5,8 +5,10 @@ AUX cups-filters-1.28.2-make-missing-testfont-non-fatal.patch 477 BLAKE2B 30e8fd
 DIST cups-filters-1.27.4.tar.xz 1493860 BLAKE2B 424c3ba73ec7d6f4683eaedde86d657b1a2da17670c84097f5f3f8ef525cc8cc6d7843a88d35013a5f48bba8a903f7504df9054427b9a63d748ce39de458e71f SHA512 8005e94bb6b06d0a15fa4dfd8455d0bc67418478bf517e205af1c8c0018681a97ae9ea486db07570050ebeeb7f63f75319a8fe012c112c6d16c0941299eaa50e
 DIST cups-filters-1.27.5.tar.xz 1494864 BLAKE2B 457968139f0bc1a5fd4c587dfe4a88d1904eb0ca9ee2aa88c1360785eb53b59e7eb823535ef01a9f81551628514441077562e91487a55a9f0c9e6c9dbdba98b7 SHA512 8bc917b2a168add1062d091d02d99c39d72861c0d0cb1242c34b2bf117c9943e7fdc1fe002de7cde4cb1919fbce41073adc34916c328fc99e66e389b0a4fe103
 DIST cups-filters-1.28.2.tar.xz 1502352 BLAKE2B e0d95a7e1596d4dc05a8e2d32b2ee573cfa1ec304288e476a38c8b51de5ed8e0b6a71e371d2196802b116d63aea1e750e0b3a6c8fae749377de0ab72f92aa86e SHA512 aa5f075927286a8278259025aa5baf95445809a83b88e2d4654e8f0a124012591b045df115294242fae60a283d983d6cdbaafc6a51224af30a7e56b58d831da5
+DIST cups-filters-1.28.3.tar.xz 1501824 BLAKE2B b4f493681ac2a701648b3b9b071f4ebfb432dd4660b610579ff2ed6cba4f6cd4351d5a1f28f5c096b3ba20d9c45dc87837bf127b9bc98680a98dec58dd0a68ea SHA512 ac139ae7452342bd46e464bff3438d437f1c9a2e719a7b32b7abc22c2667acaa93dfb976decb277a02572e688ecd86289e01fca817bef93018dff2076fb2a30c
 EBUILD cups-filters-1.27.4.ebuild 3599 BLAKE2B eb2b2f3dce938b6516342c4926f962f35b51fcc8eb6d1ff5c3d2311515c78c68febfd1fd59633d120cc3fee71b2ed6119d1503e1937e1084560b10b2b4527abe SHA512 78120456764f960f89ae41405286f7b1105be5db5c3cf6cd852bb620120bb56a96798d08a469580947616851d3d23d4f47e5d28830476c8833a8194c6d9e2f8e
 EBUILD cups-filters-1.27.5.ebuild 3611 BLAKE2B b99ea19205844335e42753ae5dd3d443fa327b533293594aa4d2ed43cd20f29691539fd095268f30cf9dfec435ce09941c4761b8263eeadb774117bec10f7ef3 SHA512 f1404c9aa04f7fa5c49ffa1836666f4d3b044f617c4983af273f50d6258fc4a095fe91b93c72cadb1ab2e5e07e5bf57acb8be4544283adb294a58fc871bc353b
 EBUILD cups-filters-1.28.2.ebuild 3608 BLAKE2B 38a5c3f7d865315a8c2780a408b9d77cd043f144368aef425ee44b829f3ea7ae2cc660ff68cc2d46fb9eab799257cd65cb631a58ad59bc9d5d21c4dcac4e8a1b SHA512 77c1cf7be7f6a346d404ee2cbd82da3a8dab8715ae63ed66efede88e841928196a0fbdf2f71972a62b74cf145359aa89e05866eb79d37a9328761f8d666b7f79
+EBUILD cups-filters-1.28.3.ebuild 3608 BLAKE2B 38a5c3f7d865315a8c2780a408b9d77cd043f144368aef425ee44b829f3ea7ae2cc660ff68cc2d46fb9eab799257cd65cb631a58ad59bc9d5d21c4dcac4e8a1b SHA512 77c1cf7be7f6a346d404ee2cbd82da3a8dab8715ae63ed66efede88e841928196a0fbdf2f71972a62b74cf145359aa89e05866eb79d37a9328761f8d666b7f79
 EBUILD cups-filters-9999.ebuild 3537 BLAKE2B b632ca69c758df9a0a3c77a3f410b2212288f945cce61d3782249325eaf04cc5885172cb0f7e02b4f953c608a296889c13f4c16b9be0cd6994bcdad4b6c2b4e1 SHA512 6f506cbfb556e3a0d5e404a6cd802ce63d6bdf90ef7bbbbdd6ce5b6d45f12dd025e4324ee30df36d1d2ce23684550512743cb3ca95f04023ac945ae72aaa5999
 MISC metadata.xml 444 BLAKE2B 43542e8e11bcce56517af18fe24258495e3032a72bec385a513c741bb1b48f9b77d83b2d8ebcd52f83a16b099762e9e85ff4a91e688203cbfc4461b4a68a34fb SHA512 8eafb557741f3d771b445424c4bfeef6e4de60c7aca36c1a1e3541d234d2bcd5e459602bbb7b3b5327403993486d803f8e837ec51dfde64fcdbfa522ad131950
diff --git a/net-print/cups-filters/cups-filters-1.28.3.ebuild b/net-print/cups-filters/cups-filters-1.28.3.ebuild
new file mode 100644
index 000000000000..d3c34b7f443d
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.28.3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-8.3.0:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	test? ( media-fonts/dejavu )
+"
+
+src_prepare() {
+	local need_eautoreconf=
+
+	default
+
+	if ! use test ; then
+		eapply "${FILESDIR}"/${PN}-1.28.2-make-missing-testfont-non-fatal.patch
+		need_eautoreconf=yes
+	elif [[ "${PV}" == "9999" ]] ; then
+		need_eautoreconf=yes
+	fi
+
+	[[ -n ${need_eautoreconf} ]] && eautoreconf
+
+	# Bug #626800
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable static-libs static)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 7ee55f4e76bb..41da508bcb64 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,7 +1,5 @@
 DIST hplip-3.19.12-plugin.run 11512079 BLAKE2B 534cbba51b2254f8227611b8f0449e100361fb445400f664e43e30412be8eb554bb35c2fe260d45cd5ad742b083af6d551532a9d14585029b0ff93675fab578a SHA512 ac2022d555f5084d5bf1e4519ddbb29828e9ca385aa6dff818ae9e79b60b4b2745e31ad4146cb01bca3747fae0d61b96e4a823b81179d2e2c55a643831165e4b
-DIST hplip-3.20.3-plugin.run 11514166 BLAKE2B 15ff8caf13f82256a5e814acf2b0433a6d365cea8b0073ea133f2e8a175796be04b058f44f68fb86c0f43f4a7c0bebf14f486aa93548b5155490e7240d02355a SHA512 3481c852aed773d3b3bcecd203066476a670eb506688381c54bc88f4057ad15da99b128d8a1cc2358985c0b3772b5538e75988dd66221f50dcea78f9bab2e3ce
 DIST hplip-3.20.6-plugin.run 11514108 BLAKE2B 83e2d26fb397c5c5df1fc4371bfc2798cea049965499b6f1ad5daa05b44b74f51ba9deb933b564dfa47a8d0ef79d4921c3a96b9531730317742e1c5651d7b012 SHA512 6f9e5c92e302f4068abbe9134cf7f8081fcbe98568c9b75d6a668843b76c83afd0f4fbb3d90d3ac775c719ab8e2dca5beedd887ef6d072bd8ee0eb48d42521ed
 EBUILD hplip-plugin-3.19.12.ebuild 1301 BLAKE2B f4cd61c24495b61e9928e1b80cee878d647037af127d9b890ddb9301666b69c17efd15103ceab6983a0c18c24e240185ea0d967e6efdff917c3e250ef4094a45 SHA512 2b0c474f02f34078b603c47d02724f198416569befabc6d8ec6abd25b4002ba93a6d600e5aa07dff0092c9fbbd26f8330f04ac31661cbc721c566fab503cfcc9
-EBUILD hplip-plugin-3.20.3.ebuild 1301 BLAKE2B f4cd61c24495b61e9928e1b80cee878d647037af127d9b890ddb9301666b69c17efd15103ceab6983a0c18c24e240185ea0d967e6efdff917c3e250ef4094a45 SHA512 2b0c474f02f34078b603c47d02724f198416569befabc6d8ec6abd25b4002ba93a6d600e5aa07dff0092c9fbbd26f8330f04ac31661cbc721c566fab503cfcc9
 EBUILD hplip-plugin-3.20.6-r1.ebuild 1450 BLAKE2B ab91d2d615018b9d377e6397a122f3fa92cbf42ea00441cedd6e7eaa57873cd6137ff558395106f78006c066f18c28856dd171f5ccf0f86fdf1574ba5c848d2f SHA512 694394be4f54bb8e5f7a2ee2a0991fcbe3588dfc1798e3b84168c53087746a17982bd496401dfbe3016f598cf3c275734de5980fc34c23dcaf6cd7165b4ae559
 MISC metadata.xml 522 BLAKE2B 47eae04f2b9633c1707c451a53dbdd8d72491903525e04f82e6017cd4e1ce9a4ce71a488dd0afcc84401fa061d51bad545a8b8a3f50d378d5f19c33f2b43ec2d SHA512 8f1a5e7c4b50aa472433dc6e49cb4715731f146f29774ad4304d9e24f1ffbe2a4756bef024d01982d8c978208e5c47e5987a48fc2ad6dd3962fa3cfb68d01a31
diff --git a/net-print/hplip-plugin/hplip-plugin-3.20.3.ebuild b/net-print/hplip-plugin/hplip-plugin-3.20.3.ebuild
deleted file mode 100644
index 94c7a5c55145..000000000000
--- a/net-print/hplip-plugin/hplip-plugin-3.20.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-DESCRIPTION="Proprietary plugins and firmware for HPLIP"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
-SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run"
-LICENSE="hplip-plugin"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	~net-print/hplip-${PV}
-	virtual/libusb:0
-	virtual/udev
-"
-DEPEND=""
-
-S=${WORKDIR}
-
-HPLIP_HOME=/usr/share/hplip
-
-# Binary prebuilt package
-QA_PREBUILT="${HPLIP_HOME}/*.so"
-
-# License does not allow us to redistribute the "source" package
-RESTRICT="mirror"
-
-src_install() {
-	local hplip_arch
-	case "${ARCH}" in
-		amd64) hplip_arch="x86_64" ;;
-		arm)   hplip_arch="arm32"  ;;
-		x86)   hplip_arch="x86_32" ;;
-		*)     die "Unsupported architecture." ;;
-	esac
-
-	insinto "${HPLIP_HOME}"/data/firmware
-	doins *.fw.gz
-
-	for plugin in *-${hplip_arch}.so; do
-		local plugin_type=prnt
-		case "${plugin}" in
-			fax_*) plugin_type=fax ;;
-			bb_*)  plugin_type=scan ;;
-		esac
-
-		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
-		newexe ${plugin} ${plugin/-${hplip_arch}}
-	done
-
-	insinto /var/lib/hp
-	newins - hplip.state <<-_EOF_
-		[plugin]
-		installed = 1
-		eula = 1
-		version = ${PV}
-	_EOF_
-}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 2bbe158aecfa..68a62a51d19f 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,9 +1,9 @@
 DIST hplip-3.18.12-patches-1.tar.xz 12032 BLAKE2B 33e6e4e1e0e5b4f998459073cf0742b7c56929b23e6c1cc3ba9df4eafb8007273a5a2e7f27af0d2d4a3a97ebb9cfe462b74dcddd7149088980893b2c66113b7c SHA512 3b0e2b4f7d8da257c6fcf12f2e049276d059426f2d1c626324982ce862efa2323cbb191a373c53fea7880e3b6e44ec62e584091676556d97e6a456edea4c44cf
 DIST hplip-3.19.12.tar.gz 25676247 BLAKE2B 1373aa70a2307071c28a22b0ae85e242c3e6bec614ef7490c1ecc0e5e745b81b6c2097948fbd062b5e72e10714cdc8d6f9145aacafc0fedeafde375909cb2cb6 SHA512 5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677
-DIST hplip-3.20.3.tar.gz 25672070 BLAKE2B 4c6209a268898de123b2b557d662acddb3ad90b227c0752ebdd1e2afb3fe3d19fddc819aba999347708dd0c098f2b8fea4580dcfb3d5fc7893e47520cae7c1d5 SHA512 a397eb3896292ac956a1969b76707af62c866e47d88148fa75b68574e4639283f7414a2c77e6854c5d22daea49181d4f1bc2daf11fb3058372ff084d591696f1
 DIST hplip-3.20.5-patches-1.tar.xz 12716 BLAKE2B 982480185b2decb9f4e857336b474dab585d64aa44a9f0da70ba568e20488f451507aae3bd1427aef4274d36db93dd9bcb1d906f7b393939dfc43c81a1f9a9db SHA512 ae46a6f490253a1112838b08d56199c6257d33911569619483d925798b54a8bc9fe57afd1e86dedb9482d89d42f44bec81db215f37cbcd8fb5982596c80c1117
+DIST hplip-3.20.6-patches-1.tar.xz 14384 BLAKE2B 89436c36478e96f91053a75d65af99d3b32e8d0a60417c26baf4a9ae72070409e7210e1fb9232bd69309b251d2960671020c1203d3e6672b9639e00827c4e4bf SHA512 4b903438a56ca16846a7e940c09e9555d3d2ee54cbb77a7d031027cefd04c37bde6ea1dad4a266f89fd03f0595851db973947b9a363f49972bd02522704c20f8
 DIST hplip-3.20.6.tar.gz 25908476 BLAKE2B cd70d00081ff41d36b566d6f6f546b2cddabb46427afafcd2d04ea7769ce5114feff74612e58ffa83dde4e817ffa2804dbf41411187d9cd15ed7b888b87658ad SHA512 ccd82112afb5ee73f5d027819ab89ba8f52ec36a4b061d314565f95d288be24e045050c3368332eeae50c0fb170f8cb015fdd8dde4b32a08e3758f0f0f4e8e96
 EBUILD hplip-3.19.12-r1.ebuild 7744 BLAKE2B e19803ef105c70237b7c88d7d45f756a219195f3f0d01ad7040676226f0acba81bb9dc94de2d8ea20081e420155297414a87a303e779bca2d03d5ed82685d1dd SHA512 b15681bbf4f396df4abd145d02a7ddca006cff7619a852b5cbdbcd5fd89d6cf34534aadf5e33114f47a8ab1443453b03f6dac71c71a80ba6740418bd699280b0
-EBUILD hplip-3.20.3.ebuild 7791 BLAKE2B 08470deec20f0a8a184a3f69f5b49a8ee94ceb6ca62ac9a659b42597285c836a3f378d069cad1c470296df8880e85d87eb62745f2cd787ec1a98e28da7941ab4 SHA512 3ddb0b4e82b2c0060cece1595b3dd02c963e9bdacab28ed78618be7b1fe1f3603e6d8fd4a14f542bda0f4fb3867ce05730e14dd1ba551c6ffee4f547e8d13b8d
 EBUILD hplip-3.20.6-r1.ebuild 7913 BLAKE2B 0d991ff1f5d52716cbfa089c0eb4c0c18340168eec8742b588769f9cee575ece1ad38351db7066a1bddc3fdada1bffdfc6dac42580298811db6dbca128af52eb SHA512 2b7d729e4cb51d1e278eeabf57d18a379bb4545407e468290dc30a7bc7963be84bd54607b75c58b899176d3490066738fe7811e9b5fa0dcb64ecfac4f05de71f
+EBUILD hplip-3.20.6-r2.ebuild 7860 BLAKE2B f392bdd3fad24e315ba76a30ab7edf83fd329899151c6e771f844009b075ba092b0aa88613fef2e9a2189b724aa43218ddb6bf19056e9cc98fb509a8c5a1d579 SHA512 788ade726c473e0f36cd863573e2101b49097e318160edf01ed8be6f187b597ee9fa3e89f6f026c63b32aea069655064deb43b1122833170fbf2585784ecf28c
 MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef
diff --git a/net-print/hplip/hplip-3.20.3.ebuild b/net-print/hplip/hplip-3.20.3.ebuild
deleted file mode 100644
index ed4bfbdd0469..000000000000
--- a/net-print/hplip/hplip-3.20.3.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+),xml"
-
-# 14 and 15 spit out a lot of warnings about subdirs
-WANT_AUTOMAKE="1.13"
-
-inherit autotools flag-o-matic linux-info python-single-r1 readme.gentoo-r1 udev
-
-DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.12-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 x86"
-
-IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
-
-COMMON_DEPEND="
-	net-print/cups
-	virtual/jpeg:0
-	hpijs? ( net-print/cups-filters[foomatic] )
-	!minimal? (
-		${PYTHON_DEPS}
-		sys-apps/dbus
-		!libusb0? ( virtual/libusb:1 )
-		libusb0? ( virtual/libusb:0 )
-		scanner? ( media-gfx/sane-backends )
-		snmp? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-			net-analyzer/net-snmp:=
-		)
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	${COMMON_DEPEND}
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	!minimal? (
-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
-		kernel_linux? ( virtual/udev )
-		$(python_gen_cond_dep '
-			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
-			dev-python/distro[${PYTHON_MULTI_USEDEP}]
-			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
-			qt5? (
-				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
-				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
-			)
-			scanner? (
-				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
-				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
-				X? (
-					|| (
-						kde? ( kde-misc/skanlite )
-						media-gfx/xsane
-						media-gfx/sane-frontends
-					)
-				)
-			)
-		')
-	)
-	policykit? ( sys-auth/polkit )
-"
-
-REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${WORKDIR}/patches"
-)
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-#DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-For more information on setting up your printer please take
-a look at the hplip section of the gentoo printing guide:
-https://wiki.gentoo.org/wiki/Printing
-
-Any user who wants to print must be in the lp group.
-"
-
-pkg_setup() {
-	use !minimal && python-single-r1_pkg_setup
-
-	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
-
-	if ! use hpcups && ! use hpijs ; then
-		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
-		ewarn "which is probably not what you want."
-		ewarn "You will almost certainly not be able to print."
-	fi
-
-	if use minimal ; then
-		ewarn "Installing driver portions only, make sure you know what you are doing."
-		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	if use !minimal ; then
-		python_fix_shebang .
-	fi
-
-	# Make desktop files follow the specification
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Encoding=.*/d' hplip.desktop.in || die
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Version=.*/d' \
-		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
-
-	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
-	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir=$(get_udevdir)
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	append-cppflags "$(python-config --includes)"
-
-	if use libusb0 ; then
-		myconf="${myconf} --enable-libusb01_build"
-	else
-		myconf="${myconf} --disable-libusb01_build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	# disable class driver for now
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-udev_sysfs_rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		--enable-hpps-install \
-		--disable-class-driver \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable !minimal gui-build) \
-		$(use_enable !minimal dbus-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable policykit) \
-		$(use_enable qt5) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build)
-
-	# hpijs ppds are created at configure time but are not installed (3.17.11)
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	#local i
-	#for i in ppd/hpijs/*.ppd.gz ; do
-	#	rm -f ${i}.temp || die
-	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-	#		gzip > ${i}.temp || die
-	#	mv ${i}.temp ${i} || die
-	#done
-}
-
-src_install() {
-	# Disable parallel install
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-	# default
-
-	# Installed by sane-backends
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
-	rm -f "${ED}"/etc/sane.d/dll.conf || die
-
-	# Remove desktop and autostart files
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
-	use qt5 || {
-		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
-	}
-
-	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${ED}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use !minimal ; then
-		python_optimize "${ED}"/usr/share/hplip
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-print/hplip/hplip-3.20.6-r2.ebuild b/net-print/hplip/hplip-3.20.6-r2.ebuild
new file mode 100644
index 000000000000..6dba4f978f09
--- /dev/null
+++ b/net-print/hplip/hplip-3.20.6-r2.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="threads(+),xml"
+
+# 14 and 15 spit out a lot of warnings about subdirs
+WANT_AUTOMAKE="1.13"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.20.6-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+	net-print/cups
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( media-gfx/sane-backends )
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp:=
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
+		kernel_linux? ( virtual/udev )
+		$(python_gen_cond_dep '
+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
+			dev-python/distro[${PYTHON_MULTI_USEDEP}]
+			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
+			qt5? (
+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
+				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
+			)
+			scanner? (
+				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
+				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
+				X? (
+					|| (
+						kde? ( kde-misc/skanlite )
+						media-gfx/xsane
+						media-gfx/sane-frontends
+					)
+				)
+			)
+		')
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+"
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use !minimal ; then
+		python_fix_shebang .
+	fi
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+		minimal_build="${minimal_build} --disable-fax-build"
+	else
+		if use fax ; then
+			minimal_build="${minimal_build} --enable-fax-build"
+		else
+			minimal_build="${minimal_build} --disable-fax-build"
+		fi
+	fi
+
+	# disable class driver for now
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		--enable-hpps-install \
+		--disable-class-driver \
+		$(use_enable doc doc-build) \
+		$(use_enable !minimal gui-build) \
+		$(use_enable !minimal dbus-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit) \
+		$(use_enable qt5) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+
+	# hpijs ppds are created at configure time but are not installed (3.17.11)
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	#local i
+	#for i in ppd/hpijs/*.ppd.gz ; do
+	#	rm -f ${i}.temp || die
+	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+	#		gzip > ${i}.temp || die
+	#	mv ${i}.temp ${i} || die
+	#done
+}
+
+src_install() {
+	# Disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED}"/etc/sane.d/dll.conf || die
+
+	# Remove desktop and autostart files
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+	use qt5 || {
+		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+	}
+
+	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	if use !minimal ; then
+		python_optimize "${ED}"/usr/share/hplip
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 9484a87fcf82..6ce2afbb4c35 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/rejik/Manifest b/net-proxy/rejik/Manifest
index 9b1062ac9e14..fa82b8ea2e01 100644
--- a/net-proxy/rejik/Manifest
+++ b/net-proxy/rejik/Manifest
@@ -1,4 +1,6 @@
 DIST banlists-2.x.x.tgz 116100 BLAKE2B 401d3cd995b7e2adcb28055c4f107799a87397a1ed06c698d70b2a4b755565759d7f56eb70a8d59a5ea04cdc51c6142d6bd03ebdd414133fd71792c66c5fe54e SHA512 068d01685e01679b2726da1cbc5f31f6aba54ab2194e8ab145bd2409e7fc71e3662445a8274b08746e5cdeadea2197f5a72a1abef98ec91267df851615b188b3
 DIST redirector-3.2.10.tgz 45407 BLAKE2B 735cab04b58d62a5772b2da540f1f358d20a1bf4612ab1d838066e9319bf28e3288a988e2fbebd5a7f7e6ad3912a59f3fadbed3bddf99b557ee562cd45779751 SHA512 6e82341e402b149464b048e763cfa6f7bc514bae48514b482eded9288af9705942fbfd2e11b5701d3540489ec5ccab358848108fe15f25c5ab2915e44f3f1033
-EBUILD rejik-3.2.10.ebuild 2321 BLAKE2B a1ba8d0b9de4bbf51f59cb772658fc83341001aa070d36b2456149e924d52ece8fe555094eb2bf1ebaa4dba37b9c4a1f2efcbd9a0d94cf06df2535eb79c7887c SHA512 5242e4266c01094dbd75e44ceee73292a07836d17cb586cf41c13c2af814d2d466d83db489d87c218c7c1491c18f419c3a287b4f1b186b2ccc5bcecd2c99b7ba
+DIST redirector-3.2.11.tgz 45758 BLAKE2B 39f83c8245d8a24c7454d40d607c851250bd9844f56ee8e9f43d64f32ac3cb52d9c1d9091e3d5126133d94fe59d5be8e8d99b7f2cb253c7731a73e344604a1ce SHA512 e4b20f11a46a84d47c8e6adc74f88f6092f9791e1b6050a3e3b4685cf4c510b55f32ea3d4c9a334dbe5753ee486b98ca73bb7e2d9854e2c8d299b7fd50fce2f8
+EBUILD rejik-3.2.10.ebuild 2290 BLAKE2B 3723f29be3740d3e937c8c1433f1bfb27b555c31a18a06c49443efa59c932670a4a3b9b11ddc385cc302f8de58535fdf03afbbca8d4b80cc328f7bc6bc394998 SHA512 1052da6d1d2bac007f11a39810dcd7d53aae659efd12312839d76ca65e113914cf598bff3f2d2c5ebb85718cc4cb5f63210cbe313a2bed474f5ef1a22143f307
+EBUILD rejik-3.2.11.ebuild 2374 BLAKE2B 14283a74cfef4686ecb0bb35d793376c9be59631be67515a86501d26f2b13fdb8c638b413e568bf99d187e0868cf1bf5a01f1724e0f9952bb9de5142ea020b92 SHA512 bcc318e80da39475396632e91dba1d3397af744d0659af43d67b0b4b3552f25141330b22506f0d9ba65b2a877d6e780d7dc63da6874e038e42ed4bda36b7527a
 MISC metadata.xml 345 BLAKE2B ced7a93f69f79d0f576c3249172a0557eca3002ba2b2c4bfeaed9f24d9bdce2e0cd10081ca67e96e3f2b944fe1a5c16bc2de4aba1a5ab14e274d89362be2089e SHA512 c45ec66f94f72f5a1faae645214953c4941e98e442625775fc25a2010345a31e61db086f1498344a64dd026764037a7a6d277655ab578ff32d7e9167d5eece57
diff --git a/net-proxy/rejik/rejik-3.2.10.ebuild b/net-proxy/rejik/rejik-3.2.10.ebuild
index 2c60bc8a830f..e566d009210b 100644
--- a/net-proxy/rejik/rejik-3.2.10.ebuild
+++ b/net-proxy/rejik/rejik-3.2.10.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A squid redirector used for blocking unwanted content"
 HOMEPAGE="https://rejik.ru/"
 SRC_URI="https://rejik.ru/download/redirector-${PV}.tgz
 	banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )"
+S="${WORKDIR}/redirector-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,25 +22,24 @@ RDEPEND="${DEPEND}
 	dev-perl/XML-Parser
 	net-proxy/squid"
 
-S=${WORKDIR}/redirector-${PV}
-
 src_prepare() {
-	sed -i -e "s:INSTALL_PATH=/usr/local/rejik3:INSTALL_PATH=${D}/opt/rejik:g" Makefile
-	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" vars.h
-	sed -i -e "s:SQUID_USER=nobody:SQUID_USER=squid:g" Makefile
-	sed -i -e "s:SQUID_GROUP=nogroup:SQUID_GROUP=squid:g" Makefile
+	sed -i -e "s:INSTALL_PATH=/usr/local/rejik3:INSTALL_PATH=${ED}/opt/rejik:g" Makefile || die
+	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" vars.h || die
+	sed -i -e "s:SQUID_USER=nobody:SQUID_USER=squid:g" Makefile || die
+	sed -i -e "s:SQUID_GROUP=nogroup:SQUID_GROUP=squid:g" Makefile || die
 	# Respect CFLAGS
-	sed -i -e "s:CC=gcc -Wall:CC=$(tc-getCC) $CFLAGS:" Makefile
+	sed -i -e "s;CC=gcc -Wall;CC=$(tc-getCC) $CFLAGS;" Makefile || die
 	# Respect LDFLAGS
-	sed -i -e "s:LIBS=-L/lib \`pcre-config --libs\`:LIBS=-L/lib \`pcre-config --libs\` $LDFLAGS:" Makefile
+	sed -i -e "s:LIBS=-L/lib \`pcre-config --libs\`:LIBS=-L/lib \`pcre-config --libs\` $LDFLAGS:" Makefile || die
 	#
-	sed -i -e "s:error_log /usr/local/rejik3:error_log /var/log/rejik:g" redirector.conf.dist
-	sed -i -e "s:change_log /usr/local/rejik3:change_log /var/log/rejik:g" redirector.conf.dist
-	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" redirector.conf.dist
+	sed -i -e "s:error_log /usr/local/rejik3:error_log /var/log/rejik:g" redirector.conf.dist || die
+	sed -i -e "s:change_log /usr/local/rejik3:change_log /var/log/rejik:g" redirector.conf.dist || die
+	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" redirector.conf.dist || die
+
+	default
 }
 
 src_install() {
-	dodir /opt/rejik
 	exeinto /opt/rejik
 	insinto /opt/rejik
 
@@ -47,13 +47,9 @@ src_install() {
 	doexe redirector
 	doins redirector.conf.dist
 
-	dodir /opt/rejik/tools
 	insinto /opt/rejik/tools
 	exeinto /opt/rejik/tools
 
-	fperms +x tools/kill-cache
-	fperms +x tools/benchmark
-
 	doexe tools/kill-cache
 	doexe tools/benchmark
 	doins tools/IN.gz
@@ -79,6 +75,6 @@ pkg_postinst() {
 	einfo "redirect_program /opt/rejik/redirector /opt/rejik/redirector.conf"
 	einfo "to /etc/squid/squid.conf"
 	einfo ""
-	einfo "Dont forget to edit /opt/rejik/redirector.conf"
+	einfo "Don't forget to edit /opt/rejik/redirector.conf"
 	einfo "Be sure redirector.conf has right permissions"
 }
diff --git a/net-proxy/rejik/rejik-3.2.11.ebuild b/net-proxy/rejik/rejik-3.2.11.ebuild
new file mode 100644
index 000000000000..da5a1a17a739
--- /dev/null
+++ b/net-proxy/rejik/rejik-3.2.11.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A squid redirector used for blocking unwanted content"
+HOMEPAGE="https://rejik.ru/"
+SRC_URI="https://rejik.ru/download/redirector-${PV}.tgz
+	banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )"
+S="${WORKDIR}/redirector-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="banlists"
+
+DEPEND="dev-libs/libpcre"
+RDEPEND="${DEPEND}
+	dev-perl/Text-Iconv
+	dev-perl/XML-Parser
+	net-proxy/squid"
+
+src_prepare() {
+	# Workaround for GCC 10 failure, bug #706766
+	append-cflags -fcommon
+
+	sed -i -e "s:INSTALL_PATH=/usr/local/rejik3:INSTALL_PATH=${ED}/opt/rejik:g" Makefile || die
+	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" vars.h || die
+	sed -i -e "s:SQUID_USER=nobody:SQUID_USER=squid:g" Makefile || die
+	sed -i -e "s:SQUID_GROUP=nogroup:SQUID_GROUP=squid:g" Makefile || die
+	# Respect CFLAGS
+	sed -i -e "s;CC=gcc -Wall;CC=$(tc-getCC) $CFLAGS;" Makefile || die
+	# Respect LDFLAGS
+	sed -i -e "s:LIBS=-L/lib \`pcre-config --libs\`:LIBS=-L/lib \`pcre-config --libs\` $LDFLAGS:" Makefile || die
+	#
+	sed -i -e "s:error_log /usr/local/rejik3:error_log /var/log/rejik:g" redirector.conf.dist || die
+	sed -i -e "s:change_log /usr/local/rejik3:change_log /var/log/rejik:g" redirector.conf.dist || die
+	sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" redirector.conf.dist || die
+
+	default
+}
+
+src_install() {
+	exeinto /opt/rejik
+	insinto /opt/rejik
+
+	doexe make-cache
+	doexe redirector
+	doins redirector.conf.dist
+
+	insinto /opt/rejik/tools
+	exeinto /opt/rejik/tools
+
+	doexe tools/kill-cache
+	doexe tools/benchmark
+	doins tools/IN.gz
+
+	fowners -R squid:squid /opt/rejik
+	fperms 750 /opt/rejik
+
+	keepdir /var/log/rejik
+	fowners -R squid:squid /var/log/rejik
+
+	if use banlists; then
+		insinto /opt/rejik
+		doins -r "${WORKDIR}/banlists"
+	fi
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "Copy /opt/rejik/redirector.conf.dist to /opt/rejik/redirector.conf and add line"
+	einfo "for squid 3.*"
+	einfo "url_rewrite_program /opt/rejik/redirector /opt/rejik/redirector.conf "
+	einfo "for squid 2.*"
+	einfo "redirect_program /opt/rejik/redirector /opt/rejik/redirector.conf"
+	einfo "to /etc/squid/squid.conf"
+	einfo ""
+	einfo "Don't forget to edit /opt/rejik/redirector.conf"
+	einfo "Be sure redirector.conf has right permissions"
+}
diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index dc7ab5a30665..760c3c73d1f3 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -1,10 +1,8 @@
 AUX shadowsocks-libev-3.3.4-gcc10.patch 498 BLAKE2B 71bf107f6f285dbfe635475ddc8f2505624a90b22cd9b162a14a7138f3977563749fc2b3c5a1e189bd3a66bdbabdd62ea3d1c14c75d5c3f0f0ea38fe5ed7d9a7 SHA512 a5fd48927aec46d998227035a55cbcc706c305c0b9d00a4916e44c10d30f2783cb5e1d644ee1861f484b5dae60486783efa38ee9475af9ee42c57b0868ee6d66
-AUX shadowsocks-libev-local_at.service 246 BLAKE2B 65bb1410be1812a8a3b5a81f1bb19bce33dd7da2d2c9a924ee41c7aa44fcfd6f24f8449c6d7222bff0b9d3b0c66cb5413e7dc62be70515228ffb914bbd7e5670 SHA512 77154a67f86894f0cde6bed737ecb537fc5cfb12b517ebbc4b9f1d210daf28e9f2bcb7d1795500d31c00aed5a3a16603d65d4c241d2d7d71fddde0de0dae883b
-AUX shadowsocks-libev-redir_at.service 257 BLAKE2B 308ff3d3e2a06208ae681322f6fecc4589e81416ec6f4b694b377f1a40b348076c673d05f7fbfa64ee7805cd91cc305b33c87da30620bfc37148a11df5f7aa3d SHA512 a94924c85f29ef0886f2dd72fc983974fffab7955d2a008154f080d04fb5e93354f73af0ba7817c8b14348428256a261b79e0712f5ae89d81fe95ecfb728e063
-AUX shadowsocks-libev-server_at.service 247 BLAKE2B cce6eb70b580f3f0918755956249a1ced7a0e771a46f345fb82ce793c132c60ee14cd3a9e3a864d564d32e9ba56330cd58718f4f7b163b751244a2b6f7f5c7ca SHA512 6d271d8fac26c697307c18f0a2637624b2c45c619340fa61850704a3cc716758c11743f249d38be4ae344bd8d872eefe6e8cb700b0b6b9183c650bc600f8e0c6
-AUX shadowsocks-libev-tunnel_at.service 259 BLAKE2B 6881120dd27e057046aaa081811de85f64b8b57e02badce7f34984be008b86053eb3912a3e84be821b450c184700bc5d8c393970ee32c5288108fbb72953582d SHA512 d68d5d0f96ba8269d5ea93e8c429936de35929592e7716eb1752e5604bd46fc92e417a2e89d0fd5e4bcd195c0cd2ac7f501c6f43776459fc8d4447fc44821c32
-AUX shadowsocks.initd 1349 BLAKE2B ec1f4bd395803c6a23ff16c6040ecfe70eae2aa840f056ebf035898485cdfb84d9207bda49c1f4c5f3ee18c51b46b706fb73bd6b4d52b7cc1fecb1930ff72ad6 SHA512 1c3d09c8a949aa70896591f1f0bd59e9729c37d9888ef6afaf0e23ea1da50ee9a75a724d81e035a609ece390e6b723db9047f1524ff71de3d9b9267c00cb08c1
+AUX shadowsocks.initd 1413 BLAKE2B 0a60cc154df3c26326d684fd3a9dbcc7beae50e2a8cb290e4caff013a338ef4fcf493be4be010573750f56c4bd9f339f3f0a98a506480fa2928dc6cb7e67ef8e SHA512 8edf2b09ee8fb48e2236447c640342132a188313956f10df73535c740934d5a610e2fd1b618b6822802d4fc7f3244933242434a0966ec2b4f8e3c4132caa3d43
 AUX shadowsocks.json 132 BLAKE2B 84f0dbdf0a7eb5d1c8d8ca26147b5dde872a78b128357fa4d3d1348afdc4bd3bdd87f73c564d030e9cdc19a0e5fe2d414a5430f2daeddd03c0a24b761460596a SHA512 6bc5c406bdb25123fd43e21784028dd331f729bc56fe7ac4d31e3b1d81d12048a6906db3fd79765a64fc7f8b651095695fd8cdcc60f6d3285231e94a90611cef
 DIST shadowsocks-libev-3.3.4.tar.gz 279666 BLAKE2B ea698a3cf29ed0b1268d17e25a492712cb90f515068de2f74d200ab04bb0d5ca859ea1d7f071714cc1c8dced0e566df4bfea0d780e24c9398f93ab1e362ec466 SHA512 4fb9e4a62f86f1504aab71022b5078a1f97b1f14da82c7b456dc9eaed23be990430769f37b7c2855c266be40ec215237bb0a40d254dffac8556ec4719cc9aa6d
-EBUILD shadowsocks-libev-3.3.4.ebuild 2258 BLAKE2B 7c85cb1e414c15523b5642a5155eae972d256052eea9285ba382d53371f8b540a1aa9ddcf54634680240e70aacc6b43d4cbe871be2f0227c580b37bc63369723 SHA512 84bb6b4d5850cf814b5b43059c91e471f323e5f748b767d414a1065554f116d1fda1d3a39c616dae0788046f42e3d92fd6b49bee9307dea157da04544cfc53d4
+DIST shadowsocks-libev-3.3.5.tar.gz 303368 BLAKE2B bb7d6e64596710402db94085044c20315028395723828fa82dfba419bc41a0c740ece1f79c6cf05dda395d9442d553429f66d7f7b2de3cdd188d5b6adb0b8edf SHA512 c0cc869b4b7661ebd348bd5559c6a17c44b66a5f42374d97023adcfb525d934da3ed96245ff792ebc74870d30dd8f71fadcd89c79b2cd8a98d551ff7592508d0
+EBUILD shadowsocks-libev-3.3.4-r1.ebuild 2113 BLAKE2B ea3ceed1ffafba1200a5327998d95b9ad780564aba4d6370a9911aa09a22e8a4a12fff9f703dadb42d85d5b1d16c8b867198d975f9e0ab6b2cd63928c36a11b0 SHA512 69599842475134f0921fd40eb873d1c87ce731fd5c8d0ef98e63ee6e3ed2e6fe119af029d46f229ed381875619e00a106b30a14688f64f8cde65fec06c2a9eb4
+EBUILD shadowsocks-libev-3.3.5.ebuild 1989 BLAKE2B bd3f5c9965126c7216b3cf2b225415ccf70e626f1503e6e97e94a63eaf6589c9b0bf781ffa68b559b9cee92e7859dc818e7f470ea1d27616d7841baadbd5c78d SHA512 81c2e55f5c2b04f60f3e94d3150651b0ac3a26e80dad7f56c626b056496ea53a07243a9d4e2d994ab2f5a5e6371921090bf91b01f9450f156e1bf57423f8d25b
 MISC metadata.xml 334 BLAKE2B 1217232e3b08c238795607fa0281c81feb34ed794005d1e5c1522b3380a9d1f3877ccf787ab88ee95a4cd4db85a11163395e4a3a449d4a862634e5a8cdfbe0e2 SHA512 a1e5349204ad41815cdf8772c760c0e1085749863c71d30fddfa8958d8c6d388575288da4dcd60acdaf00288b5a52a731aa21512a1c7ef9622fd0b2de162086f
diff --git a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-local_at.service b/net-proxy/shadowsocks-libev/files/shadowsocks-libev-local_at.service
deleted file mode 100644
index af137178380f..000000000000
--- a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-local_at.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Client Service for %I
-After=network.target
-
-[Service]
-Type=simple
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-local -c /etc/shadowsocks-libev/%i.json
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-redir_at.service b/net-proxy/shadowsocks-libev/files/shadowsocks-libev-redir_at.service
deleted file mode 100644
index 1ced8f454408..000000000000
--- a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-redir_at.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Client Service Redir Mode for %I
-After=network.target
-
-[Service]
-Type=simple
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-redir -c /etc/shadowsocks-libev/%i.json
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-server_at.service b/net-proxy/shadowsocks-libev/files/shadowsocks-libev-server_at.service
deleted file mode 100644
index 58d934bdb1d1..000000000000
--- a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-server_at.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Server Service for %I
-After=network.target
-
-[Service]
-Type=simple
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-server -c /etc/shadowsocks-libev/%i.json
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-tunnel_at.service b/net-proxy/shadowsocks-libev/files/shadowsocks-libev-tunnel_at.service
deleted file mode 100644
index 24b31d5a1cd9..000000000000
--- a/net-proxy/shadowsocks-libev/files/shadowsocks-libev-tunnel_at.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Shadowsocks-Libev Client Service Tunnel Mode for %I
-After=network.target
-
-[Service]
-Type=simple
-CapabilityBoundingSet=CAP_NET_BIND_SERVICE
-ExecStart=/usr/bin/ss-tunnel -c /etc/shadowsocks-libev/%i.json
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-proxy/shadowsocks-libev/files/shadowsocks.initd b/net-proxy/shadowsocks-libev/files/shadowsocks.initd
index 2ccd114485bb..994ba23e3b8b 100644
--- a/net-proxy/shadowsocks-libev/files/shadowsocks.initd
+++ b/net-proxy/shadowsocks-libev/files/shadowsocks.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 SS_CONFIG="/etc/shadowsocks-libev/shadowsocks.json"
@@ -49,13 +49,16 @@ start() {
 
     ebegin "Starting Shadowsocks: ${SS_SVCNAME} mode"
     start-stop-daemon --start --exec ${SS_COMMAND} \
-    -- -c ${SS_CONFIG} -f ${SS_PIDFILE} >/dev/null 2>&1 &
+	--user nobody --group nobody \
+	-- -c ${SS_CONFIG} -f ${SS_PIDFILE} >/dev/null 2>&1 &
     eend $?
 }
 
 stop() {
     ebegin "Stopping Shadowsocks"
-    start-stop-daemon --stop --pidfile ${SS_PIDFILE}
+    start-stop-daemon --stop \
+	--user nobody --group nobody \
+	--pidfile ${SS_PIDFILE}
     eend $?
 }
 
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4-r1.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4-r1.ebuild
new file mode 100644
index 000000000000..e10f0e72b1ac
--- /dev/null
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="v${PV}"
+inherit autotools eutils systemd
+
+DESCRIPTION="A lightweight secured SOCKS5 proxy for embedded devices and low end boxes"
+HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
+
+#repack with git submodule populated: libbloom, libcork, libipset
+#SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${P}.tar.xz"
+
+SRC_URI="https://github.com/shadowsocks/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug doc"
+
+RDEPEND="net-libs/mbedtls:=
+	net-libs/libbloom
+	net-libs/libcork
+	net-libs/libcorkipset
+	>=dev-libs/libsodium-1.0.8:=
+	dev-libs/libev
+	net-dns/c-ares
+	dev-libs/libpcre
+	"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10.patch"
+)
+src_prepare() {
+	sed -i -e 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \
+		configure.ac || die
+	sed -i -e "/\[Service\]/a\\User=nobody" \
+		debian/shadowsocks-libev*.service || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="
+		$(use_enable debug assert)
+		--enable-system-shared-lib
+	"
+	use doc || myconf+="--disable-documentation"
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	insinto "/etc/${PN}"
+	newins "${FILESDIR}/shadowsocks.json" shadowsocks.json
+
+	newinitd "${FILESDIR}/shadowsocks.initd" shadowsocks
+	dosym shadowsocks /etc/init.d/shadowsocks.server
+	dosym shadowsocks /etc/init.d/shadowsocks.client
+	dosym shadowsocks /etc/init.d/shadowsocks.redir
+	dosym shadowsocks /etc/init.d/shadowsocks.tunnel
+
+	dodoc -r acl
+
+	for i in debian/${PN}*.service; do
+		systemd_newunit $i $(basename $i)
+	done
+}
+
+pkg_setup() {
+	elog "You need to choose the mode"
+	elog "  server: rc-update add shadowsocks.server default"
+	elog "  client: rc-update add shadowsocks.client default"
+	elog "  redir:  rc-update add shadowsocks.redir default"
+	elog "  tunnel: rc-update add shadowsocks.tunnel default"
+}
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild
deleted file mode 100644
index 353791fc2639..000000000000
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="v${PV}"
-inherit autotools eutils systemd
-
-DESCRIPTION="A lightweight secured SOCKS5 proxy for embedded devices and low end boxes"
-HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
-
-#repack with git submodule populated: libbloom, libcork, libipset
-#SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${P}.tar.xz"
-
-SRC_URI="https://github.com/shadowsocks/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug doc"
-
-RDEPEND="net-libs/mbedtls:=
-	net-libs/libbloom
-	net-libs/libcork
-	net-libs/libcorkipset
-	>=dev-libs/libsodium-1.0.8:=
-	dev-libs/libev
-	net-dns/c-ares
-	dev-libs/libpcre
-	"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-	"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-src_prepare() {
-	sed -i 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \
-		configure.ac || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf="
-		$(use_enable debug assert)
-		--enable-system-shared-lib
-	"
-	use doc || myconf+="--disable-documentation"
-	econf ${myconf}
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	insinto "/etc/${PN}"
-	newins "${FILESDIR}/shadowsocks.json" shadowsocks.json
-
-	newinitd "${FILESDIR}/shadowsocks.initd" shadowsocks
-	dosym shadowsocks /etc/init.d/shadowsocks.server
-	dosym shadowsocks /etc/init.d/shadowsocks.client
-	dosym shadowsocks /etc/init.d/shadowsocks.redir
-	dosym shadowsocks /etc/init.d/shadowsocks.tunnel
-
-	dodoc -r acl
-
-	systemd_newunit "${FILESDIR}/${PN}-local_at.service" "${PN}-local@.service"
-	systemd_newunit "${FILESDIR}/${PN}-server_at.service" "${PN}-server@.service"
-	systemd_newunit "${FILESDIR}/${PN}-redir_at.service" "${PN}-redir@.service"
-	systemd_newunit "${FILESDIR}/${PN}-tunnel_at.service" "${PN}-tunnel@.service"
-}
-
-pkg_setup() {
-	elog "You need to choose the mode"
-	elog "  server: rc-update add shadowsocks.server default"
-	elog "  client: rc-update add shadowsocks.client default"
-	elog "  redir:  rc-update add shadowsocks.redir default"
-	elog "  tunnel: rc-update add shadowsocks.tunnel default"
-}
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild
new file mode 100644
index 000000000000..5349e2ab8407
--- /dev/null
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-3.3.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="v${PV}"
+inherit autotools eutils systemd
+
+DESCRIPTION="A lightweight secured SOCKS5 proxy for embedded devices and low end boxes"
+HOMEPAGE="https://github.com/shadowsocks/shadowsocks-libev"
+
+#repack with git submodule populated: libbloom, libcork, libipset
+#SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${P}.tar.xz"
+
+SRC_URI="https://github.com/shadowsocks/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug doc"
+
+RDEPEND="net-libs/mbedtls:=
+	>=net-libs/libbloom-1.6
+	net-libs/libcork
+	net-libs/libcorkipset
+	>=dev-libs/libsodium-1.0.8:=
+	dev-libs/libev
+	net-dns/c-ares
+	dev-libs/libpcre
+	"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	"
+
+src_prepare() {
+	sed -i -e 's|AC_CONFIG_FILES(\[libbloom/Makefile libcork/Makefile libipset/Makefile\])||' \
+		configure.ac || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="
+		$(use_enable debug assert)
+		--enable-system-shared-lib
+	"
+	use doc || myconf+="--disable-documentation"
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	insinto "/etc/${PN}"
+	newins "${FILESDIR}/shadowsocks.json" shadowsocks.json
+
+	newinitd "${FILESDIR}/shadowsocks.initd" shadowsocks
+	dosym shadowsocks /etc/init.d/shadowsocks.server
+	dosym shadowsocks /etc/init.d/shadowsocks.client
+	dosym shadowsocks /etc/init.d/shadowsocks.redir
+	dosym shadowsocks /etc/init.d/shadowsocks.tunnel
+
+	dodoc -r acl
+
+	for i in debian/${PN}*.service; do
+		systemd_newunit $i $(basename $i)
+	done
+}
+
+pkg_setup() {
+	elog "You need to choose the mode"
+	elog "  server: rc-update add shadowsocks.server default"
+	elog "  client: rc-update add shadowsocks.client default"
+	elog "  redir:  rc-update add shadowsocks.redir default"
+	elog "  tunnel: rc-update add shadowsocks.tunnel default"
+}
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index e368e0bb39c4..635e5fb38f34 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -3,5 +3,7 @@ AUX tinyproxy-1.10.0.service 181 BLAKE2B 1e5c14f607d0c54d215a6ffe5656bac288e48ca
 AUX tinyproxy.service 172 BLAKE2B d2e6199bfee2bac52e08d4c5506131f19e2630ebe1d9ed12f71d575cef37454c229e9e08b1fc89d9e26052a1192913289ed3602d69686d6894eb68b8639e7a5a SHA512 4c4cd36a7e34d9ee27c05475b72d1b61f90592ccb44c9deb96a1375bb681b7901702f078ed24b7c633074c83e450275a4a66829f3b270f75fc786a50d1ef393f
 AUX tinyproxy.tmpfiles.conf 48 BLAKE2B f2cd35878580eb198920f5db8493e3e266b4325160a9590a0b59bef1cf0577d0129bb636d99442cdb2154b444a8cdc1c6d01b4850b57df774be00338c61902e4 SHA512 24440cdaed0af6cbdb191acb1769e0a17871ef95e03e62a6621a413a2616e5d90d748d909bb5d18c029b25d7bf91485dbe46ee11e8703a1cb9008be470536715
 DIST tinyproxy-1.10.0.tar.xz 176060 BLAKE2B 58f9b443c731de6b74d689a80ebd422d3b6f51f643546ee144b37fb3262725246f6a5fa1015267a94f192f8715eaf71ffc078ead75e6225a210f58ec28ee8fcf SHA512 8d82598c5f9c89bc672f4632139ac52696d5c7788963de51688a8aeb576c69004f8338fe1e1897bf704a21dfd25ab1effb092003b6afaa9a88c2b5d0608310f5
+DIST tinyproxy-1.11.0-rc1.tar.xz 176732 BLAKE2B a448c90b17a8d3256aec1dba4307e9bce87ac421a67486e4987afbf22e49041971138f09e98a4a775cc05071b73b4f1b34e652eb2c0992b2a5fa1861a0df26b2 SHA512 e1d05777072d178c66d1f007163bcb4b3a0b1dfdf460881daaf962b5f1c0d0213ec5403bf50c161d811f46c8b50a476cd534f535962ec01b70fbb955471c1af1
 EBUILD tinyproxy-1.10.0-r1.ebuild 1653 BLAKE2B 30ee264b5f273c6a9902f2c9680acfe46fbddabe2e826d9255f4a9b9e210a08c37cd619e5b78a7b2d59a45e73685b7ac758dcce13d349a5c4788e2555d8bc2e2 SHA512 7c4606f12aa17a36dee5bcc4561f7fd0e5d104f646d1347f3de37abc9b7f8c788a3f0be6907b4fa58916cea4c2778851299396e9d1b2cd6c377a4690469ac2d8
+EBUILD tinyproxy-1.11.0_rc1.ebuild 1722 BLAKE2B 5bbb0718f57f8b690aa7f309f4ed23225e75613a1ff3bf831ca86d466ee0370a4e82874db0b85c41bf2200aa65b72e681c4808f29767dbae61eebde5268dfc76 SHA512 d1c350ece4642aed0ceaf1c449a4a286e701b030b03d546b3865d6d32fcd2468316a1c8eba2a74e604b6ec21bd53498f10148f00d5de71937f3e66ad1580ff13
 MISC metadata.xml 562 BLAKE2B db41afc703d1338c10ef24e682a96b5a945bc80fd4a4e798fa7e74fdfbb9b1b8449a9126b8506e60524e733fc4810a1499e1320e565840798f8bea4722d46380 SHA512 ade2407ef37db41cef982bee16d02621813899fff1c4c3eaa00dd7517af254def7ecf08f508a1e873eaf5d2843df22154272bf58f84954e512614107d333805c
diff --git a/net-proxy/tinyproxy/tinyproxy-1.11.0_rc1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.11.0_rc1.ebuild
new file mode 100644
index 000000000000..7c0e27a1928d
--- /dev/null
+++ b/net-proxy/tinyproxy/tinyproxy-1.11.0_rc1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd tmpfiles
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A lightweight HTTP/SSL proxy"
+HOMEPAGE="https://github.com/tinyproxy/tinyproxy/"
+SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+IUSE="test debug +filter-proxy reverse-proxy transparent-proxy
++upstream-proxy +xtinyproxy-header"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( xtinyproxy-header )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DEPEND="
+	acct-group/tinyproxy
+	acct-user/tinyproxy
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s|nobody|${PN}|g" \
+		etc/${PN}.conf.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable filter-proxy filter) \
+		$(use_enable reverse-proxy reverse) \
+		$(use_enable transparent-proxy transparent) \
+		$(use_enable upstream-proxy upstream) \
+		$(use_enable xtinyproxy-header xtinyproxy) \
+		--localstatedir=/var
+}
+
+src_test() {
+	# The make check target does not run the test suite
+	emake test
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	diropts -m0775 -o ${PN} -g ${PN}
+	keepdir /var/log/${PN}
+
+	newinitd "${FILESDIR}"/${PN}-1.10.0.initd tinyproxy
+	systemd_newunit "${FILESDIR}"/${PN}-1.10.0.service tinyproxy.service
+	dotmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.tmpfiles.conf
+
+	elog "For filtering domains and URLs, enable filter option in the configuration"
+	elog "file and add them to the filter file (one domain or URL per line)."
+}
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 4fc038e5da07..362f7675b855 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,7 +1,5 @@
-AUX trojan.initd 753 BLAKE2B a0dab04f6abe08a00bfcf4e8eb2f7c2f1368e346c485d5ccec40f9aeb798ee9e3b838ac06b98d252a9823f3ad96d798fec193791c042c041b49999cd0e46fa08 SHA512 73e84faa009436215793a39e19f5664bc7b1ddcd9d82a205b98ff16378f13cfc1dfb4380ab58804cbae988b7796b51149c11c4cd227ee0e4b15a6ca68e888b7f
-DIST trojan-1.15.1.tar.gz 48121 BLAKE2B 38f288d8b9a6c7a98ada85b6b2dd2448604f54068334380c2e6b49d6ee015a1fad2847747734ef1e670d201d9625e64859ccddde5b924ea09c4e87e206997431 SHA512 5e0dfb46116b9de54f5d4e6d0646ab5ba3746143c5ad0f275c894929ba7fc840cacb187e514bbfaa770f0651fc4d3ff9e662f648f515a972ddf72ad0e93d616f
+AUX trojan.initd 981 BLAKE2B fd66aa23bed621362d28d27125388de413dc554180283337f49feacbab3f2bae8b28409b0c2e8d980ff79d1082ac0a56657bb7d089262c99658afba0f3d28eff SHA512 d6c79b5705da095173e6a590d128d77d68036e20916ce17144d6889d45ccb9cf5422665a22f192019e0624d60998dfd077587c2ebc2f7b0d4078e33113a8a462
 DIST trojan-1.16.0.tar.gz 51669 BLAKE2B 9238f9886820ca3625a894ac8de1e199e238029593634436f3aa529d5c576f2636d5183b64a2e6155a888fe8f45629c94625f02119fbfb4ada01b1bd9e502fcf SHA512 60aa8539731eee6f15cbcb18b20b45435fc2dfe439a2f67fe9770257c3b6ffe219efe376cfd909f748d523a18645c96f6859b8487cacaba04ac7d93cf762f153
-EBUILD trojan-1.15.1.ebuild 1318 BLAKE2B 82970b3afbef707e54a9f4612a8632edff3ecbcece6658537e6930a65eee8aadee14e413436f123108949c50378a41f4e88dc718e272fb8157bd11e1df144adc SHA512 fb2938164b0be2248b0143d6d3b67ea434aa973e72bda6bdc1a0dbfc3edb7844ebdd05004183306c21c26336bf9187022283ccf9e6d13be2ef55fc3b9e7e958f
-EBUILD trojan-1.16.0.ebuild 1318 BLAKE2B 82970b3afbef707e54a9f4612a8632edff3ecbcece6658537e6930a65eee8aadee14e413436f123108949c50378a41f4e88dc718e272fb8157bd11e1df144adc SHA512 fb2938164b0be2248b0143d6d3b67ea434aa973e72bda6bdc1a0dbfc3edb7844ebdd05004183306c21c26336bf9187022283ccf9e6d13be2ef55fc3b9e7e958f
+EBUILD trojan-1.16.0-r1.ebuild 1318 BLAKE2B 82970b3afbef707e54a9f4612a8632edff3ecbcece6658537e6930a65eee8aadee14e413436f123108949c50378a41f4e88dc718e272fb8157bd11e1df144adc SHA512 fb2938164b0be2248b0143d6d3b67ea434aa973e72bda6bdc1a0dbfc3edb7844ebdd05004183306c21c26336bf9187022283ccf9e6d13be2ef55fc3b9e7e958f
 EBUILD trojan-9999.ebuild 1276 BLAKE2B b8163baf4c01ecbc56fe1f3c541b47d8f6c9c73a89fcb254a3411780bda12bfa9d3bf750f6929762f8cccb6956b20af2de262ba3220b7bf9a519e1202263c628 SHA512 76ec4e382c7def17b21715b4e9745c67998f88272418beef495c8c3351c0fcfbc57bda966ecb9ca1543823bcb8a9e650117ea8ac180a7b1d893ddaec568dcdfa
 MISC metadata.xml 1124 BLAKE2B 0d11d3625f824da33597ff489cb1170cac018279c80ce230c0b0233c7bc1e19a279adbea4f2aa9d83077ac8359d37714326dddb3c8f7f8503dbc9e17857a08d5 SHA512 2c912d390ff5483dc5458ff887958e259bdd6897754a3374d5d978729b692d0fc99768bd12975dc6c9e44b4080046914d9f55bc67045f68e792e2712cc513f30
diff --git a/net-proxy/trojan/files/trojan.initd b/net-proxy/trojan/files/trojan.initd
index 2990245430db..348d307c5264 100644
--- a/net-proxy/trojan/files/trojan.initd
+++ b/net-proxy/trojan/files/trojan.initd
@@ -2,6 +2,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+TJ_USER=nobody
+TJ_GROUP=nobody
+
 TJ_NAME=${SVCNAME##*.}
 if [ -n "${TJ_NAME}" -a "${SVCNAME}" != "trojan" ]; then
 	TJ_PIDFILE="/run/trojan.${TJ_NAME}.pid"
@@ -19,15 +22,19 @@ depend() {
 
 start() {
 	ebegin "Starting Trojan, Log File: ${TJ_LOG}"
-	start-stop-daemon --start -b \
-		-1 "${TJ_LOG}" -2 "${TJ_LOG}" \
-		-m -p "${TJ_PIDFILE}" \
+	checkpath -f -m 0600 -o ${TJ_USER}:${TJ_GROUP} "${TJ_LOG}"
+	start-stop-daemon --start --background \
+		--user ${TJ_USER} --group ${TJ_GROUP} \
+		--stdout "${TJ_LOG}" --stderr "${TJ_LOG}" \
+		--make-pidfile --pidfile "${TJ_PIDFILE}" \
 		--exec /usr/bin/trojan  -- "${TJ_CONFIG}"
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Trojan"
-	start-stop-daemon --stop -p "${TJ_PIDFILE}"
+	start-stop-daemon --stop \
+		--user ${TJ_USER} --group ${TJ_GROUP} \
+		--pidfile "${TJ_PIDFILE}"
 	eend $?
 }
diff --git a/net-proxy/trojan/trojan-1.15.1.ebuild b/net-proxy/trojan/trojan-1.16.0-r1.ebuild
index 21f494f1364d..21f494f1364d 100644
--- a/net-proxy/trojan/trojan-1.15.1.ebuild
+++ b/net-proxy/trojan/trojan-1.16.0-r1.ebuild
diff --git a/net-proxy/trojan/trojan-1.16.0.ebuild b/net-proxy/trojan/trojan-1.16.0.ebuild
deleted file mode 100644
index 21f494f1364d..000000000000
--- a/net-proxy/trojan/trojan-1.16.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake python-any-r1 systemd
-
-DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
-HOMEPAGE="https://github.com/trojan-gfw/trojan"
-SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="mysql test"
-
-# Some hiccups setting up local network server.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/boost-1.66.0:=
-	dev-libs/openssl:0=
-	mysql? ( dev-db/mysql-connector-c:= )
-"
-DEPEND="${RDEPEND}
-	test? ( net-misc/curl ${PYTHON_DEPS} )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_MYSQL=$(usex mysql)
-		-DSYSTEMD_SERVICE=ON
-		-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newinitd "${FILESDIR}/trojan.initd" trojan
-}
-
-src_test() {
-	cmake_src_test -j1
-}
-
-pkg_postinst() {
-	elog "Running Trojan with multi instances"
-	elog ""
-
-	elog "Prepare /etc/trojan/\${blah}.json first"
-	elog "Config with Openrc"
-	elog "   ln -s /etc/init.d/trojan{,.\${blah}}"
-	elog "   rc-update add trojan.\${blah} default"
-	elog ""
-	elog "Config with Systemd"
-	elog "   systemctl enable trojan.\${blah}"
-	elog ""
-}
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index a88a871c9209..08fe7a94f8d6 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/telepathy-rakia/Manifest b/net-voip/telepathy-rakia/Manifest
index 2c314d686229..22062f7a059b 100644
--- a/net-voip/telepathy-rakia/Manifest
+++ b/net-voip/telepathy-rakia/Manifest
@@ -1,3 +1,4 @@
+DIST telepathy-rakia-0.8.0-py3.patch 4472 BLAKE2B 6eb45f91f351ba6ee0afa16022921efaa764168acf9a0891b57cba4ab90c5f2f3f58c7704ecc7224d9aa1a9559a6be7b96cb8ab3c5382552fe2d640ecfd94ab5 SHA512 cf76d730001da55e1bececbfab9810c83643c6b4cabc6c92c106fafae8a64d75b2eaa455599d70a0e40f13ea6d293f0621948e3a3d047d4002ce3b08b58858f0
 DIST telepathy-rakia-0.8.0.tar.gz 659116 BLAKE2B b940d28828220f83c3408aeb9effc26f17d62729f01073539ca4381604bc762b411064d6de92a557ff0f7a8a1920799163f6ede2dba6cfec01967145501a1da2 SHA512 5378e1a2909c4218cc9c6fecf0b01beff0b52fd40cc040a601090dbaae330b3506fc74dc5ae86e5f0c954dd3c41fd7ba4e5a294f8fc11d74aa6eb9025097e9ae
-EBUILD telepathy-rakia-0.8.0.ebuild 1011 BLAKE2B b6ffcf08e5ac9eb9dc6cda368b400c9e6c0a65101515bdd71ceef5d9d94eb9738493fc7099f6ddc79c8309301270656c5847d7c5ced59d38dc0f26858171573d SHA512 e86c52ec1a104a87e2076bd34069f16c97fe663d88fee0bd428dbe67ef0df1aa346402d39565afa05ca3a6b402762fee37a4c4cce4c39a8ae400f74b9facc1ae
+EBUILD telepathy-rakia-0.8.0-r1.ebuild 1066 BLAKE2B 4d4fbb6a3e359dd581b99d42931f75a340ba5995dee35ce1f4a47176be3a712f65713038a8786d3add4defe40d2913ac286bb5b0629e21c1aacf6a231031af2a SHA512 ed74182b0c1a3638e4e71cf7bd95dc5aad1c4aeb035f8d233cd88c13f9244a17d98fdf0f0eff1b64c47b11eeea14a5ba5d366344154bda075d5bd09e81370e49
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-voip/telepathy-rakia/telepathy-rakia-0.8.0-r1.ebuild b/net-voip/telepathy-rakia/telepathy-rakia-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..e6a644508e34
--- /dev/null
+++ b/net-voip/telepathy-rakia/telepathy-rakia-0.8.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1
+
+DESCRIPTION="A SIP connection manager for Telepathy based around the Sofia-SIP library"
+HOMEPAGE="https://telepathy.freedesktop.org/"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz
+	https://patch-diff.githubusercontent.com/raw/TelepathyIM/telepathy-rakia/pull/1.patch
+		-> ${P}-py3.patch"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.30:2
+	>=net-libs/sofia-sip-1.12.11
+	>=net-libs/telepathy-glib-0.17.6
+	>=sys-apps/dbus-0.60
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-voip/telepathy-sofiasip
+"
+# telepathy-rakia was formerly known as telepathy-sofiasip
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+"
+# eautoreconf requires: gtk-doc-am
+
+PATCHES=(
+	"${DISTDIR}"/${P}-py3.patch
+)
+
+src_configure() {
+	econf --disable-fatal-warnings
+}
diff --git a/net-voip/telepathy-rakia/telepathy-rakia-0.8.0.ebuild b/net-voip/telepathy-rakia/telepathy-rakia-0.8.0.ebuild
deleted file mode 100644
index 93507fcb9416..000000000000
--- a/net-voip/telepathy-rakia/telepathy-rakia-0.8.0.ebuild
+++ /dev/null
@@ -1,41 +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 python-single-r1
-
-DESCRIPTION="A SIP connection manager for Telepathy based around the Sofia-SIP library"
-HOMEPAGE="https://telepathy.freedesktop.org/"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.30:2
-	>=net-libs/sofia-sip-1.12.11
-	>=net-libs/telepathy-glib-0.17.6
-	>=sys-apps/dbus-0.60
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-voip/telepathy-sofiasip
-"
-# telepathy-rakia was formerly known as telepathy-sofiasip
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	test? ( dev-python/twisted-core )
-"
-# eautoreconf requires: gtk-doc-am
-
-src_configure() {
-	econf --disable-fatal-warnings
-}
diff --git a/net-voip/telepathy-salut/Manifest b/net-voip/telepathy-salut/Manifest
index 8940c928235a..84baa46c6edb 100644
--- a/net-voip/telepathy-salut/Manifest
+++ b/net-voip/telepathy-salut/Manifest
@@ -1,5 +1,6 @@
 AUX telepathy-salut-0.5.0-uninitialized.patch 496 BLAKE2B f697051628069c6a8c6339ddee37133eab9b90b4f43553b501c611d02de4c63c14d3e4e15896987acd6d4b275a6416a777fbbfac962f90e1dd55c10872ff3939 SHA512 a6365b18b5c1f876c990ec4bbf522b2c8708ca73c201e9bac9447e3fc8d8979b3882c977e9393e34031ca2659b0519c841645280a03d11b4bac8e907db816ce9
 AUX telepathy-salut-0.8.1-openssl-1.1.patch 7190 BLAKE2B f66a7a22ac36889aceca1ddcf8ae85438a6ae380f99f1cc068f9df34b7b6763bd773d0669b36f2ab8fc9557ce4d6ef71abd5f011f542b040114b70a909b40a15 SHA512 fa105e35ce369a35e844d7886c22d7c17433db482d0e5ac6156139ae6474dd91045cda7490d460a26adbd35f370aa98ea9c4a5ebdc81d627c022616a9de9c138
+DIST telepathy-salut-0.8.1-python3.patch 5878 BLAKE2B db76eaf004418d48359c0ca710a59782fc1cda304825c75259daca41f3cd94ced207be06db7e5fd4d290b8021276077076eed330c20c2249b1577f0670697f93 SHA512 b924fae314d9efcc22226415e5904521593821996cdef9e5149ebc5ee2ceb4c2c210c311aeed3a01e634cb6ddc8f36b83d1473d700a8a6d1171c934217ef4185
 DIST telepathy-salut-0.8.1.tar.gz 1823482 BLAKE2B 22f93d48cc749ed74ac1ee4103ea0bf5b1f93b2d14c95a4bd2edde977a5c43db5d5fe54dd246c561ee94f13b4030ab42c011f537a0e6688e8be3ac0aa0f1ca67 SHA512 34537ac9ce0b78015e184963ea79beaa7332ac11803f9683ff34577d9f0a14f7ed287aacb2c00059f2ff2f300c325a09a78a320e83d0a0031ad976da2c197a90
-EBUILD telepathy-salut-0.8.1-r2.ebuild 1815 BLAKE2B abf34721fa6dd4f31a7f4788b9fc04332b1ab8657aec3747b0442fb3518b5e26f418dd9911962e9cc45ce1f9cc5c0a6dc4c3c99fbcacf71146c37b3e667f0505 SHA512 e9a846d7c400d30d384af2b8b780b9dca911ddbf39df600b381ba813ab3137bcbef7237a95b49c262a93e45e0d904b4a6ece5fa6949295ef6b8e3948f79e1ebb
+EBUILD telepathy-salut-0.8.1-r3.ebuild 1771 BLAKE2B e08c0062b152c96660216d9f443d226e9512eb1bde6a0b2997c659c66e2fac9ec1cf95b0697d7ad32ae6aea549b3b580add99751fdb3356590aad9be981aaf41 SHA512 61ae8443bae1f8e73e85ed29ebadda855b5fbc9c082960da78911450a1af242b97652f656bf90a343cf007d76d1e3a8f7bbb17280577e45a4ec75d98ab7bd131
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
deleted file mode 100644
index 910016e3338c..000000000000
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1
-
-DESCRIPTION="A link-local XMPP connection manager for Telepathy"
-HOMEPAGE="https://telepathy.freedesktop.org/"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~x86-linux"
-IUSE="gnutls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.61
-	dev-libs/libxml2
-	>=dev-libs/glib-2.28:2
-	>=sys-apps/dbus-1.1.0
-	>=net-libs/telepathy-glib-0.17.1
-	>=net-dns/avahi-0.6.22[dbus]
-	net-libs/libsoup:2.4
-	sys-apps/util-linux
-	dev-db/sqlite:3
-	gnutls? ( >=net-libs/gnutls-2.10.2 )
-	!gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? (
-		>=dev-libs/check-0.9.4
-		net-libs/libgsasl
-		$(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]')
-	)
-"
-# FIXME: needs xmppstream python module
-#               >=net-dns/avahi-0.6.22[python]
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-uninitialized.patch # upstream bug #37701
-	"${FILESDIR}"/${P}-openssl-1.1.patch # bug #663994
-)
-
-python_check_deps() {
-	if use test ; then
-		 has_version "dev-python/twisted[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--disable-coding-style-checks \
-		--disable-plugins \
-		--disable-Werror \
-		--disable-static \
-		--disable-avahi-tests \
-		--with-tls=$(usex gnutls gnutls openssl)
-		#$(use_enable test avahi-tests)
-
-	# false positives according to bug #413581:
-	# unrecognized options: --disable-plugins, --disable-avahi-tests
-}
-
-src_install() {
-	MAKEOPTS+=" -j1" default # bug 413581
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild
new file mode 100644
index 000000000000..11d873b5e9a7
--- /dev/null
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-any-r1
+
+DESCRIPTION="A link-local XMPP connection manager for Telepathy"
+HOMEPAGE="https://telepathy.freedesktop.org/"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz
+	https://src.fedoraproject.org/rpms/telepathy-salut/raw/master/f/${P}-python3.patch"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 sparc x86 ~x86-linux"
+IUSE="gnutls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.61
+	dev-libs/libxml2
+	>=dev-libs/glib-2.28:2
+	>=sys-apps/dbus-1.1.0
+	>=net-libs/telepathy-glib-0.17.1
+	>=net-dns/avahi-0.6.22[dbus]
+	net-libs/libsoup:2.4
+	sys-apps/util-linux
+	dev-db/sqlite:3
+	gnutls? ( >=net-libs/gnutls-2.10.2 )
+	!gnutls? ( >=dev-libs/openssl-0.9.8g:0[-bindist] )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? (
+		>=dev-libs/check-0.9.4
+		net-libs/libgsasl
+	)
+"
+# FIXME: needs xmppstream python module
+#               >=net-dns/avahi-0.6.22[python]
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.0-uninitialized.patch # upstream bug #37701
+	"${FILESDIR}"/${P}-openssl-1.1.patch # bug #663994
+	"${DISTDIR}"/${P}-python3.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--disable-coding-style-checks \
+		--disable-plugins \
+		--disable-Werror \
+		--disable-static \
+		--disable-avahi-tests \
+		--with-tls=$(usex gnutls gnutls openssl)
+		#$(use_enable test avahi-tests)
+
+	# false positives according to bug #413581:
+	# unrecognized options: --disable-plugins, --disable-avahi-tests
+}
+
+src_install() {
+	MAKEOPTS+=" -j1" default # bug 413581
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index cfebe9457d4c..7a334298c8ff 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/badvpn/Manifest b/net-vpn/badvpn/Manifest
index 7d57889cec0a..ba6cd8eefbf6 100644
--- a/net-vpn/badvpn/Manifest
+++ b/net-vpn/badvpn/Manifest
@@ -4,14 +4,10 @@ AUX badvpn-ncd.init 1146 BLAKE2B b75f582d7402ee2f586438c58240b290f156153ffdfa4b3
 AUX badvpn-ncd.service 266 BLAKE2B 70faf47cab74ccd6201cfb94bbf275d701f9f856490753b7a6a95e2a7ab0dcb5fe282d6cb0e5cb8bfff86d091cf660f30057bc2c9809f202bc92e7b9982d8711 SHA512 5087d35a4d8c0d17202fe71d2bd2c881292720b550811d99d711623307e32515938464cb885be6c02a784cfc24311aef0b76576fbffeeadcad9b59c3a05e3fc9
 AUX badvpn-server.conf 227 BLAKE2B 5a3e070d3b875563ba20782ac325cfd76760082c6c217f0e3d606c2ba6b37fb731f03c082af9dd3cff852657a8ca4327e3fe3893e3c21a47a47354eb65592542 SHA512 c5628f1380434884d297846a1c49a31f369a17f97ab9914a741cfde9a21df52926b247c0b9544605c2438f47110c9f548b9161c5975be91e70dacfdf993839c8
 AUX badvpn-server.init 1136 BLAKE2B 37d255f56fb1aeb84b63ee22b82c8b7810bb0acbc7c60654060748e6ec1d9d949f40d712c24a5ff30627c053e72abf7b6ed472d3a653b1f81a0c2e4d43829473 SHA512 12326aa9ee4966786bb49dcc8184bceefaa0c02bf4ed00ca6437d58b64178762b75ec137846401493ca8a8d0cee313339915df49e44870bc9745176ca9edffd5
-DIST badvpn-1.999.126.tar.bz2 936233 BLAKE2B 39d6c6a275f751478fcb48a6ec3b148e5e6169475400973c9635ab6682866aac4cf510ee1e19bc4f4586a03c9d07c20d38576a9023a4d4bdec3eaeca54e0961a SHA512 3d0bbe3c8f91a3cb758b78a0fce4fd111f93fa0578ce06f0a8db5cc575d02f52248b37e7fa097447589257e47084a607a9df7078448ef44ae9fb66eb59e8b9e2
 DIST badvpn-1.999.127.tar.bz2 962224 BLAKE2B c0fc22aa56f59d9273797df9a1687509d1502ada2c92a308b8bd7368b50a4151f1ef8a8d91c720fee85c6f92497a421372eec3dd2160d53e3f3345041ce35f9b SHA512 7484a817795392a52b44d3bf68765652739029aae8c16965b433bbfb4ca67ea70048f76376ba445196aac07a8f19f97696917ad24fe2bcb34025adda1f18a9fb
-DIST badvpn-1.999.128.tar.bz2 1000636 BLAKE2B 9279083684b53335cc82b2de7864386a3d14a83bf5e95890e08b3f3fcac21c34201ca1322bc0f26dca464f072dc65f969ed72faef0baba2d03cbcddc9eceac62 SHA512 7d59e8365c10e7164c6c74b95d5f212ae0c480870bea31a6fb4ed25883f28bb6365e09a9271a9ecedccccd886e5f5e50a6f6df406ee3c40fad40031bbd3f049b
 DIST badvpn-1.999.129.tar.gz 1327123 BLAKE2B 640b4bc3252d0aadaf9a8ce42da7bbead7c0d371a1f536e994a4d26897d8fbee9a0c9738b31b1ce308b3b08b6a661d9dad0ea012ff08ec6349ee67063e402084 SHA512 7a305198d7b4aaa31e567ff1f1bf23e0a65070d8eae78e7ed6be1a3a3b7bce7fcba32c0eb8ae549ef1851a61675afc1770f52dedf131658036b7b6414fdd4e4e
 DIST badvpn-1.999.130.tar.gz 1340372 BLAKE2B d13d5fdda487418ba8d93ba49736f2b68c1b5054636b5cf9120f32f6de5b9d0240502d68824a194c18074b5de86227ad6412c969d91b0ff1ee0ff016bb4c1fb4 SHA512 958d6f3b7a8074fa7ba2f26812c9b2c39272b75d762a12a821ad2d0db9cdc9b9307338d77ca0dcadcf57b81fa4632362e67524de4246d01829951e8924a89770
-EBUILD badvpn-1.999.126.ebuild 1880 BLAKE2B 8f088a95a2847befee084c14b05f5849e9e499e6166d8f649b9496d4bcbe46be78a0c4e4f26705447c451132e1a5f83cb4cae32c66764af1ed7abcf8bc13b7d3 SHA512 fb2aaacf1d15466a62a3a08414073ebb0e34f1e3ce505ed2fb4d9f9961dc74aea67821739dba149ecbdc9c14ea5adedc8bcbf9255a77d691152dccfd606a5933
 EBUILD badvpn-1.999.127.ebuild 1934 BLAKE2B 4eaa7ab82ec068138606fcc876b15869c8b211aae6b6e9f3fce2827c8f619298670e93164efd847df2b6b3343d16d6445ff940659cba3007746953acf13b5f14 SHA512 5385fa40849092fa11b90ce503bdbe1f2cc175a7e7dc993f35bc683d1c83f057025092fc224c92304631884e0bfca407a00aa4dc5c1d7ee55c5175b511fb2ecd
-EBUILD badvpn-1.999.128.ebuild 1948 BLAKE2B 6c25135de06be69eaa1922c38db8cc9c1a51666aa64df4ac959a4506affe6a27918e4cbc6033ed97117c92f2cdba4e3dbc81b33dd1d1ed919e9a399a9deae8ab SHA512 856fa2dabc437ac4c15dd3faa214468b339178416536b342c35433376b9c1f3f85101c9d42e0abcd97b05c4d79130e31a5537e737087e04f175ae222ba9f0fa8
 EBUILD badvpn-1.999.129.ebuild 2000 BLAKE2B 3285e06320b50827a80e36c6abc97bc7ffc9547fb857b8814871768b64f3e2c5d211bd2201627f532fc12be347ca3fe04770a24b69195a19c39f91a33309b59b SHA512 8c81d8708059bb1717edb69d0d2fae782e672b8e769e392a7fe262d2f4395a7f28ae420979e8493482d68280a6477552e5815a029ffb4c71a928fbd242354e1e
 EBUILD badvpn-1.999.130.ebuild 1976 BLAKE2B fca6b518a9a4f8cd61a89da6541ec1211f48fa9b722d31edc2e90ce5340384ad080c78994642303759d217ec68c29383315080ba605d28c44f9d2a160eb0b090 SHA512 ba1c2e0362eaa4aec4b9b4f2cf782d5a5bca50c821cd95c2b6e7077390459bb047f5d59f31b0fcfc752d4a15d5327dd2dc68d23c24f14e7a90c587f3571d6548
 MISC metadata.xml 1728 BLAKE2B 4ba1c50234447e72c340aa8bbd67ec8bd9b5c53f970faecc9473e9e7b790156257590c89df6e78eeed7b7ad42efda154e513baeef48d278291d972a6a74bb929 SHA512 52a2c3b1d9e1f46c71bc151b46d13a6158e0f844228f584a69932fef3370a5407d8e6abaa491a11087802e75e03cb578936abb11c1ece34a0859168ff4e949b7
diff --git a/net-vpn/badvpn/badvpn-1.999.126.ebuild b/net-vpn/badvpn/badvpn-1.999.126.ebuild
deleted file mode 100644
index b13baaaebb5a..000000000000
--- a/net-vpn/badvpn/badvpn-1.999.126.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cmake-utils user toolchain-funcs
-
-MY_P=${PN}-${PV/_rc/rc}
-DESCRIPTION="Peer-to-peer VPN, NCD scripting language, tun2socks proxifier"
-HOMEPAGE="https://code.google.com/p/badvpn/"
-SRC_URI="https://badvpn.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-TARGETS="+client +ncd +server +tun2socks +udpgw"
-IUSE="${TARGETS} debug"
-# tests are only ncd related
-RESTRICT="!ncd? ( test )"
-
-COMMON_DEPEND="
-	client? (
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/openssl
-	)
-	server? (
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/openssl
-	)
-	ncd? (
-		dev-libs/openssl
-	)"
-RDEPEND="${COMMON_DEPEND}
-	ncd? (
-		sys-apps/iproute2
-		>=virtual/udev-171
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-# we need at least one target
-REQUIRED_USE="|| ( ${TARGETS//+/} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser ${PN}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_NOTHING_BY_DEFAULT=1
-		$(cmake-utils_use_build client CLIENT)
-		$(cmake-utils_use_build server SERVER)
-		$(cmake-utils_use_build ncd NCD)
-		$(cmake-utils_use_build tun2socks TUN2SOCKS)
-		$(cmake-utils_use_build udpgw UDPGW)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# OOHMSA: do this on portage level?
-	tc-is-cross-compiler && die "these tests do not work when cross compiling!"
-
-	einfo "Running NCD tests"
-	cd "${S}"/ncd/tests || die
-	bash ./run_tests "${CMAKE_BUILD_DIR}/ncd/badvpn-ncd" \
-		|| die "one or more tests failed"
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog
-
-	if use server; then
-		newinitd "${FILESDIR}"/${PN}-server.init ${PN}-server
-		newconfd "${FILESDIR}"/${PN}-server.conf ${PN}-server
-	fi
-
-	if use ncd; then
-		newinitd "${FILESDIR}"/${PN}-ncd.init ${PN}-ncd
-		newconfd "${FILESDIR}"/${PN}-ncd.conf ${PN}-ncd
-	fi
-}
diff --git a/net-vpn/badvpn/badvpn-1.999.128.ebuild b/net-vpn/badvpn/badvpn-1.999.128.ebuild
deleted file mode 100644
index 7f18a1c6cadf..000000000000
--- a/net-vpn/badvpn/badvpn-1.999.128.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cmake-utils user toolchain-funcs systemd
-
-MY_P=${PN}-${PV/_rc/rc}
-DESCRIPTION="Peer-to-peer VPN, NCD scripting language, tun2socks proxifier"
-HOMEPAGE="https://code.google.com/p/badvpn/"
-SRC_URI="https://badvpn.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-TARGETS="+client +ncd +server +tun2socks +udpgw"
-IUSE="${TARGETS} debug"
-# tests are only ncd related
-RESTRICT="!ncd? ( test )"
-
-COMMON_DEPEND="
-	client? (
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/openssl
-	)
-	server? (
-		dev-libs/nspr
-		dev-libs/nss
-		dev-libs/openssl
-	)
-	ncd? (
-		dev-libs/openssl
-	)"
-RDEPEND="${COMMON_DEPEND}
-	ncd? (
-		sys-apps/iproute2
-		>=virtual/udev-171
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-# we need at least one target
-REQUIRED_USE="|| ( ${TARGETS//+/} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser ${PN}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_NOTHING_BY_DEFAULT=1
-		$(cmake-utils_use_build client CLIENT)
-		$(cmake-utils_use_build server SERVER)
-		$(cmake-utils_use_build ncd NCD)
-		$(cmake-utils_use_build tun2socks TUN2SOCKS)
-		$(cmake-utils_use_build udpgw UDPGW)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# OOHMSA: do this on portage level?
-	tc-is-cross-compiler && die "these tests do not work when cross compiling!"
-
-	einfo "Running NCD tests"
-	cd "${S}"/ncd/tests || die
-	bash ./run_tests "${CMAKE_BUILD_DIR}/ncd/badvpn-ncd" \
-		|| die "one or more tests failed"
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog
-
-	if use server; then
-		newinitd "${FILESDIR}"/${PN}-server.init ${PN}-server
-		newconfd "${FILESDIR}"/${PN}-server.conf ${PN}-server
-	fi
-
-	if use ncd; then
-		newinitd "${FILESDIR}"/${PN}-1.999.127-ncd.init ${PN}-ncd
-		newconfd "${FILESDIR}"/${PN}-ncd.conf ${PN}-ncd
-		systemd_dounit "${FILESDIR}"/badvpn-ncd.service
-	fi
-}
diff --git a/net-vpn/corkscrew/Manifest b/net-vpn/corkscrew/Manifest
index c82f12dfae83..e7d163d6ee9b 100644
--- a/net-vpn/corkscrew/Manifest
+++ b/net-vpn/corkscrew/Manifest
@@ -1,5 +1,4 @@
 AUX corkscrew-2.0-crlf-with-authfile.patch 666 BLAKE2B 589586fdc113c5e7467c591dd3cc9300dcc536cfa230fdfe272c931e830d889ebcd43aaf0f0eb4dd245c04daad8cb195bbe53ca93dcbaa6183940d27dc349a75 SHA512 030e5a0b176e9f7180bf737b70e230b06565a80e10106c4bcd444a9e7293286068a0192401dda8886479fe68b6c644350aa2d047f655e846b22204a248605b9e
 DIST corkscrew-2.0.tar.gz 56749 BLAKE2B 4685b373af3a6d19cbd50b42c7fb421cd1c9b872d9682280aba52933869ba723940e959619f6f6d31d93f117d8d1803c79bcd50a86edadcd66a9ffd1df84b3f0 SHA512 bfea81064601cdf67ba1730b49e3a5f7aa377423edbfb052ff0f6b2776b49e104852b7f126f4668d37541a706313ef37d9b4535126e94bb202db4ac38f693e6f
-EBUILD corkscrew-2.0-r1.ebuild 1245 BLAKE2B 43d68a47533f65e2dbce0a54db76e533f09aa7a7e98824326f87b1957d419176717674f8e404564eee78cb2acbf0d97f88a70541b1b4935ab6ae26b2d1a1fbe5 SHA512 1a5db9413b97892978cfaa73cb00a359dd688a3b0d6a6153f9738b38c8b3921ac6c68361a673ae12dd8468086370335189c20ce95baf18f2706e622feb3d440d
-EBUILD corkscrew-2.0.ebuild 985 BLAKE2B 156f288df81e6d554f4c34a548d6bfa074e0042e75c261ad0bb5e5843c555a394e04dacfc840b090245c45c496b19010e76e56fd9c5f94cef6df0cf3589eca36 SHA512 f8bee38825cf415c8af32936cb6537968198c1b5a9e3619e6863b8e3bd41b1b8e6ed58943878be84077ee3220d328fa7c9afc6de812fd870e95aa79e0d12523b
+EBUILD corkscrew-2.0-r1.ebuild 1244 BLAKE2B 73f50cee3d5880d3a2e93cae0f7755de4dd191f7ba1bf58d40ab56ef05b2192c66f63ddb0f48895d8d4fa5909ac535abac118e3928ab056055c58867a5031c70 SHA512 bc44ff95418a90405f2beb1715c8f8b93c2f2b7339c3e51034e188ce344dd6ec2506d044a0c86618222d9826bbe5f5c70e0b171f4a33632bc268137a8970b771
 MISC metadata.xml 393 BLAKE2B 24208f0e307707f49ad8ad3c9f24f5e4b21c3b8750f29607ea2a644c4998fab9d6e27b30a95a9d37d10d5662d70c796b842bd3c8cc13a9435beed09b79f4676e SHA512 3a8fb57c70452056885eae869d55a49d29edb4c23f524cfc5b35b9ab8023a1084cbc11c3f16dea27d9f153845d27bcc1b1539f59b5fd4c2e4aac87e6b322b8d6
diff --git a/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild b/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
index 3731eacafb6e..0f85fc78b7b1 100644
--- a/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
+++ b/net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.agroman.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 IUSE=""
 
 DOCS="AUTHORS ChangeLog README TODO"
diff --git a/net-vpn/corkscrew/corkscrew-2.0.ebuild b/net-vpn/corkscrew/corkscrew-2.0.ebuild
deleted file mode 100644
index 2982c2a8fddf..000000000000
--- a/net-vpn/corkscrew/corkscrew-2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools
-
-DESCRIPTION="a tool for tunneling SSH through HTTP proxies"
-HOMEPAGE="http://www.agroman.net/corkscrew/"
-SRC_URI="http://www.agroman.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-IUSE=""
-
-DOCS="AUTHORS ChangeLog README TODO"
-
-src_prepare() {
-	# Christoph Mende <angelos@gentoo.org (23 Jun 2010)
-	# Shipped configure doesn't work with some locales (bug #305771)
-	# Shipped missing doesn't work with new configure, so we'll force
-	# regeneration
-	rm -f install-sh missing mkinstalldirs || die
-
-	# Samuli Suominen <ssuominen@gentoo.org> (24 Jun 2012)
-	# AC_HEADER_STDC is called separately and #include <string.h> is
-	# without #ifdef in corkscrew.c. Instead of using AC_C_PROTOTYPES,
-	# remove the call entirely as unused wrt bug #423193
-	sed -i -e 's:AM_C_PROTOTYPES:dnl &:' configure.in || die
-
-	eautoreconf
-}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 0aed63339512..782841988e33 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/hidclient/Manifest b/net-wireless/hidclient/Manifest
index 19512d851440..983cf0ee3838 100644
--- a/net-wireless/hidclient/Manifest
+++ b/net-wireless/hidclient/Manifest
@@ -1,5 +1,5 @@
 AUX README 1100 BLAKE2B c3862f7cea283a2e5a227f9c2a556986f1d9fa90763fdb9b622bf4e4724351b6c8a76620bd418365f3750d920d941a42a60814d8564d815cf5d7fa7050fba6fb SHA512 21026c2ac24cc925fb140aef70ca2041688ff6fd0736649177d78a7e24d433fd939075b9bd315f7daff3ddfb7e49823a83ee591f0163e0f9fdc236f8cab86966
 AUX hidclient-20120728-glibc-2.30.patch 267 BLAKE2B f7739d6aea6c90149c8eef238c26c20aee428009aa3921e9f61de384330359a39944fd351ac1d976aea48c904643b761686bc3f1fbd888fcaf57760fc99d874e SHA512 59321f735a6339c815ffbba25900e6bb12b700b0200fa65f1aac496ea8fd53d359e8a97cd758a19ccde0f4e9f2ea41ecd45b068c9ae3050b1386fb8d003bd223
 DIST hidclient-20120728.tar.bz2 12563 BLAKE2B 7192a92c8673d533d35110b893c784272ef15530763815311cfe81b0e22b81fd6211aab6ee40b948f187c7e4d3884663750f3a11c07e60ab474ad900ff1508fe SHA512 c928d5844c7ed0cb20421c9241a938d39bb7d65accf9493817c6d9e1de9049a5e8256838b086ff6a44023259656c0c985c2155ed125838c6a2d73439c21884d4
-EBUILD hidclient-20120728.ebuild 699 BLAKE2B 9112cd0c9a1c701f5579bf1b80117878e4cf059daff38ba4ee267eb17e6584240e1a97fe1ba97220af473da9fe19c354debe46c65d3120b15a98cbf5cebdd9a8 SHA512 a22b2867e320c22fc0c78512601d92e7e539646c4c8a7f8763841d2f19a7b950d4c9d93ed1cb13743a9358b9cd089360d0601b415f55b99873700ed975c0b64f
+EBUILD hidclient-20120728.ebuild 696 BLAKE2B bc8cc79e4ec8f8eb25293fba8dbc8669263eb31d05a2c28babd83d301e68b5a84d552e4fa7870e755373f59579b4db344f1aeb3438088ec576b6fd6700055322 SHA512 ef76f2fcd7b37a03dfffdb8f2677e0c34b5b8e1a1d4bc92eb1858486a0cc8c2d7fbd5e8cf064693484653246fbeba4360de71fca96dfb575ad5290e21e0e6a43
 MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f
diff --git a/net-wireless/hidclient/hidclient-20120728.ebuild b/net-wireless/hidclient/hidclient-20120728.ebuild
index 0dc32ee4fc03..77d1882e7720 100644
--- a/net-wireless/hidclient/hidclient-20120728.ebuild
+++ b/net-wireless/hidclient/hidclient-20120728.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit epatch
+EAPI=7
 
 DESCRIPTION="Use your machine as a bluetooh keyboard/mouse"
 HOMEPAGE="http://anselm.hoffmeister.be/computer/hidclient/"
@@ -21,7 +19,8 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-glibc-2.30.patch
+	eapply_user
+	eapply "${FILESDIR}"/${P}-glibc-2.30.patch
 	sed -i 's#gcc#$(CC)#' Makefile
 	sed -i 's#-O2#$(CFLAGS) $(LDFLAGS)#' Makefile
 }
diff --git a/net-wireless/horst/Manifest b/net-wireless/horst/Manifest
index 3db101ac0e04..79e72418e3b8 100644
--- a/net-wireless/horst/Manifest
+++ b/net-wireless/horst/Manifest
@@ -3,6 +3,6 @@ AUX horst-5.1-pcap_bufsize.patch 872 BLAKE2B 8a6efdf7becf69b161cb582dd3d1331eb02
 AUX horst-5.1-tinfo.patch 263 BLAKE2B 94082bdde6de7ebf957628b963e25189c2db0c37cbc96f1d7854b9c35139ce9c8c942e9a70ce0f49b99687253d484c371cacd8d0d823649de7a0768fa197bbef SHA512 955491bbbe5c997b941e0654d028fd8aefd9e789f2ec57204b0e5a11d1cac0a83f0101ea73182b4be9d4690e891bea097b37f29d506ae3eeb90d7da6f7c41d76
 AUX horst-9999-tinfo.patch 244 BLAKE2B 87be3426db885f2ba8256faa7ee44c6d33b897dfdd59462f6dae311b82556004065df7b6177d8e1a506a1fabb92454f70f379bfce334234374ad01a300c2b7ae SHA512 54990da3d2825f2ff128379c81aa3f396f8b57429b73ee7301cb57f67f7bc90726980e4db78be95fd8372d6158ff8df9a68db13d9f76994502a95941d27aac17
 DIST horst-5.1.tar.gz 117392 BLAKE2B 4e21a1cb4d508c8ed6e63fe975a30299452c706aec1a83125acabc547ab8718bbae66d546d973bc10af1f0b6c885a20193c584312c30f5ecaef9d86156c0b12b SHA512 d2889a8c42c31bea72d4e0efd7141ca56c96953b37d2476793ef52d019720059eb57e48b72fa5d720e0c5518a9b0b8dee1a105828d581655c0fbf4dfb29698c4
-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
+EBUILD horst-5.1.ebuild 917 BLAKE2B f113b14134e3b483d0bf0bd0ab78ccfe9384f4e0c72384c0327fd20a462a17fbba011de4d655dbc097f3e48ae993d429cfabe07fef2220fa9eaad10feeec12b5 SHA512 9b0c50431ec08caa00866e6460107b1234c9e6e590539c562a5dbfd97b09cc597a30d470d00328b11bcfb8a4b828cf88776bc5b597894e51f279ce6743db64f4
+EBUILD horst-9999.ebuild 825 BLAKE2B f9319d9bfed03826fd4674ee90c2717937d5a3ed0a8d3407add274e10370395b6c9dadc76897e32422a90422223bbddde502bc3e741acfa778e80a43e848dd39 SHA512 6c8ab21a9518968fa94460396f80c13903b93ffb96165542f201ace57784d0ab8d7e6a1492c769d21ea1de5ace5d774de549d3277609faf6351e437764f13308
+MISC metadata.xml 384 BLAKE2B c5ef8d5aa073047775c3e6947ef3f7660ec56d3930058be1e922cba34834bab5bf163ff9173114f1047a9f9047c480e76de41911461f2c4efd6087fe3931ead9 SHA512 f44d4f5e884f4fdacd1f5d14d95362add156603fbacea7261c72fdcd9bc08671720093b4f7ccb8ee947481f74a558ed5f82da857835a219f77c5e4136ec339c9
diff --git a/net-wireless/horst/horst-5.1.ebuild b/net-wireless/horst/horst-5.1.ebuild
index 1e0f7e8997dd..fe07351a1f43 100644
--- a/net-wireless/horst/horst-5.1.ebuild
+++ b/net-wireless/horst/horst-5.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit toolchain-funcs vcs-snapshot
 
 DESCRIPTION="Small 802.11 wireless LAN analyzer"
-HOMEPAGE="http://br1.einfach.org/tech/horst/"
+HOMEPAGE="https://github.com/br101/horst/"
 SRC_URI="https://github.com/br101/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug +pcap test"
 
 RDEPEND="
+	dev-libs/libnl:3
 	sys-libs/ncurses:0
 	pcap? ( net-libs/libpcap )
 "
diff --git a/net-wireless/horst/horst-9999.ebuild b/net-wireless/horst/horst-9999.ebuild
index 3e8968e69d14..493b4bd6edac 100644
--- a/net-wireless/horst/horst-9999.ebuild
+++ b/net-wireless/horst/horst-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Small 802.11 wireless LAN analyzer"
-HOMEPAGE="http://br1.einfach.org/tech/horst/"
+HOMEPAGE="https://github.com/br101/horst/"
 EGIT_REPO_URI="https://github.com/br101/${PN}/"
 
 LICENSE="GPL-2"
@@ -14,6 +14,7 @@ KEYWORDS=""
 IUSE="debug +pcap test"
 
 RDEPEND="
+	dev-libs/libnl:3
 	sys-libs/ncurses:0
 	pcap? ( net-libs/libpcap )
 "
diff --git a/net-wireless/horst/metadata.xml b/net-wireless/horst/metadata.xml
index cf7bc3e28239..e5dffb5e0bcf 100644
--- a/net-wireless/horst/metadata.xml
+++ b/net-wireless/horst/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="pcap">Add support for network packet capture via net-libs/libpcap</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">br101/horst</remote-id>
-	</upstream>
+<maintainer type='project'>
+<email>netmon@gentoo.org</email>
+</maintainer>
+<use>
+<flag name="pcap">Add support for network packet capture via net-libs/libpcap</flag>
+</use>
+<upstream>
+<remote-id type="github">br101/horst</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index b4a41b6ec398..5f18b9a78a27 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,7 +1,10 @@
+AUX hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch 5909 BLAKE2B 2a5e3650e9872aaed73085131f3a6f80a12bf7d353b4df927346a9f2c13e828b9c4196386ded935f0ff960eee380be49325a98541bbc23a99cfe3f00e91581fe SHA512 b76bbca282a74ef16c0303e5dbd2ccd33a62461595964d52c1481b0bfa4f41deacde56830b85409b288803b87ceb6f33cf0ccc69c5b17ec632c2d4784b872f3c
+AUX hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch 2284 BLAKE2B 0c454ca976d2ee538a874f1a4f583434bdf3abe6c5d20517f3350d9852c0f50849ae1ad4611acecf5a754339678e4952b8c9ae1abb783e06cffa615b36464d06 SHA512 00cc739e78c42353a555c0de2f29defecff372927040e14407a231d1ead7ff32a37c9fd46bea7cdf1c24e3ac891bc3d483800d44fc6d2c8a12d2ae886523b12c
+AUX hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch 1553 BLAKE2B 736e51142cf4402cc8aa6858022fda23ea5f37ba256bc922349365ff4824322db31ea04add04d1b55d0d41f4cb0272de8dcf44ae4671309e808cc4f4a57fe6ac SHA512 69243af20cdcfa837c51917a3723779f4825e11436fb83311355b4ffe8f7a4b7a5747a976f7bf923038c410c9e9055b13b866d9a396913ad08bdec3a70e9f6e0
 AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 BLAKE2B fa9fb5db77955095e083a98a067072fccde02bf55f27af226c8aec515b047f28ab37d9f7c9a1bcc18e584ad3e582bc4dd59beabfcf15b5305394b05e687980a6 SHA512 63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38
 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01 SHA512 66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c
-EBUILD hostapd-2.9-r1.ebuild 6803 BLAKE2B 97627e934b0c86d435a332bba6f05f6716ec4fe8af73a94dfd0c5e88f13f92b9ad9b1cf59f99a8fb04f80a91cc6df459155490e874b669b4d7f85e2109b7a1da SHA512 a49d0df20aebdb4681511cbee8ac102d1de3e87f349938ea4e8d8d7bdd6695b6753da37db0bfb69c0a3e3c6b4028f1b4411e5866c02a305687a997fac55adfc1
-EBUILD hostapd-2.9-r2.ebuild 7139 BLAKE2B b97d52c79de0384395f28c84ff1e5e64f63451b4468b1ad2dd3fc9d80210c696dd32b34b0f6a4d97390bbd455fab394590bf5c4b75dfd93c92570145f9aec00f SHA512 2bc40e7fb59298bf530445ee1fb2c6981595bae92f777de099054ce86c7a79ac6c3a7baa797b03dd658e208a4e846497b921d5bda2e2beb10eb8a6bb3dfecc92
+EBUILD hostapd-2.9-r1.ebuild 6803 BLAKE2B 8651030448176873599cf48122c958fbd48130506be543f674a5811cbf1fbca224e6b70610d737aba40d4880f9db976771df314e917b93f84edb1ef3a2bf2379 SHA512 c25fff3e0767cdaadb8f8c181916422b127f0851f66150333a2c1cda89493f1b162f63975f3eca6eb2d181121201a8b74a55436a4b540005bb9918f8c2180253
+EBUILD hostapd-2.9-r3.ebuild 7440 BLAKE2B b90a96b77b1fa2857fb1390ffb50791c8fa755f44d84f9817dceaf1546e620ee530e7fe18e6b725d35e3f6d4869866d28c5d7253b1c15b7c8f16fc9641299be0 SHA512 659e4f514d648dde03674edcd3bd3d5214cb46b380144006d18a145c4db806609faf37c7ecd3a976f65ba7bbeb5bbf839ceba2e029e2db13eb280effba181d67
 EBUILD hostapd-9999.ebuild 7018 BLAKE2B e764ca677e98783701319bda67b8d7b1efb21994db193b07de71a775a6d2638ee0e78c32d4749de247a120f61a6fda47583cd3003baaacff21c5c0c88d86abb3 SHA512 d393440cdf12fefbb98e2e0aeb4001fc91fe456589d5cf4dca656906c66dc95b2eb8cfd3ab2bd7b50b68fa85751e5cc4140f2a7d4291bb00d61880cd6e8f41e9
 MISC metadata.xml 1116 BLAKE2B 658e8397f7ebf2f5f265e1376ee87f29ed9fa81012f0269bf655f4f2647c58f27f7cafc3bcd61ddf312039cef59ad525baf8dcb52dccff8e16842952294da839 SHA512 451d5d71930a4624d2ffc70ee69671d2a2400b0b715a19d0b7f4c14e7ec0457147b068e6ca65fbcc6ff3d75eeb721047f399f55e01fa8d7072dc02c57985813d
diff --git a/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch b/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
new file mode 100644
index 000000000000..0aa8a5ea1de0
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
@@ -0,0 +1,150 @@
+From 5b78c8f961f25f4dc22d6f2b77ddd06d712cec63 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Wed, 3 Jun 2020 23:17:35 +0300
+Subject: [PATCH 1/3] WPS UPnP: Do not allow event subscriptions with URLs to
+ other networks
+
+The UPnP Device Architecture 2.0 specification errata ("UDA errata
+16-04-2020.docx") addresses a problem with notifications being allowed
+to go out to other domains by disallowing such cases. Do such filtering
+for the notification callback URLs to avoid undesired connections to
+external networks based on subscriptions that any device in the local
+network could request when WPS support for external registrars is
+enabled (the upnp_iface parameter in hostapd configuration).
+
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/wps/wps_er.c     |  2 +-
+ src/wps/wps_upnp.c   | 38 ++++++++++++++++++++++++++++++++++++--
+ src/wps/wps_upnp_i.h |  3 ++-
+ 3 files changed, 39 insertions(+), 4 deletions(-)
+
+diff --git a/src/wps/wps_er.c b/src/wps/wps_er.c
+index 6bded14327f8..31d2e50e4cff 100644
+--- a/src/wps/wps_er.c
++++ b/src/wps/wps_er.c
+@@ -1298,7 +1298,7 @@ wps_er_init(struct wps_context *wps, const char *ifname, const char *filter)
+ 			   "with %s", filter);
+ 	}
+ 	if (get_netif_info(er->ifname, &er->ip_addr, &er->ip_addr_text,
+-			   er->mac_addr)) {
++			   NULL, er->mac_addr)) {
+ 		wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
+ 			   "for %s. Does it have IP address?", er->ifname);
+ 		wps_er_deinit(er, NULL, NULL);
+diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
+index 6e10e4bc0c3f..7d4b7439940e 100644
+--- a/src/wps/wps_upnp.c
++++ b/src/wps/wps_upnp.c
+@@ -303,6 +303,14 @@ static void subscr_addr_free_all(struct subscription *s)
+ }
+ 
+ 
++static int local_network_addr(struct upnp_wps_device_sm *sm,
++			      struct sockaddr_in *addr)
++{
++	return (addr->sin_addr.s_addr & sm->netmask.s_addr) ==
++		(sm->ip_addr & sm->netmask.s_addr);
++}
++
++
+ /* subscr_addr_add_url -- add address(es) for one url to subscription */
+ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ 				size_t url_len)
+@@ -381,6 +389,7 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ 
+ 	for (rp = result; rp; rp = rp->ai_next) {
+ 		struct subscr_addr *a;
++		struct sockaddr_in *addr = (struct sockaddr_in *) rp->ai_addr;
+ 
+ 		/* Limit no. of address to avoid denial of service attack */
+ 		if (dl_list_len(&s->addr_list) >= MAX_ADDR_PER_SUBSCRIPTION) {
+@@ -389,6 +398,13 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ 			break;
+ 		}
+ 
++		if (!local_network_addr(s->sm, addr)) {
++			wpa_printf(MSG_INFO,
++				   "WPS UPnP: Ignore a delivery URL that points to another network %s",
++				   inet_ntoa(addr->sin_addr));
++			continue;
++		}
++
+ 		a = os_zalloc(sizeof(*a) + alloc_len);
+ 		if (a == NULL)
+ 			break;
+@@ -890,11 +906,12 @@ static int eth_get(const char *device, u8 ea[ETH_ALEN])
+  * @net_if: Selected network interface name
+  * @ip_addr: Buffer for returning IP address in network byte order
+  * @ip_addr_text: Buffer for returning a pointer to allocated IP address text
++ * @netmask: Buffer for returning netmask or %NULL if not needed
+  * @mac: Buffer for returning MAC address
+  * Returns: 0 on success, -1 on failure
+  */
+ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
+-		   u8 mac[ETH_ALEN])
++		   struct in_addr *netmask, u8 mac[ETH_ALEN])
+ {
+ 	struct ifreq req;
+ 	int sock = -1;
+@@ -920,6 +937,19 @@ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
+ 	in_addr.s_addr = *ip_addr;
+ 	os_snprintf(*ip_addr_text, 16, "%s", inet_ntoa(in_addr));
+ 
++	if (netmask) {
++		os_memset(&req, 0, sizeof(req));
++		os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
++		if (ioctl(sock, SIOCGIFNETMASK, &req) < 0) {
++			wpa_printf(MSG_ERROR,
++				   "WPS UPnP: SIOCGIFNETMASK failed: %d (%s)",
++				   errno, strerror(errno));
++			goto fail;
++		}
++		addr = (struct sockaddr_in *) &req.ifr_netmask;
++		netmask->s_addr = addr->sin_addr.s_addr;
++	}
++
+ #ifdef __linux__
+ 	os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
+ 	if (ioctl(sock, SIOCGIFHWADDR, &req) < 0) {
+@@ -1026,11 +1056,15 @@ static int upnp_wps_device_start(struct upnp_wps_device_sm *sm, char *net_if)
+ 
+ 	/* Determine which IP and mac address we're using */
+ 	if (get_netif_info(net_if, &sm->ip_addr, &sm->ip_addr_text,
+-			   sm->mac_addr)) {
++			   &sm->netmask, sm->mac_addr)) {
+ 		wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
+ 			   "for %s. Does it have IP address?", net_if);
+ 		goto fail;
+ 	}
++	wpa_printf(MSG_DEBUG, "WPS UPnP: Local IP address %s netmask %s hwaddr "
++		   MACSTR,
++		   sm->ip_addr_text, inet_ntoa(sm->netmask),
++		   MAC2STR(sm->mac_addr));
+ 
+ 	/* Listen for incoming TCP connections so that others
+ 	 * can fetch our "xml files" from us.
+diff --git a/src/wps/wps_upnp_i.h b/src/wps/wps_upnp_i.h
+index e87a93232df1..6ead7b4e9a30 100644
+--- a/src/wps/wps_upnp_i.h
++++ b/src/wps/wps_upnp_i.h
+@@ -128,6 +128,7 @@ struct upnp_wps_device_sm {
+ 	u8 mac_addr[ETH_ALEN]; /* mac addr of network i.f. we use */
+ 	char *ip_addr_text; /* IP address of network i.f. we use */
+ 	unsigned ip_addr; /* IP address of network i.f. we use (host order) */
++	struct in_addr netmask;
+ 	int multicast_sd; /* send multicast messages over this socket */
+ 	int ssdp_sd; /* receive discovery UPD packets on socket */
+ 	int ssdp_sd_registered; /* nonzero if we must unregister */
+@@ -158,7 +159,7 @@ struct subscription * subscription_find(struct upnp_wps_device_sm *sm,
+ 					const u8 uuid[UUID_LEN]);
+ void subscr_addr_delete(struct subscr_addr *a);
+ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
+-		   u8 mac[ETH_ALEN]);
++		   struct in_addr *netmask, u8 mac[ETH_ALEN]);
+ 
+ /* wps_upnp_ssdp.c */
+ void msearchreply_state_machine_stop(struct advertisement_state_machine *a);
+-- 
+2.20.1
+
diff --git a/net-wireless/hostapd/files/hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch b/net-wireless/hostapd/files/hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
new file mode 100644
index 000000000000..c7a449e0b5c6
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
@@ -0,0 +1,59 @@
+From f7d268864a2660b7239b9a8ff5ad37faeeb751ba Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Wed, 3 Jun 2020 22:41:02 +0300
+Subject: [PATCH 2/3] WPS UPnP: Fix event message generation using a long URL
+ path
+
+More than about 700 character URL ended up overflowing the wpabuf used
+for building the event notification and this resulted in the wpabuf
+buffer overflow checks terminating the hostapd process. Fix this by
+allocating the buffer to be large enough to contain the full URL path.
+However, since that around 700 character limit has been the practical
+limit for more than ten years, start explicitly enforcing that as the
+limit or the callback URLs since any longer ones had not worked before
+and there is no need to enable them now either.
+
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/wps/wps_upnp.c       | 9 +++++++--
+ src/wps/wps_upnp_event.c | 3 ++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
+index 7d4b7439940e..ab685d52ecab 100644
+--- a/src/wps/wps_upnp.c
++++ b/src/wps/wps_upnp.c
+@@ -328,9 +328,14 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
+ 	int rerr;
+ 	size_t host_len, path_len;
+ 
+-	/* url MUST begin with http: */
+-	if (url_len < 7 || os_strncasecmp(url, "http://", 7))
++	/* URL MUST begin with HTTP scheme. In addition, limit the length of
++	 * the URL to 700 characters which is around the limit that was
++	 * implicitly enforced for more than 10 years due to a bug in
++	 * generating the event messages. */
++	if (url_len < 7 || os_strncasecmp(url, "http://", 7) || url_len > 700) {
++		wpa_printf(MSG_DEBUG, "WPS UPnP: Reject an unacceptable URL");
+ 		goto fail;
++	}
+ 	url += 7;
+ 	url_len -= 7;
+ 
+diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
+index d7e6edcc6503..08a23612f338 100644
+--- a/src/wps/wps_upnp_event.c
++++ b/src/wps/wps_upnp_event.c
+@@ -147,7 +147,8 @@ static struct wpabuf * event_build_message(struct wps_event_ *e)
+ 	struct wpabuf *buf;
+ 	char *b;
+ 
+-	buf = wpabuf_alloc(1000 + wpabuf_len(e->data));
++	buf = wpabuf_alloc(1000 + os_strlen(e->addr->path) +
++			   wpabuf_len(e->data));
+ 	if (buf == NULL)
+ 		return NULL;
+ 	wpabuf_printf(buf, "NOTIFY %s HTTP/1.1\r\n", e->addr->path);
+-- 
+2.20.1
+
diff --git a/net-wireless/hostapd/files/hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch b/net-wireless/hostapd/files/hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
new file mode 100644
index 000000000000..9d0376043d0b
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
@@ -0,0 +1,47 @@
+From 85aac526af8612c21b3117dadc8ef5944985b476 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@codeaurora.org>
+Date: Thu, 4 Jun 2020 21:24:04 +0300
+Subject: [PATCH 3/3] WPS UPnP: Handle HTTP initiation failures for events more
+ properly
+
+While it is appropriate to try to retransmit the event to another
+callback URL on a failure to initiate the HTTP client connection, there
+is no point in trying the exact same operation multiple times in a row.
+Replve the event_retry() calls with event_addr_failure() for these cases
+to avoid busy loops trying to repeat the same failing operation.
+
+These potential busy loops would go through eloop callbacks, so the
+process is not completely stuck on handling them, but unnecessary CPU
+would be used to process the continues retries that will keep failing
+for the same reason.
+
+Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
+---
+ src/wps/wps_upnp_event.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
+index 08a23612f338..c0d9e41d9a38 100644
+--- a/src/wps/wps_upnp_event.c
++++ b/src/wps/wps_upnp_event.c
+@@ -294,7 +294,7 @@ static int event_send_start(struct subscription *s)
+ 
+ 	buf = event_build_message(e);
+ 	if (buf == NULL) {
+-		event_retry(e, 0);
++		event_addr_failure(e);
+ 		return -1;
+ 	}
+ 
+@@ -302,7 +302,7 @@ static int event_send_start(struct subscription *s)
+ 					 event_http_cb, e);
+ 	if (e->http_event == NULL) {
+ 		wpabuf_free(buf);
+-		event_retry(e, 0);
++		event_addr_failure(e);
+ 		return -1;
+ 	}
+ 
+-- 
+2.20.1
+
diff --git a/net-wireless/hostapd/hostapd-2.9-r1.ebuild b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
index a2fbc42dc16e..379f8c74ea7c 100644
--- a/net-wireless/hostapd/hostapd-2.9-r1.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/net-wireless/hostapd/hostapd-2.9-r2.ebuild b/net-wireless/hostapd/hostapd-2.9-r2.ebuild
deleted file mode 100644
index e14a5f1ff72a..000000000000
--- a/net-wireless/hostapd/hostapd-2.9-r2.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs systemd savedconfig
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://w1.fi"
-EXTRAS_VER="2.7-r2"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
-
-if [[ $PV == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://w1.fi/hostap.git"
-else
-	if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
-		SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz"
-	else
-		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
-	fi
-	# Never stabilize snapshot ebuilds please
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda"
-
-# suiteb impl uses openssl feature not available in libressl, see bug 710992
-REQUIRED_USE="?? ( libressl suiteb )"
-
-DEPEND="
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? (
-		internal-tls? ( dev-libs/libtommath )
-		!internal-tls? ( dev-libs/openssl:0=[-bindist] )
-	)
-	kernel_linux? (
-		dev-libs/libnl:3
-		crda? ( net-wireless/crda )
-	)
-	netlink? ( net-libs/libnfnetlink )
-	sqlite? ( >=dev-db/sqlite-3 )"
-
-RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"
-
-pkg_pretend() {
-	if use internal-tls; then
-		if use libressl; then
-			elog "libressl flag takes precedence over internal-tls"
-		else
-			ewarn "internal-tls implementation is experimental and provides fewer features"
-		fi
-	fi
-}
-
-src_unpack() {
-	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
-	default
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	# Allow users to apply patches to src/drivers for example,
-	# i.e. anything outside ${S}/${PN}
-	pushd ../ >/dev/null || die
-	default
-	#CVE-2019-16275 bug #696032
-	eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
-	popd >/dev/null || die
-
-	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-		"${S}/hostapd.conf" || die
-}
-
-src_configure() {
-	local CONFIG="${S}/.config"
-
-	restore_config "${CONFIG}"
-	if [[ -f "${CONFIG}" ]]; then
-		default_src_configure
-		return 0
-	fi
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
-
-	# EAP authentication methods
-	echo "CONFIG_EAP=y" >> ${CONFIG}
-	echo "CONFIG_ERP=y" >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-	echo "CONFIG_SAE=y" >> ${CONFIG}
-	echo "CONFIG_OWE=y" >> ${CONFIG}
-	echo "CONFIG_DPP=y" >> ${CONFIG}
-
-	if use suiteb; then
-		echo "CONFIG_SUITEB=y" >> ${CONFIG}
-		echo "CONFIG_SUITEB192=y" >> ${CONFIG}
-	fi
-
-	if use internal-tls && ! use libressl; then
-		echo "CONFIG_TLS=internal" >> ${CONFIG}
-	else
-		# SSL authentication methods
-		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-		echo "CONFIG_TLSV11=y" >> ${CONFIG}
-		echo "CONFIG_TLSV12=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
-	fi
-
-	if use wps; then
-		# Enable Wi-Fi Protected Setup
-		echo "CONFIG_WPS=y" >> ${CONFIG}
-		echo "CONFIG_WPS2=y" >> ${CONFIG}
-		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-		echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
-		einfo "Enabling Wi-Fi Protected Setup support"
-	fi
-
-	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
-	echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
-	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
-
-	einfo "Enabling drivers: "
-
-	# drivers
-	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
-	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
-	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
-	einfo "  None driver enabled"
-
-	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
-
-	# epoll
-	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
-
-	# misc
-	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
-	echo "CONFIG_PKCS12=y" >> ${CONFIG}
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
-	echo "CONFIG_IAPP=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
-	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
-	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
-	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
-	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
-	echo "CONFIG_HS20=y" >> ${CONFIG}
-	echo "CONFIG_WNM=y" >> ${CONFIG}
-	echo "CONFIG_FST=y" >> ${CONFIG}
-	echo "CONFIG_FST_TEST=y" >> ${CONFIG}
-	echo "CONFIG_ACS=y" >> ${CONFIG}
-
-	if use netlink; then
-		# Netlink support
-		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
-	fi
-
-	if use ipv6; then
-		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
-	fi
-
-	if use sqlite; then
-		# Sqlite support
-		echo "CONFIG_SQLITE=y" >> ${CONFIG}
-	fi
-
-	# If we are using libnl 2.0 and above, enable support for it
-	# Removed for now, since the 3.2 version is broken, and we don't
-	# support it.
-	if has_version ">=dev-libs/libnl-3.2"; then
-		echo "CONFIG_LIBNL32=y" >> .config
-	fi
-
-	# TODO: Add support for BSD drivers
-
-	default_src_configure
-}
-
-src_compile() {
-	emake V=1
-
-	if use libressl || ! use internal-tls; then
-		emake V=1 nt_password_hash
-		emake V=1 hlr_auc_gw
-	fi
-}
-
-src_install() {
-	insinto /etc/${PN}
-	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
-
-	fperms -R 600 /etc/${PN}
-
-	dosbin ${PN}
-	dobin ${PN}_cli
-
-	if use libressl || ! use internal-tls; then
-		dobin nt_password_hash hlr_auc_gw
-	fi
-
-	newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
-	newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
-	systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
-
-	doman ${PN}{.8,_cli.1}
-
-	dodoc ChangeLog README
-	use wps && dodoc README-WPS
-
-	docinto examples
-	dodoc wired.conf
-
-	if use logwatch; then
-		insinto /etc/log.d/conf/services/
-		doins logwatch/${PN}.conf
-
-		exeinto /etc/log.d/scripts/services/
-		doexe logwatch/${PN}
-	fi
-
-	save_config .config
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you are running openRC you need to follow this instructions:"
-	einfo "In order to use ${PN} you need to set up your wireless card"
-	einfo "for master mode in /etc/conf.d/net and then start"
-	einfo "/etc/init.d/${PN}."
-	einfo
-	einfo "Example configuration:"
-	einfo
-	einfo "config_wlan0=( \"192.168.1.1/24\" )"
-	einfo "channel_wlan0=\"6\""
-	einfo "essid_wlan0=\"test\""
-	einfo "mode_wlan0=\"master\""
-	einfo
-	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
-	#	einfo "This package now compiles against the headers installed by"
-	#	einfo "the kernel source for the mac80211 driver. You should "
-	#	einfo "re-emerge ${PN} after upgrading your kernel source."
-	#fi
-
-	if use wps; then
-		einfo "You have enabled Wi-Fi Protected Setup support, please"
-		einfo "read the README-WPS file in /usr/share/doc/${P}"
-		einfo "for info on how to use WPS"
-	fi
-}
diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
new file mode 100644
index 000000000000..af3b036853f5
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi"
+EXTRAS_VER="2.7-r2"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
+
+if [[ $PV == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://w1.fi/hostap.git"
+else
+	if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+		SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz"
+	else
+		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
+	fi
+	# Never stabilize snapshot ebuilds please
+	KEYWORDS="~amd64 ~arm arm64 ~mips ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda"
+
+# suiteb impl uses openssl feature not available in libressl, see bug 710992
+REQUIRED_USE="?? ( libressl suiteb )"
+
+DEPEND="
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? (
+		internal-tls? ( dev-libs/libtommath )
+		!internal-tls? ( dev-libs/openssl:0=[-bindist] )
+	)
+	kernel_linux? (
+		dev-libs/libnl:3
+		crda? ( net-wireless/crda )
+	)
+	netlink? ( net-libs/libnfnetlink )
+	sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+	if use internal-tls; then
+		if use libressl; then
+			elog "libressl flag takes precedence over internal-tls"
+		else
+			ewarn "internal-tls implementation is experimental and provides fewer features"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
+	default
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# Allow users to apply patches to src/drivers for example,
+	# i.e. anything outside ${S}/${PN}
+	pushd ../ >/dev/null || die
+	default
+	#CVE-2019-16275 bug #696032
+	eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
+	# CVE-2020-12695 bug #727542
+	eapply "${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"
+	eapply "${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"
+	eapply "${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"
+	popd >/dev/null || die
+
+	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+		"${S}/hostapd.conf" || die
+}
+
+src_configure() {
+	local CONFIG="${S}/.config"
+
+	restore_config "${CONFIG}"
+	if [[ -f "${CONFIG}" ]]; then
+		default_src_configure
+		return 0
+	fi
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# EAP authentication methods
+	echo "CONFIG_EAP=y" >> ${CONFIG}
+	echo "CONFIG_ERP=y" >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+	echo "CONFIG_SAE=y" >> ${CONFIG}
+	echo "CONFIG_OWE=y" >> ${CONFIG}
+	echo "CONFIG_DPP=y" >> ${CONFIG}
+
+	if use suiteb; then
+		echo "CONFIG_SUITEB=y" >> ${CONFIG}
+		echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+	fi
+
+	if use internal-tls && ! use libressl; then
+		echo "CONFIG_TLS=internal" >> ${CONFIG}
+	else
+		# SSL authentication methods
+		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+		echo "CONFIG_TLSV11=y" >> ${CONFIG}
+		echo "CONFIG_TLSV12=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+	fi
+
+	if use wps; then
+		# Enable Wi-Fi Protected Setup
+		echo "CONFIG_WPS=y" >> ${CONFIG}
+		echo "CONFIG_WPS2=y" >> ${CONFIG}
+		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+		echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+		einfo "Enabling Wi-Fi Protected Setup support"
+	fi
+
+	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+	echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
+	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
+
+	einfo "Enabling drivers: "
+
+	# drivers
+	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+	einfo "  HostAP driver enabled"
+	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+	einfo "  Wired driver enabled"
+	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+	einfo "  None driver enabled"
+
+	einfo "  nl80211 driver enabled"
+	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+
+	# epoll
+	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
+
+	# misc
+	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
+	echo "CONFIG_PKCS12=y" >> ${CONFIG}
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
+	echo "CONFIG_IAPP=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
+	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
+	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
+	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
+	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
+	echo "CONFIG_HS20=y" >> ${CONFIG}
+	echo "CONFIG_WNM=y" >> ${CONFIG}
+	echo "CONFIG_FST=y" >> ${CONFIG}
+	echo "CONFIG_FST_TEST=y" >> ${CONFIG}
+	echo "CONFIG_ACS=y" >> ${CONFIG}
+
+	if use netlink; then
+		# Netlink support
+		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
+	fi
+
+	if use ipv6; then
+		# IPv6 support
+		echo "CONFIG_IPV6=y" >> ${CONFIG}
+	fi
+
+	if use sqlite; then
+		# Sqlite support
+		echo "CONFIG_SQLITE=y" >> ${CONFIG}
+	fi
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	if has_version ">=dev-libs/libnl-3.2"; then
+		echo "CONFIG_LIBNL32=y" >> .config
+	fi
+
+	# TODO: Add support for BSD drivers
+
+	default_src_configure
+}
+
+src_compile() {
+	emake V=1
+
+	if use libressl || ! use internal-tls; then
+		emake V=1 nt_password_hash
+		emake V=1 hlr_auc_gw
+	fi
+}
+
+src_install() {
+	insinto /etc/${PN}
+	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
+
+	fperms -R 600 /etc/${PN}
+
+	dosbin ${PN}
+	dobin ${PN}_cli
+
+	if use libressl || ! use internal-tls; then
+		dobin nt_password_hash hlr_auc_gw
+	fi
+
+	newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
+	newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
+	systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
+
+	doman ${PN}{.8,_cli.1}
+
+	dodoc ChangeLog README
+	use wps && dodoc README-WPS
+
+	docinto examples
+	dodoc wired.conf
+
+	if use logwatch; then
+		insinto /etc/log.d/conf/services/
+		doins logwatch/${PN}.conf
+
+		exeinto /etc/log.d/scripts/services/
+		doexe logwatch/${PN}
+	fi
+
+	save_config .config
+}
+
+pkg_postinst() {
+	einfo
+	einfo "If you are running openRC you need to follow this instructions:"
+	einfo "In order to use ${PN} you need to set up your wireless card"
+	einfo "for master mode in /etc/conf.d/net and then start"
+	einfo "/etc/init.d/${PN}."
+	einfo
+	einfo "Example configuration:"
+	einfo
+	einfo "config_wlan0=( \"192.168.1.1/24\" )"
+	einfo "channel_wlan0=\"6\""
+	einfo "essid_wlan0=\"test\""
+	einfo "mode_wlan0=\"master\""
+	einfo
+	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
+	#	einfo "This package now compiles against the headers installed by"
+	#	einfo "the kernel source for the mac80211 driver. You should "
+	#	einfo "re-emerge ${PN} after upgrading your kernel source."
+	#fi
+
+	if use wps; then
+		einfo "You have enabled Wi-Fi Protected Setup support, please"
+		einfo "read the README-WPS file in /usr/share/doc/${P}"
+		einfo "for info on how to use WPS"
+	fi
+}
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 4bf56ce893d8..abb2aab202a1 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -5,9 +5,9 @@ AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e
 AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2020-04-R3.tar.xz 3159552 BLAKE2B 458c40dea530008295d46aadaf15699a0fd9025bb572cb23e94f059f31bba2835dedd9c39725d0183e84d31c326c2769450ce0b8bee7e7ca3bb7ac9dd82f4cc6 SHA512 585def7f19f479c6049cbc24e3886276d816f584fcb2070009cd90e35b33630d3e544145abf5f8b1eae87ec571a213ed9cb9f6b81345257c9bf1332d5bb319c2
-DIST kismet-2020-09-R3.tar.xz 8692092 BLAKE2B a38a889aa382e597e11c7fe0452e0faf40a991f6ece7fcb29a9605bc158b629647bf6117c6bd72e957f5a6f2b89788983f120130b3a6f0f31ae3a386dcdfdb44 SHA512 b1c0daee20c59124059cfa71d5ab938c47f143a467e14b442aaf67a372599ff799a08951745cedb6f38e5cded7f5a30834bf03adee53846a90a593a0b3231a6a
+DIST kismet-2020-09-R4.tar.xz 8692520 BLAKE2B 68098080cfca6968538ecf4840a3ab06f95bfe9b72829dc7ea551b1a5f15d5b65fbfaa8cecfef19a537abf081d0c4e2b2ffdedc0e34023a3393013227c898d97 SHA512 4f2dd641999dd2675d2c4dfbe28caf5a8476d5d7bd9dedeefb7b1420b48b9155a4d576123832974586d51c61ca4d77d8572ab7038da3ec6fa2a7791f3e1a1479
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 9d2cb57cc3728ebaeb8ccf8b9ed4716473c4930d006d4b6f1b5badb21e6433da49b24e4d9a1f41dff698ec198cae7d09450266a78f7be67b65cfbfd61b459ca2 SHA512 4463682c7ebba71368ecb28f9ac89789be91de8c11f2ff3a1395ad4101f3ce8da2fef5e0622d211b885b9d1cacde82f27cd73aeb1079b6415af7b232dd730090
 EBUILD kismet-2020.04.3.ebuild 4981 BLAKE2B 62fcf37f04f9651f33c8686e31f387eb237498a4030a07636c922823167a59e69d9896789fa908f432af41c8f6701c3044996dd2229be6eb67ca455bd8b858ca SHA512 dd6e4ddbbbb1847574e35a66413f0d208b02c9ade36f4f4646920df86fc714466aeea3f357f7541cf10bff4e38e7b86ca1a2aead7a8a60c4a18eb9230875355a
-EBUILD kismet-2020.09.3.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b
+EBUILD kismet-2020.09.4.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b
 EBUILD kismet-9999.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b
 MISC metadata.xml 1445 BLAKE2B e915106684538d82bbd7488f9a1e37990a6b7c8bec8265db850797beeacdef58671f5635f186c21afca9c0c0964fcdb8bf6589d9d235e3e91eaa0c0d88dc5548 SHA512 33bafa9ff07daa54dcca14b76a80f01ed483e0952abe254f9a9627655f998922e7a2ff006fa6e24d6009af5ce78dd43ac43900f0ea61a22541110ce5b7d6cc86
diff --git a/net-wireless/kismet/kismet-2020.09.3.ebuild b/net-wireless/kismet/kismet-2020.09.4.ebuild
index 06840c1eb328..06840c1eb328 100644
--- a/net-wireless/kismet/kismet-2020.09.3.ebuild
+++ b/net-wireless/kismet/kismet-2020.09.4.ebuild
diff --git a/net-wireless/soapyremote/Manifest b/net-wireless/soapyremote/Manifest
index 1600b85bbb99..ddb4959dbb1d 100644
--- a/net-wireless/soapyremote/Manifest
+++ b/net-wireless/soapyremote/Manifest
@@ -1,4 +1,4 @@
 DIST soapyremote-0.5.0.tar.gz 71881 BLAKE2B e81f2df8f513df329289404de8f1f5916379a824bb51b0aa0e3b1bfc6af953a367119293db80374ef6c2ba6e638228eb8ffb5f0c9eb70a7dd61e2ff4e5641ef8 SHA512 5c5ce76c90dfbfc3b6846902f5dbf0c0906d92ae193a50d79733ce47403f1ec27dcf78d07fc198e8099272431c313984eb32c26306fb2afee129339e6501f3d2
-EBUILD soapyremote-0.5.0.ebuild 721 BLAKE2B e0cb6bab4fa75b836624a8c95b90be0a6d1df761e0b195b1f1aa04d99d680bc1273ab898ab520955bcc7cb60e7efe2e3011af77c140caf9a8c085ba5fe622b98 SHA512 eb2c437ef41e0deebe7205b7b481c32185747196721cdb2702cc32a8baa136f216a5363c8fea7d32c51e76d29c5f4ee7921e493786c81e01ce303db1ac3095e8
-EBUILD soapyremote-9999.ebuild 721 BLAKE2B e0cb6bab4fa75b836624a8c95b90be0a6d1df761e0b195b1f1aa04d99d680bc1273ab898ab520955bcc7cb60e7efe2e3011af77c140caf9a8c085ba5fe622b98 SHA512 eb2c437ef41e0deebe7205b7b481c32185747196721cdb2702cc32a8baa136f216a5363c8fea7d32c51e76d29c5f4ee7921e493786c81e01ce303db1ac3095e8
+EBUILD soapyremote-0.5.0.ebuild 682 BLAKE2B a673858ddac4c247c873b236038e24023b85c4f058285cea75a41ce9c04076ce9fef7e8968018886645d4488147fb73b2ea6badf7e490c2ff0190dc4625c4845 SHA512 67ddcda7d37bd37e290c6a0c329c549ed89348863558852ffa0ffbff98d07442dc03be2bce334bf98c3e8a6033f0dc1a118b110ca23e90ae50391dba159b1a4b
+EBUILD soapyremote-9999.ebuild 682 BLAKE2B a673858ddac4c247c873b236038e24023b85c4f058285cea75a41ce9c04076ce9fef7e8968018886645d4488147fb73b2ea6badf7e490c2ff0190dc4625c4845 SHA512 67ddcda7d37bd37e290c6a0c329c549ed89348863558852ffa0ffbff98d07442dc03be2bce334bf98c3e8a6033f0dc1a118b110ca23e90ae50391dba159b1a4b
 MISC metadata.xml 336 BLAKE2B cf77d5c87670b460f2965ad571a9566510d3df71a56aed5d8b1ebbdbee2ee0332a073ff30c2410f628053ee33fe55b7d391e1a6de7802344b3c5fc5e792ed318 SHA512 b8b0bd12ddb26ac45f533bf7d46e8f2bd4306cee47283e0f71d7bfd9701a47bdb85c5082cc070a5b6bf42f518cff91861360ab68505594e3b3d35042f42d0a72
diff --git a/net-wireless/soapyremote/soapyremote-0.5.0.ebuild b/net-wireless/soapyremote/soapyremote-0.5.0.ebuild
index 1f7f06aaa68a..77a386aa4648 100644
--- a/net-wireless/soapyremote/soapyremote-0.5.0.ebuild
+++ b/net-wireless/soapyremote/soapyremote-0.5.0.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
-
 inherit cmake-utils
 
 DESCRIPTION="Soapy SDR remote module"
diff --git a/net-wireless/soapyremote/soapyremote-9999.ebuild b/net-wireless/soapyremote/soapyremote-9999.ebuild
index 1f7f06aaa68a..77a386aa4648 100644
--- a/net-wireless/soapyremote/soapyremote-9999.ebuild
+++ b/net-wireless/soapyremote/soapyremote-9999.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
-
 inherit cmake-utils
 
 DESCRIPTION="Soapy SDR remote module"
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index caed3249824b..a478b02a0980 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -2,20 +2,10 @@ AUX mongod-wrapper 305 BLAKE2B 3bd1bfe831541e0e2c49b3875b23578e3b36307947ee7f080
 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
-DIST unifi-5.13.29.zip 151004470 BLAKE2B 0980c012bddbbeb5d18d26ebc8427137e410577e22a9c49b799f0e8fa39343191bc361b9345919917e53ded5ff0af2b35fd71e48072a09d5533a5e89feb9a20c SHA512 01b9811e288e377aff727416b32d966af5cc7a45e0f03f08f8892c89ad40a1833f4150bc42d8732468fcd2242c790bcd62b343132149a868c0d95f38b9f17dda
-DIST unifi-5.13.32.zip 151006051 BLAKE2B d853a05c361b26a47f2b3e296a41d3086a05347f6384ff71b4e78d156d5a0a5309eb5bb0b05de31721a8dd21f917d0c5b87697a337ec096a1701640796defbb8 SHA512 f1258d4f8fa73f43385260245ca31ee5d159c99db005609a22b09cbe551a886ebf685069bf95be5a0609335fe9d7290bc04158eb2430bdaa238aa7a13da681ab
-DIST unifi-5.14.22.zip 242779284 BLAKE2B 7056229ff86db56e192c96cc61b9a5c0fba8cd96727a5260af39c5949fe0df49d8bac880ac7e016938e7d7f36b6fa378addef73a08b074e8795898ae3a4ded4f SHA512 4bfa673cea02d014927844fcf4ab97c09581b4b9abe2eab618f388d74f4fa78c294f240beacfdc8a33316a9b73164224f114e28ea202f8b8930927183c11ec88
-DIST unifi-5.14.23.zip 195394703 BLAKE2B ba762712b958f4a784f281419edcd9f7622a4df4881e23a9bbf53b70ca8d9c2dd2452d8b567f1151c7cb7031947fcc0e79193c7b853a23f8faf4235edea62388 SHA512 e29969da15bed74fe24eb7b997c14247f3e8c53cc43021c402365f93cda3b7cc48b9222235770101ab37cdd574eb94d1aba445bc04393b70dac386b7a77cebb9
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-DIST unifi-6.0.20.zip 182776288 BLAKE2B 3b9aca0a7b356a1bab2e9f6af8da21ee43b7c4f14392292a0f25803395a12ad726ad7db46f4c4863841bf9c3cdc973ae5bfdd9e7dc48974494807e6ba15658b8 SHA512 926f78c3f9b3035e09a8592bd52239665fb379d9324ceae42494a55d01325028dd0d09f0692cd23466216958fe51153f2093f747fadbaf9aabd49c450233aae3
-DIST unifi-6.0.22.zip 183238039 BLAKE2B f76b59087922b46ec8db1869b167aeb62b3047e87e4f80de9ed32caa8e1d8210a384dc3ec1f06a59e2aaf740c5247539c215f821290c6c5f5398d05b37fd2fae SHA512 99e510a2c7f13929b436a73b5cb5d8d8ce48cfa4464bc610dd588c2af30cbb0f4b8c0fd8058a2108f2c3f0850f492445f6b1b9c1b6d84bfdb5e2af7cbe261283
 DIST unifi-6.0.23.zip 183386177 BLAKE2B ee0300c9595bab469e63c8c523f75507e5b4ef88e67947df8948abddb149e6522f4851108191f0f91605cc0168fcaa73170a40a9908fd64b49897f5123dc7a37 SHA512 b21be9cf360bfc6e1f2bff073db431a653a7b53f138cd9249873eaadf93777a3eecde87a8ada2db46f2fe69b2eacf747ed13c78045ba12748469dab3d068c881
-EBUILD unifi-5.13.29.ebuild 1566 BLAKE2B f3518c77f5344023a9f219e5e01b501b0d1855879c06c90b7b89798059100e844325fe1cf42c09117049056d49df19723613977eb3f73da4a5845e403a5303c8 SHA512 b3d01a742500089913ceba14990b18cea9470be9413b753ae3ab17e4adbaf49a5575f4ffdbcbb97c7b369be3aff400a3b3cdcdf711d944dc3865f3844347cadb
-EBUILD unifi-5.13.32.ebuild 1567 BLAKE2B cbfbf056c1f98854bc1732b2b4c3204cc1f9b63f9a3fece1bf629047d87164d9b4487f39825e90f41a6cc4251985bc1e263ab1efeb297034d4316107e93043b2 SHA512 9e251af9c81088256c6bdd06a6c557f9a7cc10c4e6e48aa94e0a76173cd2dedca26886d3b52bc7d39b6a9faad30ebf5306d178803cdc8ba95bc2bdec8b4974d9
-EBUILD unifi-5.14.22.ebuild 1567 BLAKE2B 18e719065dabc0f01e0e9ef1b078e9351e915fef828efb36ce4772226f30d20c4833fff9255e23c59fbbf2e6f77e89423d3a909f0faf2978e86d11f55af70645 SHA512 811b5ab374ff4673916ee7577a48e48638bf0336542e1884e2cefe92d3b8b31d13a69bbb74547b06d0511c832901e8e8388f802a04ec5322671fa360c90d7758
-EBUILD unifi-5.14.23.ebuild 1566 BLAKE2B b41bc9e03b2812566edb82bf3127501cb12df15484045c267c2e47bf1eebdefc740ee978c36e914d3cd1911728b7a4871f2bfb2f90198d38b9c3a771299c4e4e SHA512 a9998d13dda0fd508595d0c53667fec28001c1ee5766422a793f8a512c22a1266933c21f5e6e3b17702f68cd328aa5202f810aa9da020fdd66c88b3e80c30afd
+DIST unifi-6.0.24.zip 219639979 BLAKE2B a96df3d87ca5e22791ea7480012add840b09a76fe603d24057ffa74f61c12a3fdcceffafe9a2aeb5c31111cdd00348c7bc5193929ef350a2f9dd6730260759a3 SHA512 d12c49d429659b504a132597aa1eba89d173b9671a231c4c4d27ec23c81be2b964e96439469ef467a212af5ca91c1b3bc4080d4ee0c3b71f7d4576b530a5e8b0
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
-EBUILD unifi-6.0.20.ebuild 1565 BLAKE2B c72187a8dfffd38f278f21540784ff62fe881dcc74bb7311e0f9a9171c09d8f19cd1dfa93366f6d7b7dcacef5368a9089c82959736c5179cb75578424f7bd698 SHA512 5e92a24ef3335e6d37a18797e2796374450a6e9adf12174b50c00ab16db1ce8bc87d7d13e11efc2710c9919f0f068e4de0fdc485571a3a530461fa5b16744c59
-EBUILD unifi-6.0.22.ebuild 1566 BLAKE2B c0c5d4420196da1fc8dbb66da2f5ce78b2832d687e36de47df4d90fd83d1fcfec0aafccf7865c4805d3cc198cd4731d07d89507a7205fdb8ae456f09eba03d3b SHA512 de2d1437717378e4a10db19c47ce5c6e6c3a840c35e2aa5f6c15cf2bef860532b258f9ad8220d07b2f8b28bd5be44de99e927a8fdd9c62f8a17988e3e436bb88
-EBUILD unifi-6.0.23.ebuild 1566 BLAKE2B 8d215f37409ce704ab95f64fa14cec750959be590b428c6e527ca820ccc8e6e983f8e137e7dec6e36b9771212cf479a70b2a05696414caf7d37ca66ab63bc850 SHA512 257e0107e1124a5805bee6a5ba21b6b689ee309c72882602a35d6aa056b15fe90605828233cabbe756a7b33ec7bd2ffffc6febbae951c5819593c25ce801a2ae
+EBUILD unifi-6.0.23.ebuild 1565 BLAKE2B 56f4a5e9740cdd7bc9e34349164c9612152fc969f042bb82d0a7b08c46fc5ec2efa7539f0b1bda1f0469cd04c8a8988f773367497cb8b208f0df5cdd1d7fcabd SHA512 2a24a46c8656413cc847693580f830b6a4a379fb585640418b025cdb5c0c972fd0ef3ef2fc2a8ba7a9df98fd15fbd2c196e519bff47a54d652edfb69a45c41be
+EBUILD unifi-6.0.24.ebuild 1566 BLAKE2B 1d2f8558ab7608c4d2db9e28f244c92aa7416439eb63bd02a27131debff9abed084cf03a1b4bce7d7286bad82ef686fed5d0940b8a2d27f5c3a76ae56505fd18 SHA512 9084039cfe18b5192bf3fe7afb21642c0fe1b17ecacfaef8c9007fc7ae0a308d91d3db6e2e13f943dd9be5ab667f72a4618e218b6d59aab7457dabbdfc924ea0
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-5.13.29.ebuild b/net-wireless/unifi/unifi-5.13.29.ebuild
deleted file mode 100644
index c9bdb8d27e60..000000000000
--- a/net-wireless/unifi/unifi-5.13.29.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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="-1fc0cd615f"
-
-inherit systemd
-
-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.13"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	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"
-
-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() {
-	insinto /usr/lib/unifi
-	doins -r bin 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.13.32.ebuild b/net-wireless/unifi/unifi-5.13.32.ebuild
deleted file mode 100644
index 652bbb55c840..000000000000
--- a/net-wireless/unifi/unifi-5.13.32.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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="-3e11950f9b"
-
-inherit systemd
-
-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.13"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	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"
-
-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() {
-	insinto /usr/lib/unifi
-	doins -r bin 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.14.22.ebuild b/net-wireless/unifi/unifi-5.14.22.ebuild
deleted file mode 100644
index f7657757712d..000000000000
--- a/net-wireless/unifi/unifi-5.14.22.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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="-9bf8d2f44f"
-
-inherit systemd
-
-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.14"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	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"
-
-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() {
-	insinto /usr/lib/unifi
-	doins -r bin 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.14.23.ebuild b/net-wireless/unifi/unifi-5.14.23.ebuild
deleted file mode 100644
index ddf7cd97fb43..000000000000
--- a/net-wireless/unifi/unifi-5.14.23.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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="-70ddb4015a"
-
-inherit systemd
-
-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.14"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	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"
-
-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() {
-	insinto /usr/lib/unifi
-	doins -r bin 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-6.0.20.ebuild b/net-wireless/unifi/unifi-6.0.20.ebuild
deleted file mode 100644
index 82a9960326c5..000000000000
--- a/net-wireless/unifi/unifi-6.0.20.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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="-816b9dfcdd"
-
-inherit systemd
-
-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/6.0"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	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"
-
-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() {
-	insinto /usr/lib/unifi
-	doins -r bin 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-6.0.22.ebuild b/net-wireless/unifi/unifi-6.0.22.ebuild
deleted file mode 100644
index 163cf5c3fb7a..000000000000
--- a/net-wireless/unifi/unifi-6.0.22.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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="-5cc1d1cd11"
-
-inherit systemd
-
-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/6.0"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	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"
-
-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() {
-	insinto /usr/lib/unifi
-	doins -r bin 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-6.0.23.ebuild b/net-wireless/unifi/unifi-6.0.23.ebuild
index 3b3f7c9e3fc3..53d19bcb20c0 100644
--- a/net-wireless/unifi/unifi-6.0.23.ebuild
+++ b/net-wireless/unifi/unifi-6.0.23.ebuild
@@ -12,7 +12,7 @@ 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"
+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/6.0"
 IUSE="systemd"
diff --git a/net-wireless/unifi/unifi-6.0.24.ebuild b/net-wireless/unifi/unifi-6.0.24.ebuild
new file mode 100644
index 000000000000..b9e8e79d0068
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.0.24.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 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="-b200bf6446"
+
+inherit systemd
+
+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/6.0"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	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"
+
+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() {
+	insinto /usr/lib/unifi
+	doins -r bin 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/profiles/Manifest.gz b/profiles/Manifest.gz
index 74a291442ede..d03a543a0f1b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index ba108db8a5f2..8102c07d8c08 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -369,10 +369,6 @@ gnome-extra/sushi office
 # Needs testing
 media-libs/phonon gstreamer vlc
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-27)
-# remove mask when dev-java/fop is keyworded here
-gnome-extra/libgda reports
-
 # Robin H Johnson <robbat2@gentoo.org> (2012-11-01)
 # MySQL 5.5 wants systemtap, tcmalloc & jemalloc
 >=dev-db/mysql-5.5 tcmalloc
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 69cf88d03b51..843680db9263 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -230,10 +230,6 @@ sys-apps/systemd -gnuefi
 # media-libs/libbdplus is keyworded on amd64, so unmask the useflag
 media-libs/libbluray -bdplus
 
-# Michał Górny <mgorny@gentoo.org> (2015-03-01)
-# pidgin-opensteamworks is only available for amd64, ppc32 and x86
-net-im/telepathy-connection-managers -steam
-
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (2014-04-24)
 # It's only supported on amd64
 dev-db/mariadb -tokudb
diff --git a/profiles/arch/arm/armv6j/package.mask b/profiles/arch/arm/armv6j/package.mask
index 46cb68385f1a..661812c7ac80 100644
--- a/profiles/arch/arm/armv6j/package.mask
+++ b/profiles/arch/arm/armv6j/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gentoo.org> (2020-09-26)
+# Depends on media-video/rav1e that's listed below. #744637
+-media-libs/libavif
+
 # Sam James <sam@gentoo.org> (2020-07-02)
 # Needs Rust, which is available here
 -dev-util/cargo-c
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index 3e820a0a2fc8..66fcdd6f6752 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gentoo.org> (2020-09-26)                                                  
+# Depends on media-video/rav1e that's listed below. #744637                                         
+-media-libs/libavif
+
 # Sam James <sam@gentoo.org> (2020-07-02)
 # Needs Rust, which is available here
 -dev-util/cargo-c
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 4348dc0b782f..3e8067207498 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gentoo.org> (2020-09-26)
+# Depends on media-video/rav1e that's listed below. #744637
+media-libs/libavif
+
 # Sam James <sam@gentoo.org> (2020-07-02)
 # Packages which need Rust (only on >= 6j)
 # We unmask them for armv6j, armv7a elsewhere
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index d804d1a26a7a..e1ce17fcd49d 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -353,10 +353,6 @@ mail-filter/opendkim opendbx stats
 # app-text/pandoc is not keyworded on arm arch.
 app-emulation/xen-tools system-qemu doc
 
-# Markus Meier <maekke@gentoo.org> (2014-02-23)
-# Needs sci-physics/bullet tested #499974
-dev-libs/efl physics
-
 # Markus Meier <maekke@gentoo.org> (2013-12-26)
 # Unkeyworded deps, bug #488724
 app-office/gnumeric libgda
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index a0f74262bbfc..20ee5ce89276 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -139,10 +139,6 @@ media-gfx/enblend doc
 # app-text/dblatex not keyword yet
 net-firewall/nftables doc
 
-# Mart Raudsepp <leio@gentoo.org> (2019-03-11)
-# media-libs/bcg729 not keyworded yet
-net-analyzer/wireshark bcg729
-
 # Roy Bamford <neddyseagoon@gentoo.org> (2019-03-11)
 # net-misc/dropbox is binary amd64/x86 only
 kde-apps/kdenetwork-meta dropbox
@@ -182,13 +178,8 @@ kde-apps/cantor lua
 # sci-libs/oce not yet keyworded
 sci-electronics/kicad occ oce ngspice
 
-# Matthew Thode <prometheanfire@gentoo.org> (2018-07-18)
-# dev-python/pandas not keyworded and test uses pandas
-dev-python/networkx pandas test
-
 # Michał Górny <mgorny@gentoo.org> (2018-07-07)
 # Unkeyworded dependencies.
-dev-python/matplotlib doc
 net-libs/gnome-online-accounts gnome
 
 # Jan Vesely <jano.vesely@gmail.com> (2018-06-15)
@@ -199,7 +190,6 @@ media-libs/mesa opencl
 # Mart Raudsepp <leio@gentoo.org> (2018-05-30)
 # app-text/pandoc not keyworded yet
 app-emulation/xen-tools doc
-dev-python/notebook doc
 
 # Mart Raudsepp <leio@gentoo.org> (2018-05-06)
 # New enough dev-ruby/webmock not keyworded yet
@@ -267,10 +257,6 @@ media-libs/opencv vtk
 dev-libs/libpeas lua
 
 # Michał Górny <mgorny@gentoo.org> (2018-01-23)
-# Requires dev-libs/efl that is not keyworded.
-dev-libs/dbus-c++ ecore
-
-# Michał Górny <mgorny@gentoo.org> (2018-01-23)
 # USE=eds requires USE=gnome that is masked here.
 # USE=postgres requires dev-db/postgresql[kerberos] (USE masked).
 # NeddySeagoon <neddysegoon@gentoo.org> (2017-08-21)
@@ -289,7 +275,6 @@ media-video/mjpegtools sdlgfx
 
 # Michał Górny <mgorny@gentoo.org> (2018-01-12)
 # Those require USE=doc that is masked in this profile.
-dev-python/python-glanceclient test
 dev-python/python-neutronclient test
 
 # NeddySeagoon <neddysegoon@gentoo.org> (2017-08-24)
@@ -381,14 +366,6 @@ net-im/telepathy-connection-managers sipe
 # Missing keywords, bug #478254
 gnome-base/gnome classic
 
-# Benda Xu <heroxbd@gentoo.org> (2013-10-31)
-# Missing keywords from dev-ml/lablgtk, bug #487722
-net-p2p/mldonkey gtk guionly
-
-# Markus Meier <maekke@gentoo.org> (2013-09-15)
-# Unkeyworded deps, bug #481462
-dev-python/ipython nbconvert
-
 # Sergey Popov <pinkbyte@gentoo.org> (2013-09-06)
 # sci-libs/hdf does not build properly on arm
 dev-perl/PDL	hdf
@@ -419,10 +396,6 @@ media-gfx/pstoedit emf
 # keyworded here. Remove mask if this situation changes.
 gnome-extra/sushi office
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-27)
-# remove mask when >=app-editors/gedit-3.6 is keyworded here
-dev-util/devhelp gedit
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (2012-04-12)
 # Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for
 # gobject-introspection[doctool], bug #411761
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 40b04c726cfc..0b6250de5a4d 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -31,6 +31,7 @@ www-servers/uwsgi uwsgi_plugins_rados
 dev-libs/boost mpi
 media-plugins/gst-plugins-meta aac dts dv lame libvisual taglib vcd wavpack
 x11-wm/i3 test
+dev-python/ipython nbconvert
 
 # Mikle Kolyada <zlogene@gentoo,org> (2020-03-19)
 # deps not yet stable
@@ -92,10 +93,6 @@ app-doc/doxygen clang doxysearch doc
 # sci-libs/mpir fails tests, bug 640424
 dev-python/gmpy mpir
 
-# Michał Górny <mgorny@gentoo.org> (2018-05-01)
-# More non-stable dependencies.
-dev-python/urllib3 test
-
 # Michał Górny <mgorny@gentoo.org> (2018-04-15)
 # Non-stable dependencies.
 app-admin/syslog-ng spoof-source
@@ -115,6 +112,4 @@ net-fs/samba ads
 # Michał Górny <mgorny@gentoo.org> (2018-02-19)
 # Masked due to unstable deps.
 dev-db/redis tcmalloc
-dev-python/hgdistver test
-dev-python/sphinx latex test
 net-analyzer/netcat crypt
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 87ba55bdeea2..d36a1f390620 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -215,10 +215,6 @@ sys-apps/systemd gnuefi
 # Mask bdplus support and unmask on arches where libbdplus is keyworded.
 media-libs/libbluray bdplus
 
-# Michał Górny <mgorny@gentoo.org> (2015-03-01)
-# pidgin-opensteamworks is only available for amd64, ppc32 and x86
-net-im/telepathy-connection-managers steam
-
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (2014-04-24)
 # It's only supported on amd64
 dev-db/mariadb tokudb
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 366da76c51fb..ba124ae0487a 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -157,7 +157,6 @@ input_devices_wacom
 
 # Robert Buchholz <rbu@gentoo.org> (2007-06-03)
 # Only works on x86 or amd64
-lcd_devices_svga
 lcd_devices_luise
 
 # Alex Legler <a3li@gentoo.org> (2009-12-07)
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 17c90c29cb04..6fbce4a6d581 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -280,10 +280,6 @@ media-sound/pulseaudio ofono-headset
 # sys-boot/gnu-efi is not supported on all archs.
 sys-apps/systemd -gnuefi
 
-# James Le Cuirot <chewi@gentoo.org> (2015-07-11)
-# Requires dev-java/fop but we don't support java on ia64.
-gnome-extra/libgda reports
-
 # Pacho Ramos <pacho@gentoo.org> (2015-06-13)
 # Missing keywords, bug #513108
 net-misc/spice-gtk smartcard webdav
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 862862971801..78fcaf12267d 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -216,10 +216,6 @@ x11-base/xorg-drivers video_cards_amdgpu
 # Missing keywords
 net-dns/unbound dnstap
 
-# Mike Frysinger <vapier@gentoo.org> (2015-03-16)
-# Needs sci-physics/bullet & media-libs/libsdl2 tested #499974
-dev-libs/efl physics sdl
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (2015-02-15)
 # There's no keyworded office implementation anymore.
 gnome-extra/sushi office
@@ -354,10 +350,6 @@ media-libs/opencv cuda
 # sys-apps/usbredir
 app-emulation/qemu     spice xen rbd usbredir
 
-# Kacper Kowalik <xarthisius@gentoo.org> (2011-01-16)
-# bug 350513, app-pda/jpilot is not keyworded
-mail-client/claws-mail pda
-
 # Sebastian Pipping <sping@gentoo.org> (2011-02-22)
 # No media-sound/lilypond here, yet (bug #356069)
 app-text/asciidoc test
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index 53fa05df9882..65fe9d1f6463 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -126,20 +126,11 @@ app-text/tesseract scrollview
 # Java is no longer supported on ppc.
 app-text/texlive pdfannotextractor
 dev-lang/logtalk fop
-gnome-extra/libgda reports
-
-# Ben de Groot <yngwin@gentoo.org> (2015-07-20)
-# missing keyword
-media-sound/audacity midi soundtouch
 
 # Pacho Ramos <pacho@gentoo.org> (2015-06-02)
 # Missing keywords (2015-06-02)
 net-misc/connman openconnect
 
-# Michał Górny <mgorny@gentoo.org> (2015-03-01)
-# pidgin-opensteamworks is only available for amd64, ppc32 and x86
-net-im/telepathy-connection-managers -steam
-
 # Julian Ospald <hasufell@gentoo.org> (2013-11-23)
 # FIXME: app-arch/innoextract not available under ppc yet
 games-fps/duke3d-data gog
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index ef95ddfd44db..548dc56ac9ab 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -115,10 +115,6 @@ dev-java/ant-apache-bsf python
 # Mask until >sys-cluster/ceph-0.94 goes stable
 net-analyzer/rrdtool rados
 
-# Ben de Groot <yngwin@gentoo.org> (2015-07-20)
-# missing keywords
-media-sound/audacity midi soundtouch
-
 # Matthias Maier <tamiko@gentoo.org> (2014-12-24)
 # sys-devel/clang is not keyworded
 app-doc/doxygen clang
diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask
index 354875b56618..7b5a7c506ff1 100644
--- a/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask
@@ -25,8 +25,6 @@ dev-cpp/eigen test
 # dev-python/pygtk is broken, bug #716294; Bugs #706500, #710160
 # Stable-mask all revdeps, all of them are pending cleanup already.
 media-gfx/gimp python
-sys-power/nut gui
-x11-libs/vte:0 python
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-05-03)
 # media-libs/libheif not stable, bugs #717242, #720438
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index d7c6960e2d75..26ae8393fc24 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -73,8 +73,6 @@ xvmc
 cg
 # dmi depends on PC BIOSes, we don't have those
 dmi
-# 2006-10-11 - corsair - bug #150925
-lcd_devices_graphlcd
 # Masked vaapi for PowerPC until it works on hardware available to PowerPC users (cell, etc.)
 vaapi
 
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 37bdd84bb662..08d13ea895dd 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -66,7 +66,7 @@ app-crypt/pinentry fltk gnome-keyring
 app-doc/doxygen latex dot
 app-editors/emacs alsa json lcms mailutils
 app-misc/pax-utils python
-app-text/asciidoc graphviz test
+app-text/asciidoc test
 app-text/po4a test
 app-text/xmlto text
 dev-lang/python tk
@@ -92,7 +92,7 @@ dev-python/pypiserver test
 dev-python/pygments doc test
 dev-python/setuptools test
 dev-python/snakeoil test
-dev-python/sphinx latext doc test
+dev-python/sphinx doc test
 dev-python/sphinxcontrib-spelling test
 dev-python/twisted test
 dev-python/urllib3 test
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 320fe30f8b54..4f6382988e65 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -43,10 +43,6 @@ dev-ruby/tilt test
 # Requires media-libs/mesa[llvm], which is masked.
 dev-python/pyopengl test
 
-# Rolf Eike Beer <eike@sf-mail.de> (2020-04-23)
-# don't bother keywording old versions
-<net-analyzer/rrdtool-1.7.2 ruby
-
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-22)
 # dev-libs/criterion not yet keyworded
 >=app-admin/syslog-ng-3.25 test
@@ -429,10 +425,6 @@ gnome-extra/sushi office
 # Needs testing
 media-libs/phonon gstreamer vlc
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (2012-12-27)
-# remove mask when dev-java/fop is keyworded here
-gnome-extra/libgda reports
-
 # Robin H Johnson <robbat2@gentoo.org> (2012-11-01)
 # MySQL 5.5 wants systemtap, tcmalloc & jemalloc
 >=dev-db/mysql-5.5 systemtap tcmalloc jemalloc
@@ -491,9 +483,6 @@ sci-libs/hdf5 mpi
 # Needs libmodplug
 media-libs/sdl-sound mikmod
 
-# Needs clisp which won't build
-app-text/texlive xindy
-
 # Needs krb4 USE flag for mit-krb5 (Bug #255579), and we believe it to be unstable.
 net-im/pidgin zephyr
 
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index 34cc294ac6ea..88c195e654c4 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -100,7 +100,6 @@ mono
 d
 # LCDproc masks see bug #148072
 lcd_devices_g15
-lcd_devices_graphlcd
 lcd_devices_ula200
 # Masking hardened, it isn't really supported, see bugs #144126 #78951
 hardened
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index c995fc0f9260..98c9756b22d9 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -248,10 +248,6 @@ sys-apps/systemd -gnuefi
 # media-libs/libbdplus is keyworded on x86, so unmask the useflag
 media-libs/libbluray -bdplus
 
-# Michał Górny <mgorny@gentoo.org> (2015-03-01)
-# pidgin-opensteamworks is only available for amd64, ppc32 and x86
-net-im/telepathy-connection-managers -steam
-
 # Jeroen Roovers <jer@gentoo.org> (2015-01-31)
 # >x11-drivers/nvidia-drivers-346 on x86 has no UVM support (bug #534156)
 >x11-drivers/nvidia-drivers-346 uvm
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index b3f876ad748f..4b6386ca8b2b 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -142,7 +142,6 @@
 
 # Robert Buchholz <rbu@gentoo.org> (2007-06-03)
 # Unmask as it works on x86
--lcd_devices_svga
 -lcd_devices_luise
 
 # fdk-aac is already keyworded here
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 08dc0688a531..27e1dfd3d50f 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -84,7 +84,6 @@ net-libs/webkit-gtk seccomp
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2018-09-11)
 # All glibc versions that include RPC code are masked now.
-dev-libs/libspt libtirpc
 dev-perl/Lab-VXI11 libtirpc
 net-analyzer/argus libtirpc
 net-analyzer/snort libtirpc
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 35ab7bde5808..986e307d0079 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,23 @@
 # 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> (2020-09-27)
+# The respective dependencies are masked for removal.
+net-im/telepathy-connection-managers gadu icq meanwhile steam yahoo
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-26)
+# Removed in 1.1.34-r1, mask in older to unblock libxml2 cleanup.
+<dev-libs/libxslt-1.1.34-r1 python
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-26)
+# The respective dependencies are masked for removal.
+~dev-db/percona-server-5.7.27.30 test
+sci-geosciences/viking mapnik
+
+# Ulrich Müller <ulm@gentoo.org> (2020-09-25)
+# Python 2 only. Bug #735496.
+sys-cluster/ganglia python
+
 # Joonas Niilola <juippis@gentoo.org> (2020-09-23)
 # Not yet packaged in ::gentoo but besides that the functionality is 
 # still experimental and possibly broken. Use with caution.
@@ -16,10 +33,6 @@ dev-libs/efl avif
 # caution!
 dev-libs/efl efl-one
 
-# Michał Górny <mgorny@gentoo.org> (2020-09-21)
-# The respective dependencies are masked for removal.
-gnome-base/libgnome-keyring test
-
 # Michał Górny <mgorny@gentoo.org> (2020-09-20)
 # The respective dependencies are masked for removal.
 net-nntp/pan gnome-keyring
@@ -32,7 +45,6 @@ app-office/lyx docbook
 # The respective dependencies are masked for removal.
 media-plugins/mythplugins mythnetvision
 sci-physics/thepeg rivet
-sys-apps/dstat wifi
 sys-cluster/drbd-utils heartbeat
 sys-cluster/pacemaker heartbeat
 
@@ -64,7 +76,7 @@ dev-db/mariadb columnstore
 # Michał Górny <mgorny@gentoo.org> (2020-08-01)
 # Require dev-python/twisted with py2.7.
 net-voip/telepathy-haze test
-net-voip/telepathy-salut test
+<net-voip/telepathy-salut-0.8.1-r3 test
 
 # Michał Górny <mgorny@gentoo.org> (2020-08-01)
 # dev-python/distributed is going to be last rited.
@@ -79,31 +91,18 @@ www-apps/nikola websocket
 # These packages require Python 2 support in dev-python/sphinx.
 # They are generally fixable by adding py3 support and using
 # distutils_enable_sphinx to build docs.
-<dev-libs/mongo-c-driver-1 doc
 dev-python/backports-functools-lru-cache doc
-<dev-python/click-7.1.2 doc
-<=dev-python/dulwich-0.19.15 doc
 <=dev-python/futures-3.2.0 doc
-<dev-python/gevent-20 doc
-<dev-python/inflect-4 doc
-<dev-python/jaraco-itertools-5 doc
 <=dev-python/lockfile-0.12.2-r2 doc
 <=dev-python/mysql-python-1.2.5-r3 doc
-<=dev-python/mysqlclient-1.4.6 doc
 <dev-python/pep8-1.7.1-r1 doc
 <dev-python/psycopg-2.8.4 doc
-<dev-python/requests-cache-0.4.12-r1 doc
-<=sci-biology/seqan-2.4.0 doc
 
 # Michał Górny <mgorny@gentoo.org> (2020-07-27)
 # Requires Python 2 support in xapian-bindings which in turn require
 # Python 2 in dev-python/sphinx.
 <www-apps/roundup-3 xapian
 
-# Michał Górny <mgorny@gentoo.org> (2020-07-25)
-# Requires dev-python/beautifulsoup with py2 support.
-<=sys-cluster/charm-6.8.2 doc
-
 # Brian Dolbec <dolsen@gentoo.org> (2020-07-20)
 # Required dependencies are not yet in the Gentoo ebuild tree
 # Please file a bug if this feature is needed
@@ -170,25 +169,10 @@ dev-vcs/cvs2svn bazaar
 <=dev-util/wstool-0.1.18 test
 <=dev-python/vcstools-0.1.42 test
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-03-27)
-# Depends on vulnerable old version of icedtea-web #711392
-# new version is not packaged yet
-# package/useflag is not going away anytime soon,
-# just masked. unmask as needed.
-dev-java/icedtea nsplugin webstart
-dev-java/icedtea-bin nsplugin webstart
-dev-java/openjdk nsplugin webstart
-dev-java/openjdk-bin nsplugin webstart
-dev-java/openjdk-jre-bin nsplugin webstart
-
 # Michał Górny <mgorny@gentoo.org> (2020-03-27)
 # Requires old version of dev-python/docutils.
 dev-util/buildbot doc
 
-# Lars Wendler <polynomial-c@gentoo.org> (2020-03-26)
-# Requires deprecated python2 and pygtk
-mail-client/claws-mail python
-
 # Guilherme Amadio <amadio@gentoo.org> (2020-03-16)
 # Requires dev-libs/cudnn which is only available on amd64
 sci-physics/root cudnn
@@ -210,10 +194,6 @@ dev-python/zeep tornado
 # Require Python 2 support in numpydoc.
 <=dev-python/pywavelets-0.5.2-r1 doc
 
-# Michał Górny <mgorny@gentoo.org> (2020-01-29)
-# Require dev-python/epydoc which is being removed.
-<=dev-python/suds-0.6-r1 doc
-
 # Michał Górny <mgorny@gentoo.org> (2020-01-27)
 # Requires old split dev-python/twisted-*.
 net-irc/telepathy-idle test
@@ -269,7 +249,6 @@ sys-block/open-isns slp
 # Brian Evans <grknight@gentoo.org> (2019-10-01)
 # PHP support is broken with current version
 # Mask USE until they are fixed
-=dev-libs/xapian-bindings-1.2.25 php
 media-gfx/exact-image php
 
 # Michał Górny <mgorny@gentoo.org> (2019-09-28)
@@ -500,11 +479,6 @@ net-irc/hexchat theme-manager
 app-editors/emacs:25 cairo
 app-editors/emacs:26 cairo
 
-# Michał Górny <mgorny@gentoo.org> (2016-07-05)
-# Mask system-clang support as it requires llvm-3.4 that is subject
-# to security bug cleanup, #585102.
-dev-util/intel-ocl-sdk system-clang
-
 # Matthew Brewer <tomboy64@sina.cn> (2016-06-02)
 # Acked-by: Amy Winston <amynka@gentoo.org>
 # Currently broken upstream.
@@ -526,10 +500,6 @@ dev-lang/moarvm asan
 # you're doing. This has upstream's approval.
 dev-java/icedtea cacao jamvm
 
-# Patrice Clement <monsieurp@gentoo.org> (2015-11-27)
-# Unsastified dependencies are upsetting repoman. Needs investigation.
-app-arch/cfv bittorrent
-
 # Rick Farina <zerochaos@gentoo.org> (2015-10-06)
 # forward porting this patch is non-trivial, mask for now
 >=net-wireless/wpa_supplicant-2.5 wimax
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index beed0172cac6..255930f8f6da 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -23,7 +23,6 @@ dev-python/matplotlib wxwidgets
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
 # app-text/pandoc (dev-lang/ghc) has no stable keywords.
 app-emulation/xen-tools doc
-dev-python/notebook doc
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13)
 # dev-util/shellcheck (dev-lang/ghc) has no stable keywords.
@@ -76,7 +75,6 @@ dev-perl/Business-ISBN barcode
 dev-perl/Template-Toolkit gd
 media-fonts/unifont utils fontforge
 media-video/vdrsync dvdr
-www-apps/bugzilla extras
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-07-16)
 # sci-libs/dcmtk is not stable
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 75585df7490c..6611f107da34 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -5,10 +5,6 @@
 # app-office/openoffice-bin is being removed.
 office_implementation_openoffice
 
-# Patrick Lauer <patrick@gentoo.org> (2020-08-18)
-# pg13 is currently beta and has no keywords yet
-postgres_targets_postgres13
-
 # Mikle Kolyada <zlogene@gentoo.org> (2020-08-02)
 # consolekit is masked for removal
 consolekit
diff --git a/profiles/desc/l10n.desc b/profiles/desc/l10n.desc
index 2434ef498d73..d45d7fa984e9 100644
--- a/profiles/desc/l10n.desc
+++ b/profiles/desc/l10n.desc
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of L10N USE_EXPAND flags.
@@ -17,6 +17,7 @@
 # id-ID - Indonesian (Indonesia)
 # kn-IN - Kannada (India)
 # nb-NO - Norwegian Bokmål (Norway)
+# ne-NP - Nepali (Nepal)
 # nn-NO - Norwegian Nynorsk (Norway)
 # pa-IN - Punjabi (India)
 # sa-IN - Sanskrit (India)
@@ -33,10 +34,10 @@ az - Azerbaijani
 be - Belarusian
 bea - Beaver
 bg - Bulgarian
+bla - Siksika
 bn - Bengali
 bn-BD - Bengali (Bangladesh)
 bn-IN - Bengali (India)
-bla - Siksika
 bo - Tibetan
 br - Breton
 brx - Bodo (India)
@@ -212,6 +213,7 @@ tlh - Klingon
 tn - Tswana
 to - Tonga (Tonga Islands)
 tr - Turkish
+trs - Chicahuaxtla Triqui
 ts - Tsonga
 tsg - Tausug
 tt - Tatar
diff --git a/profiles/license_groups b/profiles/license_groups
index 9935e14104b1..b35e620317ff 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -13,7 +13,7 @@
 # https://www.gnu.org/licenses/license-list.html
 # GPL or LGPL with various exceptions are also included here, because
 # they are more permissive than the licenses they are based on.
-GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD ECL-2.0 FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2-with-classpath-exception GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-2+-with-openssl-exception GPL-3 GPL-3+ GPL-3+-with-autoconf-exception GPL-3+-with-cuda-exception GPL-3+-with-cuda-openssl-exception GPL-3-with-font-exception GPL-3+-with-opencl-exception GPL-3+-with-opencl-openssl-exception GPL-3-with-openssl-exception HPND IJG ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception-1.1 OPENLDAP PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community Transmission-OpenSSL-exception unicode Unlicense UoI-NCSA UPX-exception vim W3C WTFPL-2 wxWinLL-3.1 ZLIB ZPL
+GPL-COMPATIBLE AGPL-3 AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 Boost-1.0 BSD BSD-2 CC0-1.0 CeCILL-2 Clarified-Artistic Clear-BSD ECL-2.0 FTL gcc-runtime-library-exception-3.1 GPL-1 GPL-1+ GPL-2 GPL-2+ GPL-2-with-classpath-exception GPL-2-with-exceptions GPL-2-with-font-exception GPL-2-with-linking-exception GPL-2-with-MySQL-FLOSS-exception GPL-2+-with-openssl-exception GPL-3 GPL-3+ GPL-3+-with-autoconf-exception GPL-3-with-font-exception GPL-3-with-openssl-exception HPND IJG ISC LGPL-2 LGPL-2+ LGPL-2-with-linking-exception LGPL-2.1 LGPL-2.1+ LGPL-2.1-with-linking-exception LGPL-3 LGPL-3+ LGPL-3-with-linking-exception libgcc libstdc++ metapackage MIT MPL-2.0 Nokia-Qt-LGPL-Exception-1.1 OPENLDAP PSF-2 PSF-2.2 PSF-2.3 PSF-2.4 public-domain PYTHON qwt Ruby Ruby-BSD SGI-B-2.0 Sleepycat tanuki-community Transmission-OpenSSL-exception unicode Unlicense UoI-NCSA UPX-exception vim W3C WTFPL-2 wxWinLL-3.1 ZLIB ZPL
 
 # Free software licenses approved by the FSF
 FSF-APPROVED @GPL-COMPATIBLE AFL-2.1 AFL-3.0 Apache-1.0 Apache-1.1 APSL-2 BSD-4 CDDL CNRI CPAL-1.0 CPL-1.0 EPL-1.0 EPL-2.0 EUPL-1.1 FraunhoferFDK gnuplot IBM LPPL-1.2 MPL-1.0 MPL-1.1 Ms-PL NPL-1.1 openssl OSL-1.1 OSL-2.0 OSL-2.1 PHP-3.01 QPL QPL-1.0 Zend-2.0
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE Amazon Atmel AVASYS bh-luxi bonnie Broadcom freedis
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA 2dboy-EULA AdobeFlash-11.x AMD-GPU-PRO-EULA AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 EPSON-2018 ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA MakeMKV-EULA Mendeley-terms Microsemi Mojang ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE Primate-Plunge protonmail-bridge-EULA PUEL PUEL-10 Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
+EULA 2dboy-EULA AdobeFlash-11.x AMD-GPU-PRO-EULA AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics EPSON-2018 ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA MakeMKV-EULA Mendeley-terms Microsemi Mojang ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 55fd49cc234b..4caae301de97 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Jesus P Rey <gentoo@chuso.net> (2020-09-26)
+# Only one provider left; media-video/ffmpeg should be used instead
+# Bug #744787
+virtual/ffmpeg
+
 # Thomas Deutschmann <whissi@gentoo.org> (2020-09-08)
 # Dead implementations, please migrate to >=zeromq-4
 dev-perl/ZMQ-LibZMQ2
@@ -36,11 +41,6 @@ x11-libs/wxGTK:3.0
 # Abandoned upstream, countless bugs. Removal tracked in bug #659616
 sys-power/pm-utils
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-05-03)
-# Obsolete package gets in the way of unmasking >=x11-libs/pango-1.44
-# Bug #698922
-x11-libs/pangox-compat
-
 # Kent Fredric <kentnl@gentoo.org> (2020-04-15)
 # Functionality now provided by Net::SMTP 3.25+
 # available with >=virtual/perl-libnet-1.28
@@ -52,7 +52,6 @@ dev-perl/Net-SMTP-SSL
 # Matt Turner <mattst88@gentoo.org> (2020-03-17)
 # Deprecated GNOME 2 era packages
 # Bugs #640022, #713010, #726784, #728956
-dev-python/pygobject:2
 gnome-base/gnome-vfs
 gnome-base/libbonobo
 gnome-base/libbonoboui
@@ -70,12 +69,6 @@ x11-libs/gtkglext
 # bug #699796.
 virtual/libffi
 
-# Michał Górny <mgorny@gentoo.org> (2019-12-30)
-# PyPy packages have been restructured, and the virtual is no longer
-# necessary.  Depend on dev-python/pypy{,3} instead.
-virtual/pypy
-virtual/pypy3
-
 # Michał Górny <mgorny@gentoo.org> (2019-12-09)
 # Test coverage reporting is not useful for Gentoo ebuilds.  The deps
 # against coverage plugins are either entirely spurious, or the build
diff --git a/profiles/package.mask b/profiles/package.mask
index 502b94bd1e86..f555e72c4354 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,69 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-09-27)
+# Obsolete package blocking unmasking of >=x11-libs/pango-1.44, dead upstream.
+# No reverse dependencies, bug #698922. Removal in 30 days.
+x11-libs/pangox-compat
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-27)
+# Discontinued upstream.  Not ported to Python 3, and no patches seem
+# readily available.
+# Removal in 30 days.  Bug #714636.
+net-voip/telepathy-haze
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-26)
+# These packages still require Python 2.7, or are dependencies of py2.7
+# packages.  They are either dead upstream, their Python 3 porting
+# efforts are not progressing or their maintainers are simply
+# unresponsive.  Please do not remove any packages from this list unless
+# you actually port them to Python 3.
+# Removal in 30 days.  Please find relevant bugs on tracker bug #694800.
+games-arcade/diameter
+games-board/gnome-hearts
+net-analyzer/sguil-server
+net-analyzer/tcpflow
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-26)
+# Dead Python 2-only package.  No significant revdeps left.
+# Removal in 30 days.  Bug #710024.
+dev-python/mysql-python
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-26)
+# Python 2.7 backport with no revdeps left.
+# Removal in 30 days.  Bug #734636.
+dev-python/singledispatch
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-26)
+# These packages either use obsolete scons-utils.eclass API that
+# does not support Python 3, or do not support Python 3 at all.
+# Their maintainers are unresponsive.  Please do not remove any packages
+# from this list unless you actually port them to Python 3.
+# Removal in 30 days.  Please find relevant bugs on tracker bug #635934.
+dev-libs/mongo-cxx-driver
+games-action/btanks
+games-emulation/gambatte
+games-sports/vdrift
+games-strategy/endless-sky
+games-strategy/glob2
+net-vpn/freelan
+sci-geosciences/mapnik
+sci-visualization/nonolith-connect
+sys-apps/lcdtest
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-25)
+# PyPy3.7 alpha.  Known to break a few packages.  Masked until it
+# matures more.
+=dev-python/pypy3-7.3.2_p37*
+=dev-python/pypy3-exe-7.3.2_p37*
+=dev-python/pypy3-exe-bin-7.3.2_p37*
+
+# Michał Górny <mgorny@gentoo.org> (2020-09-25)
+# Effectively unmaintained.  Not ported to py3.7.  Multiple unresolved
+# build failures reported.  No reverse dependencies.
+# Removal in 30 days.  Bug #737412.
+sci-libs/shogun
+
 # Aaron Bauman <bman@gentoo.org> (2020-09-22)
 # Fails to build with new Python or at all.
 # QA issues (byte compiling etc). All live ebuilds.
@@ -229,7 +292,6 @@ sci-mathematics/axiom
 # Please do not remove any packages from this list unless you actually
 # port them to Python 3.
 # Removal in 30 days.  Please find relevant bugs on tracker bug #694800.
-app-admin/github-backup-utils
 app-backup/genbackupdata
 app-i18n/pology
 app-text/pdf2djvu
@@ -371,13 +433,6 @@ net-vpn/peervpn
 dev-db/mariadb:5.5
 dev-db/mariadb:10.1
 
-# Michał Górny <mgorny@gentoo.org> (2020-09-11)
-# 7.3.2 release candidates.  Masked for testing.
-=dev-python/pypy-7.3.2_rc*
-=dev-python/pypy3-7.3.2_rc*
-=dev-python/pypy-exe-7.3.2_rc*
-=dev-python/pypy3-exe-7.3.2_rc*
-
 # Thomas Beierlein <tomjbe@gentoo.org> (2020-09-09)
 # Depends on obsolete gnome-base/libgnomeui.
 # Upstream promised to have a better version
@@ -412,7 +467,6 @@ dev-python/redlock-py
 dev-python/root_numpy
 dev-python/rootpy
 dev-util/setconf
-sci-misc/vitables
 
 # Michał Górny <mgorny@gentoo.org> (2020-09-09)
 # These packages (or package versions) still require Python 2.7.
@@ -456,12 +510,9 @@ x11-misc/dsx
 #
 # net-analyzer/mk-livestatus: py3 bug #735394, build failure bug #705430
 # sci-biology/vienna-rna: py3 bug #735438, build failure bug #707158
-# sys-cluster/ganglia: py3 bug #735496, build failure bug #631270
 # sys-fs/owfs: py3 bug #735502, build failure bug #707438
 net-analyzer/mk-livestatus
 sci-biology/vienna-rna
-sys-cluster/ganglia
-sys-cluster/ganglia-web
 sys-fs/owfs
 
 # Louis Sautier <sbraz@gentoo.org> (2020-09-09)
@@ -563,79 +614,10 @@ sys-cluster/pbs-python
 app-text/fbless
 
 # Sam James <sam@gentoo.org> (2020-08-30)
-# Serious security bug, unmaintained.
-# Stuck on long-obsolete EAPI 4.
-# Several open bugs.
-# bug 720732, bug 729714, bug 722644,
-# bug 724184.
-dev-db/sqliteodbc
-
-# Sam James <sam@gentoo.org> (2020-08-30)
 # Serious security vulns, outdated.
 # bug 699834. Removal in 30 days.
 www-apps/ampache
 
-# Sam James <sam@gentoo.org> (2020-08-30)
-# Collection of quite dead net-irc/* pkgs
-# Please speak up if you use any of these
-# and a modern alternative doesn't work for you.
-# None of these have alive upstreams, and we're
-# the only distro packaging them in many cases.
-# Unmaintained. Removal in 30 days.
-# bug 724940, bug 708408, bug 716264, bug 633346
-# bug 706898, bug 731188
-net-irc/ptlink-ircd
-net-irc/ptlink-opm
-net-irc/irc-server
-net-irc/xaric
-net-irc/nebula
-
-# Aaron Bauman <bman@gentoo.org> (2020-08-29)
-# EAPI=4, use dev-embedded/libftd[tools] instead
-# Removal in 30 days
-dev-embedded/ftdi_eeprom
-
-# Aaron Bauman <bman@gentoo.org> (2020-08-29)
-# EAPI=4, latest release 4.3.19 in 2019.
-# Unmaintained. Removal in 30 days.
-app-cdr/pburn
-
-# Aaron Bauman <bman@gentoo.org> (2020-08-29)
-# EAPI=4, simple script, relies on hardcoded
-# /usr/dict/words for generation. Removal in 30 days.
-app-admin/passook
-
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-08-29)
-# Abandoned upstream.
-# Does not compile against ghc-8.8. Removal in 30 days.
-dev-haskell/process-conduit
-
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-08-29)
-# Abandoned upstream.
-# Does not compile against ghc-8.8. Removal in 30 days.
-dev-haskell/citeproc-hs
-
-# Miroslav Šulc <fordfrog@gentoo.org> (2020-08-29)
-# Upstream has version 1.1.2, but only for Windows,
-# sources are gone. Removal in 30 days.
-media-sound/traverso
-
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-08-29)
-# Abandoned upstream. Use dev-haskell/cryptonite instead.
-# Does not compile against ghc-8.8. Removal in 30 days.
-dev-haskell/cipher-blowfish
-dev-haskell/cryptocipher
-
-# Aaron Bauman <bman@gentoo.org> (2020-08-28)
-# EAPI=4 and fails to compile
-# Dead upstream. Removal in 30 days
-net-mail/maildirtree
-
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-08-27)
-# Abandoned upstream.
-# Does not compile against ghc-8.8. Removal in 30 days.
-dev-haskell/bio
-
 # Piotr Karbowski <slashbeast@gentoo.org> (2020-08-28)
 # Temporary mask due to multiple reports of segfaults at startup, bug #739056
 =x11-base/xorg-server-1.20.9
@@ -647,23 +629,6 @@ dev-haskell/bio
 # Removal in 30 days. Bug #739066.
 dev-libs/hsa-ext-rocr
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-08-24)
-# Abandoned upstream.
-# Does not compile against ghc-8.8. Removal in 30 days.
-# Bug #736052.
-games-roguelike/mazesofmonad
-
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-08-24)
-# Obsolete package without reverse dependencies.
-# Does not compile against ghc-8.8. Removal in 30 days.
-dev-haskell/glade
-
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-08-24)
-# Obsolete package without reverse dependencies.
-# Does not compile against ghc-8.8. Removal in 30 days.
-# Bug #735914.
-dev-haskell/drift
-
 # Alfredo Tupone <tupone@gentoo.org> (2020-08-23)
 # Ported to py3 but not yet released
 # Masked to allow py2.7 removal
@@ -685,16 +650,6 @@ dev-ada/gnatcoll-db
 >=dev-libs/vala-common-0.49
 dev-lang/vala:0.50
 
-# Matt Turner <mattst88@gentoo.org> (2020-08-13)
-# Masked for testing
->=sys-auth/sssd-2.3.0
-
-# Jonas Stein <jstein@gentoo.org> (2020-08-13)
-# One of many password generators, but with dead upstream in this case.
-# Masked for removal after 2020-10-01.
-# Bug #629272
-app-admin/apg
-
 # Mikle Kolyada <zlogene@gentoo.org> (2020-08-02)
 # consolekit is abandoned upstream.
 # People are encouraged to switch to any logind
@@ -840,7 +795,7 @@ net-misc/gnome-remote-desktop
 >=virtual/libcrypt-2
 
 # Mart Raudsepp <leio@gentoo.org> (2020-02-03)
-# Known breakages that need to be handled first, bug 698922
+# Needs news item, known breakages that need to be handled first, bug 698922
 >=x11-libs/pango-1.43
 
 # Robin H. Johnson <robbat2@gentoo.org> (2020-01-26)
@@ -859,12 +814,6 @@ net-misc/gnome-remote-desktop
 =dev-lang/lua-5.2.4-r2
 =dev-lang/lua-5.3.5-r2
 
-# Michał Górny <mgorny@gentoo.org> (2020-01-16)
-# The new version loses Python 2 support but does not introduce any real
-# changes.  Let's mask it to reduce the noise, and hopefully try to get
-# python2_7 out of default PYTHON_TARGETS first.
->=dev-python/setuptools-47
-
 # Lars Wendler <polynomial-c@gentoo.org> (2019-11-14)
 # Breaks archives containing relative paths
 # when being called with --no-absolute-filenames
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 88d7a629fa69..3290452b4f05 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -23,7 +23,6 @@ app-accessibility/simon:pim - Enable support for KDE PIM resources integration
 app-accessibility/simon:sphinx - Build sphinx backend (pulls app-accessibility/julius if disabled
 app-accessibility/speech-dispatcher:espeak - Adds support for espeak speech engine
 app-accessibility/speech-dispatcher:flite - Adds support for flite speech engine
-app-accessibility/speechd-el:brltty - brltty support
 app-admin/calamares:pythonqt - Enable PythonQt-based module interface
 app-admin/clsync:apidoc - Provide doxygen generated API docs.
 app-admin/clsync:cgroups - Use cgroups to limit /dev access.
@@ -264,8 +263,8 @@ app-backup/bareos:rados-striper - Enable use of rados-striper
 app-backup/bareos:scsi-crypto - Enable low level SCSI crypto support
 app-backup/bareos:sql-pooling - Enable SQL pooling support
 app-backup/bareos:storage-daemon - Install storage daemon (bareos-sd)
+app-backup/btrbk:lsbtr - Enable the lsbtr command-line tool
 app-backup/btrbk:mbuffer - Use sys-block/mbuffer to enable progress bar and buffering/limiting functionality
-app-backup/btrbk:pv - Use sys-apps/pv to enable progress bar functionality
 app-backup/dar:dar32 - Enables --enable-mode=32 option, which replace infinite by 32 bit integers
 app-backup/dar:dar64 - Enables --enable-mode=64 option, which replace infinite by 64 bit integers
 app-backup/dar:gcrypt - Enables strong encryption support
@@ -417,6 +416,7 @@ app-editors/nano:magic - Add magic file support (sys-apps/file) to automatically
 app-editors/nano:minimal - Disable all fancy features, including ones that otherwise have a dedicated USE flag (such as spelling).
 app-editors/nano:split-usr - Enable this if /bin and /usr/bin are separate directories
 app-editors/ne:tinfo - Link against libtinfo from sys-libs/ncurses
+app-editors/neovim:lto - Build with Link Time Optimization (LTO)
 app-editors/neovim:nvimpager - Install nvimpager symlink to less.sh macro
 app-editors/neovim:tui - Build the neovim unix tui
 app-editors/okteta:designer - Build plugins for dev-qt/designer
@@ -1064,9 +1064,9 @@ app-office/orage:clock-panel-plugin - Build the clock plugin for the XFCE panel
 app-office/scribus:boost - Enable support for Boost based enhancement
 app-office/scribus:hunspell - Enable support for spell checking with app-text/hunspell
 app-office/scribus:minimal - Don't install headers (only required for e.g. plug-in developers)
-app-office/scribus:osg - 3D redering via dev-games/openscenegraph
+app-office/scribus:osg - 3D rendering via dev-games/openscenegraph
 app-office/scribus:scripts - Install the scripts
-app-office/scribus:templates - Document tamplates
+app-office/scribus:templates - Document templates
 app-office/scribus:tk - Install tk based scripts e.g. FontSample.py
 app-office/skrooge:activities - Enable kactivities support
 app-office/skrooge:designer - Build plugins for dev-qt/designer
@@ -1111,6 +1111,7 @@ app-shells/shish:diet - Use dev-libs/dietlibc
 app-text/atril:caja - Enable property page extension in mate-base/caja
 app-text/atril:dvi - Enable build-in DVI viewer
 app-text/atril:epub - Enable build-in DVI viewer using net-libs/webkit-gtk
+app-text/atril:synctex - Enable search highlighting through synctex (virtual/tex-base)
 app-text/atril:t1lib - Enable the Type-1 fonts for the build-in DVI viewer (media-libs/t1lib)
 app-text/atril:xps - Enable XPS viewer using app-text/libgxps
 app-text/blogc:git - Build blogc-git-receiver tool
@@ -1530,12 +1531,6 @@ dev-haskell/cabal-install:native-dns - Enable use of the resolv and windns packa
 dev-haskell/chaselev-deque:debug - Enable the extra internal checks.
 dev-haskell/chell:color-output - use colors in program output
 dev-haskell/chimera:representable - Define Representable instance from adjunctions package
-dev-haskell/citeproc-hs:bibutils - use Chris Putnam's app-text/bibutils
-dev-haskell/citeproc-hs:embed-data-files - Embed locale files into the library (needed for windows packaging)
-dev-haskell/citeproc-hs:hexpat - use dev-haskell/hexpat instead of dev-haskell/xml for XML parsing
-dev-haskell/citeproc-hs:network - use dev-haskell/network and dev-haskell/http to retrieve CSL file from URIs
-dev-haskell/citeproc-hs:small-base - Choose the new smaller, split-up base package.
-dev-haskell/citeproc-hs:unicode-collation - Use Haskell bindings to the dev-libs/icu
 dev-haskell/cmark:system-cmark - use app-text/cmark instead of bundled copy
 dev-haskell/cmdargs:quotation - Build quote module
 dev-haskell/cmdargs:testprog - Build the test program
@@ -1817,6 +1812,7 @@ dev-lang/erlang:hipe - HIgh Performance Erlang extension
 dev-lang/erlang:kpoll - Enable kernel polling support
 dev-lang/fpc:ide - Build and install the Free Pascal Compiler IDE
 dev-lang/gdl:eigen - Build matrix manipulation with dev-cpp/eigen
+dev-lang/gdl:glpk - Use GNU Linear Programming Kit sci-mathematics/glpk
 dev-lang/gdl:gshhs - Add support for projection adn continent maps with sci-geosciences/gshhs-data
 dev-lang/gdl:hdf - Add support for the Hierarchical Data Format v.4
 dev-lang/gdl:proj - Add support for sci-libs/proj (geographic projections)
@@ -1986,9 +1982,9 @@ dev-libs/aws-sdk-cpp:ec2 - Amazon Elastic Compute Cloud (EC2) is a web service t
 dev-libs/aws-sdk-cpp:ecr - Amazon Elastic Container Registry (ECR) is a fully managed Docker container registry.
 dev-libs/aws-sdk-cpp:ecs - Amazon Elastic Container Service (ECS) is a highly scalable, fast, container management service.
 dev-libs/aws-sdk-cpp:eks - Amazon Elastic Kubernetes Service (EKS) is a managed service to run Kubernetes on AWS without own Kubernetes clusters.
+dev-libs/aws-sdk-cpp:elastic-inference - Amazon Elastic Inference is a service that allows you to attach low-cost GPU-powered acceleration to many Amazon machine instances in order to reduce the cost of running deep learning inference by up to 75%. Amazon Elastic Inference supports TensorFlow, Apache MXNet, and ONNX models through MXNet.
 dev-libs/aws-sdk-cpp:elasticache - Set up, manage, and scale distributed in-memory cache environments in the AWS Cloud
 dev-libs/aws-sdk-cpp:elasticbeanstalk - Quickly deploy and manage applications in the AWS Cloud.
-dev-libs/aws-sdk-cpp:elasticinference - Amazon Elastic Inference is a service that allows you to attach low-cost GPU-powered acceleration to many Amazon machine instances in order to reduce the cost of running deep learning inference by up to 75%. Amazon Elastic Inference supports TensorFlow, Apache MXNet, and ONNX models through MXNet.
 dev-libs/aws-sdk-cpp:elasticloadbalancing - Automatically distribute incoming application traffic across multiple targets, such as EC2 instances. Also enables elasticloadbalancingv2.
 dev-libs/aws-sdk-cpp:elasticmapreduce - Amazon Elastic MapReduce (EMR) processes large amounts of data efficiently using Hadoop processing combined with several AWS products.
 dev-libs/aws-sdk-cpp:email - Amazon Simple Email Service (Amazon SES): An email platform to send and receive email using ones own email addresses and domains. See: https://docs.aws.amazon.com/ses/latest/DeveloperGuide/Welcome.html Also enables sesv2
@@ -2620,7 +2616,6 @@ dev-python/twisted:serial - include serial port support
 dev-python/urllib3:brotli - Enable support for brotli compression
 dev-python/ws4py:client - Install client modules
 dev-python/ws4py:server - Install server modules
-dev-python/wxpython:examples - Install interactive demo module browser and sample applets.
 dev-python/zeep:async - Add async support
 dev-python/zeep:tornado - Add tornado support
 dev-qt/designer:declarative - Build the qdeclarativeview plugin
@@ -3035,9 +3030,7 @@ dev-vcs/kdesvn:man - Build and install man pages
 dev-vcs/mercurial:chg - Support Mercurial command server client
 dev-vcs/mercurial:gpg - Support signing with GnuPG.
 dev-vcs/mercurial:tk - Install dev-lang/tk for hgk script.
-dev-vcs/subversion:dso - Enable runtime module search
 dev-vcs/subversion:extras - Install extra scripts (examples, tools, hooks)
-dev-vcs/subversion:http - Enable http support using net-libs/serf
 dev-vcs/subversion:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet
 games-action/beathazardultra:bundled-libs - Use the upstream provided bundled libraries.
 games-action/chromium-bsu:mixer - Enables media-libs/sdl-mixer sound backend instead of media-libs/openal one.
@@ -3300,7 +3293,6 @@ games-simulation/flightgear:udev - Enable event-based Input devices through virt
 games-simulation/flightgear:utils - Build various utilities (fgpanel, fgviewer among others)
 games-simulation/openrct2:lightfx - Enables LightFX for better lightning effects.
 games-simulation/openrct2:scripting - Enable the dev-lang/duktape scripting engine for executing user scripts.
-games-simulation/openrct2:twitch - Enables streaming of ingame content to Twitch.
 games-simulation/openttd:aplaymidi - Enables midi music in game, using aplaymidi as an external player
 games-simulation/openttd:dedicated - Build only the openttd server, and not the client.
 games-simulation/openttd:lzo - Enables LZO compression for savegames. This is only needed to load extremely old savegames. (versions before 0.2)
@@ -3463,7 +3455,6 @@ gui-libs/wlroots:x11-backend - Enable support for handling input/output devices
 gui-libs/xdg-desktop-portal-wlr:elogind - Enable support for rootless session via elogind
 gui-wm/hikari:gamma - add gamma control for redshift
 gui-wm/hikari:layershell - add support for wayland apps using layer shell
-gui-wm/hikari:man - build and install man pages
 gui-wm/hikari:screencopy - add support for screen grabbing
 gui-wm/hikari:virtual-io - enable virtual input/output support, needed for remote I/O in VNC
 gui-wm/sway:X - Enable support for X11 applications (XWayland)
@@ -3663,6 +3654,7 @@ kde-plasma/kscreenlocker:consolekit - Support for killing the screenlocker when
 kde-plasma/ksysguard:pcap - Enable per-process network statistic collection using net-libs/libpcap
 kde-plasma/kwin:multimedia - Enable effect video button in desktop effects KCM
 kde-plasma/libksysguard:webengine - Enable display of detailed memory information using dev-qt/qtwebengine.
+kde-plasma/plasma-desktop:emoji - Build emojipicker applet using app-i18n/ibus and media-fonts/noto-emoji
 kde-plasma/plasma-desktop:ibus - Use ibus input method via app-i18n/ibus
 kde-plasma/plasma-desktop:scim - Enable applets that use app-i18n/scim
 kde-plasma/plasma-meta:browser-integration - Enable integration with Chrome/Firefox with browser extensions
@@ -3905,6 +3897,7 @@ mate-base/mate-applets:cpupower - Enable support for cpu frequency manipulation
 mate-base/mate-applets-meta:appindicator - Pull in mate-extra/mate-indicator-applet for AppIndicator applet
 mate-base/mate-applets-meta:sensors - Pull in mate-extra/mate-sensors-applet for hw sensors applet
 mate-base/mate-control-center:accountsservice - Add support for AccountsService
+mate-base/mate-session-manager:gles2 - Build with support for GLESv2 acceleration sessions
 mate-base/mate-session-manager:xtrans - Build with Xtrans support; WARNING: Disabling this flag will result in ICE binding on all interfaces
 mate-base/mate-settings-daemon:rfkill - build support for rfkill
 mate-extra/caja-extensions:cdr - Add an extension to burn files to cds using app-cdr/brasero.
@@ -4223,6 +4216,11 @@ media-libs/leptonica:utils - Install command-line utilities
 media-libs/libafterimage:shaping - Use MIT shaped X windows extention.
 media-libs/libafterimage:shm - Use MIT shared memory extention for X image transfer.
 media-libs/libass:harfbuzz - Enables OpenType shaping via media-libs/harfbuzz.
+media-libs/libavif:aom - Enable support for the AOM codec encoding and decoding
+media-libs/libavif:dav1d - Enable support for the dav1d codec decoding
+media-libs/libavif:extras - Build extra apps (avifenc, avifdec) and test files
+media-libs/libavif:gdk-pixbuf - Build a gdk-pixbuf loader
+media-libs/libavif:rav1e - Enable support for the rav1e codec encoding
 media-libs/libbdplus:aacs - Add support for decryption of AACS
 media-libs/libbluray:aacs - Add support for decryption of AACS
 media-libs/libbluray:bdplus - Use media-libs/libbdplus for BD+ decryption
@@ -4586,6 +4584,14 @@ media-sound/csound:utils - Build stand-alone executables for utilities that can
 media-sound/csound:websocket - Build the websocket opcode
 media-sound/darkice:aacplus - AAC+ encoding via media-libs/libaacplus
 media-sound/darkice:twolame - Build with twolame support
+media-sound/deadbeef:converter - File format converter
+media-sound/deadbeef:cover - Support for cover art
+media-sound/deadbeef:hotkeys - Keyboard shortcuts support
+media-sound/deadbeef:lastfm - last.fm/AudioScrobbler protocol support
+media-sound/deadbeef:notify - Desktop notifications support
+media-sound/deadbeef:nullout - Dummy output driver
+media-sound/deadbeef:shellexec - Define custom shell commands that can be called on tracks
+media-sound/deadbeef:supereq - Enable equalizer
 media-sound/deinvert:liquid - improve sound quality using net-libs/liquid-dsp
 media-sound/deinvert:wav - wav file support using media-libs/libsndfile
 media-sound/denemo:alsa - Enable alsa support through media-libs/alsa-lib
@@ -4798,7 +4804,6 @@ media-sound/supercollider:vim - Enable the SCVIM user interface
 media-sound/supercollider:webengine - Enable the internal help system using QtWebengine
 media-sound/teamspeak-server:tsdns - Install TeamSpeaks own DNS service for handling multiple virtual servers.
 media-sound/tomahawk:telepathy - Enable support for the real-time communication framework telepathy
-media-sound/traverso:lv2 - Add support for Ladspa V2
 media-sound/umurmur:mbedtls - Use net-libs/mbedtls as TLS provider
 media-sound/umurmur:shm - Enable shared memory support
 media-sound/upmpdcli:thirdparty - Enable streaming from Qobuz and Tidal external services
@@ -6020,8 +6025,6 @@ net-libs/gnutls:test-full - Enable full test mode
 net-libs/gnutls:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS
 net-libs/gnutls:tools - Build extra tools
 net-libs/gnutls:valgrind - Enable usage of dev-util/valgrind in debug
-net-libs/grpc:perftools - Enable profiling using dev-util/google-perftools
-net-libs/grpc:systemtap - Enable SystemTAP/DTrace tracing
 net-libs/iax:snomhack - Use slower memset for SNOM phoneem
 net-libs/ldns:dane - Enable DNS-based Authentication of Named Entities (DANE) support
 net-libs/ldns:ecdsa - Enable ECDSA support
@@ -7179,8 +7182,6 @@ sci-electronics/gtkwave:fatlines - Renders lines as double width in gtkwave.
 sci-electronics/gtkwave:judy - Enables Judy array support.
 sci-electronics/gtkwave:packed - Enables '#pragma pack' for data arrays (saves memory, costs time).
 sci-electronics/kicad:github - Add github support into PCB editor
-sci-electronics/kicad:i18n - Allow GUI internationalization through l10n_* use flags
-sci-electronics/kicad:minimal - Build only binaries without parts library and examples
 sci-electronics/kicad:ngspice - Enable circuit simulation
 sci-electronics/kicad:occ - Enable viewing 3D rendering of designs via opencascade
 sci-electronics/kicad:oce - Enable viewing 3D rendering of designs via OCE
@@ -8281,6 +8282,7 @@ sys-devel/llvm:gold - Build the gold linker plugin
 sys-devel/llvm:ncurses - Support querying terminal properties using ncurses' terminfo
 sys-devel/llvm:xar - Support dumping LLVM bitcode sections in Mach-O files (uses app-arch/xar)
 sys-devel/llvm:z3 - Enable support for sci-mathematics/z3 constraint solver
+sys-devel/llvm-roc:runtime - Builds the compiler runtime libraries.
 sys-devel/parity:vc10_0 - Enable support for Visual Studio 2010
 sys-devel/parity:vc11_0 - Enable support for Visual Studio 2012
 sys-devel/parity:vc12_0 - Enable support for Visual Studio 2013
@@ -8403,7 +8405,8 @@ sys-fs/zfs:minimal - Don't install python scripts (arcstat, dbufstat etc) and av
 sys-fs/zfs:pam - Install zfs_key pam module, for automatically loading zfs encryption keys for home datasets
 sys-fs/zfs:rootfs - Enable dependencies required for booting off a pool containing a rootfs
 sys-fs/zfs:test-suite - Install regression test suite
-sys-fs/zfs-auto-snapshot:default-exclude - Only take snapshots if dataset has com.sun:auto-snapshot=true property set
+sys-fs/zfs-auto-snapshot:cron - Install /etc/cron.* files
+sys-fs/zfs-auto-snapshot:default-exclude - Only take snapshots of datasets with com.sun:auto-snapshot=true property set
 sys-fs/zfs-kmod:rootfs - Install zfs-shutdown script to support exporting a pool containing rootfs
 sys-kernel/aufs-sources:experimental - Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".
 sys-kernel/aufs-sources:module - Patch kernel to allow aufs being build as a module.
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index b2514a855a3c..65325e396c98 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/ament_cmake/Manifest b/ros-meta/ament_cmake/Manifest
index fe425b4d93b5..3d9484110c76 100644
--- a/ros-meta/ament_cmake/Manifest
+++ b/ros-meta/ament_cmake/Manifest
@@ -1,6 +1,8 @@
 DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
 DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
+DIST ament_cmake-1.0.1.tar.gz 66465 BLAKE2B cd905b52f4600ccf364ab8d5e4dcf102e1f6034bae7ab020022860fa440ff058a996752cbb0e743b5f66a2b6bc0d1f46cec7c71900be53f035ed8a0642e50b04 SHA512 5f60c933c0ba1eea97f2d0913e19f383e154f26a0625ea4e40c529dd1fa5831109f7cbc0c39a514d37334d61c5d614df0ea546e49ab46202002af09a2adf6288
 EBUILD ament_cmake-0.9.6.ebuild 1550 BLAKE2B f7291cb44642ac0e86c2b0cbcc8c8e72b8cd46b7e8930e50e96688a8edb0ee8f3f839680ebd43860ae41d4b4bd01b2d8c526b5e25a1862921bc024021e3ff902 SHA512 7c9b2a8d6e20a0ff524bc686c704896ad7c7030068e9f890c9920238b8c4c6a5eee946ba6e25a9c35ccc832652f8c60736d7df05acefbf1f9ec07a44f19857f9
 EBUILD ament_cmake-1.0.0.ebuild 1550 BLAKE2B f7291cb44642ac0e86c2b0cbcc8c8e72b8cd46b7e8930e50e96688a8edb0ee8f3f839680ebd43860ae41d4b4bd01b2d8c526b5e25a1862921bc024021e3ff902 SHA512 7c9b2a8d6e20a0ff524bc686c704896ad7c7030068e9f890c9920238b8c4c6a5eee946ba6e25a9c35ccc832652f8c60736d7df05acefbf1f9ec07a44f19857f9
+EBUILD ament_cmake-1.0.1.ebuild 1550 BLAKE2B f7291cb44642ac0e86c2b0cbcc8c8e72b8cd46b7e8930e50e96688a8edb0ee8f3f839680ebd43860ae41d4b4bd01b2d8c526b5e25a1862921bc024021e3ff902 SHA512 7c9b2a8d6e20a0ff524bc686c704896ad7c7030068e9f890c9920238b8c4c6a5eee946ba6e25a9c35ccc832652f8c60736d7df05acefbf1f9ec07a44f19857f9
 EBUILD ament_cmake-9999.ebuild 1550 BLAKE2B f7291cb44642ac0e86c2b0cbcc8c8e72b8cd46b7e8930e50e96688a8edb0ee8f3f839680ebd43860ae41d4b4bd01b2d8c526b5e25a1862921bc024021e3ff902 SHA512 7c9b2a8d6e20a0ff524bc686c704896ad7c7030068e9f890c9920238b8c4c6a5eee946ba6e25a9c35ccc832652f8c60736d7df05acefbf1f9ec07a44f19857f9
 MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
diff --git a/ros-meta/ament_cmake/ament_cmake-1.0.1.ebuild b/ros-meta/ament_cmake/ament_cmake-1.0.1.ebuild
new file mode 100644
index 000000000000..960565dee0ad
--- /dev/null
+++ b/ros-meta/ament_cmake/ament_cmake-1.0.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit cmake python-r1
+
+ROS_PN="ament_cmake"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ament/ament_cmake"
+	SRC_URI=""
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz"
+	S="${WORKDIR}/${ROS_PN}-${PV}/${PN}"
+fi
+
+DESCRIPTION="The entry point package for the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_cmake"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE=""
+
+DEPEND="
+	dev-ros/ament_cmake_core
+	dev-ros/ament_cmake_export_definitions
+	dev-ros/ament_cmake_export_dependencies
+	dev-ros/ament_cmake_export_include_directories
+	dev-ros/ament_cmake_export_interfaces
+	dev-ros/ament_cmake_export_libraries
+	dev-ros/ament_cmake_export_link_flags
+	dev-ros/ament_cmake_export_targets
+	dev-ros/ament_cmake_libraries
+	dev-ros/ament_cmake_python
+	dev-ros/ament_cmake_target_dependencies
+	dev-ros/ament_cmake_test[${PYTHON_USEDEP}]
+	dev-ros/ament_cmake_version
+	${PYTHON_DEPS}
+
+	dev-python/ament_package[${PYTHON_USEDEP}]
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+"
+# Last batch of deps above are transitive (from ament_cmake_core) but we need this to propagate proper deps
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	python_setup
+	cmake_src_configure
+}
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index a0154d513f37..4c7f9b88e8d6 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/bwa/Manifest b/sci-biology/bwa/Manifest
index ff09184da36d..251ea4a9b645 100644
--- a/sci-biology/bwa/Manifest
+++ b/sci-biology/bwa/Manifest
@@ -1,5 +1,5 @@
-AUX bwa-0.7.15-Makefile.patch 933 BLAKE2B f62d9b7f8c55ed55f9d6b63628ddc89077e8e01bb2c99e1c215374fd05114e2007ada0867d629c0b9edf2a700299dc6ad1bc736e5b0a2ae143695c03625d5532 SHA512 d76d6aac355b2ad52d3aa1ca59defc33017cfbdcec96939db4807acf7f35d6bcd4e21728998fb0fd3633742cfd9edaa7b62ab1eaff26829296967fefdbc185b4
-AUX bwa-0.7.16a-gcc-10.patch 126 BLAKE2B 366d380329b7e4317c3145b5f3b0ed5aed00383ffd839129955a5c9c6e24473b1d655f0322eba94d5d35dd635b9bc8f739e3515f05d9e915cdf172a838429b54 SHA512 93e357c616666004c332a9cc425c5b57bd1a72accd0ce5ed111847cfa3b4f3125d65907919e3b792dd58061677a4f66b0413039b040d9e911e75b8fecf370db0
-DIST bwa-0.7.16a.tar.bz2 190773 BLAKE2B e1064381b6b1aa4c9b78d12222c7b783a55676a163b94ad8596a2af64c9b0d60bbebd8e840aaa13b25e1ca4f10466c2c39c99830f1ca58e558d724d1ad583944 SHA512 8bbe223f79efd328d66adb88baf995e894f5944aad912ac1b464dc84dc9b4e22ddf77b60dcbe468e0eedc344ee58d08dc498777f0d2794a2c1e0ddd33dad606d
-EBUILD bwa-0.7.16a.ebuild 699 BLAKE2B 3dbbd9aa120126cf4856fe2ee361e025d176545b52dfdd643f945d99146ad73ec2d1b4ea8a51fc8724c2ea441b50f0525cf9ffcde74d3a6aac26a1cbb6a5a366 SHA512 40cfd075cb3514217bcf35481e76336d13b45ebd3622c8ffe697e63bf73fab5891542bc02313a9b1114827e5e59cede785bc7c248c75b6659c1d7589b0aabd76
+AUX bwa-0.7.17-Makefile.patch 1341 BLAKE2B 21b566233ab5838174648a5316bc0c05ede4e3b6ecc1e8761556810d0c5bf5f026677fe8836ea397630f2c1d7ad45624bb6c5c26724fe1d072c9cd77889ae3c0 SHA512 0c4679d79c04ebcb8d86d7dc276cef390cd5260a08b37d7735b40d3aede634e3d98a8834154d3cf23903cf999abb00cf06661f912f6ada6d53f1242be7d1c140
+AUX bwa-0.7.17-gcc-10.patch 228 BLAKE2B c80d2fb9f1414705881178983227d762920051597edc99cca194a041b7d4dfec4d925b872448478804fbefa6881b58851e8d1a35a24b0efbc405b72f5f31cd62 SHA512 32bb9732ab9971bf26ecdaec9d512470bc970c26d1a928edb88957a4216cad1e650f0df2b69ab0214392503bbd483eade1212ed3e799393fa076b3ecdc5d5427
+DIST bwa-0.7.17.tar.gz 232593 BLAKE2B fa48aad72a47547d66c767e2e2a5aadfcfc7c77c517410812230f51a2222ee66bb04383b068036b696af0a57b04b35e97bed11e3c44793aa899a8c0807f3df5e SHA512 114e61b7cc5edcb67172d1eca7be1fa670ea33dd48b5c02c98318e254871363775c0dab327fd7ee7023200a5fedc745fa01cbe0fd9550d783f091d4df6926f48
+EBUILD bwa-0.7.17.ebuild 751 BLAKE2B b46e83d917a259affadb85c333c69821af7d54070409c5119e0d10c1a3e6136fd8fb8118f18b0e1525985b21d5d61fa00ecb3988403c42a4fd02eea5513eb5f7 SHA512 fb8c1d63bcb526c37795fa315dd4bbb8ffeb2bd6634f43ac82e1352416ffddddd44e38fcd7ec0a0608fd33143176618a418cbeb5b346f12e64172f071cf00d0d
 MISC metadata.xml 348 BLAKE2B f6e4a9e3beee19fa7b231fdf89cbed2f0bcb96eddb8e7be4d47b0f6f78253ad747e89f803edc5b929536c02993b654af5933c1d4470284484d83c6724b38656e SHA512 512439b23a870d55169998b035a6f9d8a10c0746c7e20d1f969a11a7b98eef297e71fc8fdf600a20f321e1f95a2c763d3e98ff4f089952eec38138ebf0291c6a
diff --git a/sci-biology/bwa/bwa-0.7.16a.ebuild b/sci-biology/bwa/bwa-0.7.16a.ebuild
deleted file mode 100644
index b29bf210169a..000000000000
--- a/sci-biology/bwa/bwa-0.7.16a.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Burrows-Wheeler Alignment Tool, a fast short genomic sequence aligner"
-HOMEPAGE="https://bio-bwa.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bio-bwa/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-
-RDEPEND="dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.15-Makefile.patch
-	"${FILESDIR}"/${PN}-0.7.16a-gcc-10.patch
-)
-DOCS=( NEWS.md README-alt.md README.md )
-
-src_configure() {
-	tc-export CC AR
-}
-
-src_install() {
-	dobin bwa
-
-	exeinto /usr/libexec/${PN}
-	doexe qualfa2fq.pl xa2multi.pl
-
-	einstalldocs
-	doman bwa.1
-}
diff --git a/sci-biology/bwa/bwa-0.7.17.ebuild b/sci-biology/bwa/bwa-0.7.17.ebuild
new file mode 100644
index 000000000000..3da06fd74f92
--- /dev/null
+++ b/sci-biology/bwa/bwa-0.7.17.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Burrows-Wheeler Alignment Tool, a fast short genomic sequence aligner"
+HOMEPAGE="https://github.com/lh3/bwa/"
+SRC_URI="https://github.com/lh3/bwa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.17-Makefile.patch
+	"${FILESDIR}"/${PN}-0.7.17-gcc-10.patch
+)
+DOCS=( NEWS.md README-alt.md README.md )
+
+src_configure() {
+	tc-export CC AR
+}
+
+src_install() {
+	dobin bwa
+
+	exeinto /usr/libexec/${PN}
+	doexe qualfa2fq.pl xa2multi.pl
+
+	einstalldocs
+	doman bwa.1
+}
diff --git a/sci-biology/bwa/files/bwa-0.7.15-Makefile.patch b/sci-biology/bwa/files/bwa-0.7.15-Makefile.patch
deleted file mode 100644
index 39b437a02897..000000000000
--- a/sci-biology/bwa/files/bwa-0.7.15-Makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- bwa-0.7.13/Makefile
-+++ bwa-0.7.13/Makefile
-@@ -1,8 +1,8 @@
--CC=			gcc
-+CC?=			gcc
- #CC=			clang --analyze
--CFLAGS=		-g -Wall -Wno-unused-function -O2
-+CFLAGS?=		-g -Wall -Wno-unused-function -O2
- WRAP_MALLOC=-DUSE_MALLOC_WRAPPERS
--AR=			ar
-+AR?=			ar
- DFLAGS=		-DHAVE_PTHREAD $(WRAP_MALLOC)
- LOBJS=		utils.o kthread.o kstring.o ksw.o bwt.o bntseq.o bwa.o bwamem.o bwamem_pair.o bwamem_extra.o malloc_wrap.o
- AOBJS=		QSufSort.o bwt_gen.o bwashm.o bwase.o bwaseqio.o bwtgap.o bwtaln.o bamlite.o \
-@@ -26,10 +26,10 @@
- all:$(PROG)
- 
- bwa:libbwa.a $(AOBJS) main.o
--		$(CC) $(CFLAGS) $(DFLAGS) $(AOBJS) main.o -o $@ -L. -lbwa $(LIBS)
-+		$(CC) $(CFLAGS) $(LDFLAGS) $(DFLAGS) $(AOBJS) main.o -o $@ -L. -lbwa $(LIBS)
- 
- bwamem-lite:libbwa.a example.o
--		$(CC) $(CFLAGS) $(DFLAGS) example.o -o $@ -L. -lbwa $(LIBS)
-+		$(CC) $(CFLAGS) $(LDFLAGS) $(DFLAGS) example.o -o $@ -L. -lbwa $(LIBS)
- 
- libbwa.a:$(LOBJS)
- 		$(AR) -csru $@ $(LOBJS)
diff --git a/sci-biology/bwa/files/bwa-0.7.16a-gcc-10.patch b/sci-biology/bwa/files/bwa-0.7.16a-gcc-10.patch
deleted file mode 100644
index 40056ffeaaa9..000000000000
--- a/sci-biology/bwa/files/bwa-0.7.16a-gcc-10.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/rle.h
-+++ b/rle.h
-@@ -32,3 +32,3 @@ extern "C" {
- 
--const uint8_t rle_auxtab[8];
-+extern const uint8_t rle_auxtab[8];
- 
diff --git a/sci-biology/bwa/files/bwa-0.7.17-Makefile.patch b/sci-biology/bwa/files/bwa-0.7.17-Makefile.patch
new file mode 100644
index 000000000000..944369cb75e2
--- /dev/null
+++ b/sci-biology/bwa/files/bwa-0.7.17-Makefile.patch
@@ -0,0 +1,42 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,7 @@
+-CC=			gcc
+ #CC=			clang --analyze
+-CFLAGS=		-g -Wall -Wno-unused-function -O2
++CFLAGS+=		-Wall -Wno-unused-function
+ WRAP_MALLOC=-DUSE_MALLOC_WRAPPERS
+-AR=			ar
+-DFLAGS=		-DHAVE_PTHREAD $(WRAP_MALLOC)
++CPPFLAGS+=		-DHAVE_PTHREAD $(WRAP_MALLOC)
+ LOBJS=		utils.o kthread.o kstring.o ksw.o bwt.o bntseq.o bwa.o bwamem.o bwamem_pair.o bwamem_extra.o malloc_wrap.o \
+ 			QSufSort.o bwt_gen.o rope.o rle.o is.o bwtindex.o
+ AOBJS=		bwashm.o bwase.o bwaseqio.o bwtgap.o bwtaln.o bamlite.o \
+@@ -21,16 +19,13 @@
+ 
+ .SUFFIXES:.c .o .cc
+ 
+-.c.o:
+-		$(CC) -c $(CFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@
+-
+ all:$(PROG)
+ 
+ bwa:libbwa.a $(AOBJS) main.o
+-		$(CC) $(CFLAGS) $(DFLAGS) $(AOBJS) main.o -o $@ -L. -lbwa $(LIBS)
++		$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(AOBJS) main.o -o $@ -L. -lbwa $(LIBS)
+ 
+ bwamem-lite:libbwa.a example.o
+-		$(CC) $(CFLAGS) $(DFLAGS) example.o -o $@ -L. -lbwa $(LIBS)
++		$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) example.o -o $@ -L. -lbwa $(LIBS)
+ 
+ libbwa.a:$(LOBJS)
+ 		$(AR) -csru $@ $(LOBJS)
+@@ -39,7 +34,7 @@
+ 		rm -f gmon.out *.o a.out $(PROG) *~ *.a
+ 
+ depend:
+-	( LC_ALL=C ; export LC_ALL; makedepend -Y -- $(CFLAGS) $(DFLAGS) -- *.c )
++	( LC_ALL=C ; export LC_ALL; makedepend -Y -- $(CFLAGS) $(CPPFLAGS) -- *.c )
+ 
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+ 
diff --git a/sci-biology/bwa/files/bwa-0.7.17-gcc-10.patch b/sci-biology/bwa/files/bwa-0.7.17-gcc-10.patch
new file mode 100644
index 000000000000..1babb8356c4a
--- /dev/null
+++ b/sci-biology/bwa/files/bwa-0.7.17-gcc-10.patch
@@ -0,0 +1,11 @@
+--- a/rle.h
++++ b/rle.h
+@@ -30,7 +30,7 @@
+  *** 43+3 codec ***
+  ******************/
+ 
+-const uint8_t rle_auxtab[8];
++extern const uint8_t rle_auxtab[8];
+ 
+ #define RLE_MIN_SPACE 18
+ #define rle_nptr(block) ((uint16_t*)(block))
diff --git a/sci-biology/seaview/Manifest b/sci-biology/seaview/Manifest
index 97b3063f1c7c..370ccb30d448 100644
--- a/sci-biology/seaview/Manifest
+++ b/sci-biology/seaview/Manifest
@@ -1,7 +1,5 @@
-DIST seaview_4.3.5.tar.gz 309530 BLAKE2B a4210b179bba5ab40215603738fe844d48b4f953e7b79749786afcedce0625f17c343a2d4ed2a45d4a7cfc2d4c9abbb7ab856e98405694160ecfac186f86fadd SHA512 b20c018da9a29d79fe0393fed5d29117729492ea8f36e72d4aeb98044a3de4a13331bd29e76ca552a08f6da764e57e69f9fb0325fc031551514d7a54b56c849a
 DIST seaview_4.5.4.tar.gz 420608 BLAKE2B 14b044706440da88987cd6b546595497f2de61e8d03615bfce4634104914a56544a464b0abedc83e6c96329697dccb2087c2b1af5a1fdbf0d9bdc26418a49a75 SHA512 a8a2e49a13f87ae4279311068147169b1e17874e9ce5787003b854c7271efc7a128db6916bb883a9b7b0b90f855fe40d83c77e9fd9f5751464e04346b9923301
 DIST seaview_4.6.tar.gz 424258 BLAKE2B e958ff4b1f6bb283a2122d65917a352914f33e5c9593c34c449800fbcac74b0dd4fa98bb1f47c45e11f24e07dfebb3ced54fbd8440b2bcd2b1df32dc398d5892 SHA512 e005d9dcc9e03c5636404e94f0059f7d4a9289fe77ecdab765e3ca2b59d826b8711a344f3824d079383a7ede0fe17b3b06694dfb7b709bb6a0a1e38cef6ee1d6
-EBUILD seaview-4.3.5.ebuild 2013 BLAKE2B 91c192d7cb22411f7af4366088c1e47c657fc75855cab2a289d4a1d7cec206302b2670612117334d6c6b79d25c578daf3da5cbd053dc98602ead9033c3b90f35 SHA512 41eeabeb570a22219f7ad649a4eb127b94a253f914ea6637fcce518da3607e3fb42b528d3aa436f6b86e54b695d31900b29558ec0696c1e4bf3264c42cdfc945
 EBUILD seaview-4.5.4.ebuild 2013 BLAKE2B 91c192d7cb22411f7af4366088c1e47c657fc75855cab2a289d4a1d7cec206302b2670612117334d6c6b79d25c578daf3da5cbd053dc98602ead9033c3b90f35 SHA512 41eeabeb570a22219f7ad649a4eb127b94a253f914ea6637fcce518da3607e3fb42b528d3aa436f6b86e54b695d31900b29558ec0696c1e4bf3264c42cdfc945
 EBUILD seaview-4.6.ebuild 1997 BLAKE2B 1c7c01e0a52f943b9506954d84519c8ff09b15d307476aa659f7bb49af9de1ea02076bb74bcebaac49a571d18624455879c321faa7458f8ac2660773eb4b8706 SHA512 5768df52c205ccfaa4d2d52ec753125dd77eb91a7b0be959dbc67aca00c0a66dc3f13b125d073450a81a06eea29880503981942042c77a0c6e1bb8f19f070cb8
 MISC metadata.xml 621 BLAKE2B 9c56cc2099ed696942e2958926ee8c9f24be26fd273e74a7f789d368c3a222f084363ec3a4eada5e1197c4a81f533074f4b05c43d1e9c951e66261d55bc4d9e8 SHA512 7c49694ef56359e58b76b0dd7715d28615a541655c6ccaa2d7d64041c7340082bd5026fa2baa5a15e51e3aa27309d5a72ab836a5ee554366eb324406a50a09c4
diff --git a/sci-biology/seaview/seaview-4.3.5.ebuild b/sci-biology/seaview/seaview-4.3.5.ebuild
deleted file mode 100644
index 33ee6f65ccbd..000000000000
--- a/sci-biology/seaview/seaview-4.3.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A graphical multiple sequence alignment editor"
-HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html"
-SRC_URI="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/${PN}_${PV}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+xft"
-
-CDEPEND="
-	sys-libs/zlib
-	x11-libs/fltk:1
-	x11-libs/libX11
-	xft? (
-		x11-libs/libXft
-		x11-libs/fltk:1[xft] )"
-RDEPEND="${CDEPEND}
-	sci-biology/clustalw
-	|| ( sci-libs/libmuscle sci-biology/muscle )
-	sci-biology/phyml"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# respect CXXFLAGS (package uses them as CFLAGS)
-	sed \
-		-e "s:^CC.*:CC = $(tc-getCC):" \
-		-e "s:^CXX.*:CXX = $(tc-getCXX):" \
-		-e "s:\$(OPT):${CXXFLAGS}:" \
-		-e "s:^OPT:#OPT:" \
-		-e "s:^FLTK = .*$:FLTK = ${EPREFIX}/usr/include/fltk-1:" \
-		-e "s:^#IFLTK .*:IFLTK = $(fltk-config --use-images --cflags):" \
-		-e "s:^#LFLTK .*:LFLTK = $(fltk-config --use-images --ldflags):" \
-		-e "s:^USE_XFT:#USE_XFT:" \
-		-e "s:^#HELPFILE:HELPFILE:" \
-		-e "s:/usr/share/doc/seaview/seaview.htm:${EPREFIX}/usr/share/seaview/seaview.htm:" \
-		-e "s:^#PHYMLNAME:PHYMLNAME:" \
-		-e 's:-lXinerama::g' \
-		-e 's:-lpng::g' \
-		-e 's:-ljpeg::g' \
-		-e 's:-lfontconfig::g' \
-		-i Makefile || die "sed failed while editing Makefile"
-
-	if use xft; then
-		sed \
-			-e "s:^#USE_XFT .*:USE_XFT = -DUSE_XFT $($(tc-getPKG_CONFIG) --cflags xft):" \
-			-e "s:-lXft:$($(tc-getPKG_CONFIG) --libs xft):" \
-			-i Makefile || die "sed failed while editing Makefile to enable xft"
-	else
-		sed -i -e "s:-lXft::" Makefile || die
-	fi
-}
-
-src_install() {
-	dobin seaview
-
-	# /usr/share/seaview/seaview.html is hardcoded in the binary, see Makefile
-	insinto /usr/share/seaview
-	doins example.nxs seaview.html
-
-	insinto /usr/share/seaview/images
-	doins seaview.xpm
-
-	make_desktop_entry seaview Seaview
-
-	doman seaview.1
-}
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index fe2ae16e7a21..1fecf4e508f9 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/theseus/Manifest b/sci-chemistry/theseus/Manifest
index bc633387ad18..742af600c3fc 100644
--- a/sci-chemistry/theseus/Manifest
+++ b/sci-chemistry/theseus/Manifest
@@ -1,7 +1,3 @@
-DIST theseus_2.0.6.tar.gz 1257560 BLAKE2B 80115f5ace6fe306b10254f9a7b889e5bc61afbd3cff4941953b9a82750ce1b36ac5724a94fd7e7892622684d7e5bf6ae9ed7c96d76364329d756114efbe1dd0 SHA512 70604c468eb841b92e77a3e91cd57120b96c171512fb1cc31a407b7c4816150dfa31ec123fb9568a842e623f3252c60df0dc53d40fa2a4aece6e3c77039f4696
-DIST theseus_3.0.0.tar.gz 1213574 BLAKE2B 17021c7d36b3ac3d8e7f84bbe2614523d461a3877bca4b20b6891b67de02b0d02376e695f0db813e8f598f7dee32076548444defc30b016588b70be14cf3f308 SHA512 251e6273624126406609691e1205d9693c18dcbc8c81e10c77101ac4a1b6bdffcb56a47fd5fdc7ed6ed4fa107c2ed26b03a1780f951f9cc69a25c0722996e7b2
 DIST theseus_3.3.0.tar.gz 22548124 BLAKE2B 0ad49f768e1584bf40e90ff6fd0d884b6b27ee59ad31ce75050293b817a3747969ab0c4b4ff982aadbdc5301c1c56522540b78aab045e841c099a80dd546c8e9 SHA512 1fba3e8019a40214defdae13d4721d170ee698337d8efd4e872af22f8ab3cb1fdd52fa9f19a858ee51bc98150692af0c6016033feb0d76f29acaf7fffbb430e2
-EBUILD theseus-2.0.6.ebuild 1449 BLAKE2B 8d6282e40e0cb06a26171e11fa220dbf00e28ec682e1ebb97bdb13658b1e661cff2f31d88a3251dbd8664ad44e9d19b0624d80b5372c02827d10a28021dc2683 SHA512 35fce318510a70da251151061013e52dc0c16b0bdb8aed4ecd1dca2deb53a662290d4700a5df3bfa755c785e8b481cdd7f83a2263a3823823261044079e69a26
-EBUILD theseus-3.0.0.ebuild 1499 BLAKE2B 23e60b603438314d0a5068651cfbbe6a9eeec9569a276ca9695eb4a24a5969ee798265085023c734038aabea515f5c9f6b49876569428da10ad08a62ac5a6327 SHA512 edbe86d80416fa9256b26ee95ae77e3973b2cd171e3a6ab02976127b8dfaa7541a1f35f1500afcc7200140a54bc22309bcbeaaa341b5032e6549fb5e85bfdfda
 EBUILD theseus-3.3.0.ebuild 1499 BLAKE2B 23e60b603438314d0a5068651cfbbe6a9eeec9569a276ca9695eb4a24a5969ee798265085023c734038aabea515f5c9f6b49876569428da10ad08a62ac5a6327 SHA512 edbe86d80416fa9256b26ee95ae77e3973b2cd171e3a6ab02976127b8dfaa7541a1f35f1500afcc7200140a54bc22309bcbeaaa341b5032e6549fb5e85bfdfda
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-chemistry/theseus/theseus-2.0.6.ebuild b/sci-chemistry/theseus/theseus-2.0.6.ebuild
deleted file mode 100644
index 7c3f3783602c..000000000000
--- a/sci-chemistry/theseus/theseus-2.0.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Maximum likelihood superpositioning and analysis of macromolecular structures"
-HOMEPAGE="http://www.theseus3d.org/"
-SRC_URI="http://www.theseus3d.org/src/${PN}_${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	sci-libs/gsl
-	|| (
-		sci-biology/muscle
-		sci-biology/probcons
-		sci-biology/mafft
-		sci-biology/t-coffee
-		sci-biology/kalign
-		sci-biology/clustalw:2
-		)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${PN}_src/
-
-src_prepare() {
-	cat >> make.inc <<- EOF
-	ARCH = $(tc-getAR)
-	ARCHFLAGS = -rvs
-	RANLIB = $(tc-getRANLIB)
-	LOCALLIBDIR = "${EPREFIX}/usr/$(get_libdir)
-	SYSLIBS = $(pkg-config --libs gsl) -lpthread
-	LIBS = -ldistfit -lmsa -ldssplite -ldltmath -lDLTutils -ltheseus
-	LIBDIR = -L./lib
-	INSTALLDIR = "${ED}"/usr/bin
-	OPT =
-	WARN =
-	CFLAGS = ${CFLAGS} \$(WARN)
-	CC = $(tc-getCC)
-	EOF
-
-	sed \
-		-e 's|theseus:|theseus: libs|g' \
-		-e '/-o theseus/s:$(CC):$(CC) ${LDFLAGS}:g' \
-		-i Makefile || die
-
-	sed \
-		-e 's:/usr/bin/sed:sed:g' \
-		-e "s:/usr/local/bin/:/usr/bin/:g" \
-		-e "s:/usr/bin/:${EPREFIX}/usr/bin/:g" \
-		-i theseus_align || die
-}
-
-src_install() {
-	dobin theseus theseus_align
-	dodoc theseus_man.pdf README AUTHORS
-	use examples && insinto /usr/share/${PN} && doins -r examples
-}
diff --git a/sci-chemistry/theseus/theseus-3.0.0.ebuild b/sci-chemistry/theseus/theseus-3.0.0.ebuild
deleted file mode 100644
index 583bdf1e28c5..000000000000
--- a/sci-chemistry/theseus/theseus-3.0.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Maximum likelihood superpositioning and analysis of macromolecular structures"
-HOMEPAGE="http://www.theseus3d.org/"
-SRC_URI="http://www.theseus3d.org/src/${PN}_${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	sci-libs/gsl
-	|| (
-		sci-biology/muscle
-		sci-biology/probcons
-		sci-biology/mafft
-		sci-biology/t-coffee
-		sci-biology/kalign
-		sci-biology/clustalw:2
-		)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${PN}_src/
-
-src_prepare() {
-	cat >> make.inc <<- EOF
-	ARCH = $(tc-getAR)
-	ARCHFLAGS = -rvs
-	RANLIB = $(tc-getRANLIB)
-	LOCALLIBDIR = "${EPREFIX}/usr/$(get_libdir)
-	SYSLIBS = $(pkg-config --libs gsl) -lpthread
-	LIBS = -ldistfit -lmsa -ldssplite -ldltmath -lDLTutils -ltheseus
-	LIBDIR = -L./lib
-	INSTALLDIR = "${ED}"/usr/bin
-	OPT =
-	WARN =
-	CFLAGS = ${CFLAGS} -std=c11 \$(WARN)
-	CC = $(tc-getCC)
-	EOF
-
-	sed \
-		-e 's|theseus:|theseus: libs|g' \
-		-e '/-o theseus/s:$(CC):$(CC) ${LDFLAGS}:g' \
-		-i Makefile || die
-
-	sed \
-		-e 's:/usr/bin/sed:sed:g' \
-		-e "s:/usr/local/bin/:/usr/bin/:g" \
-		-e "s:/usr/bin/:${EPREFIX}/usr/bin/:g" \
-		-i theseus_align || die
-}
-
-src_compile() {
-	emake ltheseus
-	default
-}
-
-src_install() {
-	dobin theseus theseus_align
-	dodoc theseus_man.pdf README AUTHORS
-	use examples && insinto /usr/share/${PN} && doins -r examples
-}
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index d9163127f214..5584e3b1e4cc 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -1,6 +1,7 @@
 AUX vmd-1.9.4-gentoo-paths.patch 11523 BLAKE2B 3e02c73b49a3686ce00deb44f4bca0809c527a53d7fb13315c5799c5e9fe1d8ada9664452e41f49ad084abed96d2e5a6d01b000e49393e97eeb5fb2378af888f SHA512 da8e723d12ca7728d67dffcd0bf2e9c856764917d3f3ef07756febbc981bae20b061e0ead3fa617de18b94918d855c09f68c24a979c6f9f0cdea12b343a22756
+AUX vmd-1.9.4-gentoo-plugins.patch 24618 BLAKE2B 6fbcf2e3bb59765e0980a5ed46f02e29d7b72a313865849c15891f2398d2aaf9afe6069f993a61257572d031556ce523c622858e29611ca6795be6030f4bb186 SHA512 9b8675811992d6392e9ec49cdcbcfd0da99dce1e164be4f8bf9bd07e0582b6b1e1d25f3e90fbc91cad7f94984bd091e644713c136628d0e4cc60e782a855fb63
 AUX vmd-1.9.4-tmpdir.patch 398 BLAKE2B cf61240688f111d4763f458f0e10319a8154c5427172ba99d4bcfc7a9d8fd559fe7777c1ff703f81b68b2f10ec2a8c4af5cf61fd91d147aec2f4fafcf6753c82 SHA512 c5f96b3ef880ccdcf86d3927308c85aeaf3260ed0e54d60cbf186a0d63f6a88da16e49b14d6815d97bfd1ff4500bf9ce99d183d26ee78b67fed388e2217a7f10
 DIST vmd-1.9.3-gentoo-patches.tar.xz 14804 BLAKE2B 64e5df40ed88c23c924d32636495f0383590f91dbb714e64c73551072bb50d72b4e5f188fb2da58d32e84b4bc96ff0297d7ff1bf02b0481198901c4e12e4ee59 SHA512 5d506d4df5ca4a3edb33d77aeeb440fcb4750a250c77103b99f385f356eb9d71d954173b981d3a50f7a714cfc872587e5040868904e50fa1f6fd69d7e4d9f1b1
 DIST vmd-1.9.4a43.src.tar 123955200 BLAKE2B a99ee2bce1024613ad951fc97f4cd4b6f6ad114aea67a0a6644f687c69eae488eb862fd5ea5bff31e12f01a95f6f60be04dad2a82879603b9b457443267bb18f SHA512 3e3d5d7b0d220f070d4978940ff5ab8af531e507a224cdd15e4871e263de64b4ba24e9d964cb680b31f376afbdc08f46cb4070e3cd4a474b9bfe0732c7b3cff0
-EBUILD vmd-1.9.4_alpha43.ebuild 7643 BLAKE2B 298be7052331709d194263c557558bbf0ca66936f460dcb1ac7aeb59add81519a856bdc61d61ab1ad216f5da199435eefb515a14cab59378a052bf8ae4bf6bce SHA512 4b504629e6d784d1da6ccf7db9f5a14da4b00869705851f3842c7d6f07cd0ac4ee45125c779b91862cceea54836eb06e84773098d3113a0d0b856fbb775ff07e
+EBUILD vmd-1.9.4_alpha43.ebuild 7910 BLAKE2B 79a150dca7841f97bbc47c75f30f99a9c88dca284655ecf54ad328516ae6207b4bc800d6de3584c4e14b30b7789562c14a9c46c49d99b15567e14612ccbfbe3f SHA512 63393f786285588f970f2e817145b77f93c0d62c3e87e2b83e7edd52a168f2556fcec14c8ce06c67e521e8b92d04470bbdfd143f505acc8a6b64f457ca24107a
 MISC metadata.xml 778 BLAKE2B 6c4202950f57a4d7a3004e966c761325a0a31ab19fe06a6bd69882bd685e41424953104ff653c03d6cbbcb60bb9aba45fbcec43cd228c4bb57fcb1c63a2bd881 SHA512 b967b71fb9f1b47a9d3b69e6958dfb0314a9f071dade7ed1876e91dfa73188748faf11ef832d240a71745b36a30422bde79de2e9ff8e5ec6b6da4b11b40d19c9
diff --git a/sci-chemistry/vmd/files/vmd-1.9.4-gentoo-plugins.patch b/sci-chemistry/vmd/files/vmd-1.9.4-gentoo-plugins.patch
new file mode 100644
index 000000000000..c6ea769932f3
--- /dev/null
+++ b/sci-chemistry/vmd/files/vmd-1.9.4-gentoo-plugins.patch
@@ -0,0 +1,604 @@
+From c33a68684cd06424ec78c6983f93336109d91cb5 Mon Sep 17 00:00:00 2001
+From: Stefan Kuczera <stefan.ku@yahoo.com>
+Date: Sat, 21 Jan 2017 13:20:45 +0100
+Subject: [PATCH] Squashed patches
+
+---
+ plugins/Make-arch               |   3 +-
+ plugins/Makefile                |  20 +++---
+ plugins/autopsf/Makefile        |   4 +-
+ plugins/catdcd/Makefile         |   4 +-
+ plugins/cionize/Makefile        |   6 +-
+ plugins/clustalw/Makefile       |   2 +-
+ plugins/cluster/Makefile        |   2 +-
+ plugins/hesstrans/Makefile      |   2 +-
+ plugins/libbiokit/Makefile      |  14 ++--
+ plugins/molfile_plugin/Makefile | 144 ++++++++++++++++++++--------------------
+ plugins/phylotree/Makefile      |   2 +-
+ plugins/rnaview/Makefile        |   2 +-
+ plugins/stamp/Makefile          |   2 +-
+ 13 files changed, 105 insertions(+), 102 deletions(-)
+
+diff --git a/plugins/Make-arch b/plugins/Make-arch
+index 19d2b6c..937ad9e 100755
+--- a/plugins/Make-arch
++++ b/plugins/Make-arch
+@@ -313,7 +313,8 @@ LINUX:
+ 	"AR = ar" \
+ 	"NM = nm -p" \
+ 	"RANLIB = touch" \
+-	"SHLD = gcc -shared"
++	"SHLD = gcc -shared" \
++	"SHXXLD = g++ -shared"
+ 	
+ LINUXALPHA:
+ 	$(MAKE) dynlibs staticlibs bins \
+diff --git a/plugins/Makefile b/plugins/Makefile
+index 0fee349..6b07606 100755
+--- a/plugins/Makefile
++++ b/plugins/Makefile
+@@ -150,25 +150,27 @@ distrib:
+ 
+ include Make-arch
+ 
+-molfilelibs:
+-	cd molfile_plugin; $(MAKE) dynlibs && cd .. || exit 1
+-	cd molfile_plugin; $(MAKE) staticlibs && cd .. || exit 1
++molfilelibs_static:
++	$(MAKE) -C molfile_plugin staticlibs
++
++molfilelibs_dyn:
++	$(MAKE) -C molfile_plugin dynlibs
+ 
+ win32molfilelibs:
+ 	cd molfile_plugin; $(MAKE) dynlibs && cd .. || exit 1
+ 	cd molfile_plugin; $(MAKE) win32staticlibs && cd .. || exit 1
+ 
+-dynlibs: molfilelibs
+-	for dir in $(BUILDDIRS); do cd $$dir && $(MAKE) dynlibs && cd .. || exit 1 ; done
++dynlibs: molfilelibs_dyn
++	for dir in $(BUILDDIRS); do $(MAKE) -C $$dir dynlibs; done
+ 
+-staticlibs: molfilelibs
+-	for dir in $(BUILDDIRS); do cd $$dir && $(MAKE) staticlibs && cd .. || exit 1 ; done
++staticlibs: molfilelibs_static
++	for dir in $(BUILDDIRS); do $(MAKE) -C $$dir staticlibs; done
+ 
+ win32staticlibs: win32molfilelibs
+ 	for dir in $(BUILDDIRS); do cd $$dir && $(MAKE) win32staticlibs && cd .. || exit 1 ; done
+ 
+-bins:
+-	for dir in molfile_plugin $(BUILDDIRS); do cd $$dir && $(MAKE) bins && cd .. || exit 1 ; done
++bins: molfilelibs_dyn
++	for dir in $(BUILDDIRS); do $(MAKE) -C $$dir bins; done
+ 
+ win32bins:
+ 	for dir in molfile_plugin $(BUILDDIRS); do cd $$dir && $(MAKE) win32bins && cd .. || exit 1 ; done
+diff --git a/plugins/autopsf/Makefile b/plugins/autopsf/Makefile
+index 3b35d10..8e1527e 100644
+--- a/plugins/autopsf/Makefile
++++ b/plugins/autopsf/Makefile
+@@ -49,8 +49,8 @@ AUTOPSFOBJS=${ARCHDIR}/psfatom.o  \
+ 
+ ${ARCHDIR}/psfcheck.so : ${AUTOPSFOBJS}
+ 	if [ -n "${TCLSHLD}" ]; \
+-	then ${TCLSHLD} $(LOPTO)$@ ${AUTOPSFOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
+-	else ${SHLD} $(LOPTO)$@ ${AUTOPSFOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
++	then ${TCLSHLD} ${LDFLAGS} $(LOPTO)$@ ${AUTOPSFOBJS} ${TCLLIB} ${TCLLDFLAGS}; \
++	else ${SHXXLD} ${LDFLAGS} $(LOPTO)$@ ${AUTOPSFOBJS} ${TCLLIB} ${TCLLDFLAGS}; \
+ 	fi
+ 
+ ${ARCHDIR}/psfatom.o : psfatom.h psfatom.C
+diff --git a/plugins/catdcd/Makefile b/plugins/catdcd/Makefile
+index d6c58c5..1637a3c 100644
+--- a/plugins/catdcd/Makefile
++++ b/plugins/catdcd/Makefile
+@@ -45,8 +45,8 @@ ${ARCHDIR}/catdcd.exe : ${CATDCDOBJS} ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfi
+ 	LINK ${CATDCDOBJS} /OUT:${ARCHDIR}/catdcd.exe /LIBPATH:${COMPILEDIR}/lib_${ARCH}/molfile libmolfile_plugin.lib ${TCLLIB} ${TCLLDFLAGS} ${NETCDFLIB} ${NETCDFLDFLAGS} ${EXPATLIB} ${EXPATLDFLAGS} ${SQLITELIB} ${SQLITELDFLAGS}
+ 
+ # all other platforms
+-${ARCHDIR}/catdcd : ${CATDCDOBJS} ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfile_plugin.a
+-	${CXX} ${CXXFLAGS} ${CATDCDOBJS} -o ${ARCHDIR}/catdcd -L${COMPILEDIR}/lib_${ARCH}/molfile -lmolfile_plugin ${TCLLIB} ${TCLLDFLAGS} ${NETCDFLIB} ${NETCDFLDFLAGS} ${EXPATLIB} ${EXPATLDFLAGS} ${SQLITELIB} ${SQLITELDFLAGS} -lm
++${ARCHDIR}/catdcd : ${CATDCDOBJS} ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfile_plugin.a ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfile_plugin.h
++	${CXX} ${LDFLAGS} ${CXXFLAGS} ${CATDCDOBJS} -o ${ARCHDIR}/catdcd -L${COMPILEDIR}/lib_${ARCH}/molfile -lmolfile_plugin ${TCLLIB} ${TCLLDFLAGS} ${NETCDFLIB} ${NETCDFLDFLAGS} ${EXPATLIB} ${EXPATLDFLAGS} ${SQLITELIB} ${SQLITELDFLAGS} -lm
+ 
+ ${ARCHDIR}/hash.o: hash.h hash.c
+ 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${SRCDIR}/hash.c $(COPTO)${ARCHDIR}/hash.o
+diff --git a/plugins/cionize/Makefile b/plugins/cionize/Makefile
+index bcb2510..e02241b 100644
+--- a/plugins/cionize/Makefile
++++ b/plugins/cionize/Makefile
+@@ -52,8 +52,8 @@ ${ARCHDIR}/cionize.exe : ${IONIZEOBJS} ${MGPOTOBJS} ${ARCHDIR}/cionize.o ${COMPI
+ 	LINK ${IONIZEOBJS} ${MGPOTOBJS} /OUT:${ARCHDIR}/cionize.exe /LIBPATH:${COMPILEDIR}/lib_${ARCH}/molfile libmolfile_plugin.lib ${TCLLIB} ${TCLLDFLAGS} ${NETCDFLIB} ${NETCDFLDFLAGS} ${EXPATLIB} ${EXPATLDFLAGS} ${SQLITELIB} ${SQLITELDFLAGS}
+ 
+ # all other platforms
+-${ARCHDIR}/cionize: ${IONIZEOBJS} ${MGPOTOBJS} ${ARCHDIR}/cionize.o ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfile_plugin.a
+-	${CXX} ${CXXFLAGS} ${ARCHDIR}/cionize.o ${IONIZEOBJS} ${MGPOTOBJS} -o ${ARCHDIR}/cionize -L${COMPILEDIR}/lib_${ARCH}/molfile -lmolfile_plugin ${TCLLIB} ${TCLLDFLAGS} ${NETCDFLIB} ${NETCDFLDFLAGS} ${EXPATLIB} ${EXPATLDFLAGS} ${SQLITELIB} ${SQLITELDFLAGS} -lm
++${ARCHDIR}/cionize: ${IONIZEOBJS} ${MGPOTOBJS} ${ARCHDIR}/cionize.o ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfile_plugin.a  ${COMPILEDIR}/lib_${ARCH}/molfile/libmolfile_plugin.h
++	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/cionize.o ${IONIZEOBJS} ${MGPOTOBJS} -o ${ARCHDIR}/cionize -L${COMPILEDIR}/lib_${ARCH}/molfile -lmolfile_plugin ${TCLLIB} ${TCLLDFLAGS} ${NETCDFLIB} ${NETCDFLDFLAGS} ${EXPATLIB} ${EXPATLDFLAGS} ${SQLITELIB} ${SQLITELDFLAGS} -lm
+ 
+ ${ARCHDIR}/hash.o: hash.h hash.c
+ 	${CC}  ${CCFLAGS} ${INCDIR} -c ${SRCDIR}/hash.c $(COPTO)${ARCHDIR}/hash.o
+@@ -66,7 +66,7 @@ ${ARCHDIR}/util.o: util.h util.c
+ 
+ ${ARCHDIR}/getplugins.o: getplugins.h getplugins.c
+ 	${CC}  ${CCFLAGS} ${INCDIR} -c ${SRCDIR}/getplugins.c $(COPTO)${ARCHDIR}/getplugins.o
+-	
++
+ ${ARCHDIR}/energythr.o: energythr.h energythr.c ${ARCHDIR}/util.o ${ARCHDIR}/threads.o
+ 	${CC}  ${CCFLAGS} ${INCDIR} -c ${SRCDIR}/energythr.c $(COPTO)${ARCHDIR}/energythr.o
+ 
+diff --git a/plugins/clustalw/Makefile b/plugins/clustalw/Makefile
+index 6329f64..3443720 100644
+--- a/plugins/clustalw/Makefile
++++ b/plugins/clustalw/Makefile
+@@ -66,7 +66,7 @@ OBJS = ${ARCHDIR}/alnscore.o \
+ ${ARCHDIR}/clustalw.exe: ${OBJS}
+ 	LINK ${OBJS} /OUT:${ARCHDIR}/clustalw.exe
+ ${ARCHDIR}/clustalw: ${OBJS}
+-	${CC} ${CCFLAGS} ${OBJS} -o ${ARCHDIR}/clustalw -lm
++	${CC} ${LDFLAGS} ${CCFLAGS} ${OBJS} -o ${ARCHDIR}/clustalw -lm
+     
+     
+ # Objects.
+diff --git a/plugins/cluster/Makefile b/plugins/cluster/Makefile
+index 99d347e..c2d30ae 100644
+--- a/plugins/cluster/Makefile
++++ b/plugins/cluster/Makefile
+@@ -48,7 +48,7 @@ ${ARCHDIR}/cluster.exe : ${OBJS}
+ 
+ # all other platforms
+ ${ARCHDIR}/cluster : ${OBJS}
+-	${CXX} ${CXXFLAGS} ${OBJS} -o ${ARCHDIR}/cluster -lm
++	${CXX} ${LDFLAGS} ${CXXFLAGS} ${OBJS} -o ${ARCHDIR}/cluster -lm
+ 
+ ${ARCHDIR}/cluster.o: ${SRCDIR}/cluster.c
+ 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${SRCDIR}/cluster.c $(COPTO)${ARCHDIR}/cluster.o
+diff --git a/plugins/hesstrans/Makefile b/plugins/hesstrans/Makefile
+index 76ee306..db46b82 100644
+--- a/plugins/hesstrans/Makefile
++++ b/plugins/hesstrans/Makefile
+@@ -85,7 +85,7 @@ HESSTRANSOBJS=${ARCHDIR}/newmat1.o \
+ ${ARCHDIR}/hesstrans.so : ${HESSTRANSOBJS}
+ 	if [ -n "${TCLSHLD}" ]; \
+ 	then ${TCLSHLD} $(LOPTO)$@ ${HESSTRANSOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
+-	else ${SHLD} $(LOPTO)$@ ${HESSTRANSOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
++	else ${SHXXLD} $(LOPTO)$@ ${HESSTRANSOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
+ 	fi
+ 
+ 
+diff --git a/plugins/libbiokit/Makefile b/plugins/libbiokit/Makefile
+index 7a66d08..da764dd 100644
+--- a/plugins/libbiokit/Makefile
++++ b/plugins/libbiokit/Makefile
+@@ -98,7 +98,7 @@ OBJS = ${DYNLIBOBJS} \
+ ${ARCHDIR}/tcl_libbiokit.so : ${ARCHDIR}/tcl_libbiokit_wrap.o ${ARCHDIR}/tcl_libbiokit.o ${DYNLIBOBJS}
+ 	if [ -n "${TCLSHLD}" ]; \
+ 	then ${TCLSHLD} $(LOPTO)$@ ${ARCHDIR}/tcl_libbiokit_wrap.o ${ARCHDIR}/tcl_libbiokit.o ${DYNLIBOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
+-	else ${SHLD} $(LOPTO)$@ ${ARCHDIR}/tcl_libbiokit_wrap.o ${ARCHDIR}/tcl_libbiokit.o ${DYNLIBOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
++	else ${SHXXLD} $(LOPTO)$@ ${ARCHDIR}/tcl_libbiokit_wrap.o ${ARCHDIR}/tcl_libbiokit.o ${DYNLIBOBJS} ${TCLLIB} ${TCLLDFLAGS} ${LDFLAGS}; \
+ 	fi
+ ${ARCHDIR}/tcl_libbiokit_wrap.o : ${INTERFACESRCDIR}/tcl_libbiokit_wrap.cpp
+ 	${CXX} ${CXXFLAGS} ${TCLINC} ${INCDIR} -c ${INTERFACESRCDIR}/tcl_libbiokit_wrap.cpp $(COPTO)${ARCHDIR}/tcl_libbiokit_wrap.o
+@@ -111,7 +111,7 @@ ${INTERFACESRCDIR}/tcl_libbiokit_wrap.cpp : ${INTERFACESRCDIR}/tcl_libbiokit.i
+ ${ARCHDIR}/percid.exe: ${ARCHDIR}/percid.o ${OBJS}
+ 	LINK ${ARCHDIR}/percid.o ${OBJS} /OUT:${ARCHDIR}/percid.exe
+ ${ARCHDIR}/percid: ${ARCHDIR}/percid.o ${OBJS}
+-	${CXX} ${CXXFLAGS} ${ARCHDIR}/percid.o ${OBJS} -o ${ARCHDIR}/percid -lm
++	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/percid.o ${OBJS} -o ${ARCHDIR}/percid -lm
+ ${ARCHDIR}/percid.o: ${UTILSRCDIR}/percid.cpp
+ 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${UTILSRCDIR}/percid.cpp $(COPTO)${ARCHDIR}/percid.o
+ 
+@@ -119,7 +119,7 @@ ${ARCHDIR}/percid.o: ${UTILSRCDIR}/percid.cpp
+ ${ARCHDIR}/qpair.exe: ${ARCHDIR}/qPair.o ${OBJS}
+ 	LINK ${ARCHDIR}/qPair.o ${OBJS} /OUT:${ARCHDIR}/qpair.exe
+ ${ARCHDIR}/qpair: ${ARCHDIR}/qPair.o ${OBJS}
+-	${CXX} ${CXXFLAGS} ${ARCHDIR}/qPair.o ${OBJS} -o ${ARCHDIR}/qpair -lm
++	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/qPair.o ${OBJS} -o ${ARCHDIR}/qpair -lm
+ ${ARCHDIR}/qPair.o: ${UTILSRCDIR}/qPair.cpp
+ 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${UTILSRCDIR}/qPair.cpp $(COPTO)${ARCHDIR}/qPair.o
+ 
+@@ -127,7 +127,7 @@ ${ARCHDIR}/qPair.o: ${UTILSRCDIR}/qPair.cpp
+ ${ARCHDIR}/rmsd.exe: ${ARCHDIR}/rmsd.o ${OBJS}
+ 	LINK ${ARCHDIR}/rmsd.o ${OBJS} /OUT:${ARCHDIR}/rmsd.exe
+ ${ARCHDIR}/rmsd: ${ARCHDIR}/rmsd.o ${OBJS}
+-	${CXX} ${CXXFLAGS} ${ARCHDIR}/rmsd.o ${OBJS} -o ${ARCHDIR}/rmsd -lm
++	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/rmsd.o ${OBJS} -o ${ARCHDIR}/rmsd -lm
+ ${ARCHDIR}/rmsd.o: ${UTILSRCDIR}/rmsd.cpp
+ 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${UTILSRCDIR}/rmsd.cpp $(COPTO)${ARCHDIR}/rmsd.o
+ 
+@@ -135,7 +135,7 @@ ${ARCHDIR}/rmsd.o: ${UTILSRCDIR}/rmsd.cpp
+ ${ARCHDIR}/q.exe: ${ARCHDIR}/Q.o ${OBJS}
+ 	LINK ${ARCHDIR}/Q.o ${OBJS} /OUT:${ARCHDIR}/q.exe
+ ${ARCHDIR}/q: ${ARCHDIR}/Q.o ${OBJS}
+-	${CXX} ${CXXFLAGS} ${ARCHDIR}/Q.o ${OBJS} -o ${ARCHDIR}/q -lm
++	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/Q.o ${OBJS} -o ${ARCHDIR}/q -lm
+ ${ARCHDIR}/Q.o: ${UTILSRCDIR}/Q.cpp
+ 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${UTILSRCDIR}/Q.cpp $(COPTO)${ARCHDIR}/Q.o
+ 
+@@ -143,7 +143,7 @@ ${ARCHDIR}/Q.o: ${UTILSRCDIR}/Q.cpp
+ ${ARCHDIR}/seqqr.exe: ${ARCHDIR}/seqqr.o ${OBJS}
+ 	LINK ${ARCHDIR}/seqqr.o ${OBJS} /OUT:${ARCHDIR}/seqqr.exe
+ ${ARCHDIR}/seqqr: ${ARCHDIR}/seqqr.o ${OBJS}
+-	${CXX} ${CXXFLAGS} ${ARCHDIR}/seqqr.o ${OBJS} -o ${ARCHDIR}/seqqr -lm
++	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/seqqr.o ${OBJS} -o ${ARCHDIR}/seqqr -lm
+ ${ARCHDIR}/seqqr.o: ${UTILSRCDIR}/seqqr.cpp
+ 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${UTILSRCDIR}/seqqr.cpp $(COPTO)${ARCHDIR}/seqqr.o
+ 
+@@ -151,7 +151,7 @@ ${ARCHDIR}/seqqr.o: ${UTILSRCDIR}/seqqr.cpp
+ ${ARCHDIR}/structqr.exe : ${ARCHDIR}/structqr.o ${OBJS}
+ 	LINK ${ARCHDIR}/structqr.o ${OBJS} /OUT:${ARCHDIR}/structqr.exe
+ ${ARCHDIR}/structqr: ${ARCHDIR}/structqr.o ${OBJS}
+-	${CXX} ${CXXFLAGS} ${ARCHDIR}/structqr.o ${OBJS} -o ${ARCHDIR}/structqr -lm
++	${CXX} ${LDFLAGS} ${CXXFLAGS} ${ARCHDIR}/structqr.o ${OBJS} -o ${ARCHDIR}/structqr -lm
+ ${ARCHDIR}/structqr.o: ${UTILSRCDIR}/structqr.cpp
+ 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${UTILSRCDIR}/structqr.cpp $(COPTO)${ARCHDIR}/structqr.o
+     
+diff --git a/plugins/molfile_plugin/Makefile b/plugins/molfile_plugin/Makefile
+index 4c47615..1c77ddf 100644
+--- a/plugins/molfile_plugin/Makefile
++++ b/plugins/molfile_plugin/Makefile
+@@ -15,7 +15,7 @@
+ VPATH = src ../include ${ARCHDIR}
+ 
+ SCCFLAGS = $(CCFLAGS) $(DEF)"STATIC_PLUGIN"
+-SCXXFLAGS = $(CCFLAGS) $(DEF)"STATIC_PLUGIN"
++SCXXFLAGS = $(CXXFLAGS) $(DEF)"STATIC_PLUGIN"
+ 
+ #
+ # Rules
+@@ -206,209 +206,209 @@
+ #
+ 
+ abinitplugin.so: ${ARCHDIR}/abinitplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ amiraplugin.so: ${ARCHDIR}/amiraplugin.o 
+ 	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ avsplugin.so: ${ARCHDIR}/avsplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ babelplugin.so: ${ARCHDIR}/babelplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ basissetplugin.so: ${ARCHDIR}/basissetplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ bgfplugin.so: ${ARCHDIR}/bgfplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ binposplugin.so: ${ARCHDIR}/binposplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ biomoccaplugin.so: ${ARCHDIR}/biomoccaplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ brixplugin.so: ${ARCHDIR}/brixplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ carplugin.so: ${ARCHDIR}/carplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ ccp4plugin.so: ${ARCHDIR}/ccp4plugin.o
+ 	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ corplugin.so: ${ARCHDIR}/corplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ cpmdplugin.so: ${ARCHDIR}/cpmdplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ crdplugin.so: ${ARCHDIR}/crdplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ cubeplugin.so: ${ARCHDIR}/cubeplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ dcdplugin.so: ${ARCHDIR}/dcdplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ dlpolyplugin.so: ${ARCHDIR}/dlpolyplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ dsn6plugin.so: ${ARCHDIR}/dsn6plugin.o
+ 	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ dxplugin.so: ${ARCHDIR}/dxplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ edmplugin.so: ${ARCHDIR}/edmplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ fs4plugin.so: ${ARCHDIR}/fs4plugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ gamessplugin.so: ${ARCHDIR}/gamessplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ graspplugin.so: ${ARCHDIR}/graspplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ grdplugin.so: ${ARCHDIR}/grdplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ gridplugin.so: ${ARCHDIR}/gridplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ gromacsplugin.so: ${ARCHDIR}/gromacsplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ jsplugin.so: ${ARCHDIR}/jsplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ lammpsplugin.so: ${ARCHDIR}/lammpsplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ mapplugin.so: ${ARCHDIR}/mapplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ mdfplugin.so: ${ARCHDIR}/mdfplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ mol2plugin.so: ${ARCHDIR}/mol2plugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ moldenplugin.so: ${ARCHDIR}/moldenplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ molemeshplugin.so: ${ARCHDIR}/molemeshplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ msmsplugin.so: ${ARCHDIR}/msmsplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ namdbinplugin.so: ${ARCHDIR}/namdbinplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ offplugin.so: ${ARCHDIR}/offplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ orcaplugin.so: ${ARCHDIR}/orcaplugin.o
+ 	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ parm7plugin.so: ${ARCHDIR}/parm7plugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ parmplugin.so: ${ARCHDIR}/parmplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ pbeqplugin.so: ${ARCHDIR}/pbeqplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ pdbplugin.so: ${ARCHDIR}/pdbplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ pdbxplugin.so: ${ARCHDIR}/pdbxplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ phiplugin.so: ${ARCHDIR}/phiplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ pltplugin.so: ${ARCHDIR}/pltplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ plyplugin.so: ${ARCHDIR}/plyplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ pqrplugin.so: ${ARCHDIR}/pqrplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ psfplugin.so: ${ARCHDIR}/psfplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ raster3dplugin.so: ${ARCHDIR}/raster3dplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ rst7plugin.so: ${ARCHDIR}/rst7plugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ situsplugin.so: ${ARCHDIR}/situsplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ spiderplugin.so: ${ARCHDIR}/spiderplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ stlplugin.so: ${ARCHDIR}/stlplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ tinkerplugin.so: ${ARCHDIR}/tinkerplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ uhbdplugin.so: ${ARCHDIR}/uhbdplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ vaspchgcarplugin.so: ${ARCHDIR}/vaspchgcarplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ vaspoutcarplugin.so: ${ARCHDIR}/vaspoutcarplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ vaspparchgplugin.so: ${ARCHDIR}/vaspparchgplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ vaspposcarplugin.so: ${ARCHDIR}/vaspposcarplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ vasp5xdatcarplugin.so: ${ARCHDIR}/vasp5xdatcarplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ vaspxdatcarplugin.so: ${ARCHDIR}/vaspxdatcarplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ vaspxmlplugin.so: ${ARCHDIR}/vaspxmlplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ vtkplugin.so: ${ARCHDIR}/vtkplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ xbgfplugin.so: ${ARCHDIR}/xbgfplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ xsfplugin.so: ${ARCHDIR}/xsfplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ xyzplugin.so: ${ARCHDIR}/xyzplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ 
+ ##
+ ## In-development plugins that aren't part of the build quite yet...
+ ##
+ cpmdlogplugin.so: ${ARCHDIR}/cpmdlogplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ gaussianplugin.so: ${ARCHDIR}/gaussianplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ 
+ ##
+@@ -416,31 +416,31 @@
+ ## dependencies of some kind
+ ##
+ dmsplugin.so: ${ARCHDIR}/dmsplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(SQLITELIB) $(SQLITELDFLAGS) $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(SQLITELIB) $(SQLITELDFLAGS) $(LDFLAGS)
+ 
+ dtrplugin.so: ${ARCHDIR}/dtrplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ hoomdplugin.so: ${ARCHDIR}/hoomdplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(EXPATLIB) $(EXPATLDFLAGS) $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(EXPATLIB) $(EXPATLDFLAGS) $(LDFLAGS)
+ 
+ lmplugin.so: ${ARCHDIR}/lmplugin.o
+ 	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(HDFLIB) $(HDFLDFLAGS) $(LDFLAGS)
+ 
+ maeffplugin.so: ${ARCHDIR}/maeffplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(LDFLAGS)
+ 
+ netcdfplugin.so: ${ARCHDIR}/netcdfplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(NETCDFLIB) $(NETCDFLDFLAGS) $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(NETCDFLIB) $(NETCDFLDFLAGS) $(LDFLAGS)
+ 
+ tngplugin.so: ${ARCHDIR}/tngplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(TNGLIB) $(TNGLDFLAGS) $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(TNGLIB) $(TNGLDFLAGS) $(LDFLAGS)
+ 
+ vtfplugin.so: ${ARCHDIR}/vtfplugin.o
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(TCLLIB) $(TCLLDFLAGS) $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(TCLLIB) $(TCLLDFLAGS) $(LDFLAGS)
+ 
+ webpdbplugin.so: ${ARCHDIR}/webpdbplugin.o 
+-	$(SHLD) $(LOPTO)${ARCHDIR}/$@ $? $(TCLLIB) $(TCLLDFLAGS) $(LDFLAGS)
++	$(SHXXLD) $(LOPTO)${ARCHDIR}/$@ $? $(TCLLIB) $(TCLLDFLAGS) $(LDFLAGS)
+ 
+ 
+ #
+diff --git a/plugins/phylotree/Makefile b/plugins/phylotree/Makefile
+index 6442747..0aceb4d 100644
+--- a/plugins/phylotree/Makefile
++++ b/plugins/phylotree/Makefile
+@@ -54,7 +54,7 @@ ${ARCHDIR}/upgmaclu.exe : ${OBJS}
+ 
+ # all other platforms
+ ${ARCHDIR}/upgmaclu : ${OBJS}
+-	${CXX} ${CXXFLAGS} ${OBJS} -o ${ARCHDIR}/upgmaclu -lm
++	${CXX} ${LDFLAGS} ${CXXFLAGS} ${OBJS} -o ${ARCHDIR}/upgmaclu -lm
+ 
+ ${ARCHDIR}/upgmaclu.o: ${SRCDIR}/upgmaclu.c
+ 	${CXX} ${CXXFLAGS} ${INCDIR} -c ${SRCDIR}/upgmaclu.c $(COPTO)${ARCHDIR}/upgmaclu.o
+diff --git a/plugins/rnaview/Makefile b/plugins/rnaview/Makefile
+index 16f070a..da71248 100644
+--- a/plugins/rnaview/Makefile
++++ b/plugins/rnaview/Makefile
+@@ -67,7 +67,7 @@ OBJS = ${ARCHDIR}/analyze.o \
+ ${ARCHDIR}/rnaview.exe: ${OBJS}
+ 	LINK ${OBJS} /OUT:${ARCHDIR}/rnaview.exe
+ ${ARCHDIR}/rnaview: ${OBJS}
+-	${CC} ${CCFLAGS} ${OBJS} -o ${ARCHDIR}/rnaview -lm
++	${CC} ${LDFLAGS} ${CCFLAGS} ${OBJS} -o ${ARCHDIR}/rnaview -lm
+ 
+ ${ARCHDIR}/analyze.o: ${SRCDIR}/analyze.c
+ 	${CC} ${CCFLAGS} ${INCDIR} -c ${SRCDIR}/analyze.c $(COPTO)${ARCHDIR}/analyze.o
+diff --git a/plugins/stamp/Makefile b/plugins/stamp/Makefile
+index f0fb515..aa8f6b6 100644
+--- a/plugins/stamp/Makefile
++++ b/plugins/stamp/Makefile
+@@ -101,7 +101,7 @@ OBJS = ${ARCHDIR}/a3to1.o \
+ ${ARCHDIR}/stamp.exe: ${OBJS}
+ 	LINK ${OBJS} /OUT:${ARCHDIR}/stamp.exe
+ ${ARCHDIR}/stamp: ${OBJS}
+-	${CC} ${CCFLAGS} ${OBJS} -o ${ARCHDIR}/stamp -lm
++	${CC} ${LDFLAGS} ${CCFLAGS} ${OBJS} -o ${ARCHDIR}/stamp -lm
+     
+     
+ # Objects.
+-- 
+2.5.5
+
diff --git a/sci-chemistry/vmd/vmd-1.9.4_alpha43.ebuild b/sci-chemistry/vmd/vmd-1.9.4_alpha43.ebuild
index 8ffb5a090074..db9e4f49e522 100644
--- a/sci-chemistry/vmd/vmd-1.9.4_alpha43.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.4_alpha43.ebuild
@@ -83,6 +83,10 @@ src_prepare() {
 	cd "${WORKDIR}"
 	xdg_src_prepare
 
+	# https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32121.html
+	# https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32116.html
+	eapply "${FILESDIR}"/${PN}-1.9.4-gentoo-plugins.patch
+
 	use cuda && cuda_sanitize
 
 	# Prepare plugins
@@ -117,6 +121,8 @@ src_prepare() {
 	cd "${S}" || die
 
 	eapply "${FILESDIR}"/${PN}-1.9.4-gentoo-paths.patch
+
+	# https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32122.html
 	eapply "${FILESDIR}"/${PN}-1.9.4-tmpdir.patch
 
 	# PREFIX
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 4a39d01be974..092c84b589c0 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/drawtiming/Manifest b/sci-electronics/drawtiming/Manifest
index 009a7a0a6ba5..f7414edaf4b0 100644
--- a/sci-electronics/drawtiming/Manifest
+++ b/sci-electronics/drawtiming/Manifest
@@ -2,6 +2,5 @@ AUX drawtiming-0.7.1-gcc43.patch 279 BLAKE2B 63595887c90acdcd5055e502dae85cf2b94
 AUX drawtiming-0.7.1-imagemagick-7.patch 5615 BLAKE2B 4b51bedeec295dd9bcef64ad1c8e34f6183c75532333e0b44eb15e86f13e9700e93b966b14e44beffa2e050e94d96ef2a5079602b11bfc014cf28ecbd00db6dc SHA512 1bf07304353c538ba24777613f12fd887d6d911d45488b37318e34c081381c1b4c2005bfc1135fd28f7b5fc26897078809aeabfcd77f7ef4ffb5dbdbd9381721
 AUX drawtiming-0.7.1-ldflags.patch 1290 BLAKE2B 38081c0b2daff6c2f1ab3c5718188d9b3285c3f4cd7efb252893877a25f97ae232257bead08dd53a33e6a193086469de3288d3c8ba2b12c54e59cda13aec7015 SHA512 cc77a8fed890e7d9a1713667c818437a8cfafc96d3efa328df77b1bf660e3536460da4e899e158c4515c4ecec07319cad05a4ecac5f3e13b0eb004c11d042076
 DIST drawtiming-0.7.1.tar.gz 123714 BLAKE2B 60e5f4c741d5a273860d5bddd872d1df01be4c256531b1cbfe3baeab46ce569618bc371f6d65959d77071ac66946f3a934b351841d643ac154ee59ad5fb23052 SHA512 f474ee372967f05abfa49a15d635279ee23715f1472a82aab8890f8144eab3fdb7fc0529510ed7f92b7073097d77ee2266e5a97f55e755292416e126537fcbbd
-EBUILD drawtiming-0.7.1-r1.ebuild 694 BLAKE2B 9d8b3017690551ec62c0593cbac2bd9cde62717afa4056003780c38b0c5c71d4114fa2b2f55f560fcf5e7e9c879639f4676a0231581bfe04a5c79f5c21d82d5b SHA512 1ae829bc924a70f66e9c122e6144f2a3c52b184fad7efea63374fbfd25753831cce2f222c9346f33c67cc331be372ce998758b93dd43c6d7e29c73d5ca474a62
 EBUILD drawtiming-0.7.1-r2.ebuild 872 BLAKE2B 9d8a50c237db67fada61a1161d06fdca3ebab7ec1b5806b1a813d9063e55c81fbea927edeb7ee138067d9b8655ca4d2732114b413f53c34fed99ccb2e5a3bd9c SHA512 ff5a1a61ed4f1c4ab1346ff2fd053ea72d611fd6f4f46d7bda2a994bae795d98d065db4eceba0878924529979567bc048fa6244f260a1382a4b53dcbf77f4fe9
 MISC metadata.xml 798 BLAKE2B daa9a0033fc7e8a5a2a688f461906f1b991f4245d51143e02ce17f1b9c20dfba2af967d4853c70649634b9866468adc5b362925a6d6796c21cfce9fac1fd30da SHA512 ebe66f645447adf66360697448c77c066a80adaf08a58d9c4dbbd323014ed73d990c71d5c88f3dfbf87ea1a6ada8e72267a25ea9c746f27440afd07a8f36b1fb
diff --git a/sci-electronics/drawtiming/drawtiming-0.7.1-r1.ebuild b/sci-electronics/drawtiming/drawtiming-0.7.1-r1.ebuild
deleted file mode 100644
index 7fbcf0e95f8f..000000000000
--- a/sci-electronics/drawtiming/drawtiming-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Command line tool for drawing timing diagrams"
-HOMEPAGE="http://drawtiming.sourceforge.net/index.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-DEPEND="media-gfx/imagemagick[cxx]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-	    "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README THANKS
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins samples/*.txt
-	fi
-}
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 2ae2d2bff0c6..8be1a2229631 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -6,16 +6,8 @@ AUX kicad-5.1.5-ninja-build.patch 2171 BLAKE2B 1b9c6f07abed53e04f676f9aaea6f4e24
 AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306aecf19300fa5ecc38e0a3b4f7668ed8e41aa7c66f5f6dc68f6a66905fea8947647de90788fe2ca5439703b3fe2010b287e SHA512 1000ea7dd6fef283d144ccd9d6193a68a399177e06b1f45cae5642f7c2854d16d3cf4d789f8444c6aa36028f23b7d66c6de7596ffef57c4ecdc28747fac84636
 AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7d4f61b937f4a12aaf08665c1d9a5d2816b154c76e954f80f7c8c620861e290988bafb3af071ae059bfb92113a2f2 SHA512 bf1b9d7adc23759e9b637f2d2f3d2843f1ef33a27c02f7e892a74a8743dfdcf635f918010f0bcc4a62ba0f7e939f89fa8c7786a761ffe709f670a0d6f63b3146
 AUX kicad-5.1.6-ninja-build.patch 2154 BLAKE2B 8b7fd64878e8dac5e9dcfdad262cdde1ca87460d7776d0213f0cfec39b432d638651260cc0b537b9fb5cb18de6e020d2920d065333cebc5f2dd1606e43a69d9a SHA512 8d1d9740b8f09623580ec1ddc8a9de407b3db0fe7ae0705ef3f1c7b234972a05b32885c581c9af26ae8a245c3b5b0e2c2eacc37bffce11881b50c43003ee77fa
-AUX kicad-boost-1.61.patch 9565 BLAKE2B edfafc5a9ef70ace413f7b1fb1c0a47fb4abc4bd52f0ec085d5449b5dc7bea454f16e809ea0c12a274f809bd52549507aefee6e34c9f32bf341449e6de2c87cf SHA512 a960117a4c08144de5111e76a33f208a9b3fe702d10ec2546afc57faf3de3fccfe19b5a5c62b527953d55687e644ed67c9b560cd3baf8b678d127977f3f30cee
-AUX kicad-cmake-checkcxxsymbolexists.patch 2353 BLAKE2B 38d173c8c47c623b1c2f62b58367fe8536d9349ac1a6c64368b481921b1477d73a126e2be6806b0a5f4404a586a318ca685a67ecac30ebc1a402c518d65680da SHA512 3d11ebd04dcd3b4f08de3b8c2f3e2d5b5022421caea4ca69ab22f45865f6ead5196bb5bc423761679f9259030cc2c8958cc27d9309a8485c69f5ef7393e330cc
-AUX kicad-footprints-cmakelists.txt 449 BLAKE2B d9bdcead011c5ece55c503bd6314de6daa107501152d4e3bc6f7f38dfd99405cf11da67df923df415657b84d50d4ef4f608307b2de23cc7458d8abc4cc03b9d8 SHA512 d101e28f8f5f00946a23839193bf83379da121d36bcf67f25b14b02cb5c2a4ff9a392db5b3676687bd26c0d61453313ce704192dd1e4e73834eb9930a07ee822
-DIST kicad-4.0.7-i18n.tar.gz 2578242 BLAKE2B 610f580d9584cf9ef96686c3d7b7081d4c3a0d2c670482eaa2ef32720a7e71630670845a6050bae8e51df7ac41e30f73d3d11be65ea477ad9efd9fbb5176e2df SHA512 4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a
-DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B 54be9a3f5ae6378ac05cb327c28b1a358d895e736a116e1bf5151f021973b9510eab4671a67f222c3be2ef67929954b9576c5c28ef2b6a14708f8c019729969b SHA512 7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b
 DIST kicad-5.1.5.tar.xz 14203632 BLAKE2B cda7bf95c8edbddd36489f299dca9393ee51658e828f7e9f37bfa56955924785186908b0d8c91ae3e895f15cdba50c7579cf7a450e525f4a2ba215a721df26dd SHA512 5ca19e219da07a906f13e236849eb4497c9f827726a5cd13aceffe1d8c7dee480823bf3e949527f59a805eb3b8176fad51576ae663dd07b10e2822f2b37866a5
 DIST kicad-5.1.6.tar.bz2 18299367 BLAKE2B b5bfda025bb0be249f2ff334e8b82c49e4e4265fe4cf5daad8a01bfd6149f4c2d1c55d689f3033136ab904f45e8deb9ea12ccde43ea083b14d92e677adf39c0f SHA512 4fd3d0ac1524cc113210be8dc1b76ab4e02bf271f598943ecab73af98a9dc99009b2d3818c97b358498d2f98ee863f13b21e958fd2143356c2a1368601f0d48a
-DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce SHA512 9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f
-DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360
-EBUILD kicad-4.0.7-r1.ebuild 6708 BLAKE2B 9c1b70aaa068b9d874ee8f84c8bd79b849a02a91577c43e5b27881b856579248d56de03299300a900e9583d0f2d639ca15e150382236671521f690769c1cce2b SHA512 f2f426f0936148dd8a1d46f81be89cdbbdacf4e363755848bc06f2742600f92e39ab8438a825c1180f2811d9689161fb203e1f49457d7b2a8630a042e604e1c4
 EBUILD kicad-5.1.5-r2.ebuild 4309 BLAKE2B 377d2af7c9b84715da93767d3b8cd3c0f247c84d5888f68b7a103418ecad42eba44078929fd22b2f614fee39505717cc288994b33c76ee88e3283262bcece4a9 SHA512 e0ee69147c3e865e814a8c45b66451a076ce08a3581fa31cf15cdd0e6c2084492bcc2cc7a091e88c211aa19a2f6fd578d18087077ca88881e03c6ed12df59925
 EBUILD kicad-5.1.6.ebuild 4342 BLAKE2B 5a89ff32ea1ee6c6d1a1c1fe6e8c63368e6b5bc552b57c5bffb99c8c3515abf9077331cd004eeec722d2afe1e2596dee7bddb6fc2f9f5db74c6ccec444abaab4 SHA512 3455b1e37f0079c25005cce0f160fa541edac8cabdfe5f5c9b4ebf7719f390daa5065e4e5bf54e361d6eeb6ab3c66884f28b1b6b3634d4020c124edcb237acff
-MISC metadata.xml 1181 BLAKE2B dadb380f3a2c422a93f349ede59cd4a6bf03dac69306357df08ef88931f76329669e5713f741507ce37ec4bb10445351ed293ed13174ed38de6c284e2234e2f8 SHA512 60c76ec7d665f273fb538c10e4993ac6d30c567d9cb8c0c862175c63a59d45cc9fdeacbb2ba6a3cff12e722124ef6c7466828ea792ddd405c587bd0bac65472c
+MISC metadata.xml 1013 BLAKE2B b6469c6095bc87dd09a15b8c29df6901c8c3a9137a85f11bca0198b87de4dba56a363763e577303c046ba0ae5734af20f87aff574470942b222489b2c8081067 SHA512 68b19d35279516a088271a06fa2edae7109f2f79c1bf46add405d11885e221f8166e21448cb1e70d961c185712496410a3f32e34265d18360e779f12dc907611
diff --git a/sci-electronics/kicad/files/kicad-boost-1.61.patch b/sci-electronics/kicad/files/kicad-boost-1.61.patch
deleted file mode 100644
index 3ca8711b9f0a..000000000000
--- a/sci-electronics/kicad/files/kicad-boost-1.61.patch
+++ /dev/null
@@ -1,347 +0,0 @@
---- a/common/tool/tool_manager.cpp
-+++ b/common/tool/tool_manager.cpp
-@@ -532,11 +532,11 @@
-                     if( st->cofunc )
-                         st->Push();
- 
-+                    st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
-+
-                     // as the state changes, the transition table has to be set up again
-                     st->transitions.clear();
- 
--                    st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second );
--
-                     // got match? Run the handler.
-                     st->cofunc->Call( aEvent );
- 
---- a/include/tool/coroutine.h
-+++ b/include/tool/coroutine.h
-@@ -27,10 +28,15 @@
- 
- #include <cstdlib>
- 
--#include <boost/context/fcontext.hpp>
- #include <boost/version.hpp>
-+#include <type_traits>
- 
--#include "delegate.h"
-+#if BOOST_VERSION <= 106000
-+#include <boost/context/fcontext.hpp>
-+#else
-+#include <boost/context/execution_context.hpp>
-+#include <boost/context/protected_fixedsize_stack.hpp>
-+#endif
- 
- /**
-  *  Class COROUNTINE.
-@@ -53,13 +59,12 @@
-  *  See coroutine_example.cpp for sample code.
-  */
- 
--template <class ReturnType, class ArgType>
-+template <typename ReturnType, typename ArgType>
- class COROUTINE
- {
- public:
-     COROUTINE() :
--        m_saved( NULL ), m_self( NULL ), m_stack( NULL ), m_stackSize( c_defaultStackSize ),
--        m_running( false )
-+        COROUTINE( nullptr )
-     {
-     }
- 
-@@ -69,8 +74,7 @@
-      */
-     template <class T>
-     COROUTINE( T* object, ReturnType(T::* ptr)( ArgType ) ) :
--        m_func( object, ptr ), m_self( NULL ), m_saved( NULL ), m_stack( NULL ),
--        m_stackSize( c_defaultStackSize ), m_running( false )
-+        COROUTINE( std::bind( ptr, object, std::placeholders::_1 ) )
-     {
-     }
- 
-@@ -78,9 +82,15 @@
-      * Constructor
-      * Creates a coroutine from a delegate object
-      */
--    COROUTINE( DELEGATE<ReturnType, ArgType> aEntry ) :
--        m_func( aEntry ), m_saved( NULL ), m_self( NULL ), m_stack( NULL ),
--        m_stackSize( c_defaultStackSize ), m_running( false )
-+    COROUTINE( std::function<ReturnType(ArgType)> aEntry ) :
-+        m_func( std::move( aEntry ) ),
-+        m_running( false ),
-+#if BOOST_VERSION <= 106000
-+        m_stack( nullptr ),
-+        m_stackSize( c_defaultStackSize ),
-+#endif
-+        m_caller( nullptr ),
-+        m_callee( nullptr )
-     {
-         // Avoid not initialized members, and make static analysers quiet
-         m_args = 0;
-@@ -89,18 +99,26 @@
- 
-     ~COROUTINE()
-     {
--        if( m_saved )
--            delete m_saved;
--
- #if BOOST_VERSION >= 105600
--        if( m_self )
--            delete m_self;
-+        delete m_callee;
- #endif
- 
-+#if BOOST_VERSION <= 106000
-+        delete m_caller;
-+
-         if( m_stack )
-             free( m_stack );
-+#endif
-     }
- 
-+private:
-+#if BOOST_VERSION <= 106000
-+    using context_type = boost::context::fcontext_t;
-+#else
-+    using context_type = boost::context::execution_context<COROUTINE*>;
-+#endif
-+
-+public:
-     /**
-      * Function Yield()
-      *
-@@ -110,7 +128,12 @@
-      */
-     void Yield()
-     {
--        jump( m_self, m_saved, 0 );
-+#if BOOST_VERSION <= 106000
-+        jump( m_callee, m_caller, false );
-+#else
-+        auto result = (*m_caller)( this );
-+        *m_caller = std::move( std::get<0>( result ) );
-+#endif
-     }
- 
-     /**
-@@ -122,7 +145,11 @@
-     void Yield( ReturnType& aRetVal )
-     {
-         m_retVal = aRetVal;
--        jump( m_self, m_saved, 0 );
-+#if BOOST_VERSION <= 106000
-+        jump( m_callee, m_caller, false );
-+#else
-+        m_caller( this );
-+#endif
-     }
- 
-     /**
-@@ -130,9 +157,9 @@
-      *
-      * Defines the entry point for the coroutine, if not set in the constructor.
-      */
--    void SetEntry( DELEGATE<ReturnType, ArgType> aEntry )
-+    void SetEntry( std::function<ReturnType(ArgType)> aEntry )
-     {
--        m_func = aEntry;
-+        m_func = std::move( aEntry );
-     }
- 
-     /* Function Call()
-@@ -143,6 +170,10 @@
-      */
-     bool Call( ArgType aArgs )
-     {
-+        assert( m_callee == NULL );
-+        assert( m_caller == NULL );
-+
-+#if BOOST_VERSION <= 106000
-         // fixme: Clean up stack stuff. Add a guard
-         m_stack = malloc( c_defaultStackSize );
- 
-@@ -151,22 +182,32 @@
- 
-         // correct the stack size
-         m_stackSize -= ( (size_t) m_stack + m_stackSize - (size_t) sp );
--
--        assert( m_self == NULL );
--        assert( m_saved == NULL );
-+#endif
- 
-         m_args = &aArgs;
--#if BOOST_VERSION >= 105600
--        m_self = new boost::context::fcontext_t();
--        *m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
-+
-+#if BOOST_VERSION < 105600
-+        m_callee = boost::context::make_fcontext( sp, m_stackSize, callerStub );
-+#elif BOOST_VERSION <= 106000
-+        m_callee = new context_type( boost::context::make_fcontext( sp, m_stackSize, callerStub ) );
- #else
--        m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
-+        m_callee = new context_type( std::allocator_arg_t(),
-+                    boost::context::protected_fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub );
-+#endif
-+
-+#if BOOST_VERSION <= 106000
-+        m_caller = new context_type();
- #endif
--        m_saved = new boost::context::fcontext_t();
- 
-         m_running = true;
-+
-         // off we go!
--        jump( m_saved, m_self, reinterpret_cast<intptr_t>( this ) );
-+#if BOOST_VERSION <= 106000
-+        jump( m_caller, m_callee, reinterpret_cast<intptr_t>( this ) );
-+#else
-+        auto result = (*m_callee)( this );
-+        *m_callee = std::move( std::get<0>( result ) );
-+#endif
-         return m_running;
-     }
- 
-@@ -179,7 +220,12 @@
-      */
-     bool Resume()
-     {
--        jump( m_saved, m_self, 0 );
-+#if BOOST_VERSION <= 106000
-+        jump( m_caller, m_callee, false );
-+#else
-+        auto result = (*m_callee)( this );
-+        *m_callee = std::move( std::get<0>( result ) );
-+#endif
- 
-         return m_running;
-     }
-@@ -208,61 +254,66 @@
-     static const int c_defaultStackSize = 2000000;    // fixme: make configurable
- 
-     /* real entry point of the coroutine */
-+#if BOOST_VERSION <= 106000
-     static void callerStub( intptr_t aData )
-+#else
-+    static context_type callerStub( context_type caller, COROUTINE* cor )
-+#endif
-     {
-         // get pointer to self
-+#if BOOST_VERSION <= 106000
-         COROUTINE<ReturnType, ArgType>* cor = reinterpret_cast<COROUTINE<ReturnType, ArgType>*>( aData );
-+#else
-+        cor->m_caller = &caller;
-+#endif
- 
-         // call the coroutine method
--        cor->m_retVal = cor->m_func( *cor->m_args );
-+        cor->m_retVal = cor->m_func( *( cor->m_args ) );
-         cor->m_running = false;
- 
-         // go back to wherever we came from.
--        jump( cor->m_self, cor->m_saved, 0 );    // reinterpret_cast<intptr_t>( this ));
-+#if BOOST_VERSION <= 106000
-+        jump( cor->m_callee, cor->m_caller, 0 );
-+#else
-+        return caller;
-+#endif
-     }
- 
-     ///> Wrapper for jump_fcontext to assure compatibility between different boost versions
--    static inline intptr_t jump(boost::context::fcontext_t* aOld, boost::context::fcontext_t* aNew,
-+#if BOOST_VERSION <= 106000
-+    static inline intptr_t jump( context_type* aOld, context_type* aNew,
-                                 intptr_t aP, bool aPreserveFPU = true )
-     {
--#if BOOST_VERSION >= 105600
--        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
--#else
-+#if BOOST_VERSION < 105600
-         return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU );
-+#else
-+        return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
- #endif
-     }
-+#endif
- 
--    template <typename T>
--    struct strip_ref
--    {
--        typedef T result;
--    };
-+    std::function<ReturnType(ArgType)> m_func;
- 
--    template <typename T>
--    struct strip_ref<T&>
--    {
--        typedef T result;
--    };
-+    bool m_running;
- 
--    DELEGATE<ReturnType, ArgType> m_func;
-+#if BOOST_VERSION <= 106000
-+    ///< coroutine stack
-+    void* m_stack;
-+
-+    size_t m_stackSize;
-+#endif
- 
-     ///< pointer to coroutine entry arguments. Stripped of references
-     ///< to avoid compiler errors.
--    typename strip_ref<ArgType>::result* m_args;
-+    typename std::remove_reference<ArgType>::type* m_args;
-+
-     ReturnType m_retVal;
- 
-     ///< saved caller context
--    boost::context::fcontext_t* m_saved;
-+    context_type* m_caller;
- 
-     ///< saved coroutine context
--    boost::context::fcontext_t* m_self;
--
--    ///< coroutine stack
--    void* m_stack;
--
--    size_t m_stackSize;
--
--    bool m_running;
-+    context_type* m_callee;
- };
- 
- #endif
---- a/include/tool/tool_base.h
-+++ b/include/tool/tool_base.h
-@@ -31,7 +32,7 @@
- #include <tool/tool_event.h>
- #include <tool/tool_settings.h>
- 
--#include <tool/delegate.h>
-+#include <functional>
- 
- class EDA_ITEM;
- class TOOL_MANAGER;
-@@ -53,7 +54,9 @@
- 
- /// Unique identifier for tools
- typedef int TOOL_ID;
--typedef DELEGATE<int, const TOOL_EVENT&> TOOL_STATE_FUNC;
-+
-+using TOOL_STATE_FUNC = std::function<int(const TOOL_EVENT&)>;
-+
- 
- /**
-  * Class TOOL_BASE
---- a/include/tool/tool_interactive.h
-+++ b/include/tool/tool_interactive.h
-@@ -113,7 +114,7 @@
- void TOOL_INTERACTIVE::Go( int (T::* aStateFunc)( const TOOL_EVENT& ),
-                            const TOOL_EVENT_LIST& aConditions )
- {
--    TOOL_STATE_FUNC sptr( static_cast<T*>( this ), aStateFunc );
-+    TOOL_STATE_FUNC sptr = std::bind( aStateFunc, static_cast<T*>( this ), std::placeholders::_1 );
- 
-     goInternal( sptr, aConditions );
- }
-
diff --git a/sci-electronics/kicad/files/kicad-cmake-checkcxxsymbolexists.patch b/sci-electronics/kicad/files/kicad-cmake-checkcxxsymbolexists.patch
deleted file mode 100644
index b2a1eeb2cc42..000000000000
--- a/sci-electronics/kicad/files/kicad-cmake-checkcxxsymbolexists.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur kicad-4.0.7.orig/CMakeModules/CheckCXXSymbolExists.cmake kicad-4.0.7/CMakeModules/CheckCXXSymbolExists.cmake
---- kicad-4.0.7.orig/CMakeModules/CheckCXXSymbolExists.cmake	2017-08-28 07:31:31.000000000 -0700
-+++ kicad-4.0.7/CMakeModules/CheckCXXSymbolExists.cmake	1969-12-31 16:00:00.000000000 -0800
-@@ -1,42 +0,0 @@
--# - Check if a symbol exists as a function, variable, or macro in C++
--# CHECK_CXX_SYMBOL_EXISTS(<symbol> <files> <variable>)
--#
--# Check that the <symbol> is available after including given header
--# <files> and store the result in a <variable>.  Specify the list
--# of files in one argument as a semicolon-separated list.
--# CHECK_CXX_SYMBOL_EXISTS() can be used to check in C++ files, as opposed
--# to CHECK_SYMBOL_EXISTS(), which works only for C.
--#
--# If the header files define the symbol as a macro it is considered
--# available and assumed to work.  If the header files declare the
--# symbol as a function or variable then the symbol must also be
--# available for linking.  If the symbol is a type or enum value
--# it will not be recognized (consider using CheckTypeSize or
--# CheckCSourceCompiles).
--#
--# The following variables may be set before calling this macro to
--# modify the way the check is run:
--#
--#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
--#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
--#  CMAKE_REQUIRED_INCLUDES = list of include directories
--#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
--
--#=============================================================================
--# Copyright 2003-2011 Kitware, Inc.
--#
--# Distributed under the OSI-approved BSD License (the "License");
--# see accompanying file Copyright.txt for details.
--#
--# This software is distributed WITHOUT ANY WARRANTY; without even the
--# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--# See the License for more information.
--#=============================================================================
--# (To distribute this file outside of CMake, substitute the full
--#  License text for the above reference.)
--
--include(CheckSymbolExists)
--
--macro(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
--  _CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" "${SYMBOL}" "${FILES}" "${VARIABLE}" )
--endmacro()
diff --git a/sci-electronics/kicad/files/kicad-footprints-cmakelists.txt b/sci-electronics/kicad/files/kicad-footprints-cmakelists.txt
deleted file mode 100644
index d024485befd0..000000000000
--- a/sci-electronics/kicad/files/kicad-footprints-cmakelists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-project( kicad-footprints )
-
-cmake_minimum_required( VERSION 2.6.1 FATAL_ERROR )
-
-file(GLOB footprint_dirs "*.pretty")
-
-# Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
-set( KICAD_DATA share/kicad
-    CACHE PATH "Location of KiCad data files." )
-set( KICAD_MODULES ${KICAD_DATA}/modules )
-
-mark_as_advanced( KICAD_DATA KICAD_MODULES )
-
-install(DIRECTORY ${footprint_dirs}
-    DESTINATION ${KICAD_MODULES}
-    COMPONENT resources)
diff --git a/sci-electronics/kicad/kicad-4.0.7-r1.ebuild b/sci-electronics/kicad/kicad-4.0.7-r1.ebuild
deleted file mode 100644
index a85b949bc42d..000000000000
--- a/sci-electronics/kicad/kicad-4.0.7-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="3.0"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2-utils python-single-r1 wxwidgets vcs-snapshot versionator xdg
-
-SERIES=$(get_version_component_range 1-2)
-
-DESCRIPTION="Electronic Schematic and PCB design tools."
-HOMEPAGE="http://www.kicad-pcb.org"
-SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
-	!minimal? (
-		http://downloads.kicad-pcb.org/libraries/${PN}-footprints-${PV}.tar.gz
-		http://downloads.kicad-pcb.org/libraries/kicad-library-${PV}.tar.gz
-	)
-	i18n? ( https://github.com/KiCad/${PN}-i18n/archive/${PV}.tar.gz -> ${P}-i18n.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug doc examples github i18n libressl minimal +python"
-LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh-CN"
-for lang in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${lang}"
-done
-unset lang
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	$(python_gen_cond_dep "
-		python? (
-			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
-			${PYTHON_DEPS}
-		)
-		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
-	")
-	github? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	media-libs/glew:0=
-	media-libs/freeglut
-	media-libs/mesa[X(+)]
-	sys-libs/zlib
-	x11-libs/cairo"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	i18n? ( virtual/libintl )
-	python? ( dev-lang/swig:0 )"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu"
-
-pkg_pretend() {
-	CHECKREQS_DISK_BUILD="8G"
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	setup-wxwidgets
-	CHECKREQS_DISK_BUILD="8G"
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	cmake-utils_src_prepare
-
-	# Patch to work with >=boost 1.61
-	eapply "${FILESDIR}/${PN}-boost-1.61.patch"
-	# Patch to work with >=cmake 3.11
-	eapply "${FILESDIR}/${PN}-cmake-checkcxxsymbolexists.patch"
-
-	# Remove cvpcb desktop file as it does nothing
-	rm "resources/linux/mime/applications/cvpcb.desktop" || die
-
-	# Handle optional minimal install.
-	if use minimal; then
-		# remove templates as they are not needed to run binaries
-		sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die
-	else
-		# create a link to the parts library in the main project folder
-		ln -s "${WORKDIR}/kicad-library-${PV}" "${S}/${PN}-library" || die
-		# create a link to the footprints library and add cmake build rule for it
-		ln -s "${WORKDIR}/${PN}-footprints-${PV}" "${S}/${PN}-footprints" || die
-		cp "${FILESDIR}/${PN}-footprints-cmakelists.txt" "${WORKDIR}/${PN}-footprints-${PV}/CMakeLists.txt" || die
-		# add the libraries directory to cmake as a subproject to build
-		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-library )" -i CMakeLists.txt || die
-		# add the footprints directory to cmake as a subproject to build
-		sed "/add_subdirectory( ${PN}-library )/a add_subdirectory( ${PN}-footprints )" -i CMakeLists.txt || die
-		# remove duplicate uninstall directions for the library module
-		sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die
-	fi
-
-	# Add internationalization for the GUI
-	if use i18n; then
-		# create a link to the translations library in the main project folder
-		ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die
-		# Remove unused languages. Project generates only languages specified in the
-		# file in LINGUAS in the subproject folder. By default all languages are added
-		# so we sed out the unused ones based on the user l10n_* settings.
-		local lang
-		for lang in ${LANGS}; do
-			if ! use l10n_${lang}; then
-				lang="${lang//-/_}"  # Needed to turn zh-CN to zh_CN as KiCad does not follow l10n standard here
-				sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die
-			fi
-		done
-		# cmakelists does not respect our build dir variables, so make it point to the right location
-		sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i ${PN}-i18n/CMakeLists.txt || die
-		# we also make from the master project so the source dir is understood incorretly, replace that too
-		sed "s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i ${PN}-i18n/CMakeLists.txt || die
-		# add the translations directory to cmake as a subproject to build
-		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-i18n )" -i CMakeLists.txt || die
-		# remove duplicate uninstall directions for the translation module
-		sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die
-	fi
-
-	# Install examples if requested
-	use examples || sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die
-
-	# Add important missing doc files
-	sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKICAD_DOCS="/usr/share/doc/${PF}"
-		-DKICAD_SKIP_BOOST=ON
-		-DBUILD_GITHUB_PLUGIN="$(usex github)"
-		-DKICAD_SCRIPTING="$(usex python)"
-		-DKICAD_SCRIPTING_MODULES="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
-		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex i18n)"
-		-DCMAKE_CXX_FLAGS="-std=c++11"
-	)
-	use python && mycmakeargs+=(
-		-DwxUSE_UNICODE=ON
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	if use debug; then
-		append-cxxflags "-DDEBUG"
-		append-cflags "-DDEBUG"
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/.
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-
-	if use minimal ; then
-		ewarn "If the schematic and/or board editors complain about missing libraries when you"
-		ewarn "open old projects, you will have to take one or more of the following actions :"
-		ewarn "- Install the missing libraries manually."
-		ewarn "- Remove the libraries from the 'Libs and Dir' preferences."
-		ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences."
-		ewarn "- Emerge ${PN} without the 'minimal' USE flag."
-	fi
-	elog ""
-	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
-	elog "For help and extended documentation emerge app-doc/kicad-doc."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 6eff0d23cafb..0892cbd7d4b8 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -11,8 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="github">Add github support into PCB editor</flag>
-		<flag name="i18n">Allow GUI internationalization through l10n_* use flags</flag>
-		<flag name="minimal">Build only binaries without parts library and examples</flag>
 		<flag name="ngspice">Enable circuit simulation</flag>
 		<flag name="occ">Enable viewing 3D rendering of designs via opencascade</flag>
 		<flag name="oce">Enable viewing 3D rendering of designs via OCE</flag>
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 912d42473ee7..648c8db9dbe7 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,6 +1,6 @@
-DIST klayout-0.26.4.tar.gz 52324714 BLAKE2B 663ab737d91a83452234f128b13f73ed8e559e6f0fb11f283bce6bfe80e8f391c7bac5ad16933b2f5bcf46fac6e07233ffc690dea5ddb1702850c52501157c36 SHA512 df91434e87d8cc6f4df837eacd756566626405fb75b0cce40c25f157d547dc1e5929746b6b276a317512c038e014bbdd1655615c93d76d9ed5bcf65280d95355
 DIST klayout-0.26.5.tar.gz 52335763 BLAKE2B b1ab39c378ce23c28f5a58191dbf43c5b8c165e9df241b00573c8f8b72a5a7251cddd41bf62a7e37f59cad68024c52ab99f8d0f10bf1bf45dba975bf37ba80db SHA512 b80dff34a9dd538921f6863fc94eb8a2160b989468ec0493a7ecfdfccea0e4f0441aa1ee860d000b150b0a0bc0b831dcb849ab77e9eb1304e9ed6fcced94689c
-EBUILD klayout-0.26.4-r1.ebuild 1838 BLAKE2B bf2c3445ab7625124bed08a64ff3973340823eafad89b234737336c70d5864c2a20a966f8fc59c0cb675f375fbcda95fbd9d5f1850403c5d603cf5f629190045 SHA512 d0fa0f591028c6074347576b0747f210971fd447e429d4bc23126c12d2492a034b0506827bb765d06fcdd77fac8bae358c6f88467dd6ed55397a2cddbd954dfc
+DIST klayout-0.26.8.tar.gz 54423228 BLAKE2B 5839e77a7910b0a838b6d1f436fe697ea445e968044f7102ab71d3d485ea4631194bf002d4440771e73c77359b673372662506a9cc6e2d4a3b5dc8df171783c7 SHA512 a37b324194ed523ee70a1d63034db9ba48cf55d44d3a9d1bc612803cde2425f6909fd0571ad4a66318fc2c6735e19ba11a26ab153e1200adec405c16fc05f144
 EBUILD klayout-0.26.5.ebuild 1855 BLAKE2B b9ef2c667988f3e21c61b0cd9e7a1eea0e852db716a8c07a3ddff2d8f81d804edf97d6b135f4573f9c15f805102d8978d9f838cfe9357a85f5fc94a6b2dc5898 SHA512 588fd483e8634f242efca36871f9721f26fa7ba884d1eb672ee572b3b5e2ceaab787cdf305bc0b64a65564b5f02a45de401bd7bb1dce9a4da4c1ad1465e68146
-EBUILD klayout-9999.ebuild 1856 BLAKE2B 81fa6333488c2f1507386dc9a4d9c3d98269c969b8198d78896f41ef1c8f4c19665819a378355dfd308e546e6b1b706e2f6247f0393fd1cf53de20d6c8c834c7 SHA512 85d991f37ab59ee665001623abeedfa520c216033fbce00cfae987e6a2a7f72525cbb991b46852bcad7566b3e7d05cfeca403b1eaa18e14dd68d5b54d84d62ba
+EBUILD klayout-0.26.8.ebuild 1856 BLAKE2B 45bfa423463b32a1cf25f1a26ef1cfb2ace40032be10849016d5b92bfecb663c8bfff82418a85bd0e0d4065e0fbe4aa6ff20efc9f75fd17a81359345ea712459 SHA512 412872dc99e28f95a88c3d0ce43669a3ef19e05caff9a7176ba63265aa85c8ac0b88234120131ffff444177ecccf9797a6c64f9106ce666593dc8944b2d50989
+EBUILD klayout-9999.ebuild 1856 BLAKE2B 45bfa423463b32a1cf25f1a26ef1cfb2ace40032be10849016d5b92bfecb663c8bfff82418a85bd0e0d4065e0fbe4aa6ff20efc9f75fd17a81359345ea712459 SHA512 412872dc99e28f95a88c3d0ce43669a3ef19e05caff9a7176ba63265aa85c8ac0b88234120131ffff444177ecccf9797a6c64f9106ce666593dc8944b2d50989
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/klayout-0.26.4-r1.ebuild b/sci-electronics/klayout/klayout-0.26.4-r1.ebuild
deleted file mode 100644
index d0ce619c189e..000000000000
--- a/sci-electronics/klayout/klayout-0.26.4-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-RUBY_OPTIONAL=no
-USE_RUBY="ruby25"
-# note: define maximally ONE implementation here
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit toolchain-funcs python-single-r1 ruby-ng
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git"
-	inherit git-r3
-	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
-else
-	SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
-HOMEPAGE="https://www.klayout.de/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	sys-libs/zlib
-	${PYTHON_DEPS}
-	$(ruby_implementations_depend)
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ruby-ng_pkg_setup
-}
-
-each_ruby_configure() {
-	tc-export CC CXX AR LD RANLIB
-	export CFLAGS CXXFLAGS
-	./build.sh \
-		-expert \
-		-dry-run \
-		-qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
-		-ruby "${RUBY}" \
-		-python "${PYTHON}" \
-		-build . \
-		-bin "${T}/bin" \
-		-rpath "/usr/$(get_libdir)/klayout" \
-		-option "${MAKEOPTS}" \
-		-with-qtbinding \
-		-without-64bit-coord \
-		-qt5 || die "Configuration failed"
-}
-
-each_ruby_compile() {
-	emake all
-}
-
-each_ruby_install() {
-	emake install
-
-	cd "${T}/bin" || die
-
-	dodir "/usr/$(get_libdir)/klayout"
-	mv lib* lay_plugins db_plugins "${ED}/usr/$(get_libdir)/klayout/" || die
-
-	mkdir -p "${D}/$(python_get_sitedir)" || die
-	mv pymod/* "${D}/$(python_get_sitedir)/" || die
-	rmdir pymod || die
-
-	dobin *
-
-	python_optimize
-}
diff --git a/sci-electronics/klayout/klayout-0.26.8.ebuild b/sci-electronics/klayout/klayout-0.26.8.ebuild
new file mode 100644
index 000000000000..b44affbd840d
--- /dev/null
+++ b/sci-electronics/klayout/klayout-0.26.8.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RUBY_OPTIONAL=no
+USE_RUBY="ruby26"
+# note: define maximally ONE implementation here
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit toolchain-funcs python-single-r1 ruby-ng
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git"
+	inherit git-r3
+	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
+else
+	SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
+HOMEPAGE="https://www.klayout.de/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	sys-libs/zlib
+	${PYTHON_DEPS}
+	$(ruby_implementations_depend)
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ruby-ng_pkg_setup
+}
+
+each_ruby_configure() {
+	tc-export CC CXX AR LD RANLIB
+	export CFLAGS CXXFLAGS
+	./build.sh \
+		-expert \
+		-dry-run \
+		-qmake "/usr/$(get_libdir)/qt5/bin/qmake" \
+		-ruby "${RUBY}" \
+		-python "${PYTHON}" \
+		-build . \
+		-bin "${T}/bin" \
+		-rpath "/usr/$(get_libdir)/klayout" \
+		-option "${MAKEOPTS}" \
+		-with-qtbinding \
+		-without-64bit-coord \
+		-qt5 || die "Configuration failed"
+}
+
+each_ruby_compile() {
+	emake all
+}
+
+each_ruby_install() {
+	emake install
+
+	cd "${T}/bin" || die
+
+	dodir "/usr/$(get_libdir)/klayout"
+	mv lib* lay_plugins db_plugins "${ED}/usr/$(get_libdir)/klayout/" || die
+
+	mkdir -p "${D}/$(python_get_sitedir)" || die
+	mv pymod/* "${D}/$(python_get_sitedir)/" || die
+	rmdir pymod || die
+
+	dobin *
+
+	python_optimize
+}
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index 356d966db6c6..b44affbd840d 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 RUBY_OPTIONAL=no
-USE_RUBY="ruby25"
+USE_RUBY="ruby26"
 # note: define maximally ONE implementation here
 
 PYTHON_COMPAT=( python3_{6,7,8} )
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index ecf04b6ca1f2..84f0dae6096a 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -6,11 +6,7 @@ AUX magic-7.5.231-verbose-build.patch 1033 BLAKE2B 60ddb821cf09c0bd89c800b12da10
 AUX magic-ldflags.patch 1767 BLAKE2B 644e2cd816f1763103612376c095bd00b375a129136937842a0fec068d9651e001f31aa7f5575ae999087c7376b8d35cf3d224cb0ac34e124d8f308a6996f5e1 SHA512 ba61218111b7484bb6e60f37a3bbf5696afc887766d8de0ae0e33f9dc18023ee7eecf4b6c7012376afbfb2d3caa0e0421e03b0abee0ad1b2d9032ce80c65e355
 DIST 2002a.tar.gz 6601961 BLAKE2B e34bc281b3f1bc032ba14954b781c8b0055bb9125c57944a5b5f595f8b22feb455c60f3230cf04f06bc41aa807e909d900e3d3ab746076e2c99dcbbdf51a71df SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e
 DIST magic-7.5.202.tgz 3692294 BLAKE2B 8c484e7771b388df8a5e9df574a522f81b5ae34bfaa0db28f444f31a0f5737094d73d2f5467796df74f9230fe684e9c96b08b11812b5627ee5a1bcc74893a021 SHA512 62be6e781ab51a4129a520b91a35ff5c280e7e9cb825e5d71e4012205dd0b777ca8c2355fb071d7d716977d477bddd44e45ca2810d3f97bb63dfe46c5ad1ba80
-DIST magic-7.5.231.tgz 3751133 BLAKE2B ffe7b19cfadd84ab91d668f7f317fc53dcec4292348324a9cd6326370a6b8446db537667103169313b72ad5e5e78458e346e802744ab2856eae40d773d65f80e SHA512 ff1aa170c0fdbeb78aca7328370f40fde1a7276dd77e1b4d4d53f121b38ffecdc8b0d860dc92c1dfeccd1dd7685ee6079aa19984757025fc743ae1a88ed0aace
-DIST magic-8.0.138.tgz 3880247 BLAKE2B be6e11f55452c990ae443639ba6852d683323159104ef3626e96e5ddc275a420f0f8debfcb517a7ac38ecd04aa01dfc935e81634c740f1761a1bd3a6adb35c69 SHA512 934fb0afef7fd7aca1307a1e9c86d23531d4188d1bd03bbfbb3609cabec115f5ce66ef02b75f5a0aedbace0b1f68260585b279a6d7bc45f58a4e0ac09cd99d36
 DIST magic-8.0.207.tgz 3893605 BLAKE2B 39309def79e03fd6b116482eec2f200cb2b0d2042add2e2a70b0805bc0bc75654de6a92150167ab755b21c333be917c5fac53a30e9f5ee7915fd662179ce391c SHA512 034387d774f653d6de419d597564e96242b87bf3c478045e5a649f490fe4e5431c983f6667b5900ec9ae283af2775404dfbdcbaf18419f85d7242d492360d32b
 EBUILD magic-7.5.202-r1.ebuild 1721 BLAKE2B 2eaf8bc850835dcc7ec510fdd71a18fd3654fae568688f2a50f8322841aeb2f2fe721c4abe1a256a9ed489951c376992ee2e0707c589fe3377117d06a33e845e SHA512 698d8531caef501166e2540c6e53fcbc4da9527321f5b91cd6d79e00b21979077bfc2ce68608d2e899795f9a494c1681bee32ac56b69b7770d4f47464579e597
-EBUILD magic-7.5.231.ebuild 1934 BLAKE2B 88cc312145d39637118e9e3740dbde04b7af7d0a0d0d5d8fd9460f859d7246099e189dd7c9eda40c2717bede32d65807961a498d10fa8f626684e40cc65cd838 SHA512 015ec3d1db3b28324187f7576abbab166e5395dcac3e42d7a3899e1fc07e5f173c20cb8f004d4aa2b95a252329c8bd61824f057ebe5d8bb94581ca13ce3df4b4
-EBUILD magic-8.0.138.ebuild 1885 BLAKE2B aa06f2f70a520a16eb5ff7bd16b0f6d133f8e81354e04e707d28ee19a00dbad0deba879f6f5f3eaba4531d58501d53f075d32ed1453b1cecea734808d2ab6843 SHA512 30c6502e5fe1b5535053a617af962dc0fde2111c8ba10a5460807e8e35a9f660d47746011634fed7c244002acbda60dca2f1991ad683ebea96a9f5f8649a21c8
 EBUILD magic-8.0.207.ebuild 1827 BLAKE2B d20be40ad81156e7bfa972c54f0cfec489bd99a390c22c73a721d7d674a969f2464c6aa03942d23cad4690210d6c9458b0df95adf85159e51d812005153d9af2 SHA512 852ad04635ff30f7d1223317cce41a0e984e6758f3ddc99a4a62122f053789bfbf253e11e994d7dd99555c6d923a4b6b4417f96aaec6a39f13251b7823f6d159
 MISC metadata.xml 1380 BLAKE2B 91d45cef21553d52492f1c14be3910169bfcf04b303aacf5adc2578c1feef2912da59503cb07a406116365d6f59505aa17d7d1ca7dd760fe4d3280f759900567 SHA512 ee3d5c77eb2b7cd4c6aba5cfce27692efbd2166306add6f3a0dd6322a15ee46ea374c4e754896c922e1a33783e01a2458b4ca357806c5c9f60df70fbad30e228
diff --git a/sci-electronics/magic/magic-7.5.231.ebuild b/sci-electronics/magic/magic-7.5.231.ebuild
deleted file mode 100644
index b85ff98fcbd2..000000000000
--- a/sci-electronics/magic/magic-7.5.231.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib eutils autotools
-
-DESCRIPTION="The VLSI design CAD tool"
-HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
-SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
-	ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"
-
-LICENSE="HPND GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug opengl"
-
-RDEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	dev-tcltk/blt
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
-
-src_prepare() {
-	einfo remove bundled readline-4.3
-	rm -r readline || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-7.5.231-blt-test.patch \
-		"${FILESDIR}"/${PN}-7.5.231-ldflags.patch \
-		"${FILESDIR}"/${PN}-7.5.231-verbose-build.patch
-
-	cd scripts || die
-	eautoreconf
-	cd .. || die
-
-	sed -i -e "s: -pg : :" tcltk/Makefile || die
-}
-
-src_configure() {
-	# Short-circuit top-level configure script to retain CFLAGS
-	# fix tcl/tk detection #447868
-	cd scripts
-	CPP="cpp" econf \
-		--with-tcl=yes \
-		--with-tcllibs="/usr/$(get_libdir)" \
-		--with-tklibs="/usr/$(get_libdir)" \
-		--enable-modular \
-		$(use_enable debug memdebug) \
-		$(use_with opengl)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc README README.Tcl TODO
-
-	# Move docs from libdir to docdir and add symlink.
-	mv "${D}/usr/$(get_libdir)/magic/doc"/* "${D}/usr/share/doc/${PF}/" || die
-	rmdir "${D}/usr/$(get_libdir)/magic/doc" || die
-	dosym "/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc"
-
-	# Move tutorial from libdir to datadir and add symlink.
-	dodir /usr/share/${PN}
-	mv "${D}/usr/$(get_libdir)/magic/tutorial" "${D}/usr/share/${PN}/" || die
-	dosym "/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial"
-
-	# Install latest MOSIS tech files
-	cp -pPR "${WORKDIR}"/2002a "${D}"/usr/$(get_libdir)/magic/sys/current || die
-}
diff --git a/sci-electronics/magic/magic-8.0.138.ebuild b/sci-electronics/magic/magic-8.0.138.ebuild
deleted file mode 100644
index c437a36c0558..000000000000
--- a/sci-electronics/magic/magic-8.0.138.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib eutils autotools
-
-DESCRIPTION="The VLSI design CAD tool"
-HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
-SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
-	ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"
-
-LICENSE="HPND GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug opengl"
-
-RDEPEND="sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	dev-tcltk/blt
-	opengl? ( virtual/glu
-		virtual/opengl )"
-DEPEND="${RDEPEND}
-	app-shells/tcsh"
-
-src_prepare() {
-	einfo remove bundled readline-4.3
-	rm -r readline || die
-
-	epatch \
-		"${FILESDIR}/${PN}-7.5.231-verbose-build.patch"
-
-	cd scripts || die
-	eautoreconf
-	cd .. || die
-
-	sed -i -e "s: -pg : :" tcltk/Makefile || die
-}
-
-src_configure() {
-	# Short-circuit top-level configure script to retain CFLAGS
-	# fix tcl/tk detection #447868
-	cd scripts
-	CPP="cpp" econf \
-		--with-tcl=yes \
-		--with-tcllibs="/usr/$(get_libdir)" \
-		--with-tklibs="/usr/$(get_libdir)" \
-		--enable-modular \
-		$(use_enable debug memdebug) \
-		$(use_with opengl)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc README README.Tcl TODO
-
-	# Move docs from libdir to docdir and add symlink.
-	mv "${D}/usr/$(get_libdir)/magic/doc"/* "${D}/usr/share/doc/${PF}/" || die
-	rmdir "${D}/usr/$(get_libdir)/magic/doc" || die
-	dosym "/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc"
-
-	# Move tutorial from libdir to datadir and add symlink.
-	dodir /usr/share/${PN}
-	mv "${D}/usr/$(get_libdir)/magic/tutorial" "${D}/usr/share/${PN}/" || die
-	dosym "/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial"
-
-	# Install latest MOSIS tech files
-	cp -pPR "${WORKDIR}"/2002a "${D}"/usr/$(get_libdir)/magic/sys/current || die
-}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 48eec5c44172..bc0ae6e13679 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index b2122f3216e8..2ac6e295ce23 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,22 +1,8 @@
-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.18.1-do_not_rm_library.patch 629 BLAKE2B 21add51d3bceccedf6a9f4f210d608c5fdfb61406484b640ba24aae1f63b38943157f4e6164e39bb30d631ff22870715929f626ecd21fa13426eb7dabcd78ee8 SHA512 91f1a4b9301f220b7d21b446886cfdd0ec67b0568712bb8c82101d10b2d7da6ce142d06c42803a4e611fb039386e092628986db80fa60838d7aac3387e255eed
-AUX gpsd-3.19-do_not_rm_library.patch 623 BLAKE2B 340fe4d4f05feea02d087ff069500dfa747f2441aee65e02568955cda5397fa57a44adde03cf8a4f03893dc413eabd79243b478bba1f4b1d149540de2a248126 SHA512 44f3efef561bbc9b3f974699da0f4183d5b7693c7c1651957b285fc541f517b56c95562fa401c4ee030241b9c6ef43a530b4964871f38ba9412d2777640eb28c
 AUX gpsd-3.21-scons_conditional_python_scripts.patch 1629 BLAKE2B 7011d0bc1dd2062ad8cd0ab7e009039184e66c2b72c99d77fb43d296359e52b5e3d202df698640a305462437ed124c46876a7661793facfefc65cad71072648c SHA512 6b33ea7b13ef2a3ddcf534acb827f2da592eb585535b6d6b3f9d2c3fa9edafc4c5cc577c5e3f0d1fe1afd44aeea9618b3f839fadeb2b630379fb3dfb9d71d2d5
 AUX gpsd-3.3-setup.py 448 BLAKE2B 159a212afe7600a9835a03bd87130820a154147aab83c32500108df1d81726d571c7d21e3ac7729c0054859297b71ab42f6cb6c6e487242a46f8d0d91f7c5b0f SHA512 4036bac7c095ba89795b565461bda8f282b7e1476867437db2beabeb1ba3a2a1b5a5b748acaa9ee1a2df693d854654e07f86610f387995abd0b057d3684b651b
 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
-DIST gpsd-3.18.1.tar.gz 9031595 BLAKE2B 170863740c7281ea111c3f4db2dfeb67f4366da7e9e8d2f7f3bbddacbc9d2083558379b1fe60c9293c31a6428288d205aba565694fedde6f1dfe67999a6782c6 SHA512 b381b177fcd29089a61aa11f5df2c67473720a6bbc5590ca1c4fda627331c407de01c62caceeddae780626b9a02392e9a770d52a143357e1babdcc2fbff0ed38
-DIST gpsd-3.19.tar.gz 10581777 BLAKE2B 0801919c968b8027c357047dabdc8587e1d5950cb0d80f89d6d62678a11b3dfc76a6a89ae59123680dac3188a695d0c37618d3f83280f5e584e10c1fa9a5dc03 SHA512 c9f9a9ff65759f852771ec4cf97ab15343c9176a149dd5ea6c2e2dc18b47aa7c7bf9ff1f2e8523121564d33a34ae6aa08169c5454847b4fe7848e616fd20a814
-DIST gpsd-3.20.tar.gz 3600835 BLAKE2B 6c9a3540de1be9191a601d6666c18c79e8e8913a3b4455448bafd0fa81e3a1859bd4851d42c3d06aed48fd0910060919f87a661d02fec44c001e9a393d8658e6 SHA512 557ef5e5f3b511da4fc441f4bb2e0cd2e23c2981e8b3ce2999973767a04fde070d3ec6f14af60d0e471320078e9f4d1144e5796e7927975ecfbd55fc97f470a9
 DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e
-EBUILD gpsd-3.17-r3.ebuild 4707 BLAKE2B 856de5c3f6f684e1777ade59ad372d8fdf2e0c43824f3a9303f1f6be2cbbdf74cbb01f7348d9fe77511b979d97ef7e2cdad0b8b9bb84863e80d5ed225aade9ff SHA512 f55bdf4ed92208d488e71b94e2edd562427ae495d07f609be88a6c5c172a89cdedf76199eb4d136d4f81917ba874bbec0caf5f4abf1b5732d8ab7520932864ec
-EBUILD gpsd-3.17-r4.ebuild 4888 BLAKE2B 0e9f549feb461ef812e823c310604967f12482bcd03f569f7146a254bcc8e422ec2d3dcb444af4f989b42caaca8fc027504287b26564e0551e055f7bb1fac349 SHA512 18746122b46198d686a1a19d78b51ea489b9a20e3838438c383a96eec1b351080e03d38f6cd647781915818ee5270c9cfb1bb255dc4f246b57ac5aae9a52a19f
-EBUILD gpsd-3.18.1.ebuild 5449 BLAKE2B 8c05e5183d169603b61d8329ae794cb98b24b805cfdfe1ac32407d644a77049ebec31f31074c33bc189179c4cb3370eb826bff5a540a593c876f588ad0a7a9fa SHA512 16ec24d6b3b5f6a709aa68c5a69c675fe961ad0fbc6e7ed0c8cf1eef0a8288cfe2d602a08e6d53cb423c470810b7567ba76c2013526bf36078c767077d1d33e3
-EBUILD gpsd-3.19.ebuild 5455 BLAKE2B f432f96eeae1cca54265927e5ea431d489bbee690048fb9f423ca29176e5aa56d0e1d60d9a82694b4da2911ba63105b2f71ba32f1c757435a33d5d2d7224892e SHA512 bcb17fd87f8ecdc0047a4990d34bc730a67b5bdba8571a0d4a37f3f654283576bc7bcbd746e41373eefdd06041f478993b2acb4030f081cb5aacc01e1b9b973d
-EBUILD gpsd-3.20.ebuild 5374 BLAKE2B c82108bce746e73568011f7dc8c9c042a86151ac47a28566fbd3b5a6054fb2af3128c3fb928139d590797f5d11a05390bdfa4b0f728574634b03406dcfc8d7b5 SHA512 cdc68b867abfb9e60afba81471f045d9ad80a36469229f3bbcb4bd3c4124fc9b3c31aca880651be78d4131f251d897a7d458b2d96cad3e396216f66586c937d4
-EBUILD gpsd-3.21.ebuild 5548 BLAKE2B fb31544edb5a91d65c29745ca7d9cd5679b496e25f1d3f3c019f3d2488f375dd83e5fc674b808bb4a7bc0d11455e2c69fbf372854e29e292f0b442f7ea925559 SHA512 85548df1afaa3d8325427cbebf167238228e39adb850a9efbf3e83e12c009b02460fadf4a2c87c080a9b42a537a20daf1c8cf39416ce52c79b75374088af414d
+EBUILD gpsd-3.21.ebuild 5658 BLAKE2B e22ae37add6ff5ac203fbb48448816f475ee20d9990c9c54664e669c4d45da6a100043e986e2976582c4648a5793011935a6e6366d99357b36c3545aa2065853 SHA512 951727357db685523d7c7ab179ab887a534b8f46fe12056da635567d1bc8b9b1077121abd3a6a2a98ce460891dfa327dc77ccd884417abb685ee2af1f4f4f67b
 EBUILD gpsd-9999.ebuild 5522 BLAKE2B 9127fcc0421eabd1eca09f8bbd6494a008a0990aa4669d80d87024df6f421638a9662b937a12ea03cae4c7e189c00bdbe4a3fc78fe4529634ef4ff12cd8b11e0 SHA512 8375fdb71754aeecb7c58fe02e8082db4a0f57c9b04809d4fdf88756cf35c7c6a2eff34ed6e806b6843c88b662362441a98d7d20529d2aa0e1ad64bbce5178cf
 MISC metadata.xml 950 BLAKE2B 1187055e96b7b5f0288f76fafbe2b1afd29729365fbf30b7e8120830db76193aa544815fd348058ef59351d1c097747684ae022b0ec7df0f655c0a9e3f4d7449 SHA512 87fdd329ffe13ec6aee16b877b355b2aac2267e8262b30ab5ab04307bc50797e1e3da8328a540a0484b06cbbd2f643f084e556ce32cc01b37c97d0f8f1b6be2a
diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch
deleted file mode 100644
index 83e2907fca5b..000000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index c0f083a..4a98580 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries))
- binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version))
- # Work around a minor bug in InstallSharedLib() link handling
--env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
- 
- if qt_env:
-     binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version))
diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch b/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch
deleted file mode 100644
index 4d94d05f4284..000000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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
deleted file mode 100644
index d6154c47687b..000000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-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/files/gpsd-3.18.1-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch
deleted file mode 100644
index 0500f385d79d..000000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpsd-3.18.1/SConstruct.orig	2018-10-19 12:45:40.000000000 -0700
-+++ gpsd-3.18.1/SConstruct	2019-10-02 11:49:00.848685223 -0700
-@@ -1796,8 +1796,6 @@ # third-party client programs should not
- binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib,
-                                     libgps_version))
--# Work around a minor bug in InstallSharedLib() link handling
--env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
- 
- if qt_env:
-     binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'),
diff --git a/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch
deleted file mode 100644
index 8008dd54fe9c..000000000000
--- a/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpsd-3.19/SConstruct.orig	2019-07-01 19:00:17.000000000 -0700
-+++ gpsd-3.19/SConstruct	2019-10-02 11:49:06.080655901 -0700
-@@ -1980,8 +1980,6 @@ # third-party client programs should not
- binaryinstall.append(env.Install(installdir('bindir'), bin_binaries))
- binaryinstall.append(LibraryInstall(env, installdir('libdir'), libgps_shared,
-                                     libgps_version))
--# Work around a minor bug in InstallSharedLib() link handling
--env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
- 
- if qt_env:
-     binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'),
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
deleted file mode 100644
index 98c43cc1ab7f..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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"
-RESTRICT="!test? ( test )"
-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
-
-	# 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_setup
-	# 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)
-	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-3.17-r4.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
deleted file mode 100644
index 814c85acb356..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# 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"
-RESTRICT="!test? ( test )"
-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_setup
-	# 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-3.18.1.ebuild b/sci-geosciences/gpsd/gpsd-3.18.1.ebuild
deleted file mode 100644
index 466deda4514c..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.18.1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_6 )
-SCONS_MIN_VERSION="2.3.0"
-
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
-	inherit git-r3
-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="https://gpsd.gitlab.io/gpsd/"
-
-LICENSE="BSD"
-SLOT="0/24"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis 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 )
-	gpsd_protocols_isync? ( gpsd_protocols_ublox )
-	gpsd_protocols_ublox? ( python )
-	gpsd_protocols_greis? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( cxx )"
-RESTRICT="!test? ( test )"
-
-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} )
-	gpsd_protocols_ublox? ( dev-python/pyserial )
-	gpsd_protocols_greis? ( dev-python/pyserial )
-	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
-	# Merged upstream
-	#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
-
-	default
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_setup
-	python_export
-
-	# 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']"
-	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
-	use gpsd_protocols_greis && pybins+="+ ['zerk']"
-	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 python)
-		$(use_scons qt5 qt)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons usb)
-	)
-
-	use X && myesconsargs+=( xgps=1 xgpsspeed=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
-
-	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/usr/local/$(get_libdir)/python*/site-packages/gps*
-	find "${D}"/usr/local/ -type d -delete
-	# Install correct multi-python copy
-	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-3.19.ebuild b/sci-geosciences/gpsd/gpsd-3.19.ebuild
deleted file mode 100644
index 881256686bca..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.19.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
-SCONS_MIN_VERSION="2.3.0"
-
-inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
-	inherit git-r3
-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="https://gpsd.gitlab.io/gpsd/"
-
-LICENSE="BSD"
-SLOT="0/24"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis 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 )
-	gpsd_protocols_isync? ( gpsd_protocols_ublox )
-	gpsd_protocols_ublox? ( python )
-	gpsd_protocols_greis? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( cxx )"
-RESTRICT="!test? ( test )"
-
-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} )
-	gpsd_protocols_ublox? ( dev-python/pyserial )
-	gpsd_protocols_greis? ( dev-python/pyserial )
-	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
-	# Merged upstream
-	#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
-
-	default
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_setup
-	python_export
-
-	# 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']"
-	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
-	use gpsd_protocols_greis && pybins+="+ ['zerk']"
-	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 python)
-		$(use_scons qt5 qt)
-		$(use_scons shm shm_export)
-		$(use_scons sockets socket_export)
-		$(use_scons usb)
-	)
-
-	use X && myesconsargs+=( xgps=1 xgpsspeed=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
-
-	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/usr/local/$(get_libdir)/python*/site-packages/gps*
-	find "${D}"/usr/local/ -type d -delete
-	# Install correct multi-python copy
-	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-3.20.ebuild b/sci-geosciences/gpsd/gpsd-3.20.ebuild
deleted file mode 100644
index 8953467697c5..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.20.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
-SCONS_MIN_VERSION="2.3.0"
-
-inherit eutils udev multilib distutils-r1 scons-utils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
-	inherit git-r3
-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="https://gpsd.gitlab.io/gpsd/"
-
-LICENSE="BSD"
-SLOT="0/25"
-
-GPSD_PROTOCOLS=(
-	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
-	gpsclock greis 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 )
-	gpsd_protocols_isync? ( gpsd_protocols_ublox )
-	gpsd_protocols_ublox? ( python )
-	gpsd_protocols_greis? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( cxx )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/gpsd
-	>=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} )
-	gpsd_protocols_ublox? ( dev-python/pyserial )
-	gpsd_protocols_greis? ( dev-python/pyserial )
-	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
-
-	# Avoid useless -L paths to the install dir
-	sed -i \
-		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
-		SConstruct || die
-
-	#Fix systemd binary paths
-	sed -i -e 's/local\///' 'systemd/gpsd.service'
-	sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in'
-
-	default
-
-	use python && distutils-r1_src_prepare
-}
-
-python_prepare_all() {
-	python_setup
-
-	# 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']"
-	use gpsd_protocols_ublox && pybins+="+ ['ubxtool']"
-	use gpsd_protocols_greis && pybins+="+ ['zerk']"
-	local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
-	local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])" || die "Unable to extract packet types")
-	# Post 3.19 the clienthelpers were merged into gps.packet
-	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 "/@GPS_CLIENT_SOURCES@/d" \
-		-e "s|@SCRIPTS@|${pybins}|" \
-		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	scons_opts=(
-		prefix="${EPREFIX}/usr"
-		libdir="\$prefix/$(get_libdir)"
-		udevdir="$(get_udevdir)"
-		rundir="/run"
-		chrpath=False
-		gpsd_user=gpsd
-		gpsd_group=dialout
-		nostrip=True
-		manbuild=False
-		shared=$(usex !static True False)
-		bluez=$(usex bluetooth)
-		libgpsmm=$(usex cxx)
-		clientdebug=$(usex debug)
-		dbus_export=$(usex dbus)
-		ipv6=$(usex ipv6)
-		timing=$(usex latency-timing)
-		ncurses=$(usex ncurses)
-		ntpshm=$(usex ntp)
-		pps=$(usex ntp)
-		python=$(usex python)
-		# force a predictable python libdir because lib vs. lib64 usage differs
-		# from 3.5 to 3.6+
-		$(usex python python_libdir="${EPREFIX}"/python-discard "")
-		qt=$(usex qt5)
-		shm_export=$(usex shm)
-		socket_export=$(usex sockets)
-		usb=$(usex usb)
-	)
-
-	use X && scons_opts+=( xgps=1 xgpsspeed=1 )
-	use qt5 && scons_opts+=( qt_versioned=5 )
-
-	# enable specified protocols
-	local protocol
-	for protocol in ${GPSD_PROTOCOLS[@]} ; do
-		scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
-	done
-}
-
-src_compile() {
-	export CHRPATH=
-	tc-export CC CXX PKG_CONFIG
-	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
-	escons "${scons_opts[@]}"
-
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install "")
-
-	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
-	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
-
-	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/python-discard/gps*
-	find "${D}"/python-discard/ -type d -delete
-	# Install correct multi-python copy
-	use python && distutils-r1_src_install
-
-}
diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index 6cbd9be5a865..c5109b205bda 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild
@@ -6,14 +6,14 @@ EAPI=7
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit eutils udev multilib distutils-r1 scons-utils toolchain-funcs
+inherit distutils-r1 scons-utils toolchain-funcs udev
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
 	inherit git-r3
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
@@ -94,13 +94,18 @@ src_prepare() {
 		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
 		SConstruct || die
 
-	#Fix systemd binary paths
-	sed -i -e 's/local\///' 'systemd/gpsd.service'
-	sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in'
+	# Fix systemd binary paths
+	sed -i -e 's/local\///' 'systemd/gpsd.service' || die
+	sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in' || die
 
 	default
 
-	use python && distutils-r1_src_prepare
+	if use python ; then
+		distutils-r1_src_prepare
+	else
+		# We're using escons, bug #734352
+		python_setup
+	fi
 }
 
 python_prepare_all() {
@@ -185,8 +190,11 @@ src_install() {
 	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
 
 	# Cleanup bad alt copy due to Scons
-	rm -rf  "${D}"/python-discard/gps*
-	find "${D}"/python-discard/ -type d -delete
+	if use python ; then
+		rm -rf "${ED}"/python-discard/gps* || die
+		find "${ED}"/python-discard/ -type d -delete || die
+	fi
+
 	# Install correct multi-python copy
 	use python && distutils-r1_src_install
 }
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 3d896cea5503..d721f59f69f5 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
index 25f79e46458b..db7e1a605569 100644
--- a/sci-libs/Shapely/Manifest
+++ b/sci-libs/Shapely/Manifest
@@ -2,5 +2,5 @@ AUX Shapely-1.6.4_p2-test_operations.patch 722 BLAKE2B 661659bc1d2f8c8a5d6b77f0c
 DIST Shapely-1.6.4.post2.tar.gz 225745 BLAKE2B 96e995db6dd1464bac7c2562efdc7f298a5f23c388e44f334db685b1cfa1025ff403db870e11328977a267483726504e03b6d7c47fe4234a3a5966a13b2b7311 SHA512 027c816ef2104f654569ca658b52b87c60e5ba6a45927fcc51c23dd1922f3f9f7fdcea3601160b0a999e39611617142833ccac790777093be8b96a0d9083f78f
 DIST Shapely-1.7.0.tar.gz 281419 BLAKE2B 1a4e84104f21d2f5a5eb810883a89deb20fd47cf146efed884994786364b29bb5a194b063a50ae21842c07c335cbbee0c3d1a1e4ff4e43e0d083080fe33815ac SHA512 4d944fc6727e11d004ef7ba0325c159aa5ae03043f17b029ab0a399d6dcd361c4d299ad864a045a99b0229e333d5b42634bc6fd1ed94b914b7cf58fb886af2de
 EBUILD Shapely-1.6.4_p2-r1.ebuild 1237 BLAKE2B b51a668790e3cfeb75a7088bb25f57d8b4aa5a52e8d056d87693db69cacfa56c2f33c40509475f118bb77b9d583f62028b58a9dd9940417ba135739fbecd69bd SHA512 2695c1473dc5c02ba056f12dbb4c43d98209976411f69dd03c04550abc9d5dae00b703dcaa3238d08010cb7d9b90cec66bbe45f3a39aadf1f58e122a33a7b1bd
-EBUILD Shapely-1.7.0.ebuild 771 BLAKE2B b4a44431198e9a5ff19b0389a43d4485ebffb630590f6706744b73236f0ace0408e7120804b37b1deaa7a8e51a010bdb8261579ebc8675f38b5bb93092b56e02 SHA512 18d77d5124d8725f3b537f2bca0099177d12ad9c04df054273ca4fb22e71982415c16604ff604e9ac7f1eb46f60c57f70ef1d333914ee2db4942a15096d720ac
+EBUILD Shapely-1.7.0.ebuild 778 BLAKE2B d2b6e62575cbb785b4a6ec2201badb2910661bba281ed8dcb06052982788b096c9f7bc3e9baaa73d470d93de29729d890f6a363fb6b0cd1b34c822c05556e9f6 SHA512 c3c062ce96c00da0be73aa75b2458ec95fff4a20dc703b06c48b8fda7d248f553c027d2a405d83c6de5fa8a3f96280a4f2393c2da5858b75d7c215b71b7eea31
 MISC metadata.xml 774 BLAKE2B 418f9b236cefcea8bd6d1e4a7b7d85b2f0ff55060a6e4c75597d4db592a51e843264817643e8d0758bb82a35f1fc60bf99353561590233485122bb4869e584ce SHA512 7f580b0fbdb663892f4454815e29ceae0d31ce4d29659de7e4478f7ff86fc03625eaf65c643dbd24d4ffc30a7f0b6f535658b4d084dc25c3c47cbca92d7fc210
diff --git a/sci-libs/Shapely/Shapely-1.7.0.ebuild b/sci-libs/Shapely/Shapely-1.7.0.ebuild
index 83aed726c948..a9bd484c2d61 100644
--- a/sci-libs/Shapely/Shapely-1.7.0.ebuild
+++ b/sci-libs/Shapely/Shapely-1.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Toblerity/Shapely/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/sci-libs/brial/Manifest b/sci-libs/brial/Manifest
index 957ab7326ff0..4478580092f8 100644
--- a/sci-libs/brial/Manifest
+++ b/sci-libs/brial/Manifest
@@ -1,3 +1,5 @@
 DIST brial-1.2.8.tar.bz2 1228732 BLAKE2B f9bdfc9416381f3436c555861806a7ea4680e706729b6de9c2b06ea2908090b87b745fe5ce2d94ba9d5832a78067e4848f8ef113b7d8dc22557b6d95b7dad707 SHA512 a94acba140d976dd070b5214c537fb3dba89fc2309addc566b8f0a031328f2d4c2bb3c38c2cb5565c7ff2ca0c5f7f56ca120899d15c768887d3b61a18b3e05be
+DIST brial-1.2.9.tar.bz2 1230234 BLAKE2B c083931793976deee592e91efcc8ae2fa501c5a2b5cb04fd8449e225c84d5bbe9255480641694e8aac4f299c6ab1800bf21713278d0f8def4a1f335643751cdd SHA512 f5dfcab6b324d1151e06ce3af0f085ebf692d26cd4b38203c835a35a6f0f25d09f6c4a6ebf44b12c3a9c9125dddb2e94a43f1d04b59d07995392b50ada54d410
 EBUILD brial-1.2.8.ebuild 979 BLAKE2B 1c72e16b99e8f3512b3b16bb4c30525c09772e7702029f43a3b1ad10b7e1d218cf72af004003b867eb486b0731d924ddd1de5edc66eb5f1b28e3f1da924ea596 SHA512 65aa634cb876a4ac84fc04ac33c66157d8c8dd727b88a2018c935be54adebfa4fa9d77ff352933e6731e30c1352b62ff1b68d5b436a823fe9d2e8b0c58983c40
+EBUILD brial-1.2.9.ebuild 983 BLAKE2B 64e08bbdb530f70243a503e5e243e859c74d6c53961a964a9af3089c2922110653db946a2e512ac37fd5dbfec5107e753c52568d8f70fb98ae1ee6d5168462c6 SHA512 953d52de88b03cacd45dcfe7a77b2a94bc8fdc80f5c81bc212f03b9270f6b006daf63ecc1fffcb0cdd8aeee5f7f4f424d6c27ca30b89eaa57a5dc5f2a777a337
 MISC metadata.xml 1046 BLAKE2B 34c6f471ca6fbc4538cf3a2dc71bd19d4201656f326166b2589be3126f73f5ff34d190c2ff42154a067457a9da6f05067e782c9dc340357895ca016be6983183 SHA512 550a191f11f7812c363d419e8bed69fdd70e69b3a94e6fba838be9bc04050977edaab34ab0c0ef9c589e6478cdf2d40ba631983f6a2f411e51b9f3964bb48db5
diff --git a/sci-libs/brial/brial-1.2.9.ebuild b/sci-libs/brial/brial-1.2.9.ebuild
new file mode 100644
index 000000000000..e1831c017fc6
--- /dev/null
+++ b/sci-libs/brial/brial-1.2.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A C++ library for polynomials over boolean rings"
+HOMEPAGE="https://github.com/BRiAl/BRiAl"
+SRC_URI="https://github.com/BRiAl/BRiAl/releases/download/${PV}/${P}.tar.bz2"
+
+# The top-level license is GPL2+, but cudd/LICENSE is BSD.
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="png static-libs"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/boost
+	sci-libs/m4ri[png=]"
+RDEPEND="${DEPEND}"
+
+pkg_setup(){
+	tc-export PKG_CONFIG
+}
+
+src_configure(){
+	# with-boost-libdir added to deal with some rather quirky setups
+	# see https://github.com/cschwan/sage-on-gentoo/issues/551
+	econf \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable static-libs static)
+}
+
+src_install(){
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/coinor-cppad/Manifest b/sci-libs/coinor-cppad/Manifest
index 894260c0265c..337428a0889f 100644
--- a/sci-libs/coinor-cppad/Manifest
+++ b/sci-libs/coinor-cppad/Manifest
@@ -1,8 +1,5 @@
 AUX coinor-cppad-20140519-boost.patch 2799 BLAKE2B 973de79d9d4b33ac7c35758eb8bde7d59fdda8ed84380ffb46f56e179de589e3a9378cdb02246f6525047a7b08a67b6caa1476f354e84d06727dfc29ba327112 SHA512 fe3af84b635aeefc30dedee488914f1de00d139756b2fa5c1f39c95b3886860c88ce02d8aaea6d0ec467f135bf17e8f2ce6df427fdd4d11188dbfe1a080cc014
 AUX coinor-cppad-20140519-dash.patch 7659 BLAKE2B 2bbf233f1d5081d29c5520612892c26bee210bcda651e8009ec928bf4063a2779e8590278dc38f5cceec3135be79ad825831ef4e8abd624f3f435d439371981b SHA512 a1aa44e9949d67823492f0296ba51ebdbb2f201855903a9571dfb686b6a42ac3756c577167ee7e8cf664872db0d570ec7576085d0f9d6642b78096708f83cf04
-DIST cppad-20140204.gpl.tgz 2189463 BLAKE2B 559162f45ebcb9cf11e0df5293430c5ce93c8993205c088639968ca52091a51e8d03a4e19a37d6c8e5949bc2b65f9eff7207d8e70f745e0c1748cb1dec963987 SHA512 0cead73e8d2e2da43ea22c003c0feccadefd2f66efbb58df45b79bff51181ad8646063fd053af8d377ce1732609c55175fd53c00142eb6635018878541f6d2ed
 DIST cppad-20140519.gpl.tgz 2208236 BLAKE2B 5d53891ef3b458c3914f5d59f6656290be2811fbc84ca3f9bd253ce4620b1a4b00397e1beed694cdc5284a1f74441b68520b861c90d158c4eee11d1f8927b362 SHA512 8f47e545bc76f66edccb9ea083ddebcb5852fa1807d727b6e1f445ca74731e74f7614a1d33b48c6eafbc5129b319e513594b415ee838bdc634f9c00a6d9a22af
-EBUILD coinor-cppad-20140204.ebuild 1039 BLAKE2B 3dc642a879d7c2525d01208835209e0291bacebf5d5934686cc3b278dbcc68de09a6271e42ebfeb2837b28c43699f64d0727f9e3d4f4fabc0d86f52643b607e7 SHA512 88d0afbfee4de370dab34ee49d0efce0ef146db2e135e85e1b82c263af0d719957a415f9118fb225c907d7be86ef2ac903976d56e73e8529a84cd2cc9813d06d
 EBUILD coinor-cppad-20140519-r1.ebuild 1169 BLAKE2B ce2fde6a966575d7893b13414c0ee0c6bfeacbe1a3a4b5ca7ad47fc17ec3369108748b03f490e0e8cd7710ab2b30145529d75eb2521202595642a986fcf49edd SHA512 1c9681cb5e7ab7d3d0b7136994acc37f4bf3acd733b80033263b47f8b887e0d727ca062372a55722b83e641f3fdcff134cb85b29b91d6d2a771073cbb5ad3095
-EBUILD coinor-cppad-20140519.ebuild 1041 BLAKE2B 9bb4bed4855e0f488c6f8c3eb1e7deccb7ed05c8f8f4d3681af1fadf23b26efcc28d167df2b5ecbce93301e71284616342bcf43dc0ccaf490aa64eb808673431 SHA512 7b20f8c8e9cbc52397cba87610ba83e79f2006b9b47bfc48b1666505e581736caeafa4e8a4916acbbb112ba69d2d6e01edfdd1dc555c352c42b64c2b6669f857
 MISC metadata.xml 730 BLAKE2B d2a7b1e486d64f316b3f021d12c109f2779136607438dee059eb3c70f30bf0ba82475f0b49ce8e6d9f5187aec520abc265df769c2b44c6c7f1a8937481e13a1d SHA512 4803e579d3c8d6f83a7ad08658025fe7e366eab3996ba36d6352ef2bf1a36a5b2dce608731604f25a73f23e9ab45a6b100a542ce001408184e799f1def985634
diff --git a/sci-libs/coinor-cppad/coinor-cppad-20140204.ebuild b/sci-libs/coinor-cppad/coinor-cppad-20140204.ebuild
deleted file mode 100644
index 77d4f5ebc898..000000000000
--- a/sci-libs/coinor-cppad/coinor-cppad-20140204.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYP=cppad-${PV}
-
-DESCRIPTION="COIN-OR C++ Algorithmic Differentiation"
-HOMEPAGE="https://projects.coin-or.org/CppAD/"
-SRC_URI="http://www.coin-or.org/download/source/CppAD/${MYP}.gpl.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	sci-libs/adolc:=
-	sci-libs/ipopt:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-S="${WORKDIR}/${MYP}"
-
-src_configure() {
-	local myeconfargs=( $(use doc Documentation) )
-	autotools-utils_src_configure CXX_FLAGS="${CXXFLAGS}"
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use doc; then
-		./build.sh doxygen || die
-	fi
-}
-
-src_test() {
-	autotools-utils_src_test check test
-}
-
-src_install() {
-	use doc && HTML_DOC=( "${BUILD_DIR}"/doxydocs/html/. )
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r example/*
-	fi
-}
diff --git a/sci-libs/coinor-cppad/coinor-cppad-20140519.ebuild b/sci-libs/coinor-cppad/coinor-cppad-20140519.ebuild
deleted file mode 100644
index 8294efcbd21d..000000000000
--- a/sci-libs/coinor-cppad/coinor-cppad-20140519.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils multilib
-
-MYP=cppad-${PV}
-
-DESCRIPTION="COIN-OR C++ Algorithmic Differentiation"
-HOMEPAGE="https://projects.coin-or.org/CppAD/"
-SRC_URI="http://www.coin-or.org/download/source/CppAD/${MYP}.gpl.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	sci-libs/adolc:0=
-	sci-libs/ipopt:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-S="${WORKDIR}/${MYP}"
-
-src_configure() {
-	local myeconfargs=( $(use doc Documentation) )
-	autotools-utils_src_configure CXX_FLAGS="${CXXFLAGS}"
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use doc; then
-		./build.sh doxygen || die
-	fi
-}
-
-src_test() {
-	autotools-utils_src_test check test
-}
-
-src_install() {
-	use doc && HTML_DOC=( "${BUILD_DIR}"/doxydocs/html/. )
-	autotools-utils_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r example/*
-	fi
-}
diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest
index 55a524dd1d6e..cb3cd2055565 100644
--- a/sci-libs/keras-applications/Manifest
+++ b/sci-libs/keras-applications/Manifest
@@ -1,5 +1,6 @@
 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 545 BLAKE2B 3c15aa73da882251f52cf1003966d6d7c696fcbe90573512340ddd81cfc3f5f5f7e983f9b5f79980dcdad10e57886d8695230ac6b4e1163e152480ae2a61c127 SHA512 3eb8da437ec1b8dfe8db19a6498c35315e7a10de07cc8fd7add6901ab50f37663b77c1863dfceb8364395505e9470a5b6f0280bcb6813045a4798110adbb739e
+EBUILD keras-applications-1.0.8-r1.ebuild 547 BLAKE2B 6e9686b376dda74e5fbd306f92dbf573103c61a858dc68b5172b42167878c1c5e43d107aae4f1b203c5e625d238ca0b6156357afc3d5fd92cc54ecb7c381e177 SHA512 3d4d1c3f4f9b2d2b0508a6f008ffb3e0710a6624a9c4179a5bc93596c3860de28eee7a668b51fc343dc7e8592ff69843c4df07485f0d6e75c5c47a23c14fea65
 EBUILD keras-applications-1.0.8.ebuild 545 BLAKE2B 3c15aa73da882251f52cf1003966d6d7c696fcbe90573512340ddd81cfc3f5f5f7e983f9b5f79980dcdad10e57886d8695230ac6b4e1163e152480ae2a61c127 SHA512 3eb8da437ec1b8dfe8db19a6498c35315e7a10de07cc8fd7add6901ab50f37663b77c1863dfceb8364395505e9470a5b6f0280bcb6813045a4798110adbb739e
 MISC metadata.xml 621 BLAKE2B 4f375ddfcfed6172df186350f7bd3dbfbcacea34f555b14719af43f58b140d73e378cd0a5efd8438ed2a0006f3552febc684b4fce85aeb88fb2c9bf819c06c4b SHA512 9dbb366d483843279cc7532b56a877313a7c39de25c93c313a2957092f9766ce5715a83dd87ef116d1733a7cc399319025ce1eb0e7ad174e2b7441360a9f5560
diff --git a/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild b/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..78bc7b1dc8d1
--- /dev/null
+++ b/sci-libs/keras-applications/keras-applications-1.0.8-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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 ec7e99953347..17db55bfd7ad 100644
--- a/sci-libs/keras-preprocessing/Manifest
+++ b/sci-libs/keras-preprocessing/Manifest
@@ -1,5 +1,6 @@
 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 595 BLAKE2B bc5f3052d03249c8210460d2b15a3252b4f4818fe8924f885a0cdad36ee429fd22c2f5e31c93306e6014ef42bc8a0c18cc92c4aed579f0c2791570fef63a4765 SHA512 8cb56546d094f03c846d5cf32fb4c38266cc8029e6caca76005f07b3afc5f2a77a28aa571742f77fb640a06e14aa2909d9b319061484e76f08d9230d3552d821
+EBUILD keras-preprocessing-1.1.0-r1.ebuild 597 BLAKE2B 226f15626ef1ffdebcb5bba1235ea3bf514f42eaa0579acd44d98c4a9cb5ce6ed7e4e7adc6fe27ef9085053acfb274804640640bd960b20acd85db8b63aafefd SHA512 d0d663f7697d9a76d0c4ee8bd32736a21da91ed12c13f33719ead1d685f6ffced6bc9042a6ea075ffa47f72552bb475ff9d7652b48b446b9cdd43661a095b35f
 EBUILD keras-preprocessing-1.1.0.ebuild 595 BLAKE2B bc5f3052d03249c8210460d2b15a3252b4f4818fe8924f885a0cdad36ee429fd22c2f5e31c93306e6014ef42bc8a0c18cc92c4aed579f0c2791570fef63a4765 SHA512 8cb56546d094f03c846d5cf32fb4c38266cc8029e6caca76005f07b3afc5f2a77a28aa571742f77fb640a06e14aa2909d9b319061484e76f08d9230d3552d821
 MISC metadata.xml 585 BLAKE2B a2f92ac4e2b9af055313a13de9bcbaee7ab7ca2efa4790c82027aece4b629bfa7a73c5ed0286b0f24f1853330057527009afe6ab1722f19d9c504a9d0737e827 SHA512 371cc3f5897bd28c62642a8857a22e775e24aa917bc0e58bb4de4e0a2a6580174ba35cfda2e8dd83599e2180fdfb3f11a953e7076c6d87073e1465b145b115e9
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0-r1.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..3a96094ba07c
--- /dev/null
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index cc878fedd996..bd36f953d608 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,6 +1,7 @@
+AUX lapack-3.9.0-build-tests.patch 591 BLAKE2B 3db7dad6b798e5e9a4d050b05ef318aebd564d7fca3b3ac12c44f460eb6653693476f016c8a4d6369e4f4e4aa06aa7bf4a1cea38083758e8257f8cfd36c41d9f SHA512 642073d65ab1d5b7beb06e90cd4777ed89f4a76dcd5ec26025fa254ab243c8c09dcd4ca17b8d406e55cdbd302eab36f34a429dc3963a11827209246ebf2251cd
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
 DIST lapack-3.9.0.tar.gz 7534567 BLAKE2B 408013a11a72e0262d144adfdf6db28a6efa3bb5446f9ff959bb88fe10459dfa621149ed0144630a55e73e3b5be3c704269a716eb195f6db7b39d345b4db8270 SHA512 424956ad941a60a4b71e0d451ad48db12a692f8a71a90f3ca7f71d6ecc1922f392746ea84df1c47a46577ed2db32e9e47ec44ad248207c5ac7da179becb712ef
 EBUILD lapack-3.8.0-r1.ebuild 3011 BLAKE2B a8efb95f7d55e08b16cd1e784fdf25b57f45ce1182fd5b461384bef75ae3abc5efc49066ab9f1e015c2861f0ff1fb5039db079bb48bb18899ce521a6f07798d2 SHA512 d46ec6260889139d1b721a88de7e2b428742238fde74555dc933d02820835fe804394f401ebf6d605b08016da803ac33f726545fea2f567ece89c99d0113cb2e
 EBUILD lapack-3.8.0.ebuild 2959 BLAKE2B 415318e59b79d7bca4a4faefcc7f6b080287589eab098cbd32d72d77ad31b28ba9d6536527308340feeb6141cb8439bed73d18fd7f3b4b403cbcb5e3661765f1 SHA512 aed62d7a3b58f0bb4e658ddae720ce3b872aa5416b9aa54b30cca1beb2c4350a8ce0899ba7de1cf7e4782e459baf56b8ba4ac2306b8f9e6fb0ab412d2da88ffb
-EBUILD lapack-3.9.0.ebuild 3047 BLAKE2B cc386a1a3b1ced9bdff9cb76d4cbddd5711aa427c7b6548bd04bd5af0678944f57ea15832ed17a9562838a39f2347c4ea65900b6117893fadf430da61492e60f SHA512 d1d93475f5f9ace05c5ebff892cd52336c5cdc3cd2cf8c13f2366e102471c17ee8011c9bc584ef2af1ab3b66886d8a3980e50eeacd2500677aa68de3cddc39a2
+EBUILD lapack-3.9.0.ebuild 3105 BLAKE2B cf20345444e6a2a9ed6fe8ef7310d4d8903dc288e64e55b9a2e63dcaf3e5af04c2841de5b8245c117f498f64add85ac95c378d12a9e1bc20f234d85bc4b6f809 SHA512 7b8b2f77ef85cf31827e6a4609cc7d091ed998e7b0d3427c7ec380651cf87d4d2241227d15ad46a27e95826defc56bd31616fbd1340891b5029bc79e597a71e4
 MISC metadata.xml 1490 BLAKE2B bcb933b7cc3c3ae6f33e7c8ae9ef12475477ecd3351901cfba5dc955430def35df18e5ab41624cb99f2c1551fc38153138195e4e95ab40d3cf92e5685ce68fc5 SHA512 a99af3086d63488e7a2b8cda2f3727ce31eb0e62dd75a9cf64e44a203068866a06c7d6e119665e663c49a1afccb7a70982fd831735d958b73b6dcdf52c8ef5b1
diff --git a/sci-libs/lapack/files/lapack-3.9.0-build-tests.patch b/sci-libs/lapack/files/lapack-3.9.0-build-tests.patch
new file mode 100644
index 000000000000..1dbcd6d9f677
--- /dev/null
+++ b/sci-libs/lapack/files/lapack-3.9.0-build-tests.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9dbf97..9635ba4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -127,7 +127,7 @@ set(PKG_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+ # --------------------------------------------------
+ # Testing
+-option(BUILD_TESTING "Build tests" ${_is_coverage_build})
++option(BUILD_TESTING "Build tests")
+ include(CTest)
+ message(STATUS "Build tests: ${BUILD_TESTING}")
+ 
+@@ -443,4 +443,4 @@ install(FILES
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
+   COMPONENT Development
+   )
+-  
+\ No newline at end of file
++  
diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0.ebuild
index cc1fc963b7ce..87c344ba13b5 100644
--- a/sci-libs/lapack/lapack-3.9.0.ebuild
+++ b/sci-libs/lapack/lapack-3.9.0.ebuild
@@ -30,6 +30,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.9.0-build-tests.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DCBLAS=ON
diff --git a/sci-libs/libint/Manifest b/sci-libs/libint/Manifest
index 0f25fe10bf50..d70bf14f8006 100644
--- a/sci-libs/libint/Manifest
+++ b/sci-libs/libint/Manifest
@@ -1,8 +1,6 @@
 AUX libint-1.1.6-as-needed.patch 2733 BLAKE2B 9ffec6e80030c1226387f51fb3e0409d22521d4af8747943430eeab85f8b3bd9c2b18394ef1b08a0818931e120198c3811fc79d326d4e307f820d5192ebf78e2 SHA512 69281b26c69f5cae1e33f53c58b8a7b383ae83fa8309db03a505e6df3ca018acdf5e4998b42c9d4d1cfda2eaaf36903c1a39211664358506a90cde7e1012ee8d
 DIST libint-1.1.6.tar.gz 256404 BLAKE2B c754e25f0c3bc6c52eb434beafd2cb794a2e715003ee9409d76e8ae06e0ce19a42a9331ad4db9be2745d6820e7248210d10b4c004146e99192fd16fd2c31966d SHA512 cb39d73e89431c324e32d4a71593fe913c7ae2132677d4600e63ce1ed99e8e431758f0aa3d130991da841e98a1064fa931eb0e82dbe80af4c0ece10ee3a4f2d7
-DIST libint-2.0.5.tar.gz 3209528 BLAKE2B 348dd7e2bf17504e19522f053e4dc25936702e7feea1342954af1fc3656711b38b70676c0ac574ee37bb74b37ca30b323d29d156c90711a127b7404b0ca8d5cd SHA512 d7717a6337b73645dcb77d3c0731df17884b4c662b0d52061b7b80ac0ebd9de344e6c301294f714db09e7b6e3dff5b4b6958ef06122303df52d0ebb6a011cf24
 DIST libint-2.6.0.tar.gz 24743255 BLAKE2B 3ab7baba012828485c6c8425bce100e1ab50d2a3c8443ea2ef5cf173d58d8aa211a07e837b10a7f89d7e57f2e15b9384060bbf7b9885f32e9426525e65e15960 SHA512 56343c64b0dfb829702f4bb2fe14a04ad063acd7cb8b5a21cd1a45a830944c1ee98c888c9a28d6746b1bc17459aefcfb0aafe6ef310bfe554056212ad19e43ef
 EBUILD libint-1.1.6.ebuild 955 BLAKE2B 3b9e1a5074e9d8ff91ad97b7682a0cd658abe256c331c9b270056148aba64fd0e0eb9a0f93388b25d880c9ef017408e768888fe5463900e8264f85e0c843645a SHA512 53f1b0ffc316cb021f05ca6432c24ea8c316bcb87f02149a7a0f8b6401c845d13a5f20b4fa954eee0c25c32b5325bc1f01de8ac183492c9b6f36994c7fddc491
-EBUILD libint-2.0.5.ebuild 1264 BLAKE2B 0529b5a36ffe36834704b5ddcd4c1ddfa35c19fab7c3ae1f2ec0c937f52e696610a4ebd642cb6f6c3d285f438b283c47a9ced694495739aa11095381221d5f23 SHA512 8fdc559388dc21827832087f0b7e749654dcd2da492c83059674a38ed8b63f296c120ad6282a6d5daa63f27a45aad2e1a30a5f303874e98f9daff131c7c1310e
 EBUILD libint-2.6.0.ebuild 1142 BLAKE2B dbcf21cb24b82b024aaf58ccdfc50db19fb942b72cdfca95be9feba3b549ba84749cc6d948afbb0687335c710c4cc0ca275fb65ed0e30d7bdc028cc6e8c18883 SHA512 f48c2a64fcf9bdda80d98d71c750df875ff0b9c031c7407e39985c83b06a151d184d5ce5831786e3b403ece06e2abb206b507f3b506e685cadf50e543c95928c
 MISC metadata.xml 612 BLAKE2B bc2b11edd30d0db99860d1d005c56c428c75be96224fa3285fd3cde6f35af0f142b445254214af00308a29ee8965505a8dfe14ffb2e80b57ca42ef20c91bf100 SHA512 db9172c0e887d45f42914159eae83c0f11b40fbafac31395c782ff959cdccad8a62a8d468cec66d6e362cd8ea09aa3b05057d19fff8a1f94b9bd472be97d04b0
diff --git a/sci-libs/libint/libint-2.0.5.ebuild b/sci-libs/libint/libint-2.0.5.ebuild
deleted file mode 100644
index 625e42a700c7..000000000000
--- a/sci-libs/libint/libint-2.0.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils fortran-2 toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators -)"
-
-DESCRIPTION="Matrix elements (integrals) evaluation over Cartesian Gaussian functions"
-HOMEPAGE="https://github.com/evaleev/libint"
-SRC_URI="https://github.com/evaleev/libint/archive/release-2-0-5.tar.gz -> ${P}.tar.gz"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs doc"
-
-S="${WORKDIR}/${PN}-release-${MY_PV}"
-
-DEPEND="
-	dev-libs/boost
-	dev-libs/gmp[cxx]
-	doc? (
-		dev-texlive/texlive-latex
-		dev-tex/latex2html
-	)"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	local myeconfargs=(
-		--with-cxx=$(tc-getCXX)
-		--with-cxx-optflags="${CXXFLAGS}"
-		--with-cxxgen-optflags="${CXXFLAGS}"
-		--with-cxxdepend=$(tc-getCXX)
-		--with-ranlib=$(tc-getRANLIB)
-		--with-ar=$(tc-getAR)
-		--with-ld=$(tc-getLD)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}"
-
-	use doc && emake html pdf
-}
-
-src_install() {
-	einstall
-
-	if use doc; then
-		DOCS=( doc/progman/progman.pdf )
-		HTML_DOCS=( doc/progman/progman/*.{html,png,css} )
-		einstalldocs
-	fi
-}
diff --git a/sci-libs/libsvm/Manifest b/sci-libs/libsvm/Manifest
index 32d820645c8e..4499c2bd5a14 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1,7 +1,5 @@
 AUX 3.11-openmp.patch 943 BLAKE2B 39f092a108f808711dd928595cd82d507f6154efd549c319047c7a94edb772887338209549dba99cca4ed0a8106dc40ef4afd3a42dfe41d7d884f7f630391bfe SHA512 17bcea4da6a6aa32192ce7fb66e7eefef5e037ca2afd968e67de385938555975abe2103ee2cc50d02cd21d9783e9334eac93de694d6e685f13af80c49e42af38
 AUX 3.14-makefile.patch 1634 BLAKE2B f25e5225e07040e43cc6057558914f177de4e3d40254df9668de8719fbacd6cbadd685d38e2935c13e1778d8a260ef0733672bfc5c719a9e5d9a8832cbbe8ca8 SHA512 f4c2e2f6556604bf3572e341176c855e87caf4c3db8c2b347ce4e7a7948d21b708a7df29d5bf9b741dd3f34e08a0750572b94bd5e94bb4052f1ba4b9ae50e918
-DIST libsvm-3.22.tar.gz 850563 BLAKE2B 824451dd2cafb7f2546d510d2c516dee67c27e586d5b16557a3c23e0c372cd577af5a322e24f70df6cda66e0a58f2e4d70017e6155a1d211ad3c728f840bfa2b SHA512 80a22fd2c2a82f70b8279fa5d8c5a2838b10ee439cf6d725816d608f8e45990ba1780ae6750cad78b25c1c18daf2c2315b342b9e329affbd5729d6fd7da87f7a
 DIST libsvm-3.24.tar.gz 876441 BLAKE2B 6781804ba9706de5ad363bcbda20f2ec181cc4ee9613c9e7429f03872f7a03b04859df2ec00692d9de3ea237d1e478435a4d4db3ce7e5292689a2eab26a1fe46 SHA512 ff3c39bc84291bfb707151d7b8b6fb2eece937afa769cb8ee579d00ee4c30e943d476cd7bb18851d482c9bed89cf94fb3fd8abca4d47253360e12e9406f2f24b
-EBUILD libsvm-3.22.ebuild 2668 BLAKE2B c1172520f22ec7f86e77aa6fcb564067c1ad055a5ce9b39a003342ee2e15378d09c19a56dcf2f76571bda62679038eb6d08c6d47533b0e2a88f37738e9e359fa SHA512 fd1d93c0b88763c0ce8e9e798bf46345debf7d00e76fb0f815e2cfbd8ce57f2b3d37a79b236699045421fefd98bdb7cd8ac66069d0ae493315af6c3cb6294637
 EBUILD libsvm-3.24.ebuild 2674 BLAKE2B 3223dc3048815cb3e4743985c2275022153663093bbd3d164a48def3dcc9568584d335af65a10409540be829460906c7108650baeeb6bcb932cd9d22b6655910 SHA512 65f5a3954b52b0fd1a940855467fa6e22d10f58a29352ec22268c27642570af74ea07f3f4300750b670e8239a0f02c4ca2fd46bb2f8c1363a2c4c0079d99fe83
 MISC metadata.xml 815 BLAKE2B b73e733b7881fd6c9b45f7605259a7d99e9bef6729936b7502df8c857e40e8552ebc0be25065a7d1391dd9b98cb4dd81b5dfd12722e5852f18c85ee693b2d20f SHA512 0e26fd0b3ddb08f769e92249819e93483cbca426465b8cd623703be2c242b5c8dd9731c978f6965e2c39d680229d5b15587ec0a16aea0b6fcf8172cf70e7f7ec
diff --git a/sci-libs/libsvm/libsvm-3.22.ebuild b/sci-libs/libsvm/libsvm-3.22.ebuild
deleted file mode 100644
index a84738b3fae5..000000000000
--- a/sci-libs/libsvm/libsvm-3.22.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit flag-o-matic java-pkg-opt-2 python-r1 toolchain-funcs
-
-DESCRIPTION="Library for Support Vector Machines"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/libsvm/"
-SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/libsvm/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="java openmp python tools"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	java? ( >=virtual/jdk-1.4 )
-	python? ( ${PYTHON_DEPS} )"
-RDEPEND="
-	java? ( >=virtual/jre-1.4 )
-	python? ( ${PYTHON_DEPS} )
-	tools? ( sci-visualization/gnuplot )"
-
-PATCHES=(
-	"${FILESDIR}/3.11-openmp.patch"
-	"${FILESDIR}/3.14-makefile.patch"
-)
-
-pkg_setup() {
-	if use openmp; then
-		if ! tc-has-openmp; then
-			ewarn "OpenMP is not supported by your currently selected compiler"
-
-			if tc-is-clang; then
-				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
-				ewarn "which you will need to build ${CATEGORY}/${PN} for USE=\"openmp\""
-			fi
-
-			die "need openmp capable compiler"
-		fi
-
-		append-cflags -fopenmp
-		append-cxxflags -fopenmp
-		append-cppflags -DOPENMP
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "s@\.\./@${EPREFIX}/usr/bin/@g" tools/*.py \
-		|| die "Failed to fix paths in python files"
-	sed -i -e "s|./grid.py|${EPREFIX}/usr/bin/svm-grid|g" tools/*.py \
-		|| die "Failed to fix paths for svm-grid"
-	sed -i -e 's/grid.py/svm-grid/g' tools/grid.py \
-		|| die "Failed to rename grid.py to svm-grid"
-
-	if use java; then
-		local JAVAC_FLAGS="$(java-pkg_javac-args)"
-		sed -i \
-			-e "s/JAVAC_FLAGS =/JAVAC_FLAGS=${JAVAC_FLAGS}/g" \
-			java/Makefile || die "Failed to fix java makefile"
-	fi
-	tc-export CXX CC
-}
-
-src_compile() {
-	default
-	use java && emake -C java
-}
-
-src_install() {
-	dobin svm-train svm-predict svm-scale
-	dolib.so *.so*
-	doheader svm.h
-
-	DOCS=( README )
-
-	if use tools; then
-		local t
-		for t in tools/*.py; do
-			python_foreach_impl python_newscript ${t} svm-$(basename ${t} .py)
-		done
-
-		mv tools/README{,.tools} || die
-		DOCS+=( tools/README.tools )
-
-		insinto /usr/share/doc/${PF}/examples
-		docompress -x /usr/share/doc/${PF}/examples
-		doins heart_scale
-		doins -r svm-toy
-	fi
-
-	if use python ; then
-		installation() {
-			touch python/__init__.py || die
-			python_moduleinto libsvm
-			python_domodule python/*.py
-		}
-		python_foreach_impl installation
-
-		mv python/README{,.python} || die
-		DOCS+=( python/README.python )
-	fi
-
-	HTML_DOCS=( FAQ.html )
-	if use java; then
-		java-pkg_dojar java/libsvm.jar
-		HTML_DOCS+=( java/test_applet.html )
-	fi
-
-	einstalldocs
-}
diff --git a/sci-libs/libticables2/Manifest b/sci-libs/libticables2/Manifest
index 7af888499fb2..41ac7ffeabde 100644
--- a/sci-libs/libticables2/Manifest
+++ b/sci-libs/libticables2/Manifest
@@ -1,7 +1,3 @@
-DIST libticables2-1.3.3.tar.bz2 495883 BLAKE2B 203b09c39d925a5dc4e3f8b828388e0f311f2cdadbd64e3db929c011eb750b7a86f27c307a8585de1099421f24d10971652afe99dcd7f32a806cf7fe7b4d7748 SHA512 19c9a6bb8319ccf9e9004e10c4addffbee605c3735e53e4a5628b360b0c2e8575076208d14d00d6304eb894d3c69aede6de00120cd26f8c543c6e6cc4adb21a9
-DIST libticables2-1.3.4.tar.bz2 920163 BLAKE2B 3770ed280b8a6ccf81f09a251ff33b80f025d878f75486e43d74feb820414b5167829825e10c9fc26f98eb06c63ad008f7062d51a60081d6a61a64bc9d8a51cf SHA512 fbea9ed2041a04f79e02045d40e88a3ab20edc8d86ecef4ae6a181063f3609b8b2c3aeb2ce2f4508be56655accba60eab7379116ac341921f233f469eb99b461
 DIST libticables2-1.3.5.tar.bz2 187416 BLAKE2B aea17b04783ff09a0f36fff60938c6f954f832b33dceec427e11b29b16e442921370b3cb43cb7c8d70dad854e3e9894a1d52378fed3cf232f38d69757725ad41 SHA512 171abdf41f496891c62da17a2b84d929ac32021b0f2abc0c37ed73ec93806d4a14df37a8ffbe2b0c172ff3461aa6c639fc1ba23aafb19e024b99448dd66c63bd
-EBUILD libticables2-1.3.3-r1.ebuild 1163 BLAKE2B dbcca97310d936e464616478787098f3db319bf8ed86bc34814f20bbd1c03839f378e1e424cfb9bc1f9d31b8970c5b58c3fb922e9f4d13c17b5e120ae4826388 SHA512 c0f89f54dfc8c855ca99f453d0ea817f6bcef68566f0afacc7f155b395dbacac4c1d6f4ca52e1e8a9537331b368890a4a0b092fe5fb39090f32088151fa97895
-EBUILD libticables2-1.3.4.ebuild 1123 BLAKE2B 367c473a30165c298fbaaf74c93de69afa65089bebc30aad1d542c3a66f0d0971dfa0e635dc19fabb87f068ff7a9fb7643f1b6fcac13bfa82074b5c0b87cf0d0 SHA512 72f5a4a4a2b16d2c71d2fe095f858a57bd67a763ce1ca8cdeca2adb24740e803b80cf4afde5fb2f74d57ac09027bf69e4b62db6210098b89dc38652c048a8bdd
 EBUILD libticables2-1.3.5.ebuild 1196 BLAKE2B 9010b50b36a548b7117b0e1fe822370ecb1ed7895b4d7fae7b99953a4ce5242429fe8e788618df9567296931be4ea8326ed6438540e94e8786b30569d03e7ec2 SHA512 b0e4f957d5ebc028ba010c3b5613eb0b18398a41706d5cbb73b742441464bbff34134b5a2a34da32ba2cd3bd68a0c402896985d21138ab620dcf55eeec3f1678
 MISC metadata.xml 606 BLAKE2B fa88d924dc8e7ca40c7a4aa65f4516ae9b5a0eacf4f8930dd0393bf8cefd6f98e8cfa52de399962797da5c9251c8c9ee5c18808fbacd7400342e6c1c5bbddcaf SHA512 c26d34796c6d803322c7ac15cc374d12f314a59313c4df26e00b0f3bf972195c106141fb6664f875b89e51a1db1cc2084ecf79ca41b55b68c1eede3262fe8dd7
diff --git a/sci-libs/libticables2/libticables2-1.3.3-r1.ebuild b/sci-libs/libticables2/libticables2-1.3.3-r1.ebuild
deleted file mode 100644
index 6696e6c73d35..000000000000
--- a/sci-libs/libticables2/libticables2-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-DESCRIPTION="Library to handle different link cables for TI calculators"
-HOMEPAGE="http://lpg.ticalc.org/prj_tilp/"
-SRC_URI="mirror://sourceforge/tilp/tilp2-linux/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc nls static-libs usb"
-
-RDEPEND="
-	dev-libs/glib:2
-	usb? ( virtual/libusb:1 )
-	nls? ( virtual/libintl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS LOGO NEWS README ChangeLog docs/api.txt )
-
-src_configure() {
-	# --disable-libusb $(use_enable usb libusb10) would enable virtual/libusb:1
-	econf \
-		--disable-rpath \
-		$(use_enable debug logging) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_enable usb libusb) \
-		$(use_enable usb libusb10)
-}
-
-src_install() {
-	default
-	use doc && dohtml docs/html/*
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/${PN}.la
-}
-
-pkg_postinst() {
-	elog "Please read README in /usr/share/doc/${PF}"
-	elog "if you encounter any problem with a link cable"
-}
diff --git a/sci-libs/libticables2/libticables2-1.3.4.ebuild b/sci-libs/libticables2/libticables2-1.3.4.ebuild
deleted file mode 100644
index 3ac960c27d3a..000000000000
--- a/sci-libs/libticables2/libticables2-1.3.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Library to handle different link cables for TI calculators"
-HOMEPAGE="http://lpg.ticalc.org/prj_tilp/"
-SRC_URI="mirror://sourceforge/tilp/tilp2-linux/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc nls static-libs usb"
-
-RDEPEND="
-	dev-libs/glib:2
-	usb? ( virtual/libusb:1 )
-	nls? ( virtual/libintl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS LOGO NEWS README ChangeLog docs/api.txt )
-
-src_configure() {
-	# --disable-libusb $(use_enable usb libusb10) would enable virtual/libusb:1
-	local myeconfargs=(
-		--disable-rpath
-		$(use_enable debug logging)
-		$(use_enable nls)
-		$(use_enable usb libusb)
-		$(use_enable usb libusb10)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dohtml docs/html/*
-}
-
-pkg_postinst() {
-	elog "Please read README in /usr/share/doc/${PF}"
-	elog "if you encounter any problem with a link cable"
-}
diff --git a/sci-libs/libxc/Manifest b/sci-libs/libxc/Manifest
index 8b8774454d36..bf2d51fad3a7 100644
--- a/sci-libs/libxc/Manifest
+++ b/sci-libs/libxc/Manifest
@@ -1,7 +1,5 @@
-DIST libxc-2.1.3.tar.gz 750044 BLAKE2B 6d6bb348bd8f7e25d6a3857fc40f0d7d3a7fe22c0a0514ca9f0ca60aadd67fde65b6052bc04e076a6328841c7ebe154921937083b8e9e2b9e55a5bcf197d08d0 SHA512 6cc7e4cb9b6187d3f7be9bca0aa574a1e0807db47201bee271d651e23c34ff7f00590cbe2ab1a6c399735e55d088a27e5b3456af6df46817137b3e6857c1c221
 DIST libxc-2.2.3.tar.gz 734714 BLAKE2B c5c4c3aec3373b8b481de8ec1779366b6916899e0b77964cbde0e83904b351e009b14a3ff64e9f020640e6ebf68d78828615b8abf83a46fdf86ea16480083643 SHA512 bfcd88c1946e459227e9b1a32c513f0e68ae7a5497925ac6e692085542526ebad9fe2cd5722077c839c06dbaaceca601c7f615ee6936e638eb150a9d68278d5a
 DIST libxc-3.0.0.tar.gz 8388775 BLAKE2B e82a7310c583c39b6c2313668a5d3a3d5ae7bf71ad450e9ac6241d1601bf1bb429abf98787f7e0c3c252e881c381b895e277d18619b57c46f2f910d7e079941c SHA512 42173341f917c2aed6954f76885d2a9149d7212d2525becf77072b9878753c28d752b5cf6b2c79c90a88d8aa033f0aa94fa9753eb67108e9325cee6919cece52
-EBUILD libxc-2.1.3.ebuild 1399 BLAKE2B 0f29fb75ce1f39d57b59ed7dd29d8ac35916ad33056e67e79d7b1a38e4f37edd059e9defe257772c55deef489664df99b38cba06c3f1a6cd6829893892d80aa2 SHA512 570f9ef713887b6f8dce2e9cd694d7b8026b30ed04ee7463b65ef5ee35227035ae3e413636095fc60097e436345d0bfddeca060e013933e43b024c6fd0671c24
 EBUILD libxc-2.2.3.ebuild 1397 BLAKE2B f4340eb57cc1fcd055320ac514be7126fc67070653c19a14c16a6ed7268a0964efbd1a2182b5138ca246b1c43a92e2404edb844e16ebda33518f579443a8ae2c SHA512 5f676f34ae91e59146d9cf868074ea3cb5de617e313b31379432532f8047dd3516e2ebdb80afb6c9977bd1f2776e939d4a7f6f17fd7e5fe86da54df3db0416ec
 EBUILD libxc-3.0.0.ebuild 1399 BLAKE2B 0f29fb75ce1f39d57b59ed7dd29d8ac35916ad33056e67e79d7b1a38e4f37edd059e9defe257772c55deef489664df99b38cba06c3f1a6cd6829893892d80aa2 SHA512 570f9ef713887b6f8dce2e9cd694d7b8026b30ed04ee7463b65ef5ee35227035ae3e413636095fc60097e436345d0bfddeca060e013933e43b024c6fd0671c24
 MISC metadata.xml 1339 BLAKE2B 4c98e1fa7345593b8f160ba4ad84ea3a5eb321437715137e94a1926b92a53ce87c41b27e8fd0edb5c479293e24f9049956100f0070ae7a27550144ff697b63ac SHA512 95e03f10949c2a2350063cc1666bc232f166b10669f5b1d050da91b6119b8280d69aca0f35527ab938c71666bb78019640426ab0acab18bd335e6fff2345e128
diff --git a/sci-libs/libxc/libxc-2.1.3.ebuild b/sci-libs/libxc/libxc-2.1.3.ebuild
deleted file mode 100644
index a54c26ddfc3a..000000000000
--- a/sci-libs/libxc/libxc-2.1.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils flag-o-matic fortran-2 multilib
-
-MY_P=${P//_/-}
-
-DESCRIPTION="A library of exchange-correlation functionals for use in DFT"
-HOMEPAGE="https://octopus-code.org/wiki/Libxc"
-SRC_URI="https://www.tddft.org/programs/octopus/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="fortran static-libs -test"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e "s:${PN}.f90:${PN}.F90:g" \
-		-i src/Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( $(use_enable fortran) )
-	autotools-utils_src_configure
-}
-
-## Upstream recommends not running the test suite because it requires
-## human expert interpretation to determine whether output is an error or
-## expected under certain circumstances. Nevertheless, experts might want the option.
-# The autotools src_test function modified not to die. Runs emake check in build directory.
-src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_check_build_dir
-	pushd "${BUILD_DIR}" > /dev/null || die
-	make check || ewarn "Make check failed. See above for details."
-	einfo "emake check done"
-	popd > /dev/null || die
-}
-
-src_install() {
-	autotools-utils_src_install
-
-}
diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index 0ace811524d4..48fc8141992a 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -5,4 +5,5 @@ DIST tensorflow-estimator-2.1.tar.gz 622792 BLAKE2B d1c8abb22d90c789ebfadaf78ca9
 DIST tensorflow-estimator-2.2.0.tar.gz 627362 BLAKE2B 125792fc2167b8af837a99b08a9a26943bc5c1fda8ab3690b01c0d49a6dd39142ff4a063867dfe1bee3b99fb018981d0e4ee45d194caac2cd96a829ad22db0ad SHA512 aaf743835e2c606439fcccb56742997e930ba0e72c01d51633ce86824bbfaacd64607dc1fd7fb9604cc444feb65ebae60c2266be084e1b49ef2a1a9ca5a3d60d
 EBUILD tensorflow-estimator-2.1.ebuild 1853 BLAKE2B 13a0aa24ad860e69af5c8e180d939bd074c909bfcef47d5e9d16074cf010927f51bb64e6a48a7db00a5a817db70f4aa7071a32e89439b6864cc406a3cc13c59e SHA512 295825f9278094596f880fe69898791b00b68f71b4e7b6fd2efdb7357d2090ace62eb0d45b7b649f222544c789d8375bba73776a5428b587ba01367024af6615
 EBUILD tensorflow-estimator-2.2.0-r1.ebuild 1978 BLAKE2B 790ff6c1a2facc9e5b652b346a9ad24b445494f156a90465d3fa278e49376122da03f182fd4264f2e1f17488f326353e58810122996fbd33b4deabb7ed1986b1 SHA512 419fdbe02e00fdabe285f122be8ac574181366fc5f48fcf56616a37c69867cf6b530ea7dae8f5cfd8c6114a1ccb945699e4e4674ea7a14ad4d6bc14619c6693c
+EBUILD tensorflow-estimator-2.2.0-r2.ebuild 1978 BLAKE2B 31f981c1afd0f9d9392480840e7af5cf77d8723c13aab512316f3a5b5817b18f9cc58153c33fe66ac6845c155b8c9564116dcc42996c04fd43e0475e0f9c074f SHA512 6e115396a5257a4be94741c2eae714389a4b75359cd7168021901745fa854063374f2fc3f6a3d4f2d54cb1dd98437fd0d5a8b143fa01a3043035180da92f9afc
 MISC metadata.xml 580 BLAKE2B fb81098968d0fdf34a3f28dabee76df16be5393cb9ea79ee4fa670af985ef3f70bb83f14be84a0cc0e564e6626007c2977851f8299460b483f88325be155f4cc SHA512 6aef6523502a3bcf0b2ca59cf7480b92032b53020cccfa715203e5a48c960ecc92c94fa75f98a234da2d51662d43e0c1a85a1537f3ab67287cdb8183476a0efa
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0-r2.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..6000b5742991
--- /dev/null
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.2.0-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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=""
+
+bazel_external_uris="
+	https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip
+	https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip -> bazelbuild-rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip
+	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
+
+SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${bazel_external_uris}"
+
+RDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-java/java-config"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	bazel_setup_bazelrc
+	default
+	python_copy_sources
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home)
+
+	do_compile() {
+		ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
+		ebazel shutdown
+
+		local srcdir="${T}/src-${EPYTHON/./_}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
+	}
+
+	python_foreach_impl run_in_build_dir do_compile
+}
+
+src_install() {
+	do_install() {
+		cd "${T}/src-${EPYTHON/./_}" || 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 b37913c36fee..d72f93e2668f 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -36,4 +36,5 @@ DIST tensorflow-patches-2.1.0.tar.bz2 5737 BLAKE2B 67f5004312389ed19e810aad9f2d5
 DIST tensorflow-patches-2.2.0-r1.tar.bz2 3890 BLAKE2B cf4e0d579992cd09136fe3a11c5016e7b996ea959dad9f3a1ccff2fa623c2c4eab1c6673dfaf08b3b01220fd00c9edd5966e1162049f6d1e4fe5af280f491850 SHA512 8d07c9351b75faf90a137f65c2e6147d884744c5ab9b0bacadfa7bdc7b66ec2ec92920c7d23396bb70f7f4fb290f3f818591f23c6a4e91ab1a79290cb4ea1533
 EBUILD tensorflow-2.1.0.ebuild 12365 BLAKE2B d895256b37ee79be36d83745545e6515366b64121c0bd5ec79544827a4492a327ca26593d06ec0b42745ef9bfa213a251eef2bd7c9093d8b461b744035d18cf7 SHA512 d710ea279a2e0b73749a0b4a947a98753e11a6ac14799b9d5e45e3e63afd776aa8047d44d66b831d49df686fea65f0663133f8639080f722fbbd6254d6025b46
 EBUILD tensorflow-2.2.0-r1.ebuild 13506 BLAKE2B 075b271e2e559ca7640f1cb86f7392b4bd40a53d518d42f295ae762bcb465498b901fdd24805de76f8e50e5abacc1b47f00397553c471a7b5393ea8eb5dcb8fe SHA512 eb845b0233eab0782fc1213375b091a7a8be54df6796f46cae4863bcb4be92cd7028a30cacc43d9347bf04c14471283aaa0fbb6c56052fa0dd6cb6195b86ca94
+EBUILD tensorflow-2.2.0-r2.ebuild 13634 BLAKE2B c165b9acc3d6d507582cd2fce0986147cd41efe3c5648c7b054fae17c2a0672e3e9fa54eae097618781a6b9a97a7c5c9e5f4f3feee7965b49df367c2d4046558 SHA512 68f1ec80071b447d0c9cd459a3cd369f6dd619432ae6fe44d85e51487d0209e4960505bc7eae26d0b21680e37c30b76b0a4eed97b84f831be54c7041ca31c86b
 MISC metadata.xml 500 BLAKE2B 05036ab51828503c91b561bf087bb0a4d0cd6aa2f68dafa51499a5b57c33bf04e4f413aca576b62eb60b233467405a346c08d72b3c771b9f3fb4e099a55bd3c5 SHA512 ca5c67f8ced7d0f5ebb5f261c7adbcf23ea31b099e0aa3e1a3f6fd37df7d3558706af4df8411fc421a3b99c8615df7c5f07c617d7af275eccc728e76ce509458
diff --git a/sci-libs/tensorflow/tensorflow-2.2.0-r2.ebuild b/sci-libs/tensorflow/tensorflow-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..1ab08e35c457
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-2.2.0-r2.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{6,7,8} )
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix 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="
+	https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz
+	https://gitlab.com/libeigen/eigen/-/archive/52a2fbbb008a47c5e3fb8ac1c65c2feecb0c511c/eigen-52a2fbbb008a47c5e3fb8ac1c65c2feecb0c511c.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.9.0/bazel_skylib-0.9.0.tar.gz
+	https://github.com/bazelbuild/rules_apple/releases/download/0.18.0/rules_apple.0.18.0.tar.gz -> bazelbuild-rules_apple.0.18.0.tar.gz
+	https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz -> bazelbuild-apple_support.0.7.1.tar.gz
+	https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz
+	https://github.com/bazelbuild/rules_cc/archive/01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip -> bazelbuild-rules_cc-01d4a48911d5e7591ecb1c06d3b8af47fe872371.zip
+	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_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
+	https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz
+	https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz -> bazelbuild-rules_swift.0.12.1.tar.gz
+	https://github.com/dmlc/dlpack/archive/3efc489b55385936531a06ff83425b719387ec63.tar.gz -> dlpack-3efc489b55385936531a06ff83425b719387ec63.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/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz
+	https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz
+	https://github.com/llvm/llvm-project/archive/387c3f74fd8efdc0be464b0e1a8033cc1eeb739c.tar.gz -> llvm-387c3f74fd8efdc0be464b0e1a8033cc1eeb739c.tar.gz
+	https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz
+	cuda? (
+		https://github.com/nvidia/nccl/archive/3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.tar.gz -> nvidia-nccl-3701130b3c1bcdb01c14b3cb70fe52498c1e82b7.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
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PV}-r1.tar.bz2
+		${bazel_external_uris}"
+
+RDEPEND="
+	app-arch/snappy
+	dev-db/lmdb
+	dev-db/sqlite
+	dev-libs/double-conversion
+	dev-libs/icu
+	>=dev-libs/jsoncpp-1.9.2
+	dev-libs/libpcre
+	dev-libs/nsync
+	dev-libs/openssl:0=
+	>=dev-libs/protobuf-3.8.0:=
+	>=dev-libs/re2-0.2019.06.01
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	>=net-libs/grpc-1.28
+	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.12.0
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
+		dev-python/astunparse[${PYTHON_USEDEP}]
+		>=dev-python/gast-0.3.3[${PYTHON_USEDEP}]
+		dev-python/h5py[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+		>=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}]
+		dev-python/opt-einsum[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.8.0[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-1.28[${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.1.0[${PYTHON_USEDEP}]
+		>=sci-visualization/tensorboard-2.2.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/mock
+		dev-python/setuptools
+	)"
+PDEPEND="python? (
+		>=sci-libs/tensorflow-estimator-2.2.0[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.8.0
+	dev-java/java-config
+	dev-lang/swig
+	=dev-util/bazel-2.0*
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
+	)
+	!python? ( dev-lang/python )
+	python? (
+		dev-python/cython
+		dev-python/mock
+		>=dev-python/grpcio-tools-1.28
+	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="10G"
+
+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() {
+	ewarn "TensorFlow 2.0 is a major release that contains some incompatibilities"
+	ewarn "with TensorFlow 1.x. For more information about migrating to TF2.0 see:"
+	ewarn "https://www.tensorflow.org/guide/migrate"
+
+	local num_pythons_enabled
+	num_pythons_enabled=0
+	count_impls(){
+		num_pythons_enabled=$((${num_pythons_enabled} + 1))
+	}
+	use python && python_foreach_impl count_impls
+
+	# 10G to build C/C++ libs, 5G per python impl
+	CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PV}-r1.tar.bz2
+	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
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	# Relax version checks in setup.py
+	sed -i "/^    '/s/==/>=/g" tensorflow/tools/pip_package/setup.py
+
+	# Prefixify hard-coded command locations
+	hprefixify -w /host_compiler_prefix/ third_party/gpus/cuda_configure.bzl
+
+	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
+			export PYTHON_BIN_PATH="${PYTHON}"
+			export PYTHON_LIB_PATH="$(python_get_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"
+
+			if [[ *$(gcc-version)* != $(cuda-config -s) ]]; then
+				ewarn "TensorFlow is being built with Nvidia CUDA support. Your default compiler"
+				ewarn "version is not supported by the currently installed CUDA. TensorFlow will"
+				ewarn "instead be compiled using: ${GCC_HOST_COMPILER_PATH}."
+				ewarn "If the build fails with linker errors try rebuilding the relevant"
+				ewarn "dependencies using the same compiler version."
+			fi
+
+			if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then
+				ewarn "WARNING: Tensorflow is being built with its default CUDA compute capabilities: 3.5 and 7.0."
+				ewarn "These may not be optimal for your GPU."
+				ewarn ""
+				ewarn "To configure Tensorflow with the CUDA compute capability that is optimal for your GPU,"
+				ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow."
+				ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5"
+				ewarn ""
+				ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus"
+				ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'"
+			fi
+		fi
+
+		# com_googlesource_code_re2 weird branch using absl, doesnt work with released re2
+		local SYSLIBS=(
+			absl_py
+			astor_archive
+			astunparse_archive
+			boringssl
+			com_github_googleapis_googleapis
+			com_github_googlecloudplatform_google_cloud_cpp
+			com_github_grpc_grpc
+			com_google_protobuf
+			curl
+			cython
+			double_conversion
+			enum34_archive
+			flatbuffers
+			functools32_archive
+			gast_archive
+			gif
+			hwloc
+			icu
+			jsoncpp_git
+			libjpeg_turbo
+			lmdb
+			nasm
+			nsync
+			opt_einsum_archive
+			org_sqlite
+			pasta
+			pcre
+			png
+			pybind11
+			six_archive
+			snappy
+			swig
+			termcolor_archive
+			wrapt
+			zlib
+		)
+
+		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
+		export TF_IGNORE_MAX_BAZEL_VERSION=1
+
+		# This is not autoconf
+		./configure || die
+
+		echo 'build --config=noaws --config=nohdfs' >> .bazelrc || die
+		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .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 -k --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
+		rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die
+		rm -f "${D}/$(python_get_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-bin/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-libs/xkaapi/Manifest b/sci-libs/xkaapi/Manifest
index 69fb6f39a894..4286af7b20ee 100644
--- a/sci-libs/xkaapi/Manifest
+++ b/sci-libs/xkaapi/Manifest
@@ -1,10 +1,8 @@
 AUX xkaapi-2.1-ffi.patch 794 BLAKE2B 72650c0ec253276f7d89fbaa627735e242f3e1df4cb9412d705bd403c2f1d6ffa66e4be4d37f391ffac1ac8756047ed18fd9ea7aa2b0a13c3530e44ab5e456b6 SHA512 7e99e72fa025659b5598583c4cad556888ca5424b3f41409b07aa1b4268a33cc379748f3181788ff9695433af16c21d69dca6dfddc15fb6071321f21bc80b9eb
 AUX xkaapi-2.1-flags.patch 1324 BLAKE2B 49b2aef9894417b05f7ec6d4677c67bd52bcb46129ebf616eabaed3af3ea24563141c41b7456e3c16ef20109a4f22f1fda69e2e9c370702743610ddb92fc5b7f SHA512 cc812130893bcf39e9c20f641e7744be7caa6e6918d195ca5d3b69b10d2a518e6b30e969e4cf6e8b6735e033858b33fc6fb1bbd347c67b87cd436980a0dead0f
 AUX xkaapi-3.0.3-flags.patch 1141 BLAKE2B 89ab53d83fb5b3feba3b49e47093fdd037a3c46ea0514fec9d90e486628d68838819ea1a0e175583414d582503f18be7d87bbbe0937218c3997e94be96cfad3f SHA512 8e516bd96c9f59856d3f2e7e8e4c7703cbe4281e37b57ce2b5ace9e62175c7837fb6ae140fdb760f0b89f13c9469ba201c674f38c2b51691ee1a66f0d2c5defc
-DIST xkaapi-2.1.tar.gz 2916405 BLAKE2B a3bbba6ed5575ed617b2fdbfec435c72ac12e8f464e5a25263fac38f049bd1b89bb5df6e526c2fa537e16fd5bd04fa3cd1ad39f56cf1a58da0f3ba75fd55c580 SHA512 5d4db7576d449b086677bcc686595da773da2c0db155aa0d0039f57fb379bfc166a35b139992416a3f44bdbccbf9f48688b3d3050eea77a258f2a395d7867b26
 DIST xkaapi-2.2.tar.gz 2858464 BLAKE2B 909ea71e3fe86ee6614724793a5a41edd03151025b50e1e99dcf262be9022dfdc8cfef636de4814db1fec99e97015b73f4e5ed8f45ad377e4a3a4ab46b54ee93 SHA512 1be98c4e3c50cf198ec3522c7ccbe7757464889b32fb39e53447548fc2975e727fb2b68b25ae99c367b155588b1ab2181e3280d099ceb991929aa2f0e9c83f0c
 DIST xkaapi-3.0.3.tar.gz 1535482 BLAKE2B 6f10395b66d334e235df8dec7cfa4fa128aceeac10846e78c02cc96867fb2c649a0dc88f6a64d9c5afbfb97a02221f4e6971f313bb6ca52d217aae39caa26327 SHA512 28fb02a73269e55eec90b5c2c82e4ade3bfb24d55a1f61ac6bf47da4c7e2d864cfa1389772baca9ebef4f24b3373fb6971f3fe98a4d232187e9d29a88110eda1
-EBUILD xkaapi-2.1.ebuild 1218 BLAKE2B 23a96ebe2ab314cf26cc460f2f0dd660faf8a7180c5ba44d409855bc5dbe91862518be7f51b56643f6231e675e38897f02102e7f34839cad15fb79bd56b64d8e SHA512 156beda3bb355b4d2172aa631b201d055b558707a056090917b34211fb0b1d30ae9c72adc9fb8d35830d6f0f4889a6af0cf0d75aa8e73199d278b5a26b323a4f
 EBUILD xkaapi-2.2.ebuild 1226 BLAKE2B 8da6ea7a4d8b57c1d04c2aa95327549ccfa4771330b07cbe9b28f2e02ef6ec5c83bd4ac22b1c0d77ddcc24a67e308688f2c9394c8155cf440f90eefacc6c2463 SHA512 6a172bd57cd1d0dcb8925ef9fa021c1962dfc0d3d30ea435dc42483e5b0be479574c71b1476741a700f78b7d3a7f800bf1e15ff3319faabdd64e8ff352dd69e6
 EBUILD xkaapi-3.0.3.ebuild 1044 BLAKE2B 37e637d56e7e117b25f3e9850aeaaef708d4fd244801618fc5115dfac494b54a8e0cfb490f47b5b2496bfb1b344c872aa257f14d36dd082fbb29b2a99a4b2f5d SHA512 92ca7883d124e5f9a9529b1e8bded15a9f22bb659af3ee5f6e46578f0be774285e5c1c7ae90d82fb36d1f3bd5918cf4a20cd5cf07ffcc9d6edca10402ded1368
 MISC metadata.xml 393 BLAKE2B 0b20ade325e20eee3e300047296b3aedfe9fca66f78f6514da288d4561c6282d57ecda4f9e912dbc4ebb34a5023b545ace898fc12cca92bc57d108979e31cc70 SHA512 a0fd2c3db31172b8cf83e02118bff28776e8c33dff45a46db79499f9dd57162d37e75982022618b1f505d260276ad5b3f74dbc8ed8db0be330a321ba8fe25e87
diff --git a/sci-libs/xkaapi/xkaapi-2.1.ebuild b/sci-libs/xkaapi/xkaapi-2.1.ebuild
deleted file mode 100644
index 02fd2e035000..000000000000
--- a/sci-libs/xkaapi/xkaapi-2.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils fortran-2
-
-UPSTREAM_NO=32735
-
-DESCRIPTION="Kernel for Adaptative, Asynchronous Parallel and Interactive programming"
-HOMEPAGE="http://kaapi.gforge.inria.fr"
-SRC_URI="https://gforge.inria.fr/frs/download.php/${UPSTREAM_NO}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="CeCILL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="blas cxx fortran gpu openmp static-libs"
-
-RDEPEND="
-	sys-apps/hwloc
-	dev-libs/libffi
-"
-DEPEND="${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-flags.patch
-	"${FILESDIR}"/${P}-ffi.patch
-	)
-
-src_prepare() {
-	sed \
-		-e 's:-Werror::g' \
-		-i tests/testsuite* tests/*/*.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-mode=gentoo
-		--enable-api-kaapic
-		--enable-api-quark
-		--with-ccache=no
-		--enable-hwloc
-		--with-libffi="${EPREFIX}"/usr
-		--enable-target$(usex gpu gpu mt)
-		$(use_enable fortran api-kaapif)
-		$(use_enable cxx api-kaapixx)
-		$(use_enable blas kblas)
-		$(use_enable openmp libkomp)
-#		$(use_with plasma "${EPREFIX}"/usr)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-mathematics/4ti2/4ti2-1.6.5.ebuild b/sci-mathematics/4ti2/4ti2-1.6.5.ebuild
deleted file mode 100644
index 65d55399c3ff..000000000000
--- a/sci-mathematics/4ti2/4ti2-1.6.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-# The swig subdir is not used, so we can skip running autotools in it. #518000
-AT_NO_RECURSIVE=1
-
-inherit autotools-utils toolchain-funcs
-
-DESCRIPTION="Software package for algebraic, geometric and combinatorial problems"
-HOMEPAGE="http://www.4ti2.de/"
-SRC_URI="http://4ti2.de/version_${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE="static-libs"
-
-DEPEND="
-	sci-mathematics/glpk:0[gmp]
-	dev-libs/gmp[cxx]"
-RDEPEND="${DEPEND}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.2-gold.patch
-	)
-
-src_prepare() {
-	sed \
-		-e "s:^CXX.*$:CXX=$(tc-getCXX):g" \
-		-i m4/glpk-check.m4 || die
-	autotools-utils_src_prepare
-}
diff --git a/sci-mathematics/4ti2/Manifest b/sci-mathematics/4ti2/Manifest
index b87a20d55b8a..ef1bb8ba2806 100644
--- a/sci-mathematics/4ti2/Manifest
+++ b/sci-mathematics/4ti2/Manifest
@@ -1,10 +1,8 @@
 AUX 4ti2-1.3.2-gold.patch 652 BLAKE2B a3b47b440f9417d883df52356e58267b096a273ddd725c29e97a969eb3e2281edc8ecd9342bfc1a187464b4d476c22dc095ca8060f433cd2c793c22e5a181ae0 SHA512 60b14d7b287b69adbce420f37dad5d83ce21bfa4329ea0810c67f054d35a71f6795b0a8206b268ec9cfa08f796a4cd80a34d816c691e8e3e77adcbc5217b43a7
 DIST 4ti2-1.6.2.tar.gz 5531651 BLAKE2B 1e55f8e0df242a6eeff3b66f2a4a0f6508fc5fb722ec86558c289d6c8d295b169b60c9b3172f7e672f9fc341e767221138819c6534aba9695aa43ecbf61e1ab3 SHA512 ff68f767b8677ce0ce94cca39fa3ef87835d77a951f0ec6ae28ab171bf09ae25c551d88c2cdf5bf3115b33bd32366b063533a1c22576130a00f542f9370bcd7b
-DIST 4ti2-1.6.5.tar.gz 5640117 BLAKE2B e520aebae93b7001f2d03e3e6c515e4a29a7e5e154d1a571f0a25fab26fdab9185991821a8ccf7a23e4262cf488c0ec749c9ad344535374d85c946a4d28befb3 SHA512 90dc105d99659e3c2213b484b6d21e877d7484ca0ad0373ece066df26de7c0e0cce614faaae9f7b678d03fa54f987fe95ab6d3f958477b1294a2dc00733a3a08
 DIST 4ti2-1.6.6.tar.gz 5640126 BLAKE2B e52fdfd9b406b86236795b1ba2494d9686f3c93961359bf409ddcdfeb0067e3b0904473b66268315795c8941ba0cb93dbe5e4c3cea402379bd07ee65a1951e5d SHA512 89f36aaf3d8f41bb31b37b44a013ea966d9664880473ad0d6d1825ffb00afec1eff3139c09ac6b684f0679e2ae0d201a84396bb721aa1f63dc1deca592392c41
 DIST 4ti2-1.6.7.tar.gz 5649869 BLAKE2B ab0e7da1de88e5e99ead0b8fa7f7a72773b84ae903a31dc3134e83364ea45069889f8ce9812bb471cf72b824fe013756d557489b4d2ab31216141d5b6347acfc SHA512 38d638fe01ff3cef1aebae1eefd276cf02f808978851b4465e132f77d3ab34ea51d512e2ea28a42ac65263b458c43cf420dc5f8ac930f959dd0c14916cef9841
 EBUILD 4ti2-1.6.2.ebuild 802 BLAKE2B bb6601a9e4671482ae29517090aa55cc7cd422215878be64544d0b3579ae90971464c71f676a90597c8678a56e168138af4dfbf5932876feadcc20b8f1a9aa32 SHA512 8a1aac8b45e81957f1b978e46d7ea43ee35f288a7c0f2431de1fb12883669461a517f186db68102b69d209ee1b1d5c7ab04f5bdbe74d7e71f557632c43ede56c
-EBUILD 4ti2-1.6.5.ebuild 804 BLAKE2B a98953ced8d45c1c85728048679c12a694812e77baf73802a7aaf79e8ace135b3f699be6c7775e01cf05d5c11a1969380dc462400351fb3de014aa0d0b12662e SHA512 add5b056849f4f570bcbc6c97e2802e30a5348a17721a55df19f01ca376cbd8621b721828d25c3c657f8e4f88979003cf9a54ed0adc2da04bb7a52dc52e2268d
 EBUILD 4ti2-1.6.6.ebuild 811 BLAKE2B 9371af59dc290a7e19879a97815b8fd7480fefc0c85bbc6e4af227fb303d5812392b0cdb3e5da01816cd9a98c916f0bd899fda127563a9d91e892bdef9818f5d SHA512 532ff6e560ae88d772740f7393f7eb418de3c16f0069b1d7a4bb4153fdf00a8672eb3e8f6a288184fd14b7b159c31dd87a4039f89cec065d4e61b3a0d880c297
 EBUILD 4ti2-1.6.7.ebuild 919 BLAKE2B 8b6ea74353bcc05727bc856566e16b37e22f7816c90507f441662ae18777a893deb5d44e3999a5da54dfda1c38557d91c909f4baee3e4b044a0b89dc15380178 SHA512 8c79cd88808064e58b2a6440f919a43b89b68db9a3ff96357168ccae0c2f9e62d620cef1f1441c9edcf06394923a280ae2beca425bbd7c6c78b2893bed13946f
 MISC metadata.xml 446 BLAKE2B ce737e287f6b8f420aee86ca0ce72aa4952474a3ba717239dc8d10261038faddbc9b06f93a04bc8f8c48b36606254780865bbc5038564d4fb9252241e45a7a4b SHA512 2c7950b353c54597eebcff1f50e5045f792ef37cfe59f0142160bdf5ea47ff6be57bd698b051e6c56863b109fde983c1aeeca87827289abde96838af1aa3f7d1
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 7975e72f352f..d4a782a20533 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index a637da34bf58..82251821778a 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -25,9 +25,11 @@ DIST core-dictionaries.zip 876339 BLAKE2B f29afcbf5a7f8ec635e5a5b248d978af286d18
 DIST rstudio-1.2.5033.tar.gz 20456976 BLAKE2B 3cbca6a5180690104dddf1456168bd38708d4152ed9b7a167035dd66e270aeb6405169d34461cbd899738be1872607e3f3b6f81ff0b3c9e6a9ed965a889b1393 SHA512 3569d4fed342275a9905c87e4f97be63b6391d2c37f75397e06201a7c31f80d94799214f51ff8e57d458ef18d5e54afe1ec8a7c56ac05ed8b8225ecca72d1daf
 DIST rstudio-1.2.5042.tar.gz 20456999 BLAKE2B 3251ab2511daefefa395256fedb273ecc36dbc8118457474e3647f7616baea91301e597896582ad4b191195fc7baf17645c4c25b9a957a0c17a6251151b1dd87 SHA512 e09f2360abecde0c16e240e6838efb270a355bec3d3982ffde2b01b32b21e9281fef465734edbfeb5e05375529cc7f06d5b5d41304f367982f53ae7ad98e20f9
 DIST rstudio-1.3.1056.tar.gz 89584544 BLAKE2B 0e758ad97f9faa2d3932a49dafd92bc21199a5c0a20e2d8480267ebbb7cd11dc38596b4bb697e04add7bfe6b126f7b2ae6675040a0ac8caca5a5cf737f5ad6eb SHA512 8a9077c2ae021e0cf4cca41b374a50534087b35fd2c1e4b18bdd5ba3672e1ab275046e483ec8a3aba729a8e39f961149fb03a053ea005d8a32873b51201baca2
+DIST rstudio-1.3.1093.tar.gz 89554292 BLAKE2B defd68e65a2cbc570aaf6fb14bd16342946154cda7322549d426281aea48d923803f061c1cd7d74b65b000a67ed62713dd06d311617e54130cb7c08147b34694 SHA512 c8a8d2312353e574dc2fb8ff2e64bd46c8aaf889c86f9c81ce22a7275e4cbec436dadfdaee513c3fc47dd3ad003e07a25baac4d8fcf47cc21df919afa084e92e
 DIST rstudio-1.3.959.tar.gz 89639419 BLAKE2B d45b2c1b0e426ddb5a945e59a8127ddfd47f6230ef0929639c4b525382ae57437a273df6ade85cfbf3a29911cf0158ee2e0808bfa94e783d70d4615f6c228f31 SHA512 e5d8bfe16011790ff4723c731043f44070d8fe48f85c5a9ab8389c9a2b7a1d3813e9362063ec4c6a6ca3b0a0857e2190481cbb74191650a129c0d2e10b342fac
 EBUILD rstudio-1.2.5033.ebuild 7256 BLAKE2B 5b6481bbe0d02d6751ab19df0ac2a12e8d71399cb13999d65f1c6b0ce2fab49eb0ad7e55b458933d6c3fc2490f2ecc2a5e4e0c5b41c7e36a978bf825bc27f8c5 SHA512 14a307c42c979fb18c19ccf0bb68322d9382dba785421120c21c77aac666b0517e069cb60f408baa53c349c1f3b6f8ab2a59db442ec377a244ce462b395ddb1c
 EBUILD rstudio-1.2.5042.ebuild 7256 BLAKE2B 24303ced907ff45ff66fbab6638f7bda958849ae977e0b3f37e00eb396b7ff6169ae7e10b2285c804e9cec2131cce8d45bfa8197096774fef06fc859460c5aad SHA512 f5c36843edbd62a80891b1a148081e163254fcdbdc94aafd4c9051992d63704dc360c0ee129ba92b9cc0a63e39c8cf6be258606db3b1a8831f1ee8a7110ad08c
 EBUILD rstudio-1.3.1056.ebuild 7067 BLAKE2B 3e9c18d653602ad25aaa3dfd9bfbdeb34260bfe4464559c9a8ade653e5487f89d0cf043549ae212c68542f6e1fa53fab14a733f1175189af81c9daf0e019906c SHA512 e5450ef5bb210f02f7250bfb21492f94c9a694f5e59e23fe3437da91f18d34d7036de6b64cb7ef14d61f771ee18fe311b421b8dc8204b44c87356fb35f5d5263
+EBUILD rstudio-1.3.1093.ebuild 6980 BLAKE2B 51467f99af427ab86437818788918cdeec384de97b450ea7028ad046edbe259984d3e8158ae86b51e238e4d47bcd9ddef5e110532f3544bc28e6c06a3e64ca83 SHA512 9dd2ac83e838def156fb9fac7c94ccb61fae52f7144acfd924f328077dd0630a455a914dd0c59ff186878ee4ed8f4502296d07f867be2e6003a5f5a6953a4498
 EBUILD rstudio-1.3.959.ebuild 7047 BLAKE2B 78861c03e1b7aff68ba63cc00503e09eca8d67b77df12161f8bed33d226440fc70e76b584cfb4a6236836250791d6d50f127c57c9ffc36add95866db7b19ca5e SHA512 0ae6d91439d4fb22eb27d9e58d9d5bf05f6cb063e947f4431593f9cb5c60b85e9e817cd668cb1a5d8313d74ed6cb6f0136ef370a45ef4da7f1f17a9e7c8ba0ca
 MISC metadata.xml 590 BLAKE2B 53dc62775e118c9c26ee05e20ee1da1ac31b6a6b74cf7dac410856fe4e0cce40fbb800c7a03e60f59e14442baf3aad866ad42616ad5fbb5724f7f6d8c1636eea SHA512 7111442aaa52da1e554c34f824113ec0e227798dd11b0ea9148b81e7a31c08b2a527b9995e3adb9363c7a4f2a8594f30cbd4a179545bf31d69f07d5558c20f52
diff --git a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild b/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
new file mode 100644
index 000000000000..af87bd08951d
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils cmake pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean
+
+# TODO
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+GIN_VER=2.1.2
+# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
+PANDOC_VER=2.9.2.1
+# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt
+QT_VER=5.12.6
+QT_SLOT=5
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated libressl server"
+
+RDEPEND="
+	>=app-text/pandoc-${PANDOC_VER}
+	dev-java/aopalliance:1
+	dev-java/gin:2.1
+	dev-java/javax-inject
+	=dev-java/validation-api-1.0*:1.0[source]
+	dev-haskell/pandoc-citeproc
+	dev-lang/R
+	dev-libs/boost:=
+	>=dev-libs/mathjax-2.7.4
+	sys-apps/util-linux
+	sys-devel/clang:*
+	sys-libs/zlib
+	>=virtual/jre-1.8:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets]
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( sys-libs/pam )
+	)
+	dedicated? ( sys-libs/pam )
+	dedicated? (
+		sys-libs/pam
+		acct-user/rstudio-server
+		acct-group/rstudio-server
+	)
+	server? (
+		acct-user/rstudio-server
+		acct-group/rstudio-server
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.8:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.959-prefs.patch
+	"${FILESDIR}"/${PN}-1.3.959-paths.patch
+	"${FILESDIR}"/${PN}-1.3.959-pandoc-mathjax.patch
+	"${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
+	"${FILESDIR}"/${PN}-1.3.959-qtsingleapplication.patch
+	"${FILESDIR}"/${PN}-1.0.44-systemd.patch
+	"${FILESDIR}"/${PN}-1.3.959-core.patch
+	"${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
+	"${FILESDIR}"/${PN}-1.3.1056-R-4.0.0.patch
+	"${FILESDIR}"/${PN}-1.3.1056-boost-1.74.0.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+	mkdir -p dependencies/common/dictionaries
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	java-pkg-2_src_prepare
+	egit_clean
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+	# this sed hack for now. ~RMH
+	sed -i \
+		-e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+		src/cpp/server/ServerOptions.cpp \
+		src/cpp/session/SessionOptions.cpp || die
+
+	# use mathjax from system
+	ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
+
+	# make sure icons and mime stuff are with prefix
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+	# install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes
+	sed -i \
+		-e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \
+		src/cpp/server/CMakeLists.txt || die
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag: git rev-list -n 1 v${PV}
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS aee44535570639672cf61c0545113e7a62c90b5b@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.txt \
+		|| die
+
+	eprefixify src/gwt/build.xml
+}
+
+src_configure() {
+	export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
+	export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
+	export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
+
+	local mycmakeargs=(
+		-DDISTRO_SHARE=share/${PN}
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		-DRSTUDIO_USE_SYSTEM_BOOST=TRUE
+		)
+
+	if use !dedicated; then
+		mycmakeargs+=(
+			-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+			-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	local JAVA_ANT_REWRITE_CLASSPATH="yes"
+	local EANT_BUILD_XML="src/gwt/build.xml"
+	local EANT_BUILD_TARGET="clean"
+	java-pkg-2_src_compile
+
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake_src_install
+	use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		xdg_icon_cache_update ;}
+}
+
+pkg_postrm() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		xdg_icon_cache_update ;}
+}
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index dd2c4e941f1b..5a7f836256fe 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/vitables/Manifest b/sci-misc/vitables/Manifest
index bb6b31d01a6c..c1a381a83029 100644
--- a/sci-misc/vitables/Manifest
+++ b/sci-misc/vitables/Manifest
@@ -1,3 +1,4 @@
 DIST ViTables-3.0.0.tar.gz 860411 BLAKE2B 7ef5a7ac681ac7d0d2544987080478deba39db275dc0559db48d0375ebd83f260eb37dc3b9e99b131fd427b81668b882f15549e6f1955615f9dee5927c6cc57d SHA512 0ab0a3529f70111f6d2c1a765398d0c05607e2839a353670eebfa26bedd2092a33afe9f1cad14eec5d23f76fc5f54fa6f61e2e4089d9c2f3fd43396dbbbba7b1
 EBUILD vitables-3.0.0-r1.ebuild 929 BLAKE2B cba4e7d580c20ae6437853725346565f342439d084e79eb3dedc1e44714d178233149533c72853db85bffca292cf8cfd1d641e24a9a02577b4cffc3a40649b1d SHA512 9f927980f5a336b867506d1d89c1658f87d90431023f2ac7eebf1e69184c993c64386b69329741620aa7c032c7a1f1d2601093f51698d5c1ffe970fcff5c7b3f
+EBUILD vitables-3.0.0-r2.ebuild 911 BLAKE2B 8ac5c65cb405fc850ef853d71e59c360ad05825edfbb4dae45987b8ff3b56b9f75030ce95f068905724eb92d35b71f40628fbda17828f5d8f91a8a289ecaf238 SHA512 937682cb77303a5458f8e25ee010f7d7f64f5b922c4b413dab2eb958af970be7d92b021c87100c06c178fa5659fb043490a7137798f678999f4cc02cb9601bf2
 MISC metadata.xml 637 BLAKE2B 5de3507f0c14fd0a8af230464a40a60f861433cddea38ea9490a00477f7677045845e48465d1684b0e93cc94ad6423b416e4993aabc23c793114c70365f514c6 SHA512 3e891f2f726db29eb10ae7f26e4dd30abeb8cc3d251b119c226cccfa6ca8fc90311dae6b96acd810e95423674fb57017cae938f48e213d4a873da2d9e9ee7789
diff --git a/sci-misc/vitables/vitables-3.0.0-r2.ebuild b/sci-misc/vitables/vitables-3.0.0-r2.ebuild
new file mode 100644
index 000000000000..3d7da16887dc
--- /dev/null
+++ b/sci-misc/vitables/vitables-3.0.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_P=ViTables-${PV}
+
+DESCRIPTION="A graphical tool for browsing / editing files in both PyTables and HDF5 formats"
+HOMEPAGE="https://vitables.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		dev-python/pytables[${PYTHON_MULTI_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	# remove the PyQt5 dependency
+	# because PyQt5 in Gentoo does not provide egg-info
+	# see also: https://github.com/pyqt/python-qt5/issues/18
+	sed "s:'PyQt5 [^ ]*::" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 06da38f9d1e3..64e39bd7b2d3 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest
index ed3e09f17775..4ed9bc48ee50 100644
--- a/sci-physics/bullet/Manifest
+++ b/sci-physics/bullet/Manifest
@@ -3,5 +3,5 @@ AUX bullet-2.89-no-dangling-pointer.patch 842 BLAKE2B 5d66875b52f696b839daccfbfe
 DIST bullet-2.86.tar.gz 25806558 BLAKE2B a8576d8dacd67b9789d32d7b1acc6c4025df3c15427c60d66f98b1906eee8b2b94e5b0108b9a8c00ca6261510ccaf57ba5c02c72fee8f528d4f723b304166731 SHA512 af8a6b282ab606437d7975a59cd8a9c2bf273c83b0e79f0c4c1de6fa51695ba6d5f3c853dce2fdba9cb55e7572214e15089e54db51afc465ca26f502cbd5a4f9
 DIST bullet-2.89.tar.gz 135742506 BLAKE2B 3725533bb50f3cf4783e21c57a5e3596f280d9aa3caa5b7a44925d4785206cc86514ff89c2cc1e33f8a14af7c8a5165190bb0515a6931fc4c7ec2e2b9aef3dd8 SHA512 3c4ba6a3b3623ef44dd4a23e0bc2e90dec1f2b7af463edcb886e110feac1dfb4a91945f0ed640052cac228318539e275976d37238102fb10a0f78aef065a730b
 EBUILD bullet-2.86.ebuild 1565 BLAKE2B 2bcb10a03caa592484f69870e951796f56b8a771e39fe023ec3fa1b517cb6e381e1a35cc4c951ded82aa9d5b5c8fea2cab3c034c26fddff62a962f5b2db512ad SHA512 41f68eaf06d5d300f8f6fb6b2a89cb0d3273c27dc9c7b397aaafd7cef9fd6a6f39a4bbef67ef42f0cf89754c1aa8006ce9e542f2c624e2ae7c9d0b570023817e
-EBUILD bullet-2.89.ebuild 2043 BLAKE2B d9bd64202f20ade30a37d8d4329793575980dffaede59c47abd0e5b0f2e8dbf72a413fbaeb36a3fab32ca8a185e1b036493ff8f3532c09c1102567b148a6380a SHA512 86eda68cc5a65f91da014a8dd93cc4a77061a76989fb6acbd7067ccf16d3fff1fe88ffd915bfab26ec0b87dd55989d7b7ced55beca14a57388c34d5d846aab69
+EBUILD bullet-2.89.ebuild 2050 BLAKE2B a9cb3d8cde1385146d1db5b5dfc46734ceb01d56c05e02db3b461d3b7b564ce9dcd34686c67bda7143622ca2fc05c5d6a04a50ddf3d8b74867148350f407ff32 SHA512 f778ac777ec9954c8a2ae56f3ad22d04ceff29e57ad119fed92daf535954e31ab5c7d68d49588dc4ed20f894ccdedd0f5099a366d80ae7bc2fa290b8d40ad620
 MISC metadata.xml 1188 BLAKE2B 9234b2083390248796bc38581d85dedecc7befe06b1b3d15a11c46fe0b468a0e831d20ad411d3386bc0f1ae9fc8cb119d4fe6a0a229276627f6349f373d29993 SHA512 84301ff0c87edee5c6704adb6e3a2a7b7ec1594a178a95a680c27acd2e0244742741ad02c4505da788a0c160253433c72c3daafaca95021ecc4709bd0e8571e3
diff --git a/sci-physics/bullet/bullet-2.89.ebuild b/sci-physics/bullet/bullet-2.89.ebuild
index 24626f66775a..93b7355b91d8 100644
--- a/sci-physics/bullet/bullet-2.89.ebuild
+++ b/sci-physics/bullet/bullet-2.89.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bulletphysics/bullet3/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+bullet3 doc double-precision examples extras openmp tbb test threads"
 
 REQUIRED_USE="
diff --git a/sci-physics/fastjet/Manifest b/sci-physics/fastjet/Manifest
index 6373ab565598..049bfd514a4a 100644
--- a/sci-physics/fastjet/Manifest
+++ b/sci-physics/fastjet/Manifest
@@ -1,7 +1,5 @@
 AUX fastjet-3.0.3-system-siscone.patch 4191 BLAKE2B 0de9757d64c735f49eabd836cd1edf0d6a33fe0e4e58a52794c3e5de2059276de68472f0426751984ce5547e8846ff77e8bb0f50f1807d68db83bb5183a9d781 SHA512 34ba5e61364f9fe090389edbeda4370b2707e89fab2a00e941cabe496f8e7cdd65fb1fccdb48f000247b0e6bb3abc79bb995931fd4a9709584eed8eaab42957c
 AUX fastjet-3.0.6-system-siscone.patch 3726 BLAKE2B b8fcd8b93631892b68b7d4584c3e456118fd66f80e12e39be3fc82f2f6dac3c52a3d2218c7e8f342166047aee385c9f12192777454be333b2a01b307bc67cdac SHA512 7522e3fd0fe789bc5b3172c2c26566136004b828a46a81fb0ec39bb6bedbf358efc0b51acab8cb19a40dd5b4138190f87655ddd2679cc91c819f5c7c9e9f4c57
-DIST fastjet-3.0.3.tar.gz 2240610 BLAKE2B 61c1957d3dc85f1d0e4b82ee899b8767997c79d56f29d1ce3b5af76c9e633db81dadb75bf2a6730f181b7791ee74f3be87f9b81844c3bd280a5d749584969576 SHA512 1fcdd0998d222ae089f10676ae1048fdce3e90f6aef3cd51463719b7ab26f8bcdd599d9521c6f9ef18e3989dbffd7f06da717ce845ab7e486a99433129b56f41
 DIST fastjet-3.0.6.tar.gz 2216501 BLAKE2B 1aacab5c91cb70d66035deddc4929d60c51444f6f23396f947d704f607d5f2267ccc5e09ec633d6e0ec1255b3a6bc7e51e4ea49c4cb06d0e3b6953b601ab76ee SHA512 1f01b7ed0e07bd94c88faa123f72c2e3bcd81ad32ab4d03dc0a18dd18635f3b18ba8d339176b0ef1d6e58cecd9f37aaea30b4ad909d2782ce5be7c11e205c3a5
-EBUILD fastjet-3.0.3-r1.ebuild 1243 BLAKE2B 2a492d89b0bd073a824acfdaf5084cc1af9773f3e834ac947662fc9ee0be21d263b329e9f67f49e12a05ca190c497c1af3dc2d71668f7991401484ce7648b7ae SHA512 8e64178b71db30618bbcff6233a9395abb5f3fa24b5f06e8ece6388d9fdb66be5de6f7ea82dc2661452a6ea49a234e77fb20edc28a9b377516c730c50029c8de
 EBUILD fastjet-3.0.6-r1.ebuild 1247 BLAKE2B 9df00a2006025aa82f6294ed5b7e0b921453c7e1c316d947ca40a3ea9e582d79beb9978ac1f82caf5f1514fa24354620de3b2550807491637293f694ff5d2428 SHA512 16ff337d0ef81f76028335f80d31b0eafdfde521dc11527f4e87624ebcda23caa3afc3d1ca49f2a264bbed588499e7cd439436956355bc063a833bc9430276ed
 MISC metadata.xml 846 BLAKE2B 011aac1c331a66bf050ec977961ea2091f54dad9b15611c02c84210a460b791ff1862a9b210c4acc2ba7e8877e0fb8db735dbdb16d71b2e3aee0b918d6286e4a SHA512 7a785ebae9232cef55c62ada47e4ec87507b6e4c7115f928fa3260474e67f56db336f7698833fe995d4f046b7013c88f62faf71758a881a86c982fe60a92c40a
diff --git a/sci-physics/fastjet/fastjet-3.0.3-r1.ebuild b/sci-physics/fastjet/fastjet-3.0.3-r1.ebuild
deleted file mode 100644
index a0395b353394..000000000000
--- a/sci-physics/fastjet/fastjet-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-FORTRAN_NEEDED=plugins
-
-inherit autotools-utils fortran-2 flag-o-matic
-
-DESCRIPTION="Fast implementation of several recombination jet algorithms"
-HOMEPAGE="http://www.fastjet.fr/"
-SRC_URI="http://www.fastjet.fr/repo/${P}.tar.gz"
-
-LICENSE="GPL-2 QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cgal doc examples +plugins static-libs"
-
-RDEPEND="cgal? ( sci-mathematics/cgal )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	plugins? ( sci-physics/siscone )"
-
-PATCHES=( "${FILESDIR}"/${P}-system-siscone.patch )
-
-src_configure() {
-	use cgal && has_version sci-mathematics/cgal[gmp] && append-ldflags -lgmp
-	local myeconfargs=(
-		$(use_enable cgal)
-		$(use_enable plugins allplugins)
-		$(use_enable plugins allcxxplugins)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dohtml -r html/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		find example \
-			-name Makefile -or Makefile.in -or Makefile.am -delete
-		doins -r example/*
-	fi
-}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 63a2dd0b7dc5..152dbbdc3107 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest
index 63683db134a3..11abb17c0262 100644
--- a/sci-visualization/tensorboard/Manifest
+++ b/sci-visualization/tensorboard/Manifest
@@ -1,5 +1,6 @@
 DIST tensorboard-2.1.0.zip 3835182 BLAKE2B c2c7dbc1ba4b85c52df6e693e1bd425bd76fe6db7ca25582b57d9c65c68b191dcdba2623ab0560139f1cac1bdf5c7a47261daaaf51fca46f2c5bf441f832a6fd SHA512 7463ace0863b90312a62a7fa96f4eca0147e85cf46ff21729f8996a794d54e14d876d3abe083d6aa4efd8e4e1582f7d5029de367f199981a34d4057b558bc51c
 DIST tensorboard-2.2.1.zip 2950617 BLAKE2B 487ad01981f994b23cb5fca8b60d9ed5f13ba13735d2613d1f3154eec9791b4b3068fb9fd50e75e16682e09ceb8a9ed8533ca2c43b6dea73db3adaeef15a889b SHA512 e96f8853d282dc19911cf2210ece0a4d7239f37dcba82e91697c80881fbcc21f12e4ba3e7d2eea7a84c9bb5b6521bf488d93d2312e55af9ec2d2c20f135d94fa
 EBUILD tensorboard-2.1.0-r1.ebuild 1838 BLAKE2B 777ceecaa2c901ee2c834b34b774d0c193b733e9ec3becfa6c07ee8b96bfe8a93abd5c1826a5ed38179a8bfcbfca2054a863e5f10d31822c0d7056669a5c4faa SHA512 1fcba112f887cfcb50adb7c396533da455f47413f037563ea6692227bcfc70767900219856a6574cec8e9c1efe6b04d84aef0aeee8c77113ee7424303ada7e0d
+EBUILD tensorboard-2.2.1-r1.ebuild 1946 BLAKE2B e67025a996ecbe523410775da621b4f741fc5b514474cd24dfea0ab7428411550f56c39b42c7f5b2e25adc466008bd664ed84519e1ea069dbcd4f2731e90f3ac SHA512 6a9c8f80e9a34adcc5ccbbb4535c9855e2818cc1fc46a04d6f801ef99241d856d81f77bf4c83c0e807653854ba218d33df7d67718d8c3e25f0b9d569856ed78b
 EBUILD tensorboard-2.2.1.ebuild 1944 BLAKE2B e0503f8c67624893eb16d97cfd36f0734f1db44526391cba62b7a664f1d4e4189519547904f706d8d03024ed47c45d5d0183b82f56df589cb43347c335f03db9 SHA512 29cd974fe3c4d0fe767838b60e198ef5cb553d3596f6f02afcea4eb56ee4a6a37d91e6f3f73cf77b1a4059037ec709cbf9917b0202794dd8dc7b200f9c61fe56
 MISC metadata.xml 494 BLAKE2B 367959e934fdf8e447da9632a05ea0ada6116a7c39cf42096a3b24f0dcf0c0bfbd3263e6f3913611c27e76f629b77d1e5022fa124d7e79f03a224bd3627bb538 SHA512 b59bedcac4e07ddbb62e90df57670116ba51c3d8c6294679ba5d8f17d7adbf3644f3d203c1d1ef4fa06d7e50640148ee259a081afb807477784350b98c52da11
diff --git a/sci-visualization/tensorboard/tensorboard-2.2.1-r1.ebuild b/sci-visualization/tensorboard/tensorboard-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..9d1a93563347
--- /dev/null
+++ b/sci-visualization/tensorboard/tensorboard-2.2.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-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/google-auth-1.6.3[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-oauthlib-0.4.1[${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}]
+	>=dev-python/scipy-1.4.1[${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"
+
+	sed -i -e '/tensorboard-plugin-/d' "${S}/${P}.dist-info/METADATA" || die "failed to remove plugin deps"
+}
+
+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 718c5f9f66d5..c0b929532ec9 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index d1adb546be1d..d26f45187638 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,4 +1,6 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
 DIST debianutils_4.11.1.tar.xz 157536 BLAKE2B 2093568ff6e779d25ff2960b1bc6b12bcd451eaf9ad586ee48d6a6f52bcb0d53c58cb01697eee3fe47d22bf9019fedb5e2857fc8bb358b1449f65079cab1190b SHA512 8283e42f190a9c59c54817a745e219fcc9a1f8995204d62aff84f755ace041e433fe707d3b4373060207a70c9c01d958234281061f77e6e6fb6c560c79711772
+DIST debianutils_4.11.2.tar.xz 158132 BLAKE2B c2a95c90b4267e3b1d61c21db562f960b4666982c488e69a757fb0a7a42e8e739d44f553edd8cf532df30c492e999920ab63ec3580479de7de5d901d75de76fc SHA512 0bd9098beee78b3c8dae839f0c29e9f142cbb22f2ced473cf7ae47a14d9493ba882c1829eba213780392a87a3223b3689729754c8ded80a091efaef3f6f903fd
 EBUILD debianutils-4.11.1.ebuild 912 BLAKE2B ab957374835ccb707a397e8039ca176804822429e1641a3e959df05ba9fda3afbd818a7aafda525115270b750f0c7cfb952bf7d650939f6ff3ea388f80d2be3b SHA512 8f81748727bf9a8d4e3af8165f3859a544c80e96108f83c87c97ac8b3a9a2e5771b724707d7534e2409862f3803e14133c3344c16f4bb74a90db5d91579f73ae
+EBUILD debianutils-4.11.2.ebuild 943 BLAKE2B b5a81e52dd6dcb84abea8c15d932c7543ecd3fea7c999c2f4482b5b6b4378d1d4494e9885f4773ba85d78dd33cdbba911bc5b7c573cb89f270c4a2c3538bf673 SHA512 7dc53b39049e32c8f2a4f63355c3908706a4cb3276df734f27fc2e2c4f20325ba0e3fcc6245b054fff50115b35e077fc19af1f3a304aa92fa5a4ef83f40b2a4e
 MISC metadata.xml 445 BLAKE2B e074fb05a82e69de19cfca5e102bd6577060cd6bbd3b5b6b7e4c8f24d8715b50abe3e7444eb04827d41f73777ab2588807b708636287271c39e14b2bcd7c90ef SHA512 b07bcaaba5700fa08a6dbd84c514ff720efd155fe442cc35a7c62b5c0b64802ca286c991f20f0d6d56b15bb6ecc097804bcee83b0d924b868e8c9106effa1db0
diff --git a/sys-apps/debianutils/debianutils-4.11.2.ebuild b/sys-apps/debianutils/debianutils-4.11.2.ebuild
new file mode 100644
index 000000000000..b398e3f5f041
--- /dev/null
+++ b/sys-apps/debianutils/debianutils-4.11.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="A selection of tools from Debian"
+HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="BSD GPL-2 SMAIL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+installkernel static"
+
+PDEPEND="
+	installkernel? (
+		|| (
+			sys-kernel/installkernel-gentoo
+			sys-kernel/installkernel-systemd-boot
+		)
+	)"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
+
+src_configure() {
+	use static && append-ldflags -static
+	default
+}
+
+src_install() {
+	into /
+	dobin tempfile run-parts
+
+	into /usr
+	dobin ischroot
+	dosbin savelog
+
+	doman ischroot.1 tempfile.1 run-parts.8 savelog.8
+	cd debian || die
+	dodoc changelog control
+}
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index c30f31271881..0c5f6099c799 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -3,7 +3,9 @@ AUX fakeroot-1.20.2-glibc-2.24.patch 1021 BLAKE2B 1f907d709be9819d4d7a9113fe17d7
 DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a
 DIST fakeroot_1.23.orig.tar.xz 298080 BLAKE2B eac3da8486d57266f0f6af0479f0fcec5aaf82f4707ad8f810f954373a31cf5f390ef57dcc71ba630a1d4a578df95ac9beda9c93b3c75adffcbc89860f442b69 SHA512 0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036
 DIST fakeroot_1.24.orig.tar.gz 522497 BLAKE2B fb08ed6512a3e26538662ceb28a197b85fd4a05c37b543529df6880e01c64bd774037bed1230bf7d7fe0bde798364c2fd0fcfab257fff4d3e6ae9800c076a5b0 SHA512 b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487
+DIST fakeroot_1.25.1.orig.tar.gz 126880 BLAKE2B ea92815d005422ade80a91d1351c500614f7628b2173caf23bab2192f9395440ba4429ac773723c79a0f0205b7c750db9c1cecbefe7e9e2c442c8a92938df0cf SHA512 0e340aacfb49558ee6719aa11aa297ccda2afe2f66209da8fa10e45ec7954d5db689717db38f30cdfb9d89b75ca63ec6aed42e2cc314fd25c60262aa735eab0d
 EBUILD fakeroot-1.22.ebuild 1067 BLAKE2B 12d38863a89eb5c073633b02fcf04845d48959821ad1a744b3329e98175164392dfa6cc14f006beefc3a07bb5df9b3944b016b59ad7755b8f3514e5bd7dd0d87 SHA512 5ef0839952eb6c3894faa97c9f0ca5e4676767b34c450d6375551301dc4d775188db6248d36d4abd0bf77e80176a7dc6701ecc79dd08a1ffda33d6d879d94d9d
 EBUILD fakeroot-1.23.ebuild 1074 BLAKE2B e0f810e84eae6eea778b7b23b8bd6e8cf9c83db4f9b58cd9e6705bb1811f8ac2f626959507865cd8b234577434a4e2aef6b77082b0422eac481e1e63a2907722 SHA512 76fe90adcfa947f794365bd641beb1d63ab76295bc6d5dc2541800c856594d61fe3c34aa1bb9c62e7463ed73986c59461cd8bbb5b421d493336ed313c2632904
 EBUILD fakeroot-1.24.ebuild 1081 BLAKE2B 83324f005105c63853a8609a59095032ba7c559c6a211257f5e834eccc331f0d6760ff46586ed64ca0847c2fcb4190160449538a201b3c480ecffac867d1d9c8 SHA512 aac064b0369eed287f53944cd7ce1be7455d8bd2eb647b2d7499b67d306def045a32dd994245d64c6ef632b7d240cbc258405563bd777e3239f154ec524ca531
+EBUILD fakeroot-1.25.1.ebuild 1185 BLAKE2B 53f64abb90b913657d03ae5883eff74762abf19a1562b26f3ff18dda0e80ad0db43ff88ba5378ceeecc76e38c64fb1ceebac1d544a928170fcd21aab25ba4893 SHA512 c9ee360961b83fa8a3990a7f3e6c4c18cc7b5e07c37b5944c283171662121b98df5bd779bfd4b27660cca8e0dfe7a816221d22cd096440af3a224f33050ca5f5
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-apps/fakeroot/fakeroot-1.25.1.ebuild b/sys-apps/fakeroot/fakeroot-1.25.1.ebuild
new file mode 100644
index 000000000000..eac32e7e9542
--- /dev/null
+++ b/sys-apps/fakeroot/fakeroot-1.25.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
+HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="acl debug static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/libcap
+	acl? ( sys-apps/acl )
+	test? ( app-arch/sharutils )"
+BDEPEND="app-text/po4a"
+
+DOCS="AUTHORS BUGS DEBUG README doc/README.saving"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	# Create tranlated man pages
+	pushd doc &>/dev/null || die
+	po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die
+	popd &>/dev/null || die
+
+	default
+}
+
+src_configure() {
+	export ac_cv_header_sys_acl_h=$(usex acl)
+
+	use debug && append-cppflags "-DLIBFAKEROOT_DEBUGGING"
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+}
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 082bcf8fea83..d522d90fb31c 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,5 +1,7 @@
 DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff2de810d12d43292c00e6af887b038f22d0c4c45c314b6e9d73a82dec6d737519c674bb139c2ef70511aa0 SHA512 e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
+DIST grep-3.5.tar.xz 1586396 BLAKE2B 62c98acb29b9998e60b64cacbe82df4f03a8d8a427a060d00283506155e6acadc4d77e8b8c2fa110227715c314ac7cde38a38eff0b92eb0ec793c59ba2562ea5 SHA512 8367aa930ecf7fa5c07153666bf7991097648bd7bf4ca672e6b14e0bb806c89991ec55d2880812877761cbde1d33562f22803835d74bfcd293c2246e274306c4
 EBUILD grep-3.3-r1.ebuild 1463 BLAKE2B 2592d406868784921685aa21b321caf12126627c935d729a8827048532779e7deeee21598f699ea6f9d238d945dfbca59b72555064a5ac32d5ab7fb93720bc47 SHA512 86392996c511087c09c2822dd861d6c223482ebe97b7c77a53673f003447b393cfee09647a302a939ca98cf5e7b123012323ff0dad00e9df0563d86f575f9693
 EBUILD grep-3.4.ebuild 1515 BLAKE2B eb01e846dab2fc7654fd5172d8b6dd9ba7c4affa278b28034d708a033604ceaefbda40c0c55500a6bac702e6503ebb6541029bef2faa94dc64405b79d41f970b SHA512 dadb38743f17805e0eb9f7592209645514edc0e36d6e8ccff23dba5e1c32db4cca3469fd7ea90efa10946018a60d3e915fa344963032f72d8dc5dcf8ead03d02
+EBUILD grep-3.5.ebuild 1522 BLAKE2B bcfd24d3219eb4daa64894084e592d277dae2cbebda55ed2c7cc71688cf4630766e5529ef9c04cd2ca4a57af7ad9cf49c88a0e04c7ec72a5ea76ab4e5da1cb40 SHA512 e2654150a88cb90c194e9cc20828ababa8290fbfabe98ab93c95c41fc80c0b29800b93bb415c0b5a9194705f1a7b518ff77b33cc16489057311435742cb9db69
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.5.ebuild b/sys-apps/grep/grep-3.5.ebuild
new file mode 100644
index 000000000000..a581969446e1
--- /dev/null
+++ b/sys-apps/grep/grep-3.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="https://www.gnu.org/software/grep/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
+IUSE="nls pcre static"
+
+LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	nls? ( virtual/libintl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	sed -i \
+		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
+		-e "s:@grep@:${EPREFIX}/bin/grep:" \
+		src/egrep.sh || die #523898
+
+	default
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	# don't link against libsigsegv even when available
+	export ac_cv_libsigsegv=no
+	# Always use pkg-config to get lib info for pcre.
+	export ac_cv_search_pcre_compile=$(
+		usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" ''
+	)
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/bin
+		$(use_enable nls)
+		$(use_enable pcre perl-regexp)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/hprofile/Manifest b/sys-apps/hprofile/Manifest
index 1feb8cd2ce1e..cb17916766ce 100644
--- a/sys-apps/hprofile/Manifest
+++ b/sys-apps/hprofile/Manifest
@@ -1,9 +1,3 @@
-DIST hprofile-3.0.6.tar.gz 18236 BLAKE2B b2aa89db87949ff0787dcfb84cc37b21e52c451abece3f10b13e95e37ad1aafad240a42ef5de23453f22b7fc23a9523abb8ae0dd730c33b4a9cd9a44b7f760b1 SHA512 86568314a24397d2ec5898dd3061e91a5597eff49679f0533fdcb0d2c9b76cdb131b25fe45167370174d1514ba222a781c0f09f98a1cc5407898e36c30ff677f
-DIST hprofile-3.1.1.tar.gz 18489 BLAKE2B d76c4b03e9e6873cb3f6f0dce415fd39ae49d73bffa4935a823b780e12c3f034debd20034786ba6790a6acb17181a67801b81cdf246c9f85ff5df344d8f1ff0a SHA512 b42bf79840270eccf164a0ba2d5def7d50846fa7043319b23be2be3fabece014a031cc4197c2688a6c4f7a542f0e0961ff538ea879eac81a7f03c024a4d023da
-DIST hprofile-3.2.2.tar.gz 18983 BLAKE2B f455c6895f2e550f2fd7e43952284f7894775caa1a1ad8d24171d6978dce74fb5b5f6c742cd7094de789aad2ede2023c4ad6e77207adb6b903df9c5984c8cf98 SHA512 169a6c68659ea0d84b89bf25c8421bdfe7d106c77ca7cf80bafe65a4b24a04267729ef617e795adee5bdbcbfb56102a41c2ee7c926027aef69abe4cdee499328
 DIST hprofile-6.1.3.tar.gz 18719 BLAKE2B 1e70bad6426b73fa03d4c987bc5c585413122462dfd7270f140a78b351633b75d366dd2efd328296f5ad3c78ccafe2182f758e730e6af809e1f16e010f5a93b1 SHA512 33987e1fa61619794c40dce737878a37a7c202e50edcd086fe6b59829908f019438a5dccdbda45eb798e227eb2a6ffd3510788645cd73751baa14b5028f6f670
-EBUILD hprofile-3.0.6.ebuild 522 BLAKE2B 1ffdb00c4af7096ab2e9f28c9d4fe0f351043e20d7022eee8ef6e74e6be70648aa3ab13adc2d022488fc99491332b8d9a2dda8139f0f6a25d664322ed11438e0 SHA512 969e8539dfbcec08f4ab670f342409eb7ff812ad6b70517e00d3dac43b91f1443f470e686c25c74664304afb7c4bbbe131198b9a9a9905eed3d9ebb0ef73fb59
-EBUILD hprofile-3.1.1.ebuild 522 BLAKE2B 1ffdb00c4af7096ab2e9f28c9d4fe0f351043e20d7022eee8ef6e74e6be70648aa3ab13adc2d022488fc99491332b8d9a2dda8139f0f6a25d664322ed11438e0 SHA512 969e8539dfbcec08f4ab670f342409eb7ff812ad6b70517e00d3dac43b91f1443f470e686c25c74664304afb7c4bbbe131198b9a9a9905eed3d9ebb0ef73fb59
-EBUILD hprofile-3.2.2.ebuild 522 BLAKE2B 1ffdb00c4af7096ab2e9f28c9d4fe0f351043e20d7022eee8ef6e74e6be70648aa3ab13adc2d022488fc99491332b8d9a2dda8139f0f6a25d664322ed11438e0 SHA512 969e8539dfbcec08f4ab670f342409eb7ff812ad6b70517e00d3dac43b91f1443f470e686c25c74664304afb7c4bbbe131198b9a9a9905eed3d9ebb0ef73fb59
 EBUILD hprofile-6.1.3.ebuild 523 BLAKE2B e0cfa25051185334bc936d05b871144f8917575aff7f9bc63678ad67c991aa91e57696c0f75a914236213c4aaeb500d8a2c27203d62611d798df71ef47ae1360 SHA512 c726f3d32ef34db1081560de32880ec4c838ed81084e78931d0f6342cf837ce4c957c783bcadbbaa6e06e01ea92ed3afaf6ebead2422f30285bc943c6c82be6e
 MISC metadata.xml 334 BLAKE2B 248be9d6332ce0d0ac7317dbac6b470f1c9e6a829c3adf1bc3a37d8ece5c18f2b67aa561267a2ef406318d06463ad2f20a69c0a753fc24ee826d52beed8d09ab SHA512 e42c69bbb110f8dcd81c1d5a58b04360888bc13f934b54609c5bd65d6a80954dd73b5e777d295713b30fbe0507bb933c09e5fcb31fdf30295f1d2e68de02d053
diff --git a/sys-apps/hprofile/hprofile-3.0.6.ebuild b/sys-apps/hprofile/hprofile-3.0.6.ebuild
deleted file mode 100644
index 74a49b93ed92..000000000000
--- a/sys-apps/hprofile/hprofile-3.0.6.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Utility to manage hardware, network, power or other profiles (fork)"
-HOMEPAGE="https://github.com/tokiclover/hprofile"
-SRC_URI="https://github.com/tokiclover/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	sed -i '1s:.*:#!/sbin/openrc-run:' hprofile.initd || die
-	sed -i "/^prefix/s:=.*:=${EPREFIX}/usr:" Makefile || die
-}
diff --git a/sys-apps/hprofile/hprofile-3.1.1.ebuild b/sys-apps/hprofile/hprofile-3.1.1.ebuild
deleted file mode 100644
index 74a49b93ed92..000000000000
--- a/sys-apps/hprofile/hprofile-3.1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Utility to manage hardware, network, power or other profiles (fork)"
-HOMEPAGE="https://github.com/tokiclover/hprofile"
-SRC_URI="https://github.com/tokiclover/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	sed -i '1s:.*:#!/sbin/openrc-run:' hprofile.initd || die
-	sed -i "/^prefix/s:=.*:=${EPREFIX}/usr:" Makefile || die
-}
diff --git a/sys-apps/hprofile/hprofile-3.2.2.ebuild b/sys-apps/hprofile/hprofile-3.2.2.ebuild
deleted file mode 100644
index 74a49b93ed92..000000000000
--- a/sys-apps/hprofile/hprofile-3.2.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Utility to manage hardware, network, power or other profiles (fork)"
-HOMEPAGE="https://github.com/tokiclover/hprofile"
-SRC_URI="https://github.com/tokiclover/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	sed -i '1s:.*:#!/sbin/openrc-run:' hprofile.initd || die
-	sed -i "/^prefix/s:=.*:=${EPREFIX}/usr:" Makefile || die
-}
diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index 229239e008fb..39af96933190 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1,6 +1,7 @@
-AUX README.gentoo 301 BLAKE2B c352d3f7e0038ef8f71f6e95376e91513c45914f7d4c31ec0390a0e9745360d7114b3c4e2743d2cb5872241073a3a4087a3240f2f0ef89e3203b5500520d7eb2 SHA512 a20a1a910a7f852844bfd8f03e824e74760c49c5bf7171f1dbfb16976805179ed79a3ae892ba70e99bcd93182bb1d83f491b9a5f7b64e94478172a424c00350e
+AUX README.gentoo 296 BLAKE2B df18c0796912c5cfe6e8f88427ea690512bfd519aa3502528df6f6936571497937a22f8edcd9e9143d915e648f9b341043141cc6d0ae35de55d22d44c0335f6e SHA512 4ae61b89352a4bbe70f4ea1b85eb19e58c2b81475722dda25c289fbe15e7e6e07df51b08471c5d3c5d7a3b12cc09ba599e0d2158dee68c9c66f60908d57b4326
+AUX hw-probe-1.5-disable-automatic-upload.patch 1140 BLAKE2B 47ae86326941c5a86f9efd7614509a9af36261c51ef85f21ea1172ae91c3966c113aa51f8841a56005f75b0370b57dff6196fe49a77c766ce1efd9003ee0e249 SHA512 7cbe2dc17cb513086f85052b43349fb64bd12a0f3671bb37109a20d62cf565f8bc8d9e798a7d0a7e53896d187e8c575f850861e381885f2ac1f40d2c0c919063
 DIST hw-probe-1.5.tar.gz 113996 BLAKE2B 59f6fc27e2cbb99a4b7dd9428e32a93dce2ffcc1133e82539b8836a694e6c5634fe2e172732675acf0d83504907a750c63f138d6dec236039eb7c805010a8383 SHA512 80dd2484bd317ac1e86d7f434626f288648aebf110a4bf81c0c05548abcb19d990119c1690fcb5796384a6c32fd5c1e827698a31165bfc41ef6df9fc7fdd368d
 DIST hw-probe-1.6_beta2.tar.gz 143569 BLAKE2B fc7b7562f86eb1b26fef32a8ed9b4a8d01c5621bedbc7e810d5a011c53d528b000ff9df312cf5e3f0ab455558e08e2b9a3ddcd543cd6856208466721f9a0e13c SHA512 2727e7b0fe449cbb6dd21fc112660df4ec666be845bbfd21037b41372a499dfb80c8c2dc37bd222032c68faadff91192a6d6f5229353cb0fc63b8e3dbd715f5d
-EBUILD hw-probe-1.5.ebuild 2214 BLAKE2B 8b2051627a39feb3973720423910dd8b9fc33725575bd4003756d4156de6f8b6543e8e003c412d8f81e84f57315ac568a23cffa7b81b7fe0dea3e373f59a0c23 SHA512 ae42f62eaa907b32b2cab911aadd9b863ff92338ea0dedceddb556e63ebe280d4efd6411b0bd31b8f8f236df5af0bbed2958ba37f55de4355ca1f132969afe1b
-EBUILD hw-probe-1.6_beta2.ebuild 2381 BLAKE2B e1da306e2178569bee0d11b5b0253fea11f90774f5f403c7a054461c95f1b5bae6e4aa66d519c218b4839751dbdc0512946c3f33808adba7a1dceac95c6bcb67 SHA512 a02220c7a13c3dd0991f0dbe40aabb7107289e1af7be9e036782ceee1cfe7be47df141cf429ffa0980cd84ab720cdb083401d4dcfa213658f2590cfd98364228
+EBUILD hw-probe-1.5-r1.ebuild 2282 BLAKE2B 9992151a7b468d7138ec4a001f5575525489f546c58df29b5eefef9b3db5f6607f2f01f8289f8ad8474d20f21b6f57d1381c8b6c3a446188790912544cca5a54 SHA512 b539734e3a5cf0735c99ba8fdb6aca628e8e84d8d02739676c35c13d1880b891f50f4d8f209d3ca595859f8657e7618900ee39c461c5989580b62afc9b40dcb6
+EBUILD hw-probe-1.6_beta2-r1.ebuild 2449 BLAKE2B 20d24381c6a18034608f9d3fdd5c6075bbe10ec9672faa6dcb4ad3f5ba2b258c8e5cc8d0e9b9c596c64644686b5a65977ee918e537a98212f2c4190daec8e2ae SHA512 80b49c3fb7cc001f476619f47b535139765708ab4d07cc2e45134d4c1bcba1407cbe904f7494bee613b652c6461fb472e5146c12b4f6f0cd7b10267607282916
 MISC metadata.xml 646 BLAKE2B 1cc93bfb0e3544c4c746e80ff21675fa22d3103e14a040ffedfcfd24e73d8d968decc318e4523a03815e85de4ef85926ac20d4dfdf7cde5a3445ca29f11f6de7 SHA512 2ea8a211186b71ebc008c9999225edef063c8c8e0317d6e4c6149cc6ec6281a84065bef3dc93b4308f8567860fb75c19287aa91b5ab41e6a68229fcbf1c5a474
diff --git a/sys-apps/hw-probe/files/README.gentoo b/sys-apps/hw-probe/files/README.gentoo
index 521f7f4aaaaf..61786ade26bb 100644
--- a/sys-apps/hw-probe/files/README.gentoo
+++ b/sys-apps/hw-probe/files/README.gentoo
@@ -1,6 +1,6 @@
-Please keep in mind, that all results are being uploaded
-by default directly to the Linux Hardware Database
-and can be read by everyone in public.
+Please keep in mind, that all results, as they are
+being uploaded directly to the Linux Hardware Database,
+can be read by everyone in public.
 
 In order to identify unique computers and hard drives,
 a 32-byte prefix of a salted SHA512 hash from
diff --git a/sys-apps/hw-probe/files/hw-probe-1.5-disable-automatic-upload.patch b/sys-apps/hw-probe/files/hw-probe-1.5-disable-automatic-upload.patch
new file mode 100644
index 000000000000..4f16c0d87fae
--- /dev/null
+++ b/sys-apps/hw-probe/files/hw-probe-1.5-disable-automatic-upload.patch
@@ -0,0 +1,36 @@
+From 6a211f965c21f1aa2e8612bcd7e2966ce8e8c607 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conikost@gentoo.org>
+Date: Wed, 23 Sep 2020 22:26:45 +0200
+Subject: [PATCH] hw-probe.pl: disable automatic upload
+
+Due security concerns, running 'hw-probe.pl' without any parameters
+shouldn't upload directly by default all data. Instead, the user should
+add '-upload' if he really wants that.
+
+Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
+---
+ hw-probe.pl | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/hw-probe.pl b/hw-probe.pl
+index b71f250..1bceb0e 100644
+--- a/hw-probe.pl
++++ b/hw-probe.pl
+@@ -217,15 +217,13 @@
+ 
+ if($#ARGV_COPY==-1)
+ { # Run from STDIN
+-    print "Executing hw-probe -all -upload\n\n";
++    print "Executing hw-probe -all\n\n";
+     $Opt{"All"} = 1;
+-    $Opt{"Upload"} = 1;
+ }
+ elsif($#ARGV_COPY==0 and grep { $ARGV_COPY[0] eq $_ } ("-snap", "-flatpak"))
+ { # Run by desktop file
+-    print "Executing hw-probe -all -upload\n\n";
++    print "Executing hw-probe -all\n\n";
+     $Opt{"All"} = 1;
+-    $Opt{"Upload"} = 1;
+     
+     if($SNAP_DESKTOP or $FLATPAK_DESKTOP)
+     { # Desktop
diff --git a/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild b/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
new file mode 100644
index 000000000000..3d73d2db78ad
--- /dev/null
+++ b/sys-apps/hw-probe/hw-probe-1.5-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature readme.gentoo-r1
+
+DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
+HOMEPAGE="https://github.com/linuxhw/hw-probe/"
+SRC_URI="https://github.com/linuxhw/hw-probe/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Digest-SHA1
+	net-misc/curl
+	sys-apps/dmidecode
+	sys-apps/edid-decode
+	sys-apps/hwinfo
+	sys-apps/pciutils
+	sys-apps/smartmontools
+	sys-apps/usbutils
+	virtual/perl-Data-Dumper
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.5-disable-automatic-upload.patch" )
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	default
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "showing Machine Check Exceptions." app-admin/mcelog
+	optfeature "showing additional I/O statistics." app-admin/sysstat
+	optfeature "showing smart card (reader) information." dev-libs/opensc
+	optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools
+	optfeature "showing information of attached scanners." media-gfx/sane-backends
+	optfeature "showing GPU information provided by MESA." media-libs/mesa
+	optfeature "showing zeroconf statistics." net-dns/avahi
+	optfeature "showing HP printer statistics." net-print/hplip
+	optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill
+	optfeature "showing additional CPU capabilities." sys-apps/cpuid
+	optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm
+	optfeature "showing available I2C sensors." sys-apps/i2c-tools
+	optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi
+	optfeature "showing information about tested memory for faults." sys-apps/memtester
+	optfeature "showing 'Plug & Play' devices." sys-apps/pnputils
+	optfeature "showing systemd boot process information." sys-apps/systemd
+	optfeature "showing ACPI statistics and tables." sys-power/iasl
+	optfeature "showing information about NUMA." sys-process/numactl
+	optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs
+	optfeature "showing available Xinput devices." x11-apps/xinput
+}
diff --git a/sys-apps/hw-probe/hw-probe-1.5.ebuild b/sys-apps/hw-probe/hw-probe-1.5.ebuild
deleted file mode 100644
index 88364d9d246e..000000000000
--- a/sys-apps/hw-probe/hw-probe-1.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature readme.gentoo-r1
-
-DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
-HOMEPAGE="https://github.com/linuxhw/hw-probe/"
-SRC_URI="https://github.com/linuxhw/hw-probe/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Digest-SHA1
-	net-misc/curl
-	sys-apps/dmidecode
-	sys-apps/edid-decode
-	sys-apps/hwinfo
-	sys-apps/pciutils
-	sys-apps/smartmontools
-	sys-apps/usbutils
-	virtual/perl-Data-Dumper
-"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	default
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	optfeature "showing Machine Check Exceptions." app-admin/mcelog
-	optfeature "showing additional I/O statistics." app-admin/sysstat
-	optfeature "showing smart card (reader) information." dev-libs/opensc
-	optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools
-	optfeature "showing information of attached scanners." media-gfx/sane-backends
-	optfeature "showing GPU information provided by MESA." media-libs/mesa
-	optfeature "showing zeroconf statistics." net-dns/avahi
-	optfeature "showing HP printer statistics." net-print/hplip
-	optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill
-	optfeature "showing additional CPU capabilities." sys-apps/cpuid
-	optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm
-	optfeature "showing available I2C sensors." sys-apps/i2c-tools
-	optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi
-	optfeature "showing information about tested memory for faults." sys-apps/memtester
-	optfeature "showing 'Plug & Play' devices." sys-apps/pnputils
-	optfeature "showing systemd boot process information." sys-apps/systemd
-	optfeature "showing ACPI statistics and tables." sys-power/iasl
-	optfeature "showing information about NUMA." sys-process/numactl
-	optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs
-	optfeature "showing available Xinput devices." x11-apps/xinput
-}
diff --git a/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild b/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
new file mode 100644
index 000000000000..10f2227e5771
--- /dev/null
+++ b/sys-apps/hw-probe/hw-probe-1.6_beta2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_/-}"
+MY_PV_BETA="${MY_PV/2/}"
+
+inherit optfeature readme.gentoo-r1
+
+DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
+HOMEPAGE="https://github.com/linuxhw/hw-probe/"
+SRC_URI="https://github.com/linuxhw/hw-probe/archive/${MY_PV_BETA}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${MY_PV_BETA}"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Digest-SHA1
+	net-misc/curl
+	sys-apps/dmidecode
+	sys-apps/edid-decode
+	sys-apps/hwinfo
+	sys-apps/pciutils
+	sys-apps/smartmontools
+	sys-apps/usbutils
+	virtual/perl-Data-Dumper
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.5-disable-automatic-upload.patch" )
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	default
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "showing Machine Check Exceptions." app-admin/mcelog
+	optfeature "showing additional I/O statistics." app-admin/sysstat
+	optfeature "showing display data channel (ddc) information." app-misc/ddcutil
+	optfeature "showing smart card (reader) information." dev-libs/opensc
+	optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools
+	optfeature "showing information of attached scanners." media-gfx/sane-backends
+	optfeature "showing GPU information provided by MESA." media-libs/mesa
+	optfeature "showing zeroconf statistics." net-dns/avahi
+	optfeature "showing HP printer statistics." net-print/hplip
+	optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill
+	optfeature "showing additional CPU capabilities." sys-apps/cpuid
+	optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm
+	optfeature "showing available I2C sensors." sys-apps/i2c-tools
+	optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi
+	optfeature "showing information about tested memory for faults." sys-apps/memtester
+	optfeature "showing 'Plug & Play' devices." sys-apps/pnputils
+	optfeature "showing systemd boot process information." sys-apps/systemd
+	optfeature "showing ACPI statistics and tables." sys-power/iasl
+	optfeature "showing information about NUMA." sys-process/numactl
+	optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs
+	optfeature "showing available Xinput devices." x11-apps/xinput
+}
diff --git a/sys-apps/hw-probe/hw-probe-1.6_beta2.ebuild b/sys-apps/hw-probe/hw-probe-1.6_beta2.ebuild
deleted file mode 100644
index 146c6c196eca..000000000000
--- a/sys-apps/hw-probe/hw-probe-1.6_beta2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_/-}"
-MY_PV_BETA="${MY_PV/2/}"
-
-inherit optfeature readme.gentoo-r1
-
-DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
-HOMEPAGE="https://github.com/linuxhw/hw-probe/"
-SRC_URI="https://github.com/linuxhw/hw-probe/archive/${MY_PV_BETA}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Digest-SHA1
-	net-misc/curl
-	sys-apps/dmidecode
-	sys-apps/edid-decode
-	sys-apps/hwinfo
-	sys-apps/pciutils
-	sys-apps/smartmontools
-	sys-apps/usbutils
-	virtual/perl-Data-Dumper
-"
-
-S="${WORKDIR}/${PN}-${MY_PV_BETA}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	default
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	optfeature "showing Machine Check Exceptions." app-admin/mcelog
-	optfeature "showing additional I/O statistics." app-admin/sysstat
-	optfeature "showing display data channel (ddc) information." app-misc/ddcutil
-	optfeature "showing smart card (reader) information." dev-libs/opensc
-	optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools
-	optfeature "showing information of attached scanners." media-gfx/sane-backends
-	optfeature "showing GPU information provided by MESA." media-libs/mesa
-	optfeature "showing zeroconf statistics." net-dns/avahi
-	optfeature "showing HP printer statistics." net-print/hplip
-	optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill
-	optfeature "showing additional CPU capabilities." sys-apps/cpuid
-	optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm
-	optfeature "showing available I2C sensors." sys-apps/i2c-tools
-	optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi
-	optfeature "showing information about tested memory for faults." sys-apps/memtester
-	optfeature "showing 'Plug & Play' devices." sys-apps/pnputils
-	optfeature "showing systemd boot process information." sys-apps/systemd
-	optfeature "showing ACPI statistics and tables." sys-power/iasl
-	optfeature "showing information about NUMA." sys-process/numactl
-	optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs
-	optfeature "showing available Xinput devices." x11-apps/xinput
-}
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index 7cc293b4d9f7..cec6d3463acd 100644
--- a/sys-apps/init-system-helpers/Manifest
+++ b/sys-apps/init-system-helpers/Manifest
@@ -1,4 +1,4 @@
 AUX revert-openrc-management.patch 798 BLAKE2B 1e04e2f9c361eb0c125e5b23d0b18c58198ad968fec5965f43e6a5e8b8201d29c7ad2c05431d7107d99acc75ab397cfd90121f7f0618f9bb440a8d6687039c20 SHA512 8d8cc8886b5d731b7538425e6be10b4fa8d0c8b8eb946a64e885a0f9dc19c02d596a803716a8a6d681fb9e408650993b9c81ef23d2d0ab53485d65b15863ace7
 DIST init-system-helpers_1.49.tar.xz 42660 BLAKE2B 548711283b04e3df13e9287154e2648b99ac80c2cdc71a428b4496220cd7c319f8f7afccb1e611c07b9d801837ef8799a3295a0490aa62812d47b728ba5ddba9 SHA512 bd612207e51e18a44f9c90e1e5b069ab39e06c776b8a0d6c9ecb367890d4a44ff02b3028418ac10a688782745331f39bb9299ba836f333b712e6fdd7ddc8da16
-EBUILD init-system-helpers-1.49-r1.ebuild 872 BLAKE2B 1401d9d4a4aa3e196618fa8ab0952ebc19054eb59ff9773bec1d4cbc6152252f7704f493fac58d182492784a931c4e74c7f5d80b7b1a5830d301d59f96af2031 SHA512 719a3c90e1e5abe4baef18f4ee0f1cce4b6f57a832612e48e567f86b0a9f68a94fbab84370e65237ff1fcca3e83d9eee6722209d115f9c03f09bd61c1b3102fb
+EBUILD init-system-helpers-1.49-r1.ebuild 879 BLAKE2B 2f24bdf051c0066181d636af3968e60f66788d157b1752116dce1ea2d7aaa75d19da137bb310f9fd1f6ca41c864cf259c1d07b27324f58028f85e3c39fd9b2cb SHA512 ed86a64b4f925fba0f6fbab4bc2dc24ef9b57b936d739176f82759d1ecc4e6e80b88db2e52aa5845e6fc34c93d88308b79169bdf1554becb0e06147c0e038631
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild b/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
index ede540985543..1e0096905cac 100644
--- a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
+++ b/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/linux-misc-apps/Manifest b/sys-apps/linux-misc-apps/Manifest
index 868297a76aab..8cf63c9fe726 100644
--- a/sys-apps/linux-misc-apps/Manifest
+++ b/sys-apps/linux-misc-apps/Manifest
@@ -1,16 +1,7 @@
 AUX freefall.confd 147 BLAKE2B b8fcd23306df7122e47e765dcba00cbec0fa7e2d9758d606e7e80cd3195b3fb7bce976fafef801812b425827f99689cde668106430119fcb57767bc816de635f SHA512 556472ab75ab8d3ccbedc44902a34bdef433430aa86fe5d8a125b27101f81e9c7c77e5a1fdfa84aef35078046e4b27a33eeb17d1745871f9e1f41e0ef64b2ba9
 AUX freefall.initd 1111 BLAKE2B c9c5de16da61124a4e984b47ca7cfa368cb5d02bfa85286f2cb9eaa50557da1b55d86b7a5beba5a5db60653c4a84b57276edc982782b7f8509d9a33cf45956e9 SHA512 e4d4d724276d9b64b80b29be5c28b9efc15556dd31545c85e45253aec2305d37af4b60a0be3f2f279c76c27aba5a968053a9bab7d08f2d559277701fd84375f4
-AUX hpfall.confd 144 BLAKE2B 9abe0f8d8a3454d88aaa00c186b4513045cbdc96a7b1679780f26ac8b0dcd4c082bc9807ba39efe6e21d15d3e6dfafce28ca121b95c60ef808f3c8a252d38879 SHA512 995fae481f169a2e53e4985113d5581ec37690a0fa2b77ca4665ff2e26d1ec073edc12d4001d4ca144ba3e3ce57b269bd8016ea024844fa3bde145bc7e4945f6
-AUX hpfall.initd 1098 BLAKE2B 0f854ffc7ee8649ca04aec13aaac0709ced20dcdf1981b9ad23076c9d97c0f8e2119ce9c40744b5af5d79f2680986f993f8a6680878b8dc153efa733e6528b72 SHA512 64c716255d8ecc5828d7c54b4aef9406353e2d3a2f0965882342344c533bebf7826b4a76e58263b974dfc1162b49688e2009eeb5a467e4361ab8241d23a028d7
-DIST linux-3.18.tar.xz 80934708 BLAKE2B cf796fa1eb24276470b51bd3754f02932e57c6469e45959893b3714457ba33f0081ff04137990f228e1aae6d42a05073478a3ef932df468af7cd02bf8c8836c4 SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009
-DIST linux-3.6.tar.bz2 82296001 BLAKE2B 454e1c86dd5b7d2f9ff8ba777feda3743b620ecf4325c06b7270b2b1f60d2af2797836b509252e7140980ab0ba620d8fc98dd5d3968d19f8101c9327af262eef SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9
-DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
-DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
-EBUILD linux-misc-apps-3.18.ebuild 5027 BLAKE2B 7905159d229d6076acb850b4f453689c731f03af48279a5e2e607a0fcea41b35a90c6491e73f3adb2c7167cf02ae28e4f618dcb27a4fbfa780eaa778cacdf483 SHA512 6552b6eda377a8dc7eea4ec0a452c120fb762954eab016502898d9857cd9413c4b6a59810e50d552d523bc71c441a6c740f66f6ac0926b2910bd788fc7d8a2aa
-EBUILD linux-misc-apps-3.6-r2.ebuild 5110 BLAKE2B 7281954256d85ca023c37d7a31bb0662e90976d7d442219926a3bfce1a51a590b2a03f71921958db28ce5c757781465e15e78ccb8c4899c49dae8cd04167e78a SHA512 5b57aa7d64ef4f7381c1476962e439404b3131a28e4a0d461d0cde2cd091ea69dad00dbb7f621d95f32cdd24a26969645d587e06aa3dc0429b2b4a39c38001f1
-EBUILD linux-misc-apps-4.19.ebuild 6339 BLAKE2B 1c2a523d86dd4fdd3728128a1186918966956624b02075ecfc25c5d4d0ebf616689b9b761d84620256286e55dde130d81bee3af5018808910ac06015144153ca SHA512 c1703fc466ad5a4458529b64189ec59539f9c3de38e47e963d4faa10fca6edf93c1341eb1b95397f1567e583296f15fc1bcdbd01175516e9afecc8c93bcea8aa
-EBUILD linux-misc-apps-4.4-r1.ebuild 6368 BLAKE2B 66929629228f66fad494818f2d121358f061d86107f364dfc54a3088faf4f1cf466924055eeff0317c990ef267da95aed509037e390f5fea67d7fa82fb559f24 SHA512 b687566096f04098bb1df53a3d8e0947e8a0776f847522adf8d05064dd58ef69889a5935dac084cbfd830c9bfcdbf1477aa0f67c11b3d42356d42f5aa7c61190
-EBUILD linux-misc-apps-4.4.ebuild 5526 BLAKE2B 655a698d8931c7980ae8abcc0b650fd3dc38cd8aa5c084a1293848b15533ff63ecc1cd6d6f8930317eb7b116b83da9377d7562108f7a0a20ee949f6beaa263bc SHA512 e53020f00bed7b5913613321905fe46b73ba902c2e8e602bb60752a270febd86f978f8216282b2b3a5abe11159927e57bf4ebfc5145a37609c1125ca64ae3970
+DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
 EBUILD linux-misc-apps-5.6.ebuild 6576 BLAKE2B dd0b82e5853f89d1a29ebaeee407487ecf2db0968ad69a1a4bc11b23ccde9df317fd7e103bc7d483e51b14593cfaade6066982bfcfb45bd9b285b58f3bc0a08a SHA512 cd3d66bbd6933c16b6fbb70cfe619add154202108bbe773aee51a982fc2ea99cecdbffc6cb0ebb17c46ea9a81d88d33ad848b3c60982efd225db0ffc70eefe8d
+EBUILD linux-misc-apps-5.8.ebuild 6525 BLAKE2B ca46c898c235376a5eb2558edc2cea4bf5b9186ad43a7f8446579da36fa3fc0fb640d2686791138750c4cf185dcfa40fe8ac264a19fc594404b37074bab3cfdd SHA512 2e36612df6eebed2fc0129da12daaf9934de30bae0c5ca40eef771aeb5e77df54aa9ec9f843d4382dd8280d3c90e80a54547a6dbac368a8073c80c3057553bf1
 MISC metadata.xml 318 BLAKE2B 87a15c795438a1025ba5624d0c00bfc1e3de3172205b20a4cdb27d5a0d524bc35d1aeb64e58b8c5fadd08d151a82913c35454c36ee5e653da86a6031ab707d24 SHA512 c5b90254b92fd0bd40596718daed1e9b5fd2c0039a814932811e33fb6827eac660aadd324bd45117d60ca56148b2f8213a075be1b255d6e8c006e2702f76833d
diff --git a/sys-apps/linux-misc-apps/files/hpfall.confd b/sys-apps/linux-misc-apps/files/hpfall.confd
deleted file mode 100644
index 4f3451b0bff6..000000000000
--- a/sys-apps/linux-misc-apps/files/hpfall.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/hpfall
-
-# The name of the disk device that hpfall should protect.
-# Usually this is 'sda' or 'hda' the primary master.
-
-DISK="sda"
\ No newline at end of file
diff --git a/sys-apps/linux-misc-apps/files/hpfall.initd b/sys-apps/linux-misc-apps/files/hpfall.initd
deleted file mode 100644
index 8b4930612c4d..000000000000
--- a/sys-apps/linux-misc-apps/files/hpfall.initd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-checkconfig() {
-    if [ -z "$DISK" ] ; then
-	eerror "You need to setup DISK in /etc/conf.d/hpfall first"
-	return 1
-    fi
-
-    if [ ! -b /dev/${DISK} ]; then
-        eerror "Could not find disk /dev/${DISK}!"
-        eerror "Adjust the DISK setting in /etc/conf.d/hpfall"
-        return 1
-    fi
-
-    if [ ! -e /sys/block/${DISK}/device/unload_heads ] ; then
-        eerror "No protect entry for ${DISK}!"
-        eerror "Kernel 2.6.28 and above is required"
-        return 1
-    fi
-
-    if [ ! -c /dev/freefall ]; then
-        ebegin "Loading hp_accel module"
-        modprobe hp_accel
-        eend $? || return 1
-    fi
-}
-
-start () {
-    checkconfig || return 1
-
-    ebegin "Starting active hard-drive protection daemon"
-    start-stop-daemon --start --quiet \
-        --exec /usr/sbin/hpfall /dev/${DISK}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping active hard-drive protection daemon"
-    start-stop-daemon --stop --quiet \
-        --exec /usr/sbin/hpfall
-    eend $?
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
deleted file mode 100644
index 4821b1c04c42..000000000000
--- a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils toolchain-funcs linux-info ltprune flag-o-matic
-
-DESCRIPTION="Misc tools bundled with kernel sources"
-HOMEPAGE="https://kernel.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs tcpd"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_V=$(get_version_component_range 1-2)
-
-if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES=linux-${LINUX_VER}.tar.xz
-SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES}"
-
-# pmtools also provides turbostat
-# usbip available in seperate package now
-RDEPEND="sys-apps/hwids
-		>=dev-libs/glib-2.6
-		tcpd? ( sys-apps/tcp-wrappers )
-		!sys-power/pmtools"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${LINUX_VER}"
-
-# All of these are integrated with the kernel build system,
-# No make install, and ideally build with with the root Makefile
-TARGETS_SIMPLE=(
-	Documentation/accounting/getdelays.c
-	Documentation/laptops/dslm.c
-	Documentation/laptops/freefall.c
-	Documentation/networking/timestamping/timestamping.c
-	Documentation/watchdog/src/watchdog-simple.c
-	tools/cgroup/cgroup_event_listener.c
-	tools/lguest/lguest.c
-	tools/vm/slabinfo.c
-	usr/gen_init_cpio.c
-)
-# tools/vm/page-types.c - broken, header path issue
-# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
-# Documentation/networking/ifenslave.c - obsolete
-# Documentation/ptp/testptp.c - pending linux-headers-3.0
-
-# These have a broken make install, no DESTDIR
-TARGET_MAKE_SIMPLE=(
-	Documentation/misc-devices/mei:mei-amt-version
-	tools/firewire:nosy-dump
-	tools/power/x86/turbostat:turbostat:../../../../turbostat
-	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
-)
-# tools/perf - covered by dev-utils/perf
-# tools/usb - testcases only
-# tools/virtio - testcaes only
-
-	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
-src_unpack() {
-	unpack ${LINUX_SOURCES}
-
-	MY_A=
-	for _AFILE in ${A}; do
-		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
-		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
-		MY_A="${MY_A} ${_AFILE}"
-	done
-	[[ -n ${MY_A} ]] && unpack ${MY_A}
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
-	fi
-
-	sed -i \
-		-e '/^nosy-dump.*LDFLAGS/d' \
-		-e '/^nosy-dump.*CFLAGS/d' \
-		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
-		"${S}"/tools/firewire/Makefile
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	local karch=$(kernel_asm_arch "${ARCH}")
-	# This is the minimal amount needed to start building host binaries.
-	#emake allmodconfig ARCH=${karch}
-	#emake prepare modules_prepare ARCH=${karch}
-	#touch Module.symvers
-
-	# Now we can start building
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Building $s => $bin"
-		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Building $dir => $binfile (via emake $target)"
-		emake -C $dir ARCH=${karch} $target
-	done
-}
-
-src_install() {
-	into /usr
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Installing $s => $bin"
-		dosbin ${dir}/${bin}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Installing $dir => $binfile"
-		dosbin ${dir}/${binfile}
-	done
-
-	newconfd "${FILESDIR}"/freefall.confd freefall
-	newinitd "${FILESDIR}"/freefall.initd freefall
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	elog "The cpupower utility is maintained separately at sys-power/cpupower"
-	elog "The usbip utility is maintained separately at net-misc/usbip"
-	elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed"
-	if find /etc/runlevels/ -name hpfall ; then
-		ewarn "You must change hpfall to freefall in your runlevels!"
-	fi
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r2.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r2.ebuild
deleted file mode 100644
index 4d1f8227e84b..000000000000
--- a/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r2.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils toolchain-funcs linux-info ltprune autotools flag-o-matic
-
-DESCRIPTION="Misc tools bundled with kernel sources"
-HOMEPAGE="https://kernel.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs tcpd"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_V=$(get_version_component_range 1-2)
-
-if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.bz2
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.bz2
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES=linux-${LINUX_VER}.tar.bz2
-SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-# pmtools also provides turbostat
-# sysfsutils and glib for usbip - remove sysfsutils in 3.7 or 3.8
-RDEPEND="sys-apps/hwids
-		>=sys-fs/sysfsutils-2
-		>=dev-libs/glib-2.6
-		tcpd? ( sys-apps/tcp-wrappers )
-		!sys-power/pmtools
-		!net-misc/usbip"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${LINUX_VER}"
-
-# All of these are integrated with the kernel build system,
-# No make install, and ideally build with with the root Makefile
-TARGETS_SIMPLE=(
-	Documentation/accounting/getdelays.c
-	Documentation/cgroups/cgroup_event_listener.c
-	Documentation/laptops/dslm.c
-	Documentation/laptops/hpfall.c
-	Documentation/networking/timestamping/timestamping.c
-	Documentation/watchdog/src/watchdog-simple.c
-	tools/lguest/lguest.c
-	tools/vm/page-types.c
-	tools/vm/slabinfo.c
-	usr/gen_init_cpio.c
-)
-# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
-# Documentation/networking/ifenslave.c - obsolete
-# Documentation/ptp/testptp.c - pending linux-headers-3.0
-
-# These have a broken make install, no DESTDIR
-TARGET_MAKE_SIMPLE=(
-	tools/firewire:nosy-dump
-	tools/power/x86/turbostat:turbostat
-	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
-	Documentation/misc-devices/mei:mei-amt-version
-)
-# tools/perf - covered by dev-utils/perf
-# tools/usb - testcases only
-# tools/virtio - testcaes only
-
-	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
-src_unpack() {
-	unpack ${LINUX_SOURCES}
-
-	MY_A=
-	for _AFILE in ${A}; do
-		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
-		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
-		MY_A="${MY_A} ${_AFILE}"
-	done
-	[[ -n ${MY_A} ]] && unpack ${MY_A}
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
-	fi
-
-	pushd drivers/staging/usbip/userspace >/dev/null &&
-	eautoreconf -i -f -v &&
-	popd >/dev/null || die "usbip"
-
-	sed -i \
-		-e '/^nosy-dump.*LDFLAGS/d' \
-		-e '/^nosy-dump.*CFLAGS/d' \
-		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
-		"${S}"/tools/firewire/Makefile
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_configure() {
-	cd drivers/staging/usbip/userspace && \
-	econf \
-		$(use_enable static-libs static) \
-		$(use tcpd || echo --without-tcp-wrappers) \
-		--with-usbids-dir=/usr/share/misc
-}
-
-src_compile() {
-	local karch=$(kernel_asm_arch "${ARCH}")
-	# This is the minimal amount needed to start building host binaries.
-	#emake allmodconfig ARCH=${karch}
-	#emake prepare modules_prepare ARCH=${karch}
-	#touch Module.symvers
-
-	# Now we can start building
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Building $s => $bin"
-		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target=${t/*:}
-		einfo "Building $dir => $target"
-		emake -C $dir ARCH=${karch} $target
-	done
-
-	emake -C drivers/staging/usbip/userspace
-}
-
-src_install() {
-	into /usr
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Installing $s => $bin"
-		dosbin ${dir}/${bin}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target=${t/*:}
-		einfo "Installing $dir => $target"
-		dosbin ${dir}/${target}
-	done
-
-	pushd drivers/staging/usbip/userspace >/dev/null \
-		|| die "Missing usbip/userspace"
-	emake DESTDIR="${D}" install
-
-	newdoc README README.usbip
-	newdoc AUTHORS AUTHORS.usbip
-	dodoc ../usbip_protocol.txt
-	popd >/dev/null
-
-	newconfd "${FILESDIR}"/hpfall.confd hpfall
-	newinitd "${FILESDIR}"/hpfall.initd hpfall
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	elog "The cpupower utility is maintained separately at sys-power/cpupower"
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-4.19.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-4.19.ebuild
deleted file mode 100644
index 45c7b3fd3bb5..000000000000
--- a/sys-apps/linux-misc-apps/linux-misc-apps-4.19.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils toolchain-funcs linux-info ltprune autotools flag-o-matic
-
-DESCRIPTION="Misc tools bundled with kernel sources"
-HOMEPAGE="https://kernel.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs tcpd usbip"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_V=$(get_version_component_range 1-2)
-
-if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES=linux-${LINUX_VER}.tar.xz
-SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES}"
-
-# pmtools also provides turbostat
-# usbip available in seperate package now
-RDEPEND="sys-apps/hwids
-		>=dev-libs/glib-2.6
-		>=sys-kernel/linux-headers-$(get_version_component_range 1-2)
-		usbip? (
-			!net-misc/usbip
-			tcpd? ( sys-apps/tcp-wrappers )
-			virtual/libudev
-		)
-		!sys-power/pmtools"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${LINUX_VER}"
-
-# All of these are integrated with the kernel build system,
-# No make install, and ideally build with with the root Makefile
-TARGETS_SIMPLE=(
-	samples/watchdog/watchdog-simple.c
-	tools/accounting/getdelays.c
-	tools/cgroup/cgroup_event_listener.c
-	tools/laptop/freefall/freefall.c
-	tools/testing/selftests/networking/timestamping/timestamping.c
-	tools/vm/slabinfo.c
-	usr/gen_init_cpio.c
-	# Broken:
-	#tools/lguest/lguest.c # fails to compile
-	#tools/vm/page-types.c # page-types.c:(.text+0xe2b): undefined reference to `debugfs__mount', not defined anywhere
-	#tools/net/bpf_jit_disasm.c # /usr/include/x86_64-pc-linux-gnu/bfd.h:35:2: error: #error config.h must be included before this header
-)
-# tools/vm/page-types.c - broken, header path issue
-# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
-# Documentation/networking/ifenslave.c - obsolete
-# Documentation/ptp/testptp.c - pending linux-headers-3.0
-
-# These have a broken make install, no DESTDIR
-TARGET_MAKE_SIMPLE=(
-	samples/mei:mei-amt-version
-	tools/firewire:nosy-dump
-	tools/iio:iio_event_monitor
-	tools/iio:iio_generic_buffer
-	tools/iio:lsiio
-	tools/laptop/dslm:dslm
-	tools/power/x86/turbostat:turbostat
-	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
-	tools/thermal/tmon:tmon
-)
-# tools/perf - covered by dev-utils/perf
-# tools/usb - testcases only
-# tools/virtio - testcaes only
-
-	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
-src_unpack() {
-	unpack ${LINUX_SOURCES}
-
-	MY_A=
-	for _AFILE in ${A}; do
-		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
-		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
-		MY_A="${MY_A} ${_AFILE}"
-	done
-	[[ -n ${MY_A} ]] && unpack ${MY_A}
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
-	fi
-
-	pushd tools/usb/usbip/ >/dev/null &&
-	sed -i 's/-Werror[^ ]* //g' configure.ac &&
-	eautoreconf -i -f -v &&
-	popd >/dev/null || die "usbip"
-
-	sed -i \
-		-e '/^nosy-dump.*LDFLAGS/d' \
-		-e '/^nosy-dump.*CFLAGS/d' \
-		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
-		"${S}"/tools/firewire/Makefile
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_configure() {
-	if use usbip; then
-		pushd tools/usb/usbip/ || die
-		econf \
-			$(use_enable static-libs static) \
-			$(use tcpd || echo --without-tcp-wrappers) \
-			--with-usbids-dir=/usr/share/misc
-		popd
-	fi
-}
-
-src_compile() {
-	local karch=$(kernel_asm_arch "${ARCH}")
-	# This is the minimal amount needed to start building host binaries.
-	#emake allmodconfig ARCH=${karch}
-	#emake prepare modules_prepare ARCH=${karch}
-	#touch Module.symvers
-
-	# Now we can start building
-	append-cflags -I./tools/lib
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Building $s => $bin"
-		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Building $dir => $binfile (via emake $target)"
-		emake -C $dir ARCH=${karch} $target
-	done
-
-	if use usbip; then
-		emake -C tools/usb/usbip
-	fi
-}
-
-src_install() {
-	into /usr
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Installing $s => $bin"
-		dosbin ${dir}/${bin}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Installing $dir => $binfile"
-		dosbin ${dir}/${binfile}
-	done
-
-	if use usbip; then
-		pushd tools/usb/usbip/ >/dev/null || die "usbip"
-		emake DESTDIR="${D}" install
-		newdoc README README.usbip
-		newdoc AUTHORS AUTHORS.usbip
-		popd >/dev/null
-		dodoc Documentation/usb/usbip_protocol.txt
-	fi
-
-	mv -f "${D}"/usr/sbin/{,iio_}generic_buffer
-
-	newconfd "${FILESDIR}"/freefall.confd freefall
-	newinitd "${FILESDIR}"/freefall.initd freefall
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	elog "The cpupower utility is maintained separately at sys-power/cpupower"
-	elog "The lguest utility no longer builds, and has been dropped."
-	elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed"
-	if find /etc/runlevels/ -name hpfall ; then
-		ewarn "You must change hpfall to freefall in your runlevels!"
-	fi
-	if use usbip; then
-		elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client"
-		elog "machine's kernel config and USBIP_HOST on the server."
-	fi
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-4.4-r1.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-4.4-r1.ebuild
deleted file mode 100644
index c1ed756f4430..000000000000
--- a/sys-apps/linux-misc-apps/linux-misc-apps-4.4-r1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils toolchain-funcs linux-info ltprune autotools flag-o-matic
-
-DESCRIPTION="Misc tools bundled with kernel sources"
-HOMEPAGE="https://kernel.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs tcpd usbip"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_V=$(get_version_component_range 1-2)
-
-if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES=linux-${LINUX_VER}.tar.xz
-SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES}"
-
-# pmtools also provides turbostat
-# usbip available in seperate package now
-RDEPEND="sys-apps/hwids
-		>=dev-libs/glib-2.6
-		>=sys-kernel/linux-headers-$(get_version_component_range 1-2)
-		usbip? (
-			!net-misc/usbip
-			tcpd? ( sys-apps/tcp-wrappers )
-			virtual/libudev
-		)
-		!sys-power/pmtools"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${LINUX_VER}"
-
-# All of these are integrated with the kernel build system,
-# No make install, and ideally build with with the root Makefile
-TARGETS_SIMPLE=(
-	Documentation/accounting/getdelays.c
-	Documentation/laptops/dslm.c
-	Documentation/networking/timestamping/timestamping.c
-	Documentation/watchdog/src/watchdog-simple.c
-	tools/cgroup/cgroup_event_listener.c
-	tools/laptop/freefall/freefall.c
-	tools/vm/slabinfo.c
-	usr/gen_init_cpio.c
-	# Broken:
-	#tools/lguest/lguest.c # fails to compile
-	#tools/vm/page-types.c # page-types.c:(.text+0xe2b): undefined reference to `debugfs__mount', not defined anywhere
-	#tools/net/bpf_jit_disasm.c # /usr/include/x86_64-pc-linux-gnu/bfd.h:35:2: error: #error config.h must be included before this header
-)
-# tools/vm/page-types.c - broken, header path issue
-# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
-# Documentation/networking/ifenslave.c - obsolete
-# Documentation/ptp/testptp.c - pending linux-headers-3.0
-
-# These have a broken make install, no DESTDIR
-TARGET_MAKE_SIMPLE=(
-	Documentation/misc-devices/mei:mei-amt-version
-	tools/firewire:nosy-dump
-	tools/iio:generic_buffer
-	tools/iio:iio_event_monitor
-	tools/iio:lsiio
-	tools/power/x86/turbostat:turbostat
-	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
-	tools/thermal/tmon:tmon
-)
-# tools/perf - covered by dev-utils/perf
-# tools/usb - testcases only
-# tools/virtio - testcaes only
-
-	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
-src_unpack() {
-	unpack ${LINUX_SOURCES}
-
-	MY_A=
-	for _AFILE in ${A}; do
-		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
-		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
-		MY_A="${MY_A} ${_AFILE}"
-	done
-	[[ -n ${MY_A} ]] && unpack ${MY_A}
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
-	fi
-
-	pushd tools/usb/usbip/ >/dev/null &&
-	sed -i 's/-Werror[^ ]* //g' configure.ac &&
-	eautoreconf -i -f -v &&
-	popd >/dev/null || die "usbip"
-
-	sed -i \
-		-e '/^nosy-dump.*LDFLAGS/d' \
-		-e '/^nosy-dump.*CFLAGS/d' \
-		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
-		"${S}"/tools/firewire/Makefile
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_configure() {
-	if use usbip; then
-		pushd tools/usb/usbip/ || die
-		econf \
-			$(use_enable static-libs static) \
-			$(use tcpd || echo --without-tcp-wrappers) \
-			--with-usbids-dir=/usr/share/misc
-		popd
-	fi
-}
-
-src_compile() {
-	local karch=$(kernel_asm_arch "${ARCH}")
-	# This is the minimal amount needed to start building host binaries.
-	#emake allmodconfig ARCH=${karch}
-	#emake prepare modules_prepare ARCH=${karch}
-	#touch Module.symvers
-
-	# Now we can start building
-	append-cflags -I./tools/lib
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Building $s => $bin"
-		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Building $dir => $binfile (via emake $target)"
-		emake -C $dir ARCH=${karch} $target
-	done
-
-	if use usbip; then
-		emake -C tools/usb/usbip
-	fi
-}
-
-src_install() {
-	into /usr
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Installing $s => $bin"
-		dosbin ${dir}/${bin}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Installing $dir => $binfile"
-		dosbin ${dir}/${binfile}
-	done
-
-	if use usbip; then
-		pushd tools/usb/usbip/ >/dev/null || die "usbip"
-		emake DESTDIR="${D}" install
-		newdoc README README.usbip
-		newdoc AUTHORS AUTHORS.usbip
-		popd >/dev/null
-		dodoc drivers/usb/usbip/usbip_protocol.txt
-	fi
-
-	mv -f "${D}"/usr/sbin/{,iio_}generic_buffer
-
-	newconfd "${FILESDIR}"/freefall.confd freefall
-	newinitd "${FILESDIR}"/freefall.initd freefall
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	elog "The cpupower utility is maintained separately at sys-power/cpupower"
-	elog "The lguest utility no longer builds, and has been dropped."
-	elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed"
-	if find /etc/runlevels/ -name hpfall ; then
-		ewarn "You must change hpfall to freefall in your runlevels!"
-	fi
-	if use usbip; then
-		elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client"
-		elog "machine's kernel config and USBIP_HOST on the server."
-	fi
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-4.4.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-4.4.ebuild
deleted file mode 100644
index ad1f27593bf9..000000000000
--- a/sys-apps/linux-misc-apps/linux-misc-apps-4.4.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils toolchain-funcs linux-info ltprune flag-o-matic
-
-DESCRIPTION="Misc tools bundled with kernel sources"
-HOMEPAGE="https://kernel.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs tcpd"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_V=$(get_version_component_range 1-2)
-
-if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES=linux-${LINUX_VER}.tar.xz
-SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES}"
-
-# pmtools also provides turbostat
-# usbip available in seperate package now
-RDEPEND="sys-apps/hwids
-		>=dev-libs/glib-2.6
-		tcpd? ( sys-apps/tcp-wrappers )
-		!sys-power/pmtools"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${LINUX_VER}"
-
-# All of these are integrated with the kernel build system,
-# No make install, and ideally build with with the root Makefile
-TARGETS_SIMPLE=(
-	Documentation/accounting/getdelays.c
-	Documentation/laptops/dslm.c
-	Documentation/networking/timestamping/timestamping.c
-	Documentation/watchdog/src/watchdog-simple.c
-	tools/cgroup/cgroup_event_listener.c
-	tools/laptop/freefall/freefall.c
-	tools/vm/slabinfo.c
-	usr/gen_init_cpio.c
-	# Broken:
-	#tools/lguest/lguest.c # fails to compile
-	#tools/vm/page-types.c # page-types.c:(.text+0xe2b): undefined reference to `debugfs__mount', not defined anywhere
-	#tools/net/bpf_jit_disasm.c # /usr/include/x86_64-pc-linux-gnu/bfd.h:35:2: error: #error config.h must be included before this header
-)
-# tools/vm/page-types.c - broken, header path issue
-# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
-# Documentation/networking/ifenslave.c - obsolete
-# Documentation/ptp/testptp.c - pending linux-headers-3.0
-
-# These have a broken make install, no DESTDIR
-TARGET_MAKE_SIMPLE=(
-	Documentation/misc-devices/mei:mei-amt-version
-	tools/firewire:nosy-dump
-	tools/iio:generic_buffer
-	tools/iio:iio_event_monitor
-	tools/iio:lsiio
-	tools/power/x86/turbostat:turbostat
-	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
-	tools/thermal/tmon:tmon
-)
-# tools/perf - covered by dev-utils/perf
-# tools/usb - testcases only
-# tools/virtio - testcaes only
-
-	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
-src_unpack() {
-	unpack ${LINUX_SOURCES}
-
-	MY_A=
-	for _AFILE in ${A}; do
-		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
-		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
-		MY_A="${MY_A} ${_AFILE}"
-	done
-	[[ -n ${MY_A} ]] && unpack ${MY_A}
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
-	fi
-
-	sed -i \
-		-e '/^nosy-dump.*LDFLAGS/d' \
-		-e '/^nosy-dump.*CFLAGS/d' \
-		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
-		"${S}"/tools/firewire/Makefile
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	local karch=$(kernel_asm_arch "${ARCH}")
-	# This is the minimal amount needed to start building host binaries.
-	#emake allmodconfig ARCH=${karch}
-	#emake prepare modules_prepare ARCH=${karch}
-	#touch Module.symvers
-
-	# Now we can start building
-	append-cflags -I./tools/lib
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Building $s => $bin"
-		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Building $dir => $binfile (via emake $target)"
-		emake -C $dir ARCH=${karch} $target
-	done
-}
-
-src_install() {
-	into /usr
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Installing $s => $bin"
-		dosbin ${dir}/${bin}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Installing $dir => $binfile"
-		dosbin ${dir}/${binfile}
-	done
-
-	mv -f "${D}"/usr/sbin/{,iio_}generic_buffer
-
-	newconfd "${FILESDIR}"/freefall.confd freefall
-	newinitd "${FILESDIR}"/freefall.initd freefall
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	elog "The cpupower utility is maintained separately at sys-power/cpupower"
-	elog "The usbip utility is maintained separately at net-misc/usbip"
-	elog "The lguest utility no longer builds, and has been dropped."
-	elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed"
-	if find /etc/runlevels/ -name hpfall ; then
-		ewarn "You must change hpfall to freefall in your runlevels!"
-	fi
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild
new file mode 100644
index 000000000000..c64dce76d292
--- /dev/null
+++ b/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs linux-info autotools flag-o-matic
+
+DESCRIPTION="Misc tools bundled with kernel sources"
+HOMEPAGE="https://kernel.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static-libs tcpd usbip"
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+LINUX_V=$(ver_cut 1-2)
+
+get_version_component_count() {
+	local cnt=( $(ver_rs 1- ' ') )
+	echo ${#cnt[@]} || die
+}
+
+if [ ${PV/_rc} != ${PV} ]; then
+	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+	PATCH_VERSION=$(ver_cut 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.xz
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
+		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [ $(get_version_component_count) == 4 ]; then
+	# stable-release series
+	LINUX_VER=$(ver_cut 1-3)
+	LINUX_PATCH=patch-${PV}.xz
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}"
+else
+	LINUX_VER=${PV}
+fi
+
+LINUX_SOURCES=linux-${LINUX_VER}.tar.xz
+SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES}"
+
+# pmtools also provides turbostat
+# usbip available in seperate package now
+RDEPEND="sys-apps/hwids
+		>=dev-libs/glib-2.6
+		>=sys-kernel/linux-headers-${LINUX_V}
+		usbip? (
+			!net-misc/usbip
+			tcpd? ( sys-apps/tcp-wrappers )
+			virtual/libudev
+		)
+		!sys-power/pmtools"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+S="${WORKDIR}/linux-${LINUX_VER}"
+
+# All of these are integrated with the kernel build system,
+# No make install, and ideally build with with the root Makefile
+TARGETS_SIMPLE=(
+	samples/watchdog/watchdog-simple.c
+	tools/accounting/getdelays.c
+	tools/cgroup/cgroup_event_listener.c
+	tools/laptop/freefall/freefall.c
+	tools/testing/selftests/net/timestamping.c
+	tools/vm/slabinfo.c
+	usr/gen_init_cpio.c
+	# Broken:
+	#tools/lguest/lguest.c # fails to compile
+	#tools/vm/page-types.c # page-types.c:(.text+0xe2b): undefined reference to `debugfs__mount', not defined anywhere
+	#tools/net/bpf_jit_disasm.c # /usr/include/x86_64-pc-linux-gnu/bfd.h:35:2: error: #error config.h must be included before this header
+)
+# tools/vm/page-types.c - broken, header path issue
+# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
+# Documentation/networking/ifenslave.c - obsolete
+# Documentation/ptp/testptp.c - pending linux-headers-3.0
+
+# These have a broken make install, no DESTDIR
+TARGET_MAKE_SIMPLE=(
+	samples/mei:mei-amt-version
+	tools/firewire:nosy-dump
+	tools/iio:iio_event_monitor
+	tools/iio:iio_generic_buffer
+	tools/iio:lsiio
+	tools/laptop/dslm:dslm
+	tools/power/x86/turbostat:turbostat
+	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
+	tools/thermal/tmon:tmon
+)
+# tools/perf - covered by dev-utils/perf
+# tools/usb - testcases only
+# tools/virtio - testcaes only
+
+	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
+src_unpack() {
+	unpack ${LINUX_SOURCES}
+
+	MY_A=
+	for _AFILE in ${A}; do
+		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
+		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
+		MY_A="${MY_A} ${_AFILE}"
+	done
+	[[ -n ${MY_A} ]] && unpack ${MY_A}
+}
+
+src_prepare() {
+	if [[ -n ${LINUX_PATCH} ]]; then
+		epatch "${DISTDIR}"/${LINUX_PATCH}
+	fi
+
+	pushd tools/usb/usbip/ >/dev/null &&
+	sed -i 's/-Werror[^ ]* //g' configure.ac &&
+	eautoreconf -i -f -v &&
+	popd >/dev/null || die "usbip"
+
+	sed -i \
+		-e '/^nosy-dump.*LDFLAGS/d' \
+		-e '/^nosy-dump.*CFLAGS/d' \
+		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
+		"${S}"/tools/firewire/Makefile
+
+	eapply_user
+}
+
+kernel_asm_arch() {
+	a="${1:${ARCH}}"
+	case ${a} in
+		# Merged arches
+		x86|amd64) echo x86 ;;
+		ppc*) echo powerpc ;;
+		# Non-merged
+		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
+		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
+	esac
+}
+
+src_configure() {
+	if use usbip; then
+		pushd tools/usb/usbip/ || die
+		econf \
+			$(use_enable static-libs static) \
+			$(use tcpd || echo --without-tcp-wrappers) \
+			--with-usbids-dir=/usr/share/misc
+		popd
+	fi
+}
+
+src_compile() {
+	local karch=$(kernel_asm_arch "${ARCH}")
+	# This is the minimal amount needed to start building host binaries.
+	#emake allmodconfig ARCH=${karch}
+	#emake prepare modules_prepare ARCH=${karch}
+	#touch Module.symvers
+
+	# Now we can start building
+	append-cflags -I./tools/lib
+	for s in ${TARGETS_SIMPLE[@]} ; do
+		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
+		einfo "Building $s => $bin"
+		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
+	done
+
+	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
+		dir=${t/:*} target_binfile=${t#*:}
+		target=${target_binfile/:*} binfile=${target_binfile/*:}
+		[ -z "${binfile}" ] && binfile=$target
+		einfo "Building $dir => $binfile (via emake $target)"
+		emake -C $dir ARCH=${karch} $target
+	done
+
+	if use usbip; then
+		emake -C tools/usb/usbip
+	fi
+}
+
+src_install() {
+	into /usr
+	for s in ${TARGETS_SIMPLE[@]} ; do
+		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
+		einfo "Installing $s => $bin"
+		dosbin ${dir}/${bin}
+	done
+
+	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
+		dir=${t/:*} target_binfile=${t#*:}
+		target=${target_binfile/:*} binfile=${target_binfile/*:}
+		[ -z "${binfile}" ] && binfile=$target
+		einfo "Installing $dir => $binfile"
+		dosbin ${dir}/${binfile}
+	done
+
+	if use usbip; then
+		pushd tools/usb/usbip/ >/dev/null || die "usbip"
+		emake DESTDIR="${D}" install
+		newdoc README README.usbip
+		newdoc AUTHORS AUTHORS.usbip
+		popd >/dev/null
+		dodoc Documentation/usb/usbip_protocol.rst
+		find "${D}" -name 'libusbip*.la' -delete || die
+	fi
+
+	# At one point upstream it was moved, but be generic to detect if it's
+	# happened already
+	if [[ -f "${D}"/usr/sbin/generic_buffer ]] && \
+		[[ ! -f "${D}"/usr/sbin/iio_generic_buffer ]]; then
+		mv -f "${D}"/usr/sbin/{,iio_}generic_buffer || die
+	fi
+
+	newconfd "${FILESDIR}"/freefall.confd freefall
+	newinitd "${FILESDIR}"/freefall.initd freefall
+}
+
+pkg_postinst() {
+	echo
+	elog "The cpupower utility is maintained separately at sys-power/cpupower"
+	elog "The lguest utility no longer builds, and has been dropped."
+	elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed"
+	if find "${ROOT}"/etc/runlevels/ -name hpfall ; then
+		ewarn "You must change hpfall to freefall in your runlevels!"
+	fi
+	if use usbip; then
+		elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client"
+		elog "machine's kernel config and USBIP_HOST on the server."
+	fi
+}
diff --git a/sys-apps/lmctfy/Manifest b/sys-apps/lmctfy/Manifest
index 2c3d3efb7b7b..b15ceffebf75 100644
--- a/sys-apps/lmctfy/Manifest
+++ b/sys-apps/lmctfy/Manifest
@@ -1,10 +1,3 @@
-DIST lmctfy-0.2.0.tar.gz 2291473 BLAKE2B 1cfa587476215e6cc75f8b31e8c0ff7be342d75d4deee0ddb5d31a8105450aa16b175a2cf876345959aa6bb01249c607b64a551834d7e10b97aeb3f253e05052 SHA512 533990025a9a88e2e2a467e571a80a5b057a0ef3523bfc71c155ad81e6a89463d1e1e094323d5dc875f1b86f4d2d2749819d10b8d6c781e06a93bd37747f12be
-DIST lmctfy-0.3.0.tar.gz 2305226 BLAKE2B 77b0e0c15d46f66fda59da799e37fd37fb70b53b25a13cb0ac3a484bf90ee0e6e4d57e5de13e06954336ca1611db67fe6dfc7a7a8cb9fa6ef7a615209229629f SHA512 9083af2d2b9ea34e6dbb911a24cf7b8a7fe5aa3a0f464d20115db86b5abac530d24122079f97ea2ef98bf4fb20a3980e598d89f38b570ba796665b0af08339d5
-DIST lmctfy-0.3.1.tar.gz 2312481 BLAKE2B 253f177879d85c131c21e2d9e9d2c651e7168ee9d55294014627dd522f3789759db5e8d8c82e189386621a1ada9854922bf0e8525c33f5b237e85c49da51c3c1 SHA512 ab9f2a065a49fae00b540c0592d9356022ba14e0f9dc681731e0757c259f3632a9b34b5fc629eaf2d0943d59e7747af06cfe59a64f447192e8c196a9d41b9522
 DIST lmctfy-0.5.0.tar.gz 2447650 BLAKE2B f40126ccb16b43921e39c23b82ee81a982e97c8bcd7e316568a313e3dd854cc0995f18aba7f6dd48418c3754a3ab92516b2c896136d00006d162044e6f6cd0e6 SHA512 638472b3e8cc98e7ff7ecc48eb0f58fb6a74600db22b7a1962ac3fe137d3549233f3f3b0c97f5783dff6f1851f9c3f9b0607fedea91cb23c1124ed8e2b54aea1
-EBUILD lmctfy-0.2.0.ebuild 774 BLAKE2B 1ba959ab51e1b66cea9d3c7c9567a80092794d55a4c43d65498b3c27be7089866236b95c3defa3a2ad7533b3fc45c850ec8bb5a2d60fe6455b9f8db43f48eed3 SHA512 47be9401ea7fae211b5a53d8b3c5e7e6825d3723730b932b9b9b2092a65a27847c4ed70aa6c6051130baf22199182e5b6903ed47eb3203c00d6aa548a3b0c5ee
-EBUILD lmctfy-0.3.0.ebuild 774 BLAKE2B 1ba959ab51e1b66cea9d3c7c9567a80092794d55a4c43d65498b3c27be7089866236b95c3defa3a2ad7533b3fc45c850ec8bb5a2d60fe6455b9f8db43f48eed3 SHA512 47be9401ea7fae211b5a53d8b3c5e7e6825d3723730b932b9b9b2092a65a27847c4ed70aa6c6051130baf22199182e5b6903ed47eb3203c00d6aa548a3b0c5ee
-EBUILD lmctfy-0.3.1.ebuild 774 BLAKE2B 1ba959ab51e1b66cea9d3c7c9567a80092794d55a4c43d65498b3c27be7089866236b95c3defa3a2ad7533b3fc45c850ec8bb5a2d60fe6455b9f8db43f48eed3 SHA512 47be9401ea7fae211b5a53d8b3c5e7e6825d3723730b932b9b9b2092a65a27847c4ed70aa6c6051130baf22199182e5b6903ed47eb3203c00d6aa548a3b0c5ee
 EBUILD lmctfy-0.5.0-r1.ebuild 757 BLAKE2B f0d2fce9e00442751506b2363824ff67aaf1758639146b8370fcd74aa08280812e317614f6ae73a09f9981c40551897471307ecb56673a34bb9b3d58ade7527b SHA512 7a6d014cd5e6d282cca9e1b3fd8e2b17c02afab6e2226160bfb9a78172443a9e0347a1d6d7834600bf729ccaa9b244931c34541707558ad277f97441af1fd647
-EBUILD lmctfy-0.5.0.ebuild 711 BLAKE2B 10ca9f8c29e157c057350f985b9d613d532be3cf15d115c1c4a149102a34759704bd18f906a6d367e01a9434e7a48455f158e375b4320987f11f73eda1767abc SHA512 784d3db8af701cfc5453509ba919a7b4379596ca6dc357487797ef6deb8cde267e1acaac631b284fb2da7e8bffaf73230934b5d8eec6ee70a9c1f53ed9a89a34
 MISC metadata.xml 335 BLAKE2B ea4fa6ebfc263db5fb52d6f5a30f46799eb5c7488287b7d77ac34a6d791d8e53576424a21b346c67185f293bc689787744287223c43fa8eeee6e5d157bb500e2 SHA512 ae6e68f29f452d34b44b2afb53623f3fe0fdcc76d32d5aa7c5f394cb7f1caad288b320ccf3f1e628a4f42ce8a7f789fd4e8216d07eb539ffec7954632ea68c5c
diff --git a/sys-apps/lmctfy/lmctfy-0.2.0.ebuild b/sys-apps/lmctfy/lmctfy-0.2.0.ebuild
deleted file mode 100644
index a239974b055b..000000000000
--- a/sys-apps/lmctfy/lmctfy-0.2.0.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
-
-inherit eutils
-
-DESCRIPTION="Linux application container management from Google"
-HOMEPAGE="https://github.com/google/lmctfy"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/protobuf
-	dev-cpp/gflags
-	dev-libs/re2
-	"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# test deps take too long to compile
-	use test && emake || emake lmctfy liblmctfy.a
-}
-
-src_install() {
-	# silly upstream!
-	mkdir -p "${D}/usr/bin"
-	cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary"
-	dolib.a "${S}/bin/liblmctfy.a"
-}
diff --git a/sys-apps/lmctfy/lmctfy-0.3.0.ebuild b/sys-apps/lmctfy/lmctfy-0.3.0.ebuild
deleted file mode 100644
index a239974b055b..000000000000
--- a/sys-apps/lmctfy/lmctfy-0.3.0.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
-
-inherit eutils
-
-DESCRIPTION="Linux application container management from Google"
-HOMEPAGE="https://github.com/google/lmctfy"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/protobuf
-	dev-cpp/gflags
-	dev-libs/re2
-	"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# test deps take too long to compile
-	use test && emake || emake lmctfy liblmctfy.a
-}
-
-src_install() {
-	# silly upstream!
-	mkdir -p "${D}/usr/bin"
-	cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary"
-	dolib.a "${S}/bin/liblmctfy.a"
-}
diff --git a/sys-apps/lmctfy/lmctfy-0.3.1.ebuild b/sys-apps/lmctfy/lmctfy-0.3.1.ebuild
deleted file mode 100644
index a239974b055b..000000000000
--- a/sys-apps/lmctfy/lmctfy-0.3.1.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
-
-inherit eutils
-
-DESCRIPTION="Linux application container management from Google"
-HOMEPAGE="https://github.com/google/lmctfy"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/protobuf
-	dev-cpp/gflags
-	dev-libs/re2
-	"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# test deps take too long to compile
-	use test && emake || emake lmctfy liblmctfy.a
-}
-
-src_install() {
-	# silly upstream!
-	mkdir -p "${D}/usr/bin"
-	cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary"
-	dolib.a "${S}/bin/liblmctfy.a"
-}
diff --git a/sys-apps/lmctfy/lmctfy-0.5.0.ebuild b/sys-apps/lmctfy/lmctfy-0.5.0.ebuild
deleted file mode 100644
index 26f7f25c22ba..000000000000
--- a/sys-apps/lmctfy/lmctfy-0.5.0.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
-
-inherit eutils
-
-DESCRIPTION="Linux application container management from Google"
-HOMEPAGE="https://github.com/google/lmctfy"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/protobuf
-	>=dev-cpp/gflags-2.1.1
-	dev-libs/re2
-	dev-lang/go
-	sys-libs/libapparmor
-	"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# test deps take too long to compile
-	use test && emake || emake lmctfy liblmctfy.a
-}
-
-src_install() {
-	dobin bin/lmctfy/cli/lmctfy
-	dolib.a bin/liblmctfy.a
-}
diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index b2204e2f8f9f..b1a52cab9fc4 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -1,9 +1,10 @@
+AUX flags.patch 1057 BLAKE2B 4b601dff49cfe1d82cc32b2fbb0c32922e9f049e010d1403b8986ed5d6e2d8d7c6550c1f08d184327518b71b461aa181b1b4230704dfaa993828c7a2be5d8ce5 SHA512 fd17023c238598472d8e590f2bdff75019c1c6cf76215fa54a15de7089e4f0c89259bdc99fa34147d3dbe2e1572989b6d0814ff99a859635975f627575bc1075
 AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06
 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459
 DIST opal-utils-6.5.2.tar.gz 2082426 BLAKE2B 20256f13f95da73bcccae670627c9786229e756183fad33ff45ecf2d91f1039c73a0f881b3ac794abad35d51b7bef0b780bd0f8260818c84a262ce7bb0c45b2e SHA512 765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091
 DIST opal-utils-6.6.2.tar.gz 2121790 BLAKE2B 3f1ec80baa112ba0d01fcb9a64b45592da03addd067484ef237204fd712359c04796353f47a32ac943e0e135a580c3c5ad7a5843ee4d5259cde3cbaf1bbefcc4 SHA512 a864e4120ffac4065b89d5da7c959ac20643be42e83f4186a778355f3ea0b36cbd1e02c91b1460b6fa6550fceec9034cce096b89f840b4051d65c7f0ab70dc27
 DIST opal-utils-6.6.3.tar.gz 2121842 BLAKE2B 06ecd73dea54cd8455da32fdd88163c283554e49b380c371705fdba4fef169a1e3022ed4845f33594c0188e11e60f49af1ee0d5062a2e483f0b874e62a567245 SHA512 94af7a389e05627b26a3f79ebdeb55a6bf9e99f530667724c3112df25bc113c9520944a1d8e3847fe7210efa9eed0b8facab95f1f16757ff92038aa7812ce79e
-EBUILD opal-utils-6.5.2.ebuild 2164 BLAKE2B e92b21eeaff806652eda903b2d27c0cdfffcb4a0dfb5ea78d24d4ea92ca1dd0cacd82b8eb2dc864c3e8a6911e60a9ba1a85cf448a83bacee44c6a1fd4b20debc SHA512 2c3bc02aa6fc4b37cf1e27316dec41c8ebf7ae452e6c2a0e6b5450f03e3862d4e8b317ae2d675f5a38fa1d7df4ef3bf59930609c9e09110fab0b30ccc3e4f5d7
-EBUILD opal-utils-6.6.2.ebuild 2607 BLAKE2B b33bc1f76c5401bcb2dfc8cc33daaeea923e54396a8a1cc0ae2b067a7e845b25d16390fc809ff65390d9f46d6f9fd6395adab6aa2c85767beab51d6eff4719ca SHA512 546ac0837649ff8e1e2498adb28ec393cebbf9038ef4bb7280cf74459379db6daf296d22c6d64ff55a8f589b910e280a4e821d487b8c52047e25528008a0e4c7
-EBUILD opal-utils-6.6.3.ebuild 2608 BLAKE2B 518cf78319f1f14f54d74251123c2350887078c1b38b7fad72fb946948c222f3c44b75327df8322f47703c3dd87a45f9ee7b6b1419ae7ea2c982b2fefdd78eed SHA512 0b6ec21cc3596910251160e33f2dedb7e6e5a9c8224c13fd09258279fa174707fc8d40b247d37804c89ccd6befd75637029a947eb0d75ea8a78b19c3586330eb
+EBUILD opal-utils-6.5.2.ebuild 2104 BLAKE2B d8def5a718bdf95bc54c85d3535302c94719cd9792d86264d5aef38964a54d4dd0d3fb01799bc12636d9afcf4098ce1e56c19025fc3569d7df2418e7a537a23b SHA512 ba5ecba2487789b97898a502bc6c4236c683a13c2b4bdc5b3d76a6c1c0e2f35328344a5e1df61d7554606889b4d0314c49bbb1b01b1c2704a16a9401fbbbd5f5
+EBUILD opal-utils-6.6.2.ebuild 2474 BLAKE2B 7d2955ba22d6cd0e9379fdb60d0974e5871f36075b3d64ac37b0f65dcf5b46497c61db105b34ae0a74303798c5fe2eadf8651d2f3179e5c25228ee8d3d849ea3 SHA512 e0481207daf609c9634ca83bba0455ee30b8a70319f62a83ce095273038265ff700da1381b75efa97b4ec52be22d590cc20688ca0bb9179736e9b32cbad6b3aa
+EBUILD opal-utils-6.6.3.ebuild 2475 BLAKE2B 1005100e0c402e42e8c3c866f6284790e2b8a57093f3059b57a6447c0a66b2f6d0673db1cf1e70dd08d51d1d51258620ff29d9500761d69515de3ea916d24cd7 SHA512 98027c446f9537a87a6dbc60f2ef4a5a4f98706f5a89eb8dd25d20b4ec43c90bc5b32733e1bc7dfae11b15365c75509a95ad277bcc9c0b28977bafb2af3bf6a1
 MISC metadata.xml 1099 BLAKE2B 8715aef2781f806a58a094125d7c3ca6189a27a4d4c52ff6286905975a6b688921e09519f9968bb243c216611bab2da6507775c86e5e7293b9412d46ee7713da SHA512 d159348f48be29e96a84845474b1c6286ca29df1d62bec79a1a3385e89be0ac0b84a3465c41e769e447ac5598a189564f5e3e638668ea8c876b6899a1cb33666
diff --git a/sys-apps/opal-utils/files/flags.patch b/sys-apps/opal-utils/files/flags.patch
new file mode 100644
index 000000000000..5aa045ed1ca1
--- /dev/null
+++ b/sys-apps/opal-utils/files/flags.patch
@@ -0,0 +1,35 @@
+From 828c1c28c314c62cf90b9b989f92af7ea96c100d Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sun, 27 Sep 2020 18:48:38 -0700
+Subject: [PATCH] respect user flags
+
+---
+ external/ffspart/rules.mk  | 2 +-
+ external/opal-prd/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/external/ffspart/rules.mk b/external/ffspart/rules.mk
+index 40972c6..09a025f 100644
+--- a/external/ffspart/rules.mk
++++ b/external/ffspart/rules.mk
+@@ -30,5 +30,5 @@ $(LIBFLASH_OBJS): libflash-%.o : libflash/%.c
+ 	$(Q_CC)$(CC) $(CFLAGS) -c $< -o $@
+ 
+ $(EXE): $(OBJS)
+-	$(Q_CC)$(CC) $(CFLAGS) $^ -lrt -o $@
++	$(Q_CC)$(CC) $(CFLAGS) $^ -lrt $(LDFLAGS) -o $@
+ 
+diff --git a/external/opal-prd/Makefile b/external/opal-prd/Makefile
+index fb9402f..52f10d9 100644
+--- a/external/opal-prd/Makefile
++++ b/external/opal-prd/Makefile
+@@ -1,5 +1,5 @@
+ # SPDX-License-Identifier: Apache-2.0
+-CFLAGS += -m64 -Werror -Wall -g2 -ggdb
++CFLAGS += -m64 -Wall
+ LDFLAGS += -m64
+ ASFLAGS = -m64
+ CPPFLAGS += -I. -I../../include -I../../
+-- 
+2.28.0
+
diff --git a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
index 9e12d9fc8b8a..9479de387f7e 100644
--- a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
@@ -32,6 +32,8 @@ ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
 
 S="${WORKDIR}/skiboot-${PV}"
 
+PATCHES=( "${FILESDIR}/flags.patch" )
+
 python_check_deps() {
 	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
@@ -42,11 +44,6 @@ pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	default
-	sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
-}
-
 src_configure() {
 	tc-export CC LD
 	export OPAL_PRD_VERSION="${PV}"
diff --git a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
index 867857095da6..22d57ef7a346 100644
--- a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
@@ -32,6 +32,8 @@ ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
 
 S="${WORKDIR}/skiboot-${PV}"
 
+PATCHES=( "${FILESDIR}/flags.patch" )
+
 python_check_deps() {
 	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
@@ -42,12 +44,6 @@ pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	default
-	sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
-	sed -i 's/-lrt -o/-lrt $(LDFLAGS) -o/' external/ffspart/rules.mk || die
-}
-
 src_configure() {
 	tc-export CC LD
 	export OPAL_PRD_VERSION="${PV}"
diff --git a/sys-apps/opal-utils/opal-utils-6.6.3.ebuild b/sys-apps/opal-utils/opal-utils-6.6.3.ebuild
index 6f824f28e385..823783f6fa37 100644
--- a/sys-apps/opal-utils/opal-utils-6.6.3.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.6.3.ebuild
@@ -32,6 +32,8 @@ ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
 
 S="${WORKDIR}/skiboot-${PV}"
 
+PATCHES=( "${FILESDIR}/flags.patch" )
+
 python_check_deps() {
 	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
 	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
@@ -42,12 +44,6 @@ pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	default
-	sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
-	sed -i 's/-lrt -o/-lrt $(LDFLAGS) -o/' external/ffspart/rules.mk || die
-}
-
 src_configure() {
 	tc-export CC LD
 	export OPAL_PRD_VERSION="${PV}"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4de3f975d6ae..970db73ec183 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,11 +3,9 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
 DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
-DIST portage-3.0.7.tar.bz2 1045185 BLAKE2B 1fe5e13bbbfaecd1b850b29b17908fb2c2756d559b0583174833672b68a67cfc7e7080334729ee5295b646423ca3925284f42eeace0c0b79d02305a170aed5d9 SHA512 701f6bddb9255d5ac86ed6e73f869124925bafd09f7c2e458376b54aebf030fa7f0d80beda1626350755cc1e8a2b9c2636b3fde1105787f2d2a0f742a73cf5e8
 DIST portage-3.0.8.tar.bz2 1046968 BLAKE2B 662147c37a9e7b81030fadb4d6438b734ee57a9eb9bfcee80991d137a017aa3541565961282ebf8736db71aeb05532ffa139ff3a34a84bc9064cf74427acb666 SHA512 5f97870a11ecca30ffe8f463f87cd16a1edb52b44832c6eaba15cadcfde2b4f7edf963749e45c8043b45b38e53ee210dc913aa2d2432a2bd3928cc27c8765a85
 EBUILD portage-2.3.99-r2.ebuild 8482 BLAKE2B 9880361867a65a42c22b277e46fdf973d32b57679519dcce4728fe3297a6b55990a0cc319e161f3056f33c72979101e9b54168e01ef6a1a2bfdc6a92df042821 SHA512 c04cf3569d920a4e55da0eac94cbf93b5780d9b2eb3afa45c918fbae88c11a0f130aba4370b1897628a0f03fd24dcf573aad03164c4e9a786ec754f96cd0939d
 EBUILD portage-3.0.4-r1.ebuild 8527 BLAKE2B 631108e364ee22d284e334c5c641f4e807375ac75804a7c3099837d94a74f4c41cbbaf6ca365624516f858ee68c07b8551a3c1c9f1950f6352d0186db4bd28c6 SHA512 8ff2a857a31c283408b9d8a6f5d1a984c6299ccd1b7f8eaaff2e3b5f3b1dcc62f32bee8dbc1496a4a75e836f4772f91a295a23facb005d035c337032ed63d6a1
-EBUILD portage-3.0.7.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d
 EBUILD portage-3.0.8.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d
 EBUILD portage-9999.ebuild 7417 BLAKE2B 088bcba17cd3d8451e04fa5a2a5e71ea237cd976b9cabbe157822e14b58bf283e628227c1807d5eed2f88699476f312745540bbb5c15ab25089844d4436f9e71 SHA512 bb43ac625afdd22f52cf5d4c45be1512ee56d14cb4ded2cc0c0680d22869836290a09ac09e88967d3e54b6ffd21e0dd429c8cc7f64431617f11e6645d396a020
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-3.0.7.ebuild b/sys-apps/portage/portage-3.0.7.ebuild
deleted file mode 100644
index 28cd3d04cca0..000000000000
--- a/sys-apps/portage/portage-3.0.7.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 linux-info tmpfiles 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 ~sparc ~x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-vcs/git )"
-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 )
-	apidoc? (
-		dev-python/sphinx
-		dev-python/sphinx-epytext
-	)"
-# Require sandbox-2.2 for bug #288863.
-# 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/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	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
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0"
-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
-
-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 ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	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 apidoc && targets+=( apidoc )
-
-	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 apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${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
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	env -u BINPKG_COMPRESS \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || 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
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/prctl/Manifest b/sys-apps/prctl/Manifest
index 41f6771c40b0..d3dbc936fe1b 100644
--- a/sys-apps/prctl/Manifest
+++ b/sys-apps/prctl/Manifest
@@ -3,4 +3,4 @@ AUX configure.ac 200 BLAKE2B 3ec747f56bb304484671171dd61c72cac8b264563955b7759b0
 AUX prctl-1.6-no-implicits.patch 381 BLAKE2B 4374744647de591232e9da6398465a5b9f31f75027f57ce7da5d2294321c6ee17d6bb3c4a108131602bdab7f6643aff2778313c764d659e15093a6cee1081fad SHA512 b01e17872a6c098ddbd4720cf62cd83d485fd1095a9da47c2f79cc09b50648a02bde2aeb38b8dec03d5be794223c898f2c753f576068540252071209e1701812
 DIST prctl-1.6.tar.gz 18876 BLAKE2B 9f26fec1d178141d7e5aa7390dc0403ab1774d711a12588074ee6dbf62c980ab3713179b2f476f20cac0d7e4b027899b144fa67164021dd13b10be3dc087fb2f SHA512 c5b70abbb76f76f4a4c53cebcbd34fa4e87d7db2278a2ea17128da30dea958cc4e4d75b641cb3b9fbd8fa56fee482e97dbae5e61c697e80ef4d13f4b6d28cfda
 EBUILD prctl-1.6-r1.ebuild 545 BLAKE2B d948fc8ac27ed240266ab6eeb805bc65a7ccb07c0a8008e9acd719649cc2380f4ca61dfb658cb40a099bc67a22ee98734d03cecc6c70d9485d2ac0d8353fc304 SHA512 64419216ed7f999f12fd0fe37005cfac90db415b3952abf7a5787e56d2a6ff88d7209280487dd94fc7a37236d11f70c3a4f6700f1bea416d575b2039dfc7f96b
-MISC metadata.xml 449 BLAKE2B da01afb0a080790cad07f77c097cc92bad6fca77c6d8da75b21e35eb9f1253153bb90bdff9aa719bb77a0c1e760dbb2c60d8152c9d2de15e37fd41fd2edcda80 SHA512 a254e2fa6263298f6f35967195a6f27ea434767c5690082df42e09f3bbb2439835643cfa4d030a09fd5a1829086ebadd6c5485cd53c49ed0ebf291e897f9290f
+MISC metadata.xml 326 BLAKE2B 0133c9224a3685844700784a04d8fd4a9bc5ff6f98213e84bc2d3e12efb8d68dbbc9cbb250c058fed38a903b75bbe908459db58dee9b6725479b8289277aa450 SHA512 bc575ce8fb40e554f52ed9a0154b9d5952538d6703d45a2b7bed559c452458e2bd57cd057771c8db351665f9737dbd1de95471e4cd2884505241514938bb5ffe
diff --git a/sys-apps/prctl/metadata.xml b/sys-apps/prctl/metadata.xml
index 370c6384288c..5dd84ef1cd45 100644
--- a/sys-apps/prctl/metadata.xml
+++ b/sys-apps/prctl/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="project">
-		<email>ia64@gentoo.org</email>
-		<name>Gentoo Linux IA-64 Development</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 6025f7c46ce0..e5aeb31d3a81 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -18,7 +18,7 @@ DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a
 DIST rng-tools-6.8.tar.gz 53769 BLAKE2B 2a10a5639c5b1f4506b2c2cfb0185d16b5b604bd8aae72ca616b121f2e7624ff1ba00eb32daa3626b00d89f106356924bde511e263ab8978ff764757b44588ea SHA512 8fa47c2f0f8ebe6ac13025fa2c74505528b503c4e126c5d02b939797d6d4a8c9fc2b345353e48e497e32c1620a0821431e70752a9eb8ecb71960f16713696b62
 DIST rng-tools-6.9.tar.gz 54426 BLAKE2B b798f8d052b5f13a2847edbe5fc4c7f189433cecac97537193afab09cd35a89d8ddde16708f45f474997ea926bf47b2c6950f03ae7d7d93e559f22ed9fbbabc3 SHA512 08d0b19c309331fd2a2cfb5523a980d5ab1a2e727d06e2b3ecc8851aa94b6fffe9021714f33b5bd1eeb8e6a1d28ab865845520d8e4c96ab3f63019718c08ae7b
 EBUILD rng-tools-5-r2.ebuild 1146 BLAKE2B 0fb06c8208399d1f4fee01b53ab112af78c6b4214b2c9caebd5f22c94d3de062cbc869ea207bc47bee48a11a4892ce94543972274042e5ce1f2b1cb153b33ef1 SHA512 7eb055a3cee18b56c845eb05f0a66666a8d108fc059fb0c4e2139251f9fa5f3625f25bf133cf13bcc07cb666b07d29d1b83809825c8fa664df3ea90b571c3fb5
-EBUILD rng-tools-6.10.ebuild 1805 BLAKE2B 9e457384db4a31a3f976edd63ae59096779d5bcf8b251c09163702b9a1f84f9a3fa0ab723a89fdd7be5c08877bc9e8daed07b3a51283f793e3246c81c2787e95 SHA512 a21883792e33821272f94f28f0954a3e6d29242654bc90a2706fb96c6fc038ee8532cac25cd7804fa8eb7c10251f8f6d9f1168cb55249d6ce5dcbb7ecff2acaa
+EBUILD rng-tools-6.10.ebuild 1801 BLAKE2B 80237cc93253b761e5cc1ffd51e7db2f5278716808c5f9a7e3663c5e8c9103dc09d29488d926feace950f90dd67636b735a4970bba8b2a59a96671c5d894c72b SHA512 89bcf0177b784ec633547946c0210651220a4067c542191e7ad09df4d1bb7e1486a379804e99067ec1395c2ddab08c79fb2dea2e95326978dd906a55107ee4ec
 EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492
 EBUILD rng-tools-6.7-r1.ebuild 2143 BLAKE2B 0a0da05d43c4763da8c42c1d5ed39287878fd1c24dafe7d37f4002bb6bd08293ba0fa80189210a19a83ab5c5c6914a0e0205d497f1f88d59f2cea997ceb00eb4 SHA512 14e9cd49419ba51d6df5be4134f6bae33aae463a6e19faa6220023f1ba80c9d971c442ae52ca248d85828eb395fa60e5ae41fb95d85e4364b15e99709d36a286
 EBUILD rng-tools-6.7-r2.ebuild 2173 BLAKE2B 01fb210ba3b0ed8b5f40ceb061b7e31c4f14de6ffef6af18d4c25519646776bdc66cab8c376b91cd057588a64e5b1377a0fca52d033174bbc6f77f59edac7e49 SHA512 cf9e07fc1ee37c37cd5de5b08e62aab692f83593ceeca0131edafa621a4acf61f9661851c230c5a7ded13796b99266fedeca97827c4e35ba26c301602e8d4a1d
diff --git a/sys-apps/rng-tools/rng-tools-6.10.ebuild b/sys-apps/rng-tools/rng-tools-6.10.ebuild
index 730669867d71..18d6153431a1 100644
--- a/sys-apps/rng-tools/rng-tools-6.10.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 2375f65c2c13..fc6573ee14a4 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,5 +1,3 @@
-AUX 245-clang-gnu11.patch 3167 BLAKE2B 4d254ae7ffc906d282580805a041ac2c11552ff6e7569cc06709faf6fe0894d9c9856ba54783e141341c512a401428390f7233050921e5e045b867f7e517f298 SHA512 6261c71cb4afbbbe5189f7ac01bf7cc50139edca4175f6f821941e012f5f4335835eef518e187996612e174159947a4fc2fec70fdbb16c8cdfa82369c7f4c814
-AUX 245-libmicrohttpd-0.9.71.patch 2545 BLAKE2B f07b4181e4ee2dafa7b6801ea266b135aa82e1c52521cd03f36305667b412fbbdbb7b03f597e0a9840d89453fb12e348d16069b06db448b3e000fdbbe4c51110 SHA512 f161e2d28f22bfd720c3dae5af163aa9ed88c7d9a052d5e7c9b47fcc09041a762ec4ffd4c41041e1ff03cdf1558877d37022216f91e8b6ee53bfd77494109357
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68fca1a49f5f5eb5a1576329d30c93d2fe7c121920099d74962eacf7ed1d3747250f103a57e4be246320a99871521a3b6a SHA512 1b0d1c2f96cb4aa95adfa5940efaeb2bd940110720399358317906d21d08b0caf625474980e101bba001afd626f8ad64367b09b40bec0b2d46b977021c4adfc5
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
@@ -8,12 +6,8 @@ AUX gentoo-systemctl-disable-sysv-sync.patch 784 BLAKE2B b2a1a931e1fa0c41d5610db
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
-DIST systemd-stable-244.3.tar.gz 8484735 BLAKE2B 25125ecdae59c852e8ceb45b7ed0b76631b301ab4026c4e389c4bc12090fe41f5918411a75bd20f38b6b3993445df93c850ba98f8d9b30fd24fc4e25f8355a3d SHA512 f8e83fa3e57ac8fdbed61b66bb45fd0eafa6fb36eda26f10690d93f34b03daab6ce4e7eff45b79dcaf59f11f41c1b022d1d9314f576c50ad28f6bb5901f1b18d
-DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
 DIST systemd-stable-245.7.tar.gz 9171465 BLAKE2B 77117360155ef6358244a382ebd521fe180d8dd982cc2edda18790105933cd5e8880030572eb50d5405b9afdab519b06e0721f48c57394d3d1043a123169ccb1 SHA512 306b3a9cd1d8985a05be259f8a08efb5e9f7102a657eccdef58e082822b61a6e82246dc4f3b6e0bd33eedbd550af54e0029af9d0d2b70416e27626ec43921449
-EBUILD systemd-244.3.ebuild 14561 BLAKE2B f7361cfed800988cd2d2ff70eadc3f75c15d7d1a3d12a9934574abd9c4b948207d69f25aa6326b3c90cc17274e80d70ba74c23361acc7a1b2749a25752f4db49 SHA512 4f08e146c380e8b14fa449ef11c8c33ddab8e358e7cb8efe7e39b6b2858828824405b70c223097a3dba3ceb06a2efc47cd957e2c0d5afdc2d620ad558f161c3c
-EBUILD systemd-245.5.ebuild 15237 BLAKE2B 7b1931325551b46fe73ebfbe29b3dbfb466cbb638fc58e7f3c182554ad9f53c7c8d904ec903e20abe0ab9721167c27d8b14726eec5616ed7891880a0153d45ab SHA512 8f5759721f9f76f2a7a0514adb7de7479debabd1d88c48b8fd3b05d99be8cc458bc48f175e8baef0834c7bc439009428b17f0e9fd11f4cf6e25c54eecd80fbcc
-EBUILD systemd-245.7-r1.ebuild 15125 BLAKE2B 74edf57a9af4b7543be0a28846ede00d87f482a6b337eef0a4a9d7f038d8a42ba1c028978c4de86f3cc9a235247f5a8ffbd225aa1d2beb8e830e6373128fcfe3 SHA512 5c552dcf93a1b158e05c981aa036ec9b26ec5f454bd446aefcb61e87bd0a10893dd2e019409956262cd90d073d3dac46d8785e93452f5b4ba367a53807481dd8
-EBUILD systemd-246-r1.ebuild 15132 BLAKE2B 6ae118e2c2dafc000f7c076cd39f6dc29f94723eedbcf26422ab914e78f1b96f421958e9e067b55559c32a18ad9abe8b2a3f8f7f831cfd312c73a3c3ee2b8d2a SHA512 6930805067f4c884a816b12d82e877ff94a458a1286cec5c7a3cf64fd3db0f7a2da949a39f3821d85b8f3603a8b29f2d5276437522a8eb420790500f62dc30bc
-EBUILD systemd-9999.ebuild 15132 BLAKE2B 6ae118e2c2dafc000f7c076cd39f6dc29f94723eedbcf26422ab914e78f1b96f421958e9e067b55559c32a18ad9abe8b2a3f8f7f831cfd312c73a3c3ee2b8d2a SHA512 6930805067f4c884a816b12d82e877ff94a458a1286cec5c7a3cf64fd3db0f7a2da949a39f3821d85b8f3603a8b29f2d5276437522a8eb420790500f62dc30bc
+EBUILD systemd-245.7-r1.ebuild 15134 BLAKE2B fba59139460f4ed9f099f2024cd9c7a16d888b746716897979a39118fcd474f1ca75542b743c076403aa65a55e914b4a5d9a929934d31530e2c19fd4fd256f6e SHA512 f1ab5ba4a327ac0edfbe592d11c9fc258aa5b62f46ca300d50843c9c43bed2e7f2b25faf9e894f061e968e66db036b7e7275e9e9956ed3ea3cf48750aa0fa134
+EBUILD systemd-246-r1.ebuild 15141 BLAKE2B 838868efa4e6978443e71703408c82b4d9356515c5d9eb1e8ae60062fb62c91a34f197605080fef8460be39c9e15e74cfd637306f6fa0cb30b0a6645df4ad76e SHA512 c03d81855fc53e344c0698dbcacbee7b8d32f890a981c4b00b931171b531c41270544b762d452cc1bd31f1385797194271b9fc55d85d60940b83941c620367e1
+EBUILD systemd-9999.ebuild 15141 BLAKE2B 838868efa4e6978443e71703408c82b4d9356515c5d9eb1e8ae60062fb62c91a34f197605080fef8460be39c9e15e74cfd637306f6fa0cb30b0a6645df4ad76e SHA512 c03d81855fc53e344c0698dbcacbee7b8d32f890a981c4b00b931171b531c41270544b762d452cc1bd31f1385797194271b9fc55d85d60940b83941c620367e1
 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
diff --git a/sys-apps/systemd/files/245-clang-gnu11.patch b/sys-apps/systemd/files/245-clang-gnu11.patch
deleted file mode 100644
index 9056b56d48ee..000000000000
--- a/sys-apps/systemd/files/245-clang-gnu11.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 36e0d89a88c51ba879a2d7e2f90ea9b38333e2c0 Mon Sep 17 00:00:00 2001
-From: Denis Pronin <dannftk@yandex.ru>
-Date: Sun, 8 Mar 2020 23:57:07 +0300
-Subject: [PATCH] Support compiling with clang and gnu11 standard
-
-Signed-off-by: Denis Pronin <dannftk@yandex.ru>
----
- src/shared/json-internal.h | 35 ++++++++++++++++++++++++-----------
- 1 file changed, 24 insertions(+), 11 deletions(-)
-
-diff --git a/src/shared/json-internal.h b/src/shared/json-internal.h
-index bf158bff0d4..fabff0c860e 100644
---- a/src/shared/json-internal.h
-+++ b/src/shared/json-internal.h
-@@ -26,21 +26,34 @@ assert_cc(sizeof(JsonValue) == 16U);
- /* We use fake JsonVariant objects for some special values, in order to avoid memory allocations for them. Note that
-  * effectively this means that there are multiple ways to encode the same objects: via these magic values or as
-  * properly allocated JsonVariant. We convert between both on-the-fly as necessary. */
--#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) 1)
--#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) 2)
--#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) 3)
--#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) 4)
--#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) 5)
--#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) 6)
--#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) 7)
--#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) 8)
--#define JSON_VARIANT_MAGIC_EMPTY_OBJECT ((JsonVariant*) 9)
--#define _JSON_VARIANT_MAGIC_MAX ((JsonVariant*) 10)
-+enum
-+{
-+ _JSON_VARIANT_MAGIC_TRUE = 1,
-+#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) _JSON_VARIANT_MAGIC_TRUE)
-+ _JSON_VARIANT_MAGIC_FALSE,
-+#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) _JSON_VARIANT_MAGIC_FALSE)
-+ _JSON_VARIANT_MAGIC_NULL,
-+#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) _JSON_VARIANT_MAGIC_NULL)
-+ _JSON_VARIANT_MAGIC_ZERO_INTEGER,
-+#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) _JSON_VARIANT_MAGIC_ZERO_INTEGER)
-+ _JSON_VARIANT_MAGIC_ZERO_UNSIGNED,
-+#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) _JSON_VARIANT_MAGIC_ZERO_UNSIGNED)
-+ _JSON_VARIANT_MAGIC_ZERO_REAL,
-+#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) _JSON_VARIANT_MAGIC_ZERO_REAL)
-+ _JSON_VARIANT_MAGIC_EMPTY_STRING,
-+#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) _JSON_VARIANT_MAGIC_EMPTY_STRING)
-+ _JSON_VARIANT_MAGIC_EMPTY_ARRAY,
-+#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) _JSON_VARIANT_MAGIC_EMPTY_ARRAY)
-+ _JSON_VARIANT_MAGIC_EMPTY_OBJECT,
-+#define JSON_VARIANT_MAGIC_EMPTY_OBJECT ((JsonVariant*) _JSON_VARIANT_MAGIC_EMPTY_OBJECT)
-+ __JSON_VARIANT_MAGIC_MAX
-+#define _JSON_VARIANT_MAGIC_MAX ((JsonVariant*) __JSON_VARIANT_MAGIC_MAX)
-+};
- 
- /* This is only safe as long as we don't define more than 4K magic pointers, i.e. the page size of the simplest
-  * architectures we support. That's because we rely on the fact that malloc() will never allocate from the first memory
-  * page, as it is a faulting page for catching NULL pointer dereferences. */
--assert_cc((uintptr_t) _JSON_VARIANT_MAGIC_MAX < 4096U);
-+assert_cc((unsigned) __JSON_VARIANT_MAGIC_MAX < 4096U);
- 
- enum { /* JSON tokens */
-         JSON_TOKEN_END,
diff --git a/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch b/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch
deleted file mode 100644
index 08affa501700..000000000000
--- a/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From d17eabb1052e7c8c432331a7a782845e36164f01 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 30 Jun 2020 09:56:10 +0200
-Subject: [PATCH] =?UTF-8?q?Fix=20build=20with=20=C2=B5httpd=200.9.71?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The return type of callbacks was changed from int to an enum.
----
- src/journal-remote/journal-gatewayd.c    | 4 ++--
- src/journal-remote/journal-remote-main.c | 2 +-
- src/journal-remote/microhttpd-util.h     | 6 ++++++
- 3 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
-index 5177e0d1577..3ab7c98b0b5 100644
---- a/src/journal-remote/journal-gatewayd.c
-+++ b/src/journal-remote/journal-gatewayd.c
-@@ -349,7 +349,7 @@ static int request_parse_range(
-         return 0;
- }
- 
--static int request_parse_arguments_iterator(
-+static mhd_result request_parse_arguments_iterator(
-                 void *cls,
-                 enum MHD_ValueKind kind,
-                 const char *key,
-@@ -796,7 +796,7 @@ static int request_handler_machine(
-         return MHD_queue_response(connection, MHD_HTTP_OK, response);
- }
- 
--static int request_handler(
-+static mhd_result request_handler(
-                 void *cls,
-                 struct MHD_Connection *connection,
-                 const char *url,
-diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
-index 69a111afead..f82d188a8c6 100644
---- a/src/journal-remote/journal-remote-main.c
-+++ b/src/journal-remote/journal-remote-main.c
-@@ -253,7 +253,7 @@ static int process_http_upload(
-         return mhd_respond(connection, MHD_HTTP_ACCEPTED, "OK.");
- };
- 
--static int request_handler(
-+static mhd_result request_handler(
-                 void *cls,
-                 struct MHD_Connection *connection,
-                 const char *url,
-diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h
-index d90c6bbd4f1..4ca9a5c4f16 100644
---- a/src/journal-remote/microhttpd-util.h
-+++ b/src/journal-remote/microhttpd-util.h
-@@ -47,6 +47,12 @@
- #  define MHD_create_response_from_fd_at_offset64 MHD_create_response_from_fd_at_offset
- #endif
- 
-+#if MHD_VERSION >= 0x00097002
-+#  define mhd_result enum MHD_Result
-+#else
-+#  define mhd_result int
-+#endif
-+
- void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0);
- 
- /* respond_oom() must be usable with return, hence this form. */
diff --git a/sys-apps/systemd/systemd-244.3.ebuild b/sys-apps/systemd/systemd-244.3.ebuild
deleted file mode 100644
index 7a177b4f0528..000000000000
--- a/sys-apps/systemd/systemd-244.3.ebuild
+++ /dev/null
@@ -1,507 +0,0 @@
-# Copyright 2011-2020 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
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-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 static-libs +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}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1: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? ( sys-libs/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-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
-	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}]')
-"
-
-python_check_deps() {
-	has_version -b "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
-			~!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}/245-clang-gnu11.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)
-		-Dsplit-bin=true
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-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)
-
-		# static-libs
-		-Dstatic-libsystemd=$(usex static-libs true false)
-		-Dstatic-libudev=$(usex static-libs true false)
-	)
-
-	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
-
-	gen_usr_ldscript -a systemd udev
-}
-
-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-245.5.ebuild b/sys-apps/systemd/systemd-245.5.ebuild
deleted file mode 100644
index ce5b95342570..000000000000
--- a/sys-apps/systemd/systemd-245.5.ebuild
+++ /dev/null
@@ -1,529 +0,0 @@
-# Copyright 2011-2020 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
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-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 homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="
-	homed? ( cryptsetup )
-	importd? ( curl gcrypt lzma )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	homed? ( ${OPENSSL_DEP} )
-	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? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	repart? ( ${OPENSSL_DEP} )
-	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-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]
-	hwdb? ( >=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
-	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}]')
-"
-
-python_check_deps() {
-	has_version -b "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
-			~!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}/245-libmicrohttpd-0.9.71.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"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.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)
-		-Dsplit-bin=true
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-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)"
-		-Dhomed=$(meson_multilib_native_use homed)
-		-Dhwdb=$(meson_multilib_native_use hwdb)
-		-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)
-		-Dp11kit=$(meson_multilib_native_use pkcs11)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dpwquality=$(meson_multilib_native_use pwquality)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Drepart=$(meson_multilib_native_use repart)
-		-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)
-		-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)
-
-		# static-libs
-		-Dstatic-libsystemd=$(usex static-libs true false)
-		-Dstatic-libudev=$(usex static-libs true false)
-	)
-
-	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
-
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-	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/rules.d
-
-	if use hwdb; then
-		keepdir /etc/udev/hwdb.d
-	fi
-
-	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
-
-	if use hwdb; then
-		rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
-	fi
-
-	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
-
-	gen_usr_ldscript -a systemd udev
-}
-
-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-245.7-r1.ebuild b/sys-apps/systemd/systemd-245.7-r1.ebuild
index d709f3514300..31c8fb40c649 100644
--- a/sys-apps/systemd/systemd-245.7-r1.ebuild
+++ b/sys-apps/systemd/systemd-245.7-r1.ebuild
@@ -154,7 +154,7 @@ pkg_pretend() {
 		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
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
 			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
diff --git a/sys-apps/systemd/systemd-246-r1.ebuild b/sys-apps/systemd/systemd-246-r1.ebuild
index a3cf9676ba5f..e762aa1e4009 100644
--- a/sys-apps/systemd/systemd-246-r1.ebuild
+++ b/sys-apps/systemd/systemd-246-r1.ebuild
@@ -154,7 +154,7 @@ pkg_pretend() {
 		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
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
 			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index a3cf9676ba5f..e762aa1e4009 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -154,7 +154,7 @@ pkg_pretend() {
 		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
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
 			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index c0219f3d870b..5eb5d959e993 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -1,14 +1,5 @@
 AUX usb_modeswitch.sh-tmpdir.patch 596 BLAKE2B 6198685654131161989e03ac28ec4f4db5a2d8ba57c4f3c4b5c1fe96086c36bf450b4854995d098610faf12f89eaf55a5bcd95f1a68f0f2d2c3956ee92870947 SHA512 45e3a3f78a9404293a8b7e864f22db94a617be1d34d2c91fdaddc9b6a183dee1e3e2b5f4376e417d2c56b13b772a70e5e5cb53d0a08adf4cdbe60f1378abfa1c
-DIST usb-modeswitch-2.2.6.tar.bz2 263395 BLAKE2B d9502bd56b967dd01f878be15cb6ce3dd545321dc5f7a6c813bba250236ce3db71635b9d26d31bde2c2a6ac08a11ac8472aeae92f55b3af2db694aad94f56e5a SHA512 f19b4c88e9a32af55a4a552cf89a2d25343b499180e41fccf988d34613f8480d49b7586b9b123edabc7cdbbb23073678797e99b7b679dd758924c9300377e067
-DIST usb-modeswitch-2.3.0.tar.bz2 263141 BLAKE2B 106d3db684ce1f41b096398e6b46bac64427a86010993a3a6320655f1358e029b21815a8ca4c6818728f6b5fc9f14eac2680985219344396c560681e9f0ce146 SHA512 5b7a012f31612ab53f817132e5055b45c056e5862f6daf9cb910c004878a93a46c0676040ba20323c110bd7fe3d5d26f2e16200ead2411d12f83e03278ff3a6c
-DIST usb-modeswitch-2.4.0.tar.bz2 259433 BLAKE2B 97d57cc100c63078069092a1a1e5057e29ee1d108c37a2f19ad373f793ceb8678dc4da0c810cea7887ea81f24961def6e30ce46d59c6513033b1f60fa4f3f956 SHA512 cf232b8333509012415fe9afbd1becbf54bbf7ebbb6cd450d16546840afc2dbdbc253f8ae6ae294c1e3a490d935e675b984a02ddbe243b57d80443f5d265117c
 DIST usb-modeswitch-2.5.2.tar.bz2 259820 BLAKE2B 263d0b8c4ec79eebb1f79cfd171973f0d6cab96bd361b54c5fed8908745eb4643af935edff788b0913f8ba5ba1edcb683c75aeff6c426437c8436c74f875982b SHA512 ad2a7e5134379664fca83b85803e52ec8e3fe3c2d6c633eb5af3c291c43b15ca4a67198612864de01d146a029ee5c475c8c7dc71d16e3a475b532837c5dd34ea
-DIST usb-modeswitch-data-20151101.tar.bz2 30350 BLAKE2B f9acb91e9f213a405c34349eaa8b0c0d59396eb182128cd96696d547849feeb8ce11f5d77d60f746fd0aa9993a9cc254f7269b376b077b5701a39f44f5319e5e SHA512 416fcf5ca6834b0a7697df4ecdc3ca61c02da7ecd8aff8836b9b8a83be96f9df7fb85ed05befdb6257267875d96ee39ee30affedea9794250f9ea46c1aadd879
-DIST usb-modeswitch-data-20160112.tar.bz2 31166 BLAKE2B c9d036fc836502f3197b456afc9348836208af5ffdea6d8fa79c762a24afea807f41a78243d82a09e56bd0dedd30e633e49e7552ffe56cb685ffacbe2746f0a7 SHA512 2da14d9a6e355921605f5e2231420326bae68b67466907b852c91a4f544101e31bccd703a6ecbae74b69cb518ab86d6732ffcacf4cbeccff55eea5befaedcaa3
-DIST usb-modeswitch-data-20160803.tar.bz2 31943 BLAKE2B 9b43c1a3e72497af1c935a61e0bbb7ad83b4d93619bb3897a5cead81e10572f8a705e7eb052ebde1ac04b85f4a367f07174a94b0828c1143136492fa98fa98cf SHA512 53c9ce700af986463e211fb918a06732df610403c149565c69e2d29ee5b248def7d607b2d10ba46da2b2d0be93803c1279e739b33eb14049520df6d556335608
 DIST usb-modeswitch-data-20170806.tar.bz2 32700 BLAKE2B 954aa513a74774cdabb2e3820fa56f1244de74cbfc0adda5309e4dc3bd79c2b6dd2023a5180f8d39f8b496485e1991de2a7fabbb59f6995fc7e0c0bb0b782243 SHA512 818bc9f3d9b75df245bb25f959075041667607e7681bdbca7006ec036613130a0fa5e41da9e939ca510e524a78a7a76aef82ecfbbe19611887b3735987b951cc
-EBUILD usb_modeswitch-2.2.6.ebuild 1618 BLAKE2B 51965bfe0cd191ce5d2fa04c8a3220b75d223f14743dc6af03d7bdbc4485cc7276e84a244f0ecd778fc0406eb1a1a83a5d3f59512a78129ddd5af7b105df6f9a SHA512 a03aa55c61e9cc2471002230df0c3cca107a993767335d96b4227df1bc0cdfa9bd0bf4effc34b1d2ebe84a5fe3f28bc969189f02fed29536a140914746587295
-EBUILD usb_modeswitch-2.3.0.ebuild 1621 BLAKE2B bd313eea043de7431089b7b485f3f899b719dc77201d43e1e59ff99d2797a7fd150c52a2b92c66e8af29530f126b984b2f7d4d7d7decca0c8aa28439ecb60e44 SHA512 81e79f81d623b0073bd5417ddf4df894dce0c50cc75bd034989bdecaae3b23e2d10ab9fbc8b0558b61e19311ee5de13a2dd6b8a62f2b046b0fcf48795020bad0
-EBUILD usb_modeswitch-2.4.0-r1.ebuild 1674 BLAKE2B 23b53e63eff1c31100688dcf0feef7b0459cb52bc936f989f079b7cbcf779fe2ae77ae2e78f3b72972ffcc7a3c9d32beeb2e68a1f9afa1a6cd0cae6314da82b9 SHA512 fc07e12527a539b102b626525f7cba77ba3beca9b254e1c21d7e8f692a58d09b4e81bce35afa5940402f943f3b60295e43ca3267a903ea23b3d0876e98e1b137
 EBUILD usb_modeswitch-2.5.2.ebuild 1671 BLAKE2B 304ccc0dee0fccac9beaf220e7ef1e6c07c549f197180bae7c6d3ae3ea8d9e64300f4b39387b0d7739e572f5575f3f3826929277c7ee6799f2f3b23bd1cbe343 SHA512 06bc65bb27d68ddb41d994feceb97de8dcaad790fecccfd247993d2bc2d54aeb9a97ba150b7875fd1a78a4f998ec88a3dd61efdeade725c2839b6081d27ec33c
 MISC metadata.xml 419 BLAKE2B b10eae75d3eacc64acd82b38254b85362f2301c6a5c2447f5113dae4d7769a260cf8b7d82c478d0589f05791ffab9651727f24a7709bff3f89d8d8dd0b8bd805 SHA512 6032951cd03029286f34a452c911d977a92cd3eb56c3c588c27d091bb506e1f3f963e87fb262270bc1108aeefeeb4f49b18ab8aaaa38383e35cddb8c5f43b06d
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild
deleted file mode 100644
index 341b046c566a..000000000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info toolchain-funcs udev systemd
-
-MY_PN=${PN/_/-}
-MY_P=${MY_PN}-${PV/_p*}
-#DATA_VER=${PV/*_p}
-DATA_VER="20151101"
-
-DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
-	https://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="jimtcl"
-
-COMMON_DEPEND="
-	virtual/udev
-	virtual/libusb:1
-"
-RDEPEND="${COMMON_DEPEND}
-	jimtcl? ( dev-lang/jimtcl )
-	!jimtcl? ( dev-lang/tcl:0 )" # usb_modeswitch script is tcl
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~USB_SERIAL"
-
-src_prepare() {
-	sed -i -e '/install.*BIN/s:-s::' Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		SYSDIR="${D}/$(systemd_get_unitdir)" \
-		UDEVDIR="${D}/$(get_udevdir)" \
-		$(usex jimtcl install-shared install)
-
-	# Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary,
-	# which is why we need to force the .service file to be installed:
-	systemd_dounit ${PN}@.service
-
-	dodoc ChangeLog README
-
-	pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
-	emake \
-		DESTDIR="${D}" \
-		RULESDIR="${D}/$(get_udevdir)/rules.d" \
-		files-install db-install
-	docinto data
-	dodoc ChangeLog README
-	popd >/dev/null
-}
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.3.0.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.3.0.ebuild
deleted file mode 100644
index b2c23bace38d..000000000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.3.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info toolchain-funcs udev systemd
-
-MY_PN=${PN/_/-}
-MY_P=${MY_PN}-${PV/_p*}
-#DATA_VER=${PV/*_p}
-DATA_VER="20160112"
-
-DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
-	https://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="jimtcl"
-
-COMMON_DEPEND="
-	virtual/udev
-	virtual/libusb:1
-"
-RDEPEND="${COMMON_DEPEND}
-	jimtcl? ( dev-lang/jimtcl )
-	!jimtcl? ( dev-lang/tcl:0 )" # usb_modeswitch script is tcl
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~USB_SERIAL"
-
-src_prepare() {
-	sed -i -e '/install.*BIN/s:-s::' Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		SYSDIR="${D}/$(systemd_get_unitdir)" \
-		UDEVDIR="${D}/$(get_udevdir)" \
-		$(usex jimtcl install-shared install)
-
-	# Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary,
-	# which is why we need to force the .service file to be installed:
-	systemd_dounit ${PN}@.service
-
-	dodoc ChangeLog README
-
-	pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
-	emake \
-		DESTDIR="${D}" \
-		RULESDIR="${D}/$(get_udevdir)/rules.d" \
-		files-install db-install
-	docinto data
-	dodoc ChangeLog README
-	popd >/dev/null
-}
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0-r1.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0-r1.ebuild
deleted file mode 100644
index 5a862fc779fd..000000000000
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info toolchain-funcs udev systemd
-
-MY_PN=${PN/_/-}
-MY_P=${MY_PN}-${PV/_p*}
-#DATA_VER=${PV/*_p}
-DATA_VER="20160803"
-
-DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks"
-HOMEPAGE="https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt"
-SRC_URI="https://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
-	https://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="jimtcl"
-
-COMMON_DEPEND="
-	virtual/udev
-	virtual/libusb:1
-"
-RDEPEND="${COMMON_DEPEND}
-	jimtcl? ( dev-lang/jimtcl )
-	!jimtcl? ( dev-lang/tcl:0 )" # usb_modeswitch script is tcl
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~USB_SERIAL"
-
-src_prepare() {
-	sed -i -e '/install.*BIN/s:-s::' Makefile || die
-	epatch "${FILESDIR}/usb_modeswitch.sh-tmpdir.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		SYSDIR="${D}/$(systemd_get_unitdir)" \
-		UDEVDIR="${D}/$(get_udevdir)" \
-		$(usex jimtcl install-shared install)
-
-	# Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary,
-	# which is why we need to force the .service file to be installed:
-	systemd_dounit ${PN}@.service
-
-	dodoc ChangeLog README
-
-	pushd ../${MY_PN}-data-${DATA_VER} >/dev/null
-	emake \
-		DESTDIR="${D}" \
-		RULESDIR="${D}/$(get_udevdir)/rules.d" \
-		files-install db-install
-	docinto data
-	dodoc ChangeLog README
-	popd >/dev/null
-}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index fe24deaa651f..98b65b931779 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index 942fa24848d7..8c1932e6f23b 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -16,5 +16,5 @@ EBUILD sssd-2.1.0-r1.ebuild 5972 BLAKE2B 59fe7c880dd738dd827f77b22522c8be2ad65f4
 EBUILD sssd-2.2.0-r1.ebuild 5972 BLAKE2B 59fe7c880dd738dd827f77b22522c8be2ad65f41bf8e5fc447a1c1bcd9631eda1549ddb6b15490c6e64b294338d08d41454da15fe6129dd7fb2611e4463f1349 SHA512 0057b815e569d4e0056d2117eb600f321b77b3dfcacbacb0230433e37134e48a90a54f8bf97444bfc29113860d4014cdf8399e493d9a5851c6bea37bf5209dde
 EBUILD sssd-2.2.2.ebuild 5972 BLAKE2B 59fe7c880dd738dd827f77b22522c8be2ad65f41bf8e5fc447a1c1bcd9631eda1549ddb6b15490c6e64b294338d08d41454da15fe6129dd7fb2611e4463f1349 SHA512 0057b815e569d4e0056d2117eb600f321b77b3dfcacbacb0230433e37134e48a90a54f8bf97444bfc29113860d4014cdf8399e493d9a5851c6bea37bf5209dde
 EBUILD sssd-2.2.3.ebuild 6029 BLAKE2B 85d4f9e21aa17352e91a31bfed555fce87f59d7689b621c0ee5adc2c41ac7047b6093c6d6a7426bc5c46295de5080538bd76cdf12574847338eefbb809f251c3 SHA512 22d791eca85e1e50f0cfe9bdf8a580f4e32bb3a746f129eef01a3a637b4dd7a6a9a355524c49d0f62bfb4e205241daaf3c7742c703c9ebea268a8dd48d3f4313
-EBUILD sssd-2.3.1.ebuild 7537 BLAKE2B ad16d49bd320814edf43bf982ba5e03ccb15e1d81e75d87be7090efbc0805b0bdd4bccf4dc6718a728c85f01e17f5bedec996079616bd4b967052994de6763e3 SHA512 a58f795102845b1f3d8337f11712d268cdd5d24935532d4d4caf3fc9a9a1c2293e0df10ff4703e84bffa067272bebb7e74ccdc27bc249da1eade8d24214a5435
+EBUILD sssd-2.3.1-r1.ebuild 7537 BLAKE2B ad16d49bd320814edf43bf982ba5e03ccb15e1d81e75d87be7090efbc0805b0bdd4bccf4dc6718a728c85f01e17f5bedec996079616bd4b967052994de6763e3 SHA512 a58f795102845b1f3d8337f11712d268cdd5d24935532d4d4caf3fc9a9a1c2293e0df10ff4703e84bffa067272bebb7e74ccdc27bc249da1eade8d24214a5435
 MISC metadata.xml 1480 BLAKE2B e2903840a3b7e9c92145fdded6fc6a7a275323186d2636e401b9d4c7992b61ea410f43a565482e0bdab6056feaf140a63e3f0db3da532c6686d4f7edb3d58c43 SHA512 35c81d5fdb496a9d2ca39379b0844a30c0313b2606a62e1bbf8816c0b95712089b99e4dd5f526a5bc593e8b93b8c47eb54125e25568b4c485aac379e0764d039
diff --git a/sys-auth/sssd/sssd-2.3.1.ebuild b/sys-auth/sssd/sssd-2.3.1-r1.ebuild
index 72dab04b2dc2..72dab04b2dc2 100644
--- a/sys-auth/sssd/sssd-2.3.1.ebuild
+++ b/sys-auth/sssd/sssd-2.3.1-r1.ebuild
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 5afc66bf1edc..7c9890b03dd5 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/megacli/Manifest b/sys-block/megacli/Manifest
index ec6a61949f59..46448444d6c2 100644
--- a/sys-block/megacli/Manifest
+++ b/sys-block/megacli/Manifest
@@ -1,9 +1,5 @@
 AUX megacli-wrapper 102 BLAKE2B 15b4c1bcc7102e7c757527e4f8fbb30b4d6eb14773da3690450e010fedecc248b3ff9cfd7f3ad9751cce750de816df98b249ed8f32c9960ac5eef60424f3dede SHA512 b420a93bc930ca346cd76d54871929231d7a7d378c602523d291517c1861b925cb6226a27326559c13b572bc1f9494b6a0abba1526bc02141a8ba1d86f245ec7
 DIST 8-07-14_MegaCLI.zip 7939395 BLAKE2B 3b4151724fab8b9fd2a5797d11919c52cdd5c96fefb6074fad6637a9a82a6d9291dd43e5480669779dbce18f3cb0c56fe119e868a6d6a7c9d05779eb6fccb154 SHA512 ee2b66b69dc41bb678e54f5ccf4908a51e6fde147b2118844ff6248127aa51f12af0e7562c74461d52ea8e9b4345877b21c87fc89210208d80cf2fd3402a93e3
-DIST 8.07.10_MegaCLI_Linux.zip 1543709 BLAKE2B 6b42195d105faa5ce6469d6a36c37a1d84b9a814bbc0e85ba45d8d29914232868db40fef0572c281a2716041e98222923547d7c7f25a71217bd4468ac3031fbd SHA512 ee83910dac54b653f5c33703555c51d37b33e1672c6de6473950ca21ff19518b7de921cfa07a50e1c7f26054c7075c6bc241b52f89757cc1e0e0f4251a07bcd7
-DIST 8.07.14_MegaCLI.zip 7939395 BLAKE2B 3b4151724fab8b9fd2a5797d11919c52cdd5c96fefb6074fad6637a9a82a6d9291dd43e5480669779dbce18f3cb0c56fe119e868a6d6a7c9d05779eb6fccb154 SHA512 ee2b66b69dc41bb678e54f5ccf4908a51e6fde147b2118844ff6248127aa51f12af0e7562c74461d52ea8e9b4345877b21c87fc89210208d80cf2fd3402a93e3
-EBUILD megacli-8.07.10.ebuild 2095 BLAKE2B db73b68bfb37be536e2254d29cdb0b71cd8bdbe9bf59ef0fd7c15ca7865993f0a962d533b2d24ea38783998bdb1cc420143bb286f03bf764df3d4523c562b41d SHA512 9c7eb12c22c7a82249419c04e9436f2eeec3e83b53fbb53c99bfdc6dd44a2d929539e6bb3839bef1514949999129214b7b396b400cf9a0acbc8beb89adee0b12
-EBUILD megacli-8.07.14-r1.ebuild 2503 BLAKE2B 9d622084adb012d468c002ffd5556501fffeaa491c5e1a570be28a60606e01565f35e7dd3bbe5ec0376a32e3fa05989d2a641262f76dc313f37ca2c4403cf0d4 SHA512 a15d74ce1007e4d2399ff101374e81dba943114c959e68421a1c0ba8efe62630fb7d92050b239c8fe8561b18959c5ab376de780234e5dee2b9790d75b396d311
 EBUILD megacli-8.07.14-r2.ebuild 2486 BLAKE2B 9b4b6102240a2e06bb5e229fb9854f36d830143cf86498f9bee4a6bd68ed3b8c9fe5e5426beced13b1ffcebfd95c931c104c3a1571660d8d0aa15138f1275df7 SHA512 ff284da9bc44a143f905e9bde17aa6f26afc6c23eabd86de28e8657dc652b7fda34597beb93be3905239325690875cd12bdf1f85629d7f79f6d3ea066d867bff
-EBUILD megacli-8.07.14.ebuild 2055 BLAKE2B 9a630e8908e6f1b120944e0feac9ab4e0b9dba1195fc969ae1686c8a27f28a405953b12ee5f6bef09ae877db81472fd3efe96637cb64f9f872e4d19c076f2aa4 SHA512 ee9885306d50b1c74efc4dfedc275fd03c5472ccbf008202674a3a9e62e2ccf970a36c7e72b5c9e44b2a0ac06e46e445617e93362680f227afe3fd7d5314c91f
+EBUILD megacli-8.07.14-r3.ebuild 2488 BLAKE2B 8009946c72d05a7967184b24ff906f7cf9cf403996f6535c202ae8d27e2e1b290020ad103cfc6186b3836358f5e16ce94caf387af7bcd8b44951c77d7c359d03 SHA512 0c439c3781ca5f4e75384d3cb6acf84973b2b09aebebf28e106928038fcc29366791c452578f44b4d921d1e8f1723d24529f8c1123a47bbfd8cf6d960e68ff9d
 MISC metadata.xml 318 BLAKE2B 98c2744d890564a2aee5a9541954654e57d97c3a30ca9d2470afb2d0d63935eadf02d7745b617bb9f0d076bc449ed5f10fbf4610226d3f701077d6e4c3929ab9 SHA512 d2c34bba25ecc086ba1e3e009fbcf56d40efa3522cbc8d1fd4e273a58d21d82c2fd159c25e9295939f713e1ed845d361645915060fef9bc71be9be3d4ef043ee
diff --git a/sys-block/megacli/megacli-8.07.10.ebuild b/sys-block/megacli/megacli-8.07.10.ebuild
deleted file mode 100644
index d7705715e388..000000000000
--- a/sys-block/megacli/megacli-8.07.10.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit rpm
-MY_P=${PV}_MegaCLI_Linux
-
-DESCRIPTION="LSI Logic MegaRAID Command Line Interface management tool"
-HOMEPAGE="http://www.lsi.com/"
-SRC_URI="http://www.lsi.com/downloads/Public/RAID%20Controllers/RAID%20Controllers%20Common%20Files/${MY_P}.zip"
-
-LICENSE="LSI"
-SLOT="0"
-# This package can never enter stable, it can't be mirrored and upstream
-# can remove the distfiles from their mirror anytime.
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	app-admin/chrpath"
-RDEPEND="sys-libs/ncurses-compat:5"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="mirror fetch"
-QA_PREBUILT="/opt/${PN}/${PN}
-	/opt/${PN}/lib/*"
-
-pkg_nofetch() {
-	einfo "Upstream has implement a mandatory clickthrough EULA for distfile download"
-	einfo "Please visit $SRC_URI"
-	einfo "And place $A into your DISTDIR directory"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rpm_unpack ./"Linux MegaCLI ${PV}"/MegaCli-${PV}-1.noarch.rpm
-}
-
-src_install() {
-	newdoc "Linux MegaCLI ${PV}.txt" RELEASE.txt
-
-	exeinto /opt/megacli
-	libsysfs=libstorelibir-2.so.14.07-0
-	case ${ARCH} in
-		amd64) MegaCli=MegaCli64;;
-		x86) MegaCli=MegaCli;;
-		*) die "invalid ARCH";;
-	esac
-	newexe opt/MegaRAID/MegaCli/${MegaCli} ${PN}
-
-	exeinto /opt/${PN}/lib
-	doexe opt/MegaRAID/MegaCli/${libsysfs}
-
-	into /opt
-	newbin "${FILESDIR}"/${PN}-wrapper ${PN}
-	dosym ${PN} /opt/bin/MegaCli
-
-	# Remove DT_RPATH
-	chrpath -d "${D}"/opt/${PN}/${PN}
-}
-
-pkg_postinst() {
-	einfo
-	einfo "See /usr/share/doc/${PF}/RELEASE.txt for a list of supported controllers"
-	einfo "(contains LSI model names only, not those sold by 3rd parties"
-	einfo "under custom names like Dell PERC etc)."
-	einfo
-	einfo "As there's no dedicated manual, you might want to have"
-	einfo "a look at the following cheat sheet (originally written"
-	einfo "for Dell PowerEdge Expandable RAID Controllers):"
-	einfo "http://tools.rapidsoft.de/perc/perc-cheat-sheet.html"
-	einfo
-	einfo "For more information about working with Dell PERCs see:"
-	einfo "http://tools.rapidsoft.de/perc/"
-	einfo
-}
diff --git a/sys-block/megacli/megacli-8.07.14-r1.ebuild b/sys-block/megacli/megacli-8.07.14-r1.ebuild
deleted file mode 100644
index 718d3ec37f96..000000000000
--- a/sys-block/megacli/megacli-8.07.14-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 rpm
-MY_PV="${PV//./-}"
-MY_P=${MY_PV}_MegaCLI
-
-DESCRIPTION="LSI Logic MegaRAID Command Line Interface management tool"
-# Avagotech now owns LSI
-HOMEPAGE="http://www.avagotech.com/cs/Satellite?pagename=AVG2/searchLayout&SearchKeyWord=8.07&searchType=DocumentFileExtension-zip&locale=avg_en&srchradio=within&within=8.07"
-# This file is '[zip]	MegaCLI 5.5 P2', Date: 01/20/2014   Size: 7753 KB
-SRC_URI="http://docs.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${MY_P}.zip"
-
-LICENSE="LSI"
-SLOT="0"
-# This package can never enter stable, it can't be mirrored and upstream
-# can remove the distfiles from their mirror anytime.
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	app-admin/chrpath"
-RDEPEND="sys-libs/ncurses-compat:5"
-
-S=${WORKDIR}
-
-# Previous releases from LSI directly required a click-through EULA; but the
-# upstream website no longer requires this consistently: most old files have
-# two or more download pages, and while one of the pages has a generic
-# click-through download form, the file-specific download page only requires
-# click-through on some items. See also sys-block/lsiutil
-RESTRICT="mirror bindist"
-QA_PREBUILT="/opt/${PN}/${PN}
-	/opt/${PN}/lib/*"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rpm_unpack ./Linux/MegaCli-${PV}-1.noarch.rpm
-}
-
-src_install() {
-	newdoc "${PV}_MegaCLI.txt" RELEASE.txt
-
-	exeinto /opt/megacli
-	libsysfs=libstorelibir-2.so.14.07-0
-	case ${ARCH} in
-		amd64) MegaCli=MegaCli64;;
-		x86) MegaCli=MegaCli;;
-		*) die "invalid ARCH";;
-	esac
-	newexe opt/MegaRAID/MegaCli/${MegaCli} ${PN}
-
-	exeinto /opt/${PN}/lib
-	doexe opt/MegaRAID/MegaCli/${libsysfs}
-
-	into /opt
-	newbin "${FILESDIR}"/${PN}-wrapper ${PN}
-	dosym ${PN} /opt/bin/MegaCli
-
-	# Remove DT_RPATH
-	chrpath -d "${D}"/opt/${PN}/${PN}
-}
-
-pkg_postinst() {
-	einfo
-	einfo "See /usr/share/doc/${PF}/RELEASE.txt for a list of supported controllers"
-	einfo "(contains LSI model names only, not those sold by 3rd parties"
-	einfo "under custom names like Dell PERC etc)."
-	einfo
-	einfo "As there's no dedicated manual, you might want to have"
-	einfo "a look at the following cheat sheet (originally written"
-	einfo "for Dell PowerEdge Expandable RAID Controllers):"
-	einfo "http://tools.rapidsoft.de/perc/perc-cheat-sheet.html"
-	einfo
-	einfo "For more information about working with Dell PERCs see:"
-	einfo "http://tools.rapidsoft.de/perc/"
-	einfo
-}
diff --git a/sys-block/megacli/megacli-8.07.14-r3.ebuild b/sys-block/megacli/megacli-8.07.14-r3.ebuild
new file mode 100644
index 000000000000..ed3a7f8c02de
--- /dev/null
+++ b/sys-block/megacli/megacli-8.07.14-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rpm
+MY_PV="${PV//./-}"
+MY_P=${MY_PV}_MegaCLI
+
+DESCRIPTION="LSI Logic MegaRAID Command Line Interface management tool"
+HOMEPAGE="https://www.broadcom.com/support/knowledgebase/1211161498596/megacli-cheat-sheet--live-examples https://www.broadcom.com/support/knowledgebase/1211161496959/megacli-commands"
+# This file is '[zip]	MegaCLI 5.5 P2', Date: 01/20/2014   Size: 7753 KB
+SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${MY_P}.zip"
+
+LICENSE="LSI"
+SLOT="0"
+# This package can never enter stable, it can't be mirrored and upstream
+# can remove the distfiles from their mirror anytime.
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip
+	app-admin/chrpath"
+RDEPEND="sys-libs/ncurses-compat:5"
+
+S=${WORKDIR}
+
+# Previous releases from LSI directly required a click-through EULA; but the
+# upstream website no longer requires this consistently: most old files have
+# two or more download pages, and while one of the pages has a generic
+# click-through download form, the file-specific download page only requires
+# click-through on some items. See also sys-block/lsiutil
+RESTRICT="mirror bindist"
+QA_PREBUILT="/opt/${PN}/${PN}
+	/opt/${PN}/lib/*"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rpm_unpack ./Linux/MegaCli-${PV}-1.noarch.rpm
+}
+
+src_install() {
+	newdoc "${PV}_MegaCLI.txt" RELEASE.txt
+
+	exeinto /opt/megacli
+	libsysfs=libstorelibir-2.so.14.07-0
+	case ${ARCH} in
+		amd64) MegaCli=MegaCli64;;
+		x86) MegaCli=MegaCli;;
+		*) die "invalid ARCH";;
+	esac
+	newexe opt/MegaRAID/MegaCli/${MegaCli} ${PN}
+
+	exeinto /opt/${PN}/lib
+	doexe opt/MegaRAID/MegaCli/${libsysfs}
+
+	into /opt
+	newbin "${FILESDIR}"/${PN}-wrapper ${PN}
+	dosym ${PN} /opt/bin/MegaCli
+
+	# Remove DT_RPATH
+	chrpath -d "${D}"/opt/${PN}/${PN}
+}
+
+pkg_postinst() {
+	einfo
+	einfo "See /usr/share/doc/${PF}/RELEASE.txt for a list of supported controllers"
+	einfo "(contains LSI model names only, not those sold by 3rd parties"
+	einfo "under custom names like Dell PERC etc)."
+	einfo
+	einfo "As there's no dedicated manual, you might want to have"
+	einfo "a look at the following cheat sheet (originally written"
+	einfo "for Dell PowerEdge Expandable RAID Controllers):"
+	einfo "http://tools.rapidsoft.de/perc/perc-cheat-sheet.html"
+	einfo
+	einfo "For more information about working with Dell PERCs see:"
+	einfo "http://tools.rapidsoft.de/perc/"
+	einfo
+}
diff --git a/sys-block/megacli/megacli-8.07.14.ebuild b/sys-block/megacli/megacli-8.07.14.ebuild
deleted file mode 100644
index 968ffeb5764e..000000000000
--- a/sys-block/megacli/megacli-8.07.14.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit rpm
-MY_P=${PV}_MegaCLI
-
-DESCRIPTION="LSI Logic MegaRAID Command Line Interface management tool"
-HOMEPAGE="http://www.lsi.com/"
-SRC_URI="http://www.lsi.com/downloads/Public/RAID%20Controllers/RAID%20Controllers%20Common%20Files/${MY_P}.zip"
-
-LICENSE="LSI"
-SLOT="0"
-# This package can never enter stable, it can't be mirrored and upstream
-# can remove the distfiles from their mirror anytime.
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip
-	app-admin/chrpath"
-RDEPEND="sys-libs/ncurses-compat:5"
-
-S=${WORKDIR}
-
-RESTRICT="mirror fetch"
-QA_PREBUILT="/opt/${PN}/${PN}
-	/opt/${PN}/lib/*"
-
-pkg_nofetch() {
-	einfo "Upstream has implement a mandatory clickthrough EULA for distfile download"
-	einfo "Please visit $SRC_URI"
-	einfo "And place $A into your DISTDIR directory"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rpm_unpack ./Linux/MegaCli-${PV}-1.noarch.rpm
-}
-
-src_install() {
-	newdoc "${MY_P}.txt" RELEASE.txt
-
-	exeinto /opt/megacli
-	libsysfs=libstorelibir-2.so.14.07-0
-	case ${ARCH} in
-		amd64) MegaCli=MegaCli64;;
-		x86) MegaCli=MegaCli;;
-		*) die "invalid ARCH";;
-	esac
-	newexe opt/MegaRAID/MegaCli/${MegaCli} ${PN}
-
-	exeinto /opt/${PN}/lib
-	doexe opt/MegaRAID/MegaCli/${libsysfs}
-
-	into /opt
-	newbin "${FILESDIR}"/${PN}-wrapper ${PN}
-	dosym ${PN} /opt/bin/MegaCli
-
-	# Remove DT_RPATH
-	chrpath -d "${D}"/opt/${PN}/${PN}
-}
-
-pkg_postinst() {
-	einfo
-	einfo "See /usr/share/doc/${PF}/RELEASE.txt for a list of supported controllers"
-	einfo "(contains LSI model names only, not those sold by 3rd parties"
-	einfo "under custom names like Dell PERC etc)."
-	einfo
-	einfo "As there's no dedicated manual, you might want to have"
-	einfo "a look at the following cheat sheet (originally written"
-	einfo "for Dell PowerEdge Expandable RAID Controllers):"
-	einfo "http://tools.rapidsoft.de/perc/perc-cheat-sheet.html"
-	einfo
-	einfo "For more information about working with Dell PERCs see:"
-	einfo "http://tools.rapidsoft.de/perc/"
-	einfo
-}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 3bc104a2e9b8..8654c8cfca6b 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 3a3c9bf48065..d50459770de2 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -1,3 +1,4 @@
+AUX elilo-3.16-FLAGS.patch 626 BLAKE2B cb140edefc093de92eb0af2ec2ec88d8fa3d3cd80a12811b5d657df9feae1c04da734ea933e9bbee11ab82815da5a573dfbd2ffbf68d7b9816609e7b207aa51c SHA512 69331902b4939fe349475aee84d1758cf973b7c015c9b092a7624d48235c0f6751082045cb2074eb90f0d42596d260c816e2a6fe075edeb134e4cd785f6e3e03
 AUX elilo-3.16-elilo-loop.patch 299 BLAKE2B 5fe27b5b89d18adace762e2691854140437c5d33281d8b4e6573303b9d80913fa59283ae231213dda985dc9751c019db0a070e77284c56ed3871d799897b3c69 SHA512 6480d3e9403bc54b4a923e77df049eeb42929020f222450e32c12d4dcb09b098aa52924be0ebdda95e01ee8d0ced624ec96c3977cc1213b66dc5a8639797bc20
 AUX elilo-3.16-gnu-efi-3.0.6-ia64.patch 3796 BLAKE2B 9008b004b24b390f46d6b05cf9e9ae0627d4ed930b9965d0295e700ea0c7617f2ac3e1da0b583ab931e8a7bffc0bf8452eb19318d7d1d256a5d4781cde4e710e SHA512 c2ec3ba0d2f5ee3447363a44d9d7863eb323095c40f72243241f608437fd9e2b17ee603666a1103f14a0c66cae025e8f9be09c27d8fb57554f480209a02f39e5
 AUX elilo-3.16-strncpy-clash.patch 744 BLAKE2B 421530303406aa819e07883d4b80a27da20844929d0f1749e121b2e05cf8eda2af082ad8c02476cabf864258133964b0fb02ab3ed9969202fe62392718e7e047 SHA512 4cb593ac6b56bbe63b1ff632d00ef1192dc28c9a5af355e740b9ee41697fb48766ccb678636c66ecdb05d7cdf8d16b0a14d99e0347022bbe1cb6ec9be09bfcf8
@@ -5,4 +6,5 @@ AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799
 DIST elilo-3.16-all.tar.gz 485844 BLAKE2B 813762ffef32a640c074973a07d886e0de137be10ff08e9375cd894b0d83dd8bc96cc33f80da1e698db49cc9f105a905abb2fa04048eaca394d3d70e79cb8534 SHA512 4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842
 DIST elilo_3.14-3.debian.tar.gz 32179 BLAKE2B 84f8055d3e33b99ce91079768da80a8800c3c2f569ce5619641a983efb943055dfd9a8fb2fda8e5e6d60009ffefbcc1573098f022f06635d4d5304bc3bfddf1e SHA512 b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f
 EBUILD elilo-3.16-r3.ebuild 2147 BLAKE2B 75c075dedc5088c60c0d2866b0ca5ca9c217b55ccc07adaad42449e2de0f09203d263310f6c306462df8de0f347de0f45906f2add2d6ed76549fbf4965b7955c SHA512 620e673baa83e75f762c131f97051a00df4ca85e80139461eca0785eb64d0dbe14106ed20c6b0c66ed7b87ffa57dd85bbb21cd41d8d00187b92ec5304a510ce6
-MISC metadata.xml 337 BLAKE2B 7c9b3e56e9680252631db0691b3acfc2a2cbfee80c42af709979085124a35bb9d184e58de3ef4f88b2f3e6cc873b4ef2bd285ce3fc2645aaa9ae869c3b729d87 SHA512 13691bef927bf7f8a4a6d0640d38dabb53fdae1d8bd986c5fe73c1643e2bdbaaac50bfe864e2185a584fa6265a3197afc5273b60b70675481cef61706dde8d87
+EBUILD elilo-3.16-r4.ebuild 2247 BLAKE2B 5a82f2db1261e1040f60999dc344a172941fe97ede55fbb295187205446268cc937ab4ecdafa37202fe9c5b8756d1a48d1acb365b83c2b5a578ae2e04c22b214 SHA512 7e9d4cf9c269b3cafd7d46c304f44fd79d45026ff78ac11f952a06316b4bfb51c131786df1e4a375657ab33568971353ff0e250c1236a501a55725196cb860c6
+MISC metadata.xml 326 BLAKE2B cc7b85b290136d54ab8857ad992bef9eca8cbb607949a50ff090ddfbbab704d87d3e028415845fddc57ea984215dfe0048d1a219dcd386dcf1c1062f657f5db8 SHA512 e40b5a31e5e5954c817f994c6215488a34b32191cfc597e5514bef2fa1ae1e36f0aca1b7e80043e452946051885a04081875edd53d285fc557cbe3277ae3d624
diff --git a/sys-boot/elilo/elilo-3.16-r4.ebuild b/sys-boot/elilo/elilo-3.16-r4.ebuild
new file mode 100644
index 000000000000..c4cd5a90dd8a
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.16-r4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="https://sourceforge.net/projects/elilo/"
+SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
+	mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0g
+	dev-util/patchutils"
+# dosfstools[compat] to enable 'dosfsck' symlink
+RDEPEND="sys-boot/efibootmgr
+	sys-fs/dosfstools[compat]"
+
+S="${WORKDIR}/${P}-source"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
+	"${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
+	"${FILESDIR}"/${PN}-3.16-strncpy-clash.patch
+	"${FILESDIR}"/${PN}-3.16-FLAGS.patch
+)
+
+src_unpack() {
+	unpack ${A} ./${P}-source.tar.gz
+	mv debian "${S}"/ || die
+}
+
+src_prepare() {
+	default
+
+	case $(tc-arch) in
+	ia64)  iarch=ia64 ;;
+	x86)   iarch=ia32 ;;
+	amd64) iarch=x86_64 ;;
+	*)     die "unknown architecture: $(tc-arch)" ;;
+	esac
+
+	# Now Gentooize it.
+	sed -i \
+		-e '1s:/bin/sh:/bin/bash:' \
+		-e "s:##VERSION##:${PV}:" \
+		-e 's:Debian GNU/:Gentoo :g' \
+		-e 's:Debian:Gentoo:g' \
+		-e 's:debian:gentoo:g' \
+		-e "s:dpkg --print-architecture:echo ${iarch}:" \
+		debian/elilo.sh || die
+}
+
+src_compile() {
+	# "prefix" on the next line specifies where to find gcc, as, ld,
+	# etc.  It's not the usual meaning of "prefix".  By blanking it we
+	# allow PATH to be searched.
+	local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+	emake -j1 \
+		prefix= \
+		AS="$(tc-getAS)" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		HOSTARCH=${iarch} \
+		ARCH=${iarch} \
+		EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
+		GNUEFILIB="${libdir}" \
+		EFILIB="${libdir}" \
+		EFICRT0="${libdir}" \
+		NATIVE_CFLAGS="${CFLAGS}" \
+		NATIVE_LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	exeinto /usr/lib/elilo
+	doexe elilo.efi
+
+	newsbin debian/elilo.sh elilo
+	dosbin tools/eliloalt
+
+	insinto /etc
+	newins "${FILESDIR}"/elilo.conf.sample elilo.conf
+
+	dodoc docs/* "${FILESDIR}"/elilo.conf.sample
+	doman debian/*.[0-9]
+}
diff --git a/sys-boot/elilo/files/elilo-3.16-FLAGS.patch b/sys-boot/elilo/files/elilo-3.16-FLAGS.patch
new file mode 100644
index 000000000000..a77e44d0b186
--- /dev/null
+++ b/sys-boot/elilo/files/elilo-3.16-FLAGS.patch
@@ -0,0 +1,19 @@
+eliloalt is a rare native tool. Allow user to explicitly pass
+standart optimization flags via
+    $ make NATIIVE_CFLAGS=${CFLAGS} NATIVE_LDFLAGS
+https://bugs.gentoo.org/744931
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -42,10 +42,10 @@ all: $(TARGET)
+ # redefine local rule (we build a Linux/ia64 binary here)
+ #
+ %.o: %.c 
+-	$(CC) $(OPTIMFLAGS) $(DEBUGFLAGS) -c $< -o $@
++	$(CC) $(OPTIMFLAGS) $(NATIVE_CFLAGS) $(DEBUGFLAGS) -c $< -o $@
+ 
+ $(TARGET):  %:%.o 
+-	$(CC) -o $@ $(OPTIMFLAGS) $(DEBUGFLAGS) $^
++	$(CC) -o $@ $(OPTIMFLAGS) $(NATIVE_CFLAGS) $(NATIVE_LDFLAGS) $(DEBUGFLAGS) $^
+ 
+ clean:
+ 	$(RM) -f $(TARGET) $(FILES)
diff --git a/sys-boot/elilo/metadata.xml b/sys-boot/elilo/metadata.xml
index e9138bcbce78..0b9c119b3c0e 100644
--- a/sys-boot/elilo/metadata.xml
+++ b/sys-boot/elilo/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ia64@gentoo.org</email>
-		<name>Gentoo Linux IA-64 Development</name>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">elilo</remote-id>
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index 8a1b1885a3ad..91388b608fb8 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -3,4 +3,4 @@ DIST gnu-efi-3.0.11.tar.bz2 154456 BLAKE2B dd8d5100ee65e2f94d6b67f0d2236674c7c2b
 DIST gnu-efi-3.0.12.tar.bz2 154575 BLAKE2B 264e04351cf1ef74956e65d209c00514c0f56c18427a87a894132e5a5b0b09b3ca992475a2f95aac42c8a26ff4977ec837ff473d76c1c766049e903f03bd9fff SHA512 cbec6f6e37271c22c71e3ce44d3579e48e7f3b797ec3946f56eb843ed3e472722763c566fc3b749f0c692ab6cb26e8909bb258cd164771a5b1eeff5c7cd51368
 EBUILD gnu-efi-3.0.11.ebuild 1893 BLAKE2B be5aa026b5aeadb8e39322013446277ea08bf96cbee08eeadea7a8392d56b1ad45f7d5963ef7f1baeef459e54fb68bc24ba5faaeef72f52e64dde1a1ef767d17 SHA512 be87d6720e42a9ff0334fb5e79b85d272339d332fa13bf8aa415badcb68bf3727b63ac241f44a1efcc1e44f869fa122350298837526d064d79931ade56e0cb3d
 EBUILD gnu-efi-3.0.12.ebuild 1893 BLAKE2B be5aa026b5aeadb8e39322013446277ea08bf96cbee08eeadea7a8392d56b1ad45f7d5963ef7f1baeef459e54fb68bc24ba5faaeef72f52e64dde1a1ef767d17 SHA512 be87d6720e42a9ff0334fb5e79b85d272339d332fa13bf8aa415badcb68bf3727b63ac241f44a1efcc1e44f869fa122350298837526d064d79931ade56e0cb3d
-MISC metadata.xml 446 BLAKE2B ed77ce0b04fab42aad08921e9365b866a3d64d5192a569ad161e0415a2bbe1e9b374a48e1b2357331cf9743fc082a22c6b68081bddaa6b783e5cc78c4df394c2 SHA512 114721b7dc26234a2bce0ab65f2513f5bdd4749fd8fc5beb9619dc449bde13c82c88716d3e9b94a192d4298019255fff1aa32beaa15b643490fdbc25e75d83f8
+MISC metadata.xml 323 BLAKE2B 621b04fe06119fa67e9406565c94647f5fcd9158903eb23a1673de7c02107c90fc56ddc420791c3a1a28e8e854b6a978a1abc6549ebce51d6c3ea5e1eef82c67 SHA512 a47915e6e99550f7b295118899cbdd6f79716c867e66a0d330cd3e7c5a21bba736dcfea54a6432da4c7f1478b0119e55c698162bb9ca6a1fe4cbdf3808995d93
diff --git a/sys-boot/gnu-efi/metadata.xml b/sys-boot/gnu-efi/metadata.xml
index 493998b4dac8..d89d934c554e 100644
--- a/sys-boot/gnu-efi/metadata.xml
+++ b/sys-boot/gnu-efi/metadata.xml
@@ -5,10 +5,6 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>ia64@gentoo.org</email>
-		<name>Gentoo Linux IA-64 Development</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnu-efi</remote-id>
 	</upstream>
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index cc9a219ae60a..6226e8692664 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index c1d5b132b335..5adc78b99a38 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -22,6 +22,7 @@ AUX ceph-14.2.0-mgr-python-version.patch 685 BLAKE2B fbd36e0f5fe45be7cc58cf11b2b
 AUX ceph-14.2.10-build-without-mgr.patch 3248 BLAKE2B a0d435b1e5572d29f5d961bdb5e27da10060777d02c07616cd57abf0a734af0595093f3ead54be6ea74e450543917df55657b08d5f04681468d166c7dd0570ab SHA512 e03cd8dd9f08f348805d04e554e8a4c9bb2d83e931d1ba27c4265084b899031ddee12e3cc289aa927994c35b75a1bc383a0ee6648c7f8fee6864d775bb800fbf
 AUX ceph-14.2.10-missing-includes.patch 634 BLAKE2B 2c12c908e74a93de06a8d554057a2b45cbf3969c0eee51402e31f713ecae7394d195e0a85433d90be944b9df4aee93259fd8a50663cad1c3a7a798defb71f5de SHA512 4b5cf3201b03e9c92260bf01966aa4f6992fe9ba76f2b2f4c3211bcd2f978a76e9b7d4820d79dfbbf9e3f98ccda1929ae92343397db29724120047ce0bbd25d2
 AUX ceph-14.2.10-python-warnings.patch 1536 BLAKE2B 49ce59204096e02f9e10037dcd365fdc6e95cabf69602592019470cc069835b139b6ac2664aff94ddf6226998fa63337db751b9daa7c9ec87eb4729063a34f4e SHA512 c9ebdfaa9d93ca8e287059f817df01294d0a523831e4212e534cfbcabfc70d4e11d154fce42931f8e65926cb7e5cff09dc9c8165268bf24010533e471e370aa1
+AUX ceph-14.2.11-systemd-unit-fix.patch 1110 BLAKE2B 6964fb2e9e09fef25020b8c0f3bdfc225864f3840c63349355111626260116a25c6eff9f3e34a1cdc7d5ddbf2517b8df768f4fb83a9f7d2088393c7dc6a91848 SHA512 c9d43af2d02e77c163b457603d0a519a0849eca4109b828a4e000b5e428679e81396f842f91a521d688f6c5867420a40fe893f529f9bbea9624bbcc4400377fb
 AUX ceph-14.2.3-dpdk-compile-fix-1.patch 4729 BLAKE2B 96e709b592a7ea9324f54acf75ac3f78334a0d2b155f6d4b5360df8b13e2c9c8e5f6d6b19da5ddb7760c56d9307e056db9aeecec1926dddec88b6b685eb55374 SHA512 d0849fa120b3d7c26106e75bd830874854ee4214ac867b577f4486e4a033b2f555fa6745910f90d26f7fa5280bff01f5880eda9a2bc6edc856400a5756a8346b
 AUX ceph-14.2.4-python-executable.patch 922 BLAKE2B a5c9e8c70de62a974ea0bea4159874447d725a566d75a026ca125a7db0f24a8d92212d067c8dd91b75ec1e2aab12e46da464f320c7e696cc916e29a4e0d28f93 SHA512 b263de28897f05fc3a201622b90a222bb2c6605d4e6d8921d3c8101247a41a44e1f9da4242f208e1ef4d10ae028917510f4390cc69595b77b723545f0f72eeb2
 AUX ceph-14.2.4-undefined-behaviour.patch 1990 BLAKE2B 4f9839bc05c95d40c870f346ebb1856f2846adb26fcbbed67e260f47def9b7167bac4a15917262e8c9dbb99cb83892da2aa315b6d9ee8cd60eb222876dc56482 SHA512 15e4df7cadb02e65144dffea3c287e853e27a04c18281c13282409f1bc28184f31b80d505123a3a29e5394fa0b5e3e3f1246bb70353f142e52e19939149a341e
@@ -32,6 +33,7 @@ AUX ceph-15.2.2-systemd-unit.patch 682 BLAKE2B 1ec8c0a23fc7d572c79ca24aaf82100e1
 AUX ceph-15.2.3-spdk-compile.patch 376 BLAKE2B 073cee321c1a99f9a161fbec8f9e33bb13df14574e48300d1331dc2b31353f1ccac40f723de501c6e33bc6f065f4b4500048de9d9b0bae646c76ba715eab580a SHA512 c2890202820d022bf610d6317b0a6e3521da2060bb12e39ba1a5c347096d5688adcd98b1cbf25ad33ddfa78d3cae42669c21f4e1dbe6eceb150e4ee17bece582
 AUX ceph-15.2.4-system-uring.patch 2170 BLAKE2B aabfb8c5085de8d69c9afedd20cb99161fd556148f1e6c88c35ed1bdb83dafe28ddbe75ac1e579e23d0728856bb2c650895ab4c0791b0f8e6acf2652822b14f1 SHA512 8258661e56b5360f4260fdd29b07bac4d415068a112b61ca8c55c529fb1593d8d61a0d59a4eec8f1567b97167c058082198d008f55f8ee701cb46489df5f7823
 AUX ceph-15.2.5-missing-includes.patch 435 BLAKE2B 66c4b30629203694bd0d5c82f5977a0576c67b3cb14d678e6ab60bc7a933e65306b122e253856bae7862637564e14a93b9cd2c48c9b510e01cc316fc7be9f218 SHA512 84de66f64ea96cd59b40dfb5b8c5d093fe49df1139b45ad9d1bd6b9ebd2f1200b6e931adcf032639a4995af322cf05c1ef9050eb1cb6673e29e040d4e348b3d5
+AUX ceph-15.2.5-systemd-unit-fix.patch 1114 BLAKE2B 589874deeda1bd21fb0aa83980083448b03f2185be15e23bc1a550f96d46f613d55f5134244f8b36f9e08883acdc3b49731ea5f56726c9ab2c455a1cdb0f796a SHA512 91fc1b88cba37d329f6280c94ed246bdaf5eb6e602a2537b130a764bad4179090bbb79e8a3e50e464e57703233da85da7e1a795987d28dd3aab7ef544d9af78a
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
@@ -50,7 +52,8 @@ DIST ceph-14.2.11.tar.gz 129327263 BLAKE2B fb04f3fde6642905dd21836c7472cf3b6cb48
 DIST ceph-15.2.4.tar.gz 148011928 BLAKE2B c0222725227cf922ed10bb19840b8cbfe0c0b8ae77a4f83f03a95c3fc198165740f7a1dee5e1983e9403634ce389c858e71ed3f2731202630e19961a5de0247a SHA512 94e9b4c87d9f27dbfc9961b853f2cf159d65b614bf50ac3dabad9d801a181c547550ab4bca1f48c7a6e11aa6188e5858b110a9023dc214a043ed5ba375b3dee2
 DIST ceph-15.2.5.tar.gz 149219528 BLAKE2B 8f2cea9a258b7c530bff72a46d45fabf5364cf919f098c7d77857afa0dfdbcd7c290aa5a0d88cce1d99923588cc303d27c0b85179378ff1c394d9ce0f135a1b1 SHA512 55de068886c48293e92ef95cf8343ae44825fd2bf9c3fa7d47cda92907a47bae79e0af730cd34d0155b0777901d0fd6f9d1f30537c66c54c95098df7368fca2e
 EBUILD ceph-12.2.12-r3.ebuild 8084 BLAKE2B 10c1bb21651ca274643565a22794b4c6d8c61c9baa19fca9ffa396d6cbbf22b72b5601457b01ba62c1cdd6400ca965c6a8bdc638a959df315c57f0d272e36b5a SHA512 2cfdd77569da5c05354036e3d3864abab69e889e1cee142ed10782fb989353a8c9d7c491ef8e3fd6a872700b6a341413a591e0a341aa1a1ffca988be5b6a9af0
+EBUILD ceph-14.2.11-r1.ebuild 10619 BLAKE2B a3498c221b993d0ae37a8b00077bb1fdfebe6ff32cfc732d99866cf9c494f96bc107e00087d6397f0f66e21521744f4c86bb0e8ca94893273595aa08c6937452 SHA512 12cf71f3072f804eab749ca7d16892cfaed376dd8274719e8da9481b1a0bf63a3f07828d7f9b2444e7a1fb38a25776bdcbcd091cd988423e357e0ed82a29ea24
 EBUILD ceph-14.2.11.ebuild 10416 BLAKE2B 0bb2b1c54d1eb8b63ec7a93a56fe2634232ac0aea31a1021a446c5d426921f6dc0e5f7d2f1017616a91830e67b7987fff477915b8a11386f360c6894b7c1e48d SHA512 b853708a69288d5628daa819cd40df9d5b3fe8da270df25767dc54f0a5b0ad08acf0a5d3d885ee5d2d5ce0359b8dcd492f8092cf9932eead89673c7ae9cab122
 EBUILD ceph-15.2.4-r3.ebuild 10576 BLAKE2B 0baf88168d628883949a4f284e59e6d81e9e0d8e2a631ddb0b3bd2c696ec168151235fa0a95c98b9843d4d7b0f4c9058cbdb735ca0c9d3da86dcebf6d74df29e SHA512 a4b17fb21d86e2dce10927545f5d888d35fa1e0edc7d4e1025a65ad0a6e18c377434018d3b9242ec5d3ac59e702a4f02c17dae9ed7523b6cf39db1faa70a902f
-EBUILD ceph-15.2.5.ebuild 10694 BLAKE2B 4087305c800b75a56633bcab24e6c6241c0d5f563c6838459e39c648d2750d559a281c1cdef3de33b69564cd74a589eb3f3c0bec8f9f4cad82716d093bb3682d SHA512 2781ef4a263ce1c6bcf26357e773c8a89e4cb54dfcc75176033817a332b661ef39154bd47039562f39047e1dda8cbfaab33c1807964626c0271cbaf411d82344
+EBUILD ceph-15.2.5-r1.ebuild 10777 BLAKE2B 7f072e92726d0ff2edcc953825e42ba1e81abdd83b741564b9b191e25ae0eb8e289e6243f134ac9c999273a226d62e414227e0a0c053045c23ff027cca34234f SHA512 e666f2d0fa297ce9061413afefb9a35822375c97785955301cbee401f9623c7ae2bc813a11e01a7fc6081da26c4e578b4fa30f438719d89fe9e3e5624dd36ea6
 MISC metadata.xml 2117 BLAKE2B 5aacfd24e535c6941c3b53ac2ecea9a8837511f2656ac1447b004fc6949818826321c455c0d401e79dcc21d6f5686162f69da9b6994dd4427157db47eab7894e SHA512 126776f9836132f200496c1a5eccd2bf069b8e962b47defd1b01e65d4b58204565ab8a1736d40f49e0c7b733c43bf4507fe2fc19b62c5d3935061da7980f203c
diff --git a/sys-cluster/ceph/ceph-14.2.11-r1.ebuild b/sys-cluster/ceph/ceph-14.2.11-r1.ebuild
new file mode 100644
index 000000000000..35c24e6a41de
--- /dev/null
+++ b/sys-cluster/ceph/ceph-14.2.11-r1.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+CMAKE_MAKEFILE_GENERATOR=emake
+
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
+		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
+	kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl
+	spdk system-boost systemd +tcmalloc test xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+DEPEND="
+	acct-group/ceph
+	acct-user/ceph
+	virtual/libudev:=
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/zstd:=
+	app-shells/bash:0
+	app-misc/jq:=
+	dev-libs/crypto++:=
+	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
+	dev-libs/xmlsec:=[!openssl?,!libressl?]
+	dev-cpp/yaml-cpp:=
+	dev-libs/nss:=
+	dev-libs/protobuf:=
+	net-dns/c-ares:=
+	net-libs/gnutls:=
+	sys-auth/oath-toolkit:=
+	sys-apps/coreutils
+	sys-apps/grep
+	sys-apps/hwloc:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
+	sys-apps/sed
+	sys-apps/util-linux
+	sys-libs/libcap-ng:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	sys-process/numactl:=
+	x11-libs/libpciaccess:=
+	babeltrace? ( dev-util/babeltrace )
+	fuse? ( sys-fs/fuse:0= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	kafka? ( dev-libs/librdkafka:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lttng? ( dev-util/lttng-ust:= )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
+	radosgw? (
+		dev-libs/expat:=
+		openssl? (
+			dev-libs/openssl:=
+			net-misc/curl:=[curl_ssl_openssl]
+		)
+		libressl? (
+			dev-libs/libressl:=
+			net-misc/curl:=[curl_ssl_libressl]
+		)
+	)
+	ssl? (
+		openssl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-boost? ( =dev-libs/boost-1.72*[threads,context,python,${PYTHON_USEDEP}] )
+	xfs? ( sys-fs/xfsprogs:= )
+	zfs? ( sys-fs/zfs:= )
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	>=dev-util/cmake-3.5.0
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	dev-util/gperf
+	dev-util/ragel
+	dev-util/valgrind
+	sys-apps/coreutils
+	sys-apps/findutils
+	sys-apps/grep
+	sys-apps/sed
+	sys-apps/which
+	sys-devel/bc
+	sys-devel/patch
+	virtual/pkgconfig
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+"
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	net-misc/socat
+	sys-apps/gptfdisk
+	>=sys-apps/smartmontools-7.0
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lsscsi
+	sys-fs/lvm2[-device-mapper-only(-)]
+	virtual/awk
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	mgr? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		diskprediction? (
+			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
+		)
+		sci-libs/scikits_learn[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+# diskprediction needs older scipy not compatible with py38
+# bug #724438
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	?? ( jemalloc tcmalloc )
+	^^ ( openssl libressl )
+	diskprediction? ( mgr !python_targets_python3_8 )
+	kafka? ( radosgw )
+	mgr? ( cephfs )
+	rabbitmq? ( radosgw )
+"
+RESTRICT="!test? ( test )"
+
+# the tests need root access
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# create a non-debug release
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI=no
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-14.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-13.2.0-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
+	"${FILESDIR}/ceph-14.2.5-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
+	"${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
+	"${FILESDIR}/ceph-14.2.4-python-executable.patch"
+	"${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
+	"${FILESDIR}/ceph-14.2.10-missing-includes.patch"
+	"${FILESDIR}/ceph-14.2.10-python-warnings.patch"
+	"${FILESDIR}/ceph-14.2.10-build-without-mgr.patch"
+	"${FILESDIR}/ceph-14.2.11-systemd-unit-fix.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="5200M"
+	CHECKREQS_DISK_USR="510M"
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use system-boost; then
+		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
+			| xargs --null sed -r \
+			-e 's|Boost::|boost_|g' \
+			-e 's|Boost_|boost_|g' \
+			-e 's|[Bb]oost_boost|boost_system|g' -i || die
+	fi
+
+	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		src/bash_completion/CMakeLists.txt || die
+
+	if ! use diskprediction; then
+		rm -rf src/pybind/mgr/diskprediction_local || die
+	fi
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_CEPHFS_SHELL=$(usex cephfs)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_SPDK=$(usex spdk)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_GSSAPI=$(usex kerberos)
+		-DWITH_GRAFANA=$(usex grafana)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND=OFF
+		-DWITH_NUMA=$(usex numa)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PYTHON3=3
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
+		-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED="ON"
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_RDMA=OFF
+		-DWITH_TBB=OFF
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-Wno-dev
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	# needed for >=glibc-2.32
+	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON)
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
+		|| die "failed to remove cmake cache"
+
+	cmake_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 clean
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	cmake_build VERBOSE=1 all
+
+	# we have to do this here to prevent from building everything multiple times
+	python_copy_sources
+	python_foreach_impl python_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${ED}" emake VERBOSE=1 install
+	popd >/dev/null || die
+
+	python_optimize
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners -R ceph:ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+
+	fi
+
+	udev_dorules udev/*.rules
+	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
+
+	readme.gentoo_create_doc
+
+	python_setup
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
+
+	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${ED}}"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/ceph/ceph-15.2.5-r1.ebuild b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
new file mode 100644
index 000000000000..e86923bb2522
--- /dev/null
+++ b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
@@ -0,0 +1,407 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+CMAKE_MAKEFILE_GENERATOR=emake
+
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
+		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
+	kafka kerberos ldap libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw
+	rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+DEPEND="
+	acct-group/ceph
+	acct-user/ceph
+	virtual/libudev:=
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/zstd:=
+	app-shells/bash:0
+	app-misc/jq:=
+	dev-libs/crypto++:=
+	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
+	dev-libs/libaio:=
+	dev-libs/libfmt:=
+	dev-libs/libnl:3=
+	dev-libs/libxml2:=
+	dev-libs/xmlsec:=[!openssl?,!libressl?]
+	dev-cpp/yaml-cpp:=
+	dev-libs/nss:=
+	dev-libs/protobuf:=
+	net-dns/c-ares:=
+	net-libs/gnutls:=
+	sys-auth/oath-toolkit:=
+	sys-apps/coreutils
+	sys-apps/grep
+	sys-apps/hwloc:=
+	sys-apps/keyutils:=
+	sys-apps/util-linux:=
+	sys-apps/sed
+	sys-apps/util-linux
+	sys-libs/libcap-ng:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	sys-process/numactl:=
+	x11-libs/libpciaccess:=
+	babeltrace? ( dev-util/babeltrace )
+	fuse? ( sys-fs/fuse:0= )
+	jemalloc? ( dev-libs/jemalloc:= )
+	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
+	kafka? ( dev-libs/librdkafka:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap:= )
+	lttng? ( dev-util/lttng-ust:= )
+	rabbitmq? ( net-libs/rabbitmq-c:= )
+	radosgw? (
+		dev-libs/expat:=
+		openssl? (
+			dev-libs/openssl:=
+			net-misc/curl:=[curl_ssl_openssl]
+		)
+		libressl? (
+			dev-libs/libressl:=
+			net-misc/curl:=[curl_ssl_libressl]
+		)
+	)
+	ssl? (
+		openssl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-boost? ( =dev-libs/boost-1.72*[threads,context,python,${PYTHON_USEDEP}] )
+	uring? ( sys-libs/liburing:= )
+	xfs? ( sys-fs/xfsprogs:= )
+	zfs? ( sys-fs/zfs:= )
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	>=dev-util/cmake-3.5.0
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	dev-util/gperf
+	dev-util/ragel
+	dev-util/valgrind
+	sys-apps/coreutils
+	sys-apps/findutils
+	sys-apps/grep
+	sys-apps/sed
+	sys-apps/which
+	sys-devel/bc
+	sys-devel/patch
+	virtual/pkgconfig
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)
+"
+RDEPEND="${DEPEND}
+	app-admin/sudo
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-apps/nvme-cli
+	>=sys-apps/smartmontools-7.0
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lsscsi
+	sys-fs/lvm2[-device-mapper-only(-)]
+	virtual/awk
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	mgr? (
+		dev-python/jsonpatch[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/routes[${PYTHON_USEDEP}]
+		diskprediction? (
+			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
+		)
+		sci-libs/scikits_learn[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+# diskprediction needs older scipy not compatible with py38
+# bug #724438
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	?? ( jemalloc tcmalloc )
+	^^ ( openssl libressl )
+	diskprediction? ( mgr !python_targets_python3_8 )
+	kafka? ( radosgw )
+	mgr? ( cephfs )
+	rabbitmq? ( radosgw )
+"
+RESTRICT="!test? ( test )"
+
+# the tests need root access
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# create a non-debug release
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI=no
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-14.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-13.2.0-cflags.patch"
+	"${FILESDIR}/ceph-15.2.0-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
+	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
+	"${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch"
+	"${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
+	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
+	"${FILESDIR}/ceph-15.2.4-system-uring.patch"
+	"${FILESDIR}/ceph-15.2.5-missing-includes.patch"
+	"${FILESDIR}/ceph-15.2.5-systemd-unit-fix.patch"
+)
+
+check-reqs_export_vars() {
+	CHECKREQS_DISK_BUILD="5200M"
+	CHECKREQS_DISK_USR="510M"
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use system-boost; then
+		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
+			| xargs --null sed -r \
+			-e 's|Boost::|boost_|g' \
+			-e 's|Boost_|boost_|g' \
+			-e 's|[Bb]oost_boost|boost_system|g' -i || die
+	fi
+
+	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		src/bash_completion/CMakeLists.txt || die
+
+	if ! use diskprediction; then
+		rm -rf src/pybind/mgr/diskprediction_local || die
+	fi
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_BLUESTORE_PMEM=$(usex pmdk)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_CEPHFS_SHELL=$(usex cephfs)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_SPDK=$(usex spdk)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_GSSAPI=$(usex kerberos)
+		-DWITH_GRAFANA=$(usex grafana)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND=OFF
+		-DWITH_NUMA=$(usex numa)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PYTHON3=3
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
+		-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
+		-DWITH_RBD_RWL=$(usex rbd-rwl)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_LIBURING=$(usex uring)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED="ON"
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_RDMA=OFF
+		-DWITH_TBB=OFF
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-Wno-dev
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	# needed for >=glibc-2.32
+	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON)
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
+		|| die "failed to remove cmake cache"
+
+	cmake_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:-${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 clean
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	cmake_build VERBOSE=1 all
+
+	# we have to do this here to prevent from building everything multiple times
+	python_copy_sources
+	python_foreach_impl python_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${ED}" emake VERBOSE=1 install
+	popd >/dev/null || die
+
+	python_optimize
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_install
+
+	find "${ED}" -name '*.la' -type f -delete || die
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners -R ceph:ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+
+	fi
+
+	udev_dorules udev/*.rules
+	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
+
+	readme.gentoo_create_doc
+
+	python_setup
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
+
+	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${ED}}"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/ceph/ceph-15.2.5.ebuild b/sys-cluster/ceph/ceph-15.2.5.ebuild
deleted file mode 100644
index 942ffd88e776..000000000000
--- a/sys-cluster/ceph/ceph-15.2.5.ebuild
+++ /dev/null
@@ -1,405 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-CMAKE_MAKEFILE_GENERATOR=emake
-
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \
-		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
-	kafka kerberos ldap libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw
-	rbd-rwl +ssl spdk system-boost systemd +tcmalloc test uring xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-DEPEND="
-	acct-group/ceph
-	acct-user/ceph
-	virtual/libudev:=
-	app-arch/bzip2:=
-	app-arch/lz4:=
-	app-arch/snappy:=
-	app-arch/zstd:=
-	app-shells/bash:0
-	app-misc/jq:=
-	dev-libs/crypto++:=
-	dev-libs/leveldb:=[snappy,tcmalloc(-)?]
-	dev-libs/libaio:=
-	dev-libs/libfmt:=
-	dev-libs/libnl:3=
-	dev-libs/libxml2:=
-	dev-libs/xmlsec:=[!openssl?,!libressl?]
-	dev-cpp/yaml-cpp:=
-	dev-libs/nss:=
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	net-libs/gnutls:=
-	sys-auth/oath-toolkit:=
-	sys-apps/coreutils
-	sys-apps/grep
-	sys-apps/hwloc:=
-	sys-apps/keyutils:=
-	sys-apps/util-linux:=
-	sys-apps/sed
-	sys-apps/util-linux
-	sys-libs/libcap-ng:=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:=
-	sys-process/numactl:=
-	x11-libs/libpciaccess:=
-	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse:0= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	!jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
-	kafka? ( dev-libs/librdkafka:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	lttng? ( dev-util/lttng-ust:= )
-	rabbitmq? ( net-libs/rabbitmq-c:= )
-	radosgw? (
-		dev-libs/expat:=
-		openssl? (
-			dev-libs/openssl:=
-			net-misc/curl:=[curl_ssl_openssl]
-		)
-		libressl? (
-			dev-libs/libressl:=
-			net-misc/curl:=[curl_ssl_libressl]
-		)
-	)
-	ssl? (
-		openssl? ( dev-libs/openssl:= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	system-boost? ( =dev-libs/boost-1.72*[threads,context,python,${PYTHON_USEDEP}] )
-	uring? ( sys-libs/liburing:= )
-	xfs? ( sys-fs/xfsprogs:= )
-	zfs? ( sys-fs/zfs:= )
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	app-arch/cpio
-	>=dev-util/cmake-3.5.0
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/cunit
-	dev-util/gperf
-	dev-util/ragel
-	dev-util/valgrind
-	sys-apps/coreutils
-	sys-apps/findutils
-	sys-apps/grep
-	sys-apps/sed
-	sys-apps/which
-	sys-devel/bc
-	sys-devel/patch
-	virtual/pkgconfig
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)
-"
-RDEPEND="${DEPEND}
-	app-admin/sudo
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-apps/nvme-cli
-	>=sys-apps/smartmontools-7.0
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lsscsi
-	sys-fs/lvm2[-device-mapper-only(-)]
-	virtual/awk
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	mgr? (
-		dev-python/jsonpatch[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/routes[${PYTHON_USEDEP}]
-		diskprediction? (
-			$(python_gen_cond_dep '<dev-python/scipy-1.4.0[${PYTHON_USEDEP}]' python3_{6,7})
-		)
-		sci-libs/scikits_learn[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-# diskprediction needs older scipy not compatible with py38
-# bug #724438
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	?? ( jemalloc tcmalloc )
-	^^ ( openssl libressl )
-	diskprediction? ( mgr !python_targets_python3_8 )
-	kafka? ( radosgw )
-	mgr? ( cephfs )
-	rabbitmq? ( radosgw )
-"
-RESTRICT="!test? ( test )"
-
-# the tests need root access
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# create a non-debug release
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI=no
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-14.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-13.2.0-cflags.patch"
-	"${FILESDIR}/ceph-15.2.0-no-virtualenvs.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
-	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch"
-	"${FILESDIR}/ceph-15.2.2-systemd-unit.patch"
-	"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
-	"${FILESDIR}/ceph-15.2.4-system-uring.patch"
-	"${FILESDIR}/ceph-15.2.5-missing-includes.patch"
-)
-
-check-reqs_export_vars() {
-	CHECKREQS_DISK_BUILD="5200M"
-	CHECKREQS_DISK_USR="510M"
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use system-boost; then
-		find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
-			| xargs --null sed -r \
-			-e 's|Boost::|boost_|g' \
-			-e 's|Boost_|boost_|g' \
-			-e 's|[Bb]oost_boost|boost_system|g' -i || die
-	fi
-
-	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		src/bash_completion/CMakeLists.txt || die
-
-	if ! use diskprediction; then
-		rm -rf src/pybind/mgr/diskprediction_local || die
-	fi
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_BLUESTORE_PMEM=$(usex pmdk)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_CEPHFS_SHELL=$(usex cephfs)
-		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_SPDK=$(usex spdk)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_GSSAPI=$(usex kerberos)
-		-DWITH_GRAFANA=$(usex grafana)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND=OFF
-		-DWITH_NUMA=$(usex numa)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PYTHON3=3
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
-		-DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
-		-DWITH_RBD_RWL=$(usex rbd-rwl)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_LIBURING=$(usex uring)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED="ON"
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=OFF
-		-DWITH_TBB=OFF
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-Wno-dev
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	# needed for >=glibc-2.32
-	has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON)
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
-		|| die "failed to remove cmake cache"
-
-	cmake_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 clean
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake_build VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${ED}" emake VERBOSE=1 install
-	popd >/dev/null || die
-
-	python_optimize
-}
-
-src_install() {
-	cmake_src_install
-	python_foreach_impl python_install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-
-	fi
-
-	udev_dorules udev/*.rules
-	newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
-
-	readme.gentoo_create_doc
-
-	python_setup
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
-	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
-		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
-
-	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
-	dostrip -x "${rados_classes[@]#${ED}}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch b/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch
new file mode 100644
index 000000000000..7309fea029e1
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch
@@ -0,0 +1,27 @@
+From bd8b8540f6b67a25585ca9cf140d6de760bc2a43 Mon Sep 17 00:00:00 2001
+From: Jan Fajerski <jfajerski@suse.com>
+Date: Fri, 12 Jun 2020 09:27:36 +0200
+Subject: [PATCH] systemd/ceph-osd: ceph-osd-prestart.sh now lives in
+ /usr/libexec
+
+Fixes: https://tracker.ceph.com/issues/45984
+Fixes: ed6552d5067c9f1d34c426f9ae18b0c37f2a9d29
+
+Signed-off-by: Jan Fajerski <jfajerski@suse.com>
+---
+ systemd/ceph-osd@.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in
+index a0067d347220..4a2254e99478 100644
+--- a/systemd/ceph-osd@.service.in
++++ b/systemd/ceph-osd@.service.in
+@@ -9,7 +9,7 @@ Environment=CLUSTER=ceph
+ EnvironmentFile=-@SYSTEMD_ENV_FILE@
+ Environment=CLUSTER=ceph
+ ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
+-ExecStartPre=/usr/lib/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
++ExecStartPre=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
+ ExecReload=/bin/kill -HUP $MAINPID
+ LockPersonality=true
+ MemoryDenyWriteExecute=true
diff --git a/sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch b/sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch
new file mode 100644
index 000000000000..a127ada181f2
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch
@@ -0,0 +1,27 @@
+From bd8b8540f6b67a25585ca9cf140d6de760bc2a43 Mon Sep 17 00:00:00 2001
+From: Jan Fajerski <jfajerski@suse.com>
+Date: Fri, 12 Jun 2020 09:27:36 +0200
+Subject: [PATCH] systemd/ceph-osd: ceph-osd-prestart.sh now lives in
+ /usr/libexec
+
+Fixes: https://tracker.ceph.com/issues/45984
+Fixes: ed6552d5067c9f1d34c426f9ae18b0c37f2a9d29
+
+Signed-off-by: Jan Fajerski <jfajerski@suse.com>
+---
+ systemd/ceph-osd@.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in
+index a0067d347220..4a2254e99478 100644
+--- a/systemd/ceph-osd@.service.in
++++ b/systemd/ceph-osd@.service.in
+@@ -9,7 +9,7 @@ Environment=CLUSTER=ceph
+ EnvironmentFile=-@SYSTEMD_ENV_FILE@
+ Environment=CLUSTER=ceph
+ ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
+-ExecStartPre=/usr/libexec/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
++ExecStartPre=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
+ ExecReload=/bin/kill -HUP $MAINPID
+ LockPersonality=true
+ MemoryDenyWriteExecute=true
diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index 1b1f3a1bef12..6db44ba6baf9 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -5,4 +5,5 @@ AUX gmond.rc 346 BLAKE2B 8930fe96692c100de0feed00fbe1d5f39c3d6f9679f88ef0326b1c6
 AUX gmond.rc-2 473 BLAKE2B 461d0b481f2138dcab8f7202a880354740b71f91e41ad2152a3465daf8072e6243fcc5f27ee215aa079dad30546e06146c01be71e85f518974cd9c479549ff34 SHA512 bbb5e3c525137aa2072bd46d28473523498895eba70c8dad1209230ea5e7f44ddc09875b5b6065fd5351d89ed0ad574a94fe0debcbe1d3a51e2541715adb4240
 DIST ganglia-3.7.1.tar.gz 1311019 BLAKE2B c70ee163d27af747a0961e6e8115f23512c64e28270f4224121e834c5bb66af27536821d4f9a8d6cc9a8e290d9cd3fcdb01fed7d054ce55d12cb80dd41d9f63d SHA512 1c3519cec0015cc967536a8c72cedd1b1bc268e0e238538756b1f46fd741b56ebaacc6f518c57eb111c30fd2e56372cba4593e4487c9ed68472aa59d24ce66a8
 EBUILD ganglia-3.7.1-r1.ebuild 2880 BLAKE2B f69aa3c615e40bcd3237aef252d210f86f2e009b8f313462dec60ad41564d02e27d600bbc62c9bc468da981f7f2323ea69bdd8e208d4d207e5ddd11758261e55 SHA512 7a4e354876cef93706062c3040bec203a3549d44b26ae0f2d04cbaa2b145647470d731b47ba1d3ca07d2aed4650fd2ac029fafebfae3df484865a2c12dba3323
+EBUILD ganglia-3.7.1-r2.ebuild 3101 BLAKE2B a998a1e59c6e8817c71b1f8e9ac866959f42940e65dd76876ad585a9e461698c046497fa1fedef461ed52a8e69eec9771e0656eb4186513a26f67627055533f2 SHA512 3c461886d2dd6ecd71824965f4b5d79c8d379befc1a20922ace3a81197b840da4ebe67a904a1d397677a9bb4bb1dad499ee56ac2138aacb4432d3233b2e30dae
 MISC metadata.xml 334 BLAKE2B 59027b7d3fbc47f52e3b17ca0e04d3ace7283f7fcdf5ab6328c652fd1a52a32b10a19017794e31e6fdafec51901758e312a0761025edf6aa610629d5099fbf36 SHA512 9b58ae22b5ef2ebe1d7b247b179273a68033ccbc01c78969a2ec10a2a3932432ea4328b91e192b30dcef84381313fff1d26fc0e4d7e4cf70f0a36aa9c3cd8a63
diff --git a/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild b/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild
new file mode 100644
index 000000000000..a5c08bf4977f
--- /dev/null
+++ b/sys-cluster/ganglia/ganglia-3.7.1-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="A scalable distributed monitoring system for clusters and grids"
+HOMEPAGE="http://ganglia.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ganglia/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="minimal pcre python examples"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="dev-libs/confuse
+	dev-libs/expat
+	>=dev-libs/apr-1.0
+	net-libs/libnsl:0=
+	net-libs/libtirpc:0=
+	!dev-db/firebird
+	pcre? ( dev-libs/libpcre )
+	python? ( ${PYTHON_DEPS} )"
+
+RDEPEND="
+	${DEPEND}
+	!minimal? ( net-analyzer/rrdtool )"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	if use python && ! use minimal; then
+		pushd gmetad-python >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	else
+		default_src_prepare
+	fi
+}
+
+src_configure() {
+	if use python; then
+		python_setup
+	fi
+
+	append-flags $("$(tc-getPKG_CONFIG)" --cflags libtirpc)
+	append-libs $("$(tc-getPKG_CONFIG)" --libs libtirpc)
+
+	econf \
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
+		--enable-gexec \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--enable-static=no \
+		$(use_enable python) \
+		$(use_with pcre libpcre) \
+		$(use_with !minimal gmetad)
+}
+
+src_compile() {
+	default_src_compile
+
+	if use python && ! use minimal; then
+		pushd gmetad-python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	local exdir=/usr/share/doc/${P}
+
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/gmond.rc-2 gmond
+	doman {mans/*.1,gmond/*.5}
+	dodoc AUTHORS INSTALL NEWS README
+
+	dodir /etc/ganglia/conf.d
+	use python && dodir /usr/$(get_libdir)/ganglia/python_modules
+	gmond/gmond -t > "${ED}"/etc/ganglia/gmond.conf
+
+	if use examples; then
+		insinto ${exdir}/cmod-examples
+		doins gmond/modules/example/*.c
+		if use python; then
+			# Installing as an examples per upstream.
+			insinto ${exdir}/pymod-examples
+			doins gmond/python_modules/*/*.py
+			insinto ${exdir}/pymod-examples/conf.d
+			doins gmond/python_modules/conf.d/*.pyconf
+		fi
+	fi
+
+	if ! use minimal; then
+		insinto /etc/ganglia
+		doins gmetad/gmetad.conf
+		doman mans/gmetad.1
+
+		newinitd "${FILESDIR}"/gmetad.rc-2 gmetad
+		keepdir /var/lib/ganglia/rrds
+		fowners nobody:nobody /var/lib/ganglia/rrds
+
+		if use python; then
+			pushd gmetad-python >/dev/null || die
+			distutils-r1_src_install
+			popd >/dev/null || die
+			newinitd "${FILESDIR}"/gmetad-python.rc gmetad-python
+		fi
+	fi
+}
+
+src_test() {
+	default_src_test
+
+	if use python && ! use minimal; then
+		pushd gmetad-python >/dev/null || die
+		distutils-r1_src_test
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	elog "A default configuration file for gmond has been generated"
+	elog "for you as a template by running:"
+	elog "    /usr/sbin/gmond -t > /etc/ganglia/gmond.conf"
+
+	elog "The web frontend for Ganglia has been split off.  Emerge"
+	elog "sys-cluster/ganglia-web if you need it."
+}
diff --git a/sys-cluster/kubeletctl/Manifest b/sys-cluster/kubeletctl/Manifest
index 2112869381d7..00e284c52fc1 100644
--- a/sys-cluster/kubeletctl/Manifest
+++ b/sys-cluster/kubeletctl/Manifest
@@ -366,8 +366,8 @@ DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200401025727-01dfbe2eec3d.mod 1556 BL
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20191010214722-8d271d903fe4.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip 147166 BLAKE2B a9d5897231997c8184aba7c58d6b31fa8413d7c94e48f52fb59f171f537d0e9a047055a5e717e411c7f0dbc63bf1794c2a425c278724eeb73de59e7bbd8d2ee0 SHA512 49641d1a253a5469d9dec1e104b5ecbd7033e28f8ab08c351edea432687fb1bf902d9fbf3ea2ef217b82ab06ca3f2453a1dccf03468d38281c847e19477641df
-DIST kubeletctl-1.2.tar.gz 45962 BLAKE2B 493d7c239ccd1b8d00867de7ea33aade12008410f32dee43924d9be53e5fb39aad4520c7fdee0680e1190004b6278719dba855df2697cf78962dbad1faf7f903 SHA512 73aff2fdbd340b4d9670adcfcbce7fbc4b76cce995e061751d2d171a42216ebbb98aebd177e7c2498901deec83eaec97676c5802cdcf4dbfd5969964b4c54079
 DIST kubeletctl-1.5.tar.gz 46800 BLAKE2B 6a61889b228d6c0119cab719a3c085aa49871b1d9027bb9d19b1a83780b186dfcffce4f9e5d6117d91b1044a798151ea70e42dcea5f1c8f46874e931cc8cf87f SHA512 571a898ef5d01f797c5fd6f8be389433756a107209bbac80b2066c192c6645e02fe40fb14b533c2c2b308b49d0033641295b43b36f4100283b622b0e2de711bf
+DIST kubeletctl-1.6.tar.gz 47987 BLAKE2B f69bf6e1e53a62f0a2f2edfd3a4ee2ec040349136f08077837050bed03de9b6cfc6019cac844227125b979b94976b5336eac5ce42f385c3f60be6b2265e57361 SHA512 2701d66980284cf153fe8305cb812a6bb2af550e7c7ee6aa37187a3b9d5d6ae78e4a9c7a46ae3db05b1e4d863f87f48a60091d18c35e46ce71354e894bc6922a
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.zip 113591 BLAKE2B 48dc385dfb491334ddc6da2544979d139421be19fe2398ac9ca9fd9488f820da66fe9c22dd8fb7f1995b431bd17d963aaa304937e605c667c63361150feea5ed SHA512 9d61710361110d7739e705b05320a3cef7c7caf6cee358c01e695e66eaf8c5bd144fecf34142f24065c3a87eeef51fd75bcb24644f4e082fbdbca81e211d497e
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
@@ -376,6 +376,6 @@ DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip 215199 BLAKE2B 1
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
-EBUILD kubeletctl-1.2.ebuild 20610 BLAKE2B aea1e5ec4095553fcb4001f0600a7a43f1f7936963fbcecdd2ec54441bfa4a130dc15d9a19726f4bc3c060525a4a2b4a05eae220345371e057f02a7cb0e99017 SHA512 48e65636337cabf653a98932d4e2d7e5a486ce5392b3a72dbc13c7cead198d46aed9d38b636b7f778597fcc966275424b01279ca6c8f1f7df7af593fd8029555
 EBUILD kubeletctl-1.5.ebuild 20861 BLAKE2B 300d14cffc5ec1b0608ae23f8ab2ca2e051abc0e7dd53a617d1f3a269343d51026bd8800af5efed61f14e925b369b5128d054541d259d7d13a1e18e403316098 SHA512 102528214f5303ff2a02c60f0d3b6122b4d97cd7743f22139792bc414f2a03f74b97f829d2cbb4c59f0ece9e5b6b038f471e2ca033f3d9fa42d9be1f10aec93c
+EBUILD kubeletctl-1.6.ebuild 20861 BLAKE2B 1978636a21afb4ee249794b45dc5c9b0a2142a71a865c0af1535333bc8922a578bde813d73b576a0f3661327630984136fc71a12e0c0b57c178b07b3609e36cb SHA512 5a77c4beed483fc04dcc162d4a8e2faca368e86f9dcb9819a8e50283a9966c4e91096d22faba78f5bae97300c41cca54e5086816501bbf8a4ab8cab6b348ae84
 MISC metadata.xml 328 BLAKE2B add7a675235bd67e861cecc2be7f95cb770968659097ca62dfeb4c294b6ac0bd88e0fa9ffdbb714c7e07c3fac70f42cdd0c9ce4b8c14ec88c96aa17881fa981d SHA512 931d8a196d5df07479d40717f3c07e8c5807d4e1cfdd423a5e7f2f5ef7ba7538f7e03fc24055333036aa031630e70ae4ffe31bbdb765f8e43eb0702c21420015
diff --git a/sys-cluster/kubeletctl/kubeletctl-1.2.ebuild b/sys-cluster/kubeletctl/kubeletctl-1.2.ebuild
deleted file mode 100644
index 7dee3d46f3a3..000000000000
--- a/sys-cluster/kubeletctl/kubeletctl-1.2.ebuild
+++ /dev/null
@@ -1,401 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-GIT_COMMIT=f6f50c6111b26072a76e8beb87566ff36c6a48b9
-
-DESCRIPTION="A client for kubelet"
-HOMEPAGE="https://github.com/cyberark/kubeletctl"
-
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.6/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
-	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a"
-	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0/go.mod"
-	"github.com/buger/jsonparser v0.0.0-20191004114745-ee4c978eae7e/go.mod"
-	"github.com/buger/jsonparser v0.0.0-20200322175846-f7e751efca13"
-	"github.com/buger/jsonparser v0.0.0-20200322175846-f7e751efca13/go.mod"
-	"github.com/c-bata/go-prompt v0.2.3"
-	"github.com/c-bata/go-prompt v0.2.3/go.mod"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/coreos/bbolt v1.3.2/go.mod"
-	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-	"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
-	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
-	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-logr/logr v0.1.0/go.mod"
-	"github.com/go-openapi/errors v0.19.2"
-	"github.com/go-openapi/errors v0.19.2/go.mod"
-	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-	"github.com/go-openapi/strfmt v0.19.3/go.mod"
-	"github.com/go-openapi/strfmt v0.19.5"
-	"github.com/go-openapi/strfmt v0.19.5/go.mod"
-	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-	"github.com/go-stack/stack v1.8.0"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
-	"github.com/gogo/protobuf v1.3.1"
-	"github.com/gogo/protobuf v1.3.1/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.3.3"
-	"github.com/golang/protobuf v1.3.3/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.4.0"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/gofuzz v1.1.0"
-	"github.com/google/gofuzz v1.1.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/uuid v1.1.1"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-	"github.com/googleapis/gnostic v0.4.1"
-	"github.com/googleapis/gnostic v0.4.1/go.mod"
-	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-	"github.com/gorilla/websocket v1.4.0/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/imdario/mergo v0.3.5"
-	"github.com/imdario/mergo v0.3.5/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/jedib0t/go-pretty v4.3.0+incompatible"
-	"github.com/jedib0t/go-pretty v4.3.0+incompatible/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/json-iterator/go v1.1.8"
-	"github.com/json-iterator/go v1.1.8/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pretty v0.2.0"
-	"github.com/kr/pretty v0.2.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/magiconair/properties v1.8.0/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-colorable v0.1.6"
-	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.10/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.5/go.mod"
-	"github.com/mattn/go-runewidth v0.0.6/go.mod"
-	"github.com/mattn/go-runewidth v0.0.9"
-	"github.com/mattn/go-runewidth v0.0.9/go.mod"
-	"github.com/mattn/go-tty v0.0.3"
-	"github.com/mattn/go-tty v0.0.3/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-	"github.com/oklog/ulid v1.3.1/go.mod"
-	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.10.1/go.mod"
-	"github.com/onsi/ginkgo v1.11.0/go.mod"
-	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v1.7.0/go.mod"
-	"github.com/pelletier/go-toml v1.2.0/go.mod"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/term v0.0.0-20190109203006-aa71e9d9e942"
-	"github.com/pkg/term v0.0.0-20190109203006-aa71e9d9e942/go.mod"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-	"github.com/prometheus/common v0.4.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-	"github.com/prometheus/tsdb v0.7.1/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/russross/blackfriday v1.5.2/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-	"github.com/spf13/afero v1.1.2/go.mod"
-	"github.com/spf13/afero v1.2.2/go.mod"
-	"github.com/spf13/cast v1.3.0/go.mod"
-	"github.com/spf13/cobra v0.0.5/go.mod"
-	"github.com/spf13/cobra v0.0.7"
-	"github.com/spf13/cobra v0.0.7/go.mod"
-	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spf13/viper v1.3.2/go.mod"
-	"github.com/spf13/viper v1.4.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/objx v0.2.0/go.mod"
-	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/tidwall/pretty v1.0.0/go.mod"
-	"github.com/tidwall/pretty v1.0.1"
-	"github.com/tidwall/pretty v1.0.1/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-	"github.com/ugorji/go v1.1.4/go.mod"
-	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
-	"go.etcd.io/bbolt v1.3.2/go.mod"
-	"go.mongodb.org/mongo-driver v1.0.3"
-	"go.mongodb.org/mongo-driver v1.0.3/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.uber.org/atomic v1.4.0/go.mod"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/zap v1.10.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
-	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
-	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
-	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
-	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e"
-	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
-	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
-	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/appengine v1.5.0"
-	"google.golang.org/appengine v1.5.0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.21.0/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/inf.v0 v0.9.0/go.mod"
-	"gopkg.in/inf.v0 v0.9.1"
-	"gopkg.in/inf.v0 v0.9.1/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"k8s.io/api v0.0.0-20191025225708-5524a3672fbb/go.mod"
-	"k8s.io/api v0.0.0-20200403220253-fa879b399cd0"
-	"k8s.io/api v0.0.0-20200403220253-fa879b399cd0/go.mod"
-	"k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843/go.mod"
-	"k8s.io/apimachinery v0.0.0-20200403220105-fa0d5bf06730"
-	"k8s.io/apimachinery v0.0.0-20200403220105-fa0d5bf06730/go.mod"
-	"k8s.io/client-go v0.0.0-20191026065934-0bdba2f91880/go.mod"
-	"k8s.io/client-go v0.0.0-20200404181738-fe32aa3b9449"
-	"k8s.io/client-go v0.0.0-20200404181738-fe32aa3b9449/go.mod"
-	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-	"k8s.io/klog v0.3.0/go.mod"
-	"k8s.io/klog v1.0.0"
-	"k8s.io/klog v1.0.0/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20200401025727-01dfbe2eec3d/go.mod"
-	"k8s.io/utils v0.0.0-20191010214722-8d271d903fe4/go.mod"
-	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
-	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
-	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e"
-	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
-	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
-	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	"sigs.k8s.io/yaml v1.2.0"
-	"sigs.k8s.io/yaml v1.2.0/go.mod"
-)
-go-module_set_globals
-SRC_URI="https://github.com/cyberark/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT+=" test"
-
-src_compile() {
-	go build -ldflags "-s -w" || die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README.md
-}
diff --git a/sys-cluster/kubeletctl/kubeletctl-1.6.ebuild b/sys-cluster/kubeletctl/kubeletctl-1.6.ebuild
new file mode 100644
index 000000000000..08aa63fba2b4
--- /dev/null
+++ b/sys-cluster/kubeletctl/kubeletctl-1.6.ebuild
@@ -0,0 +1,407 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+GIT_COMMIT=27d895fb207c9367a2d516f739578bbcb5db0368
+
+DESCRIPTION="A client for kubelet"
+HOMEPAGE="https://github.com/cyberark/kubeletctl"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.6/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a"
+	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/buger/jsonparser v0.0.0-20191004114745-ee4c978eae7e/go.mod"
+	"github.com/buger/jsonparser v0.0.0-20200322175846-f7e751efca13"
+	"github.com/buger/jsonparser v0.0.0-20200322175846-f7e751efca13/go.mod"
+	"github.com/c-bata/go-prompt v0.2.3"
+	"github.com/c-bata/go-prompt v0.2.3/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-openapi/errors v0.19.2"
+	"github.com/go-openapi/errors v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/strfmt v0.19.3/go.mod"
+	"github.com/go-openapi/strfmt v0.19.5"
+	"github.com/go-openapi/strfmt v0.19.5/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-stack/stack v1.8.0"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/googleapis/gnostic v0.4.1"
+	"github.com/googleapis/gnostic v0.4.1/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/hashicorp/go-version v1.0.0"
+	"github.com/hashicorp/go-version v1.0.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/imdario/mergo v0.3.5"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jedib0t/go-pretty v4.3.0+incompatible"
+	"github.com/jedib0t/go-pretty v4.3.0+incompatible/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.8"
+	"github.com/json-iterator/go v1.1.8/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-colorable v0.1.6"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.10/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.5/go.mod"
+	"github.com/mattn/go-runewidth v0.0.6/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mattn/go-tty v0.0.3"
+	"github.com/mattn/go-tty v0.0.3/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/gox v1.0.1"
+	"github.com/mitchellh/gox v1.0.1/go.mod"
+	"github.com/mitchellh/iochan v1.0.0"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/term v0.0.0-20190109203006-aa71e9d9e942"
+	"github.com/pkg/term v0.0.0-20190109203006-aa71e9d9e942/go.mod"
+	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/cobra v0.0.7"
+	"github.com/spf13/cobra v0.0.7/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/tidwall/pretty v1.0.0/go.mod"
+	"github.com/tidwall/pretty v1.0.1"
+	"github.com/tidwall/pretty v1.0.1/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.mongodb.org/mongo-driver v1.0.3"
+	"go.mongodb.org/mongo-driver v1.0.3/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/inf.v0 v0.9.0/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"k8s.io/api v0.0.0-20191025225708-5524a3672fbb/go.mod"
+	"k8s.io/api v0.0.0-20200403220253-fa879b399cd0"
+	"k8s.io/api v0.0.0-20200403220253-fa879b399cd0/go.mod"
+	"k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843/go.mod"
+	"k8s.io/apimachinery v0.0.0-20200403220105-fa0d5bf06730"
+	"k8s.io/apimachinery v0.0.0-20200403220105-fa0d5bf06730/go.mod"
+	"k8s.io/client-go v0.0.0-20191026065934-0bdba2f91880/go.mod"
+	"k8s.io/client-go v0.0.0-20200404181738-fe32aa3b9449"
+	"k8s.io/client-go v0.0.0-20200404181738-fe32aa3b9449/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.0/go.mod"
+	"k8s.io/klog v1.0.0"
+	"k8s.io/klog v1.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20200401025727-01dfbe2eec3d/go.mod"
+	"k8s.io/utils v0.0.0-20191010214722-8d271d903fe4/go.mod"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.2.0"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/cyberark/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT+=" test"
+
+src_compile() {
+	go build -ldflags "-s -w" || die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README.md
+}
diff --git a/sys-cluster/libqb/Manifest b/sys-cluster/libqb/Manifest
index 4d3c8991c35b..6a937f20d79d 100644
--- a/sys-cluster/libqb/Manifest
+++ b/sys-cluster/libqb/Manifest
@@ -1,9 +1,7 @@
 DIST libqb-0.17.2.tar.xz 373540 BLAKE2B b9d751fca21cc25798a24207740b14722502cbb918cc652cd33b0159a9bd1254a8a64bc73684ae3274a2cf346db5b19924cf010ba487f4c6a9a5f9deade792c4 SHA512 9c6dce7d18aa4da31594faecd0ea2737c2beefa749290094f733fe89ac40f094ec6409f310c534b8144d500e8c204c328386eaf1029995698d7019c014433443
-DIST libqb-1.0.1.tar.xz 438204 BLAKE2B be4d4dbe624721a6434f7e3023bcaef017e1358f67fa308e4107bd96469675eca51b5787f498857d22104e3ffa55ded9c44fe320c37fec639a84648c1f517223 SHA512 9afdf5b7064f4e79f70e3c21d1ae954d1444d202d5903bd84866e502b2afc218d4a84fd21fab637a198357e1dad5da94814a6c0bdaa0ba6ac4a24ff40422c185
 DIST libqb-1.0.5.tar.xz 488516 BLAKE2B 96f61ce681d0c259e8df38f35c04349ab3b1199f62c2311d60c6f229bf15e8f62825c965a4847cbda4701119fc7ae3c68cc3a7187f927f8ddf7496cf1931c7c2 SHA512 a695bc4c913a32d47535cb2d8812f14a39732cae32651521a8f7b6d05c4202bfc28a477c88875bbfbe1a0238cd33f1fe64f2d2217b0c27cf11acf7233fc2cbdf
 DIST libqb-1.9.0.tar.gz 225147 BLAKE2B d8200d5eec8c05a18675de585e2f85694d3d062d82afca38c421859e3e0287d1691fe9726a75d3726afc58a94765f6a201f8fb51bf1ed25c1cfeaeb326e6f6d0 SHA512 9bdf2087f610a7a02b976312d60391e1c53ebd3f36a897cdc3fcf818f666f772d63386b52bd11ed4e5ea52fa4775231ab7125359a270451f925b3821d9b8e3ee
 EBUILD libqb-0.17.2.ebuild 1155 BLAKE2B 3028a41671305e4202f7535905fb0d9636659456c254a7817d26ed8f1c77210d0bf551bd86a748e5ef114055a0ca2964155bb26f119a8af5c10b1cd71addf2f1 SHA512 89420a61581c365561d5cb25601efd84c0ef331e4b8666a80e64fc4d83b106e6518ae11d98079b5a37a8e63303e11186522fa45448c4751da7f4e7e95826270c
-EBUILD libqb-1.0.1.ebuild 1167 BLAKE2B cb36195482930926022160f4fcc37636f83726daee2a56f382370341e2b9a4729e875929a1f0a014b6d46511d920727b9c72b4ca838c4bca3bb70cb70d9f0ad0 SHA512 f6fa8cd1e1d2513827bacb46898596072bc3b5c2b9369b3ed29164585a83e4051aaa82e5d691f346d7c39ba3c63bac23c36dccbcd171d725c656b6bbd55a8dc1
 EBUILD libqb-1.0.5.ebuild 1004 BLAKE2B 8aeaecd43035bd49dc1ba587aa435fc295aa5bf59826bbb72d9c922f9b822f89c8dc046add84fd92639aa11ee88543eb6c4bdbd274def5e0461943c6fed141a7 SHA512 6101d690fd176d773a21e7b357ca9be5100a028b46736db385c22f5342a0a8f4f0b250cc9182f2b31460dd0f4cbfc211fd4cee6f181edcac0ec1b57e5ef18399
 EBUILD libqb-1.9.0.ebuild 1327 BLAKE2B b30e6331dcd0ef80cf3a9efec3558aad480f5322309fda3a553959feab5ddbe935524d19abca21967ce5913ce519529b70516c82eb4f7094ce215a07739b8f87 SHA512 9c27bac33da686b983ffba46016858509f25346b4b1c8d1464d21538f612b558654cc9d88b3099154a20e60d9418b9fb94ef7a9e37f3dfb71219873d15407ce4
 MISC metadata.xml 339 BLAKE2B c62f10b2ef4d7efe87b20e68a511c136192cdf33cddb9dee961099a44c26179f78ccd2804dacc21f6e72c2a5266f2274b332f656c3e5a1ad4f0fdad7ad33a0ab SHA512 39cccac769c39f6b8f90500c1b8f21e6ab65429ec1d992e7aa0025bc161d1ceffa28796accba321af01b75671c11ae6cacb4c8b4ab5ef14dbc8ef103dfc9f0b3
diff --git a/sys-cluster/libqb/libqb-1.0.1.ebuild b/sys-cluster/libqb/libqb-1.0.1.ebuild
deleted file mode 100644
index 55a12354c876..000000000000
--- a/sys-cluster/libqb/libqb-1.0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="Library providing high performance logging, tracing, ipc, and poll"
-HOMEPAGE="https://github.com/ClusterLabs/libqb"
-SRC_URI="https://github.com/ClusterLabs/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="debug doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	test? ( dev-libs/check )
-	doc? ( app-doc/doxygen[dot] )"
-
-DOCS=(README.markdown ChangeLog)
-
-src_prepare() {
-	sed -e '/dist_doc_DATA/d' -i Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxygen
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/docs/html/")
-	autotools-utils_src_install
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-}
diff --git a/sys-cluster/libquo/Manifest b/sys-cluster/libquo/Manifest
index 6a60e86e8890..7b567736a558 100644
--- a/sys-cluster/libquo/Manifest
+++ b/sys-cluster/libquo/Manifest
@@ -1,12 +1,4 @@
-DIST libquo-1.2.2.tar.gz 711528 BLAKE2B 6ea51c56a40f31f27b260263825d62d9ee2812b9f800cbb3df1e863771315544ea4bb29c6d5df91263a386d53dd47917a8afe36d08a3803af5bb5817e1faf081 SHA512 1aad84e65ba9167656ba6ffd53859816ea396239781b51846992766be7d01e33af732ac9c2ddda5839ec518bf304b4882a73f884c714c6e8eb9dc6884a9a6b11
-DIST libquo-1.2.3.tar.gz 727836 BLAKE2B e502f0d1fd6a202b8c065bd0edc2eb2f7911ab2528985a682598e97377537c42067ff4d42d3ee44785264edd517433dd79fbe64d0426b7535b44cab72be06c72 SHA512 d937253f1444723631439a78e5533d9ce4c8772f04f7c3475fe48c63d0dd827d5d73c4a925efec614a36d1c9680e9d93d53617ac12c00fce65b922fa69cd8c5b
-DIST libquo-1.2.4.tar.gz 714871 BLAKE2B 34ffedc654215c99e1de7a3bb2d019eae721e791c8cbfac328639581dbd5dfd6cc743569b6c0559a4b27c7475e42f07529b70dc312d66ed1a42b40be9f04db23 SHA512 a8b6ab6bcaab3f22cc707ee85ea41c8b8f345bf11319a12bc1e4bceed15577f339b7c797ecee4301d0ba8b8c5ebb7af5961d19982261e41192c3fc777cbfecfe
 DIST libquo-1.2.9.tar.gz 788507 BLAKE2B c6240ea265dfc34fd02b04f5ff9dcfa194c82789d3caa9553eb65ad25e9e883dfd320d4b095693b88778e74cbd11c207bcc9c5c133f03ec5a25e7c633853cd0d SHA512 732a737b9d53ca7b530ae5ecfd79cc9200f86e6a39f4c529975b204631165a178f6bb87228985222bf623f2581ecc29c774e8480ce9ebfcace12e14c49f98e62
-DIST libquo-1.2.tar.gz 710465 BLAKE2B 7e99bf206fa9b5ec1a8497df04bae174db155550d28ff38a770148fc4b2214fc69cddcbf70dbb0e8b4d3acb957023e6ae073da529a41e19cd435229593649ae0 SHA512 c9c087490c01af51f47490635dbf42d5433719931afbaa89dfe91bfe812e09e468649cf5a7703b6c3d5b0c0d6d6318731dcff4928a52017505f814750131c75b
-EBUILD libquo-1.2.2.ebuild 590 BLAKE2B 3368569bc1782f1e99ff8f34172936e96d42104ab13f8bf1aca98fdce3d14f05c9982b2e1744ecafb4e469a6ec7e939849aacb03b190da5fd842b73d6861b08f SHA512 94d9599f247443e5a797fcf2f5fce182f58683e5e57a0c46fc50d5c40490412d1071856545e49c6e35ff4d6dd76c96cb65a03794c82eb691fbdecf7bfdf0f707
-EBUILD libquo-1.2.3.ebuild 718 BLAKE2B 615c080225c7be97953292d8f01a6fbbd5d504d3a1f0742b0d3389130c0ef8069c27325deba8b79d034088605b400836ecf1a4f45568c976aadb027293409109 SHA512 19ea79f999461ea43bf157347b67c58447e2607f8ea623b68eaee1f0b99c696a1d3ff7e89fac7ee7c300290d276648af9e9d52ac5cd0c31a14edbd15348c0c9a
-EBUILD libquo-1.2.4-r1.ebuild 772 BLAKE2B 2958aa5a0f725bd45e63d66bda3f2fe421f245a10bcf64cc19387bc1714093357cf5dfdf3008ba228bab1977bb68f50ff9cd9ad9b3b2281b96325db8ca4352ad SHA512 7acd8fd96314780820aa4599b33a0d0c1d4d9d991d26e0d9bd1a3cfe487965c07e1b40f730ddaeceae73fb51ea93b9f438278d0d9bf52f0dfb3891887e4b1988
 EBUILD libquo-1.2.9.ebuild 761 BLAKE2B d5f80533cb11c1b59de5f3ce6ed283f70b9d4dac57a3621771b7f0f243c3b784382789c428a39965f4fe281ffd4fffbdcf17711dd9ac3b7bc93fd89e3daa4be4 SHA512 a5a4cf054fe2cfe205f27b05f46e65ca013e43f41d989a8396d6b4e11af3d6a34b6cd16b8fec34a0f147cb167643892c7c6cc0dc1220f0580860ecbb7b6fdbeb
-EBUILD libquo-1.2.ebuild 541 BLAKE2B 5c01008de8ad6fe491d952309a3b637cf15f0875b6a21f9af78e9b9d3cd714f766d51d05560ec535ebbd95abcfba7ecbf495eda5a0d12c1d55068a9c7c8a6f77 SHA512 179d109864de8811d2c065bdd430ee4c1a86f32f4e281ed1e1b80984de5e0cd0a584df6bd1a9e192e8d4e18539b812976f179cb2d9af564af360ef43dc2deb01
 EBUILD libquo-9999.ebuild 810 BLAKE2B 9a29313bcff0e3386d87ec4a2305cb131785ee33e61ed41a041ceb28c12d79589b5c8fac7dece8372cf28560ba9d7689b088472921b9b67bea9b31e8f77007c8 SHA512 4aa475245362096d9229d32767460cdae0c899de6c431d3d8c328c7fd3b7f2822ec65d8c38eeb769b08696b4b03badc2eaea15713b1a7aa40666926b65e38db4
 MISC metadata.xml 443 BLAKE2B 0473c666449ae5b5d1175a18ad8a014cba768c751a3f77027f227a1d1c59a061b06d0f25609297c3a7291d6fb80ed7a773043f04acc875a7f5d86510f99a54e1 SHA512 24f513273a47dfe443e18a9be97a710d523353daa131ea686de70ec13780d89c64bd7019ad83cf8aec8eeb1c63cd9cd3073cc86cdc27cfd361c5bc9197dba611
diff --git a/sys-cluster/libquo/libquo-1.2.2.ebuild b/sys-cluster/libquo/libquo-1.2.2.ebuild
deleted file mode 100644
index 3a8606d58270..000000000000
--- a/sys-cluster/libquo/libquo-1.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="run-time tuning of process binding policies made easy"
-HOMEPAGE="https://lanl.github.io/libquo/"
-SRC_URI="https://lanl.github.io/${PN}/dists/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="fortran"
-
-DEPEND="
-	virtual/mpi[fortran?]
-	sys-process/numactl
-	sys-apps/hwloc[numa,xml]
-	"
-RDEPEND="${DEPEND}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	autotools-utils_src_configure CC=mpicc FC=$(usex fortran mpif90 false)
-}
diff --git a/sys-cluster/libquo/libquo-1.2.3.ebuild b/sys-cluster/libquo/libquo-1.2.3.ebuild
deleted file mode 100644
index 69867bf0fe21..000000000000
--- a/sys-cluster/libquo/libquo-1.2.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/lanl/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-	AUTOTOOLS_AUTORECONF=1
-else
-	SRC_URI="https://lanl.github.io/${PN}/dists/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="run-time tuning of process binding policies made easy"
-HOMEPAGE="https://lanl.github.io/libquo/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="fortran static-libs"
-
-DEPEND="
-	virtual/mpi[fortran?]
-	sys-process/numactl
-	sys-apps/hwloc[numa,xml]
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	autotools-utils_src_configure CC=mpicc FC=$(usex fortran mpif90 false)
-}
diff --git a/sys-cluster/libquo/libquo-1.2.4-r1.ebuild b/sys-cluster/libquo/libquo-1.2.4-r1.ebuild
deleted file mode 100644
index ca89f8c78fe2..000000000000
--- a/sys-cluster/libquo/libquo-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit autotools-utils fortran-2
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/lanl/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-	AUTOTOOLS_AUTORECONF=1
-else
-	SRC_URI="https://lanl.github.io/${PN}/dists/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="run-time tuning of process binding policies made easy"
-HOMEPAGE="https://lanl.github.io/libquo/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="fortran static-libs"
-
-DEPEND="
-	virtual/mpi[fortran?]
-	sys-process/numactl
-	sys-apps/hwloc[numa,xml]
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	autotools-utils_src_configure CC=mpicc FC=$(usex fortran mpif90 false)
-}
diff --git a/sys-cluster/libquo/libquo-1.2.ebuild b/sys-cluster/libquo/libquo-1.2.ebuild
deleted file mode 100644
index 72ea50f3be66..000000000000
--- a/sys-cluster/libquo/libquo-1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="run-time tuning of process binding policies made easy"
-HOMEPAGE="https://lanl.github.io/libquo/"
-SRC_URI="https://lanl.github.io/${PN}/dists/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	virtual/mpi
-	sys-process/numactl
-	sys-apps/hwloc[numa,xml]
-	"
-RDEPEND="${DEPEND}"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	autotools-utils_src_configure CC=mpicc
-}
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index f8c883d47e2a..bd998d2141db 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -6,15 +6,11 @@ AUX neutron-openvswitch-agent.confd 142 BLAKE2B 32c521f734854608173a41625bc037ee
 AUX neutron-server.confd 70 BLAKE2B 88309872ce864e4dfa9072c1472bd6f1e8116f71106ff7e055f6386563ef1077b41f538a72e183ae00e700262d2bcf82434077f0b7e5753389077be3f276b178 SHA512 79f1a40486c37b2c3486b4ef015864f6b20ee89b05d788ce6ade8af934e2c160da9e0495d22e941a717072c1d8ca3b77963a3ec06f3ec25a3f8af8b24a4e40a0
 AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d75eab5f547be35fa5adb792db8960f71a98bbeb71d56b29e5f5166a47735ebe85804019aa4e1f11 SHA512 c9c7386ae8d97205859f02edb0c7d601059af78def3f232f87e676131c5e6fcdb6e880ccee5b1b15397b1dffe83446421145c90ed448f5e9d55994efd1629f92
 AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366
-DIST neutron-16.0.0.tar.gz 12746070 BLAKE2B 659ae3bc6971393522dc98ee5b4eccddd85aae17571734f24571e13892376ad2d9a25c09224e703a5b89511c2d696b69842469789649a1f239115ad2422af951 SHA512 f2c23a04d75328b8a671ac65163e6f84cd48880864331f6713793a037a23043779656cfdbe4aab6772fb4e5f5c606db9d97f3d4f3dc8f234920381a9929778cc
 DIST neutron-16.1.0.tar.gz 12757452 BLAKE2B 0561d2ed30c525dd5c9bc8502636714cd67680cb3f8d1d8bd04caa03ad50e0bf3f7578563789fc7172f6a53847c039a5e1e1fc12a0b5268b29077c83853c146f SHA512 13f5a58aeff8df85771737615706db67885baa1c115be01854a6e917bdf13415e201f971bd03fd3558f975c579c165c3b8079d6c7ee50588948b511d02d13b9f
-DIST neutron-configs-16.0.0.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-configs-16.1.0.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-configs-2020.1.9999.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
-DIST neutron-ml2-plugins-16.0.0.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 DIST neutron-ml2-plugins-16.1.0.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 DIST neutron-ml2-plugins-2020.1.9999.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
-EBUILD neutron-16.0.0.ebuild 8509 BLAKE2B a2729cc408a19f249d75f22090ed7569fb5e4b021d768da538c9900daadff87685f3612afacd93986ddff6d3e4fb8a091796963489cc016a8177721c0aa41470 SHA512 fb4ac3bef1d01e108dcce2845bde7306c8cd69e5a0a0338e0bd4e711caa21b5ec3a8ca7d447add5bfce09fd8952457fac9e49c01a2143c5220c339444b3127a7
-EBUILD neutron-16.1.0.ebuild 8511 BLAKE2B cbfd752ce6f8d0b3427673c807650917891fb4c501084828f346ad5e13c061fd3dd28a0c650b68449b81b0a39cddbb3e85c96d56189b2ab34d320343123741e5 SHA512 6a3544b2f66f5de8c31815389252d9c69f65bfb74d0b1d4568f23a7e68ca942fe4e121e4cc342baa4f6b8a81f992aa60acf38d71c985daffa8628aeca0eee8ec
+EBUILD neutron-16.1.0.ebuild 8509 BLAKE2B a2729cc408a19f249d75f22090ed7569fb5e4b021d768da538c9900daadff87685f3612afacd93986ddff6d3e4fb8a091796963489cc016a8177721c0aa41470 SHA512 fb4ac3bef1d01e108dcce2845bde7306c8cd69e5a0a0338e0bd4e711caa21b5ec3a8ca7d447add5bfce09fd8952457fac9e49c01a2143c5220c339444b3127a7
 EBUILD neutron-2020.1.9999.ebuild 8511 BLAKE2B cbfd752ce6f8d0b3427673c807650917891fb4c501084828f346ad5e13c061fd3dd28a0c650b68449b81b0a39cddbb3e85c96d56189b2ab34d320343123741e5 SHA512 6a3544b2f66f5de8c31815389252d9c69f65bfb74d0b1d4568f23a7e68ca942fe4e121e4cc342baa4f6b8a81f992aa60acf38d71c985daffa8628aeca0eee8ec
 MISC metadata.xml 1619 BLAKE2B 462b212e519778c98632ec3230e5f0d1a006a229edef034ed0d462559cb0c1763dafb997198241cca4f9c7cb056ebada214c82745dce35b269c2c27d554145a4 SHA512 8f9075719eeec3c3a939e8a1b05a5604bc1e801b227feb5775bfa9f2812e67c41165dc0b2b377685645d9fd9988523356ac77a8db8e73139ab3f035ae59b70ce
diff --git a/sys-cluster/neutron/neutron-16.0.0.ebuild b/sys-cluster/neutron/neutron-16.0.0.ebuild
deleted file mode 100644
index e33cb97dad0d..000000000000
--- a/sys-cluster/neutron/neutron-16.0.0.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
-	EGIT_REPO_URI="https://github.com/openstack/neutron.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
-						|| ( openvswitch linuxbridge ) )"
-
-CDEPEND=">=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/neutron-lib-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
-	compute-only? (
-		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/ovsdbapp-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.5.7[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
-	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	sys-apps/iproute2
-	net-misc/iputils[arping]
-	net-misc/bridge-utils
-	net-firewall/ipset
-	net-firewall/iptables
-	net-firewall/ebtables
-	net-firewall/conntrack-tools
-	haproxy? ( net-proxy/haproxy )
-	openvswitch? ( net-misc/openvswitch )
-	ipv6? (
-		net-misc/radvd
-		>=net-misc/dibbler-1.0.1
-	)
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )
-	acct-group/neutron
-	acct-user/neutron"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_DEFRAG_IPV4 NF_NAT NF_CONNTRACK \
-	IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-}
-
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	#add sudoers definitions for user neutron
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	# add generated configs
-	cd "${D}/etc/neutron" || die
-	unpack "neutron-configs-${PV}.tar.gz"
-	cd "${D}/etc/neutron/plugins/ml2" || die
-	unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
-	# correcting perms
-	fowners neutron:neutron -R "/etc/neutron"
-	fperms o-rwx -R "/etc/neutron/"
-
-	#remove superfluous stuff
-	rm -R "${D}/usr/etc/"
-}
-
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	python_moduleinto neutron/db/migration/alembic_migrations
-	python_domodule "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
-	elog
-	elog "neutron-server's conf.d file may need updating to include additional ini files"
-	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
-	elog "on if you will use openvswitch or linuxbridge (or something else)"
-	elog
-	elog "Other conf.d files may need updating too, but should be good for the default use case"
-	elog
-}
diff --git a/sys-cluster/neutron/neutron-16.1.0.ebuild b/sys-cluster/neutron/neutron-16.1.0.ebuild
index b8a3ed95df97..e33cb97dad0d 100644
--- a/sys-cluster/neutron/neutron-16.1.0.ebuild
+++ b/sys-cluster/neutron/neutron-16.1.0.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/configs.tar.gz -> neutron-configs-${PV}.tar.gz
 	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ussuri/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 1d2dbcd2e897..3028e6c0ef06 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -4,12 +4,9 @@ AUX nova-sudoers 78 BLAKE2B d2df2db0a2905e3a6aec56dc70afab046933d675715c9c16f0e9
 AUX nova.initd 747 BLAKE2B 2a20a632fcb66001e68f4d70fa11ba179db9b06a6f412115d7b89a7ac8cff0f897fc224e44e74f80f6b1ddfb7d44c8b399fc442ca2bc3b904a418d0765c240bd SHA512 938300464971847b0d14eb0e54c6443d0041a46d39b276642479cb3d0d9370480f7eb7aa8c20512609c5bf4f6fc54438b451ac4986ad7c93ef8ee5b966c7f2a3
 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
-DIST nova-21.0.0.tar.gz 9193053 BLAKE2B efc95ac54a18a7df1530fc61e2478d59e5711e4c2da0156c405945a9a0ccd533255e2733d626f28f3460238cf157d802b79a8573f570623024089dd86ac23abc SHA512 a006a47f10d141df8a2495ae81c98bd0bf7af0b1f790627ba929e9b3e2931e438259f96d8c9391b9717126778f3f72f0bde01db5245bdbe801077fd884ba5a89
 DIST nova-21.1.0.tar.gz 9213435 BLAKE2B e84bc5131c4bd5ca50ab2783b8b6c606eac0abdaf622fb9a32b9c86fb91ac569f92459da199b4d4bbf679710e593f7ce5539c7f85f89446a463064a108b58d3b SHA512 abb6db64bf25806a9037df1b54bb5874e0599654b8cabafbb6ac659358124a5aa62668117e0a529677e1997d7d89b4265fbb9de4613f28d00d71bdfc4e94c471
 DIST nova.conf.sample-2020.1.9999 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
-DIST nova.conf.sample-21.0.0 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 DIST nova.conf.sample-21.1.0 191182 BLAKE2B 99999b1b42b9ecc6a7f404c9874c5065591dfd8e896c97d261307f7f3b5e935e12db1b4650182660cf1eb97bcfb993d41a1f89e079120adc00b339b5a4ac1c98 SHA512 af22ba8dcfbafdb07ba2785bdcb40efd201adb81d47bee15ee11bb76437bc7a5b7c88390f995432ffa92b64b849df754bd15264e97530334f3eac6f8f93e828d
 EBUILD nova-2020.1.9999.ebuild 7628 BLAKE2B 3486d8ff71c4e70391cd416b6ef0cdf346ea8676d79cf594abaae8ea0f91dbe77a9a4a7fc720cbd4c6f910be91180b25251fa196878a33b4c8d114bb382c7e2a SHA512 d2a507f1fa6a00c2260f837cec8f02d6b151efbc7a50aecb6d50f30c1e56bd3cc708245ff7dec1a2d1a2601fb7a12a028a00ab3a7e75ff015500640c4b00c26a
-EBUILD nova-21.0.0-r1.ebuild 7660 BLAKE2B 3f78ed2930e81c882d17e64f1a4e3cb76e49bd8c61a5e9af59299f4d9d52b823266f35dee73262639ab4c8d6ebce52ffad08981ac887c9911774e7127ea5884b SHA512 66e2594c754752715820ce4679a5e2ce5ad3414f66169e778c51f70488c9a49d73a7595db005d5a314333030ec05ca5995c2ef9c84c8342a3ed6097cf705e563
-EBUILD nova-21.1.0.ebuild 7653 BLAKE2B 0eb9a06982266d64a505ae021939ca933ed504335318324a6587e56e6af8ecae55cf12fb98944abbf5c94bfaf89a424ad3f011e067257cd6a3d18ac0759e7bab SHA512 09e0b4650488aad403adad1436cef1a9afe328d3bcd50153b5aec17f85cdc5ef4958ea47d4e40af45f0312e64e0b64626d04c73c784fb21e3ed7dc6d55028720
+EBUILD nova-21.1.0.ebuild 7651 BLAKE2B fef31b81037d3412567f60578d63732f08fa0e70697c8a936d31e6b1fe5868b0dbb722447826b918ecb1467df9b95d9efec07fbe7a94225efa3f0695825e3f41 SHA512 c1a64cea2dbed104b03330662349ac165e18e162b89812a4c101f28f539773bb8563a3a56656fe561109eaef54f7eb3eccc799d81ec35de420109f35ade74352
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-21.0.0-r1.ebuild b/sys-cluster/nova/nova-21.0.0-r1.ebuild
deleted file mode 100644
index e96174c2c999..000000000000
--- a/sys-cluster/nova/nova-21.0.0-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-inherit distutils-r1 eutils linux-info multilib
-
-DESCRIPTION="Cloud computing fabric controller"
-HOMEPAGE="https://launchpad.net/nova"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/nova.git"
-	EGIT_BRANCH="stable/ussuri"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	compute-only? (
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
-	)
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	!~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.21.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-10.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	app-emulation/libvirt[iscsi?]
-	app-emulation/spice-html5
-	novncproxy? ( www-apps/novnc )
-	sys-apps/iproute2
-	openvswitch? ( net-misc/openvswitch )
-	rabbitmq? ( net-misc/rabbitmq-server )
-	memcached? (
-		net-misc/memcached
-		>=dev-python/python-memcached-1.58
-	)
-	sys-fs/sysfsutils
-	sys-fs/multipath-tools
-	net-misc/bridge-utils
-	compute? (
-		app-cdr/cdrtools
-		sys-fs/dosfstools
-		app-emulation/qemu
-	)
-	iscsi? (
-		sys-fs/lsscsi
-		>=sys-block/open-iscsi-2.0.873-r1
-	)
-	acct-user/nova
-	acct-group/nova"
-
-PATCHES=(
-	"${FILESDIR}/CVE-2020-17376.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use !compute-only; then
-		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-		done
-	fi
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
-	doins "${FILESDIR}/nova-compute.conf"
-	doins "${S}/etc/nova/"*
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/compute.filters"
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	if use iscsi ; then
-		# Install udev rules for handle iscsi disk with right links under /dev
-		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
-
-		insinto /etc/nova/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-	rm -r "${ED}/usr/etc"
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-21.1.0.ebuild b/sys-cluster/nova/nova-21.1.0.ebuild
index 7d6ad9d9a1d9..f1651e868045 100644
--- a/sys-cluster/nova/nova-21.1.0.ebuild
+++ b/sys-cluster/nova/nova-21.1.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 147b48f1aee8..7310e3994869 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -2,7 +2,7 @@ AUX pacemaker.initd 862 BLAKE2B 4da4af65887be567aa77fff2b3647b64fa86a9862a2269db
 AUX pacemaker.service 105 BLAKE2B 2b77b0c81427ab418bb5af372fb4938a7c630a9bb1e4128ed7335d9d1d11b5fbaf657e9ccabd6a7d4b1a120a00d7e46678f8a7a635b0dee7a2aa60559e78d50c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd SHA512 967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
 DIST Pacemaker-1.1.19.tar.gz 5369381 BLAKE2B 9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2 SHA512 c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
-EBUILD pacemaker-1.1.16.ebuild 1634 BLAKE2B ff3d8e910f8132df7c6a2ca2429603419b8e3742adb86388e1b3c610eef03da4027f6686ffe9bca3d975008a71d95ba165668e8191f4c0cff3247f76e837b3e2 SHA512 1895c8a7582c7a1a63d598aabe78ee096e1180ee89898870d3cf67f32e75ab35cce63fd9a5aee3ce897cfff343617fe4d5a1444d039909cf9c0e02f3a4c564a3
+EBUILD pacemaker-1.1.16.ebuild 1635 BLAKE2B 0eb20751ed13d23cc766c2e68296c711a0d9ebfc2993adc5f9c54e86557aca1ecc5f32e86d08011dee1959c9285803abe64ef2816f44f6c10b112b4584a19edb SHA512 cdcbf1e0170a616a09a00b878767dc02976b01f6eddc8f5b1440fe3c26406c679493c9579c95088f203036904f04f84f6ce3fe21a1c516370573ee060d808fe0
 EBUILD pacemaker-1.1.19-r1.ebuild 1648 BLAKE2B de91e5a4d40719f74d0503a91c1666c516026e8ee99385102f17d20e395f16ef10b9890f8cbe2a6b51c49cc1e20146c31de039510ccc9cb282c9dce9a5a63949 SHA512 e02adc3fb6e1186264ed91170d3b97b1e974f2b344cd972ce8406de9592bb45312040b970a7a707074cc0988c6f6c2147837db7ec9f77fa294676cf6d8c2325c
 EBUILD pacemaker-1.1.19.ebuild 1637 BLAKE2B bec518f49dedf193882e42fde6c24f5a6787884739807460c15dd6e71a1ef1967262ab8384ef9902e13e432826a8ca63e97c4eff711d4cbd242f595f5a236361 SHA512 998e69df883392f99074155de857063e55fa5ecaa617665d8c01d393b3295b5b3c4152467879628791464547c1b3fd551843a010f52f699acf59b6a153d191dd
 MISC metadata.xml 889 BLAKE2B 9b52f88582de605852765e0956640e713e68584066410f472beecccbf69db5a8b7226aaf4ce12851b45fd6945d0cde5cd7e524a873599bf35d4e3cf03a6dd8a5 SHA512 dbfaa3e72fbe361e1648a0a1dfd3e0f153489d005f052fc4ddd1468480d53c84a49bb18c0cfc16ac3f2f409f2ff673ec554faae562452420b898167b8650654f
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
index 737be8f19686..f6bef07a1217 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="acl heartbeat smtp snmp static-libs"
 
 DEPEND="${PYTHON_DEPS}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index b5c37afec17f..07118b5042b0 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index 4bda265919b6..49ba71397806 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -1,5 +1,3 @@
-AUX am-wrapper-10.sh 4626 BLAKE2B f7261f39e06afa88eb0b52c5ccdcbb2b4fabe3bda4fdb50ef2c974d4a03101439decb76edee3d0534a621fd4ca4e5d574a3af2701e382f7c07f838a5235ae6ef SHA512 6f1611000ac2dd901a24efd133522274aa8feea02610645f3b1332a3f294de687f65e995b398a487b1d030c74dd278f65fcd224007ebe7e950af03660cc38f60
 AUX am-wrapper-11.sh 4626 BLAKE2B 2a96abc5b93db360a3ce074d84b21d7f875ff42d54f99030d8589b84efc94b411d8fb1a707716a060dc4a66c59f2a84d1e50a70f681faa62358fc7ae7a5a7d77 SHA512 452c0c52ef65b1ad5ad8d8f5c9c12cb9ff18eb03faaf7217c52a7dcf2a9832c7d4a59dbd8cc6325a0035a6650cc913f9b842615d053bd0f0c5c5177e660dbfca
-EBUILD automake-wrapper-10.ebuild 916 BLAKE2B 57dc9390529e3cc6fb0236fc247804d003d9293dafc995b8197dc96c34a8e46e05d1b79697f6c6130225795bcdfec4876939fae2586ddd6c2612876d13a91cfc SHA512 d9ad75a62c23fc3f94dd8753449e95956f0bfe6f4f7fe08da4c357953ff480fe6aca3f193932cbf2b9e4b2681fcaa9f85f2d3aa02bff188c8c2e46f1f7f2b393
 EBUILD automake-wrapper-11.ebuild 928 BLAKE2B 075e0703acb9cc64f7c83df860fa146a570255d6926ef4969e7648ce65e59f5ec74819e4cb04ab745a86e1d4d0cc2235e3a60892b0947446108e545337425127 SHA512 a0b2b047ae995f3cc47379d8f0e03ce95c6832009bea3524add4ad12719b5ca15190a09d9751a936e264b3e0b23f6468ab6448e48a26672c8bd4c6f8c08e5d5b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
deleted file mode 100644
index 14c1563cc18a..000000000000
--- a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="wrapper for automake to manage multiple automake versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
-IUSE=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${FILESDIR}"/am-wrapper-${PV}.sh "${S}"/ || die
-}
-
-src_prepare() {
-	# usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell
-	if use prefix ; then
-		sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' \
-			"${S}"/am-wrapper-${PV}.sh || die
-	fi
-}
-
-src_install() {
-	newbin "${S}"/am-wrapper-${PV}.sh automake
-	dosym automake /usr/bin/aclocal
-
-	keepdir /usr/share/aclocal
-}
diff --git a/sys-devel/automake-wrapper/files/am-wrapper-10.sh b/sys-devel/automake-wrapper/files/am-wrapper-10.sh
deleted file mode 100644
index 235474fbf3d9..000000000000
--- a/sys-devel/automake-wrapper/files/am-wrapper-10.sh
+++ /dev/null
@@ -1,186 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Executes the correct automake version.
-#
-# If WANT_AUTOMAKE is set (can be a whitespace delimited list of versions):
-#  - attempt to find an installed version using those
-#  - if magic keyword 'latest' is found, pick the latest version that exists
-#  - if nothing found, warn, and proceed as if WANT_AUTOMAKE was not set (below)
-# If WANT_AUTOMAKE is not set:
-#  - Try to detect the version of automake used to generate things (look at
-#    Makefile.in and aclocal.m4 and any other useful file)
-#  - If detected version is not found, warn and proceed as if blank slate
-#  - Try to locate the latest version of automake that exists and run it
-
-(set -o posix) 2>/dev/null && set -o posix
-
-_stderr() { printf 'am-wrapper: %s: %b\n' "${argv0}" "$*" 1>&2; }
-warn() { _stderr "warning: $*"; }
-err() { _stderr "error: $*"; exit 1; }
-unset IFS
-which() {
-	local p
-	IFS=: # we don't use IFS anywhere, so don't bother saving/restoring
-	for p in ${PATH} ; do
-		p="${p}/$1"
-		[ -e "${p}" ] && echo "${p}" && return 0
-	done
-	unset IFS
-	return 1
-}
-
-#
-# Sanitize argv[0] since it isn't always a full path #385201
-#
-argv0=${0##*/}
-case $0 in
-	${argv0})
-		# find it in PATH
-		if ! full_argv0=$(which "${argv0}") ; then
-			err "could not locate ${argv0}; file a bug"
-		fi
-		;;
-	*)
-		# re-use full/relative paths
-		full_argv0=$0
-		;;
-esac
-
-if ! seq 0 0 2>/dev/null 1>&2 ; then #338518
-	seq() {
-		local f l i
-		case $# in
-			1) f=1 i=1 l=$1;;
-			2) f=$1 i=1 l=$2;;
-			3) f=$1 i=$2 l=$3;;
-		esac
-		while :; do
-			[ $l -lt $f -a $i -gt 0 ] && break
-			[ $f -lt $l -a $i -lt 0 ] && break
-			echo $f
-			: $(( f += i ))
-		done
-		return 0
-	}
-fi
-
-#
-# Set up bindings between actual version and WANT_AUTOMAKE;
-# Start with last known versions to speed up lookup process.
-#
-LAST_KNOWN_AUTOMAKE_VER="15"
-vers=$(printf '1.%s ' `seq ${LAST_KNOWN_AUTOMAKE_VER} -1 4`)
-
-#
-# Helper to scan for a usable program based on version.
-#
-binary=
-all_vers=
-find_binary() {
-	local v
-	all_vers="${all_vers} $*" # For error messages.
-	for v ; do
-		if [ -x "${full_argv0}-${v}" ] ; then
-			binary="${full_argv0}-${v}"
-			binary_ver=${v}
-			return 0
-		fi
-	done
-	return 1
-}
-
-#
-# Try and find a usable automake version.  First check the WANT_AUTOMAKE
-# setting (whitespace delimited list), then fallback to the latest.
-#
-find_latest() {
-	if ! find_binary ${vers} ; then
-		# Brute force it.
-		find_binary $(printf '1.%s ' `seq 99 -1 ${LAST_KNOWN_AUTOMAKE_VER}`)
-	fi
-}
-for wx in ${WANT_AUTOMAKE:-latest} ; do
-	if [ "${wx}" = "latest" ] ; then
-		find_latest && break
-	else
-		find_binary ${wx} && break
-	fi
-done
-
-if [ -z "${binary}" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
-	warn "could not locate installed version for WANT_AUTOMAKE='${WANT_AUTOMAKE}'; ignoring"
-	unset WANT_AUTOMAKE
-	find_latest
-fi
-
-if [ -z "${binary}" ] ; then
-	err "Unable to locate any usuable version of automake.\n" \
-	    "\tI tried these versions:${all_vers}\n" \
-	    "\tWith a base name of '${full_argv0}'."
-fi
-
-#
-# autodetect helpers
-#
-do_awk() {
-	local file=$1 ; shift
-	local v=$(awk -v regex="$*" '{
-		if (ret = match($0, regex)) {
-			s = substr($0, ret, RLENGTH)
-			ret = match(s, "[0-9]\\.[0-9]+")
-			print substr(s, ret, RLENGTH)
-			exit
-		}
-		}' "${file}")
-	case " ${auto_vers} " in
-	*" ${v} "*) ;;
-	*) auto_vers="${auto_vers:+${auto_vers} }${v}" ;;
-	esac
-}
-
-#
-# autodetect routine
-#
-if [ -z "${WANT_AUTOMAKE}" ] ; then
-	auto_vers=
-	if [ -r "Makefile.in" ] ; then
-		do_awk Makefile.in '^# Makefile.in generated (automatically )?by automake [0-9]\\.[0-9]+'
-	fi
-	if [ -r "aclocal.m4" ] ; then
-		do_awk aclocal.m4 'generated automatically by aclocal [0-9]\\.[0-9]+'
-		do_awk aclocal.m4 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\\(\\[?[0-9]\\.[0-9]+[^)]*\\]?\\)'
-	fi
-	# We don't need to set $binary here as it has already been setup for us
-	# earlier to the latest available version.
-	if [ -n "${auto_vers}" ] ; then
-		if ! find_binary ${auto_vers} ; then
-			warn "auto-detected versions not found (${auto_vers}); falling back to latest available"
-		fi
-	fi
-fi
-
-if [ -n "${WANT_AMWRAPPER_DEBUG}" ] ; then
-	if [ -n "${WANT_AUTOMAKE}" ] ; then
-		warn "DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}"
-	fi
-	warn "DEBUG: will execute <${binary}>"
-fi
-
-#
-# for further consistency
-#
-export WANT_AUTOMAKE="${binary_ver}"
-
-#
-# Now try to run the binary
-#
-if [ ! -x "${binary}" ] ; then
-	# this shouldn't happen
-	err "${binary} is missing or not executable.\n" \
-	    "\tPlease try installing the correct version of automake."
-fi
-
-exec "${binary}" "$@"
-# The shell will error out if `exec` failed.
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 5d2c80b90427..b22f4a58fc2e 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -15,19 +15,19 @@ AUX automake-1.16.1-py3-pep3147-cmdline.patch 599 BLAKE2B 0bdd6885e8856905b1389f
 AUX automake-1.16.1-py3-pep3147.patch 1565 BLAKE2B d1de92c94bd37b439e09003f27729c892c6ed7d807c70d6774f9bb0379a771059c1816c4a4fea3e88717223fdec557d20df914211e62e9e2d009339344c39df8 SHA512 f8a22e014123dffb442786a1f18f0623ed3b4fcb6b90649607c2ceb7f8ce0423181a83f9f15a575cc8e1408f812349ea3c33e89028c0e5714a152cfbdbdd742a
 AUX automake-1.16.2-py3-compile.patch 2412 BLAKE2B 20a3ce66047ad5106f0cafccce19fc8acd47ee0ba01882d1ff18c1a15592ef68b9c3debb61df78a31f238938a93ca4dc281b358b588727864673b09b11167131 SHA512 3bb9769d37b02e89373612752f127c582f948347a6f54e8b24dba262e14ca860e8fa507d96c0d51f0d64587371b9da17eb270dd5b7695091181731e35e5b9c2d
 AUX automake-1.4-CVE-2009-4029.patch 2186 BLAKE2B 6a33684f950b1e932418e2b7d8d6676fc27792e354f3b72502d5149e9ec9db6fb984e5bb168a465ad97e13d0f1d84b6b8acc0ca04ef51612577196f67441cad3 SHA512 cf65172ee59f91869b13292204e9744fb385a2cf13a17dab0e1dba5b1f403da55d1bd73448b00d81f46de2c9e7de1347e7b6868cd6f4b5e97e255a5c206d2d31
-AUX automake-1.4-ansi2knr-stdlib.patch 249 BLAKE2B bbf77d9aba954d03cfdb896c88bf9fb98695951011f885936b9df29c522d5ea5d46ee1441d37c7e367cd2c7429a2f017edbf4645470f55c55a7c50b0a7b2ae50 SHA512 db8d0e71e702e236b1e9d6f2ff949b6981a02da4ec143219ea10327f7c6dd9845f100c62c715b6cda46082dbc2cfb69bd50aea64d5fccc5bbd6fe81351a0012c
-AUX automake-1.4-libtoolize.patch 542 BLAKE2B 25dad3cbd948d1a6825ba800756e1a6f67ce0be86d2e33d345eaecd5e7c6a7a6e6aee213eb89cb9ce83ee6abf550c96f2ab2d17f32bddc62b95abd4003d93417 SHA512 1c9ee6d970cc9eb393e959c12518173ac49ec88d07ae52ca026807b52502a52f3f019916503e1fc444ba83bc21a6df74a95abadbc2cf938f79fd63299cd64846
-AUX automake-1.4-nls-nuisances.patch 746 BLAKE2B 91fe9080fd3c8a860398abeb8b95ac724458660eae126d27338cbe11e34f69ff1919dffdcedd5cd9186a47e51759f7df3e810dbf8706fdaa04c41087bf84d31e SHA512 5821637eb9cec970feb4cf1b09dc6efcd5b84cfce804915d31eccf810983e0b837c3fb6c9a4af857f4bb0545244f3d824138ad364c2073fab34d858aa8ff7d8c
+AUX automake-1.4-ansi2knr-stdlib.patch 176 BLAKE2B a62062f56aa89108f851d8f51d4774b36d639a11cf88d20c8dc0df3593531ed053d2374112ce61157a043bb3b5803c896c2f0cac0ecf2d3d5081aaf73a29b2ef SHA512 fa8de19294b53adbcafdf551e2611e842df610bfb6bfd1d11022c44870a7b0a6ac8c53c4ff78a6cb36f8994d2e0bd6ab3aafbd7ce74a33789585e58419966634
+AUX automake-1.4-libtoolize.patch 496 BLAKE2B 966b85c9c7d9d87506d01d55e08a019167a368058784ed2fcb627f79f91d69313ca8bae68d10b522400782bcce553a25a9ddfa3d196d3e4df6ea6bfe8dc48b60 SHA512 8cc4ae889552ffe431adbfa2b0d599416c049072b54e2f9a145342eccaa1c526cfb125315b3549957b41e0b4407ca6c96ad5bd120b75ab09221cf6efdee6ac05
+AUX automake-1.4-nls-nuisances.patch 750 BLAKE2B 9b7d33971fbc96d653e98f439f157f97a32226af36f04dd43f92c21edcedb47ed5293e9a0e39a12d7608d712ff8ecdd6a52af6e1c087f9b53012f411454e2fde SHA512 ca77a877d040f81271fd7241165748b169b8690b7e4a53b63f6c17de6f2bd2eb0a23af6ab2c3333f7f4a203dc29b7c428909b137f91efd24920d29f4dad04807
 AUX automake-1.4-perl-5.11.patch 839 BLAKE2B 6af1a5bbef79cf7938486ebfcf5b46cc3d10817a64344c824258dab187286af34ff64ef9fda7dda679b9d988a8bbc22dfaea1ab28df94cf05d853a5fabc3cd00 SHA512 f604c8334a942c345c4f63a07a18d91123f840a66d9314d99853a3133caf032f8dd6ad65b124f78f89c9494451babb3245a8ed7e771dbc9e479c302938fb62d5
 AUX automake-1.4-perl-dyn-call.patch 738 BLAKE2B 5bd553905fcedfa58cf57db2f188317d31199044670696d21f61087b0c81d9270d8ae7f23e373536c1c6961dc67ee1c3dece6e7b73cdcb4a6a8de4942155c8b0 SHA512 69a1d2ff4265e2cc3935313e95337b3b4c3b52210888ef15c15a83aa35e2b564e04f03bb8c8bca6877913abb2ccc5ea4351eb245b4b6e5f48f19f8010941e24c
 AUX automake-1.4-subdirs-89656.patch 944 BLAKE2B 98db6654bc5fdec52c05695d628dad8b2d1d3bb0acf607a8b0b69c13a4c4fbce013818c279c19857d39933fd9b23ddd6574c13f9dd18214409cd91f0b540cee2 SHA512 3aa2d98bf64294f608c081df2c316064ae86d7d7b05b60f79a571049e8d125a91309771edeb460ff8d29bf2536e0fe0542c0c247764338be9af37c0d32686670
 AUX automake-1.5-CVE-2009-4029.patch 2316 BLAKE2B 7c90e68fc679f3431ed17fc456281adb9bae25c0d3652d940ee3299780f580c975012ad4cb90c072bf4f770b895c8ed11a9541f227edabb9cb6c4b7fc88cab26 SHA512 2961ce03774e55623362b041214e8b1ecc98c193ca1b080938b848c3069e25438fd023a41ac73ca6aaf51d537e836fa8bcfbbd3e6e32494ba758ecbcbe2458ee
 AUX automake-1.5-perl-5.11.patch 806 BLAKE2B 2391683a15f82728e1992d1ec066d3ce5bd9016e633efb44e1ad4b61792f2730b2f88ddc06f49dce72d1b2031fa33501081fccbb99d9f5c96e6681e657dc7031 SHA512 1eb9314be86d7e775c1bbdc35d86d3f0e8b5ca81e4c170a6fec63dea3895c81c770e101660e4337a942fa2c34aeaa6b8b1e7eaed3d310921c23292dbcd25febe
-AUX automake-1.5-slot.patch 1191 BLAKE2B e8cc77cf6b79a0a9017684083f302efc2c333a8cfef1cbde1e10bb09c5b294f63fa15db4fad43e0322772018e0eb8995f9ce06b4c88626727e4667d10dc8f177 SHA512 031b592f62b95a9832a034838f2b0e1b3bc120af9e1582f03f66da3cc4d9bdb0148417da3e7064ace01e028e2c0c9b94fe59da95493dc736a6f75718e2fd0121
-AUX automake-1.5-target_hook.patch 1132 BLAKE2B f4b501e3d5d92c00435de01ab1b44ae89c11df0ebf5a06f79e3c9d80af9adc78f1a22cb79b7ac971ef9b9f142d376f6e61e8039ba0f5698582223927209a8816 SHA512 3d21577b22bd2d6bcdb78259f0b8ebe4783184785868e1b54740269c627045fbe1608e01bd044ad85e848fa5c6eee241b6c0c9626369d839784cbc79892fdaea
+AUX automake-1.5-slot.patch 1045 BLAKE2B e40fb233fddf1fb8f6e31450b6146da1455a76154aae9c6707f0ba9ece429cdd7acebcbc5375e6b6314a6c10d633df8332cdfdc8c2c227af4def87b5365da654 SHA512 ff77ccc31c1db5e4abaf27ec103790ea9e362bc06e6f07b399a0b8fb3122bcb2ef60a428c1387a2c1f9ed6f9a005bae4a7fe2f36b590fc7c167794c9d925e864
+AUX automake-1.5-target_hook.patch 878 BLAKE2B 88c775ee47e76ff7aa1db9c5da275e4c33ef335e90bfcd1f34b3f3b105793400e591ddeba3b72922ed2d8d329a400563f532a86f1933375cc223fa070f27b51b SHA512 0a6e13aa9ac5e467ea2afc1e7cfc4707cf80e845596ac01869e2d58395a5a9058f2c160b9717fd0f6a2c8eec9ee4c9a922a0e3af7337061e6a99980ff69d4fc5
 AUX automake-1.5-test-fixes.patch 1300 BLAKE2B 87a853e32a34419e48d8a6514f2c404d7e77c6ffcd703d2d493546c6e355b4d431733a7f00be370c7ad2188c6589d1c4b42d885d7cda7f294a66f3e54a717c39 SHA512 5642985801c0786678062f50fbc8090c4994c53b989727e274e4054d37dd9efc0de44b160bb5eae71fbdad289daf406812963d941a68953d1f6314089196f0f4
 AUX automake-1.6.3-test-fixes.patch 723 BLAKE2B 9d54674ae2964702cc1965e8d977ab5e6cad42dde4ae053ada2999e1cc8decdb40d58c108962d87b2d27e9b9e2acaf482fb2e4106e761bcfd2ca5016511645bc SHA512 6f3b97d87412906a812febd813a4303b1dde51454732256e4b483388eb602b471262f79822ad222e738199d9583ae3d91e266197385d9a265306907a696d8b93
-AUX automake-1.7.9-infopage-namechange.patch 592 BLAKE2B 87262591052afd95f5458e45fcc28d4ef493327eae40b6a9160ae7147070ad9c01b93344eac1f84d4163ff26fe3ae65c444a52a91cabf61ff15f1a4aa16f90be SHA512 15770a375b60a39a453c1b0e2bef5eb05d567ae230429fe009531f5d7d059bd182772b9cc06daf2bc7640628ee463b4c4529a74714f329b04078c4174140e2e1
+AUX automake-1.7.9-infopage-namechange.patch 524 BLAKE2B 791a81fea03fc88f8709a9745f4d94a3a8be970631531f321fd1fff5f3767beeca2f0024c9a6da508754f0842bac42dd49dfa02384579d902667e83fdb93646c SHA512 a96d27e04012fd43f722740dcb600b33039c76a400019e414903b9c4778b588436c375262dcac8723fc0f6cd0cd3b409d11b7e479c8ef774cc5f0b234d11ee38
 AUX automake-1.7.9-libtool-2.patch 859 BLAKE2B 3ef296b4cef6e21888c5c704342bbabae4c52b9e0f5b14f938086f2a5f0c695a06dba9856ef802242f30d8c5fcb99b20daaba83a89a727b91d5b37208453c4ff SHA512 1e571d20a0a8d5928c938e3892e5cc5d76abb678f726ee85afb5d29417ccd2167c249a8c252496312277e8dfbf9b0f7c5c6b77cec1e861a02400dddb5d4711b4
 AUX automake-1.7.9-test-fixes.patch 1159 BLAKE2B a805acac10b8895cf97804d44217d20ad6f15bfee7118c4ac9ce7744437a15925b79bf2cfc998edd3f7bc934ba292a76116d93d246983ebbeb5a8fb0980d6dee SHA512 ea4a6ded1a6f605dbcb3cf3da1c6f369c2dd4abf3739185df723ffe52eb88ef93ff1e9b23323c7a94c477301250873dbeea2af2cac1affdfde9d67ce7d38a679
 AUX automake-1.8-perl-5.11.patch 784 BLAKE2B 5bbd4f9b5dd03233a7b06f230cedc5693afdb4a9d5d6a88a36cf7f245c63f40efbe1ccea037238f364ffeefab6fd98b7237883a04734ae915df0a146e27d530d SHA512 ab574c2af5a4b1c734d547611e74057984092b7058e638344f3c2350858a8fd45fcdd5c8a7631d6d54777458d6d6f79f922b0b94c653f3370a386c035ff9eb32
@@ -53,20 +53,20 @@ DIST automake-1.6.3.tar.bz2 476275 BLAKE2B 5d0b7f69cbf9fda3b1f1426548fae45c63137
 DIST automake-1.7.9.tar.bz2 577705 BLAKE2B 0fdd9eec855f79dba2067374d2fb902d92fa4c2ec1e3fe292376383b3f8cef62799d880610af51b7b31b4a17812b9cd25d1bbc8687fd30ee98de88d4e7625f53 SHA512 372f326cdf9c893a016473b959f0d3b92a7a82a13978e3950a887a79c93856a635549ebc63945faafba30b8be6db1c4cd68385f7dfe1cbb36386400acb2aa7a2
 DIST automake-1.8.5.tar.bz2 663182 BLAKE2B a1488fe8653517d16e69e64655829119283ae9f49d5a29c4886100197fb08d6893abf2701000125fcbaa9923c76a2466de25e056ffcf856eb2878c34284c00b6 SHA512 862f9fe8dd4f0fd51b97d80b767304b982d9c9307bf66933298187bf121f5c827f0b4880eab92f07d16e0c1d41ff5179923c7ae8d8aabd635db8574d4a3021b0
 DIST automake-1.9.6.tar.bz2 765505 BLAKE2B 078d4dff44be18d93a8b1b30367a6010fff0be890a61a23926910ac2d92ac87672e7fec8f3548815eaa72310b3c4e042ce0f5df0250423446b39924eee4d044b SHA512 6aa8824876003bcac804e88d58f014a2449c7e1d824e46b5e971d3e2d070bc6ac0a3881e8eaae12e2f7f310c6b81dfb83ad4647d58785fc7e6759aa37478784e
-EBUILD automake-1.10.3-r3.ebuild 2353 BLAKE2B 271e7e9441c44e7cdf8aca7ae7262963d30aa270fcccd2255ed812a2766ea0c239b2533d08221f2e9972eb984b92ab42f875ff856fdf75e4cf210d769f810ef0 SHA512 b8c001ef8bcd92f6d0b7b5f906c7441ec3c5c8f4302e4313679411c86d55a5442b330af8768821a1ed5e4511a187d1ed270782e65d3e114f2e77c72587962009
-EBUILD automake-1.11.6-r3.ebuild 2584 BLAKE2B 767b9aaf67f6a14ff4197e93d575307bdab754328bff2dd79bf69c7caa85869c21fdad9037737bd7b98c7ec9aba2ed234666b376e500f6145b6251c2603a04bd SHA512 203098fde48d340d8664eebbf1748d905eded49acd63114459383327d71d16975bea008bf377f0fb9ad544a6fb61e5fe11bc9d2d6bac41f9cab627f1b1900f42
-EBUILD automake-1.12.6-r2.ebuild 2366 BLAKE2B 9c1bb1c60ca67203cac86cc565da6d55351e79c7a63e0f06964d948f19aa634f4a2b4e5a477aabfa42ddaec208e38302b4f42ea6a8e0a426b1092a8f986b55d7 SHA512 9dfe5d5fa9df70df6dfe9e0ce94224796d2b8763d27fd62adaaaab74817a65c4566cffaf90abf8d1c1b1ccefb8f9c8a32d50ef2f653190b698cb502070060d18
-EBUILD automake-1.13.4-r2.ebuild 2619 BLAKE2B d9bfb9be05dcd0582b0c495fdec4ccdefc89295996b5e850428b9a531210ff412a91f85e0efed74fb2c973ac0af1cd045ec9d296f60a331a3c970a0054887b22 SHA512 3de79f083d9d71d46fcd6ab080ca899f0c3db0e57ecd442b65c6bf39107d5110f715f356510251b49175029ae8f99e92b7d4c102f72e58307c171c9af273e778
-EBUILD automake-1.14.1-r2.ebuild 3038 BLAKE2B 127f8c1375dbc0b9c3a47868ce2a769fe815188bcfc857f5c44253441ae9f998796426494c69813ee8e004f19fdda6f7a6e4fca0690bbcf7c2e2972834d63abe SHA512 52a582482de1d90a8bcb0962759d9b16d07bcdb359ca7340568936d248c337dda523e446b1f83657ff45a4d9ef98c0d2a1d8ea002bb1101008acfc44bc15f045
-EBUILD automake-1.15.1-r2.ebuild 3208 BLAKE2B 9a3c41ddb9a2cda2f423dc48e6afc02dab24a592ca33b0d7f539828f49348a5beb26baa0d38c5f73f008b023567c3b2e5a990ef961f40adb08e9a7b78c1d0742 SHA512 27157d328ba24528e0cbc10752ed2e1734c18efb2962d0354c6afaf24ec69f9f557bf9deef2bd6242649bec9876c02f2603e98c2d64b88630d7fc606f400d6f4
-EBUILD automake-1.16.1-r1.ebuild 3133 BLAKE2B a39535645573cc8182867c62cbcabd50cc29772b50be042ee91b3f8a39c2752f98b654d01bfe3a4e68dda3012d4e37fdf27220a89e85dbd488e4c40363e120ed SHA512 fe2dd86480bca7d3d413a33f70cf1cc404861b831e53eb9c607272e19c71aa36898d20e789339381d8a96a1d2ac1cb113dc397259d191a761dd520e83dd8f44a
+EBUILD automake-1.10.3-r3.ebuild 2388 BLAKE2B 9dac25084c353bc3316360dc606c8cd4645c4fc0a68b7630a197c30b0669ac845815eb4fcdfd63549788ad2ebd797315c059ffa38c385bd5c2ec16ef4a57ef34 SHA512 b8c8b9fef56b930ad471a52b547cfe955b37bf34fd9efec2e73c6abab0c9361fe39a5801a76af8e7bc71cb274485fbf231f18abcfcbdd23f0a558de9eb87c30a
+EBUILD automake-1.11.6-r3.ebuild 2565 BLAKE2B 67a70c6bc25cc386e45d742d9552197ed1e4b1d9d2ef85f5b22d0eeceb20e018c0b482dd991a7640fbbc424d1f6e3e71c442aa32ca28b8c1fc2bc4f29b55398d SHA512 dfb8aa86a245b1fc8e28dab0b5007d9b64f78ef188ecfb469df60f8583dcf7da62fbc8c18c2a5a790fe65bef344a5e8290f4170cf6dbc34121a9bc152e836a06
+EBUILD automake-1.12.6-r2.ebuild 2420 BLAKE2B 0f8f42975c78c92fb942c3c446608854fd9058f8d811d46330054b070d3dc5585ba872060484a93713ed216b2e4984dd290e12683408bc572ed8033a38695ccb SHA512 6a197c024acc592a697efe31ce28ccef3707c6896a241f0bbcc07f985ab0ccb62a868fc844ac5cab381eaea68a30a9cd02b466cfa18382fadc979031cb22884c
+EBUILD automake-1.13.4-r2.ebuild 2673 BLAKE2B 4f9ae5f5af93438814b9a4704370c11c4fe5e83f4bb2e3aa230bd2996303d13ebcbddfd0b218d484ee6710d5f8dbd4b0d9693600e19a00e104319a90d64a4061 SHA512 6ab14110bc87a1040a919ffc7c4083253fad241000290bae9c5e1e7d87d516f2e832a33d46f145e81b869d0d37eb0789ac7c8af63874228373edb65e4506a549
+EBUILD automake-1.14.1-r2.ebuild 3052 BLAKE2B 9f9127fefca8f16ecf0de2f072f85d428bfe199f81e93a82e7ab43e758aba9dd98f7371c11a699abf524865663af9000739601ae1c56e5e87c7057580519b78a SHA512 8ca5a939721c97e28f34f4e8bd4c6dc8dd0079b3b092f7a02e045541a66ca90828809431ff76de2cdb4c9d16ff15aeb6e03675b1205107fcf5850176069a7069
+EBUILD automake-1.15.1-r2.ebuild 3222 BLAKE2B fb0da9250436fa471435d93df44acaaba32903b7dcdce1a4eab92679d0ae92710b36246e7480f63adb181dfa14cb9ccfe6e7f8dfefbd79b8cd2f39d9a4845819 SHA512 d103e91a98f614130f0736a843e944eac33b5f9ee6c3c5d52152c193386ccdd11363db286f39bf063f4845f8463ef08066a1a5337345bfd8cdc2157234720165
+EBUILD automake-1.16.1-r1.ebuild 2940 BLAKE2B d4a8801f4dfbcff936b960fef2af6cbc3ffbea408e9123ff9bf410d1e53cd479f6d11f02a648ddb2d2dbbd9786f98443333becb8304cfe7267349c584ebbcf81 SHA512 499e4f37a028f51e7113e37ecbbed445888dc09b2a62dd8c3ab43afed91789d1d9878a25f011aefe825c18259ce5ccd0dfcf0e05b95598e1425bfcad34c0d866
 EBUILD automake-1.16.1-r2.ebuild 3630 BLAKE2B 4623977d5598404a613dfee378feb53b97ae5c724c6fccbb5a236ab4861c2755e05f0777155d3182ffadf6b777f90a88dac881c7a2bb356b7c1ad1f30f304153 SHA512 fa5f121283bee781449981d985b571fa244503e17713e679cb2c3845631d472e614c5f6c98c91230288bd9ffed16bc88ac98b8c84f2414618ffc174f5b0547b2
 EBUILD automake-1.16.2.ebuild 3416 BLAKE2B a57d755ad8e43746d96878c154d03360c633e29c149056e990b6f10b70a0baa21a26e990e245d56458b5b1f64e53fbce6ff9c1b7f8d829dc2815239b0557b3b1 SHA512 58c0cb4967fa32ea0f5878e0521dbf5514c4c72423bc379f2190d70067235d716f6b648b925d61025d9b5823ffeab4a86c0834f9a07ecaeae46ca603bc83db4f
-EBUILD automake-1.4_p6-r2.ebuild 2468 BLAKE2B 86d6f97b68df38f787c181eb5a3d84ddac8eaafbdda64a62761e1a0e9368982ed1e734b9a53cd393b99005ccf903cf9a26c784d478f110405f86e72134e0526a SHA512 6381dbe67d79f32014610077fc7154052cb551fc3318330fd0469a8be279dffd27543ea7edf37e6307cfa6359cf97e1f38c436d29a1fe465121dbc19357e159e
-EBUILD automake-1.5-r2.ebuild 2286 BLAKE2B 584d007a623d34e989ee5e87a7843746e72c938061c10269c371ea36e27771a1827fff7b45f318757907d904334cce182199059c0b9bcf5c06aa5db5f9b4bfcc SHA512 c0be94a2bd3f78fc5a3ae825580c922a1b997a9a85af6bcc7e0551b6f1f00fbbbe3e3e3eae3edce81baf968d73e7168d2af29ee7f36eb90c62bc4c358c5e9cb1
-EBUILD automake-1.6.3-r2.ebuild 2034 BLAKE2B e60e2ec2d60b56fbef99df4370b831d1cb7794111826c784e134b9051ece9be6f06f9ecd8d0b3a8f72a7c737cfa7027d42647075de0a04b652516d77d601e72d SHA512 981f6508bf23db2060d215f143416f94184e206dab62e7065f571d52a96aeec76fda331257deff6c10e2872b628acd23177078c9fe8eed36dff0d67518bf2cb6
-EBUILD automake-1.7.9-r3.ebuild 2189 BLAKE2B b6edf115036fedbbe5951667381936adcf5c3e841566dbca8879d5ee47cfb34fd92e770d9aebb9aac1f81e637ff334d631b457e3382c1e32c57c846cb252ffe0 SHA512 21c5a5a9832c3e5399f6a2a3b98b055bb3e03c45f5754eea18835beb97f9c80bbf8e284ab6209d3d9e28292958f77fcd72cc6500ed979ff131611c3dd85de4d8
-EBUILD automake-1.8.5-r5.ebuild 2216 BLAKE2B 6cd3c0aefb4f3f981f99031ad931c53d306f623d62f77ab14ff0add33edbfca2c4d5b571032f25c8af5b670009ad672a3f812707d5b3129d406bf565e0684e03 SHA512 a419cccfe87519962a5e2455a39720ef8802406be376d6e4be10a66819dec6d56fe210d3223dc09cabb207715403351c9f2ac3f502d236902a8f94e8aac34476
-EBUILD automake-1.9.6-r5.ebuild 2567 BLAKE2B acd71c985e31c37b94e599ba2df894834eee57d3b6767ad16467dcf9df401dea5f5dc78b3642ff214d39f872deef19cb5db35ae4a420cd7881d298af370033fc SHA512 232f2667321ad9a57c9f52dbaee681cce22f0087543afdc3ccdb5b13eabf29011f0dea3e2e243b73a1c058e7194b9bbf39415c3230d2b97eefb63b3ac55ce288
-EBUILD automake-9999.ebuild 3416 BLAKE2B a57d755ad8e43746d96878c154d03360c633e29c149056e990b6f10b70a0baa21a26e990e245d56458b5b1f64e53fbce6ff9c1b7f8d829dc2815239b0557b3b1 SHA512 58c0cb4967fa32ea0f5878e0521dbf5514c4c72423bc379f2190d70067235d716f6b648b925d61025d9b5823ffeab4a86c0834f9a07ecaeae46ca603bc83db4f
+EBUILD automake-1.4_p6-r2.ebuild 2469 BLAKE2B f631fc0d87edf6cef1a8a07f0417fd72df8229fdaeca66f2f85944cb00fa3f6dfba73cd20df88ab2fe6fbe268473d8dffd6ac203980d4e241988ad3084ce9271 SHA512 ff05eabeb5baf5d8415b3e8c87e462e1c3f5b3a46a4910f9c0216746e6794739947c98515251b722dfbce51cb12868f4dcc247deac924371bf504a7b35fb4c96
+EBUILD automake-1.5-r2.ebuild 2243 BLAKE2B c530c3ff67f450a3c5c10ccf224a2e87021e17821ce15b288dc979d8af78f81d578767d86fec09b15b704d32c7c46504e3ec35b126cf6792145c6056b57ba048 SHA512 7ca78eba7b26acb2ed84e8382148a895581345d359bf63c8aeee5efca99fd9637247b573c420a42f6a5f6bcfe2093057470f6ee259dea06e0a99b7ab0e1ae927
+EBUILD automake-1.6.3-r2.ebuild 2045 BLAKE2B 6c06598b71fbaa8976d5d8b1fdbe5c091698a38c881b3a5f978eebc96207b3dde2d63022b0e2f6b9ebfb9fa0e22e7ab6a67734f52cd52be083ceda959af6a4bc SHA512 b583d6abf8fb8f0f15f03d5faab000244322c309b089f40b59d0b0a3202c58427cc5de9b1aa423c1cacd20277c51387755e2c367e80a85d0bab923a5b6bd85be
+EBUILD automake-1.7.9-r3.ebuild 2179 BLAKE2B e9da60d988c7bc2a46f34271b0cb1aecd8a29f04b690d73d7cf7af821fa574ee51e899952688a055bbb6031760b1908d761465ed6ac6eeac851e76545930ab2c SHA512 6667759ace8e089d5d76553897fda8a1043926a2888578a61ed0b29892857f2c3f98df2d480249c74c7d66ab6e5d313cfc71ed7bb1d90269dbccd53b8f1f02ed
+EBUILD automake-1.8.5-r5.ebuild 2206 BLAKE2B 397fa1a1a136989e2edc100edf150ee08eacb02784aa4ed0592b9a859ed1a18ba044dd56ec71ce5ccc79771159f5a9e95070c8e4817815c37a7b10ea78a2975f SHA512 542538416e7f07413edb7f9152cf4dd5777097535b1b065d486fbbf686ca8fe2239d8c1ce7170a1b328f0986948fa483cb5b4919e75818aae4399df72ba8eb05
+EBUILD automake-1.9.6-r5.ebuild 2420 BLAKE2B 5c8f761c4a20873b880aa83d5729a892dffb4a1018570f958383b0ddfe18af3a6a2559b25118f5942a9b0690c85335205908e6bd26d234a01083a16cfe664a5d SHA512 dc8e5ad6a642196e821d2ac44a71ceaae7ae487eabc717f97f79c53683b1fa7431e5ad4b7975d3c6a963fcf1afd13040e47352b59596d4d0e2a492befe7aae5c
+EBUILD automake-9999.ebuild 3412 BLAKE2B f4b1237ce15109e4d586720afa780d7d169b13d896966b4fd0326b239dc4c93942062e90f0f3f1d42e5cb754f9e68e71f7c11dcacc7541cbf478e956f1a2e1f4 SHA512 760e399700bbe1580b060e7d07dad4e4f219bf5d03e2c0cdc5be9b0bb24952140e444311f3308cfe781882c3af4354d4d0a16bd5a7a0385251965b556852e3cf
 MISC metadata.xml 331 BLAKE2B 71cfd842ad316730cf02f9f80b8c6ede120bfe4b007c43737d31204990c97665d916b69932d9d855cfb4a8b325e3920957c5b287b896b9d371311ebb57134b10 SHA512 2194f195d6364115d869d3417993fb58361392dc7f8c98792213a22ad3289abf35199403c6a326d6e8f3f234afde056ff6f4d67a84ddd1cb4a227dbe3e9982d6
diff --git a/sys-devel/automake/automake-1.10.3-r3.ebuild b/sys-devel/automake/automake-1.10.3-r3.ebuild
index 9326962123a8..f70d8537f23a 100644
--- a/sys-devel/automake/automake-1.10.3-r3.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r3.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
+EAPI=7
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="https://www.gnu.org/software/automake/"
@@ -14,16 +11,16 @@ LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+IUSE=""
+RESTRICT="test"
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-10
 	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
-	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )"
+	sys-apps/help2man"
+BDEPEND="app-arch/gzip"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
@@ -31,20 +28,15 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
 )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
-	chmod a+rx tests/*.test
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED%/}"/usr/share/info >/dev/null || die
+	pushd "${ED}"/usr/share/info >/dev/null || die
 	rm -f dir || die
 
 	# Rewrite all the references to other pages.
@@ -79,12 +71,19 @@ src_install() {
 	for x in aclocal automake ; do
 		help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1
 		doman ${x}-${SLOT}.1
-		rm -f "${ED%/}"/usr/bin/${x}
+		rm -f "${ED}"/usr/bin/${x}
 	done
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
 }
diff --git a/sys-devel/automake/automake-1.11.6-r3.ebuild b/sys-devel/automake/automake-1.11.6-r3.ebuild
index fb2d2c65c290..58ccde9a40ba 100644
--- a/sys-devel/automake/automake-1.11.6-r3.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r3.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
+EAPI=7
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="https://www.gnu.org/software/automake/"
@@ -14,16 +11,16 @@ LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+IUSE=""
+RESTRICT="test"
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-10
 	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
-	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )"
+	sys-apps/help2man"
+BDEPEND="app-arch/gzip"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
@@ -31,14 +28,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
 )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
-	chmod a+rx tests/*.test
 	export HELP2MAN=true
 	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
 	export TZ="UTC"  #589138
@@ -56,7 +48,7 @@ src_compile() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED%/}"/usr/share/info >/dev/null || die
+	pushd "${ED}"/usr/share/info >/dev/null || die
 	rm -f dir || die
 
 	# Rewrite all the references to other pages.
@@ -82,24 +74,25 @@ slot_info_pages() {
 	popd >/dev/null || die
 }
 
-src_test() {
-	unset HELP2MAN # 583108
-
-	default
-}
-
 src_install() {
 	default
 	slot_info_pages
 
 	rm \
-		"${ED%/}"/usr/bin/{aclocal,automake} \
-		"${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	local x
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+	gunzip "${tarfile}" || die
+	fi
 }
diff --git a/sys-devel/automake/automake-1.12.6-r2.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild
index 50123d8e2db9..3292e87d89b9 100644
--- a/sys-devel/automake/automake-1.12.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r2.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
+EAPI=7
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="https://www.gnu.org/software/automake/"
@@ -14,26 +11,22 @@ LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+IUSE=""
+RESTRICT="test"
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-10
 	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
-	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )"
+	sys-apps/help2man"
+BDEPEND="app-arch/gzip"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
 	"${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch
 )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -43,7 +36,7 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED%/}"/usr/share/info >/dev/null || die
+	pushd "${ED}"/usr/share/info >/dev/null || die
 	rm -f dir || die
 
 	# Rewrite all the references to other pages.
@@ -73,16 +66,23 @@ src_install() {
 	default
 
 	slot_info_pages
-	rm "${ED%/}"/usr/share/aclocal/README || die
-	rmdir "${ED%/}"/usr/share/aclocal || die
+	rm "${ED}"/usr/share/aclocal/README || die
+	rmdir "${ED}"/usr/share/aclocal || die
 	rm \
-		"${ED%/}"/usr/bin/{aclocal,automake} \
-		"${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	local x
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
 }
diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
index cb464ade7c1f..21c2e6bf016e 100644
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
+EAPI=7
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="https://www.gnu.org/software/automake/"
@@ -14,16 +11,16 @@ LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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"
-IUSE="test"
-RESTRICT="!test? ( test )"
+IUSE=""
+RESTRICT="test"
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-10
 	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
-	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )"
+	sys-apps/help2man"
+BDEPEND="app-arch/gzip"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch
@@ -32,10 +29,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.14-install-sh-avoid-low-risk-race-in-tmp.patch
 )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -45,7 +38,7 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED%/}"/usr/share/info >/dev/null || die
+	pushd "${ED}"/usr/share/info >/dev/null || die
 	rm -f dir || die
 
 	# Rewrite all the references to other pages.
@@ -75,16 +68,23 @@ src_install() {
 	default
 
 	slot_info_pages
-	rm "${ED%/}"/usr/share/aclocal/README || die
-	rmdir "${ED%/}"/usr/share/aclocal || die
+	rm "${ED}"/usr/share/aclocal/README || die
+	rmdir "${ED}"/usr/share/aclocal || die
 	rm \
-		"${ED%/}"/usr/bin/{aclocal,automake} \
-		"${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	local x
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
 }
diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild
index efc4d1200e8a..3d8d7f660278 100644
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r2.ebuild
@@ -1,17 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 versionator
+EAPI=7
 
 if [[ ${PV/_beta} == ${PV} ]]; then
 	MY_P=${P}
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
 else
-	MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
+	MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
 	MY_P="${PN}-${MY_PV}"
 
 	# Alpha/beta releases are not distributed on the usual mirrors.
@@ -25,16 +22,16 @@ LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 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"
-IUSE="test"
-RESTRICT="!test? ( test )"
+IUSE=""
+RESTRICT="test"
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-10
 	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
-	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )"
+	sys-apps/help2man"
+BDEPEND="app-arch/gzip"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.14-gzip-fix.patch
@@ -44,10 +41,6 @@ PATCHES=(
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -62,7 +55,7 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED%/}"/usr/share/info >/dev/null || die
+	pushd "${ED}"/usr/share/info >/dev/null || die
 	rm -f dir || die
 
 	# Rewrite all the references to other pages.
@@ -92,16 +85,23 @@ src_install() {
 	default
 
 	slot_info_pages
-	rm "${ED%/}"/usr/share/aclocal/README || die
-	rmdir "${ED%/}"/usr/share/aclocal || die
+	rm "${ED}"/usr/share/aclocal/README || die
+	rmdir "${ED}"/usr/share/aclocal || die
 	rm \
-		"${ED%/}"/usr/bin/{aclocal,automake} \
-		"${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	local x
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
 }
diff --git a/sys-devel/automake/automake-1.15.1-r2.ebuild b/sys-devel/automake/automake-1.15.1-r2.ebuild
index 80447194c28f..8ec205e95c9c 100644
--- a/sys-devel/automake/automake-1.15.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r2.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 versionator
+EAPI=7
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
@@ -17,7 +14,7 @@ else
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
 	else
-		MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
+		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
 		MY_P="${PN}-${MY_PV}"
 
 		# Alpha/beta releases are not distributed on the usual mirrors.
@@ -32,23 +29,19 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-IUSE="test"
-RESTRICT="!test? ( test )"
+IUSE=""
+RESTRICT="test"
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-10
 	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
-	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )"
+	sys-apps/help2man"
+BDEPEND="app-arch/gzip"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -66,7 +59,7 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED%/}"/usr/share/info >/dev/null || die
+	pushd "${ED}"/usr/share/info >/dev/null || die
 	rm -f dir || die
 
 	# Rewrite all the references to other pages.
@@ -96,16 +89,23 @@ src_install() {
 	default
 
 	slot_info_pages
-	rm "${ED%/}"/usr/share/aclocal/README || die
-	rmdir "${ED%/}"/usr/share/aclocal || die
+	rm "${ED}"/usr/share/aclocal/README || die
+	rmdir "${ED}"/usr/share/aclocal || die
 	rm \
-		"${ED%/}"/usr/bin/{aclocal,automake} \
-		"${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	local x
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
 }
diff --git a/sys-devel/automake/automake-1.16.1-r1.ebuild b/sys-devel/automake/automake-1.16.1-r1.ebuild
index 4a5093369fe7..fb84f2113fed 100644
--- a/sys-devel/automake/automake-1.16.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r1.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 versionator
+EAPI=7
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
@@ -17,7 +14,7 @@ else
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
 	else
-		MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
+		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
 		MY_P="${PN}-${MY_PV}"
 
 		# Alpha/beta releases are not distributed on the usual mirrors.
@@ -32,20 +29,15 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-IUSE="test"
-RESTRICT="!test? ( test )"
+IUSE=""
+RESTRICT="test"
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-11
 	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
-	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
+	sys-apps/help2man"
 
 src_prepare() {
 	default
@@ -64,7 +56,7 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED%/}"/usr/share/info >/dev/null || die
+	pushd "${ED}"/usr/share/info >/dev/null || die
 	rm -f dir || die
 
 	# Rewrite all the references to other pages.
@@ -94,16 +86,17 @@ src_install() {
 	default
 
 	slot_info_pages
-	rm "${ED%/}"/usr/share/aclocal/README || die
-	rmdir "${ED%/}"/usr/share/aclocal || die
+	rm "${ED}"/usr/share/aclocal/README || die
+	rmdir "${ED}"/usr/share/aclocal || die
 	rm \
-		"${ED%/}"/usr/bin/{aclocal,automake} \
-		"${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	local x
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
 }
diff --git a/sys-devel/automake/automake-1.4_p6-r2.ebuild b/sys-devel/automake/automake-1.4_p6-r2.ebuild
index 8f5f42f51afa..328151c0dcb6 100644
--- a/sys-devel/automake/automake-1.4_p6-r2.ebuild
+++ b/sys-devel/automake/automake-1.4_p6-r2.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-
-inherit eutils
+EAPI=7
 
 MY_P="${P/_/-}"
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
@@ -18,29 +16,33 @@ IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69
+	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4-nls-nuisances.patch #121151
+	"${FILESDIR}"/${PN}-1.4-libtoolize.patch
+	"${FILESDIR}"/${PN}-1.4-subdirs-89656.patch
+	"${FILESDIR}"/${PN}-1.4-ansi2knr-stdlib.patch
+	"${FILESDIR}"/${PN}-1.4-CVE-2009-4029.patch #295357
+	"${FILESDIR}"/${PN}-1.4-perl-5.11.patch
+	"${FILESDIR}"/${PN}-1.4-perl-dyn-call.patch
+)
 
 src_prepare() {
+	default
 	export WANT_AUTOCONF=2.5
-	epatch "${FILESDIR}"/${PN}-1.4-nls-nuisances.patch #121151
-	epatch "${FILESDIR}"/${PN}-1.4-libtoolize.patch
-	epatch "${FILESDIR}"/${PN}-1.4-subdirs-89656.patch
-	epatch "${FILESDIR}"/${PN}-1.4-ansi2knr-stdlib.patch
-	epatch "${FILESDIR}"/${PN}-1.4-CVE-2009-4029.patch #295357
-	epatch "${FILESDIR}"/${PN}-1.4-perl-5.11.patch
-	epatch "${FILESDIR}"/${PN}-1.4-perl-dyn-call.patch
 	sed -i 's:error\.test::' tests/Makefile.in #79529
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null
-	rm -f dir
+	pushd "${ED}"/usr/share/info >/dev/null || die
+	rm -f dir || die
 
 	# Rewrite all the references to other pages.
 	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
@@ -62,7 +64,7 @@ slot_info_pages() {
 		sed -i -e "s:${f}:${d}:g" * || die
 	done
 
-	popd >/dev/null
+	popd >/dev/null || die
 }
 
 src_install() {
@@ -70,14 +72,16 @@ src_install() {
 		pkgdatadir=/usr/share/automake-${SLOT} \
 		m4datadir=/usr/share/aclocal-${SLOT}
 	slot_info_pages
-	rm -f "${ED}"/usr/bin/{aclocal,automake}
+	rm -f "${ED}"/usr/bin/{aclocal,automake} || die
 	dosym automake-${SLOT} /usr/share/automake
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
+	local x
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
 }
diff --git a/sys-devel/automake/automake-1.5-r2.ebuild b/sys-devel/automake/automake-1.5-r2.ebuild
index 06253da239ee..5d33bc94d3d5 100644
--- a/sys-devel/automake/automake-1.5-r2.ebuild
+++ b/sys-devel/automake/automake-1.5-r2.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="https://www.gnu.org/software/automake/"
@@ -17,26 +15,30 @@ IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69
+	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/automake-1.4-nls-nuisances.patch #121151
+	"${FILESDIR}"/${P}-target_hook.patch
+	"${FILESDIR}"/${P}-slot.patch
+	"${FILESDIR}"/${P}-test-fixes.patch #79505
+	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
+	"${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
+	"${FILESDIR}"/${PN}-1.5-perl-5.11.patch
+)
+
 src_prepare() {
+	default
 	export WANT_AUTOCONF=2.5
-	epatch "${FILESDIR}"/automake-1.4-nls-nuisances.patch #121151
-	epatch "${FILESDIR}"/${P}-target_hook.patch
-	epatch "${FILESDIR}"/${P}-slot.patch
-	epatch "${FILESDIR}"/${P}-test-fixes.patch #79505
-	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	epatch "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
-	epatch "${FILESDIR}"/${PN}-1.5-perl-5.11.patch
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null
-	rm -f dir
+	pushd "${ED}"/usr/share/info >/dev/null || die
+	rm -f dir || die
 
 	# Rewrite all the references to other pages.
 	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
@@ -58,7 +60,7 @@ slot_info_pages() {
 		sed -i -e "s:${f}:${d}:g" * || die
 	done
 
-	popd >/dev/null
+	popd >/dev/null || die
 }
 
 src_install() {
@@ -67,13 +69,14 @@ src_install() {
 
 	local x
 	for x in aclocal automake ; do
-		mv "${ED}"/usr/bin/${x}{,-${SLOT}} || die "rename ${x}"
-		mv "${ED}"/usr/share/${x}{,-${SLOT}} || die "move ${x}"
+		mv "${ED}"/usr/bin/${x}{,-${SLOT}} || die
+		mv "${ED}"/usr/share/${x}{,-${SLOT}} || die
 	done
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
 }
diff --git a/sys-devel/automake/automake-1.6.3-r2.ebuild b/sys-devel/automake/automake-1.6.3-r2.ebuild
index 92eb4fa57aa8..6c0cd2f16749 100644
--- a/sys-devel/automake/automake-1.6.3-r2.ebuild
+++ b/sys-devel/automake/automake-1.6.3-r2.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="https://www.gnu.org/software/automake/"
@@ -17,23 +15,27 @@ IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69
+	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-test-fixes.patch #159557
+	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
+	"${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
+	"${FILESDIR}"/${PN}-1.5-perl-5.11.patch
+)
+
 src_prepare() {
+	default
 	export WANT_AUTOCONF=2.5
-	epatch "${FILESDIR}"/${P}-test-fixes.patch #159557
-	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	epatch "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
-	epatch "${FILESDIR}"/${PN}-1.5-perl-5.11.patch
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null
-	rm -f dir
+	pushd "${ED}"/usr/share/info >/dev/null || die
+	rm -f dir || die
 
 	# Rewrite all the references to other pages.
 	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
@@ -55,18 +57,19 @@ slot_info_pages() {
 		sed -i -e "s:${f}:${d}:g" * || die
 	done
 
-	popd >/dev/null
+	popd >/dev/null || die
 }
 
 src_install() {
 	default
 	slot_info_pages
-	rm -f "${ED}"/usr/bin/{aclocal,automake}
+	rm -f "${ED}"/usr/bin/{aclocal,automake} || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	local x
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
 }
diff --git a/sys-devel/automake/automake-1.7.9-r3.ebuild b/sys-devel/automake/automake-1.7.9-r3.ebuild
index 37a3480981c2..df9f506f48e6 100644
--- a/sys-devel/automake/automake-1.7.9-r3.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r3.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="https://www.gnu.org/software/automake/"
@@ -17,26 +15,30 @@ IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69
+	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-infopage-namechange.patch
+	"${FILESDIR}"/${P}-test-fixes.patch
+	"${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
+	"${FILESDIR}"/${P}-libtool-2.patch #257544
+	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
+	"${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
+	"${FILESDIR}"/${PN}-1.5-perl-5.11.patch
+)
+
 src_prepare() {
+	default
 	export WANT_AUTOCONF=2.5
-	epatch "${FILESDIR}"/${P}-infopage-namechange.patch
-	epatch "${FILESDIR}"/${P}-test-fixes.patch
-	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
-	epatch "${FILESDIR}"/${P}-libtool-2.patch #257544
-	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	epatch "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
-	epatch "${FILESDIR}"/${PN}-1.5-perl-5.11.patch
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null
-	rm -f dir
+	pushd "${ED}"/usr/share/info >/dev/null || die
+	rm -f dir || die
 
 	# Rewrite all the references to other pages.
 	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
@@ -58,18 +60,19 @@ slot_info_pages() {
 		sed -i -e "s:${f}:${d}:g" * || die
 	done
 
-	popd >/dev/null
+	popd >/dev/null || die
 }
 
 src_install() {
 	default
 	slot_info_pages
-	rm -f "${ED}"/usr/bin/{aclocal,automake}
+	rm -f "${ED}"/usr/bin/{aclocal,automake} || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	local x
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
 }
diff --git a/sys-devel/automake/automake-1.8.5-r5.ebuild b/sys-devel/automake/automake-1.8.5-r5.ebuild
index 241a20422cee..f545e1e2fdee 100644
--- a/sys-devel/automake/automake-1.8.5-r5.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r5.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="https://www.gnu.org/software/automake/"
@@ -17,26 +15,30 @@ IUSE=""
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-10
-	>=sys-devel/autoconf-2.69
+	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch
+	"${FILESDIR}"/${P}-test-fixes.patch #159557
+	"${FILESDIR}"/${PN}-1.9.6-aclocal7-test-sleep.patch #197366
+	"${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
+	"${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
+	"${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
+	"${FILESDIR}"/${PN}-1.8-perl-5.11.patch
+)
+
 src_prepare() {
+	default
 	export WANT_AUTOCONF=2.5
-	epatch "${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch
-	epatch "${FILESDIR}"/${P}-test-fixes.patch #159557
-	epatch "${FILESDIR}"/${PN}-1.9.6-aclocal7-test-sleep.patch #197366
-	epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
-	epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
-	epatch "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
-	epatch "${FILESDIR}"/${PN}-1.8-perl-5.11.patch
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null
-	rm -f dir
+	pushd "${ED}"/usr/share/info >/dev/null || die
+	rm -f dir || die
 
 	# Rewrite all the references to other pages.
 	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
@@ -58,18 +60,19 @@ slot_info_pages() {
 		sed -i -e "s:${f}:${d}:g" * || die
 	done
 
-	popd >/dev/null
+	popd >/dev/null || die
 }
 
 src_install() {
 	default
 	slot_info_pages
-	rm -f "${ED}"/usr/bin/{aclocal,automake}
+	rm -f "${ED}"/usr/bin/{aclocal,automake} || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	local x
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
 }
diff --git a/sys-devel/automake/automake-1.9.6-r5.ebuild b/sys-devel/automake/automake-1.9.6-r5.ebuild
index 9d9571840123..bfb4a120b038 100644
--- a/sys-devel/automake/automake-1.9.6-r5.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r5.ebuild
@@ -1,10 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
+EAPI=7
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="https://www.gnu.org/software/automake/"
@@ -14,8 +11,8 @@ LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+IUSE=""
+RESTRICT="test"
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-10
@@ -23,8 +20,7 @@ RDEPEND="dev-lang/perl
 	>=sys-apps/texinfo-4.7
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
-	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )"
+	sys-apps/help2man"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.6-infopage-namechange-r1.patch
@@ -37,10 +33,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.8-perl-5.11.patch
 )
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 	export WANT_AUTOCONF=2.5
@@ -49,7 +41,7 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED%/}"/usr/share/info >/dev/null || die
+	pushd "${ED}"/usr/share/info >/dev/null || die
 	rm -f dir || die
 
 	# Rewrite all the references to other pages.
@@ -83,12 +75,13 @@ src_install() {
 	for x in aclocal automake ; do
 		help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1
 		doman ${x}-${SLOT}.1
-		rm -f "${ED%/}"/usr/bin/${x}
+		rm -f "${ED}"/usr/bin/${x}
 	done
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
 }
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index fc05add3e373..4dcd0a59fb5a 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -2,20 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-any-r1
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
-
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P="${P}"
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
 	else
 		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
 		MY_P="${PN}-${MY_PV}"
diff --git a/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch b/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch
index 78aa2e3d6a3f..62a076107ee5 100644
--- a/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch
+++ b/sys-devel/automake/files/automake-1.4-ansi2knr-stdlib.patch
@@ -1,5 +1,5 @@
---- ansi2knr.c.orig	2005-01-30 06:54:09.702046352 -0500
-+++ ansi2knr.c	2005-01-30 06:54:17.719827464 -0500
+--- a/ansi2knr.c
++++ b/ansi2knr.c
 @@ -132,7 +132,7 @@
  
  #endif /* not HAVE_CONFIG_H */
diff --git a/sys-devel/automake/files/automake-1.4-libtoolize.patch b/sys-devel/automake/files/automake-1.4-libtoolize.patch
index d71d66c973c5..3e818ca960ba 100644
--- a/sys-devel/automake/files/automake-1.4-libtoolize.patch
+++ b/sys-devel/automake/files/automake-1.4-libtoolize.patch
@@ -1,7 +1,7 @@
 Patch from redhat/fedora which made it into upstream.
 
---- automake.in	Wed Jul 12 11:40:03 2000
-+++ automake.in	Thu Nov  9 07:04:46 2000
+--- a/automake.in
++++ b/automake.in
 @@ -6882,9 +6882,11 @@
  		    $suppress = 1;
  
diff --git a/sys-devel/automake/files/automake-1.4-nls-nuisances.patch b/sys-devel/automake/files/automake-1.4-nls-nuisances.patch
index 16aa657c8ebb..d84d29698e64 100644
--- a/sys-devel/automake/files/automake-1.4-nls-nuisances.patch
+++ b/sys-devel/automake/files/automake-1.4-nls-nuisances.patch
@@ -1,5 +1,5 @@
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -46,6 +46,16 @@
  infodir='${prefix}/info'
  mandir='${prefix}/man'
diff --git a/sys-devel/automake/files/automake-1.5-slot.patch b/sys-devel/automake/files/automake-1.5-slot.patch
index 348775abe751..640e73c7b794 100644
--- a/sys-devel/automake/files/automake-1.5-slot.patch
+++ b/sys-devel/automake/files/automake-1.5-slot.patch
@@ -1,5 +1,5 @@
---- aclocal.in.orig	2004-10-22 11:11:05.361192040 -0400
-+++ aclocal.in	2004-10-22 11:11:45.362110976 -0400
+--- a/aclocal.in
++++ b/aclocal.in
 @@ -33,5 +33,5 @@
  $prefix = "@prefix@";
  # Note that this isn't pkgdatadir, but a separate directory.
@@ -20,8 +20,8 @@
 +	print "/usr/share/aclocal", "\n";
  	exit 0;
      }
---- automake.in.orig	2004-10-22 11:14:10.787003032 -0400
-+++ automake.in	2004-10-22 11:14:22.072287408 -0400
+--- a/automake.in
++++ b/automake.in
 @@ -32,7 +32,7 @@
  BEGIN
  {
diff --git a/sys-devel/automake/files/automake-1.5-target_hook.patch b/sys-devel/automake/files/automake-1.5-target_hook.patch
index 6f40cbb67d39..5f3bdb1f06c0 100644
--- a/sys-devel/automake/files/automake-1.5-target_hook.patch
+++ b/sys-devel/automake/files/automake-1.5-target_hook.patch
@@ -1,6 +1,5 @@
-diff -C 2 -r -N /tmp/automake-1.5/automake.in automake-1.5/automake.in
-*** /tmp/automake-1.5/automake.in	Thu Aug 23 07:26:53 2001
---- automake-1.5/automake.in	Tue Feb  5 20:38:55 2002
+*** automake-1.5/automake.in
+--- automake-1.5/automake.in
 ***************
 *** 1941,1945 ****
   
@@ -16,9 +15,8 @@ diff -C 2 -r -N /tmp/automake-1.5/automake.in automake-1.5/automake.in
 ! 	}
   
   	if ($derived_source)
-diff -C 2 -r -N /tmp/automake-1.5/m4/depout.m4 automake-1.5/m4/depout.m4
-*** /tmp/automake-1.5/m4/depout.m4	Mon May 14 02:01:09 2001
---- automake-1.5/m4/depout.m4	Wed Jan 30 22:03:33 2002
+*** automake-1.5/m4/depout.m4
+--- automake-1.5/m4/depout.m4
 ***************
 *** 13,18 ****
   for mf in $CONFIG_FILES; do
diff --git a/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch b/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch
index 0e6708a55099..bb1c21175175 100644
--- a/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch
+++ b/sys-devel/automake/files/automake-1.7.9-infopage-namechange.patch
@@ -1,5 +1,5 @@
---- Makefile.in	2003-06-30 17:07:30.000000000 +0000
-+++ Makefile.in	2003-06-30 17:09:28.000000000 +0000
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -199,8 +199,9 @@
  
  .texi.info:
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index a51d91870766..42e48879b172 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -4,13 +4,10 @@ DIST binutils-2.33.1-patches-1.tar.xz 17944 BLAKE2B 811ad416fe9c059f645856a3123e
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
 DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
-DIST binutils-2.35-patches-1.tar.xz 12216 BLAKE2B a811449da684e3501a7520a26639e04dda2f2d2fc8610974293eff3e4a1e23c4abeb97f52fe3b796679452bd6e3a5330fef4beb6f64b9ce2a1162076803390a0 SHA512 b8da16a4d97b264da925cc939b54bedbc148eb72a8d60f79d7ed222e9e299dca2a4f1fad4a6d60448d9d196c11331443eca0508dcbb85cb4c2da6c67bfaf4cd2
 DIST binutils-2.35.1-patches-1.tar.xz 10088 BLAKE2B fa4b0c417b6452757f90243921c60b2406c9bf60d1aaa393654fb23ce52e32fb3e7ed90f6d59286786dd95398a10d008c75bfdca065d704025cc828ff65b225f SHA512 dccb4407f4f2a8b38488f9f42638c10777ee344239cf5d4fcc8f580df3e8ff15d03211dc51ef18d905c326a71771da4b38f47381d6d549422a8353b5da0e7b0b
 DIST binutils-2.35.1.tar.xz 22031720 BLAKE2B d3468da90b75e9b5fa7fbd64d3fdb0a4bc445e4cb7da5ae058f73a1e9d948b3e9438bc9f1b5b351db369b76a25960c9c1f58f828fd2c7646f555de45fa3c052b SHA512 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb
-DIST binutils-2.35.tar.xz 22042160 BLAKE2B 72ea79edf3a77aa93dcf38274123abbae5ce8f800a95e6379b4c8807050b05c2dfec314f06c027b1343c5570f369324fa3e195d7e0db5f8a57c0579937c49d3f SHA512 9f222e4ab6720036402d03904fb11b73ab87714b85cd84997f7d357f405c7e10581d70202f9165a1ee0c70538632db27ecc9dfe627dddb1e6bc7edb1537cf786
 EBUILD binutils-hppa64-2.32-r1.ebuild 12648 BLAKE2B aa452384823e5b0be386bc4a7501d49b2de644af4492a05992f7dddd680c5e87481dbf5a38fff342526e571e271adc6af68b33bda2e83059877a307b4d892b81 SHA512 df21c036804f909f7c8b3ccec6119c6f35189cfe3988390be4dbe3f36cc7ead39eea4415cae689dcdcaa9387bb7d97477e50f329c7a11f75d28880a6f676b1eb
 EBUILD binutils-hppa64-2.33.1.ebuild 12302 BLAKE2B 84e6b959af5995933200f19231c033fbc7bec57f54c7a28d92733556a2194e963120469d68ca488788e32f3199312bf2f08351e1d541e847c15e67d451648b79 SHA512 4b1330e3070fb3ccbaea43f261ce9a96786779d3c876d41fa4e80e73206395ef1586bc7e82e959b744ebe0c6ca798aaa41d48a19c77380b627f0824aad405bba
 EBUILD binutils-hppa64-2.34-r2.ebuild 12314 BLAKE2B 7a1914abaa711fb2a4446529b56651b39680b315870d439bf4041de4828fc48ff70a5780dd1332dc9677b44c8b625cd199a3fe9598fc274ae4322fc08e87edd5 SHA512 3d5b043da836315294659097a9adcd2d867973156b4af9c0c95248702c98e700e84dee66a0d9e19058295715a00ada7e2e00374acf5249e526ac95bf7fcb7aad
-EBUILD binutils-hppa64-2.35.1.ebuild 12071 BLAKE2B eb7ce3f34eab1b847fb0b99de6aeec234ca5d0f3ba9078a20acd02ac623e8b2b8815f03d1e1ca12c492d98b450130c92178635f9bab806064647a1fdbfc306ce SHA512 ab3f9db525e8eb89f37eadaceb2d5fb13f732607c1c19ac44ac31128065e3904a09f24a983693003c1d36d69664943a2e9253c88043394a7b4f8955b3da6e10a
-EBUILD binutils-hppa64-2.35.ebuild 12071 BLAKE2B eb7ce3f34eab1b847fb0b99de6aeec234ca5d0f3ba9078a20acd02ac623e8b2b8815f03d1e1ca12c492d98b450130c92178635f9bab806064647a1fdbfc306ce SHA512 ab3f9db525e8eb89f37eadaceb2d5fb13f732607c1c19ac44ac31128065e3904a09f24a983693003c1d36d69664943a2e9253c88043394a7b4f8955b3da6e10a
+EBUILD binutils-hppa64-2.35.1.ebuild 12070 BLAKE2B e91f9e33cc2f2c13734659859663bccefeab65cb513c2458b65add662fc00c7a633f765031a6c6e122451cb366edb69d8498b7a6022e9499e10976547cec8013 SHA512 eba147c86196fc04a4cf27ee85c1c4faac430552ee47de942253f80699fc87f5fcee89864570c0552429e8052ddde438832c4e985069e148f6744f490f0cf6d1
 MISC metadata.xml 691 BLAKE2B ce21a0c95e69ad1f656373ec843f43ff5300b0145e0d89b92c7d7ae664886db9ba5afd4c39c7d7fe0d4f898b43d98bab6ba562b06945e5016a2abf62e1c4119f SHA512 97ff085ad4b3273a5867d37bb70dc9586a7bc3ffbf9ca1b6c68e224c340afe102afbfc034b339533732afd032a7f8be584e31c8572cd76df90f4db93bac3baa3
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1.ebuild
index 0a83fa18e4a2..baeec28e3432 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1.ebuild
@@ -35,7 +35,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(ver_cut 1-2)
-#		KEYWORDS="-* ~hppa"
+		KEYWORDS="-* ~hppa"
 		;;
 esac
 
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.35.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.35.ebuild
deleted file mode 100644
index 0a83fa18e4a2..000000000000
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.35.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CTARGET=hppa64-${CHOST#*-}
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here:
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=1
-PATCH_DEV=dilfridge
-
-case ${PV} in
-	9999)
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		inherit git-r3
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		SLOT=${PV}
-		;;
-	*)
-		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-		SLOT=$(ver_cut 1-2)
-#		KEYWORDS="-* ~hppa"
-		;;
-esac
-
-#
-# The Gentoo patchset
-#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-S=${WORKDIR}/${P/-hppa64/}
-
-src_unpack() {
-	case ${PV} in
-		*9999)
-			git-r3_src_unpack
-			;;
-		*)
-			;;
-	esac
-	default
-	mkdir -p "${MY_BUILDDIR}"
-}
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-		if use default-gold; then
-			myconf+=( --enable-gold=default )
-		fi
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-	# bug 637066
-	filter-flags -Wall -Wreturn-type
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-
-	# the hppa64 hack; this should go into 9999 as a PN-conditional
-	# tweak the default fake list a little bit
-	cd "${D}"/etc/env.d/binutils
-	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 8949712fac5a..589df2a53e6a 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -9,15 +9,12 @@ DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
 DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
-DIST binutils-2.35-patches-1.tar.xz 12216 BLAKE2B a811449da684e3501a7520a26639e04dda2f2d2fc8610974293eff3e4a1e23c4abeb97f52fe3b796679452bd6e3a5330fef4beb6f64b9ce2a1162076803390a0 SHA512 b8da16a4d97b264da925cc939b54bedbc148eb72a8d60f79d7ed222e9e299dca2a4f1fad4a6d60448d9d196c11331443eca0508dcbb85cb4c2da6c67bfaf4cd2
 DIST binutils-2.35.1-patches-1.tar.xz 10088 BLAKE2B fa4b0c417b6452757f90243921c60b2406c9bf60d1aaa393654fb23ce52e32fb3e7ed90f6d59286786dd95398a10d008c75bfdca065d704025cc828ff65b225f SHA512 dccb4407f4f2a8b38488f9f42638c10777ee344239cf5d4fcc8f580df3e8ff15d03211dc51ef18d905c326a71771da4b38f47381d6d549422a8353b5da0e7b0b
 DIST binutils-2.35.1.tar.xz 22031720 BLAKE2B d3468da90b75e9b5fa7fbd64d3fdb0a4bc445e4cb7da5ae058f73a1e9d948b3e9438bc9f1b5b351db369b76a25960c9c1f58f828fd2c7646f555de45fa3c052b SHA512 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb
-DIST binutils-2.35.tar.xz 22042160 BLAKE2B 72ea79edf3a77aa93dcf38274123abbae5ce8f800a95e6379b4c8807050b05c2dfec314f06c027b1343c5570f369324fa3e195d7e0db5f8a57c0579937c49d3f SHA512 9f222e4ab6720036402d03904fb11b73ab87714b85cd84997f7d357f405c7e10581d70202f9165a1ee0c70538632db27ecc9dfe627dddb1e6bc7edb1537cf786
 EBUILD binutils-2.32-r1.ebuild 12638 BLAKE2B 3bb6831d91295ad0e1eba8f50de8d5ceea51f245b2798cf890b2e0d42628db175150d4372f918067e560d229c2173412662320c90b39d3ab99f69fb1c9c4e18e SHA512 e4c24268b2bb5780bdbaaee7d7b7a02fbf590afb95b11037e1b518fd5c98e94ac8b25e60d188609d98dc30180e030f44ec78e1ef7ce1162fe13658fbe057b340
 EBUILD binutils-2.32-r2.ebuild 12417 BLAKE2B 0db121dfdf5af96c1884684ab0d8a25d69c037d8b394a8d364f742ded9962f96c4e94f5073294c41eaefb0b9061b58b4f78f86ae04c73bd13797b3de5d3e3c4d SHA512 abbf2690b78b9c74c8db40db03a0de41afdf9006120b2d32014c53b064ff3872813c2a35d610e5dc5b50324613395ff8dbd6f9e0811fc09003efd830c748d459
 EBUILD binutils-2.33.1-r1.ebuild 12152 BLAKE2B 71c89261848ff7d8898c81cd013de9bd9fac9f3853732fb4636c6e420106b74d3f42970d2dc25c2053a71003d898377618fb2c6ef271f993302f3f5c1f4d3d54 SHA512 689498a68f0e802c1468ee3a4df6dfe8ede15dfa797d1983466d01e64f5da26c071f1396d52f25085e5df4075cb2969349f0533eb89a543da224c6c3ed47d4b9
-EBUILD binutils-2.34-r2.ebuild 12120 BLAKE2B 3be9576db416b0d152d77133377de50fb1eabec168bffe584af591c6a2551b220a66cac1503279ea7032853f07023b102a6be105a5ceacc4394db82dad342ea0 SHA512 9afac1be6a7555c2a9c5edc5e989c4a15f2091b833eb12b658798c6a8942a239749b5200f25a98eaefb1248a4894804cb5b7ac09e3f42415a1950964754207cd
-EBUILD binutils-2.35.1.ebuild 12473 BLAKE2B ca4147fba3107d9afc68365b69143cf2750731ba94331315f42925afd8411e996318f0bf03f721a45591b258768a95541c5ec3afa819d0cadaa0301ea45fcf3b SHA512 98ad2ffc53c2664d3363cd337b955b15667714bcc6046636002b86b451f7e70ed862dd359a7c439c30ea9b3047829bc2f8e8bf93a6379d86758c8e2cf0ed62bf
-EBUILD binutils-2.35.ebuild 12473 BLAKE2B ca4147fba3107d9afc68365b69143cf2750731ba94331315f42925afd8411e996318f0bf03f721a45591b258768a95541c5ec3afa819d0cadaa0301ea45fcf3b SHA512 98ad2ffc53c2664d3363cd337b955b15667714bcc6046636002b86b451f7e70ed862dd359a7c439c30ea9b3047829bc2f8e8bf93a6379d86758c8e2cf0ed62bf
-EBUILD binutils-9999.ebuild 12473 BLAKE2B ca4147fba3107d9afc68365b69143cf2750731ba94331315f42925afd8411e996318f0bf03f721a45591b258768a95541c5ec3afa819d0cadaa0301ea45fcf3b SHA512 98ad2ffc53c2664d3363cd337b955b15667714bcc6046636002b86b451f7e70ed862dd359a7c439c30ea9b3047829bc2f8e8bf93a6379d86758c8e2cf0ed62bf
+EBUILD binutils-2.34-r2.ebuild 12119 BLAKE2B 9ffb2d93bb543e023bdada09eb459b39a2f182816e0f2a0e28e376fe2984eddd1d3a1130fa8a1f2eb716f619c3ed04d6df3e440657246bf6510ff53f370b88f8 SHA512 75eb38babbda8ac3afeb82e7893e42d502aea41d9ac6b0874dacfe3cc3c12c9c50fe9f77d4bea0d7c3772906047bfd97846c2aa97e5be87fcf43e5771d2b72b7
+EBUILD binutils-2.35.1.ebuild 12468 BLAKE2B 92daee225625599510aec7656338a8a91853c4541cfc75b0f72ed2814941ad3765f51bab88b694543e180b9e0f88799fcff680ea24140b511145ffd0d4f2ac5d SHA512 fa18f03f24cb6880ad1ef246fe382a33187d822b571c7183418a228721578f4cf9cd1807524c04594dd5ac342c8b7bfcbe0c82135d196e2ae025d40016b48f08
+EBUILD binutils-9999.ebuild 12469 BLAKE2B f99ef61b216d5e1948898a1f79aa35a7e8dc439240b6ce9cca8cd88e9a11497e2a937930c3ef31b3d844c180f2352cb33d98c189d4ec8aa46d24e38a80b089f9 SHA512 6cf1f15697a42b4931e1bcf1180ed658ef975df3053b16c41acdebf2c200075b11583aa4a2d20fb84ff6b8d3c1c3744c37317117ba6235b024df080059fe17c9
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.34-r2.ebuild b/sys-devel/binutils/binutils-2.34-r2.ebuild
index 0f8c0bacf0e3..672f3cc3c5a5 100644
--- a/sys-devel/binutils/binutils-2.34-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.34-r2.ebuild
@@ -42,7 +42,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(ver_cut 1-2)
-		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 		;;
 esac
 
diff --git a/sys-devel/binutils/binutils-2.35.1.ebuild b/sys-devel/binutils/binutils-2.35.1.ebuild
index fb041ee7e6bc..2f8b80c52eea 100644
--- a/sys-devel/binutils/binutils-2.35.1.ebuild
+++ b/sys-devel/binutils/binutils-2.35.1.ebuild
@@ -33,7 +33,7 @@ else
 		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
 	SLOT=$(ver_cut 1-2)
 	# live ebuild
-	#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 ~sparc ~x86"
 fi
 
 #
diff --git a/sys-devel/binutils/binutils-2.35.ebuild b/sys-devel/binutils/binutils-2.35.ebuild
deleted file mode 100644
index fb041ee7e6bc..000000000000
--- a/sys-devel/binutils/binutils-2.35.ebuild
+++ /dev/null
@@ -1,437 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-LICENSE="GPL-3+"
-IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test vanilla"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here  (ignored for live ebuilds)
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=1
-PATCH_DEV=dilfridge
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SLOT=${PV}
-else
-	PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-	PATCH_DEV=${PATCH_DEV:-slyfox}
-	SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-	SLOT=$(ver_cut 1-2)
-	# live ebuild
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-fi
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( sys-apps/texinfo )
-	test? ( dev-util/dejagnu )
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	virtual/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git"
-		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
-		git-r3_src_unpack
-		mv patches-git/9999 patch || die
-
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.xz
-
-		cd "${WORKDIR}" || die
-		unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
-	fi
-
-	cd "${WORKDIR}" || die
-	mkdir -p "${MY_BUILDDIR}" || die
-}
-
-src_prepare() {
-	local patchsetname
-	if [[ ${PV} == 9999* ]] ; then
-		patchsetname="from git master"
-	else
-		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
-	fi
-
-	if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
-		if ! use vanilla; then
-			einfo "Applying binutils patchset ${patchsetname}"
-			eapply "${WORKDIR}/patch"
-			einfo "Done."
-		fi
-	fi
-
-	# This check should probably go somewhere else, like pkg_pretend.
-	if [[ ${CTARGET} == *-uclibc* ]] ; then
-		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
-			die "sorry, but this binutils doesn't yet support uClibc :("
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered. #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Fix conflicts with newer glibc #272594
-	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
-		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}"
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-		if use default-gold; then
-			myconf+=( --enable-gold=default )
-		fi
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd.  This matches
-	# the bi-arch logic in toolchain.eclass. #446946
-	# We used to do it for everyone, but it's slow on 32bit arches. #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
-	# on everyone in alpha (for now), we'll just enable it when possible
-	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
-	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		# Available from 2.35 on
-		--enable-textrel-check=warning
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		${EXTRA_ECONF}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-	)
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}"
-
-	# bug 637066
-	filter-flags -Wall -Wreturn-type
-
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}"
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH} #171905
-	cd "${ED}"/${LIBPATH}
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH}
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-}
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}"
-		dodoc README
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index fb041ee7e6bc..25e45ab6c6ae 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -33,7 +33,7 @@ else
 		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
 	SLOT=$(ver_cut 1-2)
 	# live ebuild
-	#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 ~sparc ~x86"
 fi
 
 #
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 3c556c54208b..881e00565b6c 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-common-10.0.0.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
 EBUILD clang-common-10.0.1.ebuild 586 BLAKE2B 662709a5185c65cfc72a20874193ec64fb14f697818a11f89bb59289b98cef9a3a34d178aaa9d8e55dd000a6576a6781cf7d94c335c4362f1952fbf7e4983e1a SHA512 a9bc61165d69104a671904f959fa824cb4c0d82f7f316a903f7e6c9a7748d01fd37c7d5ab09a8632a3c45354188b645456b4a7d9f8297a4eebe93b7533ee66eb
 EBUILD clang-common-11.0.0.9999.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
 EBUILD clang-common-11.0.0_rc3.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
+EBUILD clang-common-11.0.0_rc4.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
 EBUILD clang-common-12.0.0.9999.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
 EBUILD clang-common-9.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/clang-common/clang-common-11.0.0_rc4.ebuild b/sys-devel/clang-common/clang-common-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..18e41e0917da
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-11.0.0_rc4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh )
+llvm.org_set_globals
+S=${WORKDIR}/clang/utils
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+PDEPEND="sys-devel/clang:*"
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index d2b965f61ea8..bf419810c80b 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -2,6 +2,7 @@ EBUILD clang-runtime-10.0.0.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d
 EBUILD clang-runtime-10.0.1.ebuild 698 BLAKE2B f04b04bcb2e02fe8cfe61089982d9542379da412fd88f31316c5849b445c77bd488cfdfa28c6f5184807939ba9563205428237abc2630d0117c6f8a4a36c3aa4 SHA512 4cc5fef5cb012a1b01016f0c806fb3da85761fd515cc68b3f7bb95f1dde190b4558b9f7794259e267e9de7687af05fb11f709dba0c669d69aacc800c9189ca97
 EBUILD clang-runtime-11.0.0.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-11.0.0_rc3.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
+EBUILD clang-runtime-11.0.0_rc4.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-12.0.0.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97
 EBUILD clang-runtime-9.0.1.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f
 MISC metadata.xml 578 BLAKE2B d58a4d1a7bf88a0d5640a02f3acb7e491f275b3bb66a8583aa057b8daae93bb1dbb80f6150bc326228c6ab8c8f8498b46bf72a3fb5e97d0eeea2fb39f87660e3 SHA512 822f56b33d991088ad5e51c3dd96e2e36f544b68c57e45ed8365835d1ef6d0eb797f9de1f8f33b59fbbaf085e245079ca767d5e8b773261cf9ad2c5629b7b16a
diff --git a/sys-devel/clang-runtime/clang-runtime-11.0.0_rc4.ebuild b/sys-devel/clang-runtime/clang-runtime-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..2713d1f397ff
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-11.0.0_rc4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+PROPERTIES="live"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}
+		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 2556a1fbb0ba..cb5d22e5adb0 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -6,11 +6,13 @@ DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-10.0.0.ebuild 10366 BLAKE2B af2fc9f454038f9fbf552a217b8534d3c6fe74cac3bb58b167c96bdf3249e213dd64fc469a0f29f51a0dbf3e46c1dfdfdfb7680288df4fa13b21021d9a120102 SHA512 8e83ea9ff93c88c0d9fe3db936a8f2949413cab513ab675e936146130885ee26234174985e7616f1a830c9cb9c2b1c560f686570909115c4fbaccd7ba911ca28
 EBUILD clang-10.0.1.ebuild 11405 BLAKE2B 9ab0e63b50869afd35272f6028ff129d145f22d57309681800329c5cf42a9423552f80f6d7678a5ccceb164d7c1a8f5250403318068c1ee496da1fabe0a8f4de SHA512 50e2f617e8a1186f8000da61bfc27f80981df9284708fe8eae9c144cb2b3bae536b45834965a7195f160feaa6f07f339249f7271aee29eecc5ad6c2198b433b3
 EBUILD clang-11.0.0.9999.ebuild 11181 BLAKE2B 6b8a194faf777d0be720847059c268146608e22e86c99e3d2e127017f86a29c8278ea7d527e37d310f8604b66d17722abea18f1ff079a56c27fd82fa228bc71e SHA512 08bf959cf04b092fbb75b278e6dff2bb45c18c2d8fe0166e9da9c12f376b8c4a3a28704c0ab65406de144c8ffe8d325dbba815b3047afc1bff127f21abc1aafa
 EBUILD clang-11.0.0_rc3.ebuild 11181 BLAKE2B 6b8a194faf777d0be720847059c268146608e22e86c99e3d2e127017f86a29c8278ea7d527e37d310f8604b66d17722abea18f1ff079a56c27fd82fa228bc71e SHA512 08bf959cf04b092fbb75b278e6dff2bb45c18c2d8fe0166e9da9c12f376b8c4a3a28704c0ab65406de144c8ffe8d325dbba815b3047afc1bff127f21abc1aafa
+EBUILD clang-11.0.0_rc4.ebuild 11181 BLAKE2B 6b8a194faf777d0be720847059c268146608e22e86c99e3d2e127017f86a29c8278ea7d527e37d310f8604b66d17722abea18f1ff079a56c27fd82fa228bc71e SHA512 08bf959cf04b092fbb75b278e6dff2bb45c18c2d8fe0166e9da9c12f376b8c4a3a28704c0ab65406de144c8ffe8d325dbba815b3047afc1bff127f21abc1aafa
 EBUILD clang-12.0.0.9999.ebuild 11215 BLAKE2B 63ad3811c2942c22bd3b4a2e9b0550096175514f005e9e7df0730de06daed8b3cf0591a1b0cd1d098ed38491be6cb93f1e5ea2825d12254a61cb703b836dcebf SHA512 e290d7a08d01e8bdbe9e39613166e54c6b25f8d3084e444a47c215e11809ef4760fe7cdfd26955ce52bf17d5e341a3c7e825f96a0aae26c6b6a0754c18b88cbb
 EBUILD clang-9.0.1.ebuild 8982 BLAKE2B 05319c777c4ecfd03a54bc9e14f322ad6f348a99554ebf8eb1e3a0a1b8c7aba5f3ba618fd3edb21022dd34f1cd4dca2c3f24b152b6f795b939a77c8959d27fa1 SHA512 f88f6c0dc7f1faed0f0d8310c9235a4d0d17352f710f28d9a8c7e47e28aaa43f7727e3e2a7e30334ffae7cb2e6df7769a543fd4c79a0ecb8a1f0a480b15fdb06
 MISC metadata.xml 1336 BLAKE2B aaddc1c1193323466a545df21dfa53b637c3edff4f61cd55037d8327273457cf8d35cad7b92a2eef31acfb055a3e1ed93cb53a913b01eddf43b7b3dc6de880c4 SHA512 0538198df449cdf4d0cd00cb50d7c6883b06524419a29c4376cdcaed440fb84cfbd4983a1a025ae9a6e2fc5d91a4870bfcde587c493d8b617baec2214705601c
diff --git a/sys-devel/clang/clang-11.0.0_rc4.ebuild b/sys-devel/clang/clang-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..8f5be4425a42
--- /dev/null
+++ b/sys-devel/clang/clang-11.0.0_rc4.ebuild
@@ -0,0 +1,408 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org multilib-minimal pax-utils \
+	python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+llvm.org_set_globals
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx default-lld
+	doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/sphinx
+	xml? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!<sys-devel/llvm-4.0.0_rc:0
+	!sys-devel/clang:0"
+PDEPEND="
+	sys-devel/clang-common
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	default-lld? ( sys-devel/lld )"
+
+# 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_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	mv ../clang-tools-extra tools/extra || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# headers for clang-tidy static library
+					clang-tidy-headers)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-wrapper
+			clang-refactor
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+
+			# extra tools
+			clang-apply-replacements
+			clang-change-namespace
+			clang-doc
+			clang-include-fixer
+			clang-move
+			clang-query
+			clang-reorder-fields
+			clang-tidy
+			clangd
+			find-all-symbols
+			modularize
+			pp-trace
+
+			# manpages
+			docs-clang-man
+			docs-clang-tools-man
+		)
+
+		use doc && out+=(
+			docs-clang-html
+			docs-clang-tools-html
+		)
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-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=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		-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_DEFAULT_LINKER=$(usex default-lld lld "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	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=ON
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON
+			-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
+		)
+	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 can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	# 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_build check-clang
+	multilib_is_native_abi &&
+		cmake_build check-clang-tools check-clangd
+}
+
+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 "${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
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# 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() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# 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
+
+	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 [[ -z ${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 "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
+	elog "  dev-python/pyyaml"
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/dwz/Manifest b/sys-devel/dwz/Manifest
index f853f5a83ad0..a348d0ef9a70 100644
--- a/sys-devel/dwz/Manifest
+++ b/sys-devel/dwz/Manifest
@@ -1,3 +1,3 @@
 DIST dwz-0.13.tar.xz 114016 BLAKE2B 0e53bb99a7790dbdd724594ad00f76267483fe31bf99c9a6ea67f8ca031d2559d5cfc79f613c81b1a99f9086aa16570cb4d850f36ddbc60bdec443dc3122cae7 SHA512 8dc5e647a99ab652fbbed2d37c595a072a2e31198e66f84220d4caf04a9ee0b2900b116932f268b68015e4cc6b49b87313bf1a2d00748d2b3c4799c9ee58c2f4
-EBUILD dwz-0.13.ebuild 502 BLAKE2B 53f8f9d13b21c4ac3e80087dba3d1b9c42af3c3f19900a0a0ac620014895661ac2c2c6709552108c8f6554bb44379eccc04b0db349d099536d773b81a2e12ef5 SHA512 34e876834f20bc3fffb3720bbaae26a0ce747cd8516e6fb9ae3cf34d7e967fd7ba9bf10ce75c92121ea1fb5e8bbab142c3503704480a46db6401c13c23498589
+EBUILD dwz-0.13.ebuild 606 BLAKE2B 4c579e1d0d1b88be896e5f0b0ade3fe199f5b7a117b13732ed4ea45f97c71b675384091811bb447741220ac048b577b6d590bff09b5f588600eb280c0af8eb8b SHA512 5042c6ef4dee6c50399c433851c84844977ee3f9dc0289292d4bef298dc4bf4111ab337b0f68b6d6d67e1986de8de3f2df319cb06b23b776dd2e48160e9af38c
 MISC metadata.xml 918 BLAKE2B 7d94594246e411793f1dd68161be15e1032ac3e3d0a2cd1595532a13f5acaf0a03b9f0c5161befc57e30873dbb262d59cfd3c9e46ac8d3a124b553ca79df5734 SHA512 6ab2333960c27add9c83a6af83183841a75c5db023e12e14efd01a9a43f85e6241d0091d9aab133e248aa38302b8c2743dd467a2ac9469819055ec0df5af9145
diff --git a/sys-devel/dwz/dwz-0.13.ebuild b/sys-devel/dwz/dwz-0.13.ebuild
index a99b0d53e373..58aaf22593d5 100644
--- a/sys-devel/dwz/dwz-0.13.ebuild
+++ b/sys-devel/dwz/dwz-0.13.ebuild
@@ -14,9 +14,15 @@ S="${WORKDIR}/${PN}"
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND="dev-libs/elfutils"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-libs/elfutils"
+DEPEND="${RDEPEND}"
+BDEPEND="test? (
+	dev-util/dejagnu
+	dev-libs/elfutils[utils]
+)"
 
 src_prepare() {
 	default
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 851c5015bf6b..b4a9a24356e8 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -15,10 +15,6 @@ DIST gcc-10.2.0-patches-2.tar.bz2 17701 BLAKE2B bed0cf2dcb6b2e35dbd86c43db617cfa
 DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
 DIST gcc-11.0.0-patches-4.tar.bz2 12829 BLAKE2B d0e12c09268e096390c3841e466e35bcd66a735536287c80d9713335a65a82c55ade728b487ed549ba1bfa60c9dd95bcad5ae27a86619f2a7c3236fdf457b41b SHA512 010b90b63ac142efeabc1c51287727f472a469a7a25e0576f5bdc380206cf500ae78060da3e97fa46c3fa7288e6cb1b4a2b7b78d7c8704b6db05a23be902e649
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
-DIST gcc-4.9.4-patches-3.tar.bz2 27908 BLAKE2B d3dd297df864e2240e4b80b8c81266ae9a6c3acf97111a2a682c5e12df99719c57810f677ae9e8a6177c685aada7cc4cf48a2b493f3202a37cd3f36e96e3319c SHA512 8f2058b7effa8bbf5cbafd474a045763274d9cd70a381f3b163e06c3db7495a458565a94f63e8afe7640006986e787bdfcf2b36d1e3c8f4364969aaf6bc5eff3
-DIST gcc-4.9.4-piepatches-v2.tar.bz2 14237 BLAKE2B 60afc2b8f78838a5f444819401d79a3a48ad0ee2ddd09bf32da1b06dcc6f933be61951f7c6b53d8224319a5d42c6b79b299bc06930eea1ca31301a1bb0b88513 SHA512 fdca8ccc81bed856c4a2e0da7a8cf897ca9765f9b448595bbf0d5a93702d91cbf937b560ebff96e3cd820b7747dc60a6a490d78adbacca751ecc7351ada2c56d
-DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
-DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
 DIST gcc-5.5.0-patches-4.tar.bz2 31676 BLAKE2B 9fef84a494dc19668f1118733712fcd6bb17725ccb8381ce7906233d2beebaeb6ef579e6ee7e0903c19d50edbce642b861a26a69c8d26c00b7ede2f558d9965a SHA512 5fade4c71ae5c51ae320da267ca3e79f08316e6545776b80a01f4a8d762880953d17ca7afb6319076cad83f90f5b1b6cc7889d2a2968c6a7feb5946d69a1fa15
 DIST gcc-5.5.0-piepatches-v1.tar.bz2 14367 BLAKE2B ce1d288ca4d563cb12e2795dbc9f9c674e451295c75fb4b15b9ba65d3efc8dacea725775cca8c67b581647235b692dd4083e8b158f87c7951bbf6303d8efed43 SHA512 6baf18a7ac6cdc1f93a1a8f87bbbdcc96c68d2b256e82ce04beabdd4ad82b2260e04dbff0850da703fb94bb1f9e13439d2922d7aaae3b12eaa92bc53a89a9398
 DIST gcc-5.5.0-uclibc-patches-1.0.tar.bz2 3518 BLAKE2B b528d79d41de1099f3540c168339350b403568f38a338a5eeaf0a080ebc850cfa390ec72f03a6c61433f2617eaa452ed0c7397a530662188e9a73e5144bd6a1d SHA512 97b97d99fd121642ba7c170c62de245e9f2719dbfae148e0d69f7ee172f84669277f4ef26554fb4cecfab5956587ce50131d92e4244f28f914d1eecd2c361ba5
@@ -35,7 +31,6 @@ DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6
 EBUILD gcc-10.2.0-r1.ebuild 434 BLAKE2B 0a13b431e4ac099cb2ce6a33f35152778097a7f8444ab873bbc35b64284bcf870ea19239d4d0a64a926b9ceaf86cb5c2475528ab5683803b45bf7bec18b9e33c SHA512 1a4f4625297720efa27a50c4b1d96134efd86ed2717fdafa3644090cc957b0635ae8aefacca263a29c5a32770486f8d6b81cce08d10dc0534598b7b3bed72cc8
 EBUILD gcc-10.2.1_pre9999.ebuild 807 BLAKE2B 08c2172ac50d043050dcfb3d69c138c51fb8d58f2601c14bcbaa4df5d9e844639f0bd345b14a702a86cebb7c420ca4cd831e0b8a995b036e7fd261963663e331 SHA512 0c05fc611f569a49d95d766048f6a1f3972108f7cbf2d03d5dc9a0f0ad29bf1ce4dd2269edabb0912628c9d5e8e377e9be586dbd07f182ebadbe7721a7cd5108
 EBUILD gcc-11.0.0_pre9999.ebuild 511 BLAKE2B 6a2aeea8fadc80745e6d7054611c0f877ccd90e8696d22748c7f1ac7c8256c7830a9509afd66e26c0c0dc68bcdce5004cf880fa1960304e5a024ffe3238b0f3e SHA512 e4bced5f4b44310966329d156671a7907adc117f9e58f3fc22dd4599e75a5d53fc06ee029bf1decd3e12d9f5d21eb2049eba5b3a33562e27c96241a5c3cc72b2
-EBUILD gcc-4.9.4-r1.ebuild 1438 BLAKE2B 0cd42c3a15b80146943fedbee5cccb05ae3832b53fe674a43c85a7f87fca6c1ebaa7097687281dafe2dad993da78ef5c1bfc6e3176559031ac9ac9ffae0fc7f7 SHA512 0ae3fdba2aa7f2525c28c4b2a2dcd7db973b3efde3e8467f24515739c36dcc858cd95cded2e3bdecee92e87ba5f06ac1405613c67bca7cf9be19caec2531c136
 EBUILD gcc-5.5.0.ebuild 1253 BLAKE2B 977028492445b2a30a9c2477cef241ec5fd08fc0b7334d5b0f16d8ca8aaf90288bc336c5961760477ddca362db423b5d7481380c8b62ce068cc6c6d34aa1a642 SHA512 acfb8e42fe2748a30ef96d9a11785c266361d37a5348601f627ca4e942a98f3b797eebc92aca430352aa9d9f3cd65b208d5e8a8c0dc91e2471462638ad69e351
 EBUILD gcc-6.5.0-r2.ebuild 436 BLAKE2B f340e099406e6325e3ace5d179b01f1972acab4482be0af46017d1e55f5fd2a7bf1b8f7e7c7b493084bfbe4fd9c889d51f85d2ddd379f481181e9f645b4eebe7 SHA512 d5c9af31f338affd52e90651d2119bcc9f142d3699f83c5b14b095c8e05b9a1ffcb9d60f464567dee581ca26cf692bd0a611046e93ace8d85676ede02d9166c2
 EBUILD gcc-6.5.0-r3.ebuild 439 BLAKE2B 4c2b8283b6bd0b7104d1be4e11d65a5986e451c9d1f532001532b84538670e48b81f035e3af26e4333e071195ed66476a53439e20470971bef38739a8a7fd385 SHA512 c4b54e30604002d43e1369017fb592aae2668b3bc5b03a1390bb91e59fcc118a3b50f13bfa9f47e50a8ba85109eb2e90a00f652623733633c2d29a393eddd5eb
diff --git a/sys-devel/gcc/gcc-4.9.4-r1.ebuild b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
deleted file mode 100644
index 790cb126b299..000000000000
--- a/sys-devel/gcc/gcc-4.9.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PATCH_VER="3"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="2"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-#end Hardened stuff
-
-inherit eutils toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	# Bug 638056
-	eapply "${FILESDIR}/${P}-bootstrap.patch"
-
-	toolchain_src_prepare
-
-	use vanilla && return 0
-	# Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
-	[[ ${CHOST} == ${CTARGET} ]] && eapply "${FILESDIR}"/gcc-spec-env-r1.patch
-}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 401f5530ea4e..b828ae715bbf 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lld-10.0.0.ebuild 1478 BLAKE2B b91fbc24f88a6365b543ef20b6e80398545e921bf0ea8431a3b450a77cf1fa637506513d43d023b25a665a2a9324582e78adbce0df709f237b4e8a542181fa02 SHA512 8b45bf02033c78110eef573a2d7018972527637352bf097166f7a8fe6966fea9cf934e22f7aee62a9390e859d28fadca1c74dd0bc87874d0d5a3d6a720caef82
 EBUILD lld-10.0.1.ebuild 1329 BLAKE2B 24ef8612fe55b962e16117b59c8bffb9b587b0608579c3b0a930b3d3ae1457377ebb22fbd50b979c6dda436dcbdad57f6fcea7bdad209d6afbf02c80a02e70a6 SHA512 6352bb20b21e2234fbf5d3089b9318333b4c7ca0b5724cc3740d09720acffb56b628df18bc9a7178c7989c9085440ee5150f0bf87a620d67d3f69c2d9c6e41a6
 EBUILD lld-11.0.0.9999.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
 EBUILD lld-11.0.0_rc3.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
-EBUILD lld-12.0.0.9999.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
+EBUILD lld-11.0.0_rc4.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
+EBUILD lld-12.0.0.9999.ebuild 1712 BLAKE2B 3474cccbcab21eb1f7f0b5853465c8867c05ce9f0251a8e0f3b91f49c4491e2609f1d4a68e262dacae04d6d1786e0144a1a4a0864756b4183c5e39a55dfb5447 SHA512 5ce94b6b59396739cc0d4e6c7ffccc0ae23d9586b683705603f255accb5d1d1114c3082113853fe5c84a8692a46af42d208b70810b38a638243e113882646e68
 EBUILD lld-9.0.1.ebuild 1323 BLAKE2B 042f875208515a2b9c39289239601e9b573aa2d9603f2bd58652612d44ff9e62b5776a2370eac1b6933f38f6dd085d3ba24749509eeb2084416e78dc4b5f8fe2 SHA512 d0a352fa95f0e5c47edce97ed4344555ee56d09b70db50b79f2b0ce50ab41e71aaa427dd4218f7239bfa56a439d04b9e99d4eabaa07f573617d55ac259721b55
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-11.0.0_rc4.ebuild b/sys-devel/lld/lld-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..7b627c88cf1b
--- /dev/null
+++ b/sys-devel/lld/lld-11.0.0_rc4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lld )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
+
+src_install() {
+	cmake_src_install
+	# LLD has no shared libraries, so strip it all for the time being
+	rm -r "${ED}"/usr/{include,lib*} || die
+}
diff --git a/sys-devel/lld/lld-12.0.0.9999.ebuild b/sys-devel/lld/lld-12.0.0.9999.ebuild
index 7b627c88cf1b..88c1fe13f11f 100644
--- a/sys-devel/lld/lld-12.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-12.0.0.9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lld )
+LLVM_COMPONENTS=( lld libunwind/include/mach-o )
 LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
 llvm.org_set_globals
 
@@ -31,15 +31,26 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
 
 		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 	)
 	use test && mycmakeargs+=(
 		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
 		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 07d00ffad277..d9406608b6cb 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-common-10.0.0.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
 EBUILD llvm-common-10.0.1.ebuild 601 BLAKE2B 5d30bfa020f57e7b73406d6a5b297c295560543a051e40896df1ccdc620c186046e67f0613a7239e1d183a1ae6cc2e724e0177e15f5d75e9f966d3545d4d6df1 SHA512 3398aa2abe0eec569cd5b7985dc0666a120ebd8271bed27b8e039418208dc65603de0b2248ac7783f479905aeb50880f44ebc633626e69e8350cff61c79865a7
 EBUILD llvm-common-11.0.0.9999.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
 EBUILD llvm-common-11.0.0_rc3.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
+EBUILD llvm-common-11.0.0_rc4.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
 EBUILD llvm-common-12.0.0.9999.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
 EBUILD llvm-common-9.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-11.0.0_rc4.ebuild b/sys-devel/llvm-common/llvm-common-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..df9cf92b47a1
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-11.0.0_rc4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest
index 4c40a1c54d10..be8dc74ef1a4 100644
--- a/sys-devel/llvm-roc/Manifest
+++ b/sys-devel/llvm-roc/Manifest
@@ -3,5 +3,5 @@ AUX llvm-roc-3.7.0-current_pos.patch 1292 BLAKE2B 8481497e3f9c46c142034ae4c5455f
 DIST llvm-rocm-ocl-3.7.0.tar.gz 116973132 BLAKE2B c1cc8a3b95292d726626d3cb59ec1b96549682bfcbec16030e47cf1318c6ea01bc76f3349f012ce4f1e4d8b9fe192c51a025c2d08cf593622c61fe7c61969ba6 SHA512 0626075bedb3898c96c0bb0be7a2aba4662050a1c738115f661bedc03d744ace7a4581b55c6325060740c13a0e50e72e09272bb02c1186c2c4a40fc9b961dcbe
 DIST llvm-rocm-ocl-3.8.0.tar.gz 117004300 BLAKE2B 13c3213f0fb951fb9d574e8f6d76bb6c632fecadfe93dbe68a9720baa22e35aa3269deef8b533c5a5ff50a2c1ee3dd7a1ea0fae4b8ab8573ec5bfc5ca5d04f4f SHA512 4eca387a132c9d1237ebec7c80319e99c80088766209d05a697d09890f4a82c56ba5f48a5c8c8749bb051c177bb5eab67e00405b04d3191681d0ac7cf1ae868c
 EBUILD llvm-roc-3.7.0-r1.ebuild 1397 BLAKE2B 08aec56b8ab26093f28a9118ca043adb35dcb84ae5899da5890cbeecb5d10f8d6b08e767a490272a5f35d1b3a5ee8d912a52b448ee57582cda9f99fce57ec8ec SHA512 745f2a9fa18bc3b9d76a324beb1e5165f9be8f720ef133b35e1509c08c08e48872ec4c7402e52d29a3b493e27729a43081fd0e90afe90d30b64d6da3f046e824
-EBUILD llvm-roc-3.8.0.ebuild 1404 BLAKE2B 6d42d82eaee7ba82a727bc5f9f908212e410f1819b4a448d0cab4e49af169ae3923fbfd46fc0b0847ac88de79cf021bcf6b4d304dbc3fefd1a29b79a067d39b1 SHA512 f322c8d0d74efc499ea9358d3acc3c60cf8300674a25135c6c0c81945121352b9077af98dfe9abec2532bac468664a1fa171c41f41f8eb07b9ba3699b37947c5
-MISC metadata.xml 365 BLAKE2B 22b9f4a7b16e5666ba2945afd12d7814477261cc16b67d87c220172561aa543bd5123f562be4b9dff1df396eec792a7d0ca48069f1f6f325a1e328d54ae86304 SHA512 1244d72c8f7c8d281bb66a63df7a964fa41724c49032ab565627e11080ef055e80c786dae3c0d963242b894dc7bcab9f7243018f51abe7dd96bea2bf7cc4faa7
+EBUILD llvm-roc-3.8.0.ebuild 1492 BLAKE2B 73fd9fd2c47a18b5de44222b84fead548f85b4e67c18838050c52917b6836debee77bc83db6aa0a378516b48a56e5daaac53dde84bdbe1dbefd02494b06498d8 SHA512 d45f0e60c2f12e9b98425310fe370aeeb5d29cd24bfa83b1b908bcbc25866a49e6e1fc7facb04e699bd897f1960a394f2e3a4c5a8308ad9af6177f735dc40631
+MISC metadata.xml 461 BLAKE2B 5a060c417f0bb9bf1fba8375292e7bff20b2c50c3a2ab490bd436f81a954dbd370d61ba59b305b8bdaad9887e9c6a872eb30fea31c566dc6d74d3493b40d0a26 SHA512 a82c2186fc0642dab37608155dcf0aafd20701cb7e2769c6eb3aae88d4df6690743769a75f47efdb36fd8a3d6771f0feecd3efd01c98460fe195394c16d95660
diff --git a/sys-devel/llvm-roc/llvm-roc-3.8.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.8.0.ebuild
index 50c927f78d37..8bcc3f8ce0eb 100644
--- a/sys-devel/llvm-roc/llvm-roc-3.8.0.ebuild
+++ b/sys-devel/llvm-roc/llvm-roc-3.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.ta
 LICENSE="UoI-NCSA rc BSD public-domain"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug"
+IUSE="debug runtime"
 
 RDEPEND="virtual/cblas
 	dev-libs/libxml2
@@ -37,9 +37,15 @@ src_prepare() {
 }
 
 src_configure() {
+	PROJECTS="clang;lld"
+
+	if usex runtime; then
+		PROJECTS+=";compiler-rt"
+	fi
+
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc"
-		-DLLVM_ENABLE_PROJECTS="clang;lld"
+		-DLLVM_ENABLE_PROJECTS="${PROJECTS}"
 		-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86"
 		-DLLVM_BUILD_DOCS=NO
 		-DLLVM_ENABLE_OCAMLDOC=OFF
diff --git a/sys-devel/llvm-roc/metadata.xml b/sys-devel/llvm-roc/metadata.xml
index 303f9081b054..bf09a1db7df6 100644
--- a/sys-devel/llvm-roc/metadata.xml
+++ b/sys-devel/llvm-roc/metadata.xml
@@ -8,4 +8,7 @@
     <upstream>
         <remote-id type="github">RadeonOpenCompute/llvm</remote-id>
     </upstream>
+    <use>
+        <flag name="runtime">Builds the compiler runtime libraries.</flag>
+    </use>
 </pkgmetadata>
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 62d72d636baa..32282d709935 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -7,11 +7,13 @@ DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-10.0.0.ebuild 10751 BLAKE2B 338970325836138a0214d3e97e1b408b466052abe7bda4815edcb41e3b998a7b9df26bcf2caf457ee8b66d997b383a0f94a196a580671db4b5288b8522e48bb5 SHA512 c588a1cce4e950bdbd189ad0f44c1b9377adc5bdf041a1da4872cc2d629d79f73132f1776cee09d8e08cd799aa7bc0473915d3a3644606e3cc26f5329b533194
 EBUILD llvm-10.0.1.ebuild 11705 BLAKE2B d0c82c5652f611446cc36756ef005fb970b7dfda8c2e6ef6e64818564f2918340f0243cf3b82ff91d1b7f6d1dfb926f5e3f057d81f0a25ea265e1629f0cc2398 SHA512 651e7135a571e7404d8db82d36a5904b957752d164be9c24ad8847ddb3589c4ad571edb96cd56c6e38ffb9dc61601dee47a766a39b3904f67f8706ac8e0a011d
 EBUILD llvm-11.0.0.9999.ebuild 12325 BLAKE2B 41fe35b64d8f98a89f1a0ccab2861ad2d8ac4073ca944fa0f29d51246a9df5d06fd94ce2e68983e4936341c72c5d296b2af1dc8eb3414645f533afcb664653ed SHA512 d3e15dd002796b0f4b06daad6d33ed14f96b60eb45db74584c2b39878c0b064c5f185edf728d11e943b930f508f115cc3b88c05bc0da8274a42749bd8a88e528
 EBUILD llvm-11.0.0_rc3.ebuild 12325 BLAKE2B 41fe35b64d8f98a89f1a0ccab2861ad2d8ac4073ca944fa0f29d51246a9df5d06fd94ce2e68983e4936341c72c5d296b2af1dc8eb3414645f533afcb664653ed SHA512 d3e15dd002796b0f4b06daad6d33ed14f96b60eb45db74584c2b39878c0b064c5f185edf728d11e943b930f508f115cc3b88c05bc0da8274a42749bd8a88e528
+EBUILD llvm-11.0.0_rc4.ebuild 12325 BLAKE2B 41fe35b64d8f98a89f1a0ccab2861ad2d8ac4073ca944fa0f29d51246a9df5d06fd94ce2e68983e4936341c72c5d296b2af1dc8eb3414645f533afcb664653ed SHA512 d3e15dd002796b0f4b06daad6d33ed14f96b60eb45db74584c2b39878c0b064c5f185edf728d11e943b930f508f115cc3b88c05bc0da8274a42749bd8a88e528
 EBUILD llvm-12.0.0.9999.ebuild 12348 BLAKE2B 2a40e5ce5c5f930d7a50da3bae3fd3324ffdd4e9b0824e440d2f741fca13b4acb9094948961951d20a1ac14f2bbbff24fc92c693ab132eb10917d790d970b9c2 SHA512 f107d05eda19a34c4a0cf8204ce1fdba0683b9d096ed2f3ebde36c59bc666bc4e159d82782d5a12624fc193f49224cf51313312dd222a85c54977900a31f521d
 EBUILD llvm-9.0.1.ebuild 8454 BLAKE2B 33b4c7bdf4bc136d29f3f6f505799b11de31d33e393b51c9bafb121b0b8b347e86a5954ba6ba039cd6b39cb7c1a501d4747f51652351559c42ba0b84c4bae54b SHA512 f43a600265c1559e924a6f2ec97dffdacfae35df2cc3e3e874704c5ae179ba48d90fdd666411cdab500d171fa63b557538282545c7c4078867857e077c941a4c
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-11.0.0_rc4.ebuild b/sys-devel/llvm/llvm-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..6ee898821d6b
--- /dev/null
+++ b/sys-devel/llvm/llvm-11.0.0_rc4.ebuild
@@ -0,0 +1,503 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+# Those are in lib/Targets, without explicit CMakeLists.txt mention
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+# Keep in sync with CMakeLists.txt
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	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=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	gold? ( sys-libs/binutils-libs )"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	libffi? ( virtual/pkgconfig )
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] )
+	')"
+# 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} )"
+
+python_check_deps() {
+	if use doc; then
+		has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" ||
+			return 1
+	fi
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_live_ebuild() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+	# reorder
+	all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" )
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then
+		eqawarn "ALL_LLVM_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}"
+		eqawarn "Expected: ${all_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# Fix llvm-config for shared linking and sane flags
+	# https://bugs.gentoo.org/show_bug.cgi?id=565358
+	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the live ebuild is up-to-date
+	check_live_ebuild
+
+	llvm.org_src_prepare
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwp
+			llvm-elfabi
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-lib
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-pdbutil
+			llvm-profdata
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-rtdyld
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-undname
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+
+			# manpages
+			docs-dsymutil-man
+			docs-llvm-dwarfdump-man
+			docs-llvm-man
+		)
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use gold && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+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=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_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_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+		)
+	fi
+
+#	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
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=ON
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=ON
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+			-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
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	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_build 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() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		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_
+
+	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 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/prelink/Manifest b/sys-devel/prelink/Manifest
index 737fbc460513..f153ff72aa04 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -7,6 +7,5 @@ AUX prelink.timer 140 BLAKE2B 2ed2a1d3b2d64c8d7329c888bf72cddb154a0d09b95d6dafe3
 DIST prelink-cross-20151030.tar.bz2 701337 BLAKE2B 4875b936254a03afd0eeb1ee81ee99f97a2d654b7c0379acb80ea3763412f3e892c366a9962ff3e1493bba9c83a8a140e79a1d5fb08b269a08ef596d63fd1d32 SHA512 75edd8617b95ae5bd3bfc968732ee142c968855c97c5b2b93784d3476a9724e0fd9a4eb7af681a5356616a4f023e24d5c5a2e75fb57e2a25b142cc901d9bfcaf
 DIST prelink.pdf 474129 BLAKE2B 6df5d4998d0822a8032c5dcd1103d7eafa8e9002f2cbfa8fa821131d7c804d2998100dc98d310ae3ae601137b6815435ecdd2684d547a8d25025984c20c06318 SHA512 86b7163fcf6f43d1764183b3dfc30aad8de99ce198b2721af276c81fc361e9f5fd8f4aea1e8e0c653f0566e8346dff4b4ba72909359167aa92c094f5561d2e1e
 EBUILD prelink-20151030-r1.ebuild 1790 BLAKE2B 451d353fcd6b153f8e7d82227aeffa03bb81807ff1b1d159538588af4856f6fe196e24c84a673901b5be61aa255eaf22fe1af3cd2f1ac82fdef5ece1ae39c36a SHA512 e9a57df9ff5c27e5c3e090fda02831eadc9aa5cfedf94395cdf84d05b19adbfaf55a148c9d1c926a73b5b141d1f7d226d7dfa3676ca6efaac2eaa3b4b76c8d98
-EBUILD prelink-20151030.ebuild 1728 BLAKE2B 135fab33e693b2fb3f0df564f0eef138177e9ccc7e604474607557d267a310ed96c54023f0e56b79ec3ca91891e64e8687788678b93811a48da2c060f560f461 SHA512 9a64e74420db58640d46d4b4ebf7b7a60fe005801193992427a77628920797fac56d02b6eadeec080abb3b0cb40fdb4b646a8e9fa59cf2333f0dfa0fa9e60337
 EBUILD prelink-99999999.ebuild 1723 BLAKE2B abdb7d80d8a9a1330fd5e9c67c40e9c4a26fa7b849726249f35ccd541ba219607d5bc00a81de4c1b86b4fa51fe542de04636251958687ce6ce1afbb9c6856fb9 SHA512 a070d459d47e21ecb1f550f56b4cd1ecbd224a43184e11788062adfaeacb45cd404da0c4834301b6b2150151673d9e4b2b0e712342eb406f29a63679b20cb1a9
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/prelink/prelink-20151030.ebuild b/sys-devel/prelink/prelink-20151030.ebuild
deleted file mode 100644
index 1b0b170001a8..000000000000
--- a/sys-devel/prelink/prelink-20151030.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2002-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN="${PN}-cross"
-MY_P="${MY_PN}-${PV}"
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Modifies ELFs to avoid runtime symbol resolutions resulting in faster load times"
-HOMEPAGE="https://git.yoctoproject.org/cgit/cgit.cgi/prelink-cross/ https://people.redhat.com/jakub/prelink"
-SRC_URI="https://git.yoctoproject.org/cgit/cgit.cgi/${MY_PN}/snapshot/${MY_P}.tar.bz2
-	doc? ( https://people.redhat.com/jakub/prelink/prelink.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="doc selinux"
-
-RDEPEND=">=dev-libs/elfutils-0.100
-	selinux? ( sys-libs/libselinux )
-	!dev-libs/libelf"
-DEPEND="${RDEPEND}
-	sys-libs/binutils-libs"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20130503-prelink-conf.patch
-	"${FILESDIR}"/${PN}-20130503-libiberty-md5.patch
-)
-
-# tests were fixed only in development version after 20151030
-RESTRICT=test
-
-src_prepare() {
-	default
-
-	sed -i -e '/^CC=/s: : -Wl,--disable-new-dtags :' testsuite/functions.sh #100147
-
-	has_version 'dev-libs/elfutils[threads]' && append-ldflags -pthread
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable selinux)
-}
-
-src_install() {
-	default
-
-	use doc && dodoc "${DISTDIR}"/prelink.pdf
-
-	insinto /etc
-	doins doc/prelink.conf
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/prelink.cron prelink
-	newconfd "${FILESDIR}"/prelink.confd prelink
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		elog "You may wish to read the Gentoo Linux Prelink Guide, which can be"
-		elog "found online at:"
-		elog "    https://wiki.gentoo.org/wiki/Prelink"
-		elog "Please edit /etc/conf.d/prelink to enable and configure prelink"
-	fi
-}
diff --git a/sys-devel/rust-std/Manifest b/sys-devel/rust-std/Manifest
new file mode 100644
index 000000000000..be088cad5481
--- /dev/null
+++ b/sys-devel/rust-std/Manifest
@@ -0,0 +1,3 @@
+DIST rustc-1.46.0-src.tar.xz 101868452 BLAKE2B da9798596b124a10d79c236a871228f05e5f571d22c2259328e7026c91e088c85f5de9c0536a16531e0cb10477bfcd16d3ac11467979f5561cb6199442b877ef SHA512 099857f1d295043587a4e2a65ef3e6a90e12c8b6958e98535a1656c113c553f9a9b621aba8a19cf21bd8d2c79d27cbfa4b8e6fabbcb3cbfee23b545be7b450b4
+EBUILD rust-std-1.46.0.ebuild 3220 BLAKE2B 29a66cd46bbd78d716fe0e7db483865b1b5a8b12200202e21f061624be9b3385e9fc1561a092b2f21be9a7d6cb84b9460a1ffafc67ac2d90db95f99be0e69bfc SHA512 129ab7a762c6dc633dde21235ab3d7267d3cb9ed800cb3b506b0e5a2de3ccad8fe4e5a31f51eddda6e840b457b9883827f94fdf41f80b8ece54fde3ebabec7e1
+MISC metadata.xml 818 BLAKE2B 32766ac24fada44b46f8d4ef77164a4e4843b876347056223184ec6fe48af9a6e2fa7d3e1fd48dec299f328f37fbdf4c84225a7450b788ce3e6c92e87bf8f313 SHA512 c1c4a46790dedc83b6890bbb536927148b293eed7f4d3bbd1f602b7664a9b303ca9689d4d1d35ed8047c2c909d64145fc4098efbec279f630b86207b0216ca80
diff --git a/sys-devel/rust-std/metadata.xml b/sys-devel/rust-std/metadata.xml
new file mode 100644
index 000000000000..c736f846eb11
--- /dev/null
+++ b/sys-devel/rust-std/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>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>rust@gentoo.org</email>
+		<name>Rust Project</name>
+	</maintainer>
+	<longdescription>
+		The Rust Standard Library is the foundation of portable Rust software,
+		a set of minimal and battle-tested shared abstractions for the broader Rust ecosystem.
+		It offers core types, like Vec&lt;T&gt; and Option&lt;T&gt;, library-defined operations on language primitives,
+		standard macros, I/O and multithreading, among many other things.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">rust-lang/rust</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-devel/rust-std/rust-std-1.46.0.ebuild b/sys-devel/rust-std/rust-std-1.46.0.ebuild
new file mode 100644
index 000000000000..a90e4641c1f1
--- /dev/null
+++ b/sys-devel/rust-std/rust-std-1.46.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit flag-o-matic multiprocessing python-any-r1 rust-toolchain toolchain-funcs
+
+DESCRIPTION="Rust standard library, standalone (for crossdev)"
+HOMEPAGE="https://www.rust-lang.org"
+SRC_URI="https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable/$(ver_cut 1-2)"
+# please do not keyword yet
+#KEYWORDS="" #nowarn
+IUSE="debug"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	~dev-lang/rust-${PV}:=
+"
+
+DEPEND="||
+	(
+		>="${CATEGORY}"/gcc-4.7:*
+		>="${CATEGORY}"/clang-3.5:*
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+# need full compiler to run tests
+RESTRICT="test"
+
+QA_FLAGS_IGNORED="usr/lib.*/rust-.*/rustlib/.*/lib/lib.*.so"
+
+S="${WORKDIR}/${P/-std/c}-src"
+
+#
+# The cross magic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+toml_usex() {
+	usex "$1" true false
+}
+
+pkg_pretend() {
+	is_cross || die "${PN} should only be used for cross"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	# do the great cleanup
+	strip-flags
+	filter-flags '-mcpu=*' '-march=*' '-mtune=*' '-m32' '-m64'
+	strip-unsupported-flags
+
+	local rust_root x
+	rust_root="$(rustc --print sysroot)"
+	rtarget="$(rust_abi ${CTARGET})"
+	rtarget="${ERUST_STD_RTARGET:-${rtarget}}" # some targets need to be custom.
+	rbuild="$(rust_abi ${CBUILD})"
+	rhost="$(rust_abi ${CHOST})"
+
+	echo
+	for x in CATEGORY rust_root rbuild rhost rtarget RUSTFLAGS CFLAGS CXXFLAGS LDFLAGS; do
+		einfo "$(printf '%10s' ${x^^}:) ${!x}"
+	done
+
+	cat <<- EOF > "${S}"/config.toml
+		[build]
+		build = "${rbuild}"
+		host = ["${rhost}"]
+		target = ["${rtarget}"]
+		cargo = "${rust_root}/bin/cargo"
+		rustc = "${rust_root}/bin/rustc"
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = true
+		verbose = 2
+		cargo-native-static = false
+		[install]
+		prefix = "${EPREFIX}/usr"
+		libdir = "$(get_libdir)/${P/-std/}"
+		[rust]
+		optimize = true
+		debug = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		debuginfo-level-rustc = 0
+		backtrace = true
+		incremental = false
+		default-linker = "$(tc-getCC)"
+		rpath = false
+		dist-src = false
+		remap-debuginfo = true
+		jemalloc = false
+		[dist]
+		src-tarball = false
+		[target.${rtarget}]
+		cc = "$(tc-getCC ${CTARGET})"
+		cxx = "$(tc-getCXX ${CTARGET})"
+		linker = "$(tc-getCC ${CTARGET})"
+		ar = "$(tc-getAR ${CTARGET})"
+		$(usex elibc_musl 'crt-static = false' '')
+	EOF
+
+	einfo "${PN^} configured with the following settings:"
+	cat "${S}"/config.toml || die
+}
+
+src_compile() {
+	env RUST_BACKTRACE=1 \
+		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
+		src/libstd --stage 0 || die
+}
+
+src_test() {
+	ewarn "${PN} can't run tests"
+}
+
+src_install() {
+	local rustlib="$(get_libdir)/${P/-std/}/rustlib"
+	dodir "/usr/${rustlib}"
+	pushd "build/${rhost}/stage0-sysroot/${rustlib}" > /dev/null || die
+	cp -pPRv "${rtarget}" "${ED}/usr/${rustlib}" || die
+	popd > /dev/null || die
+}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 968da183cf47..3668460d06c4 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/Manifest b/sys-firmware/iwl3160-7260-bt-ucode/Manifest
index b46c275f32d3..44199165574a 100644
--- a/sys-firmware/iwl3160-7260-bt-ucode/Manifest
+++ b/sys-firmware/iwl3160-7260-bt-ucode/Manifest
@@ -1,7 +1,3 @@
-DIST iwl3160-7260-bt-ucode-37.8.10.tgz 21750 BLAKE2B 8f4f845f56cb5b6dd6df8f913e4f01fcbbea5b281020bb14200b4e18e6fce03a88dcaa1e716ae43340d945879215a9e8884edcad57d15039240a215c60280096 SHA512 a0f81382cd7ce9077e8efd75566220a3b2ab0077897ce2d292091f6942b12832819335fe53d007a06797d0f79ef18463282b714e8a148dcc57898313e8f627ba
-DIST iwl3160-7260-bt-ucode-37.8.10_p1.tgz 51854 BLAKE2B 31da77a41e68c1866695393b90fa98a585f3422a99380bba6a4fa8b3d19b513962309e3e2b6547e673a8012ac5d29180799a9740b78a20aec3e46dd8be388717 SHA512 84bcaad82db9588d41ab446c2c5ff9c3f323c15b8dc6b627317edafc80c5ac5c0290a8eea9b5cb5ceafa817d398fb957385cddd715787e3abfb598cf3392774c
 DIST iwl3160-7260-bt-ucode-37.8.10_p2.tgz 78372 BLAKE2B 5abb7abc130ebe93527b4d3d364488bfebe4c9ad005c5173e4a27db5bf880c3af97b451825b5ac972ec89bbab25f127e2e8f15501fcfd96b679868a21154f888 SHA512 73399fcfd58972b9099cad6014f686f74ed4aedc2278d1389d1e815fb08d2af43f3f6defa70d409ecc0b388fba0710dc8fe26627d3149c79db8e8792576047e5
-EBUILD iwl3160-7260-bt-ucode-37.8.10.ebuild 1118 BLAKE2B 8ade3a5e4b83576f439189342aa227a58286fdcc714758e8498b313e76686f1d6674ddca11d3c69dd8446433bce4a3fe1751effec011804e42021962f4bdac43 SHA512 00f245f1d4d8521ad956c3012b666ec2acc0c777eae46ecd4f55e24d78fcd13f1c18665eeedc1e9874241192c796502e1aaef70748a011f47a684f9ffa0a8d4c
-EBUILD iwl3160-7260-bt-ucode-37.8.10_p1.ebuild 1215 BLAKE2B acd623428e8704fc78bd171ca864528f141556d553735d2805df2d530093a1ea197358f0dbd8e2d57cfa6f32ebe584fc8c6acbb300d4e77344059f2bd4592647 SHA512 7755a25451b40d7002741d4af9457a5396ba10cd05d184d060dd7d851492b728110e1e8a9dd82fdb96c3824593832e20b2a963069845a1aa75a47a2836256b5b
 EBUILD iwl3160-7260-bt-ucode-37.8.10_p2.ebuild 880 BLAKE2B d6fc678bb8003adbd64f4cadb02eb2f0a35b8d1690d4bc2232169040eaf2880a27a16c4c59ceb2c2556e35f8619e32279b9be8a6b4fa381ab1e533d6e75b5275 SHA512 0c39890cae8eec956ed0e5200bfef73ba7841fa517332261668f382ea7752bc6b16af8a86d9cde1824f0808c1dd5ff8a5db7d55366134a1542a98a2de8a6c457
 MISC metadata.xml 411 BLAKE2B 8d226427ccf5f4c90c44b4dd781eb13755d21fdc6b3c62de20866f0837d1c89b64ec0ce20b597a431ed0a9113fade7901c3595c2fb7e33b54faa490be2f750b8 SHA512 76b5dccc04fe0168ac05439b3733e5cdc3b43447f62ad3685aea9ea0d038bd1fa5b93503e96b9c01cebe9f1ad2d2cb473d917c91dbccc216dec072524e86bcbd
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10.ebuild b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10.ebuild
deleted file mode 100644
index 1f5af2dc2a4c..000000000000
--- a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info
-
-DESCRIPTION="Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="mirror://gentoo/${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the Intel (R) Wireless 3160, 7260, 7265 firmware"
-
-pkg_pretend() {
-	if kernel_is lt 3 10 0; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.10.0."
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware/intel
-	doins "${S}/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq"
-	doins "${S}/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq"
-	doins "${S}/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq"
-	doins "${S}/ibt-hw-37.7.bseq"
-	doins "${S}/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq"
-	doins "${S}/ibt-hw-37.8.bseq"
-}
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p1.ebuild b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p1.ebuild
deleted file mode 100644
index e5e83ddbeba5..000000000000
--- a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info
-
-DESCRIPTION="Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="mirror://gentoo/${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the Intel (R) Wireless 3160, 7260, 7265 firmware"
-
-pkg_pretend() {
-	if kernel_is lt 3 10 0; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= 3.10.0."
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware/intel
-	doins "${S}/ibt-hw-37.7.10-fw-1.0.1.2d.d.bseq"
-	doins "${S}/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq"
-	doins "${S}/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq"
-	doins "${S}/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq"
-	doins "${S}/ibt-hw-37.7.bseq"
-	doins "${S}/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq"
-	doins "${S}/ibt-hw-37.8.10-fw-1.10.3.11.e.bseq"
-	doins "${S}/ibt-hw-37.8.bseq"
-}
diff --git a/sys-firmware/iwl3160-ucode/Manifest b/sys-firmware/iwl3160-ucode/Manifest
index 35525a22cb36..e91e7ca540c0 100644
--- a/sys-firmware/iwl3160-ucode/Manifest
+++ b/sys-firmware/iwl3160-ucode/Manifest
@@ -1,25 +1,3 @@
-DIST iwl3160-ucode-0.10.11.23.tgz 334243 BLAKE2B 943ffa85e7c2d88042030d777f3cbc4865d72a8f3da3d1c0ac0f93b51f1ef1d89f0c2d4438841057145b219313ddd0d272badca0951b5ad77ab4ff2ea23c6271 SHA512 14aeedd0e7069d5f65d388f36b7d30bb0e3f90c2c721a582e761aa2a27402f6ad8616dd07c44812b8e62bfa0c6eabb57adae71aa2a48053cf85757fbb6548432
-DIST iwl3160-ucode-0.10.15.23.tgz 335313 BLAKE2B 45d1ae3c5ec7ec1b1654e166b671f540aca32ec9aafecbef57ad72af354ceb9e36f1e2109370964f0faa5a8c7ab409522f807097c58fc2ebc20de0c5263a5875 SHA512 a939cba5dbfb73c3178844e6045d0c6b70e75df4bb1bdfc6a3ce34c82de2521f598fbb402ebd4961fbab8e33878172f156e4641c9e02566f7ab754087d857b9b
-DIST iwl3160-ucode-0.12.16.25.tgz 337890 BLAKE2B 934b827128fe7dd0b259c273b92d4ff9cbf9ff6742cf7c21510cef17503394c507fac84719dd7ee17db77be69f4ac8bcb1a0d01a51ce76e65d1b777385b8bbec SHA512 247906e813e5fc49889a02532cc5813f204ccdeaa9600f856d66904e3491471e9a881daffed4ed1e08f8cae14238802773c0820785d05a90406bd9f2f8df31dd
-DIST iwl3160-ucode-0.12.17.25.tgz 337993 BLAKE2B 50805d72af71efa8ba08ffc21d9ad4637aae16402ffdf66511a5251adb83b11cdff5d463f729ea09b2b5febbed2fe944995dbe98cbdfb655fd54ec43adc1576b SHA512 d3095fccac0273205272906f1762d0e205725234083cc9fbb3d30184135690cdd7b095460becf26bb2355c878caf6e3a92aa2a398c8cb07a8115ae279bec0776
-DIST iwl3160-ucode-0.13.30.25.tgz 336262 BLAKE2B 5d888bf9068db868c235b2ef52a8dd309e4c74eb64f0d33c0d75a679fcd349223e4b3060372fbf3e50fe5b72cbe3113902c45d601de36e0ef9e89155e4916006 SHA512 209c810252bdbee729ba3f3b314b428d255f254b41dd931368e7a4dd6d027b9bdeb42d80325ecbcd58032300590276bb220a84dec3cbdbbfcd957638a1f71e97
-DIST iwl3160-ucode-0.15.227938.tgz 467773 BLAKE2B cb7ace7b987970708bd35ee06cfc6d3317ef16e5aa700458235f7123cb0af7d63935247750890b671077a09975dd742d49e73e58454b97f49539a8de8fbe4c00 SHA512 88ad510667adf3895b1906e51373cda420cde2165b37cff72ffbe0d159eeb82de60ab3741e16437384e9db4b245d0a927be680fcb9f784af425f0554ee039798
 DIST iwl3160-ucode-0.16.242414.tgz 467156 BLAKE2B 47a94667cfdc5a9409073e866f750b7c3edefe42539ab1b4f7ac432e2dc74a8a5c0cf45bad5febb1ed165b74dc2af1319b088c751bde69cd5c64812ffd5f43f7 SHA512 ca0f675ebddb92c936df6bf412fdd1a41a33426636c3c40881251dfdd8b6527bc03d03b73b10dfb6fcc23676d1d51c372ac406f9554baf7f4ac36c9bd302b79d
-DIST iwl3160-ucode-0.7.1.22.tgz 332285 BLAKE2B 1da1fed388bf95cfe11874920b59d8ea30d7cc46b0908e87a1ca9bdc325d091c50579a943d0b1fab10f552d191c5900e6b0a3ddf5353aaf7f9d74815a9c68275 SHA512 5f379edc87d0cb743bd91cecd5a1879edfd18033c02d29269ea55e046663fa47c3363a19441d0edb52ea99c58e757c81872545c8ece634459675d927f46a4392
-DIST iwl3160-ucode-0.8.15.22.tgz 328351 BLAKE2B 77d380a7c53ca56999dc3bd387e69c948dc308cba1fa53eae1155ed56806de5b2c10cc89cc6db69057c6e36e0e6321061bbd36503ef0937043d55625c1229cd7 SHA512 33e8842068c285bd62cd58629855c4be82a5b19129bcaefc4ac622245562085ec4ae155dba719937f71767d3f26e0d309553c9362fe7995943f2e95a9bc5d1fd
-DIST iwl3160-ucode-0.8.24.22.tgz 334306 BLAKE2B 5bc48bd0465fb5a024afb223f396f5d2dd0268faabec82653dd0ada982ff32cf7401cc526d7587fb092483379bbc9613347be34db318c4ba072b6ac942dca6b7 SHA512 afa9d1c081f21ec8cb3d427be79475853c9f078fb4f3d60ada154df0c58fe3dec4655dc2f54095dc395cf064563e0de9f69d55478b28ee07b7f19c0b93fb6097
-DIST iwl3160-ucode-0.9.214.23.tgz 335384 BLAKE2B 300f167a528c80f52b22cd163d8a70344dab3db58798d439424ad6a2e629c1859b47c0c6f55b0437f4f566b6ad48f1bd4f37d84e1bb250d36ac1a6dd8d4d82c8 SHA512 93812c6de01ba97da7192f53b33e6c4dca94a5ea2e29b519b47af3bf1f19b41cc1638b6ba92015c4faf840bf4abe8a2abfd6cff1a76557ff93024e095d246f16
-DIST iwl3160-ucode-0.9.228.25.tgz 337276 BLAKE2B d2f8dd3d6b9d5a93c589c5432d2cb4b6185ec9891fc88e3244c01c933a5e713bca9c9f7b5ef3ac360b4a8277d759758d0985c8532c4c450e3f65f2686bccf090 SHA512 95f1d3bddbb05d32a66250c6e714d74b17902b8f6d9451a5107cf2d061f1cdf90dfb3cf8b0375f6104dfb2fe1bc201dab8baa1c6bdffda944aa5fe8aad568a16
-EBUILD iwl3160-ucode-0.10.11.23.ebuild 1416 BLAKE2B f73deb8ab38d5a56ca173f017fe5cc1cafa8f1130068b65a885e5907825bc483e7b7f43787642f489a4751799d84bf2a08039f67f854f57a665814a599bbd7ee SHA512 e53c69c405039553ec1bd015ea77c5fac9595dd423030c89eb2daddf969dad9e06e61239c7d2eee3e6b55f75d934a3ab6e926387f1cb27994b0c1c4acb2d18bb
-EBUILD iwl3160-ucode-0.10.15.23.ebuild 1388 BLAKE2B 6b170d54ed0755266d20f9c0e3289c5af27269789d322704819acc4a8c701d6e7dc6965f6dd06c585ac0fc0c243c4d4f48b602e1ac07b4f34692941dafa86dcc SHA512 a6a663d14131755f3b0e3c5d4d7a40b255b1eb912ac45017f5e122febf5bac41e4213d0154ea3d22076ff65a58aff17dd4a4c10b3b344e20f16a202c4ef38f11
-EBUILD iwl3160-ucode-0.12.16.25.ebuild 1388 BLAKE2B a549c0fce33d3feab03446a7c86fa2d9901d5624243869317337be01f36889d0c09153cfe9023982f7894f79f56304c84d368e2e7e0d319c14d35364b81fc62f SHA512 a32ff0461b51d873f4e7c214f4ec0cc6131bc856486068f8741c4a2e023a6faf474db2a66ed074c5f44e4cc0458a4590555c71c26867153891d5a3360ea32ba9
-EBUILD iwl3160-ucode-0.12.17.25.ebuild 1388 BLAKE2B c64a8af09f36d5b421461d74c7fb2df3f8fcfd9036edf737eb9505150318ffcce55924d43c4ff7cff942cc92f8c8f13c4bcfae05ca96eebbd26f521def683de5 SHA512 a4cf54bc50795849cbf4a7e326d70b067681dca07f002a0bd14394b3a4d1804c64557c3ef4ab7aaf02fe2b507710235eb46a77f45751095ee57a36faff43d6da
-EBUILD iwl3160-ucode-0.13.30.25.ebuild 1387 BLAKE2B 781cc6359708df7f8519cabec036c1f0171469259781b150ed7324027bb3baeffc8243012ab957895d1756dc38c1064e1dc586973584206a2fc19a5402f50b43 SHA512 97b1927b5153b7eb62b074ae2f3ac1b9f77fbb96dbd19d147d6373db808ac82b11d2f3cc2540fe787d9c24e52f62710a47f4ff391ea4129b88f5c3e665060ab6
-EBUILD iwl3160-ucode-0.15.227938.ebuild 1378 BLAKE2B 8af147d4b521d8046fa4695b9b32e3b7b931060f92317645316efb5227d3d8fca7ed80f9ce4dd527cc162898f8b871d7fd76e52ca2d1b44489b36f43e2ec0e2b SHA512 8cd5c32adcac6346835952a23d18f08ee4cac7d2eb1d3eff05dd5c03720a4a559857b80847f8f803320e0a65a1591a99cc55cac1a47050adc14c69d850cbd598
 EBUILD iwl3160-ucode-0.16.242414.ebuild 1378 BLAKE2B a1d43fb4c278ad25674cb5adad899c6dccb7ef4c410ee1537dddbd4a2e139ea754d88e55df8bc7fcdd561ac790bb683200161f06bd7fa9f951050d0fd7ca6c87 SHA512 2f149bf9cd37e79a7dfcca8388b4874187432e0459a40acd980d71ca1203864e10014c9a279a1fa18425b404be0a1531799198c21157312d256fae2f6112df49
-EBUILD iwl3160-ucode-0.7.1.22.ebuild 1318 BLAKE2B 5982ca2b3f6a67561e88d309bb71a04b6714333835d704a90a64fe7904c167e9e88c7532d69db56532de3d67fc5437b38f4497849e69487c769f377fe083d0ff SHA512 2306080d402e972475f95ceb470d8bc0846cb6aa736d695cd3195bff0977e9995252b67b06045c26b2e5e2142f384367279e4e2d7003135fbafaf4125994a007
-EBUILD iwl3160-ucode-0.8.15.22.ebuild 1415 BLAKE2B 8666dac12d3f59c71eb8f864bbeae90266b3fe4e1166aac5cca999dd4320a7e78da5f6650730d850d63ef0f8f29e50e2006d700056419877a5f3b78a469047eb SHA512 dcf57cc976da6ee56c7c15dc884fe140f238d4974ea4611301befc41389379182e42681049c777bc22c7bf3c9b6e6f4cd82b0f6997d026a4f30461b3e15d5e05
-EBUILD iwl3160-ucode-0.8.24.22.ebuild 1416 BLAKE2B 3296571ef002995edfe93bc14275ea033732a839021bfb9d54a6dc8a9f3be2fc630406b53af8a7d401b74dd9b9a0e7c815ec4664384b523ceead114b37d8ae33 SHA512 59a576991e3729a3cafc957c6900c213086f599e8b811942416429510b2d4f736ecdc894c76e90f27894f2d95ffc3b7f120e413da4d3f91980cecd66f9c98f2b
-EBUILD iwl3160-ucode-0.9.214.23.ebuild 1415 BLAKE2B 7ff07b3ff1179664d2c529e80e8ddb830f303c313373bccc032f9887d4eb06443bdc6b2a076fb974111e6c10a32f9014391a7ddfb93d995bc49eddd7f8ba6d71 SHA512 96a3ef296bf1e8c19a34d857efafb95183bb4c08ddef3030a5d0bfe1c8edb48c03279fde07a41e237b681fc0f91e7e4a6e35d5846e5d4047721c901ca0bab855
-EBUILD iwl3160-ucode-0.9.228.25.ebuild 1416 BLAKE2B 9bfa96af6c5e0024f7a4b607c44af2538bb9bc9b12e9b25c06fb2bd4364186528f0cf68f7bc4ccc66171b78c2df7a46363b96c89c0c4938ee64a7eed4c1b2ac0 SHA512 31f49222fca10e96c9c4db79030b75a30b6f3418f98a6a3aadd8d6e4d93a3f5fcc0bbfefc2faac51b3c278c2b3700a0ebf2902ff9175e1cd055fca4d99143409
 MISC metadata.xml 412 BLAKE2B 4c048426b26056e52471f5e3abce5180fd0c892446b257f27cdf361742b30a17cbd0a8ec968550317f3c0ea17510c8debaf7e8233677b7cb8755253680cac857 SHA512 e4ea06015128a5119d7a836e9f9c40d5a34420b9614d3b12d43fab96de9f1b02a1c5ebf1833da05277b8099142488f062749249a60224f305313e4a1a2e59070
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.11.23.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.11.23.ebuild
deleted file mode 100644
index b7b57b49d435..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.11.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="17"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.15.23.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.15.23.ebuild
deleted file mode 100644
index 84397cd3d807..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.10.15.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="17"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.16.25.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.16.25.ebuild
deleted file mode 100644
index c8229ccdc4d5..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.16.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="19"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.17.25.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.17.25.ebuild
deleted file mode 100644
index 4663a5372b54..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.12.17.25.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 linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="19"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.13.30.25.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.13.30.25.ebuild
deleted file mode 100644
index 831ef0a387b1..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.13.30.25.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 linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="4"
-DV_MINOR="1"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.15.227938.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.15.227938.ebuild
deleted file mode 100644
index 15801434dea4..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.15.227938.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[2]}.${vc[4]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="4"
-DV_MINOR="2"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.7.1.22.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.7.1.22.ebuild
deleted file mode 100644
index bda121aa6cff..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.7.1.22.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="10"
-DV_PATH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.15.22.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.15.22.ebuild
deleted file mode 100644
index e3858dadf676..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.15.22.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="13"
-DV_PATH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.24.22.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.24.22.ebuild
deleted file mode 100644
index 4b7654a4243b..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.8.24.22.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="13"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.214.23.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.214.23.ebuild
deleted file mode 100644
index a36858a66a93..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.214.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="14"
-DV_PATH="7"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.228.25.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.228.25.ebuild
deleted file mode 100644
index 16e8b7de50d8..000000000000
--- a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.9.228.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="14"
-DV_PATCH="9"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7260-ucode/Manifest b/sys-firmware/iwl7260-ucode/Manifest
index c749e1c53eaf..c1faea58fd21 100644
--- a/sys-firmware/iwl7260-ucode/Manifest
+++ b/sys-firmware/iwl7260-ucode/Manifest
@@ -1,25 +1,3 @@
-DIST iwl7260-ucode-0.10.11.23.tgz 347295 BLAKE2B 27c4d991c14e29d33d856571daed7c7dafb07e9e8bb62facaad071c5fdcd93005399685913592b37f1d32815b5634bffa3630876868d7c5cab1cbb72ccc48428 SHA512 8e8e14be7e2f3f97a40bcfa16065d55418e42c10d7e4987b956a55775a8b0dfe75127296b97e6bcb9becf53133cd3f052e2691c05421804b6d3e11fc951d1a6f
-DIST iwl7260-ucode-0.10.15.23.tgz 348549 BLAKE2B 5cf945f980f43d850f7af7287b3e564735770c7491d4b2438ea57e5e28889c2de8c0c4f57390df7a7a58956f14f9cc6a5bd1464d73aa3cdc01ffd1ed43690904 SHA512 a40efc2610a981b1e0de2a88d16afa760f5bcb116987034769a1a9adcc716b1ea84103e9a7c372172e98690e729c4d6e34b5857e2c9097439184b3b473f168a8
-DIST iwl7260-ucode-0.12.16.25.tgz 353537 BLAKE2B 716c3e7a54e301ba840d48445823599c10107ea0cd7eea7ebb4f6df364a483572f1fd7fa939f5c4577c277d8c40de2e88afce84dd1568b367118933e9efd80ea SHA512 efedee8f6d4078865b45962a8297c6c1022504653360ee6a23cc7f1eb4cfb1a34c5ee6685cf9819a61f439d445579e1eb14da84f3e28bcf45f89a5a66fbdfa07
-DIST iwl7260-ucode-0.12.17.25.tgz 353588 BLAKE2B cb3bb173e2ae68e1d8974b6399d66964940a3d247f6c32a400a0915df0e2ffe0bbfea7944e09bf5db52a43a7e7e4674b56ce6cce516c064c6e8b66ca8ea67474 SHA512 d43a278aa6f96599649991c6dd4b5cda1833d2eabecd00e4b894a4edeffa9dbd15e2e85ad656d4083dc20e314a2b473e40379a3ac88ad9d72a5ed1f7e1df6bfe
-DIST iwl7260-ucode-0.13.30.25.tgz 352035 BLAKE2B c4f91dc495528108313d678f9143389f2c87c245669d4d8b710c678805f27c639601c196c7e19b4e30759c0bc89a7a0024e75eb504a9c1999ddf4ae16381dcf7 SHA512 11fa74f97d658f0396aed081c9d2eb13580ce6dd5278876411ed7c972b9aa1304552924e70cc5dd4768c0605cf3359b8678837052ce0a7d21e722a2198c44223
-DIST iwl7260-ucode-0.15.227938.tgz 493590 BLAKE2B 2a02c2623301e930130235c0526bec8f26d8d5405705ba7a7bb810ecb7d25b07cae126da966385969785d9f2255b6f6159670d6bdd2097f4425300fb4bdc254d SHA512 44e17c425be6c354983e80d6681c459c36b278c18ad12325675abbd8f94d1f1f3b4ea9961d26a7396e1e8a42ebc36ecfba80d20fd75fab9ba1669d0c8ecc0c8d
 DIST iwl7260-ucode-0.16.242414.tgz 494594 BLAKE2B b1dc80d923eca6046750d0858f19598473ac7c0d0155e98ecc0080fa61825366d17a2e4985031908548667ce17c8ee3f4b6683d10d53e532385c86c6f9dc84fc SHA512 8abfa4141a390a733ea6a43fe7d8d8874752b84a42a5be0a93ed7935f2f76241af41d48f2911393837a32aaf0230f1b1ee9984488e60f447c29794c0e60cd0bb
-DIST iwl7260-ucode-0.7.1.22.tgz 341956 BLAKE2B 3d33d7c4708a78299d1f3aeaaeba1517d76c14d82e626cde511ba297430b16168e14d4da511d885bc89cd316b04a2219bf24c3cf64a293eeacc839f31e1538ec SHA512 c6ae43ec84e5d0df85b6fc1962c5d6052be9352e453b53807a3c45eebc334892dae51c84a053fd197afa66a77bac5b5c349de8d566c071f15f2e76c370a36880
-DIST iwl7260-ucode-0.8.15.22.tgz 342953 BLAKE2B 622e44866d5b8634176eacefe2f59ffed190dbe6dd8d54b1a87b1d6aea7284bf1ff5f25de5aab57b719c32540de8324544bc3b82381ad4204ce634de3549fe7c SHA512 7f6105c547dde559280444e1d729928c33d55ca4f5df1036d40ced735d7863277f2291a27c36ac544bb0c4278883b345be087268124d22af85155b0b4a57bb96
-DIST iwl7260-ucode-0.8.24.22.tgz 346691 BLAKE2B 6993d1942a4dd6f242c9f9c8a921dc1e715bc75924561c0e1123f51e4c983529cd865507096bcc8373d565aebc51002051ef9ae47c9006bf4109728f98f93f33 SHA512 a8a81030bdec074b6370a6bb7f3b22fd8389b76c00b9b27902acfb34be2263662adf5b7eee6e8817c22dead54528607ccb93194073bd509191561a15ce88a3e8
-DIST iwl7260-ucode-0.9.214.23.tgz 347695 BLAKE2B 63a019ab33082c933044192c9787986acb0005c98d6a240d45364dd58b8f4dc4abd779757a2d010fe7044d512db9f9c00e1091b6ae131151a78caa2e91c9c8b8 SHA512 d3ffaacc2827d088cbc1086b4d736e158dafde981e10a01442ede3003f8ccc66bb7ca6ca62c4f3c03fce4cc3cba56141c9144024ecfdaaf52ea3c7cdfbdbf074
-DIST iwl7260-ucode-0.9.228.25.tgz 348138 BLAKE2B 3955688a5309e3ff00083592f6dcc76c0c1a331edd04c974548f2a5717846f144d6abd82be87cd9112e4ee90e4480e9ec8a9e1e1be2d5257b68eebcda34a7ed7 SHA512 f2d6d5fa859e0f7680f695e6ae4fe2c2a56eb7dd26430b61520f7ab95322601bceafff33038945bbf07c8e6691b9a19cd5a5e7ae3e349bd89b72d11d09a9bfdc
-EBUILD iwl7260-ucode-0.10.11.23.ebuild 1416 BLAKE2B f73deb8ab38d5a56ca173f017fe5cc1cafa8f1130068b65a885e5907825bc483e7b7f43787642f489a4751799d84bf2a08039f67f854f57a665814a599bbd7ee SHA512 e53c69c405039553ec1bd015ea77c5fac9595dd423030c89eb2daddf969dad9e06e61239c7d2eee3e6b55f75d934a3ab6e926387f1cb27994b0c1c4acb2d18bb
-EBUILD iwl7260-ucode-0.10.15.23.ebuild 1388 BLAKE2B 6b170d54ed0755266d20f9c0e3289c5af27269789d322704819acc4a8c701d6e7dc6965f6dd06c585ac0fc0c243c4d4f48b602e1ac07b4f34692941dafa86dcc SHA512 a6a663d14131755f3b0e3c5d4d7a40b255b1eb912ac45017f5e122febf5bac41e4213d0154ea3d22076ff65a58aff17dd4a4c10b3b344e20f16a202c4ef38f11
-EBUILD iwl7260-ucode-0.12.16.25.ebuild 1388 BLAKE2B a549c0fce33d3feab03446a7c86fa2d9901d5624243869317337be01f36889d0c09153cfe9023982f7894f79f56304c84d368e2e7e0d319c14d35364b81fc62f SHA512 a32ff0461b51d873f4e7c214f4ec0cc6131bc856486068f8741c4a2e023a6faf474db2a66ed074c5f44e4cc0458a4590555c71c26867153891d5a3360ea32ba9
-EBUILD iwl7260-ucode-0.12.17.25.ebuild 1388 BLAKE2B c64a8af09f36d5b421461d74c7fb2df3f8fcfd9036edf737eb9505150318ffcce55924d43c4ff7cff942cc92f8c8f13c4bcfae05ca96eebbd26f521def683de5 SHA512 a4cf54bc50795849cbf4a7e326d70b067681dca07f002a0bd14394b3a4d1804c64557c3ef4ab7aaf02fe2b507710235eb46a77f45751095ee57a36faff43d6da
-EBUILD iwl7260-ucode-0.13.30.25.ebuild 1387 BLAKE2B 781cc6359708df7f8519cabec036c1f0171469259781b150ed7324027bb3baeffc8243012ab957895d1756dc38c1064e1dc586973584206a2fc19a5402f50b43 SHA512 97b1927b5153b7eb62b074ae2f3ac1b9f77fbb96dbd19d147d6373db808ac82b11d2f3cc2540fe787d9c24e52f62710a47f4ff391ea4129b88f5c3e665060ab6
-EBUILD iwl7260-ucode-0.15.227938.ebuild 1378 BLAKE2B 8af147d4b521d8046fa4695b9b32e3b7b931060f92317645316efb5227d3d8fca7ed80f9ce4dd527cc162898f8b871d7fd76e52ca2d1b44489b36f43e2ec0e2b SHA512 8cd5c32adcac6346835952a23d18f08ee4cac7d2eb1d3eff05dd5c03720a4a559857b80847f8f803320e0a65a1591a99cc55cac1a47050adc14c69d850cbd598
 EBUILD iwl7260-ucode-0.16.242414.ebuild 1378 BLAKE2B a1d43fb4c278ad25674cb5adad899c6dccb7ef4c410ee1537dddbd4a2e139ea754d88e55df8bc7fcdd561ac790bb683200161f06bd7fa9f951050d0fd7ca6c87 SHA512 2f149bf9cd37e79a7dfcca8388b4874187432e0459a40acd980d71ca1203864e10014c9a279a1fa18425b404be0a1531799198c21157312d256fae2f6112df49
-EBUILD iwl7260-ucode-0.7.1.22.ebuild 1319 BLAKE2B 6a50e35b3d7fb7079244bda8c69ea6e2c848eb397edcb1ad0b6589e8ded1c9b17e67270cd9faf476b10ed8de222500b0246b136befbcf2fee4f339080cd9bfb1 SHA512 1a9f5ef2f11d861b8252684012b5f7752c9f37453454562bc06cdec5251ca5d661aae5945191a0ac1b42ef09e16da1cdea59d763c598db167732c84f23079627
-EBUILD iwl7260-ucode-0.8.15.22.ebuild 1416 BLAKE2B 3296571ef002995edfe93bc14275ea033732a839021bfb9d54a6dc8a9f3be2fc630406b53af8a7d401b74dd9b9a0e7c815ec4664384b523ceead114b37d8ae33 SHA512 59a576991e3729a3cafc957c6900c213086f599e8b811942416429510b2d4f736ecdc894c76e90f27894f2d95ffc3b7f120e413da4d3f91980cecd66f9c98f2b
-EBUILD iwl7260-ucode-0.8.24.22.ebuild 1416 BLAKE2B 3296571ef002995edfe93bc14275ea033732a839021bfb9d54a6dc8a9f3be2fc630406b53af8a7d401b74dd9b9a0e7c815ec4664384b523ceead114b37d8ae33 SHA512 59a576991e3729a3cafc957c6900c213086f599e8b811942416429510b2d4f736ecdc894c76e90f27894f2d95ffc3b7f120e413da4d3f91980cecd66f9c98f2b
-EBUILD iwl7260-ucode-0.9.214.23.ebuild 1416 BLAKE2B 33e69632e2331ea8381eb9c297cd993c70fee852ff3016c9c6603c8b299ba4ad065c2a3f084e3155fd186b1845353910ca4ac97b5dbf17319e3e9245907c7434 SHA512 245d095fd3bcff3abd58d021e58f03fe5aa31c4c01413e07f28002def29a47d6d820221e5a0355b9a99f66e48296f662813a747b6e4e5fc29761dfd4bd579d7d
-EBUILD iwl7260-ucode-0.9.228.25.ebuild 1375 BLAKE2B 81d9e2371189821832676d8dbbe7a47bdb58b35e614eedf23662953cd5e401f4db0325e7d4855cfaf7df51b3ec945c569d910d09aaacfb891d90c7639f936f1e SHA512 69a7dd51f6aac8815136d8ffef8c2442297eb880a8ea766cc48f9079982cc9304e7db1f08bc7ecd1165cc2a7e2e14f6fd09fc742421092d27792f60e7ad34162
 MISC metadata.xml 412 BLAKE2B ca9792310edbc641b6e6aa083bd83e117fe6f276d72ee9cd1fea3b4c2917c97466f69361c3b7783e6b0348d6a73809414998001edb125f6beb5aef8d4687e859 SHA512 87df5e498b2fbc9e6dd2826285935bd440733e7efb2fbd627593a8f15a02b7ea4456fffb2d4a39ed37ab3125ffe25ed59208b9d3621f0afb908aefee567e9c46
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.11.23.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.11.23.ebuild
deleted file mode 100644
index b7b57b49d435..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.11.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="17"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.15.23.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.15.23.ebuild
deleted file mode 100644
index 84397cd3d807..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.10.15.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="17"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.16.25.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.16.25.ebuild
deleted file mode 100644
index c8229ccdc4d5..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.16.25.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="19"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.17.25.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.17.25.ebuild
deleted file mode 100644
index 4663a5372b54..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.12.17.25.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 linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="19"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.13.30.25.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.13.30.25.ebuild
deleted file mode 100644
index 831ef0a387b1..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.13.30.25.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 linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="4"
-DV_MINOR="1"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.15.227938.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.15.227938.ebuild
deleted file mode 100644
index 15801434dea4..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.15.227938.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[2]}.${vc[4]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="4"
-DV_MINOR="2"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.7.1.22.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.7.1.22.ebuild
deleted file mode 100644
index ac3f78071b7a..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.7.1.22.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="10"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.15.22.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.15.22.ebuild
deleted file mode 100644
index 4b7654a4243b..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.15.22.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="13"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.24.22.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.24.22.ebuild
deleted file mode 100644
index 4b7654a4243b..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.8.24.22.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="13"
-DV_PATCH="0"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.214.23.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.214.23.ebuild
deleted file mode 100644
index a0785dfd7a48..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.214.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DV_MAJOR="3"
-DV_MINOR="14"
-DV_PATCH="7"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.228.25.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.228.25.ebuild
deleted file mode 100644
index e7db28d8ba4d..000000000000
--- a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.9.228.25.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit linux-info versionator
-
-DEV_N="${PN:3:4}"
-vc=($(get_all_version_components "${PV}"))
-MY_PV="${vc[6]}.${vc[4]}.${vc[2]}.${vc[0]}"
-MY_PN="iwlwifi-${DEV_N}-ucode"
-
-DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
-HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
-SRC_URI="https://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
-
-LICENSE="ipw3945"
-SLOT="${vc[2]}"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-DEPEND=""
-RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
-	!sys-kernel/linux-firmware[-savedconfig]"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-CONFIG_CHECK="~IWLMVM"
-ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
-
-pkg_pretend() {
-	if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
-		ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
-		ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
-	fi
-}
-
-src_install() {
-	insinto /lib/firmware
-	doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
-	dodoc README*
-}
diff --git a/sys-firmware/vgabios/Manifest b/sys-firmware/vgabios/Manifest
index c3c346915cc3..f735607f4665 100644
--- a/sys-firmware/vgabios/Manifest
+++ b/sys-firmware/vgabios/Manifest
@@ -1,5 +1,5 @@
 DIST vgabios-0.7a-fixes-1.tar.bz2 2602 BLAKE2B 68fbd29e6c660dc69ea110e00ff75fc9d14f10bd11b9be89bd373281852a3133c73ee0f2a7ecdf026b29979e4c20bcdbad0baf9f80d013ffeb24dda892725778 SHA512 30992efac011d4b99301960df08cdc69d9503aa6b61feed01fca2c5a910460269d9500650cb394a0737318e977a282c5e0ab613a8b2bc28b9f0c6528a9a77d73
 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
+EBUILD vgabios-0.7a-r1.ebuild 1664 BLAKE2B 931f6cb332fe70867152414d1f896d20c9cc3e34fffd4809d50ccc61782ad2a8c1d716734a8b4aec863be4ef51d8acfe9576ae0ce09375514d5131e358cb3177 SHA512 c15cf3f55ec224e78ec5cdddf07f3481084c19fad02f62c2bae1294e3c466a926895f9fbe8d50a72dd85e4b16c33e7d37e1807a2392123f4da7edde7d591b6c9
+EBUILD vgabios-0.7a.ebuild 1635 BLAKE2B 9ced20787c35a6c9b73508d274e17e1869e7b27456b5c82a377d117f210c933dc42250bdd5ef142f43a48c0a98420d4c502ce8ea56c232272fe83b71428e4ea5 SHA512 7577d3a41ea5acaf929c9095c50ff9143e91c449414fc1c315358b2d77e67b8ccb43727892d44498b1eb32272093d42e4e7650ee674e65438cdfd1c0f0153f6b
 MISC metadata.xml 497 BLAKE2B 486ae4d9758667855e7920cc589aa1a284c0be89387f78c2c226701fa2f32bc20a6769b909d63f9c04483aa900d0d0858fec2db4e49fe6e710cf9dd6df458263 SHA512 c7f5fb5b3c08c0cd3d7460d4ada18ce829dadd3c286782cc064ce18af5b427e20c5be8925b8ed179ceb2ee2405aa0a85593b268c1d98dfae5d55f06587d6de47
diff --git a/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild b/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
index 081c30ad69c8..aa925da50189 100644
--- a/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
+++ b/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 # Can't really call them backports when they're fixes that upstream
 # won't carry
 FIXES=1
 
-inherit eutils
-
 DESCRIPTION="VGA BIOS implementation"
 HOMEPAGE="http://www.nongnu.org/vgabios/"
 SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tgz
@@ -18,16 +16,14 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="binary debug"
-
-DEPEND="!binary? ( sys-devel/dev86 )"
-RDEPEND=""
+BDEPEND="!binary? ( sys-devel/dev86 )"
 
 src_prepare() {
-	[[ -n ${FIXES} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
+	if [[ -n ${FIXES} ]] ; then
+		eapply patches/*.patch
+	fi
 
-	epatch_user
+	default
 }
 
 src_compile() {
diff --git a/sys-firmware/vgabios/vgabios-0.7a.ebuild b/sys-firmware/vgabios/vgabios-0.7a.ebuild
index 0e794a42af95..85d6d4c72bce 100644
--- a/sys-firmware/vgabios/vgabios-0.7a.ebuild
+++ b/sys-firmware/vgabios/vgabios-0.7a.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 # Can't really call them backports when they're fixes that upstream
 # won't carry
 FIXES=1
 
-inherit eutils
-
 DESCRIPTION="VGA BIOS implementation"
 HOMEPAGE="http://www.nongnu.org/vgabios/"
 SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tgz
@@ -19,16 +17,15 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 
-DEPEND="amd64? ( sys-devel/dev86 )
+BDEPEND="amd64? ( sys-devel/dev86 )
 	x86? ( sys-devel/dev86 )"
-RDEPEND=""
 
 src_prepare() {
-	[[ -n ${FIXES} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
+	if [[ -n ${FIXES} ]] ; then
+		eapply patches/*.patch
+	fi
 
-	epatch_user
+	default
 }
 
 src_compile() {
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 018bba8851c3..f96dfc63cb27 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest
index 65fd77dbe340..758d7cc9f754 100644
--- a/sys-fs/bcache-tools/Manifest
+++ b/sys-fs/bcache-tools/Manifest
@@ -4,12 +4,11 @@ AUX 1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch 1335 BLAKE2B bb99576cd404dc
 AUX 1.0.8_p20140220/bcache-tools-1.0.8-probe-bcache-underlinking.patch 531 BLAKE2B 3e1ec0b19cf4e68cb30197c94f4a2c85f3479e60b9ca953553f2c5c5730a30cd1bef7b013c5d5087a9220f05bf0d634903a4ed263df250673641f78982d98835 SHA512 883dbb66051bc7d1cbb170235ef8dbb4a1d115d0a598eae907d89fae6365c2e6725929e1297f9f74c742150d893ed8febb99a03bf55e91f0b90cc33314cf51d2
 AUX 1.0.8_p20140220/bcache-tools-20131018-fedconf.patch 253 BLAKE2B 74ebc9f660eab05c6633ac9574951ee5b6355bceb0e32ff6bc586a6cc0e4bde70bbe085e71fe6186fc4e29317c4f7d7d1556945f1ec237688d555695a95112c0 SHA512 459875969ef1a80a5bb635e5da2187222a01aefe9ea49eb7feeab89d5290e4d478a0e5e37e424dd77a69916811b0ad3f82f7ec4e0ae91ae686e3fe7f5eac9d57
 AUX 1.0.8_p20140220/bcache-tools-status-20130826-man.patch 1095 BLAKE2B df33f5ce76d5e5b9b859588ebe4be1ea5c710281e21595cc80438ffd2dece7cf9278936bc08c9f8250672d4d3f9daa4b52c9723340650fbc9d348794cfead564 SHA512 44f4227e7cd3e4ec3b4c90d27445be8bfa36b229aa11a08b9b66c08c224dc9c006c0d358580b0906a8372eb83b938c0a5a199665680e96898aa2070bb55000de
+AUX 1.1/bcache-tools-add-bcache-status.patch 13158 BLAKE2B e986d81d6fdf76f809ffcaad0c93869421e369e77efb7a51f81c1abe07b941c703bf80ce89e4c09bad42f5b4d76a7bb7c40fa5ad94c87f31237b676c40b41049 SHA512 bdcc2912d3b6e47781e9023433e2b152d628ce9fa538ae4ff7ed8385a495752786cdb32bd8f82d7a7c84ad068d49b22b3911c0125e235f561a729c20c8223363
+AUX 1.1/bcache-tools-add-man-page-bcache-status.8.patch 1431 BLAKE2B f88c54286ad07766e4ebe216a27b99838ee9eb63412bb50a1036c93e1e41d77ea9d02cc47c148105ab63115f954c4dcc52903e7c726399b2d2ec2066a7b24ecc SHA512 e6e5f073b01e0272710bc6effeecf5ce6786f1606986e12f18bf37a1124d25858a4ed25fa42f2da85bf04e95844e3c6156af2e83bed323bb83621601774b0802
 DIST bcache-status-20140220.tar.gz 3779 BLAKE2B a3fa5e9d87b2c51f1f5178693db6d9f8b4bde31c77783d1ebd9de6e81995d89a4b07df43178cba384757b212087c474a0508640d1d3ddcd97d3d928643971e4a SHA512 0c8db02dc865b469f3a5964f679a3bfdf5cdbf5a2f6ccd5d81544f3bb3c06df2f5d06b9f09aaec527ec90229740dcd31fbb33e2628721b6da139cfcee6b48d7c
-DIST bcache-tools-1.0.5.tgz 21934 BLAKE2B 9761fd0b7b7fa5a9a6911576988065b80ada0fbb52a094b1290affca302b2b995f0418ed65ab5af6de71c7d18953606968cc910e7b4c4f8cb2e0e9970c8e7d7c SHA512 aaf27e4cc3037d482cb14c8bb083c1ce5cda5641a19cec67ca1ad22cde71ce035e49701145c6d920b4d62058897c4b7d29d341b3b8bd436c9c51e2f8bdb5c568
-DIST bcache-tools-1.0.8.tgz 22153 BLAKE2B d40a64b02e0d66ef8868151870715f6e6ab54633e4875c32d0e03dfe1871e5aa98d7e133b9eed583ac4898b1598f38b71e47109210009ca51c4dfe9dbd31768c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc
 DIST bcache-tools-1.0.8_p20140220.tgz 22153 BLAKE2B d40a64b02e0d66ef8868151870715f6e6ab54633e4875c32d0e03dfe1871e5aa98d7e133b9eed583ac4898b1598f38b71e47109210009ca51c4dfe9dbd31768c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc
-EBUILD bcache-tools-1.0.5.ebuild 948 BLAKE2B 933b23d5b1a82ace33886d6d85960630c19ceb7b65ee8a39cf3538d6f58f410d3caece111ea3db203b3e14148e5595f424f2c79caebb64195dd12f4cd894a735 SHA512 9aaf48abd2b5c5aeffbdf0d9036c45c795802281ac1424c1acb9ac45f26b5f232632738ebc22ad894c007478e1036c8ce28ed7fb85cddbe5ca14c98a0228d8f1
-EBUILD bcache-tools-1.0.8.ebuild 948 BLAKE2B 933b23d5b1a82ace33886d6d85960630c19ceb7b65ee8a39cf3538d6f58f410d3caece111ea3db203b3e14148e5595f424f2c79caebb64195dd12f4cd894a735 SHA512 9aaf48abd2b5c5aeffbdf0d9036c45c795802281ac1424c1acb9ac45f26b5f232632738ebc22ad894c007478e1036c8ce28ed7fb85cddbe5ca14c98a0228d8f1
+DIST bcache-tools-1.1.tar.gz 34548 BLAKE2B e6ebc0f609debe0cc123deba0e21076441c37cdbc6edd02bf2c16c0e36fe806f1fc160b9e9baed577f86f6358884182a4e3903f34bccee81943191c0ba6a2d11 SHA512 4ccbef47255bf3644a50242a79951b1f3720e71a55eb1e07dc6b8486df0245da99a77bba751b50197d489b4c5d738e5284aabc014c2f7f44816ddf6a1bb807ca
 EBUILD bcache-tools-1.0.8_p20140220-r1.ebuild 1600 BLAKE2B b9cece80cc38461984bcfbe4a736f294f5d65339b29dc6e72ec5416fb6cca669d17af4137ef5e43100c682c01d779069c82e81ed87236200f29f6f1cab84c596 SHA512 37f20893675416762095b2d45aea6098a5f1886fe4a8abdf2005bad5e5a3e90ad5eeaa0642daf95adefc37866b00f2615a9291ee9aeff40cf5481ce797d4fb44
-EBUILD bcache-tools-9999.ebuild 992 BLAKE2B b44ccdac9c100f3777e73db2b5d91831d4cb9f434507df1b03d4aac965a0f3d927e1872f40050d1d5b3b81a0072d832425eb58ac047ca16ee3122e00f55bd525 SHA512 96f1b026c0365cb19fdd4d0815778609eb2f59cc6cd4760a5287a1e76f6c5591b9ac1ae36eae966255fa93b5be690e16553ca2881880c7cb8b4bb62ee4ae4de5
+EBUILD bcache-tools-1.1.ebuild 1352 BLAKE2B 8c53986672505f423e11800d10953fe45eea9304d3a3a03a98d28d392f6c3c906b2a977ced978366574fbe4b768f9f1804333c0aabba6acd7a3fe13798d0f837 SHA512 9143c9749d870668d457d1cb78276bb35d7f8be01846227d7b8c266c2ae2a56b93aac418c012347f14477c7d4d45fc35c5ee281594b65e9a025a0bdc452c5059
 MISC metadata.xml 253 BLAKE2B 053cd7caa33b4ace537584fb68b0fd010978dd08ec030003d4f4cad19896018102a7fa85ccdfd6cbecb8f8c62c63fd97b7babc6a5b72d2a6f37d4aec14442694 SHA512 3ea0dad00b289add099c74cf0b6b8202e9adc0ac7537b16b7673d2fadddcf83c7c686b0662bfd4766819d37af300cf978bb939133aed74b9a8aa8de2b84e805a
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild
deleted file mode 100644
index ed33527ffb9e..000000000000
--- a/sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="https://bcache.evilpiepirate.org/"
-SRC_URI="https://github.com/g2p/bcache-tools/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=sys-apps/util-linux-2.24"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	tc-export CC
-	sed \
-		-e '/^CFLAGS/s:-O2::' \
-		-e '/^CFLAGS/s:-g:-std=gnu89:' \
-		-i Makefile || die
-}
-
-src_install() {
-	into /
-	dosbin make-bcache bcache-super-show
-
-	exeinto $(get_udevdir)
-	doexe bcache-register probe-bcache
-
-	udev_dorules 69-bcache.rules
-
-	insinto /etc/initramfs-tools/hooks/bcache
-	doins initramfs/hook
-
-	# that is what dracut does
-	insinto /usr/lib/dracut/modules.d/90bcache
-	doins dracut/module-setup.sh
-
-	doman *.8
-
-	dodoc README
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild
deleted file mode 100644
index ed33527ffb9e..000000000000
--- a/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="https://bcache.evilpiepirate.org/"
-SRC_URI="https://github.com/g2p/bcache-tools/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=sys-apps/util-linux-2.24"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	tc-export CC
-	sed \
-		-e '/^CFLAGS/s:-O2::' \
-		-e '/^CFLAGS/s:-g:-std=gnu89:' \
-		-i Makefile || die
-}
-
-src_install() {
-	into /
-	dosbin make-bcache bcache-super-show
-
-	exeinto $(get_udevdir)
-	doexe bcache-register probe-bcache
-
-	udev_dorules 69-bcache.rules
-
-	insinto /etc/initramfs-tools/hooks/bcache
-	doins initramfs/hook
-
-	# that is what dracut does
-	insinto /usr/lib/dracut/modules.d/90bcache
-	doins dracut/module-setup.sh
-
-	doman *.8
-
-	dodoc README
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/sys-fs/bcache-tools/bcache-tools-1.1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.1.ebuild
new file mode 100644
index 000000000000..0f340688356d
--- /dev/null
+++ b/sys-fs/bcache-tools/bcache-tools-1.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit flag-o-matic python-r1 toolchain-funcs udev
+
+DESCRIPTION="Tools for bcache"
+HOMEPAGE="https://bcache.evilpiepirate.org/"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/${PN}.git/snapshot/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch
+	"${FILESDIR}"/${PV}/bcache-tools-add-bcache-status.patch
+	"${FILESDIR}"/${PV}/bcache-tools-add-man-page-bcache-status.8.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export CC
+	sed \
+		-e '/^CFLAGS/s:-O2::' \
+		-e '/^CFLAGS/s:-g::' \
+		-i Makefile || die
+
+	append-lfs-flags
+}
+
+src_install() {
+	into /
+	dosbin bcache make-bcache bcache-super-show
+
+	exeinto $(get_udevdir)
+	doexe bcache-register probe-bcache
+
+	python_foreach_impl python_doscript bcache-status
+
+	udev_dorules 69-bcache.rules
+
+	insinto /etc/initramfs-tools/hooks/bcache
+	doins initramfs/hook
+
+	# that is what dracut does
+	insinto /usr/lib/dracut/modules.d/90bcache
+	doins dracut/module-setup.sh
+
+	doman *.8
+
+	dodoc README
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/sys-fs/bcache-tools/bcache-tools-9999.ebuild b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
deleted file mode 100644
index 3bd398fac481..000000000000
--- a/sys-fs/bcache-tools/bcache-tools-9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_NONSHALLOW=true
-
-inherit git-r3 toolchain-funcs udev
-
-DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="https://bcache.evilpiepirate.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/g2p/bcache-tools.git"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND=">=sys-apps/util-linux-2.24"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	tc-export CC
-	sed \
-		-e '/^CFLAGS/s:-O2::' \
-		-e '/^CFLAGS/s:-g:-std=gnu89:' \
-		-i Makefile || die
-}
-
-src_install() {
-	into /
-	dosbin make-bcache bcache-super-show
-
-	exeinto $(get_udevdir)
-	doexe bcache-register probe-bcache
-
-	udev_dorules 69-bcache.rules
-
-	insinto /etc/initramfs-tools/hooks/bcache
-	doins initramfs/hook
-
-	insinto /etc/initcpio/install/bcache
-	doins initcpio/install
-
-	# that is what dracut does
-	insinto /usr/lib/dracut/modules.d/90bcache
-	doins dracut/module-setup.sh
-
-	doman *.8
-
-	dodoc README
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/sys-fs/bcache-tools/files/1.1/bcache-tools-add-bcache-status.patch b/sys-fs/bcache-tools/files/1.1/bcache-tools-add-bcache-status.patch
new file mode 100644
index 000000000000..bd58d0a309d5
--- /dev/null
+++ b/sys-fs/bcache-tools/files/1.1/bcache-tools-add-bcache-status.patch
@@ -0,0 +1,381 @@
+From 10824170800268e91508e2edc6ed745f40370f0a Mon Sep 17 00:00:00 2001
+From: Coly Li <colyli@suse.de>
+Date: Wed, 2 Sep 2020 19:27:08 +0800
+Subject: [PATCH 1/2] bcache-tools: add bcache-status
+
+People request to include bcache-status into bcache-tools package. This
+patch picks bcache-status script from github page of the orginal author
+Darrick J. Wong,
+  https://github.com/djwong/bcache-tools/blob/master/bcache-status
+
+Thanks to Darrick for writing the great bcache-status, and I will keep
+this script being updated from Darrick's repo time to time.
+
+Signed-off-by: Coly Li <colyli@suse.de>
+Cc: Darrick J. Wong <darrick.wong@oracle.com>
+---
+ bcache-status | 352 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 352 insertions(+)
+ create mode 100755 bcache-status
+
+diff --git a/bcache-status b/bcache-status
+new file mode 100755
+index 0000000..ac5a22f
+--- /dev/null
++++ b/bcache-status
+@@ -0,0 +1,352 @@
++#!/usr/bin/env python
++#
++# Dumb script to dump (some) of bcache status
++# Copyright 2014 Darrick J. Wong. All rights reserved.
++#
++# This file is part of Bcache.  Bcache is free software: you can
++# redistribute it and/or modify it under the terms of the GNU General Public
++# License as published by the Free Software Foundation, version 2.
++#
++# This program is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++# details.
++#
++# You should have received a copy of the GNU General Public License along with
++# this program; if not, write to the Free Software Foundation, Inc., 51
++# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++
++import os
++import sys
++import argparse
++
++MAX_KEY_LENGTH		= 28
++DEV_BLOCK_PATH		= '/dev/block/'
++SYSFS_BCACHE_PATH	= '/sys/fs/bcache/'
++SYSFS_BLOCK_PATH	= '/sys/block/'
++
++def file_to_lines(fname):
++	try:
++		with open(fname, "r") as fd:
++			return fd.readlines()
++	except:
++		return []
++
++def file_to_line(fname):
++	ret = file_to_lines(fname)
++	if ret:
++		return ret[0].strip()
++	return ''
++
++def str_to_bool(x):
++	return x == '1'
++
++def format_sectors(x):
++	'''Pretty print a sector count.'''
++	sectors = float(x)
++	asectors = abs(sectors)
++
++	if asectors < 2:
++		return '%d B' % (sectors * 512)
++	elif asectors < 2048:
++		return '%.2f KiB' % (sectors / 2)
++	elif asectors < 2097152:
++		return '%.1f MiB' % (sectors / 2048)
++	elif asectors < 2147483648:
++		return '%.0f GiB' % (sectors / 2097152)
++	else:
++		return '%.0f TiB' % (sectors / 2147483648)
++
++def interpret_sectors(x):
++	'''Interpret a pretty-printed disk size.'''
++	factors = {
++		'k': 1 << 10,
++		'M': 1 << 20,
++		'G': 1 << 30,
++		'T': 1 << 40,
++		'P': 1 << 50,
++		'E': 1 << 60,
++		'Z': 1 << 70,
++		'Y': 1 << 80,
++	}
++
++	factor = 1
++	if x[-1] in factors:
++		factor = factors[x[-1]]
++		x = x[:-1]
++	return int(float(x) * factor / 512)
++
++def pretty_size(x):
++	return format_sectors(interpret_sectors(x))
++
++def device_path(x):
++	if not os.path.isdir(DEV_BLOCK_PATH):
++		return '?'
++	x = '%s/%s' % (DEV_BLOCK_PATH, x)
++	return os.path.abspath(os.path.join(os.path.dirname(x), os.readlink(x)))
++
++def str_device_path(x):
++	return '%s (%s)' % (device_path(x), x)
++
++def dump_bdev(bdev_path):
++	'''Dump a backing device stats.'''
++	global MAX_KEY_LENGTH
++	attrs = [
++		('../dev',		'Device File',		str_device_path),
++		('dev/dev',		'bcache Device File',	str_device_path),
++		('../size',		'Size',			format_sectors),
++		('cache_mode',		'Cache Mode',		None),
++		('readahead',		'Readahead',		None),
++		('sequential_cutoff',	'Sequential Cutoff',	pretty_size),
++		('sequential_merge',	'Merge sequential?',	str_to_bool),
++		('state',		'State',		None),
++		('writeback_running',	'Writeback?',		str_to_bool),
++		('dirty_data',		'Dirty Data',		pretty_size),
++		('writeback_rate',	'Writeback Rate',	lambda x: '%s/s' % x),
++		('writeback_percent',	'Dirty Target',		lambda x: '%s%%' % x),
++	]
++
++	print('--- Backing Device ---')
++	for (sysfs_name, display_name, conversion_func) in attrs:
++		val = file_to_line('%s/%s' % (bdev_path, sysfs_name))
++		if conversion_func is not None:
++			val = conversion_func(val)
++		if display_name is None:
++			display_name = sysfs_name
++		print('  %-*s%s' % (MAX_KEY_LENGTH - 2, display_name, val))
++
++def dump_cachedev(cachedev_path):
++	'''Dump a cachding device stats.'''
++	def fmt_cachesize(val):
++		return '%s\t(%.0f%%)' % (format_sectors(val), float(val) / cache_size * 100)
++
++	global MAX_KEY_LENGTH
++	attrs = [
++		('../dev',			'Device File',		str_device_path),
++		('../size',			'Size',			format_sectors),
++		('block_size',			'Block Size',		pretty_size),
++		('bucket_size',			'Bucket Size',		pretty_size),
++		('cache_replacement_policy',	'Replacement Policy',	None),
++		('discard',			'Discard?',		str_to_bool),
++		('io_errors',			'I/O Errors',		None),
++		('metadata_written',		'Metadata Written',	pretty_size),
++		('written',			'Data Written',		pretty_size),
++		('nbuckets',			'Buckets',		None),
++		(None,				'Cache Used',		lambda x: fmt_cachesize(used_sectors)),
++		(None,				'Cache Unused',		lambda x: fmt_cachesize(unused_sectors)),
++	]
++
++	stats = get_cache_priority_stats(cachedev_path)
++	cache_size = int(file_to_line('%s/../size' % cachedev_path))
++	unused_sectors = float(stats['Unused'][:-1]) * cache_size / 100
++	used_sectors = cache_size - unused_sectors
++
++	print('--- Cache Device ---')
++	for (sysfs_name, display_name, conversion_func) in attrs:
++		if sysfs_name is not None:
++			val = file_to_line('%s/%s' % (cachedev_path, sysfs_name))
++		if conversion_func is not None:
++			val = conversion_func(val)
++		if display_name is None:
++			display_name = sysfs_name
++		print('  %-*s%s' % (MAX_KEY_LENGTH - 2, display_name, val))
++
++def hits_to_str(hits_str, misses_str):
++	'''Render a hits/misses ratio as a string.'''
++	hits = int(hits_str)
++	misses = int(misses_str)
++
++	ret = '%d' % hits
++	if hits + misses != 0:
++		ret = '%s\t(%.d%%)' % (ret, 100 * hits / (hits + misses))
++	return ret
++
++def dump_stats(sysfs_path, indent_str, stats):
++	'''Dump stats on a bcache device.'''
++	stat_types = [
++		('five_minute',	'Last 5min'),
++		('hour',	'Last Hour'),
++		('day',		'Last Day'),
++		('total',	'Total'),
++	]
++	attrs = ['bypassed', 'cache_bypass_hits', 'cache_bypass_misses', 'cache_hits', 'cache_misses']
++	display = [
++		('Hits',		lambda: hits_to_str(stat_data['cache_hits'], stat_data['cache_misses'])),
++		('Misses',		lambda: stat_data['cache_misses']),
++		('Bypass Hits',		lambda: hits_to_str(stat_data['cache_bypass_hits'], stat_data['cache_bypass_misses'])),
++		('Bypass Misses',	lambda: stat_data['cache_bypass_misses']),
++		('Bypassed',		lambda: pretty_size(stat_data['bypassed'])),
++	]
++
++	for (sysfs_name, stat_display_name) in stat_types:
++		if len(stats) > 0 and sysfs_name not in stats:
++			continue
++		stat_data = {}
++		for attr in attrs:
++			val = file_to_line('%s/stats_%s/%s' % (sysfs_path, sysfs_name, attr))
++			stat_data[attr] = val
++		for (display_name, str_func) in display:
++			d = '%s%s %s' % (indent_str, stat_display_name, display_name)
++			print('%-*s%s' % (MAX_KEY_LENGTH, d, str_func()))
++
++def get_cache_priority_stats(cache):
++	'''Retrieve priority stats from a cache.'''
++	attrs = {}
++
++	for line in file_to_lines('%s/priority_stats' % cache):
++		x = line.split()
++		key = x[0]
++		value = x[1]
++		attrs[key[:-1]] = value
++	return attrs
++
++def dump_bcache(bcache_sysfs_path, stats, print_subdevices, device):
++	'''Dump bcache stats'''
++	def fmt_cachesize(val):
++		return '%s\t(%.0f%%)' % (format_sectors(val), 100.0 * val / cache_sectors)
++
++	attrs = [
++		(None,					'UUID',			lambda x: os.path.basename(bcache_sysfs_path)),
++		('block_size',				'Block Size',		pretty_size),
++		('bucket_size',				'Bucket Size',		pretty_size),
++		('congested', 				'Congested?',		str_to_bool),
++		('congested_read_threshold_us',		'Read Congestion',	lambda x: '%.1fms' % (int(x) / 1000)),
++		('congested_write_threshold_us',	'Write Congestion',	lambda x: '%.1fms' % (int(x) / 1000)),
++		(None,					'Total Cache Size',	lambda x: format_sectors(cache_sectors)),
++		(None,					'Total Cache Used',	lambda x: fmt_cachesize(cache_used_sectors)),
++		(None,					'Total Cache Unused',	lambda x: fmt_cachesize(cache_unused_sectors)),
++		#('dirty_data',				'Dirty Data',		lambda x: fmt_cachesize(interpret_sectors(x))),		# disappeared in 3.13?
++		('cache_available_percent',		'Evictable Cache',	lambda x: '%s\t(%s%%)' % (format_sectors(float(x) * cache_sectors / 100), x)),
++		(None,					'Replacement Policy',	lambda x: replacement_policies.pop() if len(replacement_policies) == 1 else '(Various)'),
++		(None,					'Cache Mode',		lambda x: cache_modes.pop() if len(cache_modes) == 1 else '(Various)'),
++	]
++
++	# Calculate aggregate data
++	cache_sectors = 0
++	cache_unused_sectors = 0
++	cache_modes = set()
++	replacement_policies = set()
++	for obj in os.listdir(bcache_sysfs_path):
++		if not os.path.isdir('%s/%s' % (bcache_sysfs_path, obj)):
++			continue
++		if obj.startswith('cache'):
++			cache_size = int(file_to_line('%s/%s/../size' % (bcache_sysfs_path, obj)))
++			cache_sectors += cache_size
++			cstats = get_cache_priority_stats('%s/%s' % (bcache_sysfs_path, obj))
++			unused_size = float(cstats['Unused'][:-1]) * cache_size / 100
++			cache_unused_sectors += unused_size
++			replacement_policies.add(file_to_line('%s/%s/cache_replacement_policy' % (bcache_sysfs_path, obj)))
++		elif obj.startswith('bdev'):
++			cache_modes.add(file_to_line('%s/%s/cache_mode' % (bcache_sysfs_path, obj)))
++	cache_used_sectors = cache_sectors - cache_unused_sectors
++
++	# Dump basic stats
++	print("--- bcache ---")
++	for (sysfs_name, display_name, conversion_func) in attrs:
++		if sysfs_name is not None:
++			val = file_to_line('%s/%s' % (bcache_sysfs_path, sysfs_name))
++		else:
++			val = None
++		if conversion_func is not None:
++			val = conversion_func(val)
++		if display_name is None:
++			display_name = sysfs_name
++		print('%-*s%s' % (MAX_KEY_LENGTH, display_name, val))
++	dump_stats(bcache_sysfs_path, '', stats)
++
++	# Dump sub-device stats
++	if not print_subdevices:
++		return
++	for obj in os.listdir(bcache_sysfs_path):
++		if not os.path.isdir('%s/%s' % (bcache_sysfs_path, obj)):
++			continue
++		if obj.startswith('bdev'):
++			dump_bdev('%s/%s' % (bcache_sysfs_path, obj))
++			dump_stats('%s/%s' % (bcache_sysfs_path, obj), '  ', stats)
++		elif obj.startswith('cache'):
++			dump_cachedev('%s/%s' % (bcache_sysfs_path, obj))
++
++def map_uuid_to_device():
++	'''Map bcache UUIDs to device files.'''
++	global SYSFS_BLOCK_PATH
++	ret = {}
++
++	if not os.path.isdir(SYSFS_BLOCK_PATH):
++		return ret
++	for bdev in os.listdir(SYSFS_BLOCK_PATH):
++		link = '%s%s/bcache/cache' % (SYSFS_BLOCK_PATH, bdev)
++		if not os.path.islink(link):
++			continue
++		basename = os.path.basename(os.readlink(link))
++		ret[basename] = file_to_line('%s%s/dev' % (SYSFS_BLOCK_PATH, bdev))
++	return ret
++
++def main():
++	'''Main function'''
++	global SYSFS_BCACHE_PATH
++	global uuid_map
++	stats = set()
++	reset_stats = False
++	print_subdevices = False
++	run_gc = False
++
++	parser = argparse.ArgumentParser(add_help=False)
++	parser.add_argument('--help',			help='Show this help message and exit',		action='store_true')
++	parser.add_argument('-f', '--five-minute',	help='Print the last five minutes of stats.',	action='store_true')
++	parser.add_argument('-h', '--hour',		help='Print the last hour of stats.',		action='store_true')
++	parser.add_argument('-d', '--day',		help='Print the last day of stats.',		action='store_true')
++	parser.add_argument('-t', '--total',		help='Print total stats.',			action='store_true')
++	parser.add_argument('-a', '--all',		help='Print all stats.',			action='store_true')
++	parser.add_argument('-r', '--reset-stats',	help='Reset stats after printing them.',	action='store_true')
++	parser.add_argument('-s', '--sub-status',	help='Print subdevice status.',			action='store_true')
++	parser.add_argument('-g', '--gc',		help='Invoke GC before printing status.',	action='store_true')
++	args = parser.parse_args()
++
++	if args.help:
++		parser.print_help()
++		return 0
++
++	if args.five_minute:
++		stats.add('five_minute')
++	if args.hour:
++		stats.add('hour')
++	if args.day:
++		stats.add('day')
++	if args.total:
++		stats.add('total')
++	if args.all:
++		stats.add('five_minute')
++		stats.add('hour')
++		stats.add('day')
++		stats.add('total')
++	if args.reset_stats:
++		reset_stats = True
++	if args.sub_status:
++		print_subdevices = True
++	if args.gc:
++		run_gc = True
++
++	if not stats:
++		stats.add('total')
++
++	uuid_map = map_uuid_to_device()
++	if not os.path.isdir(SYSFS_BCACHE_PATH):
++		print('bcache is not loaded.')
++		return
++	for cache in os.listdir(SYSFS_BCACHE_PATH):
++		if not os.path.isdir('%s%s' % (SYSFS_BCACHE_PATH, cache)):
++			continue
++
++		if run_gc:
++			with open('%s%s/internal/trigger_gc' % (SYSFS_BCACHE_PATH, cache), 'w') as fd:
++				fd.write('1\n')
++
++		dump_bcache('%s%s' % (SYSFS_BCACHE_PATH, cache), stats, print_subdevices, uuid_map.get(cache, '?'))
++
++		if reset_stats:
++			with open('%s%s/clear_stats' % (SYSFS_BCACHE_PATH, cache), 'w') as fd:
++				fd.write('1\n')
++
++if __name__ == '__main__':
++	main()
+-- 
+2.28.0
+
diff --git a/sys-fs/bcache-tools/files/1.1/bcache-tools-add-man-page-bcache-status.8.patch b/sys-fs/bcache-tools/files/1.1/bcache-tools-add-man-page-bcache-status.8.patch
new file mode 100644
index 000000000000..cd999a994a16
--- /dev/null
+++ b/sys-fs/bcache-tools/files/1.1/bcache-tools-add-man-page-bcache-status.8.patch
@@ -0,0 +1,69 @@
+From 91fd5fb518ae535e36cff1ae188d1bcef874cf40 Mon Sep 17 00:00:00 2001
+From: Coly Li <colyli@suse.de>
+Date: Wed, 2 Sep 2020 20:09:06 +0800
+Subject: [PATCH 2/2] bcache-tools: add man page bcache-status.8
+
+Add the initial man page for bcache-status.
+
+Signed-off-by: Coly Li <colyli@suse.de>
+---
+ bcache-status.8 | 47 +++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 47 insertions(+)
+ create mode 100644 bcache-status.8
+
+diff --git a/bcache-status.8 b/bcache-status.8
+new file mode 100644
+index 0000000..f56cfb6
+--- /dev/null
++++ b/bcache-status.8
+@@ -0,0 +1,47 @@
++.TH bcache-status 8
++.SH NAME
++bcache-status \- Display useful bcache statistics
++
++.SH SYNOPSIS
++.B bcache-status [ --help ] [ -f ] [ -h ] [ -d ] [ -t ] [ -a ] [ -r ] [ -s ] [ -g ]
++
++.SH DESCRIPTION
++This command displays useful bcache statistics in a convenient way.
++
++.SH OPTIONS
++
++.TP
++.BR \-\-help
++Print help message and exit.
++
++.TP
++.BR \-f ", " \-\-five\-minute
++Print the last five minutes of stats.
++
++.TP
++.BR \-h ", " \-\-hour
++Print the last hour of stats.
++
++.TP
++.BR \-d ", " \-\-day
++Print the last day of stats.
++
++.TP
++.BR \-t ", " \-\-total
++Print total stats.
++
++.TP
++.BR \-a ", " \-\-all
++Print all stats.
++
++.TP
++.BR \-r ", " \-\-reset\-stats
++Reset stats after printing them.
++
++.TP
++.BR \-s ", " \-\-sub\-status
++Print subdevice status.
++
++.TP
++.BR \-g ", " \-\-gc
++Invoke GC before printing status (root only).
+-- 
+2.28.0
+
diff --git a/sys-fs/bindfs/Manifest b/sys-fs/bindfs/Manifest
index cbc3c9b0ba9e..8ff4f2472ed9 100644
--- a/sys-fs/bindfs/Manifest
+++ b/sys-fs/bindfs/Manifest
@@ -1,5 +1,7 @@
 DIST bindfs-1.14.5.tar.gz 407863 BLAKE2B 2c75b426f2b2fd8947c2f7e8b74fd9826cccba99afce661713946acdc7765cd8065475ecc244d4ffd534fde8243d100eba03abcc643cec2a9d2fbec954c4ab73 SHA512 df8245339ef0491a58d69f3fca215b4cca4853976cedc507ba4c953ef136d34d245130c7bdb9b75adb7661e0f359582afae0b6e7b5f69252ca5adecbc09c51ec
 DIST bindfs-1.14.7.tar.gz 409427 BLAKE2B 0027ee589a39d6d29b4bc337aaa87e4cf231f4549245c14353a39fb7a66e8ade17412740f5caf2e2eed4cb0501b6537beaf4929d21256c5b0625304b056829a3 SHA512 03b0bce29b87219e7e159077942e66e7e0e783b8c41234231696f96aa83e66271431fd3b4e7c1d98ba74705ec7255bd7da9d9484981ddb86c4d1c1b35dcaa0cc
+DIST bindfs-1.14.8.tar.gz 410096 BLAKE2B 93184ccbb5b2ed3b75bb74e2c79e92d4b0f90a977713936a3aaf70d56a5801ca0316ea4a4c09818c435618b8a3c848a9d115fd038190a30053c82134a1a38106 SHA512 aa76528d227024b10631dc542c87d6ed9511226ee2983f8aeaf4da5f59acd9537194065505302f506b12150177f1fbdd654366aceea568ca16f40ae8dd2bdb94
 EBUILD bindfs-1.14.5.ebuild 478 BLAKE2B 8a742f9c0a17005ab1d6feec04d155cef1e9d6350dbaff76191273f3ff586bdbe21d96fdc34ce2f1f9ffe9c377537f1fe3135fd50e37db0e3c4d46d3124386a9 SHA512 23105ab140967691268df3809cfeb577a7c63538c356702ae471bf9dbaf3dd2fa1ff432f982ed0d90318cdef902d63237c6473e1487582ecff35ae7f6afd4e60
 EBUILD bindfs-1.14.7.ebuild 478 BLAKE2B 8a742f9c0a17005ab1d6feec04d155cef1e9d6350dbaff76191273f3ff586bdbe21d96fdc34ce2f1f9ffe9c377537f1fe3135fd50e37db0e3c4d46d3124386a9 SHA512 23105ab140967691268df3809cfeb577a7c63538c356702ae471bf9dbaf3dd2fa1ff432f982ed0d90318cdef902d63237c6473e1487582ecff35ae7f6afd4e60
+EBUILD bindfs-1.14.8.ebuild 478 BLAKE2B 8a742f9c0a17005ab1d6feec04d155cef1e9d6350dbaff76191273f3ff586bdbe21d96fdc34ce2f1f9ffe9c377537f1fe3135fd50e37db0e3c4d46d3124386a9 SHA512 23105ab140967691268df3809cfeb577a7c63538c356702ae471bf9dbaf3dd2fa1ff432f982ed0d90318cdef902d63237c6473e1487582ecff35ae7f6afd4e60
 MISC metadata.xml 325 BLAKE2B aa0a376311bff962fc56dfcfdf9f0d7eab54cde65ad9518ef24e38651e57bccc1514e444657e1dfc4c9a5c7f651e700b5b7122dedca39ac24029b6b7e990c493 SHA512 466c2a77d115de2a7b8110a3076d58b604e0f53a9de46842ffcb0fb2c913e0cc6e0393035432a101327a780163453ff973044f0b473584eb2be65a53a181e83c
diff --git a/sys-fs/bindfs/bindfs-1.14.8.ebuild b/sys-fs/bindfs/bindfs-1.14.8.ebuild
new file mode 100644
index 000000000000..69f9d93e580a
--- /dev/null
+++ b/sys-fs/bindfs/bindfs-1.14.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
+HOMEPAGE="https://bindfs.org/"
+SRC_URI="https://bindfs.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=sys-fs/fuse-2.9:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+RESTRICT="test"
+
+src_configure() {
+	econf $(use_enable debug debug-output)
+}
diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest
index bafbdc44fa9a..6edfe8c799b4 100644
--- a/sys-fs/diskdev_cmds/Manifest
+++ b/sys-fs/diskdev_cmds/Manifest
@@ -4,4 +4,4 @@ AUX diskdev_cmds-respect-cflags.patch 388 BLAKE2B 8ecaa932e3a5841bc9ace0ffd2fea2
 DIST diskdev_cmds-332.14.tar.gz 714035 BLAKE2B 8c66509366db8067b6b3057dc8dd8c6de5f25df86a88fec8beac78e4e14d91af5319bf61671ceea206508b6abac54231e82d527a2cc79ea467e7660e10997a7f SHA512 e1df91fb5330dc01a79de99dd8b1f389a337a19c2136994d59b7cbca9c2e1cb5f7d47101366dd01db4e23a5d3d7afab41758045bf7402d739fa22182dc922044
 DIST diskdev_cmds-332.14_p1.patch.bz2 21989 BLAKE2B f7e421c164ec242e6516a4638bc4c4706a11b03587fad0e7328a311d15f47b48b4e706f819cffa8e8539d7e4eaa8efa5f9a55a838f88586872e7fc8d67c9ac8e SHA512 aaef096aa6a3f2e09bcc8c1831172c3d68994589ade505153ade00e6f4d0c49263b63212f8616ece597b1ee218a87474bb1c3812d15f34c5bc5c51fd7b72a062
 EBUILD diskdev_cmds-332.14_p1-r3.ebuild 1331 BLAKE2B 3aa87e3b8743f508f1176c8e652e2d63660574c4a88bf829cd5c4f269fd21de4bfbfbce3cf1cdbfde5e5e15d5c5316beb994c66af7363b1ea979e91803a46161 SHA512 126425aab2c54ef9a146a7488023073ac677c74e87abcc151749dd8ec99c99b13ede41f0dad6b3680dca4f8b4c715bde08d2808019eaa363920ff48fa6d3098c
-MISC metadata.xml 375 BLAKE2B b5ab86c1adfdb8ad06c76fcff0378bc7d88bdb7510e0fa06cf3c32e5025d7bf7e151f4791e0b1bf9c76692408da5c979b7a9ea713cddf412e4c291eb2cbc31fb SHA512 4a9cb22aca89fe59e631d6a102977e8e3a6fe6f2599dddddcf7ca8eb043d2af50d23a43483cc23350d942cbbac52774571e57260820ea0448308858ed1fd45c5
+MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-fs/diskdev_cmds/metadata.xml b/sys-fs/diskdev_cmds/metadata.xml
index 9ee7b49bec49..c5298995d2d4 100644
--- a/sys-fs/diskdev_cmds/metadata.xml
+++ b/sys-fs/diskdev_cmds/metadata.xml
@@ -5,8 +5,4 @@
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>ppc@gentoo.org</email>
-		<name>Gentoo Linux PowerPC Development</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest
index d69f1a2d68bf..d3579b0854ab 100644
--- a/sys-fs/fuse-common/Manifest
+++ b/sys-fs/fuse-common/Manifest
@@ -6,4 +6,4 @@ DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fb
 EBUILD fuse-common-3.9.1.ebuild 878 BLAKE2B 2b36fcad7d4b870240f6d8c25639825bc51c8ceca28488a46708317f72d7e58978fa6c8bbdcc12be211016c256e36408723ce9f042d935fb679f433cf2046956 SHA512 36f14cb465000d7d48ebe0367e2a84af714567cfc28ba4583e9e9b6d8a92808e1acf001a2742d0996bb0ad9875badde088e380e66ccce6eaca851bc3c85fe4e8
 EBUILD fuse-common-3.9.2.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f
 EBUILD fuse-common-3.9.3.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f
-MISC metadata.xml 408 BLAKE2B 20a23e1ce0b234dcedcf095ccbef63413420ab0490a2e0b98f9dffcb43508bc7c770b0180e2cb9ac501764bc85f286b7e9bf81848e34257b414ed78c7de0877c SHA512 6bfd1910124508d1a555213adcd9509b19b28184fd5eb5346d84531370414194a6f18ac2ce7d726b4341018b058e02cf2805146fa1747aba21c6b9d8c2371020
+MISC metadata.xml 407 BLAKE2B 037af22bfc4bf2f29d8875a5dd0e9884597553b5a9d6a8853dfb30e69220c310118c6959440d2d619b40c6b14a3077b2e7b19351596af7d2795f37a0522705cb SHA512 5d4c0f0c1fee3610133de2cc7bd075c63de6dfe48782c10a882f8dcc2827ffe7b089b743ae5a5099fa47666f65b9f10cd3a3b41481f3f1090f0e67efd4268991
diff --git a/sys-fs/fuse-common/metadata.xml b/sys-fs/fuse-common/metadata.xml
index 8badbeef7062..4ef3e54e193d 100644
--- a/sys-fs/fuse-common/metadata.xml
+++ b/sys-fs/fuse-common/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>bman@gentoo.org</email>
-		<name>Aaron BaumanM</name>
+		<name>Aaron Bauman</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 9a6ae17a8b85..8b5eccb77cb8 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -7,4 +7,4 @@ EBUILD fuse-2.9.9-r1.ebuild 2070 BLAKE2B 2946ac81c95dbb8cc329247aaf0f123a4547511
 EBUILD fuse-3.9.1.ebuild 1951 BLAKE2B d77d30f658b18676242b9f12240da45cd10a6e320592dc8c742febcfd9ce046fe2a92fd89c1d7e4c01da5ed89cbcaa24550a7eb1a7475e9a1c6515b877886722 SHA512 a4e79858f9f94df3e7494eb79270246c6fd64c87e68974e960d661a6056b4acdd0990cd8faa0cf0f2e9703e87a7732acb27bf1f604949d23a1b44654fca53e15
 EBUILD fuse-3.9.2.ebuild 1959 BLAKE2B 9031d363fe452bd0daa3ae880b2026db1c58ca1a2547e486351f0121fa56f777cc681af5c5f8d32879e87b1832027c67cd112f57659312f6a02daa20c4ecd083 SHA512 dc61b7ad3b936d6d298c51bfca3bcfccc0da77e5d41eba9acae04a06a24195adb1d2b7e6eee7e4ff6d9da60f89e69fedc232fe543ee46f6a5577bb19971d0962
 EBUILD fuse-3.9.3.ebuild 1959 BLAKE2B 9031d363fe452bd0daa3ae880b2026db1c58ca1a2547e486351f0121fa56f777cc681af5c5f8d32879e87b1832027c67cd112f57659312f6a02daa20c4ecd083 SHA512 dc61b7ad3b936d6d298c51bfca3bcfccc0da77e5d41eba9acae04a06a24195adb1d2b7e6eee7e4ff6d9da60f89e69fedc232fe543ee46f6a5577bb19971d0962
-MISC metadata.xml 461 BLAKE2B 5886a41fed2f941b52933f1b2b83f7a6dfaf20a34721862a8ede36b573b6de79b3ac30fe25bf46e39047bf3d67b35bd44ae9747eccf566aa4d81f8bdee3d3a11 SHA512 66c7c7e08946aa12f78d09162654cb3da545a273e1a846b66a745bdb1767384c07bee4c8eccafce1615192d50cf783bddffcfd38783cc379afbae94a0b47e568
+MISC metadata.xml 460 BLAKE2B a8f51e9fc0148b7bcc163ea5e0f72291f9e36f3dad8c20076495fe32cb8d5fe992579ab069f840bca251164ff646c522ee0b7ad5ffa7b3115effa89d5acfe332 SHA512 e56ba815557e847487dbc76dbec4ae657c7c4ecebc9b3c02c39402daa699c5ff90923bcaf1843747c94d2025f339ca6521f35f48c6c4583d36e9de33e6f3a586
diff --git a/sys-fs/fuse/metadata.xml b/sys-fs/fuse/metadata.xml
index b64588b9eb7e..a992a2436837 100644
--- a/sys-fs/fuse/metadata.xml
+++ b/sys-fs/fuse/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>bman@gentoo.org</email>
-		<name>Aaron BaumanM</name>
+		<name>Aaron Bauman</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>base-system@gentoo.org</email>
diff --git a/sys-fs/hfsutils/Manifest b/sys-fs/hfsutils/Manifest
index 5e8af0ed72af..30f1734b0f02 100644
--- a/sys-fs/hfsutils/Manifest
+++ b/sys-fs/hfsutils/Manifest
@@ -2,5 +2,5 @@ AUX hfsutils-3.2.6-fix-tcl-8.6.patch 158 BLAKE2B bb12d05629bede97e0d0eedcf42cbab
 AUX largerthan2gb.patch 216 BLAKE2B d8f9edd367883df8ad1e88660f6f2e0d0d0654cfefe38da0b846ae136f141047b99c9251e9ef63e1fcb11bfc56f6ff739007a81d9cdf655e11270dfd7499db76 SHA512 f20e52f571995a0fc0b0e0a7b804717a1d501fbaecf80460cdbb69cbf2e956a2b8f33ec8c9fa637af2e857edc1d2565797d4a6f2c3ce2ace0359311ef8dc0882
 DIST hfsutils_3.2.6-14.debian.tar.xz 6780 BLAKE2B 00474d328f5ec2614ec429052e6940b9eb10d04f433399f686ccc24d66ca1559e7ca45c4ab3ebe6386e02fc4de5ffd96242a7aa6f58d6032798d5536da912a61 SHA512 33d44f7b9094743031fc9315cf9380e158225ee2cd5af7a5ec7c55a2ae9af42e16f9cad3c667b153a1d3d9484d4ea773d34b88b78bfe9499df52a8b9d77defb2
 DIST hfsutils_3.2.6.orig.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173
-EBUILD hfsutils-3.2.6_p14.ebuild 1386 BLAKE2B ea5b361576cc81de601b996c3138895ce1215a60befb1672bf40e93583e27b821c65a4d97e4449e6f36450b78cd7aae0fa8bd8e4cc39ee41d5aad0d007f6873b SHA512 72f6b34eeed6a85edab8e3ed2d5848c6e7bbbd1f539d39526d715b5b1b2d450dd3f302761f88fb2a97424f6cff88399c3edbba323517eb81b599c672a11b749b
-MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
+EBUILD hfsutils-3.2.6_p14.ebuild 1393 BLAKE2B 6c0981a18fedd2c7c9ed27eed5e7b85dbbebb4639837bd976c0fb06580d1f4180b053d13810bd9e44c8bd65dc0ada48b8e45505ca4b029365f5f5a2e8f8791cd SHA512 bc5da1ce959572c8824f976f4cb309d1ba80b02f218e6a9a864f3a989230f9daf422283a018022d39a44eb1acc49860818e0fa690e2d453c972edc0e114bc2cd
+MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
index 7a5d15a78c71..663f0b115d7d 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="tcl tk"
 
 DEPEND="
diff --git a/sys-fs/hfsutils/metadata.xml b/sys-fs/hfsutils/metadata.xml
index 5eb05198076b..c5298995d2d4 100644
--- a/sys-fs/hfsutils/metadata.xml
+++ b/sys-fs/hfsutils/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ppc@gentoo.org</email>
-	<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index f86a030b9f70..dbcae98cbe1b 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -2,5 +2,5 @@ AUX inotify-tools-3.20.1-rm-unused-cmd-arg.patch 495 BLAKE2B e838d5af6f64a1bc9b7
 DIST inotify-tools-3.20.1.tar.gz 79564 BLAKE2B 4b1235951f55ecb7c6c92b06b68dedebad8677c2265616dddd275bf627034b66b5756cf17a2f68f4201a78b043ec8a0800f115f3952c19875ae7f524b9b21382 SHA512 a97d27e6033036f0db5c0737bee3510206db9f4c843f0d18f1b2e179e838624ea33316c34fd9917c158dbb3580367908e90042fb1bfb146f150c32833b0b2ff2
 DIST inotify-tools-3.20.2.2.tar.gz 81006 BLAKE2B 7dd29985f68096fe2146a3ad84d619b3d1238b0db25eeb125f2fe9591fa678078351f00c7e09b526cf2251e4736201d5625ff0e477523cae370a307ccb667730 SHA512 72d6fdcc216d8083cd384c71c02dc8e800d3a9702613568b3c571f704aee3d42bf084c52f2141c9afb8d28e8b87ebb6391ed3d825b3d664ed51c552debeb1881
 EBUILD inotify-tools-3.20.1.ebuild 877 BLAKE2B e8c8831cd4596a80e1a2d0092489e3c0355086ff66d7cdbf5d0d3246539918e337b5679a169439aad4070a48f3ab7794966ff16e4c4b316bcdf4e45af0b7bc3f SHA512 fd7f3f20a5e087a6f3bedcc136f92fe2f320d08d2afe7b7a2a9c6dc5ac4307800595e300be71b2ec9aa6bdb24f60221cf7d0d6318075ff4a61356ae2e09178da
-EBUILD inotify-tools-3.20.2.2.ebuild 819 BLAKE2B a728b977430b71b71fdd0b13f14a9f290c1740dbffa67dfa3bdb779a18309f2c5eb7390fdc651844d3018c404601124d5f360d0f0d98a8290fae50318d74b7c3 SHA512 024972b621818669ebb2a315899a49c1aa520ecff62c9652f0349c6df1f2645fec2a4c8876d9b170b575074056506319feb4d1ca30c3e5080b8a589104980f5f
+EBUILD inotify-tools-3.20.2.2.ebuild 943 BLAKE2B ea876005b60646eb31877314dc40ec82d9c11a7724ba66d484abc1d4a93b71f30d5fd421aba745c0216514afb5cd2274210e47908db8677b0ea34de021489262 SHA512 a647b78df5863b7fd13f489879bef00c10467ff8b78f578153d87da03aa574ad88bf9b0fda6c012dce9b5b9d799a3e1438cc9b1695b012f32bea7b0df18d4996
 MISC metadata.xml 649 BLAKE2B 414281eb4ef1da7d9b3cbaf61603043a64c6b748b6d21f7693b1bc4e6fdb1c811fc59490c3246cdf0526de0658ada36251493ea9c5f00f5e700d8d4e68f99868 SHA512 62eaab525f91d97a37b526fb07b7ee4b5c7abcfdd9f785655d3252de2a4f545649da51341c5c0ff4201e0ea097bb7206d2dbe5285c9008a392c55e4802c229e7
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
index 391f17cbf861..ff0369a04dea 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
@@ -19,6 +19,11 @@ RDEPEND=""
 
 src_prepare() {
 	default
+
+	# Remove -Werror from CFLAGS (#745069)
+	find -name "Makefile.am" -print0 \
+		| xargs --null sed 's@ -Werror@@' -i || die
+
 	eautoreconf
 }
 
diff --git a/sys-fs/jdiskreport-bin/Manifest b/sys-fs/jdiskreport-bin/Manifest
index 2254b56ae9cb..734607f8260d 100644
--- a/sys-fs/jdiskreport-bin/Manifest
+++ b/sys-fs/jdiskreport-bin/Manifest
@@ -1,7 +1,3 @@
-DIST jdiskreport-1_2_5.zip 613585 BLAKE2B f78ea7b0449c89b966e810dda3515a502187aff07b5cc008a5d3e110f4506aebef9cb2f2c3302d9e7e3e22e25fcbff16c381404acc0356311a8a05f72592af5c SHA512 d23641610a9fba6b7b2c5d529244229e807d89bd2b4c339e59522547f3b45a32415d6819a4ee8d5bd4a8789ea4610887428bfd5a5a4c56b11911da035a560993
-DIST jdiskreport-1_3_0.zip 650433 BLAKE2B 4edeec05f53bf10c3b1a911790a56f8f3e591b36b29b645a3378e357c6b0e835d4530753058541d712727111dd91a3dbf07664bc52c4cb1b330086fa5ae59af1 SHA512 9d57e7db810117a27c1d8d2aef40113652f25055e3512500fdf5f8806b1d68f4be8b4231e281d690108301afde3cc6b70f061c71d3fafef06689ca3228dd44ea
 DIST jdiskreport-1_4_1.zip 864613 BLAKE2B 9f10a10e54f0553e9130bdaf801380b40982a48e308fff5418308a37a4e02a886961d5ff2787b9bc3d1dfa1db087409e0447b275f6419b5e775716d20843fa98 SHA512 c1e17bdaab739561ae46475d69805e18be271a0d41b555e981cde59091d6c46fe3cf6775bdd992200edbb4646b7a04003a6b67bfedc18161952a20e47b18ea38
-EBUILD jdiskreport-bin-1.2.5-r1.ebuild 650 BLAKE2B cb2701aefc30a2e887aae5e0d72c396005911268a8b765d95b7724db50263a7a27c5e5382f54a36e071f4fe8ab421b37e8ed13b9dc1fd1c0f7dbdb3fa6d92690 SHA512 774e2b2c278511825066dab5fb2c24ed64df33bf907e3eb5eac1abbf7bb5c2c83e09ba9be4a43acae08b3170279aae82174dfab80ba72ca84e53f8ad0164a3c5
-EBUILD jdiskreport-bin-1.3.0.ebuild 650 BLAKE2B cb2701aefc30a2e887aae5e0d72c396005911268a8b765d95b7724db50263a7a27c5e5382f54a36e071f4fe8ab421b37e8ed13b9dc1fd1c0f7dbdb3fa6d92690 SHA512 774e2b2c278511825066dab5fb2c24ed64df33bf907e3eb5eac1abbf7bb5c2c83e09ba9be4a43acae08b3170279aae82174dfab80ba72ca84e53f8ad0164a3c5
 EBUILD jdiskreport-bin-1.4.1.ebuild 650 BLAKE2B 9cd7263ccfac9331c0c7730335741aec623418a7073fa02082d15957edb90a9f8759e3682c0a6bdc337522e3d7b6d940e825c8a68094ce1c986216eb26877516 SHA512 e0006eb4794e244f18d4ba53d4088de3d9967797d92b74e50a2d7cacd6ebf878497eea2015d338fe3d8b4e071a0a67bc52edbcf35c5dbb2eae5cbb8a25063c6e
 MISC metadata.xml 449 BLAKE2B 93a22d95c04e27c440815e9440a6a3928462826412c94e718939cbfa9dc8a93496dc4b5ccdc3408d1b8a2c328aa01cc85d8b9f9fb92ccc9a3f5215f50e245c36 SHA512 d0192d871b568d54810f2d2d973666fc309f8855c18b53e89631fb9495770978bfc1b583094151e6dc0916444b6594f3c588db5a070762b3c5b844848752673c
diff --git a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild
deleted file mode 100644
index 7eefac0eba94..000000000000
--- a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV//\./_}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="JDiskReport helps you to understand disk drive usage"
-HOMEPAGE="http://www.jgoodies.com/freeware/jdiskreport/"
-SRC_URI="http://www.jgoodies.com/download/${MY_PN}/${MY_P}.zip"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
-	java-pkg_newjar ${MY_PN}-${PV}.jar
-	java-pkg_dolauncher ${MY_PN}
-
-	dodoc README.txt RELEASE-NOTES.txt
-}
diff --git a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.3.0.ebuild b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.3.0.ebuild
deleted file mode 100644
index 7eefac0eba94..000000000000
--- a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-2
-
-MY_PN=${PN/-bin/}
-MY_PV=${PV//\./_}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="JDiskReport helps you to understand disk drive usage"
-HOMEPAGE="http://www.jgoodies.com/freeware/jdiskreport/"
-SRC_URI="http://www.jgoodies.com/download/${MY_PN}/${MY_P}.zip"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
-	java-pkg_newjar ${MY_PN}-${PV}.jar
-	java-pkg_dolauncher ${MY_PN}
-
-	dodoc README.txt RELEASE-NOTES.txt
-}
diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest
index c091b1db715a..03fdc66f3835 100644
--- a/sys-fs/mac-fdisk/Manifest
+++ b/sys-fs/mac-fdisk/Manifest
@@ -8,4 +8,4 @@ AUX mac-fdisk-amd64.patch 5154 BLAKE2B c8bbc117df448bc4c1181d9c172bc78dd5b1fd021
 DIST mac-fdisk_0.1-18.diff.gz 20267 BLAKE2B 111e5b18c1485b33cfb2f653846e901a528e65207d705f024bb4ba1e181881913fc79cc2bf94c536e0bd2f88f9169d25f2a64c0d1464844a2ebb8e24f1554a61 SHA512 5774e86e1770873cbccb80a79941c6bf917ac1df62f722805b1c4eae0a76b318b3df36ed39ac16d8b051e771603cc42a13feeaadd451343f6a21703e07e58c11
 DIST mac-fdisk_0.1.orig.tar.gz 55817 BLAKE2B d193be6b06be562bcb3297300dc009ac28adba41ea5d7c1a5bc0d16b8f9ec8275e1ad015c9bc529c3aafd12cbd9012e1af7baef7259ce0c8cef4d6dc62986dec SHA512 1263e60a18111162f5ef439b5f9615cef9de94e7836cb998782a6e6d3bcf92a69e49566b33c7330bdea05de5e6ca83f7920c6707f342ce515440160695f07120
 EBUILD mac-fdisk-0.1_p18.ebuild 1270 BLAKE2B 78e0a235eed6ec2d1b3f842b0a688db8f15f7f2d96ddfefadc1a9b7a242183be6b87d2dc96c8f1aa8475d44a353653e82518a86cdf3f19dc81631a2c5737da8c SHA512 4f930aa9bd653ed7cdc240c63265efad87560bb91cf4ab20c6c84984240c743da336bd21c59607c7595414304bb18d670bbe1a54230d3f3b95d1ea78bbddde56
-MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
+MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-fs/mac-fdisk/metadata.xml b/sys-fs/mac-fdisk/metadata.xml
index 5eb05198076b..c5298995d2d4 100644
--- a/sys-fs/mac-fdisk/metadata.xml
+++ b/sys-fs/mac-fdisk/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ppc@gentoo.org</email>
-	<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/zfs-auto-snapshot/Manifest b/sys-fs/zfs-auto-snapshot/Manifest
index 01464528c1cc..d57db57dfb6e 100644
--- a/sys-fs/zfs-auto-snapshot/Manifest
+++ b/sys-fs/zfs-auto-snapshot/Manifest
@@ -1,5 +1,17 @@
 AUX README.gentoo 684 BLAKE2B 7175ddfbb8dd5b209fa4fa5e5a3aeecac3fdd102e240f93b640f91bbf0204f9101801a94087383d7087bec08ae490e9769dfcf4f7f218d6daa4779087a8a0d23 SHA512 e77c3a573c2d4499df902b68909c186e4c80ba8b451b493c7e08e5e96ebe281933ce4b5fc11c201e33f27b14a02a35fd85270baf7ddece42a2fcbc6c3c421146
+AUX zfs-auto-snapshot-daily.service 216 BLAKE2B 7c07eb29b2923cdce50af71f356edcb688a803f36711edd4cef61d89324425f255ba17139f0eb7c9fb75bc5316051b76504e8fe476ea84592a0fa318c2f84711 SHA512 0cd391b026d3f2d2af312bd2c572cff7ee136f1575fb69b9a2fc044105d8fa463b4fb511fd5f17cf773a53894b9fe20691aac11d95f7884cfcf6ef76e0c615bf
+AUX zfs-auto-snapshot-daily.timer 148 BLAKE2B 2392e77048af08c24cf18b5428706251a292701343d967f61f8fb1aa0cc0b3f0f0fa7ce70556fd46951608b2ebeb16b7ac76e29eda9c19a75b7db98a76768320 SHA512 38b4a48132afe5634934a6064eccb9089f9b32514c1614bc5a28798b67dac5f378f65e7f437d2f2b7f35063460be26df7c663733d719c2e2de7fd4d63fe70c60
+AUX zfs-auto-snapshot-frequent.service 221 BLAKE2B 8d7268fbb74fb4193d5e136c86065ad3432e7d25d6875296ea0175ce809d7d8663ff3c8f769643e9d8131a45c3c1912a942308f93680e91b910e47da5a887d5e SHA512 60bb1f59c187388db631da02340102802a22957ed314ab92042e144df38276d741ab5d02b10b200182686b5b4a0f2af54db29e57eaeed5dece3ffca3d1d258f0
+AUX zfs-auto-snapshot-frequent.timer 151 BLAKE2B 1a64a3cfdd3158bc37efb289e7ab6d9e072e7cad45859ac6003a110cda20acbdf07050b9e71348fbdc4741fd6eeabe92ccfca04608244768057dbf6ece92ee31 SHA512 4b4fbf5794e63abcbff1a5f88bc502c084b5a205b0c316a981e64b29e86eebec23cf0b8aac8d324d73324d2fd624b6866a16c1e3074ac73834aa83bd5d5000ad
+AUX zfs-auto-snapshot-hourly.service 218 BLAKE2B 8ba476bc812861ddc9afb35c5ce125a6ee96941459856a30841d037b29080569c8a69e13ab2b7b9fce262622e02609a290656ce39fb0170cf9e839961b346b6a SHA512 f3893aafa3081866158e13a9fdd74ebed20cdde90b898fc79a7b041479e9e031c3d5cb40c257f38216456228a2caa02e48bf44ca59000e8d045061875a1ae412
+AUX zfs-auto-snapshot-hourly.timer 149 BLAKE2B 47af6c37755b03df10920abd2ba44afaaab3f72f0dac1071c9b0d4b1c1ea58c4d8578ebf9b24f8dc7104b5abf19c2d5a18f8eafafe232fa222073e1250739bbf SHA512 63f79c2495a08dfbb908416b33ff0dc419c8ad69d7bb472c6ec7a4cb7988ccb3713f38f2697cf5ed4bf8bfaaea597bef84585257f95c20f67929cf6e6c1c3f3d
+AUX zfs-auto-snapshot-monthly.service 220 BLAKE2B 31f47f232a7eea37068c7881fc7a0fbeedfa4ebc90e8f6611aecd5bf434287198c78fb2bc5b0961f9dc7b8a84135df7756fe4c79ebddf3b8d2592e36a242c253 SHA512 a108f652d86a7d90ebae2694178ac03305d9ffaf8b77a1ad4d1f2ef77678e53a67fa8f4cf0bcd53eea8df62bdcb599c299d00739d451e0ecdefd93386e954670
+AUX zfs-auto-snapshot-monthly.timer 152 BLAKE2B 617e0e9e31b6c081bd4aa626978a9c988931ffc37738bc841b7dbbf2c5877a80f7e80893f133c3ee64b36fafb5842e1da18366ab061ab132b9303325731c2d20 SHA512 20339cc6e317a7bf7eae8c1e8ec2e2669276aa9148e8a4f5697896b261617214ca20dff109e452e3af06dd91ca9787f77691fb021a62a4fd5243d6cc43edf87b
+AUX zfs-auto-snapshot-weekly.service 217 BLAKE2B 715f8f8da6272b9ea782dbe77dbafa6e919297c9c24c58f38775cc9356f5644a57a86fa7ff80134558c8f3081df3c102cc455eb815c729ef4cebed81bc4dfe9d SHA512 7ecaf7256a3921a5cac6c551b3b7d833907c02530141abfcf2689c90f3bb091d6115fb3e62695bccf4fce172ec3c8b6b8a8ff0960f73dd65404cfff4b15985cf
+AUX zfs-auto-snapshot-weekly.timer 150 BLAKE2B 655187add790017f8328edae33e88eb0a4b88774999e67a5fb9c990f5bae9a13ac1e64c290c7e0a218cdcf05dd7bbe320369d1741da036c54994371eecfc50d7 SHA512 49357f15660900b344eba04f8d4bab7e153b728b4665e285b2f9320a287c15b62c426d568d2ba9a43daf69c6f1a6fbccff8b68417f8991dd5f8c3368d562b73c
+AUX zfs-auto-snapshot.target 360 BLAKE2B 17be6ab113a8849d5244fd36140d1165c4e919df2a04f4b16aa591c1c92b29243b1be4f2243bcc6a8ef015b0cc1fb53b183da1c83668e4e7e0b609f7301a3372 SHA512 f607dada27e4be409184152b93e2079eecf12f5eba76f2dbe42bdbf4793603063c23813e752bfd829a081eeb6d09c86bc18ab75d65bff87b2c1d4f998abac516
 DIST zfs-auto-snapshot-upstream-1.2.4.tar.gz 13375 BLAKE2B 2a44cdecb7c4bb432c1804dba9a6674289aced9664ae0fcc6a33b604b128d852fce459367316f11961747594516916da51072ed10f84d0c01ea8cca553ce7eec SHA512 26382303fce8b90dfb40f69fcab92308e88c17c147b4a566c5d32f2e9aa241d64f5da56ad82b4becb824ba01a470037a724460d35676a1d46de9c578c02a57d9
+EBUILD zfs-auto-snapshot-1.2.4-r1.ebuild 2569 BLAKE2B f263b09a100de5847cd23761b53f123e61f4ab8e9c4f98bb7a0dd8854e3e70e41fd4e4df730b2c265e5a18a636c479bbf7a689309b6a8bd7fe8ae011801a8732 SHA512 ecbcdd796820464725ecab22bd8fd5049c46cd1a3f45bef305e1910f14dddbc3ca9973afe623423c409b71ff8459b22a5eda201b2e0b08235b728dd6fbf74301
 EBUILD zfs-auto-snapshot-1.2.4.ebuild 1388 BLAKE2B bbdc50ab6b3ee05cd8c7606b07d7609d62e092345232261a47bf12e423d0bd548d1f009f54aa8fa25a387264e20abfbf8efa415f87cb6ab2331a6e8250ef8a55 SHA512 2bbc915d73fe4fb581af4b9a512228834eaa13105be89e8b9a2303334328c426030220fe750ab7662f83c173184787367994bdb1c2adb7647fc9bc5e14b4a8d0
-EBUILD zfs-auto-snapshot-9999.ebuild 1390 BLAKE2B 641dd27e8910fce57c130dbaf49460efb5ca9f89a694f0f9661b898b75bd0af015d9036d43eb6d36840b325eb4a56c03d609dad326211534e97c2c53f8394e29 SHA512 180789c017c9c0f2fc432cf7cdcb147bfa2862a265fcab804585904c4cf0bd759ba89fe989d0a3474d5a1ffa4b3ae8a3f4fb0919241278624a5023265da26e97
-MISC metadata.xml 909 BLAKE2B 74eeac781ab385dfd962c316d6792c79ebdffed9084f3c7b071a13b502edb881555e4e9525a1c8c5f2fe0ca51241afbe430f7ce07fdbd4b2554c841f1837af85 SHA512 d98be1718d600b6a04af37294de1eb47e814c74ddf24d4e119d037554baf3f9b551ab43dabd1dcd70b35b65e9fb687325c04371d078757d26c07385ac72143c8
+EBUILD zfs-auto-snapshot-9999.ebuild 2569 BLAKE2B f263b09a100de5847cd23761b53f123e61f4ab8e9c4f98bb7a0dd8854e3e70e41fd4e4df730b2c265e5a18a636c479bbf7a689309b6a8bd7fe8ae011801a8732 SHA512 ecbcdd796820464725ecab22bd8fd5049c46cd1a3f45bef305e1910f14dddbc3ca9973afe623423c409b71ff8459b22a5eda201b2e0b08235b728dd6fbf74301
+MISC metadata.xml 964 BLAKE2B 1770ba286fb8bc951069d778bed894d02536ee199e9cfa776878af509ecc77db36048a62ea45ff4f3ce6e4320e1d03ad373825a9de54fcd42e16031d8be52125 SHA512 89291918f6f2f4fb919513ed50ec47d3abeb0b5bb9227c13f6d5875a0d12765fee685c75b547745df90f625b7231226a2f299a197336d57e6970a0bbe6fc4071
diff --git a/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-daily.service b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-daily.service
new file mode 100644
index 000000000000..6929cb837438
--- /dev/null
+++ b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-daily.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=ZFS daily snapshot service
+Documentation=man:zfs-auto-snapshot(8)
+
+[Service]
+ExecStart=@GENTOO_PORTAGE_EPREFIX@/usr/sbin/zfs-auto-snapshot @DEFAULT_EXCLUDE@ --skip-scrub --label=daily --keep=31 //
diff --git a/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-daily.timer b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-daily.timer
new file mode 100644
index 000000000000..2198d83f458b
--- /dev/null
+++ b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-daily.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=ZFS daily snapshot timer
+Documentation=man:zfs-auto-snapshot(8)
+
+[Timer]
+OnCalendar=daily
+Persistent=true
+RandomizedDelaySec=600
diff --git a/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-frequent.service b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-frequent.service
new file mode 100644
index 000000000000..ae698351ee3e
--- /dev/null
+++ b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-frequent.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=ZFS frequent snapshot service
+Documentation=man:zfs-auto-snapshot(8)
+
+[Service]
+ExecStart=@GENTOO_PORTAGE_EPREFIX@/usr/sbin/zfs-auto-snapshot @DEFAULT_EXCLUDE@ --skip-scrub --label=frequent --keep=4 //
diff --git a/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-frequent.timer b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-frequent.timer
new file mode 100644
index 000000000000..e42f2eec50e0
--- /dev/null
+++ b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-frequent.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=ZFS frequent snapshot timer
+Documentation=man:zfs-auto-snapshot(8)
+
+[Timer]
+OnCalendar=*:0/15
+Persistent=true
+RandomizedDelaySec=60
diff --git a/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-hourly.service b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-hourly.service
new file mode 100644
index 000000000000..72dc764e4c7f
--- /dev/null
+++ b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-hourly.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=ZFS hourly snapshot service
+Documentation=man:zfs-auto-snapshot(8)
+
+[Service]
+ExecStart=@GENTOO_PORTAGE_EPREFIX@/usr/sbin/zfs-auto-snapshot @DEFAULT_EXCLUDE@ --skip-scrub --label=hourly --keep=24 //
diff --git a/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-hourly.timer b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-hourly.timer
new file mode 100644
index 000000000000..5d3f5e51e312
--- /dev/null
+++ b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-hourly.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=ZFS hourly snapshot timer
+Documentation=man:zfs-auto-snapshot(8)
+
+[Timer]
+OnCalendar=hourly
+Persistent=true
+RandomizedDelaySec=59
diff --git a/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-monthly.service b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-monthly.service
new file mode 100644
index 000000000000..c96607cd6a16
--- /dev/null
+++ b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-monthly.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=ZFS monthly snapshot service
+Documentation=man:zfs-auto-snapshot(8)
+
+[Service]
+ExecStart=@GENTOO_PORTAGE_EPREFIX@/usr/sbin/zfs-auto-snapshot @DEFAULT_EXCLUDE@ --skip-scrub --label=monthly --keep=12 //
diff --git a/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-monthly.timer b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-monthly.timer
new file mode 100644
index 000000000000..bf5f8944bcb5
--- /dev/null
+++ b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-monthly.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=ZFS monthly snapshot timer
+Documentation=man:zfs-auto-snapshot(8)
+
+[Timer]
+OnCalendar=monthly
+Persistent=true
+RandomizedDelaySec=600
diff --git a/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-weekly.service b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-weekly.service
new file mode 100644
index 000000000000..47a517ebbed9
--- /dev/null
+++ b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-weekly.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=ZFS weekly snapshot service
+Documentation=man:zfs-auto-snapshot(8)
+
+[Service]
+ExecStart=@GENTOO_PORTAGE_EPREFIX@/usr/sbin/zfs-auto-snapshot @DEFAULT_EXCLUDE@ --skip-scrub --label=weekly --keep=8 //
diff --git a/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-weekly.timer b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-weekly.timer
new file mode 100644
index 000000000000..9eebb0dfdb8d
--- /dev/null
+++ b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-weekly.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=ZFS weekly snapshot timer
+Documentation=man:zfs-auto-snapshot(8)
+
+[Timer]
+OnCalendar=weekly
+Persistent=true
+RandomizedDelaySec=600
diff --git a/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot.target b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot.target
new file mode 100644
index 000000000000..b2d10f606da5
--- /dev/null
+++ b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot.target
@@ -0,0 +1,11 @@
+[Unit]
+Description=Automatically create, rotate, and destroy periodic ZFS snapshots.
+Documentation=man:zfs-auto-snapshot(8)
+Requires=zfs-auto-snapshot-frequent.timer
+Requires=zfs-auto-snapshot-daily.timer
+Requires=zfs-auto-snapshot-hourly.timer
+Requires=zfs-auto-snapshot-weekly.timer
+Requires=zfs-auto-snapshot-monthly.timer
+
+[Install]
+WantedBy=timers.target
diff --git a/sys-fs/zfs-auto-snapshot/metadata.xml b/sys-fs/zfs-auto-snapshot/metadata.xml
index 7ee701b35b9f..3e7ea4e0074d 100644
--- a/sys-fs/zfs-auto-snapshot/metadata.xml
+++ b/sys-fs/zfs-auto-snapshot/metadata.xml
@@ -15,7 +15,8 @@
 		snapshots if it is installed.
 	</longdescription>
 	<use>
-		<flag name="default-exclude">Only take snapshots if dataset has com.sun:auto-snapshot=true property set</flag>
+		<flag name="cron">Install /etc/cron.* files</flag>
+		<flag name="default-exclude">Only take snapshots of datasets with com.sun:auto-snapshot=true property set</flag>
 	</use>
 
 	<upstream>
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..4096503e2fff
--- /dev/null
+++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix readme.gentoo-r1 systemd
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
+else
+	MY_P="${PN}-upstream-${PV}"
+	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="ZFS Automatic Snapshot Service for Linux"
+HOMEPAGE="https://github.com/zfsonlinux/zfs-auto-snapshot"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+cron +default-exclude systemd"
+
+RDEPEND="
+	sys-fs/zfs
+	!systemd? ( virtual/cron )
+"
+
+REQUIRED_USE="!systemd? ( cron )"
+
+src_install() {
+	if use default-exclude; then
+		for cronfile in etc/"${PN}".cron.{daily,hourly,monthly,weekly}; do
+			sed -i "s/\(^exec ${PN}\)/\1 --default-exclude/" "${cronfile}" || die
+		done
+		sed -i "s/\(; ${PN}\)/\1 --default-exclude/" etc/"${PN}".cron.frequent || die
+	fi
+	readme.gentoo_create_doc
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+
+	local exclude unit
+	exclude="$(usev default-exclude)"
+	for unit in "${PN}"{-daily,-frequent,-hourly,-monthly,-weekly}.service; do
+		cp "${FILESDIR}/${unit}" "${T}/${unit}" || die
+		eprefixify "${T}/${unit}"
+		sed -i "s/@DEFAULT_EXCLUDE@/${exclude:+--default-exclude}/g" "${T}/${unit}" || die
+		systemd_dounit "${T}/${unit}"
+	done
+	for unit in "${PN}"{-daily,-frequent,-hourly,-monthly,-weekly}.timer; do
+		systemd_dounit "${FILESDIR}/${unit}"
+	done
+	systemd_dounit "${FILESDIR}/${PN}.target"
+
+	if ! use cron; then
+		ebegin "removing cron files from installation image"
+		rm -rfv "${ED}/etc" || die
+		eend "$?"
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if ! use default-exclude; then
+		ewarn "snapshots are enabled by default for ALL zfs datasets"
+		ewarn "set com.sun:auto-snapshot=false or enable 'default-exclude' flag"
+		elog
+	fi
+
+	if use cron && has_version sys-process/fcron; then
+		ewarn "frequent snapshot may not work if you are using fcron"
+		ewarn "you should add frequent job to crontab manually"
+	fi
+
+	if use cron; then
+		if systemd_is_booted || has_version sys-apps/systemd; then
+			echo
+			ewarn "Both 'cron' and 'systemd' flags are enabled."
+			ewarn "So both ${PN}.target and cron files were installed."
+			ewarn "Please don't use 2 implementations at the same time."
+			ewarn "Cronjobs are usually enabled by default via /etc/cron.* jobs"
+			ewarn "If you want to use systemd ${PN}.target timers"
+			ewarn "disable 'cron' flag and reinstall ${PN}"
+			echo
+		fi
+	fi
+}
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild
index c880e32a7601..4096503e2fff 100644
--- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild
+++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit readme.gentoo-r1
+inherit prefix readme.gentoo-r1 systemd
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -20,10 +20,14 @@ HOMEPAGE="https://github.com/zfsonlinux/zfs-auto-snapshot"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+default-exclude"
+IUSE="+cron +default-exclude systemd"
 
-RDEPEND="sys-fs/zfs
-	virtual/cron"
+RDEPEND="
+	sys-fs/zfs
+	!systemd? ( virtual/cron )
+"
+
+REQUIRED_USE="!systemd? ( cron )"
 
 src_install() {
 	if use default-exclude; then
@@ -34,6 +38,25 @@ src_install() {
 	fi
 	readme.gentoo_create_doc
 	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+
+	local exclude unit
+	exclude="$(usev default-exclude)"
+	for unit in "${PN}"{-daily,-frequent,-hourly,-monthly,-weekly}.service; do
+		cp "${FILESDIR}/${unit}" "${T}/${unit}" || die
+		eprefixify "${T}/${unit}"
+		sed -i "s/@DEFAULT_EXCLUDE@/${exclude:+--default-exclude}/g" "${T}/${unit}" || die
+		systemd_dounit "${T}/${unit}"
+	done
+	for unit in "${PN}"{-daily,-frequent,-hourly,-monthly,-weekly}.timer; do
+		systemd_dounit "${FILESDIR}/${unit}"
+	done
+	systemd_dounit "${FILESDIR}/${PN}.target"
+
+	if ! use cron; then
+		ebegin "removing cron files from installation image"
+		rm -rfv "${ED}/etc" || die
+		eend "$?"
+	fi
 }
 
 pkg_postinst() {
@@ -45,8 +68,21 @@ pkg_postinst() {
 		elog
 	fi
 
-	if has_version sys-process/fcron; then
+	if use cron && has_version sys-process/fcron; then
 		ewarn "frequent snapshot may not work if you are using fcron"
 		ewarn "you should add frequent job to crontab manually"
 	fi
+
+	if use cron; then
+		if systemd_is_booted || has_version sys-apps/systemd; then
+			echo
+			ewarn "Both 'cron' and 'systemd' flags are enabled."
+			ewarn "So both ${PN}.target and cron files were installed."
+			ewarn "Please don't use 2 implementations at the same time."
+			ewarn "Cronjobs are usually enabled by default via /etc/cron.* jobs"
+			ewarn "If you want to use systemd ${PN}.target timers"
+			ewarn "disable 'cron' flag and reinstall ${PN}"
+			echo
+		fi
+	fi
 }
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 101b68f2115e..5cc774d275a4 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,8 +1,9 @@
 AUX 0.8.4-initconfdir.patch 1004 BLAKE2B fd4186b5f378f562098040a8e13a12e6fd7f0f37f3b981a8d46e0e3bc943eb8dd5fa474e6c65cefd8c03fc3c45a119f6a141d42753ce4729e3a234e7f57dc4b8 SHA512 c18e9cd03d537a3ad632e1aeb354b56f5db9a8ef51c30b2e728ea527b7e9017219b1a230374238ecdd24082d9f2c62510aea68b234df84961ada5dce2ed617cc
+AUX 2.0.0_rc2-exports-d-permissions.patch 5290 BLAKE2B 40973b72df805d4e8ef4d02acbfa05e70fbdcdc0484c9f69960800a3b354998ee179e2fad3553264ecd442ffcbd1c3c9a992e48f6b81dec199501b0d0aac1207 SHA512 0a23bb1ee709c9229297388252ea657d18d368952095eb6f4598b4b17c6f693d592abd466b8be2c92f343b8f2588fcb22704c935209e1e43ea7856ed17f5fa66
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
 DIST zfs-2.0.0-rc2.tar.gz 12854085 BLAKE2B 73cabd565c11eef1bebbc391f8c4ba18acd1610f98f1b8afb507bc844f4b6a64ba32d9727e634c7f26c48fe365a841bf071513df234b9b7a87e954610a6d7f3b SHA512 14b17d06124890efef15b3b073e103c9faeecaea761779fff9a8420e3ab72fa611df9875fa766a323d69646e9025f8b19f918ded4c6705af116cf9f14eea4f40
 EBUILD zfs-0.8.4-r2.ebuild 5645 BLAKE2B 162d5f2689b7842df19fa7ffb21579faa2f0c8d5a3ab5251cb6a427667957de78ca3c4228f51874851454e3b25613c13f32d179ce308194c4af3e75d8fa07a2e SHA512 57d265e0b9128e1d2a13863f87377ba00026bd0f8ff4dc42604b0efce167224be3fb32a051735da79ce303750913b7ab2444195fcfc33b497e8842fd12b7f3b3
-EBUILD zfs-2.0.0_rc2.ebuild 5861 BLAKE2B 1a235667de2aeb65ceca37e11867ffd75a35852e91ae0e0e1141530b1eec73bffa42acc01c29dff84d6cd21333cd41481e5c4c11f5772b96f65b83d0759ccda1 SHA512 3f7b2cf46e2508feaa6b7aa31733a8117a8d5ac11defaf60a7d33e201b932c742d84202044dfcb399bb916003ca9b50d5fbb57134af82485a5a0b018e62b5e32
+EBUILD zfs-2.0.0_rc2-r1.ebuild 5911 BLAKE2B b59fd2636f280632ad6ce84da9f6336028a5ce38d60d37c6c95d93fbef860e0e24b15c7b2ecd084af5de5727adf2377c0dd8e794475da96e24fc9e19399cab71 SHA512 abdff63d208e07dea79cb1c06f587762ba770e6f30cae2780211e235ab0da5dea96077f89776092adf453cf495200596f576348a4f9e59e489b323b88d393860
 EBUILD zfs-9999.ebuild 5861 BLAKE2B 1a235667de2aeb65ceca37e11867ffd75a35852e91ae0e0e1141530b1eec73bffa42acc01c29dff84d6cd21333cd41481e5c4c11f5772b96f65b83d0759ccda1 SHA512 3f7b2cf46e2508feaa6b7aa31733a8117a8d5ac11defaf60a7d33e201b932c742d84202044dfcb399bb916003ca9b50d5fbb57134af82485a5a0b018e62b5e32
 MISC metadata.xml 1003 BLAKE2B 640ef6d6f178ae9c3f3281a8e8539980c4a263f6cf0c5f4e1de3f0572f2acfe409865e85a12473129eb026130c9b76b946ee7698bd990b05f14e6b26c40fcb22 SHA512 965eabb5488a3cb54b360b33c847a2eb0d326a2c6761d86d581e06c2f52db9478fe7df131f68cb57bf32a2a872ecc1597e2a1a6b457d254f578d684cf73810c5
diff --git a/sys-fs/zfs/files/2.0.0_rc2-exports-d-permissions.patch b/sys-fs/zfs/files/2.0.0_rc2-exports-d-permissions.patch
new file mode 100644
index 000000000000..4acaf465a7bc
--- /dev/null
+++ b/sys-fs/zfs/files/2.0.0_rc2-exports-d-permissions.patch
@@ -0,0 +1,189 @@
+From fe413a4d901a243d98cfef16ea330f7114a104ea Mon Sep 17 00:00:00 2001
+From: George Wilson <george.wilson@delphix.com>
+Date: Tue, 15 Sep 2020 22:57:16 -0400
+Subject: [PATCH] zpool command complains about /etc/exports.d
+
+If the /etc/exports.d directory does not exist, then we should only
+create it when we're performing an action which already requires root
+privileges.
+
+This commit moves the directory creation to the enable/disable code
+path which ensures that we have the appropriate privileges.
+
+Signed-off-by: George Wilson <gwilson@delphix.com>
+Closes #10785
+---
+ lib/libshare/os/freebsd/nfs.c | 36 +++++++++++-------
+ lib/libshare/os/linux/nfs.c   | 71 ++++++++++++++++++++---------------
+ 2 files changed, 64 insertions(+), 43 deletions(-)
+
+diff --git a/lib/libshare/os/freebsd/nfs.c b/lib/libshare/os/freebsd/nfs.c
+index 65f3b11bf9b..5951b9eafa2 100644
+--- a/lib/libshare/os/freebsd/nfs.c
++++ b/lib/libshare/os/freebsd/nfs.c
+@@ -228,21 +228,33 @@ nfs_copy_entries(char *filename, const char *mountpoint)
+ 	int error = SA_OK;
+ 	char *line;
+ 
+-	/*
+-	 * If the file doesn't exist then there is nothing more
+-	 * we need to do.
+-	 */
+ 	FILE *oldfp = fopen(ZFS_EXPORTS_FILE, "r");
+-	if (oldfp == NULL)
+-		return (SA_OK);
+-
+ 	FILE *newfp = fopen(filename, "w+");
++	if (newfp == NULL) {
++		fprintf(stderr, "failed to open %s file: %s", filename,
++		    strerror(errno));
++		fclose(oldfp);
++		return (SA_SYSTEM_ERR);
++	}
+ 	fputs(FILE_HEADER, newfp);
+-	while ((line = zgetline(oldfp, mountpoint)) != NULL)
+-		fprintf(newfp, "%s\n", line);
+-	if (ferror(oldfp) != 0) {
+-		error = ferror(oldfp);
++
++	/*
++	 * The ZFS_EXPORTS_FILE may not exist yet. If that's the
++	 * case then just write out the new file.
++	 */
++	if (oldfp != NULL) {
++		while ((line = zgetline(oldfp, mountpoint)) != NULL)
++			fprintf(newfp, "%s\n", line);
++		if (ferror(oldfp) != 0) {
++			error = ferror(oldfp);
++		}
++		if (fclose(oldfp) != 0) {
++			fprintf(stderr, "Unable to close file %s: %s\n",
++			    filename, strerror(errno));
++			error = error != 0 ? error : SA_SYSTEM_ERR;
++		}
+ 	}
++
+ 	if (error == 0 && ferror(newfp) != 0) {
+ 		error = ferror(newfp);
+ 	}
+@@ -252,8 +264,6 @@ nfs_copy_entries(char *filename, const char *mountpoint)
+ 		    filename, strerror(errno));
+ 		error = error != 0 ? error : SA_SYSTEM_ERR;
+ 	}
+-	fclose(oldfp);
+-
+ 	return (error);
+ }
+ 
+diff --git a/lib/libshare/os/linux/nfs.c b/lib/libshare/os/linux/nfs.c
+index a6a9b33d765..1efa321b7bc 100644
+--- a/lib/libshare/os/linux/nfs.c
++++ b/lib/libshare/os/linux/nfs.c
+@@ -393,6 +393,14 @@ static char *
+ nfs_init_tmpfile(void)
+ {
+ 	char *tmpfile = NULL;
++	struct stat sb;
++
++	if (stat(ZFS_EXPORTS_DIR, &sb) < 0 &&
++	    mkdir(ZFS_EXPORTS_DIR, 0755) < 0) {
++		fprintf(stderr, "failed to create %s: %s\n",
++		    ZFS_EXPORTS_DIR, strerror(errno));
++		return (NULL);
++	}
+ 
+ 	if (asprintf(&tmpfile, "%s%s", ZFS_EXPORTS_FILE, ".XXXXXXXX") == -1) {
+ 		fprintf(stderr, "Unable to allocate temporary file\n");
+@@ -481,36 +489,49 @@ nfs_copy_entries(char *filename, const char *mountpoint)
+ 	size_t buflen = 0;
+ 	int error = SA_OK;
+ 
+-	/*
+-	 * If the file doesn't exist then there is nothing more
+-	 * we need to do.
+-	 */
+ 	FILE *oldfp = fopen(ZFS_EXPORTS_FILE, "r");
+-	if (oldfp == NULL)
+-		return (SA_OK);
+-
+ 	FILE *newfp = fopen(filename, "w+");
++	if (newfp == NULL) {
++		fprintf(stderr, "failed to open %s file: %s", filename,
++		    strerror(errno));
++		fclose(oldfp);
++		return (SA_SYSTEM_ERR);
++	}
+ 	fputs(FILE_HEADER, newfp);
+-	while ((getline(&buf, &buflen, oldfp)) != -1) {
+-		char *space = NULL;
+ 
+-		if (buf[0] == '\n' || buf[0] == '#')
+-			continue;
+-
+-		if ((space = strchr(buf, ' ')) != NULL) {
+-			int mountpoint_len = strlen(mountpoint);
++	/*
++	 * The ZFS_EXPORTS_FILE may not exist yet. If that's the
++	 * case then just write out the new file.
++	 */
++	if (oldfp != NULL) {
++		while (getline(&buf, &buflen, oldfp) != -1) {
++			char *space = NULL;
+ 
+-			if (space - buf == mountpoint_len &&
+-			    strncmp(mountpoint, buf, mountpoint_len) == 0) {
++			if (buf[0] == '\n' || buf[0] == '#')
+ 				continue;
++
++			if ((space = strchr(buf, ' ')) != NULL) {
++				int mountpoint_len = strlen(mountpoint);
++
++				if (space - buf == mountpoint_len &&
++				    strncmp(mountpoint, buf,
++				    mountpoint_len) == 0) {
++					continue;
++				}
+ 			}
++			fputs(buf, newfp);
+ 		}
+-		fputs(buf, newfp);
+-	}
+ 
+-	if (oldfp != NULL && ferror(oldfp) != 0) {
+-		error = ferror(oldfp);
++		if (ferror(oldfp) != 0) {
++			error = ferror(oldfp);
++		}
++		if (fclose(oldfp) != 0) {
++			fprintf(stderr, "Unable to close file %s: %s\n",
++			    filename, strerror(errno));
++			error = error != 0 ? error : SA_SYSTEM_ERR;
++		}
+ 	}
++
+ 	if (error == 0 && ferror(newfp) != 0) {
+ 		error = ferror(newfp);
+ 	}
+@@ -521,8 +542,6 @@ nfs_copy_entries(char *filename, const char *mountpoint)
+ 		    filename, strerror(errno));
+ 		error = error != 0 ? error : SA_SYSTEM_ERR;
+ 	}
+-	fclose(oldfp);
+-
+ 	return (error);
+ }
+ 
+@@ -701,13 +720,5 @@ static const sa_share_ops_t nfs_shareops = {
+ void
+ libshare_nfs_init(void)
+ {
+-	struct stat sb;
+-
+ 	nfs_fstype = register_fstype("nfs", &nfs_shareops);
+-
+-	if (stat(ZFS_EXPORTS_DIR, &sb) < 0 &&
+-	    mkdir(ZFS_EXPORTS_DIR, 0755) < 0) {
+-		fprintf(stderr, "failed to create %s: %s\n",
+-		    ZFS_EXPORTS_DIR, strerror(errno));
+-	}
+ }
diff --git a/sys-fs/zfs/zfs-2.0.0_rc2-r1.ebuild b/sys-fs/zfs/zfs-2.0.0_rc2-r1.ebuild
new file mode 100644
index 000000000000..1f9d81f16e60
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.0.0_rc2-r1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 linux-mod
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	S="${WORKDIR}/${P%_rc?}"
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
+
+DEPEND="
+	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?] )
+	!minimal? ( ${PYTHON_DEPS} )
+	pam? ( sys-libs/pam )
+	python? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="virtual/awk
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="${DEPEND}
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
+	!prefix? ( virtual/udev )
+	sys-fs/udev-init-scripts
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-kernel/genkernel-3.5.1.1
+	)
+	test-suite? (
+		sys-apps/kmod[tools]
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+	)
+"
+
+REQUIRED_USE="
+	!minimal? ( ${PYTHON_REQUIRED_USE} )
+	python? ( !minimal )
+	test-suite? ( !minimal )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/bash-completion-sudo.patch"
+	"${FILESDIR}/${PV}-exports-d-permissions.patch"
+)
+
+pkg_setup() {
+	if use kernel_linux && use test-suite; then
+		linux-info_pkg_setup
+
+		if  ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	else
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	use minimal || python_setup
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--enable-systemd
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
+		--with-vendor=gentoo
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable python pyzfs)
+		$(use_enable static-libs static)
+		$(usex minimal --without-python --with-python="${EPYTHON}")
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
+
+	if ! use static-libs; then
+		find "${ED}/" -name '*.la' -delete || die
+	fi
+
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
+
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	use minimal || python_fix_shebang "${ED}/bin"
+}
+
+pkg_postinst() {
+	if use rootfs; then
+		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+			elog "root on zfs requires initramfs to boot"
+			elog "the following packages known to provide one and tested on regular basis:"
+			elog "  sys-kernel/dracut"
+			elog "  sys-kernel/genkernel"
+		fi
+	fi
+
+	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
+		einfo "for default zfs systemd service configuration"
+	else
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+			einfo "You should add zfs-share to the default runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		remove_moduledb
+	fi
+}
diff --git a/sys-fs/zfs/zfs-2.0.0_rc2.ebuild b/sys-fs/zfs/zfs-2.0.0_rc2.ebuild
deleted file mode 100644
index d2f00419b0c7..000000000000
--- a/sys-fs/zfs/zfs-2.0.0_rc2.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 linux-mod
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	MY_P="${P/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-	S="${WORKDIR}/${P%_rc?}"
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
-
-DEPEND="
-	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?] )
-	!minimal? ( ${PYTHON_DEPS} )
-	pam? ( sys-libs/pam )
-	python? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="virtual/awk
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
-	!prefix? ( virtual/udev )
-	sys-fs/udev-init-scripts
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-kernel/genkernel-3.5.1.1
-	)
-	test-suite? (
-		sys-apps/kmod[tools]
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-	)
-"
-
-REQUIRED_USE="
-	!minimal? ( ${PYTHON_REQUIRED_USE} )
-	python? ( !minimal )
-	test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		eautoreconf
-	else
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	use minimal || python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-systemd
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
-		--with-pammoduledir="$(getpam_mod_dir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		--with-vendor=gentoo
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable pam)
-		$(use_enable python pyzfs)
-		$(use_enable static-libs static)
-		$(usex minimal --without-python --with-python="${EPYTHON}")
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-
-	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
-
-	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
-
-	if ! use static-libs; then
-		find "${ED}/" -name '*.la' -delete || die
-	fi
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "root on zfs requires initramfs to boot"
-			elog "the following packages known to provide one and tested on regular basis:"
-			elog "  sys-kernel/dracut"
-			elog "  sys-kernel/genkernel"
-		fi
-	fi
-
-	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
-		einfo "for default zfs systemd service configuration"
-	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-			einfo "You should add zfs-share to the default runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		remove_moduledb
-	fi
-}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 9518cb8998fa..6ff00303377d 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 8bf30a56e1d1..51e474bdbab1 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -29,7 +29,7 @@ DIST dracut-050.tar.xz 333592 BLAKE2B cb0bfa5a8e7547260b8a80a3606eb284182c062926
 EBUILD dracut-048-r1.ebuild 4558 BLAKE2B 7b3803b80f7feecd61327484c46a83570150997a7cb9e6d123a03d10f09294772ae8bc30869171d785e21502c282b7a9fd4f4ad84862c8731020b7ed765e7c73 SHA512 dd3e819db605a042d721bc3bec5f1e5f45d993199994d311c15425d4d91f7bb54e63f13297c4fdb33ecc20a98ccc720fe5ca64aa2b222eb72d14a5f47c4ab66b
 EBUILD dracut-049-r3.ebuild 5706 BLAKE2B 4889c5b80cc1e2b72ccf22a7ac80e685a7d39d73d3d3b0fbfef9a02e13b45cf36eaeb4c75b5daf8c093c83c45529fd8863ac9c66731b1a9a60880a798002e4af SHA512 bec9e611e86a08f2b3a8248745a46fba14fe6d31dc80dcd36c817a60fdbc4c97a760543da87728e58a14a026d6b4531babca782fabdb71ce56ce20cf78732027
 EBUILD dracut-050-r1.ebuild 4965 BLAKE2B f18e3c65ff4f19a9fd9c2ff5d29c731f74c4ee0a3bb535b8bc35e6a548b75d2a189ae55f57fb29a657c6b3f24df1068a053954a529d3c91c524adbab88e85d49 SHA512 27cb0d50ef3b500f45e8f1fdd41dae3dd3f0bc79f429883c1911be8bd16b1e1ffadb382652d4cbad1e0404177c40f2dfd82066f8ec68202128b2358e3eb0454f
-EBUILD dracut-050-r2.ebuild 5306 BLAKE2B 4b4ff06ace6acc93e1178af175714ebe8897e319dcc21b08af71f111b795659634744f5eb5c482b1a1e1ed3358d9d0d5978c4c07648c1a639de18848461a970f SHA512 4ee0ac825ccb10acbe542e57370241fa4f00d6f30c4c12f58a28adbba2a92875b9c347a9ce82c6cb73d163f381e7969a7f3c323c55b4072cf0da4034d41b0f87
+EBUILD dracut-050-r2.ebuild 5305 BLAKE2B 9b624aeb49791142db8a262853d50fa6db9b4dee23f2f9c5012a61f8d1fd7c7bbdd284fc6ad65d3e54e2dc4bd84647c2b8f6b5515344dfb98cff995c3c0d3f28 SHA512 295755b4b000555ba9f4f56659acdedda73b6270ea9dadee97492a90e23b0a090c501f7e863bd1ff55a8878062961043d1ca7b3f5a34d94c085217ce1fa9bddf
 EBUILD dracut-050.ebuild 4921 BLAKE2B 08c75e7037cab2e61f7b6ff382aa79c5946d10eec95d11f41eaa05b45fe4d81875252e116ceb018585bdb03cf4e4bc145a3f7378e053fc5ecce07c9d032b2f2a SHA512 e215accee829b1da127a8663857f3cab4f49dfddba624bff2f1ea15d5201394cab2990b67dd088980071b0de2da95c7435615c4b1d702d06250ec25181d32b00
 EBUILD dracut-9999.ebuild 4714 BLAKE2B 5f083768d4c4a67c7e45214ad178081fc20393e936009159a6967847a004bda42eb76d0126aad375c868729c3f492a6625c4e4a4a96e45138d8bedd852b34c53 SHA512 6af33208562023495ae279c77e08b450190abde92b8e57ece7f22bb4116adee7bde95649a5b7d509152092fd46485d948206135b5d991c1484ca9806a7f23a62
 MISC metadata.xml 584 BLAKE2B 72babd073fb003a06e5e60e8b413268fb37433a661de9dd6b0ac58e848d32d0e4f3e72b72874d78c647896859e791bea387d8c253c61d03ef49e926a2574ff12 SHA512 851bd1b589cc2038ea6bee02c452bfa3b6d14ded8532cec6b7b238146dae92e74259e917270bf3bba3d2e0d16a0ede42134cabd6588ae1f94ecf336ee644484d
diff --git a/sys-kernel/dracut/dracut-050-r2.ebuild b/sys-kernel/dracut/dracut-050-r2.ebuild
index 17cbb1f56af6..c5676baf3093 100644
--- a/sys-kernel/dracut/dracut-050-r2.ebuild
+++ b/sys-kernel/dracut/dracut-050-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
 fi
 
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 92396bf079dd..c0ab7c111464 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,91 +1,21 @@
-DIST gentoo-kernel-5.4.60-1.amd64.xpak 61916726 BLAKE2B 74a698a340c1eb181de73a19dd99cd61960fdb4c80d12e92dbe04324275fc5465d7690740826ed6579a1cd8f867056619b3521ddbedc8755822e6446ccc3bad7 SHA512 ba9c3eb51b9416691c85f5ef3146936593b0061dd5a0894cbaeecbd5ca06d70bb646247a72f0dc28d9bdc5843792dfed5c325507179558a2fc788bb740479255
-DIST gentoo-kernel-5.4.60-1.arm64.xpak 56840602 BLAKE2B 881f0f429e92c239c06488092914dd47c105beaed494f3f985ca1609e4004bd212613c3e3edf1409b4257ce1bd93123d0b54d23a3e62d04e1588b761b7d60cb9 SHA512 2f0f4ef68338c5b070f3a739b0aa140eb085ad20195b85256af0e57956ff4180aaf8febf03118385676c6043e64391a1c3320268af6898fcf3f47e6590314afd
-DIST gentoo-kernel-5.4.60-1.x86.xpak 53688620 BLAKE2B 7af235b2fd2037123dacbdb444944e576014342919b0c99f62a85be16a6510d9ef3f3487e6e18de69749f46e07ff1d612613e027335a26953c17f4be8aea1e87 SHA512 7cf5f0379607669144ad890df3f51ba681325e6e2c7e8fbe3d9fb0b54fbeb446203f2c951ebcdfb247be6c2b117a0b1462e005cccd343d32d0906d9ff8ccea19
-DIST gentoo-kernel-5.4.61-1.amd64.xpak 61944347 BLAKE2B 7d7efad45857d09f32056369a002a548023fc2508033125b7ea57251444d7909eecf9b55e56d1826a9079fb2b9933d05a4098aa471cc32ae710d2c1df1488d47 SHA512 490498e6dfcd9d64c869fa86441480b8a0642dfb4a23f269f8aa83cf88f83a5b4c424b1b5d6d3a78c96c50474b5c4438b46d5944b77855385464895b4308c4eb
-DIST gentoo-kernel-5.4.61-1.arm64.xpak 57746217 BLAKE2B f150b2bb1513bc44c0d476d130b69658fcc28ea1982827fce047a2238eacd8de33cae46f7d07e52885f81dd8733526c097ce659dcb9cac81dff31cc79f13b18b SHA512 9885dc43c574f3ad852053a4a337780cacc5c0e1d33c9035328552ee97d502bb219aebff7a4f63da3a73967fbdfd26d07ee1b0f88f63ebba8ce999c657c186c5
-DIST gentoo-kernel-5.4.61-1.x86.xpak 53726696 BLAKE2B c4f6c9abfca4a48ccecb684009a7c54c0f9befa1af267632a9884d737b024f837dbff615566ac5641977915302b17cffb26d9a0bc39c1d004dc880ad317c8a6b SHA512 fc5a55585922be701695baa683240e36edcabfd5baca2eb4d631b13eee42186b755a8319b7bd6623efab3b9dfc6523ba08bc809dfe80810f6c0f465d433401d3
-DIST gentoo-kernel-5.4.62-1.amd64.xpak 62012793 BLAKE2B e3ac9896abbb3312ce8e5dfeaa1f9150f970f38ddec8dd047ca4b34b8f0f31d68f065821ef377ff38ebf05bf87b9b20c72414f5fe27acf7a4361bd8ca24459be SHA512 7cb81af009777ce7e42e6cd6b46706f869db643043d62cdd42cc537b7ca7e68001ba27df5b15e84ff48920ae9b950a05aa5678ffa563b72cd6899ac5dddce41e
-DIST gentoo-kernel-5.4.62-1.arm64.xpak 57961735 BLAKE2B dace370f17524bdf1d69255c47cb37e0d16ab0d7c24a2f35cd68b005c8c61c2f04774c9b6c9f04164118509774e1780819294d546632da4c3be212b2d4dfe737 SHA512 3dc60bc6ac50d39a0076f9f0fa7837d14aedc83faf1e3673073b89c1b204efd1e7e201e61cc0cee44456c36617daf3b755fe8b1bd8dc55b7fcbb9af69ec6253e
-DIST gentoo-kernel-5.4.62-1.x86.xpak 53723101 BLAKE2B 27bc1915aaf1aa421900e2e0ebb873637593fce995f15b8277fe6d0d9e0c176cda2d426fb4e60a5bc04aaea3a70a7eaf7b827051fea355ccb77289e16c2a4fbb SHA512 cfa66eed57c5a5fb6b523fb31ce42fa48211e6d30ecadcfb11694c9787cab2dea369efcef2d2b4ab5c3c4f137bd127c38fc3051ee6de7d1029717f7cb3f176a4
-DIST gentoo-kernel-5.4.63-1.amd64.xpak 61958828 BLAKE2B 93f253c9523af74c3f42cc0d5622a0a08f48b64356beab5961a9f0d46ed06efb368a71952b1f8dda2f17b1a91fbbbf21b359a3d46486e87df1a0e361f6c74b24 SHA512 b484b6a5a3c75153b6714ab9c1b99519d4f48402db3fed6e15d141b541b0950b708e857c01b1c0a6dc9c6eba9f10adcec23765763fd7fbd28590d0f6b2ea374e
-DIST gentoo-kernel-5.4.63-1.arm64.xpak 57973091 BLAKE2B c68b023a7ba1ca295ff7115aa991b7a6f329c5dc6e8865b5cb46fb803bfe14b202aaa6ee0499a42353bf860309ffef57f2ee82d08b336765cae8388c34b4d7e1 SHA512 3121af01c82fb65992d9ddd5b81453fc6ab98ae64d749167a00eeae23e888410a967f196a92c0dd7de5a5bcf6f8ddb6214d6e8e6174a0da80fb28f65c0cb3480
-DIST gentoo-kernel-5.4.63-1.x86.xpak 53725189 BLAKE2B 14c87985ebcc975321187483af9eddf8185da6ea0e967c604ad78f9d144dac24fac97704aa5b9a0f532549ccdb226cd00be5684519c135a90ef53db14264a18a SHA512 0cc28e5c50c1b898958a423e05bc1c0cb21e7ce333e4061c3344f9f9f6a615d915031eeb70cc5a36957d6fad0f05af5c436b35ee946393c71e6ed903b6b5d111
 DIST gentoo-kernel-5.4.64-1.amd64.xpak 61493792 BLAKE2B 86a133920417723c458f946a22f04a704e4099abb280edec0d63f24ba982cc788af6c1081b044a76e71baeb81fef6de3353bf76d70d471a6c1afb21b5664cc8a SHA512 88e4630741416f144b1c69dba87aa3826914692603193b3c30a6eeb7ba94653bf77c8c017c4c20d82f83790e9b79556d87acc0c6392571a343d5b584665394cf
 DIST gentoo-kernel-5.4.64-1.arm64.xpak 56477814 BLAKE2B abf9e68ec92b4cb3ad283c447ce8de26c3ea71660e82467da5dcca7450a1831044ab8cc888796b40b040e119f1f89a71789cd9c1020076db3d4209826035b06d SHA512 344225e57ff6ef188834ff82db2bb9c0d2da01a2b9087e91b55b1a658471ca5c45ed5b805249dd9113f6877f4cc56df866241d642dfbdc85f4ce59c4c1a7dffc
 DIST gentoo-kernel-5.4.64-1.x86.xpak 53360544 BLAKE2B 0e67661699d063fe05a41ba15a25355c4395817a7c0f069159a38b3fbab7c9a696e7f9cf3ac905a9641f19439e9e7ca19a45748462fb89d522e56522bda3c55d SHA512 2da7eb14b81600f01057bcb9929f0632448de56b6959c8286039ec526090b6dbed3755cce78840b4a7db43e3b9d6e1abeb58a1726561bd204293f6f1ea9b8530
-DIST gentoo-kernel-5.4.65-1.amd64.xpak 61494346 BLAKE2B bd358f8b11d3d6cc3e09aca6b96a3c291bd6c8d574608e7a01b6b30b23cceb063f9edf1311ff08ae2c26f12b2be40276eb0fb61c1082491711fa39690768411b SHA512 b906d7b76b89b882866b1997d50d8222bd91c23372cb6cee90c493e398e471a2911f0c99428c1c388a4cfd0a769253bef4f83d65c2d705b767dc3168a58614ee
-DIST gentoo-kernel-5.4.65-1.arm64.xpak 56473932 BLAKE2B 28ce0b7c6856d551ee9db9096f1b387d0d29769078a682ccc256aef3e2590de227e4135a3ad5e7aabd9c47e7da1a77313cf14fde3bb4c14eed05dc6697ff7ae3 SHA512 095d93e97f435420d0e32c993ab3678b44b024518f3d16e8e91fc92b78a7bc5f20b992de6caa73a1312d2945eaa2fb2b18543760e899c01905f4db2afc6a9059
-DIST gentoo-kernel-5.4.65-1.x86.xpak 53360713 BLAKE2B 0c38b23aa9dbda83f7f5c08213c61a1a7029cfc99ee114071a25be6ee7815ff1b1c5902db2b78565de6a2feb03f49e2292dfa479a1094ab01eb90cfa5651ba4b SHA512 81c4cf87efa3283f4b6e0b3408277272515e00bb5918fab88faf3df4aa91332006f6898d465013570392abd95f6b7acd0aec29820509e7530f48d516caa4dd90
 DIST gentoo-kernel-5.4.66-1.amd64.xpak 61476663 BLAKE2B 6460feb08f629a085f176db71b0cd1856a8f1330a39a99abf69f263fd65a52bdea60c61179a260d514e8a3e6559f91ae70ff1d16442aea92759b7ce4d029eba6 SHA512 c8b0bd0bb801e700681b60b01a5f9956b784b815f030a948df7aada2b82ab808dd20407424ccbdf9f9758dc5e72879ecb6595d096fffe16514fb2aea98390886
 DIST gentoo-kernel-5.4.66-1.arm64.xpak 56495611 BLAKE2B 41b8c97aa227114e909e88763131e80eb279f0f455d01b83107d36f8e32ccc063cb26aca64ebe197bd1c25fe1d1258050026956cb7301c6e6d1b5a6b3fc9fb2a SHA512 37d3120dc7af2485a6989905a5601e87ef60b299e44e0360f47cb7711051af842cfda2163aff8d75943f0b39f61a1bf8245b6c73480aa932d0402ece3f3f220e
 DIST gentoo-kernel-5.4.66-1.x86.xpak 53349561 BLAKE2B bac28002f62d4974acd09df4250e03e1b222edd03a66547bc1c2f17d77b20521f1476c3b32e559f393b38dd286d427c5b730c832f805475e799cf30faa198215 SHA512 44f889bd931dd391d65cb72e20493ad12db7f015ce35dce253078999ec62d032ed1ae40e00947bccee1986a92cb9387cad5e055c5a12e06ccf052cbd2b14c764
-DIST gentoo-kernel-5.4.67-1.amd64.xpak 61551155 BLAKE2B 55263b960a7278ddb1ff63c05e48a8e014f97e0f5c3ec32775efcd1321ac258b1e23812ff3fffd40f5bb43e546a22bd6fbac6cc5022d1b1c377e687933872521 SHA512 3b5a1bf691fac95a5dd7440303d2f73c97f02a57ea1556f084f1f3a745290d8597a187dc101fdfa036c367e11497d4bf816cd6f1263b22017627b837b9abe0cf
-DIST gentoo-kernel-5.4.67-1.x86.xpak 53349995 BLAKE2B a871a00a1629f46c06474a00c3ab696cf5a924633b6b88587a742a2357a2bfacf387b56040e207270be85c76d8c5355fa53b22f628acd15d4d0c2948d992a533 SHA512 72a1e44af59d29854841db24020825aa8454e3c15d33c2120dceb8d73bc69e797c471af8a3f3f2217cba63516e6bd20a601b808af1e2c9455adbd6bf31eda44a
-DIST gentoo-kernel-5.7.17-1.amd64.xpak 63476985 BLAKE2B 1a31855979a309c7bb4565208aa92dcac9d4fcf0714ea224c2a909b534ca65bac2778f6c2cee24cb5dbcfd825bc896b52cb14eb37cc36aedffadcc0217a32269 SHA512 4071bb9eb192da7823834365b8d6817dd043c256ff0803eb70a35278aa92b63a66fa1c8d86b2c91d90fceb7c7b4fb1ac41b347457d6ccda78e02c6e0f123c044
-DIST gentoo-kernel-5.7.17-1.arm64.xpak 59769706 BLAKE2B e7f3180e3d4373a7923250b8fe12141c0138e04f81d08b014386270defcc25517028ef404163c5d81097c72d6605cd5a6b4f1ad6df15a0f77d13daebb6045268 SHA512 59b33b487c170bad68de3527506c3a13a1edd232de40281cfac463fd8641222c0e86c4aef3b47127746a54dde94456a7b21fb150ca66674f1efadaf5c5db7d34
-DIST gentoo-kernel-5.7.17-1.x86.xpak 55460526 BLAKE2B 42a6e4d92b5c4a4c5d358d7b0d56c5e29f9ab4371aeae4fb261b5dbedba60b7333f9bd656b35747effa2cbd820dd0cbbf6be3f10c5bd3504822105c73451de32 SHA512 27897f33a65fbd5f889267b52b897730934dc9ec04ec70968582c817fee9cf49b661c3613397d8cb76279c332fa6d4afc589141b920fe328fabe0bdf8d1afc6b
-DIST gentoo-kernel-5.7.18-1.amd64.xpak 63471982 BLAKE2B 8d95cd447b9360b8b76ece7c545817995d2b8fb4e3aca94f31ade75d5322ac1dca0e45b4069fa4d4365e5ea36da0b712d01881624bc346a7b629ef6e2ae76653 SHA512 0b45aa04369a9676bdeeb60cffbd2497a45714c7218446afc1dbaccb68b6b3e1bcd918d0f55f484fdfc1b779b75735c71fab5a89917c8fa5d18aab825944da5a
-DIST gentoo-kernel-5.7.18-1.arm64.xpak 60743873 BLAKE2B e35cc55cce6bf0dde3f45563a1ec61a1e5a9d31d18af81c8eebba8db736c469aff68b407fcf763bcf36ab5acd8573ae0b083712278b907881fac9e1292aa56e9 SHA512 76053464c1615592803548bb3345ffdd3f25962e8bc83d4e68e8b7b02cb1ba9e711e9b7583a4e80ed02eb03f45abba4eb634b0a3a7121711ff47dd967e48ee44
-DIST gentoo-kernel-5.7.18-1.x86.xpak 55492303 BLAKE2B 09b68d6d2fa35daf498298cc41c060fcc49f102d705e3f73cdd8c95dad31a79c98ae8bd65a0f691bb5a6e1419cec9a32696779e7b553e58dbbde3744d10a6cec SHA512 e31893b180599a5128649fb75c1aa1facf83132e39c590b11bb19e240417166885c7c3485a71f42079f0797a7c4be4a9b63d2bca5a8e52b771f6313c87c1f12d
-DIST gentoo-kernel-5.7.19-1.amd64.xpak 63506610 BLAKE2B 01643b816790754256fa2cf87128ae2ec04a09d4bdcc539a8fabcc0424ca89b2f10dfaa912ea7f46d2d238e18915b9e76bb4eb5859dc6831c1a27ffb16c77785 SHA512 54463d4e50f1063e5d30cf9a68fc4cbfa95839e75d328c1fa5a1bfe627342f03628bda559af45d60e8b991e6f93ac439739b6a8479ed7f35e181984863e8f6fb
-DIST gentoo-kernel-5.7.19-1.arm64.xpak 60724114 BLAKE2B 1b7efaafb7e55bafc0501cba6cfb39726ce2029cefec06ff5484f51ca7b3e33edbfce019039a4bcaddd071555be87cf4e5e63c80a97596b36d460eb0d26c4e2a SHA512 b0f50db402ef8fa9e2e893a5348e8b7f1b6df6f24577270b0ac011b3293b919e9cf6b110eef838a04c1ff127ec035bcb41f38842b7f477ae044dbae175a0b03b
-DIST gentoo-kernel-5.7.19-1.x86.xpak 55495543 BLAKE2B 2855ac4af7ceaf9189a17aa1a0b5ded706a089bae976f45e13ed137066313287061c1321735224f619adb099b69d793fdf8966bf4eabda932c08eb91ac1e4cec SHA512 62b382258c57ab2db2125f5671af4cbb1f14636008dcea321e77e42aed6dc59a9429a87b445e5dcc6c2d9f625b285a154d5d3497fe8c92fc78f18f8285aa1b33
-DIST gentoo-kernel-5.8.10-1.amd64.xpak 64087087 BLAKE2B c8495f01874b100f5b72fd4347274a180015c74e4b3a80968bf543dee0d7c7594a988ba06eda77ca138244ed2b756225f3d838f0041d407b58cf891c719f6bc6 SHA512 df038830eb5354bbd8fe51109863689f5f6c3dec03b1eb0f1a5b35d8767242c8688301ae304875562280fa229e495e4ea3461b448d9344d900c1bb97c5f44455
-DIST gentoo-kernel-5.8.10-1.arm64.xpak 60604695 BLAKE2B 0c80a7105705de1adeadbbee7f7da59b9af8543af31f5c5e581df6d667fc4c0d00db6290ba79dc855cb538f8b9e6d9149fb14f06906e6ef445d677592293be9a SHA512 ad9d8266fc2418106e31ea86e286bb89f0faaa1547303c44886ca957ecddacbe2343e3fdac632b919bd814cf4df4064ff68d8ed79bd63f9ff3065d0a60980c6f
-DIST gentoo-kernel-5.8.10-1.x86.xpak 56121777 BLAKE2B 13b731eb2a9fedbde1737974673b041a0bf2e4efd76f37ed6da69c03762574a3b687b89ecc918673a8c3f5acb2d9f78a3a3394b403f684db85ee39b654091ec9 SHA512 9e0bfa3a4faa1329f65a29899435aa2383df479a2e1fb85e9291ffabd7882e6e032d92eb6fd60bc611842e0dedbbb873e3199d27ac060e106db6de7f82fad10c
-DIST gentoo-kernel-5.8.11-1.amd64.xpak 64083966 BLAKE2B 98a770773074e41f232921a1eeece65d0b029836337d14bc4792b5a6f1f59c4f46b20ca5f1de4e28d12d52f9cec98e51827dc3e89df1a58c2cba8fb344ffdfdf SHA512 269ed6430ffbfc7159de0da1618d277dadd6b98084d2419271ff767e8cffa165b8fae6a822335369ab4e66b22fe038929678c396e9c236efa266dd3ea4c04499
-DIST gentoo-kernel-5.8.11-1.x86.xpak 56120164 BLAKE2B 9f7bf8fb5c818bf31411411b3c148e40a48cbe166268cfc6598430ce3292625e2047ee9ad6dfb1927ba7a31f01682ab22a9946a96f5161367582aab261f86ada SHA512 863d3de8bfe710305ceb5a82b148ba0e8d127061b2111af19fa12be761a783a53531aeeb5d56095e621120ec041608c060152b0c0dd0c548dbe62acd7b245dfa
-DIST gentoo-kernel-5.8.3-1.amd64.xpak 64633724 BLAKE2B af5a903684829c3761fa29e7f84b050870479b5bb5105b91d5d53c7c2773a90cede547e2b03b95c0da08fbc6f75c2f48316960a3d8948acf8eb419d48a8a4dbf SHA512 f09ac10e1e26703db6e0a4bf1384ec90fdafacafdbd5595f953648112278acb78c37646dffa8bd6be09502224cd63fd706aadfbe4b9601dfd5a41eeb4efe8db9
-DIST gentoo-kernel-5.8.3-1.arm64.xpak 60976315 BLAKE2B 6cd9a830735d6a3e3acc0d8115032cc373b6238fc314308784862ccb9e0994a0c023bd13e058a5ba61e1b3f3fc2ce7ab468078e46c092534da117e534076bd59 SHA512 b5f5451e0a4661a47f00fb7eec8f836cafdc94e6c2b879036b3a3b37e237ea1a930a6d4fc61edf9655f6becf1fd8714fd854933e8f707d2d437cf71fc0ef06bc
-DIST gentoo-kernel-5.8.3-1.x86.xpak 56549915 BLAKE2B 0d456bb683530704c32045ffd9b28d0e9353de1f3010433e2e90f1298513b7c6c4796841a100a57b55787a6464df9e02b9656955c8f30e97b69e2190aaf5cb58 SHA512 035accade13e17d2da8564c6e188198b63f52e3f901282a78ffbc800038c395ec711d69c7c53f1d99d8ae6b9d0262cbbd71dd618093e16b114bcf5e40988c84d
-DIST gentoo-kernel-5.8.4-1.amd64.xpak 64634841 BLAKE2B 44339a5c0b6c0cfc53daecbcfbe28ab0f276e7742478b195ed3e738e3a32bd48f09cb503ac98f8a02b91bb48c1c347a8d31901477ed2dd6f61d52e249cd03559 SHA512 d8d4e62276424e2e2fc30f3f136a99b300d85fdb59812497b64f52d55519b88e3cd6b5b37df67bbf1960df29b91248307b064c75204783eed546c4de105b6641
-DIST gentoo-kernel-5.8.4-1.arm64.xpak 61971031 BLAKE2B 38a8af994e03dbd88f1f5554e191536f28c50170810ac4bd3345565a9623ae465a6927dbd4611d0d8f4e4d22720c0f7e30f5cfcacf22f173517e13a629c82a23 SHA512 9b17abf39b69f17c2a25a749f8c8495c59f6fb3e8b1185fe26267b473cfb66f66b6686e6d831ec0238bba466853d8a87748a238255d8d367605cd7fdfee06864
-DIST gentoo-kernel-5.8.4-1.x86.xpak 56574861 BLAKE2B 350f0609733fc8a9e76ba81ee5f4b9e0c20f246a986cc188f9c44e58662e2cd39de34c99be9801dd0609c2d006211245cbd5d3b5d0e09ee7f29e8654e883c024 SHA512 a358d2ebf34ff004e487633ac20e0e4cb957bf6fd3de15901c2cf630f74f6b2f7c31f8e79181d88e764979ca37419c19917241b5421d48f45818abe193d9e4b4
-DIST gentoo-kernel-5.8.5-1.amd64.xpak 64641722 BLAKE2B 623b91448b017791f8d1597be27cf01e3a44be035d3e724f1693e6ea9bed203429ba586b2b3b941da07888053d7fa71e7907051315d144d139d759348be3f4a6 SHA512 b6963f4fb1d9d3b3dde64bd8505b3f4fb5ef23e2e0d8f774cb1ab36dc2cdc3accefbcb6eba8ff624a5ee1e2b9a5d15f17f17225bf90afb20a3e9c02027b049d6
-DIST gentoo-kernel-5.8.5-1.arm64.xpak 61961042 BLAKE2B 8c920e52d3888270714206b4287ad2e0741b9b474ea6e64d7afbcafa8f84dceabeba88df87f5bc5f26bc1d23a5fb9b9b564a50e7eaa9a5ccea98ca581837d24d SHA512 1fb55a01f43197fb760d35e7c36d30e7b7d97c5df36ac1a012067df6b5d20f8af619d41d63181832a2db0318a95ab196568af34665adfaf8661dd1450aa9ee8d
-DIST gentoo-kernel-5.8.5-1.x86.xpak 56586150 BLAKE2B d0ff52cec539f85c7971cf69f882a82f937123d9e0464b685f86895080d32e3a3e17ab53dd952633bf827242519de9cc0a22915ef84872219314ea4143157e8c SHA512 273504c8521468ac24e287feab1b6bc7e7d93ffe7ca577ee2e692791b9ba2221004e53dbce00837832a1c11996785b94b601f88b76cb9b5eac1c743e263e9eff
-DIST gentoo-kernel-5.8.6-1.amd64.xpak 64678358 BLAKE2B dfa4423044fdf7541983c04fedf3a2e30959f18775b8f2fa81ad7e96e7b9a49b0e0a0dac42e60771abbd6243bdf4fa747a1d1ac8dd7647ebe51136c11c1ff34c SHA512 2d64b51956ed8c331f7300ffe3517df62a257c5c859a6ea65b829f917c9e74980f0f0c8a22aaf687b51c114ca8c55c3beba539da83924eded660572684adcc24
-DIST gentoo-kernel-5.8.6-1.arm64.xpak 62048563 BLAKE2B eb6c45d94c533eceb0ff2758a4a711c99c7c82945cb86ef6f3ab473f36cf8bcf5abb06260bb40fc379a49647bb00114e617b7e404b56f0b958105f8190cb835f SHA512 77cbcaf374f54611674bb8329d97aa5f92368dc4a9b9d746b751aafb998b04f471f31bf24289a9fdd877cf82e4b07bf92e039dde4f61058844e916a5c32d111c
-DIST gentoo-kernel-5.8.6-1.x86.xpak 56578930 BLAKE2B 1978d2390f5ad7a58fe8b5b59081323c4047c49104c0b35ad499bc9bf5ed144a8d49e37b0dbb9c85919afd5517e5b1e496247b8e831381e9b8a4c67e911984cc SHA512 b028158415e59c213cc37293a79026ecdd20cb7f0cef04def48a8874c2ac802220314895c6c57f8cbb04ec27a52688bc9e1180636d13ac0cd0ba7bdd17732a65
-DIST gentoo-kernel-5.8.7-1.amd64.xpak 64676388 BLAKE2B 93b859aed31b5a8ca77658690a4c9b04853ff5c780c0f2a1fb79bcdef6529ca3695e77ef1bb4dc04c7d59d305202f888b2876174d4fedaa9f4db2e02dc0f61ec SHA512 3f0b738c1dbda968f0493b44556232734d9445df0d2ce97eac54d81795d1eb8d89c89257fa53e155d6110292f8215872a327918d0348bcd5541701e761e0299a
-DIST gentoo-kernel-5.8.7-1.arm64.xpak 62077730 BLAKE2B eac861b25f94eef0feba0b1dee8fd44f8f802d2c92431193f1fe87e7648e49d8e6ab35629073b7cfbb03ee8f68723bc4fab957535701bfb46372aca6251da47b SHA512 dce1aa26e1fe1ee3592d2b9a255f8387067fcc11404ff3557f7638db665ad9ad3e34189af180abffd3049141b1aee1e7acb0ce70a6933d42f529bc2c7269bf8b
-DIST gentoo-kernel-5.8.7-1.x86.xpak 56596642 BLAKE2B ac985eb803b391b41e769b60ea99f35a398a2288914182a6537506ca8e388359cbbcdf4ca3b2aab233aef571a9b2ad6aa0e1fc38d0156155d955cfc0c0d71be5 SHA512 d5d42a539de0bbab8bae038b1480377f1711a727f95925f9f41c6de64e77b7dfa1352be4296063739916c8eaf81b2bfaa13575009cf1922cdeec6646a04a617a
-DIST gentoo-kernel-5.8.8-1.amd64.xpak 64123312 BLAKE2B 6252a69863b02bb982919a9da6b73a9e102b71083104e87992ddd7cb35bd8c768be77a27e72825b87bb2480d0ed1a4245529f7e8ed8d91f4630e4b81d36a27d8 SHA512 8d11250e6a7c50c62f305edfe7138ed26ce3a2a9ff573857a05236ab2d39a7479eea9c07626fc9f894868677d96e3da4ba209b1a8ac05224bbafeb14684a5506
-DIST gentoo-kernel-5.8.8-1.arm64.xpak 60594339 BLAKE2B 949c3c012ebfc591d880abc202d9bf14915a53db871fdd7d447821e82cf9f0127dfc7f22d434fc649d6455e6df67f908ae30f089034107226333b4725f80f122 SHA512 55e6c0bb8bddf6d56dd73b81cf81e6d294c8c6585b7a1fe857c2ce04b8eb11422ec5a01a953c1e06048f1e8e1d6e9474a5d4a0e6df0f87adb57661433ecb9f39
-DIST gentoo-kernel-5.8.8-1.x86.xpak 56167005 BLAKE2B 33cd1c0be65f68c95b91738ec5dad2684bcaadec9a5b275b6cd6037814ea2950df35da7a73a8324ab2104ff25146aba8ffb69a0a37af6f06ae46b4a8eae02efd SHA512 a0e6025582898e4ae0a1f1046da7f15730ffd04d1f5b9b5ea2520446541c62b70db51a5b26cfbb9e92eb2fc210ed1f261672d0b12f813c93ffe3107bd31222d6
-DIST gentoo-kernel-5.8.9-1.amd64.xpak 64122189 BLAKE2B fc6166ebd70f9945d9aacaa27c43d7c668bebaf72d7f86277c8d59ad6bdfe35d31d38e14c944cd47b0e4ad3e839e9f0bcd0f67717cdaa91f8453a18bcc48d477 SHA512 5f23f274236d72520e896c85e65f12ff077a9c2789749c31b3214f1919aec620c175992902140fd220a8897b37f49f4180b12882bacecef4228d5dc7d1bea896
-DIST gentoo-kernel-5.8.9-1.arm64.xpak 60625032 BLAKE2B df25adf9f01985e8af03f4fb49e018b9f3e4a2f01ab286c4be42d9f5c002bed67b0d35221f12207b4c7c30cbdc3db64ed02a64613abab5cb1ac9c06c1fd1f0ef SHA512 b321bf573c7c4c1d8776464b6b66e9f44ce60f5686289e755c80f5bf2162eebb359a411437dfc53e341604400366a4142689251b5f3e6b5da92594a2733c08fa
-DIST gentoo-kernel-5.8.9-1.x86.xpak 56129158 BLAKE2B f90d8444e8e7c1d17d3c5c7dc15a1b72592f8360b0f321349ab6a66815a885bf8f8bed99c09cd91cdd05a4943594087a7710d80965f5e0c9e19c2b4601e2cc68 SHA512 3d3e86f94278e0913fa1a59d9c71238fed77a4a8fda12cbbf2a9981706cfce7e24515bb0e90495a0be451a916a0c60dfbe0a83fabdef0ffd43ea8ba7d96e4af0
-EBUILD gentoo-kernel-bin-5.4.60.ebuild 1381 BLAKE2B 2cb7e917845b514bc352a98d9cd39aee4e6e409b3c7d943c93505be7bc8c4c765496745ad0cb3997d96b997a48890cd8a0e8fa573bf00e4b27a1a930985f4d71 SHA512 37342615aa35ee6571b0a7d04cd62b947f2b4343347bae990b3a09db787cc51b29a074b18fba2436dcc9b46692ee160ed496d70b572f00d9d576f7d24ed60889
-EBUILD gentoo-kernel-bin-5.4.61.ebuild 1384 BLAKE2B 1ded0f26f266a58fc4eb374c4fb63b3f7b6869ab3e95e3def268d1fe914802549e967094aaf09849a56cb68d4588a0008bbbe92887a126d666af6b354bc80e53 SHA512 bac5cb448526cfa25c9701dac955721dbc89da47c7ee79aa2d793763e31a5e84b9ffe3fa23eb3d8c985d89812dc1d919d42df9b92aa21e8a8d81be87e6e35d64
-EBUILD gentoo-kernel-bin-5.4.62-r1.ebuild 1372 BLAKE2B 1fc07b92338d9da27b11824cab32ffb01f1895037ed75b091bc42039bf949b93fc6cd2991fa6fb3c6d44a0d5fc803cca62c2ab7a4d0ccc10405d7cb1bb67bd1f SHA512 692857c6e58157c5b82ec618f9f9df26774e665d87431a2965318cdf42e75b34d61653d9432251a0819690ad814aa554609935a0926c1272bcaa1e23be7d0e05
-EBUILD gentoo-kernel-bin-5.4.62.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
-EBUILD gentoo-kernel-bin-5.4.63-r1.ebuild 1372 BLAKE2B 1fc07b92338d9da27b11824cab32ffb01f1895037ed75b091bc42039bf949b93fc6cd2991fa6fb3c6d44a0d5fc803cca62c2ab7a4d0ccc10405d7cb1bb67bd1f SHA512 692857c6e58157c5b82ec618f9f9df26774e665d87431a2965318cdf42e75b34d61653d9432251a0819690ad814aa554609935a0926c1272bcaa1e23be7d0e05
-EBUILD gentoo-kernel-bin-5.4.63.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
+DIST gentoo-kernel-5.4.68-1.amd64.xpak 61493744 BLAKE2B 3f1797046b421bd1b374e1bfda0cf407a3b13de8d222adbed33bf5d6d3dcb7fce30bc29d823ed34d854701535dbf7e211f3e60022ae8a2da2d52c511af3938d3 SHA512 b7fda56c7d43a962c964acad088a32a763e1fca468fee4b78503c7cf4a75790e3e0d6fb24abbab52d2b8ffb8faf243bfa57f061902755ac08402072409ed3cd9
+DIST gentoo-kernel-5.4.68-1.arm64.xpak 56462206 BLAKE2B 75e9b787a0b87d82adeb319501ac03bfa5409086dc6729f18f5bfa1eb0bf101774791ac99ca8949618e4c6185152f325a227875d7284d018ffb027cf31995a7f SHA512 5198cee93955e87ffd654c68e60bebb512f9488531d0b26fd769a2ad8c172fa6c54e0c9119074227f7a04352761036228f52f293037051f344df88bed0c4f624
+DIST gentoo-kernel-5.4.68-1.x86.xpak 53358098 BLAKE2B 6a35264a7514c1daa61e590d64c1400a298b602bfe5ef09c4a1f00ad8f5da1e10e6446152b69dd9e6d0eda6d5976d9a225a257efda9a6efb24928909816e9630 SHA512 f0c8ca982dbf382fff4642ffcad6f2bd295a605d7169eec8a2c5c434b663c6030e2679526dae59be30c18ac64bc1842a0e95dd31d604fb7b311a4498fea12999
+DIST gentoo-kernel-5.8.12-1.amd64.xpak 64106657 BLAKE2B a8167bc714130a6f05811ec522c14c84b5038a6130a4a0ca7d581cad6ada7f47b55a9940198524ecf4a28debad79286929a888cd2f433a7b22e4bce4342254e3 SHA512 e952c7efbd007ad12be3074ffb488593dc5ddd4fb7dba70d7c73173d9ffdfbfc5013c06307ead53daed43c7d816789a608feb2a5d48818341d179e947edbc446
+DIST gentoo-kernel-5.8.12-1.arm64.xpak 60541802 BLAKE2B 3d92912c25ee3ebbd48316550fb16f6960d2845a380db93026174a2f147ad1f32eea28c06dc1e350c15122939ecd64401e7b825268b2ce9d38343da3503499d3 SHA512 d937892936ba556529ee15d49acd207592e1142ce4a035d90920575c9ae3a5a8ef0325fddeb3b318b849df47ba436cf50b34fa8c00a01651f241cc805cdf8a09
+DIST gentoo-kernel-5.8.12-1.x86.xpak 56133532 BLAKE2B c969778b746896cde2af60afc5b7049db6dba8906079a26db905b7342ef099b1dc400ea482ed2548f3a160b8e3a4ac32eed3243315c4cff6f26e9423e9c8fe8b SHA512 2b1470d9d4d08c29ad0635a65b1ea9e2291210f814ed26c47c52cbe4155cc6bdd59b829a85163f76ad377da6cbc7022771fc5fdbc6f540e43a01ab3a5038e0c0
 EBUILD gentoo-kernel-bin-5.4.64-r1.ebuild 1371 BLAKE2B b11c2f146a3f72d590347cdb433c3c998ad4a79de5e4e547914275851382af44107f01f6ebea0ffda0a0651689db7d2b0126ba58ea64da8c7bc4cee7974893ce SHA512 5db1e935269ba1b5bad9cee1a6c42cfe155281e11887522d7a256fd326b8ce89037b61b0df4b6f0570bae6c05b97b817bfb5d4e3a5a8c00b4ebe9c87dafd7fc7
 EBUILD gentoo-kernel-bin-5.4.64.ebuild 1249 BLAKE2B bf16b5cf89aeb4cbf1df81265b67c96f47a1eb5992119755c67b2fe929a2c4495120aa0914f69d14d09db77c30e88daf463f5fe3a41e5d8a6bfaeecf2796d0df SHA512 eec7898c0548d5b76bab2190ec1714d7d53189a582cc1da9bc6255a7f0e948bcc3c8417287a829e68c04b8dc58a48a333bb4f3eef27984330ac271adf79f467c
-EBUILD gentoo-kernel-bin-5.4.65-r1.ebuild 1372 BLAKE2B 1fc07b92338d9da27b11824cab32ffb01f1895037ed75b091bc42039bf949b93fc6cd2991fa6fb3c6d44a0d5fc803cca62c2ab7a4d0ccc10405d7cb1bb67bd1f SHA512 692857c6e58157c5b82ec618f9f9df26774e665d87431a2965318cdf42e75b34d61653d9432251a0819690ad814aa554609935a0926c1272bcaa1e23be7d0e05
-EBUILD gentoo-kernel-bin-5.4.65.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
 EBUILD gentoo-kernel-bin-5.4.66-r1.ebuild 1371 BLAKE2B b11c2f146a3f72d590347cdb433c3c998ad4a79de5e4e547914275851382af44107f01f6ebea0ffda0a0651689db7d2b0126ba58ea64da8c7bc4cee7974893ce SHA512 5db1e935269ba1b5bad9cee1a6c42cfe155281e11887522d7a256fd326b8ce89037b61b0df4b6f0570bae6c05b97b817bfb5d4e3a5a8c00b4ebe9c87dafd7fc7
 EBUILD gentoo-kernel-bin-5.4.66.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
-EBUILD gentoo-kernel-bin-5.4.67.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
-EBUILD gentoo-kernel-bin-5.7.17.ebuild 1383 BLAKE2B 26c0b230868900f364b6e91b78c61630ad6b911b5480c9a75da87927a84a198483852b502d00420416c6b8fe6f2ea6c098b08e8e861267bf8053fea29cf41612 SHA512 01f27a33b207cfcf4d3b681c7e40f06cf64ba77c0ab4285eced959b68f89db53d07eeb195409146dd3b6b68aa0a155ae6adf2d67891e95344e94bb15f30790fa
-EBUILD gentoo-kernel-bin-5.7.18.ebuild 1383 BLAKE2B 26c0b230868900f364b6e91b78c61630ad6b911b5480c9a75da87927a84a198483852b502d00420416c6b8fe6f2ea6c098b08e8e861267bf8053fea29cf41612 SHA512 01f27a33b207cfcf4d3b681c7e40f06cf64ba77c0ab4285eced959b68f89db53d07eeb195409146dd3b6b68aa0a155ae6adf2d67891e95344e94bb15f30790fa
-EBUILD gentoo-kernel-bin-5.7.19-r1.ebuild 1371 BLAKE2B 83e5e559f434d35d406e6ce6f0ce0ee40b7e84c6a58254b1acc8ab8a6dc62c4a31af715abaca6088793b69e4e8cb3a6446cb834a39f325a38eaa5a8eb8f3cb42 SHA512 b8acaa8b754e49a23b1dee682018acc7e20d9355f67193368649b4f5cd1095b25a2840f944c8bfa716294f1333cce9e1172c9da0c9e248601bad2795d8a40be9
-EBUILD gentoo-kernel-bin-5.7.19.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
-EBUILD gentoo-kernel-bin-5.8.10-r1.ebuild 1371 BLAKE2B 83e5e559f434d35d406e6ce6f0ce0ee40b7e84c6a58254b1acc8ab8a6dc62c4a31af715abaca6088793b69e4e8cb3a6446cb834a39f325a38eaa5a8eb8f3cb42 SHA512 b8acaa8b754e49a23b1dee682018acc7e20d9355f67193368649b4f5cd1095b25a2840f944c8bfa716294f1333cce9e1172c9da0c9e248601bad2795d8a40be9
-EBUILD gentoo-kernel-bin-5.8.10.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
-EBUILD gentoo-kernel-bin-5.8.11.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
-EBUILD gentoo-kernel-bin-5.8.3.ebuild 1383 BLAKE2B 26c0b230868900f364b6e91b78c61630ad6b911b5480c9a75da87927a84a198483852b502d00420416c6b8fe6f2ea6c098b08e8e861267bf8053fea29cf41612 SHA512 01f27a33b207cfcf4d3b681c7e40f06cf64ba77c0ab4285eced959b68f89db53d07eeb195409146dd3b6b68aa0a155ae6adf2d67891e95344e94bb15f30790fa
-EBUILD gentoo-kernel-bin-5.8.4.ebuild 1383 BLAKE2B 26c0b230868900f364b6e91b78c61630ad6b911b5480c9a75da87927a84a198483852b502d00420416c6b8fe6f2ea6c098b08e8e861267bf8053fea29cf41612 SHA512 01f27a33b207cfcf4d3b681c7e40f06cf64ba77c0ab4285eced959b68f89db53d07eeb195409146dd3b6b68aa0a155ae6adf2d67891e95344e94bb15f30790fa
-EBUILD gentoo-kernel-bin-5.8.5-r1.ebuild 1371 BLAKE2B 83e5e559f434d35d406e6ce6f0ce0ee40b7e84c6a58254b1acc8ab8a6dc62c4a31af715abaca6088793b69e4e8cb3a6446cb834a39f325a38eaa5a8eb8f3cb42 SHA512 b8acaa8b754e49a23b1dee682018acc7e20d9355f67193368649b4f5cd1095b25a2840f944c8bfa716294f1333cce9e1172c9da0c9e248601bad2795d8a40be9
-EBUILD gentoo-kernel-bin-5.8.5.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
-EBUILD gentoo-kernel-bin-5.8.6-r1.ebuild 1371 BLAKE2B 83e5e559f434d35d406e6ce6f0ce0ee40b7e84c6a58254b1acc8ab8a6dc62c4a31af715abaca6088793b69e4e8cb3a6446cb834a39f325a38eaa5a8eb8f3cb42 SHA512 b8acaa8b754e49a23b1dee682018acc7e20d9355f67193368649b4f5cd1095b25a2840f944c8bfa716294f1333cce9e1172c9da0c9e248601bad2795d8a40be9
-EBUILD gentoo-kernel-bin-5.8.6.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
-EBUILD gentoo-kernel-bin-5.8.7-r1.ebuild 1371 BLAKE2B 83e5e559f434d35d406e6ce6f0ce0ee40b7e84c6a58254b1acc8ab8a6dc62c4a31af715abaca6088793b69e4e8cb3a6446cb834a39f325a38eaa5a8eb8f3cb42 SHA512 b8acaa8b754e49a23b1dee682018acc7e20d9355f67193368649b4f5cd1095b25a2840f944c8bfa716294f1333cce9e1172c9da0c9e248601bad2795d8a40be9
-EBUILD gentoo-kernel-bin-5.8.7.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
-EBUILD gentoo-kernel-bin-5.8.8-r1.ebuild 1371 BLAKE2B 83e5e559f434d35d406e6ce6f0ce0ee40b7e84c6a58254b1acc8ab8a6dc62c4a31af715abaca6088793b69e4e8cb3a6446cb834a39f325a38eaa5a8eb8f3cb42 SHA512 b8acaa8b754e49a23b1dee682018acc7e20d9355f67193368649b4f5cd1095b25a2840f944c8bfa716294f1333cce9e1172c9da0c9e248601bad2795d8a40be9
-EBUILD gentoo-kernel-bin-5.8.8.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
-EBUILD gentoo-kernel-bin-5.8.9-r1.ebuild 1371 BLAKE2B 83e5e559f434d35d406e6ce6f0ce0ee40b7e84c6a58254b1acc8ab8a6dc62c4a31af715abaca6088793b69e4e8cb3a6446cb834a39f325a38eaa5a8eb8f3cb42 SHA512 b8acaa8b754e49a23b1dee682018acc7e20d9355f67193368649b4f5cd1095b25a2840f944c8bfa716294f1333cce9e1172c9da0c9e248601bad2795d8a40be9
-EBUILD gentoo-kernel-bin-5.8.9.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
+EBUILD gentoo-kernel-bin-5.4.68-r1.ebuild 1372 BLAKE2B 1fc07b92338d9da27b11824cab32ffb01f1895037ed75b091bc42039bf949b93fc6cd2991fa6fb3c6d44a0d5fc803cca62c2ab7a4d0ccc10405d7cb1bb67bd1f SHA512 692857c6e58157c5b82ec618f9f9df26774e665d87431a2965318cdf42e75b34d61653d9432251a0819690ad814aa554609935a0926c1272bcaa1e23be7d0e05
+EBUILD gentoo-kernel-bin-5.4.68.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
+EBUILD gentoo-kernel-bin-5.8.12-r1.ebuild 1371 BLAKE2B 83e5e559f434d35d406e6ce6f0ce0ee40b7e84c6a58254b1acc8ab8a6dc62c4a31af715abaca6088793b69e4e8cb3a6446cb834a39f325a38eaa5a8eb8f3cb42 SHA512 b8acaa8b754e49a23b1dee682018acc7e20d9355f67193368649b4f5cd1095b25a2840f944c8bfa716294f1333cce9e1172c9da0c9e248601bad2795d8a40be9
+EBUILD gentoo-kernel-bin-5.8.12.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.60.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.60.ebuild
deleted file mode 100644
index d1b53ecbaadb..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.60.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.61.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.61.ebuild
deleted file mode 100644
index cfda942acb35..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.61.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.63-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.63-r1.ebuild
deleted file mode 100644
index 2378adc3f352..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.63-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.63.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.63.ebuild
deleted file mode 100644
index d6e61fa69369..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.63.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.65-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.65-r1.ebuild
deleted file mode 100644
index 2378adc3f352..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.65-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.65.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.65.ebuild
deleted file mode 100644
index d6e61fa69369..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.65.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.67.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.67.ebuild
deleted file mode 100644
index d6e61fa69369..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.67.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.62-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.68-r1.ebuild
index 2378adc3f352..2378adc3f352 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.62-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.68-r1.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.62.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.68.ebuild
index d6e61fa69369..d6e61fa69369 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.62.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.68.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.17.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.17.ebuild
deleted file mode 100644
index f576acc22243..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.17.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.18.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.18.ebuild
deleted file mode 100644
index f576acc22243..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.18.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.10-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.10-r1.ebuild
deleted file mode 100644
index d5d78a106e7c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.10-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.10.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.10.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.10.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.11.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.11.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.11.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.19-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.12-r1.ebuild
index d5d78a106e7c..d5d78a106e7c 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.19-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.12-r1.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.19.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.12.ebuild
index dca6aedbd789..dca6aedbd789 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.19.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.12.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.3.ebuild
deleted file mode 100644
index f576acc22243..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.4.ebuild
deleted file mode 100644
index f576acc22243..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.5-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.5-r1.ebuild
deleted file mode 100644
index d5d78a106e7c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.5-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.5.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.5.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.6-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.6-r1.ebuild
deleted file mode 100644
index d5d78a106e7c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.6-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.6.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.7-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.7-r1.ebuild
deleted file mode 100644
index d5d78a106e7c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.7-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.7.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.8-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.8-r1.ebuild
deleted file mode 100644
index d5d78a106e7c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.8-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.8.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.8.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.9-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.9-r1.ebuild
deleted file mode 100644
index d5d78a106e7c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.9-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	arm64? (
-		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.arm64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~arm64"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.9.ebuild
deleted file mode 100644
index dca6aedbd789..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-install
-
-MY_P=${P/-bin/}-1
-DESCRIPTION="Pre-built Linux kernel with genpatches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.amd64.xpak
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
-			-> ${MY_P}.x86.xpak
-	)"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-
-QA_PREBUILT='*'
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_unpack() {
-	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
-	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
-	eend ${?} || die "Unpacking ${MY_P} failed"
-}
-
-src_test() {
-	kernel-install_test "${PV}" \
-		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
-		"lib/modules/${PV}"
-}
-
-src_install() {
-	mv * "${ED}" || die
-}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 923d9015f7aa..c9544cc1a008 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,82 +1,23 @@
-DIST genpatches-5.4-61.base.tar.xz 2186332 BLAKE2B f0063cb381a98330178dcf4ffa017ae9262f0406a1d4801b8e60a0300c51238a57b502ec8f72ac30e7b8618e8d54e6a56afdc9513fd8f896fc3129cbe3532446 SHA512 0733161227e3d1f3bb179a4ae8132183ef858166a0521e28669b5e01bf660a924b0b4758268ea4271abaf4bd51b8a49d0ac300173873087820697de5e53452b2
-DIST genpatches-5.4-61.extras.tar.xz 1764 BLAKE2B eeb60ddb3ac1b28aaccca2820d107dc65629b61460073b1e281903b04759f3c1a66ee8dca35459d1ea81fc75410709c8010c3c16aedf802fcc626cf47534ead0 SHA512 35a93c028932e1e6313ccce7fe0aa5277e57cad6c61418a436432aea5a3937e4621d72ae4d2e9b28c7b26342eaf0e63bdd9e55362d9f7b0aa4bb6a64b0c59c37
-DIST genpatches-5.4-62.base.tar.xz 2210192 BLAKE2B 5aa23923418095dad7570323e6bf853a3f718a527e15c56cbb7f177e1c03f814d741c6ba3888b9fbd40af418d9400999995469f83548a220f0efed0635217f86 SHA512 e4622bdf08e4b678eb6701a6284a5d85e0bf91973ba0e4f797c6dd4e3a14a8b34879eb7561bc38a183d72281a18cadddd4d4caf0eb8fe7acf49bd0fc823fb329
-DIST genpatches-5.4-62.extras.tar.xz 1768 BLAKE2B 6381f43f1f0bc497cfea4451538cd4a6900002a40031f5a726d0dfcd8da8ab1a8c2af4403810d2c6f0377ac5a1bcf799d43e42141361ab684e7a63a11e31bf84 SHA512 efbe0418614bcc2674040e4db0a137760f719793cab7e57cb237ff85ecffe1521a056c6c2ffda2c7efd7e47a0b914a06e87f92d73fbb754b41dfa63a88e7d4ea
-DIST genpatches-5.4-63.base.tar.xz 2261952 BLAKE2B 98f002f6a4f7a5908c4da9e9fb25451e995378d848f0bd6408e7e800bf94ecc41480eb76293dd840035d48806eb1bfaf92e33c2bf3979ca8e6f8fb417ac3644b SHA512 f5a089e940b70c7fdcb4de8aaf28c17f0783626af05271b3dec348307ee202525d11e139845db95f0e225cfbbee2185638ac79a617ca13168e0676685caaba4e
-DIST genpatches-5.4-63.extras.tar.xz 1768 BLAKE2B ca8c254b3f0f31ba0e0dff7e99127c36acf94783075ddb53ef8da28c017422e6a1537992e06796983b703d1062c0b6a609d58f6b0ed5e62a069902065bc6dca7 SHA512 075581b8fa5123d2b48b5a66d939fc126db7000229713a07cbc475c7052e07acb357c408b2b4484d3d60b72088c260af09e9d871c7ff6b0ea559ea396109aba3
-DIST genpatches-5.4-64.base.tar.xz 2269092 BLAKE2B c2e312dcbac6410bb416047d2e1182ce1c1bf4f01abf164571d8f24cac7c2c05dcb9d4076f80c6f19bfea185ad214f0c5b0fe5f519e7b3a9603bdde41cf2486b SHA512 832a9697d2960562a87d1a669990d42d889c6a79d3095144255a3a38b0e53b391a9398f764449bd27b0f5c19ad724d9973fcfffe91989c6f5cf7aef9258d1a2a
-DIST genpatches-5.4-64.extras.tar.xz 1768 BLAKE2B 1b0808cc84f4b3c2c4e783274a56a48f0c8dcc4e764eb4bfddf889b23c1cf99fe1f2eff42765814c73015f371c2d979b94cd14d1518ec32d04ee113282bac9d7 SHA512 407e744ed486337c0e32a4c7b518fb6cc36d0f144fca59eb89d56db9bd368845048f47b906eeb024b2bcfc4fab63b1414a61648506fce1d9fec46094bf39153b
 DIST genpatches-5.4-65.base.tar.xz 2300512 BLAKE2B 7ed1f7694782a2f2aba5448d4e2786b813d1caaa6d3da986ad429834c73f15c29268dd1cf3e3fbc63a913717cdd707084d5c1d0a9a0d0a91a558e44d1605927c SHA512 3109881309ec0354ab91924b6e45e8ecad18e13ecbcdd86adc4626668557ce6324ccb942d9a62ca02d7093fd221e90e8b8e9f33ce8c009676122ffc100576f61
 DIST genpatches-5.4-65.extras.tar.xz 1768 BLAKE2B 07e18047c9d88d73325933496d70d645acc6d07bf70d531a4e4602b85c6dacded40d9fae716bfa4654672be78f0d6029700cf4b5b368f3bdbec485218f74abeb SHA512 b3421a90b0e664a64e49b4e87c4392871d425577995cbd15cc420d3f4a1a101706bd19e32aefc077144d6da955c442c7635552f8987f1af707af05868aa61a2c
-DIST genpatches-5.4-66.base.tar.xz 2303300 BLAKE2B 1107b439bab215b9dc438d40cb69d08353ef9841329151298f91b9191a4f798eab7904cd2acf23fe5d69c4cb224b0f87f972255e54acb46ea162f431e307a134 SHA512 71f4a032dc2dfd71195fe9acaf2e75966515f1ec7fd2f46830080e563916da9504de8ccd9214d49637b8234de9610c4d7ce3bed1b6dfdfcb063c88588bb32c6d
-DIST genpatches-5.4-66.extras.tar.xz 1768 BLAKE2B 0a81b02b97cbbc7c34d8b8ff13c4f26bce534e92a3f75da169b24c1dcc7b215091f9a2363f9e19cdd3af4febb26d8bf85808eb78cbab6d2e3ab9fda5b1bd346e SHA512 8ef8938c32c46eda7a35cdec9bcb2ffdd3c507a9e2024fae1ebb4684869b6de97ef1d531e71e23d286c49bb4a8b6f2d959b0f874f31aa7f9276ac28fbbcf4422
 DIST genpatches-5.4-67.base.tar.xz 2335352 BLAKE2B ae98701f88da8c3ab823499c6d5683c80adaface3b23d0e5671deb4e8005a6aa8f9ef3c4ff4b0fb1475ca33de7790c59c56571795122ac4bfed6f1c6e4ae8049 SHA512 1d039a98cb29a76f0b5d26cf2ef72cbeef469746e31afc513f6f5f88841e9fa4c96fe34e92748e61a6f6f5a6d8ac68783126e6bcc696bd0106747b8a93a9b940
 DIST genpatches-5.4-67.extras.tar.xz 1768 BLAKE2B 6e6718c80465485c0271d46231d45412e4bb7e713caed3a333b27f1a655048c2ccea871d5331fc4d6413ddbeb2776df02acf00ad1c399a1d86e65615f05d5c69 SHA512 7da85f2ff8f50f43ae1eb814e34402fa8a55629c7b8e9b362ad657974be2ac60489157adf474f91c05587475d89deb1cb1511c5241b80885d695651bfb122af3
-DIST genpatches-5.4-68.base.tar.xz 2349792 BLAKE2B e7c2dec93508a89d24ac5a8cc08a40289953abf1715a0f624872a5b327e8c957489fd37d6486bfd2362ee745ff252595f3371becfb88c54980c4db48e62e30f0 SHA512 8b4e19b5cbdd7e18113f72736338eb6f23438fc5beaa051ffe48c9a23d58acabddecc3742588865cc3ef1e3b73e200caaaa0125c388b19640444a81df52404c5
-DIST genpatches-5.4-68.extras.tar.xz 1764 BLAKE2B af078c5e8d444d6b5f615fa6c1d07b810d2cf55a425ebbee3febd8cf3a327525a384139fa140576dacbfac197e50eb01bd32599e09ab2132f821f4018868aa93 SHA512 727bcde520c62b67dc7bceea8252a9ebe351b8797a0a3e79d3c47817c8841321d3a5d69cf5e38e592070bbb383280923a1688091fc272a1ecd71a9e7140d8edb
-DIST genpatches-5.7-18.base.tar.xz 778720 BLAKE2B 384315c8e0e23db1137f73d6d60bc6f681d7b74e23e2b5288ad741ae8f005255164074c08a4ece67667d5eaff15dd0f955fb2eb23d9745c8647ce7761aad3f47 SHA512 8c36cb71a02d9bff7d3257c527c16191a8ba05e08e4cd836047e97264d93cd93343d13e2a550f2b8321d638a00069d8108296240c7d2656023185c80ad640c0d
-DIST genpatches-5.7-18.extras.tar.xz 1768 BLAKE2B 7312c4b26f1e3aaa51b8a8e67f9fade727b1ec6dbcc256d581061ea6ab878a47dcecfe6d949d677500a49d62928ce4a8c6aae75ce618b9555fcf7fa11fee4ecc SHA512 6b4459fef57765cf67503265ea094ffebbf5f2f9db7c753e1182f524f44981e9b047b6a1661f45b9d99f39e2c2ec57bb1a93e35dfc4a62997d9b629728c2b5c6
-DIST genpatches-5.7-19.base.tar.xz 806520 BLAKE2B 1eba96a84e0a75a6dd53cbe24181ee761579f49ab95b2d128dac2bb2780fb0e5b2d5751b95368df70dbe8a9e6ea2ddde960b04e7961d52be02928f17ae2b43c4 SHA512 e654d6444e82e083996f57cb3a8775898e37ec1ab71cd0f639ee0398d6b1f4e875c5bc661db83f46b1d67c5d77a9528182f9ef7980e5c222084d0f016d6e57d5
-DIST genpatches-5.7-19.extras.tar.xz 1768 BLAKE2B 54af894e73664fd8a22ea400a908c6b4fe9f5d928374701c1bff9811ebc75aac22b5a5c72d59aad1ba41939a3544431d1a90e49049d099dd5ab67b0dceec4f90 SHA512 968dd48a5e033f94993f48f1a30b2b7647a5605fdbd77fcddf95b44eeb82629785c9dfee2d76a15010ed7250d9c30dcd5924e5e47c879406d10408bce38ec193
-DIST genpatches-5.7-20.base.tar.xz 809256 BLAKE2B 92ceaa6c9cd0a71cd7b86745240c2c018265dcbe8be124375ee3cde3f6fa4e00981f6c8762ec369461fe75542efb9154a09f90499ddf127405716ffcfdac4027 SHA512 900283861dec83bbaba8aafbff3b9d689d7f729917130c3d6760a05f919903b079203c48b768cad2bdae5b197192d5fe8764b786aec95fab77bee6384803b7f0
-DIST genpatches-5.7-20.extras.tar.xz 1768 BLAKE2B 016fb07a98245121971534b7f9d40f1bc627325fbda893342ecaf330b2ad4a2caee6ff39a7a24e7c46e2eefba8df4cf901bd3d46d7041f1c8781288ddc1d63fc SHA512 b8aa2c75b014fdefc7f56f67be6a7bbfd57e55f6f08346899a7a64892bd0975d0494864614c2bb485bb5dcfe262a280c51f43c7f0ff18256a2370b1fa93add3b
-DIST genpatches-5.8-10.base.tar.xz 347544 BLAKE2B 8cfcdd84b803b8dc1721166d853267267f16a4c6e6cf759bad5c34b6149a57e7f5bddc14b287b870df98ad2af93871b6bd1b5f9dff0308fde9a25115943d3bbe SHA512 40f07ddf0f852cbe79f7b2da289787090ace5cb478c21c41adb82726e22a404d7c35acd76dc73a7fb1444f6910735249667a79d8d756171e1b8ce9cfcbfbfdef
-DIST genpatches-5.8-10.extras.tar.xz 1768 BLAKE2B 056c24f09a74c2867c767139fcd90af83623aac03e06ae03ebe96decfc4fccfc8b213f93e8b0cfda9bac935d85734c8968f590dd4537ba14f9daa0c249c257fd SHA512 aa1bc1d7f0190cded4d944cad3855358b26bc7dcfc726745da6ff8789662c5b74790284bf659ae8060280086e6b2809c903ce876f0c5b9c9d550a0123ada86af
-DIST genpatches-5.8-11.base.tar.xz 400044 BLAKE2B ffa3cbdd4586e142933833859ff3e741a2bf9cfe569aadce43767b671706d256082a07e5c3b11bd9cc849bde645b664c641958590d1ec0b73dd826dab2996f56 SHA512 5dab9eb4f0077d5822b736e282696b95993e17d1078691cd14c2201043e9be9c496c56d5f89cfd38fbb5d0c1da433f62d35ff8b9542423524ef701205bc04577
-DIST genpatches-5.8-11.extras.tar.xz 1764 BLAKE2B 3798c0b54dd3056dfd389db8bbcea775462b218d9670c3322240d90d8f894c89bde55a04a80220e76b0d6fd135c32af1d9f5564795f30e9368f3f58d0d45501f SHA512 958d68e317c0140b2540f757dfabc767e28f1878a2b65012599248edd9ab8ac20e7f1736a0f802f01a9f0f22cc743f1a1f9f4665ac287ba6a477521dee323ab1
-DIST genpatches-5.8-12.base.tar.xz 405720 BLAKE2B a34d0390f8297c189a0ad67995b3bf0780ce899d0565b87036723dd0b0e86b22daa9437ac942967ef5274713aafe38e628dc51f1622ab9c1df02ac72065ff37e SHA512 47fcf2cf80c80253c71931db0378a5fd04d724fe8dcb8428f56c7f0a5af8ec3c699ae89ef0a15960a8ac14093d348175b31e4debd92de1aa641223dae4b0b345
-DIST genpatches-5.8-12.extras.tar.xz 1768 BLAKE2B 232dfb50d4cb331379045b2fc05216c92aa61fc98bd1bd9b697c8cd04f1d1f159f8e2c039d406b540e9b8951494cf7f8ce73db448d0bda2f7c867aabb7bb1190 SHA512 82362b149c0df2acfa584ea17a16205b9e0e48c9754f33c8a13e820eaeb9715ef849d9f9ae1b9d4dcaee43245e7d65f71d59c0d4c7476e373765eed4ec4a7037
-DIST genpatches-5.8-13.base.tar.xz 453844 BLAKE2B 4d6bb86ba3238f969784a2496799f59de039cf6b037cfa81ee5cd6231728289c92d1bd1c12c3341635de64196c13e41d55eea5a6263547d5c31b7e26d4a7fbac SHA512 3338b4fcabb06ff5c89152652f263fb5fd4208e792267755154ddb9b198da245715cee5d7d3d579f69954673889ed10e9b42d11b244ebefd31cad981c832dcac
-DIST genpatches-5.8-13.extras.tar.xz 1768 BLAKE2B 7b70ebda93c52dc86d61e8040a48278a4cd61dc4e6a1317afb3bcc33a25fcc63dd3bbeb966244910cc38ef5d5a02be9875b5b1f8b7ed8ae9d1c46d7e00348146 SHA512 a36406969d495057e7685743b74379e88688861a3db1f0bc870ec9d7860a08f61f9dc4840742f69223198bbdf4597f9a96e3b3997b44d5b65cc2dc1afcfb7d71
-DIST genpatches-5.8-14.base.tar.xz 482452 BLAKE2B a9b6d3be1666d75d95b4e7d12679c70df363e0d264255e8f49282a478f13c1a716dd9e6d66dd589fe997eb8271736fe562b731dc1185b0bcf2f420b9ed942e7a SHA512 b5a553daf43fd4c315b03ffbe12cfdbffa31c5c9030d41a9fb33214332db734a640b66dc552a33098831e8dc274c41248119ae2ecc5cfc1fcccffbc36f5d23d7
-DIST genpatches-5.8-14.extras.tar.xz 1768 BLAKE2B b6373b4b1c04b177c0200ce1cb0cbef6e130a449cf38dc4900502479f646994509f044a784db2642008f9e66885ff97c2a2bbbfb124642269675b54269ec644e SHA512 3b34181e5a3af01cfc602cee52979f7592ad92c2f6cb715482344e99b591841e41cecc620871dd0147c8c60e7412c539ea85da26280449eeb5dfad961470acd5
-DIST genpatches-5.8-5.base.tar.xz 216176 BLAKE2B 8c57c2b91b6a395b490fedcee8e0f5ba8c7698903d0e1017fb66bb3d5ced1c6675fcd6e7ecc2405ccd237fd9ef4c641b10a0b4c32403c757ada5ccec3dbf0f26 SHA512 64bf8a331ba97a1d86159dff23c46c94c63f07158e66f9e86b02de6cc1a4476064fb6a924573c93fa117ea88bf6d6bb05f89c82c1883700af9fcdbbfaa5b72bc
-DIST genpatches-5.8-5.extras.tar.xz 1768 BLAKE2B b49e51d13c594029950911a1c7689b13710b8102330a475edb774f967b6162a036cb830b3cc25187e0ee3ec577d607baae036d136111ae1c64b7bebf1f544fe0 SHA512 a3fa7af02966567b5a2f4caab584ae19d7a1b955d2c8e599355b1ee5f3aed8971c26ecca6ab453280ea7bd8c9c004b53045848934d121f52474046293a2f554d
-DIST genpatches-5.8-6.base.tar.xz 253496 BLAKE2B 691638688887676a60639683b75a51a281642bb7cdf51439dc2871a72e8e9fbd3121a93767ccd0f17e95627eba5876e3f119905c3fb93292b16393f3736d2a4c SHA512 352c4f32780e24e4e9721e3792377070806cc756dc68f3266ad3140f5508c303c52c6573736915dfc27f92501a5b56f0fcb25e76916f338e5e737bf75fbb939d
-DIST genpatches-5.8-6.extras.tar.xz 1768 BLAKE2B 0ce3cc9c79e236e98da9b799d3d82aaafadc33beb4e373ecaa9ac7c9e0c29a43706633b2d9708e3548914c1088140030b1905274ffff286eaf45d2d33991979b SHA512 f5705f850fb6b9b14f70193ec258041bfdab9c3a93122f9da5e6a92633a6b130568efcadde4aaa59fd90a18426689a40e0dc14e4df7cfcf460a502f565e6f47d
-DIST genpatches-5.8-7.base.tar.xz 256688 BLAKE2B d4b30859f73f8da89d236181f5d9ee45c4b60728090153e6c068bf77b9b21210402ee4843969888d287c2ae74a4abda42334b1add83bcab2f6635d7fd276fa69 SHA512 960d483b0592f691628899808f1537c16cf204d4f9d512d0cb1fb40c940c0cfd5a127658b9ac6cb75d7f13c2fe8a7b9430fa006435bc04ab9b6f109d7030f115
-DIST genpatches-5.8-7.extras.tar.xz 1768 BLAKE2B db9b7e4916695a491803c5f152877597294ac4ea07453579b63b1d7f18331d083ee5b3362139da173374ba212223823bda6e32307b96b18dfe5ee6e51506e542 SHA512 ddda697285266c098d40f511304d00cc7bec9cfa6a245f263cb3f109e55fd00f9b8623a7cf0807ab204c15bdda526f19ad2e542956c9fa531231815f5f112e60
-DIST genpatches-5.8-9.base.tar.xz 340332 BLAKE2B 07cf6b878e42ba269c93179c99c376936e992fc6d8d5751329c7f4e63f7a78540cf2bf3404ef0ff00edaa050d2f8cb3da61850d58aa178734d81e719fd9bdf90 SHA512 216ceff89ee2b7a4903e91814639034d89dbf7da827c6a0f87f6f62f315e513dd31d4d41bb8d69f2f624c45563798f14c2c483c07112de2bebfb6e0ca7e7c579
-DIST genpatches-5.8-9.extras.tar.xz 1768 BLAKE2B 60e864404bf061eaad2034fc8bb4109d060041fbd149a533dd239895b3a89a2466d84617bd6deaf9c4674db821780399a47022c55fda6c7e8742d4497081d561 SHA512 b7e0a30938b7ce1ab296a54f31c77aa22c59f360a72a15c0f395403d4b49e8135acfdfdee1b4ff4b627e4c49fcf9b753847dd78fd64b46a8c7bc437f86b14f31
-DIST kernel-aarch64-fedora.config.5.8.1 215181 BLAKE2B d29bdc80f90f8ff22f43439ec03c8f391ddeae8d299dd36cb4d4d51c7d37851900faef728a94eca069c08fbb22a8ef5c2bdfb2b850e4f669276d967cb47dc331 SHA512 99f9a4fa65082d09b38bd05021a9f7577b98eb8b101928ff7862139461f603484722ed19aefe34540da6aa15908abee99a5287c1594e45f0c12afa4663820fa0
-DIST kernel-aarch64-fedora.config.5.8.4 215181 BLAKE2B d29bdc80f90f8ff22f43439ec03c8f391ddeae8d299dd36cb4d4d51c7d37851900faef728a94eca069c08fbb22a8ef5c2bdfb2b850e4f669276d967cb47dc331 SHA512 99f9a4fa65082d09b38bd05021a9f7577b98eb8b101928ff7862139461f603484722ed19aefe34540da6aa15908abee99a5287c1594e45f0c12afa4663820fa0
+DIST genpatches-5.4-69.base.tar.xz 2362320 BLAKE2B 5f0a1f950d6b4edd2eb2189256e128350df0d9682c218527e8f2c8283cdebefddaddaabb7d77e3f8bc8a09d4fb23fea37a9208ffe3c3bbf748eb5e05df85ba28 SHA512 d323506ceb6d8cdb01ff7be8ee80d6b7d5a72fc7a2411d96a84f58ae12392f2f72565413878cc7b4abf9221bdcd0b505d8dc5ee5920945aebbe6984250f13d88
+DIST genpatches-5.4-69.extras.tar.xz 1768 BLAKE2B ab83c9bd71bb08d7356aa93c27c3596911fe67fcadfe97a80313d2a038001be7ccada663ab25aee1d5cc348b220d3c82970d08bd3ebd538a729918a7487e0a1a SHA512 6a780c1a4ab2d2acd313e45c3fca0ae013104e916961855c76b4bc2c4f732f8eec27240b728677bf8e3c0042694605f477e672af41e5e4e50e266320d126fc32
+DIST genpatches-5.8-15.base.tar.xz 498912 BLAKE2B 429c079f836b9dc6d2086fe818f4e705264f002bcfcf4e5bdbe144af53aca53c8bfc1c0ac23aa33939bc59111e2194747088bbccff61015fd59ac0e3150aab62 SHA512 936414eaaa159a84bf016080332a8ba29c2024c02e5b83ed559df7b1a910ba405093e5ed36d54a346091a534f1389eba99b95852b23328a92e2f7ba5b07723ee
+DIST genpatches-5.8-15.extras.tar.xz 1772 BLAKE2B 690935cb537f442dd48dea34000bc444b9c2861b259ebb156722f1027ba281111b037fafe4cfdb71e68c40603f2dcb27d2639d949d4e4fbada8811fce2716329 SHA512 8dcc4ebb194603036323dcc559b5827d02c6a678b2f162191e306fe6ae52cc860e651937962ac8b52e2a4e229b1326a2cb24f938638556b0ddf4369f140f997b
 DIST kernel-aarch64-fedora.config.5.8.5 215148 BLAKE2B c71380f46c1b37e9e17bab6d78907114369b377bcbdb54afa2c35b6a222937fd061f25309d8de0cc78ef2329ede7192722270acceeaa3da4629a5f58d8fee809 SHA512 e86e2c60e88b1ea5968db1a471d7d928ccb3146fe850f8f2813ef315f2de0cbfa0daa2f6828dee71acb2299f65f05fc0b6f1572a82fb146ae9f53a905fe94e97
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
-DIST kernel-aarch64.config.5.7.8 208443 BLAKE2B ca77401ee1abd8a2f34de28c32a7153434534a10335f29150c33a0b4fa9b52b161223f59a79e50d9e260014ea2f95e5a2066957060cbf3ca8e938b05957315a4 SHA512 7528c9ae989e9d6297c4d06c3555a06f6636f92ef02adbc03a8bb7173891cfaf52222faeeb1409112119221b08041147acde5d4fe3ab73175bd55d4406283f52
-DIST kernel-i686-fedora.config.5.7.8 191864 BLAKE2B 217857254ffd12e987a5bd573e2520508bc70764b6363fc2c6bda1e5be46b70528616b26167150cba32f9e57fe17883c455fed34615a216b2398017d307971db SHA512 b90c6f2cdb55bcb115d7b92752a6efd8fdc09f68acbf365b08c9ff89732745f26d2644e18cb097ffd92d75cff07dbd98a9723179a35dc72ce01a732bdd632592
-DIST kernel-i686-fedora.config.5.8.1 199143 BLAKE2B ea223234bc54d430b87f3eb15fe11b11e617103c861945fb530091285abd0702e2cbb1d9258ca1afe718c4e7578c41f8878422c53e2f0b476e5ff2fa5c17aece SHA512 fc9c1b642e59c3c80b4cb6e1e6e9e2a27692524324539a3f1c163e284f8a69efb45ec839a630b0faeb0e52c15fb6577449163c7396aa0f1c43d727fe8aa35623
-DIST kernel-i686-fedora.config.5.8.4 199143 BLAKE2B ea223234bc54d430b87f3eb15fe11b11e617103c861945fb530091285abd0702e2cbb1d9258ca1afe718c4e7578c41f8878422c53e2f0b476e5ff2fa5c17aece SHA512 fc9c1b642e59c3c80b4cb6e1e6e9e2a27692524324539a3f1c163e284f8a69efb45ec839a630b0faeb0e52c15fb6577449163c7396aa0f1c43d727fe8aa35623
 DIST kernel-i686-fedora.config.5.8.5 199121 BLAKE2B f6e16e6faac6e730eb4c9c3edc1c173b2988b49fe677d34ef1540541911b8f76e5bdc166327d73237c78c1769d484de18864044c91b7da253795506c674d7303 SHA512 0a2c9abaae11ac1ec2e43da4b53fd1731a9bec983a7fda7b9e20f1d25b816e6b0bd217b255ca95b02a8b6530e923b4fc7de770f6a66411045712e7de61d431af
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
-DIST kernel-ppc64le-fedora.config.5.8.4 185788 BLAKE2B 07492670fe2febdd59dc371294b0c9dc0be82d3240f19c6cd1df6dc329cb8c87cdfdf161d700590964287eb529b0e114f3e06be172853ba1d6b34b99508a2cc9 SHA512 1dc947484336e99e47c5e1155baae5c20682bdc1c8888a7bbb8cb2f8f0056039d38c5ad3aa7e42291f83318f38be2cf14211e5a11a020b850b424e19ca8a3595
 DIST kernel-ppc64le-fedora.config.5.8.5 185766 BLAKE2B 27330c7806923eb4a3346df2abb5f253ca044a02afe72a89c6ce006d149966d65b4ba3e114b5ebefae987565279510c05d33dbc89c36c5e78e2e88732f5125f2 SHA512 8b621e0584624ccc24580951fc116478506a7465715449a53e70f46c99d0210bf08063a4fd5b87e4624f5ce179e6a6316f23723839c0e64e57a2ee58e4de59fe
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
-DIST kernel-x86_64-fedora.config.5.7.8 192882 BLAKE2B 23044bd3625d1ced686950c1322e91dd99eddb3128ab830c8862f5c949b66df67bc9ce38b810f4d54a35f9b9f11feb58d01450593ec513e132d789e3a50ac48b SHA512 b7770da1f608e8f0ec227dbeaf66491815e9fc4f8f08f01d2ad5877dd1946e73b315e8834f35cb5fc035fc3ac52ede8365107515d54b0792f326ad937d901625
-DIST kernel-x86_64-fedora.config.5.8.1 200074 BLAKE2B 05673cc7c5ae861faff6e823b8fadb9ce2f00864cc955d78733945abe6fa5842b5b74d0e41129cea92607bd907598b39127740dabd377cb25a2fbbcd54eae8b6 SHA512 c601c380163c66c9e351508dbc7ad3f10214eb04895257f721c808e8fa685770b9c898f48b3b05a5f76832fbf8c91e63278539dd9ef3e2c571997c844ecc7c8b
-DIST kernel-x86_64-fedora.config.5.8.4 200074 BLAKE2B 05673cc7c5ae861faff6e823b8fadb9ce2f00864cc955d78733945abe6fa5842b5b74d0e41129cea92607bd907598b39127740dabd377cb25a2fbbcd54eae8b6 SHA512 c601c380163c66c9e351508dbc7ad3f10214eb04895257f721c808e8fa685770b9c898f48b3b05a5f76832fbf8c91e63278539dd9ef3e2c571997c844ecc7c8b
 DIST kernel-x86_64-fedora.config.5.8.5 200052 BLAKE2B be804fd499527a6c6927365c0350b51b3351da9a4e3f75bcbcc44d1a1b21d001d4907e6028ceb7ec6d5c812ea190d369ca6de4ae2c21a293342b6af33b8e5e65 SHA512 40ba21b0597702d3cff9eb3c1fab98784229ba78702bbb0fae2264b145a2e433615522e300cff1f9c9c52067431116b80a8db92e1263bd1a9070adbbd068f982
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-EBUILD gentoo-kernel-5.4.60.ebuild 2419 BLAKE2B aa61a010470c10a12a325eaff699963d9aca663f6e1972609a9d7715da411b2332a1c4d5ccbb65899035f19154e0295d8f2d637ad68adf56e349585b70bf9d42 SHA512 7bbbcb35155d5c3a4037bd49715a1e14720e8246028d275541089266272a6d6132598ca1b7de25e52e8002d156e6ff90365f827a22be31b74a46fa7494886a2a
-EBUILD gentoo-kernel-5.4.61.ebuild 2656 BLAKE2B 048c16864806494007ac99f514afe490a29ccf8bdf1d1d679c27682bd25388a76f44c2930194a9cacf3baf024d3de1aebb27a76c7403168a26233d80af7f8a0f SHA512 0d144643c53d4897d53b33e1a19f14c196aabecbbbca5c3519da59d540d87a71c001f32421aa9b79103f5a65f0dc7251733458a18f82b90ba137d954b0bffc1b
-EBUILD gentoo-kernel-5.4.62.ebuild 2658 BLAKE2B 68d786f0fb1b40f32c92c22ac89571558026e8ddb3c0763ccd09266201e1dc36ec2bbb330294681f42a8953535107bdad7f640f3bd17dbf3b2f5afa9ad5d4fd3 SHA512 c26e6ff38398768b643536c350c0e686ea120bf35f821484a29dccee1026179a286e2f5d4daaa7a928abe732ad44660b590aa42357dcdbdd2e66e3e417d0b823
-EBUILD gentoo-kernel-5.4.63.ebuild 2658 BLAKE2B 68d786f0fb1b40f32c92c22ac89571558026e8ddb3c0763ccd09266201e1dc36ec2bbb330294681f42a8953535107bdad7f640f3bd17dbf3b2f5afa9ad5d4fd3 SHA512 c26e6ff38398768b643536c350c0e686ea120bf35f821484a29dccee1026179a286e2f5d4daaa7a928abe732ad44660b590aa42357dcdbdd2e66e3e417d0b823
 EBUILD gentoo-kernel-5.4.64.ebuild 4382 BLAKE2B 7b74305d92ce5e96835fcbeff0d0430d95a6d771981c094ff21e2dce4324ec3d863010f9434d73fe560ca162ba830f956b1f6b62a7f90b8c6f980e5b9e8d2465 SHA512 accf9b40a80ee24c6b2f3fb11f1d784f7a395daae8394cc20269e8f46ac156aede98834039bea0a049696a45faca4284ed62b428d02626c753ab48fa2b651f02
-EBUILD gentoo-kernel-5.4.65.ebuild 4385 BLAKE2B 865fc5028592d4408053503b11117b98ced615020e6de40a26cc3cb8357065e28cfa70209d043537e69c23d62d3b9e29c978ea35db14b9f1bc94318a25e564c5 SHA512 1110813549c8a40f29bd0c224f247dc2c9826257f373bcc11961eafbc16ce2da4ccc75bf8c6f0b8805c701b84fac2efba58cce0e651d0cc4b9903b373354111c
 EBUILD gentoo-kernel-5.4.66.ebuild 4384 BLAKE2B b363fccc63465a0b47754fddb05f2e1dbdbda1c45b14a64befc6396347930cddc6893fab15e999ee364bb7fbb2a420175f2a8a4c2278eaa8a98ffa1253970a65 SHA512 f42e8a205ece2bc26a81f7a78531dc81703eed827741dd474560eccb363bdc8b7b145bc8d86f836857c5b88bddbf0253b13d7483289758503246bce46d9ec080
-EBUILD gentoo-kernel-5.4.67.ebuild 4385 BLAKE2B 865fc5028592d4408053503b11117b98ced615020e6de40a26cc3cb8357065e28cfa70209d043537e69c23d62d3b9e29c978ea35db14b9f1bc94318a25e564c5 SHA512 1110813549c8a40f29bd0c224f247dc2c9826257f373bcc11961eafbc16ce2da4ccc75bf8c6f0b8805c701b84fac2efba58cce0e651d0cc4b9903b373354111c
-EBUILD gentoo-kernel-5.7.17.ebuild 2424 BLAKE2B d123a44cab87a519206d5ee1d510dbcf25a3d7b4b3f1f496e9a4c45493e21de0d1fa842664d87d4ea825d5a91cb6afbb36a792d4c533f65830204b1f0f6f1563 SHA512 bb696f61afa021064fb92ac671bdbf376553819035f1b2bac7592168b4da155ce933357b80bb42dfbe5b89b52552b08f1949280824faafc9c706bdbd5b204a20
-EBUILD gentoo-kernel-5.7.18.ebuild 2424 BLAKE2B d123a44cab87a519206d5ee1d510dbcf25a3d7b4b3f1f496e9a4c45493e21de0d1fa842664d87d4ea825d5a91cb6afbb36a792d4c533f65830204b1f0f6f1563 SHA512 bb696f61afa021064fb92ac671bdbf376553819035f1b2bac7592168b4da155ce933357b80bb42dfbe5b89b52552b08f1949280824faafc9c706bdbd5b204a20
-EBUILD gentoo-kernel-5.7.19.ebuild 2426 BLAKE2B 53e2b737d78899872901d4c778bb44fda0cfde6f31b273a440a1cba8fcb956faad8e6328166cae12f6957ea65bb0ad8b673bd429d93fc49a815f6b629e65e50e SHA512 f10d44749e720b8ec9002ec7acce8116949a0cca9a5a9a44811f8940ffc1ae2eb8d2e5a3d05919982c40b7a636d3dc63619537cc487db6a4855f59baa84a1798
-EBUILD gentoo-kernel-5.8.10.ebuild 4325 BLAKE2B 2641156befda0f1fe51da073f224cf004685b5518182d004b79017f66cd110d439f05527db851ed66234b1d0fec2f328bacc3f5e47d636f6d28b7e0e64207604 SHA512 afc25fed7b7477c5c12c7aabc243062aba13980b5da068e70e0794997732ad2c995eb77506ccf18467f8971e453ac1909239fd46d61dbdec9c048e0a35b4d6fe
-EBUILD gentoo-kernel-5.8.11.ebuild 4325 BLAKE2B 2641156befda0f1fe51da073f224cf004685b5518182d004b79017f66cd110d439f05527db851ed66234b1d0fec2f328bacc3f5e47d636f6d28b7e0e64207604 SHA512 afc25fed7b7477c5c12c7aabc243062aba13980b5da068e70e0794997732ad2c995eb77506ccf18467f8971e453ac1909239fd46d61dbdec9c048e0a35b4d6fe
-EBUILD gentoo-kernel-5.8.3.ebuild 2438 BLAKE2B 80cea563a899eb747a46f4b3599afabfb8b9efc9b7c9304c69db52312d086541985414d49625a77036e802631b980230a5b5a50a1a8f33aa56e6079a0bd1a041 SHA512 b5008448786ec73b061d7df7d5ab282b44a73738a4a319e739704ff6020b61eee7f997b6f3c078caa97cf5239e233c82aba71146efe14dc2a32886e5d21b5ccb
-EBUILD gentoo-kernel-5.8.4.ebuild 2438 BLAKE2B 80cea563a899eb747a46f4b3599afabfb8b9efc9b7c9304c69db52312d086541985414d49625a77036e802631b980230a5b5a50a1a8f33aa56e6079a0bd1a041 SHA512 b5008448786ec73b061d7df7d5ab282b44a73738a4a319e739704ff6020b61eee7f997b6f3c078caa97cf5239e233c82aba71146efe14dc2a32886e5d21b5ccb
-EBUILD gentoo-kernel-5.8.5.ebuild 2695 BLAKE2B 1f7098bec24243f5ff6aa78dc612bbac7ed7486c536b3e0cae3b46ec2f6683321b2cca8301c383c66d9507c924e789b80535d178378e25e37a317c4fd2210566 SHA512 62c25a01cbf32104986a9e534874fc1369601c491086baf3ef282add298d44f0f335de36158231f5bb0316f07e462ca3d07d27974b975cb8278ce6742932c267
-EBUILD gentoo-kernel-5.8.6.ebuild 2695 BLAKE2B ee18c6592ec24013d5fb738ba53a8feabfe3c1eec78d23d84fa82b5f968abcc7042b5659721628cdfb4cea0bca5179be839a200d163028e499b62250cd2a38e1 SHA512 fc2b8fdd20b9b40e8aa6d06bb64eb90bc274c18039d2c427f99b4584b3d0295a7ec314da26525ac06052661f2bfaeb6289964db849fde5f601f0397923f789e9
-EBUILD gentoo-kernel-5.8.7.ebuild 2695 BLAKE2B d3ae498caa191d02c8a857ff0e8a6d88da8de42b916e41b5ef823b88bebd2cdb9751c031aa55e0838a8db36ad146f24659f617741c20052e9ee3d069450f8c73 SHA512 cd84ceb27829a66eef227943ab7006ba811e81dc7659dbec8778d7871c1aa2fbbc608f7db113d8534be72658deb9bdc7ed1b794f9b7f39e317901c6a1ac5cb66
-EBUILD gentoo-kernel-5.8.8.ebuild 4359 BLAKE2B 2ce1e69d0bd399c73b3e1359ec02df739d9c45a83c4cd9c6c6e53d34f6b44938eac51f90b732cbf7baf802a6dac9090240bef4453bb6524c28199a1b6373ee46 SHA512 4fc96c3ccadcc33a6a12a01ced91403b2dade2df3bd57506e99b6c74a2fde64d50b45df4025ea3e5d476e7c6d47c268b2f38c4a5a61f40f9b1425e59ecc851b0
-EBUILD gentoo-kernel-5.8.9.ebuild 4325 BLAKE2B 2641156befda0f1fe51da073f224cf004685b5518182d004b79017f66cd110d439f05527db851ed66234b1d0fec2f328bacc3f5e47d636f6d28b7e0e64207604 SHA512 afc25fed7b7477c5c12c7aabc243062aba13980b5da068e70e0794997732ad2c995eb77506ccf18467f8971e453ac1909239fd46d61dbdec9c048e0a35b4d6fe
+EBUILD gentoo-kernel-5.4.68.ebuild 4385 BLAKE2B 865fc5028592d4408053503b11117b98ced615020e6de40a26cc3cb8357065e28cfa70209d043537e69c23d62d3b9e29c978ea35db14b9f1bc94318a25e564c5 SHA512 1110813549c8a40f29bd0c224f247dc2c9826257f373bcc11961eafbc16ce2da4ccc75bf8c6f0b8805c701b84fac2efba58cce0e651d0cc4b9903b373354111c
+EBUILD gentoo-kernel-5.8.12.ebuild 4325 BLAKE2B 2641156befda0f1fe51da073f224cf004685b5518182d004b79017f66cd110d439f05527db851ed66234b1d0fec2f328bacc3f5e47d636f6d28b7e0e64207604 SHA512 afc25fed7b7477c5c12c7aabc243062aba13980b5da068e70e0794997732ad2c995eb77506ccf18467f8971e453ac1909239fd46d61dbdec9c048e0a35b4d6fe
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.60.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.60.ebuild
deleted file mode 100644
index a811f1c623eb..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.60.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61.ebuild
deleted file mode 100644
index 82970b5920f2..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.61.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.62.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.62.ebuild
deleted file mode 100644
index 44e23fbb4fbc..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.62.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.63.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.63.ebuild
deleted file mode 100644
index 44e23fbb4fbc..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.63.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.67.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.67.ebuild
deleted file mode 100644
index ff0e401cd76a..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.67.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.65.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.68.ebuild
index ff0e401cd76a..ff0e401cd76a 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.65.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.68.ebuild
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.17.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.17.ebuild
deleted file mode 100644
index 53f94e012520..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.17.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.7.8
-CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.18.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.18.ebuild
deleted file mode 100644
index 53f94e012520..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.18.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.7.8
-CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.19.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.19.ebuild
deleted file mode 100644
index 5bd8492ef2ca..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.19.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.7.8
-CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.11.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.11.ebuild
deleted file mode 100644
index 1527024779c4..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.11.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.10.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.12.ebuild
index 1527024779c4..1527024779c4 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.10.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.12.ebuild
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.3.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.3.ebuild
deleted file mode 100644
index 25267cc03640..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.1
-CONFIG_HASH=47a895f435cccb2cb14eb5d0c52d2f6d4d904907
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.4.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.4.ebuild
deleted file mode 100644
index 25267cc03640..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.1
-CONFIG_HASH=47a895f435cccb2cb14eb5d0c52d2f6d4d904907
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5.ebuild
deleted file mode 100644
index a06c1eca5289..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.4
-CONFIG_HASH=d5f320566eb00901161a51fbd50b5ebbc51f47be
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.6.ebuild
deleted file mode 100644
index bb6cca2830cd..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.6.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.4
-CONFIG_HASH=d5f320566eb00901161a51fbd50b5ebbc51f47be
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.7.ebuild
deleted file mode 100644
index 27aff6df61ae..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.8.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.8.ebuild
deleted file mode 100644
index bb8fb1c71631..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.8.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y:'
-		-e '/CONFIG_IKCONFIG_PROC/s:.*:CONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.9.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.9.ebuild
deleted file mode 100644
index 1527024779c4..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.9.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel:${SLOT}
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 5b47ce919b8c..9febf35d0cc9 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,15 +1,6 @@
 DIST genpatches-4.14-204.base.tar.xz 4470580 BLAKE2B dcc2d7c1d1176f6169e0c88ae504661d0a7fa29a414388ba868463b1c117c91a1ffc66e6a3d0a6ecda347a08297475a20b40577759399fbc82c01eadba9a4b38 SHA512 91e9f3d10be4810500e11800aec062b9c05ab0bfdb6076d15cbd383ad6ae4d3b9bdebbc1e6d992561a8fea324ddb9ce73224392efe7ac0233c9be629255a2e72
 DIST genpatches-4.14-204.experimental.tar.xz 6088 BLAKE2B 774390bbc0b6d565290a317346f7da96ab5f2dec23dde3063469dadc8ddd98c26fa227f6c9a22ee0b9dce391d707668f88f691c11c80c6a7819b6d79ea6fedb7 SHA512 7c623c14de65a444b79a200158c90f8108c963969835461c43a9fc12c8de46ec41e63a0a72ebee2b7f68b37779f9ad8755065a5a347770b3159392d3e53b2e71
 DIST genpatches-4.14-204.extras.tar.xz 17532 BLAKE2B 1b1d877f960be52247af38d0eaa560081026f8e4e9869cb78fbdf58b84c4f90f039d993318c4304d4faf400512c17f49542eaba8d4417b2a2f775ed98a5ca344 SHA512 c946e8feafed29738c4f124f325c29b2b3ca4d56870800d240aefec55c90e01dd3fcd76e5ec2f52a37b0da38bcadfa66d2e995d2728a561af77a7c78f78f6564
-DIST genpatches-4.14-205.base.tar.xz 4480588 BLAKE2B 05f521adb16e25712e98dc0b8e8b6cc3ba65cd5b5340132496b865ad48030a78260c4e6247a2bc8a4093c19b6464dee0938093c59d3c9134434dee21cf87ec00 SHA512 a4481c1a9418244d4f539f68d2eb2dfad25870d02298f9f42050c42c8a0f09e7387323d6bfb0539194e348970ebab53bf4fe790715729663d2b46d087257c340
-DIST genpatches-4.14-205.experimental.tar.xz 6088 BLAKE2B c7bae39df314a701036c22c2aeb1e459f57f0513c66a04d829606730be2763f2900f39e6d7e9a2b6d524414992482783eed395aebec2070d57805fb60ebe7859 SHA512 b8a47a762f7b5daf90e929e96137ae465c86343af169c918054d200c3ddf603012663b2e4541f69a71783bb9730833a3a8b4c8989ef113c546e2d26ba8d97927
-DIST genpatches-4.14-205.extras.tar.xz 17540 BLAKE2B b1ca00164af495ef0d8496b777d6e3e1053d4a706c9a7ec2fa3d309819df8e32731c7d89bbdd5324898355f21f8b06536496a16240b3f1b6922b3c04d7eb6a7e SHA512 c745027f611f0edc445575ed18c2ee6c3baee05d5191ce3f47c944491180e84211199e1387e1b8e7f9eea0d96581ffd9c387ad5c28031318d75309d244543775
-DIST genpatches-4.14-206.base.tar.xz 4502436 BLAKE2B f19a99aae0cf52c13371738a94d060b88ac7540a0f2bc897af4a7769a3827c8f60e53633546ec5eff1265f79b2fed4dce0c3f8628f10af2cf7c1ec688845091a SHA512 842100a986dae5f730daf7bf3a3eeba4f2696799751ce03b3cfdf49affa5a5df18798291e1de580855417799b8cc822f7567e864ac5c8ee2257930fb39c1e521
-DIST genpatches-4.14-206.experimental.tar.xz 6084 BLAKE2B 2cc0eb307892de4978b9a616164c33afc057c8c735133d9fde32b0a497d4505ab626a40c8210fa7076a71ff5421ec54b7e80f63c6a8b9c115b1578950762127a SHA512 f546c011f06946c5aec8f4d67a7795bd0bf7c75f9afb9ad06aa27ee4da2520b583c07d7f23d8418d5b1ddd7c216b4b87a2eacdaa94a68276278570a83aa3427c
-DIST genpatches-4.14-206.extras.tar.xz 17528 BLAKE2B 9aa8400b61417a888e9d07f4853acb791aad5602515549758df0446a058f3a947acebf6bc8ef5744cd6ee04efe968dbdcc31d72130c3a500deba29f156e7ba99 SHA512 39fa5821ffaa9e2aa2b541844af5eb9094d987a645a085b200a19f31c4f01941c32c3882ff3dcbe314704292a159a3c376ec8f1e41994c0eb92b8c0e8c79e375
-DIST genpatches-4.14-207.base.tar.xz 4521272 BLAKE2B 3fb8727503ecb8c1b64d3d22b91a82a182f69fc5e9f37cb066d48624c879182f25f09365e19fecde1b84693ddc779b92c3cd5a2fcab4c1b82523a2b5fba2245e SHA512 cc1b8860b0d2a92960e4708937a44ee44e8a938310a5516d6efe029eebe96baa14be5ecabe886e9e63eddae73b2ad9de2be9ea790ae4b324b567cc9e17a12ddd
-DIST genpatches-4.14-207.experimental.tar.xz 6088 BLAKE2B 21cf44760b6354d93cf88099084fc75632b2d3e04fc37a4d6123dbcd1d0e9c1ae0e92deb37d90023fcb264d20e8f0f6e6f6064b6f6cafdbcf3d972f8f4ea6cc4 SHA512 7de1cdacb9ad00b622e33cf9a48313f12c7304568e651e407da6378bfe5ffc45f5d274d8dea870dd522fc1758ee1d973d017dd63d64070e55bafdc79adc4ea11
-DIST genpatches-4.14-207.extras.tar.xz 17536 BLAKE2B 5c1ecb399d4e2fcc53ee7b6d1cc5731008c471427f55af96b0a95c97540f3d20b27c7630dcb40181884c5cfd868815cd5287ce0577d9ddb18abaa31e5aa6d04a SHA512 5241dfca30bda7fff5ba9e07da984908d4acdc828a2a5d6c31a44025b28dc7285dc285d4f0cda41d8db88924f281ff954612afebaff59c5ce7716711531f7d55
 DIST genpatches-4.14-208.base.tar.xz 4528048 BLAKE2B b87e20e9008edcba6e52bcc57d0dc4544273c3da0ced74d410441d8877be9d449c40b4a53a8880d178e7b1dc706d10b0bcf797d0271f6882d410f548114fb77d SHA512 012433cefb294896ea928d683e7c00514331c85a0e63e131b94b0119158abe3538d77d60b075a35178ef933b240c9a4aa1d70494dd6fc3da2cce112f3e935660
 DIST genpatches-4.14-208.experimental.tar.xz 6092 BLAKE2B 188eea7e5646bbdbb67e9af624e34e79481b18e5fe36cba5553ec1312c73f20c2ebef19589c10a8e9ff999a24a4dc6ceb24511d1e299aa5a8c6f330f7e6d3422 SHA512 3219a3dfab95ee5e8f8d5865b7cf57a742457331bf99760a481be224c2ca4fe74711660f337578ec879831a805616f54b409f9f07cc2e98150a64e38d99a13bb
 DIST genpatches-4.14-208.extras.tar.xz 17536 BLAKE2B a555b9c78d47323e78c10dc31fbf191ebf6613f264756cd65c9e26e262941a0f4cd64122f93701a66686398b722aeb251dfd1b88b60cd89257addcbe86e2f623 SHA512 9cc457946e4822d76a3be86c0a07b40930785fa45f445721a0969d3ff9fff3a2062ab154386f39924317a3dc5e9dd38ee4136229d5a7ebdeb9297af7afe0ddfb
@@ -19,33 +10,18 @@ DIST genpatches-4.14-209.extras.tar.xz 3336 BLAKE2B 9c1e816171c46d509d634c6de1c4
 DIST genpatches-4.19-140.base.tar.xz 3799532 BLAKE2B 3b090f11a9faca5afc9b1267cc6101de8197a7bb54ceb9fba614b829d30ea97e4a19601e78095ee747e8e98f6dfaa3644ade1f5433607698283c6b210f45921e SHA512 8a8d2ca4cfc19e1c4de5c6402469d34268a98c8e3b853307e96d0fb0fb05335ac302ddaabca2658a98998dc6994378f580aca57cef4afbc9557afaf184785a2a
 DIST genpatches-4.19-140.experimental.tar.xz 6984 BLAKE2B 5720cec896e2e2795a89801dd1f58d64926ba6bb5d7126349448ef653cf3c6cc040a3f7556760616124ab21a55ebdce1679a5f9fa8b0a3da7a04dd56115d1b23 SHA512 469bdfd6235a5af80c8b40368d75b2b65132c4d1c2dbc4e1f567b2e6095db9fbfb56df4265a65bb83c0e54320d96d69b307c6c091864a3d555a9c2a3d8fb5141
 DIST genpatches-4.19-140.extras.tar.xz 17524 BLAKE2B 1b57f18a9ef73f3bb8d3dfd5158202a3b6131bb6b3dc4532d11e16242935e8dfe489ea8fd96d9db9b8d45244267980ff22207819d5772907ecbec1cc7ad98c92 SHA512 b85062b1acc16d8e012fcb384c49612d098b4727baa09e6c35e769580f84daf5b4f2ba006de785ec22e995bab63eb14fae55dbca9d4664439061f158c1f159e5
-DIST genpatches-4.19-141.base.tar.xz 3813436 BLAKE2B 6a3993b08462455738719b1b1c0fd77e97b100ceb296f4272ab3b9cd28be6aaa382ec2b13befe9191e2749de2b51fb5117b33a643de46d19d4b7c3a6c5a05db8 SHA512 bce6b1f6605889af958c63878400e313fd205e176c7c49cfceccd23081a864d584594a4b8289bdec8132a78e0ec49e47daaba47faa825b018fca3d3cbad5a35e
-DIST genpatches-4.19-141.experimental.tar.xz 6984 BLAKE2B 946a62c28ff0afdb8f0c27361ac0a0d6e1fff52b2a1aaf407e6574f3784965bd5bdcc3276e357fcbd099479d1a752bcecbc3de939269338a7409c7a0a517e22e SHA512 53bd0b8ded6c4c43bba354ab01a6790649a08f5433b95953187ef9a91e9144142c25d183e5589cb46a91e4dfb41f8ad785ec16e13b0f0e402ebeb34fb7c17f1f
-DIST genpatches-4.19-141.extras.tar.xz 17512 BLAKE2B f3fe8f91866a86d9ca81e795dc1db6ce417ad99e916bef24db30019b4e92e0b8aedb9b8fca0074c222e0741463643fd4164e64ec5fafa00a4165c2a05f57d251 SHA512 997660078e927f8b2084084325864a36010c52d67dbacd5b903c8b403792639e74d22994bf375392d42f203b1e6e27ed490ca6c998c2f3bec3d6f9a53a018d0b
-DIST genpatches-4.19-142.base.tar.xz 3842416 BLAKE2B ae96c5b65477dfae806ae017be4a491e717ddc66977a24a5aae4a5a8bb1a5d2df34c5dc6749dd625b086e74ae8eeec736bd5c0cfea34169f74d63aa4e58281e0 SHA512 a93beb0bbcf38fa353b55e71922deff303dc4bfab576e21a90cc70205aacd5b64bfc2d1f78af19fc51555a330452e5c93b516e60ecc6adfdc8fd3db9e8ef8f33
-DIST genpatches-4.19-142.experimental.tar.xz 6976 BLAKE2B a55bd54f8a6f39dd482811a7c0cf30ebbca3bec4179da80fc5d6547e9434b1ac851d2ee529692c381fca310b93cbaa7b8b8bc3de62c669569583b5f649461431 SHA512 60a81b0c42539c0ec0ccb5b6b38a65d7d51cff3594b27263d55c59557839fc1c8dc5a20904225448d3160f314dafde52898dca25a9fda92d39e39555d41ae30b
-DIST genpatches-4.19-142.extras.tar.xz 17520 BLAKE2B 3ed07a14f6c1885807314545d87e90e35978c1c5f82be16b456abc22feb0ee2aa0c7491a201e67f0393dc5538dd133438cebdd789b023d8e4c573ee392db66d0 SHA512 88baff82c502eecf2e30395f0579117313c7ce98489c4ae23ab3a1dfde211c4b2f42cd66a6541f46ab1f6107fff815bed6e02c0ce6c9e164b9a30c4e6a3da93c
-DIST genpatches-4.19-143.base.tar.xz 3868000 BLAKE2B 6be48a27b82be51ec85ff97b6cee6c6deabecd449dbf0781529b3f611e637ae0f925e1f7ed6ee609adbf359a49fbce5c5d35cadca632874009103ed85de9cc8b SHA512 d784d09604e4814c7c6cab2ef966975df248b19df98796919bb935971f847cb56f4934bd2af45a1949108b76cd9a1190b4502ffc477f4508043811f8214e5201
-DIST genpatches-4.19-143.experimental.tar.xz 6972 BLAKE2B aac354983641aa2e0c031fbc78c819a3d31b582bef4fb30769da91a767ba18674f18c243468815ef18a950b480c4be059cd374c779deb0414ba32962888c273e SHA512 ab8f34fda0475d2070bb3d4c73c2f0ad75b0495a4c96837f77a165449a64cb5431c6b4cb4852186ceaea063ed1f1aa31692ae325271df25606c99f7068dbd24a
-DIST genpatches-4.19-143.extras.tar.xz 17520 BLAKE2B ea356fc798d8779b6f321d7e39a3458006d564ce531051ec19308d100ac70d4848a846d9a5366d41674fbb329798dec8f554b089b53b50ae9cc0e8c1d8cbb126 SHA512 a1e48b33d651ff1ccf5707523c1c1b60adbc08496725a78d10e1acd4e31e452f5afc1656483b455bc4396b0d4e13e22ce948c3acb09969fe1bccef8a185c21d2
-DIST genpatches-4.19-144.base.tar.xz 3870444 BLAKE2B 3e2aac1859aac9b8554e330ac0e7bba3523921288b4961f7837850dbc1b98bb929e00693f48aaa93f7fd64f18a8d7d851f5dbc8a4f62db85220535c12fc659a0 SHA512 84821bcc1353cbd769289e7b5b89079e478ee262689ad01335b8f203ab20cd7237614e6cdb731517133f3fefc35ee3bae9f4f8a85a5b49c82781f39aa8b605c5
-DIST genpatches-4.19-144.experimental.tar.xz 6980 BLAKE2B 9a63a0beec63085aafbf5187dbcc8d6e42f53970b7e09e9eb539524307bb0956827bad44f476cad35aa04a7821ba6228cd3c31dfd818d1d15860d6ff897a9739 SHA512 9b3e9fc0a977a419eeb05ff009346af569bf8d2553162283cf0dbfc211e41462f0d1206fcd8bd793839e2b2318232b064b589a20e760c10feffc21faf97bca71
-DIST genpatches-4.19-144.extras.tar.xz 17524 BLAKE2B ab5c55d6f4bf6666e03d14262a0851cd65ea856b9dfd6c30f8240d83804e97e823018bc88f4c04f67e4f88eff0b2abc2bf831f89db272b26134eb6a45057f344 SHA512 db1fdc473c20f0eae1d6af2fd2ac102df31fa70bea62cdc9f0c8d4ad20d228748f462abf98dea3d3b6f2c12c95e81b48e4a773e47e1eb2b95e2559f53507effc
 DIST genpatches-4.19-145.base.tar.xz 3890268 BLAKE2B 6705feaa0dd76fab27a883c1ecdb325d00467fc50e051fa205c70c0fa07e62731406066589d3ea88bad2e1fb9d3aa3ffecacc0391348183a92097b8d69477c1c SHA512 6385ce0d318f988338c14aca095f2c054835a7e88ecf63829994eadee02bbf35beee39a3e366c4c445064c70be4ae5fc6105293fee36c6cdf81bb3206b0eeb6f
 DIST genpatches-4.19-145.experimental.tar.xz 6972 BLAKE2B fec91bdb34d9ab0d52f4ab920159f16cf43cc63e2ea8d079e61cd247c1bbaf8e57d183a484670d5e703542bf2c78d59029e09c0eefac7686392dd727671c40a0 SHA512 ae35835ed9b9854147a4b9f5111bcb37980f8664b59894654970ec7337c7114e86d639b0198144cfef87756740ef08ad7a08fb2bca6f78aa319bf662dcb92095
 DIST genpatches-4.19-145.extras.tar.xz 3316 BLAKE2B b8ea2c727280adcbc4cd30cce7a20f8ae22985c89d3749cabb3b5499b22dfd7f7297428e38b8881d2f3ce99c7786c50a2d181d9fb9de28321ff8416c7562fc8e SHA512 adf93acb5f86addcdaca9083da5a2ac0939654949a497b107bafb47ea35a8aff13e74906b93d9b40133082ab96339381a6addf2b1b6a6c2df7c9982cf031fac2
 DIST genpatches-4.19-146.base.tar.xz 3902228 BLAKE2B c746dc0f83350e8ac6584b8284db7442188d9cf658a707b8986780dca391ecdec84c0192af90cfbbe0947b9fe0286f6dec8fafe40ed4a2183c679984d1e21286 SHA512 12144dacf34cc4c885a7be93e4748243928cc7df1afc114f2a761384b1876dbafb594e9f15ce0b30daae81aa9dc6cd0c787098f640c3a5e539b8e42324c64664
 DIST genpatches-4.19-146.experimental.tar.xz 6976 BLAKE2B 07c8d0e8c3427f15351ecba95b0d7f5e0677998f337b825cc0fabfa3f24b3b04faa576b50f5f08353d706d28e2051c172900e66b349d1f79b20a2495343bebf4 SHA512 9a8dedbb4a5ca3f5c42974224ce8f1b9bac66acb2c99161892828dd6644e03f93f5fbce5f358d0349a324185ca97a87b54f6610736f43f23d4fce0b6aee5b1b5
 DIST genpatches-4.19-146.extras.tar.xz 3316 BLAKE2B 2de572d8e8ec70f4abde0b2681a9b7b8786683d72ec5dc5664389d32e89d0ec101137232e4113f1720f91aa4e87b24f1180f46cdfb3bdc618805bb5aa81fb579 SHA512 e461223ea3f32da0ca5c5337832b9c508aa9665198bb6b2da08ee2394485288a3701d8819cc4f779bc396c7b5eb94b4fe1c3c3afc9ddc7f580594f79d66617af
+DIST genpatches-4.19-147.base.tar.xz 3914028 BLAKE2B b6f113387ad1b9270448b01d178ab833d2a91bf52716756fc89a1df0c879fa806edea09cb53336e5584afe1238d914d22434e6abcbb7f8a41055e1aea4cd6a90 SHA512 cf9ea9e52a6a20b2713eab3249e393653ba09baf71fe289af581a341359a5263d00817ff7d9ef6e38c8f3200d24770c88bfc82c3bd556919c99980d1268f546b
+DIST genpatches-4.19-147.experimental.tar.xz 6976 BLAKE2B d3a5a26863931de047396f73bc15a19712eaa7d76d836baf3b7e75ab42f263c1f04c95947c69189acf15f7d1df998706277004dfe07d78d1f1f97667f6c999ad SHA512 f34befc03887f2150466b65d7dee1b6b98a019d88348b5a965604412b78b2ca7ab25bc1a705866476f1839d77a64734fb424543fe86a855387de930f0a416e84
+DIST genpatches-4.19-147.extras.tar.xz 3316 BLAKE2B 168a00fdecab7530c7e94876a15ac37619db16a6f63956edbcb69e31991908d849671c0dbcd354ebab129f59b79ae3f90b718714940443098ab11a0b1005a75c SHA512 5677ac0bbbba8c9d485b6beddaaaaefbb0525101f2ab53633f8eb36d41f98613b6f4de856e5941f9d0c7b9e0acf8566e9478878f8bc096de6cdab9daa6ce5d4c
 DIST genpatches-4.4-234.base.tar.xz 3796056 BLAKE2B eab6e9711dccb5d53ccc8aff4cbb51218c3f2af98e5423fbfdf97eb38388b84e6899990287d595a30a94a1811ad2d7d8665996e89a09e48a11dd5d541ff3ebad SHA512 c35e78b2e13c8fbbcfcbaeff8343334da892af53c10d3f5194bcabc24a3beb5316b71c2afb399bcbfc3bf8e2707999a396240f3725a723fa0ccc4b72daf7f025
 DIST genpatches-4.4-234.experimental.tar.xz 83304 BLAKE2B 85ae8e6bfa90de01ae1a72530d2f404784376402b5742895f66e9bd336b653b416bcd014372db25b7950d0f32598dd384aaba40a7f3b7fd4685ef95ece229b6f SHA512 d12ea54b57d4fca7a8f16879d79ad6216cc13742d308d811c806d12040c44095d9830d8cf2f68249c3e7fedf17bafb1ab3f6b1b86663e354b40c1546d8404a1a
 DIST genpatches-4.4-234.extras.tar.xz 16504 BLAKE2B 162cf8fa92659ed171184a6dc5c7117a0f16ff1c38481bdd8f98785ce800f9d19d3aebc41dc58d9128fa01ec97e40c5c5bf518fb536c532ed3cd3396181d2547 SHA512 7d7598a5e1c5aae430deae50f94c2b8ca3140256709be7fcbe27341d87a1b2926a558a0764aef45a9b4e038cfea2404aad0536ea8e71de87dcd2f1be6cc595e3
-DIST genpatches-4.4-235.base.tar.xz 3802908 BLAKE2B d8df284f2491a2f1400ab67c589c5a6491797e326e27d9276862c03e6f87c809aff3635a928034dd6b60326a9a2d22a0cb3bf2f2cc9d68eecd762ff333767cd8 SHA512 105c37435209f39260228be98a4155e5b469fa094100e1c05a7507f830b357b288a5aecc5fe1167b7fdc84053773c272a7cfddbba16d5a6837786ba2592b571f
-DIST genpatches-4.4-235.experimental.tar.xz 83280 BLAKE2B 9f3c4bdbc01705d7a013d51d7a3926663857ea592f52f0e48595cbc0531fb03835a062c8a6180ced52460c28aed7dc91a2a10d7324412dc760bc373148d20d65 SHA512 2f09c70ca71adaa8c50da4465509f8e26a9789e8c6bbc0b22551895dcf34babc86edf8d6e53d8383a12bd81631956d0330394086244d68ab7c3a81c0e98d8dfe
-DIST genpatches-4.4-235.extras.tar.xz 16508 BLAKE2B d31f5eb6b8c7f8bb61ffce4257ecc981a17646d3e6322647e247177d7a15eddc96fcb3a7ebb80b745ddfb81c24cf0c8f5030b47468bd2ed8376bd7c46eaf90d8 SHA512 4de2cb188ef4fe944ba012b8f33f6c8c562f207475417b699243eb94f5655a959cdad54f908bb421887ac25ec1a41f1af6560f3f19cd5b118d407f8e009354a1
-DIST genpatches-4.4-236.base.tar.xz 3816872 BLAKE2B e0438149553895be35323320584bf010a2fdc0aa7b522c5dc5fbc50d95a3d6124210c4140e2dd494d41a4cf845ebf32adafed580d5720da711c10a1ead462638 SHA512 d4e52e7b6e6b2a4226cd3af96ec2359419827fdc6fc6e3b715927bcb349b2b5d01dccdc0734ea1df6d525e5465a082340bd64c879db99b0e19e14dfb6a4d74ec
-DIST genpatches-4.4-236.experimental.tar.xz 83300 BLAKE2B a42fb250c57a80bafb2b3f30eb0da0a63ba25ce7d61337db8129b5c2eca06ad8cbeb4734f5590c167db115be581a01deca3feb214d83e721841df3948e7b852a SHA512 4ad27989926ad9f6067a225c50d31ec2984ed64df11a60cca334591e75e6d6c6ca661f49abaf75d5c6323c9a1028cedf6dde2a68f5d794074b44db1cbfe85302
-DIST genpatches-4.4-236.extras.tar.xz 16492 BLAKE2B 51d63969a29c4ae15ef23ef54d08e4b7f53e779371a84b3d8e1b7e98a26cd821a33f44fc3f90ecbfd7a6449ab3c6a48ba28c4bf62c01ab215a0896600146d343 SHA512 6f510c38098ef51340d133a929b4489b852040faca140b3e42a4ef8feae7c3d8fb0c03e32b3f7df3852f1fdff9dab2749a8921efe40b33c94dfef51e72210e2d
 DIST genpatches-4.4-237.base.tar.xz 3832188 BLAKE2B 014d7612d383737adde6a30e454675ec1fd74c909756cefac5bc97af7dafa6850a85ad4a7f5b63328dfa135d01451f0f72e746b60f5520095859063879f81aa2 SHA512 98c2d176518858b1d63d86f937a68d05293005459c5728c4c992767f190234d6b5413ef97cecbcfb923ec236f93f4582bd34f2dedc31e811ae34efe45dd99590
 DIST genpatches-4.4-237.experimental.tar.xz 83284 BLAKE2B 4fd3fe9b097cd7b2b71d32efb623f495f235f5359068a40142b19c5f98d83620caf9feb58b9ed33f55c31954d246e716ba0c0ceee3acf24066b95509efe3c96c SHA512 0f2737e304dc4ba9a596e96b8b0af063c32db0879b3fe481b5c9cc5e8755e5b1684ec139373fe2ecd716944054a9b451e667bb0d8092405b5a41640a8c9963c8
 DIST genpatches-4.4-237.extras.tar.xz 16504 BLAKE2B d4a7f563f97dc81e56cccc49087b1bc702ba2ca46b622e73da726eb0cdff2bc444a831f233830981f36f1eda1be82627f70348aa209ee3f8f89ab7e60f5550ce SHA512 61b94b84efd62360d21f90474d6b176379bf58aa3541cf6d0d4ff47991966239822d9d6eec45a8f832b0bfd7fef79f03c3428795a3e3fd31d006ac0be49699c0
@@ -55,12 +31,6 @@ DIST genpatches-4.4-238.extras.tar.xz 1780 BLAKE2B bda0efa731810b2a26d7d78bdc52b
 DIST genpatches-4.9-237.base.tar.xz 4215704 BLAKE2B aae3f674659e8ed135129c36b6afe4336a542ed9833f9be3871cb9bcb260968603d3dc4c944dd89815d8c05e178862e3aadeb74157a09b821899a58a57f445bf SHA512 17048947821511ef7d1411fda43f42a2935d1cda4016d89618ea32d54c3723b2ede57dd30a6bc8f6f07aa5b2b1d6f61e261f46266f61583800185f0dc7939ac6
 DIST genpatches-4.9-237.experimental.tar.xz 106452 BLAKE2B b927926179e48d1d41ec70215f42705298a90deb541dcbba7b1d5472a734f4f53fee5cb2cf82573e257a2440ecc99595e2a69fe30cc046c6b27dfe26164fe7bf SHA512 5a587a915dfb879b466a61ae4ab65d51d2329258fb2d7d7e8906ebb06cdaac3f7f414b614f6d47fee79be1698901931dd28cef0068b1d3e181e334f67c118482
 DIST genpatches-4.9-237.extras.tar.xz 17396 BLAKE2B bb4cbbed886d283c62160ca990ab9d73489924b9d8555d3bb8214612b09a5f51a333b59dfd8db780f8cbf581870c97dc91e823a574ca7738cc2eed1034d4d3d3 SHA512 fc732cd3fadba95c98d1c51a7c11c09336b1d67bc747fb4a82a64f1eedf3ea688c33f6e17bdb0fc5e49f7c04138a2e911ce1a7727ca2c8810d9958c02b3c6723
-DIST genpatches-4.9-238.base.tar.xz 4224084 BLAKE2B 5c9d4ae27248c6db5f03f8de4c44509db012088946c7f3d9a8adc37fe95c15dbb77cedca5c9fb02eb097bbadf141b9742868002a2afed49cf99c1da896c8e837 SHA512 a51fe960d581dd78517d6170fe8978a8cf666d23628192efc7105fee7cf5b38246e19967b08b95a873d0d0bb39ea7e21fd977dabc7eddf003eadc978470a8d03
-DIST genpatches-4.9-238.experimental.tar.xz 106384 BLAKE2B e451036006b47cada259cc91d594fa90e41712af34137ab057e08c71d1b887728fdfd2a860a1341b21556ab805a70ac3b96bbb5b96ae85f4804e4f12b0e4e528 SHA512 6849ab8f293da988a6bf54f7b1eddabcf63f500a535add1941141ef196cb94091c70a85c0b914bd06ff20eed2c4f70faa26febf8cb4178d8af022b633fbf903d
-DIST genpatches-4.9-238.extras.tar.xz 17400 BLAKE2B b2154c1bc42bf0c59561469f06de73d273367238daf848f85d7d1a12a37ed1cbfd8485fc6910e59793773a6f13df4c41e8849a23e902efb485e5ebd28b135a84 SHA512 8745d21ef2f7d2b4054ead087b4448c959a47f7c7be48e2340823456ef5011cf57139f5e5d6dfb5d99ba3ba5fba018c4bb0e89a60a41e6077908a5438b4448cd
-DIST genpatches-4.9-239.base.tar.xz 4242340 BLAKE2B a79259f3b05cd5d85116ebe77768f0f5f7ea537a427fd657a11d7ae46d3d7e3d758aa22516b36b30dfe94da5ef0d4ab90c9207cb9a9af04e83cf7c59da9f2abb SHA512 a44fa8c94de5da9402e9309bb4fd04ca98eabfae3bb67776ca9fed25df51a0d7b06365a628de296837e7df1e45fd38fc90ab6e2c7c135bb1bfc6a6a83541de32
-DIST genpatches-4.9-239.experimental.tar.xz 106384 BLAKE2B e358693fb9e8a203998a8b533c6e359adf83544787c2f721024f882a75d477dd7b88925446b6f903e1a0020e37c28b49ee05047e77bf5530a975b2edc6d9db3f SHA512 81abb7ff61d2a24cc75d852c02ba666e84de00bfa8e171cc48d4ebbe1d8f1924c77aa9bc7d05ddabd0aacf271e1ad2464c590f7eadd0d752cc93c1a87e953dcb
-DIST genpatches-4.9-239.extras.tar.xz 17400 BLAKE2B 612e8c8385fdee10ce52e13c284e08e2031f7cecaa9fc27de3f8df6f7e3476fb995f8ea83c0413fa0f2531b16a4b5089106dd9b3f4d77a8f21d97cd4140cbbec SHA512 e528cd2cc15b162ca0e9f8743a7ff51bc7f951c43c3f69ca6842e681ae8184ddc3bb1d0566d0655a709192788fd9e13fd9384ead057fd4339090c8a00d680c8a
 DIST genpatches-4.9-240.base.tar.xz 4267036 BLAKE2B 899e0e4efb969478207c13f87deb7a8775f63cd55ae1fea5fd643f0a254a2258f787c5a6e90d9ba2cfc9f18c9b903c4c25a560df62d6eafcc57293c86bd74c28 SHA512 f36da8e466ab9415233859a1ea30f55b8bfad7a3d6a6ccf946860769900be45786ddbba24ee05039248e943db5686426c399eba5d33c791c9f487ca9bec30288
 DIST genpatches-4.9-240.experimental.tar.xz 106380 BLAKE2B 6c814606f8aecd426124c5d61562dab0042992e8cbef9f20cc1b647966412e955eedf4743df4b022c05bac51926a72786dd9311c6040f326944d4da8e181c27b SHA512 5fe75ec33c3295fccbac456472b5507e86da44fc3014a7cae019f4a8f293e2a5714f51a4044709123d1206806234bc445354ed1c10e08ba002707226df41219b
 DIST genpatches-4.9-240.extras.tar.xz 17396 BLAKE2B 4a22af944b224c879e1d4d56e6bcea33a462e3a914cf0d008ca24cd780bbe26449554436a04c4e2ac58a0cdfb90efce577b7d2d762102d48784f89aa4b385ad5 SHA512 fc72ae76069e75b5460a1d31710aac46c75e480655a9ebd5cbc1c3ff1151e574fd493064e551a64d089e2db64f58dedaece82401d6828de6bc5cbe5e2179d5b4
@@ -70,33 +40,15 @@ DIST genpatches-4.9-241.extras.tar.xz 3336 BLAKE2B 49751b3be239f7189703f475eace8
 DIST genpatches-5.4-61.base.tar.xz 2186332 BLAKE2B f0063cb381a98330178dcf4ffa017ae9262f0406a1d4801b8e60a0300c51238a57b502ec8f72ac30e7b8618e8d54e6a56afdc9513fd8f896fc3129cbe3532446 SHA512 0733161227e3d1f3bb179a4ae8132183ef858166a0521e28669b5e01bf660a924b0b4758268ea4271abaf4bd51b8a49d0ac300173873087820697de5e53452b2
 DIST genpatches-5.4-61.experimental.tar.xz 6692 BLAKE2B e847f735003f85ca5ae64284cf4df0114ae171c74c89f32fbe0ad6c55343f8fa18385c2312e47e3758719493038400cd87246c2da877023a561ee6043a796e22 SHA512 c4cb73568826f4e8c0078667254c9863cdd4e648697115b8b4c5adaa188d536c319ca518fa5f15005e8570558df7f93a47771a8577600fa305c49da6855cec88
 DIST genpatches-5.4-61.extras.tar.xz 1764 BLAKE2B eeb60ddb3ac1b28aaccca2820d107dc65629b61460073b1e281903b04759f3c1a66ee8dca35459d1ea81fc75410709c8010c3c16aedf802fcc626cf47534ead0 SHA512 35a93c028932e1e6313ccce7fe0aa5277e57cad6c61418a436432aea5a3937e4621d72ae4d2e9b28c7b26342eaf0e63bdd9e55362d9f7b0aa4bb6a64b0c59c37
-DIST genpatches-5.4-62.base.tar.xz 2210192 BLAKE2B 5aa23923418095dad7570323e6bf853a3f718a527e15c56cbb7f177e1c03f814d741c6ba3888b9fbd40af418d9400999995469f83548a220f0efed0635217f86 SHA512 e4622bdf08e4b678eb6701a6284a5d85e0bf91973ba0e4f797c6dd4e3a14a8b34879eb7561bc38a183d72281a18cadddd4d4caf0eb8fe7acf49bd0fc823fb329
-DIST genpatches-5.4-62.experimental.tar.xz 6700 BLAKE2B 60556209a5fdd4d11c2a2fdd4ed2aec6e29cc44ea3029af24dccdec5d5f0affb13ffe82dbcc54f215a9d90d267f517f662d683bdbc64f4323a543895312917aa SHA512 a7f9c097db2d8bda9ed49d04fb903cb630af7a653f5fab8aab97b1269e35e3502b6d2aa9e29845ad8eac36215238fafee3880ae867f17c9413c7bb4c37e73b69
-DIST genpatches-5.4-62.extras.tar.xz 1768 BLAKE2B 6381f43f1f0bc497cfea4451538cd4a6900002a40031f5a726d0dfcd8da8ab1a8c2af4403810d2c6f0377ac5a1bcf799d43e42141361ab684e7a63a11e31bf84 SHA512 efbe0418614bcc2674040e4db0a137760f719793cab7e57cb237ff85ecffe1521a056c6c2ffda2c7efd7e47a0b914a06e87f92d73fbb754b41dfa63a88e7d4ea
-DIST genpatches-5.4-63.base.tar.xz 2261952 BLAKE2B 98f002f6a4f7a5908c4da9e9fb25451e995378d848f0bd6408e7e800bf94ecc41480eb76293dd840035d48806eb1bfaf92e33c2bf3979ca8e6f8fb417ac3644b SHA512 f5a089e940b70c7fdcb4de8aaf28c17f0783626af05271b3dec348307ee202525d11e139845db95f0e225cfbbee2185638ac79a617ca13168e0676685caaba4e
-DIST genpatches-5.4-63.experimental.tar.xz 6696 BLAKE2B 2e9dd9935091fa2a4487f4a22701492b10d7f479a90b6fd2a5247a8d9b3aa194b3606d4e289c8e6607d67b8c6a1a0068cdad99b019b752f6e91926853c084947 SHA512 084ea02916a3ec364339bea5741435d859ed980d46b957681abc87d8619ce572a0e19cccfe062df465ec09a1b46f0930aa2d5c0024ea3c1aa92a4910ebf0c1d7
-DIST genpatches-5.4-63.extras.tar.xz 1768 BLAKE2B ca8c254b3f0f31ba0e0dff7e99127c36acf94783075ddb53ef8da28c017422e6a1537992e06796983b703d1062c0b6a609d58f6b0ed5e62a069902065bc6dca7 SHA512 075581b8fa5123d2b48b5a66d939fc126db7000229713a07cbc475c7052e07acb357c408b2b4484d3d60b72088c260af09e9d871c7ff6b0ea559ea396109aba3
-DIST genpatches-5.4-64.base.tar.xz 2269092 BLAKE2B c2e312dcbac6410bb416047d2e1182ce1c1bf4f01abf164571d8f24cac7c2c05dcb9d4076f80c6f19bfea185ad214f0c5b0fe5f519e7b3a9603bdde41cf2486b SHA512 832a9697d2960562a87d1a669990d42d889c6a79d3095144255a3a38b0e53b391a9398f764449bd27b0f5c19ad724d9973fcfffe91989c6f5cf7aef9258d1a2a
-DIST genpatches-5.4-64.experimental.tar.xz 6692 BLAKE2B 8bb80336c33390929b99698dea04525172a83ba9052cf3986813b7d347bed9eccaea86a808b2c6ff8d33b93ac46df58faa88df6d454789a07f91fbfd2e094ecf SHA512 db178e46b1c5ef0b71272cc4c3ed46c79dc1ebb646e4ebe17b4f37e4c065bbb79797f1218c82b8563c34bba0057587fd7d1d2891a5e1e86a78ed2f7974aefe23
-DIST genpatches-5.4-64.extras.tar.xz 1768 BLAKE2B 1b0808cc84f4b3c2c4e783274a56a48f0c8dcc4e764eb4bfddf889b23c1cf99fe1f2eff42765814c73015f371c2d979b94cd14d1518ec32d04ee113282bac9d7 SHA512 407e744ed486337c0e32a4c7b518fb6cc36d0f144fca59eb89d56db9bd368845048f47b906eeb024b2bcfc4fab63b1414a61648506fce1d9fec46094bf39153b
-DIST genpatches-5.4-65.base.tar.xz 2300512 BLAKE2B 7ed1f7694782a2f2aba5448d4e2786b813d1caaa6d3da986ad429834c73f15c29268dd1cf3e3fbc63a913717cdd707084d5c1d0a9a0d0a91a558e44d1605927c SHA512 3109881309ec0354ab91924b6e45e8ecad18e13ecbcdd86adc4626668557ce6324ccb942d9a62ca02d7093fd221e90e8b8e9f33ce8c009676122ffc100576f61
-DIST genpatches-5.4-65.experimental.tar.xz 6700 BLAKE2B 6dd1fe19bb3935a756145971621297d9e6cfc220fd092e632c4f7de03f64b0885d2eb9b3df371d17b755487861ce9ff6140d92dfe15094819100f5c432fa961a SHA512 a11d61987e806f2cd3963f7f1219339326791cc952f1ae968e896fef024552dac5ccac28d2921eee8f05cc43d4abad6a4e527cbf46e94e4c9015fad7fc8f482f
-DIST genpatches-5.4-65.extras.tar.xz 1768 BLAKE2B 07e18047c9d88d73325933496d70d645acc6d07bf70d531a4e4602b85c6dacded40d9fae716bfa4654672be78f0d6029700cf4b5b368f3bdbec485218f74abeb SHA512 b3421a90b0e664a64e49b4e87c4392871d425577995cbd15cc420d3f4a1a101706bd19e32aefc077144d6da955c442c7635552f8987f1af707af05868aa61a2c
-DIST genpatches-5.4-66.base.tar.xz 2303300 BLAKE2B 1107b439bab215b9dc438d40cb69d08353ef9841329151298f91b9191a4f798eab7904cd2acf23fe5d69c4cb224b0f87f972255e54acb46ea162f431e307a134 SHA512 71f4a032dc2dfd71195fe9acaf2e75966515f1ec7fd2f46830080e563916da9504de8ccd9214d49637b8234de9610c4d7ce3bed1b6dfdfcb063c88588bb32c6d
-DIST genpatches-5.4-66.experimental.tar.xz 6700 BLAKE2B 626d296d4380542eecdabe79aad6ed29f2133c2eb8de9b9bf89a10e4b162f1032b529a7b6e8e62e6cb7c4780cd159cc4e8edbd5bddb8149def71e14beae80d22 SHA512 5f82950ab0ec0464686d4ad4d9046640013cfe5b1d4098f9ec99090642c6e71e2a7c2535d27d510c7ccfe24a130c6c59911ae21291949869762477b3eb003133
-DIST genpatches-5.4-66.extras.tar.xz 1768 BLAKE2B 0a81b02b97cbbc7c34d8b8ff13c4f26bce534e92a3f75da169b24c1dcc7b215091f9a2363f9e19cdd3af4febb26d8bf85808eb78cbab6d2e3ab9fda5b1bd346e SHA512 8ef8938c32c46eda7a35cdec9bcb2ffdd3c507a9e2024fae1ebb4684869b6de97ef1d531e71e23d286c49bb4a8b6f2d959b0f874f31aa7f9276ac28fbbcf4422
 DIST genpatches-5.4-67.base.tar.xz 2335352 BLAKE2B ae98701f88da8c3ab823499c6d5683c80adaface3b23d0e5671deb4e8005a6aa8f9ef3c4ff4b0fb1475ca33de7790c59c56571795122ac4bfed6f1c6e4ae8049 SHA512 1d039a98cb29a76f0b5d26cf2ef72cbeef469746e31afc513f6f5f88841e9fa4c96fe34e92748e61a6f6f5a6d8ac68783126e6bcc696bd0106747b8a93a9b940
 DIST genpatches-5.4-67.experimental.tar.xz 6696 BLAKE2B 0d3871c594f7a60311ace7bd7095fe7d10013fe817fad6e7c94f056db3505dc55ce0944ec56f5b1d24c2419d2fa810dbb9712ccf098ff92e1b352974eebab8bd SHA512 6cbfdd3e651fc95f0f929fd0fa239ff4494d0621b47f138d2b335d36b6ee33863b41436a57dfc456c4a47d0ef4b21af5be7a80078990664496b98632d8990e75
 DIST genpatches-5.4-67.extras.tar.xz 1768 BLAKE2B 6e6718c80465485c0271d46231d45412e4bb7e713caed3a333b27f1a655048c2ccea871d5331fc4d6413ddbeb2776df02acf00ad1c399a1d86e65615f05d5c69 SHA512 7da85f2ff8f50f43ae1eb814e34402fa8a55629c7b8e9b362ad657974be2ac60489157adf474f91c05587475d89deb1cb1511c5241b80885d695651bfb122af3
 DIST genpatches-5.4-68.base.tar.xz 2349792 BLAKE2B e7c2dec93508a89d24ac5a8cc08a40289953abf1715a0f624872a5b327e8c957489fd37d6486bfd2362ee745ff252595f3371becfb88c54980c4db48e62e30f0 SHA512 8b4e19b5cbdd7e18113f72736338eb6f23438fc5beaa051ffe48c9a23d58acabddecc3742588865cc3ef1e3b73e200caaaa0125c388b19640444a81df52404c5
 DIST genpatches-5.4-68.experimental.tar.xz 6696 BLAKE2B 3c7110eb367f23edaa5a5e0d6d66c4abff32070cc9563bf486e6a25121288629359ae5551bef93d134d09ac7db438e9ca3b9c47d8451ea3f1c8c275a634117c5 SHA512 7147e654417817f4faedad8df82353443e8661564e53b725ba2ab7df522728b7096523c3656ea0325f9466e303eea987bddd8829696754411d73c18e8443910a
 DIST genpatches-5.4-68.extras.tar.xz 1764 BLAKE2B af078c5e8d444d6b5f615fa6c1d07b810d2cf55a425ebbee3febd8cf3a327525a384139fa140576dacbfac197e50eb01bd32599e09ab2132f821f4018868aa93 SHA512 727bcde520c62b67dc7bceea8252a9ebe351b8797a0a3e79d3c47817c8841321d3a5d69cf5e38e592070bbb383280923a1688091fc272a1ecd71a9e7140d8edb
-DIST genpatches-5.7-20.base.tar.xz 809256 BLAKE2B 92ceaa6c9cd0a71cd7b86745240c2c018265dcbe8be124375ee3cde3f6fa4e00981f6c8762ec369461fe75542efb9154a09f90499ddf127405716ffcfdac4027 SHA512 900283861dec83bbaba8aafbff3b9d689d7f729917130c3d6760a05f919903b079203c48b768cad2bdae5b197192d5fe8764b786aec95fab77bee6384803b7f0
-DIST genpatches-5.7-20.experimental.tar.xz 14144 BLAKE2B f1ddef4ebf7a4905f14c74c365a5be9590c2f38b4194c935e8572f00431b8653e5459db1592ff022db4c04326f552f41e333a3d89a150dbd7db31011510379cd SHA512 6d8aa8b5364d77d427c47b907991f23d6a7e6cf5c0b1a74febe2251f9ad46b144852feb8a064bc158774116b6ccdfd5fe6ef3933b066ee3c353b73a815a72a46
-DIST genpatches-5.7-20.extras.tar.xz 1768 BLAKE2B 016fb07a98245121971534b7f9d40f1bc627325fbda893342ecaf330b2ad4a2caee6ff39a7a24e7c46e2eefba8df4cf901bd3d46d7041f1c8781288ddc1d63fc SHA512 b8aa2c75b014fdefc7f56f67be6a7bbfd57e55f6f08346899a7a64892bd0975d0494864614c2bb485bb5dcfe262a280c51f43c7f0ff18256a2370b1fa93add3b
-DIST genpatches-5.8-10.base.tar.xz 347544 BLAKE2B 8cfcdd84b803b8dc1721166d853267267f16a4c6e6cf759bad5c34b6149a57e7f5bddc14b287b870df98ad2af93871b6bd1b5f9dff0308fde9a25115943d3bbe SHA512 40f07ddf0f852cbe79f7b2da289787090ace5cb478c21c41adb82726e22a404d7c35acd76dc73a7fb1444f6910735249667a79d8d756171e1b8ce9cfcbfbfdef
-DIST genpatches-5.8-10.experimental.tar.xz 14240 BLAKE2B cff77ac57b09e377f86547949afbc98cfe3204f8a136bab283e8615781129cd35fd26b6b1fde08b98d6aaf1991de2fd6a4a35918a1a6648da9dbe3d3f3463408 SHA512 f3ba66798b45943b028cfabbb68b02b13c83ac707a4695c6630c98dd9be8efcd086efde005c3a7e006a1bc2079b53af56f1a34f2710bf9105cfecb5ec1957369
-DIST genpatches-5.8-10.extras.tar.xz 1768 BLAKE2B 056c24f09a74c2867c767139fcd90af83623aac03e06ae03ebe96decfc4fccfc8b213f93e8b0cfda9bac935d85734c8968f590dd4537ba14f9daa0c249c257fd SHA512 aa1bc1d7f0190cded4d944cad3855358b26bc7dcfc726745da6ff8789662c5b74790284bf659ae8060280086e6b2809c903ce876f0c5b9c9d550a0123ada86af
+DIST genpatches-5.4-69.base.tar.xz 2362320 BLAKE2B 5f0a1f950d6b4edd2eb2189256e128350df0d9682c218527e8f2c8283cdebefddaddaabb7d77e3f8bc8a09d4fb23fea37a9208ffe3c3bbf748eb5e05df85ba28 SHA512 d323506ceb6d8cdb01ff7be8ee80d6b7d5a72fc7a2411d96a84f58ae12392f2f72565413878cc7b4abf9221bdcd0b505d8dc5ee5920945aebbe6984250f13d88
+DIST genpatches-5.4-69.experimental.tar.xz 6700 BLAKE2B 5dc77757b202a6196554e89a956167b07793315178ada78153a0129673e8e391fdb6eafee51e23fb3e0c66bcadb1e70ba8d7db9b5d2e3fe0cd75d96a652ba3dd SHA512 e36e092a14fa3c5a301d25d09d98c27f32fff0a7900ead1dbcdaa9c94d49e627963f07ef5a4b2b92ad79e31bfd1df8389a6354444e987d2c3fafc382f23dd235
+DIST genpatches-5.4-69.extras.tar.xz 1768 BLAKE2B ab83c9bd71bb08d7356aa93c27c3596911fe67fcadfe97a80313d2a038001be7ccada663ab25aee1d5cc348b220d3c82970d08bd3ebd538a729918a7487e0a1a SHA512 6a780c1a4ab2d2acd313e45c3fca0ae013104e916961855c76b4bc2c4f732f8eec27240b728677bf8e3c0042694605f477e672af41e5e4e50e266320d126fc32
 DIST genpatches-5.8-11.base.tar.xz 400044 BLAKE2B ffa3cbdd4586e142933833859ff3e741a2bf9cfe569aadce43767b671706d256082a07e5c3b11bd9cc849bde645b664c641958590d1ec0b73dd826dab2996f56 SHA512 5dab9eb4f0077d5822b736e282696b95993e17d1078691cd14c2201043e9be9c496c56d5f89cfd38fbb5d0c1da433f62d35ff8b9542423524ef701205bc04577
 DIST genpatches-5.8-11.experimental.tar.xz 14248 BLAKE2B 41c0b5453d89c794504fe7bdd02d595553bd70abe0b4018f290328b7ffef0a2f9c3f7be61ae73cbb42827e64844d5ac2ff2bf798760e1bbb4bc0f4812753006c SHA512 3ce760f2b257e8fb9a443583daacee267f35469596bfa3867032e524235cfd5c1f98de5e4f92ecfa5651f9a3ab852c077eca940ce00f344c69386117ee824e57
 DIST genpatches-5.8-11.extras.tar.xz 1764 BLAKE2B 3798c0b54dd3056dfd389db8bbcea775462b218d9670c3322240d90d8f894c89bde55a04a80220e76b0d6fd135c32af1d9f5564795f30e9368f3f58d0d45501f SHA512 958d68e317c0140b2540f757dfabc767e28f1878a2b65012599248edd9ab8ac20e7f1736a0f802f01a9f0f22cc743f1a1f9f4665ac287ba6a477521dee323ab1
@@ -109,64 +61,35 @@ DIST genpatches-5.8-13.extras.tar.xz 1768 BLAKE2B 7b70ebda93c52dc86d61e8040a4827
 DIST genpatches-5.8-14.base.tar.xz 482452 BLAKE2B a9b6d3be1666d75d95b4e7d12679c70df363e0d264255e8f49282a478f13c1a716dd9e6d66dd589fe997eb8271736fe562b731dc1185b0bcf2f420b9ed942e7a SHA512 b5a553daf43fd4c315b03ffbe12cfdbffa31c5c9030d41a9fb33214332db734a640b66dc552a33098831e8dc274c41248119ae2ecc5cfc1fcccffbc36f5d23d7
 DIST genpatches-5.8-14.experimental.tar.xz 6064 BLAKE2B c0d28c5358176934f4a2dd93fe5da55b367f112bfa07aab24276e94a14be4a562c25a0316024fe457fcf2e9a3b6e14859ea4a3c4cbd2ad85c907e56aa90d63a3 SHA512 39b605dcd4a3bc8f50a52160d71094eca7b0c8c9d106d953426ac84dae2ffa76a9f7c86b7b066f530e632e078da732d319e38117ad576d6c5cbf9efa4adf9826
 DIST genpatches-5.8-14.extras.tar.xz 1768 BLAKE2B b6373b4b1c04b177c0200ce1cb0cbef6e130a449cf38dc4900502479f646994509f044a784db2642008f9e66885ff97c2a2bbbfb124642269675b54269ec644e SHA512 3b34181e5a3af01cfc602cee52979f7592ad92c2f6cb715482344e99b591841e41cecc620871dd0147c8c60e7412c539ea85da26280449eeb5dfad961470acd5
-DIST genpatches-5.8-5.base.tar.xz 216176 BLAKE2B 8c57c2b91b6a395b490fedcee8e0f5ba8c7698903d0e1017fb66bb3d5ced1c6675fcd6e7ecc2405ccd237fd9ef4c641b10a0b4c32403c757ada5ccec3dbf0f26 SHA512 64bf8a331ba97a1d86159dff23c46c94c63f07158e66f9e86b02de6cc1a4476064fb6a924573c93fa117ea88bf6d6bb05f89c82c1883700af9fcdbbfaa5b72bc
-DIST genpatches-5.8-5.experimental.tar.xz 14240 BLAKE2B 3fa447ea495893c242314ec3144e0671b1053309ae4854bd5856a1e4b2ae989d0cdf0641e01ea7917639f0e282fc08b460222f49144bdbc89ed0bf385c0d7612 SHA512 50db6df2fc681814a768b37cccda5085cdeedd537e5a185bf82d6a466f5bce215c91b6a973feb548d8904573e663cede2802a39d22bcac5ad998147cd6d7c208
-DIST genpatches-5.8-5.extras.tar.xz 1768 BLAKE2B b49e51d13c594029950911a1c7689b13710b8102330a475edb774f967b6162a036cb830b3cc25187e0ee3ec577d607baae036d136111ae1c64b7bebf1f544fe0 SHA512 a3fa7af02966567b5a2f4caab584ae19d7a1b955d2c8e599355b1ee5f3aed8971c26ecca6ab453280ea7bd8c9c004b53045848934d121f52474046293a2f554d
-DIST genpatches-5.8-6.base.tar.xz 253496 BLAKE2B 691638688887676a60639683b75a51a281642bb7cdf51439dc2871a72e8e9fbd3121a93767ccd0f17e95627eba5876e3f119905c3fb93292b16393f3736d2a4c SHA512 352c4f32780e24e4e9721e3792377070806cc756dc68f3266ad3140f5508c303c52c6573736915dfc27f92501a5b56f0fcb25e76916f338e5e737bf75fbb939d
-DIST genpatches-5.8-6.experimental.tar.xz 14244 BLAKE2B 6cffcd75c7aa7419510388ae451c82b7dd9c804597e23e0b5f1b9c7ac9011aef93d84f8284562672d09bc30210055fb248d6a4e81bde81cb0a83e0d02ded34cd SHA512 756d5c74c0d6da9b20d122e743d33d93f3dd6800fb69593243b8911f98b4d031d5790ad9f0425e7d31ca46fefe918f9f3c666be502eb5526dadb8dfb98aeb7f7
-DIST genpatches-5.8-6.extras.tar.xz 1768 BLAKE2B 0ce3cc9c79e236e98da9b799d3d82aaafadc33beb4e373ecaa9ac7c9e0c29a43706633b2d9708e3548914c1088140030b1905274ffff286eaf45d2d33991979b SHA512 f5705f850fb6b9b14f70193ec258041bfdab9c3a93122f9da5e6a92633a6b130568efcadde4aaa59fd90a18426689a40e0dc14e4df7cfcf460a502f565e6f47d
-DIST genpatches-5.8-7.base.tar.xz 256688 BLAKE2B d4b30859f73f8da89d236181f5d9ee45c4b60728090153e6c068bf77b9b21210402ee4843969888d287c2ae74a4abda42334b1add83bcab2f6635d7fd276fa69 SHA512 960d483b0592f691628899808f1537c16cf204d4f9d512d0cb1fb40c940c0cfd5a127658b9ac6cb75d7f13c2fe8a7b9430fa006435bc04ab9b6f109d7030f115
-DIST genpatches-5.8-7.experimental.tar.xz 14244 BLAKE2B bbcabc89c34fdf17de217f0d174308ace9bb6ed3f8b7bdc65f874ce757a5d422a33d253c4906e041bf6ddeb79fc44170d52d8345cb3c522c82771d6bccb95af9 SHA512 a185f9cc0891e580c60ba04e92e85b6ba58605f4f66369fa350a678ad5bf3c287d1972dad39c4eeedc1636eec736e6d3fe9b401fc64ce8b73e5d75b5080f0226
-DIST genpatches-5.8-7.extras.tar.xz 1768 BLAKE2B db9b7e4916695a491803c5f152877597294ac4ea07453579b63b1d7f18331d083ee5b3362139da173374ba212223823bda6e32307b96b18dfe5ee6e51506e542 SHA512 ddda697285266c098d40f511304d00cc7bec9cfa6a245f263cb3f109e55fd00f9b8623a7cf0807ab204c15bdda526f19ad2e542956c9fa531231815f5f112e60
-DIST genpatches-5.8-9.base.tar.xz 340332 BLAKE2B 07cf6b878e42ba269c93179c99c376936e992fc6d8d5751329c7f4e63f7a78540cf2bf3404ef0ff00edaa050d2f8cb3da61850d58aa178734d81e719fd9bdf90 SHA512 216ceff89ee2b7a4903e91814639034d89dbf7da827c6a0f87f6f62f315e513dd31d4d41bb8d69f2f624c45563798f14c2c483c07112de2bebfb6e0ca7e7c579
-DIST genpatches-5.8-9.experimental.tar.xz 14252 BLAKE2B 2577283d6a03f6fe4f5aaf515d42ac76408f0a6bfb4152fa4eed23a40a95edc39cd7673744a7ef7ea78a97c200f0f339dd29d3d74858c7416e4d8e65ea45955f SHA512 f281ad0cb67372ba2dfe3ed851a5fa0db0dea7174dba349376dddfc0d8cb2ba3b39620513a7a1e4bc7e9e939fa4040aa0205ede6525f5c09abdb115693ef7abf
-DIST genpatches-5.8-9.extras.tar.xz 1768 BLAKE2B 60e864404bf061eaad2034fc8bb4109d060041fbd149a533dd239895b3a89a2466d84617bd6deaf9c4674db821780399a47022c55fda6c7e8742d4497081d561 SHA512 b7e0a30938b7ce1ab296a54f31c77aa22c59f360a72a15c0f395403d4b49e8135acfdfdee1b4ff4b627e4c49fcf9b753847dd78fd64b46a8c7bc437f86b14f31
+DIST genpatches-5.8-15.base.tar.xz 498912 BLAKE2B 429c079f836b9dc6d2086fe818f4e705264f002bcfcf4e5bdbe144af53aca53c8bfc1c0ac23aa33939bc59111e2194747088bbccff61015fd59ac0e3150aab62 SHA512 936414eaaa159a84bf016080332a8ba29c2024c02e5b83ed559df7b1a910ba405093e5ed36d54a346091a534f1389eba99b95852b23328a92e2f7ba5b07723ee
+DIST genpatches-5.8-15.experimental.tar.xz 6064 BLAKE2B d447307c194e9e62fff29e71b640730f16d0a88ce148a331d74cac74b1b4661ac2d4b4827f4e9c05edd25de2522e295c15d2a37ed62bed329fc8365cb8333afd SHA512 e6f4701e88cfde590d75bd8fc3954eed48e179bcc84704a4cc0b2ccd2379754a74a16d65355021de7c372571499a290d11d150624b1eeb91ea3170d038048565
+DIST genpatches-5.8-15.extras.tar.xz 1772 BLAKE2B 690935cb537f442dd48dea34000bc444b9c2861b259ebb156722f1027ba281111b037fafe4cfdb71e68c40603f2dcb27d2639d949d4e4fbada8811fce2716329 SHA512 8dcc4ebb194603036323dcc559b5827d02c6a678b2f162191e306fe6ae52cc860e651937962ac8b52e2a4e229b1326a2cb24f938638556b0ddf4369f140f997b
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 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.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
 EBUILD gentoo-sources-4.14.194.ebuild 729 BLAKE2B d5757ca61a886662710caa94e917f8ebf59fb3d16ff668b3880f78efad641ce6a0f0148807ca37899cad70844021019652e70c223068e92552af272900d79694 SHA512 f007616acba66dd27d1a3ad055f16a4c5b64f9fe83e9df1fe6f7dd5a8e7857488d5ba053b81009ca1e76edbcd46a54fd79033d5eaf414cc3697f177a19780675
-EBUILD gentoo-sources-4.14.195.ebuild 736 BLAKE2B fefa21d287b384fac3dcfd2c3d9dca74b0be1fe5d4f144b341c67e5cf34452d9cff35b0862859407f1476200d9decd9ba682beeaae131b04d1c501189c683701 SHA512 6a005d9c0cd48029c6d77d4182e00e75bbbb163b7be91f80883ab850c9bdcdf9a148461422a1b6b106bf58ded9cc4b908a6ee462d8916ea2c35e94ad9d4fabaf
-EBUILD gentoo-sources-4.14.196.ebuild 736 BLAKE2B b3abb5208f4f95e0d9c3eb9d8c49c2c2f67f1a8e8f783014b4a5a6055ac5c8e338e81cb560ae7d2ca4a1e7cfb85623d9fc442855f6562a1b317d7d56aa65fa0a SHA512 c097679f63c53029d0861f27bc511ceb95f5a18e260ff0158606033e9c487591733507cfd6888d2a1b74dc8e89674982541b6880a5d26536ed4dcb778d8350c9
-EBUILD gentoo-sources-4.14.197.ebuild 736 BLAKE2B 10ea4bb4b37cc3ebbef98d3afd3e943904739074141ea3b4b7f8ab0c45d07506a0e0481d8b0b3550d6b7bf1dae8671ec574e349bcccf5d76c5f42916ae1ad888 SHA512 f4977d368f0bfc379792f6f32702dfb014075d360a304fe93222e898dcbd8a8ccb9e55537321473f4b54b82c6b57e0f2491ebf006b99ff8b4ba0304e519a319a
-EBUILD gentoo-sources-4.14.198.ebuild 734 BLAKE2B 2562bdbf7b083c7e6d1f283f9eebfa918a7c4ba81a8e54f0f490ad9be9f95af6bc79c2e9ebeb76ee0e42ad8097245823a612e442b99d72f69edbaf4f877c3aa7 SHA512 2f43a97f1df298918523a2ae2c4c95a98eec91abb8f84c78715226905cac7473b7ebc6c51b928ce0f9553b080bf6829969c98cd170f34629d30e5129127881fa
+EBUILD gentoo-sources-4.14.198.ebuild 730 BLAKE2B 35dd1dd969963cd9631a93fd644e539dfdf054b40aced2baed9d5a52891b9ac972f39fc64d5b060c5456eb69af23aea1677c556cb5d14dffcb3c80f926e319d9 SHA512 303ae3315867b1090a4be67e4f700d850c0b0fee0d71f7bf5355d28fe77acfb0dead071400b1e4704a257772733d608471f30c1c2fcfbd2cd00e8ee3fb7140ea
 EBUILD gentoo-sources-4.14.199.ebuild 736 BLAKE2B 8aad984dd2dac2f28404d880c5fd94cccdb8cd3d898fd4c8e3e5c59f715c44b72617eae18aa4f4544033e521d3c0dedce6172159a0d448c33f1e9960582b1773 SHA512 14c1694b6bc22ad46296eb3d3276e95a4f3f189a40f8b3b8c85e1391de6861c9d5f641c030299feaed1435ecae9622f8267a0322c2f0516842f275bb44110251
 EBUILD gentoo-sources-4.19.141.ebuild 729 BLAKE2B 8c7561fd7eda0ce39ca2f5afc486d3556b04b93a217b500686da52fcaa39b1bd48226787259cc4e838668a3665e80568c8a1e2849ccc554fa700daa8006ce870 SHA512 45b04b690b8f638b58bb5a959ff1665b94e92f7334412f81f90b82547fd7d2cfeca72a26ff6cdf9daced8a9c5a6ffd03cffed38435f7a37a670032e27adab92e
-EBUILD gentoo-sources-4.19.142.ebuild 736 BLAKE2B 720979db00f2637efcefa0f21a85bde90499fd1a166ecdd13a457353a9475100a539adb9296b19d1e1e781cb3a8aeac15bf199c1237ae984468bb85cb35507d2 SHA512 3059597ca05233df47eeade02b0a34b812452681f5c5faa1c2264fd30578b1bc04be20965ee7ab35044d1e3a10ca5530b6dd2f42352fd4cc9c3375e3dc2708d0
-EBUILD gentoo-sources-4.19.143.ebuild 736 BLAKE2B 7917b2f03f61728037bd1ebb170fb5e72849ed0b3c96819d27d63afa63c5bc59965ba70685996b0d917e5d89577455e71ba75fc1c6c982d29813654905aa4405 SHA512 11fa2d463047e2b9706a4fac58fd79e93ab3dc6264ef365649706104fe9a67a52154f36258fffcd261f19adf90bd489b7654e009b4ae6218431b24c9d4f81419
-EBUILD gentoo-sources-4.19.144.ebuild 736 BLAKE2B 83f9663c51a18388aa404b825167e0828a416ce2294f60d6b0801ca42540fd9b1c00abc8a5a0620833db1c965df90f94397d1c1e82c74511b1b20ba0b1178922 SHA512 09520ed07066aa6edf63669284cb89d52b907ceb3aa63a0dffb8063011a83955b2605e6ccac0206966a107f99547e143df2507cd48c54b728dd54e569490cf89
-EBUILD gentoo-sources-4.19.145.ebuild 736 BLAKE2B b6a076d67bd91f10a65d5e6d604ca1b7f20a4f5369b07db0d7c50c5b9f91806c8f97e78f4d5ca46ab2d6762fa43e8c29e5b67a065ad1af1a65ced0bd05aeba00 SHA512 4b3f28e8b85b53a4a041b6925707bf899b3baecb445d0a26aec16e3b7a69a28de92a899368ba7578eb9ce0b157467aaf2217bd3c1bb79ef735740c85e64c184e
-EBUILD gentoo-sources-4.19.146.ebuild 734 BLAKE2B b8084af50d8ecf8d013e405c6f7b40561b53ae0df68d58b6e268465ff7d32283b7188943ac4dd07b375bfd0dd5dacaa0ff97eb23aa47fb4f1dea4560ad5e23a7 SHA512 82598db337b6f66c439657b61e2b1514d3e13eaa2610e3b27a36acddb2a4a03656fbe633c9a35214538eb85af7d6eda2f1c5cbd2dc304b85a56cb7b42a57014d
+EBUILD gentoo-sources-4.19.146.ebuild 730 BLAKE2B a7651aeefdb8d07069a5972321e3c2dde6a090867b54dd4e96493d3fc947a9f14cc9bd7d9ae0ea325b29186ee9f57543213c275588a80a471fecdd1644427764 SHA512 1fb99c14ba73973b894908d86bb82881ed7fade75f39c28c6957fa8320b14f114c612446b002fe0bcdc806f570d1f3e30b4d6980fddec6fbfb2b4b3fee0e3f25
 EBUILD gentoo-sources-4.19.147.ebuild 736 BLAKE2B f7de4d8dec8eb402d5de99ff6d15e71a5a52c4628be550e8957df8941751de71cd702cddf988287363744458db1b860f81e5d529bd86ad6b035cd3723a9efff3 SHA512 c5260776c36e9736e63b10db2eceace54fed3e715ca43ef3b1c32c4377cb3bfec3e8834b7d6703d63cab04a0ec4318b8c8df7c1e4cb9fb6f8eef841d25299344
+EBUILD gentoo-sources-4.19.148.ebuild 736 BLAKE2B d9db0fc54f303e94eb45ce6f278ffc8e96da38f8a4c985f48e26c0d163f9bbdc41919d69af58349c43d31e8f40dcb438e5382f931f25ae2556f45077149beeef SHA512 b2516515558e19e6f40d19e45bf5fe7580a25e1389205d41763cebf598cd68f9a39d216ec95d66df40d04fc7f3333b46bab778e0934f779adf644b35188d52de
 EBUILD gentoo-sources-4.4.233.ebuild 729 BLAKE2B 28f41b4bdae4a56871bcffb87d729fcdf17235a71dfe70ff60107570ff0855bc84e5269e7f0f918d8b0038676858f78105d719d664326f37e57c3da94ba3830e SHA512 264604707ce026e5300361a10b24c98272e73d85bc23be7169916b992a958e0e1ab3a8831ddb14c3761619236bfada8fa2b0418c84c20954aeeea6ad728956aa
-EBUILD gentoo-sources-4.4.234.ebuild 736 BLAKE2B ee36b3b82766df47b170dff005c048e8a6e98e5f2196a6000b2861fa0247f39842e2933ec9db09c9ccf1beec568f0aa9cafebc8620ab59fd65a79e60a058aaf7 SHA512 88c4962fb77cb003b1a4996dee0d5a0f220574d8cc981e68b79eb850086e67a3fab693ab7b942c9effffc044012c2fdb546435be77bb40347dbaea8a1d6b574b
-EBUILD gentoo-sources-4.4.235.ebuild 736 BLAKE2B 9215adad10c213fccd2fb16c96ec4dab78fff787b158ae46304868a91b7f27de031b688bd3dcd0733c8e0958b9d2d5cb3849914eaf544a87aa31a6fe458767fb SHA512 d1bb42bc41f885baa747213122569e93e0b351e291cee6d0e1bed9c038b0886d8adccb110f7893b65a4006e218cf90290713591847c3b03fb8c9430fd11be510
-EBUILD gentoo-sources-4.4.236.ebuild 734 BLAKE2B 5617475ecd5a9b48d91ad134b32e8f78676135b51aea71ada8af36e778ef10c52bbbd3f44aa6cd25c523d67bdaa8b71eda76945e4d0c7a7170630cb5831e2d3c SHA512 e2a4765f972391dfac51c9f569effa1ebd42761794199ac89cc39fd64aa6435fb7424ce0d5d2f0844fd9934c60102ee6b4db069c111208504c521a37a0eeecdd
+EBUILD gentoo-sources-4.4.236.ebuild 730 BLAKE2B 522af72bc7af91bc670feb3f34bc567ab466bdd8ecaad9456963f6eef8180f27d59c3547294b82cb39d301e52f7a9e287e34faa7fd600cd575d891fa1d6909e3 SHA512 29103f72faf672bad3104bb0aece91f050a249fba788cf1da92a11dc13cb60b98bbbe084720f37e5ff0208a18de6ab97dfd8de21a49184f9801885f533856f99
 EBUILD gentoo-sources-4.4.237.ebuild 736 BLAKE2B 7bc7e229f54a6b7f8dfac3c094897c65af01c9e1a84fb23e2811e4cb9113c39d7f3487011edde6d653ac5e175b6008b40b6ef052c3187b9a261ce64a323a3cd9 SHA512 b2509b81b859db7454557225098d5d1b9f0b1d6c7bd8e0d8f1b0b4cd137e94d52d5bf5b4627dc838ed6ca890782e1503d657a7f1421c0e9e4d426f4ba14f5990
 EBUILD gentoo-sources-4.9.233.ebuild 729 BLAKE2B b4bf2ebbd73329668e4384d90510be030614eb448691ec29f66f1143b31bb2f4c1d04b8f935841f242dc3444544d5789fc9a11bad40e9d739be4b7dc7c8d6f11 SHA512 8bff227fc6a947c628a601ed9460b0d7725824d57f471f9fc60a97397d75329dea42d17196862d8c3d80839a8c038cd981f812640890188236824b7d863c7842
-EBUILD gentoo-sources-4.9.234.ebuild 736 BLAKE2B 7bc7e229f54a6b7f8dfac3c094897c65af01c9e1a84fb23e2811e4cb9113c39d7f3487011edde6d653ac5e175b6008b40b6ef052c3187b9a261ce64a323a3cd9 SHA512 b2509b81b859db7454557225098d5d1b9f0b1d6c7bd8e0d8f1b0b4cd137e94d52d5bf5b4627dc838ed6ca890782e1503d657a7f1421c0e9e4d426f4ba14f5990
-EBUILD gentoo-sources-4.9.235.ebuild 736 BLAKE2B a132f50500f4745a09c310b32ee48d2db2d48c585fd857f02b8f01cb8d47f301df73eec9e423bf5d8d628612e75f875b3742cfd5b498d34cafaa75b19a3a280a SHA512 8d0a2b0bbf39c837f755c52ddf77b3ed8a9a17c8428c0a540f7aa5daa469a253c7ce58e0cff16dcca5158fcb545396da19a59090b4ae6d073580ced79edcc990
-EBUILD gentoo-sources-4.9.236.ebuild 734 BLAKE2B cab076407da3c98a4ad0479201ba6dce99f1c5d501290c93ed700b09540d4218fccf77e8696ce0b33b4d5197833dc0fe2bc7df29defcc854ddc0e45a25ce03c7 SHA512 139bc005c2e9e8ee028a69b1f3d646e471b22322b5abaacca7606bbd699bc07c5e405c9a6bb06b9a2d176c5da0a6efbf61d523a2284483976d5fb0efd703aa64
+EBUILD gentoo-sources-4.9.236.ebuild 730 BLAKE2B 2a0ded1c95a8bdc8ca7c1dfe34c576651bc7ae6cf8f4bd0baf139666ac966035c835250310eb30295811300652feae1ac9e172bf5cdb4950b78e02a7d989c5cf SHA512 7caf8343c7fff86b45a656765464088b553cfb319430a9aa77c767bfc214fb05bc1afddb05b9f670af448657233113dc7dff6bea900eff1552250c663d38e9fe
 EBUILD gentoo-sources-4.9.237.ebuild 736 BLAKE2B d2e8be1f3b95a4be2413bdc080ed39c20610ee53b6a7da376c0e4a3220aa62076dc98c7bd8606cfaec3bdd7096580640d9e439a4428039a23d3358b1dd6f84be SHA512 94eeaaf22f1757168e4a7794a6cd2cb6f3ce048fb91552d361e742e3fbe59fedeb6f2e9225147065b0e7a6b80f8300e4b1112636ccbcb30b78fd2fc7d099741d
 EBUILD gentoo-sources-5.4.60.ebuild 727 BLAKE2B 8cd6b3be28d783ef110d20854343786497059464e82118051efa86e76bdac07342ca260a7dc3f0402f6b704e4462caca46d49957187ed5ee906b4bb9adee476e SHA512 2460b7d415925a579eac931e6b54bcd040bb01c0692c9a7cf6bb8136f705fd1f7b7e73a302d6d0be0bcf9739f5ae477096fab0fc78a7f80bff62686050767c8a
-EBUILD gentoo-sources-5.4.61.ebuild 735 BLAKE2B 8d8ec48dd571aeab34d2c778e246bc131741d4f0d4d8d13e9f4c7d079d6a815383003a2e24994599ace6e086398ba83096c4067852dcbd6b18ad01504a860d5d SHA512 a79d7f2db41522606dd98f08e568a0b5b1387220c10ea957d5218434f96743c635813e8fad88384cdb3474a8472622c922bd473cb4f02928dcc1e957eb9019ae
-EBUILD gentoo-sources-5.4.62.ebuild 735 BLAKE2B c7d6792643a8977f12f5719b56859123c3889617e5b8b85aad9000bd4de0f812e0a9c0fae0bc9a42d6e6bd2e41626baa0444916e1662dea95afc4b16cce582ad SHA512 20d22e7b38a7af3ac51b11a7405158937627e235eacf3db245dd266932760f6602c6793592a6ad048f6bcf9f1eb81de9e9a3686f02dce5c4da37c5aaf4667a8d
-EBUILD gentoo-sources-5.4.63.ebuild 735 BLAKE2B 6a19034e31d186ee43432c01a8a47e28b66f3ec35a70ef09841d864f9ff8e2ec915999cbae85f34c46edfdc5cf528d87d1433fe505383aee598e0d3d2d4c0e1b SHA512 989ee4b2943e5d5006223aa5b7d6d4256050dbd5b836ab741d475327dbf277bca77ec992004b4c8cf2216b74731f52a026846b1353b4918d05289c6642bb5749
-EBUILD gentoo-sources-5.4.64.ebuild 735 BLAKE2B 863d321a69307b9436672b7c67976c8e952625bf2c083ff1e7fa2eefcbc0bd7a5ba10183948e4d6d82745d49d303e7eac78077bf83eb7223b644b63a6a1d49bf SHA512 572f3dd7520c80409cf59b78e26e742d24a88c2cbd7f639bec76b1dacd4ecac42c55e9e876ad6bea1991a7de36e2907c6b94bf8d80164de4c6de89cc86820531
-EBUILD gentoo-sources-5.4.65.ebuild 735 BLAKE2B 41a9d344e8e4180ec914c623d112bc61826c925f4169ad0be7459e392827217c96026a535d307a540b68a60759632b5d21a44cb496aa0ce88c2a64f053686f41 SHA512 609bc50ac857e7426e82aa945336f0a99422317d5f5b9134addc928504eef1d869fa420dabdfac61bb4d1f15d15f178f2977f7437a6db1bafcf7ecee0ade4449
-EBUILD gentoo-sources-5.4.66.ebuild 732 BLAKE2B a365a643037605d5fb4db8430af5bb590dbc0dda23a2bdf11861eb43fe3029fe4fc1f32b9cbbe202eaea70f5732d21e47d423a24397b9b977cd695a96bf6d00a SHA512 b5fa23167ccc9d893961606bfc20a61300dd6df45b6358833a8f2b3b4ccf39aff58d34e96445e65725c9f7746a25a8cab01cfac408db773308b62f953d3d19f0
+EBUILD gentoo-sources-5.4.66.ebuild 728 BLAKE2B 1d9c6fc8d99764f58f611d295f93ef6616704e7436bab760afdae3ae466e8941215182fc79ec1efc72449f2068dcef26521b845275260617e2d474ca5e62e82f SHA512 d9a5eef2920ff001740a8f15ff348c41897daabb2acd052bc481a3a92ae64a9c4a667ac8a2213c4e5099c0b8f1df8543d0847d48a5e56bd484bb2ec39b4c051b
 EBUILD gentoo-sources-5.4.67.ebuild 735 BLAKE2B 8e4791db168148f3a2edf1d99a7012fa378e492655a52be46dc3d28cec81bd1beb8c4ccd3f44577adc362917f2bff38f5fbf8822cd059249ea9264a46830c477 SHA512 86dad626908ebea509b4e692680c460f68139c79c953755dfbff5788756e5f58adf6420d33630d007d79c6c73617595843ad5fae54ce9c7c6c834e6a69b38e9b
-EBUILD gentoo-sources-5.7.19.ebuild 735 BLAKE2B 6ce13ac4487ed3c096b132b395c66d4a8750eb56b66a2a99361d6114668ffd79e488b1c9be4b775799416d63074828e22d864d31c630471edc430cf782696f46 SHA512 7af998f0f7c9a7f43cbc2058946a1c9d4326d2965755390979bd29c6c32cf0e0793e487cde0a26f6599d3b04673ac07a02c2e47e9f666590198fd6b3ec2ce687
+EBUILD gentoo-sources-5.4.68.ebuild 735 BLAKE2B 299b2a8071c5a91eb6276bb00d2a2e40eb41316f11ed5b2783e6581a3309cf9dc2408b08344e6518fcac3af3915d5b43916260742dc93fcdb897c5173714a6f8 SHA512 a86e536583f060f0d9dc3f755c30cd3a0a7b6ffab5d7798dd50d5784a2a90c60ca43135758943f9bda9e022fc9b9d540bd69cd17bcc19a060e45543caf001cb8
 EBUILD gentoo-sources-5.8.10.ebuild 735 BLAKE2B ca4969bd3812fa181b282d913834d910d0f194ae5964c641f1a7657fd15c97dd1e749f5a0712c7ba20e3f16127b864ddc949ee860009a31776dd86d7e383a492 SHA512 1f2cf508c1e5662dc3f432b6ae17abef9e312beaec92660c1cb0e54da3dc625c2934099649632e835f84350cbf5c848c67b291fa4cd342b65f636902dcf6b4e1
 EBUILD gentoo-sources-5.8.11.ebuild 735 BLAKE2B 28ab0a8e61004d3011e2628c87bf51b28c81d84fbe929403d98344b31ac1024de82d54a32924506cbc3c692236733cf415db86d88d17945991165044d92b4dd9 SHA512 87f593d8cb157251d1fbdbbccf7078b12136fdefd58aefb63e8847205595c97b193ca314c392b1004b5241e94b0e3f00227da99d4adb2d60041a3ad892e061fd
-EBUILD gentoo-sources-5.8.3.ebuild 734 BLAKE2B 394de3dd79025b61d51744bb8dd583aacaf9636f08eabad8e9f0565713af4368b9796c1f7c2cfc67b9c90a5ccd604ea3c964d2a1b85a6e5921e45ffb639863ef SHA512 510ec265a59a2398007bfec9e5e3a3be7638a7a2f8ab9500b98fc0ffdd26f940cdfa074445bc154410cd4d099057ece1351fcef66aaa12096999c17a84827817
-EBUILD gentoo-sources-5.8.4.ebuild 734 BLAKE2B 5a4981b9e187d92f0330cecb9ad95b17fb483a766ff61fb85dffa5440eff17616e6b09787e5822bb52587aacfe8933957da460a5227fa62b9e7a3ae4b38dd14b SHA512 f4d8ae5c569f6c19dd38fb4ac411ab8bc94592069a8149cf3e8baa03a0465b0e0a894b62da62711fe5ab3cd99580b32ef78db0ada1c5e582e725e456c1342c00
-EBUILD gentoo-sources-5.8.5.ebuild 741 BLAKE2B c4b7b2c7da4baf622c6d1c2656a14678c0196e204ce4fc7fd89b6f30b42b41e1ef355b1afac3c3ce0e515aaf5750518761ab91012deba0533767653ffcc9f4b1 SHA512 72adc79ec824efca727fc66001f4f86b6fbfffc3dae6e130d0462c07274d9aec6179c44fdd696d217c8b6b88a04186d9e7b88dfe8cf0f3bb6ae2658caa98d3d3
-EBUILD gentoo-sources-5.8.6.ebuild 734 BLAKE2B a7ad4915d3a0c8ca61d2ffbbfa4609cc0c4c34c4caee6337e3f0264d6e12e2509b52d2c8df5364442970361f672789bf46e2da384366abb3af2a845f49e06c3e SHA512 64b716182622504fe4c5743ca3b036c3c4cfd6752eada73b9297a9bf1ba40dd363214ff0c61fef58a672b09ac3c1da7f75306dcafa292cc9a1f905abf20236cb
-EBUILD gentoo-sources-5.8.7.ebuild 735 BLAKE2B a4c81e4c51e567f272c4dc12e6311280480989115ffd545e64ce14a8d958f41b1537d42cfa9b619e349fde65595ea056b0111525f750145dfeb0e3afb11705e6 SHA512 95c165ed8521e66dbe01acf16b7b61ef3b88ea980ba5e64b60855d06a0bcdc1a4ad6c5d0bdbe230031ae7d421681b3cfdfd17046f1ca8379c4895efed13d80dc
+EBUILD gentoo-sources-5.8.12.ebuild 735 BLAKE2B fb6f0d803f17314707fdf42aec41d3eaba2270cfb69b5b3b2c79d4186f110859981417d7db58ac884487c1f8006f00397b69e200978458a4a603a8888de0a1b1 SHA512 cbf9fba0bd24919a39bc8f8c0f441dbf50d510750eab21dafb5ae86f67dd94e94f623e7253c076b6cb9fd3c0e99e4c6efee9e701dda4fafca8cf6f993d751f24
 EBUILD gentoo-sources-5.8.8.ebuild 735 BLAKE2B c1fa9fc96f79777419b7c3989ff2d04a217c4eda7c5f3709e63258e9bf00eba1d33ef8c866dd0609cfecef769f9656f651a72ccdd801ab7f597005f6fd4edbe0 SHA512 d0532b0f6dfd6e596520cd10928289dbf080183e8ba387717f58deed9c4d741c85b8fe772ba7ccbf862e199727ffdc4f63e825cdb95d1dc5e65d11c7c6deccd1
 EBUILD gentoo-sources-5.8.9.ebuild 735 BLAKE2B 07f85b3f10c5672309f71378fe3e8f63009000aaf5fed2ee7920ae09884f03fb69fe5ce70ef193b2e97563c5e69cdf81c9459b86e1a0f53005b02e1b6045af61 SHA512 b6ab9ad0a6813678aaa7cba37783d06885a0a1e221bd66a4f5a514486b4d23100941d07e5fe06ec93c3ca2c98c55e670028675430597f6899c086e4457ea056e
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.195.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.195.ebuild
deleted file mode 100644
index 4c1991c5dd93..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.195.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="205"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.14.196.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.196.ebuild
deleted file mode 100644
index d1ea06988927..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.196.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="206"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.14.197.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.197.ebuild
deleted file mode 100644
index 69feff002235..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.197.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="207"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.14.198.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.198.ebuild
index 6b0cc33ddae4..18f6588ebc5b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.198.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.198.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.142.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.142.ebuild
deleted file mode 100644
index 040d1cc3d4e5..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.142.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="141"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.143.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.143.ebuild
deleted file mode 100644
index 00d2ade3b30c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.143.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="142"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.144.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.144.ebuild
deleted file mode 100644
index e2ac0d5b2b25..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.144.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="143"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.145.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.145.ebuild
deleted file mode 100644
index ea94105d56f1..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.145.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="144"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.146.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.146.ebuild
index e82ea60bb95b..12b4fb0fdeaf 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.146.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.146.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.148.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.148.ebuild
new file mode 100644
index 000000000000..1263aac713f0
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.148.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 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="147"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.234.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.234.ebuild
deleted file mode 100644
index eaf99dae7dc6..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.234.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="235"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.235.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.235.ebuild
deleted file mode 100644
index 171c05d734e4..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.235.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="236"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.236.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.236.ebuild
index 462ac0f84d9a..f9c19e1c737c 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.236.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.236.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.234.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.234.ebuild
deleted file mode 100644
index d4ca79dc5b29..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.234.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="238"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.235.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.235.ebuild
deleted file mode 100644
index 1b037cd5067d..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.235.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="239"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.236.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.236.ebuild
index f9f7608349c6..e4dab159de5a 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.236.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.236.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.61.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.61.ebuild
deleted file mode 100644
index f9e41923ad6d..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.61.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="62"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.4.62.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.62.ebuild
deleted file mode 100644
index ba308764e155..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.62.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="63"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.4.63.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.63.ebuild
deleted file mode 100644
index d48384179ab8..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.63.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="64"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.4.64.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.64.ebuild
deleted file mode 100644
index 316df63cd679..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.64.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="65"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.4.65.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.65.ebuild
deleted file mode 100644
index e6f3664cabbf..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.65.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="66"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.4.66.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.66.ebuild
index fa4938a8069b..4a7b4b012a8b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.66.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.66.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.68.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.68.ebuild
new file mode 100644
index 000000000000..fcdcdc1cbbd7
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.68.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 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="69"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.7.19.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.7.19.ebuild
deleted file mode 100644
index 178d79c9f0fd..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.7.19.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="20"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.8.12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.8.12.ebuild
new file mode 100644
index 000000000000..1098d7a49917
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.8.12.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 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="15"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.8.3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.8.3.ebuild
deleted file mode 100644
index 822efd7f60da..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.8.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="5"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.8.4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.8.4.ebuild
deleted file mode 100644
index d225a5270ef9..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.8.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="6"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.8.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.8.5.ebuild
deleted file mode 100644
index c93b2a6415ef..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.8.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="7"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~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.8.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.8.6.ebuild
deleted file mode 100644
index f3769cf5f934..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.8.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="9"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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.8.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.8.7.ebuild
deleted file mode 100644
index dac94ff87df7..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.8.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 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="10"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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 25345b8fddf1..3bc682cd041b 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -5,10 +5,12 @@ DIST patch-5.9-rc3.patch 63570996 BLAKE2B 7bd2b596298f5cee0baf480544592d0964b473
 DIST patch-5.9-rc4.patch 63952223 BLAKE2B 13121098e6d93ed02b21e9dcef1fd2dc806b0b11958261e05feee2b2b3f946833fe266b1016c84fee7554278d64158f87da91779313b79fbf8407b2e8d2e92ca SHA512 0b167737a08e413a1fb62a7656e7130029e997bbc733924b9e523cea95945126f1da6e7c90a2c5fd97f9621a4c4ddb27e5e462ac4c4b227e4f0492096c0f1201
 DIST patch-5.9-rc5.patch 64122375 BLAKE2B 0f7d66eb7a8bb70fba3068fb77d3a21349e775f4c8f97c4f971fec8c3414d463450928a8c4cc30d26e06d9a7ca8796714631fe7a084c71cf89c6942ffe24503c SHA512 414d7c0d1c42487de01398657e7e8f8801258ad0cbcd5087af6aa59372c04420379fc5a639005a07ef0dce4e7a8cede3c389c3a409ad4647d48cad6a1123ad6d
 DIST patch-5.9-rc6.patch 64271496 BLAKE2B 63a7c1054eb11e9d0cf4829e7d8033d501fa7f7495327c4b424a96b338c1e49fbeae6447cd1134c6632c978e4b65dd4f477dbedb39cc09892f044ce79ae38ca1 SHA512 ea3247d5e860898e4254ac32a2583c926c3179dadf6f9132829c636870c733b21fa09dd4ffca6d9522ed486bed7265c47f01bb435f47bbea34f440dd7989501e
+DIST patch-5.9-rc7.patch 64541010 BLAKE2B 550872db5861c55eb01e801bf1ff7f9aeea65d06940b0662b455f73267dd9df4edec6c01523b583045c448f2de59886bb497dc8d39d69d1a9a9877f5bd9850b6 SHA512 945be50ee1a5529ad49ddc5613a3603f1d85ee53a68032a0f75ec2ac694100e2ccdea5af97ee72b2f73cde41c98a284754e846f5668a8c091fe51f77b3cfab3c
 EBUILD git-sources-5.9_rc1.ebuild 1171 BLAKE2B e5477c742534f25af7332bc83490bf1490ca45f026e0a290f9b24476acea12a9855984420583ad7edecdd18464d2b6685ef5f05749202e5d5daa1454e358ab85 SHA512 57f5d5b7050aa69dda1bbab60e41f175d3861803195db7725bdf8832bd2e494e1c6ad3f4616237d3303196775fbfb24039625992f56497b52b2c3c6583a0cd5f
 EBUILD git-sources-5.9_rc2.ebuild 1171 BLAKE2B e5477c742534f25af7332bc83490bf1490ca45f026e0a290f9b24476acea12a9855984420583ad7edecdd18464d2b6685ef5f05749202e5d5daa1454e358ab85 SHA512 57f5d5b7050aa69dda1bbab60e41f175d3861803195db7725bdf8832bd2e494e1c6ad3f4616237d3303196775fbfb24039625992f56497b52b2c3c6583a0cd5f
 EBUILD git-sources-5.9_rc3.ebuild 1171 BLAKE2B e5477c742534f25af7332bc83490bf1490ca45f026e0a290f9b24476acea12a9855984420583ad7edecdd18464d2b6685ef5f05749202e5d5daa1454e358ab85 SHA512 57f5d5b7050aa69dda1bbab60e41f175d3861803195db7725bdf8832bd2e494e1c6ad3f4616237d3303196775fbfb24039625992f56497b52b2c3c6583a0cd5f
 EBUILD git-sources-5.9_rc4.ebuild 1171 BLAKE2B e5477c742534f25af7332bc83490bf1490ca45f026e0a290f9b24476acea12a9855984420583ad7edecdd18464d2b6685ef5f05749202e5d5daa1454e358ab85 SHA512 57f5d5b7050aa69dda1bbab60e41f175d3861803195db7725bdf8832bd2e494e1c6ad3f4616237d3303196775fbfb24039625992f56497b52b2c3c6583a0cd5f
 EBUILD git-sources-5.9_rc5.ebuild 1171 BLAKE2B e5477c742534f25af7332bc83490bf1490ca45f026e0a290f9b24476acea12a9855984420583ad7edecdd18464d2b6685ef5f05749202e5d5daa1454e358ab85 SHA512 57f5d5b7050aa69dda1bbab60e41f175d3861803195db7725bdf8832bd2e494e1c6ad3f4616237d3303196775fbfb24039625992f56497b52b2c3c6583a0cd5f
 EBUILD git-sources-5.9_rc6.ebuild 1171 BLAKE2B e5477c742534f25af7332bc83490bf1490ca45f026e0a290f9b24476acea12a9855984420583ad7edecdd18464d2b6685ef5f05749202e5d5daa1454e358ab85 SHA512 57f5d5b7050aa69dda1bbab60e41f175d3861803195db7725bdf8832bd2e494e1c6ad3f4616237d3303196775fbfb24039625992f56497b52b2c3c6583a0cd5f
+EBUILD git-sources-5.9_rc7.ebuild 1171 BLAKE2B e5477c742534f25af7332bc83490bf1490ca45f026e0a290f9b24476acea12a9855984420583ad7edecdd18464d2b6685ef5f05749202e5d5daa1454e358ab85 SHA512 57f5d5b7050aa69dda1bbab60e41f175d3861803195db7725bdf8832bd2e494e1c6ad3f4616237d3303196775fbfb24039625992f56497b52b2c3c6583a0cd5f
 MISC metadata.xml 464 BLAKE2B 37fa8f89a0431479faf733cd072c8d86fe27976913e47a9e09d6028e2eec20bd9b3093da14a2f01f00ff88ee6da012eb1dad96a9b3f5bc04f82157e9715c2645 SHA512 56e60b220ade75cd0b4175c43f01e8e31eb088c563327a25c0875493bbe28b5cef80fefb2b5394eb749c2eee43a1cbb632bdc79d48435e6a2f0fe609b13a2dfe
diff --git a/sys-kernel/git-sources/git-sources-5.9_rc7.ebuild b/sys-kernel/git-sources/git-sources-5.9_rc7.ebuild
new file mode 100644
index 000000000000..c239fcfa16c8
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.9_rc7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 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.8"
+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 ~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/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 7d5fedf08e58..32f488be347e 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -15,6 +15,7 @@ DIST pf-sources-5.8_p2.patch 1071081 BLAKE2B e6c5f85607b7483ee711bee6b62dae5fc1d
 DIST pf-sources-5.8_p3.patch 1248429 BLAKE2B acf0911cd8b9c356bcafe754e54e982a6f749800c01795fa9ca4573a932e366185378e41a649150718ddf604e787ba85d22bec134d106c2fb44aa35262a32d19 SHA512 01cb5fd69560220c61106508585db4970164dc27b373aee03b5b9a14a30af5b04534095b9f839228f5a9bf4139f8d6e0b8b978ca2ae1b6c1e873cce782c7e9c7
 DIST pf-sources-5.8_p4.patch 1896149 BLAKE2B 1d036e1d4605372557e110d829edbfe03bbe76367b122c3081c04bdd13eb17d3c6076eebe674b957a31d8909170d0cd667692f37f14d47030f72687ccdbf38a5 SHA512 94c0a51973788a26a2130abbbda1bbcfcc8ca8f43ed8bdeed5ff27989baa886b5501b392c2aa90ce833d8b729c32fce55dced1c635e2388395967efff848d997
 DIST pf-sources-5.8_p5.patch 2141177 BLAKE2B 5d55ced84a31fa86d80d2e9ff694812b073ee2799a0685455c83dda8de7bb5b9231d590673092e8b1b6301a3e87f8089c656879d323524c7f76d3eade9000bf2 SHA512 6b2948aee3bbfebc4e7b4c46ead91987f5b2690b91e7ffbeace2b78f6455555ef36f4557fd88c82cb302b5fe389d8e9d786a1ec4d2d226780357760dc6024970
+DIST pf-sources-5.8_p6.patch 2337599 BLAKE2B 8ea69321cc3d7d9b63d67823c5326e796f9d09e39b29cad9eb0500f025b9c7dad71a20bc8b702815fb1c3dad1846e63e95a916114901fc519a2f8df120d4ca3a SHA512 10ae0bcb7b99bcfd20153f037128f4fbd127a9196ef3f346a328fbd12df38ebb61987c577b7e8846f447ed4b6acd448a69f62bab9680b6bc381d8b48d670073b
 EBUILD pf-sources-5.6_p8.ebuild 2047 BLAKE2B b0f55d05756f0c0b753ae711f60d9667a1047727e3e8f1920ea822ed1ee36a27bfd80649d1c82958ce2c97645f9666eadc5dd4f80e534d940ee1806caa93983d SHA512 8a9d4a9f4fa7003a71421fd8a3d05bf41740ddd26641f80579f3c3844a1f25205a8674edbf58ee26f4f12747abe3969e45c972edaf921168f82204e69fa3f4dc
 EBUILD pf-sources-5.7_p5.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760e75e66691f61b843024be88ab8c042327b926d79ea49268115413147457083be5a4e7ea8f2c26196dd3a2eda12017 SHA512 c831c884e7fdcb78f89f7611ec2c0fc96b9ae56e6a69615c90940513dc56e9e28ff9803e631e2bb469baa73734d902b5da184c21a7e5db523c187c712e869b63
 EBUILD pf-sources-5.7_p7.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760e75e66691f61b843024be88ab8c042327b926d79ea49268115413147457083be5a4e7ea8f2c26196dd3a2eda12017 SHA512 c831c884e7fdcb78f89f7611ec2c0fc96b9ae56e6a69615c90940513dc56e9e28ff9803e631e2bb469baa73734d902b5da184c21a7e5db523c187c712e869b63
@@ -23,4 +24,5 @@ EBUILD pf-sources-5.8_p2.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760
 EBUILD pf-sources-5.8_p3.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760e75e66691f61b843024be88ab8c042327b926d79ea49268115413147457083be5a4e7ea8f2c26196dd3a2eda12017 SHA512 c831c884e7fdcb78f89f7611ec2c0fc96b9ae56e6a69615c90940513dc56e9e28ff9803e631e2bb469baa73734d902b5da184c21a7e5db523c187c712e869b63
 EBUILD pf-sources-5.8_p4.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760e75e66691f61b843024be88ab8c042327b926d79ea49268115413147457083be5a4e7ea8f2c26196dd3a2eda12017 SHA512 c831c884e7fdcb78f89f7611ec2c0fc96b9ae56e6a69615c90940513dc56e9e28ff9803e631e2bb469baa73734d902b5da184c21a7e5db523c187c712e869b63
 EBUILD pf-sources-5.8_p5.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760e75e66691f61b843024be88ab8c042327b926d79ea49268115413147457083be5a4e7ea8f2c26196dd3a2eda12017 SHA512 c831c884e7fdcb78f89f7611ec2c0fc96b9ae56e6a69615c90940513dc56e9e28ff9803e631e2bb469baa73734d902b5da184c21a7e5db523c187c712e869b63
+EBUILD pf-sources-5.8_p6.ebuild 1958 BLAKE2B 87e715f7443e52153f1e41592c3e2471760e75e66691f61b843024be88ab8c042327b926d79ea49268115413147457083be5a4e7ea8f2c26196dd3a2eda12017 SHA512 c831c884e7fdcb78f89f7611ec2c0fc96b9ae56e6a69615c90940513dc56e9e28ff9803e631e2bb469baa73734d902b5da184c21a7e5db523c187c712e869b63
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-5.8_p6.ebuild b/sys-kernel/pf-sources/pf-sources-5.8_p6.ebuild
new file mode 100644
index 000000000000..d2e345cf5fb4
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.8_p6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux
+# updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+inherit optfeature kernel-2
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="${KERNEL_URI}
+	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
+	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"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+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
+
+	elog "Optional features:"
+	optfeature "Userspace KSM helper" sys-process/uksmd
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 3cbaa341a64b..2282afecc522 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,58 +1,17 @@
-DIST kernel-aarch64-fedora.config.5.7.8 208443 BLAKE2B ca77401ee1abd8a2f34de28c32a7153434534a10335f29150c33a0b4fa9b52b161223f59a79e50d9e260014ea2f95e5a2066957060cbf3ca8e938b05957315a4 SHA512 7528c9ae989e9d6297c4d06c3555a06f6636f92ef02adbc03a8bb7173891cfaf52222faeeb1409112119221b08041147acde5d4fe3ab73175bd55d4406283f52
-DIST kernel-aarch64-fedora.config.5.8.1 215181 BLAKE2B d29bdc80f90f8ff22f43439ec03c8f391ddeae8d299dd36cb4d4d51c7d37851900faef728a94eca069c08fbb22a8ef5c2bdfb2b850e4f669276d967cb47dc331 SHA512 99f9a4fa65082d09b38bd05021a9f7577b98eb8b101928ff7862139461f603484722ed19aefe34540da6aa15908abee99a5287c1594e45f0c12afa4663820fa0
-DIST kernel-aarch64-fedora.config.5.8.4 215181 BLAKE2B d29bdc80f90f8ff22f43439ec03c8f391ddeae8d299dd36cb4d4d51c7d37851900faef728a94eca069c08fbb22a8ef5c2bdfb2b850e4f669276d967cb47dc331 SHA512 99f9a4fa65082d09b38bd05021a9f7577b98eb8b101928ff7862139461f603484722ed19aefe34540da6aa15908abee99a5287c1594e45f0c12afa4663820fa0
 DIST kernel-aarch64-fedora.config.5.8.5 215148 BLAKE2B c71380f46c1b37e9e17bab6d78907114369b377bcbdb54afa2c35b6a222937fd061f25309d8de0cc78ef2329ede7192722270acceeaa3da4629a5f58d8fee809 SHA512 e86e2c60e88b1ea5968db1a471d7d928ccb3146fe850f8f2813ef315f2de0cbfa0daa2f6828dee71acb2299f65f05fc0b6f1572a82fb146ae9f53a905fe94e97
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
-DIST kernel-i686-fedora.config.5.7.8 191864 BLAKE2B 217857254ffd12e987a5bd573e2520508bc70764b6363fc2c6bda1e5be46b70528616b26167150cba32f9e57fe17883c455fed34615a216b2398017d307971db SHA512 b90c6f2cdb55bcb115d7b92752a6efd8fdc09f68acbf365b08c9ff89732745f26d2644e18cb097ffd92d75cff07dbd98a9723179a35dc72ce01a732bdd632592
-DIST kernel-i686-fedora.config.5.8.1 199143 BLAKE2B ea223234bc54d430b87f3eb15fe11b11e617103c861945fb530091285abd0702e2cbb1d9258ca1afe718c4e7578c41f8878422c53e2f0b476e5ff2fa5c17aece SHA512 fc9c1b642e59c3c80b4cb6e1e6e9e2a27692524324539a3f1c163e284f8a69efb45ec839a630b0faeb0e52c15fb6577449163c7396aa0f1c43d727fe8aa35623
-DIST kernel-i686-fedora.config.5.8.4 199143 BLAKE2B ea223234bc54d430b87f3eb15fe11b11e617103c861945fb530091285abd0702e2cbb1d9258ca1afe718c4e7578c41f8878422c53e2f0b476e5ff2fa5c17aece SHA512 fc9c1b642e59c3c80b4cb6e1e6e9e2a27692524324539a3f1c163e284f8a69efb45ec839a630b0faeb0e52c15fb6577449163c7396aa0f1c43d727fe8aa35623
 DIST kernel-i686-fedora.config.5.8.5 199121 BLAKE2B f6e16e6faac6e730eb4c9c3edc1c173b2988b49fe677d34ef1540541911b8f76e5bdc166327d73237c78c1769d484de18864044c91b7da253795506c674d7303 SHA512 0a2c9abaae11ac1ec2e43da4b53fd1731a9bec983a7fda7b9e20f1d25b816e6b0bd217b255ca95b02a8b6530e923b4fc7de770f6a66411045712e7de61d431af
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.8.5 185766 BLAKE2B 27330c7806923eb4a3346df2abb5f253ca044a02afe72a89c6ce006d149966d65b4ba3e114b5ebefae987565279510c05d33dbc89c36c5e78e2e88732f5125f2 SHA512 8b621e0584624ccc24580951fc116478506a7465715449a53e70f46c99d0210bf08063a4fd5b87e4624f5ce179e6a6316f23723839c0e64e57a2ee58e4de59fe
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
-DIST kernel-x86_64-fedora.config.5.7.8 192882 BLAKE2B 23044bd3625d1ced686950c1322e91dd99eddb3128ab830c8862f5c949b66df67bc9ce38b810f4d54a35f9b9f11feb58d01450593ec513e132d789e3a50ac48b SHA512 b7770da1f608e8f0ec227dbeaf66491815e9fc4f8f08f01d2ad5877dd1946e73b315e8834f35cb5fc035fc3ac52ede8365107515d54b0792f326ad937d901625
-DIST kernel-x86_64-fedora.config.5.8.1 200074 BLAKE2B 05673cc7c5ae861faff6e823b8fadb9ce2f00864cc955d78733945abe6fa5842b5b74d0e41129cea92607bd907598b39127740dabd377cb25a2fbbcd54eae8b6 SHA512 c601c380163c66c9e351508dbc7ad3f10214eb04895257f721c808e8fa685770b9c898f48b3b05a5f76832fbf8c91e63278539dd9ef3e2c571997c844ecc7c8b
-DIST kernel-x86_64-fedora.config.5.8.4 200074 BLAKE2B 05673cc7c5ae861faff6e823b8fadb9ce2f00864cc955d78733945abe6fa5842b5b74d0e41129cea92607bd907598b39127740dabd377cb25a2fbbcd54eae8b6 SHA512 c601c380163c66c9e351508dbc7ad3f10214eb04895257f721c808e8fa685770b9c898f48b3b05a5f76832fbf8c91e63278539dd9ef3e2c571997c844ecc7c8b
 DIST kernel-x86_64-fedora.config.5.8.5 200052 BLAKE2B be804fd499527a6c6927365c0350b51b3351da9a4e3f75bcbcc44d1a1b21d001d4907e6028ceb7ec6d5c812ea190d369ca6de4ae2c21a293342b6af33b8e5e65 SHA512 40ba21b0597702d3cff9eb3c1fab98784229ba78702bbb0fae2264b145a2e433615522e300cff1f9c9c52067431116b80a8db92e1263bd1a9070adbbd068f982
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
-DIST linux-5.4.60.tar.xz 109583396 BLAKE2B 1f6296eb9be00329b1eb015eafb4a965c575ded58b8618cfc0af3d15072c424afbbc029fad4d65e0af3bccc5963c4304c14b4a9d4763cfaec9b4596834a0f9b0 SHA512 fb9ebada932c17d0adbc099a1df31a7d97afe3be694665b1f8171e7159bda84a36a435ceecfdce6d492d8e5075ed4253c68029dcdf952e75a3fe7ee36646327b
-DIST linux-5.4.61.tar.xz 109579356 BLAKE2B 78e8ee2fcd0e8cce8f536ba907a24676b5aafa662d97eb5c02f97150b0be4616dc564542503d4250d3fd8a674598cd2d3fdcaa34c880e0f3df558c4b5da8b24c SHA512 1c2d7226dc8b4b6ca468a7082b42ac14bdf9f2ff4d0824737cb6a2e959b2c5da320877efe8b6dc7fd66200daadfe5ac424d8c8abc52888358e45ee594f60937d
-DIST linux-5.4.62.tar.xz 109580336 BLAKE2B 4cc346ae1b9def22ddbab11ea9a73eeedeb742290f5726eac9d72d7b6b8a6e8599cc6ad264ef840136a214152007c7c32757a01109129d6fd27a0ce504318311 SHA512 0d1d1b2e2e809caf0c5a6fd3d06494fc02ed8ad84c2aef37670afaa20611c8c4dc8a21b9ceeec406f0533ba85c9c1251a78da4ca5bba14b727926ca741183d53
-DIST linux-5.4.63.tar.xz 109583360 BLAKE2B f1afaf0d30b26ce325e9b7e4c8b328749f466796839ff7bc63b4ee14215627347dad38c168efa7099dc964d4378ac8ca94de7771339446acc51a75e9377442a0 SHA512 1e97faea4c5f4a814d207f0a850cd5dd4aab33259f5501d54fea3f5487aab3e7b38af3f38d9c2bb127222d859e8ad6cdc0d19e10e42ec455b53d3728b085353d
 DIST linux-5.4.64.tar.xz 109593152 BLAKE2B f0bea4ef1fac7a4744848d6328175d1cd200023eba9398bc46511e88e7ad51b559732202d642df60bb5032004e42aae753eb9d7b049781d12303f48e3aece6bc SHA512 135e62581e9bef772a5c68a2b1945bbe09689d5d8bda41a09efdd7ba7cd99afa8010c4157a5d23badeb8b6f9832c53ffda49d1dd6c5862f01b9756ceca9ebcec
-DIST linux-5.4.65.tar.xz 109587504 BLAKE2B 3cc1040e324ba0ffb95b1b075621264623a1f17b929b77af4231dfff0a494fbab2d4acbe20fcd39bc216ac21ad425ed8ff3b703b46aebf9df7009626621b8f8b SHA512 f457e7cf3f1a241a187ab8251238e0fad5308ca0f30623908ddaead32041797db02438a4a926c73b504774516db400e9c95427f4f24f60efbde65bb9e7926f0f
 DIST linux-5.4.66.tar.xz 109584352 BLAKE2B 5b2f08dfac6069f2a5a842de69b572691d4d6857f07c38c3fee2e2d327b3ddfd2ed7c17e18ef60bfaad3f36161ca61d8796ac537b2a783c5a6580d0abae49357 SHA512 06cfd689542805cb843b19993242adee5d41a383ae6f4c730073f4d56e78a2d9e92f8d012de7635a67290c83cf204302a839ca8d4395869a4c0d4e2457283c05
-DIST linux-5.4.67.tar.xz 109587704 BLAKE2B 0870c932888bbd75e04195e2a8106bf83e1df0ba99d1bab625cdd973d4c96d6ca99e8ec2d2cf9633c116c431beaa035046c4b971a9b6e50733eb64051d5f52d6 SHA512 1b1b1db72df2dc4a438ae64f1a099a5e5ca4e9aeec0d18688fdb4310cd8080b57d0c4bd718b715a5b1f608bb372079a0a49994f0cadefe68a8bc4189d5d9d658
-DIST linux-5.7.17.tar.xz 112744000 BLAKE2B ef73f9c940d678465d1ff2c4eb880b6878827f563942666aab0fb49be9c24d6a12a78a2c569c9cb35023c82a195945b392ca00a933726701c0cff092f71141b6 SHA512 e4618e3d28882b81699892eb04b266a3e0b508806d02bd9671c84027a5a343535561b7094755ab6358ffd72e9ce5a2296b126ce9218a334b260c31535e2de59f
-DIST linux-5.7.18.tar.xz 112759392 BLAKE2B 22fb5388521bd824a8ecbde7484db3319817eaebc6c74b5f615b872ec18b1cf6abd6b9aed651400bfee2b12e2d759a066ea79412021202a05b8fa1934b9b14aa SHA512 d84a1dfb3ae6fad1f4ca3b42bbd01e9b6e1543e23f319237bc4db2381770df5a30d799cf5ed6ca85c5ece6779502327afdb4892452f612b9e4dbca3305c9901c
-DIST linux-5.7.19.tar.xz 112742648 BLAKE2B 408fdc49f8a341f6d7c0fead1ddc1b0816caf4a7393286127440a6ec1b513cd413067d6e56180310cc9d634b95c9583b7f38ae4711cd115f4ac2f08918e6b916 SHA512 c64aacd11f90dd1fb4f163ba3757ba52543c8a3c3932b9600109ad2b8ac97c8819d430067266e1e347998b5e9df92f7c0f1945a73142442ba5bccd41439a4988
-DIST linux-5.8.10.tar.xz 114493036 BLAKE2B 9cfc3a8ac707e3b08ee690661b9b5ad1ac249158c34416563ccb3bd8988814faf3ead9b2ec7405ef5d75a9672365ee96e1d4c0c659a63728e5c5bdea768bee7a SHA512 cff8cbbf30b8a8b3e151573d36dd6a36e3ddf849f1866f02c811c30a95945d76752051aff6c5b680d19d72dc42a6238ba438f3e00755c1eb64b5ba0276fbad0f
-DIST linux-5.8.11.tar.xz 114496860 BLAKE2B 64a128f29cc18146625e5a7424438324cd41da18a10fc6cac89a0da2b9deda9df039b516b79a8d3e8fdabf23d03608cc30aff15bf673e27c8febfbbd8a200540 SHA512 bb6994f09aabfb0076f3023dd8359c5c569a4b398d3a3c3c8d6b27052092cab56ad675f45dd6ceba7fe431f2a6a587858f3c21415b5a00adb346bd2c68d85b0f
-DIST linux-5.8.3.tar.xz 114473912 BLAKE2B 9d2913bbaf4afabd8f654abd0a2a3c62df043a613cbc2518944f5889d1a760ab6401e76d0b67b0cc9fbe05c8a0e280fe9b2ebf125f50ff5962f097956642fd8e SHA512 a23973139bf105e202621f6181be366e1a933aefd1da9a347d3a19c0917ba16dd271b5c8d90a8c527791fb0f7535a1cc1bbecd118598b500c881d16ff7d64157
-DIST linux-5.8.4.tar.xz 114478188 BLAKE2B d9cb7a130e69de2fd176e5ce4236cfe5f4f31cf96f963a1f04e94958d0b064a7cf34c5a2d7e37500892fd840214ce1fc6f2ffb3050cbf8678ffe612bbd1cf51d SHA512 b1fb4586932369f2853360aaab702baaa994be5a88c0a746b7272d7c29c864ac2f0302bd82664f58d29f7b464bc98603167211ea886aa15ea1cd6d12d422ba61
-DIST linux-5.8.5.tar.xz 114482912 BLAKE2B 751cded511b08dd541cd6ae2365602068138641d4a6ade4205936dd1ec1de5a01441a2822afde25fd83004896e8ae02a70af37482dc4b09fa9fc52ca8bd05a8c SHA512 30832e10d14f87f62542cc8a58d2d7d54cbfd0e99de772f79364354a09c2aff2c5bd07bcd06e1e7523a404aa39829355b6b198334472d3070dc7a4f810ed0f20
-DIST linux-5.8.6.tar.xz 114492376 BLAKE2B 05a36af44a20686e3612ceee49f12fd81aa40865f7934d15da4ff3444b261a4d60dc6eb2e04617c2f5d470cca8f8310f7c5452ed3bcddfafc000816d5aabfd7d SHA512 13a7af7fd678354ca4bebaf42b1f18d31eb066be93bd2627294f67c18e40897b140bcb7d86533e5653e771a18fda820b31e80c0fc815908840d339a9a804d7df
-DIST linux-5.8.7.tar.xz 114493672 BLAKE2B 4a1761a9fcec3c13b4f61c0be2af9287c38fa4c6f65b9751c379f333a25af513c4ed5cc1cc49f287e0362058446e99b63fbf5a944d688d4724ba707f8791ef40 SHA512 f529143fad82d0ab36a6f0f2b3ff1e00be12c53bdee7248b371206de0668f21b944d50cefc196b3ac684fdf99b7feb81436fd173b7e82a9c44553ff126e8a84c
-DIST linux-5.8.8.tar.xz 114499832 BLAKE2B 2bd3da156a9e1da58e3fa059accf96c1deeb2e7679aa365b9bc3b11bbdabbad2131d39c611ec0becdbd97399ea5f470634ba45fdb69d514b529c0d8389ce6055 SHA512 cd716a3619b4d802c0c4ea1e73bf810f01047b504c6617d48eb5cee62c10685b8813b9c88687cb5f866538a402c98092581b413dce302d46c1c06d084080c87c
-DIST linux-5.8.9.tar.xz 114503916 BLAKE2B 2c570dde4a870b32d7253b859a9337909043733f09d35990897503a1db3af5ee18b573d057b2b2f90af1b8af02f5c86ba258ec31d4456bf98abde01cbaf2549f SHA512 d3a3a494a5ddc258d6e8eaf92eeb8957ca94ecc8657157c0647369772630848d3fb3633133fd184cc020a148b659d95a6e3d850d435c64ffa55e2f5156687220
-EBUILD vanilla-kernel-5.4.60.ebuild 2104 BLAKE2B 15f236ffe41612f09f0a2d7fbdc7b6ceff94c2e59991a06715946bb6c872390c00b1d0be6251083b36a1c4780945f5e42d8b334cdcc059b9f8b3cf57765fe4e7 SHA512 b59379a97240821d242576b91f37e5b2bd1ae4e115112469ddbac8b13de8ee296e9bab116227db003e05feb937bd0d3a2bc46ad147ea92ac867897c63f718c6d
-EBUILD vanilla-kernel-5.4.61.ebuild 2104 BLAKE2B 15f236ffe41612f09f0a2d7fbdc7b6ceff94c2e59991a06715946bb6c872390c00b1d0be6251083b36a1c4780945f5e42d8b334cdcc059b9f8b3cf57765fe4e7 SHA512 b59379a97240821d242576b91f37e5b2bd1ae4e115112469ddbac8b13de8ee296e9bab116227db003e05feb937bd0d3a2bc46ad147ea92ac867897c63f718c6d
-EBUILD vanilla-kernel-5.4.62.ebuild 2104 BLAKE2B 15f236ffe41612f09f0a2d7fbdc7b6ceff94c2e59991a06715946bb6c872390c00b1d0be6251083b36a1c4780945f5e42d8b334cdcc059b9f8b3cf57765fe4e7 SHA512 b59379a97240821d242576b91f37e5b2bd1ae4e115112469ddbac8b13de8ee296e9bab116227db003e05feb937bd0d3a2bc46ad147ea92ac867897c63f718c6d
-EBUILD vanilla-kernel-5.4.63.ebuild 2331 BLAKE2B 2db7af661ddee2c8e34e869a94608cdb0d5592c3a0ee7c7190adb1f570ad978700c1cfc708a328d0c6d0f0d405d1d0dcad7464603c947654cd5753e9fd036501 SHA512 f11d7b8b60045309ce014c4b9ea1ad55e6667ff0464cc9dc4a39792c23f3e893a2d428bcf3d11a5d273ef0a799777012db35d0325af67213b1e5d3404d6d76b0
+DIST linux-5.4.68.tar.xz 109601148 BLAKE2B 03e25fdfa93a892aa7b8ea0ba4822c1dbf1f8cb498cdb80b3c3f4f8ea2b7d4f02bcecdf3788afc84dd1fbd4de02add0c2a5f9e5d9ededaa02fff4bf5e8310300 SHA512 027f63296a2b3a0fda3eaeed8ac1a3e0075d90469888c76666f355a69f2c81384e9245d31991f74f6fbba657d35ba32bf280a455e7b5abd68b039990f5f8efaa
+DIST linux-5.8.12.tar.xz 114510484 BLAKE2B 85edb8bea54dc1952e7f3ec439d01b22181ac9ba527ca387a04168966398e615a052d7d9585cde47fa4a4f9f09a7dffffaa41508af9b0cb7c93357e9f54ecf15 SHA512 c1daa20dcdaa2cb805e7a973b684ea40327088d8fadf0cf44f4c73284923363397b12f2e1958d64d6a0ff348198366d46b59a5301a72d3431389d319a4bde489
 EBUILD vanilla-kernel-5.4.64.ebuild 4058 BLAKE2B 48fcc3d1a3acc6065ed9fed27e6953d9c4cdd73c15d034bf77baf271aef89455e0d3bab7df8ef69e8fd67036a268fd21f55f67772f2d69dae185329282cebcda SHA512 54a487cbd08a736b880bc8897aaaf44684158d93eb190d7ca95eaebbda8534694842c11239bd829061c7693467735fae325a243c6634da97a193e72ba5f50d7b
-EBUILD vanilla-kernel-5.4.65.ebuild 4058 BLAKE2B 48fcc3d1a3acc6065ed9fed27e6953d9c4cdd73c15d034bf77baf271aef89455e0d3bab7df8ef69e8fd67036a268fd21f55f67772f2d69dae185329282cebcda SHA512 54a487cbd08a736b880bc8897aaaf44684158d93eb190d7ca95eaebbda8534694842c11239bd829061c7693467735fae325a243c6634da97a193e72ba5f50d7b
 EBUILD vanilla-kernel-5.4.66.ebuild 4058 BLAKE2B 48fcc3d1a3acc6065ed9fed27e6953d9c4cdd73c15d034bf77baf271aef89455e0d3bab7df8ef69e8fd67036a268fd21f55f67772f2d69dae185329282cebcda SHA512 54a487cbd08a736b880bc8897aaaf44684158d93eb190d7ca95eaebbda8534694842c11239bd829061c7693467735fae325a243c6634da97a193e72ba5f50d7b
-EBUILD vanilla-kernel-5.4.67.ebuild 4058 BLAKE2B 48fcc3d1a3acc6065ed9fed27e6953d9c4cdd73c15d034bf77baf271aef89455e0d3bab7df8ef69e8fd67036a268fd21f55f67772f2d69dae185329282cebcda SHA512 54a487cbd08a736b880bc8897aaaf44684158d93eb190d7ca95eaebbda8534694842c11239bd829061c7693467735fae325a243c6634da97a193e72ba5f50d7b
-EBUILD vanilla-kernel-5.7.17.ebuild 2122 BLAKE2B 75a9ccc58ce263daf9a3b0639c234aad384338fb59d14d98cf28ad60b5b27caeace35328a34b13cf137f38c6da6cd16644781fa9530d6be209567b0ba3ac5a5c SHA512 c8636b5da9930ad315b5339005492fe5f9b6932d1b088c0fc69e0a842406ad1755a84d39a88aaa40636cd073dd9c9543fc7180d77b740f1a4ca383b0b160b70b
-EBUILD vanilla-kernel-5.7.18.ebuild 2122 BLAKE2B 75a9ccc58ce263daf9a3b0639c234aad384338fb59d14d98cf28ad60b5b27caeace35328a34b13cf137f38c6da6cd16644781fa9530d6be209567b0ba3ac5a5c SHA512 c8636b5da9930ad315b5339005492fe5f9b6932d1b088c0fc69e0a842406ad1755a84d39a88aaa40636cd073dd9c9543fc7180d77b740f1a4ca383b0b160b70b
-EBUILD vanilla-kernel-5.7.19.ebuild 2122 BLAKE2B 75a9ccc58ce263daf9a3b0639c234aad384338fb59d14d98cf28ad60b5b27caeace35328a34b13cf137f38c6da6cd16644781fa9530d6be209567b0ba3ac5a5c SHA512 c8636b5da9930ad315b5339005492fe5f9b6932d1b088c0fc69e0a842406ad1755a84d39a88aaa40636cd073dd9c9543fc7180d77b740f1a4ca383b0b160b70b
-EBUILD vanilla-kernel-5.8.10.ebuild 4007 BLAKE2B 6ed6d6dadc0939bcad36d1f5730a7806dc1e5bdb77b413d7ae209596ad344fc5186a00cc12ea07becd6d378359c6e129b1db1b1a08cf0d4e412385d66b3067ea SHA512 39267d528574bb9dc9ae3e55fd4e6f09c177b13a7659af04b732fd5c18a131a842b3f40d1090d0304af2a9136b55f071b140f4a37ae99baa40991d12013d8527
-EBUILD vanilla-kernel-5.8.11.ebuild 4007 BLAKE2B 6ed6d6dadc0939bcad36d1f5730a7806dc1e5bdb77b413d7ae209596ad344fc5186a00cc12ea07becd6d378359c6e129b1db1b1a08cf0d4e412385d66b3067ea SHA512 39267d528574bb9dc9ae3e55fd4e6f09c177b13a7659af04b732fd5c18a131a842b3f40d1090d0304af2a9136b55f071b140f4a37ae99baa40991d12013d8527
-EBUILD vanilla-kernel-5.8.3.ebuild 2122 BLAKE2B b63ecbbaa471585533431f70a6a78c0848f7d865237119ad9ef8b7d0009997ecc62d9dd7438620c1fb588094e3b690c12f538ac12bdb3dac7462dfd2f57f8b97 SHA512 b24e8a73fd13087fca5d9b45ddd8f601a449de5a28bebda4132e3c418700147264910357e95791d257543c9c218b201ab3b7de2393c2f7da1afc3e2d2d0cefc4
-EBUILD vanilla-kernel-5.8.4.ebuild 2122 BLAKE2B b63ecbbaa471585533431f70a6a78c0848f7d865237119ad9ef8b7d0009997ecc62d9dd7438620c1fb588094e3b690c12f538ac12bdb3dac7462dfd2f57f8b97 SHA512 b24e8a73fd13087fca5d9b45ddd8f601a449de5a28bebda4132e3c418700147264910357e95791d257543c9c218b201ab3b7de2393c2f7da1afc3e2d2d0cefc4
-EBUILD vanilla-kernel-5.8.5.ebuild 2122 BLAKE2B 4999640130cf746272878a92aababaa6c60dde9853bb91c14ad2917ca44629565e2445184e8ad3cdfc6a1d4e48169fa050c619c30f93de293b7439130e8ac613 SHA512 9cf4fda01b9e4f5f4ee7cb725f0dde5040e72b9a117abc133e19eab753faa64aea32d335133e0841625c837ffaed696c95f78c20dd6b8cd67640c6b569c3d3b2
-EBUILD vanilla-kernel-5.8.6.ebuild 2122 BLAKE2B 4999640130cf746272878a92aababaa6c60dde9853bb91c14ad2917ca44629565e2445184e8ad3cdfc6a1d4e48169fa050c619c30f93de293b7439130e8ac613 SHA512 9cf4fda01b9e4f5f4ee7cb725f0dde5040e72b9a117abc133e19eab753faa64aea32d335133e0841625c837ffaed696c95f78c20dd6b8cd67640c6b569c3d3b2
-EBUILD vanilla-kernel-5.8.7.ebuild 2377 BLAKE2B b9fa68aaeddb0dd8ec59827727eb929e5ec05cb166eb8812008932a47865ce683d02cf116e37db9a8f8934b798c5d825c5f8c93d61dc71718277c63028eaad56 SHA512 419da173ebce3756cca6ce31e92b3682b57faa4d72fab5e4e7855629cb48fe56c723007b8161c04c9a32f39cfc1ca0f64772c56c7ae57a7558782ea18bedfdad
-EBUILD vanilla-kernel-5.8.8.ebuild 4041 BLAKE2B daed772e2dd9a7e4ac0bf1abb4a134abe22ede3958a55e00afc2eb25ac5022e4bef6bfbcda5a7a3afd165aafe1142ead8a314bb86f80222785f823886c8057b5 SHA512 53ebb1bf9d1e7ee7baf8d0507a36a8b6aecd9da3d08fa64a13e5dd932c6c4585fd31159a7adb3c0d3252458a5414732a0e40d28888bcf05d52e4ca752582ad89
-EBUILD vanilla-kernel-5.8.9.ebuild 4007 BLAKE2B 6ed6d6dadc0939bcad36d1f5730a7806dc1e5bdb77b413d7ae209596ad344fc5186a00cc12ea07becd6d378359c6e129b1db1b1a08cf0d4e412385d66b3067ea SHA512 39267d528574bb9dc9ae3e55fd4e6f09c177b13a7659af04b732fd5c18a131a842b3f40d1090d0304af2a9136b55f071b140f4a37ae99baa40991d12013d8527
+EBUILD vanilla-kernel-5.4.68.ebuild 4058 BLAKE2B 48fcc3d1a3acc6065ed9fed27e6953d9c4cdd73c15d034bf77baf271aef89455e0d3bab7df8ef69e8fd67036a268fd21f55f67772f2d69dae185329282cebcda SHA512 54a487cbd08a736b880bc8897aaaf44684158d93eb190d7ca95eaebbda8534694842c11239bd829061c7693467735fae325a243c6634da97a193e72ba5f50d7b
+EBUILD vanilla-kernel-5.8.12.ebuild 4007 BLAKE2B 6ed6d6dadc0939bcad36d1f5730a7806dc1e5bdb77b413d7ae209596ad344fc5186a00cc12ea07becd6d378359c6e129b1db1b1a08cf0d4e412385d66b3067ea SHA512 39267d528574bb9dc9ae3e55fd4e6f09c177b13a7659af04b732fd5c18a131a842b3f40d1090d0304af2a9136b55f071b140f4a37ae99baa40991d12013d8527
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.60.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.60.ebuild
deleted file mode 100644
index d2655d6349c6..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.60.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.61.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.61.ebuild
deleted file mode 100644
index d2655d6349c6..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.61.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.62.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.62.ebuild
deleted file mode 100644
index d2655d6349c6..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.62.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.63.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.63.ebuild
deleted file mode 100644
index cfbdb27fa735..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.63.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.67.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.67.ebuild
deleted file mode 100644
index ee1e12c459a7..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.67.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-		# WireGuard was backported to 5.4 but we use old configs (#739128)
-		-e '$aCONFIG_WIREGUARD=m'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	[[ ${ARCH} == x86 ]] && config_tweaks+=(
-		# fix autoenabling 64bit
-		-e '2i\
-# CONFIG_64BIT is not set'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.65.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.68.ebuild
index ee1e12c459a7..ee1e12c459a7 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.65.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.68.ebuild
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.17.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.17.ebuild
deleted file mode 100644
index da392ebe6f5e..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.17.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.7.8
-CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.18.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.18.ebuild
deleted file mode 100644
index da392ebe6f5e..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.18.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.7.8
-CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.19.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.19.ebuild
deleted file mode 100644
index da392ebe6f5e..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.19.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.7.8
-CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.11.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.11.ebuild
deleted file mode 100644
index 540a5ea3c744..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.11.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.10.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.12.ebuild
index 540a5ea3c744..540a5ea3c744 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.10.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.12.ebuild
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.3.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.3.ebuild
deleted file mode 100644
index 9da43339c7d6..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.1
-CONFIG_HASH=47a895f435cccb2cb14eb5d0c52d2f6d4d904907
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.4.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.4.ebuild
deleted file mode 100644
index 9da43339c7d6..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.1
-CONFIG_HASH=47a895f435cccb2cb14eb5d0c52d2f6d4d904907
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.5.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.5.ebuild
deleted file mode 100644
index 44edb4bbe0f6..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.4
-CONFIG_HASH=d5f320566eb00901161a51fbd50b5ebbc51f47be
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.6.ebuild
deleted file mode 100644
index 44edb4bbe0f6..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.6.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.4
-CONFIG_HASH=d5f320566eb00901161a51fbd50b5ebbc51f47be
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.7.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.7.ebuild
deleted file mode 100644
index 6a8a305fb00b..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.7.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# shove arch under the carpet!
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.8.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.8.ebuild
deleted file mode 100644
index 73a7dd553f64..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.8.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y:'
-		-e '/CONFIG_IKCONFIG_PROC/s:.*:CONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.9.ebuild
deleted file mode 100644
index 540a5ea3c744..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.9.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kernel-build
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.8.5
-CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="debug"
-REQUIRED_USE="
-	arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/vanilla-kernel-bin:${SLOT}"
-BDEPEND="
-	debug? ( dev-util/dwarves )"
-
-pkg_pretend() {
-	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
-	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
-
-	kernel-install_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local config_tweaks=(
-		# replace (none) with gentoo
-		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
-		# we do support x32
-		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
-		# disable signatures
-		-e '/CONFIG_MODULE_SIG/d'
-		-e '/CONFIG_SECURITY_LOCKDOWN/d'
-		-e '/CONFIG_KEXEC_SIG/d'
-		-e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
-		-e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
-		-e '/CONFIG_SIGNATURE/d'
-		# remove massive array of LSMs
-		-e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
-		-e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
-		# nobody actually wants fips
-		-e '/CONFIG_CRYPTO_FIPS/d'
-		# these tests are really not necessary
-		-e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
-		# probably not needed by anybody but developers
-		-e '/CONFIG_CRYPTO_STATS/d'
-		# 1000hz is excessive for laptops
-		-e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
-		# nobody is using this kernel on insane super computers
-		-e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
-		# we're not actually producing live patches for folks
-		-e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
-		# this slows down networking in general
-		-e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
-		# include font for normal and hidpi screens
-		-e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
-		# we don't need to actually install system headers from this ebuild
-		-e '/CONFIG_HEADERS_INSTALL/d'
-		# enable /proc/config.gz, used by linux-info.eclass
-		-e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
-	)
-	use debug || config_tweaks+=(
-		-e '/CONFIG_DEBUG_INFO/d'
-		-e '/CONFIG_DEBUG_RODATA_TEST/d'
-		-e '/CONFIG_DEBUG_VM/d'
-		-e '/CONFIG_DEBUG_SHIRQ/d'
-		-e '/CONFIG_DEBUG_LIST/d'
-		-e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
-		-e '/CONFIG_TORTURE_TEST/d'
-		-e '/CONFIG_BOOTTIME_TRACING/d'
-		-e '/CONFIG_RING_BUFFER_BENCHMARK/d'
-		-e '/CONFIG_X86_DECODER_SELFTEST/d'
-		-e '/CONFIG_KGDB/d'
-	)
-	sed -i "${config_tweaks[@]}" .config || die
-}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index c2af2099b4ac..164273f1b08c 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -6,17 +6,17 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
 DIST patch-4.14.199.xz 3893364 BLAKE2B c0c4e8d402e9f6f05b65ad243130b011138ece53f6fe791f9e68f89536c8e37a752badc5d4bc53b11133afb3b84760a7c4a57ba65ae7d23cc1d9a60cdc606f60 SHA512 5ca1070e58a8cb6548891c9c470bc8f5d9c8beea1f441032281ca61524d8beb96e4678162479d3aff7f96d02d3682d5376d91dd0718b138f5e13dc4547dda329
-DIST patch-4.19.147.xz 3423732 BLAKE2B 6d9a34c24c699d104f451db9077f62326ef93695abff3210b5c823777cf801bb82c0ff1d10dcd17b05df3c49bbd1bb9ee5b93e36e2e48795b24600a8dbc55e2f SHA512 fc929e99affcc3f331831bc54eed8186d44a1333b0b07b244ef93ab4d6a1d468ca433e03df5e2c2ceb01dcb6285d5c6d2bf67aff71ed76a94946e907cbc9cb64
+DIST patch-4.19.148.xz 3434156 BLAKE2B 8737101044c2dc5400b64c61f9589a10b0af3eb862cd439098eeb6d2cd0645676f93093549494584789e38786dc19d1843fc5136187797abe6b3bd6713aae721 SHA512 a8790ae1925d1622f469e975e5da3baaca6204d324f5c981159d19011f77df51a600ea76e1d6da6f2bac6e9c1c2cf1b64f0df5e7e288800ca7451195be6146a7
 DIST patch-4.4.237.xz 3318664 BLAKE2B 1771de77c365203b1a40f0c6880a0b2fcb090044c7214bf756aeedffe7ec72fca482ebad2c5efd957b285d341d26fcdefc7731a0512faba6ddc0e4382d7cc78e SHA512 3358f389d334258aca30ba3e2bf1b13b6bb86707dcb1cfce788d83c2ca1674cd437d7aa0484bfa0ace8906f1695af98cb6053e2d902c09deaf66ac1bef9a4598
 DIST patch-4.9.237.xz 3675464 BLAKE2B ab202035a95936544f0b3cce2e14295bac52450c83aa9b6d6cfd36fc108eb72a610ee89d725564e6b2f6c2006a832b3b2fcbe5b4d4d51d5bed3d902e330a136b SHA512 de937e1b64a12fdc86452d97dc5f5d99c5d71851d9a480dcca21712f85bf9f07dd754695cf5678f41df5e67d2ac2aaadce87f7e4a9a725f191168c02a2c9473f
-DIST patch-5.4.67.xz 1999108 BLAKE2B aeabfb6686fac0b05cc4c26ebebf6c7e485f48d3bc7404894345433f293adec4a655efbebf48c77708ab4a155dcbfa0aaf1e8497ba0c8c2adc0ffcc67195c962 SHA512 0d6aa7a30cfdf3d435cb776d6679a53ba093a46771bec9eaff7c8a1226c80455390155d342bf8b4c7308d84bafbc8e282c52fb1d2f4736244a7298ac2d362219
+DIST patch-5.4.68.xz 2007900 BLAKE2B 95b3e0db26a03596dfe2407a709f7fce085d7222e1a99d568073517dc2eb45e806010a91db6e129ba1ce9c75499ef853fcf189e40511aea7dc8acb0ce76b5ca3 SHA512 4db326bc299245e32ccd7e0d988a823fa3d115265d6f7a16ece056f1f6317193405de43b9dbd020ec992822442aa5c0311d9b56ed7408b5bc8587ca49612f962
 DIST patch-5.7.18.xz 773408 BLAKE2B 624c9909c3983e86df6affb562495925c729534ce6108af3c49c73b24c8c74d73cac44843abae2486e507d4f43c55588cb1a00f0f0f1a1204ffd3efbc512f980 SHA512 59fba5b05fbb8b2f072642318bcd49db1c990a46683bbff18c1578ef149be13be15637d353c0423babcab22820cab2a4ca3801dbc33459725e32a5df9d74987f
-DIST patch-5.8.11.xz 466860 BLAKE2B 7ddf80fdd27fb71d47308ed1cf97e724d97de7fb94b1338959aca3d42796c47beacdf1fe2e8fee5468e4bc022d04da90bcf26681aa56a6e5dbaea7577c0b78c1 SHA512 e25526290621bf802f743002e8d02308813e6a6bbbe44b2415bab0199d82bec18dd15aa47ff8b19c69b604dc3733a0d36f7389d0edd79b18a003b7da0532e489
+DIST patch-5.8.12.xz 482628 BLAKE2B 5c29e28392665d07475c08749c59a3784ccd52dd88d22eda7477a0366c375349cdfee7b15c8d28f69c8d83a19a96e499a0e29c4b72b583241a7980a443c2761c SHA512 46aaf68e7771376688401736b8f36cbfa32e0cf2bbaeeeeaaaed0e9c44e62b427db912397f04415e65981eb801f9a23384503e3f005c1bf34d96bdfe39460b06
 EBUILD vanilla-sources-4.14.199.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.19.147.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.19.148.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 EBUILD vanilla-sources-4.4.237.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 EBUILD vanilla-sources-4.9.237.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-5.4.67.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-5.4.68.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 EBUILD vanilla-sources-5.7.18.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-5.8.11.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-5.8.12.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 MISC metadata.xml 516 BLAKE2B ec4d6b5a7084baa9ed012e2108690e78422b269c88926baa66e8d0705dd5a7cc82fd76edcaeaf9a481c8b5099f65fe612388a826541a6e9a9c5256ab8aabdd92 SHA512 138d42372bcd976186c5c51f1e62b498df6b35662beeba737a46350e9e9f87b3d8bd97aeb57db43c99fc219ebb992aa2612c3ac8473cf4cc68e7d084c0fd8b93
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.147.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.148.ebuild
index 26a9a84f3519..26a9a84f3519 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.147.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.148.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.67.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.68.ebuild
index 26a9a84f3519..26a9a84f3519 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.67.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.68.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.8.11.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.8.12.ebuild
index 26a9a84f3519..26a9a84f3519 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.8.11.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.8.12.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 597965131239..525c4e92f16d 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index ec5d502f5e4a..dac4b9c86fa5 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -2,12 +2,9 @@ DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95
 DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
 DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
-DIST binutils-2.35-patches-1.tar.xz 12216 BLAKE2B a811449da684e3501a7520a26639e04dda2f2d2fc8610974293eff3e4a1e23c4abeb97f52fe3b796679452bd6e3a5330fef4beb6f64b9ce2a1162076803390a0 SHA512 b8da16a4d97b264da925cc939b54bedbc148eb72a8d60f79d7ed222e9e299dca2a4f1fad4a6d60448d9d196c11331443eca0508dcbb85cb4c2da6c67bfaf4cd2
 DIST binutils-2.35.1-patches-1.tar.xz 10088 BLAKE2B fa4b0c417b6452757f90243921c60b2406c9bf60d1aaa393654fb23ce52e32fb3e7ed90f6d59286786dd95398a10d008c75bfdca065d704025cc828ff65b225f SHA512 dccb4407f4f2a8b38488f9f42638c10777ee344239cf5d4fcc8f580df3e8ff15d03211dc51ef18d905c326a71771da4b38f47381d6d549422a8353b5da0e7b0b
 DIST binutils-2.35.1.tar.xz 22031720 BLAKE2B d3468da90b75e9b5fa7fbd64d3fdb0a4bc445e4cb7da5ae058f73a1e9d948b3e9438bc9f1b5b351db369b76a25960c9c1f58f828fd2c7646f555de45fa3c052b SHA512 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb
-DIST binutils-2.35.tar.xz 22042160 BLAKE2B 72ea79edf3a77aa93dcf38274123abbae5ce8f800a95e6379b4c8807050b05c2dfec314f06c027b1343c5570f369324fa3e195d7e0db5f8a57c0579937c49d3f SHA512 9f222e4ab6720036402d03904fb11b73ab87714b85cd84997f7d357f405c7e10581d70202f9165a1ee0c70538632db27ecc9dfe627dddb1e6bc7edb1537cf786
 EBUILD binutils-libs-2.33.1-r1.ebuild 3549 BLAKE2B 931ae3c38edbeed8cca61909b5e0897bc37f3855820ac49ed97955c611a2c8a58c50df2e87d4f13674ea7de511638205f49932663f25afd9f2b96970803dd91c SHA512 9e17954c198e39f725603fd9b6d1c3c24e39c99ee823a3e15b3d5c4838ae507787cb23aaf36e5dbfb9052656955b114a95b2cb3f8b0fc96ecfb0b5ed970053d0
-EBUILD binutils-libs-2.34-r2.ebuild 3569 BLAKE2B 4efa43080ecee8791f99f673f570cf8b4626c54e53805f5dded9cb315447468134b8669765d6177d322ba51998af22abed9c84f490b375fc5ef250f3427ee764 SHA512 a929c5d02191391f2ae8c3882426eec113a74a375aaf0a7f27c937b5203e9a1544b6b6ac4fb63812898e967b3f594eb39c012d3a5cc0b8871597acd21bb6095c
-EBUILD binutils-libs-2.35.1.ebuild 3573 BLAKE2B 23f988a36b4e7334644d5a17efb566140ef430aeee100e235f85470fe9c9a318d6804440f20d4da0858a118128d456ef23434bf08fc5ffe7adff228a02c69a4a SHA512 0d0cd1c97bf4c97aea8905dbd23a964565aaa43358553b282f62bbbc05122a93410d59f3ef06bfdd975e7f4e556d239a5b073b97d3969c4d8bdf5ab03ecc8f42
-EBUILD binutils-libs-2.35.ebuild 3573 BLAKE2B 23f988a36b4e7334644d5a17efb566140ef430aeee100e235f85470fe9c9a318d6804440f20d4da0858a118128d456ef23434bf08fc5ffe7adff228a02c69a4a SHA512 0d0cd1c97bf4c97aea8905dbd23a964565aaa43358553b282f62bbbc05122a93410d59f3ef06bfdd975e7f4e556d239a5b073b97d3969c4d8bdf5ab03ecc8f42
+EBUILD binutils-libs-2.34-r2.ebuild 3568 BLAKE2B 51106ec2a31aedee44588025ded635b7f7ba37bac3d33f49a0ec12872e979cf0d69770638fc9a45095340b8bb3093bde3fb8c44e6cde3f4550ae9ebd1f6c93f8 SHA512 16f832ab41335abb97b66efce95907878041b91ed2991c23fceb5c0b06a90aadf67679ce655466c46173873a06ff3be4f780e95be24a898cf12603309b522a9e
+EBUILD binutils-libs-2.35.1.ebuild 3572 BLAKE2B c81c435b987840387a3d0d45aa9b3f8256f1f9f8495f203229e8186b1db299151a38adb8f4bffa098fa04bddc45cde52626febb38145f924a859b72a34e61692 SHA512 96eef2876f54bebab53db22b48d5f86dba4464aa700896640a6d942cbeebfa4f6c68b534b553149c0861f72fe753023cdd6fbcff2ba248f7c96da61165308fc1
 MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
diff --git a/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
index 42cfa1d03e87..b097a25bf94d 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV}"
 IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/binutils-libs/binutils-libs-2.35.1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.35.1.ebuild
index 0decbf620dd1..f9d5c21bb08d 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.35.1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.35.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV}"
 IUSE="64-bit-bfd multitarget nls static-libs"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/binutils-libs/binutils-libs-2.35.ebuild b/sys-libs/binutils-libs/binutils-libs-2.35.ebuild
deleted file mode 100644
index 0decbf620dd1..000000000000
--- a/sys-libs/binutils-libs/binutils-libs-2.35.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCH_VER=1
-PATCH_DEV=dilfridge
-
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-MY_PN="binutils"
-MY_P="${MY_PN}-${PV}"
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-slyfox}
-
-DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
-HOMEPAGE="https://sourceware.org/binutils/"
-SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0/${PV}"
-IUSE="64-bit-bfd multitarget nls static-libs"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-# Need a newer binutils-config that'll reset include/lib symlinks for us.
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-config-5
-"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/bfd.h
-)
-
-src_prepare() {
-	if [[ ! -z ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# Fix cross-compile relinking issue, bug #626402
-	elibtoolize
-
-	default
-}
-
-pkgversion() {
-	printf "Gentoo ${PVR}"
-	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="https://bugs.gentoo.org/"
-		--with-pkgversion="$(pkgversion)"
-		$(use_enable static-libs static)
-		# The binutils eclass enables this flag for all bi-arch builds,
-		# but other tools often don't care about that support.  Put it
-		# beyond a flag if people really want it, but otherwise leave
-		# it disabled as it can slow things down on 32bit arches. #438522
-		$(use_enable 64-bit-bfd)
-		# This only disables building in the zlib subdir.
-		# For binutils itself, it'll use the system version. #591516
-		--without-zlib
-		--with-system-zlib
-		# We only care about the libs, so disable programs. #528088
-		--disable-{binutils,etc,ld,gas,gold,gprof}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# We pull in all USE-flags that change ABI in an incompatible
-		# way. #666100
-		# USE=multitarget change size of global arrays
-		# USE=64-bit-bfd changes data structures of exported API
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
-	)
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	use nls \
-		&& myconf+=( --without-included-gettext ) \
-		|| myconf+=( --disable-nls )
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-
-	# Prevent makeinfo from running as we don't build docs here.
-	# bug #622652
-	sed -i \
-		-e '/^MAKEINFO/s:=.*:= true:' \
-		Makefile || die
-}
-
-multilib_src_install() {
-	default
-	# Provide libiberty.h directly.
-	dosym libiberty/libiberty.h /usr/include/libiberty.h
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 56b301c4975b..6f3c8e634c1e 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD compiler-rt-sanitizers-10.0.0.ebuild 4552 BLAKE2B 5b4130f8f81fa91932b4c814bbbd3b8c3636f881c097463faf2914ecf3d9eab8d741130fe99ace77faf7c4180606f9e0785acdc037c2ca2226f220b925e0fc23 SHA512 b17034bf3dd2596a07c78f523c2ed64329f18086f7d5ee2861793a3484b1c5c6a7c890820ba2e1cb4e64497d88ca39308be84a7751812789fccb16542c1097a5
 EBUILD compiler-rt-sanitizers-10.0.1.ebuild 4503 BLAKE2B 85c1b71b1ca79b7c018bf7ed23c113adaa01c1efbd836673b78d2108b1371a320f51bb6ebfe0d33ff37e92514356e52dd0b6b3f9cfd7a7c7b1872c10d4787af0 SHA512 51525e8bf4648afb656731516a623b3763c4e82667f810cf0fbe9c3a20f5fed5ef537b72413169eb3b883d5410db7f7a578417a02439d2b5769e33873be18851
 EBUILD compiler-rt-sanitizers-11.0.0.9999.ebuild 4430 BLAKE2B 1bdc47f48c8ef1fafe3b963ca8034492cf0ad5fcb82f773f0bb9e786f2c5f24bcd812bd1b1d1a0a415826d8bedaec1c2422ac87e6b680fb10a58ad1f11a6bb8a SHA512 593eef702a86536e117e0daaecae4ba5436532bb6958b6c24b3e79282e0a40068f6d0b7c570f936fd5c9aa4356d68b20f6f01f2b5f974b9f589b7c92972cae81
 EBUILD compiler-rt-sanitizers-11.0.0_rc3.ebuild 4430 BLAKE2B 1bdc47f48c8ef1fafe3b963ca8034492cf0ad5fcb82f773f0bb9e786f2c5f24bcd812bd1b1d1a0a415826d8bedaec1c2422ac87e6b680fb10a58ad1f11a6bb8a SHA512 593eef702a86536e117e0daaecae4ba5436532bb6958b6c24b3e79282e0a40068f6d0b7c570f936fd5c9aa4356d68b20f6f01f2b5f974b9f589b7c92972cae81
+EBUILD compiler-rt-sanitizers-11.0.0_rc4.ebuild 4430 BLAKE2B 1bdc47f48c8ef1fafe3b963ca8034492cf0ad5fcb82f773f0bb9e786f2c5f24bcd812bd1b1d1a0a415826d8bedaec1c2422ac87e6b680fb10a58ad1f11a6bb8a SHA512 593eef702a86536e117e0daaecae4ba5436532bb6958b6c24b3e79282e0a40068f6d0b7c570f936fd5c9aa4356d68b20f6f01f2b5f974b9f589b7c92972cae81
 EBUILD compiler-rt-sanitizers-12.0.0.9999.ebuild 4430 BLAKE2B 1bdc47f48c8ef1fafe3b963ca8034492cf0ad5fcb82f773f0bb9e786f2c5f24bcd812bd1b1d1a0a415826d8bedaec1c2422ac87e6b680fb10a58ad1f11a6bb8a SHA512 593eef702a86536e117e0daaecae4ba5436532bb6958b6c24b3e79282e0a40068f6d0b7c570f936fd5c9aa4356d68b20f6f01f2b5f974b9f589b7c92972cae81
 EBUILD compiler-rt-sanitizers-9.0.1.ebuild 4847 BLAKE2B cc23d456a4c52596858a405bc74c3c5db35c4fe116685cba4982e2753ba01941bd2c166f56e4278c79e02b06229e90a7fba9fce923360dba8bbf516c8a665ae6 SHA512 dc11719f142cfa56c86373e7e6dba88957511218a654c138ab37d3de01a60bd77f8dd4bc90ed634156d0952b350dce1bad08f8a2db1a7d207335596cdd0bd4d6
 MISC metadata.xml 547 BLAKE2B 6f9d8b65c12797fd3d168e9b3948c604265db135bda5493d9f1d8b1d01fd73a79d07e5241afc3a7fa1672827fac23d3d9dc4d7ae42371a0de892a900c8c28269 SHA512 fb73a96b1ffbc7ff2fecfba35c9acd3e54ade0154016ae04423217f5c000eee2b0b821cc626908647551a0aa7b7f462d42d56cde3993ddd52248bc373b117c3e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc4.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..cecd595ac6c1
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0_rc4.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( compiler-rt )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
+# FIXME: libfuzzer does not enable all its necessary dependencies
+REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	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}"
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+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_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_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)
+		# builtins & crt installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# 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_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_build check-all
+}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index cc5ab056bf63..c3a6b6d30e3f 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD compiler-rt-10.0.0.ebuild 2918 BLAKE2B b815aee19b40b970d1331e5e5c71ffe7b9279b900b3392fbfd627b661214f0a6d4e8e4818e24a3a781c2da768f42bba2f44d5e84fadbad7dba669a94bb9132fb SHA512 79b57e3f8af6f135300441670dcba927843182518c070d6767bc3c866a9fdfdd0bcf9be14c4cd5a1d9d51cc592a443c0c02af635942d7e30bf4adef34d558c45
 EBUILD compiler-rt-10.0.1.ebuild 2772 BLAKE2B bd76a3fa2eeec469a22878630365fd024462c01d3e61a7a74aec110966bc8139373323f6ea531543fdee2c1902b0a4d6cbdbe92ec030d34b74416377f38c9c96 SHA512 8a1a658c468f05cde9542c2a69f563cc83dc5345d99d65b3a300a29a4b57b61c2d68564dfd37941670871df805cb0bdeb16715367c74816ca93fec94070dc555
 EBUILD compiler-rt-11.0.0.9999.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
 EBUILD compiler-rt-11.0.0_rc3.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
+EBUILD compiler-rt-11.0.0_rc4.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
 EBUILD compiler-rt-12.0.0.9999.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
 EBUILD compiler-rt-9.0.1.ebuild 2916 BLAKE2B 4725960cfa3ff697f1b17d709c7a9f463aa8aaf2da33592b6c5d129fc4acb51181a4712c1afce01c0b97e441685cc5932524f02cbacb339f5c7c315813e4ec72 SHA512 2b038aeb653043691f046ae2930cac58ada17ece1f7da2699e1e9ce4dbe1903f21366ca82cb3d08605875f0b24fc0a9707bbde2ea6a039c080f0d54268071f0f
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0_rc4.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..c83c56ecf249
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0_rc4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( compiler-rt )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS=""
+IUSE="+clang test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
+	${PYTHON_DEPS}"
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+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++
+		strip-unsupported-flags
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_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_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-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
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-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_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index cbb6adb60f74..1d791ca732bb 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -20,6 +20,7 @@ DIST glibc-2.31-patches-8.tar.xz 60868 BLAKE2B c641a77cab0b3e5379a6911a548483266
 DIST glibc-2.31-patches-9.tar.xz 74712 BLAKE2B 62991b67de4def4cca944e8420d2f0139f88b6754c6bc81072bb321c574c1db22641857345325848e1dfb551c10758f582e4425e687a7921cdbd4e7e7923a047 SHA512 699d898e3a8ed02b04573c675f572076e8f747767bfc577a033a49cd7d9078a7a60ac325acd4bd419a93b56edf90ce067baa7578ab315e27885f1f0e13916354
 DIST glibc-2.31.tar.xz 16676764 BLAKE2B 91df1792345f157265eae405185a81fd4b8ce36d4c2388f44b0d5b1ae38174ea374cbc909cd260770b9f38ea58051da13766d4fa22abf41c2d4a2493257b179b SHA512 735e4c0ef10418b6ea945ad3906585e5bbd8b282d76f2131309dce4cec6b15066a5e4a3731773ce428a819b542579c9957867bb0abf05ed2030983fca4412306
 DIST glibc-2.32-patches-1.tar.xz 7640 BLAKE2B 849bdc1108e1f68f307bb9673f5ecda7c5470815f7d2de7956d529b638aafd4a8f37c22f79bc89d8e5f2efd51878927d3999d80586ec1074c46a52b6e148ea18 SHA512 a206d69693c3d9c527e17307b413aed05bcdefdf2537bb16af97ef31e85e4c48812971b60c00107b6a7c4bdc83c7e8ba1c9ea96f5641520852f98928f1018349
+DIST glibc-2.32-patches-2.tar.xz 8588 BLAKE2B 57a85241e3270d14df0332b039a933c5a7ee4d089684d85cca564eeec2d6796735de60b628c5746858757342922d58993d6cf7187ce1d7102b2299ca2cf8513f SHA512 45bbab9e2f813f55cb4a1438dcd9365170b8facff50b11648ba6022da06c20029bb65a4b06fd906af82aa7461b7374f85105fd7eedb7915cec3f1df3779b68a3
 DIST glibc-2.32.tar.xz 16744512 BLAKE2B a56b4afbb35315c5cd6dca0f62e44455dceae3e6e88a8453621f9a5394a60ddf10ca9309b2db0911830c7fd77e3faa5d94694eb94d5b2c05fc5285cef52255da SHA512 8460c155b7003e04f18dabece4ed9ad77445fa2288a7dc08e80a8fc4c418828af29e0649951bd71a54ea2ad2d4da7570aafd9bdfe4a37e9951b772b442afe50b
 DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff
 DIST locale-gen-2.10.tar.gz 7747 BLAKE2B 49f569c5ae5260fca128503bc6f22d6f6f1cda817920c41fdadadf1527bbb4f3eb161f79fa729830666a4673e9092f99f4685ec8fcac8ddea0b8242bca9c1f4f SHA512 e350e60d458d67638e3090711fca05af6fafac06c51b97648244549f8a0621dab7543f09dc7ad4c62392f13bdae8e5875dc6d0b6c3d83efc29d116bc2eef92db
@@ -28,8 +29,8 @@ EBUILD glibc-2.25-r11.ebuild 6063 BLAKE2B a995a2553fad56abe09f0f890e2c70f9456867
 EBUILD glibc-2.30-r8.ebuild 43113 BLAKE2B e567ea4544419609ce3f02ac06ce8ee2175d11502e947187334ec02cca11dacbb5453d514fe8b1c77418259e8f0bbd4306cdfa6aa573426e95ba56f910a9534c SHA512 b85c7656eb09b9702d352b2e20c334d70b764ddedacc6a218b3a921c990314ec80a4ff14e234a3bebf810f3482c45b323e9edc3c2044266341125b7095186126
 EBUILD glibc-2.30-r9.ebuild 43267 BLAKE2B 5705e5c2c6558d1eecb0b1df532512cda073e1cd9e182d0864abf64f209f58f1fd8d73789381f1f6556e59e65134a361e3235299917588eb7ae881fb4c90c460 SHA512 38eb6ece3fba563af2d600acb4ec01f0f8b3719c953db82b5c6caf838bb5522f241cbd3b34da36cab89f10fcdfb9b3af3931ca48964e2292a88decc6567324ab
 EBUILD glibc-2.31-r6.ebuild 44382 BLAKE2B 232d74149e6028963993873c373e1fc744e4b0a3eb33aed47cd045503d55c2a77836c5bf7a96a3496c9d2d863a691ae1268f62d3f029a5cdd417c9492f3b3392 SHA512 61d0bb3df2cba90d53956774d4b4d52fa63649c6d9e21cc08f903bc63dbb30d6e412c0e71824dde753553bd64dee711603cb094cdcf35bbd28f6b5e911ebf735
-EBUILD glibc-2.31-r7.ebuild 44391 BLAKE2B 85da5d9ae3ce8d16f7af48a8342e29637d1482c0eeb12880b85b19fa8dc2ac3d90cb2712726f395ccf99bde8883c691e22b19543d67900441da7590764e6a692 SHA512 a37fa0526a9c0d4235aa3a40611038903266f2422741cdc3ad0d2722c3c52238dcf007c46ae6a703e735d53ec48eb772f916081eaeb9dac51df44602afd4df79
+EBUILD glibc-2.31-r7.ebuild 44390 BLAKE2B ce2d4c14152b96990d76a2459071e0c7529afc4996480fed6b7abc9d0f5124b7662e768a339c935a276d47b6a570d4e8a197e3c4bf1e2940ae71cac545ee26b0 SHA512 bbe93e5a9e9ffa69989568507d54b668c8c10bc71d9b64b6a8549a5cef12d4e5ca2b1ec851525aa3727a3d5244e4ead2202fc0ef3eb7814dac24afa7c87dff96
 EBUILD glibc-2.32-r1.ebuild 44754 BLAKE2B 15b6de7f027bda31caf170311117faf0f82f68232559be863ce65e9edf1a9600fc50d6ce9cec84d8d40ed00765a3793ebeb18559a18d11b4b5f1105981a1aeb1 SHA512 00ae773906303be880f87a3f4c6413a5c99199e4c537081112fa6497d9c9f76b56dac1d06e822da213af248933a4a9168a68cc66d55951e65557466f21d188a2
-EBUILD glibc-2.32.ebuild 44390 BLAKE2B 3ba4b4f9bf36f7e381c4b2b0aef9c4337656b4200c17ea6039d3af89e600b7c2cbb93c92da579018977a64125ac8925b93a04e9e069b89a4b0c40fdb37227204 SHA512 d99cde411eff37e5059bde2e83366d671734999f166823059f37a27b1edcbc2e70b409f6634a5bd7d3e67576b35f7454ea220a09a22abe0a3c7ad69de13e5f5d
+EBUILD glibc-2.32-r2.ebuild 44754 BLAKE2B 96efa8072cc065efd1daf95fabb1cb7e33ae8c320f12da38e0d4a9918b90e1730739c58d6dfb50993735c9c0b18d3b28f587b11673f152ac49e8282cfaa6fc86 SHA512 b6f83a6c732cf8bdfdabd303bf1c3d5c8b3bf83f83b9058c94f75c41b9ad701e4a1f553c2ff559b38f85ec6c8c1374b6488eb215b8d4188a8ce6445c588e3ab6
 EBUILD glibc-9999.ebuild 44192 BLAKE2B 35137b65aefdf2022b758d8102c91811326679da8972dd2767055e2f61a6ae0611ca7cec070f8e5a86f047ab168ec219627b3f38240ad2e54e277148b25a701e SHA512 cbfc09d443000bca8cbdda9f7ce99e2f6eed8d5c44677e7645e13562154853b8c02c4215e9b3d1a472712ce46f8b219a1b8e0d59e74fb63ae3fc48fec7cad574
 MISC metadata.xml 1491 BLAKE2B 4688b54e937163824a5895f4fbbcc9f09152378c68416f62294f7f1506379ecb82de43e8d2c6a64d1647c16700abe7c750b3cc658a9c7053891b3a9504f2ae93 SHA512 f6c002a52bb81471fbb631c7c430e1e91f6fdefc84a0c1f330606ac6347067b60f8a6d078169d49d2b30fa6991883466fff05caf4f93f53c00e5ced625dd8c88
diff --git a/sys-libs/glibc/glibc-2.31-r7.ebuild b/sys-libs/glibc/glibc-2.31-r7.ebuild
index 07f25009bd18..479b14e51143 100644
--- a/sys-libs/glibc/glibc-2.31-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.31-r7.ebuild
@@ -22,7 +22,7 @@ PATCH_DEV=dilfridge
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 fi
diff --git a/sys-libs/glibc/glibc-2.32-r2.ebuild b/sys-libs/glibc/glibc-2.32-r2.ebuild
new file mode 100644
index 000000000000..6f714f6aee1e
--- /dev/null
+++ b/sys-libs/glibc/glibc-2.32-r2.ebuild
@@ -0,0 +1,1505 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
+	multilib systemd multiprocessing
+
+DESCRIPTION="GNU libc C library"
+HOMEPAGE="https://www.gnu.org/software/libc/"
+LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
+SLOT="2.2"
+
+EMULTILIB_PKG="true"
+
+# Gentoo patchset (ignored for live ebuilds)
+PATCH_VER=2
+PATCH_DEV=dilfridge
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
+	SRC_URI+=" riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz )"
+fi
+
+RELEASE_VER=${PV}
+
+GCC_BOOTSTRAP_VER=20180511
+
+LOCALE_GEN_VER=2.10
+
+SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
+SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
+
+IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla"
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Here's how the cross-compile logic breaks down ...
+#  CTARGET - machine that will target the binaries
+#  CHOST   - machine that will host the binaries
+#  CBUILD  - machine that will build the binaries
+# If CTARGET != CHOST, it means you want a libc for cross-compiling.
+# If CHOST != CBUILD, it means you want to cross-compile the libc.
+#  CBUILD = CHOST = CTARGET    - native build/install
+#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
+#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
+#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
+# For install paths:
+#  CHOST = CTARGET  - install into /
+#  CHOST != CTARGET - install into /usr/CTARGET/
+#
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+# Note [Disable automatic stripping]
+# Disabling automatic stripping for a few reasons:
+# - portage's attempt to strip breaks non-native binaries at least on
+#   arm: bug #697428
+# - portage's attempt to strip libpthread.so.0 breaks gdb thread
+#   enumeration: bug #697910. This is quite subtle:
+#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
+#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
+#     via 'ps_pglobal_lookup' symbol defined in gdb.
+#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
+#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
+#     (unexported) is used to sanity check compatibility before enabling
+#     debugging.
+#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
+#   * normal 'strip' command trims '.symtab'
+#   Thus our main goal here is to prevent 'libpthread.so.0' from
+#   losing it's '.symtab' entries.
+# As Gentoo's strip does not allow us to pass less aggressive stripping
+# options and does not check the machine target we strip selectively.
+
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS,
+# and that gcc already contains the hardened patches.
+# Lastly, let's avoid some openssh nastiness, bug 708224, as
+# convenience to our users.
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/pax-utils-0.1.10
+	sys-devel/bison
+	doc? ( sys-apps/texinfo )
+"
+COMMON_DEPEND="
+	gd? ( media-libs/gd:2= )
+	nscd? ( selinux? (
+		audit? ( sys-process/audit )
+		caps? ( sys-libs/libcap )
+	) )
+	suid? ( caps? ( sys-libs/libcap ) )
+	selinux? ( sys-libs/libselinux )
+	systemtap? ( dev-util/systemtap )
+	!<net-misc/openssh-8.1_p1-r2
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=net-dns/libidn2-2.3.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/gentoo-functions
+"
+
+RESTRICT="!test? ( test )"
+
+if [[ ${CATEGORY} == cross-* ]] ; then
+	BDEPEND+=" !headers-only? (
+		>=${CATEGORY}/binutils-2.24
+		>=${CATEGORY}/gcc-6
+	)"
+	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
+else
+	BDEPEND+="
+		>=sys-devel/binutils-2.24
+		>=sys-devel/gcc-6
+	"
+	DEPEND+=" virtual/os-headers "
+	RDEPEND+="
+		>=net-dns/libidn2-2.3.0
+		vanilla? ( !sys-libs/timezone-data )
+	"
+	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
+fi
+
+# Ignore tests whitelisted below
+GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
+
+# The following tests fail due to the Gentoo build system and are thus
+# executed but ignored:
+XFAIL_TEST_LIST=(
+	# 9) Failures of unknown origin
+	tst-latepthread
+
+	# buggy test, assumes /dev/ and /dev/null on a single filesystem
+	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
+	# https://sourceware.org/PR25909
+	tst-support_descriptors
+
+	# Flaky test, known to fail occasionally:
+	# https://sourceware.org/PR19329
+	# https://bugs.gentoo.org/719674#c12
+	tst-stack4
+)
+
+#
+# Small helper functions
+#
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	is_crosscompile && use headers-only
+}
+
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+
+# This prefix is applicable to CHOST when building against this
+# glibc. It is baked into the library at configure time.
+host_eprefix() {
+	is_crosscompile || echo "${EPREFIX}"
+}
+
+# This prefix is applicable to CBUILD when building against this
+# glibc. It determines the destination path at install time.
+build_eprefix() {
+	is_crosscompile && echo "${EPREFIX}"
+}
+
+# We need to be able to set alternative headers for compiling for non-native
+# platform. Will also become useful for testing kernel-headers without screwing
+# up the whole system.
+alt_headers() {
+	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
+}
+
+alt_build_headers() {
+	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
+		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
+		if tc-is-cross-compiler ; then
+			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
+			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
+				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
+				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
+			fi
+		fi
+	fi
+	echo "${ALT_BUILD_HEADERS}"
+}
+
+alt_libdir() {
+	echo $(alt_prefix)/$(get_libdir)
+}
+alt_usrlibdir() {
+	echo $(alt_prefix)/usr/$(get_libdir)
+}
+
+builddir() {
+	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
+}
+
+do_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
+
+	pushd "${T}" >/dev/null
+
+	rm -f glibc-test*
+	printf '%b' "$*" > glibc-test.c
+
+	# Most of the time CC is already set, but not in early sanity checks.
+	nonfatal emake glibc-test CC="${CC-$(tc-getCC ${CTARGET})}"
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+do_run_test() {
+	local ret
+
+	if [[ ${MERGE_TYPE} == "binary" ]] ; then
+		# ignore build failures when installing a binary package #324685
+		do_compile_test "" "$@" 2>/dev/null || return 0
+	else
+		if ! do_compile_test "" "$@" ; then
+			ewarn "Simple build failed ... assuming this is desired #324685"
+			return 0
+		fi
+	fi
+
+	pushd "${T}" >/dev/null
+
+	./glibc-test
+	ret=$?
+	rm -f glibc-test*
+
+	popd >/dev/null
+
+	return ${ret}
+}
+
+setup_target_flags() {
+	# This largely mucks with compiler flags.  None of which should matter
+	# when building up just the headers.
+	just_headers && return 0
+
+	case $(tc-arch) in
+		x86)
+			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
+			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				filter-flags '-march=*'
+				export CFLAGS="-march=${t} ${CFLAGS}"
+				einfo "Auto adding -march=${t} to CFLAGS #185404"
+			fi
+		;;
+		amd64)
+			# -march needed for #185404 #199334
+			# TODO: See cross-compile issues listed above for x86.
+			[[ ${ABI} == x86 ]] &&
+			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
+				# Normally the target is x86_64-xxx, so turn that into the -march that
+				# gcc actually accepts. #528708
+				[[ ${t} == "x86_64" ]] && t="x86-64"
+				filter-flags '-march=*'
+				# ugly, ugly, ugly.  ugly.
+				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
+				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
+				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
+			fi
+		;;
+		mips)
+			# The mips abi cannot support the GNU style hashes. #233233
+			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
+		;;
+		ppc|ppc64)
+			# Many arch-specific implementations do not work on ppc with
+			# cache-block not equal to 128 bytes. This breaks memset:
+			#   https://sourceware.org/PR26522
+			#   https://bugs.gentoo.org/737996
+			# Use default -mcpu=. For ppc it means non-multiarch setup.
+			filter-flags '-mcpu=*'
+		;;
+		sparc)
+			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
+			filter-flags "-fcall-used-g7"
+			append-flags "-fcall-used-g6"
+
+			local cpu
+			case ${CTARGET} in
+			sparc64-*)
+				cpu="sparc64"
+				case $(get-flag mcpu) in
+				v9)
+					# We need to force at least v9a because the base build doesn't
+					# work with just v9.
+					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
+					append-flags "-Wa,-xarch=v9a"
+					;;
+				esac
+				;;
+			sparc-*)
+				case $(get-flag mcpu) in
+				v8|supersparc|hypersparc|leon|leon3)
+					cpu="sparcv8"
+					;;
+				*)
+					cpu="sparcv9"
+					;;
+				esac
+			;;
+			esac
+			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
+		;;
+	esac
+}
+
+setup_flags() {
+	# Make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+
+	# Store our CFLAGS because it's changed depending on which CTARGET
+	# we are building when pulling glibc on a multilib profile
+	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
+	CFLAGS=${CFLAGS_BASE}
+	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
+	CXXFLAGS=${CXXFLAGS_BASE}
+	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
+	ASFLAGS=${ASFLAGS_BASE}
+
+	# Allow users to explicitly avoid flag sanitization via
+	# USE=custom-cflags.
+	if ! use custom-cflags; then
+		# Over-zealous CFLAGS can often cause problems.  What may work for one
+		# person may not work for another.  To avoid a large influx of bugs
+		# relating to failed builds, we strip most CFLAGS out to ensure as few
+		# problems as possible.
+		strip-flags
+		# Lock glibc at -O2; we want to be conservative here.
+		filter-flags '-O?'
+		append-flags -O2
+	fi
+	strip-unsupported-flags
+	filter-flags -m32 -m64 '-mabi=*'
+
+	# glibc aborts if rpath is set by LDFLAGS
+	filter-ldflags '-Wl,-rpath=*'
+
+	# #492892
+	filter-flags -frecord-gcc-switches
+
+	unset CBUILD_OPT CTARGET_OPT
+	if use multilib ; then
+		CTARGET_OPT=$(get_abi_CTARGET)
+		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
+	fi
+
+	setup_target_flags
+
+	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
+		CBUILD_OPT=${CTARGET_OPT}
+	fi
+
+	# glibc's headers disallow -O0 and fail at build time:
+	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
+	replace-flags -O0 -O1
+
+	filter-flags '-fstack-protector*'
+}
+
+want_tls() {
+	# Archs that can use TLS (Thread Local Storage)
+	case $(tc-arch) in
+		x86)
+			# requires i486 or better #106556
+			[[ ${CTARGET} == i[4567]86* ]] && return 0
+			return 1
+		;;
+	esac
+	return 0
+}
+
+want__thread() {
+	want_tls || return 1
+
+	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
+	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
+
+	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
+
+	# only test gcc -- can't test linking yet
+	tc-has-tls -c ${CTARGET}
+	WANT__THREAD=$?
+
+	return ${WANT__THREAD}
+}
+
+use_multiarch() {
+	# Allow user to disable runtime arch detection in multilib.
+	use multiarch || return 1
+	# Make sure binutils is new enough to support indirect functions,
+	# #336792. This funky sed supports gold and bfd linkers.
+	local bver nver
+	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
+	case $(tc-arch ${CTARGET}) in
+	amd64|x86) nver="2.20" ;;
+	arm)       nver="2.22" ;;
+	hppa)      nver="2.23" ;;
+	ppc|ppc64) nver="2.20" ;;
+	# ifunc support was added in 2.23, but glibc also needs
+	# machinemode which is in 2.24.
+	s390)      nver="2.24" ;;
+	sparc)     nver="2.21" ;;
+	*)         return 1 ;;
+	esac
+	ver_test ${bver} -ge ${nver}
+}
+
+# Setup toolchain variables that had historically been defined in the
+# profiles for these archs.
+setup_env() {
+	# silly users
+	unset LD_RUN_PATH
+	unset LD_ASSUME_KERNEL
+
+	if is_crosscompile || tc-is-cross-compiler ; then
+		multilib_env ${CTARGET_OPT:-${CTARGET}}
+
+		if ! use multilib ; then
+			MULTILIB_ABIS=${DEFAULT_ABI}
+		else
+			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
+		fi
+
+		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
+		# and fall back on CFLAGS.
+		local VAR=CFLAGS_${CTARGET//[-.]/_}
+		CFLAGS=${!VAR-${CFLAGS}}
+		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	if just_headers ; then
+		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
+		# At this bootstrap stage we have only binutils for
+		# target but not compiler yet.
+		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
+		return 0
+	fi
+	local VAR=CFLAGS_${ABI}
+	# We need to export CFLAGS with abi information in them because glibc's
+	# configure script checks CFLAGS for some targets (like mips).  Keep
+	# around the original clean value to avoid appending multiple ABIs on
+	# top of each other.
+	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET})}
+	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+}
+
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if use multilib ; then
+		abilist=$(get_install_abis)
+	else
+		abilist=${DEFAULT_ABI}
+	fi
+	local -x ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	return ${ret}
+}
+
+glibc_banner() {
+	local b="Gentoo ${PVR}"
+	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+	echo "${b}"
+}
+
+# The following Kernel version handling functions are mostly copied from portage
+# source. It's better not to use linux-info.eclass here since a) it adds too
+# much magic, see bug 326693 for some of the arguments, and b) some of the
+# functions are just not provided.
+
+g_get_running_KV() {
+	uname -r
+	return $?
+}
+
+g_KV_major() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	echo "${KV%%.*}"
+}
+
+g_KV_minor() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.}
+	echo "${KV%%.*}"
+}
+
+g_KV_micro() {
+	[[ -z $1 ]] && return 1
+	local KV=$@
+	KV=${KV#*.*.}
+	echo "${KV%%[^[:digit:]]*}"
+}
+
+g_KV_to_int() {
+	[[ -z $1 ]] && return 1
+	local KV_MAJOR=$(g_KV_major "$1")
+	local KV_MINOR=$(g_KV_minor "$1")
+	local KV_MICRO=$(g_KV_micro "$1")
+	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	if [[ ${KV_int} -ge 131584 ]] ; then
+		echo "${KV_int}"
+		return 0
+	fi
+	return 1
+}
+
+g_int_to_KV() {
+	local version=$1 major minor micro
+	major=$((version / 65536))
+	minor=$(((version % 65536) / 256))
+	micro=$((version % 256))
+	echo ${major}.${minor}.${micro}
+}
+
+eend_KV() {
+	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
+	eend $?
+}
+
+get_kheader_version() {
+	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
+	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
+	tail -n 1
+}
+
+# We collect all sanity checks here. Consistency is not guranteed between
+# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
+# src_unpack.
+sanity_prechecks() {
+	# Prevent native builds from downgrading
+	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
+	   [[ -z ${ROOT} ]] && \
+	   [[ ${CBUILD} == ${CHOST} ]] && \
+	   [[ ${CHOST} == ${CTARGET} ]] ; then
+
+		# The high rev # is to allow people to downgrade between -r#
+		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
+		# should be fine. Hopefully we never actually use a r# this
+		# high.
+		if has_version ">${CATEGORY}/${P}-r10000" ; then
+			eerror "Sanity check to keep you from breaking your system:"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
+		fi
+
+		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
+			eerror "Your old kernel is broken. You need to update it to a newer"
+			eerror "version as syscall(<bignum>) will break. See bug 279260."
+			die "Old and broken kernel."
+		fi
+	fi
+
+	# Users have had a chance to phase themselves, time to give em the boot
+	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
+		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
+		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
+		die "Lazy upgrader detected"
+	fi
+
+	if [[ ${CTARGET} == i386-* ]] ; then
+		eerror "i386 CHOSTs are no longer supported."
+		eerror "Chances are you don't actually want/need i386."
+		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
+		die "Please fix your CHOST"
+	fi
+
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
+		ewarn "This will result in a 50% performance penalty when running with a 32bit"
+		ewarn "hypervisor, which is probably not what you want."
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
+		local entry
+		for entry in passwd group shadow; do
+			if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
+				eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
+				eerror "Please make sure you have 'files' entries for"
+				eerror "'passwd:', 'group:' and 'shadow:' databases."
+				eerror "For more details see:"
+				eerror "  https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
+				die "nsswitch.conf has no 'files' provider in '${entry}'."
+			fi
+		done
+	fi
+
+	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
+	# we test for...
+	if ! is_crosscompile ; then
+		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
+			ebegin "Checking that IA32 emulation is enabled in the running kernel"
+			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
+			local STAT
+			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
+				"${T}/check-ia32-emulation.elf32"
+				STAT=$?
+			else
+				# Don't fail here to allow single->multi ABI switch
+				# or recover from breakage like bug #646424
+				ewarn "Failed to compile the ABI test. Broken host glibc?"
+				STAT=0
+			fi
+			rm -f "${T}/check-ia32-emulation.elf32"
+			eend $STAT
+			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
+		fi
+
+	fi
+
+	# When we actually have to compile something...
+	if ! just_headers ; then
+		ebegin "Checking gcc for __thread support"
+		if ! eend $(want__thread ; echo $?) ; then
+			echo
+			eerror "Could not find a gcc that supports the __thread directive!"
+			eerror "Please update your binutils/gcc and try again."
+			die "No __thread support in gcc!"
+		fi
+
+		if [[ ${CTARGET} == *-linux* ]] ; then
+			local run_kv build_kv want_kv
+
+			run_kv=$(g_get_running_KV)
+			build_kv=$(g_int_to_KV $(get_kheader_version))
+			want_kv=${MIN_KERN_VER}
+
+			if ! is_crosscompile && ! tc-is-cross-compiler ; then
+				# Building fails on an non-supporting kernel
+				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
+				if ! eend_KV ${run_kv} ${want_kv} ; then
+					echo
+					eerror "You need a kernel of at least ${want_kv}!"
+					die "Kernel version too low!"
+				fi
+			fi
+
+			ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
+			if ! eend_KV ${build_kv} ${want_kv} ; then
+				echo
+				eerror "You need linux-headers of at least ${want_kv}!"
+				die "linux-headers version too low!"
+			fi
+		fi
+	fi
+}
+
+#
+# the phases
+#
+
+# pkg_pretend
+
+pkg_pretend() {
+	# All the checks...
+	einfo "Checking general environment sanity."
+	sanity_prechecks
+}
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
+# src_unpack
+
+src_unpack() {
+	# Consistency is not guaranteed between pkg_ and src_ ...
+	sanity_prechecks
+
+	use multilib && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
+
+	setup_env
+
+	if [[ ${PV} == 9999* ]] ; then
+		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
+		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		git-r3_src_unpack
+		mv patches-git/9999 patches || die
+
+		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
+		EGIT_CHECKOUT_DIR=${S}
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.xz
+
+		cd "${WORKDIR}" || die
+		unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
+	fi
+
+	cd "${WORKDIR}" || die
+	unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
+	use riscv && unpack backport-rv32.txz
+}
+
+src_prepare() {
+	local patchsetname
+	if ! use vanilla ; then
+		if [[ ${PV} == 9999* ]] ; then
+			patchsetname="from git master"
+		else
+			patchsetname="${RELEASE_VER}-${PATCH_VER}"
+		fi
+		elog "Applying Gentoo Glibc Patchset ${patchsetname}"
+		eapply "${WORKDIR}"/patches
+		einfo "Done."
+
+		if use riscv ; then
+			elog "Adding rv32 backport patchset for glibc-2.32 (experimental)"
+			eapply "${WORKDIR}"/backport-rv32
+			einfo "Done."
+		fi
+	fi
+
+	default
+
+	gnuconfig_update
+
+	cd "${WORKDIR}"
+	find . -name configure -exec touch {} +
+
+	# move the external locale-gen to its old place
+	mkdir extra || die
+	mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
+
+	eprefixify extra/locale/locale-gen
+
+	# Fix permissions on some of the scripts.
+	chmod u+x "${S}"/scripts/*.sh
+
+	cd "${S}"
+}
+
+glibc_do_configure() {
+	# Glibc does not work with gold (for various reasons) #269274.
+	tc-ld-disable-gold
+
+	# CXX isnt handled by the multilib system, so if we dont unset here
+	# we accumulate crap across abis
+	unset CXX
+
+	einfo "Configuring glibc for nptl"
+
+	if use doc ; then
+		export MAKEINFO=makeinfo
+	else
+		export MAKEINFO=/dev/null
+	fi
+
+	local v
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM READELF; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+
+	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
+	# To build .S (assembly) files with the same ABI-specific flags
+	# upstream currently recommends adding CFLAGS to CC/CXX:
+	#    https://sourceware.org/PR23273
+	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
+	# and breaks multiarch support. See 659030#c3 for an example.
+	# The glibc configure script doesn't properly use LDFLAGS all the time.
+	export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}"
+	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
+
+	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
+	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}"
+
+	if is_crosscompile; then
+		# Assume worst-case bootstrap: glibc is buil first time
+		# when ${CTARGET}-g++ is not available yet. We avoid
+		# building auxiliary programs that require C++: bug #683074
+		# It should not affect final result.
+		export libc_cv_cxx_link_ok=no
+		# The line above has the same effect. We set CXX explicitly
+		# to make build logs less confusing.
+		export CXX=
+	fi
+	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
+
+	# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
+	# can't detect them automatically due to ${CHOST} mismatch and fallbacks
+	# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
+	export NM="$(tc-getNM ${CTARGET})"
+	export READELF="$(tc-getREADELF ${CTARGET})"
+	einfo " $(printf '%15s' 'Manual NM:')   ${NM}"
+	einfo " $(printf '%15s' 'Manual READELF:')   ${READELF}"
+
+	echo
+
+	local myconf=()
+
+	case ${CTARGET} in
+		m68k*)
+			# setjmp() is not compatible with stack protection:
+			# https://sourceware.org/PR24202
+			myconf+=( --enable-stack-protector=no )
+			;;
+		powerpc-*)
+			# Currently gcc on powerpc32 generates invalid code for
+			# __builtin_return_address(0) calls. Normally programs
+			# don't do that but malloc hooks in glibc do:
+			# https://gcc.gnu.org/PR81996
+			# https://bugs.gentoo.org/629054
+			myconf+=( --enable-stack-protector=no )
+			;;
+		*)
+			# Use '=strong' instead of '=all' to protect only functions
+			# worth protecting from stack smashes.
+			# '=all' is also known to have a problem in IFUNC resolution
+			# tests: https://sourceware.org/PR25680, bug #712356.
+			myconf+=( --enable-stack-protector=$(usex ssp strong no) )
+			;;
+	esac
+	myconf+=( --enable-stackguard-randomization )
+
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
+	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
+	case ${CTARGET} in
+		x86_64-*) myconf+=( $(use_enable cet) ) ;;
+		*) ;;
+	esac
+
+	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
+
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
+
+	# Since SELinux support is only required for nscd, only enable it if:
+	# 1. USE selinux
+	# 2. only for the primary ABI on multilib systems
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
+		if use multilib ; then
+			if is_final_abi ; then
+				myconf+=( --with-selinux )
+			else
+				myconf+=( --without-selinux )
+			fi
+		else
+			myconf+=( --with-selinux )
+		fi
+	else
+		myconf+=( --without-selinux )
+	fi
+
+	# Force a few tests where we always know the answer but
+	# configure is incapable of finding it.
+	if is_crosscompile ; then
+		export \
+			libc_cv_c_cleanup=yes \
+			libc_cv_forced_unwind=yes
+	fi
+
+	myconf+=(
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		$(use_enable profile)
+		$(use_with gd)
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		--sysconfdir="$(host_eprefix)/etc"
+		--localstatedir="$(host_eprefix)/var"
+		--libdir='$(prefix)'/$(get_libdir)
+		--mandir='$(prefix)'/share/man
+		--infodir='$(prefix)'/share/info
+		--libexecdir='$(libdir)'/misc/glibc
+		--with-bugurl=https://bugs.gentoo.org/
+		--with-pkgversion="$(glibc_banner)"
+		$(use_enable crypt)
+		$(use_multiarch || echo --disable-multi-arch)
+		$(use_enable static-pie)
+		$(use_enable systemtap)
+		$(use_enable nscd)
+		${EXTRA_ECONF}
+	)
+
+	# We rely on sys-libs/timezone-data for timezone tools normally.
+	myconf+=( $(use_enable vanilla timezone-tools) )
+
+	# These libs don't have configure flags.
+	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
+	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
+
+	# There is no configure option for this and we need to export it
+	# since the glibc build will re-run configure on itself
+	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
+	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
+
+	# We take care of patching our binutils to use both hash styles,
+	# and many people like to force gnu hash style only, so disable
+	# this overriding check.  #347761
+	export libc_cv_hashstyle=no
+
+	local builddir=$(builddir nptl)
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+	set -- "${S}"/configure "${myconf[@]}"
+	echo "$@"
+	"$@" || die "failed to configure glibc"
+
+	# ia64 static cross-compilers are a pita in so much that they
+	# can't produce static ELFs (as the libgcc.a is broken).  so
+	# disable building of the programs for those targets if it
+	# doesn't work.
+	# XXX: We could turn this into a compiler test, but ia64 is
+	# the only one that matters, so this should be fine for now.
+	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
+		sed -i '1i+link-static = touch $@' config.make
+	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	#
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
+		echo 'main(){}' > "${T}"/test.c
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+		fi
+	fi
+}
+
+glibc_headers_configure() {
+	export ABI=default
+
+	local builddir=$(builddir "headers")
+	mkdir -p "${builddir}"
+	cd "${builddir}"
+
+	# if we don't have a compiler yet, we can't really test it now ...
+	# hopefully they don't affect header generation, so let's hope for
+	# the best here ...
+	local v vars=(
+		ac_cv_header_cpuid_h=yes
+		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
+		libc_cv_asm_cfi_directives=yes
+		libc_cv_broken_visibility_attribute=no
+		libc_cv_c_cleanup=yes
+		libc_cv_compiler_powerpc64le_binary128_ok=yes
+		libc_cv_forced_unwind=yes
+		libc_cv_gcc___thread=yes
+		libc_cv_mlong_double_128=yes
+		libc_cv_mlong_double_128ibm=yes
+		libc_cv_ppc_machine=yes
+		libc_cv_ppc_rel16=yes
+		libc_cv_predef_fortify_source=no
+		libc_cv_target_power8_ok=yes
+		libc_cv_visibility_attribute=yes
+		libc_cv_z_combreloc=yes
+		libc_cv_z_execstack=yes
+		libc_cv_z_initfirst=yes
+		libc_cv_z_nodelete=yes
+		libc_cv_z_nodlopen=yes
+		libc_cv_z_relro=yes
+		libc_mips_abi=${ABI}
+		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
+		# These libs don't have configure flags.
+		ac_cv_lib_audit_audit_log_user_avc_message=no
+		ac_cv_lib_cap_cap_init=no
+	)
+
+	einfo "Forcing cached settings:"
+	for v in "${vars[@]}" ; do
+		einfo " ${v}"
+		export ${v}
+	done
+
+	local headers_only_arch_CPPFLAGS=()
+
+	# Blow away some random CC settings that screw things up. #550192
+	if [[ -d ${S}/sysdeps/mips ]]; then
+		pushd "${S}"/sysdeps/mips >/dev/null
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
+		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
+
+		# Force the mips ABI to the default.  This is OK because the set of
+		# installed headers in this phase is the same between the 3 ABIs.
+		# If this ever changes, this hack will break, but that's unlikely
+		# as glibc discourages that behavior.
+		# https://crbug.com/647033
+		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
+
+		popd >/dev/null
+	fi
+
+	case ${CTARGET} in
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
+	local myconf=()
+	myconf+=(
+		--disable-sanity-checks
+		--enable-hacker-mode
+		--without-cvs
+		--disable-werror
+		--enable-bind-now
+		--build=${CBUILD_OPT:-${CBUILD}}
+		--host=${CTARGET_OPT:-${CTARGET}}
+		--with-headers=$(build_eprefix)$(alt_build_headers)
+		--prefix="$(host_eprefix)/usr"
+		${EXTRA_ECONF}
+	)
+
+	# Nothing is compiled here which would affect the headers for the target.
+	# So forcing CC/CFLAGS is sane.
+	local headers_only_CC=$(tc-getBUILD_CC)
+	local headers_only_CFLAGS="-O1 -pipe"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
+	local headers_only_LDFLAGS=""
+	set -- "${S}"/configure "${myconf[@]}"
+	echo \
+		"CC=${headers_only_CC}" \
+		"CFLAGS=${headers_only_CFLAGS}" \
+		"CPPFLAGS=${headers_only_CPPFLAGS}" \
+		"LDFLAGS=${headers_only_LDFLAGS}" \
+		"$@"
+	CC=${headers_only_CC} \
+	CFLAGS=${headers_only_CFLAGS} \
+	CPPFLAGS=${headers_only_CPPFLAGS} \
+	LDFLAGS="" \
+	"$@" || die "failed to configure glibc"
+}
+
+do_src_configure() {
+	if just_headers ; then
+		glibc_headers_configure
+	else
+		glibc_do_configure nptl
+	fi
+}
+
+src_configure() {
+	foreach_abi do_src_configure
+}
+
+do_src_compile() {
+	emake -C "$(builddir nptl)"
+}
+
+src_compile() {
+	if just_headers ; then
+		return
+	fi
+
+	foreach_abi do_src_compile
+}
+
+glibc_src_test() {
+	cd "$(builddir nptl)"
+
+	local myxfailparams=""
+	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
+		for myt in ${XFAIL_TEST_LIST[@]} ; do
+			myxfailparams+="test-xfail-${myt}=yes "
+		done
+	fi
+
+	# sandbox does not understand unshare() and prevents
+	# writes to /proc/, which makes many tests fail
+
+	SANDBOX_ON=0 LD_PRELOAD= emake ${myxfailparams} check
+}
+
+do_src_test() {
+	local ret=0
+
+	glibc_src_test
+	: $(( ret |= $? ))
+
+	return ${ret}
+}
+
+src_test() {
+	if just_headers ; then
+		return
+	fi
+
+	# Give tests more time to complete.
+	export TIMEOUTFACTOR=5
+
+	foreach_abi do_src_test || die "tests failed"
+}
+
+run_locale_gen() {
+	# if the host locales.gen contains no entries, we'll install everything
+	local root="$1"
+	local inplace=""
+
+	if [[ "${root}" == "--inplace-glibc" ]] ; then
+		inplace="--inplace-glibc"
+		root="$2"
+	fi
+
+	local locale_list="${root}/etc/locale.gen"
+
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
+		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+		locale_list="${root}/usr/share/i18n/SUPPORTED"
+	fi
+
+	set -- locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
+		--destdir "${root}"
+	echo "$@"
+	"$@"
+
+	popd >/dev/null
+}
+
+glibc_do_src_install() {
+	local builddir=$(builddir nptl)
+	cd "${builddir}"
+
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
+
+	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
+	# which come without headers etc. Only needed for binary packages since the
+	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
+	find "${D}" -name "libnsl.a" -delete
+	find "${D}" -name "libnsl.so" -delete
+
+	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
+	# to infer upstream version:
+	# '#define VERSION "2.26.90"' -> '2.26.90'
+	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
+
+	# Avoid stripping binaries not targeted by ${CHOST}. Or else
+	# ${CHOST}-strip would break binaries build for ${CTARGET}.
+	is_crosscompile && dostrip -x /
+	# gdb thread introspection relies on local libpthreas symbols. stripping breaks it
+	# See Note [Disable automatic stripping]
+	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
+
+	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
+		# Move versioned .a file out of libdir to evade portage QA checks
+		# instead of using gen_usr_ldscript(). We fix ldscript as:
+		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
+		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
+		dodir $(alt_usrlibdir)/${P}
+		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
+	fi
+
+	# We'll take care of the cache ourselves
+	rm -f "${ED}"/etc/ld.so.cache
+
+	# Everything past this point just needs to be done once ...
+	is_final_abi || return 0
+
+	# Make sure the non-native interp can be found on multilib systems even
+	# if the main library set isn't installed into the right place.  Maybe
+	# we should query the active gcc for info instead of hardcoding it ?
+	local i ldso_abi ldso_name
+	local ldso_abi_list=(
+		# x86
+		amd64   /lib64/ld-linux-x86-64.so.2
+		x32     /libx32/ld-linux-x32.so.2
+		x86     /lib/ld-linux.so.2
+		# mips
+		o32     /lib/ld.so.1
+		n32     /lib32/ld.so.1
+		n64     /lib64/ld.so.1
+		# powerpc
+		ppc     /lib/ld.so.1
+		ppc64   /lib64/ld64.so.1
+		# riscv
+		ilp32d  /lib/ld-linux-riscv32-ilp32d.so.1
+		ilp32   /lib/ld-linux-riscv32-ilp32.so.1
+		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
+		lp64    /lib/ld-linux-riscv64-lp64.so.1
+		# s390
+		s390    /lib/ld.so.1
+		s390x   /lib/ld64.so.1
+		# sparc
+		sparc32 /lib/ld-linux.so.2
+		sparc64 /lib64/ld-linux.so.2
+	)
+	case $(tc-endian) in
+	little)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64.so.1
+		)
+		;;
+	big)
+		ldso_abi_list+=(
+			# arm
+			arm64   /lib/ld-linux-aarch64_be.so.1
+		)
+		;;
+	esac
+	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
+	fi
+	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
+		ldso_abi=${ldso_abi_list[i]}
+		has ${ldso_abi} $(get_install_abis) || continue
+
+		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
+		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
+			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
+		fi
+	done
+
+	# With devpts under Linux mounted properly, we do not need the pt_chown
+	# binary to be setuid.  This is because the default owners/perms will be
+	# exactly what we want.
+	if ! use suid ; then
+		find "${ED}" -name pt_chown -exec chmod -s {} +
+	fi
+
+	#################################################################
+	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+	# Make sure we install some symlink hacks so that when we build
+	# a 2nd stage cross-compiler, gcc finds the target system
+	# headers correctly.  See gcc/doc/gccinstall.info
+	if is_crosscompile ; then
+		# We need to make sure that /lib and /usr/lib always exists.
+		# gcc likes to use relative paths to get to its multilibs like
+		# /usr/lib/../lib64/.  So while we don't install any files into
+		# /usr/lib/, we do need it to exist.
+		keepdir $(alt_prefix)/lib
+		keepdir $(alt_prefix)/usr/lib
+
+		dosym usr/include $(alt_prefix)/sys-include
+		return 0
+	fi
+
+	# Files for Debian-style locale updating
+	dodir /usr/share/i18n
+	sed \
+		-e "/^#/d" \
+		-e "/SUPPORTED-LOCALES=/d" \
+		-e "s: \\\\::g" -e "s:/: :g" \
+		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
+		|| die "generating /usr/share/i18n/SUPPORTED failed"
+	cd "${WORKDIR}"/extra/locale
+	dosbin locale-gen
+	doman *.[0-8]
+	insinto /etc
+	doins locale.gen
+
+	# Make sure all the ABI's can find the locales and so we only
+	# have to generate one set
+	local a
+	keepdir /usr/$(get_libdir)/locale
+	for a in $(get_install_abis) ; do
+		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
+			dosym ../$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
+		fi
+	done
+
+	# HACK: If we're building for riscv, we need to additionally make sure that
+	# we can find the locale archive afterwards
+	case ${CTARGET} in
+		riscv*)
+			if [[ ! -e ${ED}/usr/lib/locale ]] ; then
+				dosym ../$(get_libdir)/locale /usr/lib/locale
+			fi
+			;;
+		*) ;;
+	esac
+
+	cd "${S}"
+
+	# Install misc network config files
+	insinto /etc
+	doins posix/gai.conf nss/nsswitch.conf
+
+	# Gentoo-specific
+	newins "${FILESDIR}"/host.conf-1 host.conf
+
+	if use nscd ; then
+		doins nscd/nscd.conf
+
+		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
+
+		local nscd_args=(
+			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
+		)
+
+		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
+
+		systemd_dounit nscd/nscd.service
+		systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf
+	fi
+
+	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
+	doenvd "${T}"/00glibc
+
+	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
+		[[ -s ${d} ]] && dodoc ${d}
+	done
+	dodoc -r ChangeLog.old
+
+	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
+	# creation of the "factory" symlink in pkg_postinst().
+	rm -f "${ED}"/etc/localtime
+
+	# Generate all locales if this is a native build as locale generation
+	if use compile-locales && ! is_crosscompile ; then
+		run_locale_gen --inplace-glibc "${ED}/"
+		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
+	fi
+}
+
+glibc_headers_install() {
+	local builddir=$(builddir "headers")
+	cd "${builddir}"
+	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
+
+	insinto $(alt_headers)/gnu
+	doins "${S}"/include/gnu/stubs.h
+
+	# Make sure we install the sys-include symlink so that when
+	# we build a 2nd stage cross-compiler, gcc finds the target
+	# system headers correctly.  See gcc/doc/gccinstall.info
+	dosym usr/include $(alt_prefix)/sys-include
+}
+
+src_install() {
+	if just_headers ; then
+		export ABI=default
+		glibc_headers_install
+		return
+	fi
+
+	foreach_abi glibc_do_src_install
+
+	if ! use static-libs ; then
+		elog "Not installing static glibc libraries"
+		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+	fi
+}
+
+# Simple test to make sure our new glibc isn't completely broken.
+# Make sure we don't test with statically built binaries since
+# they will fail.  Also, skip if this glibc is a cross compiler.
+#
+# If coreutils is built with USE=multicall, some of these files
+# will just be wrapper scripts, not actual ELFs we can test.
+glibc_sanity_check() {
+	cd / #228809
+
+	# We enter ${ED} so to avoid trouble if the path contains
+	# special characters; for instance if the path contains the
+	# colon character (:), then the linker will try to split it
+	# and look for the libraries in an unexpected place. This can
+	# lead to unsafe code execution if the generated prefix is
+	# within a world-writable directory.
+	# (e.g. /var/tmp/portage:${HOSTNAME})
+	pushd "${ED}"/$(get_libdir) >/dev/null
+
+	local x striptest
+	for x in cal date env free ls true uname uptime ; do
+		x=$(type -p ${x})
+		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
+		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
+		case ${striptest} in
+		*"statically linked"*) continue;;
+		*"ASCII text"*) continue;;
+		esac
+		# We need to clear the locale settings as the upgrade might want
+		# incompatible locale data.  This test is not for verifying that.
+		LC_ALL=C \
+		./ld-*.so --library-path . ${x} > /dev/null \
+			|| die "simple run test (${x}) failed"
+	done
+
+	popd >/dev/null
+}
+
+pkg_preinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	# prepare /etc/ld.so.conf.d/ for files
+	mkdir -p "${EROOT}"/etc/ld.so.conf.d
+
+	# Default /etc/hosts.conf:multi to on for systems with small dbs.
+	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
+		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
+		einfo "Defaulting /etc/host.conf:multi to on"
+	fi
+
+	[[ -n ${ROOT} ]] && return 0
+	[[ -d ${ED}/$(get_libdir) ]] || return 0
+	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
+}
+
+pkg_postinst() {
+	# nothing to do if just installing headers
+	just_headers && return
+
+	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
+		# Generate fastloading iconv module configuration file.
+		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
+	fi
+
+	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
+		use compile-locales || run_locale_gen "${EROOT}/"
+	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
+}
diff --git a/sys-libs/glibc/glibc-2.32.ebuild b/sys-libs/glibc/glibc-2.32.ebuild
deleted file mode 100644
index bf2ba5df8529..000000000000
--- a/sys-libs/glibc/glibc-2.32.ebuild
+++ /dev/null
@@ -1,1495 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
-	multilib systemd multiprocessing
-
-DESCRIPTION="GNU libc C library"
-HOMEPAGE="https://www.gnu.org/software/libc/"
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-SLOT="2.2"
-
-EMULTILIB_PKG="true"
-
-# Gentoo patchset (ignored for live ebuilds)
-PATCH_VER=1
-PATCH_DEV=dilfridge
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
-	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
-fi
-
-RELEASE_VER=${PV}
-
-GCC_BOOTSTRAP_VER=20180511
-
-LOCALE_GEN_VER=2.10
-
-SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
-SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
-
-IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla"
-
-# Minimum kernel version that glibc requires
-MIN_KERN_VER="3.2.0"
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-#
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-# Note [Disable automatic stripping]
-# Disabling automatic stripping for a few reasons:
-# - portage's attempt to strip breaks non-native binaries at least on
-#   arm: bug #697428
-# - portage's attempt to strip libpthread.so.0 breaks gdb thread
-#   enumeration: bug #697910. This is quite subtle:
-#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
-#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
-#     via 'ps_pglobal_lookup' symbol defined in gdb.
-#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
-#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
-#     (unexported) is used to sanity check compatibility before enabling
-#     debugging.
-#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
-#   * normal 'strip' command trims '.symtab'
-#   Thus our main goal here is to prevent 'libpthread.so.0' from
-#   losing it's '.symtab' entries.
-# As Gentoo's strip does not allow us to pass less aggressive stripping
-# options and does not check the machine target we strip selectively.
-
-# We need a new-enough binutils/gcc to match upstream baseline.
-# Also we need to make sure our binutils/gcc supports TLS,
-# and that gcc already contains the hardened patches.
-# Lastly, let's avoid some openssh nastiness, bug 708224, as
-# convenience to our users.
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-misc/pax-utils-0.1.10
-	sys-devel/bison
-	doc? ( sys-apps/texinfo )
-"
-COMMON_DEPEND="
-	gd? ( media-libs/gd:2= )
-	nscd? ( selinux? (
-		audit? ( sys-process/audit )
-		caps? ( sys-libs/libcap )
-	) )
-	suid? ( caps? ( sys-libs/libcap ) )
-	selinux? ( sys-libs/libselinux )
-	systemtap? ( dev-util/systemtap )
-	!<net-misc/openssh-8.1_p1-r2
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=net-dns/libidn2-2.3.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/gentoo-functions
-"
-
-RESTRICT="!test? ( test )"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	BDEPEND+=" !headers-only? (
-		>=${CATEGORY}/binutils-2.24
-		>=${CATEGORY}/gcc-6
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	BDEPEND+="
-		>=sys-devel/binutils-2.24
-		>=sys-devel/gcc-6
-	"
-	DEPEND+=" virtual/os-headers "
-	RDEPEND+="
-		>=net-dns/libidn2-2.3.0
-		vanilla? ( !sys-libs/timezone-data )
-	"
-	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-# Ignore tests whitelisted below
-GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
-
-# The following tests fail due to the Gentoo build system and are thus
-# executed but ignored:
-XFAIL_TEST_LIST=(
-	# 9) Failures of unknown origin
-	tst-latepthread
-
-	# buggy test, assumes /dev/ and /dev/null on a single filesystem
-	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
-	# https://sourceware.org/PR25909
-	tst-support_descriptors
-
-	# Flaky test, known to fail occasionally:
-	# https://sourceware.org/PR19329
-	# https://bugs.gentoo.org/719674#c12
-	tst-stack4
-)
-
-#
-# Small helper functions
-#
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	is_crosscompile && use headers-only
-}
-
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-
-# This prefix is applicable to CHOST when building against this
-# glibc. It is baked into the library at configure time.
-host_eprefix() {
-	is_crosscompile || echo "${EPREFIX}"
-}
-
-# This prefix is applicable to CBUILD when building against this
-# glibc. It determines the destination path at install time.
-build_eprefix() {
-	is_crosscompile && echo "${EPREFIX}"
-}
-
-# We need to be able to set alternative headers for compiling for non-native
-# platform. Will also become useful for testing kernel-headers without screwing
-# up the whole system.
-alt_headers() {
-	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
-}
-
-alt_build_headers() {
-	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
-		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
-		if tc-is-cross-compiler ; then
-			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
-			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
-				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
-				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
-			fi
-		fi
-	fi
-	echo "${ALT_BUILD_HEADERS}"
-}
-
-alt_libdir() {
-	echo $(alt_prefix)/$(get_libdir)
-}
-alt_usrlibdir() {
-	echo $(alt_prefix)/usr/$(get_libdir)
-}
-
-builddir() {
-	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
-}
-
-do_compile_test() {
-	local ret save_cflags=${CFLAGS}
-	CFLAGS+=" $1"
-	shift
-
-	pushd "${T}" >/dev/null
-
-	rm -f glibc-test*
-	printf '%b' "$*" > glibc-test.c
-
-	# Most of the time CC is already set, but not in early sanity checks.
-	nonfatal emake glibc-test CC="${CC-$(tc-getCC ${CTARGET})}"
-	ret=$?
-
-	popd >/dev/null
-
-	CFLAGS=${save_cflags}
-	return ${ret}
-}
-
-do_run_test() {
-	local ret
-
-	if [[ ${MERGE_TYPE} == "binary" ]] ; then
-		# ignore build failures when installing a binary package #324685
-		do_compile_test "" "$@" 2>/dev/null || return 0
-	else
-		if ! do_compile_test "" "$@" ; then
-			ewarn "Simple build failed ... assuming this is desired #324685"
-			return 0
-		fi
-	fi
-
-	pushd "${T}" >/dev/null
-
-	./glibc-test
-	ret=$?
-	rm -f glibc-test*
-
-	popd >/dev/null
-
-	return ${ret}
-}
-
-setup_target_flags() {
-	# This largely mucks with compiler flags.  None of which should matter
-	# when building up just the headers.
-	just_headers && return 0
-
-	case $(tc-arch) in
-		x86)
-			# -march needed for #185404 #199334
-			# TODO: When creating the first glibc cross-compile, this test will
-			# always fail as it does a full link which in turn requires glibc.
-			# Probably also applies when changing multilib profile settings (e.g.
-			# enabling x86 when the profile was amd64-only previously).
-			# We could change main to _start and pass -nostdlib here so that we
-			# only test the gcc code compilation.  Or we could do a compile and
-			# then look for the symbol via scanelf.
-			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
-				local t=${CTARGET_OPT:-${CTARGET}}
-				t=${t%%-*}
-				filter-flags '-march=*'
-				export CFLAGS="-march=${t} ${CFLAGS}"
-				einfo "Auto adding -march=${t} to CFLAGS #185404"
-			fi
-		;;
-		amd64)
-			# -march needed for #185404 #199334
-			# TODO: See cross-compile issues listed above for x86.
-			[[ ${ABI} == x86 ]] &&
-			if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
-				local t=${CTARGET_OPT:-${CTARGET}}
-				t=${t%%-*}
-				# Normally the target is x86_64-xxx, so turn that into the -march that
-				# gcc actually accepts. #528708
-				[[ ${t} == "x86_64" ]] && t="x86-64"
-				filter-flags '-march=*'
-				# ugly, ugly, ugly.  ugly.
-				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
-				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
-				einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
-			fi
-		;;
-		mips)
-			# The mips abi cannot support the GNU style hashes. #233233
-			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
-		;;
-		ppc|ppc64)
-			# Many arch-specific implementations do not work on ppc with
-			# cache-block not equal to 128 bytes. This breaks memset:
-			#   https://sourceware.org/PR26522
-			#   https://bugs.gentoo.org/737996
-			# Use default -mcpu=. For ppc it means non-multiarch setup.
-			filter-flags '-mcpu=*'
-		;;
-		sparc)
-			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
-			filter-flags "-fcall-used-g7"
-			append-flags "-fcall-used-g6"
-
-			local cpu
-			case ${CTARGET} in
-			sparc64-*)
-				cpu="sparc64"
-				case $(get-flag mcpu) in
-				v9)
-					# We need to force at least v9a because the base build doesn't
-					# work with just v9.
-					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
-					append-flags "-Wa,-xarch=v9a"
-					;;
-				esac
-				;;
-			sparc-*)
-				case $(get-flag mcpu) in
-				v8|supersparc|hypersparc|leon|leon3)
-					cpu="sparcv8"
-					;;
-				*)
-					cpu="sparcv9"
-					;;
-				esac
-			;;
-			esac
-			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
-		;;
-	esac
-}
-
-setup_flags() {
-	# Make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-
-	# Store our CFLAGS because it's changed depending on which CTARGET
-	# we are building when pulling glibc on a multilib profile
-	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
-	CFLAGS=${CFLAGS_BASE}
-	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
-	CXXFLAGS=${CXXFLAGS_BASE}
-	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
-	ASFLAGS=${ASFLAGS_BASE}
-
-	# Allow users to explicitly avoid flag sanitization via
-	# USE=custom-cflags.
-	if ! use custom-cflags; then
-		# Over-zealous CFLAGS can often cause problems.  What may work for one
-		# person may not work for another.  To avoid a large influx of bugs
-		# relating to failed builds, we strip most CFLAGS out to ensure as few
-		# problems as possible.
-		strip-flags
-		# Lock glibc at -O2; we want to be conservative here.
-		filter-flags '-O?'
-		append-flags -O2
-	fi
-	strip-unsupported-flags
-	filter-flags -m32 -m64 '-mabi=*'
-
-	# glibc aborts if rpath is set by LDFLAGS
-	filter-ldflags '-Wl,-rpath=*'
-
-	# #492892
-	filter-flags -frecord-gcc-switches
-
-	unset CBUILD_OPT CTARGET_OPT
-	if use multilib ; then
-		CTARGET_OPT=$(get_abi_CTARGET)
-		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
-	fi
-
-	setup_target_flags
-
-	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
-		CBUILD_OPT=${CTARGET_OPT}
-	fi
-
-	# glibc's headers disallow -O0 and fail at build time:
-	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
-	replace-flags -O0 -O1
-
-	filter-flags '-fstack-protector*'
-}
-
-want_tls() {
-	# Archs that can use TLS (Thread Local Storage)
-	case $(tc-arch) in
-		x86)
-			# requires i486 or better #106556
-			[[ ${CTARGET} == i[4567]86* ]] && return 0
-			return 1
-		;;
-	esac
-	return 0
-}
-
-want__thread() {
-	want_tls || return 1
-
-	# For some reason --with-tls --with__thread is causing segfaults on sparc32.
-	[[ ${PROFILE_ARCH} == "sparc" ]] && return 1
-
-	[[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD}
-
-	# only test gcc -- can't test linking yet
-	tc-has-tls -c ${CTARGET}
-	WANT__THREAD=$?
-
-	return ${WANT__THREAD}
-}
-
-use_multiarch() {
-	# Allow user to disable runtime arch detection in multilib.
-	use multiarch || return 1
-	# Make sure binutils is new enough to support indirect functions,
-	# #336792. This funky sed supports gold and bfd linkers.
-	local bver nver
-	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
-	case $(tc-arch ${CTARGET}) in
-	amd64|x86) nver="2.20" ;;
-	arm)       nver="2.22" ;;
-	hppa)      nver="2.23" ;;
-	ppc|ppc64) nver="2.20" ;;
-	# ifunc support was added in 2.23, but glibc also needs
-	# machinemode which is in 2.24.
-	s390)      nver="2.24" ;;
-	sparc)     nver="2.21" ;;
-	*)         return 1 ;;
-	esac
-	ver_test ${bver} -ge ${nver}
-}
-
-# Setup toolchain variables that had historically been defined in the
-# profiles for these archs.
-setup_env() {
-	# silly users
-	unset LD_RUN_PATH
-	unset LD_ASSUME_KERNEL
-
-	if is_crosscompile || tc-is-cross-compiler ; then
-		multilib_env ${CTARGET_OPT:-${CTARGET}}
-
-		if ! use multilib ; then
-			MULTILIB_ABIS=${DEFAULT_ABI}
-		else
-			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
-		fi
-
-		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
-		# and fall back on CFLAGS.
-		local VAR=CFLAGS_${CTARGET//[-.]/_}
-		CFLAGS=${!VAR-${CFLAGS}}
-		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
-	fi
-
-	setup_flags
-
-	export ABI=${ABI:-${DEFAULT_ABI:-default}}
-
-	if just_headers ; then
-		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
-		# At this bootstrap stage we have only binutils for
-		# target but not compiler yet.
-		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
-		return 0
-	fi
-	local VAR=CFLAGS_${ABI}
-	# We need to export CFLAGS with abi information in them because glibc's
-	# configure script checks CFLAGS for some targets (like mips).  Keep
-	# around the original clean value to avoid appending multiple ABIs on
-	# top of each other.
-	: ${__GLIBC_CC:=$(tc-getCC ${CTARGET})}
-	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
-	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
-}
-
-foreach_abi() {
-	setup_env
-
-	local ret=0
-	local abilist=""
-	if use multilib ; then
-		abilist=$(get_install_abis)
-	else
-		abilist=${DEFAULT_ABI}
-	fi
-	local -x ABI
-	for ABI in ${abilist:-default} ; do
-		setup_env
-		einfo "Running $1 for ABI ${ABI}"
-		$1
-		: $(( ret |= $? ))
-	done
-	return ${ret}
-}
-
-glibc_banner() {
-	local b="Gentoo ${PVR}"
-	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
-	echo "${b}"
-}
-
-# The following Kernel version handling functions are mostly copied from portage
-# source. It's better not to use linux-info.eclass here since a) it adds too
-# much magic, see bug 326693 for some of the arguments, and b) some of the
-# functions are just not provided.
-
-g_get_running_KV() {
-	uname -r
-	return $?
-}
-
-g_KV_major() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	echo "${KV%%.*}"
-}
-
-g_KV_minor() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	KV=${KV#*.}
-	echo "${KV%%.*}"
-}
-
-g_KV_micro() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	KV=${KV#*.*.}
-	echo "${KV%%[^[:digit:]]*}"
-}
-
-g_KV_to_int() {
-	[[ -z $1 ]] && return 1
-	local KV_MAJOR=$(g_KV_major "$1")
-	local KV_MINOR=$(g_KV_minor "$1")
-	local KV_MICRO=$(g_KV_micro "$1")
-	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
-
-	# We make version 2.2.0 the minimum version we will handle as
-	# a sanity check ... if its less, we fail ...
-	if [[ ${KV_int} -ge 131584 ]] ; then
-		echo "${KV_int}"
-		return 0
-	fi
-	return 1
-}
-
-g_int_to_KV() {
-	local version=$1 major minor micro
-	major=$((version / 65536))
-	minor=$(((version % 65536) / 256))
-	micro=$((version % 256))
-	echo ${major}.${minor}.${micro}
-}
-
-eend_KV() {
-	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
-	eend $?
-}
-
-get_kheader_version() {
-	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
-	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
-	tail -n 1
-}
-
-# We collect all sanity checks here. Consistency is not guranteed between
-# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
-# src_unpack.
-sanity_prechecks() {
-	# Prevent native builds from downgrading
-	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
-	   [[ -z ${ROOT} ]] && \
-	   [[ ${CBUILD} == ${CHOST} ]] && \
-	   [[ ${CHOST} == ${CTARGET} ]] ; then
-
-		# The high rev # is to allow people to downgrade between -r#
-		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
-		# should be fine. Hopefully we never actually use a r# this
-		# high.
-		if has_version ">${CATEGORY}/${P}-r10000" ; then
-			eerror "Sanity check to keep you from breaking your system:"
-			eerror " Downgrading glibc is not supported and a sure way to destruction."
-			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
-		fi
-
-		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
-			eerror "Your old kernel is broken. You need to update it to a newer"
-			eerror "version as syscall(<bignum>) will break. See bug 279260."
-			die "Old and broken kernel."
-		fi
-	fi
-
-	# Users have had a chance to phase themselves, time to give em the boot
-	if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
-		eerror "You still haven't deleted ${EROOT}/etc/locales.build."
-		eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
-		die "Lazy upgrader detected"
-	fi
-
-	if [[ ${CTARGET} == i386-* ]] ; then
-		eerror "i386 CHOSTs are no longer supported."
-		eerror "Chances are you don't actually want/need i386."
-		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
-		die "Please fix your CHOST"
-	fi
-
-	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
-		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
-		ewarn "This will result in a 50% performance penalty when running with a 32bit"
-		ewarn "hypervisor, which is probably not what you want."
-	fi
-
-	# Check for sanity of /etc/nsswitch.conf
-	if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
-		local entry
-		for entry in passwd group shadow; do
-			if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
-				eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
-				eerror "Please make sure you have 'files' entries for"
-				eerror "'passwd:', 'group:' and 'shadow:' databases."
-				eerror "For more details see:"
-				eerror "  https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
-				die "nsswitch.conf has no 'files' provider in '${entry}'."
-			fi
-		done
-	fi
-
-	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
-	# we test for...
-	if ! is_crosscompile ; then
-		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
-			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
-			local STAT
-			if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
-				"${T}/check-ia32-emulation.elf32"
-				STAT=$?
-			else
-				# Don't fail here to allow single->multi ABI switch
-				# or recover from breakage like bug #646424
-				ewarn "Failed to compile the ABI test. Broken host glibc?"
-				STAT=0
-			fi
-			rm -f "${T}/check-ia32-emulation.elf32"
-			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
-		fi
-
-	fi
-
-	# When we actually have to compile something...
-	if ! just_headers ; then
-		ebegin "Checking gcc for __thread support"
-		if ! eend $(want__thread ; echo $?) ; then
-			echo
-			eerror "Could not find a gcc that supports the __thread directive!"
-			eerror "Please update your binutils/gcc and try again."
-			die "No __thread support in gcc!"
-		fi
-
-		if [[ ${CTARGET} == *-linux* ]] ; then
-			local run_kv build_kv want_kv
-
-			run_kv=$(g_get_running_KV)
-			build_kv=$(g_int_to_KV $(get_kheader_version))
-			want_kv=${MIN_KERN_VER}
-
-			if ! is_crosscompile && ! tc-is-cross-compiler ; then
-				# Building fails on an non-supporting kernel
-				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
-				if ! eend_KV ${run_kv} ${want_kv} ; then
-					echo
-					eerror "You need a kernel of at least ${want_kv}!"
-					die "Kernel version too low!"
-				fi
-			fi
-
-			ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
-			if ! eend_KV ${build_kv} ${want_kv} ; then
-				echo
-				eerror "You need linux-headers of at least ${want_kv}!"
-				die "linux-headers version too low!"
-			fi
-		fi
-	fi
-}
-
-#
-# the phases
-#
-
-# pkg_pretend
-
-pkg_pretend() {
-	# All the checks...
-	einfo "Checking general environment sanity."
-	sanity_prechecks
-}
-
-pkg_setup() {
-	# see bug 682570
-	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
-}
-
-# src_unpack
-
-src_unpack() {
-	# Consistency is not guaranteed between pkg_ and src_ ...
-	sanity_prechecks
-
-	use multilib && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
-
-	setup_env
-
-	if [[ ${PV} == 9999* ]] ; then
-		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
-		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
-		git-r3_src_unpack
-		mv patches-git/9999 patches || die
-
-		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
-		EGIT_CHECKOUT_DIR=${S}
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.xz
-
-		cd "${WORKDIR}" || die
-		unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
-	fi
-
-	cd "${WORKDIR}" || die
-	unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
-}
-
-src_prepare() {
-	local patchsetname
-	if ! use vanilla ; then
-		if [[ ${PV} == 9999* ]] ; then
-			patchsetname="from git master"
-		else
-			patchsetname="${RELEASE_VER}-${PATCH_VER}"
-		fi
-		elog "Applying Gentoo Glibc Patchset ${patchsetname}"
-		eapply "${WORKDIR}"/patches
-		einfo "Done."
-	fi
-
-	default
-
-	gnuconfig_update
-
-	cd "${WORKDIR}"
-	find . -name configure -exec touch {} +
-
-	# move the external locale-gen to its old place
-	mkdir extra || die
-	mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
-
-	eprefixify extra/locale/locale-gen
-
-	# Fix permissions on some of the scripts.
-	chmod u+x "${S}"/scripts/*.sh
-
-	cd "${S}"
-}
-
-glibc_do_configure() {
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
-
-	# CXX isnt handled by the multilib system, so if we dont unset here
-	# we accumulate crap across abis
-	unset CXX
-
-	einfo "Configuring glibc for nptl"
-
-	if use doc ; then
-		export MAKEINFO=makeinfo
-	else
-		export MAKEINFO=/dev/null
-	fi
-
-	local v
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM READELF; do
-		einfo " $(printf '%15s' ${v}:)   ${!v}"
-	done
-
-	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
-	# To build .S (assembly) files with the same ABI-specific flags
-	# upstream currently recommends adding CFLAGS to CC/CXX:
-	#    https://sourceware.org/PR23273
-	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
-	# and breaks multiarch support. See 659030#c3 for an example.
-	# The glibc configure script doesn't properly use LDFLAGS all the time.
-	export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}"
-	einfo " $(printf '%15s' 'Manual CC:')   ${CC}"
-
-	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
-	export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}"
-
-	if is_crosscompile; then
-		# Assume worst-case bootstrap: glibc is buil first time
-		# when ${CTARGET}-g++ is not available yet. We avoid
-		# building auxiliary programs that require C++: bug #683074
-		# It should not affect final result.
-		export libc_cv_cxx_link_ok=no
-		# The line above has the same effect. We set CXX explicitly
-		# to make build logs less confusing.
-		export CXX=
-	fi
-	einfo " $(printf '%15s' 'Manual CXX:')   ${CXX}"
-
-	# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
-	# can't detect them automatically due to ${CHOST} mismatch and fallbacks
-	# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
-	export NM="$(tc-getNM ${CTARGET})"
-	export READELF="$(tc-getREADELF ${CTARGET})"
-	einfo " $(printf '%15s' 'Manual NM:')   ${NM}"
-	einfo " $(printf '%15s' 'Manual READELF:')   ${READELF}"
-
-	echo
-
-	local myconf=()
-
-	case ${CTARGET} in
-		m68k*)
-			# setjmp() is not compatible with stack protection:
-			# https://sourceware.org/PR24202
-			myconf+=( --enable-stack-protector=no )
-			;;
-		powerpc-*)
-			# Currently gcc on powerpc32 generates invalid code for
-			# __builtin_return_address(0) calls. Normally programs
-			# don't do that but malloc hooks in glibc do:
-			# https://gcc.gnu.org/PR81996
-			# https://bugs.gentoo.org/629054
-			myconf+=( --enable-stack-protector=no )
-			;;
-		*)
-			# Use '=strong' instead of '=all' to protect only functions
-			# worth protecting from stack smashes.
-			# '=all' is also known to have a problem in IFUNC resolution
-			# tests: https://sourceware.org/PR25680, bug #712356.
-			myconf+=( --enable-stack-protector=$(usex ssp strong no) )
-			;;
-	esac
-	myconf+=( --enable-stackguard-randomization )
-
-	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
-	# is not robust enough to detect proper support:
-	#    https://bugs.gentoo.org/641216
-	#    https://sourceware.org/PR22634#c0
-	case $(tc-arch ${CTARGET}) in
-		# Keep whitelist of targets where autodetection mostly works.
-		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
-		# Blacklist everywhere else
-		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
-	esac
-
-	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
-	case ${CTARGET} in
-		x86_64-*) myconf+=( $(use_enable cet) ) ;;
-		*) ;;
-	esac
-
-	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
-
-	myconf+=( --enable-kernel=${MIN_KERN_VER} )
-
-	# Since SELinux support is only required for nscd, only enable it if:
-	# 1. USE selinux
-	# 2. only for the primary ABI on multilib systems
-	# 3. Not a crosscompile
-	if ! is_crosscompile && use selinux ; then
-		if use multilib ; then
-			if is_final_abi ; then
-				myconf+=( --with-selinux )
-			else
-				myconf+=( --without-selinux )
-			fi
-		else
-			myconf+=( --with-selinux )
-		fi
-	else
-		myconf+=( --without-selinux )
-	fi
-
-	# Force a few tests where we always know the answer but
-	# configure is incapable of finding it.
-	if is_crosscompile ; then
-		export \
-			libc_cv_c_cleanup=yes \
-			libc_cv_forced_unwind=yes
-	fi
-
-	myconf+=(
-		--without-cvs
-		--disable-werror
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		$(use_enable profile)
-		$(use_with gd)
-		--with-headers=$(build_eprefix)$(alt_build_headers)
-		--prefix="$(host_eprefix)/usr"
-		--sysconfdir="$(host_eprefix)/etc"
-		--localstatedir="$(host_eprefix)/var"
-		--libdir='$(prefix)'/$(get_libdir)
-		--mandir='$(prefix)'/share/man
-		--infodir='$(prefix)'/share/info
-		--libexecdir='$(libdir)'/misc/glibc
-		--with-bugurl=https://bugs.gentoo.org/
-		--with-pkgversion="$(glibc_banner)"
-		$(use_enable crypt)
-		$(use_multiarch || echo --disable-multi-arch)
-		$(use_enable static-pie)
-		$(use_enable systemtap)
-		$(use_enable nscd)
-		${EXTRA_ECONF}
-	)
-
-	# We rely on sys-libs/timezone-data for timezone tools normally.
-	myconf+=( $(use_enable vanilla timezone-tools) )
-
-	# These libs don't have configure flags.
-	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
-	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
-
-	# There is no configure option for this and we need to export it
-	# since the glibc build will re-run configure on itself
-	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
-	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
-
-	# We take care of patching our binutils to use both hash styles,
-	# and many people like to force gnu hash style only, so disable
-	# this overriding check.  #347761
-	export libc_cv_hashstyle=no
-
-	local builddir=$(builddir nptl)
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-	set -- "${S}"/configure "${myconf[@]}"
-	echo "$@"
-	"$@" || die "failed to configure glibc"
-
-	# ia64 static cross-compilers are a pita in so much that they
-	# can't produce static ELFs (as the libgcc.a is broken).  so
-	# disable building of the programs for those targets if it
-	# doesn't work.
-	# XXX: We could turn this into a compiler test, but ia64 is
-	# the only one that matters, so this should be fine for now.
-	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
-		sed -i '1i+link-static = touch $@' config.make
-	fi
-
-	# If we're trying to migrate between ABI sets, we need
-	# to lie and use a local copy of gcc.  Like if the system
-	# is built with MULTILIB_ABIS="amd64 x86" but we want to
-	# add x32 to it, gcc/glibc don't yet support x32.
-	#
-	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
-		echo 'main(){}' > "${T}"/test.c
-		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
-			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
-		fi
-	fi
-}
-
-glibc_headers_configure() {
-	export ABI=default
-
-	local builddir=$(builddir "headers")
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-
-	# if we don't have a compiler yet, we can't really test it now ...
-	# hopefully they don't affect header generation, so let's hope for
-	# the best here ...
-	local v vars=(
-		ac_cv_header_cpuid_h=yes
-		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
-		libc_cv_asm_cfi_directives=yes
-		libc_cv_broken_visibility_attribute=no
-		libc_cv_c_cleanup=yes
-		libc_cv_compiler_powerpc64le_binary128_ok=yes
-		libc_cv_forced_unwind=yes
-		libc_cv_gcc___thread=yes
-		libc_cv_mlong_double_128=yes
-		libc_cv_mlong_double_128ibm=yes
-		libc_cv_ppc_machine=yes
-		libc_cv_ppc_rel16=yes
-		libc_cv_predef_fortify_source=no
-		libc_cv_target_power8_ok=yes
-		libc_cv_visibility_attribute=yes
-		libc_cv_z_combreloc=yes
-		libc_cv_z_execstack=yes
-		libc_cv_z_initfirst=yes
-		libc_cv_z_nodelete=yes
-		libc_cv_z_nodlopen=yes
-		libc_cv_z_relro=yes
-		libc_mips_abi=${ABI}
-		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
-		# These libs don't have configure flags.
-		ac_cv_lib_audit_audit_log_user_avc_message=no
-		ac_cv_lib_cap_cap_init=no
-	)
-
-	einfo "Forcing cached settings:"
-	for v in "${vars[@]}" ; do
-		einfo " ${v}"
-		export ${v}
-	done
-
-	local headers_only_arch_CPPFLAGS=()
-
-	# Blow away some random CC settings that screw things up. #550192
-	if [[ -d ${S}/sysdeps/mips ]]; then
-		pushd "${S}"/sysdeps/mips >/dev/null
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
-
-		# Force the mips ABI to the default.  This is OK because the set of
-		# installed headers in this phase is the same between the 3 ABIs.
-		# If this ever changes, this hack will break, but that's unlikely
-		# as glibc discourages that behavior.
-		# https://crbug.com/647033
-		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
-
-		popd >/dev/null
-	fi
-
-	case ${CTARGET} in
-	riscv*)
-		# RISC-V interrogates the compiler to determine which target to
-		# build.  If building the headers then we don't strictly need a
-		# RISC-V compiler, so the built-in definitions that are provided
-		# along with all RISC-V compiler might not exist.  This causes
-		# glibc's RISC-V preconfigure script to blow up.  Since we're just
-		# building the headers any value will actually work here, so just
-		# pick the standard one (rv64g/lp64d) to make the build scripts
-		# happy for now -- the headers are all the same anyway so it
-		# doesn't matter.
-		headers_only_arch_CPPFLAGS+=(
-			-D__riscv_xlen=64
-			-D__riscv_flen=64
-			-D__riscv_float_abi_double=1
-			-D__riscv_atomic=1
-		) ;;
-	esac
-
-	local myconf=()
-	myconf+=(
-		--disable-sanity-checks
-		--enable-hacker-mode
-		--without-cvs
-		--disable-werror
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		--with-headers=$(build_eprefix)$(alt_build_headers)
-		--prefix="$(host_eprefix)/usr"
-		${EXTRA_ECONF}
-	)
-
-	# Nothing is compiled here which would affect the headers for the target.
-	# So forcing CC/CFLAGS is sane.
-	local headers_only_CC=$(tc-getBUILD_CC)
-	local headers_only_CFLAGS="-O1 -pipe"
-	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
-	local headers_only_LDFLAGS=""
-	set -- "${S}"/configure "${myconf[@]}"
-	echo \
-		"CC=${headers_only_CC}" \
-		"CFLAGS=${headers_only_CFLAGS}" \
-		"CPPFLAGS=${headers_only_CPPFLAGS}" \
-		"LDFLAGS=${headers_only_LDFLAGS}" \
-		"$@"
-	CC=${headers_only_CC} \
-	CFLAGS=${headers_only_CFLAGS} \
-	CPPFLAGS=${headers_only_CPPFLAGS} \
-	LDFLAGS="" \
-	"$@" || die "failed to configure glibc"
-}
-
-do_src_configure() {
-	if just_headers ; then
-		glibc_headers_configure
-	else
-		glibc_do_configure nptl
-	fi
-}
-
-src_configure() {
-	foreach_abi do_src_configure
-}
-
-do_src_compile() {
-	emake -C "$(builddir nptl)"
-}
-
-src_compile() {
-	if just_headers ; then
-		return
-	fi
-
-	foreach_abi do_src_compile
-}
-
-glibc_src_test() {
-	cd "$(builddir nptl)"
-
-	local myxfailparams=""
-	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
-		for myt in ${XFAIL_TEST_LIST[@]} ; do
-			myxfailparams+="test-xfail-${myt}=yes "
-		done
-	fi
-
-	# sandbox does not understand unshare() and prevents
-	# writes to /proc/, which makes many tests fail
-
-	SANDBOX_ON=0 LD_PRELOAD= emake ${myxfailparams} check
-}
-
-do_src_test() {
-	local ret=0
-
-	glibc_src_test
-	: $(( ret |= $? ))
-
-	return ${ret}
-}
-
-src_test() {
-	if just_headers ; then
-		return
-	fi
-
-	# Give tests more time to complete.
-	export TIMEOUTFACTOR=5
-
-	foreach_abi do_src_test || die "tests failed"
-}
-
-run_locale_gen() {
-	# if the host locales.gen contains no entries, we'll install everything
-	local root="$1"
-	local inplace=""
-
-	if [[ "${root}" == "--inplace-glibc" ]] ; then
-		inplace="--inplace-glibc"
-		root="$2"
-	fi
-
-	local locale_list="${root}/etc/locale.gen"
-
-	pushd "${ED}"/$(get_libdir) >/dev/null
-
-	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
-		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
-		locale_list="${root}/usr/share/i18n/SUPPORTED"
-	fi
-
-	set -- locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
-		--destdir "${root}"
-	echo "$@"
-	"$@"
-
-	popd >/dev/null
-}
-
-glibc_do_src_install() {
-	local builddir=$(builddir nptl)
-	cd "${builddir}"
-
-	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
-
-	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
-	# which come without headers etc. Only needed for binary packages since the
-	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
-	find "${D}" -name "libnsl.a" -delete
-	find "${D}" -name "libnsl.so" -delete
-
-	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
-	# to infer upstream version:
-	# '#define VERSION "2.26.90"' -> '2.26.90'
-	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
-
-	# Avoid stripping binaries not targeted by ${CHOST}. Or else
-	# ${CHOST}-strip would break binaries build for ${CTARGET}.
-	is_crosscompile && dostrip -x /
-	# gdb thread introspection relies on local libpthreas symbols. stripping breaks it
-	# See Note [Disable automatic stripping]
-	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
-
-	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
-		# Move versioned .a file out of libdir to evade portage QA checks
-		# instead of using gen_usr_ldscript(). We fix ldscript as:
-		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
-		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
-		dodir $(alt_usrlibdir)/${P}
-		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
-	fi
-
-	# We'll take care of the cache ourselves
-	rm -f "${ED}"/etc/ld.so.cache
-
-	# Everything past this point just needs to be done once ...
-	is_final_abi || return 0
-
-	# Make sure the non-native interp can be found on multilib systems even
-	# if the main library set isn't installed into the right place.  Maybe
-	# we should query the active gcc for info instead of hardcoding it ?
-	local i ldso_abi ldso_name
-	local ldso_abi_list=(
-		# x86
-		amd64   /lib64/ld-linux-x86-64.so.2
-		x32     /libx32/ld-linux-x32.so.2
-		x86     /lib/ld-linux.so.2
-		# mips
-		o32     /lib/ld.so.1
-		n32     /lib32/ld.so.1
-		n64     /lib64/ld.so.1
-		# powerpc
-		ppc     /lib/ld.so.1
-		ppc64   /lib64/ld64.so.1
-		# riscv
-		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
-		lp64    /lib/ld-linux-riscv64-lp64.so.1
-		# s390
-		s390    /lib/ld.so.1
-		s390x   /lib/ld64.so.1
-		# sparc
-		sparc32 /lib/ld-linux.so.2
-		sparc64 /lib64/ld-linux.so.2
-	)
-	case $(tc-endian) in
-	little)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64.so.1
-		)
-		;;
-	big)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64_be.so.1
-		)
-		;;
-	esac
-	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
-	fi
-	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
-		ldso_abi=${ldso_abi_list[i]}
-		has ${ldso_abi} $(get_install_abis) || continue
-
-		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
-		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
-			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
-		fi
-	done
-
-	# With devpts under Linux mounted properly, we do not need the pt_chown
-	# binary to be setuid.  This is because the default owners/perms will be
-	# exactly what we want.
-	if ! use suid ; then
-		find "${ED}" -name pt_chown -exec chmod -s {} +
-	fi
-
-	#################################################################
-	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
-	# Make sure we install some symlink hacks so that when we build
-	# a 2nd stage cross-compiler, gcc finds the target system
-	# headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		# We need to make sure that /lib and /usr/lib always exists.
-		# gcc likes to use relative paths to get to its multilibs like
-		# /usr/lib/../lib64/.  So while we don't install any files into
-		# /usr/lib/, we do need it to exist.
-		keepdir $(alt_prefix)/lib
-		keepdir $(alt_prefix)/usr/lib
-
-		dosym usr/include $(alt_prefix)/sys-include
-		return 0
-	fi
-
-	# Files for Debian-style locale updating
-	dodir /usr/share/i18n
-	sed \
-		-e "/^#/d" \
-		-e "/SUPPORTED-LOCALES=/d" \
-		-e "s: \\\\::g" -e "s:/: :g" \
-		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
-		|| die "generating /usr/share/i18n/SUPPORTED failed"
-	cd "${WORKDIR}"/extra/locale
-	dosbin locale-gen
-	doman *.[0-8]
-	insinto /etc
-	doins locale.gen
-
-	# Make sure all the ABI's can find the locales and so we only
-	# have to generate one set
-	local a
-	keepdir /usr/$(get_libdir)/locale
-	for a in $(get_install_abis) ; do
-		if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then
-			dosym ../$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale
-		fi
-	done
-
-	# HACK: If we're building for riscv, we need to additionally make sure that
-	# we can find the locale archive afterwards
-	case ${CTARGET} in
-		riscv*)
-			if [[ ! -e ${ED}/usr/lib/locale ]] ; then
-				dosym ../$(get_libdir)/locale /usr/lib/locale
-			fi
-			;;
-		*) ;;
-	esac
-
-	cd "${S}"
-
-	# Install misc network config files
-	insinto /etc
-	doins posix/gai.conf nss/nsswitch.conf
-
-	# Gentoo-specific
-	newins "${FILESDIR}"/host.conf-1 host.conf
-
-	if use nscd ; then
-		doins nscd/nscd.conf
-
-		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
-
-		local nscd_args=(
-			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
-		)
-
-		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
-
-		systemd_dounit nscd/nscd.service
-		systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf
-	fi
-
-	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
-	doenvd "${T}"/00glibc
-
-	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
-		[[ -s ${d} ]] && dodoc ${d}
-	done
-	dodoc -r ChangeLog.old
-
-	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	# creation of the "factory" symlink in pkg_postinst().
-	rm -f "${ED}"/etc/localtime
-
-	# Generate all locales if this is a native build as locale generation
-	if use compile-locales && ! is_crosscompile ; then
-		run_locale_gen --inplace-glibc "${ED}/"
-		sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
-	fi
-}
-
-glibc_headers_install() {
-	local builddir=$(builddir "headers")
-	cd "${builddir}"
-	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
-
-	insinto $(alt_headers)/gnu
-	doins "${S}"/include/gnu/stubs.h
-
-	# Make sure we install the sys-include symlink so that when
-	# we build a 2nd stage cross-compiler, gcc finds the target
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	dosym usr/include $(alt_prefix)/sys-include
-}
-
-src_install() {
-	if just_headers ; then
-		export ABI=default
-		glibc_headers_install
-		return
-	fi
-
-	foreach_abi glibc_do_src_install
-
-	if ! use static-libs ; then
-		elog "Not installing static glibc libraries"
-		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
-	fi
-}
-
-# Simple test to make sure our new glibc isn't completely broken.
-# Make sure we don't test with statically built binaries since
-# they will fail.  Also, skip if this glibc is a cross compiler.
-#
-# If coreutils is built with USE=multicall, some of these files
-# will just be wrapper scripts, not actual ELFs we can test.
-glibc_sanity_check() {
-	cd / #228809
-
-	# We enter ${ED} so to avoid trouble if the path contains
-	# special characters; for instance if the path contains the
-	# colon character (:), then the linker will try to split it
-	# and look for the libraries in an unexpected place. This can
-	# lead to unsafe code execution if the generated prefix is
-	# within a world-writable directory.
-	# (e.g. /var/tmp/portage:${HOSTNAME})
-	pushd "${ED}"/$(get_libdir) >/dev/null
-
-	local x striptest
-	for x in cal date env free ls true uname uptime ; do
-		x=$(type -p ${x})
-		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
-		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
-		case ${striptest} in
-		*"statically linked"*) continue;;
-		*"ASCII text"*) continue;;
-		esac
-		# We need to clear the locale settings as the upgrade might want
-		# incompatible locale data.  This test is not for verifying that.
-		LC_ALL=C \
-		./ld-*.so --library-path . ${x} > /dev/null \
-			|| die "simple run test (${x}) failed"
-	done
-
-	popd >/dev/null
-}
-
-pkg_preinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	# prepare /etc/ld.so.conf.d/ for files
-	mkdir -p "${EROOT}"/etc/ld.so.conf.d
-
-	# Default /etc/hosts.conf:multi to on for systems with small dbs.
-	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
-		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
-		einfo "Defaulting /etc/host.conf:multi to on"
-	fi
-
-	[[ -n ${ROOT} ]] && return 0
-	[[ -d ${ED}/$(get_libdir) ]] || return 0
-	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
-}
-
-pkg_postinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
-		# Generate fastloading iconv module configuration file.
-		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
-	fi
-
-	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
-		use compile-locales || run_locale_gen "${EROOT}/"
-	fi
-
-	# Check for sanity of /etc/nsswitch.conf, take 2
-	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
-		local entry
-		for entry in passwd group shadow; do
-			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
-				ewarn ""
-				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
-				ewarn "removed from glibc and is now provided by the package"
-				ewarn "  sys-auth/libnss-nis"
-				ewarn "Install it now to keep your NIS setup working."
-				ewarn ""
-			fi
-		done
-	fi
-}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index d79f5ddb0dae..df4b7c777c45 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -2,11 +2,13 @@ AUX libcxx-3.9-cmake-link-flags.patch 1014 BLAKE2B 8e86059e00a5ebcd7a15288828766
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD libcxx-10.0.0.ebuild 6080 BLAKE2B 51e502d81dfd67727be527ed485ed932893cfc321ba49259873dade51218a4278b20941c14a970d995b80e71e0307230ec9a6107bb0b0a8003d92c00ab419834 SHA512 f1c43ea15b0f894586c032813b9ad5cc07f41bf0dce1f84e246212a55aaa40b377819665fed2d46eecafb16f0f138aeeee5903e2925b306253dad5e8571e9068
 EBUILD libcxx-10.0.1.ebuild 5968 BLAKE2B 53bf5e5d2651683caf8ac963704b62eecaeda510c0a74976913c66dadbbda3bd5ffc90fe442f54113e67b9dbe93c629c965a49d5e34427e9805d4248c5028ffc SHA512 588086b50a83b7be9a0234fd8da3b064dc726108cd12fb4849ecd99ea860f24485cceac1a7a0527277a1d4f1c7b87c9b8c5e7a82d31a3906de3c665af007f63f
 EBUILD libcxx-11.0.0.9999.ebuild 5987 BLAKE2B f0af59bfe3b89eaa2f4f67e52e8788917d8dcb8679044215dcdcf39037fd1d935d4dcc72a52e3ae05af2d7590d0358eb4ffb0dd4432c00abb00fac04b9fef6c6 SHA512 15de2d8ebce71c9aca6d57403066492d00a1e938d871059cf72f9d74580a7fe28484d8886a6c9b6812b79c3b90ba61684c248441fe327470bea5272c5f961d37
 EBUILD libcxx-11.0.0_rc3.ebuild 5987 BLAKE2B f0af59bfe3b89eaa2f4f67e52e8788917d8dcb8679044215dcdcf39037fd1d935d4dcc72a52e3ae05af2d7590d0358eb4ffb0dd4432c00abb00fac04b9fef6c6 SHA512 15de2d8ebce71c9aca6d57403066492d00a1e938d871059cf72f9d74580a7fe28484d8886a6c9b6812b79c3b90ba61684c248441fe327470bea5272c5f961d37
+EBUILD libcxx-11.0.0_rc4.ebuild 5987 BLAKE2B f0af59bfe3b89eaa2f4f67e52e8788917d8dcb8679044215dcdcf39037fd1d935d4dcc72a52e3ae05af2d7590d0358eb4ffb0dd4432c00abb00fac04b9fef6c6 SHA512 15de2d8ebce71c9aca6d57403066492d00a1e938d871059cf72f9d74580a7fe28484d8886a6c9b6812b79c3b90ba61684c248441fe327470bea5272c5f961d37
 EBUILD libcxx-12.0.0.9999.ebuild 5987 BLAKE2B f0af59bfe3b89eaa2f4f67e52e8788917d8dcb8679044215dcdcf39037fd1d935d4dcc72a52e3ae05af2d7590d0358eb4ffb0dd4432c00abb00fac04b9fef6c6 SHA512 15de2d8ebce71c9aca6d57403066492d00a1e938d871059cf72f9d74580a7fe28484d8886a6c9b6812b79c3b90ba61684c248441fe327470bea5272c5f961d37
 EBUILD libcxx-9.0.1.ebuild 6398 BLAKE2B 0bf084d925f6633809763077300f2221bd7fd67f2d29b1f4febc436b7ff658c51deb7b614807eb9459f466a120e9f7420cf047a1f5583effd48544bdc51aa344 SHA512 77898701b515982851e2e49436705c9166f9c82c011b967b942f3c4f8d2466692e89883d18b28b1ad886692d37b02234a14a80c965c12fc2675fc40baacceebc
 MISC metadata.xml 731 BLAKE2B a6e96906bc2bff950c1b193b01feeb456b064fa585042566eae77dbe9a207bb08dfd083a3ab5fede2133a80b905a61c6dd541f9196e585c60b5629dd04a06213 SHA512 0a25560aa3eff5355137dadbb9cc48e384d2885b89075a97a8dafc7ac0ebe4ec5fde5b171a3416490264791a734c4405ec8a42dfc98e7e830c30ef0cfef58b6f
diff --git a/sys-libs/libcxx/libcxx-11.0.0_rc4.ebuild b/sys-libs/libcxx/libcxx-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..22c6462abd9d
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-11.0.0_rc4.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
+REQUIRED_USE="libunwind? ( libcxxabi )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
+# llvm-6 for new lit options
+# clang-3.9.0 installs necessary target symlinks unconditionally
+# which removes the need for MULTILIB_USEDEP
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+DOCS=( CREDITS.TXT )
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+src_prepare() {
+	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
+	# out-of-tree build.
+	eapply "${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
+
+	llvm.org_src_prepare
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# we want -lgcc_s for unwinder, and for compiler runtime when using
+	# gcc, clang with gcc runtime (or any unknown compiler)
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
+	if use libunwind; then
+		# work-around missing -lunwind upstream
+		extra_libs+=( -lunwind )
+		# if we're using libunwind and clang with compiler-rt, we want
+		# to link to compiler-rt instead of -lgcc_s
+		if tc-is-clang; then
+			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			   ${LDFLAGS} -print-libgcc-file-name)
+			if [[ ${compiler_rt} == *libclang_rt* ]]; then
+				want_gcc_s=OFF
+				want_compiler_rt=ON
+				extra_libs+=( "${compiler_rt}" )
+			fi
+		fi
+	fi
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
+		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
+	)
+
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxx
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	local libdir=$(get_libdir)
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
+
+	# Move it first.
+	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=" libpthread.a libdl.a"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
+}
+
+gen_shared_ldscript() {
+	local libdir=$(get_libdir)
+	# libsupc++ doesn't have a shared version
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
+
+	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
+	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
+}
+
+multilib_src_install() {
+	cmake_src_install
+	gen_shared_ldscript
+	use static-libs && gen_static_ldscript
+}
+
+pkg_postinst() {
+	elog "This package (${PN}) is mainly intended as a replacement for the C++"
+	elog "standard library when using clang."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 0112ffdcb49e..b7e07c6fc3a3 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD libcxxabi-10.0.0.ebuild 3390 BLAKE2B 708b1327f629ad4445fde37d53dea7807c433a2e3154f56f3fed4ba9eb698f3bb3e67055820521c58d8a31dc26abf28c293d709f97b4496ab420d788ab532c12 SHA512 18ab388b271756a5eb6dd1650d6a9f05a392b4e2cb48df92359c0e9ac763ecc4672343b4b51184f13c0636fe130e4a5972d8937866d34f1efec4b1addce1f81a
 EBUILD libcxxabi-10.0.1.ebuild 3239 BLAKE2B f3be66eed47371e423b5dfc37d7c0f29cd26f3ac762f13e6eb26f21f3d7c35030a359b766074546b2659a6122c20866f926e7a272f5334e51c40647a789e3b8f SHA512 d71de6fbc4d4650e3832359d8a19b0c8c7fa698efda658233b5f05958e1fe3cf648bc2c88a59bb6bded1e2b04f585b9ca843bda42494377056560727c76e5ef3
 EBUILD libcxxabi-11.0.0.9999.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515
 EBUILD libcxxabi-11.0.0_rc3.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515
+EBUILD libcxxabi-11.0.0_rc4.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515
 EBUILD libcxxabi-12.0.0.9999.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515
 EBUILD libcxxabi-9.0.1.ebuild 3390 BLAKE2B 708b1327f629ad4445fde37d53dea7807c433a2e3154f56f3fed4ba9eb698f3bb3e67055820521c58d8a31dc26abf28c293d709f97b4496ab420d788ab532c12 SHA512 18ab388b271756a5eb6dd1650d6a9f05a392b4e2cb48df92359c0e9ac763ecc4672343b4b51184f13c0636fe130e4a5972d8937866d34f1efec4b1addce1f81a
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0_rc4.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..4b304417a9c3
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.0_rc4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+# libcxx is needed uncondtionally for the headers
+LLVM_COMPONENTS=( libcxx{abi,} )
+LLVM_TEST_COMPONENTS=( llvm/cmake )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libunwind +static-libs test elibc_musl"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libunwind? (
+		|| (
+			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
+		)
+	)"
+# llvm-6 for new lit options
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+		)
+	fi
+	cmake_src_configure
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	# build a local copy of libc++ for testing to avoid circular dep
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r include/.
+}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 385b7dc98cfa..7142fa6053cf 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD libomp-10.0.0.ebuild 3013 BLAKE2B cebd2bde8d98f6b4941f8c5000295424ee995ca2601224ae0ba535ae3fd327065688d481a498953450364b7725d60b4beea386f859660cac70292882365b8d79 SHA512 1938aff720e1e87fa290076f204feab09eaee1ff6152e65466fc1905a7afb03064a51ed39d3653d17ccf06a68344e2662a148d6913f7eb60797ded593146b8be
 EBUILD libomp-10.0.1.ebuild 2895 BLAKE2B bc9f5a57e95fc11d3468930ed2f59ada7b988c4e1a3d88b49947bc001de7260f6c79b8a35bfc2bed64fbbbacb4855fca9698e9b234c59fecb2deae46818bd3ba SHA512 fbb927a7802196b59fa8ef1f131093dd8fbb2b6ef9876ad1c8411935b101e36fe2c7e6b3bb12ee81a999da73180dda8b68bb86d71921dc2b02718f90d15ede51
 EBUILD libomp-11.0.0.9999.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
 EBUILD libomp-11.0.0_rc3.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
+EBUILD libomp-11.0.0_rc4.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
 EBUILD libomp-12.0.0.9999.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
 EBUILD libomp-9.0.1.ebuild 3011 BLAKE2B 33ccc441765ab33b61c9739e999039b24437c6f79b89a4db5ee1575b072fd3af609d5c8c583331db81b0b5a24a2a85cc359b4df312330b5732a24c7a8ebe3021 SHA512 404f3df2df27e031b59c4f827b13b2d9ce2b6af4126abdd1d6a233cfe0ec26ede61d01ddf6ca3434b6698ac6407ce8b4a845070b875f92eff4d961280c95ed5a
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-11.0.0_rc4.ebuild b/sys-libs/libomp/libomp-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..5bffd6685f64
--- /dev/null
+++ b/sys-libs/libomp/libomp-11.0.0_rc4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib linux-info llvm.org python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+LLVM_COMPONENTS=( openmp )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="cuda hwloc kernel_linux offload ompt test"
+# CUDA works only with the x86_64 ABI
+REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		virtual/libelf:=[${MULTILIB_USEDEP}]
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	)"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	offload? ( virtual/pkgconfig )
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		>=sys-devel/clang-6
+	)"
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+	use offload && mycmakeargs+=(
+		# this is non-fatal and libomp checks for CUDA conditionally
+		# to ABI, so we can just ignore passing the wrong value
+		# on non-amd64 ABIs
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+	)
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 19d2da53d8dd..2da4f8897aca 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD llvm-libunwind-10.0.0.ebuild 3356 BLAKE2B 761c9fcfbd3dc5689521f7423e1bafe4f673d7c6dbd397f6b6e0f4bc168495f3eea513c0550d20a60cf1e4e38200df59583cede7bfaad4c574f249e532fe4bb2 SHA512 82f4e6967d73ae96199a507081cd9cc913a4e4b2b0c45caa0b27d428b68262df76242d318327616bb5112d97ee68fec1061485f94f0137fd73a0fdaad998707b
 EBUILD llvm-libunwind-10.0.1.ebuild 3187 BLAKE2B 63227f585be153cfe25880dcae377b5a357363e1a5794508bb579b26562f7e82a227c3ebe3fc182ded92e0dd0c1ea8adbc80b68e19bb8b8e68d7923b9c4a29b1 SHA512 ea38446f23ede8c0c6e8f4feb74c44af0020654d8401bf682bcbc4f5aeaf8ba964ce919bd1b4e71bb929e57a637e8e4ac65d0204a758aabf78d8ebd838c23f1e
 EBUILD llvm-libunwind-11.0.0.9999.ebuild 3178 BLAKE2B a82038f3e9a5c05fd28fb62c79e0677920297708a17077dd760f4b119cfec8db47cf950ecf5678936fc82be1c13745213333a8cb0f5335d924157dfdfd74b4c3 SHA512 b50d2899f327813dfdfd72e3158a7bc228b8d9339f4107a2fb23295e7cc6d7482a522220cc698e6390c1e83cbb33dab9df5b0737ac519f3c8a1f2abb840fb05c
 EBUILD llvm-libunwind-11.0.0_rc3.ebuild 3178 BLAKE2B a82038f3e9a5c05fd28fb62c79e0677920297708a17077dd760f4b119cfec8db47cf950ecf5678936fc82be1c13745213333a8cb0f5335d924157dfdfd74b4c3 SHA512 b50d2899f327813dfdfd72e3158a7bc228b8d9339f4107a2fb23295e7cc6d7482a522220cc698e6390c1e83cbb33dab9df5b0737ac519f3c8a1f2abb840fb05c
+EBUILD llvm-libunwind-11.0.0_rc4.ebuild 3178 BLAKE2B a82038f3e9a5c05fd28fb62c79e0677920297708a17077dd760f4b119cfec8db47cf950ecf5678936fc82be1c13745213333a8cb0f5335d924157dfdfd74b4c3 SHA512 b50d2899f327813dfdfd72e3158a7bc228b8d9339f4107a2fb23295e7cc6d7482a522220cc698e6390c1e83cbb33dab9df5b0737ac519f3c8a1f2abb840fb05c
 EBUILD llvm-libunwind-12.0.0.9999.ebuild 3178 BLAKE2B a82038f3e9a5c05fd28fb62c79e0677920297708a17077dd760f4b119cfec8db47cf950ecf5678936fc82be1c13745213333a8cb0f5335d924157dfdfd74b4c3 SHA512 b50d2899f327813dfdfd72e3158a7bc228b8d9339f4107a2fb23295e7cc6d7482a522220cc698e6390c1e83cbb33dab9df5b0737ac519f3c8a1f2abb840fb05c
 EBUILD llvm-libunwind-9.0.1.ebuild 3356 BLAKE2B 761c9fcfbd3dc5689521f7423e1bafe4f673d7c6dbd397f6b6e0f4bc168495f3eea513c0550d20a60cf1e4e38200df59583cede7bfaad4c574f249e532fe4bb2 SHA512 82f4e6967d73ae96199a507081cd9cc913a4e4b2b0c45caa0b27d428b68262df76242d318327616bb5112d97ee68fec1061485f94f0137fd73a0fdaad998707b
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0_rc4.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..fff362b926dc
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0_rc4.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake-multilib llvm llvm.org python-any-r1
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://github.com/llvm-mirror/libunwind"
+LLVM_COMPONENTS=( libunwind )
+LLVM_TEST_COMPONENTS=( libcxx{,abi} llvm/cmake )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug +static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!sys-libs/libunwind"
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6"
+BDEPEND="
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+build_libcxxabi() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
+	local BUILD_DIR=${BUILD_DIR}/libcxxabi
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=
+		-DLIBCXXABI_ENABLE_SHARED=OFF
+		-DLIBCXXABI_ENABLE_STATIC=ONF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=OFF
+		-DLIBCXX_ENABLE_STATIC=ON
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake_src_configure
+	cmake_src_compile
+}
+
+multilib_src_test() {
+	# build local copies of libc++ & libc++abi for testing to avoid
+	# circular deps
+	build_libcxxabi
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	# install headers like sys-libs/libunwind
+	doheader "${S}"/include/*.h
+}
diff --git a/sys-libs/openipmi/Manifest b/sys-libs/openipmi/Manifest
index 4e9d629d9507..7dbe08089831 100644
--- a/sys-libs/openipmi/Manifest
+++ b/sys-libs/openipmi/Manifest
@@ -3,7 +3,7 @@ AUX openipmi-2.0.26-tinfo.patch 808 BLAKE2B fc7545b3610c9ba6a2d8d7075a8db3384659
 DIST OpenIPMI-2.0.27.tar.gz 3125193 BLAKE2B 86639a86803e49393aefbaf5b1d1fee8e2bf399b2772bdee7d07a00d5e6657efe5cdf962cacb0397f9de5deb0b18edc05783c3388f4fc19e1ee2de4c01be0663 SHA512 44aa2eb97559514d61654434f24bf8e87c3f89ea7095fd3d46c1a889e16c128f29ca19cfb9747afc7fd432ada84406ee884bc8b9c65e28b8bd033d368b744fe3
 DIST OpenIPMI-2.0.28.tar.gz 3118911 BLAKE2B 0f4192dc536ec1767ee72cf9f0d2c3b021e5f8e88b4029846a27c3b6561a3c63d44f4bad7ced234a171504804d2d9cdd90d0c6a6dc178f9f76ea52f6df20b9d0 SHA512 faaca335f7ff582f396d588c6b3736b4e2756a9914becba75550878a10d7acce55e85912bcf5cd9e482c3e646eb472a8a055c520f2dcba7a874f0c0f120502da
 DIST OpenIPMI-2.0.29.tar.gz 3119530 BLAKE2B 5c60b04e828699c396cb7ce29dca7665109d7b39c3d64535fafdca328c01eab0af9cc4d7fd1a30aa254836f6ce10a16e491fb7239777dc4d57edc65c20998504 SHA512 ff23aadfe4b9002574d1f06dda3d61f7a03ef1df2c61855516b7d67bd6d3272c53af74e3412e1045242dcb845f50b7c542083e918805c0efac424dd86e720a10
-EBUILD openipmi-2.0.27-r1.ebuild 2322 BLAKE2B b8421f48e67af99154607e36216fa69ed62330f37314764c90ce29f623343be3fc1ede6755f6e3dd082a508db045745f7955fe9383441197006170edac0668a9 SHA512 9f9c1806008f49d31aaabfd58390ae024a5df6f1365ac287637c6748eec33b676dc7205f282c7a50f17228a5d6212b3587991870341ee95d4480bb8a3417bbce
-EBUILD openipmi-2.0.28.ebuild 2289 BLAKE2B 807965405e3d9e5465440ec86abbcb8c437b16759900e3277458b7b58f126cff2ab116613b85b9e767ffa9ead3a9d31a3e8eae92efd731ebaaa5e934bfa0b368 SHA512 5d0cb2fb2a4a048e40dd3ae322a341636a972f0cbd1dac3b2b09fa001655feffc1ace545364c75d6474c0b4c234a00fc360eb22faf096846600a3fe229ab9374
-EBUILD openipmi-2.0.29.ebuild 2296 BLAKE2B a0245cccbd36a95c56a9809ed54a185a7ccc0adf8cf0ebe6ce8626e10669da4bbd1bbdf0b1f97bd80840f847d70c4a27320515496187b1b18475d3393d495abf SHA512 041c2ac382718b3d127add630342961abd755a2ca0e63f32708aa2585d5f646003bbe236306bc6c0289247d9a80ab33b23dc82aa2810fec5564dc8096a04f597
+EBUILD openipmi-2.0.27-r1.ebuild 2323 BLAKE2B d618b032ee5af5254c6f7f4db49348118f740cd4abb1a819b2f8954449270621a502ae2d224d136399d4dae85d525c05e558296e42bddddebaa3d29d775698c7 SHA512 f5c84a02eac84d9352251997e60341f81108cc942952d638ac3b73c08ce9d805a997ad09604de314bfae4142b5f3d7c295f268c019afc8b36fd56ee8ea928e08
+EBUILD openipmi-2.0.28.ebuild 2290 BLAKE2B c4417b513a033deff931d30e128abd7f00d79792ab6240c353d2c694104c75f1c82939d0ebb70d475b8eafd20d23c849394c67f74f60cd13567f17bc83f2ed8b SHA512 91b2813a586ab265b54dfdbea2f052f9ac956c87c88d3a06a48a69a721e57b9e95427f301929f0c5da93f01280c13400d0881d571c2c50632ae6767358d45bd6
+EBUILD openipmi-2.0.29.ebuild 2297 BLAKE2B 55f54973ba53171889944223f682eab3ec3cb38d9bd94bed6e585661c648f3b3a1df3e3c4da4fceeca708817cd9b62120aaeafb58abcf0b56cae7b3abbac111c SHA512 6db782e5ca32a98e68f5843ece73451ae1907e84442996c4869c09d7cde5d62b5bd52c692739f0e50390083ba0ee0fdbd5cbdf4df116094c4355c657b697d1cb
 MISC metadata.xml 347 BLAKE2B 4857bbfde0e588b4ad2ac893f826affe46d77ead16c7565fa775580c23fdd35df745a9050b599d0ff333290a155b48cf6d571065abd8b2fe5cc4b2e136f3efc1 SHA512 f67b97714b2b543109c2bc90d8f474df13e8915b7a14fdc3a16b62f1dfbc59ac27c8e64d19429b87a63ee2c1e4812cee26d8fb797591028484b2072b1951231f
diff --git a/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild b/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild
index 4a278338a6da..049d5cd95eae 100644
--- a/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.27-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit autotools python-single-r1
 
diff --git a/sys-libs/openipmi/openipmi-2.0.28.ebuild b/sys-libs/openipmi/openipmi-2.0.28.ebuild
index 99e493a94c4c..fa54ed37ba3d 100644
--- a/sys-libs/openipmi/openipmi-2.0.28.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.28.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit autotools python-single-r1
 
diff --git a/sys-libs/openipmi/openipmi-2.0.29.ebuild b/sys-libs/openipmi/openipmi-2.0.29.ebuild
index c2d149b11ce1..8e3f1eb3694f 100644
--- a/sys-libs/openipmi/openipmi-2.0.29.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.29.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit autotools python-single-r1
 
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index a000fb60a475..79293f0fecca 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpi_call/Manifest b/sys-power/acpi_call/Manifest
index cdc7f891eba6..d7a688ae2040 100644
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -6,8 +6,6 @@ AUX acpi_call-3.17-linux-4.14.patch 341 BLAKE2B 8402c22a3f016f8b2b00805f6ce1db3b
 AUX acpi_call-3.17-linux-5.6.patch 1002 BLAKE2B ac5ddd5a3375aff549117cb0410d1a3d0468e07f11eb9456b89809e2d6481ab0f63a33d4b5447a8de868ee3aa3b908ea1530b2ba59a9f551c59a5839f46b8220 SHA512 31aba84449ea18511914c7bc05124cbeefbb51ce34736b84b0bf83bf7f6ab9dc3d6df74e2f87ac09d7a6117f9839573b6602c0f94e8b56184af7695d9a4db389
 DIST acpi_call-1.1.0.tar.gz 10470 BLAKE2B 000c5e6f1eb968bdea3d8dfb6d6bf7b18daffe8baa75ff32e8c6c4b98cafe0a72a67a65a17994a1c8efa16f528bdfbf2b27686a146730c319a5195dfa9ec0d51 SHA512 d5cf13c15f9057e3a27aaacfee6dcdb17b6a79194bdc8fd57b8140c07a532e2e58151bea881aa158c1183ac3bbe89f83fcfc2279ffd9e945a72331b6ddbf2c70
 DIST acpi_call-3.17.tar.gz 10470 BLAKE2B e1a4912f4b92532aa8496e668541975b7e563dfd7613d41f33503d5eecad786b84ba98b205f27c4a4fbd3b37b034a467cf7c9a73f2995539d2117f50751df682 SHA512 39f8f924995ba4e5490e93f03c33db083ced224699b1028102294b2cc99edebd1eea04d33b50beed9dea86939c124682ef8d013c990d5611471b104be3200cb1
-EBUILD acpi_call-1.1.0-r3.ebuild 708 BLAKE2B 464a13863e5540b2cf702d7ab51dec1d15b5b400456594310661de9a757b83810d1577b978783ae385bed69ba2d22f539ef42700e4b544b58b532138dade486c SHA512 83848672df330912eede86df9025be30a3100e73fea3227ef84a68a11ee56de07f0a604c8dd8d3485723a6f78877f6fd953a6a27c273c459296f1566ac0974ef
-EBUILD acpi_call-1.1.0-r4.ebuild 778 BLAKE2B b437b750c540d2348bdf13094d23a9c38a34c83984f1b7e47b436ee9977533e583246090bf9dc3c5353c2935885e58470e2d4635136d5cd2d534f53ad91588d3 SHA512 d806686711e0103bd4245aaa8d0dcb9ff0964f391c6935f5c1425a443bfe8cd8ff82ca27e8ff9c0e6ed0d5a87145b2feb706b3d2fb5a5a2eaf0f6e9f93346a74
 EBUILD acpi_call-1.1.0-r5.ebuild 832 BLAKE2B fa8a5377ffd2d5e7f9b2b2ac86b1709c5630f6720023e73a6bf598962a7b63011b75d94e25a108c216a6121e92918217c527d638fcdceca7d3af48ff9d136e67 SHA512 a29a162870bacf966f8036fd2c079803ad2037798c5ee9b06dcf1f5e550cbdfc4387538a477ad90d5a7fc7a98d407e6575287146e77cc2628b3236cb7123b201
 EBUILD acpi_call-3.17-r2.ebuild 808 BLAKE2B 35076a597e1fc879b8d11d0a121cd01a43c8fdb6774c00de9eb9b32ebe3a58130fd3b207af8fd7fe54fa70005c7a5c0567d705aeaad95fb3ab1f0c9b8f0276f4 SHA512 1e9e521ea51e0ebc9863d963dea0310d34ad1a47afa23eca29cf7c8492347799ae73d21881c61836b80c29e5faa92c8ef7de3689a530ef87a7614a2efd23ee5e
 EBUILD acpi_call-9999.ebuild 685 BLAKE2B c562b75f62f68ebf5df42851fd8d330aaa86416dfa1fcf695ae278e15890505dbdb2cb463afd18e4c38eb721a4d37613488c92427c727f0115cdbc3ed9814414 SHA512 fec83bf1b8af54c3c0f0dc66ed373da4d6f40ec97ccaaa2d85b4e069d9ad4ae34af5c41db9369881f5d0cd6be46683e0d29decd81c2e88a8b7a001eb00807a16
diff --git a/sys-power/acpi_call/acpi_call-1.1.0-r3.ebuild b/sys-power/acpi_call/acpi_call-1.1.0-r3.ebuild
deleted file mode 100644
index fb33317d196b..000000000000
--- a/sys-power/acpi_call/acpi_call-1.1.0-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info linux-mod
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/mkottman/acpi_call.git"
-	KEYWORDS=""
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/mkottman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="A kernel module that enables you to call ACPI methods"
-HOMEPAGE="https://github.com/mkottman/acpi_call"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-CONFIG_CHECK="ACPI"
-MODULE_NAMES="acpi_call(misc:${S})"
-BUILD_TARGETS="default"
-
-src_compile() {
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
-	linux-mod_src_compile
-}
diff --git a/sys-power/acpi_call/acpi_call-1.1.0-r4.ebuild b/sys-power/acpi_call/acpi_call-1.1.0-r4.ebuild
deleted file mode 100644
index 2c15af2d8fe2..000000000000
--- a/sys-power/acpi_call/acpi_call-1.1.0-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info linux-mod
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/mkottman/acpi_call.git"
-	KEYWORDS=""
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/mkottman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="A kernel module that enables you to call ACPI methods"
-HOMEPAGE="https://github.com/mkottman/acpi_call"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-CONFIG_CHECK="ACPI"
-MODULE_NAMES="acpi_call(misc:${S})"
-BUILD_TARGETS="default"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-linux-3.17.patch"
-}
-
-src_compile() {
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
-	linux-mod_src_compile
-}
diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index 23c067598d6d..eb9e37c82851 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -15,6 +15,5 @@ AUX power.d/pci_devices 1391 BLAKE2B 5da4f067b6b7e6d6905fb719cdbead8abf65d347ea3
 AUX power.d/usb_bluetooth 1121 BLAKE2B abcd8ab1e9b455dacadd5ca9627a63e9bb61c6c49912d644283c299c10171d27b684d48166058f64e1a2ebdb24f04492bf728015e3e9f33f7612da3c8d903e13 SHA512 b96abfdb8745f320ac3f1f368d1095195c68b0a56270aea4c5ad61e913ddc1641c5b5e1aadc6225d78f88956c4ffb2a396e031de02b9ecced09fac09765701bf
 AUX sleep.d/50unload_alx 316 BLAKE2B b674a3b9480c77836dc7137dedd4639704b428a6109f7e13971ef45ee328e157c7b4304e12ed0e022298c68d6fc4d2aafbb2da4a5b50d27366e6991ff027320b SHA512 64e7f77088a6157c90024d26ae6afde40abffc17d8ec2775e6a4ed17fac6c6fc1787c9f1b02cd0f4cd9e18dd74502f84e894006875b7dcacc39e509b3e0d86b0
 DIST pm-utils-1.4.1.tar.gz 208687 BLAKE2B dde7992acf1b28378021f4bd433a8e08c37bb35035af19d8b811cf8a22c141ded5cc02caf3e2ffd7119592eefcd941e4ddebb0dfbe715007788ea201cb96d073 SHA512 5bc9479fe75f120aee136befeb24c8d7d85f61410b551177ed61fd1b4ea9cce7989796b067e357ea93b44b4ae9f66311687066f188236c5efdfd3750695a8017
-EBUILD pm-utils-1.4.1-r6.ebuild 2914 BLAKE2B 7010fb2a2225ee2e82d513f82d44bf771462ad88da12c229de36da0f0c5f235ce3b8b08aa65ac64b696b0de4d47fb9af31abfec63105f87c38274435b4649ff2 SHA512 80440890a8cf4245984ba20146b756b1677ed07b396604d16fcd30ebe32ac28e563456c6b40b6c2cec7a558e922170e3a6c39d6fa2fb8870469a3d0797380433
 EBUILD pm-utils-1.4.1-r7.ebuild 2958 BLAKE2B d6682a59f2bfee19428292a17f27ab3460075a23907f5323ed4bb691a59bf8a0a7ff8a8f051f120ac31828dc1642c51761b49db55df6bf891c4d3affd42b05c8 SHA512 731c270de8041ee0165557544a364de70a7ca1773886b8373e571aa623b2ea9978b7e95556829b0d04e0f78b7c49925dd0d37a250b831782c4b6c5d8f1e2920a
 MISC metadata.xml 321 BLAKE2B 17786e84c4ddae5272489e8238655805099de241a1ffa04c985434d4a35c902d2f5a39c8a288dc1c35d6c4d54167d4ccf8439982faee55418ff8872e2ca6aac6 SHA512 8bbd7192ac92567bef9234c1725dd9abd12fbb2809d961d0f6690f05b9477e0d07ef6056a516b1eddb1c533c6b80560c9924d74f1e2fe57f682ca1e622354563
diff --git a/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild b/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild
deleted file mode 100644
index 7f54b68cd96f..000000000000
--- a/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib
-
-DESCRIPTION="Suspend and hibernation utilities"
-HOMEPAGE="https://pm-utils.freedesktop.org/"
-SRC_URI="https://pm-utils.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="alsa debug ntp video_cards_intel video_cards_radeon"
-
-vbetool="!video_cards_intel? ( sys-apps/vbetool )"
-RDEPEND="!<app-laptop/laptop-mode-tools-1.55-r1
-	!sys-power/powermgmt-base[-pm-utils(+)]
-	sys-apps/dbus
-	>=sys-apps/util-linux-2.13
-	sys-power/pm-quirks
-	alsa? ( media-sound/alsa-utils )
-	ntp? ( || ( net-misc/ntp net-misc/openntpd ) )
-	amd64? ( ${vbetool} )
-	x86? ( ${vbetool} )
-	video_cards_radeon? ( app-laptop/radeontool )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog NEWS pm/HOWTO* README* TODO"
-
-src_prepare() {
-	local ignore="01grub"
-	use ntp || ignore+=" 90clock"
-
-	use debug && echo 'PM_DEBUG="true"' > "${T}"/gentoo
-	echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${T}"/gentoo
-
-	epatch \
-		"${FILESDIR}"/${PV}-bluetooth-sync.patch \
-		"${FILESDIR}"/${PV}-disable-sata-alpm.patch \
-		"${FILESDIR}"/${PV}-fix-intel-audio-powersave-hook.patch \
-		"${FILESDIR}"/${PV}-logging-append.patch \
-		"${FILESDIR}"/${PV}-fix-alpm-typo.patch \
-		"${FILESDIR}"/${PV}-inhibit-on-right-status.patch \
-		"${FILESDIR}"/${PV}-ignore-led-failure.patch \
-		"${FILESDIR}"/${PV}-run-hook-logging.patch \
-		"${FILESDIR}"/${PV}-suspend-hybrid.patch \
-		"${FILESDIR}"/${PV}-uswsusp-hibernate-mode.patch \
-		"${FILESDIR}"/${PV}-xfs_buffer_arguments.patch
-}
-
-src_configure() {
-	econf --disable-doc
-}
-
-src_install() {
-	default
-	doman man/*.{1,8}
-
-	# Remove duplicate documentation install
-	rm -r "${ED}"/usr/share/doc/${PN}
-
-	insinto /etc/pm/config.d
-	doins "${T}"/gentoo
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN} #408091
-
-	exeinto /usr/$(get_libdir)/${PN}/sleep.d
-	doexe "${FILESDIR}"/sleep.d/50unload_alx
-
-	exeinto /usr/$(get_libdir)/${PN}/power.d
-	doexe "${FILESDIR}"/power.d/{pci_devices,usb_bluetooth}
-
-	# No longer required with current networkmanager (rm -f from debian/rules)
-	rm -f "${ED}"/usr/$(get_libdir)/${PN}/sleep.d/55NetworkManager
-
-	# No longer required with current kernels (rm -f from debian/rules)
-	rm -f "${ED}"/usr/$(get_libdir)/${PN}/sleep.d/49bluetooth
-
-	# Punt HAL related file wrt #401257 (rm -f from debian/rules)
-	rm -f "${ED}"/usr/$(get_libdir)/${PN}/power.d/hal-cd-polling
-
-	# Punt hooks which have shown to not reduce, or even increase power usage
-	# (rm -f from debian rules)
-	rm -f "${ED}"/usr/$(get_libdir)/${PN}/power.d/{journal-commit,readahead}
-
-	# Remove hooks which are not stable enough yet (rm -f from debian/rules)
-	rm -f "${ED}"/usr/$(get_libdir)/${PN}/power.d/harddrive
-
-	# Change to executable (chmod +x from debian/rules)
-	fperms +x /usr/$(get_libdir)/${PN}/defaults
-}
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index b96d88ad9fb0..aa94afb9f1b2 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,9 +1,6 @@
+AUX 0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch 3100 BLAKE2B e432205a6145f4f7efbe3dac7626b97b73bd4c9db6f639fb401494a38540025dcde40fe53464ed15057a5c67e4da5786a4a57b24e549a739c8a758d88654ab50 SHA512 79ca53f0c4ba9d37dd0a6b6bbfcac39651f658b0288aa33b941ae5bfc15cbf520ec197a6fe4230417385fc726723ef79f99a0728bda83eab96907391ebaaea32
 AUX powertop-2.8-ncurses_tinfo.patch 1385 BLAKE2B 1b11138ae9c8fc90236b421d733f8cf0edff843572cfbfececba0efed5dd2a154ca561692b42e087a1c75bc19966b71fde241a029f16b126074b7d857e8c4bf5 SHA512 f1f483c43355fc1c52d0d7b9ca8e01f71c371e4e77c275584afc9f7178985e0028d42ed675adc52a1ea014325c5aaaafe245fa9166c14326cf467bd92c274522
-DIST powertop-2.11.tar.gz 307755 BLAKE2B 01723262922df5cc2ec63f6972b2a301f7efc4c701dfa3c08280dcdaa4b79f2d04503592f8c17e43d77df89e7f08695b0381f498671969fe4aa388578f732978 SHA512 bbe2882196f1b3ae39885d38dd86018576bfac5b5e8f16ea10c7dfd197197d0493ae4ce83c969417a4c4239c41dbcfada989063f14e2943c088a7489e43953b7
 DIST powertop-2.13.tar.gz 303030 BLAKE2B 3c88e05f9889cc4b276bea3bc50a3a83228ca8efae278379a14fadc6104754f2837174e028bf9c5ded9f3af84ce6b8766ac3d24b6ae62b9b192c03fc3afdec11 SHA512 8ebeccd17b6f76d9e445382d9ce5b1c00ab2daf4f1e6e133c249bceb35ea582ca3e76da5415fd0b55a28b8a124655dc5ac7a18aaf2a3df955547d77495e59181
-DIST powertop-v2.10.tar.gz 722992 BLAKE2B 573f1f0ed40705d3463f6e6f76c67ae99127ab2541b851143dafa707ef1c2dab4127d27811b63ad27e6b002ea4efd39417297a0227996ad9b01141b6de733d41 SHA512 4219e7aadbeebdf6932c04f784434e4dd0f540bf4941d43c1830b1b5cad1f3928769b13897e24dd956b6bdee65fb1fbe902ee30685bca229b71e140d65367837
-EBUILD powertop-2.10.ebuild 3843 BLAKE2B f0d637015c7ed1dbf8f69c619630dcf7ea3a0a6fe1a9698da2dda5274a28d054c88ac884b8a7c6ca312c1bca4a582da6e008476a548592fdf60ad357083b85b0 SHA512 c9f56ee6c4d33ad52d4774ffc96b791f7c82c677aa5e439a84c9ee7d4e7c6205163b7ede16c3e30cf10bbee3835fd16d6cbd7aa5c955c8a303f5830842c2d494
-EBUILD powertop-2.11.ebuild 3690 BLAKE2B 145b1787828fc13066f4e076e311b39e5ac22ea990591fe5817b6410d6b16e5c686b9d2c1fe839e9e20653dc920eaaadfc98529d40f523f38f1a9c6ca00ffe7b SHA512 e13aa9b1cef15c80f5f69a9c51bcb286a2211c4c5161b281cb4e879fc970bb7e607a829c987093c1f8b9087f6dbaa2a7649eb905496875220f99e19bf5f03786
-EBUILD powertop-2.13.ebuild 3719 BLAKE2B f4f9d0554bc4eee892f13a5fa3f733befcd0555af4366345745c7967393abc0e1138dc3b0d4bcf25e78902d55ce9785c5510cee4a207d9d57258ae9ab2a94401 SHA512 49f66a7edd7671af9a683fa6a219aac16d493bebb2779315b9379c3af178832eb83af1b06aab122fe1a1a8ad4473998c3e1e2d5f3b7d662a4952f992ebe767fa
+EBUILD powertop-2.13-r1.ebuild 3788 BLAKE2B 4e985b40055bb591c25cb86deb59e5fe53db94c6486857f118000752b6a8764fda314f4c5d4b75e1b3e3877f5e3dac931cf0a9f06fcff44f6afb989cf5fdb29f SHA512 5d1ccd173b788818f5a9f2473cbaa91af89771d206e4726e8873717611240cbf4e2a6ce5c187ba46db0da0edb73c9d9fbca494841abbaceb8e419af6e788a9a0
 EBUILD powertop-9999.ebuild 3602 BLAKE2B b52644b5010edb0cbad9a339a75edaca4ec98188da83ab5c4c16cd85e3cec5ef8613a5fe5622cfc1d0c43654b9073372e6a63fce14d54bfd1c22792181ae9ea3 SHA512 3e918cf6c3012fba1ba5acc486c5bd8c0791f8ff1dc6c4d139c1acb0b7a9cd319a7b50c9b1808ddfafafcf591ac9a0c9d81ee58c115a99b4be5045a553437338
 MISC metadata.xml 328 BLAKE2B b0558a511f51fb77479976e60fde11b9cc46f85af935d78d060a53a1d5b1dc2611721e3c1451e3d23229cb8db0bd2bd9c6bb902c9b0fca8f57718f53f16032a8 SHA512 9d17013502d4a90d7c41493c2e69f7bc20bfd834f6f2caa5b105f9cc3045b87382393903c08a8e25bd75faaa9371e2d5c16d2521a90a89dd08697069ce8e8f5d
diff --git a/sys-power/powertop/files/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch b/sys-power/powertop/files/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
new file mode 100644
index 000000000000..c864020514e1
--- /dev/null
+++ b/sys-power/powertop/files/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
@@ -0,0 +1,62 @@
+From 311b88d2a078aa68b042dc37b416a9bdb3f650e5 Mon Sep 17 00:00:00 2001
+From: Ed Baker <edward.baker@intel.com>
+Date: Thu, 3 Sep 2020 09:01:25 -0700
+Subject: [PATCH] configure.ac: Use PKG_PROG_PKG_CONFIG macro
+
+The goal of this commit is to fix an error encountered when building
+2.13 on Chromium OS.
+emerge-${board} powertop
+  <snip>
+  checking for libnl-3.0 >= 3.0 libnl-genl-3.0 >= 3.0... yes
+  checking for library containing inet_aton... none required
+   * pkg-config: ERROR: Do not call unprefixed tools directly.
+   * pkg-config: ERROR: For board tools, use `tc-export PKG_CONFIG` (or ${CHOST}-pkg-config).
+   * pkg-config: ERROR: For build-time-only tools, `tc-export BUILD_PKG_CONFIG` (or ${CBUILD}-pkg-config).
+   * python3 /mnt/data/chromiumos/chromite/bin/cros_sdk --enter --chrome_root=chrome_root
+   *   `-python3 /mnt/data/chromiumos/chromite/bin/cros_sdk --enter --chrome_root=chrome_root
+   *       `-bash
+   *           `-emerge -b /usr/lib/python-exec/python3.6/emerge --root-deps powertop
+   *               `-sandbox /usr/lib/portage/python3.6/ebuild.sh configure
+   *                   `-ebuild.sh /usr/lib/portage/python3.6/ebuild.sh configure
+   *                       `-ebuild.sh /usr/lib/portage/python3.6/ebuild.sh configure
+   *                           `-configure ./configure --prefix=/usr --build=x86_64-pc-linux-gnu --host=x86_64-cros-linux-gnu --mandir=/usr/share/man --infodir=/usr/share/info --datadir=/usr/share --sysconfdir=/etc --localstatedir=/var/lib --disable-dependency-tracking --disable-silent-rules --docdir=/usr/share/doc/powertop-2.13 --htmldir=/usr/share/doc/powertop-2.13/html --with-sysroot=/build/volteer --libdir=/usr/lib64 --disable-nls
+   *                               `-pkg-config /build/volteer/tmp/portage/sys-power/powertop-2.13/temp/build-toolchain-wrappers/pkg-config --exists bash-completion
+   *                                   `-pstree -a -A -s -l 10567
+   * ERROR: sys-power/powertop-2.13::portage-stable failed (configure phase):
+   *   Bad pkg-config [--exists bash-completion] invocation
+<snip>
+
+The environment variable is populated for board specific tooling.
+declare -x PKG_CONFIG="/build/volteer/build/bin/pkg-config"
+
+Signed-off-by: Ed Baker <edward.baker@intel.com>
+---
+ configure.ac | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8daa48d..f191197 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,6 +38,7 @@ AC_PROG_INSTALL
+ AM_PROG_CC_C_O
+ AX_ADD_FORTIFY_SOURCE
+ AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
++PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ AX_PTHREAD([
+@@ -155,8 +156,8 @@ AC_SEARCH_LIBS([inet_aton], [resolv], [], [
+ ], [])
+ 
+ 
+-AS_IF([`pkg-config --exists bash-completion`], [
+-	bashcompletiondir=`pkg-config --variable=completionsdir --define-variable=prefix=${prefix} bash-completion`
++AS_IF([`${PKG_CONFIG} --exists bash-completion`], [
++	bashcompletiondir=`${PKG_CONFIG} --variable=completionsdir --define-variable=prefix=${prefix} bash-completion`
+ ], [
+ 	bashcompletiondir=${datadir}/bash-completion/completions
+ ])
+-- 
+2.17.1
+
diff --git a/sys-power/powertop/powertop-2.10.ebuild b/sys-power/powertop/powertop-2.10.ebuild
deleted file mode 100644
index a0784d08bd46..000000000000
--- a/sys-power/powertop/powertop-2.10.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
-
-if [[ ${PV} == "9999" ]] ; then
-	GIT_ECLASS="git-r3"
-	SRC_URI=""
-else
-	SRC_URI="https://01.org/sites/default/files/downloads/${PN}-v${PV}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux"
-	MY_P="${PN}-v${PV}"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-inherit autotools ${GIT_ECLASS} linux-info
-
-DESCRIPTION="tool to diagnose issues with power consumption and power management"
-HOMEPAGE="https://01.org/powertop/ https://github.com/fenrus75/powertop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls unicode X"
-
-DEPEND="
-	dev-libs/libnl:3
-	sys-apps/pciutils
-	sys-libs/ncurses:=[unicode?]
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-RDEPEND="
-	${DEPEND}
-	X? ( x11-apps/xset )
-	virtual/libintl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
-)
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~X86_MSR
-		~DEBUG_FS
-		~PERF_EVENTS
-		~TRACEPOINTS
-		~NO_HZ_IDLE
-		~HIGH_RES_TIMERS
-		~HPET_TIMER
-		~CPU_FREQ_STAT
-		~CPU_FREQ_GOV_ONDEMAND
-		~FTRACE
-		~BLK_DEV_IO_TRACE
-		~TRACING
-	"
-	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
-	ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
-	ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_NO_HZ_IDLE="NO_HZ_IDLE should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
-	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
-	ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
-	linux-info_pkg_setup
-	if linux_config_exists; then
-		if kernel_is -lt 3 7 0; then
-			if linux_chkconfig_present SND_HDA_INTEL; then
-				CONFIG_CHECK="~SND_HDA_POWER_SAVE"
-				ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
-				check_extra_config
-			fi
-		fi
-		if kernel_is -lt 3 9 0; then
-			CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
-			ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-		if kernel_is -lt 3 19; then
-			CONFIG_CHECK="~PM_RUNTIME"
-			ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
-			check_extra_config
-		else
-			CONFIG_CHECK="~PM"
-			ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-		if kernel_is -lt 4 11; then
-			CONFIG_CHECK="~TIMER_STATS"
-			ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Bug 599114
-	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX_11])|' configure.ac || die
-
-	if [[ ${PV} == "9999" ]] ; then
-		chmod +x scripts/version || die "Failed to make 'scripts/version' executable"
-		scripts/version || die "Failed to extract version information"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
-	econf $(use_enable nls)
-}
diff --git a/sys-power/powertop/powertop-2.11.ebuild b/sys-power/powertop/powertop-2.11.ebuild
deleted file mode 100644
index e472b13d37e0..000000000000
--- a/sys-power/powertop/powertop-2.11.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
-
-if [[ ${PV} == "9999" ]] ; then
-	GIT_ECLASS="git-r3"
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit autotools ${GIT_ECLASS} linux-info
-
-DESCRIPTION="tool to diagnose issues with power consumption and power management"
-HOMEPAGE="https://01.org/powertop/ https://github.com/fenrus75/powertop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls unicode X"
-
-DEPEND="
-	dev-libs/libnl:3
-	sys-apps/pciutils
-	sys-libs/ncurses:=[unicode?]
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-RDEPEND="
-	${DEPEND}
-	X? ( x11-apps/xset )
-	virtual/libintl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
-)
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~X86_MSR
-		~DEBUG_FS
-		~PERF_EVENTS
-		~TRACEPOINTS
-		~NO_HZ_IDLE
-		~HIGH_RES_TIMERS
-		~HPET_TIMER
-		~CPU_FREQ_STAT
-		~CPU_FREQ_GOV_ONDEMAND
-		~FTRACE
-		~BLK_DEV_IO_TRACE
-		~TRACING
-	"
-	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
-	ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
-	ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_NO_HZ_IDLE="NO_HZ_IDLE should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
-	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
-	ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
-	linux-info_pkg_setup
-	if linux_config_exists; then
-		if kernel_is -lt 3 7 0; then
-			if linux_chkconfig_present SND_HDA_INTEL; then
-				CONFIG_CHECK="~SND_HDA_POWER_SAVE"
-				ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
-				check_extra_config
-			fi
-		fi
-		if kernel_is -lt 3 9 0; then
-			CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
-			ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-		if kernel_is -lt 3 19; then
-			CONFIG_CHECK="~PM_RUNTIME"
-			ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
-			check_extra_config
-		else
-			CONFIG_CHECK="~PM"
-			ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-		if kernel_is -lt 4 11; then
-			CONFIG_CHECK="~TIMER_STATS"
-			ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Bug 599114
-	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX_11])|' configure.ac || die
-
-	echo "\"${PV}\"" > version-short
-	echo "${PV}" > version-long
-
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
-	econf $(use_enable nls)
-}
diff --git a/sys-power/powertop/powertop-2.13-r1.ebuild b/sys-power/powertop/powertop-2.13-r1.ebuild
new file mode 100644
index 000000000000..ef1f63925d7c
--- /dev/null
+++ b/sys-power/powertop/powertop-2.13-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
+
+if [[ ${PV} == "9999" ]] ; then
+	GIT_ECLASS="git-r3"
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit autotools ${GIT_ECLASS} linux-info
+
+DESCRIPTION="tool to diagnose issues with power consumption and power management"
+HOMEPAGE="https://01.org/powertop/ https://github.com/fenrus75/powertop/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls unicode X"
+
+DEPEND="
+	dev-libs/libnl:3
+	sys-apps/pciutils
+	sys-libs/ncurses:=[unicode?]
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf-archive
+	>=sys-devel/gettext-0.20.2
+"
+RDEPEND="
+	${DEPEND}
+	X? ( x11-apps/xset )
+	virtual/libintl
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
+	"${FILESDIR}"/0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch
+)
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~X86_MSR
+		~DEBUG_FS
+		~PERF_EVENTS
+		~TRACEPOINTS
+		~NO_HZ_IDLE
+		~HIGH_RES_TIMERS
+		~HPET_TIMER
+		~CPU_FREQ_STAT
+		~CPU_FREQ_GOV_ONDEMAND
+		~FTRACE
+		~BLK_DEV_IO_TRACE
+		~TRACING
+	"
+	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
+	ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
+	ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_NO_HZ_IDLE="NO_HZ_IDLE should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
+	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
+	ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
+	linux-info_pkg_setup
+	if linux_config_exists; then
+		if kernel_is -lt 3 7 0; then
+			if linux_chkconfig_present SND_HDA_INTEL; then
+				CONFIG_CHECK="~SND_HDA_POWER_SAVE"
+				ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
+				check_extra_config
+			fi
+		fi
+		if kernel_is -lt 3 9 0; then
+			CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
+			ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
+		if kernel_is -lt 3 19; then
+			CONFIG_CHECK="~PM_RUNTIME"
+			ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
+			check_extra_config
+		else
+			CONFIG_CHECK="~PM"
+			ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
+		if kernel_is -lt 4 11; then
+			CONFIG_CHECK="~TIMER_STATS"
+			ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Bug 599114
+	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])|' configure.ac || die
+
+	echo "\"${PV}\"" > version-short
+	echo "${PV}" > version-long
+
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
+	econf $(use_enable nls)
+}
diff --git a/sys-power/powertop/powertop-2.13.ebuild b/sys-power/powertop/powertop-2.13.ebuild
deleted file mode 100644
index c3f8c0534105..000000000000
--- a/sys-power/powertop/powertop-2.13.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
-
-if [[ ${PV} == "9999" ]] ; then
-	GIT_ECLASS="git-r3"
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit autotools ${GIT_ECLASS} linux-info
-
-DESCRIPTION="tool to diagnose issues with power consumption and power management"
-HOMEPAGE="https://01.org/powertop/ https://github.com/fenrus75/powertop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls unicode X"
-
-DEPEND="
-	dev-libs/libnl:3
-	sys-apps/pciutils
-	sys-libs/ncurses:=[unicode?]
-"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/autoconf-archive
-	>=sys-devel/gettext-0.20.2
-"
-RDEPEND="
-	${DEPEND}
-	X? ( x11-apps/xset )
-	virtual/libintl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
-)
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~X86_MSR
-		~DEBUG_FS
-		~PERF_EVENTS
-		~TRACEPOINTS
-		~NO_HZ_IDLE
-		~HIGH_RES_TIMERS
-		~HPET_TIMER
-		~CPU_FREQ_STAT
-		~CPU_FREQ_GOV_ONDEMAND
-		~FTRACE
-		~BLK_DEV_IO_TRACE
-		~TRACING
-	"
-	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
-	ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
-	ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_NO_HZ_IDLE="NO_HZ_IDLE should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
-	ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
-	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
-	ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
-	linux-info_pkg_setup
-	if linux_config_exists; then
-		if kernel_is -lt 3 7 0; then
-			if linux_chkconfig_present SND_HDA_INTEL; then
-				CONFIG_CHECK="~SND_HDA_POWER_SAVE"
-				ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
-				check_extra_config
-			fi
-		fi
-		if kernel_is -lt 3 9 0; then
-			CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
-			ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-		if kernel_is -lt 3 19; then
-			CONFIG_CHECK="~PM_RUNTIME"
-			ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
-			check_extra_config
-		else
-			CONFIG_CHECK="~PM"
-			ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-		if kernel_is -lt 4 11; then
-			CONFIG_CHECK="~TIMER_STATS"
-			ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
-			check_extra_config
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Bug 599114
-	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])|' configure.ac || die
-
-	echo "\"${PV}\"" > version-short
-	echo "${PV}" > version-long
-
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
-	econf $(use_enable nls)
-}
diff --git a/sys-power/suspend/Manifest b/sys-power/suspend/Manifest
index 951f2896ea0b..bb89b0eefabc 100644
--- a/sys-power/suspend/Manifest
+++ b/sys-power/suspend/Manifest
@@ -1,4 +1,6 @@
 DIST suspend-1.0_p20120915.tar.xz 111080 BLAKE2B 99eea1d9808219373501001f0af90973c9176c1b19d62bff7be26886b11ebb514134b68434e9b453146ef1a4af2c4cc8e26326b956a1b2378c38c100638af17c SHA512 bb714b4a7c0f5749c4b711a5c38ca5d8cb5078176a75387957123f75cfe8348adc3aa4e96335eb65c14ad1dd2f99fd6dbca3b415525dd39b3c547f9b13b775be
 DIST suspend-1.0_p20190605.patch.xz 6224 BLAKE2B 0eefbef5a8d777590f69c85b02edb5575a357b373b78d94846e2c2bd59430cbd55af59ee0e676faa7f60388cb3910adb2182dedadb1fdc1df38a409411ea2df1 SHA512 cf576a029b35306368cbdabb9863965e055198920b86eab7205083f3502ae69ec3e8a4267fb6ceaaf1560a8bdb0c59543453f1baad4758c8adc4ac4ae92736bc
+DIST suspend-1.0_p20200924.patch.xz 6664 BLAKE2B 8a0529859cfd1a19f52fb46f306111ec4e520c9678113fd7c5ad12ada85bed89fedeeafee5145f11f07ef8dac1c6c1ae0ff2d6c6d6f794c268759d70895b1af9 SHA512 27c7cfcf2b2a0f8ccafd4c0020c1dce3aa1df352adac81ba5f24b76381a833f10621f7ae58e55c7c3d41f41ba63a38aa818454edaa32ad1f0fdc6db45b5bfe73
 EBUILD suspend-1.0_p20190605.ebuild 1236 BLAKE2B 58de9f7d775ea9a68f7195816286b699ec0a2030b1cd019436e28cce341a0bdbf65655746dfe6f6b8f230db0e6fa4188e4a5a94e786cf61229fd2dbc9bfddefe SHA512 75764d08c169246882f1e177a327fa12f842c931b215af2de76d80039e42c7054be9ced7aeab4d7ecee9c311d5d913e5306595229faec1ce149c7739b43b3673
+EBUILD suspend-1.0_p20200924.ebuild 1238 BLAKE2B 4c8bc35b42b7a1421e315a20caa017b6c5603c5570c0703e39b27fc03be99e326789576875f737071e53934e0defd751036dd2f166ba47167c6b13e5621e4ecd SHA512 1af36494afcf26e6e06aadf0623fb88ecc64216a92d72851433a6a326ea1633eb2472cd3fdc71fe6e5162926cae966032f9e44096bb7ea04f859b7de1b8d3b03
 MISC metadata.xml 471 BLAKE2B 2ea30120686624747556b6498973fbd771c5d58ef822daa17f2f162ca212631b2657a0d2c8ac07e25f654e478f1be70c7fcf256112fbf54fe5adc1dc565509e8 SHA512 e357c0bf04493ca74cd36d4f3d5781c3d03afd24cad914a0fab8149c99a5543bc4dddee538d235147ea3b73a8ba081e16badde28bf10af52b2cb99eb89c19f4a
diff --git a/sys-power/suspend/suspend-1.0_p20200924.ebuild b/sys-power/suspend/suspend-1.0_p20200924.ebuild
new file mode 100644
index 000000000000..e40e3e8d371b
--- /dev/null
+++ b/sys-power/suspend/suspend-1.0_p20200924.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+BASE_PV="1.0_p20120915"
+
+DESCRIPTION="Userspace Software Suspend and S2Ram"
+HOMEPAGE="http://suspend.sourceforge.net
+https://github.com/bircoph/suspend"
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${PN}-${BASE_PV}.tar.xz
+	https://dev.gentoo.org/~bircoph/patches/${P}.patch.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt +lzo threads"
+
+RDEPEND="
+	dev-libs/libx86
+	>=sys-apps/pciutils-2.2.4
+	crypt? (
+		>=dev-libs/libgcrypt-1.6.3:0[static-libs]
+		dev-libs/libgpg-error[static-libs] )
+	lzo? ( >=dev-libs/lzo-2[static-libs] ) "
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5.10
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${WORKDIR}/${P}.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-fbsplash \
+		$(use_enable crypt encrypt) \
+		$(use_enable lzo compress) \
+		$(use_enable threads)
+}
+
+src_install() {
+	dodir etc
+	emake DESTDIR="${D}" install
+	rm "${D}/usr/share/doc/${PF}"/COPYING* || die
+}
+
+pkg_postinst() {
+	elog "In order to make this package work with genkernel see:"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=156445"
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index de053733cd33..afc66baed7e5 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index cfe7a58f8143..f6ab48e3cf14 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,18 +1,6 @@
-AUX 2.0/criu-2.0-sysroot.patch 362 BLAKE2B f99d30b790242b5bf56be24f65b94f51c428b7418c135051738f65c7475883e0afdebd3245b323cd87a18dc7bdd521a09cd03f777b1e79ccaf90254cc71ee231 SHA512 1ddce6d4072453305dc380c87f9905e441b9554cc8977c2ddc0a4ef4794732bea5c1448519ab8672d36dab5cbe1ec95dc7f8f9548b63d84aa6a7bbddeca77706
 AUX 2.2/criu-2.2-flags.patch 259 BLAKE2B 6e62d8e96ba9b2beaa4a525f14ebca1a198dae73c83d37396d92642dd426a015828daa0f5022471f0822f1660acc373cc5a848d86bcb231d9ed00b6ca5975866 SHA512 d2b122abb9d8878b5d50e11aa6a5323bd16a30f60eb7b746ecb7e4dcaab2a54d7974931778b5d82766d92963dc5075784df87bb736ad5019c66052bd25d9d57d
-AUX 2.3/criu-2.3-aarch64.patch 533 BLAKE2B bae80e07fde9eb3055ab709f3d0fa1dcae73ba01e1b84e0ee1e7858f6b68e91b1c101add3a892b4db48ea1a5aa677ae1d0ea08f6184891b5f251b649947f9299 SHA512 357b54639e0368077fc33a80fc4c8b3e40831b36ff06c7c45acc6c8de128b146536f41eb5e870f767a5e05ef8977e3b39f6be853471d2a0b2fa6e99f89f85dd1
 AUX 2.3/criu-2.3-no-git.patch 651 BLAKE2B 76d7bd15f67789a72cd0d58c854da5601cfdc42e657cc819acecd52653b2b3699db3f00cb5916148c9a1a8013159716d8607bfd6443d24a2f98bd6e0abe21f90 SHA512 9010b79a01f7bab35ca23749d6e61706404cca89d5cdacd31fc32aba82b088becd9997f9a82db460e16bd84d9f38b1b35e90d3c49ad04b0f141d037e9ebafdd8
-AUX 2.4/criu-2.4-makefile.patch 2497 BLAKE2B c9ea525b59aba01f6418ede5cd68fe02878da1962b9748689c1637e8a1733b9027507d0e382ec226ddf47e2d392d3a467855732137ff7ed3763513b4421e98a1 SHA512 3bb9963907b92d791e54ad57fde2474b77ac4bcd26e7eff67ff098feacd6c0255c560a3d364031e0a4051b9a8c943b9401afb271cfee1d91e58e116a02f3d979
-AUX 2.5/criu-2.5-automagic-libbsd.patch 516 BLAKE2B d7d1f929dade8247b1d4999aab073cc27cb2f0e3823c589e2313df5d1bd55162e3c3a7cc6eadfe0929fe8e51a774017acbb4b1f1582c7f72221d1c3f354aaa60 SHA512 01f1a6ac36c8c40b2f0d4cecafb2783d7bf7be51af042710615aa79318ef7914cef063b437428c4c2c8b2dd02434abbec7affd3983b4da74aabe429b1ce947b6
-AUX criu-2.8-automagic-libbsd.patch 511 BLAKE2B afcda80c50a2ea0a74f3578c56b2dcfe1bbb3ff17dc88bb0ea7da16fa8db21e1adb5e2f85479459d079991f7d9f2b443881d9a8d07cae1b1b541ac5a691f37ac SHA512 d43280f988965dc6c7932767a896fa252234aefee99b85651d2d3ea0ffac7dd3fce60c067d9eb7c847ad941cb20eca68a118f77246d56831d083ba01aa8f037a
 AUX criu-3.12-automagic-libbsd.patch 457 BLAKE2B bd16c9e84ba67d0968371844c7b8121d1defea93371b17124130685c1d55969e3f472349f4e4f5ac211cd659980bfdecaa06b38a2fc6037d486d15dee6850884 SHA512 b535792caf39c9e8c21ed313551b9fc0f8675c494586c66d5caba17c67bb432c27c9ff3cbf5a7d2248c99fc438174c0daea355d89ef9d4ce1a8a26e688fdf7c3
-AUX criu-3.12-gcc-10.patch 2059 BLAKE2B 6a541cc5350297b082bfb8d0535dee7e266b1d87a19b8e06ecaebdd00fd69eab0c318d4928e42dda0a0b95791125b67fe1507e2cb16055910bc58dcc155e7087 SHA512 69153aefa50ef8dc45e0bded4b6a3e4bcabc8fef6e37fd2f77fae4b1b75b98ad236d00f297b9df5010aed34ef6e811affcf812b4fc1bb167c6ca0dd9ace5ef88
-DIST criu-3.11.tar.bz2 809858 BLAKE2B 873502887a66ab5c9017b55d55ec2b391d0576e4c97f391bcd896041ac4f12f55ba40e9a9190e2a9cc802aa3c3280d68d26e9440507a5201194cbe6b1ff3661e SHA512 d201ca54b20512a4ad890c5081bbee5d1621e65bdf0a672a7a9b74a67cfdb8d451e566c32502eb8ed53c83826f8d5976a77ec451bdf667d89f8fa77c82663d1a
-DIST criu-3.12.tar.bz2 820168 BLAKE2B ea1c6ebb9d2c9fc1d8f42647e122527b48b95a6d61e32b6c093ab7ffc4d26934111dd66cedbb1b044b9a193db18df43f0941e10f197b68279be8818fdcc716ca SHA512 bb810d42da6e6dfa47a6675f258ef528a5be02eec663dc85e73532f9a291a8594f1642b0df2fbb4683c9555cb62af23597603ae0007e1b3be79d7ad7b77a60f0
 DIST criu-3.14.tar.bz2 881407 BLAKE2B 418412681baf7ec9d3a03afe3860590c857bffcb6c57d01e60b77e85dd5ba2b30deee280c884ba1574665be5fcfd03f3cc058a4b7ae08f66aabe63a80373089b SHA512 97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb88883be398911cc2c995310b17cc6
-DIST criu-3.6.tar.bz2 739437 BLAKE2B 0f128cf69a5a073df3abc736e3081b7d266573575c038a457fdf8adcdab668d957559f3b9a16606ff31871c3bf5e111349995c496c4236b5191340486814981f SHA512 5849024ac4660a5537ed37b6d98adf61d3f071e2a181d873a1f7ca6c4d00a4258445b4bc840e908d907bc34daf8a818450f54e6cdf4826a679e756c0cbc5d586
-EBUILD criu-3.11.ebuild 2900 BLAKE2B b8589a947a4672aaf53f341ddf590910c5e29eba5cec10da0a4a49e8fee7f2dfbe874790e0cd6531bb6fea9c04df36c0884384491e6fcca5805dee7243351ac7 SHA512 b60f26c2fd42745681c4cebb90a7345d2dc8653ffb9a346830b220361a676200813efa3ab1fa7f86a9509badd187811b7c60450185a6531e09be69f9e26e5518
-EBUILD criu-3.12.ebuild 2908 BLAKE2B e2302e92541f7877fe7dacf4f6cfb6b900b1fc470a63c6146ac82b3510bcff8bc77459bd4ca00be0aba98d4b9543121ec3e62a88d219cec58ceecaf7be16b241 SHA512 ad077cf2ce8f40e7a35042dd4468677ec1e301c2ef472ce6158810408ba3b4c44352cd27e4f7941d86d7c5fb1b66fdc507a1ad173b5d050045be4d3a255c2bea
-EBUILD criu-3.14-r2.ebuild 3059 BLAKE2B 0bdc0af5e6aaffb1a9f9a81db5dcfa5ff00da9b7190455d6f869f1dc0bcb9afe71665c63b6f97e8a8cdf0da7cbc373029f01162d7a2a7682d613a1928726c5c5 SHA512 d9b64a37e3a11e9f5dc9315254ea811452ea078f58cb7e19118a43624a168023005b90713904a90641a6fd11ba6a939a4d5849470cf03473df403334d63eb53d
-EBUILD criu-3.6.ebuild 2530 BLAKE2B fa1a972b8f6c15296ac8bf9519e2e4e0758fd2aad6582014b84ec72b12384385c80f0b9477301f333745ab8d1833c7521d77fa6218b1f7a3de7a4f90cdd3886b SHA512 979baf7eca6befc56c951f063ec8775d35401136f4783009829229698ae9ed8b598737f8869c016fd5a266985df4be15048ea7e8aed550160f5281348954ed73
+EBUILD criu-3.14-r2.ebuild 3202 BLAKE2B 04eb854ab9e5231e46a54ad9da940260867505f5a50adb8315cdc1b7fa0e0d4a6f8108c30e395239e95075a4ba70895e2211fd22ab5a7b094c44973da5d5be60 SHA512 272022650447956a89c5e4e469a578df559735f1aba781d4800023d56fc56e3e3210bd181abed58df154c2b7b9e9ad3eeb13c7b3d49077c4597e3bf14ea5dfbb
 MISC metadata.xml 489 BLAKE2B b147e18ffae358f6ea0c3ca2cc8addaa039d77fc845092758a258943852daa0bc674f9f2a5a94ba7094d2e6c65a179271304e2b0b4a01f1cff6d4ac20696dce8 SHA512 aebc8636c880916beff94bb80e4a9fda5eef6ef935c9e0305bbcab038e26e69a5947640e05d74978a034ca5b36d5096e177d9485c036314eaada010f16f144d4
diff --git a/sys-process/criu/criu-3.11.ebuild b/sys-process/criu/criu-3.11.ebuild
deleted file mode 100644
index 97a9868b7220..000000000000
--- a/sys-process/criu/criu-3.11.ebuild
+++ /dev/null
@@ -1,125 +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 toolchain-funcs linux-info flag-o-matic python-r1
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="https://criu.org/"
-SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="doc python selinux setproctitle static-libs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/protobuf-c
-	dev-libs/libnl:3
-	net-libs/libnet:1.1
-	sys-libs/libcap
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-RDEPEND="${RDEPEND}
-	python? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-python/ipaddr[${PYTHON_USEDEP}]
-	)"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN
-	~NETFILTER_XT_MARK"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-	"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
-	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
-)
-
-criu_arch() {
-	# criu infers the arch from $(uname -m).  We never want this to happen.
-	case ${ARCH} in
-	amd64) echo "x86";;
-	arm64) echo "aarch64";;
-	*)     echo "${ARCH}";;
-	esac
-}
-
-src_prepare() {
-	default
-
-	if ! use selinux; then
-		sed \
-			-e 's:libselinux:no_libselinux:g' \
-			-i Makefile.config || die
-	fi
-
-	use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
-}
-
-src_configure() {
-	# Gold linker generates invalid object file when used with criu's custom
-	# linker script.  Use the bfd linker instead. See https://crbug.com/839665#c3
-	tc-ld-disable-gold
-}
-
-src_compile() {
-	local target="all $(usex doc 'docs' '')"
-	RAW_LDFLAGS="$(raw-ldflags)" emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		ARCH="$(criu_arch)" \
-		V=1 WERROR=0 DEBUG=0 \
-		SETPROCTITLE=$(usex setproctitle) \
-		PYCRIU=$(usex python) \
-		${target}
-}
-
-src_test() {
-	# root privileges are required to dump all necessary info
-	if [[ ${EUID} -eq 0 ]] ; then
-		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
-	fi
-}
-
-install_crit() {
-	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
-}
-
-src_install() {
-	emake \
-		ARCH="$(criu_arch)" \
-		PREFIX="${EPREFIX}"/usr \
-		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		V=1 WERROR=0 DEBUG=0 \
-		install
-
-	use doc && dodoc CREDITS README.md
-
-	if use python ; then
-		cd lib
-		python_foreach_impl install_crit
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-}
diff --git a/sys-process/criu/criu-3.12.ebuild b/sys-process/criu/criu-3.12.ebuild
deleted file mode 100644
index 7b5158f5f9b0..000000000000
--- a/sys-process/criu/criu-3.12.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs linux-info flag-o-matic python-r1
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="https://criu.org/"
-SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="doc python selinux setproctitle static-libs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/protobuf-c
-	dev-libs/libnl:3
-	net-libs/libnet:1.1
-	sys-libs/libcap
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)"
-RDEPEND="${RDEPEND}
-	python? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-python/ipaddr[${PYTHON_USEDEP}]
-	)"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN
-	~NETFILTER_XT_MARK"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-	"${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch
-	"${FILESDIR}"/${PN}-3.12-gcc-10.patch # backport
-)
-
-criu_arch() {
-	# criu infers the arch from $(uname -m).  We never want this to happen.
-	case ${ARCH} in
-	amd64) echo "x86";;
-	arm64) echo "aarch64";;
-	*)     echo "${ARCH}";;
-	esac
-}
-
-src_prepare() {
-	default
-
-	if ! use selinux; then
-		sed \
-			-e 's:libselinux:no_libselinux:g' \
-			-i Makefile.config || die
-	fi
-
-	use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
-}
-
-src_configure() {
-	# Gold linker generates invalid object file when used with criu's custom
-	# linker script.  Use the bfd linker instead. See https://crbug.com/839665#c3
-	tc-ld-disable-gold
-}
-
-src_compile() {
-	local target="all $(usex doc 'docs' '')"
-	RAW_LDFLAGS="$(raw-ldflags)" emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		ARCH="$(criu_arch)" \
-		V=1 WERROR=0 DEBUG=0 \
-		SETPROCTITLE=$(usex setproctitle) \
-		PYCRIU=$(usex python) \
-		${target}
-}
-
-src_test() {
-	# root privileges are required to dump all necessary info
-	if [[ ${EUID} -eq 0 ]] ; then
-		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
-	fi
-}
-
-install_crit() {
-	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
-}
-
-src_install() {
-	emake \
-		ARCH="$(criu_arch)" \
-		PREFIX="${EPREFIX}"/usr \
-		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		V=1 WERROR=0 DEBUG=0 \
-		install
-
-	use doc && dodoc CREDITS README.md
-
-	if use python ; then
-		cd lib
-		python_foreach_impl install_crit
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-}
diff --git a/sys-process/criu/criu-3.14-r2.ebuild b/sys-process/criu/criu-3.14-r2.ebuild
index 0cab02a87743..2eeaf8f09f27 100644
--- a/sys-process/criu/criu-3.14-r2.ebuild
+++ b/sys-process/criu/criu-3.14-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 IUSE="doc selinux setproctitle static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -79,6 +79,11 @@ src_configure() {
 	# Gold linker generates invalid object file when used with criu's custom
 	# linker script.  Use the bfd linker instead. See https://crbug.com/839665#c3
 	tc-ld-disable-gold
+
+	# Build system uses this variable as a trigger to append coverage flags
+	# we'd like to avoid it. https://bugs.gentoo.org/744244
+	unset GCOV
+
 	python_setup
 }
 
diff --git a/sys-process/criu/criu-3.6.ebuild b/sys-process/criu/criu-3.6.ebuild
deleted file mode 100644
index 055d999d50a5..000000000000
--- a/sys-process/criu/criu-3.6.ebuild
+++ /dev/null
@@ -1,113 +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 eutils toolchain-funcs linux-info flag-o-matic python-r1
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="http://criu.org/"
-SRC_URI="http://download.openvz.org/criu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-IUSE="python selinux setproctitle static-libs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/protobuf-c
-	dev-libs/libnl:3
-	net-libs/libnet:1.1
-	sys-libs/libcap
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto"
-RDEPEND="${RDEPEND}
-	python? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-python/ipaddr[${PYTHON_USEDEP}]
-	)"
-
-CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER
-	~IA32_EMULATION ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/2.2/${PN}-2.2-flags.patch
-	"${FILESDIR}"/2.3/${PN}-2.3-no-git.patch
-	"${FILESDIR}"/${PN}-2.8-automagic-libbsd.patch
-	"${FILESDIR}"/2.0/${PN}-2.0-sysroot.patch
-)
-
-criu_arch() {
-	# criu infers the arch from $(uname -m).  We never want this to happen.
-	case ${ARCH} in
-	amd64) echo "x86";;
-	arm64) echo "aarch64";;
-	*)     echo "${ARCH}";;
-	esac
-}
-
-src_prepare() {
-	default
-
-	if ! use selinux; then
-		sed \
-			-e 's:libselinux:no_libselinux:g' \
-			-i Makefile.config || die
-	fi
-}
-
-src_compile() {
-	RAW_LDFLAGS="$(raw-ldflags)" emake \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		ARCH="$(criu_arch)" \
-		V=1 WERROR=0 DEBUG=0 \
-		SETPROCTITLE=$(usex setproctitle) \
-		PYCRIU=$(usex python) \
-		all docs
-}
-
-src_test() {
-	# root privileges are required to dump all necessary info
-	if [[ ${EUID} -eq 0 ]] ; then
-		emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test
-	fi
-}
-
-install_crit() {
-	"${PYTHON:-python}" ../scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/"
-}
-
-src_install() {
-	emake \
-		ARCH="$(criu_arch)" \
-		PREFIX="${EPREFIX}"/usr \
-		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		WERROR=0 \
-		install
-
-	dodoc CREDITS README.md
-
-	if use python ; then
-		cd lib
-		python_foreach_impl install_crit
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-}
diff --git a/sys-process/criu/files/2.0/criu-2.0-sysroot.patch b/sys-process/criu/files/2.0/criu-2.0-sysroot.patch
deleted file mode 100644
index 4dcb0fb2c95a..000000000000
--- a/sys-process/criu/files/2.0/criu-2.0-sysroot.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Using host headers when cross compiling is not a great idea.
-
-Index: criu-2.0/criu/Makefile
-===================================================================
---- criu-2.0.orig/criu/Makefile
-+++ criu-2.0/criu/Makefile
-@@ -51,1 +51,1 @@ ccflags-y		+= -iquote $(SRC_DIR)/criu/pi
--ccflags-y		+= -I/usr/include/libnl3
-+ccflags-y		+= -I${SYSROOT}/usr/include/libnl3
diff --git a/sys-process/criu/files/2.3/criu-2.3-aarch64.patch b/sys-process/criu/files/2.3/criu-2.3-aarch64.patch
deleted file mode 100644
index e857b6a1aa2b..000000000000
--- a/sys-process/criu/files/2.3/criu-2.3-aarch64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0e2636b..ef8f78b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -25,7 +25,7 @@ export SRC_DIR
- 
- #
- # Architecture specific options.
--ifneq ($(filter-out x86 arm arm64 ppc64,$(ARCH)),)
-+ifneq ($(filter-out x86 arm aarch64 ppc64,$(ARCH)),)
-         $(error "The architecture $(ARCH) isn't supported")
- endif
- 
-@@ -39,7 +39,7 @@ ifeq ($(ARCH),arm)
-         SRCARCH		:= arm
- endif
- 
--ifeq ($(ARCH),arm64)
-+ifeq ($(ARCH),aarch64)
-         ARCH		:= aarch64
-         SRCARCH		:= aarch64
-         VDSO		:= y
diff --git a/sys-process/criu/files/2.4/criu-2.4-makefile.patch b/sys-process/criu/files/2.4/criu-2.4-makefile.patch
deleted file mode 100644
index 8a0fb6d940fc..000000000000
--- a/sys-process/criu/files/2.4/criu-2.4-makefile.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/Makefile.install b/Makefile.install
-index e3dd551..495ad39 100644
---- a/Makefile.install
-+++ b/Makefile.install
-@@ -6,24 +6,11 @@ BINDIR		?= $(PREFIX)/bin
- SBINDIR		?= $(PREFIX)/sbin
- MANDIR		?= $(PREFIX)/share/man
- SYSTEMDUNITDIR	?= $(PREFIX)/lib/systemd/system/
--LOGROTATEDIR	?= $(PREFIX)/etc/logrotate.d/
-+LOGROTATEDIR	?= $(SYSCONFDIR)/etc/logrotate.d/
- LIBDIR		?= $(PREFIX)/lib
- INCLUDEDIR	?= $(PREFIX)/include/criu
- LIBEXECDIR	?= $(PREFIX)/libexec
- 
--#
--# For recent Debian/Ubuntu with multiarch support.
--DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
--ifneq "$(DEB_HOST_MULTIARCH)" ""
--        LIBDIR			?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
--else
--        #
--        # For most other systems
--        ifeq "$(shell uname -m)" "x86_64"
--                LIBDIR		?= $(PREFIX)/lib64
--        endif
--endif
--
- export BINDIR SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
- export INCLUDEDIR LIBDIR DESTDIR PREFIX LIBEXECDIR
- 
-diff --git a/lib/Makefile b/lib/Makefile
-index f1c0821..3bef265 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -25,8 +25,12 @@ lib-c: c/$(CRIU_SO)
- #
- # Python bindings.
- lib-py:
-+ifeq ($(PYCRIU),yes)
- 	$(call msg-gen, $@)
- 	$(Q) $(MAKE) -C py all
-+else
-+	$(Q) echo "no py criu"
-+endif
- .PHONY: lib-py
- 
- all: lib-c lib-py
-@@ -43,7 +47,7 @@ clean:
- 	$(Q) $(RM) -r build usr
- .PHONY: clean
- 
--install: lib-c lib-py ../crit/crit c/criu.pc.in
-+install: lib-c ../crit/crit c/criu.pc.in
- 	$(E) "  INSTALL " $(CRIU_SO)
- 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)
- 	$(Q) install -m 755 c/$(CRIU_SO) $(DESTDIR)$(LIBDIR)/$(CRIU_SO).$(CRIU_SO_VERSION_MAJOR).$(CRIU_SO_VERSION_MINOR)
-@@ -55,8 +59,6 @@ install: lib-c lib-py ../crit/crit c/criu.pc.in
- 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
- 	$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)),' c/criu.pc.in > c/criu.pc
- 	$(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
--	$(E) "  INSTALL " crit
--	$(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES)
- .PHONY: install
- 
- uninstall:
-diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk
-index bd40944..3cfbffa 100644
---- a/scripts/nmk/scripts/build.mk
-+++ b/scripts/nmk/scripts/build.mk
-@@ -87,7 +87,7 @@ builtin-name	:= $(strip $(builtin-name))
- 
- #
- # Link flags.
--ld_flags	:= $(strip $(LDFLAGS) $(ldflags-y))
-+ld_flags	:= $(strip $(RAW_LDFLAGS) $(ldflags-y))
- 
- #
- # $(obj) related rules.
diff --git a/sys-process/criu/files/2.5/criu-2.5-automagic-libbsd.patch b/sys-process/criu/files/2.5/criu-2.5-automagic-libbsd.patch
deleted file mode 100644
index de6509a745c2..000000000000
--- a/sys-process/criu/files/2.5/criu-2.5-automagic-libbsd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/criu/Makefile.config b/criu/Makefile.config
-index f531b3b..23a3b23 100644
---- a/criu/Makefile.config
-+++ b/criu/Makefile.config
-@@ -2,10 +2,12 @@ include $(__nmk_dir)/utils.mk
- include $(__nmk_dir)msg.mk
- include $(SRC_DIR)/scripts/feature-tests.mak
- 
-+ifeq ($(SETPROCTITLE),yes)
- ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true)
-         LIBS		+= -lbsd
-         FEATURE_DEFINES	+= -DCONFIG_HAS_LIBBSD
- endif
-+endif
- 
- ifeq ($(call pkg-config-check,libselinux),y)
-         LIBS		+= -lselinux
diff --git a/sys-process/criu/files/criu-2.8-automagic-libbsd.patch b/sys-process/criu/files/criu-2.8-automagic-libbsd.patch
deleted file mode 100644
index 54781ea5f841..000000000000
--- a/sys-process/criu/files/criu-2.8-automagic-libbsd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile.config b/Makefile.config
-index e0d49d2..d1b2b9d 100644
---- a/Makefile.config
-+++ b/Makefile.config
-@@ -2,10 +2,12 @@ include $(__nmk_dir)utils.mk
- include $(__nmk_dir)msg.mk
- include $(SRC_DIR)/scripts/feature-tests.mak
- 
-+ifeq ($(SETPROCTITLE),yes)
- ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true)
-         LIBS_FEATURES	+= -lbsd
-         FEATURE_DEFINES	+= -DCONFIG_HAS_LIBBSD
- endif
-+endif
- 
- ifeq ($(call pkg-config-check,libselinux),y)
-         LIBS_FEATURES	+= -lselinux
diff --git a/sys-process/criu/files/criu-3.12-gcc-10.patch b/sys-process/criu/files/criu-3.12-gcc-10.patch
deleted file mode 100644
index ff277b5b22df..000000000000
--- a/sys-process/criu/files/criu-3.12-gcc-10.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://bugs.gentoo.org/707942
-
-From 10d9dcdb6e2fbe4646ff3f27cd35376ebaeeb0f9 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 2 Feb 2020 18:45:59 +0000
-Subject: [PATCH] criu: fix build failure against gcc-10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
-ld: criu/arch/x86/crtools.o:criu/include/cr_options.h:159:
-  multiple definition of `rpc_cfg_file'; criu/arch/x86/cpu.o:criu/include/cr_options.h:159: first defined here
-make[2]: *** [scripts/nmk/scripts/build.mk:164: criu/arch/x86/crtools.built-in.o] Error 1
-```
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Reported-by: Toralf Förster
-Bug: https://bugs.gentoo.org/707942
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- criu/config.c             | 1 +
- criu/include/cr_options.h | 2 +-
- criu/include/pstree.h     | 2 +-
- criu/include/tun.h        | 2 +-
- 4 files changed, 4 insertions(+), 3 deletions(-)
-
---- a/criu/config.c
-+++ b/criu/config.c
-@@ -30,6 +30,7 @@
- #include "common/xmalloc.h"
- 
- struct cr_options opts;
-+char *rpc_cfg_file;
- 
- static int count_elements(char **to_count)
- {
---- a/criu/include/cr_options.h
-+++ b/criu/include/cr_options.h
-@@ -156,7 +156,7 @@ struct cr_options {
- };
- 
- extern struct cr_options opts;
--char *rpc_cfg_file;
-+extern char *rpc_cfg_file;
- 
- extern int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd, int state);
- extern int check_options(void);
---- a/criu/include/pstree.h
-+++ b/criu/include/pstree.h
-@@ -42,7 +42,7 @@ enum {
- };
- #define FDS_EVENT (1 << FDS_EVENT_BIT)
- 
--struct pstree_item *current;
-+extern struct pstree_item *current;
- 
- struct rst_info;
- /* See alloc_pstree_item() for details */
---- a/criu/include/tun.h
-+++ b/criu/include/tun.h
-@@ -5,7 +5,7 @@
- #define TUN_MINOR	200
- #endif
- 
--struct ns_id *ns;
-+extern struct ns_id *ns;
- 
- #include <linux/netlink.h>
- 
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index a5cc5a8ae755..f865efd8d0a8 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,5 +1,7 @@
 DIST parallel-20200722.tar.bz2 2101118 BLAKE2B 989b0fbf6d359ddb4fc86d1509ccc9d92af36f7f622cebf660ccdf216d61c99f66464dabbb65d16773bb23216c3b6b4b296ed4abbcb708b954993eaf21b01531 SHA512 acffc0a08ef599275f54f710244fde45efd85d15b8b98bff6df2ad113c06334de9ffe641c61a55da51e62025f8bfe66d1318959f08c6cffe1ab2292c7cdb8cd1
 DIST parallel-20200822.tar.bz2 2102303 BLAKE2B c910b2b7e7631f07962d97e4953e26b3134a6ecbb42e64eb862eeeeff1b2707d95ca6d28d651f051bf32b62d0013f7e64f116a7bd87bd892da9debccfa700cfe SHA512 f723163b430e1932a8d5282ea4b6376cf0e65c04feaf1a7ce35d838328d26f5dba5d63a004b0652e733595cb82cca475e479b2111c423c1977aa1a0d1d59b5ff
+DIST parallel-20200922.tar.bz2 2101918 BLAKE2B 51446bbe0ab34166db2b088dc96b18cfc26027312b16a8a98a6d68bf50ae247ba3b8654689760a53020bb5d8826ea8bd498bf4e6fbd9e26ab0e49dcc2214b68c SHA512 150e067025ba46dcd3f5319524890c383a5ba662999a355a1c44357e2bc57e4d23f0a164684aff12c96798dd637b44c3c8582769f5858a86e30dc66c9c3fca88
 EBUILD parallel-20200722.ebuild 634 BLAKE2B 3937842c027464703f2aa2fc03407cd349174ac4f8286004ce4a91d008803a113e4ef014df6b4f93c44b0fd415f535cb2f6817b1bac3fa76f5e52730b6ab8876 SHA512 dd9271c6b3ae7a78d9917f3d19f4c97244c5cf6a51f95a16bda46e42387f334e4c135ab962664c9ac7d7d29c07f93f06ac9e52b72a656dcd4b1392cd36a48d82
 EBUILD parallel-20200822.ebuild 638 BLAKE2B b9dbb07e6bd05e6fd839db8684e3e00f833ef4d3070c8e6f2ceae9726b6d382eb312c56abdeaa53294853fd3b6f4ff149983d83a318d37270e4f6e8e29f6eeb1 SHA512 174793db3e189d3f35e92bdc4cd6b32c98a36adebc0e7b68cfacea6f8b1ed137075049483e60b8882b50dedd88af6b276ffb6c63d4f65683e31f5e2200902251
+EBUILD parallel-20200922.ebuild 638 BLAKE2B b9dbb07e6bd05e6fd839db8684e3e00f833ef4d3070c8e6f2ceae9726b6d382eb312c56abdeaa53294853fd3b6f4ff149983d83a318d37270e4f6e8e29f6eeb1 SHA512 174793db3e189d3f35e92bdc4cd6b32c98a36adebc0e7b68cfacea6f8b1ed137075049483e60b8882b50dedd88af6b276ffb6c63d4f65683e31f5e2200902251
 MISC metadata.xml 1077 BLAKE2B a636be1d6e6e4861e156561d8670e0c07ae27657e2ddf8cac3a6d9dfcb3c637931fe95daf998dc93fac1ab2a31d9ae43e73469a2882124fa8e229f1c7bf55d06 SHA512 5cfcbca8d00c6fd19ef2ad24fe6f23d3e02164b31a330d0ab34a739a8a4152f8d8df31a42c563d0b482a94519bdc4b0d92182b04d6937dd98f06bcee3726493b
diff --git a/sys-process/parallel/parallel-20200922.ebuild b/sys-process/parallel/parallel-20200922.ebuild
new file mode 100644
index 000000000000..b26f0ef3040a
--- /dev/null
+++ b/sys-process/parallel/parallel-20200922.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 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/ https://git.savannah.gnu.org/cgit/parallel.git"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-lang/perl:=
+	dev-perl/Devel-Size
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Temp
+	virtual/perl-IO"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index cb927f8ea7db..d71d573a8f3e 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -5,5 +5,5 @@ DIST psmisc-23.2.tar.xz 303820 BLAKE2B 6c63a54b91e1e31f812bc47c10937e8767fa2990b
 DIST psmisc-23.3.tar.xz 311896 BLAKE2B f38360dfb037a758633a8ff25af1de70be83ae5b2f2afe856ce237ade7bd2720f7c270c5af884313177022aa70f408dfce0c39e5d847057a6fdba98e3363561c SHA512 791ffef78d87b092d653da98710b338017466a9e1e1935968b9f0194ccef8da941317aa0c39d821d46b20d95d6539ccf78e5ebb71ad1032ae62337a397180d58
 EBUILD psmisc-23.1-r1.ebuild 1270 BLAKE2B 372ee0848e1201eb5718481b8c6ae0ed80acf3c9c94957b6b64c768f610687ce285a775324a6b76c23de3d309b35c88dd2e96f2c752ad6db145f4191721c0755 SHA512 982c57baaa9985aa9ac140b7bbb65718c88d8aa8b79e2e5b07267f0aa1eeae52aed5d1e7e338f054758d444a8eb04b4866d75042a4a32c1877bcb2a3c0794cb2
 EBUILD psmisc-23.2-r2.ebuild 1274 BLAKE2B 653aaf23f8fbc371338cd0639877bd467ff87987648d0d68838bfa6094f0ef2f29b372c89df171a3ab38ddfa5500de104bab650f0fca5aabed2ccfddd016a7af SHA512 31e2681b481e2f7a2b4da2b86d980a7a6789090c9ea89efe04e48ed595d4464ac55cebeae56899aacb30717d74efe49728796416fa7a8eafeb1fc33d4c1fc7a2
-EBUILD psmisc-23.3-r1.ebuild 1152 BLAKE2B 985b9911015de0d38bdb2ef776cfebd67a024fe5753dd5660c502cf6ae426000ca96da8241b25d94747d2413777decf14f3a29277922444259896d8729e4dc3a SHA512 8a77edec036973dcb603264e9bd018e2b292cb85c5c36ea29ada873e4f31acaed54d7baef0d6d1fa57d944278d0b3f2db18909d308f3fded343696c6959ba97c
+EBUILD psmisc-23.3-r1.ebuild 1150 BLAKE2B b3ef07952efb80a7e13a5683e23949e06db15ee298e029bae355438fc7a49a4fbc1a30c8bde47502715062d36181dcbbdb9f830af41a1afb11889f013faaf186 SHA512 bc76d36a24722841f9078fb5a72e41e5e0df3e9489524cba257ef02d1aecf50c281cc883c008834eff0b859f2841ee9f60b7661c64c390d7bc32525816f656d4
 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c
diff --git a/sys-process/psmisc/psmisc-23.3-r1.ebuild b/sys-process/psmisc/psmisc-23.3-r1.ebuild
index 6d90d4483cae..09a5c56c9241 100644
--- a/sys-process/psmisc/psmisc-23.3-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 nls selinux X"
 
 RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
diff --git a/sys-process/systemd-cron/Manifest b/sys-process/systemd-cron/Manifest
index 009fc8628368..db7e3c76fd8a 100644
--- a/sys-process/systemd-cron/Manifest
+++ b/sys-process/systemd-cron/Manifest
@@ -1,3 +1,3 @@
 DIST systemd-cron-1.5.14.tar.gz 31634 BLAKE2B 59394128145dbd04a2b1bb10a6ac8821a97a465e3c0d43f3ca8fdfe60db273352d46b1200c966adaf772272835269c5c553b040cb0e0340ec56340181c9b7245 SHA512 772a4f8181a0f8039a8138fdc43bfe0f2bd89222fe19fa971727be265036f86435334d6230e116440f6969425fc6d59dc26e9cf230c00d030ea5d62ba351713c
-EBUILD systemd-cron-1.5.14.ebuild 2043 BLAKE2B 7a7ccba4f7ab17ebf466fa0ae9b0bee40b096cc3888e69133bf5689ea114c74b0ffc03b5c2e8b8a9790c1320223f5cfa6d2680ac85af5a9e36a775adc404c098 SHA512 be3385ecfb38a3483b821328d4b8d1abd5ec820bb5ed9556b57a9919392064fddd719727df422aaaf36f0fa4d3ecf1d75f804ac3520d73842b0615fecb3c57e7
+EBUILD systemd-cron-1.5.14.ebuild 2055 BLAKE2B c641214b325e3ca317cfc632359a561bd64c7a39a60239c1cf01d8f1c1b91485fe009b497d7eb435f31d415e813846296804f542b6fe42e3a8a7fd94305541f0 SHA512 16ab5ad7b09d19a608be8b3c57afdaef727027664e2460fbe13efd55a987ff7c21bf9a07b51425fb8b242d03cbbce2c50b6ec2bcf92851c4cd65829357d0bab0
 MISC metadata.xml 696 BLAKE2B 9487789802e271bb95d8c44c5f279f8c850b928e8a2547ce7a1b47e2db3aef119265c0d8e36b8dfba3c62e3b7d4ccc040ba7983dec6c6328fc11e10e7ffd4ecc SHA512 54efb7e34c7e83c0ac3e964e300705b3b33c2dd93dc711c6e71b9d93d83a627f0318ce757b01feb6d6e1edd228f94ab180394617803dcc23c5e73aece9c9f7c1
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild
index 9c20864eb745..23e98c5e305b 100644
--- a/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild
+++ b/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 IUSE="cron-boot etc-crontab-systemd minutely setgid test yearly"
 RESTRICT="!test? ( test )"
 
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index d1da6897964c..cadb9f97f166 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/pypy/Manifest b/virtual/pypy/Manifest
deleted file mode 100644
index 4ec82e63d474..000000000000
--- a/virtual/pypy/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD pypy-7.3.0.ebuild 426 BLAKE2B d2b625fb2c96af719c7e02732e0091471507f6815fc4688a1bbd1ca067395084e4d3e3b08b4e102b7cda10f716f85753c76e157e634476eb1a95dcd4dd62f98c SHA512 ce785b1894ac305f269dd968ae3a80a83dde2c9fc5eea736f68d35ee7078cad607260d41249fe9a50f0101d1fd3d15b69d16627c64c149b60bf76ebe8bb90a4f
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/pypy/metadata.xml b/virtual/pypy/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/virtual/pypy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/pypy/pypy-7.3.0.ebuild b/virtual/pypy/pypy-7.3.0.ebuild
deleted file mode 100644
index d6da859f3bb5..000000000000
--- a/virtual/pypy/pypy-7.3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="An obsolete virtual for PyPy Python implementation"
-# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/73"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm ncurses sqlite tk"
-
-RDEPEND="
-	>=dev-python/pypy-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]"
diff --git a/virtual/pypy3/Manifest b/virtual/pypy3/Manifest
deleted file mode 100644
index 14c5bc235323..000000000000
--- a/virtual/pypy3/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD pypy3-7.3.0.ebuild 439 BLAKE2B 2110a7ee262a03ac4ea18a88e32265655d8ff2534b398f7ccd5ebe4f33584da8c44a2fd800075d16901b84f03c8a9da8ad32753d861659761ce5666692d95d63 SHA512 f1873e05937d7fbb02bfbce9a9954d80e55abd4db24c88e1a93ed6ce9c67baf85233b511bd16a1ca596168fd2427d41cbc89a023484d3ca40b3d6f642739100e
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/pypy3/metadata.xml b/virtual/pypy3/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/virtual/pypy3/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/virtual/pypy3/pypy3-7.3.0.ebuild b/virtual/pypy3/pypy3-7.3.0.ebuild
deleted file mode 100644
index 76e6e9bb3d6e..000000000000
--- a/virtual/pypy3/pypy3-7.3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="An obsolete virtual for PyPy3 Python implementation"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/pypy36-pp73"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm ncurses sqlite tk"
-
-RDEPEND="
-	>=dev-python/pypy3-${PV}:${SLOT}[bzip2?,gdbm(-)?,ncurses?,sqlite?,tk?]"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 64c180927eec..f07efbb4330e 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_common_redirect/Manifest b/www-apache/mod_common_redirect/Manifest
index 0a7eb02ab2ec..16387660b166 100644
--- a/www-apache/mod_common_redirect/Manifest
+++ b/www-apache/mod_common_redirect/Manifest
@@ -1,4 +1,4 @@
 AUX 20_mod_common_redirect.conf 133 BLAKE2B 1353b28961812a4cb9e8aae0bc53feeb6de2b15238d64c8680402c5b118765b6233ec2521cfd1ec3cc7d9dd1400ba17d370c4b062ce1792d032c91e5c45ef796 SHA512 5152736abde393b0ab9e1df1167cdaaf951ef23ad83e53482eacad4a49b3cdef9d840bc4d0ff38504ea2bdb0d78dc5e5075b2e83726068d495b1aafd30f39d69
 DIST mod_common_redirect-0.1.1.tar.gz 3341 BLAKE2B 124c5dbf239351514522c87cfd69bcdae45a6220944e1a88f082224e537419930ba5f5121f065cd6f0f9f51a17a19e0b8ff76c513eb2f10f440f3238b874d234 SHA512 861f7db59095f35b760ab67e703a6ae40c0f31d310c9b9498d7d477ffcdf1f1f673fd0f637acbd1c3911ac140581dfa49457ae56602035f8e834f56774706263
-EBUILD mod_common_redirect-0.1.1.ebuild 698 BLAKE2B 3809b057bcb60e8b4b6ad94fef3ff699660a95e35ef82c1f6616d17dd206b29a1eadbe7fecff6c9395f01ea4b408c14ec661a070ae67f52227b2cfcb4e6b97bb SHA512 99e9e42829f66cff3384e0ac79eafa858d48b7944bf7df0cb6c8f983b4df64e6f2a6c471585252e6f61292200c7915d32852c18a52c71f04343745a2719035ed
+EBUILD mod_common_redirect-0.1.1-r1.ebuild 766 BLAKE2B 96dad47721c3dec6ecfd065737610864b5341262f429f6b0e188e6a8f191b7e4589b45f90b50fe4a17f9c2004b8b7b84645fd8a946c1a602cd7347db79b53ba3 SHA512 859f5ae8fb2ec9c9182c1e6b22df7a1c268dc5ceba24fc19aa5241ad47db3d793c2aa7b9d177c13618b54486156509e18f374d24a6295f1838d252ed6df71efd
 MISC metadata.xml 258 BLAKE2B 673268a026dd67f7464a1d0c460d0b0640c160f36b5e8c262334bc4faf624dc75a3990576b2252eedc9debfc038902f6952fa005c4f98f776e96f7e9e449a2b6 SHA512 c01fb3d6cdc9ad3bcf61ef3957c6fe9e2202cc99ba05ece5bec1971c8f608c3dc057c506fb0ee680e44488c76aa6f871a1d3549323b3f6b5e1d3075950ed41ab
diff --git a/www-apache/mod_common_redirect/mod_common_redirect-0.1.1-r1.ebuild b/www-apache/mod_common_redirect/mod_common_redirect-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..cf68396b12e2
--- /dev/null
+++ b/www-apache/mod_common_redirect/mod_common_redirect-0.1.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit apache-module
+
+GITHUB_AUTHOR="hollow"
+GITHUB_PROJECT="mod_common_redirect"
+GITHUB_COMMIT="595a370"
+DESCRIPTION="mod_common_redirect implements common redirects without mod_rewrite overhead"
+HOMEPAGE="https://github.com/hollow/mod_common_redirect"
+SRC_URI="https://nodeload.github.com/${GITHUB_AUTHOR}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}.tar.gz"
+S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+need_apache2
+
+src_install() {
+	APACHE2_MOD_CONF="20_${PN}"
+	APACHE2_MOD_DEFINE="COMMON_REDIRECT"
+	APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
+	apache-module_src_install
+}
diff --git a/www-apache/mod_common_redirect/mod_common_redirect-0.1.1.ebuild b/www-apache/mod_common_redirect/mod_common_redirect-0.1.1.ebuild
deleted file mode 100644
index 8f49770faaca..000000000000
--- a/www-apache/mod_common_redirect/mod_common_redirect-0.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit apache-module
-
-GITHUB_AUTHOR="hollow"
-GITHUB_PROJECT="mod_common_redirect"
-GITHUB_COMMIT="595a370"
-
-DESCRIPTION="mod_common_redirect implements common redirects without mod_rewrite overhead"
-HOMEPAGE="https://github.com/hollow/mod_common_redirect"
-SRC_URI="https://nodeload.github.com/${GITHUB_AUTHOR}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-APACHE2_MOD_CONF="20_${PN}"
-APACHE2_MOD_DEFINE="COMMON_REDIRECT"
-
-need_apache2
-
-S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT}
diff --git a/www-apache/mod_xsendfile/Manifest b/www-apache/mod_xsendfile/Manifest
index 639f17729f29..2e423e34faa2 100644
--- a/www-apache/mod_xsendfile/Manifest
+++ b/www-apache/mod_xsendfile/Manifest
@@ -1,4 +1,4 @@
 AUX 50_mod_xsendfile.conf 451 BLAKE2B 7bacc1828434238520af0fde4f877ba64277d515f3abd7bdc8e4ccded1ec5ec5556fede98d02ffc2aa96ae9840fa3dc68a110bf81a6a09487e265018cacb50f3 SHA512 b138d82adbf2a145ff5bef22750826eabe58daf94eabdfebd8d540be4b9b242a69b9ab9333e0ceb4da0cbad947978e7bf928978b6cf8560abe5695d6b533df3c
 DIST mod_xsendfile-1.0b1.tar.gz 14883 BLAKE2B fe250070ae8b7f2f00b8b0616ad53803b0c2d5cbec897f98a9af45e3b2a4e5c598b93ce3f0ffe65d6ec083a0201e1f1c07a8d6109fc77dd761d2aa7e4d3caf10 SHA512 96745a5c753af329cabc10b1551e199425abf28c058222e118e67c604a53cfebb4fd8e27558caa58269ca8b4ca805ac6c4a71654c8414331c095bd600a4b3914
-EBUILD mod_xsendfile-1.0_beta1.ebuild 580 BLAKE2B 9cf32e64c43e894c04c9ce8e808563ec36b33c6a9bf549c96d7b346b677548e414d4fd3da535fa6e74d0b4a42ea64c629b172096d772209fd78d1753f67e0b2a SHA512 8f784038f9b21b8e9b39d7eba09e98c76610b91367ca9f8b194dbe0d6aa7aa3ff9d5ee8863cb2c5549b7b53c5d53328c020bd40c6368ab925f3a3a4515f85233
+EBUILD mod_xsendfile-1.0_beta1-r1.ebuild 764 BLAKE2B 2134b09bf78494fbb65a277a9369b9e218edf42726e32bd3cec5f11db770c0cab9c1d49bf74a50e3004205be2dd04b9d0f09d05528db0d39e16dfa8fdba25a20 SHA512 302321f9be26bb65e7bf1c38f8ab683456b49e9f8d02e06d09fa018750bba126e194118aee394b1b08cdf170f5c2cedd1320bb3d16d7828bb70a626bfd87dae9
 MISC metadata.xml 249 BLAKE2B 210caabfc49730fad6228e8c34b09d11554fece8f3f754a26c6239b3b0de845ea128507b2c17d6e97343f9e6e2ae01272eb024992c3c64d3903794fbf73a66ed SHA512 c13d64a0d3034eeb4c9567f5e1236ecd6f3c3cbdec69b805627298cdb7050ae01a19a3cb075ec905de9497079a3e855bdccef2f37f65540b6ae184439f01cdae
diff --git a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..6006d8ed7ab3
--- /dev/null
+++ b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit apache-module
+
+MY_PV="1.0b1"
+DESCRIPTION="Apache module that processes X-SENDFILE headers registered by the output handler"
+HOMEPAGE="https://tn123.org/mod_xsendfile/"
+SRC_URI="https://tn123.org/mod_xsendfile/beta/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 sparc x86 ~amd64-linux"
+
+need_apache2
+
+src_install() {
+	APACHE2_MOD_CONF="50_${PN}"
+	APACHE2_MOD_DEFINE="XSENDFILE"
+	# Triggers unfortunate QA warning in the eclass
+	# See bug #515414, seems to be an apache-module.eclasss issue
+	DOCFILES="docs/Readme.html"
+
+	APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
+
+	apache-module_src_install
+}
diff --git a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild
deleted file mode 100644
index b6b79a6db6a7..000000000000
--- a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit apache-module
-
-MY_PV="1.0b1"
-DESCRIPTION="Apache module that processes X-SENDFILE headers registered by the output handler"
-HOMEPAGE="https://tn123.org/mod_xsendfile/"
-SRC_URI="https://tn123.org/mod_xsendfile/beta/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 sparc x86 ~amd64-linux"
-IUSE=""
-
-S=${WORKDIR}
-
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_CONF="50_${PN}"
-APACHE2_MOD_DEFINE="XSENDFILE"
-
-DOCFILES="docs/Readme.html"
-
-need_apache2
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index e440ce0bcef1..f043616ad9df 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/ikiwiki/Manifest b/www-apps/ikiwiki/Manifest
index ece7d1620c9f..68104a8fa7dd 100644
--- a/www-apps/ikiwiki/Manifest
+++ b/www-apps/ikiwiki/Manifest
@@ -1,7 +1,3 @@
-DIST ikiwiki_3.20170111.tar.xz 2614240 BLAKE2B b37d2e9095b38b2642bd4f2bd6114a8b313837bd409abd5c111d61a9abd2e65cc534e7efbcfdb72b148a567cc6391e576d61daf530c62b5e14269f2f25bbabf8 SHA512 78c2a624684bb1c34878ff008558a3967f6e7f5648878e931961695e582a40e4351b6e467c64ca42ba99cb403fd275265bd5d96ecd860ad8263043514d207ad4
-DIST ikiwiki_3.20171001.tar.xz 2638780 BLAKE2B 537008233f4c9612b3d1236eb15fe85a76a1bbbd1db9648197c032ec83c79ee3810dbd44f0a99576ac30e34e049662a1ae6525707cd1c786cc11081692ec57f7 SHA512 1f5c5a48aa95e6e3898fdb40826f90d554ff328c367133e69a2a2da4c9286e0e54ba2f2dcd57ff452fa3105c92b4d72297d771688661fb8ecf22b7a0cf78bd97
 DIST ikiwiki_3.20190228.orig.tar.xz 2672244 BLAKE2B 43012fc14f08c491ebe382e20953b8b01e10c390c28da0184b4e45a1435ada00b1ad6ac61f28c56ba1edb2e22dca1ab1f32eb77fc8d6133b899a26023593d3bd SHA512 125147d83dae6166b45541ed9176398ba4bd22ef3389d3efb3f442e558e326e0b004583d29aa32ed4bfca489c9d55b4232f074aab5fa649e51d9edd103685172
-EBUILD ikiwiki-3.20170111.ebuild 2110 BLAKE2B ce8f7ff4fafce2203fa7a757d1bc753ef17523a334960d8bdcf449ee981c365f61bb30c99eab1578692527e6e9b32a152286e3f91d50f1ae024dd09f48857235 SHA512 86030570777dee6ac123e63a74522147072a0cb56a84bffcdcb6385168a6aed7dab12e0ab9e38f4a9c41b486d004786ab3834347bd861f51dc3618f178c48a0d
-EBUILD ikiwiki-3.20171001.ebuild 2111 BLAKE2B 5e961d6859a13084a896f7396195f53854ba69a559da5cfbfa370508e14be88854061404074fc8bd8e121bd457d98303193913a8aba6c0187c38c63a71d98c28 SHA512 ea8f2bd0d510a9d14527935d6ed7ea2b9d2bfd01c1b36d7219109b0d015b77a28cfe79cdd539d48d390133b06f3a1af8d0394b38d7d0a429af24f25ee0348e46
 EBUILD ikiwiki-3.20190228.ebuild 2117 BLAKE2B a44fcc2746c47223ee18c89428b50a1d8b7bee41e705f537267ecf0eb2629b69b52669d44dae84dab6bdf595fcf7525663cdb634259af54a3b19b2f4234f724c SHA512 d8c4303b053547ad028bd1ed25f471cfa0863bdda2b6edf4aa017c6d6c2ff9c34408b558ae99741fd9051bd519f2d0824f130fdd24ed0076e8d8f32011dd9d9e
 MISC metadata.xml 336 BLAKE2B 659eb5913c4c6c05924f811fac31deea3cea40dd30b32b498ea5b55341f20cf9405065dfdf5d19e82f8ba93ff3ec4d5c5adbedfa51271d6762cff10c4a5088f4 SHA512 7d31f6078d1d49aef54bd46c5e8005d4247eb1cadfd4fdec36592deef15c4450a213d29c353dd43255a10918c2146c335efdbf7b626da2cd4ea98f815e0c5141
diff --git a/www-apps/ikiwiki/ikiwiki-3.20170111.ebuild b/www-apps/ikiwiki/ikiwiki-3.20170111.ebuild
deleted file mode 100644
index b829c1877e1b..000000000000
--- a/www-apps/ikiwiki/ikiwiki-3.20170111.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="A wiki compiler"
-HOMEPAGE="http://ikiwiki.info/"
-SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="extras minimal test"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~x86"
-
-S=${WORKDIR}/${PN}-${PV}
-
-#Authen::Passphrase
-#Search::Xapian
-#Locale::gettext
-#Crypt::SSLeay
-#Text::CSV
-#Text::Typography
-#Text::Textile
-#Text::WikiFormat
-#Net::Amazon::S3
-
-EXTRA_RDEPEND="
-	dev-python/docutils
-	dev-perl/Digest-SHA1
-	dev-perl/File-MimeInfo
-	dev-perl/RPC-XML
-	dev-perl/XML-Feed
-	dev-perl/LWPx-ParanoidAgent
-	dev-perl/Net-OpenID-Consumer
-"
-
-SUGGESTED_RDEPEND="
-	dev-perl/CGI
-	>=dev-perl/CGI-FormBuilder-3.0202
-	>=dev-perl/CGI-Session-4.14
-	dev-perl/Mail-Sendmail
-	dev-perl/Term-ReadLine-Gnu
-	dev-perl/XML-Simple
-	media-gfx/imagemagick[perl]
-"
-
-TEST_DEPEND="
-	dev-perl/File-chdir
-	dev-perl/File-ReadBackwards
-	dev-perl/File-MimeInfo
-	dev-perl/HTML-LinkExtractor
-	dev-perl/HTML-Tree
-	dev-perl/Net-OpenID-Consumer
-	dev-perl/RPC-XML
-	dev-perl/XML-Feed
-	dev-perl/XML-Twig
-	dev-vcs/cvs[server]
-	dev-vcs/cvsps"
-
-DEPEND="
-	>=dev-lang/perl-5.10
-	app-text/po4a
-	dev-perl/HTML-Parser
-	dev-perl/HTML-Scrubber
-	dev-perl/HTML-Template
-	dev-perl/URI
-	dev-perl/Text-Markdown
-	dev-perl/TimeDate
-	dev-perl/YAML-LibYAML
-"
-
-RDEPEND="${DEPEND}
-	!minimal? (
-		${SUGGESTED_RDEPEND}
-		extras? (
-			${EXTRA_RDEPEND}
-		)
-	)
-"
-
-DEPEND="${DEPEND}
-	test? ( ${TEST_DEPEND} )"
-
-SRC_TEST=do
-
-src_prepare() {
-	#bug 498444 /usr/lib/plan9/lib/fortunes.index
-	addpredict "/usr/lib/plan9/lib/fortunes"
-
-	sed -i 's,lib/ikiwiki,libexec/ikiwiki,' \
-		"${S}"/{IkiWiki.pm,Makefile.PL,doc/plugins/install.mdwn} || die
-#	if use w3m ; then
-		sed -i 's,lib/w3m,libexec/w3m,' "${S}"/Makefile.PL || die
-#	else
-#		sed -i '/w3m/d' "${S}"/Makefile.PL || die
-#	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" pure_install
-	insinto /etc/ikiwiki
-	doins wikilist
-
-	#insinto /usr/share/doc/${PF}/examples
-	#doins -r doc/examples/*
-	dohtml -r -A setup html/*
-	dodoc debian/{NEWS,changelog}
-}
diff --git a/www-apps/ikiwiki/ikiwiki-3.20171001.ebuild b/www-apps/ikiwiki/ikiwiki-3.20171001.ebuild
deleted file mode 100644
index 6240b30623dc..000000000000
--- a/www-apps/ikiwiki/ikiwiki-3.20171001.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module
-
-DESCRIPTION="A wiki compiler"
-HOMEPAGE="http://ikiwiki.info/"
-SRC_URI="mirror://debian/pool/main/i/ikiwiki/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="extras minimal test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/${PN}-${PV}
-
-#Authen::Passphrase
-#Search::Xapian
-#Locale::gettext
-#Crypt::SSLeay
-#Text::CSV
-#Text::Typography
-#Text::Textile
-#Text::WikiFormat
-#Net::Amazon::S3
-
-EXTRA_RDEPEND="
-	dev-python/docutils
-	dev-perl/Digest-SHA1
-	dev-perl/File-MimeInfo
-	dev-perl/RPC-XML
-	dev-perl/XML-Feed
-	dev-perl/LWPx-ParanoidAgent
-	dev-perl/Net-OpenID-Consumer
-"
-
-SUGGESTED_RDEPEND="
-	dev-perl/CGI
-	>=dev-perl/CGI-FormBuilder-3.0202
-	>=dev-perl/CGI-Session-4.14
-	dev-perl/Mail-Sendmail
-	dev-perl/Term-ReadLine-Gnu
-	dev-perl/XML-Simple
-	media-gfx/imagemagick[perl]
-"
-
-TEST_DEPEND="
-	dev-perl/File-chdir
-	dev-perl/File-ReadBackwards
-	dev-perl/File-MimeInfo
-	dev-perl/HTML-LinkExtractor
-	dev-perl/HTML-Tree
-	dev-perl/Net-OpenID-Consumer
-	dev-perl/RPC-XML
-	dev-perl/XML-Feed
-	dev-perl/XML-Twig
-	dev-vcs/cvs[server]
-	dev-vcs/cvsps"
-
-DEPEND="
-	>=dev-lang/perl-5.10
-	app-text/po4a
-	dev-perl/HTML-Parser
-	dev-perl/HTML-Scrubber
-	dev-perl/HTML-Template
-	dev-perl/URI
-	dev-perl/Text-Markdown
-	dev-perl/TimeDate
-	dev-perl/YAML-LibYAML
-"
-
-RDEPEND="${DEPEND}
-	!minimal? (
-		${SUGGESTED_RDEPEND}
-		extras? (
-			${EXTRA_RDEPEND}
-		)
-	)
-"
-
-DEPEND="${DEPEND}
-	test? ( ${TEST_DEPEND} )"
-
-SRC_TEST=do
-
-src_prepare() {
-	#bug 498444 /usr/lib/plan9/lib/fortunes.index
-	addpredict "/usr/lib/plan9/lib/fortunes"
-
-	sed -i 's,lib/ikiwiki,libexec/ikiwiki,' \
-		"${S}"/{IkiWiki.pm,Makefile.PL,doc/plugins/install.mdwn} || die
-#	if use w3m ; then
-		sed -i 's,lib/w3m,libexec/w3m,' "${S}"/Makefile.PL || die
-#	else
-#		sed -i '/w3m/d' "${S}"/Makefile.PL || die
-#	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" pure_install
-	insinto /etc/ikiwiki
-	doins wikilist
-
-	#insinto /usr/share/doc/${PF}/examples
-	#doins -r doc/examples/*
-	dohtml -r -A setup html/*
-	dodoc debian/{NEWS,changelog}
-}
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 0169f99cfff6..bc6e1204acaa 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,5 +1,9 @@
 AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca4595692ac146c2e4cd1c3647e7399d44249059496960ae94490c5b188c986dab64d4b90901bd7fc44203493532a0 SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b
 AUX postupgrade-1.16-en.txt 1519 BLAKE2B 39cf00073c5d12e04dd69126c7671acb5876bcdd592526d6aca475b98f9ed7abcb6d2691cef8642be04d8041fcbdaee0555937f1480f71a82c3f367f2a3d99b6 SHA512 495a2ea3074e96e570ed83e557691786524aea878fa6ee489080245a9bb1669d93e318c3871ce44918225d0e64d09e1e644538627bfb35a4a2a12d27365dc89d
 DIST mediawiki-1.34.2.tar.gz 40721102 BLAKE2B fbf7e8a19cd51e1dd3eab85442ce4e65ee9591bb4d2c6faa93ecbfc43e0b6cf88501a0027a7ba0f1adb55d9946de9958abcb14f9fb95b826ba674f1aa8306553 SHA512 ea95b46b746c0c180b5cb3b8a2263a2f94207eadbb1638c2113e97b1503c3f0a4d82a2107ce4cabca4790512b81564bda49defe30ac0fdb9bddf3230d6201f8b
+DIST mediawiki-1.34.4.tar.gz 40739239 BLAKE2B a8f413c0797daa549891ea6909cfc65a51b8f7d5aec87a82aba4c4395b6d960eb1fe41e432610d28b74a9e4ae716e71f15522ef86d1a17c896a45c4851ab8044 SHA512 0caa85c00bce4640710aba865bb17674ff3efa8413c5fb2139f6c570c303c585046fa88bd6552061532e88b221505a45e8d836bbeba2da2ac0162901749353f9
+DIST mediawiki-1.35.0.tar.gz 48039474 BLAKE2B 54d4e5edd4d7531815840d180a92bdaf008e28df3ea9ad26ba27673e4c6f904f5643c0ff333efd5a7e03512b54514c9eb74c5ed1774ef7f4085dbc50dcf42f4d SHA512 0d3d5b464abc2fdea2aa798bdf7fc53d5269852d9ed3f787710528505bbccfed2796b0e2459f5776929f3f0f207a145ae4a8f13e3040322e22d59481a71cfcde
 EBUILD mediawiki-1.34.2.ebuild 2547 BLAKE2B 671e90fbf8be26c4c3817e112a1c34dee51712cf44d2e35a27b20ef4b58c10014e6f0d8a22625ee6a9ca5d0637325444c90b80abd775418b86a96cccd84969e5 SHA512 39687dd0c3e6a03a13cac0d7343c1e261266b6ff5b9c9ad710d7fed2e1e853923fcc7ff038dbfa1735592bfaf0074bc5cca5ecaeac6dbfc06e0bfdd3df11c67e
+EBUILD mediawiki-1.34.4.ebuild 2550 BLAKE2B b82bf5e2217daf3aa52d5e851e21e599b05d90b0e76564b5ac9648e8e4815d5e22315f62398d6ca6cecdd9e838efebdb8195883383a1a8006f5d18b3c009ec5a SHA512 5f593fce677c7a31f6ff9e60fad0be8a93bf6eda16fc6eed080a1063591822b94522b72c9992cd3bc5b8e2f767a5a439c8b3610935368e9a4e9b824e79fc9222
+EBUILD mediawiki-1.35.0.ebuild 2562 BLAKE2B 5405b7d9ebe10daf85e6ba1468e869b89c998b54c3652064095c0fd54c33d16d32e8a29ba5667c9629eea0e9e1ca086c7fe121a4eeff4e64b7684be2852d47ba SHA512 a3b3995a0844d6fc8466a5f257efa321d9c7b681d2df3ffa6f420a244d41908b6557aa9ed64e3820e7f9c0e822b69f7af88a72fe7b492624fae1faf99bb17a44
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mediawiki/mediawiki-1.34.4.ebuild b/www-apps/mediawiki/mediawiki-1.34.4.ebuild
new file mode 100644
index 000000000000..32020160a1b1
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.34.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit webapp
+
+MY_BRANCH=$(ver_cut 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="dev-lang/php[ctype,fileinfo,iconv,json,postgres?,session,ssl,unicode,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	mysql? ( dev-lang/php[mysql,mysqli] )
+	sqlite? (
+		dev-db/sqlite[fts3(+)]
+		dev-lang/php[pdo,sqlite]
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_unpack() {
+	default
+
+	# remove lua binaries (bug #631554)
+	rm -fr "${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die "Failed to remove lua binaries"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto databases
+	dodoc docs/databases/*
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs || die
+	find . -name Makefile -delete || die
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		echo
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		echo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		echo
+	fi
+}
diff --git a/www-apps/mediawiki/mediawiki-1.35.0.ebuild b/www-apps/mediawiki/mediawiki-1.35.0.ebuild
new file mode 100644
index 000000000000..8eaf0489dbea
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.35.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit webapp
+
+MY_BRANCH=$(ver_cut 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND=">=dev-lang/php-7.3.19[ctype,fileinfo,iconv,json,postgres?,session,ssl,unicode,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	mysql? ( dev-lang/php[mysql,mysqli] )
+	sqlite? (
+		dev-db/sqlite[fts3(+)]
+		dev-lang/php[pdo,sqlite]
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_unpack() {
+	default
+
+	# remove lua binaries (bug #631554)
+	rm -fr "${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die "Failed to remove lua binaries"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README.md RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto databases
+	dodoc docs/databases/*
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs || die
+	find . -name Makefile -delete || die
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		echo
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		echo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		echo
+	fi
+}
diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 10c3ab3b19e2..aae941f6f671 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -4,9 +4,7 @@ AUX postinstall-en.txt 55 BLAKE2B 841988e40b1e0fb6d6a0ef331d7c87448ce87220475272
 AUX ttrssd.confd-r2 1581 BLAKE2B ce18840ddb58704abb9311d02e27cfc179bba43668b90cb358082466d55bb54acdb5806f73cb24dbc758981c477eeb6a50c472043323abaf50572f7d2eeee4b1 SHA512 15957854718a4decf7ac9784e955fc090755343008facd3d65d7e72f3e00df170215514a5435378180110c6f4584df9e5580eb45775816eb3f5c58d09e03d249
 AUX ttrssd.initd-r3 2338 BLAKE2B 6ddcb12c548ef6b34196da7539b5ec2f061db46f041912647ea2741208004d25cc7d51d88375aa06b5866a7ef44995088cc9002d625666bdaaf687733b699a8f SHA512 eb6a9824562f49d42e94522c074719720686cd2d3fb3d0ac13ce5d83fdeae6b17a5047e79e761aea084eb8ff6e6aa733d49131324f8a00406935f8e0b962764b
 AUX ttrssd.logrotated-r1 135 BLAKE2B dc653add518cd3ed5296097d51ca2346e102edcbad5ec82397713ded489e8ed8e49af928331e58b80152f13bddc37d673c67440df388651c875cfbd37ff62080 SHA512 c292020a55688c6edb4306d9d8144ad7d30be94fda08467b8bbe560c7bf02b0877d9591123a226dd030e9a9c01b79df4a3696e54fd1ece0dbdef1c285cdae97a
-DIST tt-rss-20180105.tar.gz 3070929 BLAKE2B 2370104c70f5381d690a29b216269c749bf1f7c6b925eb9499b741e5df3e686d95fce430a144946fd915414481280b67e6d0c881edcdd13aee0fa344dc0bec3f SHA512 86ceec3646629ad7fd3fde2f3c3237e48ad96bd08b46e73c34c76507d9b17613ea309e1bd5e6e85a0d9eb96029e54b54e5ee367c56aab31be3dcec9169c5ada5
-DIST tt-rss-20190523.tar.gz 3336985 BLAKE2B 9f37c676b6ca263b09685ae66c4183b4b1fed2e37c2fb361aeeb15f877916967ebdb272fb60ce554c8a7596f74de7713ca2ff6c70bf1ae8a669da2bd702607e9 SHA512 22fbed0199503ecf3728ed4c2e199bbd9fc617b83ec3a09d80352512460ab9cf46abfe840143e62c747743975d2e5b9c9ce0bfb8498b8c6187ae567552a49213
-EBUILD tt-rss-20180105.ebuild 2116 BLAKE2B 420d5b05643b29abe653a53db201ac1d5bd287faf48a5ed4eb8694e183ce38fec6c36dbe77cbdbe55cdb03508e720bd3371df939dd10d0185398a2fcc3fb5838 SHA512 362544447ff951a400056ebd8a083a0d7f37dd0a6772b5b25bc46aada86d69ed6df37b6f612c8313e2b6cd4667d0e16c5cc18990730e333dbb11588d528242c9
-EBUILD tt-rss-20190523.ebuild 2123 BLAKE2B 5e741b1b68a15327824b3fb98090ee993dd2517cc0851bd1cbfce3f67f1fc5163e458aeec22767a915f2705c0c4970c8dd2bd3b4586a0ca091d50f2ab2ec0f17 SHA512 7baa07afbcb6112bfbab8409a31a63afab7f566cd764a7e110c61e62555ad330d07e8cba4d541ba1775b789b2c86f3cbb8ea15aec0748874133432f0d3441ce7
-EBUILD tt-rss-99999999.ebuild 2170 BLAKE2B 360b2ada6756ae564c7dc1497f488baebb4d1db78e93ff21c0681a40767b70bbfb5c4c161f08411cbe89cb9f3d3cdf451ba64208b4f3c2f2f7f6534ea25b0f48 SHA512 c453912dc640ba2a235601a8442061e775e0259a468df39bad3dedcd6f69999f906196076c57bcf44b79a8754558f4b3eedb0af400a31efc7077f089d6642c94
+DIST tt-rss-20200922.tar.gz 3406007 BLAKE2B 7058253fbbba1c121d11eace8a3ef024b7ef83b05fd8b10b0ba0d017fa75d16b970e2c95c13091f760b21bcf092f609d81a5649de03672b0394113412f90beb0 SHA512 90387d07af76bc90bfb2e740dcfa0b2e13ed9af679a6c9258edd053511277bc36fca8edd4b3862c3f1957fa65a827b161abf3ed7fa603d4b84514fd456947a47
+EBUILD tt-rss-20200922.ebuild 2045 BLAKE2B 3bf4f1b393e8a85e3cbc2a6f485a17754c288bc1b1d64ffd1a9a3608bffe320a89d4a084024eb86c9f27c948dbc26ac54b65b7f60626d2abad4148074ac5d0f6 SHA512 8ce815907a958ab6b14e9f180ddb8fb1672cd7645959625e2c2a49564ce1d60eb5dfb0b1a49ff05899799d008a40ba13a4ebec641e2ddd75e7760131d6fcdb30
+EBUILD tt-rss-99999999.ebuild 2126 BLAKE2B c7a0c750d2068fa9f735d981fd28e6368af46e60aa6ef4ac6fe8acd13f9d75eaf9c7d426a6d1be10ed3edf8930cd7dd336be7d17334bd5bb81e170d147a60b15 SHA512 db5e7dcacf80bd515d56bfb2b593525dcd3f53980fa6893a9031eaa7c50df4b1e6ef7007377a25dd725a6164dee44d19206586a6e2bf8bda11b417c82b570547
 MISC metadata.xml 349 BLAKE2B d14bc6946ab95fa116a982d4d9ea1c76b94c1094876c32451adeb783925410e5f80323943aa8922aef9c4c7bd630038bbab07186f62cbc3aa36b2d7eec5fc306 SHA512 2b18408b092177dc05b0720635e28c8dac334d9013d1e9f30ee7288fd2158a1c47fd313f916dea4e5f1bf37ea04b15e8845f4a7331dcce43579163fb7a36bb6a
diff --git a/www-apps/tt-rss/tt-rss-20180105.ebuild b/www-apps/tt-rss/tt-rss-20180105.ebuild
deleted file mode 100644
index 9affdac7e139..000000000000
--- a/www-apps/tt-rss/tt-rss-20180105.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix user webapp
-
-COMMIT="c30f5e18119d1935e8fe6d422053b127e8f4f1b3"
-DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
-HOMEPAGE="https://tt-rss.org/"
-SRC_URI="https://git.tt-rss.org/git/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE="+acl daemon +mysqli postgres"
-REQUIRED_USE="|| ( mysqli postgres )"
-
-DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
-
-RDEPEND="${DEPEND}
-	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,pcntl,pdo] )
-	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,pdo] )
-	virtual/httpd-php:*"
-
-DEPEND="!vhosts? ( ${DEPEND} )"
-
-need_httpd_cgi # From webapp.eclass
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if use daemon; then
-		enewgroup ttrssd
-		enewuser ttrssd -1 /bin/sh /dev/null ttrssd
-	fi
-}
-
-src_configure() {
-	hprefixify config.php-dist
-
-	sed -i -r \
-		-e "/'DB_TYPE'/s:,.*:, '$(usex mysqli mysql pgsql)'); // mysql or pgsql:" \
-		-e "/'CHECK_FOR_UPDATES'/s/true/false/" \
-		config.php-dist || die
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r *
-
-	# When updating, grep the plugins directory for additional CACHE_DIR
-	# instances as they cannot be created later due to permissions.
-	dodir "${MY_HTDOCSDIR}"/cache/starred-images
-
-	local dir
-	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,feed-icons,lock}/; do
-		webapp_serverowned "${dir#${ED}}"
-	done
-
-	if use daemon; then
-		webapp_hook_script "${FILESDIR}"/permissions
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon-r1.txt
-
-		newinitd "${FILESDIR}"/ttrssd.initd-r3 ttrssd
-		newconfd "${FILESDIR}"/ttrssd.confd-r2 ttrssd
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/ttrssd.logrotated-r1 ttrssd
-
-		elog "After upgrading, please restart ttrssd."
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "You need to merge config.php-dist into config.php manually when upgrading."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/tt-rss/tt-rss-20190523.ebuild b/www-apps/tt-rss/tt-rss-20190523.ebuild
deleted file mode 100644
index fbfb5e9a9330..000000000000
--- a/www-apps/tt-rss/tt-rss-20190523.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit prefix user webapp
-
-COMMIT="4a2836ea90c4c471029d189a8c9fe5ec10a9521b"
-DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
-HOMEPAGE="https://tt-rss.org/"
-SRC_URI="https://git.tt-rss.org/git/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE="+acl daemon +mysqli postgres"
-REQUIRED_USE="|| ( mysqli postgres )"
-
-DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
-
-RDEPEND="${DEPEND}
-	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] )
-	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] )
-	virtual/httpd-php:*"
-
-DEPEND="!vhosts? ( ${DEPEND} )"
-
-need_httpd_cgi # From webapp.eclass
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if use daemon; then
-		enewgroup ttrssd
-		enewuser ttrssd -1 /bin/sh /dev/null ttrssd
-	fi
-}
-
-src_configure() {
-	hprefixify config.php-dist
-
-	sed -i -r \
-		-e "/'DB_TYPE'/s:,.*:, '$(usex mysqli mysql pgsql)'); // mysql or pgsql:" \
-		-e "/'CHECK_FOR_UPDATES'/s/true/false/" \
-		config.php-dist || die
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r *
-
-	# When updating, grep the plugins directory for additional CACHE_DIR
-	# instances as they cannot be created later due to permissions.
-	dodir "${MY_HTDOCSDIR}"/cache/starred-images
-
-	local dir
-	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,feed-icons,lock}/; do
-		webapp_serverowned "${dir#${ED}}"
-	done
-
-	if use daemon; then
-		webapp_hook_script "${FILESDIR}"/permissions
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon-r1.txt
-
-		newinitd "${FILESDIR}"/ttrssd.initd-r3 ttrssd
-		newconfd "${FILESDIR}"/ttrssd.confd-r2 ttrssd
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/ttrssd.logrotated-r1 ttrssd
-
-		elog "After upgrading, please restart ttrssd."
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "You need to merge config.php-dist into config.php manually when upgrading."
-	webapp_pkg_postinst
-}
diff --git a/www-apps/tt-rss/tt-rss-20200922.ebuild b/www-apps/tt-rss/tt-rss-20200922.ebuild
new file mode 100644
index 000000000000..1c58510d1d96
--- /dev/null
+++ b/www-apps/tt-rss/tt-rss-20200922.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit prefix webapp
+
+DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
+HOMEPAGE="https://tt-rss.org/"
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz" # Upstream git frontend blocks wget?
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
+IUSE="+acl daemon gd +mysqli postgres"
+REQUIRED_USE="|| ( mysqli postgres )"
+PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json,pdo,unicode,xml"
+
+DEPEND="
+	daemon? ( acl? ( sys-apps/acl ) )
+"
+
+RDEPEND="
+	${DEPEND}
+	daemon? (
+		acct-user/ttrssd
+		acct-group/ttrssd
+		dev-lang/php:*[${PHP_USE},cli,pcntl]
+	)
+	!daemon? (
+		dev-lang/php:*[${PHP_USE}]
+	)
+	virtual/httpd-php:*
+"
+
+DEPEND="
+	!vhosts? ( ${DEPEND} )
+"
+
+need_httpd_cgi # From webapp.eclass
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	hprefixify config.php-dist
+
+	sed -i -r \
+		-e "/'DB_TYPE'/s:,.*:, '$(usex mysqli mysql pgsql)'); // mysql or pgsql:" \
+		-e "/'CHECK_FOR_UPDATES'/s/true/false/" \
+		config.php-dist || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r *
+
+	# When updating, grep the plugins directory for additional CACHE_DIR
+	# instances as they cannot be created later due to permissions.
+	dodir "${MY_HTDOCSDIR}"/cache/starred-images
+
+	local dir
+	for dir in "${ED}${MY_HTDOCSDIR}"/{cache/*,feed-icons,lock}/; do
+		webapp_serverowned "${dir#${ED}}"
+	done
+
+	if use daemon; then
+		webapp_hook_script "${FILESDIR}"/permissions
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon-r1.txt
+
+		newinitd "${FILESDIR}"/ttrssd.initd-r3 ttrssd
+		newconfd "${FILESDIR}"/ttrssd.confd-r2 ttrssd
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/ttrssd.logrotated-r1 ttrssd
+
+		elog "After upgrading, please restart ttrssd."
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "You need to merge config.php-dist into config.php manually when upgrading."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/tt-rss/tt-rss-99999999.ebuild b/www-apps/tt-rss/tt-rss-99999999.ebuild
index 1f6d41d337bf..9a62a5c6ac7a 100644
--- a/www-apps/tt-rss/tt-rss-99999999.ebuild
+++ b/www-apps/tt-rss/tt-rss-99999999.ebuild
@@ -1,38 +1,42 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit git-r3 prefix user webapp
+inherit git-r3 prefix webapp
 
 DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
 HOMEPAGE="https://tt-rss.org/"
-EGIT_REPO_URI="https://git.tt-rss.org/git/${PN}.git"
+EGIT_REPO_URI="https://git.tt-rss.org/fox/${PN}.git"
 LICENSE="GPL-3"
 SLOT="${PV}" # Single live slot.
-IUSE="+acl daemon +mysqli postgres"
+IUSE="+acl daemon gd +mysqli postgres"
 REQUIRED_USE="|| ( mysqli postgres )"
-
-DEPEND="daemon? ( acl? ( sys-apps/acl ) )"
-
-RDEPEND="${DEPEND}
-	daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] )
-	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] )
-	virtual/httpd-php:*"
-
-DEPEND="!vhosts? ( ${DEPEND} )"
+PHP_USE="gd?,mysqli?,postgres?,curl,fileinfo,intl,json,pdo,unicode,xml"
+
+DEPEND="
+	daemon? ( acl? ( sys-apps/acl ) )
+"
+
+RDEPEND="
+	${DEPEND}
+	daemon? (
+		acct-user/ttrssd
+		acct-group/ttrssd
+		dev-lang/php:*[${PHP_USE},cli,pcntl]
+	)
+	!daemon? (
+		dev-lang/php:*[${PHP_USE}]
+	)
+	virtual/httpd-php:*
+"
+
+DEPEND="
+	!vhosts? ( ${DEPEND} )
+"
 
 need_httpd_cgi # From webapp.eclass
 
-pkg_setup() {
-	webapp_pkg_setup
-
-	if use daemon; then
-		enewgroup ttrssd
-		enewuser ttrssd -1 /bin/sh /dev/null ttrssd
-	fi
-}
-
 src_configure() {
 	hprefixify config.php-dist
 
diff --git a/www-apps/webdavcgi/Manifest b/www-apps/webdavcgi/Manifest
index 1644b89e9f21..70751c9f11d5 100644
--- a/www-apps/webdavcgi/Manifest
+++ b/www-apps/webdavcgi/Manifest
@@ -1,16 +1,5 @@
-AUX 0.8.3-logout-var-expansion.patch 612 BLAKE2B 46cc80a7da8616420f1b76bb710857579336b9a568ef8883753a50a6a808e8958d0dc2fe56c4584db92ac8016a85ec492fb5b8d9d93f04ec71924ea0ffbf6237 SHA512 8089e9f3614739c98b710da3c873f6667a012b16bbcfc13cb04707cdf9603677294d45a76d82a0c1e194dc15d4d8b09709448187f010181d86fcc68aae104943
-AUX apache-webdavcgi-0.8-example.conf 2406 BLAKE2B 7c29fd8c62d3f1e6e47057ef2d7d2e22567c67559a02b700cc0157b62651b1828f3e546d1a1ab04691c378833333cb96baea547f762fcf297dcf030c203230ab SHA512 9d7f521e00056836b54f3d664b837a1048b3e5dce027cd079a4b1ae2d0cdff0fe6387180f3d54ccd53c36b1c19298a27375ebd9ab4bb00bd7d0194800c0994a0
 AUX apache-webdavcgi-1.1-example.conf 2621 BLAKE2B 0ef587bc87f08043c5503db0bf04259daf1c047a653203ba1794ce247d340fec722b91334f9a8b2d1af32bddc9b8e3cf1d31118d869816e8d20e46208362e4c1 SHA512 36e440c8274a46c3e415291f08eb1263694bcb512c9c5bfe6b58f8c24b4d665672788500fc31d87b104c4a654458572798a2e92ab913bd4a438e39b4e90e6ac8
-AUX postinstall-en.txt 1133 BLAKE2B 2533aaa6ad2f160f71abae43f45ca666573b1b56ee0a21ba9baf3220e1f83a5a4cf051b0b52c51d8930087cf5cfed354f82a3d0554e73a3229dba1feec4a1b69 SHA512 207132fd11a1df46e2198fe7134da5db7a15de9b0778481059b088c41d5d8c7bcf2b39d4675cd8a9e65cd546f85693b1ab4ae9b64737985180eb3ff18d292c96
-AUX postinstall-webdavwrapper-en.txt 1279 BLAKE2B 08bb5f3e64c4a41f9e5b35069daf5ab817fe985001094c16811026f2ce4ad5d92c841328d0ace3cf8a9f4d3fd6ac8172bae4ed0166b31feaa542f60161cb88e2 SHA512 b670dba1bbd11e764bf7244c0b2194de475c16228ec7c7b0864b0131c0a9a10c2a2980df9caecabfa7252a4024c6976ee7060ef94bb2d5b6e3f985d3fa9ab031
-AUX reconfig 784 BLAKE2B bf0d96a5cff5d495f32bfeba690760d4d5c56a276c17eb37b66eb7dd4965a43196401e089ef914404a09a67a3986807a36f6890ee2ac20c9d4ce5932075f3b16 SHA512 415c692c26693296fc23161d70521d233543f37aeadfc12992cf4b36ee0f25c7c2eed354831767ccf2a386d4479c53534c23800c756cc7b678ef1f5ed60e32f4
-AUX reconfig-suid 602 BLAKE2B 5abfb20ad980f533785022596f29af114ba98de8227f34588c9267530d181a32cbb1faabd85523d77e2a0bdff76b372cb9936bf5be664f2547958ac4f45e7e03 SHA512 aa1563edce254668fb43110dc7d24293e926a6d5083da4a3879bcd5b4d205f1f9feae7bd6e0e00bda5303143346f6951e65318276720013ed7744a6d2c609eb2
-AUX webdav-0.8.conf 2872 BLAKE2B 47b1ae8e0e0b15adec1ed71110f0a841a044f368f362f5ab71f0948c1b6e5a869b4d6033263dd65538ec84cc64e1661654ffab9dad58211ae35cefb3e781ca11 SHA512 1b1d8c1eb53689e02180fb0e59b0ec992da4f6656d0f9965ebeb483bf4f829da6971273d368b0a1cf8bf9df65089720bc57db76f7f8a8b85e0cf645662a2b869
 AUX webdav-1.1.conf 4450 BLAKE2B 29c7dcfdc623938d90a060e4e86d70d82bceb03aba95da72c323415dfc501de975a23cacda18929126f219f540da4b015fe6871e02a551ac25b7017268bf7d58 SHA512 4e867f9d8de4eb3f864ddc0671bf048d1a8daa9e01c830045a7adb5ac712c46925f0ed60d5aeba9acb3f9c3fd259411af23c41476f06d38f3d8f3cb2027c51c8
-DIST webdavcgi-0.8.3.tar.bz2 1190975 BLAKE2B 7935474a850afde362faf244d3b6047e86f8c509e1b54e452c2cecd15a08bbbb5c91c862fc70142e8958d9d6cd687f85bd482d6472ba12b22c9027b9cdb7e106 SHA512 f50e6bb1e78a88ab6bc6452c04f2e5d0cec86f6641d1813556ae3b06c33e2c9250e623926bf1a71ea10f6ca3912e708cb54cd0956b344329de1499887e48e784
-DIST webdavcgi-0.8.4.tar.bz2 1195935 BLAKE2B 7f914d8f9f04354c6887303482ae72e8b4b24751e58aae225b1bc8182dd22e9644e1386b9d5823a610c49ebf0a5676838cfd7e0a1fcc20cce7e34c08d49966af SHA512 17d9dcfe68012820bf809bc3bd54a881fc9e66a9ddfd87d9381ec0cb08abe3f81638afba4d28ab3079ed56cf1e263b4a764b8348691f17a06743bb1ddf3a2a4e
 DIST webdavcgi-1.1.1.tar.bz2 11623234 BLAKE2B a5a2b67f2666ce4180e5ed145045b8552e6e988967d99bad518d72a67a417ce600619b11af9171aa291bb4b98ec0b0c8c3ce56511d65c4e8b8c92932e8da418f SHA512 660b3e54d72c5b96c1fb329d8e0838b1dbf68e1671af3880f7e096bfdfe559909cf3e1e3069fe4877e0ffbd67d24dc4a38c3db8baaae6d62db05bde31cea789f
-EBUILD webdavcgi-0.8.3.ebuild 2766 BLAKE2B e3801bbfa9c3d418872cbadde17c726bca1570f010cd6fcff9a877dbe6a01560f74a0f174b25c116624b79d18b000aab9807cd811f8017eda7cf44c0be76ff20 SHA512 500f6552ca5daaf7595ff3c18ed361015bb191a48705212ab5b74c9b289c15b50a24a604322b3d1b8faa5438c381815b6e9ac5a56f1ccd5dbb2e9805763a8542
-EBUILD webdavcgi-0.8.4.ebuild 4781 BLAKE2B afbc05b971d90aaf849597cfbd573f948f33254c53b5ac45ddf3b4bfd4c10516eeeb14a734f3392d595873cddb3ed1a2bc65eebc0a2303b705a94944dd3c4dce SHA512 4a5ca82beca219929bd9190d18eb92a648e8eb68fc2dc91f514f2fb598b7eaeee29cf97a8f233425f7bd0662699a533b19f6f70cd6d0ccd6afa957d05bb86d9d
 EBUILD webdavcgi-1.1.1.ebuild 5736 BLAKE2B 46d043b9252bdf52f75696ee6476489ebf8bde2a208f81d121b504bb4bd1e8b347bb2ae85ab650bb19e2dd6f47779387afb331219fa4e6d7e448699f5469a89d SHA512 e4fb54e0f2fee21772eae95816a4b9fca5179a5231606f904db5f61d50ecab7d1ad6922dc87d022dc199b8af5ff7b642148cc662c1413c73ae378648cc94ac8e
 MISC metadata.xml 1040 BLAKE2B fb1efea181e0b46f16e8086c4e183af13f61d4113d9957cb3b9e8ded4894c13e8559989c543cc9bdd326083805d7357c64c8ffc80518ed8fe12945c947cefbb0 SHA512 af3c8574f9b2c376194b27190dd6e1acf2e7a1e01f1becf41b84de395d96e6a6c739ebfb969c772104c8bdac3de4a8e725ad95a10e8a40902595602692bdcddb
diff --git a/www-apps/webdavcgi/files/0.8.3-logout-var-expansion.patch b/www-apps/webdavcgi/files/0.8.3-logout-var-expansion.patch
deleted file mode 100644
index 739ff7f4c79b..000000000000
--- a/www-apps/webdavcgi/files/0.8.3-logout-var-expansion.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru cgi-bin.orig/logout-dist cgi-bin/logout-dist
---- cgi-bin.orig/logout-dist	2011-03-22 17:25:52.000000000 +0100
-+++ cgi-bin/logout-dist	2012-10-03 21:44:35.057437306 +0200
-@@ -34,13 +34,13 @@
- # -----
- ### REALM: the basic authentication realm 
- ### (must be equal to your AuthName value for Apache)
--REALM="Change Me"
-+REALM="${REALM:=Change Me}"
- 
- ### HOMEURL: the home URL
--HOMEURL="/changemyhomeurl"
-+HOMEURL="${HOMEURL:=/changemyhomeurl}"
- 
--### TIMEOUT: the refresh timeout for the logut page
--TIMEOUT=0
-+### TIMEOUT: the refresh timeout for the logout page
-+TIMEOUT=${TIMEOUT:=0}
- 
- # SETUP END
- 
diff --git a/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf b/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf
deleted file mode 100644
index cf1d4d4dafe0..000000000000
--- a/www-apps/webdavcgi/files/apache-webdavcgi-0.8-example.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-# Example Apache HTTP server configuration snippet for WebDAV CGI
-#
-# Add the following lines to the Apache HTTP virtual host which should run
-# WebDAV CGI.
-#
-# WebDAV CGI will be accessible via http://www.example.com/webdav/ and uses
-# basic HTTP authentication (by default). For this to work, you need to add all
-# valid users to the AuthUserFile with the help of the htpasswd command:
-#
-# htpasswd -c /etc/webdavcgi-0.8/default/users.htpasswd user1
-# htpasswd /etc/webdavcgi-0.8/default/users.htpasswd user2
-#
-# Note, that if you have the UID/GID wrapper enabled (USE=suid), WebDAV CGI will
-# switch to the login user after a successful login, thus the users within the
-# AuthType need to present on the system as well.
-#
-# You probably want to review and change the following settings:
-# - /webdavcgi should point to your desired webdavwrapper, which is either
-#   webdavwrapper, webdavwrapper-afs, webdavwrapper-krb or in case you disabled
-#   the UID/GID wrapper (USE=-suid), webdav.pl
-#
-# - The /webdav location
-#   If you change this location, make sure to reflect the new path within the
-#   WebDAV CGI configuration (WEBDAVCONF -> $VIRTUAL_BASE) as well.
-#
-# - The authentication provider and/or AuthUserFile
-#
-# - The HOMEURL environment variable. After a user logs out, the browser will
-#   be redirected to this URL.
-#
-# - The WEBDAVCONF environment variable has to point to your configuration
-#
-# For further informations and other configuration possibilities consult the
-# WebDAV CGI documentation which is located at http://webdavcgi.sourceforge.net
-# and the Apache HTTP server documentation at https://httpd.apache.org/docs/
-#
-    ScriptAlias /webdavcgi "/usr/libexec/webdavcgi-0.8/cgi-bin/webdavwrapper"
-    ScriptAlias /webdav/logout "/usr/libexec/webdavcgi-0.8/cgi-bin/logout"
-
-    <Location /webdav>
-        Order Allow,Deny
-        Allow from all
-    </Location>
-
-    <Location /webdavcgi>
-        AuthType Basic
-        AuthName "WebDAV-CGI"
-        AuthUserFile /etc/webdavcgi-0.8/default/users.htpasswd
-        Require valid-user
-        Order Allow,Deny
-        Allow from all
-    </Location>
-
-
-    RewriteEngine On
-
-    RewriteRule ^/webdav/logout -  [L,E=REALM:WebDAV-CGI,E=HOMEURL:/webdav,E=TIMEOUT:5]
-
-    RewriteRule ^/webdav        /webdavcgi [PT,L,E=WEBDAVCONF:/etc/webdavcgi-0.8/default/webdav.conf,E=PERLLIB:/usr/share/webdavcgi-0.8/lib/perl,E=LOGOUTURL:/webdav/logout]
diff --git a/www-apps/webdavcgi/files/postinstall-en.txt b/www-apps/webdavcgi/files/postinstall-en.txt
deleted file mode 100644
index 8aa6f95d87a2..000000000000
--- a/www-apps/webdavcgi/files/postinstall-en.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Before you can run WebDAV CGI you need to configure your web server and WebDAV
-CGI itself.
-
-The following configuration snippet serves as an example for the Apache HTTPD
-web server. You will have to adapt it to suite your own server and configuration
-needs.
-
-    ScriptAlias  /cgi-bin/ "${VHOST_CGIBINDIR}/"
-
-    <Location /${VHOST_CGIBINDIR##*/}/>
-        AuthType Basic
-        AuthName "WebDAV-CGI"
-        AuthUserFile ${VHOST_ROOT}/etc/users.htpasswd
-        Require valid-user
-        Order Allow,Deny
-        Allow from all
-    </Location>
-
-    RewriteEngine On
-    RewriteRule ^/${VHOST_APPDIR}/logout /${VHOST_CGIBINDIR##*/}/logout [PT,E=REALM:WebDAV-CGI,E=HOMEURL:/${VHOST_APPDIR},L]
-    RewriteRule ^/${VHOST_APPDIR} /${VHOST_CGIBINDIR##*/}/webdav.pl [PT,E=WEBDAVCONF:${VHOST_ROOT}/etc/webdav.conf,E=PERLLIB:${VHOST_ROOT}/lib/perl,L]
-
-
-Afterwards you need to copy the default configuration file and edit it:
-cp -p ${VHOST_ROOT}/etc/{webdav.conf-dist,webdav.conf}
-\$EDITOR ${VHOST_ROOT}/etc/webdav.conf
-
-For further informations study the online documentation which is located at:
-http://webdavcgi.sourceforge.net/doc.html
diff --git a/www-apps/webdavcgi/files/postinstall-webdavwrapper-en.txt b/www-apps/webdavcgi/files/postinstall-webdavwrapper-en.txt
deleted file mode 100644
index 5f30d81be7b6..000000000000
--- a/www-apps/webdavcgi/files/postinstall-webdavwrapper-en.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Before you can run WebDAV CGI you need to configure your web server and WebDAV
-CGI itself.
-
-The following configuration snippet serves as an example for the Apache HTTPD
-web server. You will have to adapt it to suite your own server and configuration
-needs.
-
-    ScriptAlias  /cgi-bin/ "${VHOST_CGIBINDIR}/"
-
-    <Location /${VHOST_CGIBINDIR##*/}/>
-        AuthType Basic
-        AuthName "WebDAV-CGI"
-        AuthUserFile ${VHOST_ROOT}/etc/users.htpasswd
-        Require valid-user
-        Order Allow,Deny
-        Allow from all
-    </Location>
-
-    RewriteEngine On
-    RewriteRule ^/${VHOST_APPDIR}/logout /${VHOST_CGIBINDIR##*/}/logout [PT,E=REALM:WebDAV-CGI,E=HOMEURL:/${VHOST_APPDIR},L]
-    RewriteRule ^/${VHOST_APPDIR} /${VHOST_CGIBINDIR##*/}/webdavwrapper [PT,E=WEBDAVCONF:${VHOST_ROOT}/etc/webdav.conf,E=PERLLIB:${VHOST_ROOT}/lib/perl,L]
-
-
-Afterwards you need to copy the default configuration file and edit it:
-cp -p ${VHOST_ROOT}/etc/{webdav.conf-dist,webdav.conf}
-\$EDITOR ${VHOST_ROOT}/etc/webdav.conf
-
-Also make sure that all system users which should be able to login to WebDAV CGI
-are able to access the installed files below ${VHOST_ROOT}.
-
-For further informations study the online documentation which is located at:
-http://webdavcgi.sourceforge.net/doc.html
diff --git a/www-apps/webdavcgi/files/reconfig b/www-apps/webdavcgi/files/reconfig
deleted file mode 100644
index 07710dd7c3e9..000000000000
--- a/www-apps/webdavcgi/files/reconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-confDir="etc"
-distConfFile="webdav.conf-dist"
-
-sedCmd="/bin/sed"
-
-
-function die ()
-{
-	echo "reconfig error: $1" >&2
-    	exit 1
-}
-
-
-if [ $1 != "install" ]; then
-	# nothing to be done, exit
-	exit 0
-fi
-
-# Set the correct path within the config file
-distConfFilePath="${VHOST_ROOT}/${confDir}/${distConfFile}"
-if ! ${sedCmd} -i -e "s|^\(\$INSTALL_BASE\)=.*|\1='${VHOST_ROOT}/';|" \
-         ${distConfFilePath}
-then
-	die "Setting INSTALL_BASE path in ${distConfFilePath} failed"
-fi
-
-
-# Adding logout support
-# see: http://webdavcgi.sourceforge.net/doc.html#logout
-echo "\$HEADER = '<div class=\"header\">WebDAV CGI - Web interface: You are logged in as <span title="'.`id -a`.'">' .\$ENV{REMOTE_USER}.'</span> (<a href="/logout">Logout</a>).</div>';" >> ${distConfFilePath}
diff --git a/www-apps/webdavcgi/files/reconfig-suid b/www-apps/webdavcgi/files/reconfig-suid
deleted file mode 100644
index d7fb87722614..000000000000
--- a/www-apps/webdavcgi/files/reconfig-suid
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-webDavWrapper="webdavwrapper"
-webDavWrapperPath="${VHOST_CGIBINDIR}/${webDavWrapper}"
-
-chmodCmd="/bin/chmod"
-chownCmd="/bin/chown"
-
-
-function die ()
-{
-	echo "reconfig error: $1" >&2
-    	exit 1
-}
-
-if [ $1 = "install" ]; then
-	# In order to change the user and group ID at runtime, the webdavwrapper
-	# needs to be run as root (set-user-ID and set-group-ID bit)
-	if ! ${chownCmd} root:root ${webDavWrapperPath}; then
-		die "Chown for ${webDavWrapperPath} failed"
-	fi
-
-	if ! ${chmodCmd} 6755 ${webDavWrapperPath}; then
-		die "Setting SUID and SGID bit on ${webDavWrapperPath} failed"
-	fi
-fi
diff --git a/www-apps/webdavcgi/files/webdav-0.8.conf b/www-apps/webdavcgi/files/webdav-0.8.conf
deleted file mode 100644
index 8563df7ad617..000000000000
--- a/www-apps/webdavcgi/files/webdav-0.8.conf
+++ /dev/null
@@ -1,88 +0,0 @@
-## -- INSTALL_BASE
-## folder path to the webdav.conf, .css, .js, and. msg files for the Web
-## interface
-## (don't forget the trailing slash)
-$INSTALL_BASE='/usr/share/webdavcgi-0.8/';
-
-## -- VIRTUAL_BASE
-## only neccassary if you use redirects or rewrites from a VIRTUAL_BASE to
-## the DOCUMENT_ROOT;
-## regular expressions are allowed
-## EXAMPLE: $VIRTUAL_BASE = '/';
-$VIRTUAL_BASE = '/webdav';
-
-## -- DOCUMENT_ROOT
-## by default the server document root
-## (don't forget a trailing slash '/'):
-$DOCUMENT_ROOT = '/home/';
-
-## -- UMASK
-## mask for file/folder creation 
-## (it does not change permission of existing files/folders):
-$UMASK = 0007;
-
-## -- ENABLE_DAVMOUNT
-## enables DAV mount button in the folder navigation of the Web interface
-$ENABLE_DAVMOUNT = 1;
-
-## -- ENABLE_COMPRESSION
-## enables/disables gzip content encoding for the Web interface
-$ENABLE_COMPRESSION = 0;
-
-## -- PAGE_LIMIT
-## limits number of files/folders shown in the Web interface
-$PAGE_LIMIT=100;
-
-## -- PAGE_LIMITS
-## allowed selectable limits (-1 = show all)
-@PAGE_LIMITS = ( 5, 10, 15, 20, 30, 50, 100, -1);
-
-## -- DBI_(SRC/USER/PASS)
-## database setup for LOCK/UNLOCK/PROPPATCH/PROPFIND data
-##
-## SQLite config
-## If users share the same folder they should use the same database
-## in this case you have to use a single file writeable for all users.
-#$DBI_SRC='dbi:SQLite:dbname=/var/lib/webdavcgi/0.8/default/webdav.db';
-#$DBI_USER='';
-#$DBI_PASS='';
-#$CREATE_DB = !-e '/var/lib/webdavcgi/0.8/default/webdav.db';
-
-## MySQL config
-#$DBI_SRC='DBI:mysql:database=webdavcgi;host=localhost;port=3306';
-#$DBI_USER='mysqluser';
-#$DBI_PASS='changeme';
-#$CREATE_DB=0;
-
-## PostgreSQL config
-#$DBI_SRC='dbi:Pg:dbname=webdavcgi;host=localhost;port=5432';
-#$DBI_USER='pguser';
-#$DBI_PASS='changeme';
-#$CREATE_DB = 0;
-
-## -- HEADER
-## content after body tag in the Web interface
-$HEADER = '<div class="header">WebDAV CGI - Web interface: You are logged in as <span title=.`id -a`.>' .$ENV{REMOTE_USER}.'</span> (<a href="'.$ENV{LOGOUTURL}.'">Logout</a>).</div>';
-
-## -- ENABLE_CALDAV
-## Disable CalDAV support for Lightning/Sunbird/iCal/iPhone calender/task
-## support
-$ENABLE_CALDAV = 0;
-
-## -- ENABLE_GROUPDAV
-## Disables GroupDAV (http://groupdav.org/draft-hess-groupdav-01.txt)
-$ENABLE_GROUPDAV = 0;
-
-## -- ENABLE_THUMBNAIL
-## Disable image thumbnail support and media rss feed for folder listings of the
-## Web interface.
-## If enabled the default icons for images will be replaced by thumbnails
-## and if the mouse is over a icon the icon will be zoomed to the size of
-## $THUMBNAIL_WIDTH.
-$ENABLE_THUMBNAIL = 0;
-
-## -- THUMBNAIL_CACHEDIR
-## defines the path to a cache directory for image thumbnails
-## this is neccessary if you enable the thumbnail cache ($ENABLE_THUMBNAIL_CACHE)
-## EXAMPLE: $THUMBNAIL_CACHEDIR=".thumbs";
-$THUMBNAIL_CACHEDIR="/var/cache/webdavcgi/0.8/default/thumbnails";
diff --git a/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild b/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild
deleted file mode 100644
index b2e189821039..000000000000
--- a/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs webapp
-
-DESCRIPTION="A Perl CGI for accessing and sharing files, or calendar/addressbooks via WebDAV"
-HOMEPAGE="http://webdavcgi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64"
-IUSE="mysql postgres rcs samba +sqlite +suid"
-
-DEPEND=""
-RDEPEND="dev-perl/Archive-Zip
-	dev-perl/File-Copy-Link
-	dev-perl/PerlIO-gzip
-	dev-perl/Quota
-	dev-perl/TimeDate
-	dev-perl/URI
-	dev-perl/UUID-Tiny
-	dev-perl/XML-Simple
-	media-gfx/graphicsmagick[perl]
-	mysql? ( dev-perl/DBD-mysql )
-	virtual/perl-Module-Load
-	postgres? ( dev-perl/DBD-Pg )
-	rcs? ( dev-perl/Rcs )
-	samba? ( dev-perl/Filesys-SmbClient )
-	sqlite? ( dev-perl/DBD-SQLite )
-	dev-perl/CGI
-	virtual/perl-File-Spec"
-
-need_httpd_cgi
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CGIBINDIR="cgi-bin"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-logout-var-expansion.patch"
-}
-
-src_compile() {
-	if use suid; then
-		# There are several webdavwrappers, TODO: make it configureable
-		export WEBDAVWRAPPER="webdavwrapper"
-
-		$(tc-getCC) ${LDFLAGS} ${CFLAGS} \
-			-o "${CGIBINDIR}/${WEBDAVWRAPPER}" \
-			helper/webdavwrapper.c || die "compile ${WEBDAVWRAPPER} failed"
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local htdocsDir='htdocs'
-	local confDir='etc'
-
-	local installDirs="$confDir lib locale"
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r "${htdocsDir}"/*
-
-	exeinto "${MY_CGIBINDIR}"
-	newexe "${CGIBINDIR}/logout-dist" logout
-
-	doexe "${CGIBINDIR}/webdav.pl"
-	use suid && doexe "${CGIBINDIR}/${WEBDAVWRAPPER}"
-
-	local currentDir
-	for currentDir in ${installDirs}; do
-		dodir "${MY_HOSTROOTDIR}/${currentDir}"
-		insinto "${MY_HOSTROOTDIR}/${currentDir}"
-		doins -r "${currentDir}"/*
-	done
-
-	webapp_configfile "${MY_HOSTROOTDIR}/${confDir}"/{webdav.conf-dist,mime.types}
-
-	use mysql && webapp_sqlscript mysql sql/mysql.sql
-	use postgres && webapp_sqlscript postgres sql/postgresql.sql
-
-	dodoc CHANGELOG TODO
-	dohtml -r doc/*
-
-	webapp_hook_script "${FILESDIR}/reconfig"
-
-	webapp_src_install
-
-	# In order to change the user and group ID at runtime, the webdavwrapper
-	# needs to be run as root (set-user-ID and set-group-ID bit)
-	if use suid; then
-		einfo "Setting SUID and SGID bit for ${WEBDAVWRAPPER}"
-		fowners root:root "${MY_CGIBINDIR}/${WEBDAVWRAPPER}"
-		fperms 6755 "${MY_CGIBINDIR}/${WEBDAVWRAPPER}"
-		webapp_postinst_txt en "${FILESDIR}/postinstall-${WEBDAVWRAPPER}-en.txt"
-		webapp_hook_script "${FILESDIR}/reconfig-suid"
-	else
-		ewarn "You have the 'suid' USE flag disabled"
-		ewarn "WebDAV CGI won't be able to switch user ids"
-		webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
-	fi
-}
diff --git a/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild b/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild
deleted file mode 100644
index 45fbb4226ce9..000000000000
--- a/www-apps/webdavcgi/webdavcgi-0.8.4.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator
-
-DESCRIPTION="A Perl CGI for accessing and sharing files, or calendar/addressbooks via WebDAV"
-HOMEPAGE="http://webdavcgi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-
-# Provide slotting on minor versions. WebDAV CGI is a web application which
-# can be shared by multiple instances and thus major updates shouldn't be
-# enforced to all users/instances at the same time.
-SLOT="$(get_version_component_range 1-2)"
-
-KEYWORDS="~amd64"
-IUSE="afs kerberos mysql postgres rcs samba +sqlite +suid"
-
-DEPEND=""
-RDEPEND="!www-apps/webdavcgi:0
-	afs? ( net-fs/openafs )
-	dev-lang/perl
-	dev-perl/Archive-Zip
-	dev-perl/File-Copy-Link
-	dev-perl/PerlIO-gzip
-	dev-perl/Quota
-	dev-perl/TimeDate
-	dev-perl/URI
-	dev-perl/UUID-Tiny
-	dev-perl/XML-Simple
-	kerberos? ( virtual/krb5 )
-	media-gfx/graphicsmagick[perl]
-	mysql? ( dev-perl/DBD-mysql )
-	virtual/perl-Module-Load
-	postgres? ( dev-perl/DBD-Pg )
-	rcs? ( dev-perl/Rcs )
-	samba? ( dev-perl/Filesys-SmbClient )
-	sqlite? ( dev-perl/DBD-SQLite )
-	dev-perl/CGI
-	virtual/perl-File-Spec
-	|| ( virtual/httpd-cgi virtual/httpd-fastcgi )"
-
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CGIBINDIR="cgi-bin"
-
-src_compile() {
-	if use suid; then
-		WEBDAVWRAPPERS="webdavwrapper" # Standard UID/GID wrapper
-
-		use afs      && WEBDAVWRAPPERS+=" webdavwrapper-afs"
-		use kerberos && WEBDAVWRAPPERS+=" webdavwrapper-krb"
-
-		export WEBDAVWRAPPERS
-
-		local wrapper
-		for wrapper in ${WEBDAVWRAPPERS}; do
-			$(tc-getCC) ${LDFLAGS} ${CFLAGS} \
-				-o "${CGIBINDIR}/${wrapper}" \
-				"helper/${wrapper}.c" || die "compile ${wrapper} failed"
-		done
-	fi
-}
-
-src_install() {
-	exeinto "/usr/libexec/${PN}-${SLOT}/${CGIBINDIR}"
-	newexe "${CGIBINDIR}/logout-dist" "logout"
-	doexe "${CGIBINDIR}/webdav.pl"
-
-	use afs   && doexe "${CGIBINDIR}/afswrapper"
-	use samba && doexe "${CGIBINDIR}/smbwrapper"
-
-	if use suid; then
-	    # In order to change the user and group ID at runtime, the webdavwrapper
-	    # needs to be run as root (set-user-ID and set-group-ID bit)
-		exeopts -o root -g root -m 6755
-
-	    local wrapper
-		for wrapper in ${WEBDAVWRAPPERS}; do
-			einfo "Installing UID/GID wrapper ${wrapper}"
-			doexe "${CGIBINDIR}/${wrapper}"
-		done
-
-		# reset install opts
-		exeopts
-	else
-		ewarn "You have the 'suid' USE flag disabled"
-		ewarn "WebDAV CGI won't be able to switch user ids"
-	fi
-
-	local confDir='etc'
-	local webdavConfDir="/etc/${PN}-${SLOT}/default"
-
-	export WEBDAVCONFIG="${webdavConfDir}/webdav.conf"
-
-	insinto "${webdavConfDir}"
-	doins "${confDir}/mime.types"
-	newins "${FILESDIR}/webdav-${SLOT}.conf" "webdav.conf"
-
-	local installBaseDir="/usr/share/${PN}-${SLOT}"
-	local currentDir
-	for currentDir in htdocs lib locale; do
-		insinto "${installBaseDir}/${currentDir}"
-		doins -r "${currentDir}"/*
-	done
-
-	if use mysql || use postgres; then
-		local sqlDir='sql'
-		insinto "${installBaseDir}/${sqlDir}"
-		use mysql    && "${sqlDir}/mysql.sql"
-		use postgres && "${sqlDir}/postgresql.sql"
-	fi
-
-	if use sqlite; then
-		# Directory where the SQLite database resides
-		local sqliteRootDir="/var/lib/${PN}/${SLOT}"
-		keepdir "${sqliteRootDir}"
-
-		# Default database directory where all users are able to create and
-		# share the databases, this can be changed within the config file and
-		# restricted to user/group only access if required.
-		export SQLITEDIR="${sqliteRootDir}/default"
-		keepdir "${SQLITEDIR}"
-		fperms 1777 "${SQLITEDIR}"
-	fi
-
-	# Default thumbnail directory, writable by all users
-	export THUMBNAILDIR="/var/cache/${PN}/${SLOT}/default/thumbnails"
-	keepdir "${THUMBNAILDIR}"
-	fperms 1777 "${THUMBNAILDIR}"
-
-	export APACHEEXAMPLECONFIG="apache-webdavcgi-${SLOT}-example.conf"
-	dodoc CHANGELOG TODO
-	dodoc "${FILESDIR}/${APACHEEXAMPLECONFIG}"
-	dohtml -r doc/*
-}
-
-pkg_postinst() {
-	ewarn "In order to allow different users to create and share files,"
-	ewarn "some directories were installed with world write access by default."
-	ewarn "To set restrictive permissions, add all WebDAV CGI users to a"
-	ewarn "common group, and allow access to the following directories by this"
-	ewarn "group only."
-	ewarn "Thumbnail directory: ${THUMBNAILDIR}"
-	use sqlite && ewarn "SQLite directory:    ${SQLITEDIR}"
-
-	ewarn
-	ewarn "Until bug #456180 is fixed, you probably have to re-emerge"
-	ewarn "media-gfx/graphicsmagick"
-
-	elog
-	elog "The WebDAV CGI config is located at ${WEBDAVCONFIG}."
-	elog
-	elog "An example Apache HTTP server configuration snippet is available in"
-	elog "/usr/share/doc/${PF} in the file ${APACHEEXAMPLECONFIG}"
-
-	einfo
-	einfo "Detailed installation and configuration instructions can be found at"
-	einfo "http://webdavcgi.sourceforge.net/"
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 6967addd9b6b..e348724a865d 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 2dac6a3202ad..8634cf71b489 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,4 +1,7 @@
 AUX chromium-84-mediaalloc.patch 1242 BLAKE2B 3545ea4f8d71a062f71c20f4fa3e1460dbd02d3512ce6445ac4f948582a51bdcbd98829eff9b01cb7b920313d1f849534c46a942eed209a56ca373da8e938b6b SHA512 7799be695afe24844aad35ee4ed2aeb338b36a06e29a7f8d8a9c5d2b2769167469b8cdfa3f8814e6976c26a2731fc73741dc1c0b095695e1a21bfd3db166f7b4
+AUX chromium-86-fix-vaapi-on-intel.patch 1719 BLAKE2B ec015786c717b81fe90f959679fe309faaf631ee5290ee470c02d28b83a72ba3984a8c1ac97d986569029942d3fc176a14d3415a7f3a1e8c70fb1917bf779d77 SHA512 0297d26fef8f18054f2a6d01b5224f6a1e6ec8359785f3c5411b5f5cf9c7ec194f7074632327e07e1a424e5d4bbe3b67f7276849aa8f1bbc5708cd68785b3887
+AUX chromium-87-fix-vaapi-build.patch 5714 BLAKE2B aeb3d172f9c27d80957782e17a5236ed731e45bc770477b311bfe08736b28b23d360c63833ed3c2c4c36bf71544767fbec9f9ec3286c05c69f94a210df84da96 SHA512 f4395a28215516f1bae621f1d75bb31ae8551e34e26437bb2117e329e81aba83b1dad8c01cd85559430950c6a9079b1515bf66b679d68b957bfb04ae58a599c4
+AUX chromium-87-ozone-deps.patch 442 BLAKE2B 679f82c94e0716200b0483c13e7fed89a549a5689640a64ad8b04ff6da4e484d6c5f29a0daeec29f5330b0483632b8d63d3d4fbe93aa8262363f136f3f4bf5fb SHA512 31bbaf5fb3d9629ee036a88725ffab3a724f6593790f5041c25496225ac105cb06b9b97c3685fb6d2d9d7bf75020a93a452a28e81eb817bce502a0c245c3085d
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-launcher-r5.sh 1556 BLAKE2B 0671bd8558cd98f3ce0281d35893a99388d45388629b0eaa31e141289ed641bf950fa717c4ead9e87803eebb2055ed97b0f8ad6537062e9d563f54c0a9a008cb SHA512 e5bb9c5fc2daabeef1740a0cb9fea67986a233d51cdcaa0b27ff365b0cf6182d9bf047df664dcccca64c6dc4d59d6246e4312c5e7fa16bb30b085c34934d5689
 AUX chromium-launcher-r6.sh 1593 BLAKE2B a871bd572239552390b216c89269dfe132474e1f57bfd0429f605af8285634659725c550b701e537f56adf20cba2dcb27dd9dadd390366dedc147f1ee987f462 SHA512 c01cb376eae2871dfa7a488d96ac8cc3445230eeb0fbd865948c5b3b601820468e85f2f0b9b30fff940c736aded050b7802759b8562e6378747af93c1d4f08a3
@@ -6,11 +9,11 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-85-patchset-2.tar.xz 9724 BLAKE2B 929d6abe3a66db395a9cedc63510a6a0ed0d79057f92ade22fe26221bf46a63e88fb40d6e54e6ffa837d142ec5da22e2b428f3153db431e3389de0b230fa2aec SHA512 753ce53c2c10cf1abdce334086a633dfcb4543c86a2dccbee0ad1bc8a8a0b642cdd18e2277c67088a380a9fa2ca8fd655e2fc0b3a2931de3230afa046615cd0e
 DIST chromium-85.0.4183.121.tar.xz 833194480 BLAKE2B d91302792fc34730795815a39ba91878f1d6d33c7bb810a10efcea2e117c069a6493b3acb1e3d8a04b19d599335b60d70523f47c65c42080cbe0d3981255c264 SHA512 9d61a0782c012fe36467a10f008962d45f4eaa065f6812276d847f7563056124c9fd21d8376dda8ab64e4c3b793da0593bac9d39988bbd60221828084b534945
 DIST chromium-86-patchset-6.tar.xz 7152 BLAKE2B 494b412caec2b3e3fd6c838ba4b61d499433f5a6043e4763efc424c811e405ed11461d8df2afe0aa22d898329ef82df0c43c47ae30f7c4a1c0c3f6e5b314e283 SHA512 68833c9dea6a7183ff42a2d432cf811b360c1237c36feed6b4f9163b61d7f98854ce73b33c58851cb800cf72311a638adeedb4555caf15f80b4bd6aca5039aef
-DIST chromium-86.0.4240.42.tar.xz 825375252 BLAKE2B 9b2abf8c9158630cf89cb35106db7259cf99b6e9753446fd2fc5ce47ceb4f5bc37e68b92e26b80a9e3ab0bf972309b5fdf6326eb9a890d187959f5f95b2309e0 SHA512 8b0edac6b924d6f599c3051e06309824367951389cb18920e7d401ac56f65305b4d39b702cad92babe38c8ae3833f24accf5f436bb9aa5a525f52fcf6fa0603b
-DIST chromium-87-patchset-3.tar.xz 8884 BLAKE2B 9f06f3e4afd53d633a01a5df197799ac54760b5608f202be0216fca80bba57cfbee78b0ea67290f12bccbf1bc150802f007914563f04903727ac15b92a3a68f9 SHA512 1fde82d4cc238a949b6aad7e5c2b7213c06dac49965873b7dcc270312a581421687f7726dbf6c28220c0e69379a5ccdadfc2a99fcdfe6c9f011f482266c177ef
-DIST chromium-87.0.4263.3.tar.xz 830924908 BLAKE2B 8388732772ae84671a3cf90a04663a1f71d4ee51310bf494a9bcbb60867648ac30920ab5eca83b236784cb6f3bb44ecde94b5d74f92e22f5bddd456bc01308fe SHA512 071cc9f88ad7229619b101911202f9c0fa094c99238a20ade793a9e013e2bb497033fb1a1c4458218003f1892e4a3018ac103ea0bf28a44ea689cb4b4cb4c17d
+DIST chromium-86.0.4240.53.tar.xz 825355604 BLAKE2B d7a74d2fb82c2f686f502932de79e081c13f5b4a2cf3afc5f01944f1bff9574ce5be6650b1b72443729bd014d4b869af09a08ad784fd1a5984ec8a6d0c7c1261 SHA512 874be536c589b1d6b5c28018de740af414ba431d6de5232047370f5c0e54c784971bde27b3410bfb077254a1e224d488a7d65c9205f8107eec521930c357c8c8
+DIST chromium-87-patchset-4.tar.xz 8100 BLAKE2B cf052203bb9ced993f051ebac51270da1482e59999d87aff24fa81d25cc0de228a92a00abb56e0caa91c3f045bdd9df7524d77b375b77f1a0c7c198cb05c7649 SHA512 bc7cb6ad99c7d45999d45e5c9df05d43c80c25212dafe3750146d2cb5b38a7239e32ac1e9bf245331ba7055c0a36e551131eab92ecea907e51878259416b59a9
+DIST chromium-87.0.4270.0.tar.xz 831037464 BLAKE2B f9b19b704e252b96c5a6861719828d3b08eee9128d753a8c264b21b0bd26cbc1e7a3d29909d4300e59246ac9c56b88e205f83efd024897915a8b77085fe5f160 SHA512 76cbf88b1390c2e64d6615e29763f00493b94beff5836c240833840b1b50fa782c137ebc66a81a6940f35052895bdc0098fefca5e6cc46f56dbc2b8b2184ca6f
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 EBUILD chromium-85.0.4183.121.ebuild 26679 BLAKE2B 1154809a421f02f704d778efa340a29d8a5748ba784060cd39eaa5687d2bb04f46fee00fbb863e6987f7a6b6427ce2af1d5ac3b8551008bcf3cd64fd37fb058e SHA512 c3e7fbd0a29df9f84ad18b48816dd3228685dc601521e49bdd82762093c578a5b24d1793db3551314ee190736685d038da50be47ce1514e1c0e5a0b21a290316
-EBUILD chromium-86.0.4240.42.ebuild 27932 BLAKE2B c4790f812572d65541458b0c4840b6906ac5e620458771da2a6dd0d391107400d9b408b7a2e34ad50262bf5c65f90ede4dd226ddbb7ab4c00bb095d22f8cefbb SHA512 31530182e51266b233d1ecfb8ef8c4cde35843198a31c40351dffaf467ed64b5eca2441d507e9911a5c83d05eda2b1c88bd48eb61bb2d5828df4a18c169f3037
-EBUILD chromium-87.0.4263.3.ebuild 27679 BLAKE2B 7c6292c0a3272610c2165958887badfd141e550f3522f5a8eb9a6f19eb4bd3e1ccf9db50ad1e79791addbeacc27b4d743d9e0b29d5ef649b540948ef66dd75f9 SHA512 cc04be7036ea07aeb1e190c058b78f8cbfe4a7261b7a3b1eb13e1cad6275555a1de5135b4c91101cd8f006c002082c14a79faa94f7a94b0c4a5a5e9528079c46
+EBUILD chromium-86.0.4240.53.ebuild 27932 BLAKE2B c4790f812572d65541458b0c4840b6906ac5e620458771da2a6dd0d391107400d9b408b7a2e34ad50262bf5c65f90ede4dd226ddbb7ab4c00bb095d22f8cefbb SHA512 31530182e51266b233d1ecfb8ef8c4cde35843198a31c40351dffaf467ed64b5eca2441d507e9911a5c83d05eda2b1c88bd48eb61bb2d5828df4a18c169f3037
+EBUILD chromium-87.0.4270.0.ebuild 27833 BLAKE2B 2ae1c7438cc316f289f12a5fff2493097e1697139a49c66bf075f5bf05fd937a796fda73048117c576d111d67e1bed87cb595379896a2ef531ce4b0ac9433873 SHA512 37570e250504c1605da5f3486466f4ef7695e99d9911b4039c75c93741f97a6599f9f82a920a152dde9e57f9e45c3e18745132723b3088919932d95470b21f62
 MISC metadata.xml 1712 BLAKE2B 07346b7372c3a52dd3c08b320527793f8fcd8be2308503145d6f7a7068d8113035559c7b2576ec009c9488364ed43837dc73581284e563e47b54a49028c9e22e SHA512 756cd5106e7680e33d1de45b5ad8a8154d9f4f7dedef865aa6e1b218d7b690ca8017a9e00696377a33a45aa03c77ecff91f42c6e0b00cf263396b700e5815c3a
diff --git a/www-client/chromium/chromium-86.0.4240.42.ebuild b/www-client/chromium/chromium-86.0.4240.53.ebuild
index fcb525d806f7..fcb525d806f7 100644
--- a/www-client/chromium/chromium-86.0.4240.42.ebuild
+++ b/www-client/chromium/chromium-86.0.4240.53.ebuild
diff --git a/www-client/chromium/chromium-87.0.4263.3.ebuild b/www-client/chromium/chromium-87.0.4263.3.ebuild
deleted file mode 100644
index 35a5f4c1ced5..000000000000
--- a/www-client/chromium/chromium-87.0.4263.3.ebuild
+++ /dev/null
@@ -1,879 +0,0 @@
-# Copyright 2009-2020 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="https://chromium.org/"
-PATCHSET="3"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc wayland widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-REQUIRED_USE="
-	component-build? ( !suid )
-"
-
-COMMON_X_DEPEND="
-	media-libs/mesa:=[gbm]
-	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/libXtst:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libxcb:=
-"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=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-1.8.2:=[postproc] )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4.3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-	!headless? (
-		${COMMON_X_DEPEND}
-		>=app-accessibility/at-spi2-atk-2.26:2
-		>=app-accessibility/at-spi2-core-2.26:2
-		>=dev-libs/atk-2.26
-		x11-libs/gtk+:3[X]
-		wayland? (
-			dev-libs/wayland:=
-			dev-libs/libffi:=
-			x11-libs/gtk+:3[wayland,X]
-			x11-libs/libdrm:=
-			x11-libs/libxkbcommon:=
-		)
-	)
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	app-arch/unzip
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	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
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-: ${CHROMIUM_FORCE_LIBCXX=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-10"
-fi
-
-if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-	RDEPEND+=" >=sys-libs/libcxx-10"
-	DEPEND+=" >=sys-libs/libcxx-10"
-else
-	COMMON_DEPEND="
-		app-arch/snappy:=
-		dev-libs/libxslt:=
-		>=dev-libs/re2-0.2019.08.01:=
-		>=media-libs/openh264-1.6.0:=
-		system-icu? ( >=dev-libs/icu-67.1:= )
-	"
-	RDEPEND+="${COMMON_DEPEND}"
-	DEPEND+="${COMMON_DEPEND}"
-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.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-			die "At least gcc 9.2 is required"
-		fi
-		# component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
-		if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
-			die "Component build with tcmalloc requires FEATURES=-usersandbox."
-		fi
-		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
-			if use component-build; then
-				die "Component build with clang requires fuzzer headers."
-			fi
-		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
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		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
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	eapply "${WORKDIR}/patches"
-
-	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/double_conversion
-		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/src/third_party/volk
-		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/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		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/jpeg-js
-		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/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/fabricjs
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit-html
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/third_party
-		third_party/dom_distiller_js
-		third_party/emoji-segmenter
-		third_party/flatbuffers
-		third_party/freetype
-		third_party/libgifcodec
-		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/harfbuzz-ng/utils
-		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/libavif
-		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/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/opencv
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		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/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/schema_org
-		third_party/securemessage
-		third_party/shell-encryption
-		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/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/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
-		third_party/ukey2
-		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/ooura
-		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/wuffs
-		third_party/xcbproto
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		tools/grit/third_party/six
-		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
-	)
-	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 )
-
-		# we need to generate ppc64 stuff because upstream does not ship it yet
-		# it has to be done before unbundling.
-		if use ppc64; then
-			pushd third_party/libvpx >/dev/null || die
-			mkdir -p source/config/linux/ppc64 || die
-			./generate_gni.sh || die
-			popd >/dev/null || die
-		fi
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-	if use wayland && ! use headless ; then
-		keeplibs+=( third_party/wayland )
-	fi
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		keeplibs+=( third_party/libxml )
-		keeplibs+=( third_party/libxslt )
-		keeplibs+=( third_party/openh264 )
-		keeplibs+=( third_party/re2 )
-		keeplibs+=( third_party/snappy )
-		if use system-icu; then
-			keeplibs+=( third_party/icu )
-		fi
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	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
-		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-			die "Compiling with sys-libs/libcxx requires clang."
-		fi
-		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)"
-
-	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
-		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
-	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
-		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
-		gn_system_libraries+=( libxml )
-		gn_system_libraries+=( libxslt )
-		gn_system_libraries+=( openh264 )
-		gn_system_libraries+=( re2 )
-		gn_system_libraries+=( snappy )
-	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"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check 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_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 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
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || 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 -mno-fma -mno-fma4
-		fi
-	fi
-
-	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
-		append-flags -stdlib=libc++
-		append-ldflags -stdlib=libc++
-	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)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	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
-
-	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
-	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
-	# Disable unknown warning message from clang.
-	tc-is-clang && append-flags -Wno-unknown-warning-option
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	if use wayland || use headless; then
-		myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-		myconf_gn+=" ozone_platform_headless=true"
-		if use headless; then
-			myconf_gn+=" ozone_platform=\"headless\""
-			myconf_gn+=" use_x11=false"
-		else
-			myconf_gn+=" ozone_platform_wayland=true"
-			myconf_gn+=" use_system_libdrm=true"
-			myconf_gn+=" use_system_minigbm=true"
-			myconf_gn+=" use_xkbcommon=true"
-			myconf_gn+=" ozone_platform=\"wayland\""
-		fi
-	else
-		myconf_gn+=" use_ozone=false"
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-	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
-
-	# https://bugs.gentoo.org/717456
-	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${PYTHONPATH+:}${PYTHONPATH}"
-
-	#"${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
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || 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;
-			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
-			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.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
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so)
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	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
-	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
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# 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-87.0.4270.0.ebuild b/www-client/chromium/chromium-87.0.4270.0.ebuild
new file mode 100644
index 000000000000..008abd293ee8
--- /dev/null
+++ b/www-client/chromium/chromium-87.0.4270.0.ebuild
@@ -0,0 +1,884 @@
+# Copyright 2009-2020 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="https://chromium.org/"
+PATCHSET="4"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups cpu_flags_arm_neon +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +tcmalloc vaapi wayland widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+REQUIRED_USE="
+	component-build? ( !suid )
+"
+
+COMMON_X_DEPEND="
+	media-libs/mesa:=[gbm]
+	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/libXtst:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libxcb:=
+	vaapi? ( >=x11-libs/libva-2.7:=[X,drm] )
+"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=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:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+	!headless? (
+		${COMMON_X_DEPEND}
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		x11-libs/gtk+:3[X]
+		wayland? (
+			dev-libs/wayland:=
+			dev-libs/libffi:=
+			x11-libs/gtk+:3[wayland,X]
+			x11-libs/libdrm:=
+			x11-libs/libxkbcommon:=
+		)
+	)
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	app-arch/unzip
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	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
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+: ${CHROMIUM_FORCE_CLANG=no}
+: ${CHROMIUM_FORCE_LIBCXX=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-10"
+fi
+
+if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+	RDEPEND+=" >=sys-libs/libcxx-10"
+	DEPEND+=" >=sys-libs/libcxx-10"
+else
+	COMMON_DEPEND="
+		app-arch/snappy:=
+		dev-libs/libxslt:=
+		>=dev-libs/re2-0.2019.08.01:=
+		>=media-libs/openh264-1.6.0:=
+		system-icu? ( >=dev-libs/icu-67.1:= )
+	"
+	RDEPEND+="${COMMON_DEPEND}"
+	DEPEND+="${COMMON_DEPEND}"
+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.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-87-ozone-deps.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		# component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
+		if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
+			die "Component build with tcmalloc requires FEATURES=-usersandbox."
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			if use component-build; then
+				die "Component build with clang requires fuzzer headers."
+			fi
+		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
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		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
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	eapply "${WORKDIR}/patches"
+	if use vaapi; then
+		eapply "${FILESDIR}/chromium-86-fix-vaapi-on-intel.patch"
+		eapply "${FILESDIR}/chromium-87-fix-vaapi-build.patch"
+	fi
+
+	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/double_conversion
+		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/src/third_party/volk
+		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/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		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/jpeg-js
+		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/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/fabricjs
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/emoji-segmenter
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/libgifcodec
+		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/harfbuzz-ng/utils
+		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/libavif
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/opencv
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		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/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/schema_org
+		third_party/securemessage
+		third_party/shell-encryption
+		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/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/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/ukey2
+		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/ooura
+		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/wuffs
+		third_party/xcbproto
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		tools/grit/third_party/six
+		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
+	)
+	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 tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+	if use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		keeplibs+=( third_party/libxml )
+		keeplibs+=( third_party/libxslt )
+		keeplibs+=( third_party/openh264 )
+		keeplibs+=( third_party/re2 )
+		keeplibs+=( third_party/snappy )
+		if use system-icu; then
+			keeplibs+=( third_party/icu )
+		fi
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+	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
+		if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+			die "Compiling with sys-libs/libcxx requires clang."
+		fi
+		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)"
+
+	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
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
+		# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
+		gn_system_libraries+=( libxml )
+		gn_system_libraries+=( libxslt )
+		gn_system_libraries+=( openh264 )
+		gn_system_libraries+=( re2 )
+		gn_system_libraries+=( snappy )
+	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"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check 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_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+	myconf_gn+=" use_vaapi=$(usex vaapi 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 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
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || 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 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
+		append-flags -stdlib=libc++
+		append-ldflags -stdlib=libc++
+	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)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	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
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# Disable unknown warning message from clang.
+	tc-is-clang && append-flags -Wno-unknown-warning-option
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	if use wayland || use headless; then
+		myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+		myconf_gn+=" ozone_platform_headless=true"
+		if use headless; then
+			myconf_gn+=" ozone_platform=\"headless\""
+			myconf_gn+=" use_x11=false"
+		else
+			myconf_gn+=" ozone_platform_wayland=true"
+			myconf_gn+=" use_system_libdrm=true"
+			myconf_gn+=" use_system_minigbm=true"
+			myconf_gn+=" use_xkbcommon=true"
+			myconf_gn+=" ozone_platform=\"wayland\""
+		fi
+	else
+		myconf_gn+=" use_ozone=false"
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+	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
+
+	# https://bugs.gentoo.org/717456
+	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${PYTHONPATH+:}${PYTHONPATH}"
+
+	#"${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
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || 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;
+			s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g;
+			s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.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
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so)
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	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
+	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
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# 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/files/chromium-86-fix-vaapi-on-intel.patch b/www-client/chromium/files/chromium-86-fix-vaapi-on-intel.patch
new file mode 100644
index 000000000000..2e3f9a6fdc5d
--- /dev/null
+++ b/www-client/chromium/files/chromium-86-fix-vaapi-on-intel.patch
@@ -0,0 +1,40 @@
+From 9ff06536caf7ea51aad9fd2bb649c858eaf7ee84 Mon Sep 17 00:00:00 2001
+From: Akarshan Biswas <akarshanbiswas@fedoraproject.org>
+Date: Sat, 26 Oct 2019 10:06:30 +0530
+Subject: [PATCH] Move offending function to chromeos only
+
+--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+@@ -58,6 +58,7 @@ unsigned int GetVaFormatForVideoCodecProfile(VideoCodecProfile profile) {
+   return VA_RT_FORMAT_YUV420;
+ }
+ 
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+ // Returns true if the CPU is an Intel Gemini Lake or later (including Kaby
+ // Lake) Cpu platform id's are referenced from the following file in kernel
+ // source arch/x86/include/asm/intel-family.h
+@@ -70,6 +71,7 @@ bool IsGeminiLakeOrLater() {
+       cpuid.model() >= kGeminiLakeModelId;
+   return is_geminilake_or_later;
+ }
++#endif
+ 
+ }  // namespace
+ 
+@@ -1213,6 +1215,8 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
+   if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
+     return BufferAllocationMode::kNormal;
+ 
++#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
++  // Move this to chromeOs only as it is causing problem in some intel linux drivers
+   // On Gemini Lake, Kaby Lake and later we can pass to libva the client's
+   // PictureBuffers to decode onto, which skips the use of the Vpp unit and its
+   // associated format reconciliation copy, avoiding all internal buffer
+@@ -1228,6 +1232,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
+       num_extra_pics_ = 3;
+     return BufferAllocationMode::kNone;
+   }
++#endif
+ 
+   // For H.264 on older devices, another +1 is experimentally needed for
+   // high-to-high resolution changes.
diff --git a/www-client/chromium/files/chromium-87-fix-vaapi-build.patch b/www-client/chromium/files/chromium-87-fix-vaapi-build.patch
new file mode 100644
index 000000000000..e230510fde7f
--- /dev/null
+++ b/www-client/chromium/files/chromium-87-fix-vaapi-build.patch
@@ -0,0 +1,177 @@
+From 90c4cfb5355a36de6660df4ed0a1c405a830ca0e Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson@chromium.org>
+Date: Tue, 15 Sep 2020 12:02:17 -0700
+Subject: [PATCH] [XProto] Fix VAAPI build
+
+Fixes the build after [1] broke it.
+
+[1] https://chromium-review.googlesource.com/c/chromium/src/+/2392140
+
+Bug: 1066670, 1127532
+Change-Id: I340f91a1d4ba7214ea47fa4b1bb4a368fe5597f5
+R=mcasas
+CC=tmathmeyer
+---
+
+diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc b/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
+index 843cf22..91eb184 100644
+--- a/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
++++ b/media/gpu/vaapi/vaapi_picture_native_pixmap_angle.cc
+@@ -7,6 +7,8 @@
+ #include "media/gpu/vaapi/va_surface.h"
+ #include "media/gpu/vaapi/vaapi_wrapper.h"
+ #include "ui/base/ui_base_features.h"
++#include "ui/gfx/x/connection.h"
++#include "ui/gfx/x/xproto.h"
+ #include "ui/gl/gl_bindings.h"
+ #include "ui/gl/gl_image_egl_pixmap.h"
+ #include "ui/gl/scoped_binders.h"
+@@ -16,24 +18,27 @@
+ namespace {
+ 
+ inline Pixmap CreatePixmap(const gfx::Size& size) {
+-  auto* display = gfx::GetXDisplay();
++  auto* connection = x11::Connection::Get();
++  auto* display = connection->display();
+   if (!display)
+     return 0;
+ 
+-  int screen = DefaultScreen(display);
+-  auto root = XRootWindow(display, screen);
+-  if (root == BadValue)
+-    return 0;
++  auto root = connection->default_root();
+ 
+-  XWindowAttributes win_attr = {};
+-  // returns 0 on failure, see:
+-  // https://tronche.com/gui/x/xlib/introduction/errors.html#Status
+-  if (!XGetWindowAttributes(display, root, &win_attr))
++  uint8_t depth = 0;
++  if (auto reply = connection->GetGeometry({root}).Sync())
++    depth = reply->depth;
++  else
+     return 0;
+ 
+   // TODO(tmathmeyer) should we use the depth from libva instead of root window?
+-  return XCreatePixmap(display, root, size.width(), size.height(),
+-                       win_attr.depth);
++  auto pixmap = connection->GenerateId<x11::Pixmap>();
++  auto req = connection->CreatePixmap(
++      {depth, pixmap, root, base::checked_cast<uint16_t>(size.width()),
++       base::checked_cast<uint16_t>(size.height())});
++  if (req.Sync().error)
++    pixmap = x11::Pixmap::None;
++  return base::strict_cast<::Pixmap>(pixmap);
+ }
+ 
+ }  // namespace
+@@ -71,11 +76,8 @@
+     DCHECK_EQ(glGetError(), static_cast<GLenum>(GL_NO_ERROR));
+   }
+ 
+-  if (x_pixmap_) {
+-    if (auto* display = gfx::GetXDisplay()) {
+-      XFreePixmap(display, x_pixmap_);
+-    }
+-  }
++  if (x_pixmap_)
++    x11::Connection::Get()->FreePixmap({static_cast<x11::Pixmap>(x_pixmap_)});
+ }
+ 
+ Status VaapiPictureNativePixmapAngle::Allocate(gfx::BufferFormat format) {
+diff --git a/media/gpu/vaapi/vaapi_picture_tfp.cc b/media/gpu/vaapi/vaapi_picture_tfp.cc
+index 9ff0372..1c917a1 100644
+--- a/media/gpu/vaapi/vaapi_picture_tfp.cc
++++ b/media/gpu/vaapi/vaapi_picture_tfp.cc
+@@ -7,6 +7,7 @@
+ #include "media/gpu/vaapi/va_surface.h"
+ #include "media/gpu/vaapi/vaapi_wrapper.h"
+ #include "ui/base/ui_base_features.h"
++#include "ui/gfx/x/connection.h"
+ #include "ui/gfx/x/x11_types.h"
+ #include "ui/gl/gl_bindings.h"
+ #include "ui/gl/gl_image_glx.h"
+@@ -33,7 +34,8 @@
+                    texture_id,
+                    client_texture_id,
+                    texture_target),
+-      x_display_(gfx::GetXDisplay()),
++      connection_(x11::Connection::Get()),
++      x_display_(connection_->display()),
+       x_pixmap_(0) {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   DCHECK(!features::IsUsingOzonePlatform());
+@@ -49,7 +51,7 @@
+   }
+ 
+   if (x_pixmap_)
+-    XFreePixmap(x_display_, x_pixmap_);
++    connection_->FreePixmap({static_cast<x11::Pixmap>(x_pixmap_)});
+ }
+ 
+ Status VaapiTFPPicture::Initialize() {
+@@ -85,15 +87,20 @@
+   }
+ 
+   XWindowAttributes win_attr;
+-  int screen = DefaultScreen(x_display_);
+-  XGetWindowAttributes(x_display_, XRootWindow(x_display_, screen), &win_attr);
++  auto root = connection_->default_root();
++  XGetWindowAttributes(x_display_, static_cast<::Window>(root), &win_attr);
+   // TODO(posciak): pass the depth required by libva, not the RootWindow's
+   // depth
+-  x_pixmap_ = XCreatePixmap(x_display_, XRootWindow(x_display_, screen),
+-                            size_.width(), size_.height(), win_attr.depth);
+-  if (!x_pixmap_) {
++  auto pixmap = connection_->GenerateId<x11::Pixmap>();
++  if (connection_
++          ->CreatePixmap(
++              {win_attr.depth, pixmap, root, size_.width(), size_.height()})
++          .Sync()
++          .error) {
+     DLOG(ERROR) << "Failed creating an X Pixmap for TFP";
+     return StatusCode::kVaapiNoPixmap;
++  } else {
++    x_pixmap_ = static_cast<::Pixmap>(pixmap);
+   }
+ 
+   return Initialize();
+diff --git a/media/gpu/vaapi/vaapi_picture_tfp.h b/media/gpu/vaapi/vaapi_picture_tfp.h
+index c4eb2c1..a32955e 100644
+--- a/media/gpu/vaapi/vaapi_picture_tfp.h
++++ b/media/gpu/vaapi/vaapi_picture_tfp.h
+@@ -11,6 +11,7 @@
+ #include "base/memory/ref_counted.h"
+ #include "media/gpu/vaapi/vaapi_picture.h"
+ #include "ui/gfx/geometry/size.h"
++#include "ui/gfx/x/connection.h"
+ #include "ui/gl/gl_bindings.h"
+ 
+ namespace gl {
+@@ -47,6 +48,7 @@
+  private:
+   Status Initialize();
+ 
++  x11::Connection* const connection_;
+   Display* x_display_;
+ 
+   Pixmap x_pixmap_;
+diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
+index 2ad0b997..a988233 100644
+--- a/media/gpu/vaapi/vaapi_wrapper.cc
++++ b/media/gpu/vaapi/vaapi_wrapper.cc
+@@ -57,8 +57,13 @@
+ #include "ui/gl/gl_implementation.h"
+ 
+ #if defined(USE_X11)
+-#include <va/va_x11.h>
+ #include "ui/gfx/x/x11_types.h"  // nogncheck
++
++typedef XID Drawable;
++
++extern "C" {
++#include "media/gpu/vaapi/va_x11.sigs"
++}
+ #endif
+ 
+ #if defined(USE_OZONE)
diff --git a/www-client/chromium/files/chromium-87-ozone-deps.patch b/www-client/chromium/files/chromium-87-ozone-deps.patch
new file mode 100644
index 000000000000..ceb693cea8b0
--- /dev/null
+++ b/www-client/chromium/files/chromium-87-ozone-deps.patch
@@ -0,0 +1,15 @@
+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+index 3f89c70..0df6490 100644
+--- a/chrome/browser/BUILD.gn
++++ b/chrome/browser/BUILD.gn
+@@ -5056,7 +5056,9 @@ static_library("browser") {
+       "chrome_browser_main_extra_parts_ozone.cc",
+       "chrome_browser_main_extra_parts_ozone.h",
+     ]
+-    deps += [ "//ui/ozone" ]
++    if (use_ozone) {
++      deps += [ "//ui/ozone" ]
++    }
+   }
+ 
+   if (enable_background_mode) {
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 4d46414a6701..981be1f62bfd 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -2,10 +2,12 @@ AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44f
 AUX firefox-wayland.sh 110 BLAKE2B 60875713743e7a65b0c5a7649b8a016dc5005b723640378c4b60ec29f017d7a227cdcddf3b77faa2cae33683b1b8dbf0688968071d9936def4bda4f66ca0aef1 SHA512 58d6b3fb5e9af26ce9c55d0da304eec65a5380ddd58e16dd28cc80ec035a9d1b88bd3815cb74a6999125d1540e77a42182c15e142803b326ddc9c3626e8cb484
 AUX firefox-x11.sh 104 BLAKE2B 8d374235286fac0cfd113f851b0f48e9b23685f6890c6a959e4a071c6c2a58fd274aa7a88c750496420ce6918c06825d2c03cb159638db6567e3d773f3168cf7 SHA512 59cae56b34507f463c4480a7335ea25070beb450e3c93d3adcb782e070cb558544f05c7a784419d48f33cbdca7ed7b2c740c361da8ea081d0323677ffcef79ef
 AUX firefox.sh 3103 BLAKE2B 43066a1aa148d2162f7c6ac422dd6983d7c4504ff09271da2ccd22adab9f834b5343e7970271ca995e2a85c17455988cac0d6235cfab40eff033ac29d33efb08 SHA512 7d443dc42bae690d22437be1cd025d8b21c7d31debdde1995495e6cab8ceb94ab0bcd63513ed5f68fefd2e1991db414c7134bb621f3079772e60e4ac9876903c
+AUX gentoo-default-prefs.js 674 BLAKE2B 02f84c3be7b50eefbb1c29b8f6876519674b239dcb0dead5e5c15999f1a52221e4caefff16f00ff85ff59dda177445bc7c3cfedc8b52377601604de9f7c83a3c SHA512 4fb488c0ebdfff251b3f3d53e912bfe88c404c133e2cfd9599d48809e0ffa855b9c9b700a6c98a5e6e6072f9b92f676e2ddb8cbbe883f1b731e167d76012bd8f
 AUX gentoo-default-prefs.js-3 978 BLAKE2B 54af7c32832dccc407b09402e0f549e717e60d26f61bd0cb1bb4f5afb8ccd752f501fc194639bb81f88c732d813460fae19586e33b4dfcbc32262a58f0fde71a SHA512 ae96b9cdb8bbe3d47d8fab0386d1d1c3e8286b227cbd3590b3deb15f319d3779b052526866174231c730a4bf9eca82d10bc7e5d5bc626695b1271c5498906c27
-AUX gentoo-hwaccel-prefs.js-1 100 BLAKE2B 08be790b58524077a5681cc06e10890b72dc6e8155c9e03e6ef9165035087d4b8cbcac4a6b8997f61db3721895c9247a12171eec7d082fa15e1d5312bf51fbee SHA512 cf5385c793056e66b8853fd641dce2e7804d6878675afd24485487f2201801e1bdd5d27c15cb0d483eb34bfb75e7a21c01f1bbf701cb1c2dfa48f8f6422ed42c
+AUX gentoo-hwaccel-prefs.js-1 162 BLAKE2B c5f2dfb727081e2d538c262f12c0cfdda31cbda58c77f4024d820e1d1915203d1fb8ad2671f88ff0eb2b019bbf44079a8b1114e240b74f815680e5c28eccc295 SHA512 f1847f11e7059a83f09c3c7494aadcb04512cdf2ccf6616ebe3ec02fc46de66fd35cf83d81e08013c0e594b73e4dffcb67a32288b6949ce137669715583fd0a4
 AUX icon/firefox-r1.desktop 7966 BLAKE2B 35b6b569024efe703dbcb0a6840fd85127db110f5c81c87dc910f61c262603967d1906c66fa1c926cf122551f61a59cded1d084d31e81291568765959e4c77ba SHA512 179bdaecc965ead95f32897d43efe530a358c8886d427fea37dab733871690955198aa6b55209e5167d11cc5cf1a76969bcdf1ea05571eb2b6dd7e72be44052c
 AUX icon/firefox-r2.desktop 8137 BLAKE2B 5d0ce737c0e0969cb1a61de7989f5ca1ca0dff413d6d98bb0c93e0fed510b4e075a88fc117d3713e5e11ee7471ceaeffa9bc9dfd4282f3ddb1ea837d823e4887 SHA512 749a50b11d89c1329a52d13745ff8d5f801e565038cb5341319b4b515f36baf1c0c740003d6d01188c27e31d7ddeff58310e7b2420681292d0f2522bc5bd34b6
+AUX icon/firefox-symbolic.svg 7432 BLAKE2B 33a552ffb9850f6b9cd3cb8d9f7f80268ac08f00a0bd5eb15d892c6fbb950f8cacf6058b9c838f5be1ae1b53541f143a1ec0c1302ae85b49100b166fcbccdce6 SHA512 ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8
 AUX icon/firefox.desktop 277 BLAKE2B 944a7b4706ba5f6b93a1369416adc31203dfaf0d12291a035ce05830f2c79bd14d1f7d5324c16d3e5be21fdda2a9237223901030a974f3ff778b1def7f8bb3e3 SHA512 99b57d36601bba420bb2e6647e0fa4baa1c31f15bf7c602ac43a347d7fe78f4350b3fb10af3a709a5aac02a4c4f283dcfacd780bacb43e7e8ed46b83b97d6f4d
 DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7 SHA512 9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128
 DIST firefox-68.12.0esr-ach.xpi 471594 BLAKE2B 067ac8a1dc7773d198f7421ae43aa1dcf7ba3f83a9b4e9351813e0997171dfd3f24247c909993856ea0ee9738e259a54bf031b5dbeffe24e6181eb74041137fa SHA512 f070eb67eef8a441f285c8f91b41adde9d5a720852a24cc95137242602708d70371ad4abf20897232c73ff5b6f2556a00ae83ab5dd59d2674e291be3bab007b6
@@ -100,6 +102,102 @@ DIST firefox-68.12.0esr-xh.xpi 470243 BLAKE2B 1c1e8a6ce19687687827bc8e8ac3cf5230
 DIST firefox-68.12.0esr-zh-CN.xpi 536443 BLAKE2B 2f0c8f0a541065d63e55673729b110495bfef7d07a71057b1c83cc3663888519ded6af1155ae47305a8468551354a4def2377903e3883e39060080b6b15d0a23 SHA512 30eca263f2e7aa516845305df42cea51646f8b9b7e011a9833df1e8b0e0266f24d20522fd2d070c07aa4ad10fad9509b13135ee747b56903b3e00cc9207b816c
 DIST firefox-68.12.0esr-zh-TW.xpi 535854 BLAKE2B eade9f743136204f614a207c7ac4e07124f6f4a81de83b80da5659c42b19b0d794165147268bff847f64b185e370d91a1efe2dc694feb2643515a360eb5d71a7 SHA512 c81b18754fcd4e2bf6be72756bd730291732db41eb1c2320f22380fc4f87b505c162a02e8400833266ce59c43e60fa5d2e37f12f66ad7922acb509a42a9c0565
 DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c SHA512 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
+DIST firefox-78.3.0esr-ach.xpi 500682 BLAKE2B cf2428cc06010aa818d541e0c50bd6ebea45e36238b1652e3443ee7036a152fbd6268274177b7b2c8ed0345ea9d9907f639ae454c13ef4d85d359b0968fc2519 SHA512 6d02af8987e18f0827d68d25bc1f916ed4fd163fb33f5c173edafd59038e036129199034839db771570e66aeccc1135ac5effbb7b01455f299cbbef91abaa0b3
+DIST firefox-78.3.0esr-af.xpi 444088 BLAKE2B c494ac63cecb8e4bcd9d41b227f5a2ef8e11012bb2d6b27c98c04a2f65d65303a2d0978dd31cb8d19bfca4e3a782906b11c33c5e74f8723c7f206228a81a6efd SHA512 8d082592d8c57c04b7dd022a1a972a59db8ef842279ca3d9973d350c053db35c11c9ac9eb959e087fdf43ead20f65b043513d975828a2f93bdc0faed382ccd6a
+DIST firefox-78.3.0esr-an.xpi 511470 BLAKE2B 3ad2f995299f96bce1d793cb846a99c025333b0c84e3e20dce6b2cd89804120eda44c976a57edee5d7c08362f2fe136dc579e579d9aedd65b6654360bef1b569 SHA512 4407016fa13849bcf83acc654e805719df4eb731ccdc7c7516e3dea492597f64e08d3fafe72708cc3ed921966af9f1b7eca82a0810a56fc57c573def196f2e20
+DIST firefox-78.3.0esr-ar.xpi 588708 BLAKE2B ac3dd8f0d23b0e940b2518ba89a031f082f41b8e8939ce143fcf9ef1e62acbd787fd786dd9d170b83b515075e0d333d54007a4f35ac5edd26eac522ce2b7450e SHA512 a550f82d4cb8d4bfa459b7b11a5f291d735bf20aa1403934b322dbeeffb69a4b645ffdf7fd1cfa7bf1e041b4f4fc1a9713f78d8e194699318daddd4104428497
+DIST firefox-78.3.0esr-ast.xpi 500545 BLAKE2B fad5d4dfba3a1785496788cfad57a775e0b48aed6632412019c5ad4b15fdcaf95e31411e65c911bea5da2d630f695f256bada4c601b3c114353efc926c487fb1 SHA512 06ee764ffd72eb4742d71face7a13984281ae9bb7fa4d1fdfa76e8e8309952261308a6f8881b716544385b6779cd03c2644beb50fc912511ab11c3f2dc910c94
+DIST firefox-78.3.0esr-az.xpi 537588 BLAKE2B 34597b9eb308816f5a12fd00307685fe160ca84e466528e719578adf6dae87b695c0539083ba09dafb3cd9a05d392a3b094a1e8a722beabf4ead6638e94b0b62 SHA512 91c3e0b14eacda998ac2d96f51304459e57ae3c06bb80178c67385094a930df9a29cfcdf2f36e3dbbbe9cb622d8976a3d717bcf63a4cf8369c9aa00626f4316b
+DIST firefox-78.3.0esr-be.xpi 647672 BLAKE2B 4c602a3403ada1d10351668cded869393f555a8292a947afbde0dec16f8a24743a8c67fd703dab92bafcb99ae3bb66f90c0bd5af1555e4474ca680fa486f3c5b SHA512 ea3ec989f942c8631f53d83a84e7f4b055553ab83503b879af5fc6050626c1a56d34fc2f9f1260213b6d7ffc6baa1fa9d42ada7f23edcdb06a4161f0887fedf9
+DIST firefox-78.3.0esr-bg.xpi 608529 BLAKE2B fed0302aef1330f37a92f14ddda35484945913800b02598ab60414b71a582aa754d9726f362a8d3c365082d62101cb553b4368e30415be816a4b0aaa4cedb499 SHA512 a1cf066661ae467dff419c58534a393b4e71b17e4f21419204cc4bf04fb0da951cd22ed133abecfcb25135ff9fdd56dd3d9c75a5b4a21321fa474d564c6e5315
+DIST firefox-78.3.0esr-bn.xpi 634043 BLAKE2B d2acf1e93bfdf6fae63b72c16195a252389eb2e61c1e940e7cb1ec2d6e854efb0168b4995fd701cab55cf90ffe1cb3bdbf8bb21b023a4434423b39e8aca6eb11 SHA512 e4fc1043f2ebc2f2890f4074ea350fdc3ae6366a922edc732c199998e73a4789e613129c52217a87003babc457bfafec1da660bac8349a9e80e76a1b2e42fc43
+DIST firefox-78.3.0esr-br.xpi 551259 BLAKE2B 333ad7581f4a020b61bc7424efcf5e267ffec2f0322678d7d1f7ec19f68b5ad21cf529381cdcd159300c98d4f215f232ce9026fbf1d4a283f9dbf87b2a46089e SHA512 decbcf6c78d73ced1e71d0dd5708ea6eb5553650826f66711fdbdb0ad88f7f64d00172aa3cf8653cbe748bdfe72a3d1176abff27ceed08289ba4e3881fb7c427
+DIST firefox-78.3.0esr-bs.xpi 506398 BLAKE2B 11b4b9f0780d26d5ed023d128ab79607f8e182519970cd4f308a21d79032b7e4d1c4b8148fc428e624d3f5172e565e27223370f7f5c46e2c20367d5cb18e8b78 SHA512 8fd41cc107473a83e8c90638406b0976f7242f9614b273d20a5030986f8e1fe3bbcf84a41a3657d46364e25172a5d4f2043117c683ef20841b02af50009032c4
+DIST firefox-78.3.0esr-ca-valencia.xpi 558395 BLAKE2B 7f794034c495355445e5c51d29d4af85ec6093380965414ed03e1430431462cd965f69a9699f47449e31ef87f5dc8bf2b16e1b8277d409fe40446c2b6e9e9652 SHA512 9369d644b8a65033c6c35b4da5e3c994e6386743810d1c76c5ab16da684f53a9c238bfb684b74ca0f9c73af4b6832980262f2bbae9bc19e945f355461e27a469
+DIST firefox-78.3.0esr-ca.xpi 552885 BLAKE2B ac9d0bdfbcd00d84ef4b1075fce0ccaa4399c1ffdf41765b25c7c3ac1583564fcdc47329943cdb7d058df2aada649ad8cf5f20c332de6126912f10af54a0c01b SHA512 dbb376de94bfa77af6e3f826a2b31c5e4fa212caf403d7d7fd17fcd899360b7f4e65de0002855e0c62a7bc7fa1e94f0f05272d9069e0337ef875f99ce1763c09
+DIST firefox-78.3.0esr-cak.xpi 584944 BLAKE2B 946b55cf0b0cb25649c41fdc214b87d1982c16296c4ac4ac0ebee61512aecee07430126d964de3dc6c71301af617293fc230fe5c2d0e7a68f893e9a8605dab66 SHA512 e83ff70e45966f1ab42cbf1a6af50372e9beb7ae22c7dad7ee2da6b8542bdece2e1165031588995f3bd32511c8af7ccf0117a70047e96d715028fdca7b190181
+DIST firefox-78.3.0esr-cs.xpi 585532 BLAKE2B 830dd4f7e0d0e7b51cf0d4c2fdf8be8356831f23380b8ba532f862076058efe933b4cd0423f5717da04ac32d09761297b25f85503acf0825e374a5574292735d SHA512 de7fe657cfa1b6ecef487bfa8081003315854a767f749b8e940128ffcf29ad1a249769bcbab86e286de4e1ce5910d82594e96d7bb87e1f8ecbcea172fabd6b3c
+DIST firefox-78.3.0esr-cy.xpi 563223 BLAKE2B 301f7ae058ed8c5bfd88efdbbf528e9ce863498c6b8d476f1d138583fbee4edde6b2a7fd12091e54dd07a5e661440ea573bbbd3998b43f7a32ebaccb20c3a8be SHA512 a8a14b7b11041b6155c26aa6f133542a5d515aaf3e43aeb55d8c80aa3083300e8865148cb5fe6c6e8477d909d7d5c440f04c409efe42565c50909279241af506
+DIST firefox-78.3.0esr-da.xpi 552316 BLAKE2B cb3021d1772836eab2d1aed539abd360662073c8ef63d62bc88a0726fbe063a56a0068695d962f8e377d28e56b0c31208db8edcd8a2a31848e7a25230bf51a12 SHA512 6c4d6d2a276bff85d6817240d964815c81d2c238682eb001afd770f64bc349d06b76e70c31f7e414cdfdc296c6ab75a62ee08315c7ef3abf5a072a16d3cd6c15
+DIST firefox-78.3.0esr-de.xpi 576946 BLAKE2B 5b43bcc1ffe80921231b0bba46631e3d8b637cbc79960e795901f407d897f2c62122ecaff7c4174f3a2325a6121be35ad2d9c19d3dfcfb787a3a1220c17f7b6c SHA512 2def0eae41265af867a088116bddd6bf795d778ceb12f7c99f35f26ca7167f8bc3c307b2a86597b5d71139cb71a6be342c01362c0901d5965a7d1b6c301470ae
+DIST firefox-78.3.0esr-dsb.xpi 589035 BLAKE2B 5a1ade20a3f8e880be54df7933d16566340f45b7fe78f4d4c43e8a683470532137a5a4e6c06c48bb800f8bbb1462c9d41a5c6ddea3a3ee3cddf21ed2010cda88 SHA512 df8b00d9f129badc06ffb0bcdf04cfa4387ac6b52b420b376123b0cc275d6dcb1644c0385a61759edf619f51156ab23c0c4fcce1a117517083f0bcab59e11283
+DIST firefox-78.3.0esr-el.xpi 665906 BLAKE2B 6aae483aa66b1f993f62a005d9c12ace14813b385d1e7b7a8740bc7f1bb0538c98840ae5c78971009e74a3908aef9177dc4735b2c88000fc0eab614ee50f6dec SHA512 1ca05989d02364b4bf8e4096cc8fe72e91c300a07bcc749afb53ea20d9fdec2adc7b5217b1d5cb8b79043ce22bec278f3af0af194cd323064bf6a57061a9eb3a
+DIST firefox-78.3.0esr-en-CA.xpi 531413 BLAKE2B 922e56e1c1fe8bb952368ed65fd16c3dbaebaaa503039aafe01535115b2912e4c4513a44b2bc3f03750c9aa39fb9740803bc1b17d5f305e9ee500ea2d5541e07 SHA512 0ff27080c531d296650cdfc984114518b83f0cf432ea085f7d6710f2c5324e92109ce3a242f847e8920d08306feb25cc3335f20efe966aa1316a4193d4fc5455
+DIST firefox-78.3.0esr-en-GB.xpi 531197 BLAKE2B 824b7bc95c58653d6d6ad1a5731a31443fce7e79e612da10c62c5e46a7da3133522507503a7aad63763fdfea74dcf824f8e72c17bd02c61b4757dc8ecec8fe7d SHA512 b0dac81bc663b8617d2378479727715008ed36b0294ee799add47aa8a74f1e1cb77c579140d8baef281c04f9339fcbf7f95cdd5d770230afb0fd2bbfc1179189
+DIST firefox-78.3.0esr-eo.xpi 558618 BLAKE2B fc0b7bb7ab3809628a0e039f69b23c68bd9ecf34285fd60d4990146379f10bb9f5c9f835646013fdeb600ebc6109f6ee0cc004755134239bbcb1838a2ca1549a SHA512 c5ebea956aea830e8fa7c0a454db89f1f2d6c8bb16eaefdbd703ee3bf3a4a1f6d1ce88444d7d93cb5a31162203c145da4dc137f147d6c422c7fd6b9d335998bf
+DIST firefox-78.3.0esr-es-AR.xpi 568401 BLAKE2B d0eec27d4a63eaed4c4be15b8328333de6deb0214e88213fff0666c91c91c45a1edec8ead65d61d3b2751b765b3512c6e5169c22295e82988ff4716c3b9b6355 SHA512 0c2300762caa233c17ed92411f11e5013ea1a6e40c26f341ce774a8e843aaa82810acc57ee20accd610f6348dfb32041a4bcf8b4e72ae44edc47ef50f4916645
+DIST firefox-78.3.0esr-es-CL.xpi 567586 BLAKE2B 050065738c3240fb6c139cf838ea3f060a419c52b5d67a4b7fc71f2d5d6fd98796b80941e6a8ba77908ee0fb8a6284ce34ae650b131f677e4dfd2cb43ac462f8 SHA512 97ca52f2e0cd83edc896ed386582f00537a29e51711d0c570b4700bc381aeaf427ec03369e41afbecb0f7ebf2db1f029966d44e04eb071814d9f9ba426236677
+DIST firefox-78.3.0esr-es-ES.xpi 551519 BLAKE2B a4a6b7d29ac3648db9d5d597334fd64f978c0bb418391ff6b1e1f83b56dde48d9b40567c7cd255b108cc1bab2b60cf28e81224f441ebb8ad4f871cd467fb2131 SHA512 cea38eb451863188ebf7b4c404b7a8389095ef604c73797820282cdbdc3dbed13281a544cd041dff1fe6aaf61cb7fffd406d9e7c134e3e5fc3deeb50a3473c68
+DIST firefox-78.3.0esr-es-MX.xpi 569785 BLAKE2B adcc399f73e6394ff98ad0d6544e34abe7f3773c60b55ea4087b0c6b2f5aeef81ec49b86a3f7c6a1c56820871af6805ff18b7cc692dc90d8ec9700800fb1424f SHA512 fe3c472ebf68c380810e6639558a7d51370694b016c3a60afeb65114c372e3fc8a7643e78b842e6c4276bbd9146742d9cd2920e4831207d296688167eb1fe868
+DIST firefox-78.3.0esr-et.xpi 535627 BLAKE2B 061beb3800fc32a92929cfb8bdcb32a087d3bd020cec909d05f6dabd659a5816704799563bc004324980531cdd94d777d4d180df47e069956135f8202fc3b1b1 SHA512 c1fdbb27afb0b5ee726441a4c123b29ece59988a01913789dadb859b2534507170f3cc3bde5a58c0f2859c13f724036841a7cb4e45371f29dc27f5a1ba7c20a1
+DIST firefox-78.3.0esr-eu.xpi 556811 BLAKE2B 3e973af9a7a3279b9af4fca3be9a80afdb0c7dce4a8ab614ecab5c5e0d6c60c11e4b99a88aeeb5885d05aac32ec8e659c974b45adfe59146324eadcb222dff6d SHA512 e4514c895ac2a4fb29e6978ec01de299388a67a512601896d4c33e780c6c9aecf1be0a4299467aaef02885dcb2b9b94a2be98005895fd2d29637b64cbef38e47
+DIST firefox-78.3.0esr-fa.xpi 593491 BLAKE2B 67224468f35394c6f1d5a91299b4c5da0b4e1d7d93a454cf9700a243b9f117050715f0110378eb71e7afa5eea31f74ff1209fa46769fd97360dfbafda88ff7b7 SHA512 3d997cffbfa58b726534a41af14762e5cc954982caad8e7ebd06596faccab4d2ab4ef5fa7bd2508f18fdf0030ab2eeb0d6dab9ae5f17862b88a69059635f23a0
+DIST firefox-78.3.0esr-ff.xpi 531569 BLAKE2B 357485219a341d57851a3b7b7aebb1397dd87431abc0a4947d12aa7b23447fe385fb9f07ed01a83505aac3ff4438497e029922686411b2a2fa2d3700621f2bef SHA512 c0308bfd9e46ebb11d96c435f08d09b5e9c9511ecaa1a7a53de35fd3a104f1cc814afa834f6160007b50e85da4df0129e039e28096ebd15b98971a06cbfd8c44
+DIST firefox-78.3.0esr-fi.xpi 554044 BLAKE2B c3837467858a821cf5791455b3fcc1acba70106630e2dc6b189f35cb8e41ff6d72df9b7d720ebc968a04a32ac07b5ea895d1a99f5db3fa90ce6b1aa1f01ced5f SHA512 b6f190c236cc1c16c08a92ecfb40acc1fbc370f1ca24db0ead15af067493129aa7f05ff5c0137641597bdd799a11e518b2cb26427b1bf09b6d6be70f5974afae
+DIST firefox-78.3.0esr-fr.xpi 580679 BLAKE2B 75bfa88984bb50b7fac546cdf1f2791e517c64cff54df9ac0174e09bb8a56348188e4fd9d011dc0d7a0d4912b854b40c3e980a779b2c0a01b123fc8ca1f673e2 SHA512 fd7686e40acb90b673f6c24fb26725bb7ee957fb87cb50f2b2bc2b25d33e1826481daa6550a5ce1e3fbf63317449f565d1f7074097cb2eafc09d2e5dd821c46d
+DIST firefox-78.3.0esr-fy-NL.xpi 565468 BLAKE2B b03519643b344b613ea2103906864a8597c7c7ce31fd9b13a22351d3fafa5cb95e9f738feb95dfcfac422657856e4e074c54cf2beb531f4adca5e0a0eef46e42 SHA512 eb53dc1dc6a2d0cbb0848c2d8b2529a00f2885b4f9e83fbd8843fba22ce04f79417663ed710572b9aba325baf3baaa22d33a7d4af466a57566576e65ddeb7c9e
+DIST firefox-78.3.0esr-ga-IE.xpi 514583 BLAKE2B e3da9447050aa1a7df690ce66a7aee2fd7ceb8251d9fce19917462e22b8351ce6008fa7b1a5c7299931acc8e6532ec665fdce07d71326c4e242dbaf81e8afaeb SHA512 f4a7d8a34039203f767b04ae53276aa1ff7fee141773efcd64e0d8238c2526395b3a417538bd486dfa923237111fc7d3faf340ea2f96555300f634d261f74ce7
+DIST firefox-78.3.0esr-gd.xpi 544413 BLAKE2B 6b1481db2b2ec9d50059e5033abdf237cd6a987d6878220601ac508024a4d0c6fcb56b9eec9f6e183aead26deb77c572af1ab091033cc5fdede9b995f500b203 SHA512 e6c43c09d2fcbdf19ca9bf269cdcecba31027ddfb6bf772b01754c0f293b07abd435de16caee750b1f159f4c21299ca78579e52f8f11ab8e32ca0b34fa281a5e
+DIST firefox-78.3.0esr-gl.xpi 508270 BLAKE2B b0aace1a12114a1ffb9bacd1ad74132e940d459303b5c1a42bc49339332cf0596937210ce4f610796a2a259040667e70b1b5a1b0e32c44976a661754c98dd8f0 SHA512 f5ccf8b24809451527889497fed3204d6c0407aee9ef431e528a8c394c8e88c697f322082460b3a40b46e54078b2d3fae3340ef2d504cb80ab506fe8547a4604
+DIST firefox-78.3.0esr-gn.xpi 582148 BLAKE2B afa9fa67dedd100218ea3372b00e8a93b4927133e318d3aa8a7c724934db07268551601ff695aca4aff4fb9fd1f8a2f0088d8bd96a9b3f170a171db78b5d0317 SHA512 28c6962fa96d539c600df43a856a50615dacd6d6180d15ab8e477026507fed51ee9d3dd4562a32dfe3e95e6e7fa6e7993e9a48e99dc43364e6af7a46f8501916
+DIST firefox-78.3.0esr-gu-IN.xpi 602924 BLAKE2B 61db1d6baf98caa6ff19d698facff4c41b01b380586b7d1c1fc2fb70931f05f282ca672b1f7fad9c8ad5f1c301593925bdc8381ce3ff2a340f62e6604afffd71 SHA512 2bb5595619ba5c7b6ec771ccfe6a1243ad2b9da6e1ca4ccd7211e65455662e91a784066c61ddd1e9a004e98e4dbb15db6a7bb563553057c54a231d13442e46e5
+DIST firefox-78.3.0esr-he.xpi 582419 BLAKE2B 902914c72d4973c82215af0ffa1830ee547dbe2902116d9568e030533ef327df16d3c32efbccf4a8140505b58f5c05dec272b2ac2d3d35dd9c4ed4cd9220fc28 SHA512 12e79d9a47dbdf9bd1d83a3d40045da8a0c2da15305c6e5f47c45ab5714799a2f0e1b8a85afca1523c501d7ba3b80088d056668c483f069031c0023131240c8a
+DIST firefox-78.3.0esr-hi-IN.xpi 622432 BLAKE2B 18f964712018aae867515f7440afdc6b95de5386e12b9337e9ce466027edfca659219c25d81000bc3542f66b985194be7b0f7f057d2add68faccc55419ea7cfd SHA512 cf3ed13276103cb0bc5fa2a627bc20a9639887b4459fa11d7754bd13a4d5f6022fc75c6244223e70831f668130c6e6e2ef7439a9fe4939c4382c6acc6a6be73e
+DIST firefox-78.3.0esr-hr.xpi 560788 BLAKE2B 772b000aecbf349eafcc47e97fb78f6e33ec31a29db52743a2d352636a375b8b064397f9e013fd61df141031f40cb082908248928bf76aa9c72735568e965233 SHA512 cd07c808c7e5a94344b7d61fad47017be6c01d41e4656f54cd21e76883f4cf7af3064f401351f4d056b7ec0408d3b3f52a590a87f4926ef38395f40977e6a888
+DIST firefox-78.3.0esr-hsb.xpi 585295 BLAKE2B 73447a1447da959297deba3980b51f0ea211bb3728f1fd2f1016c85359353526463a026d48ce249cd845bf6ace6f78d435c3b3877043518b5514812511ae15a0 SHA512 4420d54e08e9f326fece0fb6fb315e00810bd930100b545b91369168239714ca2f2b317dfea7ef550ed7f06e36cbd87e6a1b4489622fbd772320f1896d70982f
+DIST firefox-78.3.0esr-hu.xpi 588740 BLAKE2B a58c3329bf4cffe2155f1e1a42d1c75acf0b97c672b734b0f7f89b0262a0833fdcae36d507be08a1077f0bc0f16c5306c3bcaeb1386d366608435b988f9ad96b SHA512 5de6c62c1350e7dba7d37b42498ce74f1ee54d5b0c6a01c0498fed9475174d0b48a9c73808b14ecb65eacfa7c791bfc7097bd56ff54d56fd7fb83717b438ba81
+DIST firefox-78.3.0esr-hy-AM.xpi 649321 BLAKE2B 5e2e3b4c98b0054368e0da107b3cb5af03c6948afd6000d1ae319faadfb7c0b8a787516accbe601ce3f88f62db2386ba47f65edba20bf8446c47ae18ae117fa9 SHA512 2b09ae8159db3f188a33d362ab3d61c9697675346a5d6df9ff872a1a8da614457f47645b7b6a4b5cf0576eab2639a9eec0afe9c4a6037bc528dd86fba212c39d
+DIST firefox-78.3.0esr-ia.xpi 554114 BLAKE2B 974e63a047432aae4561849710d718f9dc7728b29da6318d447eef4396dd784f5af5b0b1f02a191508a43e19b84bb3b9ea9329e747bc303e7ef5d8c439bec572 SHA512 5e4442cdbcadff0eb4c8c054f641959d11436b3e872417b70235b66123263a0ca474ce9fc652fba9cd2bf145ccbb01a23c28ea87763c6cf9c0c2fd01777c0572
+DIST firefox-78.3.0esr-id.xpi 551948 BLAKE2B dc745e26fce4a1db839be26448a97a8d206ab566c734047c7a485b065aa509620da876d9c5f829972bf0d4c84ddadaf3511228a854556e5b10e960e8f7447ebc SHA512 bc8a5cdfa3d8d2134715fabc0f3cdece57702a0ca67afe5d882d1fe9fd2e5ecf69cbca637c6159e1871c2c900a90296a1bd06eb99cb439ceb7fe7f8888d7f421
+DIST firefox-78.3.0esr-is.xpi 527495 BLAKE2B e5d7e1a94a26a5dbbf794d1ddc9830cc6066ab1b99d297ff65da0e6075b143d920f45abde072d525b90aa304c965f5f5bdfd48f0d6f0d300f993708a1f2bdd05 SHA512 0bfea6f0cbb188b26048216ed5ffd05b3e2085f7da5f5fae4916d762ae79508900181bd116b7a41a4b89c40f7f98ba9db03efbe57c375d778e500278d96489d4
+DIST firefox-78.3.0esr-it.xpi 455011 BLAKE2B bb9b80c8afd66d77e090de1ea171e958a7c5fc290747abd7bbd650524f31b98d3107bb3a3b98ba67edafdc66ec8f19fec37b7e1b6dd622e678781b62771e1fad SHA512 8d5c696a189df64e5616a71622973f7be1cb4b49480cb5ed5935fb7f84865a3f29483bc50ce68b91f2c6218780080f5cc7ebe39b7a635ab4264b52958200376c
+DIST firefox-78.3.0esr-ja.xpi 615907 BLAKE2B 9e4c2adb807696bb1acda5b10c732be78f0e0b6db197853f2498fd2d57e4457cbeee7a594a20c557ae57335712aa2b8f65547d017640e41066a6f55aa657d516 SHA512 883ea7d350da791c5f5809677970e8fc86344c46f9127d9a53d0a8ee3491eafb251d5c243f2c07124ec162b135dd8f5d08ae529bfaf4aae887894981dfbb46e4
+DIST firefox-78.3.0esr-ka.xpi 612307 BLAKE2B 0ab9f7f9a95630b9f0aa177d74de7425266280a6a196d20eaaa5aa9faf3eea29d971c6602cd633c33848c21b197aad71ed2df6c90f97cd942431720117e66977 SHA512 acd94f25a1d416a0e18c2d70503ea84d4103bd07f869280cd53bf7a6986fc99181d6ddcd9456645469bab25a6bcf48d466009435742a0e360b0b99a33ef77943
+DIST firefox-78.3.0esr-kab.xpi 574001 BLAKE2B 3e2b35009b4d76c63cd3e6bfd9bdb16ad96514b987d3659a96890f9a6e751cb4423d46a42a685253678114abeae545b2e12e470265a8d83ab5cd7dbe06ad6737 SHA512 e2f643d084e7d0b9216e99b4f6a5a809cf099d0022add05b13cd3e809baa300591db7457626675dab1c0ee3234f4cd1e3ca38076dad47392540b69321efb32ef
+DIST firefox-78.3.0esr-kk.xpi 642150 BLAKE2B 95486ad4de3f1f256a34444a0f23cc61542ad76acd104f27dade39242ba7641fc3abed4d67e572c4a92c7f193bfbbe909fe86f8ac15c88ada062797ab25f0843 SHA512 db650c7082980c5bbe7b8fbd3a4b270f09c99629ed8f80be6ad32181f5a62b73765c802c38581360cf518f2bd1c36e6e4a52cd1663ddac382ca164cd883a6aa1
+DIST firefox-78.3.0esr-km.xpi 567222 BLAKE2B a5f9c41cca58b4d4f67e03e44edb29cbddf3814557570aebe9fa9e1bea82cac318a65319db1e6ff1b337e84e404155b6adf5a0bf84c542e473bcf00e915c2fc7 SHA512 beb53e0a3f2f9f9ee012f658c7081c2b51d6a42711387882e8983b4c792ffd8365d1f43d9b61d53c1910fcca9214a22d7b36516f5e031aa89702466114d90d8d
+DIST firefox-78.3.0esr-kn.xpi 558804 BLAKE2B 723256334f62d518df8552269804c1e9151bda031c1bdd856f7386727b194bd02ec8a120b2d5da2ecd6894d789eb199b23ca55495cafe899d7b95d953050da44 SHA512 05b010d549b1234af0ebaebfe00d6b1962c1aafc884f356fe639f92706c5ca0f76b3c423a5bd37b09f295af9e31f122b0a46bfdb3aa4c94eff5e49a2e5ff6e26
+DIST firefox-78.3.0esr-ko.xpi 602760 BLAKE2B f4c2fec9781c848c26d4f69320fb446762a15f828108ea51533b9205fb91609e849850577081b97849b1b76be20dc9b4d05062fba372df449bf5c5d6c33dce79 SHA512 08219bb5cea7c2ca93948d9ba84070d05dc3f130243a784a0b51ab2dc263d7cb0c8f0261bd697981a645686a572c9ee34cfca3d8395b12da660b59a8b9a591a5
+DIST firefox-78.3.0esr-lij.xpi 526104 BLAKE2B f7d272398516350c8d8c1d27db1933ae332f9d5dbe4ae3f01873b4a791216e9cd34ca8b2d9b46d83a778bd35b493b01e60b23503025890679f9cd52c9f5d531a SHA512 64ead02ada241ae321058ad946b3975ea5587b05f8d25beccaf29c821e72303a93dba3aa1ab2a8341885f47ff9bd369aa4282a709eeef03ca34529b8dc67512f
+DIST firefox-78.3.0esr-lt.xpi 579640 BLAKE2B a7805992aac896db5229662a716572da9563e9b3c44f67f7bb7889e9e41f4b9e43dd8cc730cbb01b997aa7feca3758a7a0e9cbf2afe00f86112682642172ceb0 SHA512 e6f62c425547639998b1a78d33a7de8d88776c76e1bbbebce50b9bd49de0fdb5e36fff225ad9dfacbcf1912b077bab7ad23655eb02e4cb145d804b502adbee26
+DIST firefox-78.3.0esr-lv.xpi 516885 BLAKE2B d2f107234e672f06a10348aa6450e3dcc11edc8cffd31ab0f255b3061209aa70571b4d7e14bc543f170ec1b584a0ef0ced4d1fff290cc3c7c86c722e54eb2d38 SHA512 77b51303a527d23b619f95beb461c86e280ffd8a6ef4f1b317cdb37f138f822b3a72f34b811e74cc85c7bd8ccf1c775abee13f255e462be7918548c519719280
+DIST firefox-78.3.0esr-mk.xpi 482921 BLAKE2B 9246f394e7b6283afcad82ae0a564e49c55e74bf5adf7d4a8d2f255ab89b9d6939d37d8d7e891859cd95b58f5ff5e877d9e8e96fc1a8f65d6fee09e1c6b999e7 SHA512 b19560ff4409c5bd774532c06596a2937de839a25378a3abc1536e20e6a83cd2d17c9211d4126f38d11b2ae3dc02d1d5678c132020aa86a1524c8f5aafe08916
+DIST firefox-78.3.0esr-mr.xpi 599909 BLAKE2B b47c363e78d6185de2183d68dba430eebb48c7e908b75c8992030960cac25fa5f3a57d4103ce161509eef5854df16f1c891e401cc0b98166d08648cf142fc734 SHA512 8a5fded7b9e372050b06e70dabc152659e8b2d4d456f0cb8d076c86c976af373241459a119741aef6c3d3881aa6834593f991ed441de547579d06ad15a4a55c4
+DIST firefox-78.3.0esr-ms.xpi 500963 BLAKE2B 2e13bb37c0af066d5feb7d8fdaeaab33c5bdf2d85d686f2f994e5fbb190b650622eb86dee352e0caa7bd49f056a77433ac687a24ae62ff90158584720def427a SHA512 becaeb0e75eea79fda891b888eb34cc6be2c9bfe2b868540b6d143322a518d55c6c6e4ddb7512739271e0d07f1e93cd8614123b2a2b3c0314b4e24e532f5cbb6
+DIST firefox-78.3.0esr-my.xpi 557190 BLAKE2B 1f8059b3fbeeb48997c91b86822bc147130bed4e4392313abd880e60035236e2dea132aed0a4618f9dc94611c4e79e859f256acdcb47ad0e3e0ec6ff16fac471 SHA512 76988f9b040aa9877f612e462d9295040f87bed2b183ea48cb4980d741d4713199c44cc2763eb62a13804dd7a3f883584afe67d8651ed5540d6e8f170219f9e8
+DIST firefox-78.3.0esr-nb-NO.xpi 549585 BLAKE2B 400aca7a92d4c66df6dc1bb3105fa1040281e16da197ee4591ec4b7e0bb12c98cd5d7a2ec4db366ad9391be1bfca0a8d4aacc9749312a8e8c7f900c886de479d SHA512 4cc0ad05e409afced60cb3cedd8f0033b26dc5a893ecdcfd49875e6d3267338d1b784a598954d52afa6e7f97880bf4ca04b0874f21a88830219e7622a554134e
+DIST firefox-78.3.0esr-ne-NP.xpi 529237 BLAKE2B af2e49484a9fa30a09ee6721b72d62602d6bed6f6d96a63ddfcf5d5c4267ad8f7afae7b9cc33e2dd10b603eae105b94ca1639dd012b25dc129cd4b3262801e07 SHA512 4404cc5ca543b0ad88bce09e9db5a8930a874ac07957b8b52219375cec9f81d448d7e21f83241ae3c71978ad721378ed3311e121317a2bd12d947c2e70dd1a90
+DIST firefox-78.3.0esr-nl.xpi 558792 BLAKE2B 2bd46047aed16a1b3a82a86144ccabed472d4c0c85c45753be9791a7ff2885f418854992ce81a7d34318da4315fcf6d77cc85b412d83cfaa08ce575d49fd87e8 SHA512 2e3e202a81566a1d036bc1dba7c71c5191b8a43359b3baefbd8733646114e9990c93f965686a6c431ca42a0b721bd6896d67d6a3f4bf3cab3ce3f8b84cf8a565
+DIST firefox-78.3.0esr-nn-NO.xpi 552150 BLAKE2B 07353adae442cc7b8bbc14c2f4aeea2da082968bb6678003ab425955dc3385a0d5bdaab8d6383c42ab1ed25681dd3fdb1b7e1da52c791024e2f564ab1940555a SHA512 6242f603970b267cd8776b58322d116da789390f82d339e9b4519b480c193a77794e6033116be02d813732067e6efe0291763afcb609c0cd4b5830686c621a90
+DIST firefox-78.3.0esr-oc.xpi 576260 BLAKE2B 7f361c79ec67eb8f65b96bf9eec1f4561f908f2b2952baca8bf80e59a34bbd35df8976145c4bceb0a51e218d947a9560d6ee9a1880f2409db326dbcdf4042485 SHA512 f73e4b74324e6bb4111af5c3184e432db8f9ec2c97d9743f924fc7fe23fa018bcb5298cd00083c9a526d69642b41ede711546ef6768c297a5fe565ef66a7c9c9
+DIST firefox-78.3.0esr-pa-IN.xpi 606173 BLAKE2B 6f003decd5c1957ffc833f1603d1b362627a9d74fc410650089612c5cb22787b4fadeb57f3037318ccb943af91a016cc68ce6f368ccb7ee1f9527604329a1f83 SHA512 e43d8d072173323e4e9ec8e5109202863d49a46d7a6f3380829b5eb655b0e306b7e4d8694e41d60fb9783adbec3d5ced8f31531c188560527eaeb21255deb47b
+DIST firefox-78.3.0esr-pl.xpi 574905 BLAKE2B 67c8a8a1817aa0c4375b1e8e368cb3bee3b1569fb2c0cf4083b8929ef148f4509a019640bc5f9a47c42b903ed27c0fd96834ba200caccee38cb5bbe9cdf588d0 SHA512 b7adb3b9240d7e5f438aee47cc6b751d84fd655d3bbd0ebc1c7c7979c9b193405680a8888df4713a7feadd58d398dc2719bb1f21fc644b2f21fcd115307ae3b4
+DIST firefox-78.3.0esr-pt-BR.xpi 558015 BLAKE2B fb992389146f5dfe281037e07e9020df56a7364fb4ecd19dc2d96069bd7c8c62b166f188cafebc1479171a1b123038af0c3ce2842263a202896d052cc903e823 SHA512 1e1e3c9eaf6b8865f17ff291abbae5bc1df7fefcec50a91c592f1209eb8dc0e2a40173bdae31a1679f3ad1da223a85c07cf3752fe8496aa88b52bb6d69b646cb
+DIST firefox-78.3.0esr-pt-PT.xpi 565636 BLAKE2B 0436da53682a7827aa73565d06c7e72686f1e3ce95d308d9de558c0011f32e541ca1b1d62dd61bcd664f73734fa356d172bdffa782c5f1c88efd43a29aee82bd SHA512 c36981935727c6f9809de8231d1c8d7aae42d802436231e0ea451a5fbb955fedafb36aaee56d4de103e3da0ee20c9079549192052fd97e0165dd236dd7eb294e
+DIST firefox-78.3.0esr-rm.xpi 557926 BLAKE2B 53696df0d5a81aa2767b77391250086484b5596aeef689e160838865b5502f7826d58a07f0fc0a3f15615f321494d9c14e1c59e16540ad64b18aac589151726e SHA512 22d74c6304baa9a20a983abfe56b8f9934a609cf76eed120bbc9e3c46f96c58568f551e01e8f0839b7935df82619971f39d8108f03cf5d92e084ce81e482e8d1
+DIST firefox-78.3.0esr-ro.xpi 569383 BLAKE2B 0671c39d38ff4079a121b3900508582395f7203752ed42aa4428578914caab2e00544ed8757e19f7a408063d47f36328f4f393da2b98913d37e8a01cf315cfaf SHA512 0560b3dc0576854547027f26499a69ad59c27f6244cb94529989cddb3e31412b85ebfbee630c0cfee83234157dd5f5a82b2e978ffd1ff8ebc5d998135435cf2b
+DIST firefox-78.3.0esr-ru.xpi 650683 BLAKE2B 952fe3437829f63928e0233d894944d62fa70eb6d99fba5028a1819dc29626d25c303bfbf5f5f99eaada03c06a164acfbaa3edf73b4f0271d6101dca95086586 SHA512 402a9411cc1e86ab82ba1445b9d90fa1549000eea59f428452a45e6f059ebf6838fd504db2f2527adde4f79d8ad663d96185242e1dbcecfd92d4e7c3bf661554
+DIST firefox-78.3.0esr-si.xpi 534199 BLAKE2B 24a8187ce61e7c87f3a75b74a2bc527f926b313eb1c2e0c7cb6566edcfd90f2bd431c8b96f7082e663458e5787e23c0d7ac484e2492adc9e30fbc95777d58b3a SHA512 5137226dae2817bd811a084d061d1c19b7e231a454f0ba7e1823a0907a465223362d6722c8ff9f92661b927e7b7da8effd71408aac99bba8ae07251082aabad6
+DIST firefox-78.3.0esr-sk.xpi 578529 BLAKE2B 2ba3d75e14f91694cf9481c21c327ddd022206ecec741d14f1bf87b52c6983406e0ceed2ef7bd714f1e7e8cd1310309c0149bca357547e068d6fe54c1d09ce96 SHA512 c68a995a970c41caf126b0fb250c160ef0be9fdef67a06aabe87e8f235e979eb41f7d888e3dda1532e062864c7b3bf5a339826ad2e95cc20e5bb57ce6061b5d5
+DIST firefox-78.3.0esr-sl.xpi 563041 BLAKE2B 66ec660cc69831ec2c8f261dc28d3a1f59b308ac43deeca7f04d7d51efb8f833776559a9fa217873d0a8ab0b0c843be4d16f9b08f5319a9720219118cf800c0b SHA512 060b0538b9fe0ed956b2e429573c5dc85cb897f5cb328d3a995e880a48bc85576853602b47f3f33568a60f9c8177a68888a17b5d90076eda155e14dd4903bde0
+DIST firefox-78.3.0esr-son.xpi 454251 BLAKE2B 58fa0909f5a201c163ceced02e13f9d0c5aa94446981cc35a970a8ebdc54b0f2c8130ca8e4bc0977a987fe03a2b734ed5658494f1221b6016add0c2cb44b8598 SHA512 cafd081493a60354b0b6a6de607a244adf935c343b7de3416d0f72ebbe79d81c10499ff74fe05b2b883a38359159c09db21df2299aa23746782a45b9a4547d83
+DIST firefox-78.3.0esr-sq.xpi 580012 BLAKE2B 46cded6ec796bbabec107446e79d545e73ae6ddb1fb2f1273ff9c7f5f06cf36df0490fabace6d38e844b7cb9bd098aed99a151790cab8134a75e14c6fe3aaa4d SHA512 7254ac7e75d619e83bc314985028622d87a09551cc78b7506dd002db8f5ec8d784baf2f1d2f6a50289e7fd6ca6145a96c5b2db39e786cad226f64da8c381dd08
+DIST firefox-78.3.0esr-sr.xpi 604539 BLAKE2B 2519ea9b3cb53256d55b33b52fbbe5a466f62aca1223e081d7b9a72519a9d1e28a0b2a28960b0ff0bfcab3c23631fd525400f49cf0e1e94513ec12a8754e75cc SHA512 f5251fcb8a8a3574da1b360c75d00e803b851772736d35b06a7ef61d54cccdf8efcd240366998853705a7e9d5b1c259c4df76c93f1480155f1d9665298800270
+DIST firefox-78.3.0esr-sv-SE.xpi 561876 BLAKE2B fd0f23cdd139b41735696fa5d75a7b9907a8435d9c40f414c0032e1ffa752ec7ebb5617877cb5458d3c16e4422b4b4c4d1ef1ef2c7eb6b3bd0eb0def37814448 SHA512 52430c3373c1de65cd21c62f9d9b61188fb04f086ba2e596bda1c4bb4d3d15e6f49f124f31153b1f88225ce87dc581f15e1f074de7d489ff550a6777806ad10e
+DIST firefox-78.3.0esr-ta.xpi 572350 BLAKE2B fca05092e55129e9be4b29b49b513167b41d934b7a5cce020fafc2653cc8ba934fc2c5b6f41bd78124f05659d9e5ec8801b1fc2125058bb4ac7a6237026843e4 SHA512 16c9f175415c96889148f7a6cb37cccfbfaa7a4b0c0a4015bdb8d67f5f604e2af3240a9aeed01d4f80af3ebb145331e44207fcf898fed62138d494398a0777bc
+DIST firefox-78.3.0esr-te.xpi 591644 BLAKE2B c2f9cac8f83ae43cd8f75d179897a723dc9e338e6e658619945eb803f4ceb3afa15ce788930239ce56de456e200da95f07b0a086dc2cb0bfe21c9d397892336c SHA512 282ada33e70414e1a5cc983102acf1da24d37bd38fb84c241c2dbe371dec98f9a33e1701635258c334c3971a62fe9a434fb3792e5cddb3733ff4ed4397e76d39
+DIST firefox-78.3.0esr-th.xpi 628321 BLAKE2B a142b53e0dcad6ab0b3d9d9d3d9e0533c05d294be9910fdce3adf77564c1cd008a03f41b54816db30ecbb929df6ad1c5b87cc6b383802a5925c2367237c99a2c SHA512 69cbba91cc1a8d4f3e106826bf426d694409dbda99b66f93d36b73f2f65cfd1529eefe0166b3e9a909969e594eb2bd9b0deca1a7a28cc2d8b2f56ebb0e4bc5af
+DIST firefox-78.3.0esr-tl.xpi 552298 BLAKE2B 6010847a8291fc8c7deb3246100aff8d4120ef11bf9c5a3857cb797fa44ceb3ae3c736999e18d8b56a602b96607b43c5c902abcc37509c8ecde1316eee193d57 SHA512 8ad5ab27f6907561c9f0e11ce76b4a9180e3d76dedb1b8b01ed87cca5cfe677b839e3ac7962e227ba7ce5986464b3b90694e95c31cd0a25854943428dc28e7b3
+DIST firefox-78.3.0esr-tr.xpi 576356 BLAKE2B 2dd2159e3811401c0a3cbbfa9dd762f6e455cf8969c6f76c23a8a6e1f2bfe72b481502c1ffac0dc5ab336ad603bdb2cb2923a924e2375408420d9a20438a19d6 SHA512 f20defbbc20a3d2c020ce4c1ceb5823dc5694d94fc5e38893ff59293112130cc9da91657d3ebb6983561c7378e8b3296dde8d3033ea50c5f535d8e416b97b16d
+DIST firefox-78.3.0esr-trs.xpi 540192 BLAKE2B e19c87ae84a23a5c9d2c64d81d984989606d588b553f9d223406003eb1e0c7fcf7cafbedf72d040701870df84cad891084528de9283607b982ee60642b76378e SHA512 205739a745d0856b5157723e55bf0fe02ff649f828ce2fc9ed7ca759a322ad802a9235c4247a419315c01450331bfdce8cbbae2f821009dff615a3ac37ba9a6e
+DIST firefox-78.3.0esr-uk.xpi 646864 BLAKE2B 796a779d263fed8965fca8f73989c9be0af1d27157cc84f31861460bd06f12c40deeaa2769ad912d28addfa4a6835d37df29e7ad6e0e91573890c7718d4f4fe2 SHA512 e70405a6318af6d35e068c452d6014279615fa3a16f31565f06c5f90a1faee9fe3bd7b3b4823e1db2ead8d329e84c53c642ccdf80d1b542c7eac5562a6406aa0
+DIST firefox-78.3.0esr-ur.xpi 608130 BLAKE2B 747526131d83b0691dbafae9a664a613e46a07e87d7fa08dbe559339a549d17d55c69cd117624b74e1c99079b1a9fcbb9fa7b13b6aafa9f83c85232763843dad SHA512 e16b52a1b1444922a36145788ed7e7b53a1ffc2be19c29d43b9080d7ebd92496e5543d0a3034bc5f5e38e718e9fb2ac95507894b6f1dfb4487164b13d53d1678
+DIST firefox-78.3.0esr-uz.xpi 521140 BLAKE2B 91681e284ca1ec82fe35cdd569e5406b522ed156f739ce940b852a94470ce5a5483bb7a08ddcd85c05886829a26b6fffaf1be896f3bbad182e9989d047d0e46b SHA512 b64d33c920dca971bf7f3a8b57693162aac5e4df3b8797f27855b1cd8b5a9714a4a177b9d46f945eb4f7d6adbf1967a74341784d0f0c81ce906960290fd89c58
+DIST firefox-78.3.0esr-vi.xpi 596838 BLAKE2B 4549ee453a89aeda2dd0501062d084f526af0d2baccb3aa54e27026e0cad7c9ce39373776f4b6d6f05bdc39c245963452772bad8f19974cae9ec92ae06640f85 SHA512 4b336d96f79b97a4af6e52ea27bf2071d560710c2ba496d1b3a00dd4241ecdafa2a130294515587417437ab835df98bbb4d6f06e91a7245b214f049622c66063
+DIST firefox-78.3.0esr-xh.xpi 458908 BLAKE2B f9a6769a96540056c37ce1cb077694e98b98293f620c8a163dbdb177de8466803fc11ac5a0d87df48c93b9d322ca1a05671e4a981899cd3509194db9d72a4338 SHA512 2992481f9900e36342314d291354fc76019140130cc2f4405aa41e2696819fea62147e264168067ae505a453e8fcbe43a1609b74ebf42b4a01af635ac573b031
+DIST firefox-78.3.0esr-zh-CN.xpi 600179 BLAKE2B bbdc1cec5c4dbc2efa6913393b4928fe3ceb4f3d68f8615a3ac80510e2fd22bc60b6628e9053c83b263bca5fa2ab6357d0f5f7f8cfad2ea2bc6c23727966c1c5 SHA512 b156e8de8717367c4494744f13f698803cfb0e4b9ca6acc5b06350df3fd400a3dc20dd12c7438bc0ee3fa4ffb25b24c57e858102d1ffccdf7ab90acf255c54c1
+DIST firefox-78.3.0esr-zh-TW.xpi 599257 BLAKE2B c5b28502cd111e8b03f85694be2baebb199aaf35cb8fe7cc466e205ca73098a6e5dbdbff128a89288f416afecd06a563ab59a3083344e503392e4ae3641c160a SHA512 05cd0d99d5caff0dd9b35f5347770854b7aaad9dca71868470ab2c6e00e7c0e38430b8579a1186148ff6955a44139635a2935e6fbde2fac0f0a3081c9e3fa851
+DIST firefox-78.3.0esr.source.tar.xz 331073228 BLAKE2B 01f3d3c0b8b963dedfa89631c518225104c739637a8bf22c121e3a942fa0b1d1f8cf1c4c2edad2e823e0e3922f865cc8d3430c6fc9246deea855295eaff84a0e SHA512 89e12797429d99760b294e302d803432f533b7c2c10f1fcd3781b89b27ec9698173d4fbf1bfe7506186602daf6666c09152407ce5668fb5b7391e38b5566f2f2
 DIST firefox-80.0-ach.xpi 504733 BLAKE2B cd52c95165ccf00c0bc995f869c65cc4d3b5ed8b5cb698b1343d1cf6272a0d749cb4d9cf5e05dee39d57bfffec13955b4176422d22995387cdbfaa1014e4e73b SHA512 235c396fb2a45e4e18b0834196565498987bedf63d3b8968f983b994c660d71400fd1966aa2cdab3bc1fa24ccc82384e079ec9db0ea12b4fa447e6f58233661b
 DIST firefox-80.0-af.xpi 444437 BLAKE2B 3b40f0ff49e4e2d4c3780f1312db9ae2cd7c0c93dbb23ae667a9f9d0183a31e9db423e69abff43da5cedd9abed0b4be654b24bf125cffa6a2072c4338a436bc0 SHA512 5381e4cfdac44d088fc6c9c778b03780d79ab39f440e6beece40c4e62c0077fb461397059484318520a55ef4d9a6637efc2b2f2599ed3e7311900409d7b638f5
 DIST firefox-80.0-an.xpi 542574 BLAKE2B 33c2539310261ecdb6ea354d6acd93d2f14eaf66c978f595f0808dd36a4baa1ec6f11b3d76cb2d848a5756373eb01a6813c4fcb994589b1adb95504a2f36f5be SHA512 85b189ceeb0837d58536242f15c04c0f4eced857f95e8f299426cd2a98ca0bbc5a106e5fab8c4e42c8ff245905e65103f09f2db4dec0cedb73f94c7829c87dd7
@@ -286,8 +384,108 @@ DIST firefox-80.0.1-zh-CN.xpi 611635 BLAKE2B 3263f493ddc0ad7f5ae018f5dba479e9daa
 DIST firefox-80.0.1-zh-TW.xpi 611178 BLAKE2B e84b0defc7990b6c775a9ee9a5ba7dd54a60a41ca1e618d87b72c1033eb08a814de335a1d59b9aa84fff70d164f8755f2143b188128da5c84fd2eb4ea08b4b77 SHA512 253f80d60eb05d05d366642e2ebb78430b3b9acb36baa553b3cffa5a1d4773e1a422e770557a3ae791d7704ed22f5ded6713313886b696548bf49c91bfb7dfbf
 DIST firefox-80.0.1.source.tar.xz 334690792 BLAKE2B 47c8cdb2c8c0088b5dc8abbdfba8be685dfdd4d079b155aebb1431a5f8b448b94d90e188d08426053be961f228d3b4e7852626f502397099e99e4a897e7dadfa SHA512 97a54e5f0ff0e34d0994b9ea67250fda1e9a51acb1129a5f6ce632ca5d15132ae4e5eb18c1a9a609a14f5012daf87c6e1a5049e096dd1c32cac9e2c981381d10
 DIST firefox-80.0.source.tar.xz 335316448 BLAKE2B 3099426b27cd3c89b63be7d796c8c5a87d0ee9bd8252e5bde23ed3a61f71d611e7427ffee506224e81a88ef109eefe944f2cf3367bd636a6ed46b7351d0a4b1b SHA512 6cfba55615d032e77f973ffdb1d4bb27c3c00d1ef642521284afa3e01a1bd29c6db963181e9ebefb0a44e49b96c3f93e57ce49541eae7e5a54d3360ffa81c1f3
+DIST firefox-81-patches-01.tar.xz 27212 BLAKE2B ef544bf38ae2dcb3a385d68f6ecea016a4d0677af895fad8be2ab07a2dab313d953b764fd0390844444f743ae1a2f67fa6f3b67795b72823d9eb47f4ae10cc33 SHA512 88d0ca8f29574ac45afce3be4a59a9816b3761eb5e1741770927c26c4d4afae669ba8632bbef78479cb7ec892e581ef06e2a5da7c2e106a676dce886d2a14ebc
+DIST firefox-81.0-ach.xpi 458704 BLAKE2B 806ed3112f9be7a2609485ae11d71ff573f1ca9b750d0f7d18b8390e273b5a63b6508d7292d665166ec163717c1a2dcbd45103617a2e03d276760dcb17ce09b2 SHA512 18d79ecc95b068b0e23fd58809187eda0732d53c7ae8d5907389cbd45ad88b4ce8213832ac2a7e83eeae1cb0af3c17f9b785ff7f6f2caad66eded80128b22fbe
+DIST firefox-81.0-af.xpi 429003 BLAKE2B 44cd83009fa2c45786fcd4164629a2711ea9ca6b44118c119bddbe6ad0ce5336322bf7cd09dd6544e1e2a687b08f7fd977cb76c0ec25dd7d05b4552f52c9b0d2 SHA512 2dff6d871b63b3cec5512ecbda83e8287974b5a926b5029ebe0279d7d3a7e80db3d8d934d533c4daa67d9c16f2f8fcdaad17795126e9004bd4b626c26b2ddeff
+DIST firefox-81.0-an.xpi 506884 BLAKE2B 167e3ae966f2578a87b8d1cf7e6481843d0cfd737ab359f3c377b23119afddc1843f97cb444dc5683002bdb03a1df6598c30eaf84f20a64014fbc6a8146ac853 SHA512 afc5994c70d8321a1f537f1782b04b086f15713ea8e363751cf227db9f7436125cd6442d59acc3fccdd3d638ee592cc15b16c8126e299cb75d8d0d4fc1cf983b
+DIST firefox-81.0-ar.xpi 548495 BLAKE2B 69352b01f4cdaa0e7c8d316429df4fc745161fbe475cb535c422ce5add9b6ecaf9a015ad14122ec4ef96969afb9ffdca48f9db6b45097893ec6e96e70e726747 SHA512 f63fd9b814d423bc36f75460b6ba13eb0b3a9607e18df8ad3a59179c62590d361305097469cd252edba38d0869faad0e3823697d0f832d9340b0383cba359d0d
+DIST firefox-81.0-ast.xpi 457245 BLAKE2B 9480b71ba35f3f442ac4436f6ad85fe35e2575752ede185f0a1c6ad52387a4099de74348f603c1ffa9bb61a7d4abd1d71ef316643da84ceb39ed7fc751f852e4 SHA512 ca64933d93028c0a593329896747fd29de808928de22f1dec4fb8140d920b47f463be6ceda13cf927b1cabb73fbfc2b62135a7606912a5a0c5b202fe4a1b282e
+DIST firefox-81.0-az.xpi 492768 BLAKE2B da096633f563bff9b56dd9cab81bd1ac5cd2335e7d7d105bc91725f1f3924d4414c5b2591e4d2d38786e55ebbe1e60e794f6ce240c5d21db6b98fe406931f6bf SHA512 ba9378d50c929813b29f627f42ffc3a5744d74e00f7330fb277af8bf0dea8936f252d8a789416119c79d9bd0332fbb9baa74067743175f7f0af4a55c28a27bfc
+DIST firefox-81.0-be.xpi 593036 BLAKE2B 51e00ad4d93645903b4d0582161c6fd0fff1bf4a4eb15772c4d7b6517259946435924cf1a2b7fc8bb90663390eeaa45eed9eb7a3e6fd3e4d67c9b43151d7aec4 SHA512 13551dcb43033a03fc84b335302d55ac3d06267642b8231a2d3022371fc75229fe609cf5b6319891f928bb0399fa7475f5c80b14030ec0c5a6485d5c8b8a57ac
+DIST firefox-81.0-bg.xpi 554712 BLAKE2B 6cb68b15b32b99c8a30a92413257200331e5755305c92de4360dc9d3413eb9b47c8fef9c587d0f9d015615ab92d92827ac5db512f376de66e5613200b6dda42b SHA512 f9ba97ff33012f0ccebfb081de7e8b9579128e94bf30715eab719ca3a8eb98ab3ae7cc4e6075f1f983ee1d10bebf360857cd144e504ab4a7359817632427397c
+DIST firefox-81.0-bn.xpi 572613 BLAKE2B 1f2cbfcd629f83d2c4f30495743e825c89adbd0764176d0a340c021bfee1f5f8ab6cfeb13a633a1183d8372627494835075d06d0db5f1440270f7d9ad8e0914d SHA512 54e164daf50da9f6757907826d5592d0fb8e38a97c3434b0394deb5d48911eeb6ac1766a902caf2e8411476f977c2f1c988206d8bd1a96d76e66627279d01594
+DIST firefox-81.0-br.xpi 506640 BLAKE2B 4cc1c0ee08d1ac31aba0d8cdb2660213530badf2c22e9667d98dea36ddfbd7afddb28c2537f7cb8d6b6829fb1c8c206e27252d513c6970f3364d87ca97629620 SHA512 367063b2e7cefade02fbd9d4968bc35325fb2bf6a15e6baf20eed1d0904b996daf5b185ae65154ef057317ab2ac60fa7db5b2b5dbeb9e5cc05f7189e1a69bc4d
+DIST firefox-81.0-bs.xpi 465218 BLAKE2B 9a6f98e1a3945d877d40524aa568ba172d8a7be09e3676a2bbdb17127dbffff941825da2d98765bbcd0708089863dc8ea99222817e6059fe31948ed1da9df9f2 SHA512 c5783580fd5c9bd3551170d33a6f9ef913159e596d2d1649528e9cf0697f26778d6a0e39c4fb8ddf9d6b2b39c44684df2232246eaaf0d0ab06bb2fd4695ee979
+DIST firefox-81.0-ca-valencia.xpi 517385 BLAKE2B 8bd7602e13de803e753cc8315d4e66f5e756df8d3f9ba72d62b785bcf0de2e7afda5f409de7562af834cd8bc3619244fde47cebf030bf60199314cc41eaa73a3 SHA512 2444a67009bf9da3b7794108586b239ae4b0a7d3bf8e369167c7679520309e8439f6c8aae1b10c7d2e29b374edbb824413fa354bd7e5477895e088050a22b61c
+DIST firefox-81.0-ca.xpi 513594 BLAKE2B a858ba8da67c2cf909b3d48a6eafa75e11cf5a294c73c539c4582fe8c9dd98e88ddc0aa0191ee080ef3db7bd0c358fcefd9156e66e4f0b0d28786f7a4f47ea31 SHA512 7749126c219f7477a6dd664cbf25ea72c7faf6d160d505d6fcd249abf23cf6c6b29e3d01dd9d85d3a04631bc16da1250038783e86477e2da76c6e218cf91fd0b
+DIST firefox-81.0-cak.xpi 541580 BLAKE2B 38e73011724057ce0db3dcb98b2a4436ffce7204dd664eab91770ba0aa1c4653f0569473ebca8becfed5748393e0803b401f0807933ae3532255bc64ab2c0bcc SHA512 c360a54f0270005050a85e59a2fd4fee004059d5195071c0ed19f4e25e80a51f8f20d77c20a128e3bc201b879afba53ec059d71b0cad95c5e609a00ba19ad8fb
+DIST firefox-81.0-cs.xpi 539047 BLAKE2B 03d0caa3f69f7224aad7e74ec055565f3a67542600090313c9a9ba0ccce693508a36f79cad9ada9ff80bf1f395ba0ea43b44c9130beaa71ae82708f733caf1eb SHA512 870be6a294bb3c91d59c873b62546ec18e385bbca8cab5536eef9529f40041bd9acc006674aaa6340b33b928ecca3df9b3b58142f17070f3afabc8108f90ad94
+DIST firefox-81.0-cy.xpi 520840 BLAKE2B f9f5f1b25f090d9acd4c29a654b32efb92ad22210362632e0f4472f983449fae6ee05c014231d05286cac3585d87ceced8469e3df1bf1acc82923819d265cf5c SHA512 6cc6497bc20d3dbb887b183180cb3a00c6787d64568a4ba22cfdf5f29b411970e41e11cdaedd9e220f53643177d0df23a425e519ba6666b452b62e6155596ae1
+DIST firefox-81.0-da.xpi 514311 BLAKE2B 6d575bce8d5a8c98a973dd1fbc413dae0b4c53524ac465c207a13115b4330697f80d936b9f53a42e94d6fa63912f8da58f929f7fb7ca0a74c52560fd69c2ba78 SHA512 00ca3b0dc3b6ca13053cd40ae1c87113deaa8e790b2601c2090e812cc9895818fec8c8559869eef0b807ef54abb944b58ae62666d307032f63e34eecf909b476
+DIST firefox-81.0-de.xpi 533118 BLAKE2B 4cfee5ccb6aea63a373554c4003e4ef64314c571793b7f3f7b1b6c2774a687d33265bc81e10119fad9a9d26dc598b72ac3043b4d409b910f9011cf05c9c584f6 SHA512 2503d3ae4c1f993f0b713d6704b5c6bb80626e8d7e50aab73c1cf1bc981b358720cbef8de7fbc08011b622c501e06d4c21207355872e31e266cab8bc7d98df8b
+DIST firefox-81.0-dsb.xpi 544433 BLAKE2B e331d26aaee701a5524b9c7ec1ad38e6417ac704ac91d809ea5ea0c0d0096800d36ada0dfca0205a8e9f20b35d1d9b2aaf2444ec814a3ffc427a0507d2a83a27 SHA512 2161139c1b3cdf4b15daefa4baa414863c2d33a4af9db44b6f0d4d3c479d22e45cd111aa05cfe94a1bd473471995a08f6db11b140c8aa731c642102ca0dc1f8e
+DIST firefox-81.0-el.xpi 614642 BLAKE2B e416dc9eae09e784acd1f68a993946a6fbce1e0d0bd0198b81ba8e067ca7597dee359c23f122602f5287e53c2a5ee6b4c581be2ff951a8badf699393085a24dd SHA512 69c580ecb279718263236274ebb0b6cd298205d6c7635b9511d2f61d1c64e1533d9d23d33504863121ad1d35cb55d595ad62fe711534a92ebf47ae654427f414
+DIST firefox-81.0-en-CA.xpi 491834 BLAKE2B 2aaf5825e517aeb1058d835adac0302d69a50764d643d753cf0a3fb89ea438495ec895adeb6933d18bb8ef5c6f6f88e60949a3719ab23cd59fda2310c0a98d5b SHA512 a6ff72bb1657ca37e0022c8bac1de3e86e93fb979ad96cbba4807788cf6c7a8548260fe1648b864ce1f7fe138282fa4429ce9363c4c8c2a6b06656e6b1a26519
+DIST firefox-81.0-en-GB.xpi 491773 BLAKE2B cac0e100166c444665acc16923d62488768acd3688b77e854400ba3b88d140386f57070018f3d04749f0f7cba4d4a514d4a410961cde89bc6745aa458581f25b SHA512 9079fa91b93245875bc9061afdcff305e9e7f36d84799eff11da7b081d3397bb685a2291a281443c592eb271bd5668c8b667e91b6fa2762fc195659f2e202a6f
+DIST firefox-81.0-eo.xpi 516394 BLAKE2B 333d1d10c215256cc1815be6619853809e7030654c1e84503a1573ef15c2c75892e701202bf849dea6b7ea20bd6a173cc3a4946d8cb147b6b56f9179589e146a SHA512 47bf9aff7552e18b30acc02aae7d2350ec6045813befb8cc6fda9cc57a9e5c7deed27d239ebe71bf040a11e2b24990fd3ddaa71ec4f101f8fac86952005b99a0
+DIST firefox-81.0-es-AR.xpi 525968 BLAKE2B 7de7c7071b749da2095c6b26ae2c5829847facd8e6ee612b36dd4b1a19131ae1e0bf4d38515d013e1c8f52ecc1228dd8d9fa95bbb388455da1a7c375b01fa945 SHA512 a2e00d9a3a82eee47b0dd6987c679ad1cf44eb598f3315e861523e46c6736bb4d103f6cb28c73e389f0eebf6ebba181d86750b4b94d7f205f117edd2e336292e
+DIST firefox-81.0-es-CL.xpi 525524 BLAKE2B a0a202a4e1539f58fb1ee801a9731e447a337c596e377f349db313622f7e074b54133eece4f48649b802b41b15d654181e7c2e14d67f4cd92b28394a766eef08 SHA512 3272f30e59dfc31f107b9e9e37cca6da47b58665ab20005ba0867cb95ef49d946ac5a992d95f131fcb8667dbe41b42e325a1a49b29f146e2e259ab34a3ad1b86
+DIST firefox-81.0-es-ES.xpi 515141 BLAKE2B a9be452d2c578bec7af8f67afabb4311edfe0be0f8573a6475be97f3c61fbd1a3ce06658fba3a4c9750c4dd4f6b89e482c5282f29ef782409cca318bfb8caad3 SHA512 7222a41b78b520679b8efa782a58f166e02699e68bf77821a29f87531faf07f607be9652687c336472f7350a815957817c94a8f8bcecb03a7df3ec0aa07e3245
+DIST firefox-81.0-es-MX.xpi 529399 BLAKE2B dcd77958ba4cfa76279072901f8f262e3685e9d64e820a8c4f8f179bd6e8684ddcfb536afbfba47d578e7cd4af3454576d166c2717071a01b21ea6b3371c2f2d SHA512 f82a596fa8ad0e2ddf3c5c3eff730f9d4a77a6baf119e455a0b986acaba6c0c4e3077046a384d8f1ca2bbafd3ea6fe7be922273398f124665c087a05855e47fc
+DIST firefox-81.0-et.xpi 486335 BLAKE2B 261fbe37e9eab5878cde1e4cc124b451f3d3367ae242d7b957380f6b806827053d378309a6db010adeff180e8d636f397891761b1052c3832ff782992b368f51 SHA512 118f04947594983d703b0253b8877b06c418ead9355db5306645bf5ab6971d66644302bc406c928c6ff347c888290701891bb4646da75a57642d61b96e4c7cdc
+DIST firefox-81.0-eu.xpi 505704 BLAKE2B c4a8cd5e10dee932705b30a425f1a8077f72916cea76d8b4ef68c11b1633c850f1e6352f2eed4b48def32dd1bc7809fd9ba3432edb1d5c8a8af1c2064dbb138e SHA512 6df46f81c21d515cde9987b1729bd3404c327d9c60ceacca9bf44d069037a435831977a809aed370b3593ae65e9079d797f34375f933806c727df31bd47b7cab
+DIST firefox-81.0-fa.xpi 539089 BLAKE2B a6719c8179f4c38b8f6a5d81649ea44718902dbc3133e97936f863dda2478d3bf1a8d9f65a69f7cb92eef109deaf973b3675c204eeab114da7bbe91a159dd6db SHA512 6dcc1395232476ff75bf9fd6cf9c9b3c5c424b68080fea2b0c0df9c3efcafb9d7e22798c9c72fa2a6fbfd129fa05d1265ef89355c28555592a8e89a7602d72ee
+DIST firefox-81.0-ff.xpi 482668 BLAKE2B 561ace8e6643f19b260324aaafbb4d5482ba16f0ea2a18a82f376d4abd5dcc9341e88133e4435b3f26bd3b5ccc1f9f9d4d52b24f1d96624e764aead5d352325e SHA512 aa6bf84cf802dfbe29eca62e7aaa5f7011027d04cc7913f227aaec5af27f8489ce437928b2b8ebf5892858de6acfe3f2c178014bdd6840cba26b31b27cc0cad1
+DIST firefox-81.0-fi.xpi 512540 BLAKE2B 1a34fe6e5de10e78ab05904844350e1cd748359726a978dc6bf4d1d7bb47f06a74ada06c0a937fe36ae96426a840e74203fa809978b564b71ed620c25b7ff27c SHA512 d33f3c17300e9612d77097d8760bb4ff783db4f36ac201dec74c4139ba72a48c1fb6126baf420233adba2f1ca0abe53e47345ae553d2224783ea96f665e4f1c5
+DIST firefox-81.0-fr.xpi 536852 BLAKE2B a7fc453a1897755130eb7a4d89231a3136fd3ece0e75e207a9d6bc79e2d49114488e02eb4cd264df8d8b56887182fd94065d327491f6cf1ec10c92d63a9e837d SHA512 24be5505b1307d3f4969fb22ca6a3b6c7e6f87692ce342f9d4a40c895cd3eceb714934f87b9cd1d17c6a0f729185fb5d54f2d68a9146ebd653ecdb39e50065c2
+DIST firefox-81.0-fy-NL.xpi 522614 BLAKE2B d1b0b6e9148faa49503829890056e1e0d39ef3d5dc1b5fca088e8677cf69fbaffe4731b6613136dc0cdf8cd6e6130338c295ab263a19fdbdbbe2b6c1c27f1655 SHA512 27effd197340bb4e15c708db7bf85f283b25e0bc50d1e52ba222ea99154946137d4d599f368112e6c3533ca4c8ce2f99a17b2443567c243b1fb3d1f8e8b5455a
+DIST firefox-81.0-ga-IE.xpi 467820 BLAKE2B c9706f571ba7a3e6eafb74591727dd473e0fe7e2f4caa900869b80f8924b0078a9e38c87409697461015518e7fc6977f35465a1254c09505f87685f37fdf2fcc SHA512 a55090c0818c6a42d5edb30da8d83ebb9afe8c0bf1e84831fa273230b1992d24795f3087eda237f1a50b8002ff4643b6ee13b82c8444464808a2a708092822a5
+DIST firefox-81.0-gd.xpi 492742 BLAKE2B 66fc41fcd379359a3b3a86618cdd7c0ccfc5c4f22d66abcb6ebe551eee045ec868aec0039fb9be029cd435b79df26f271ca1f8b4228eb2c05f49504468429426 SHA512 0d47a0704920514c1a3df29a220648ada8b288ecc93f18b9912357abf496045dcf361306ac8849a294361004b76810d32eee8a35a632f610b888b2648c407ef5
+DIST firefox-81.0-gl.xpi 521893 BLAKE2B 199af589e26bf62364e4133ada4e9617fa9a9d98c919cae1f0796a2bb40ecfb9ec0bfe22696a6d7dcde722b7f252c9c6856860debcbd13d3b65b316f56c5ffff SHA512 5461bc38d42999754ca0ad1ff0693eabefe2e3ae70fa4b8f35df9e46b730811212d27dab2667e961eb52dcd283abade9187dbbc895dfea1d546978e28163a628
+DIST firefox-81.0-gn.xpi 536982 BLAKE2B ab6b27a5179cf9d9abe43879e223c6a5f4c54e61ae3ae5959dd8c8b5e02e5f037c27b5dad14605a38e301d9b6540209c31b61d522af6e011d4dd30391d349fc4 SHA512 a20607385917f57f8acd6b171e533256f3d4b68ce7e35be1bfeafefda57046a1dcce6775ed3de82639a76d32ca041168497d9c24c9ea7628087f833419267f73
+DIST firefox-81.0-gu-IN.xpi 541542 BLAKE2B 8b76f19251ec340d885e15259b1cec05f94b4883f4d162a88163913d77f6b83764ca54a62bdae113ad840bb3c9ceb33c2fb9f8b5a5a73f9ffecbfd74dd4fdd98 SHA512 7fe2777ebbcb893fba704e7158138e19ee86611937190c1178044b2abfbe6dd5a0e084a516b9649df5af4ba8499095d0fe4f4a6b3435a66d696b4975eb256f0c
+DIST firefox-81.0-he.xpi 537117 BLAKE2B 2f2579389602ee1dd29c8cb9b37944fd54dfc4d03c4e7ac1da869733e1bbf9032c85163672db9b1cde947884eb8b81aa50a16b2cb01bf550b504f216a0e97104 SHA512 39d204ce15139ef628d6c4862ff25a447bd483195cbc1c4095d28c1f0870067286c60830819a4eb7919ce8f61bf79dc2ede1b1bec57dbe2fe5a1d020f840d5ac
+DIST firefox-81.0-hi-IN.xpi 566847 BLAKE2B 71412a809c76eeaa3521146d9fc6675a0a473ea74cdf13028264f58851e756ec62d4e7bff2236dea4bc27523850cf851dba48e1d2e7c3e72930ea1fb9d156ca8 SHA512 8153617e82c0c52b480fe7eab1b960f4be07cab61c733a60ed3c83ce451ca5475d909c4873eb001ae5e2b7a2f774a199a87bd608f24471c7551a7e0493989336
+DIST firefox-81.0-hr.xpi 516911 BLAKE2B bdfa100f307149e0b0dc947354cdf98c3f56842ccc51453d12716e8fff242cfcbb6888975945813200a2b6ee24cbbbb1e55298284696a6dc631a52af0460331a SHA512 35270b8c2094ade5e59efeacafa55e2db6dd0228e127693afd6d9e5ee91b1979aa036aa03f52f4835b0c04a624a4ff68e55fdc549b7875085f87b57cb3a03494
+DIST firefox-81.0-hsb.xpi 540879 BLAKE2B 6a783ed4497da040ad7f22342d9402900852e7f67de2ed21ee3f347aa2960767cdc65fab6f3ad90114f55ec917df58d8787f1462c87f1196d4c17179eeac8727 SHA512 0d49f3577b80b7604418f9113e745c6885ee2638cc27f3d001aa828a093b168155c5593fbdb1e42460e945a5ad7b1d0183c921d4bc90e0ed5466b7702ce88e7d
+DIST firefox-81.0-hu.xpi 544584 BLAKE2B e6c95b54c04c5ac55b2042bb916da91c925100be5498448ee003c27f9bb84ab105f4416e9c1632a3b657078948786eaf258c4d0aadd1ef7508373e9b9a41b20d SHA512 0884a37e51216c232a81b1606600053bf5a70775e3e2e7f1333570c419edeca8f50a94bea3971354b9b049015349f1552be84aa04d9cd095715de8a08259e27c
+DIST firefox-81.0-hy-AM.xpi 588074 BLAKE2B 25f8cfac7b21759fb8abd3db5315b6af108599cddea06df3d359389e87a9530913c194d656088921a4db377cb021e3887eab4b4615882932075dd4f244e64166 SHA512 747d0cbd608e40540cce31be2111569f6b2440403d4cd44f28725a8fff32779cf08a28917a0a14fd59645c7cec38c35faccedb0ed6bbd3e3f26ec4a83a73a9bb
+DIST firefox-81.0-ia.xpi 512457 BLAKE2B d6923f2226193e19b1023cf9a51b836c2b8b052609c8446fe784c47799e24fbe6d61c3ce2642bbc5ecbfba7bda942c88be9c690507e492626b791d89e1d0e2b8 SHA512 7b1a7663c4106024c04f21d7bd37b048d50ad3b68283b6ff3274ab9e86361bc27b397d5f3f222f5fbea9d32e79fdc57263cae92135b044dda8d06a3cd9edc2d2
+DIST firefox-81.0-id.xpi 506711 BLAKE2B 4e1ef6fa480d3fe8247be522a579375a342a18dc0a411f869416ccd8cfd9f9803bcf195d0df83ebddad998cda2812223e5446bd64b0de812e3c6472278e78c86 SHA512 6bce11838a3d316a70482192f18c4c2351d58bf8fc91fe92c902681a9e0bd4e14249b05b7cc933e3ba04cac2e604944d7616009829c477b5a920767de3fbdb04
+DIST firefox-81.0-is.xpi 478160 BLAKE2B 38b83b2fe68dbe0f9ce9c29b85ff753c237cd87bdb2207d5e0de5389a16efb7e86fd6b59b27218d0c7bffe7881fe9a3989d8dffe8f6749bf6cd737ea98adcdfc SHA512 6bcd23760e7a593c2900914555f7f236a72c9fe8a82485f4d1a2eee1921a7c71a476ae224e68fcb9e814c427c01aaa263e230346b3c85dcf7efac7f2dadef0fc
+DIST firefox-81.0-it.xpi 441428 BLAKE2B cdcdeeef443e8ca3d3887bc683940eb2b1468ae8c26c945342fc34b2071d1499d0bf3efd358c356fbad33e5d1ed80d0f58d64a2087d6457a83dca896384c1c40 SHA512 39ce365c0ecf0f7e65d00b891c2d9fd8ce91b967eab2fc2d192ab05d0c91e32671c45c2111c49cffb470d368c28e016fdd1fd1944d567363b7f759443ced0967
+DIST firefox-81.0-ja.xpi 570539 BLAKE2B 766f8bd2253ec2c7a1e5bfad7d1b0b52218f919ddf2f4eb04dc520cb880bffcd4e32b09bf9402c04bc8bf3c786ad5858b85b683c0b39fe2a9aaefc5293da20d0 SHA512 66dad15c5096dd312a7a56117692e7aa4e626f5610ab3f2b76bbae58eedcffea88ba81ae4da1f78b2501eb936b7f1f775a874d4956fb3910e814d6942d3f8b37
+DIST firefox-81.0-ka.xpi 570426 BLAKE2B 4ab8dc1c5aba4fe7f061760cf16051e5c8ab31787c69a183b82d89fe810344aa31556eee7f31e16ce0ff6d3ccec755efb4f0e313b2bdc3821763466f0eb1745a SHA512 7d68e13ccd2352d51346903208d6dc9f6b2cfe23a1be1368efeadd944d2f5144c4694ef7ccb4499f9a1dfdda2e312a014f28f33ddce5e1afcc549263ad9180fd
+DIST firefox-81.0-kab.xpi 530543 BLAKE2B 2d94dece2b7e3297d0d7ce582fe9f33adc1c14eae770e0bb48a3ee024765c82867665faf0bc83ee0f93e6e4884155ad808adf50922e710b5c73300c51f73e831 SHA512 ff6f99ba240a0acb37b340b636c621cb64fe94fe33447353490d3e2846256fda838946a3afb210ad95ef960a8f2f6632e29cba1ca2934c1f19cb797b258df579
+DIST firefox-81.0-kk.xpi 588942 BLAKE2B ee7a04ee68865b1b633f790ff6b49e823307b996c1910e0278237e1ced3347021f6909fe6eadd2faeb67550b540c7c1c4983666cc112a8ae882519c7fdf545b0 SHA512 cad3858429dcd83c3162a9d254f766cef28effc73bb11b7890814536af7de34d9c5ec52b2758db6b4f5e8d19632c3877cbc734edb93305aa581e293134d8eef0
+DIST firefox-81.0-km.xpi 525938 BLAKE2B da56471f90e51ef3aac16e1752cb115a741adf7606ef142944374418bd9bc630a6e78df3e070225ffa0549e4326a2ea3a53b561fcdfe6d6a72bcc6df6b9c9474 SHA512 384c753a16cf40c05da62fbbc757ab3f3cf81c3b3631475cf453bc53905802a9d8fa3f5f732946aa7e70636b0f078b6133921bfd2a5361678517fc209c65c5ba
+DIST firefox-81.0-kn.xpi 506715 BLAKE2B c443f896ce7b599928827dd18283a898797c602d6538624714206bf82454f8923b2126f4ecc03c9f1df55cd6f7f471d49d5807ab0988fbbcb801230272b27d42 SHA512 ae53945e102925c836b4225f34cd022e6fd52569e129040c00b822d8028764fb61d6f5a06434a58eb0b889d69eeb30c1141bd4d813b8ccaa505b4e13f8631a58
+DIST firefox-81.0-ko.xpi 556928 BLAKE2B 48555bf5e2972ad94b357682dd588ab155c4a477f18a5e76f28158002b42788925cd215e02cadb6ba0288f12ff54372e11199704999511c289f5e60ccfc21950 SHA512 d4eb712c8115b56f5aec04bdac459c23858b9c267a4d04e92e0ee040a66e870334287590a2ed616f3f29c5496332b32881f5a2e2bc9c87da8d28e16519d97411
+DIST firefox-81.0-lij.xpi 476223 BLAKE2B e3ee3b79a0613ffd7a5411002f3f145c27a1c6cac153c092450e05f108dc92f83b92fea5c36ab1ea445972d3293682de763c51ae3b1f227741b28fbccd89c18a SHA512 c91e79d97a0de761a0f7389bcd7be4ceda5cf999c6f57f9a0d3191697762f46afe70ebc0336fa41cf1263847f349e935941b3fe7aae89901c5d9bc33d3ba28ab
+DIST firefox-81.0-lt.xpi 536127 BLAKE2B 50241669fb41b3500ef44021b78c54797ac89be582200cf672ae648bf4cfa8edf253389cc1aafb3c3d0b8699e228aedd93a3907a173f855599f1eb88c55515b8 SHA512 31f0f0eab6f2ce161b164f78e21fca275b0675901dc7112440588d3283da7fbac145e1bfb844e660020f153df87f8cc63e12101164defc4760b6c6138de86b71
+DIST firefox-81.0-lv.xpi 468497 BLAKE2B 96c659bce6ba05a41bb508d918714c4ef4b5157cd22f646a2910fa7ba44d32496b8dc58478a9800fc4f5dba4fd4598d1bbaea859e2ee4a285148825ee0617670 SHA512 5a06107b92f21ec42d5e6230152935ede3030f8b4af446c0e6f7dea35e2c231015d9b49880e93bf74e5a0b3385aae3a1c2f4b11c9ce88bf60d97b9dd64e678fe
+DIST firefox-81.0-mk.xpi 459792 BLAKE2B e4c4e9961b32df90cf4aaa104c87238af3c301b173b8c917de4b319d53e92456c2996e75f851217fd55e567fb2add91eba98c30d5edd174e83100c599317116e SHA512 637ac3d4da9a568bff2d2fde9ac5dec7eaf6fe515ebfd1df0b7f199f2a33d4ebc237dbac61cdce0d7717b10fcb0261c9f597285c1f85927dcb3a20cbfbbba18d
+DIST firefox-81.0-mr.xpi 541691 BLAKE2B cce6dc7d1dfcdd294452643ec9a010dc05dff90a6def78458aade14371270937c0a39fbceb2933dce9c662df0ab9b3071709b4c93c5350eca098d35e9fae8f73 SHA512 9e1e7d76d70749ca586b3d3299cade35fab2b9de1e18393c831eda62a8ea45e027f781be5bbf94637830addc5b6a78005ca6c15c8b6fc6f452dbfcc8de4ca45e
+DIST firefox-81.0-ms.xpi 454299 BLAKE2B 663010cfae9bfa94ae9b91659a7ded5aa3b6339cf6f956c9e0c9ea96f48c476a73e981efeeb5f71d9984f7c2ad8c50414901a855d8acfce1f8299d3cc8685799 SHA512 72e24a5a203d7620de662c21af7dccc109f3748c73185c180dddf9f431936396c0423ad1679623f093b4ea55809c0ccd001bc6151b210726f3d335303962b1bf
+DIST firefox-81.0-my.xpi 526286 BLAKE2B 9d23ac22b770cabf3db3743f820f3200557b61258713c3065000a01c13e1ffbaa334295af0ca35c0c562abeb3fe7e8297a1d64429d39a5ede9ad40a79cd59ac6 SHA512 1bcf447dcf40ca96d5200a9d846f0e431346f8c68b952e0591c8736d7477362b8b002f1bcc38a89b0739cbfabb9fd04b6ef916c6baa2c552a381dc6fd7101b08
+DIST firefox-81.0-nb-NO.xpi 509492 BLAKE2B 14698e6416578a07de2a235cd062da2c177fd02fd5f2805e8eac1af4e5ead6ff150e5a14fe47fc7014df517579b4b66c9f585fe52027e9494c246c2ee11a1f20 SHA512 1f52bf8319e4de2c9929e114a823b2e5544cab4bcf1825d990311785fad7e1971591eda535b7e62a9d3d1666944b4c4ecd4327611f2aa1d4bfc8ffb6f23972ec
+DIST firefox-81.0-ne-NP.xpi 483415 BLAKE2B 54868771ecfb6dfbb8c0e2be87416313720e9ed1fc71117b1aa2c466f71995808b10261b33d2617e6ded52d1f7a5f6c92806a2207dd30f79833c3f7563419ae5 SHA512 ab841041f94cd69249d7824357afa1caf9e76bd820970ab7370558383dceba0190a5f712724bfc5f607ede745dacbda978617ad1a7ddd26df18f49dee552506f
+DIST firefox-81.0-nl.xpi 516617 BLAKE2B 2af159b38ed3af5823f5b98c093e2940697d9058604330d3da9a80648b5e3cb0d9010add7209babce3e5677882391d3b7d23e636cf795500ee6a67593228d203 SHA512 fe20d4b07dd48c839884be85658c9f34cc835b0d7f34b43cf642a7a84e92bf67ea25f6b5f2ff9f3193ac1a0cb9d5864b38362830af95f9aa48975cb185b3b86e
+DIST firefox-81.0-nn-NO.xpi 511954 BLAKE2B 533541ca79d6d5c6a2c3fa1fc3eb5235e6d1596a9a05d98ddbf092e5f755e38eb5c9bf7190c03c20753688954475ac77f3d39a924a1103de79e113e5a244d7ee SHA512 ade0afe3d99627b48094f0bfacf7a904be1bbb8642b9f4b28e3ac08e722b0bdb49fcee5e0a5f3beef911ce94957753e61d54cd4ff09e4ee49395939bb8463b0e
+DIST firefox-81.0-oc.xpi 529760 BLAKE2B ea13cc628f4b80535c54265f6d4f4d1e87396153fe62746d11516406159f7475984811077473923b86521cc48c6664c73c55af5680037d8cdecdd8ae6dae2b80 SHA512 276fd3e1004393bd112e697ee30b288b99c537dc431f2ad387c1534785ae77dadd20e0e7c48d899b741a8c6c786939ad631883c98020113384b32899ade39853
+DIST firefox-81.0-pa-IN.xpi 569877 BLAKE2B 00c589324f687483332c99ad2f840d26dbbce8b1ca12bc7ffe910ba80c294bbe864457ce944df7262a8cdba5bc16857a4ab1be72b0ff12bdbf34c584d270c0f2 SHA512 37d540ede741b43bbd55b8d97ed7eb5d5ccd812f03bedc3c5feb747b8bad5514b3c196f2cb0509af0de8ae5c27b8a53a44a7a88295ab98d6fadf6a316cebb011
+DIST firefox-81.0-pl.xpi 535548 BLAKE2B 252c793aa0654bedd1c74bf9e464b47b04705b45bfdd7031a1e0e5dcb96a91856ab9c0c5a7875e7aaa3302f93c12bf67a079b7ac4a8d11d9aeb746ff2a80ecc7 SHA512 0830d3532ba8a6a715f27300fc41f1b67d24e7d9bbc037b943efedbb6c759f1a83e04484c81bcc355bd2e4c82e64f0dda30bab68d36b5c8ca4325b061c2558a9
+DIST firefox-81.0-pt-BR.xpi 517605 BLAKE2B 62ea9479302f052015ae58bea0772997b687881f0ed141c2d29b85593ed1362fd88bb4ceaee4ec274fd5b796ada8ef7ed0f69a82e7a6dd06abb4558873534e81 SHA512 cd959c9c30c706bae5137cc5502b6db3a33e2d55c35ad0084822ce5a2f9afac8fb46f6d57a6f4422e3157e051b3942b258d5fad6032bb8f584a03eb43972387a
+DIST firefox-81.0-pt-PT.xpi 525638 BLAKE2B 19cf0bcf651d11794845f47ff160698a872104a41d86dc4b24057fa94f815b5411f281660651a3112d047fe2e705d6a98788aabbabca8c80eb616fb7a71e824e SHA512 97d7ffcd9287bd0f1be76c25923e3ea8c4dce31285a0f3263893c0c15942c3e14bf705476a7f90d6d72169f66db46286316f149d525f69d132385f86d15d467c
+DIST firefox-81.0-rm.xpi 514445 BLAKE2B f9828453f34b7b8f7906fb805cbb01391187c8f7f8c1413219aaf301ca667267e8805fcbcdf0eb75b44ba3f6826d9560eed0bf661977293d0fccc43eb88407bd SHA512 5009869c9ba5782ee4a3df510460f16ad281ae053b0c4eb2f47162c3239d4708f736b6f1972d003d11590fc26db7dc91a5b0f447855cdef7a56e710e197cbf48
+DIST firefox-81.0-ro.xpi 532731 BLAKE2B b261f1a6dcca659d236de01236a77d59ea0ac847a99ca58aca6ff247d28ca53bbbb929892cae9b0acb96f0fa18df61ab9c43e5846a8be18dbd082a58216f1dfd SHA512 9e29b641d3dc8f05055e56eff32f5552168c13e42a8f4a7aad119247ece2ae254eefe38c3e07359103b4b8188a4cab36a9a0111cbb2362b2ccefd3058537bf60
+DIST firefox-81.0-ru.xpi 603105 BLAKE2B fa67f816b4c2bd8952576cb61a622e788037abf986f0a5fdeb1723fb841893d939e03aba289f9f5e8a634184e9ba48413ad8a4668323f2ceb106b77e82370526 SHA512 718e6c8e4c7f095dd222e1611aab48ea443a9846753c42feeb57b90371be2c3ab8a2412c6b3c3551b26e8dfc9002791915c095c0e47cdca41f0405ed495cc570
+DIST firefox-81.0-si.xpi 492872 BLAKE2B c13d863caa672f3b40323d9907516424dd4f5cdacea424e22a232f60f79dcfaa46b41cf7ea9f874ceec763f202e0557f6e37b7e183d2e0bc3785b668fa3f3063 SHA512 823637a18d85afc93586c905ceea14519aa0aecad3f62f87266b358f13465b4eecc3576c85a366458748782675a72afeb93416804441ebaf5ee187f02b08a3a3
+DIST firefox-81.0-sk.xpi 533661 BLAKE2B 5f4028d1ea21aaebde31ad1be37f95729a31ff6728ee3edf55b22e3c4aa775b73845853c95996749eaf6b6e4e144401313f069a222979283ef39efaa88c8655c SHA512 00b081a993d6c8234e5e99a0fcc1e9db78df93e73d83f94c351b7e4445cbcbfdb1cf8a0fff9f8843dbf3ffce2b025b8b23244da7e1a4042e0da6aaba07e2cadd
+DIST firefox-81.0-sl.xpi 517954 BLAKE2B 544e8d79558223861bafa9eae1b4aa2bd22aebd1fb833529ccf453ad964dfd86c9fdcbbdd7abcc0b9192d61ad95104a9d81b4a3011df3885061428321dce96d7 SHA512 4aefeef16449e91a215518edf3ff6d44b228494b43367323f8662b019dae8c962e9c83a15c164027ef3473ddf3293b5db5570ccc5919a3970537c406ac76978d
+DIST firefox-81.0-son.xpi 425678 BLAKE2B 4f9241e9cc5fdf1fab6ca41122712b57e0dd2227d0ddba86976203d4d6cdbb7bc3ae4364d11ef9c1b77f1eb608f4ffff5539d722f1e7b4f08c72ff9ed7cab616 SHA512 b31225cb45c573cb9aada41d3490d55a1dfb9ad5970d1ab02f67819a59c794a0f047dc4b335bb73d3fef3dc255bfd5d6d6a85c0d1dacad7c4ef475610c14b285
+DIST firefox-81.0-sq.xpi 533958 BLAKE2B 80c640a319b7414cd9c750b9ab8ad25f739098c849d1bfd26d364a6c4bc577f9b34f6958c2b8050a84d8f8bbe4e5e922918ac05026f9a6891caf4bfb912849c6 SHA512 a538a061390cb5791c41f1f2d220db10d48069feb4270c192cf99184a854accc2017d4b8c8a33e0a0cd5f980e879aa28e4ffef96bab4314d4d36d1f2c58562db
+DIST firefox-81.0-sr.xpi 561053 BLAKE2B bb1d0795f67b9f50121c857c304ef563a3dcd3f80c50ffea432c10dbcff847e6062cbd8b37b6396b6edfad681e2448ef8984dcf1eb307c4440efdb858e6d55b4 SHA512 6caadeb6c666216186a080b025fd269db88cead2d260ca5e2f38909a9bce229d779d60cb19926c9e1aa7b7ff67d549f1d1a6d81fcc90eadb4a238b2231df891b
+DIST firefox-81.0-sv-SE.xpi 520272 BLAKE2B b763b6cddaa03c8070ec2ac8de319dd29dc62eb9d36c75890c7b8bb6f896f46faef3c1e22d74df381ea98f08559679acf14b6fff8c5b4639b1d949d79e50c650 SHA512 9c09df21cc4e88cf9b894bd251aaef72529fbd6d324b363258dbf5f67d929ce30797083323f8b939a9626ff7f1b5ed401a9f0badde931ee6ea0a59a93625c4d1
+DIST firefox-81.0-ta.xpi 521447 BLAKE2B b4640c16728bb06d66bc4d6e76b7525934633f4a33532ab3583325fa2a80b8ab2d76a2ff03a6577004f12432d59d156b4d5b2f9b919171a18ec87f0dbfcad843 SHA512 4049980ee61db971a6d563e9ed2f8f8a747f7ec932c6755b09557af94bd5e7b91cfd8397a13d3adc58f0c47c4736982e91b29ac549bec73647bd8961c6266081
+DIST firefox-81.0-te.xpi 557700 BLAKE2B d492bc00e431d0c47c06685bfd9b5950da1ec646518eaa27063cb021a008343c12a2e38a4b518729c8844f578063a41f910fe8a7e10cc2acb8b6bbd8092108a0 SHA512 1f38500b68b32f429676d0c8a1d12321738022afeed38b4e9f6be47c1651dc3e32ff24436418ad53bdc6cb4633cdfa63c90b38cf7136c1c0cd0ac92af06a81f4
+DIST firefox-81.0-th.xpi 585292 BLAKE2B 7f69422aff85b3e242af5b448a0f68cb7e8417457a2fb45dfbbaa9796677e86d03af4165cecebd713587b766a3b9b791e7e847c89fc2d2c475baa037de5f1c1d SHA512 1d30ca3e7755b3ec9c12d543a175863762fd17e135653844cf30a878f3f949cb7d26b57e8ea8c3272c3e4b2ca3356412c92e7b2fb8223dbfa10b34f1f12837ec
+DIST firefox-81.0-tl.xpi 505733 BLAKE2B 8492d4b783d69158e914449901fee0350ba7730d6e0d7ba8314bcb14ca7644bf992e8ebd98e83480e3c4cfecf6be274e8bc1b487016ee6056cddc017c2e78705 SHA512 fb7a47d960df8389e958b06f88cfde9d94918852e96b1e306a4ea4b724ad0bd85b4e4fcdfe0b24fb945f621d2e5b0639360277e4a4bbdf107197d317f259cff1
+DIST firefox-81.0-tr.xpi 530257 BLAKE2B bdbf22c16935a7321eba766bb9a44e3cb5abd3aef97fb612df5535bdefa5fd481369f53cb7b9f10d1bd9416084955feddd693b84847f287c87a6dfd2b9f9d0a3 SHA512 bf1b0681fa9df4dba76d3fd0e452c3c1f335d8b664c229b08f053daf77d1f167965f17bd6fb2975beaeb17e5c7683fde0e81294a113206a6a1e0f5e984cd7d22
+DIST firefox-81.0-trs.xpi 500282 BLAKE2B b14cf0974d1a82024916ac8b874a718bb549fc624e27b519e9789ce61076271ea42c449e7d152318a265170694bba19f67e3cc97108ddfdf42e85f8df17be253 SHA512 87425291fb8d0d859bce53c7811e29ba9058222b621d3ccb8771296f25c8fc65f9d6fe2608b625df5188480067f4957c7570430bddda63182a061445222c7825
+DIST firefox-81.0-uk.xpi 597212 BLAKE2B 79215b6d7f718d632a9027ea0559c76fee9a9ddf8b71a9f6c9e7ecaf8ec0421957403ca931274936576cb730b4704415bb325e42baa97afbd59f1d3fad604458 SHA512 0e608c6f19f1ed2900fd8ce2cc99a5c409af5ab2035aecee8f4827371f72472f26c9e2e39311d73e4301656f37ed720f05e42ab66ac0f824039aca83bb8f2c05
+DIST firefox-81.0-ur.xpi 558284 BLAKE2B a1a624f52e1994ad5a4e8e1a5b02cd4d023f1c137e64004c7796756d7decae1cc53136981b84d97a24d63310806c2d7b3fcc020ada4337458b886b9b4e8a2aca SHA512 9c96a33cdd87e74ea5b5a6d05a05d0608f60c4ee53cbd66629030c2d440b7b3e52588a7540adf275340b49e780a7be589d429e85352bfe4fef1d859714606ffa
+DIST firefox-81.0-uz.xpi 478097 BLAKE2B 46e7753fc23b793fb9b036e2c0e35cec81cf8c82c15e5cf067a347bf0e178ab412e4f3a79bf84127ebc75b35d020370f412c0e3b40b33c88902868a364cea758 SHA512 60008664e3f125805b477eb633267c8f9bdc3e93a2cfa68e3a4f1219a3834d791e3822b7b6c73e7628b35352c0539386fde641eb4ce26907a0d41c3bd534df4b
+DIST firefox-81.0-vi.xpi 553760 BLAKE2B 7247d2684658cfdac8023ff53ed0b47d8a32a09143baef36962708ab592dab0600956a689e0a994858bdc77a03563b64c6bcc859f34bcea000037a1fa3f72480 SHA512 a3f03bc4be666bed463592efcf7dcca22a62614f716b03513e8d7641e8d81bb775b26fdec772755819ef461961681f12096d430cf701b467216c01b88c034485
+DIST firefox-81.0-xh.xpi 427846 BLAKE2B 753beea068254a3b528a94c90331fb19f347d552eb09abbdacc4f688b186c76044aa5ccb4dace268794d74e80f7c7e72a3282be5078c6ca8a70aeea1d3ae3e9e SHA512 55d7cddb69a6db09b40e8bc5506db8237a229d7ffc48c589ff99f4adcd648fff8e938cea091a159f6f561916fbb90809a592893a87c23e34dcef0e4d47032426
+DIST firefox-81.0-zh-CN.xpi 554382 BLAKE2B 568ae2cd0ab490b552dc26c60714747c3cff4a572cc81dcb9aa9c026882e20b5a64fd677e3496fbf077d4cca4ab4c2a1c498ed18f776d1b3eefd1381fd37e19b SHA512 436e3ee03d1eee0b0e2a3cb88495148e1efa1d4e8787ac27e1951c9d3cbbc4e1fc8bc3cdefa94db583669c215edf423f398987821d53dee152b9cbe195fdc7ef
+DIST firefox-81.0-zh-TW.xpi 554145 BLAKE2B 718a02b0c906fbcd0fb39141a41e8b0c427b50c120b18a6d496e36f10c3fbc39269f02bcde7218a515298f37494027e1fe6bfcae0344a524a16e948920d5d583 SHA512 31b8f7651b1b575eb231325dfd0223f0c84706cc4d5a60d2c3a65f29ffd36f73fa17ef5821f2928f500076737f72dc0b66c9c1078c19c3aa0a41b3a2a287df1e
+DIST firefox-81.0.source.tar.xz 340347916 BLAKE2B 0546bad15aa89a7e4d2ca0cc000fed2170b9529f8f2cc1c1c4907649ffbcf72e8ee800083b63a767fc07b643cacb298b424ebc1ce827de209f366716e3a5135b SHA512 29e0af4c53a09451c3b8e6850c3f19538530035fb576ebe99b3b3a7ed55c37f51bdf44d6c02704e0cbb05ef4ce8278c9b47877643e64c68cd594d626e5d86e5b
+DIST firefox-esr-78-patches-02.tar.xz 36288 BLAKE2B f177027ea550b4f41616c104865a4d1a99fa0a84ca431176b5191107f23b2fcdd8361ad97493d3182d01dfeb7f2805caf16725b8a81bf1f7847cf400f87018d6 SHA512 7eff0a4f5d2b4abcb0293877b3fe562b5fa2581f46b4905ff8ad839559049e4d903dcca4aad6a7196720cc7b3cd93ae88ca0093da51f70e56609faaadf646c78
 EBUILD firefox-68.12.0.ebuild 28973 BLAKE2B d19e41a8a047426a34573a019744c517716cd30a06a992284d2be2f76433cbdb6e75e1c2a9caa8518efb003c143b6e6afeb22d9089808483285560a074de1e64 SHA512 8a9791f34f548f5d628c00810046a365bf4f8d86a86a9aa2df6fde37d5d7ccf7116a43c80d04478dca23cec8a496cc5059eb36801ad23ed7984234d4eb9f1f6e
+EBUILD firefox-78.3.0.ebuild 28750 BLAKE2B c3ed905f1d71545b50d6cb014127dcd60316a5ab94920f7e647136303c499633da04ab450ba0bc0ba755f9e96ff5dfd2134b5a428324d514c2b339e4ba7b13f3 SHA512 7f5f6f0df28f7e91f449c9595d3f0cdaad4500c5dcf968903230c7a0a445c38c30340be77bcb915c082bdadd1a8f01a3d0f2f73111be4ee79148538037a96a3b
 EBUILD firefox-80.0.1-r1.ebuild 28853 BLAKE2B 63718fa37a658403ac2d7cd25b523ebf3a33d2652761a1beeca02f0a733889d450fcee4aa4455577fd9fe60e04e019dd5ec9c50b6078c1c95d33f7fd81d5b493 SHA512 42326b2e83383aa49dd9d79c1438060a56985adaef65ea2f02a8a14918ca769b3637ea0ad1e4b772baebb6e40fc8397ee177f9d071ebc2af8a8ebe27a616d23d
 EBUILD firefox-80.0.1.ebuild 28853 BLAKE2B 5b48db6f1c2434ce1dd57dc57b79ed18266b74478dcef62fc34ab062ec5e264c07b0fe196549f743691e1a4c05186322f52627331e76ecd232320429a65904a5 SHA512 c8323a71a8cd774f8831c04e65dc648ba15fb90e9cfef69e71a2c05cb90a4b9391d3fdf066003e096084efa9ec84eeb640fb0c47a2dfcbb85741e07cb56d936a
 EBUILD firefox-80.0.ebuild 28767 BLAKE2B 185a08ee124387571bd8e87533c3f8d8c01dea1e569a8758eb04abb09142443b4d0eb081353135ae57f2d34a6046bece68a0c4f854fed64b3411b6241a7fb2c5 SHA512 40bc2692649ed7b5b3ea6df9bc3bc92921b6f71631c3ecce373a95b46784a6f4b0f2e3bb0fb0e61405fb75575e930f6d97208db5ba478430967a6c9861bf7a76
+EBUILD firefox-81.0.ebuild 28729 BLAKE2B 17d1e6b7b9cbbd9fd42d35125d75e72954b5f55400f9f955a757d3b24f907a231b1064ccd3c1e2de0fc2645dd9d9b7715fce72ba79de8f20aad8f08abbd2485a SHA512 4f1246f638f2bc93b90ce59ff73f99ab64e4ca6a05e97fd24aab1b3f5121305ae1ab9fd37ba7b8aa7d49137f3dc3470a0b8e46893187d9664cf67ba449f88c9e
 MISC metadata.xml 2559 BLAKE2B d1b21789a936805597548ce0636dfac52084ab4df2086dc5823fb00a3bb4cef802c2c3810690a29263b58b0d10179cf24ec9f149e18161301ea1f8e253c72253 SHA512 cadffe14e56530ae0e1f107e254b95e5dfb2f5d06cf676f65c34703e1e7700843553a51e3ecd1bf93bcfcd3b62b4960db53929361d52758b59bf1ec393a18167
diff --git a/www-client/firefox/files/gentoo-default-prefs.js b/www-client/firefox/files/gentoo-default-prefs.js
new file mode 100644
index 000000000000..dceaf893e40e
--- /dev/null
+++ b/www-client/firefox/files/gentoo-default-prefs.js
@@ -0,0 +1,13 @@
+pref("general.smoothScroll",               true);
+pref("general.autoScroll",                 false);
+pref("browser.urlbar.hideGoButton",        true);
+pref("accessibility.typeaheadfind",        true);
+pref("browser.shell.checkDefaultBrowser",  false);
+pref("browser.EULA.override",              true);
+pref("general.useragent.vendor",           "Gentoo");
+pref("general.useragent.locale",           "chrome://global/locale/intl.properties");
+pref("intl.locale.requested",              "");
+/* Disable DoH by default */
+pref("network.trr.mode",                   5);
+/* Disable use of Mozilla Normandy service by default */
+pref("app.normandy.enabled",               false);
diff --git a/www-client/firefox/files/gentoo-hwaccel-prefs.js-1 b/www-client/firefox/files/gentoo-hwaccel-prefs.js-1
index 0cb92b046f94..a00144a7ad13 100644
--- a/www-client/firefox/files/gentoo-hwaccel-prefs.js-1
+++ b/www-client/firefox/files/gentoo-hwaccel-prefs.js-1
@@ -1,2 +1,3 @@
+/* Force hardware accelerated rendering due to USE=hwaccel */
 pref("layers.acceleration.force-enabled",  true);
 pref("webgl.force-enabled",                true);
diff --git a/www-client/firefox/files/icon/firefox-symbolic.svg b/www-client/firefox/files/icon/firefox-symbolic.svg
new file mode 100644
index 000000000000..2078eea40b69
--- /dev/null
+++ b/www-client/firefox/files/icon/firefox-symbolic.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg3758"
+   sodipodi:docname="firefox-symbolic-quantum.svg"
+   inkscape:version="0.92.2 5c3e80d, 2017-08-06">
+  <metadata
+     id="metadata3764">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3762" />
+  <sodipodi:namedview
+     pagecolor="#555753"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1591"
+     inkscape:window-height="909"
+     id="namedview3760"
+     showgrid="false"
+     showborder="false"
+     inkscape:snap-global="false"
+     inkscape:zoom="1"
+     inkscape:cx="3.8851213"
+     inkscape:cy="12.517918"
+     inkscape:window-x="143"
+     inkscape:window-y="60"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3758">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3768" />
+  </sodipodi:namedview>
+  <title
+     id="title3754">Gnome Symbolic Icon Theme</title>
+  <path
+     d="m 15.054715,6.9884649 v 0 c -0.02034,-0.133652 -0.04071,-0.2122775 -0.04071,-0.2122775 0,0 -0.05225,0.060583 -0.138743,0.1748124 A 4.9808937,4.9808937 0 0 0 14.703694,6.0103229 6.4034781,6.4034781 0 0 0 14.270352,4.895288 4.6469845,4.6469845 0 0 0 13.87447,4.2163686 Q 13.793063,4.0947376 13.708437,3.9805045 C 13.444828,3.5499376 13.142365,3.2867867 12.792269,2.7891599 A 3.6101075,3.6101075 0 0 1 12.333953,1.5474054 5.0151173,5.0151173 0 0 0 12.113814,2.3599798 C 11.754468,1.997397 11.441832,1.7397963 11.253142,1.5640539 10.322171,0.69459485 10.430396,0.24367816 10.430396,0.24367816 v 0 c 0,0 -1.7389294,1.94102274 -0.9855522,3.96297904 a 3.8848199,3.8848199 0 0 0 1.2949452,1.726432 c 0.728868,0.6012222 1.513693,1.0743371 1.927612,2.2832561 A 3.8741829,3.8741829 0 0 0 11.21337,6.6823034 3.5023502,3.5023502 0 0 1 11.490854,8.0697401 3.2946971,3.2946971 0 0 1 7.4621982,11.27934 3.0343219,3.0343219 0 0 1 6.6459244,11.001852 3.3219834,3.3219834 0 0 1 5.667782,10.09771 l -0.00463,-0.0078 0.058274,0.02125 a 3.0061106,3.0061106 0 0 0 0.4162344,0.111409 2.6028293,2.6028293 0 0 0 1.6570605,-0.195631 C 8.3154732,9.7379218 8.6308831,9.5237932 8.8866339,9.6084266 h 0.0046 c 0.24974,0.079514 0.446755,-0.1628244 0.2682391,-0.4162632 A 1.3596868,1.3596868 0 0 0 7.8423564,8.6778985 C 7.3211426,8.7537416 6.8434027,9.1241907 6.1603222,8.7653097 a 1.4470953,1.4470953 0 0 1 -0.128107,-0.075371 c -0.04625,-0.026369 0.146605,0.040234 0.1017455,0.010233 A 3.3899676,3.3899676 0 0 1 5.7047808,8.4439577 c -0.010172,-0.00822 0.103133,0.032367 0.092497,0.024039 A 1.6561356,1.6561356 0 0 1 5.3495968,8.015168 0.80517516,0.80517516 0 0 1 5.3190728,7.2964766 0.63405807,0.63405807 0 0 1 5.5965603,7.0356384 c 0.088333,0.043485 0.1429059,0.076305 0.1429059,0.076305 0,0 -0.040235,-0.073997 -0.061972,-0.1128365 0.00786,-0.0027 0.014794,0 0.022662,-0.00513 0.077233,0.033293 0.248351,0.1202544 0.3385341,0.1734358 A 0.46987818,0.46987818 0 0 1 6.19362,7.3061637 c 0,0 0.030994,-0.015351 0.0079,-0.079998 A 0.41623066,0.41623066 0 0 0 6.0414753,7.0300927 h 0.0074 a 1.3596868,1.3596868 0 0 1 0.1970213,0.1225561 0.96149289,0.96149289 0 0 0 0.078625,-0.416232 0.54479973,0.54479973 0 0 0 -0.031914,-0.2312396 c -0.024511,-0.046254 0.013876,-0.064746 0.056885,-0.016135 A 0.45137905,0.45137905 0 0 0 6.3129456,6.378979 v -0.00372 0 c 0,0 0.024511,-0.031916 0.035615,-0.043486 A 0.66134433,0.66134433 0 0 1 6.4484481,6.2503678 4.6122987,4.6122987 0 0 1 7.1259793,5.9048971 C 7.3174429,5.8211545 7.4760733,5.7573477 7.5084475,5.7388339 a 1.0637007,1.0637007 0 0 0 0.1355052,-0.1040612 0.91015778,0.91015778 0 0 0 0.3052354,-0.5272274 0.73996569,0.73996569 0 0 0 0.0079,-0.082324 v -0.023118 -0.013967 0 -0.00552 0 -0.00611 0 C 7.9293085,4.872475 7.749868,4.7943251 6.8119611,4.7064478 A 0.81997449,0.81997449 0 0 1 6.1413599,4.0776254 v 0.0042 c -0.013416,0.034225 -0.025431,0.068909 -0.037456,0.1040572 0.012025,-0.034685 0.024051,-0.069373 0.037456,-0.1040572 v -0.00742 A 2.3762148,2.3762148 0 0 1 7.0598423,2.9339361 c 0.024051,-0.019416 -0.096192,0.00512 -0.072152,-0.014798 A 2.3845397,2.3845397 0 0 1 7.2328039,2.8155414 C 7.2748921,2.7979724 7.0524371,2.7128704 6.8558842,2.7336774 a 1.0174527,1.0174527 0 0 0 -0.3496338,0.082324 c 0.046253,-0.039773 0.1849968,-0.092498 0.1521605,-0.092498 a 2.2499581,2.2499581 0 0 0 -0.713142,0.2696255 0.14521828,0.14521828 0 0 1 0.01387,-0.064747 1.1099484,1.1099484 0 0 0 -0.4458297,0.3440843 0.58966016,0.58966016 0 0 0 0.00462,-0.080469 1.3300881,1.3300881 0 0 0 -0.2187525,0.2053404 l -0.00417,0.00321 A 2.9066776,2.9066776 0 0 0 3.6684873,3.2618132 l -0.00463,-0.0042 h 0.00554 A 1.3610743,1.3610743 0 0 1 3.3803631,2.9339159 l -0.0074,0.0018 -0.00877,-0.010174 C 3.3285694,2.8728322 3.2920343,2.813172 3.2545731,2.7465739 3.2277502,2.7003291 3.2004619,2.646216 3.1731756,2.5902563 c 0,-0.00372 -0.00416,-0.00513 -0.006,-0.00552 -0.0111,0 -0.01896,0.05133 -0.028212,0.037927 v -0.0028 A 1.9923577,1.9923577 0 0 1 3.0080744,1.8396896 l -0.0074,0.00372 A 0.87130958,0.87130958 0 0 0 2.6704677,2.2753541 c -0.028212,0.063362 -0.046248,0.098047 -0.064746,0.1327329 0,0.0028 0,-0.00461 0,-0.016194 0.00416,-0.031916 0.018037,-0.097585 0.014799,-0.092497 -0.00323,0.00513 -0.00553,0.00882 -0.00877,0.013415 A 0.80147532,0.80147532 0 0 0 2.4956586,2.4848515 1.0891367,1.0891367 0 0 0 2.4262868,2.661518 c -0.00276,0.00973 0,-0.00832 0,-0.029599 0,-0.02127 0.00416,-0.059199 0,-0.051331 L 2.4161148,2.600475 A 4.3935464,4.3935464 0 0 0 2.0461275,4.0040946 1.3976101,1.3976101 0 0 0 2.031791,4.252909 v 0.00742 A 3.0653076,3.0653076 0 0 0 1.6539417,4.7690529 7.2174403,7.2174403 0 0 0 0.85524217,6.725337 4.7871157,4.7871157 0 0 1 1.2830334,5.9756593 6.9371784,6.9371784 0 0 0 0.79974461,8.5192901 6.582457,6.582457 0 0 1 1.0078598,7.7659142 6.3854411,6.3854411 0 0 0 1.585032,10.755373 6.9542899,6.9542899 0 0 0 4.3372422,13.87618 v 0 a 6.0196208,6.0196208 0 0 0 1.6038754,0.768639 c 0.07492,0.02728 0.1507676,0.0541 0.2284646,0.08 -0.024511,-0.0096 -0.04625,-0.02034 -0.070761,-0.03098 A 7.2609132,7.2609132 0 0 0 8.179966,15 c 2.494615,0 3.318287,-0.949928 3.394136,-1.044738 v 0 A 1.2625664,1.2625664 0 0 0 11.8687,13.559386 v 0 q 0.07216,-0.02958 0.145679,-0.06335 l 0.03097,-0.01397 0.05597,-0.02635 a 5.2315572,5.2315572 0 0 0 1.053064,-0.659489 2.5436321,2.5436321 0 0 0 0.98184,-1.433687 v 0 a 0.89628343,0.89628343 0 0 0 0.01343,-0.660421 q 0.03838,-0.0606 0.0791,-0.129501 A 5.8762526,5.8762526 0 0 0 15.1107,7.7140393 v -0.0027 c 0,-0.027291 0,-0.054583 0,-0.081863 A 3.5754215,3.5754215 0 0 0 15.05473,6.9884887 Z"
+     id="path3756"
+     inkscape:connector-curvature="0"
+     style="fill:#bebebe;fill-opacity:1;stroke-width:0.46247858" />
+</svg>
diff --git a/www-client/firefox/firefox-78.3.0.ebuild b/www-client/firefox/firefox-78.3.0.ebuild
new file mode 100644
index 000000000000..a1d5ff8af43c
--- /dev/null
+++ b/www-client/firefox/firefox-78.3.0.ebuild
@@ -0,0 +1,1035 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-esr-78-patches-02.tar.xz"
+
+LLVM_MAX_SLOT=10
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR="1"
+
+# 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
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
+	multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{axz,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${PN}-${MOZ_PV}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0/esr$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
+	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
+	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-libvpx +system-webp wayland wifi"
+
+REQUIRED_USE="screencast? ( wayland )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	>=dev-util/cbindgen-0.14.3
+	>=net-libs/nodejs-10.19.0
+	virtual/pkgconfig
+	>=virtual/rust-1.43.0
+	|| (
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:9
+			sys-devel/llvm:9
+			clang? (
+				=sys-devel/lld-9*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
+			)
+		)
+	)
+	lto? (
+		!clang? ( sys-devel/binutils[gold] )
+	)
+	amd64? ( >=dev-lang/yasm-1.1 )
+	x86? ( >=dev-lang/yasm-1.1 )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+CDEPEND="
+	>=dev-libs/nss-3.53.1
+	>=dev-libs/nspr-4.25
+	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
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	screencast? ( media-video/pipewire:0/0.3 )
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.6.8:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-67.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.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
+}
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el 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 ne-NP 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 tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-i686/xpi/${lang}.xpi -> ${PN}-${MOZ_PV}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13G"
+		else
+			CHECKREQS_DISK_BUILD="5G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13G"
+		else
+			CHECKREQS_DISK_BUILD="5G"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		python-any-r1_pkg_setup
+
+		# 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 \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# 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.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+	fi
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use pgo && rm -v "${WORKDIR}"/firefox-patches/0033-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+
+	# Initialize .mozconfig
+	cp browser/config/mozconfig .mozconfig || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Use the MOZILLA_FIVE_HOME for the rpath
+	#append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
+
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		if is-flag '-g*' ; then
+			mozconfig_add_options_ac '+debug' --enable-debug-symbols=$(get-flag '-g*')
+		else
+			mozconfig_add_options_ac '+debug' --enable-debug-symbols
+		fi
+
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			mozconfig_add_options_ac '+debug' --enable-debug-symbols=$(get-flag '-g*')
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-install-strip \
+		--disable-strip \
+		--disable-updater \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ ${MOZ_ESR} == 1 ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-google.key" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	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-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable screencast pipewire
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm | ppc64)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Build system requires xargs but is unable to find it
+	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/firefox \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/firefox-bin" || die
+	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Skia should be working by now ...
+	## Force cairo as the canvas renderer on platforms without skia support
+	#if [[ $(tc-endian) == "big" ]] ; then
+	#	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to force cairo for platform without skia support"
+	#	sticky_pref("gfx.canvas.azure.backends",           "cairo");
+	#	sticky_pref("gfx.content.azure.backends",          "cairo");
+	#	EOF
+	#fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install icons
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${FILESDIR}/icon/firefox-symbolic.svg" ${PN}-symbolic.png
+
+	local icon size
+	for icon in "${S}"/browser/branding/official/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${PN^}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command='firefox-wayland --name firefox-wayland'
+				newbin "${FILESDIR}"/firefox-wayland.sh firefox-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command='firefox-x11 --name firefox-x11'
+				newbin "${FILESDIR}"/firefox-x11.sh firefox-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command='firefox'
+				;;
+		esac
+
+		cp "${FILESDIR}/icon/${PN}-r2.desktop" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	rm "${ED}/usr/bin/${PN}" || die
+	newbin "${FILESDIR}/firefox.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/firefox" \
+		"${ED}/usr/bin/firefox-x11" \
+		"${ED}/usr/bin/firefox-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; 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_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; 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
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
diff --git a/www-client/firefox/firefox-81.0.ebuild b/www-client/firefox/firefox-81.0.ebuild
new file mode 100644
index 000000000000..c92df895d0b1
--- /dev/null
+++ b/www-client/firefox/firefox-81.0.ebuild
@@ -0,0 +1,1035 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+FIREFOX_PATCHSET="firefox-81-patches-01.tar.xz"
+
+LLVM_MAX_SLOT=10
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=""
+
+# 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
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
+	multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{axz,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${PN}-${MOZ_PV}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
+	hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
+	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-libvpx +system-webp wayland wifi"
+
+REQUIRED_USE="screencast? ( wayland )"
+
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	>=dev-util/cbindgen-0.14.3
+	>=net-libs/nodejs-10.19.0
+	virtual/pkgconfig
+	>=virtual/rust-1.43.0
+	|| (
+		(
+			sys-devel/clang:10
+			sys-devel/llvm:10
+			clang? (
+				=sys-devel/lld-10*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:9
+			sys-devel/llvm:9
+			clang? (
+				=sys-devel/lld-9*
+				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
+			)
+		)
+	)
+	lto? (
+		!clang? ( sys-devel/binutils[gold] )
+	)
+	amd64? ( >=dev-lang/yasm-1.1 )
+	x86? ( >=dev-lang/yasm-1.1 )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+CDEPEND="
+	>=dev-libs/nss-3.56
+	>=dev-libs/nspr-4.28
+	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
+	>=x11-libs/pixman-0.19.2
+	>=dev-libs/glib-2.26:2
+	>=sys-libs/zlib-1.2.3
+	>=dev-libs/libffi-3.0.10:=
+	media-video/ffmpeg
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	dbus? (
+		sys-apps/dbus
+		dev-libs/dbus-glib
+	)
+	screencast? ( media-video/pipewire:0/0.3 )
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-libs/harfbuzz-2.6.8:0=
+		>=media-gfx/graphite2-1.3.13
+	)
+	system-icu? ( >=dev-libs/icu-67.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.8.2:0=[postproc] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wifi? (
+		kernel_linux? (
+			sys-apps/dbus
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+		)
+	)
+	jack? ( virtual/jack )
+	selinux? ( sec-policy/selinux-mozilla )"
+
+RDEPEND="${CDEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)
+	selinux? ( sec-policy/selinux-mozilla )"
+
+DEPEND="${CDEPEND}
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )"
+
+S="${WORKDIR}/firefox-${PV%_*}"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
+}
+
+MOZ_LANGS=(
+	ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
+	da de dsb el 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 ne-NP 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 tl tr trs uk ur uz vi
+	xh zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-i686/xpi/${lang}.xpi -> ${P}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13G"
+		else
+			CHECKREQS_DISK_BUILD="5G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13G"
+		else
+			CHECKREQS_DISK_BUILD="5G"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		python-any-r1_pkg_setup
+
+		# 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 \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# 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.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+	fi
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	use pgo && rm -v "${WORKDIR}"/firefox-patches/0029-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Clearing checksums where we have applied patches
+	moz_clear_vendor_checksums target-lexicon-0.9.0
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+
+	# Initialize .mozconfig
+	cp browser/config/mozconfig .mozconfig || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	local have_switched_compiler=
+	if use clang && ! tc-is-clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		have_switched_compiler=yes
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Use the MOZILLA_FIVE_HOME for the rpath
+	#append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+		else
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
+
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		elif tc-ld-is-gold ; then
+			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		if is-flag '-g*' ; then
+			mozconfig_add_options_ac '+debug' --enable-debug-symbols=$(get-flag '-g*')
+		else
+			mozconfig_add_options_ac '+debug' --enable-debug-symbols
+		fi
+
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			mozconfig_add_options_ac '+debug' --enable-debug-symbols=$(get-flag '-g*')
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-install-strip \
+		--disable-strip \
+		--disable-updater \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-png \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
+		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ ${MOZ_ESR} == 1 ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-google.key" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	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-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+
+	use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	mozconfig_use_enable jack
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
+	fi
+
+	mozconfig_use_enable screencast pipewire
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm | ppc64)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif tc-ld-is-gold ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export MACH_USE_SYSTEM_PYTHON=1
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Build system requires xargs but is unable to find it
+	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/firefox \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/firefox-bin" || die
+	dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Skia should be working by now ...
+	## Force cairo as the canvas renderer on platforms without skia support
+	#if [[ $(tc-endian) == "big" ]] ; then
+	#	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to force cairo for platform without skia support"
+	#	sticky_pref("gfx.canvas.azure.backends",           "cairo");
+	#	sticky_pref("gfx.content.azure.backends",          "cairo");
+	#	EOF
+	#fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install icons
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${FILESDIR}/icon/firefox-symbolic.svg" ${PN}-symbolic.png
+
+	local icon size
+	for icon in "${S}"/browser/branding/official/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menus
+	local display_protocols="auto X11"
+	local icon="${PN}"
+	local name="Mozilla ${PN^}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		display_protocols+=" Wayland"
+		use_wayland="true"
+	fi
+
+	local app_name desktop_filename display_protocol exec_command
+	for display_protocol in ${display_protocols} ; do
+		app_name="${name} on ${display_protocol}"
+		desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+		case ${display_protocol} in
+			Wayland)
+				exec_command='firefox-wayland --name firefox-wayland'
+				newbin "${FILESDIR}"/firefox-wayland.sh firefox-wayland
+				;;
+			X11)
+				if ! use wayland ; then
+					# Exit loop here because there's no choice so
+					# we don't need wrapper/.desktop file for X11.
+					continue
+				fi
+
+				exec_command='firefox-x11 --name firefox-x11'
+				newbin "${FILESDIR}"/firefox-x11.sh firefox-x11
+				;;
+			*)
+				app_name="${name}"
+				desktop_filename="${PN}.desktop"
+				exec_command='firefox'
+				;;
+		esac
+
+		cp "${FILESDIR}/icon/${PN}-r2.desktop" "${WORKDIR}/${PN}.desktop-template" || die
+
+		sed -i \
+			-e "s:@NAME@:${app_name}:" \
+			-e "s:@EXEC@:${exec_command}:" \
+			-e "s:@ICON@:${icon}:" \
+			"${WORKDIR}/${PN}.desktop-template" \
+			|| die
+
+		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+		rm "${WORKDIR}/${PN}.desktop-template" || die
+	done
+
+	# Install generic wrapper script
+	rm "${ED}/usr/bin/${PN}" || die
+	newbin "${FILESDIR}/firefox.sh" ${PN}
+
+	# Update wrapper
+	local wrapper
+	for wrapper in \
+		"${ED}/usr/bin/firefox" \
+		"${ED}/usr/bin/firefox-x11" \
+		"${ED}/usr/bin/firefox-wayland" \
+	; do
+		[[ ! -f "${wrapper}" ]] && continue
+
+		sed -i \
+			-e "s:@PREFIX@:${EPREFIX}/usr:" \
+			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+			"${wrapper}" \
+			|| die
+	done
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; 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_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; 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
+
+	local show_doh_information show_normandy_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+			fi
+
+			if ver_test "${replacing_version}" -lt 74.0-r2 ; then
+				# Tell user only once about our Normandy default
+				show_normandy_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+}
diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index 86adef23b547..b184b966430c 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1,6 +1,6 @@
-AUX luakit-cflags.patch 240 BLAKE2B 6ea8589e3a552ae67ad45832bafeb97a0138d635e4fc18f8ebc1a18907bbe96b4d2d86e99034be9b821eda0d8e323cc9cb17c91a71d4c10bfc12eaf7c94c87d6 SHA512 a7898e2cc40f4f35753e2c56096955f4098c4fb19a670da021d5aa7baab466c53d0bed96375ef9fbae1579cb881532608a65bd3d2d3572d6b1f043aa02051dc4
-AUX luakit-fix_tests.patch 3877 BLAKE2B a4d1f05a961034ae5b78c84758ffe3cf859786548c6f5e2ca2149b3aa9ff41762a7c821e8fdb59afa1d385310812abb4c42fa32a5f228de0a76010f65d74607b SHA512 40d4aea86e27fb29fd97ca2be9f84aecf25ce148323de6e2233b0c99d583b2ec07b6dbf5afa86852db89d09f1fe04b8c98acc793ff6ad9f66eb4e88f8e8d57f4
-DIST luakit-2017.08.10.tar.gz 399564 BLAKE2B e7efad1e3e2e34971811c2b1fcccf48caeadbb5e87d09bda2835f00cb075ac499b9c7121c7b805acd14f5cae297c16b59fce75fc5dd1c07fa461ed7ed0fae17d SHA512 6cceb241ca5a7ad7dfbb3964888318b5f2c5f734175ea7ecd5178419d037d58dc5e0aba00a7ed8ca3dd811cc5af953c353b0cd203be95a15c6a78c396f9230c8
-EBUILD luakit-2017.08.10.ebuild 1662 BLAKE2B 3f40a8ea9ae2124697036a8d75f5c572107af41cbcbb13a9bad49f2e52532bf1d32cfe6d986edc02ea3a26917f31886144898a529821bd36c9fe383aab47e627 SHA512 7a2db4f5c805aa5272ef64f9e10652d4c510c4735333ccb7fb73594accb82e0f21b865925ebe0d83b7434e99b7c39749f39551cf6c65d68f11ecce60756d8864
-EBUILD luakit-9999.ebuild 1604 BLAKE2B f4b118aa1af57476786954fbcaf2b83ebb7ece48a19cedef2fb44f8a5bf24f2288806f7f31da2bb56a8b1536b3fc6e4e3a39bc5be6456d89c0df68ba86ce8415 SHA512 c34e8cd1ca7d1ceb450b86054312613daed771bd87eff61664421f3e4ece5cd1e5e2bb20f86eba1c1316fe89353d2ee1252c3b20db86d304a995905524bd4048
+AUX luakit-2.2.1-make.patch 1349 BLAKE2B 9f13f93b00908d15fdad63fa4fcaff607512237f6d0a065fff54cf3726bb6274b0e3b163a82d2cf11f01f18990bc0a80dc5d2cc11a16d2a8b834db9ab7f35ff1 SHA512 d7a9250ea33748514f942f38198bedf2bcaf19756c9d75014e6bbb781695443e3b0e280b621db785b0f907bbd80e3971a53d8131e0ab52a136aa72c90db64d1f
+AUX luakit-2.2.1-pkg-config.patch 779 BLAKE2B 6ab9e9d8af10f8d8dde8f01a77481f16aaf285718e4fe520d026b6054b175a72b5bd880793a3379dc3cc500bb3889e2f429fdaabdd5d47f261ddfc5b40e5e29e SHA512 f51ba29b41841cb1dc1b5cf4917182b86c9aa1e71ddc8b834314e70700ac805660f87f49c3a5ce3a8b093d1ee49305c008f72a37fbefc0edcbd9ad77ce8f5f95
+DIST luakit-2.2.1.tar.gz 488845 BLAKE2B 2bed592f7d56fc4b5bad4fee3563805954c6211222e25344d01430ef9f2921c240e9cb3c735564fae66d0739d50da41a90309c7dba3ba9f4631d880b9a47e4b1 SHA512 9a055c1541f31027805d3da2604d98c0193a9c2874099fc3ab3ef08c645a8e91b8504d1162e86cbd29a5e5e0a3c54b3154299708f864d135d8640bcc3866674b
+EBUILD luakit-2.2.1.ebuild 1630 BLAKE2B 73071d403c2feb97802203dffd15ae9c5997b7b5032a48291f76090e90107ea9dbb44f1289e46af214f3b494f6cf4c7f57f4bea483fffc28155132166151d120 SHA512 ee87b2487742f5a50e4a0df20ee840b8ba71c7734d1f91affda285686caf4fc264fe71588f7088293e126caf3d1326b86c4b630041b4ae3a21f35cb27891285c
+EBUILD luakit-9999.ebuild 1586 BLAKE2B 25845834617ac142d7caef22cd31cf4af803e8a0e96a5a6d87a257ca81be7340ec54e644e775d044cdb94b5df74d0be17a98063737ab83334c6b4b16550ce525 SHA512 e58c31f0952a9c95684fa20a0ff20ea063f68d8337baa3413b57b9e9507b281dc9053801072fb9825882e137d08160197a349574d583926a281a5a34d5a63fc8
 MISC metadata.xml 170 BLAKE2B eb526dd38c08c5ca150626a4bd6f4e58daeaffd25edcde9782dc8b584d0e302e0e795b9c8ccfa5f96da40ece9cbac094c3867fecf9758a2e530155c1db2dd715 SHA512 ed1f2cc86749299c1a5b0b5d82e82c86816c2f89d41b162b14cfecd7af82fb2ec2ae6a38190002587f5cfc13030b7598b1e49eb438e97bc38e8f4a71ce1e4e08
diff --git a/www-client/luakit/files/luakit-2.2.1-make.patch b/www-client/luakit/files/luakit-2.2.1-make.patch
new file mode 100644
index 000000000000..0e0689feee2e
--- /dev/null
+++ b/www-client/luakit/files/luakit-2.2.1-make.patch
@@ -0,0 +1,38 @@
+--- a/Makefile
++++ b/Makefile
+@@ -56,22 +56,18 @@
+ $(filter-out $(EXT_OBJS),$(OBJS)) $(EXT_OBJS): $(HEADS) config.mk
+ 
+ $(filter-out $(EXT_OBJS),$(OBJS)) : %.o : %.c
+-	@echo $(CC) -c $< -o $@
+-	@$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
+ 
+ $(EXT_OBJS) : %.o : %.c
+-	@echo $(CC) -c $< -o $@
+-	@$(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fpic $(CPPFLAGS) $< -o $@
++	$(CC) -c $(CFLAGS) -DLUAKIT_WEB_EXTENSION -fpic $(CPPFLAGS) $< -o $@
+ 
+ widgets/webview.o: $(wildcard widgets/webview/*.c)
+ 
+ luakit: $(OBJS)
+-	@echo $(CC) -o $@ $(OBJS)
+-	@$(CC) -o $@ $(OBJS) $(LDFLAGS)
++	$(CC) -o $@ $(OBJS) $(LDFLAGS)
+ 
+ luakit.so: $(EXT_OBJS)
+-	@echo $(CC) -o $@ $(EXT_OBJS)
+-	@$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
++	$(CC) -o $@ $(EXT_OBJS) -shared $(LDFLAGS)
+ 
+ luakit.1: luakit.1.in
+ 	@sed "s|LUAKITVERSION|$(VERSION)|" $< > $@
+@@ -115,7 +111,7 @@
+ 	install -d $(DESTDIR)$(APPDIR)
+ 	install -m644 extras/luakit.desktop $(DESTDIR)$(APPDIR)
+ 	install -d $(DESTDIR)$(MANPREFIX)/man1/
+-	install -m644 luakit.1.gz $(DESTDIR)$(MANPREFIX)/man1/
++	install -m644 luakit.1 $(DESTDIR)$(MANPREFIX)/man1/
+ 	mkdir -p resources
+ 	find resources -type d -exec install -d $(DESTDIR)$(PREFIX)/share/luakit/'{}' \;
+ 	find resources -type f -exec sh -c 'f="{}"; install -m644 "$$f" "$(DESTDIR)$(PREFIX)/share/luakit/$$(dirname $$f)"' \;
diff --git a/www-client/luakit/files/luakit-2.2.1-pkg-config.patch b/www-client/luakit/files/luakit-2.2.1-pkg-config.patch
new file mode 100644
index 000000000000..181c02378669
--- /dev/null
+++ b/www-client/luakit/files/luakit-2.2.1-pkg-config.patch
@@ -0,0 +1,21 @@
+--- a/config.mk
++++ b/config.mk
+@@ -98,15 +98,15 @@
+ PKGS += javascriptcoregtk-4.0
+ 
+ # Check user has correct packages installed (and found by pkg-config).
+-PKGS_OK := $(shell pkg-config --print-errors --exists $(PKGS) && echo 1)
++PKGS_OK := $(shell $(PKG_CONFIG) --print-errors --exists $(PKGS) && echo 1)
+ ifneq ($(PKGS_OK),1)
+     $(error Cannot find required package(s\) to build luakit. Please \
+     check you have the above packages installed and try again)
+ endif
+ 
+ # Add pkg-config options to compile flags.
+-CFLAGS  += $(shell pkg-config --cflags $(PKGS))
++CFLAGS  += $(shell $(PKG_CONFIG) --cflags $(PKGS))
+ CFLAGS  += -I./
+ 
+ # Add pkg-config options to linker flags.
+-LDFLAGS += $(shell pkg-config --libs $(PKGS))
++LDFLAGS += $(shell $(PKG_CONFIG) --libs $(PKGS))
diff --git a/www-client/luakit/files/luakit-cflags.patch b/www-client/luakit/files/luakit-cflags.patch
deleted file mode 100644
index dd8d51c391f1..000000000000
--- a/www-client/luakit/files/luakit-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config.mk
-+++ b/config.mk
-@@ -2,7 +2,7 @@
- 
- # Compile/link options.
- CC         ?= gcc
--CFLAGS     += -std=gnu99 -ggdb -W -Wall -Wextra -Werror=unused-result
-+CFLAGS     += -std=gnu99 -W -Wall -Wextra
- LDFLAGS    +=
- CPPFLAGS   +=
- 
diff --git a/www-client/luakit/files/luakit-fix_tests.patch b/www-client/luakit/files/luakit-fix_tests.patch
deleted file mode 100644
index f379fa85f6c8..000000000000
--- a/www-client/luakit/files/luakit-fix_tests.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 1d5ae1d56da688c3ac95301f4ae07eb7721dd20e Mon Sep 17 00:00:00 2001
-From: Aidan Holm <aidanholm@gmail.com>
-Date: Fri, 11 Aug 2017 11:32:47 +0800
-Subject: [PATCH] Add support for tests with DEVELOPMENT_PATHS=0
-
----
- ipc.c                         | 36 ++++++++++++++++--------------------
- tests/async/run_test.lua      |  4 ++++
- tests/async/wrangle_paths.lua | 20 ++++++++++++++++++++
- 3 files changed, 40 insertions(+), 20 deletions(-)
- create mode 100644 tests/async/wrangle_paths.lua
-
-diff --git a/ipc.c b/ipc.c
-index e0e8bfde..bd871209 100644
---- a/ipc.c
-+++ b/ipc.c
-@@ -158,23 +158,20 @@ web_extension_connect_thread(gpointer UNUSED(data))
- static void
- initialize_web_extensions_cb(WebKitWebContext *context, gpointer UNUSED(data))
- {
--#if DEVELOPMENT_PATHS
--    gchar *extension_dir = g_get_current_dir();
--#else
--    const gchar *extension_dir = LUAKIT_INSTALL_PATH;
--#endif
--
--    char *extension_file = g_build_filename(extension_dir,  "luakit.so", NULL);
--    if (access(extension_file, R_OK)) {
--#if DEVELOPMENT_PATHS
--#  define DEVPATHS "\nLuakit was built with DEVELOPMENT_PATHS=1; are you running luakit correctly?"
--#else
--#  define DEVPATHS ""
--#endif
--        fatal("Cannot access luakit extension '%s': %s" DEVPATHS, extension_file, strerror(errno));
--#undef DEVPATHS
-+    char *dirs[] = { g_get_current_dir(), LUAKIT_INSTALL_PATH }, *dir = NULL;
-+
-+    for (unsigned i = 0; !dir && i < LENGTH(dirs); ++i) {
-+        char *extension_file = g_build_filename(dirs[i],  "luakit.so", NULL);
-+        verbose("checking for luakit extension at '%s'", dirs[i]);
-+        if (!access(extension_file, R_OK))
-+            dir = dirs[i];
-+        g_free(extension_file);
-     }
--    g_free(extension_file);
-+
-+    if (dir)
-+        verbose("found luakit extension at '%s'", dir);
-+    else
-+        fatal("cannot find luakit extension 'luakit.so'");
- 
-     const char *path;
-     g_mutex_lock (&socket_path_lock);
-@@ -185,10 +182,9 @@ initialize_web_extensions_cb(WebKitWebContext *context, gpointer UNUSED(data))
- 
-     GVariant *payload = g_variant_new_string(path);
-     webkit_web_context_set_web_extensions_initialization_user_data(context, payload);
--    webkit_web_context_set_web_extensions_directory(context, extension_dir);
--#if DEVELOPMENT_PATHS
--    g_free(extension_dir);
--#endif
-+    webkit_web_context_set_web_extensions_directory(context, dir);
-+
-+    g_free(dirs[0]);
- }
- 
- static void
-diff --git a/tests/async/run_test.lua b/tests/async/run_test.lua
-index d281265b..2a55f225 100644
---- a/tests/async/run_test.lua
-+++ b/tests/async/run_test.lua
-@@ -3,6 +3,10 @@
- -- @script async.run_test
- -- @copyright 2017 Aidan Holm
- 
-+-- Adjust paths to work when running with DEVELOPMENT_PATHS=0
-+dofile("tests/async/wrangle_paths.lua")
-+require_web_module("tests/async/wrangle_paths")
-+
- local shared_lib = {}
- local priv = require "tests.priv"
- local test = require("tests.lib")
-diff --git a/tests/async/wrangle_paths.lua b/tests/async/wrangle_paths.lua
-new file mode 100644
-index 00000000..66efe929
---- /dev/null
-+++ b/tests/async/wrangle_paths.lua
-@@ -0,0 +1,20 @@
-+--- Test runner path wrangler.
-+--
-+-- @script async.wrangle_paths
-+-- @copyright 2017 Aidan Holm
-+
-+local system_paths, luakit_paths = {}, {}
-+for path in string.gmatch(package.path, "[^;]+") do
-+    if not path:match("^%./") and not path:find("luakit") then
-+        table.insert(system_paths, path)
-+    elseif not path:match("^%./") and path:find("luakit_test_") then
-+        table.insert(luakit_paths, path)
-+    end
-+end
-+local rel_paths = { "./lib/?.lua", "./lib/?/init.lua", "./config/?.lua", "./config/?/init.lua", }
-+system_paths = table.concat(system_paths, ";")
-+rel_paths = table.concat(rel_paths, ";")
-+luakit_paths = table.concat(luakit_paths, ";")
-+package.path = string.format("./?.lua;%s;%s;%s", system_paths, rel_paths, luakit_paths)
-+
-+-- vim: et:sw=4:ts=8:sts=4:tw=80
diff --git a/www-client/luakit/luakit-2.2.1.ebuild b/www-client/luakit/luakit-2.2.1.ebuild
new file mode 100644
index 000000000000..efeb361d7b9d
--- /dev/null
+++ b/www-client/luakit/luakit-2.2.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs xdg
+
+DESCRIPTION="A fast, extensible, and customizable web browser"
+HOMEPAGE="https://luakit.github.io/luakit"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/luakit/luakit.git"
+else
+	SRC_URI="https://github.com/luakit/luakit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="doc luajit test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-lua/luafilesystem[luajit=]
+	net-libs/webkit-gtk:4=
+	x11-libs/gtk+:3
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-lua/luassert[luajit=]
+		dev-lua/luacheck[luajit=]
+		x11-base/xorg-server[xvfb]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-make.patch
+	"${FILESDIR}"/${PN}-2.2.1-pkg-config.patch
+)
+
+src_configure() {
+	export LUA_BIN_NAME=$(usex luajit luajit lua)
+	export LUA_PKG_NAME=$(usex luajit luajit lua)
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		${PN}
+
+	use doc && emake doc
+}
+
+src_test() {
+	local failing_test
+	for failing_test in test_clib_luakit test_image_css; do
+		mv tests/async/${failing_test}.lua{,.disabled} || die
+	done
+
+	emake run-tests
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		PREFIX="${EPREFIX}/usr" \
+		XDGPREFIX="${EPREFIX}/etc/xdg" \
+		install
+
+	rm "${ED}/usr/share/doc/${PF}/COPYING.GPLv3" || die
+
+	use doc && dodoc -r doc/html
+}
diff --git a/www-client/luakit/luakit-2017.08.10.ebuild b/www-client/luakit/luakit-2017.08.10.ebuild
deleted file mode 100644
index 779e8b75552e..000000000000
--- a/www-client/luakit/luakit-2017.08.10.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A fast, light, simple to use micro-browser using WebKit and Lua"
-HOMEPAGE="https://luakit.github.io/luakit"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/luakit/luakit.git"
-else
-	SRC_URI="https://github.com/luakit/luakit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="doc luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-lua/luafilesystem[luajit=]
-	net-libs/webkit-gtk:4=
-	x11-libs/gtk+:3
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-lua/luassert[luajit=]
-		dev-lua/luacheck[luajit=]
-		x11-base/xorg-server[xvfb]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-cflags.patch
-	"${FILESDIR}"/${PN}-fix_tests.patch
-)
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		PREFIX="${EPREFIX}/usr" \
-		XDGPREFIX="${EPREFIX}/etc/xdg" \
-		LUA_PKG_NAME=$(usex luajit 'luajit' 'lua') \
-		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
-		all
-
-	use doc && emake doc
-}
-
-src_test() {
-	emake \
-		LUA_PKG_NAME=$(usex luajit 'luajit' 'lua') \
-		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
-		run-tests
-}
-
-src_install() {
-	emake \
-		LUA_PKG_NAME=$(usex luajit 'luajit' 'lua') \
-		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		DOCDIR="${ED}/usr/share/doc/${PF}" \
-		XDGPREFIX="${ED}/etc/xdg" \
-		install
-
-	rm "${ED}/usr/share/doc/${PF}/COPYING.GPLv3" || die
-
-	use doc && dodoc -r doc/html
-}
diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
index 3f617a46a60c..e249169925ec 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -2,10 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit toolchain-funcs xdg
 
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A fast, light, simple to use micro-browser using WebKit and Lua"
+DESCRIPTION="A fast, extensible, and customizable web browser"
 HOMEPAGE="https://luakit.github.io/luakit"
 
 if [[ ${PV} == 9999 ]]; then
@@ -28,40 +27,52 @@ RDEPEND="
 	net-libs/webkit-gtk:4=
 	x11-libs/gtk+:3
 	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	!luajit? ( dev-lang/lua:0 )
+"
+DEPEND="
+	${RDEPEND}
 	test? (
 		dev-lua/luassert[luajit=]
 		dev-lua/luacheck[luajit=]
 		x11-base/xorg-server[xvfb]
-	)"
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-make.patch
+)
+
+src_configure() {
+	export LUA_BIN_NAME=$(usex luajit luajit lua)
+	export LUA_PKG_NAME=$(usex luajit luajit lua)
+	tc-export CC PKG_CONFIG
+}
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
-		LUA_PKG_NAME=$(usex luajit 'luajit' 'lua') \
-		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
 		PREFIX="${EPREFIX}/usr" \
-		all
+		${PN}
 
 	use doc && emake doc
 }
 
 src_test() {
-	emake \
-		LUA_BIN_NAME=$(usex luajit 'luajit' 'lua') \
-		run-tests
+	local failing_test
+	for failing_test in test_clib_luakit test_image_css; do
+		mv tests/async/${failing_test}.lua{,.disabled} || die
+	done
+
+	emake run-tests
 }
 
 src_install() {
-	sed -i 's/install -m644 luakit.1.gz/install -m644 luakit.1/g' Makefile || die
-
 	emake \
 		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
 		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		PREFIX="${EPREFIX}/usr" \
 		XDGPREFIX="${EPREFIX}/etc/xdg" \
 		install
 
@@ -69,9 +80,3 @@ src_install() {
 
 	use doc && dodoc -r doc/html
 }
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 007e78a177e9..91a475bc3c90 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -2,5 +2,5 @@ AUX netsurf-3.10-disable-failing-tests.patch 1196 BLAKE2B 055f4663bfed7ebe291e92
 AUX netsurf-3.10-julia-libutf8proc-header-location.patch 1155 BLAKE2B bd2e04f8b9ebd5a00659c88dda90b6e8822e1cb51e8bf3755cae88373a206f6d1637f14e928365345bc9d98cfaa18294e9aa5beeef43449252c70e8d1de8d21b SHA512 76b0d397ce0f73aa23e6069b9fce492768f9d8fe1ba3dcb77b2f3d8c27b2e5fb8cbf5f97ede41bc624684c0d20bd80f3d985385ba1c825298f75f68c768656b4
 AUX netsurf-3.9-conditionally-include-image-headers.patch 775 BLAKE2B 1d62fa92cda9851126b7befbf0b19d28f130a1d165c8ddabecac98b8dee59cf51bede93bf380ba5ce07625f6bf0156a400e8575df418611bda29f9e7f325a696 SHA512 5e866aa56c7959ba5a6ac44d997a12b24bf4cc3ef38e3149a06be178350cf1a14bc27a31b6bf817faf8586f44ecef65cb7633245cdbbe0896e54dbc88e7dd84f
 DIST netsurf-3.10-src.tar.gz 4084480 BLAKE2B 267ce1811cbf11d053f721e22b8a6d484e796102a4c9baaa10580d92cc1eecfe3f126fb97456262675c962ec88a5235e48dc85f2a5168631f6c9dd5b5082b43b SHA512 1b1153916438e08146271dc04200aefbdba3b2c4ca9432a43abfc3811b5418df7ed21bbd91767f12d04331a236227379d2c412fcf13f25349685a549723bf13d
-EBUILD netsurf-3.10-r3.ebuild 4489 BLAKE2B 7fa8888d1091b8f3a542efea8e6b7e2231903146198319c27e14c54986c5ce4a0132715980acdcb18046f0044061911496873e4ad7f36f35fc16e490817de171 SHA512 3fa41da7df0769f037c9011e47b9660010586ee32ab5c2229418a3b8587393b059a006b3709214f6a1921acd62e82c2216264de080f99734367aa703cf625d62
+EBUILD netsurf-3.10-r3.ebuild 4494 BLAKE2B 9e494aa5e9775cfb48026178cfc3fb75d7fb159518fdea2627d62fcb27a639f5dac9aab8364466e21cb290ff220cba661d064a0ac532c7280e86052c12300463 SHA512 561ecc3e1d52eeaa8ce21465bcc9523035cf996c371fb25288e33a7ca047b81d2d61e670816570d3079cfba60f32ecca385d4b48d4d7a1183e43f7354892332c
 MISC metadata.xml 1564 BLAKE2B 613fed039b6dac6329dacce954d28087855dfb2db7445496e9394882c0d9bf59c9db936bb47188a582eaf7987961acb5d4045baf1917fd1a46b72dad1c24ed7e SHA512 634e81db8221b34e71fab51ff66efd15d95307a88dc08812837b290301a8b8e1644dab4972f9e1941434b04f0c5877343033099d624fa68bd449796f0866ab48
diff --git a/www-client/netsurf/netsurf-3.10-r3.ebuild b/www-client/netsurf/netsurf-3.10-r3.ebuild
index 80ac0b1a0117..2d6a524e3b26 100644
--- a/www-client/netsurf/netsurf-3.10-r3.ebuild
+++ b/www-client/netsurf/netsurf-3.10-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.ta
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc64"
 IUSE="bmp +duktape fbcon truetype +gif +gtk gtk2 +javascript +jpeg mng
 	+png +psl rosprite +svg +svgtiny +webp"
 
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index b83eddea1316..ee142ae3fba5 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,9 +1,3 @@
 DIST opera-beta_71.0.3770.126_amd64.deb 68278732 BLAKE2B edb569db1a790964f36fa0cc8620fb966d60459a6ec75b53a7a8b9130eefa8798d29d4dc44fea8fe9385e54fd5b86513be4de3967b5c795f8063d672fa63b581 SHA512 0a2d3fe294c7a4611ddcd86dd31c33707974cf2760c378af6afa2f85a5c9c4d84ba95b11a11f22aae022ecba0cb971039df3696c6891c217911f2a93164d020b
-DIST opera-beta_71.0.3770.50_amd64.deb 68263536 BLAKE2B 0a48ff6994e6e7343c0e7fa67db6ab149e521390d598d1c1b464ed8d16e12e1c368920929c93ee53128d871a95021ab4f51441723e3be7fafef4ab20d0258f6d SHA512 68b3d636bc70cd41b97d7b57297f553886a06c1f48b950f81f5c672f6c29290a141784a44c599bd7d564845ae838dffa402a096a87c509f4b6d31a8bf499ac2d
-DIST opera-beta_71.0.3770.81_amd64.deb 68283640 BLAKE2B 8578dd008e3be1450cf6dae231e0ff50138a453da550102b7fa0009665787de1fe37daa559cc66372a94b115a44107be7a4596e84e8268ddc28075e7676b745a SHA512 7ae8326e030530ca13d5234de52ca66770286b9b27793ea66f16b45ac10a80e3744b96a59752bf15a35dba3e4153af5201469167399f7e7943146d013fee4fb0
-DIST opera-beta_71.0.3770.97_amd64.deb 68269300 BLAKE2B d5a52db87f78fdb13fbefdb59083548b396baf765083419009a654908401d2345efad804485872edc25f5df16993c402b19e1d837716305be71e07669108eb7d SHA512 4b66e0b3ec6859cfc5d54bddf938c6f2b61697831abf077efe1573834e923d03d52b3bbcc1d8eab8df5f91f1615a63ae81006b3d93641fede5322297c2813942
-EBUILD opera-beta-71.0.3770.126.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
-EBUILD opera-beta-71.0.3770.50.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
-EBUILD opera-beta-71.0.3770.81.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
-EBUILD opera-beta-71.0.3770.97.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
+EBUILD opera-beta-71.0.3770.126.ebuild 2085 BLAKE2B 5ae88144348847cfa68fe4d042e2c1ac003ae6ee7eab6775388e5451f497ffc0c6d1ce148c00ec35ff9fee518c2ba01f6fd85e4596c6e9a7b07f669b8f6fa8d2 SHA512 73cdd76545535234fe7ee685c54bdcd114a668d67be5d9c39245b4cae4253c9f9cf9d080b46f5fa76a4f658e145adf4868a8bbe32387ae5f37487f7d59dcbcef
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-71.0.3770.126.ebuild b/www-client/opera-beta/opera-beta-71.0.3770.126.ebuild
index 99905f624666..dff5217c967f 100644
--- a/www-client/opera-beta/opera-beta-71.0.3770.126.ebuild
+++ b/www-client/opera-beta/opera-beta-71.0.3770.126.ebuild
@@ -7,7 +7,7 @@ CHROMIUM_LANGS="
 	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
+inherit chromium-2 multilib unpacker xdg
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="https://www.opera.com/"
@@ -101,15 +101,3 @@ src_install() {
 	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-beta/opera-beta-71.0.3770.50.ebuild b/www-client/opera-beta/opera-beta-71.0.3770.50.ebuild
deleted file mode 100644
index 99905f624666..000000000000
--- a/www-client/opera-beta/opera-beta-71.0.3770.50.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 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-beta/opera-beta-71.0.3770.81.ebuild b/www-client/opera-beta/opera-beta-71.0.3770.81.ebuild
deleted file mode 100644
index 99905f624666..000000000000
--- a/www-client/opera-beta/opera-beta-71.0.3770.81.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 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-beta/opera-beta-71.0.3770.97.ebuild b/www-client/opera-beta/opera-beta-71.0.3770.97.ebuild
deleted file mode 100644
index 99905f624666..000000000000
--- a/www-client/opera-beta/opera-beta-71.0.3770.97.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 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 c18f8c4dd1a8..89700abf7cfd 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,3 +1,5 @@
 DIST opera-developer_73.0.3820.0_amd64.deb 72042252 BLAKE2B bc2dd709212c6a26208fac5d1eab246b33ac669a5f593c630ec4c379fc7330bc51485e59b3f981ac314dbf5a1cc4e033b732ea3318103118d76b021b8e6dc62a SHA512 d51eed335794dd5aa64e0300f873a8f202c1733512e192697104089a6bc57ef51ee321843044553f26444e1f649026728d66f847936d983f92c6014f68c2ec8e
-EBUILD opera-developer-73.0.3820.0.ebuild 2334 BLAKE2B e650f419d156d4053fda868c80e1e3bc995423fa37c085fb8949e48d20e7cda09019e89e76de90f5d1f9d70fcfd333006c61d37ddb95e4732aa613a83c45bc93 SHA512 12e1d2306aa0d1c0e0b4565508463a7f9e4f8bffdb40351ba98b5f3ab357d86fc24d764ecb1f560c8bd1cedc5cf0dec333547ad277636eb1d6181ce2b4bd1e72
+DIST opera-developer_73.0.3827.0_amd64.deb 72518736 BLAKE2B 14213c23f1e170694e9b5ccbf04755c0244988918b9c18fd733b64c656827e0d477e916ad02af61c20252ec53d5be06881bed1b8159bfbde20e4339b4ff64dfa SHA512 9b26341ac053674a8461826c221e44c2ee4833613ade0aeb1ee12ecc112418a720c9db14f7165812150576266937ec5c021ed561ad0706672a77df099418a8be
+EBUILD opera-developer-73.0.3820.0.ebuild 2126 BLAKE2B d45518a4a0304f6cb0b4816fcb3f97399bacace2c3ae2cbbb946738eb687bb2157b1fd1a005bd3e66c71fed8ef6a1c026bf0f4f0fe156494619ef71f8f3a34c4 SHA512 e12158a4efb7e939723082d46ed4e0a305cfde724b5e6c78ec533b64a427b6c342f014413e237c957558eaf1ba5fe8fddb76d15e49cbfa809a5f743d16f6d72f
+EBUILD opera-developer-73.0.3827.0.ebuild 2126 BLAKE2B d45518a4a0304f6cb0b4816fcb3f97399bacace2c3ae2cbbb946738eb687bb2157b1fd1a005bd3e66c71fed8ef6a1c026bf0f4f0fe156494619ef71f8f3a34c4 SHA512 e12158a4efb7e939723082d46ed4e0a305cfde724b5e6c78ec533b64a427b6c342f014413e237c957558eaf1ba5fe8fddb76d15e49cbfa809a5f743d16f6d72f
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-73.0.3820.0.ebuild b/www-client/opera-developer/opera-developer-73.0.3820.0.ebuild
index d2ddd1490579..c6ec6cb96a08 100644
--- a/www-client/opera-developer/opera-developer-73.0.3820.0.ebuild
+++ b/www-client/opera-developer/opera-developer-73.0.3820.0.ebuild
@@ -7,7 +7,7 @@ CHROMIUM_LANGS="
 	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
+inherit chromium-2 multilib unpacker xdg
 
 DESCRIPTION="A fast and secure web browser"
 HOMEPAGE="https://www.opera.com/"
@@ -103,15 +103,3 @@ src_install() {
 	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/opera-developer-73.0.3827.0.ebuild b/www-client/opera-developer/opera-developer-73.0.3827.0.ebuild
new file mode 100644
index 000000000000..c6ec6cb96a08
--- /dev/null
+++ b/www-client/opera-developer/opera-developer-73.0.3827.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 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
+
+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
+	dev-libs/wayland
+	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/libxkbcommon
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+pkg_setup() {
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+}
+
+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
+}
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 5b573cb21b61..44dca18ab96d 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,7 +1,5 @@
-DIST opera-stable_70.0.3728.154_amd64.deb 67310968 BLAKE2B e43b41be25dfda3079d2c57c1a9b9df54ff5d27c689fe42efc507a7f979d0ff2a828032bd3d149ab72856d07547f19a1fc625565dee11835734a4061403c7272 SHA512 d708e96be745693de15a23b03716ba77430cc1feeaf56f85ba35dc9b537261a92bc1749d363ed0fba6600810a12e6d470f208c472fee116f6a3f0e100b3ad957
-DIST opera-stable_70.0.3728.178_amd64.deb 67334984 BLAKE2B 5cc3bfdaa19f948eec19ca69af6023526d126e31d8d5c5869f2c86fa63d834c72ca82e6982c57984af531450ed1fc243c7dbae0b2f36d752210aa195570dc660 SHA512 22fbde279f97b7c619621713f980385951abf682f4d38aa63905b5a1f5127a58f3955b4f2d9076c2d82f3dadb2103027fb3f226469226e4b0ad7b438a3bb8169
-DIST opera-stable_71.0.3770.148_amd64.deb 67785272 BLAKE2B bc0f4f6089b278669e1b613eea461fdd416cd2a8682244673a42ea5111500a17e60840dda37e6435ab04e950cca9bc4fe0534ef57a7340fe43c5a38179b035ac SHA512 88394099a30c336b2e7cd14903e525b465dcb5f364301d6602a8937bb7fecdc40fabe220ae57dde9a1efa08e64d4286f5a256704e54e9c3a1f77f7a765a98875
-EBUILD opera-70.0.3728.154.ebuild 2263 BLAKE2B 67babdcb934021a8b2d7a094d152a0afefaf1f4c6dc4495136c1e19b94132fda5c56ed4c458e32d6e9662e58f8f2891f1c2a2b43f29d7cca5a819f348d48def1 SHA512 679d35d4704aebe44161aa5b6d06ffbea1ab6fe3ff6bbe8ac1323e4f973d21b7694ca70c90b2b016f477df8245efa17d0e75cf164a7b0c2655b603fd5afd8336
-EBUILD opera-70.0.3728.178.ebuild 2264 BLAKE2B 3030e3c70536fd8fb5f0d84b8e852ee5c5474ff7fed660cbc916c6caccdf8cd6486d6008ae833cde542551e0b30c633905a52096efcc78885c8f50e11321a811 SHA512 12828f7dfeb9c6c6cbbb0b3c8ecab0b5fa3cd7ad4cee8a88494729c37005cd2c8290fc69a9bb23546c8a7e884a36a715798370cab34267cc1b79e37518e2c666
-EBUILD opera-71.0.3770.148.ebuild 2264 BLAKE2B 3030e3c70536fd8fb5f0d84b8e852ee5c5474ff7fed660cbc916c6caccdf8cd6486d6008ae833cde542551e0b30c633905a52096efcc78885c8f50e11321a811 SHA512 12828f7dfeb9c6c6cbbb0b3c8ecab0b5fa3cd7ad4cee8a88494729c37005cd2c8290fc69a9bb23546c8a7e884a36a715798370cab34267cc1b79e37518e2c666
+DIST opera-stable_71.0.3770.171_amd64.deb 67804340 BLAKE2B 973c0dc2ad27e1cf5b9e17dac7ff0f5eb0cc821c909467857b505d17bc1c8d7b29396ee4ef17e3ea01b0d48a9ef99fd756c928deeecc31dda595d22fd057751a SHA512 e6782456b74546227ca6bf80ce32882cde6e4c6f8eab4b3930069e4c2112065b79648ed0f0847cc6fcb1ec6f1dd5a7e37144c3382bb294237dd24f047906bd20
+DIST opera-stable_71.0.3770.198_amd64.deb 67830756 BLAKE2B ac0feda2b658bdd3447a17b5e63d29d86ae3ddcd8d762fe8756d4151a7ef152f97623269198c509562bde3a6e105067fed5e00a8345c65af914a1667d9df90a5 SHA512 9eea20f3416b04559270a41c6e35bc6e018de6f4b98673780bb5dd66160239e5a9edd37e364549a68bc2cc26c7db1a4a13c77d5c0f55896ce385cc9ffef15716
+EBUILD opera-71.0.3770.171.ebuild 2055 BLAKE2B aa243d07330052b19c1a4c6526bfd025ad1835634640475c16259cd878f22aea6fa4dcd2e02750a7f8fc9787503b43c1d4daf3a68d360055f0ca838cdf4c8507 SHA512 3ab11e54c6f49ee1d309bfca2b52bdb5aafa4f95a6a2658161bd41881ab7a002198cd53ecb3e74c9074bf70a836f9b233b72c24acdfc8be4c18a6a435e162973
+EBUILD opera-71.0.3770.198.ebuild 2056 BLAKE2B 6e7eafea310de551858b2151eca82f812a5de79f934e49d72eb2aaf5b1886235acdc32a7a50573d2ed323dcec0511edf88a59b37241057c77c9f70185f893154 SHA512 4e3c998934659db13763cdf046ad08986b5b18a7a56c9ad10c26d41696967968f474fba22a05f407c650d68f941a5163171c45b4698e2184fb7e9910b172f8f4
 MISC metadata.xml 446 BLAKE2B dbd473cdfed1e48919a7d03f61999b3bbeb294a8ab917bb438b52dcffc304d6cd954f79817b0a73a396a9d153eb5917cfba1c1bd33e419918dc8b9a5dc449379 SHA512 42d93f4994820e8ca5f6d56a94709f8194046395f9aff8f445ce2f80777a43763c124a4ab514bab55751c6a651c9d0002c61c92d77bf9c841ef9e112abd26105
diff --git a/www-client/opera/opera-70.0.3728.154.ebuild b/www-client/opera/opera-70.0.3728.154.ebuild
deleted file mode 100644
index fb69b98489da..000000000000
--- a/www-client/opera/opera-70.0.3728.154.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 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
-	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-70.0.3728.178.ebuild b/www-client/opera/opera-70.0.3728.178.ebuild
deleted file mode 100644
index 58c0be89c0ab..000000000000
--- a/www-client/opera/opera-70.0.3728.178.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 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
-	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-71.0.3770.148.ebuild b/www-client/opera/opera-71.0.3770.148.ebuild
deleted file mode 100644
index 58c0be89c0ab..000000000000
--- a/www-client/opera/opera-71.0.3770.148.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 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
-	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-71.0.3770.171.ebuild b/www-client/opera/opera-71.0.3770.171.ebuild
new file mode 100644
index 000000000000..74846af4b10a
--- /dev/null
+++ b/www-client/opera/opera-71.0.3770.171.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 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
+
+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
+	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
+}
diff --git a/www-client/opera/opera-71.0.3770.198.ebuild b/www-client/opera/opera-71.0.3770.198.ebuild
new file mode 100644
index 000000000000..4a76841018cf
--- /dev/null
+++ b/www-client/opera/opera-71.0.3770.198.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 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
+
+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
+	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
+}
diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index f75e75388e12..85e9207524b5 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,6 +1,8 @@
 AUX surfraw-2.3.0-completion.patch 1202 BLAKE2B 5ee51e874e51c9007e4d1948fb197caf5cb4f62845b56e75baa45741efe3c3405bec7735c77165dc4f9a03047125cc3e35d68cb3e768ef411668f90adf125218 SHA512 6bee4b435d3c52d2165ff76029ab3f7b898d358468c52304f9bf70f5c991e0387928d154d1097cfdd08d826f9c8695e85f587ef529978f7d97cbe07caf183443
+AUX surfraw-99999-sr-completion-path.patch 463 BLAKE2B f13c4436756532f6ea15718ae40f01dc257cd0ebcd17a890466d27027149de49da80872e9050440aeabaff7e3379136ae4747230ea5345584fb11c2485be466e SHA512 80d110e18c4e7d1b258b9bbb809973d0f83f20f137889593e1cc90bc192eb4d54c1a39eac3145610b184e7f40de6e0bd5c75a59fbb543f90f58ca3ff253dadd5
 DIST Surfraw-surfraw-2.3.0.tar.bz2 114065 BLAKE2B 91105b225737fe8f3a016e8c723421a2386c48f0c245b6ed119e4cc0f1032c9362e83a062134d0fef8b1cb14f58af07d3d9abe72c4efef9e79c6eb4c93bab25c SHA512 43f0dd2b48a045a47e73e8ef8058e0590a0409367e8378a086497ef912c58317614ba318b006913803529a51a641858a58c1f9f6a2f93dcdea9a45a26484af02
 EBUILD surfraw-2.3.0-r1.ebuild 2551 BLAKE2B d133c24fc4124485752353e66db1cdefb5f90d0cb1bc2e98437de78f13ccb45ac5479dfd4c3c9237e4bc3264cd826983e32cfb024f8616beabd4c7c5e13e34ed SHA512 44d14989a604b2b9db566bfa5fc980e9de9f7b069d4c89922af2a9750b01ab7877c3cfeb80b6eb7b7a164d394ec641ce2f3af1118e6313cdcd41446ed733a700
 EBUILD surfraw-2.3.0-r2.ebuild 2510 BLAKE2B db46028bea6faa656ff5b3c853c0d8827b20b7e3288da1a873222e73d8588af72f6fee01e3b7f7f1903b8cc11ab8de04a650a7cafca7823c48fc97a52573c48b SHA512 49155576c86f0887eb78ec467c4e797029a765563913518e39ffc42e9fe6444fe626ee0e4799d33d789f6e4ae54bb71f9b003662198655e3603ef2bb994fc73a
-EBUILD surfraw-99999.ebuild 796 BLAKE2B bdaaf4148ad6fc7063d06725745dc539e011234ecd9c7501bd434d129c7137b16d7ccd1c196f001b32151e92e8d878ec6a3b6b2576d810e9bf36ed69da677f70 SHA512 617102f4f7a748a7869e7f4393312b838570e9a9cf9e8d00b5f4ac333ad4134db154adf3d86eacbaced57251eae673e81659bb020f4240b9d586a741912fba4f
+EBUILD surfraw-2.3.0-r3.ebuild 2936 BLAKE2B 38d52ffc6e80f4b51dab460779f2b062daf95855d11943e5fe010adf344a758cec2071a724f57ad573dd1fd79cad590381b276098514b5b012272336f637742b SHA512 e63247e30c605f047d9fc4c22fe638da71d327078aafc8bab9d98135a48f1493f8bbb97a3bf0a13b242234831642b73a37ad3f03cf2016dd54f656314b53184a
+EBUILD surfraw-99999.ebuild 1274 BLAKE2B 30a2f4f4a90ddfa92bccef0f47e75af6bbdc8535644ec378b68bd7bee11581886ee80d11e105ef92b87af148a28a75e384bdd46a1d4b64d9012cc4b1a4fa671b SHA512 ba478cafb5c958adabe27bba76da46a1c4a08bc5bbdd7a2f7132d43687b7a42fb68f981147793dd49d1e3775083a16fe476aeb2c153959744bf62363542580f6
 MISC metadata.xml 1439 BLAKE2B 0863a7f2566c13e6ea8fae5379f6f078fb5fe87cded695a011550a7829c3d6ca47c3c39c41922dd055c74a79ecd4cb9a070318c3fa41fe5ec1bbb5cd7f40f613 SHA512 86b0384eac922d16b5e686bdd3470a3eb6a1827c57cc0a31311c378d1068d2c7446dd22af7e57326f667b87ef03862924475bb1fd0b16ad629bc8034586d34ec
diff --git a/www-client/surfraw/files/surfraw-99999-sr-completion-path.patch b/www-client/surfraw/files/surfraw-99999-sr-completion-path.patch
new file mode 100644
index 000000000000..273ffcb3ce55
--- /dev/null
+++ b/www-client/surfraw/files/surfraw-99999-sr-completion-path.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -112,7 +112,7 @@
+ 	mkdir -p $(DESTDIR)@datadir@/bash-completion/completions
+ 	@cp $(top_srcdir)/surfraw-bash-completion $(DESTDIR)@datadir@/bash-completion/completions/surfraw
+ if INSTALLSR
+-	@ln -sf $(DESTDIR)@datadir@/bash-completion/completions/surfraw $(DESTDIR)@datadir@/bash-completion/completions/sr
++	@ln -sf surfraw $(DESTDIR)@datadir@/bash-completion/completions/sr
+ endif  # INSTALLSR
+ endif  # BASHCOMPLETIONS
+ 
diff --git a/www-client/surfraw/surfraw-2.3.0-r3.ebuild b/www-client/surfraw/surfraw-2.3.0-r3.ebuild
new file mode 100644
index 000000000000..afa5aad6b120
--- /dev/null
+++ b/www-client/surfraw/surfraw-2.3.0-r3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A fast unix command line interface to WWW"
+HOMEPAGE="https://gitlab.com/surfraw/Surfraw"
+SRC_URI="https://gitlab.com/surfraw/Surfraw/-/archive/${P}/${PN^}-${P}.tar.bz2"
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+RDEPEND="
+	dev-lang/perl
+"
+RESTRICT="test"
+DOCS=(
+	AUTHORS ChangeLog HACKING NEWS README TODO
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0-completion.patch
+)
+S=${WORKDIR}/${PN^}-${P}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-elvidir='$(datadir)'/surfraw
+}
+
+src_install() {
+	default
+
+	local sr_man_page
+	for sr_man_page in $(find "${ED}" -lname surfraw.1.gz); do
+		ln -sf surfraw.1 "${sr_man_page/.gz}" || die
+		rm "${sr_man_page}" || die
+	done
+	for sr_man_page in $(find "${ED}" -lname elvi.1sr.gz); do
+		ln -sf elvi.1sr "${sr_man_page/.gz}" || die
+		rm "${sr_man_page}" || die
+	done
+	for sr_man_page in $(find -P "${ED}"/usr/share/man/man1/ -type f -name '*.gz'); do
+		gzip -d "${sr_man_page}" || die
+	done
+
+	newbashcomp surfraw-bash-completion ${PN}
+	bashcomp_alias ${PN} sr
+
+	docinto examples
+	dodoc examples/README examples/uzbl_load_url_from_surfraw
+}
+
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.0.7"
+	upgrade_from_1_0_7=$?
+}
+
+pkg_postinst() {
+	local moves f
+
+	einfo
+	einfo "You can get a list of installed elvi by just typing 'surfraw' or"
+	einfo "the abbreviated 'sr'."
+	einfo
+	einfo "You can try some searches, for example:"
+	einfo "$ sr ask why is jeeves gay? "
+	einfo "$ sr google -results=100 RMS, GNU, which is sinner, which is sin?"
+	einfo "$ sr rhyme -method=perfect Julian"
+	einfo
+	einfo "The system configuration file is /etc/surfraw.conf"
+	einfo
+	einfo "Users can specify preferences in '~/.surfraw.conf'  e.g."
+	einfo "SURFRAW_graphical_browser=mozilla"
+	einfo "SURFRAW_text_browser=w3m"
+	einfo "SURFRAW_graphical=no"
+	einfo
+	einfo "surfraw works with any graphical and/or text WWW browser"
+	einfo
+	if [[ $upgrade_from_1_0_7 = 0 ]] ; then
+		ewarn "surfraw usage has changed slightly since version 1.0.7, elvi are now called"
+		ewarn "using the 'sr' wrapper script as described above.  If you wish to return to"
+		ewarn "the old behaviour you can add /usr/share/surfraw to your \$PATH"
+	fi
+	# This file was always autogenerated, and is no longer needed.
+	if [ -f "${EROOT}"/etc/surfraw_elvi.list ]; then
+		rm -f "${EROOT}"/etc/surfraw_elvi.list
+	fi
+
+	# Config file location changes in v2.2.6
+	for f in /etc/surfraw.{bookmarks,conf}; do
+		if [ -f "${EROOT}"${f} ]; then
+			ewarn "${f} has moved to /etc/xdg/config/surfraw/${f##*.} in v2.2.6."
+			moves=1
+		fi
+	done
+	if [ "${moves}" == 1 ]; then
+		ewarn "You must manually move, and update, the config files listed"
+		ewarn "above for surfraw v2.2.6 and above to use them."
+	fi
+}
diff --git a/www-client/surfraw/surfraw-99999.ebuild b/www-client/surfraw/surfraw-99999.ebuild
index 6c4ea3c98769..83703adf77d3 100644
--- a/www-client/surfraw/surfraw-99999.ebuild
+++ b/www-client/surfraw/surfraw-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,7 @@ DOCS=(
 )
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.0-completion.patch
+	"${FILESDIR}"/${PN}-99999-sr-completion-path.patch
 )
 
 src_prepare() {
@@ -37,6 +38,19 @@ src_configure() {
 src_install() {
 	default
 
+	local sr_man_page
+	for sr_man_page in $(find "${ED}" -lname surfraw.1.gz); do
+		ln -sf surfraw.1 "${sr_man_page/.gz}" || die
+		rm "${sr_man_page}" || die
+	done
+	for sr_man_page in $(find "${ED}" -lname elvi.1sr.gz); do
+		ln -sf elvi.1sr "${sr_man_page/.gz}" || die
+		rm "${sr_man_page}" || die
+	done
+	for sr_man_page in $(find -P "${ED}"/usr/share/man/man1/ -type f -name '*.gz'); do
+		gzip -d "${sr_man_page}" || die
+	done
+
 	newbashcomp surfraw-bash-completion ${PN}
 	bashcomp_alias ${PN} sr
 
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 6020a7d9ad2f..b01049a70a09 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -14,8 +14,13 @@ DIST vivaldi-snapshot-3.4.2049.2_p1-amd64.deb 73500204 BLAKE2B 77ddd6b14291a8575
 DIST vivaldi-snapshot-3.4.2049.2_p1-arm64.deb 65898224 BLAKE2B 63b75e0f9c8407837c536ee0f471e625e43cafe6c28d468653d65f2b48f8da0fb316031408e98cd4d5a3c8f4d6ba3217ec1e28291c5d049d196431a2eb014017 SHA512 b4022083a406655699c4414542099b7e057c08b09dbc30d62c92e0dbfa7e2bec5fbf0965140d9d81cf5d3715f581b4b0d15e91736340a821dc2cc580c5edf229
 DIST vivaldi-snapshot-3.4.2049.2_p1-armhf.deb 64892132 BLAKE2B a172cf9adf32abbd3193fca7fbabffec373d68318681038721b49ee3f91ce53c8623ec1f6c1c6cad8fbdb8cf4a9360089b597847d4d5540055e096beccf1ad7d SHA512 f4cc934349c6abbdab98b5feec593477257539069ff316df82f202a0ab6214abe8ba8a7efa6b3b02c22393ebb12367ddc38c6ced26f68c6abee0255745f68ec4
 DIST vivaldi-snapshot-3.4.2049.2_p1-i386.deb 70673824 BLAKE2B 2895ec5606727315ca67894b2a29e4ae1a747a09d47bc69da276ec026d9ab6c773d8abef66cca9d94632ebc7f3658c0086d76d9696359aef8e19a2bf35ba741f SHA512 ae5c7d2fee224a229266affc6dede97a033b387d5f796d933f5a37a0394e1c954d8a3a2dc4f2674abf69096af8023d7bad274bde5d91ecc17662e0656bfb74b2
+DIST vivaldi-snapshot-3.4.2056.19_p1-amd64.deb 73504020 BLAKE2B 6eac459befc2e0af859d1b47b906f9e070414c4b9035c9e0fd695a14d920491fcf33a7f15e285c3e6625909f173a4bd8acc098a8e420d0814d94686484ccd303 SHA512 72c717d25eed0e5ebf8d08704ac3e85da0842d94d1fcc9a77a8ac47d4ee8bdd6280bfd4242f789c152511978b075e13d8c4a6fe8ad870f7cff36de2aa4e327a1
+DIST vivaldi-snapshot-3.4.2056.19_p1-arm64.deb 65922752 BLAKE2B 8a6d813ef23ca4f8daf7c4e8d799ce4af59787c9017902b5497ef0bb0ba9d0668f5fc17af1eccde402ad53d7267d82d9feb94784e5ec79784d0513a7420ac639 SHA512 5180c8f0d5300577da4eff7867c5d41e5a6179a4a78fcec335913ae4b44ce2005b520d78796f280e3473edabfd95e521b6c34f2d972fa4c134e672c6c9f151ef
+DIST vivaldi-snapshot-3.4.2056.19_p1-armhf.deb 64889956 BLAKE2B 8a9d3efcf4f6ec700c361cf98561295a17b473fb437e631b1f7c2b8cec2e37bbdb3b733015a363bed21419105a0dafbb6b4b6b3ed15e2d7fe2ff92c4fd8b4d51 SHA512 cbbf57d916cb1cbd3de49405a19a20ffbe09579f0ddad4d1e27ca5fbee824b0240b10064893650217b6ef0f29d4d194875eb30c1fb12786dd006671ad7eeb378
+DIST vivaldi-snapshot-3.4.2056.19_p1-i386.deb 70724892 BLAKE2B 17313d53f72931462583784a4619ec39f875994b6340c40fbd9e6303bf3f36b771b05419496c0cafe98323508b20a0fa3aa579b9534b6d6b2ee780ab02d9f8e2 SHA512 050282659fc6392b815bc902b72a4058eed6de0081e8ca170ebfd1909723b4a693313a8099eb56198fa42eff727c29ba31b0d71328700a57fff8e7c412842a92
 EBUILD vivaldi-snapshot-3.4.2035.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
 EBUILD vivaldi-snapshot-3.4.2036.3_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
 EBUILD vivaldi-snapshot-3.4.2038.4_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
-EBUILD vivaldi-snapshot-3.4.2049.2_p1.ebuild 2614 BLAKE2B d5e4ad5b5ecdc0e50c8a9a5054d2d76847c1b561d3015a50b79f9f70e55afff3d6447973a84849e2fbb3b1ddfc96a5935493c826d1e291ec9599375bc872c071 SHA512 ceb902e8aed71a56616f4ee04a59e13c459f97d21975a0b54f9c26917d0e62763183cbfc0935127ea34605115a965d3c29f98e033f38abff5875af13abef6e42
+EBUILD vivaldi-snapshot-3.4.2049.2_p1.ebuild 2466 BLAKE2B 6195ccfdd748c7cfbda4d6401395b5ff6aa8011cd07e5938e82e4d233be43095788e9826487f90be8f2beb3d931332ac08d687c84f34b20639e279a2655d5dc3 SHA512 c24c5b42d05501ba7518f746ff202349fc3831148534a73a22dc955f53eb04c66caa66a0c0dd643cf1ad1714324671c043295d393774c757db0118a5ed876be6
+EBUILD vivaldi-snapshot-3.4.2056.19_p1.ebuild 2466 BLAKE2B 6195ccfdd748c7cfbda4d6401395b5ff6aa8011cd07e5938e82e4d233be43095788e9826487f90be8f2beb3d931332ac08d687c84f34b20639e279a2655d5dc3 SHA512 c24c5b42d05501ba7518f746ff202349fc3831148534a73a22dc955f53eb04c66caa66a0c0dd643cf1ad1714324671c043295d393774c757db0118a5ed876be6
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2049.2_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2049.2_p1.ebuild
index db3613b057e7..0178e0245253 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2049.2_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2049.2_p1.ebuild
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="
 	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
+inherit chromium-2 multilib unpacker toolchain-funcs xdg
 
 VIVALDI_HOME="opt/${PN}"
 DESCRIPTION="A browser for our friends"
@@ -104,13 +104,3 @@ src_install() {
 
 	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-3.4.2056.19_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2056.19_p1.ebuild
new file mode 100644
index 000000000000..0178e0245253
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2056.19_p1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 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
+
+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 )
+	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 ~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} \
+		|| 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() {
+	rm -r usr/share/appdata || die
+	mv * "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index ad4a7b989dc4..92fc7de6d88b 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -2,5 +2,5 @@ DIST vivaldi-3.3.2022.47_p1-amd64.deb 72566388 BLAKE2B a554a671a57927a6010534ea0
 DIST vivaldi-3.3.2022.47_p1-arm64.deb 65274916 BLAKE2B fc8bbf72484899741ff5383c9996204f21329679deb8a5712e98d0aa863998803023faf58d97382c10e9ca426e29c40295cb169f93621d783d5239f1d20ed144 SHA512 7cda781b9531e871070d211549f9cbabbb25c20bcdd208c2322032cefbe7f56d66f751a483fa0a68402db89d7ebf570099c9330d79c971353c8bc62592e0f839
 DIST vivaldi-3.3.2022.47_p1-armhf.deb 64311036 BLAKE2B 49ae9cf662bcbc438d0c082cadbcfca9fbaeda4da5418342133ada00d55ffc33cafbde1b71b469a00952ed9326daabfb766b96e4d1c78af7ef03364f9766d4dc SHA512 eb0ef5e061e32f8322ece7fd2169af19641a3f1a7f3d992d0cfc077eec48e848d74f5498d0f88b40eddf761ffb26e30bd0c38168858a9619a3648906cf7d1a8a
 DIST vivaldi-3.3.2022.47_p1-i386.deb 70821004 BLAKE2B 2a514e0242eddf2bb9abd1a25d9b5e9344be192de515601bd31c809c17a13240989a615a37e4c72b175d6b827b20147814cf9067989e2223669256619ace5077 SHA512 c3c681a9a0b56b859e62b22f155d81ca498ff4ff068e947a77430322e615a1e550b3fd8448b96dfe792ccc3703648fe9f0c241fdebb2fc57a6114f62354d19df
-EBUILD vivaldi-3.3.2022.47_p1.ebuild 2970 BLAKE2B ee909eefd804082c5c3ba23a589395f6edc0e96e0e9cef593ead4b64f46d0b25a81e7c89c6ed1eea88a0980b5ba4e8f03407e6c37db3d9d9cab3dfb71d65cf02 SHA512 64cef34c3a0239d62b82521cf07306b1ba70502354050acd2b2be643e34af9b5c282c423c1237ca34d96b0cb6557eb388ed90b532c8d84054c4e367b7a03bb1a
+EBUILD vivaldi-3.3.2022.47_p1.ebuild 2822 BLAKE2B d789dab33c105c76ad04055a8d73a9f4d240dc0188e959963ee985538164fe9ee3904a83e9e558a1c969ef87f620eaf2ac5e5aabb07ea8a6e9aa6dd08da719e4 SHA512 ed638bb8b00e0cee8da2a96bfcebb9fe0f729fb42415155b8df82d05d67e486db577356f310d99c5ee92a37f4a5d3b85e48a08c0c73a26f6914f764519e39357
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi/vivaldi-3.3.2022.47_p1.ebuild b/www-client/vivaldi/vivaldi-3.3.2022.47_p1.ebuild
index f28a5ac334d7..f807af0fd17c 100644
--- a/www-client/vivaldi/vivaldi-3.3.2022.47_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-3.3.2022.47_p1.ebuild
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="
 	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
+inherit chromium-2 multilib unpacker toolchain-funcs xdg
 
 #VIVALDI_BRANCH="snapshot"
 
@@ -113,13 +113,3 @@ src_install() {
 
 	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-misc/Manifest.gz b/www-misc/Manifest.gz
index b36a7426eb07..9ce7e7b96092 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/mergelog/Manifest b/www-misc/mergelog/Manifest
index 2d564159bb65..78ab0749197f 100644
--- a/www-misc/mergelog/Manifest
+++ b/www-misc/mergelog/Manifest
@@ -1,5 +1,5 @@
 AUX mergelog-4.5-asneeded.patch 1106 BLAKE2B f125b2f5604202ddcbc03656c4086532672306d3d5780c65c816dd249e29ce5944d4a8da80a316344b881166a43215047159d511712f1dc3a2c855cf61ccf4b9 SHA512 88c6e44645b41d84e67e4973dede40e550ea64b8d98490eed4c55b8240e3cecbedcf6697b5b73264e5358f3c4eea11cf2534f9588c0bf638d288678e60f8f5fa
 AUX mergelog-4.5-splitlog.patch 13678 BLAKE2B 9d6a020d492edfacce955087e165254708547c800da25cb70d338ec190b7431473068e32fee3acb8798a6f0b09134af0f7668cf9ac01de5026fd84c999ac8348 SHA512 1d3b104e0ea27e41227cf903196a1cdbd4f362a85f9aabe95ea2a648dcc3db5378dc0a64c06b406237c88db91ac8cd63b73bce32de3a80bd44b14f5cf24de803
 DIST mergelog-4.5.tar.gz 39407 BLAKE2B ea51ab27a4a76e635b3a364854cb488ef5b88878a5cb5118443f14658661157c4a8cf601f945e8869614b0205ff71f89d8d8e0b80815a2671ba497e740d6d01a SHA512 f2259cb8981871c1f9d7cadc5414997789aa13eed0e18701673ffbddedc74954e137e282c1357cafaf515e18b39e256f890ec31568a305feefa1089a9347991f
-EBUILD mergelog-4.5-r2.ebuild 526 BLAKE2B 52674bc3341aa9d74a80fa815263aafef02c7dcbccd907c64cb2d5ea43de695d89670c74462d8c7622c000c666430d3cc448fdb5d34eaf643c45d43f23cf7546 SHA512 e77a5320c9a304b0e20094b4086c7a2ee619cf134dfea17f1348de08a9aadde2c678a9ffa207815afb6913c77921da0fe6f030c458af990b96b4495b2685e64d
+EBUILD mergelog-4.5-r2.ebuild 533 BLAKE2B 0798a4116a40aa1bdfc23a59ea9cca8a5ab05118b65f0a4ca0778816c05051e7b512db608bedfd67fee5b736ed7d6d46cc68bca844b19ddee02bd00a0d63b99f SHA512 e145086b30341f6dfa9407d1f426f093802e37b54e6deda5712da2f59e0b30986be093db505fede0f3bd0574d1fb07e4b5975fbc4a14f5eb70ff8b39c24bab3f
 MISC metadata.xml 588 BLAKE2B b1b0444cee23d8cb7dab856ca462529046683b0a3987f490fda2e0a4e5db796eda47e61f164f7af277d87f771657f3bdf62c400179f2fb97751628102a79be6d SHA512 8301f5e4da25f389e6d3c26bad59c5170c6f971f56b79cd62786cb6fba287e9b3d865f648c04ae4ab22a40fb2815ca69ad36afd917b92d0bab97cd75cbfa41ca
diff --git a/www-misc/mergelog/mergelog-4.5-r2.ebuild b/www-misc/mergelog/mergelog-4.5-r2.ebuild
index 8872f3141239..74b4b2512937 100644
--- a/www-misc/mergelog/mergelog-4.5-r2.ebuild
+++ b/www-misc/mergelog/mergelog-4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mergelog/${P}.tar.gz"
 IUSE=""
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~arm64 ppc x86"
 
 RDEPEND="sys-libs/zlib"
 DEPEND="${DEPEND}"
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index bde4be29571b..faaa801515c0 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/google-talkplugin/Manifest b/www-plugins/google-talkplugin/Manifest
index 7d86bf827a50..ed07375422d4 100644
--- a/www-plugins/google-talkplugin/Manifest
+++ b/www-plugins/google-talkplugin/Manifest
@@ -1,8 +1,5 @@
-DIST google-talkplugin_5.41.0.0-1_amd64.deb 7813320 BLAKE2B 8e982ca7961f7bca69cadec9bb91f396ab5d79594cee479a09302a3ef9e7b7c13c3dd4c02eb03a43d087756b9bd3f2514b30a3e4f4467b7032563d3e2bcc06bc SHA512 cfeed6384fee1f25c12a90c3b39081f058dbcc1043a4692450f143569ce1fe6b94f0978f76362eafac87a15820b806fd01cc9975d80c076d35456533f9486cb1
-DIST google-talkplugin_5.41.0.0-1_i386.deb 7659028 BLAKE2B 3195dbeecc56cded73e94d4c47ea36a969ad728305485f2bdc52fe0dd99630f60f22126f303b8bfdf99927adaae5fd123cdfeb854e29c0b2b982c6d4c14f2411 SHA512 ca5cd6b296791de471151710558d6fb501d584620703817ba5de769d639b653fd67ed30ae6d3aff3411b69c39a22232f2af9067d8b771677d26c561ffe958533
 DIST google-talkplugin_5.41.3.0-1_amd64.deb 7800474 BLAKE2B be28444d07f0fa10beaeb5572b6e2faf1b6315f0928fc40c531bc4639bfbac3b15069f28bb03f9155771b2a7c871911ca5ed5bf5d2ab321e0bc3eba9f82ee577 SHA512 8802c1726c9b362db5302a8b2243c8d84c2b35b9ab55adacc08ed05a5fb98d2778c2ff516a5df13bcaa499ab9d902481957b119624467be69a2833e0b76ba218
 DIST google-talkplugin_5.41.3.0-1_i386.deb 7629820 BLAKE2B d0b42df38960f22b13a57c7d2a02ac4993c15cb27e749218a878b9b2ce23ca39e5b1c352dce3e086cff06c3c781a99e0123542a5bcf755f5a0f7286015a7eaa8 SHA512 9a133cec4c57672018985a1f924e87a6cc13c27b69fbf248daa60ae27df3669e4f510e591de20f41d75dfa2dd8bb499e8d8d04efd2b9d2288b381371b662dce9
-EBUILD google-talkplugin-5.41.0.0.ebuild 3660 BLAKE2B 9c47e7ba2f8e436487f7346a66db6ea3842667945c56374c6c514a04dbe6ac0a3dcb3e46586daf85e6b3ed20e940c7da29831df099387fb315d3b41fb64f190e SHA512 251e2e9cd61ab7fa3b058cce7e46afcbb08be94eb6c05980abb9df10ffa7cce3a311200d8d81774bed827fdbea84052a073608e1a96afda46526625c1dbf75f8
 EBUILD google-talkplugin-5.41.3.0.ebuild 3659 BLAKE2B 9c2e7d05edae615abf40fed59907b4f82eed6827d238c6a16a9e7a7defd68e601ff96914d9e6e6e09ddb1674d31afdda5d780c7b0067f32155e2751f27f734c3 SHA512 e10cae68ff5007b91119a1cb69a1adc41d6aab69136a6abd2268a0e842dcab4d807e421bd242021fbe1dcc527c2526672fcdd86fb909d3d5b52c1d03f9ffc6ce
 EBUILD google-talkplugin-9999.ebuild 3626 BLAKE2B 035f90fb5312ed54c0c9cd9b94d12ce405e3428edb2417aab6896b608989997e3c8196099e0ef0b288e869392d7d655c9371a4cc13bf708e14903d41a7aa86c3 SHA512 e271055ee41ff77d9165ace48fa355f2d31ca5394a667e8b52f6b62ef5dcb9c33a7ae95ecd24903dd1de1a0f94ce6c679e97963a2871e9beabb8413d5b9b3d9c
 MISC metadata.xml 389 BLAKE2B 97b4377ea1d76c0c1cb2d3a5dbbc1fbd5b0115b1aa97a53febce757a1612ffb656c478639d0eaa411118981bd44f474a90a318f790646e5f8bd445dc7d3c98ac SHA512 88ea0212fafc1b4cfa072502d6ea103bb2e3f232ee6879fc95736085b8b2f7fa765333fff19c11c2250d93cc71db9535d518beefc42195ce35c4bc8454fbc94b
diff --git a/www-plugins/google-talkplugin/google-talkplugin-5.41.0.0.ebuild b/www-plugins/google-talkplugin/google-talkplugin-5.41.0.0.ebuild
deleted file mode 100644
index 3aeeda9649fa..000000000000
--- a/www-plugins/google-talkplugin/google-talkplugin-5.41.0.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib nsplugins unpacker
-
-if [ "${PV}" != "9999" ]; then
-	DEB_PATCH="1"
-	#https://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages
-	MY_URL="https://dl.google.com/linux/talkplugin/deb/pool/main/${P:0:1}/${PN}"
-	MY_PKG="${PN}_${PV}-${DEB_PATCH}_i386.deb"
-	SRC_URI="x86? ( ${MY_URL}/${MY_PKG} )
-		amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )"
-	KEYWORDS="-* ~amd64 ~x86"
-else
-	inherit cvs #hack to make it part of @live-rebuild
-	MY_URL="https://dl.google.com/linux/direct"
-	MY_PKG="${PN}_current_i386.deb"
-	SRC_URI=""
-fi
-
-DESCRIPTION="Video chat browser plug-in for Google Talk"
-
-HOMEPAGE="https://www.google.com/chat/video"
-IUSE="libnotify selinux"
-SLOT="0"
-
-#GoogleTalkPlugin binary contains openssl and celt
-LICENSE="Google-TOS openssl BSD"
-
-OBSOLETE="yes"
-[[ $OBSOLETE = yes ]] && RESTRICT="bindist fetch strip" || RESTRICT="bindist strip mirror"
-
-RDEPEND="|| ( media-sound/pulseaudio media-libs/alsa-lib )
-	dev-libs/expat
-	dev-libs/glib:2
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/pango
-	sys-apps/lsb-release
-	selinux? ( sec-policy/selinux-googletalk )
-	libnotify? ( x11-libs/libnotify )"
-
-DEPEND=""
-
-INSTALL_BASE="opt/google/talkplugin"
-
-QA_PREBUILT="${INSTALL_BASE}/*"
-
-S="${WORKDIR}"
-
-LANGS="ar cs en et fr hu lt ms pl ru sv tl vi bg da fa gu id ja lv nl
-sk ta tr bn de es fi hi is kn ml no sl te uk ca el fil hr it ko mr or
-ro sr th ur"
-
-# nofetch means upstream bumped and thus needs version bump
-pkg_nofetch() {
-	if [[ ${OBSOLETE} = yes ]]; then
-		elog "This version is no longer available from Google and the license prevents mirroring."
-		elog "This ebuild is intended for users who already downloaded it previously and have problems"
-		elog "with ${PV}+. If you can get the distfile from e.g. another computer of yours, or search"
-		use amd64 && MY_PKG="${MY_PKG/i386/amd64}"
-		elog "it with google: https://www.google.com/search?q=intitle:%22index+of%22+${MY_PKG}"
-		elog "and copy ${MY_PKG} to your DISTDIR directory."
-	else
-		einfo "This version is no longer available from Google."
-		einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
-		einfo "Please file a version bump bug on https://bugs.gentoo.org (search	existing bugs for ${PN} first!)."
-	fi
-}
-
-src_unpack() {
-	local pkg="${A:=${MY_PKG}}"
-	if [ "${PV}" = "9999" ]; then
-		use amd64 && pkg="${pkg/i386/amd64}"
-		einfo "Fetching ${pkg}"
-		wget "${MY_URL}/${pkg}" || die
-	fi
-	unpacker ${pkg}
-}
-
-src_install() {
-	local plugindir i l
-	local ppapi_plugindirs=( /opt/google/chrome{,-beta,-unstable}/pepper
-		/usr/$(get_libdir)/chromium-browser/pepper )
-
-	unpacker usr/share/doc/google-talkplugin/changelog.Debian.gz
-	dodoc changelog.Debian
-
-	exeinto "/${INSTALL_BASE}"
-	doexe "${INSTALL_BASE}"/GoogleTalkPlugin
-	for i in "${INSTALL_BASE}"/lib*.so; do
-		doexe "${i}"
-		[[ ${i##*/} = libnp* ]] && inst_plugin "/${i}"
-		if [[ ${i##*/} = libpp* ]] ; then
-			for plugindir in "${ppapi_plugindirs[@]}"; do
-				dosym "/${i}" "${plugindir}/${i##*/}"
-			done
-		fi
-	done
-
-	#install screen-sharing stuff - bug #397463
-	insinto "/${INSTALL_BASE}"
-	doins "${INSTALL_BASE}"/windowpicker.glade
-	doins "${INSTALL_BASE}"/remoting24x24.png
-	doins -r "${INSTALL_BASE}"/data
-
-	strip-linguas ${LANGS}
-	for l in ${LINGUAS}; do
-		insinto "/${INSTALL_BASE}"/locale/$l/LC_MESSAGES/
-		doins "${INSTALL_BASE}"/locale/$l/LC_MESSAGES/windowpicker.mo
-	done
-}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 0063f56a721e..ace632103007 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 72760a7ac28a..d3cdf60402d5 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -3,5 +3,5 @@ DIST gunicorn-19.9.0.tar.gz 415774 BLAKE2B 1ac920e3a02aff434d2458cbcacd821df428e
 DIST gunicorn-20.0.4.tar.gz 373841 BLAKE2B d6f0b5b901697ebc6ee987af5766174a845de8bfad03ce95638ed087b92175e9b2f0e9a49fda70f8f9c6fdc15e1ef1a431c069270af068fb29780abcedf63fc3 SHA512 706620f165e36c178a6d3e65f51a9bb7746abd40dfc7c0f1b3b523771be953dd03b36111f192407aef474ad44afdffd11b6502e51376d11465ffac2255822d5e
 EBUILD gunicorn-19.8.1.ebuild 1171 BLAKE2B a8c6b1dcbb749db4dcf60b8c26111045be976f28559b2cb4a7f7ef1536dae320a0f7060bd572bdc2998dab0003230ad1688ca4c28130c70757702504222998e6 SHA512 ab4761df1c5e57b7aa87095de97915126007055a87cac29866a603604c47ef4f25886cdef723de8b36eccdbfd7b2ed835832b54b827ed3f27c97cee0c30a90f5
 EBUILD gunicorn-19.9.0.ebuild 923 BLAKE2B d6a784321f92ca5b2cc04f077a7d18bc24a1371867607b3813820e5089ce36f2f41ac38fae36b00fb1c8c2fbee9a36398624bc3823072c2eba50e3e8848f18c7 SHA512 f14c034ae4d0fa97483b80df04e5bba6ca4219b8944d38cbd43a21c91daafe001331985f1bda79fb9be81bac55db6fce2a64be489a91db37c723af452d563a7a
-EBUILD gunicorn-20.0.4.ebuild 888 BLAKE2B 1705ce3c003863b7b5e2f5ace32e77a6dca24fbddac48da0c9d2b361f5f673b5ce82350ffce1ada7516d70bc91a601eb7ba623a4753bfe54551c90939d00c8ec SHA512 b9a719e634bd28384a5a6ee7eb4e1d7ce1b8a8cdfdfd86381a6bdf47b8700cf20b37cedce8f84d71eb4391783c4a59ea08e53aed3bdb0b06ba7e6b2b5cf752fc
+EBUILD gunicorn-20.0.4.ebuild 895 BLAKE2B 78cde1587279ce2a0eb5a70d03c51352d99c7abb66c1f1d68fa79872e59dc91ba0e068b448306d8096ebb0895d427406e6b692ec436257be027d9b10a9f63f2c SHA512 34b09643e8fde9c1cc34539d4eadf09abf0004625990e49f6eac23f1c4375cec90afdb4ae888bf45993ecf7da634ac2a7d5b2545017fb904c1a92051dc0ec72c
 MISC metadata.xml 808 BLAKE2B d23e87c5659aed0bcb8a8719d3eb3a862ddff635b231ae01b3928cd6f33cd073b5b054742ed806a9dc408528c3a843a06e5db4c6a252beaaace6873d798468f7 SHA512 c420223f8e7f0b3ec1fb82091e38a85087ca814b16051dfd783e54d8af5fdb811086887a5f1e7177f8bcd37e098ab6244e3e8ecf38c6a3fa9941c2933b38e1c0
diff --git a/www-servers/gunicorn/gunicorn-20.0.4.ebuild b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
index 03560b760187..39f4261a8dda 100644
--- a/www-servers/gunicorn/gunicorn-20.0.4.ebuild
+++ b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT PSF-2 doc? ( BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
 
diff --git a/www-servers/pshs/Manifest b/www-servers/pshs/Manifest
index ad80c9440681..b2e81b1c359c 100644
--- a/www-servers/pshs/Manifest
+++ b/www-servers/pshs/Manifest
@@ -1,4 +1,7 @@
 DIST pshs-0.3.4.tar.bz2 81435 BLAKE2B e5a72c02efbaa95f0069d2533ce4434da88a5eaf33b7025b5d83bd0679631d6ee0b1faf31a5f3b0ed3bf2e23d4500bf6f473d997cabf99d8b769f4a2c662d32f SHA512 d264b46ad54286d5c4fac601e3353c1029af75ad59f28fea5a2970dc7e9b00327a08dfdd82141c76656f07047cfce1fa35b485b2f69f0728bcf74c835def917d
-EBUILD pshs-0.3.4.ebuild 977 BLAKE2B 35b554b7b1ab12ad32e2fcff7987892fba5e4eb66d0c5127e2d0e4e7e43380320d5d4bd08b094c7db3b1e86af95b85eeff3bba6d79b38ea7ac6226b3da30db7d SHA512 a90f6e8ccb198db874a0bce03baecbd850e7aa5c3a3cf73964e9f1837b464dc6dc4d79f58cd596505ac20f1342f36ed9af66387d89918c6c35084b19b3df7a90
-EBUILD pshs-9999.ebuild 1011 BLAKE2B 6b9807aabc60e93373dc2e38b15aa6877df3a42ae9791f4a6f3a92eaa0db0a618c6dd299865bb035e302b7e1a457b578ddf978240e44d4443a30e5744b4f4ea8 SHA512 831f63979c59d8aefa9d1b41f98e4eded021b437f1607218c34143687f22668dbd7dd7435bb2688d128699712ed9b5fa2e30536511dd4da9d39ab7b43d9f4b5f
+DIST pshs-0.3.5.tar.bz2 79871 BLAKE2B 07322ce82d80ecc0db166672d1694902a3ae743fd5d43d79261fab66a2f08e58f990d3c5a47dd39c9d041f195cacf31d5db3546336ccc3d961709d17712adf53 SHA512 5cb0cd8950f708f0c4d7b9281e2863440c579557c285fdfda1082eebf849bfb7cd25965de05c7f7b96527eed94b95c635f8cd2d397ebfd4af12195f70b3c5648
+DIST pshs-0.4.1.tar.gz 11758 BLAKE2B b3f9422c8ebd47d3de9993b93ea0438232f3ba037d7433b08875a131f449fab880a205bb62616a057328b7d6fe9c00277fbb2e886a1494d2234ab684b0a1e90f SHA512 7ecd0e5019e9778b5f2eff31b8e2f481972cf6da66e4493cff850aa1ec13a4df46e46782799ab25cecd1cc36122f797c6ae0ac2863ea604477784a79191a62d6
+EBUILD pshs-0.3.4.ebuild 976 BLAKE2B 8f24f99c604d1ef8e43adcd59f8d74d986a088d54d3413b504a0fb6c44d450aadf8d33c55c36ae220e02fca1c3bbcd5b76283300228672f8d4de10f27fbe0047 SHA512 f8313c8eaa7f13f544ac7a55469765219791906049f6efaba5918aae476e011913ec62271568c2bb556676a34e6fd03b932db78c29a448ada0a0fb86ec9ee042
+EBUILD pshs-0.3.5.ebuild 835 BLAKE2B 553fb6d15e7149c69e8f3e22d4f28eb184c42896eb63cd8fea02d912467292409837b79f020a396715a33742b3ef99bc7025ced8b3f4b408a371f7d993cb44c0 SHA512 79a7810708a6c5636c1c96b5f818e4efbef2413dac6281a8362bba16b7d1656d487e30cd0dbe9acb3cf2d22a614411a0609111d8c1f23d04e27c7c9b77d17e15
+EBUILD pshs-0.4.1.ebuild 865 BLAKE2B f40e8683e508b56eeb0031c38bf506d0dba1ccc7b7d4d58c6d28b5b8ee1ff2926fdc4502b779c924eec41d1e1660e9b48fb3bd9584c6034cea659959d9f19d2b SHA512 f67e06e743cbe8b820fe6b020d6342def6f572e353bccac3a53fe4f4cc7a9aa3ec430a81ad275ce60a505d99d814711644e3d4d0469efd6979cd394c8c2ef638
 MISC metadata.xml 812 BLAKE2B 22683da13714799f768dbbf0e941ef96434d78566d3b7ee136d88214b360ef2c1d15dd4357238103bfeccc559e99e342ff3b61c3241563d816671844f2e4c23d SHA512 9e58734863a46f1f6d8d4b0c2666fc0d596d45d924a60fc5a19a173018e3ca881c20862a3e879a63b9ccfab6dc6018ba122b3537e408336db26672b02374cdb2
diff --git a/www-servers/pshs/pshs-0.3.4.ebuild b/www-servers/pshs/pshs-0.3.4.ebuild
index 249f38ca2e23..1cba5442a194 100644
--- a/www-servers/pshs/pshs-0.3.4.ebuild
+++ b/www-servers/pshs/pshs-0.3.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl +magic +netlink qrcode ssl upnp"
 
 RDEPEND=">=dev-libs/libevent-2:0=
diff --git a/www-servers/pshs/pshs-0.3.5.ebuild b/www-servers/pshs/pshs-0.3.5.ebuild
new file mode 100644
index 000000000000..6b3e64295963
--- /dev/null
+++ b/www-servers/pshs/pshs-0.3.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
+HOMEPAGE="https://github.com/mgorny/pshs/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +magic qrcode ssl upnp"
+
+RDEPEND=">=dev-libs/libevent-2:0=
+	magic? ( sys-apps/file:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	upnp? ( net-libs/miniupnpc:0= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local myconf=(
+		$(use_enable magic libmagic)
+		$(use_enable qrcode qrencode)
+		$(use_enable ssl)
+		$(use_enable upnp)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/www-servers/pshs/pshs-0.4.1.ebuild b/www-servers/pshs/pshs-0.4.1.ebuild
new file mode 100644
index 000000000000..e20baa15b0c6
--- /dev/null
+++ b/www-servers/pshs/pshs-0.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
+HOMEPAGE="https://github.com/mgorny/pshs/"
+SRC_URI="
+	https://github.com/mgorny/pshs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +magic qrcode ssl upnp"
+
+RDEPEND=">=dev-libs/libevent-2:0=
+	magic? ( sys-apps/file:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	upnp? ( net-libs/miniupnpc:0= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature magic libmagic)
+		$(meson_feature qrcode qrencode)
+		$(meson_feature ssl)
+		$(meson_feature upnp)
+	)
+
+	meson_src_configure
+}
diff --git a/www-servers/pshs/pshs-9999.ebuild b/www-servers/pshs/pshs-9999.ebuild
deleted file mode 100644
index 7f31015204b0..000000000000
--- a/www-servers/pshs/pshs-9999.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
-
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
-
-inherit autotools git-r3
-
-DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
-HOMEPAGE="https://github.com/mgorny/pshs/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="libressl +magic +netlink qrcode ssl upnp"
-
-RDEPEND=">=dev-libs/libevent-2:0=
-	magic? ( sys-apps/file:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	upnp? ( net-libs/miniupnpc:0= )"
-DEPEND="${RDEPEND}
-	netlink? ( sys-apps/iproute2
-		>=sys-kernel/linux-headers-2.6.27 )"
-# libnetlink is static only ATM
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable magic libmagic)
-		$(use_enable netlink)
-		$(use_enable qrcode qrencode)
-		$(use_enable ssl)
-		$(use_enable upnp)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/www-servers/servefile/Manifest b/www-servers/servefile/Manifest
index f9f3d4c3ee0d..325ad8c9b837 100644
--- a/www-servers/servefile/Manifest
+++ b/www-servers/servefile/Manifest
@@ -1,4 +1,6 @@
 AUX servefile-0.4.4_p20200211-ipv6-absent-tests.patch 776 BLAKE2B db36dc2c79bd5551b539f71493472c88b258333f3493bf42d6c4323e06a223dfc07c8930662583fc91bbd2325c35da13f87b411a7fa2c32eb7e0c5237683f858 SHA512 e7e6d11c86efff0a8d0eb51e687686cbb962130a6c3d5117d863876337a49349500f9330ac6c865b871db80b0ed989585f9d01a386782b209841f6ce5092f654
 DIST servefile-0.4.4_p20200211.tar.gz 18304 BLAKE2B 2bbd6534d7fb787a0b85d594bd0a2bc235c859f80618be24dea144ef2adaa6188a29efdffc2e9109229301b9d3ee09df6a9d746a15ae6b01fed44a21307df78e SHA512 ef4edb4c92d9f804970087fc1c3d59775740642516a06704258de6d972cb807123f309991a5e22469b7619aff2304e265d5749485a4f74e75f2c80c279a23c33
+DIST servefile-0.5.1.tar.gz 19390 BLAKE2B 4443471870650f03564d6f574b633630fac4e1f9f6e6a9807b1baa4d3aaa6284f803fa9dc0c7c07f53cc343f89687db5f6b5a4ebf09e9fd327369e2b3aecddc5 SHA512 2502f3072522a8f460d3711dccbaa3fa57e34915313aaad475e5831962adc92c0728c2598f9f78ee99e60731cdc2d3026488ce8050369ab0c967246cd9372f44
 EBUILD servefile-0.4.4_p20200211.ebuild 853 BLAKE2B d87ccc93c478aaa6aa48194b5ded2af1b84f63ff7ae26e95811c1061393c1d7437766c4a79418339111c5e0b6308e6b3689b877eca071dabeb21a54da3c90d98 SHA512 59d729b25a13ef1d692887a5da11c0a9a0cb879ac338bd2232493a147a04d55774bc6430c92fc8ef2e2f20c538834115f7e59cc9bc82e83f730b0764c972ce21
+EBUILD servefile-0.5.1.ebuild 832 BLAKE2B b9f178ee6d55b0cb2bd2972f4292ff20347b1a8feb4180da28b481c3a9391e94fd090a07172020ba2996b0064980b420a3ffb01c17eb7463f6a70c7cfcd19543 SHA512 5dfa69edb8a7fb0ee85643aea9809e6bbe70adddb7b85336bcbe6cb557644c847291daa5bc70a235e14d10216a96b2b090f4f5398abca5378204ab186579b5f3
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/www-servers/servefile/servefile-0.5.1.ebuild b/www-servers/servefile/servefile-0.5.1.ebuild
new file mode 100644
index 000000000000..7d34a67b34de
--- /dev/null
+++ b/www-servers/servefile/servefile-0.5.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Serve a single file via HTTP"
+HOMEPAGE="https://github.com/sebageek/servefile"
+SRC_URI="https://github.com/sebageek/servefile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl test"
+
+RDEPEND="
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	sys-apps/grep
+	sys-apps/iproute2
+	sys-apps/net-tools
+	sys-apps/sed"
+DEPEND="test? (
+		${RDEPEND}
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}"/${P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.4_p20200211-ipv6-absent-tests.patch
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	doman ${PN}.1
+}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 9ee697a0dbc9..6e051fe15eb2 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index b2c9b2d3f5f5..88c2077c9a58 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,5 +1,3 @@
-DIST xev-1.2.3.tar.bz2 134866 BLAKE2B 9ff8bdb1e75754a5390115d10dd5851f71b2319ad7ff02299ff28284aa23c14cd1ad3ee9eea81718ed355fc31983e4f7ec0312b31e3f86d3691bb52ebbe0cc4e SHA512 47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e
 DIST xev-1.2.4.tar.bz2 136792 BLAKE2B 46b38d7295f8a11509598758ece9d880f9c3d303064de5cb6ef12aa9d0b066e78aefd3aa5e0c94ea4af7633936209474be362f9e38c0994eefe798662c2e4c6c SHA512 383472ddbfad639ba46a69080ecdd11a514a0578fd32c463fae18da02e0265c944589eebf12a858994f5fd601c02a0d51517e9b3ff61c6afe740d374f02781ca
-EBUILD xev-1.2.3.ebuild 380 BLAKE2B 74260776f579a9b4fef66c5a5e3e4fd8ee86c2bd690846808b20db7f772533fc602b215632ca0a1161bdebc17589fd8231aeee1934a1369f38d7a85f29e3a32d SHA512 8ec4b6ea8c7a665338da71a07dd51cc9d1bde482ce26e2b5ba2f9c3179bab99cd07885e1b57bfcb0cc3c248c522a7f6c03e28d453e56fe5ea967c5a3acf63eae
 EBUILD xev-1.2.4.ebuild 380 BLAKE2B 74260776f579a9b4fef66c5a5e3e4fd8ee86c2bd690846808b20db7f772533fc602b215632ca0a1161bdebc17589fd8231aeee1934a1369f38d7a85f29e3a32d SHA512 8ec4b6ea8c7a665338da71a07dd51cc9d1bde482ce26e2b5ba2f9c3179bab99cd07885e1b57bfcb0cc3c248c522a7f6c03e28d453e56fe5ea967c5a3acf63eae
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xev/xev-1.2.3.ebuild b/x11-apps/xev/xev-1.2.3.ebuild
deleted file mode 100644
index 84bc210d12b4..000000000000
--- a/x11-apps/xev/xev-1.2.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="Print contents of X events"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 1e8c4f36d73e..380044d5cb12 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-video-fbdev/Manifest b/x11-drivers/xf86-video-fbdev/Manifest
index 00db16018539..75f3327378e9 100644
--- a/x11-drivers/xf86-video-fbdev/Manifest
+++ b/x11-drivers/xf86-video-fbdev/Manifest
@@ -1,4 +1,3 @@
 DIST xf86-video-fbdev-0.5.0.tar.bz2 295102 BLAKE2B f3696662e782f35eeae66a755761b8f5d6f1304321976ef7e17758576da014091c0dce9046c4fde6b0ec4cfa1dce998b4b9130e646911d4d1dad983bd530d06b SHA512 c1217b943bbe3301b3c2a8649ed1004c3c67b02607bd56bbc14f6dfa05e7f0184332c81a6a19595514745501ed88526aee932e555779b7c3a8233646b0979448
 EBUILD xf86-video-fbdev-0.5.0-r1.ebuild 323 BLAKE2B b00de5b045f2f77bcfe81991339f80d4fed3108ec7ed948dbf6655e29877cf9fde5e9b7dd33f7f5323c193e29935a15d936f96478ed48fcf87bb0cc11ab6a42e SHA512 cc7aec97ef54375ada3ba438e60db91ab1fc7968a6a56b576fab56ebd7a8e3a8ecd960593b211e865149bdc7e8869b650a8d377557641c6a30747d3b848f1dbc
-EBUILD xf86-video-fbdev-0.5.0.ebuild 332 BLAKE2B a19b0b32a6ec54d23a2108359c0763f6766975fe2a7669e09388729920e6391776caa25164a835d0885ee61ae8b68070c3cf2fb0bee6832f9eeca580568e5131 SHA512 5972969d9447c30fd70232fb326d879e95de9d20bdec194ea9cc6866e17a3dfc13508ccf22b0556352f4b6d38fb31a46bd3cb7912b24a2d1752f7065de18b28b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild
deleted file mode 100644
index 3d08249dc22a..000000000000
--- a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="video driver for framebuffer device"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-base/xorg-server"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 8c688de2187b..d41582df98ad 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index 8153147e2d7d..2df3a68cc6fb 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,5 +1,6 @@
 AUX gtkglext-1.2.0-gcc8-fixes.patch 791 BLAKE2B d0f17c83bccd6e92c640383fecdce384cd0ecb92868f3f70d87b16aed8a85357e9391134c3c233549f7471d64e02416bde03ff92028d8d2f19eacd3802542875 SHA512 b6240ce1f293e3bd37d71a09233417c4acfa2a7fce05ba65ba364181e6075f86fc72797586b93fb81e057ab8de2191ad345415bd6cc6e29e38945cfb4362f3cb
 AUX gtkglext-1.2.0-gl-configure.patch 11350 BLAKE2B ad0cadfa12bda13866da64433935520bcbb77a9fb430640d31c66b14ffb867a1ae1cb236e459b9d13c0493279185dbe8c8eddafce86abd14b2ab4b2d0a59a0f9 SHA512 b164b8e64ff8fbe6d9b3437100c35d1352056094c4395fc1df4a40d8c91edf7543317ec05e3a05af1da9fe432817e312e7a8fc80fd3343824365d4579046f8fb
+AUX gtkglext-1.2.0-no-pangox.patch 5636 BLAKE2B 3c871cb2c37199d10cce761be9658090b630fa4b83bded75db4210f65986f70cc9f7eb4f2689d48f0a6c3d6ca79167532fedaee2baf0022545c8b0a8ba458987 SHA512 ccec3aae5a577cec6fdb7146af4faaa54afd9830942f83c400d7d083d2e53a1f684624d70590a53cc0e54d6fd1de90f13d7926fdee03b49bbec5f365f05214ee
 DIST gtkglext-1.2.0.tar.bz2 703821 BLAKE2B 985d84cf1b87a23cfebcf536cecb087bbfd050f5131cf70b2a09e9a2e556e7f2549ed1b4b26ec6eccf790a383e3530d27171a553145614b641437c7c2d8462b5 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d
-EBUILD gtkglext-1.2.0-r4.ebuild 1533 BLAKE2B 824e5814537b06fff7d44d0068448b00af03a043ccc1e58933193d8086178a7a1c060f64bdf3f2aafa8b0810dc2bd4bb5e36bd8cf3b1384d90be877a82c45a9c SHA512 f3909ca1c5cb2f8ad1623eea9ede9e025f5c19fc207bbedef888041b751fbe1e61cc1b17e9b1a0c8314fc1061022e1b7e73d3cbcf00b00eb49145a4c17a59c63
+EBUILD gtkglext-1.2.0-r5.ebuild 1617 BLAKE2B 46c83bb703b76e40389c64634234dc606f3bf4960583fa6dcc3d80b113869b4281f81c2ac3a3b8947baec16f52d768da927be0db4c8054990e69a94fdff6ea45 SHA512 dcb297a87c4bc7b79df57692d2709d058d779642fc9ae406709204eb3ea2d2cf1c6395d15fe240e40365d8f9fcf9e2dee379bf504d2ccea07eaac77ce17323ff
 MISC metadata.xml 331 BLAKE2B 214f9245eccb98bed5314d370a2e16d8605c46629c656c05a22c1a037e7aeeb9d3255f24203405b148fc73276241db48243303a86abea879c08a944025cc51b4 SHA512 8c9768b7a27485752cb816de376d4e9e352e6522e42eb489d41aab48f0fd47541483913c7fec9ec4bbdfea3aa846c35bedab83ac2524901635337a7111f14ab9
diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch b/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch
new file mode 100644
index 000000000000..1a0799959be6
--- /dev/null
+++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-no-pangox.patch
@@ -0,0 +1,184 @@
+diff -up gtkglext-1.2.0/configure.in.nopangox gtkglext-1.2.0/configure.in
+--- gtkglext-1.2.0/configure.in.nopangox	2006-02-04 22:17:19.000000000 -0500
++++ gtkglext-1.2.0/configure.in	2020-07-13 15:52:42.616448758 -0400
+@@ -59,10 +59,6 @@ m4_define([gmodule_required_version], [2
+ m4_define([pango_pkg], [pango])
+ m4_define([pango_required_version], [1.0.0])
+ 
+-# Pangox
+-m4_define([pangox_pkg], [pangox])
+-m4_define([pangox_required_version], [1.0.0])
+-
+ # PangoFT2
+ m4_define([pangoft2_pkg], [pangoft2])
+ m4_define([pangoft2_required_version], [1.0.0])
+@@ -349,7 +345,6 @@ PKG_CHECK_MODULES([BASE_DEPENDENCIES], [
+ gtk_pkg >= gtk_required_version \
+ gdk_pkg >= gdk_required_version \
+ pango_pkg >= pango_required_version \
+-pangox_pkg >= pangox_required_version \
+ gmodule_pkg >= gmodule_required_version \
+ ])
+ 
+@@ -794,7 +789,7 @@ LIBS="$save_LIBS"
+ # CFLAGS and LIBS
+ ##################################################
+ 
+-GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
++GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg"
+ GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
+ GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
+ GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
+diff -up gtkglext-1.2.0/configure.nopangox gtkglext-1.2.0/configure
+--- gtkglext-1.2.0/configure.nopangox	2006-02-04 22:17:47.000000000 -0500
++++ gtkglext-1.2.0/configure	2020-07-13 15:52:42.619448711 -0400
+@@ -19880,14 +19880,12 @@ if test -n "$PKG_CONFIG"; then
+ gtk+-2.0 >= 2.0.0 \\
+ gdk-2.0 >= 2.0.0 \\
+ pango >= 1.0.0 \\
+-pangox >= 1.0.0 \\
+ gmodule-2.0 >= 2.0.0 \\
+ \"") >&5
+   ($PKG_CONFIG --exists --print-errors "\
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ") 2>&5
+   ac_status=$?
+@@ -19897,7 +19895,6 @@ gmodule-2.0 >= 2.0.0 \
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ " 2>/dev/null`
+ else
+@@ -19916,14 +19913,12 @@ if test -n "$PKG_CONFIG"; then
+ gtk+-2.0 >= 2.0.0 \\
+ gdk-2.0 >= 2.0.0 \\
+ pango >= 1.0.0 \\
+-pangox >= 1.0.0 \\
+ gmodule-2.0 >= 2.0.0 \\
+ \"") >&5
+   ($PKG_CONFIG --exists --print-errors "\
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ") 2>&5
+   ac_status=$?
+@@ -19933,7 +19928,6 @@ gmodule-2.0 >= 2.0.0 \
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ " 2>/dev/null`
+ else
+@@ -19958,7 +19952,6 @@ fi
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ "`
+         else
+@@ -19966,7 +19959,6 @@ gmodule-2.0 >= 2.0.0 \
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ "`
+         fi
+@@ -19977,7 +19969,6 @@ gmodule-2.0 >= 2.0.0 \
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ) were not met:
+ 
+@@ -19994,7 +19985,6 @@ echo "$as_me: error: Package requirement
+ gtk+-2.0 >= 2.0.0 \
+ gdk-2.0 >= 2.0.0 \
+ pango >= 1.0.0 \
+-pangox >= 1.0.0 \
+ gmodule-2.0 >= 2.0.0 \
+ ) were not met:
+ 
+@@ -25420,7 +25410,7 @@ LIBS="$save_LIBS"
+ # CFLAGS and LIBS
+ ##################################################
+ 
+-GDKGLEXT_PACKAGES="gdk-2.0 pango pangox gmodule-2.0"
++GDKGLEXT_PACKAGES="gdk-2.0 pango gmodule-2.0"
+ GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
+ GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
+ GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
+diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c
+--- gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox	2004-02-20 04:38:14.000000000 -0500
++++ gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c	2020-07-13 15:55:19.720973082 -0400
+@@ -18,7 +18,8 @@
+ 
+ #include <string.h>
+ 
+-#include <pango/pangox.h>
++//#include <pango/pangox.h>
++#include <pango/pangocairo.h>
+ 
+ #include "gdkglx.h"
+ #include "gdkglprivate-x11.h"
+@@ -77,9 +78,9 @@ gdk_gl_font_use_pango_font_common (Pango
+ {
+   PangoFont *font = NULL;
+   gchar *charset = NULL;
+-  PangoXSubfont subfont_id;
++  //PangoXSubfont subfont_id;
+   gchar *xlfd = NULL;
+-  PangoXFontCache *font_cache;
++  //PangoXFontCache *font_cache;
+   XFontStruct *fs;
+ 
+   GDK_GL_NOTE_FUNC_PRIVATE ();
+@@ -91,6 +92,7 @@ gdk_gl_font_use_pango_font_common (Pango
+       goto FAIL;
+     }
+ 
++  /*
+   charset = gdk_gl_font_charset_for_locale ();
+   if (!pango_x_find_first_subfont (font, &charset, 1, &subfont_id))
+     {
+@@ -114,6 +116,7 @@ gdk_gl_font_use_pango_font_common (Pango
+   glXUseXFont (fs->fid, first, count, list_base);
+ 
+   pango_x_font_cache_unload (font_cache, fs);
++  */
+ 
+  FAIL:
+ 
+@@ -149,11 +152,7 @@ gdk_gl_font_use_pango_font (const PangoF
+ 
+   GDK_GL_NOTE_FUNC ();
+ 
+-#ifdef GDKGLEXT_MULTIHEAD_SUPPORT
+-  font_map = pango_x_font_map_for_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+-#else  /* GDKGLEXT_MULTIHEAD_SUPPORT */
+-  font_map = pango_x_font_map_for_display (gdk_x11_get_default_xdisplay ());
+-#endif /* GDKGLEXT_MULTIHEAD_SUPPORT */
++  font_map = pango_cairo_font_map_get_default ();
+ 
+   return gdk_gl_font_use_pango_font_common (font_map, font_desc,
+                                             first, count, list_base);
+@@ -187,7 +186,7 @@ gdk_gl_font_use_pango_font_for_display (
+ 
+   GDK_GL_NOTE_FUNC ();
+ 
+-  font_map = pango_x_font_map_for_display (GDK_DISPLAY_XDISPLAY (display));
++  font_map = pango_cairo_font_map_get_default ();
+ 
+   return gdk_gl_font_use_pango_font_common (font_map, font_desc,
+                                             first, count, list_base);
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
deleted file mode 100644
index b8b0a33c60ab..000000000000
--- a/x11-libs/gtkglext/gtkglext-1.2.0-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 multilib-minimal
-
-DESCRIPTION="GL extensions for Gtk+ 2.0"
-HOMEPAGE="http://gtkglext.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-	>=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=sys-devel/autoconf-archive-2014.02.28
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix build issues with gcc patch from Fedora, bug #649718
-	eapply "${FILESDIR}"/${P}-gcc8-fixes.patch
-
-	# Ancient configure.in with broken multilib gl detection (bug #543050)
-	# Backport some configure updates from upstream git master to fix
-	eapply "${FILESDIR}/${P}-gl-configure.patch"
-
-	mv configure.{in,ac} || die "mv failed"
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	local DOCS="AUTHORS ChangeLog* NEWS README TODO"
-	einstalldocs
-}
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r5.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r5.ebuild
new file mode 100644
index 000000000000..ff4f55ef3255
--- /dev/null
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2 multilib-minimal
+
+DESCRIPTION="GL extensions for Gtk+ 2.0"
+HOMEPAGE="http://gtkglext.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+	>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=sys-devel/autoconf-archive-2014.02.28
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix build issues with gcc patch from Fedora, bug #649718
+	eapply "${FILESDIR}"/${P}-gcc8-fixes.patch
+
+	# Ancient configure.in with broken multilib gl detection (bug #543050)
+	# Backport some configure updates from upstream git master to fix
+	eapply "${FILESDIR}"/${P}-gl-configure.patch
+
+	# Drop pangox-compat dep with patch from Fedora, bugs #698950, #706344
+	eapply "${FILESDIR}"/${P}-no-pangox.patch
+
+	mv configure.{in,ac} || die "mv failed"
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	local DOCS=( AUTHORS ChangeLog{,.pre-1-0} NEWS README TODO )
+	einstalldocs
+}
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 818fe91b726f..0dbcf21b5a17 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -4,7 +4,7 @@ DIST libva-2.7.1.tar.bz2 477933 BLAKE2B 261e608af3f1427bed0244d4ebbc0d3ffe568166
 DIST libva-2.8.0.tar.bz2 478734 BLAKE2B b11393a9b9ec7ef4cf91d20d4005d42ad3d0e6a4a8e4d8cda67816bc5b9d3b23900754b5e8af92386dcf99a11e53af70fc4723ffecc715328c8fbf3d40486098 SHA512 329c5fc2262a6f4fddfcb13bd9644589248be6ae18fa1481cccc6b33874b91b60ad3f16a1777712f7a4817ba576db984834aa8735e6ad13d99b2f5aa13e9ddfa
 EBUILD libva-2.5.0-r1.ebuild 2186 BLAKE2B 7c9a9dc3f979909e02812398551197938bce437f0092940361853613fff9813e2d06af44f4e09130cb27ac4313722eba8b869ec0a8681532f07c6449ee4c0078 SHA512 2d8f8705c68d3a1bda268a18e8e65dc3e8d8f0d73fdcea6f6e8e5908028598f1a0e3865818ef37643bc6843af9dcb3f4fa9a167d021dbf67772937af2df721ed
 EBUILD libva-2.6.1.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
-EBUILD libva-2.7.1.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
+EBUILD libva-2.7.1.ebuild 2194 BLAKE2B b1bc02eeac4ebe7baeb9a858211ddca4318a536de33bdc79579b60f73c71a43179d9c3dd5aa2d60b869363b9aae0371d1a373441e96f8cf0c8fc1a3260506a15 SHA512 2cb24c84fcd7608ef13f0b3875ea7e91f24bbac85351a1c728c668e20a9523e05a781128a3f134c863344b395215a4f3d0d24312cb63f17f3b22bbdb4b0c7cc3
 EBUILD libva-2.8.0.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
 EBUILD libva-9999.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1
 MISC metadata.xml 469 BLAKE2B 86258c66689544ac1709503e76a23d84d090393d1358158b47ea2fd0936f5d3828c4be00ea8490a531f63956274b9411e3b698207899eaf98a6bcf2f88572145 SHA512 2ad27b3a2dadd6e89f2f6700cff4aa5a76ee2770f0daa8a3b523ec5c19718e333528fee6919c7df6d53c58368c67fcb3836aae256d61bf4d7e042d00ab9f74b4
diff --git a/x11-libs/libva/libva-2.7.1.ebuild b/x11-libs/libva/libva-2.7.1.ebuild
index 016d79e6442e..16471ef454e4 100644
--- a/x11-libs/libva/libva-2.7.1.ebuild
+++ b/x11-libs/libva/libva-2.7.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then # Live ebuild
 	AUTOTOOLS_AUTORECONF="yes"
 else
 	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index dc1b7f0baa93..08bf589b23bf 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,5 @@
 DIST libxkbcommon-0.10.0.tar.xz 383788 BLAKE2B 0e2cc110c35a4d07cfd55a46a4cc30038bc296f74522beb97b72d0318799adb76fa514427640f286254de7aa59fb8b8c26de5d8fd52f7e09c5ba3521febb97bd SHA512 58c523b42a8ea0cae7322d453fbc5d4624374221246cb067074e2ff9820eef3ceea8686283136432cdf0842acfc0858c7b2d3954de234b6501092ae1d27c9e79
 DIST libxkbcommon-1.0.1.tar.xz 432692 BLAKE2B 151e9c2260b517e7e646defea8dfa1891af87aaeeebbf52d41d8e6b52c2c1d5079ca55da9e998300145c83718ce981be13c3fa35d8825bcde7846dcd330e9dfd SHA512 929be7b52fae360a696f01e0a8f3aa9b585ad99db975a88680ababf623e46f4d98e6f7590a2859c24060856f45b27e7249072702fbbf5a7bd0d4a10791e6d489
 EBUILD libxkbcommon-0.10.0-r1.ebuild 1284 BLAKE2B d43d05a9366fe8a92d62f714a532d5f2b372443971c0a5f496387faecbfd91ab83841372977f4de853e0ac569545c2deab9828f4dccca580ca0539c406bc884c SHA512 fd009357bf396f4f9bdbcc86febef8536a84095a880bdd5d5dc135e59981113db959d909edd6340e5c6908163e939ae032307228f76219d7972b577f209e6224
-EBUILD libxkbcommon-1.0.1.ebuild 1292 BLAKE2B 58b41eb81edce585c966a1ef1041ac7236da6565b90a2a514e12a729937400e542fe113230cf2a2dde1e348b3f38796809f661dd6c2b3ece4af2d362a5d0ec4e SHA512 dece8d99a0018f03604153358549cddf09a4a4a6853b32229080d17fe3ef7616f13e989c76c03c3af35d2548e55f1c790954f1b4dd5244d28f738ede9d42dc81
+EBUILD libxkbcommon-1.0.1-r1.ebuild 1333 BLAKE2B 1369a2e9b99ce80648ce8acfca823020fc00f8b1b62f4ed238bff9e728c01d0a4e69503a686a3d69fb20d9a904fb6eff5f7fa4fcb3b65afa9aca59c1be500cb8 SHA512 4a54be5605d1d850e9684f7ddfb7f914c2f52a4da7c74860efb0d2cafeff179750cc008d0166fe31604fd6a64156dc79b27a60d7de9e89d5b7f81759cd60745c
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.0.1-r1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..74ecf3bf4849
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.0.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
+else
+	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="keymap handling library for toolkits and window systems"
+HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
+LICENSE="MIT"
+IUSE="X doc static-libs test"
+RESTRICT="!test? ( test )"
+SLOT="0"
+
+BDEPEND="
+	sys-devel/bison
+	doc? ( app-doc/doxygen )"
+RDEPEND="
+	X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library="$(usex static-libs both shared)"
+		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+		-Denable-wayland=false # Demo applications
+		$(meson_use X enable-x11)
+		$(meson_use doc enable-docs)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.0.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.0.1.ebuild
deleted file mode 100644
index 15fdecd2c429..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-1.0.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-inherit meson multilib-minimal ${GIT_ECLASS}
-
-DESCRIPTION="keymap handling library for toolkits and window systems"
-HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
-LICENSE="MIT"
-IUSE="X doc static-libs test"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-BDEPEND="
-	sys-devel/bison
-	doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library="$(usex static-libs both shared)"
-		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		-Denable-wayland=false # Demo applications
-		$(meson_use X enable-x11)
-		$(meson_use doc enable-docs)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 0a230ae38c91..03e107433339 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -7,7 +7,7 @@ DIST vte-0.58.3-command-notify.patch.xz 4964 BLAKE2B f8414d3bf124bd3de4c08e22a05
 DIST vte-0.58.3.tar.xz 514844 BLAKE2B 1f48e95ec81397937c8a5a3d34ea9a7d1835d6cacec6e1b90b78568505d509b375f55678462428dd01da00e7290e4543bbab2dbb0aea46a322788fbaf022427b SHA512 b0a38eb1cd7d923b0431af943dbdb89932833f9a2b0b8fc1fa9ee728c87418c1f5a424b2ccee661721093a80c569f3b41c721b0ba2302ba0c3a42d4c5e31aa9a
 DIST vte-0.60.3-command-notify.patch.xz 6108 BLAKE2B 1f96788c097b003a3f9041529a0ff8ad083fe60597920632450e65ce13ad7181cb3bd4f2713ee19ab7d15154e3546720cdd0a72fabb3710ea7149c63cb159a1f SHA512 070d17fa2dfeed5ccb5ad67687bfb65a6a9dd79db300bb6e00f7d35b8ab3563c331e5f48bbecc32f8037475db319fb71f35e72108f260b6446fd2dd8e1a2897e
 DIST vte-0.60.3.tar.xz 535504 BLAKE2B c5556fdb91d876aa681d2a9466fa4f4c0ee6be630d076949fbd01878baffdf319e50ec75575729c49c09484914d9ee103d4d491861aedb678b0e336cd4ddcc2e SHA512 3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18
-EBUILD vte-0.28.2-r208.ebuild 2948 BLAKE2B 24401f7eb05692d9e546e11e5f47862a43a7e86664078a6210c0f2f1899e4d5dcddcef89a1da5014adbcbaa57739d006bfe003a4163b9bf7672ad13e218cdd1b SHA512 73bcd40d14e4d7443af62f104865002c6a3938d62473da99fffa455dd0dbd231eadfa2618ba4a335b1c63eb8d0a4d13cf3264694b78116653832e3b878f30a9c
+EBUILD vte-0.28.2-r209.ebuild 1865 BLAKE2B c5e05195cda70e92ecf2bf90b2d00094c8e3679d0cd8fe8ee3fb8f53a7a32671fe81c5daaaf5a60d3a511bb98cb09a95487931db519f5b28d1d3a935b1e60e8b SHA512 75e44dda5dfcccec43b57eaf2cf73667460700bfa91833b11e83d3cfcf8a2a84ba5ab239650b8f3276a8cd7341cfb3453317c01092f9a1c1623e9eaf287348b4
 EBUILD vte-0.58.3.ebuild 2072 BLAKE2B 56ac1b16fe5ae050c9a0604c8b66bb8a1d90e16d43d38b833e796f46eeb8032211cae9f0ac97fa9882dfa678a5830eb8fbde1a422a7e6ff0bdb36c8067f02ca1 SHA512 127732d569d2119149056e220818050e944a48c155c7e2ce6af453d7a68751a811011122321bb5dfd9e2f5402a1ba29d432d7a96dd4025294d13d220b859db93
 EBUILD vte-0.60.3.ebuild 2204 BLAKE2B 3d039a6cd2189f6ca40df31339cc3a97530c5d8c0629a9b933d099337451f23b26f0667c3070c1f86cd6d204816093251901871bb6bbe5661b8cd3645e258420 SHA512 6ad81b19eaafc6a148d1eeb30f98c95b1858766e8830788a4dd539a762d43fc819d59e8484e3158a8ba5a69958b69cc2dd95fde17bcc7ec79027d448a3331a06
 MISC metadata.xml 518 BLAKE2B c7e4aeabaea85722d8f81e1cdf7428a3ab30e38fd03c6e2bfaf81b21468d00d63d8aca53c90b50292075259bc8498a51785e1034874f3c8a9fa42d13b90d6d87 SHA512 c76435d37b54d53bdcd66dded770858b8801c15bfcda607529039928d5009635902d320ba14840e731618ebf8e0eafc2437d74cc0243ccf7a515e4f7efcdb338
diff --git a/x11-libs/vte/vte-0.28.2-r208.ebuild b/x11-libs/vte/vte-0.28.2-r208.ebuild
deleted file mode 100644
index c579c5a9a8ad..000000000000
--- a/x11-libs/vte/vte-0.28.2-r208.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="GNOME terminal widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="debug +introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=x11-libs/gtk+-2.20:2[introspection?]
-	>=x11-libs/pango-1.22.0
-
-	sys-libs/ncurses:0=
-	x11-libs/libX11
-	x11-libs/libXft
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-PDEPEND="x11-libs/gnome-pty-helper"
-
-PATCHES=(
-	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
-	"${FILESDIR}"/${PN}-0.30.1-alt-meta.patch
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=652290
-	"${FILESDIR}"/${PN}-0.28.2-interix.patch
-
-	# Fix CVE-2012-2738, upstream bug #676090
-	"${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch
-
-	# Fix https://bugzilla.gnome.org/show_bug.cgi?id=542087
-	# Patch from https://github.com/pld-linux/vte0/commit/1e8dce16b239e5d378b02e4d04a60e823df36257
-	"${FILESDIR}"/${PN}-0.28.2-repaint-after-change-scroll-region.patch
-)
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_prepare() {
-	prepare_python() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	if use python; then
-		python_foreach_impl prepare_python
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	configure_python() {
-		ECONF_SOURCE="${S}" gnome2_src_configure --enable-python
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir configure_python
-	fi
-
-	local myconf=""
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		myconf="${myconf} --disable-Bsymbolic"
-
-		# interix stropts.h is empty...
-		export ac_cv_header_stropts_h=no
-	fi
-
-	# Do not disable gnome-pty-helper, bug #401389
-	gnome2_src_configure --disable-python \
-		--disable-deprecation \
-		--disable-glade-catalogue \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		--with-gtk=2.0 \
-		${myconf}
-}
-
-src_compile() {
-	gnome2_src_compile
-
-	compile_python() {
-		cd "${BUILD_DIR}"/python || die
-		ln -s "${S}"/src/libvte.la "${BUILD_DIR}"/src/ || die
-		mkdir -p "${BUILD_DIR}"/src/.libs || die
-		ln -s "${S}"/src/.libs/libvte.so "${BUILD_DIR}"/src/.libs/ || die
-		emake CPPFLAGS="${CPPFLAGS} -I${S}/src"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir compile_python
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	install_python() {
-		cd "${BUILD_DIR}"/python || die
-		emake install DESTDIR="${D}" \
-			CPPFLAGS="${CPPFLAGS} -I${S}/src"
-	}
-	if use python; then
-		python_foreach_impl run_in_build_dir install_python
-	fi
-
-	rm -v "${ED}usr/libexec/gnome-pty-helper" || die
-}
diff --git a/x11-libs/vte/vte-0.28.2-r209.ebuild b/x11-libs/vte/vte-0.28.2-r209.ebuild
new file mode 100644
index 000000000000..dc412695bb3e
--- /dev/null
+++ b/x11-libs/vte/vte-0.28.2-r209.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2
+
+DESCRIPTION="GNOME terminal widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug +introspection"
+
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=x11-libs/gtk+-2.20:2[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	x11-libs/libX11
+	x11-libs/libXft
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+PDEPEND="x11-libs/gnome-pty-helper"
+
+PATCHES=(
+	# https://bugzilla.gnome.org/show_bug.cgi?id=663779
+	"${FILESDIR}"/${PN}-0.30.1-alt-meta.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=652290
+	"${FILESDIR}"/${PN}-0.28.2-interix.patch
+
+	# Fix CVE-2012-2738, upstream bug #676090
+	"${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch
+
+	# Fix https://bugzilla.gnome.org/show_bug.cgi?id=542087
+	# Patch from https://github.com/pld-linux/vte0/commit/1e8dce16b239e5d378b02e4d04a60e823df36257
+	"${FILESDIR}"/${PN}-0.28.2-repaint-after-change-scroll-region.patch
+)
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+src_configure() {
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	# Do not disable gnome-pty-helper, bug #401389
+	gnome2_src_configure --disable-python \
+		--disable-deprecation \
+		--disable-glade-catalogue \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		--with-gtk=2.0 \
+		${myconf}
+}
+
+src_install() {
+	gnome2_src_install
+
+	rm -v "${ED}usr/libexec/gnome-pty-helper" || die
+}
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index 15f240a596e7..b8c8ba488173 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,4 +1,3 @@
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
-EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1373 BLAKE2B a562ea63ae7d0ab61737a1da2b4aa2e178630ff385fa92c50f8ba8bc75215749b4d217e0a8f3c5ebe6b1f311607601d7869a3ef5a42c5dd62bacd7a523429c14 SHA512 d790475278909a5163af2e1c9dbda90adc1d68e6998ac14c2ce5be456dee42bf221af55d0565ab2abf7de3531fce32af303a801f2d43f3535c39bd85a11bd7d8
 EBUILD xcb-util-cursor-0.1.3-r3.ebuild 1034 BLAKE2B a1d3e3f4152dff7ac4edec2aa7485c7d8bfa2b1c3d5de4175e0aafd7fba8dd9c5c340731a78977824297eae2db97232b99226530802a9de8a63418ae4e5ab2bd SHA512 51f7a14f8ca7162fdfed636452601508c0afc0a4a770cfc16439a961a1bb1670968fcd33a6ed18f4e84e2e24997264ae3521aaaca97565fa92ecd5114ffc7a14
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
deleted file mode 100644
index 89c2412cb38e..000000000000
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor.git"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=x11-base/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
-	x11-base/xorg-proto
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-		--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index 0cf0053e59bf..935ffb6122e9 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,4 +1,3 @@
 DIST xcb-util-image-0.4.0.tar.bz2 327891 BLAKE2B 022536e7b7410ba1ed129f9efc2ad48fda26d9a69e79e54fe6fd4510df38d1e957289d249dc1a5beb4385116b0808f3282ad496b3f2a246bc6f5762bbe8c7e36 SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f
-EBUILD xcb-util-image-0.4.0-r1.ebuild 972 BLAKE2B e7763db6a983e1f1a77061f1892083f76ace5af13b5140844a5ab7e914fbd1ef6cd6b8d9b542a4bf5bf725cb54f68ffcf3e65a0aa3cf054b042c038faeecc002 SHA512 578ef56dece7935557e778d79f6373a59fe7ce0caf55a28e4eeb1c7033ca14362b587c3752a1dd007b80b94004da8e054b0a949d346b273de1724e005e2a076c
 EBUILD xcb-util-image-0.4.0-r2.ebuild 597 BLAKE2B 2839fce6b163e4e4ec6152d4b79382845420538301dcd06e2d287020cee4c78fe3baf221fe5e520ef8514e8f40edf73de253b9bbc82a75807a68429f07a5c246 SHA512 6d7aa3ca3c1a2c7d3157844a670d124a05cbc1fc521a12b9d2a336ffd4045e07dc9e3f173451a238729cbbd74108d7b720bfdcefdbe95dad5732cc0f75927a9f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
deleted file mode 100644
index 482024f64369..000000000000
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-image.git"
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-image"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
index d0e90bd5d348..f79884bc8655 100644
--- a/x11-libs/xcb-util-keysyms/Manifest
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -1,4 +1,3 @@
 DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 BLAKE2B 5f55706fc74ed5c096ca0e8a8411ba392a023ab7f3c8185088c31570e5873345e16d72b693596b0983011350ecdb7cb30ae5fca118f4758710ee2fc2441883ca SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4
-EBUILD xcb-util-keysyms-0.4.0-r1.ebuild 919 BLAKE2B 2397ac2d3cd413f73a4c03064a3cea2a135cd096a9756c1d25c0a5f4e1bc363ac1dd1992b097cffeb620078477f9b7c3577f404579b601cbb0b80b26d8b00059 SHA512 11adeedddac342108bd08c6bbcc3589e0729cc47daa9e1865eac69b42e6fc926766c786fcd861665cc58dfe80741dca19d96b270dcd14bfc669dd68d12ddd8a4
 EBUILD xcb-util-keysyms-0.4.0-r2.ebuild 542 BLAKE2B a0037f872e4a4e2f50ef157356cf7aef7f8f841de41749e29eb5f94d02fc9febf9d63625dcf60ea298c3875b80f90c0f64e100e425a15c3b3ff84e2ced54b5d3 SHA512 e3f55864514c3be822c51611de423a6cf0a2471564136511f6bc3b5290717b53f7fb9fd5868b75eea1c20797f307fc193c9a9edea5dff99cdd33a247821c6cd7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
deleted file mode 100644
index e7d51513b02a..000000000000
--- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms.git"
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	x11-base/xorg-proto
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
index 6148bcfe45a7..86a525b72a93 100644
--- a/x11-libs/xcb-util-renderutil/Manifest
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -1,4 +1,3 @@
 DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 BLAKE2B 8de259f918f1ffcd82d054bd751baf3f0fe3514da86bc736b68c74ca1f285fb41dca364ca49153e1464691c10fb65f16a53eec0ec8102c1abade9ad7c80629e4 SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc
-EBUILD xcb-util-renderutil-0.3.9-r2.ebuild 939 BLAKE2B ba23a8e39462d745bb748f3f1b9bc131e433d016d47ae3cc0491edf54d8063b80dfbc5fb4f56ef4e412387da30237a003dfb9b834b904766e7470421ec7bcc6b SHA512 d7be2a7f1ca40ec0a9de97ded92158912ac2dbf6af07a7f463c15383b2ccc4d2d8390e06eaa14e6445d6aedfacac0fcafa691b9d750036bc7ee2230095261cf5
 EBUILD xcb-util-renderutil-0.3.9-r3.ebuild 554 BLAKE2B 249f0697324e0aed1052ccbc1c06e5fa4b96fc640f01f6fd34976220a34e0a308d03a5a64b43f5058280ea86dec99a7d1ffe36df219dd6646db0b22284a63ce7 SHA512 52ca7675c762b09474052c8889cb00267b44ad2756fbd161d59aae07a21855a3de3ebd2fa1a2424bb721646b8a0af861051b057514a1ede40b10721d1a019643
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
deleted file mode 100644
index 304d5773da98..000000000000
--- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util.git"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index 6ad627dc87df..b3090d2e4d78 100644
--- a/x11-libs/xcb-util-wm/Manifest
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -1,4 +1,3 @@
 DIST xcb-util-wm-0.4.1.tar.bz2 321855 BLAKE2B 095d1f39e4b42e85790830b46c1faeeb8ac3bd7b792c3db8dca15a998a0ce835fd4fa148e8ed896c81d82e2113d1b9650e35de7741e9629883908d3b81b927f3 SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326
-EBUILD xcb-util-wm-0.4.1-r2.ebuild 920 BLAKE2B 5762a21acb7c3278af572aa5922ce15956ec81a2822c64de241a22b27692557222f3f496b28330c6ef6fed5250478f505d9fc4dc1355e710360d035dd1ca5227 SHA512 1fbadcfb495abb85f78e38acd1d5f890af7002d1847381af1ea3b0cfe124c717b22610e8a33b9f925d4b6b9264864f9e8a29220f83fd6abde7ee211c18661e09
 EBUILD xcb-util-wm-0.4.1-r3.ebuild 545 BLAKE2B 4eb6f8d0f220da428a420a5d8fda8ccfd4084c512838c37db3a24129686de6ace726cf7ed9c567afeea5da4a2a3c8ccd92de1375b5e5a7edb65bdf13ee1e7dc8 SHA512 a54094a509afb0a13abf73b72b29ef3d245996f49dffd4f882748c090be2de0a24419a8bd37b51c2eabcf88a5a1373a2629ac37652a29d7323a72d064225e870
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
deleted file mode 100644
index 160f8dc8699f..000000000000
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-wm.git"
-EGIT_HAS_SUBMODULES=yes
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-wm"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index c79ca8563242..9f433db2a68e 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -1,4 +1,3 @@
 DIST xcb-util-0.4.0.tar.bz2 297412 BLAKE2B 55970cddd8d4bfb313f5d6e4ea82a169a90311c1c0bb5ebf796ac1ceb1d1e1baea4268dc37bd8adf557514a752eec9f957ad3e3e0747384f2cf6e1985f26247f SHA512 e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e
-EBUILD xcb-util-0.4.0-r1.ebuild 1193 BLAKE2B 963f6060498a3f40ab19fcfd27247528ca60317c822daff96c854a879d21cd64e6db9f71d6e8a8a0c6f86ef3913b804b156a18b707b53fb1f84f22bef39ebf7d SHA512 1ef915863bd04a4ddde1b5f1c28e59256612b8db727c972a9c25f4733ee7587e50c3740043a8caf1bb89babc66a41d194949ff2f63c68738636e46ac000041d4
 EBUILD xcb-util-0.4.0-r2.ebuild 840 BLAKE2B eb8b189532ecdcd051daf84a133a3226c1fd5a761a670fbbbb993926abec12a8fb383f8f81760ff476889330f0baf986feda0e4e580d764e8c6c83655bb6699b SHA512 d0f66835cb5ba3d3d38dc21bde8a4f61a3b9c4c257a59e2763813b3ea78668272489725f1edbf27d2ad863257e6e5e308dea0b02baf2dedf4a27e979459ead4a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
deleted file mode 100644
index 36b3edb1583c..000000000000
--- a/x11-libs/xcb-util/xcb-util-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=/
-XORG_BASE_INDIVIDUAL_URI=https://xcb.freedesktop.org/dist
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/lib/libxcb-util.git"
-
-DESCRIPTION="X C-language Bindings sample implementations"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb-util"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.1
-	test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-PDEPEND="
-	>=x11-libs/xcb-util-cursor-0.1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-image-${PV}:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-keysyms-${PV}:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-renderutil-0.3.9:=[${MULTILIB_USEDEP}]
-	>=x11-libs/xcb-util-wm-${PV}:=[${MULTILIB_USEDEP}]
-"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc doxygen)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/xpa/Manifest b/x11-libs/xpa/Manifest
index c2c5d6313608..60d56de217cf 100644
--- a/x11-libs/xpa/Manifest
+++ b/x11-libs/xpa/Manifest
@@ -1,10 +1,6 @@
 AUX xpa-2.1.18-include.patch 249 BLAKE2B 9ddd35eefbcf2c2e538c78dd71047cd31ec384b9d4c394c0bb15a24e20baeed5d65c392fa430364d5ddd24b599d760869cfd45a1e72726b2434e60b5bb00056f SHA512 341980f141b4587e9ab6825976c302ec3d831cdd761fc52be13fec9736045532b7ff10dc9969d7cd2dbe631ba2e5d35dcfbfca5700c13e6a678df1c27ff7a540
 AUX xpa-2.1.18-makefile.patch 3382 BLAKE2B fda26e82e3179838cc79d97e469b85a576e9b43419de58238950ddbd10c34294cb84fe70f29d2a5bb7387d7c6677abf4f9a5504a47f48aae2bfa73cac7abcb96 SHA512 f13a64cd033fdd7a9bd087ad4edceb222f89b3d363cefaca38a710d08a9117754be95e5b1aea0bfcb145e31b232ab6600cd8a70aea98da3c6fe4ad5b6f9fb392
 AUX xpa-2.1.8-makefile.patch 2594 BLAKE2B 51fb3835820aaf3aea51b04e88fc357e727e425fe6029b9f8a7d9fd10647d9491a18fe9f6115e20557e4fbc23e88a99c2d7c7f2b5e7d644383bc4801eeb50032 SHA512 e36e57ffb8ea86c3f646c4cdd7d3e8e304b6fe48f810cc4081a1dde2a367acfb70846160fef75cf020222002961963126e4c8b5a19f7d5cb5796cbee7429ec5e
-DIST xpa-2.1.15.tar.gz 861859 BLAKE2B 4ca3dd5dbfe6c5a39c1ed73db287d3fb4fe0e0eb1ec61086a7990f4a902a2a98e187e9ef34e1025861ed98fbce3d8ec644bd2d171f5698e82c435f91eda8aacc SHA512 62b453eb138197b452fca8d1ded1df97be54bcfbd13a0d5fecafc206c1589913c7d09593247077fb07c8b66a87ac0b22b95dfe74c49f2bd0abb942942fa87ce8
-DIST xpa-2.1.17.tar.gz 900465 BLAKE2B 0f61b40ef9944497286afe7f0f3a5c54d9db5d8e35ff4ee2ffbe85e1b51e24dc496731560bd8e6aa5b5b715d81568f35d11c8fdf22358306d6a2b52814e82586 SHA512 c9742b8427a9d8512a429f5a3b2bc6a55803b975c1524ead64906a4387a589f229e8715c46814b7b1bfb30a05f2f5fe59e944e1dabc333fcceca71c569a05a50
 DIST xpa-2.1.18.tar.gz 900579 BLAKE2B bce33b30235e17309979e6e91d6508286403b476ee890c437985a434145992c442b1b3fd923da2658bb7d0dd6656ffa93bc20d2e8ff8bedb7438b9cbfa48e6a1 SHA512 4482325338ed15b70a1a934d8ba848712a4eed7546b4197fc89baa93dc80df1be29170a7350453f176d45264fae6f0474d136e487c0239d9e97dbd09dd8d0b19
-EBUILD xpa-2.1.15.ebuild 1265 BLAKE2B 6f82d10d2baa1f6b0d2a5cd4f4829c2482d4520a46f0148cc222a897f83fd2ecb159a1af4207a8626f440989a028b9fa156c88526238a39bf71fab0931c24588 SHA512 828d02551fdb70340a8ddac63460eb9bf7a8217fa1fda01c9d3e7052b5eee56d3ef485071bb7a142b16442a0d7fb8cd9783fbbec2fddf42729d6235c3fe6389b
-EBUILD xpa-2.1.17.ebuild 1256 BLAKE2B 8179cc15911e847ce441eee66c1b8fdffd389d1bb1ca71005df6018864ae0a78437d0c9b01b8f99e5535ebee954c3868457807d808eb102df4a505977a933a9d SHA512 fd2ebe2ec6b49d31af06b3dad1609c553eafcaeab9f153f9a8e431c71febe3d05b2603844f680d744999cb571be59e839a47a994758970f3a753b6894cf43112
 EBUILD xpa-2.1.18.ebuild 1221 BLAKE2B b89ecc8ef83feaada40d2ba2f8f65f225ba4bef9ac1498903f926a850aafcb3479615d0e94409f4d2c7a3a801603318eff8296ad98930dc4a540de18d4f49232 SHA512 f9a3717b05a948de728505db02d44b98904ea8d5dd898f0b59272dea986ca26bc84f5cf325d4c34f88430732c6ab9380edf9d3cbd675b629073443221893dc3a
 MISC metadata.xml 1072 BLAKE2B 41e28666089a2ea7fb726abcbd92cacee49dce705d193be11e172bf90072429a8d97059682ca5d8d40fc8ad36431e07ad5c2421f6c3d77b6d7861ce3e58e7875 SHA512 64769fd2b90a2dcdcc2de9cc97afae34fc4af8b3a2c7d62c80c17b2491e7a06cf26bcb99e28098e2dc199884f388f08ad1587a63da3c3c9edbfa1dcd1bea94f7
diff --git a/x11-libs/xpa/xpa-2.1.15.ebuild b/x11-libs/xpa/xpa-2.1.15.ebuild
deleted file mode 100644
index 54682a96d22b..000000000000
--- a/x11-libs/xpa/xpa-2.1.15.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="Messaging system providing communication between programs"
-HOMEPAGE="http://hea-www.harvard.edu/RD/xpa/"
-SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND="
-	dev-lang/tcl:0=
-	x11-libs/libXt
-	!<sci-astronomy/ds9-5.3"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.8-makefile.patch
-	sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib || die
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--enable-threaded-xpans \
-		--with-x \
-		--with-tcl \
-		--with-threads
-}
-
-src_compile() {
-	emake shlib tclxpa
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	emake INSTALL_ROOT="${D}" install
-	insinto /usr/$(get_libdir)/tclxpa
-	doins pkgIndex.tcl
-	mv  "${ED}"/usr/$(get_libdir)/libtclxpa* \
-		"${ED}"/usr/$(get_libdir)/tclxpa/ || die
-	dodoc README
-	use doc && dodoc doc/*.pdf && dohtml doc/*.html
-	# build system so crappy not worth patching to a non respondant upstream
-	# and builds static with PIC
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/x11-libs/xpa/xpa-2.1.17.ebuild b/x11-libs/xpa/xpa-2.1.17.ebuild
deleted file mode 100644
index ad5228ffb298..000000000000
--- a/x11-libs/xpa/xpa-2.1.17.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="Messaging system providing communication between programs"
-HOMEPAGE="https://github.com/ericmandel/xpa"
-SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND="
-	dev-lang/tcl:0=
-	x11-libs/libXt:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.8-makefile.patch
-	sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib || die
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--enable-threaded-xpans \
-		--with-x \
-		--with-tcl \
-		--with-threads
-}
-
-src_compile() {
-	emake shlib tclxpa
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	emake INSTALL_ROOT="${D}" install
-	insinto /usr/$(get_libdir)/tclxpa
-	doins pkgIndex.tcl
-	mv  "${ED}"/usr/$(get_libdir)/libtclxpa* \
-		"${ED}"/usr/$(get_libdir)/tclxpa/ || die
-	dodoc README
-	use doc && dodoc doc/*.pdf && dohtml doc/*.html
-	# build system so crappy not worth patching to a non respondant upstream
-	# and builds static with PIC
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 7df0c11e9867..d7a73c095d5e 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/evolvotron/Manifest b/x11-misc/evolvotron/Manifest
index 781429a0144f..10a93b7089ce 100644
--- a/x11-misc/evolvotron/Manifest
+++ b/x11-misc/evolvotron/Manifest
@@ -1,4 +1,3 @@
 DIST evolvotron-0.7.1.tar.gz 179516 BLAKE2B b73c813fdf134e0e4c7882e06a12bc06acfb6dcdf4a38043c4c30027bf00da10df85d6877abdbd8ca6393496038ba9fa0c32a16b0f37dd14d72cc63c00a17d1c SHA512 74f48dc0881a82d999ccc910df026da80fcc46a906fe2fbb8edbae50a1fa42a3379087f00dd21fd9e5d69cee7c6fc745b80f8703b1af1ebc3a1cdb52ffbe16e9
-EBUILD evolvotron-0.7.1-r1.ebuild 880 BLAKE2B b22113e22bf41363133673ae7c29e11a74adb1df6c20e7a008a574216db96049e653a1cdc815816063fafc7e24bfbb64d9091aa08d50501dc8a5ea6973d60b51 SHA512 a63a10863fc0b0d501000674cc18a477c9b5da5afc46bbd85c58d38db2de4a5269280e79b9676d5a9c4643a8e0686811713605d04320d8a3293001ec9ffd8b11
-EBUILD evolvotron-0.7.1.ebuild 932 BLAKE2B c4d20a71a4ca313e7fb8550aa89c6abd4d151cf5d27e4d704fcd9cf6a42f542b3b7b749006893ed5dad8f181c6c2102f5232be199d3f1f88d958a2c21b977f02 SHA512 1a47ee7de6fecee8922509898eb752b969cf29200fc74d133d53720c9c519031bdce0ef63d5ad2a99c82868598fb64145bd0dff8d8791b0080b76f6eccb92bf2
+EBUILD evolvotron-0.7.1-r1.ebuild 878 BLAKE2B 534a03152a5e38b5aa90c7db36c5b29d4ee65853656d87f0311b2a7afe2b7114ca0caba518d2f8da6b05ff2e60155930382b13d360b35255918905820eb88c6a SHA512 72d8245cdd4f378ab0a4412996dc2dd2384d6f18ba63b872f2530e83c63eabced18e3d989652a493054e36c033576948d15825a66d4977e875a1a55bd16843df
 MISC metadata.xml 356 BLAKE2B bcffe50af78659801374955b8bb13970760d0d565c89a210d2ee98059078df0bbd5634e95f2cbc9e922e8b29f21cacb7b6339b6004ac4619b21706b7da85be14 SHA512 7cea09fe7cfe3d43572ab13f83921cd252cb4a12bfc9fb4e2629cbd96c90a07fef8613090514ad562ee112960f88bdcbbe18daa185470780bd714e95aa6bfb47
diff --git a/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild b/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
index c8f3df726e12..2cfacb68a556 100644
--- a/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
+++ b/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	dev-libs/boost:=
diff --git a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild b/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
deleted file mode 100644
index 62f289f61def..000000000000
--- a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qmake-utils
-
-DESCRIPTION="Generative art image evolver"
-HOMEPAGE="
-	http://www.bottlenose.net/share/evolvotron/index.htm
-	https://sourceforge.net/projects/evolvotron/
-"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
-
-DOCS=(
-	BUGS NEWS README TODO USAGE
-)
-HTML_DOCS=(
-	evolvotron.html
-)
-S=${WORKDIR}/${PN}
-
-src_configure() {
-	eqmake5 main.pro
-}
-
-src_compile() {
-	local etsubdir
-	for etsubdir in \
-		libfunction libevolvotron evolvotron evolvotron_render evolvotron_mutate
-		do
-		emake sub-${etsubdir}
-	done
-}
-
-src_install() {
-	local bin
-	for bin in ${PN}{,_mutate,_render}; do
-		dobin ${bin}/${bin}
-	done
-	doman man/man1/*
-	einstalldocs
-}
diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest
index 398a6229a81a..eaa3f4d3f7e6 100644
--- a/x11-misc/gpaste/Manifest
+++ b/x11-misc/gpaste/Manifest
@@ -1,3 +1,5 @@
 DIST gpaste-3.20.3.tar.gz 157869 BLAKE2B 02b52b8023c875bd3c651cc5864603812f0cfd49cfac774ee4e27eae63c66e46f34d5128b717af514cc1c57fb93a775ff01f827210bd7cfa5e9ab5de9a87fd07 SHA512 08b7c52d16e630ac57e4d583ae985763b536728ef9997ce5ecc8a8ffb9be8745e1e5aed9003a4ab522ba76a276855c6a095fef7a73b4f4d80b54c7a9c3e6e9d1
+DIST gpaste-3.36.3.tar.gz 186352 BLAKE2B b00af3f32076bbeb4f06853a7892772901d0c72dd972d08fff0520afae388bed0c9eee81892a2492f4bb972b3a80a924519e1c137edb660fa5f9dfa2fab31856 SHA512 e5fe4a31367e96089aefd1af5ed0a3ad591eee009bbc74b1b33c9c736061831979d79f2d6a5c072cf55fc6f1982ade581fe73d2039c5dbd607081683860c7b9f
 EBUILD gpaste-3.20.3.ebuild 1462 BLAKE2B 4c08db2d5cf05e824dd0e380b817a439d3b807daf5f6f800b33a3b5a996dd6c76b645eca63e018b1a9a1681c7a80b7e0da17fe45deeb34df3d64c1e658dedf25 SHA512 1579bc767610f4acb79fb6657a5723bc81a59713ab2251ff5e90bbbf11facd4ed992c06f9f817d154d382ab75e3e25c849ed676d42cd646095f8629f3479ec12
+EBUILD gpaste-3.36.3.ebuild 1663 BLAKE2B 86ead7cb8147cb3aa16f295d260a645f96b367a2e528c394208a019532b8ff362a99e342411c943ef071e0aad53f8673b1d72ce37208d1cd833a59c8639cec4c SHA512 da84e0add550cec51df0b45d983e8ae5d7491dc3fa77eab25efc4c09e60cce67713bac488997a7036e7f1627213b3c1b2501460744076c82d37059cd42ac8c6d
 MISC metadata.xml 404 BLAKE2B b3bee2faf7f5e7ebaa212dcf5926437b55877bd5d9a3988db09c78411f8f24eb4c60db56ca4ea021c064ede1079f33598e096f8e1e793abef0a5c0aef27b0e82 SHA512 fbd89391c9bf83754466bd2d2dc590d819292eb1e2aa29d3c66e22c32c599ad0ccbeef93ad706326c4aa0665c5ca4448cedf5485694ae076a1b3794e5f33b999
diff --git a/x11-misc/gpaste/gpaste-3.36.3.ebuild b/x11-misc/gpaste/gpaste-3.36.3.ebuild
new file mode 100644
index 000000000000..c80647c39d7f
--- /dev/null
+++ b/x11-misc/gpaste/gpaste-3.36.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION="0.30"
+VALA_USE_DEPEND="vapigen"
+
+inherit meson vala gnome2-utils
+
+DESCRIPTION="Clipboard management system"
+HOMEPAGE="https://github.com/Keruspe/GPaste"
+SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gnome +introspection systemd vala"
+REQUIRED_USE="
+	gnome? ( introspection )
+	vala? ( introspection )
+"
+
+DEPEND="
+	dev-libs/appstream-glib
+	>=dev-libs/glib-2.48:2
+	sys-apps/dbus
+	>=x11-libs/gdk-pixbuf-2.34:2
+	>=x11-libs/gtk+-3.20:3
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/pango
+	gnome? (
+		>=x11-wm/mutter-3.36
+	)
+	introspection? (
+		dev-libs/gjs
+		>=dev-libs/gobject-introspection-1.48.0
+		>=x11-wm/mutter-3.36[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	gnome? (
+		gnome-base/gnome-control-center:2
+	)
+	systemd? (
+		sys-apps/systemd
+	)
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${DEPEND}
+	gnome? (
+		gnome-base/gnome-control-center:2
+		gnome-base/gnome-shell
+	)
+	systemd? (
+		sys-apps/systemd
+	)
+"
+
+S="${WORKDIR}/GPaste-${PV}"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use systemd systemd)
+		-Dbash-completion=true
+		-Dzsh-completion=true
+		-Dx-keybinder=true
+		-Dcontrol-center-keybindings-dir=$(usex gnome '' \
+		'/usr/share/gnome-control-center/keybindings')
+		$(meson_use introspection introspection)
+		$(meson_use vala vapi)
+		$(meson_use gnome gnome-shell)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/x11-misc/gxmessage/Manifest b/x11-misc/gxmessage/Manifest
index ec9333bdd6a7..553bc7bd7bd6 100644
--- a/x11-misc/gxmessage/Manifest
+++ b/x11-misc/gxmessage/Manifest
@@ -1,7 +1,5 @@
-DIST gxmessage-2.20.3.tar.gz 274110 BLAKE2B 9863e680b1d23ba3d69c35e2de826106f1078f585c0be36d1ad51946abbeef8637bc2f872f9fee20738c978146adebfbe47548de48be6b12b92c314ed93d9c32 SHA512 8f677d0ee899c88a40c912ba68b59ba9a21a0ae21db467c64756daea41fbf2a7fb566e26c74e72f89e6009b1e8029af9bd5748f92099f681346399fe7e9d8e27
 DIST gxmessage-2.20.4.tar.gz 274356 BLAKE2B f3325f870e63429934514d2e1bf3debd2827591e776c43213aae84543623484f912b61f7541e37622a28b1e4dfd5044f0b85e664cae2cb8610b3f77c32a9f4be SHA512 43891fc44d9125921150f9330c7ebafd9086866bde27a635ef0f6b30f2d2fa49b01dcd9a6bf65d6dcdec11de07748993057871c77387f51894c150550e3c160f
 DIST gxmessage-3.4.3.tar.gz 275354 BLAKE2B 2801944c3a6542d250f91388a90736ba781013e5c370e42783db620387a07b315b176bac60e30af6e623d4f664291fdf567786e66a1f9e8c383dc772a64547e6 SHA512 4e3c455595db723e2d78060c4913f1a87b8f0c5cb6017427d48cd02652655592bf8aa1001adfbfecd5598cc0c613c78a74d71a59a7f1f0787acc29774328e93a
-EBUILD gxmessage-2.20.3.ebuild 841 BLAKE2B 26fde7e4dbc1b331f9cae6775ac56b4261e4deade272bb43441372ee982605c61a1d41ea9bbcd2070a857c1f467a0213fb55a6cd6ff9252893e9bd99f351818e SHA512 320cf1739969fc9c5d82c5c40892a99706ee0b94fed71df842f6465b904d785fc7cfe351e915f533e3169461e087e6198faa31e188e9ed7499774c0a0aeba82a
 EBUILD gxmessage-2.20.4.ebuild 672 BLAKE2B 344b10d688a284f7dd9e3d5deb38604b4430382661191a267c76186848fba6ce30f0d8a1e8d02281ef5e6dc3ea45663c74dc634a7125bb8aeb52f53e0099fe7f SHA512 6ec50529591320c38091991fa9f8f30ed7f5ad02339b85e84e81d52ffe7785cf11018dc355d65a4944048e8fac0d220f0e8acb09848a504fc15f383e26a849d9
 EBUILD gxmessage-3.4.3.ebuild 867 BLAKE2B f8b771ad4cd8490bbd3bcb6ebd8a19847bf8c57a80c25ef40e5df2a9e08958aaa3be06dc2597bfa6436e971bba042e440a8be97a56c65b958fdbc3fbe53bfcdc SHA512 e35a84714028debd44d59ce5e54305a90a556d12af2dcfd5257b7a3b4081e02331d79ced5029c9e179148f2f207f3edbd49f85fc6ff9eb32458a0b9966c59a3f
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/gxmessage/gxmessage-2.20.3.ebuild b/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
deleted file mode 100644
index 3de3cbc42142..000000000000
--- a/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2-utils
-
-DESCRIPTION="A GTK+ based xmessage clone"
-HOMEPAGE="https://savannah.gnu.org/projects/gxmessage/ http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
-
-LICENSE="GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.20:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc examples/*
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index 743d12112cac..c08cc87f02cc 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -1,4 +1,6 @@
 AUX org.freedesktop.Notifications.service 94 BLAKE2B 1a97aac2db9c803c9e4babf9067283b564a1eecb1d251aee3a5e66b8a4f63d2554e3e09ea06749383ce3d5b8e77c8cc3bd87ae2dde48ae8feb4886ecaf7a3c27 SHA512 0575cbfc094455c0a2f04faa534a5e0d9cc41e6d9566ab9bcb0fcbce99e142213ded786ad00c36dc434ae1b9208d34d234a341dfc86adb72925dad0ee2b25f97
 DIST mate-notification-daemon-1.24.0.tar.xz 392588 BLAKE2B 480272848b3403d34eaa1f555a573dbf74a4e8e45e76c4726943bda4c29d7002f00d1a828e318d51dd07a44df1c64902c38bbe41c1c14339e8cb8710f7008f36 SHA512 0fd2da98001c60672d4833e974ac74dd561f54ca6f3fd74f8d6620e3b28768add46dd891d7446b01426b6aed09d4966d902cbde45aac3498fdcbb837e531a147
+DIST mate-notification-daemon-1.24.1.tar.xz 395444 BLAKE2B dca166664216c7027b2e816c7df64636c3f1c7ae25db253167f9c5d1b296cd9bf3c7533e1f7a33a7d4f2bf5fe074e8f0911462463fffa5b839fd8decd62a4716 SHA512 7c799e31229860cb34fa4a19421360a4a93d81826bc4381ed284e1ec280bae67d2f5bdf5d751f3dad6a1da424a5c598b2def60b7b24fd6ea41da5f126f456bac
 EBUILD mate-notification-daemon-1.24.0.ebuild 1028 BLAKE2B 628a6b16802acc6b15febaaa876d4ef6f7fd053e2d2bc3930c4658c13d72dc460f585db90865594179c359551774b1bcf800fea2e72b0235663abb4530075d0e SHA512 df275daceeb8e1d5ee36f37f3c7007710a69540ca4d528c93a28eea494e087510cd64c6753cf7cecfc1a008b9512033f676922ac00480474d0f39ccc88c6e1b8
+EBUILD mate-notification-daemon-1.24.1.ebuild 994 BLAKE2B 1f168864632ef98659fa44f1079cab355fef086169c70664b6ce5367f36114dbda78c3dd7085b92b20dbf10be7b5c654e758417bdc454afa05227542c19566a0 SHA512 8a80b2ee8af7927e740a5b857f74319b087a1a8e77c977bea44db10b63de1da4a12f40ef4ed408fedaae8ed016a59351200bf6391e0344fa49f686f0747945e9
 MISC metadata.xml 353 BLAKE2B 774bcae8807bbb16a1ee8bc12320e487ec817fb45d3169f4929cbd8c3f7f33a35eb1aad2682e5d87131567c56e6ffe8f2bdbda612c58926ddc3d78b14cb69e53 SHA512 3f46b4bb5e12fdb448e7b7f54db4f4a4683cbdbd89019156601abf80be0333690b65670fb110120cf613dd42ecdfb38b329ddde67fd265257d6ddb32e24bfbbd
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.1.ebuild
new file mode 100644
index 000000000000..b419b74c0364
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE Notification daemon"
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libxml2-2.9.0
+	>=sys-apps/dbus-1
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	virtual/libintl
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libwnck-3:3
+	>=media-libs/libcanberra-0.4:0[gtk3]
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!x11-misc/notify-osd
+	!x11-misc/qtnotifydaemon
+	!x11-misc/notification-daemon
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2.6:2
+	virtual/pkgconfig
+"
+
+src_install() {
+	mate_src_install
+
+	insinto /usr/share/dbus-1/services
+	doins "${FILESDIR}/org.freedesktop.Notifications.service"
+}
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 40d991cd3164..0119a9277b00 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,3 +1,4 @@
 DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
+EBUILD mozo-1.24.0-r1.ebuild 1313 BLAKE2B 245b391e83ec524f3a14f772bccd9771d67ee65bb98b39dd085ec3a70c62fc992792e1aaea7d1f7197e797a6421470f3debacca3ccd9bec4e1f7c9e95321af66 SHA512 5099b3d2be89196d4b177c7186a7ed78dc250f9fcf285cba70c62a055e36da3822b045cacc95c5ae78d8fb325a73fe737bfb30b3014dc9478e9a5f96a6880e4c
 EBUILD mozo-1.24.0.ebuild 1311 BLAKE2B 31a5bb689aff98fe1f37caea0a4f856262592214f24621ed6be18fba2563c601e0c41f37e96e2605104f2bae7473135e27bf0a7a7530480cec2eab00ba22cf8a SHA512 d7ffdb97ca09abe2814c244accd3d622fced0e385c1723ac22d925ca97e7b9358382540718cb877996dc7d3108156b9a9fc5c866f34e564eb055202d74e7bb56
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.24.0-r1.ebuild b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
new file mode 100644
index 000000000000..8977a145b152
--- /dev/null
+++ b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_REQ_USE="xml"
+
+inherit mate python-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Mozo menu editor for MATE"
+LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
+	>=mate-base/mate-menus-1.21.0[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	!!x11-misc/mate-menu-editor
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	mate_src_prepare
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir mate_src_configure \
+		--disable-icon-update
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir emake check
+}
+
+src_install() {
+	installing() {
+		mate_src_install
+
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
+			-i mozo || die
+
+		python_doscript mozo
+		python_optimize
+	}
+
+	python_foreach_impl run_in_build_dir installing
+}
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 5c4ebbe916bd..b3a74f7d14e7 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -1,11 +1,5 @@
 AUX notification-daemon-0.5.0-libnotify-0.7.patch 948 BLAKE2B 9da54db70a628988b5f5b3e34dd71a7bbf8357a58be1e7c9de863d719619b6376ca311c4963e0974f77c08671f03efd28693d90f97a852ee68393e3b11b550fc SHA512 e828d89197c29c3b8e2b6b2e616d6fd63952f8b8ac23f4a0b7a8f6a75722e011d1684302b711ee530506e4e17aae6c7949f12f58a113ca6bb254a29d146d5870
 AUX notification-daemon-0.5.0-underlinking.patch 277 BLAKE2B ef30fae7ca0d8a26c18acc5f98e5a2bd4db53293f302fdba3bf3fbc362c435931d81482e174fbff5396ecee04768068e51c48a8e19be3f881803ae4af77e3637 SHA512 e370ed9435b474fddf0b884d6781bdbfb1cb68dd7f851e72f525d6153235d39f77d28257c6d720f3de63df8ac29a7bf9100669813f4edda177a9dbf21afa3e5e
-DIST notification-daemon-0.5.0.tar.bz2 330034 BLAKE2B af201d3084716fbac02095140f88a4f8528548005996b18ea9a6ef3022ad9865f5bcc1cb7b8bc75d3e97de61fafc34ac98dd5a85066a52a96e908153b61b040f SHA512 abdc86732afebbbe819db779924b82642fee7d29c005564dc890918849e2af11dbff5ba36e1d089c35318236e5950ac69df7e379fc48e7d696d27facce203b5a
-DIST notification-daemon-3.14.1.tar.xz 280344 BLAKE2B 8e965cd52f97129f8f6116c9e21ffe73213b80f0652b7b00732c1afe3817e57a96c094a2ab8cef1628ef0e941aa90c759ff641d5d9fb3e5be8d4c8c26f27678a SHA512 977d028206d6a2005d346f697af5790b404f56399c451774037db25e37724f0cfbd558ae413c9ada40d2d7f399c1911392b19194e8fd093de74f65a6783ccc05
-DIST notification-daemon-3.18.2.tar.xz 329196 BLAKE2B cc4b00474ea20435fa412c1c27a95614baea06bfc00bf09c25b539e44ec8c41621eb7903a9245407e23a2a098290160d970e66dfe9cabc3bdf1ce3663a418f06 SHA512 962d84eb1970451d12d07027d4ee6843a96dc42c7d954dcb79bac55cd9918dcc84a2903b4ee032a0fd8f25d269e5e965a1deaab3da34b4181ea304df2adbae3c
 DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b9b91eb151e5eb030fcb9364a5ac04a4a5631c0a8483dc4068dd806d54ef0a096062ca92f9783f2030edb57f681b82015cf8584 SHA512 d9311c71a2915cb6e55bd1408e60b4d7b7fc24114410b8bd8cb358fe86c100198567099843b967f7e01ca03c91afe3f3980fb30b7f2c138bdab949e0e196a0f8
-EBUILD notification-daemon-0.5.0.ebuild 964 BLAKE2B 05fad23b9462530039899511e68da49574b623314fc3a8baebeb280b551d96cb6f1b7a2a2858abef469acbf55075ecd7362719ac48a057df6bd9c9650a40778c SHA512 b3c775edcb7a25140cf76ceb3d52b0d57a6288201a841c7297365675f1a866f566917818d58b03caea549267e6b3888f620573712cbd5f9ed7e087f872c0b41c
-EBUILD notification-daemon-3.14.1.ebuild 961 BLAKE2B bda9b278350e7e3ccb3add0187011c29824732e835bafc5a5dd39978d46b01d5f38c18c72e1aa45e2f9a57f5c96d9b77c20b077c4624100428f8664c54d35c90 SHA512 83cc2f4e61790432e8d27722da4ac99ce29182440e1ecfa1d64b768fec9658f03bdadf342c01ea22bfd95be2c6e64fa1b9f293eb903b22be7e733d9defc8300f
-EBUILD notification-daemon-3.18.2.ebuild 933 BLAKE2B ebfa325b308ea42f7c3249265726cb13d4476b93f0d7f4e410a9163a5ff519578a9e1173343c2a50a8f82e651738a9b06a1d0b17be2111970754ec1e41ba87c0 SHA512 46a1a4f00896a331beff2a9b42720cff8a6cc9a1b21c727dec9af0463c0fca034668a7d1f8f04523d7a27adf96bac38f067c84e14fccbcc224af5703f4869b3e
 EBUILD notification-daemon-3.20.0.ebuild 933 BLAKE2B 6b6723c0fb6eb6d0bb651cf89391044caec710a62c646ce14c449dfadba8bac667260ab134ac3441e908fe66061db130e3a7a35f76cbb48ed56ad35258d7d58e SHA512 5ede8f81fb46b783f0d2f323d95724db34405bc5b9339afd36faea803453bd3b76c47c09b8c8525dd821637d1069572f645593c50d18c4e4b266166a7eac373a
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
deleted file mode 100644
index 807ee0da169f..000000000000
--- a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
-GNOME_TARBALL_SUFFIX=bz2
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Notification daemon"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.18:2
-	>=gnome-base/gconf-2
-	>=dev-libs/dbus-glib-0.100
-	>=sys-apps/dbus-1
-	>=media-libs/libcanberra-0.4[gtk]
-	x11-libs/libnotify
-	x11-libs/libwnck:1
-	x11-libs/libX11
-	!x11-misc/notify-osd
-	!x11-misc/qtnotifydaemon"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-libnotify-0.7.patch \
-		"${FILESDIR}"/${P}-underlinking.patch
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
deleted file mode 100644
index 5fe49103da47..000000000000
--- a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit gnome.org
-
-DESCRIPTION="Notification daemon"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.28
-	>=x11-libs/gtk+-3.8:3
-	sys-apps/dbus
-	media-libs/libcanberra[gtk3]
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	!x11-misc/notify-osd
-	!x11-misc/qtnotifydaemon
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS )
-
-src_install() {
-	default
-
-	cat <<-EOF > "${T}"/org.freedesktop.Notifications.service
-	[D-BUS Service]
-	Name=org.freedesktop.Notifications
-	Exec=/usr/libexec/notification-daemon
-	EOF
-
-	insinto /usr/share/dbus-1/services
-	doins "${T}"/org.freedesktop.Notifications.service
-}
diff --git a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
deleted file mode 100644
index 15fde45bfb77..000000000000
--- a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit gnome.org
-
-DESCRIPTION="Notification daemon"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3.15.2:3[X]
-	sys-apps/dbus
-	x11-libs/libX11
-	!x11-misc/notify-osd
-	!x11-misc/qtnotifydaemon
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS )
-
-src_install() {
-	default
-
-	cat <<-EOF > "${T}"/org.freedesktop.Notifications.service
-	[D-BUS Service]
-	Name=org.freedesktop.Notifications
-	Exec=/usr/libexec/notification-daemon
-	EOF
-
-	insinto /usr/share/dbus-1/services
-	doins "${T}"/org.freedesktop.Notifications.service
-}
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index f8a497be6a62..cac32f0383e6 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -2,20 +2,15 @@ AUX xlockmore-5.46-freetype261.patch 561 BLAKE2B f5fde1a8984784a2892363b85413728
 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.64_alpha0-LDFLAGS.patch 906 BLAKE2B 477e2fa3b3e74ef3bcb93d0f87f82f05f05dbd0b8fe395a2be3540986df74acff7650dcaaae84809f2cef9d5da7ff8360cd40e261328d2f404b58338e7353b13 SHA512 ae42b30b37eeccbf767e6e44a557611ae8bd549778b1b4671355d0cd4c3fbb195c23a6b3dfac7b4aa2563cfba86ddbafa791bc3786b9c8c1b84ae057e625e2b5
+AUX xlockmore-5.66_alpha06-rotator.patch 176 BLAKE2B 52115f36e2b40d911570e72fab408d518b3ba3545db9e95b16cf9ed460c80c66b0491b302d8c8752cf487e521d57ecacbf9de00f52785c095eba976291760931 SHA512 db33a41047724dadbe1ab720b5d91289e9795b664e2c032593177d6fc5733c0f004579d568365df42584db96d5ef777e23f6d4630458178a56cf578ae051ccbc
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
-DIST xlockmore-5.62.tar.xz 1943836 BLAKE2B 6ce9b9ad709881a50eba0e32ae1e7524414a5e92e34daeff1ce68b6bb4738117155543d15219723ab514d520064601824a22d438541a699c742ab0c620285c64 SHA512 fc7c63a8ce781ba1a9598b5e3d585cc85051da864dbd59e3232b2fa6b6529743f9244e52bdf588ae438c02a2e1e745eb81b372234189e73ae6698cc962c387c2
-DIST xlockmore-5.63.tar.xz 1944624 BLAKE2B 8ee27c5cc88a7088705b7a017563698fa4bf99418bf3237594a1237547fa1eb9d5274327672f33344e97d2333eca71f95e51f760f0548abef06f8006a97c55c0 SHA512 0b067ced9afe0c5498f0b1e19bf163b0363bbb4bc2bc2007c1c0416328cdc2d528d664b122ef68322c38f2bcc37a15665b31ee6e8ce2369bad9e50528b93a047
-DIST xlockmore-5.64.tar.xz 1944496 BLAKE2B 1b2c0337950bcf7ba094012c70c6c8578523b81a6af6dd68a0373425f87d7da28a770a8f7453019cc1527501a417390f013f43b3da2ddfc7d44380c512f9b4c9 SHA512 4946e8e9f895c0433c09e1cd639389d26020a764d62b08b329ce5d9e5de4bb6438f024639b2068c94f21cb0ebb5a6f94dffff6f606c6c3e2372a5102768e7f39
 DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8
-DIST xlockmore-5.66ALPHA00.tar.xz 1944644 BLAKE2B 0b52cc3a5cb77645174084eec3e81838e96a4b5e849955e9090efabb62cb38f477ae3a23664b4dc27bb8b79af62d946b4702244bc3b601ede7097f60de6b0fbd SHA512 7216fc3b034c382ab02d06e22a9e572e3602e4745b2a055a8ee51f6a4c014776ea27b665fe7638719303b9bea3f957a27e1da47e15d5de44c3717136dae82ee2
-DIST xlockmore-5.66ALPHA04.tar.xz 1946880 BLAKE2B a02290052459df4424cca7205a932de603733176323331024514a61682e581706a66a5591f57e6a041eb0e725cbcf04d9641a9d59be4bfbea88d77605973a58b SHA512 2a2b59e733ade48810e85ac0fc58ae2433035db9bfc1653e73359d921a425d7d67156588ce1c428ef756b1604125a151221f64c719c4da20dc0de83fb4d2bc23
 DIST xlockmore-5.66ALPHA05.tar.xz 1945728 BLAKE2B df0d5a8b0122673204c30f416c4bb599476340f0a0a4a80e08efe42c77a5dfa2408d74375dfcf2d68740d0b2c0147faff8ee01fe96e106eeed14fc779bcb3344 SHA512 259a8b2b0e7f487e5bb025a8a6961c38933ae259b3544c66823e09ea2f0fc44e19155bd335870adca653c268dc4811d41570882b021977e4981f0ded36ce3909
+DIST xlockmore-5.66ALPHA06.tar.xz 1947244 BLAKE2B 998d1438bc8ad95c21ebcace2e390936c56fe975331d2a82d10899a00b43fd245fc71c34050459d88fcc47c9b97bc074bd91be432df0a2933db0fd9153091888 SHA512 cd4d47a677b2e00f993b6a32cd2cd98a88fa04dca1d2a62303b58ebe2a4b26b4e4308a5c25883dbe8adade98ae85dbe7b61422ec05579a82b193eecb642b057c
+DIST xlockmore-5.66ALPHA08.tar.xz 1947004 BLAKE2B 44ad1f877d214a8b719db57df8f502391f635a4a9cd12bd470610c27543c4523acd6824cf01cb9bf6ca73628d4bc59bc25dafc436d4ee818d5590ae058a7b02d SHA512 a7bc5ffe09be91a5a903067c1e9cbdd5808207fc2ff0507e9bdfeb4156c187ee00da2a8d790a539b97e26985adb51326e1dcde9cdaa194bab4b8705117dc97ce
 EBUILD xlockmore-5.50.ebuild 2231 BLAKE2B 3accf80283ec7705cfafe4531bc38c1694d9d27381c9aa375bb14a1d59e865dd1c2aa8c99d1cdd26a93fe929b3302ca4646fe93f740feb56c86b70ca9362ed6c SHA512 f0116108dcbae364e4a7c391054890fca090fc182b8bd11c613e84bc91ccb07904e5bd14c515b934e2895c9e6bd2f82762d09719de4e648f6077338e3f05ff97
-EBUILD xlockmore-5.62.ebuild 2290 BLAKE2B 684053c5ea68511e810fdddff942f61ad18ffcdffa32a1b6eb68ed4269def2d03b82a70b75c3e37500615c5816077a49944b93858a53b9e07b8eba27c68bcba0 SHA512 e7818da25a25f015a06aec1f8096a3394981bc4c68a73f7a6a178fff6e278a91f088b02423eaf937aea0d9e33b5115973f23e714e78b12ae5458977012efb22f
-EBUILD xlockmore-5.63.ebuild 2284 BLAKE2B 5dfca5003f797a6765b33f14a91664b40559441812611677f392b2291a7e29297c254fb29ec3ea895df6e903f98e5926215b74d2ea0b342527da35eb045cc2f0 SHA512 0ec91c240df64f0a3e6c3c0aa7fbf35bdb889cb4d4cc76825223802cf3dd807067f228980838e1d813214f20ba8269d1cc9df96548dc14d2dca4b2d8ee102671
-EBUILD xlockmore-5.64.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
 EBUILD xlockmore-5.65.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
-EBUILD xlockmore-5.66_alpha00.ebuild 2480 BLAKE2B db28c6af68b0fa419e001dc54dec91d6f5856c5cf2159c1764809f0780fee5a6155a06438880e4a20d2c457332295a7d0830c0e5792bd43f321d901c90b07eef SHA512 4e4bc7c9867f24c9066371c2838ce9e960394717a72fa9b532f4b98ee0e7ad40bd1902669cc1f76c3a5f16742d1b283d5cd0d0722ad6eda30c09aba7efb87b7b
-EBUILD xlockmore-5.66_alpha04.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
 EBUILD xlockmore-5.66_alpha05.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
+EBUILD xlockmore-5.66_alpha06.ebuild 2527 BLAKE2B 12589616ce832d6cb0bbe75372c081169c74904cbc30951bda056c2ac4e6a39d05ad4b8439f895b754331df052a99436a02a22551ece327b06b7a2fc37b3e05b SHA512 243be7ad3ccd304b8d54e4b34bf8065d65d4fbccacb969cfb7400e36c21fda424c9b83f0c127dec4442ffe4e86bb974333be46e453e541a547fa268f53073e4e
+EBUILD xlockmore-5.66_alpha08.ebuild 2479 BLAKE2B e6c5a0afd5d3db19928f57c5e31892115b12bc5104ccb6f5386ee31d1c34ec35a128a1367725e8fcb1c4ed80f814aff4b7133455bddc7850899f1a6b4bbd0a14 SHA512 e6b4f3f832087cfe018f37322f784e007aab26768ab5933ff0deab106a3bfc561346a23dea3f232e81208a5bb3846fccfc170ef9a1c81274a60e14669cb41f6d
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch b/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch
new file mode 100644
index 000000000000..6400ba33fe35
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch
@@ -0,0 +1,13 @@
+--- a/modes/glx/text3d2.cc
++++ b/modes/glx/text3d2.cc
+@@ -83,7 +83,10 @@
+ #endif
+ #endif
+ 
++extern "C"
++{
+ #include "rotator.h"
++}
+ #include "text3d2.h"
+ #include <GL/glu.h>
+ 
diff --git a/x11-misc/xlockmore/xlockmore-5.62.ebuild b/x11-misc/xlockmore/xlockmore-5.62.ebuild
deleted file mode 100644
index 2071d0700818..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.62.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 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="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.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? ( sys-libs/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_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-cppflags -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.63.ebuild b/x11-misc/xlockmore/xlockmore-5.63.ebuild
deleted file mode 100644
index 989d6c25d4c0..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.63.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 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="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P/_beta/BETA}.tar.xz
-	https://www.sillycycle.com/xlock/recent-releases/${P/_beta/BETA}.tar.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? ( sys-libs/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/_beta/BETA}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-cppflags -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.64.ebuild b/x11-misc/xlockmore/xlockmore-5.64.ebuild
deleted file mode 100644
index 26cf0a2b0721..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.64.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 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="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.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? ( sys-libs/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.64_alpha0-LDFLAGS.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-cppflags -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.66_alpha00.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha00.ebuild
deleted file mode 100644
index 5fcdba0ea0d5..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha00.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 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="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.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? ( sys-libs/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.64_alpha0-LDFLAGS.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/XLOCKLIBPATHS="-L/d' \
-		-e '/XMLOCKLIBPATHS="-L/d' \
-		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"/'|g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-cppflags -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.66_alpha06.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild
new file mode 100644
index 000000000000..46cad1c85f0e
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 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="https://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.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? ( sys-libs/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.64_alpha0-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-5.66_alpha06-rotator.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/XLOCKLIBPATHS="-L/d' \
+		-e '/XMLOCKLIBPATHS="-L/d' \
+		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-cppflags -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.66_alpha04.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha08.ebuild
index 2bb52c63b8ed..2bb52c63b8ed 100644
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha04.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha08.ebuild
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 923ca25f8b24..4d4e34d3008b 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-skypeweb/Manifest b/x11-plugins/pidgin-skypeweb/Manifest
index 89de328e6794..7e1e92e3370a 100644
--- a/x11-plugins/pidgin-skypeweb/Manifest
+++ b/x11-plugins/pidgin-skypeweb/Manifest
@@ -1,12 +1,4 @@
-DIST pidgin-skypeweb-1.1.tar.gz 321761 BLAKE2B 5968946352c272bea84bde3bf5bcc04a9f84babaa5758aaf1caff460b7b282c06d3d4355f7f69f2fdd08f3749f7181362496ca98b5ce5a98a8ae5f5c71bc7d40 SHA512 bf293ddfac8839c720e6a1e3c594d764d9a2ec876ed201dfcaf62c3f6eba4d6260dcd0bd06e8af60e2c61942396cad9ff76c7be3f5586927ae6ebcd2971d7280
-DIST pidgin-skypeweb-1.2.2.tar.gz 410637 BLAKE2B 4766042f31159c3165e54267cd108d91e8fb1f8997a5e401843ee419126b312cd21bff72d27009064f34fa3549b6635516214dca8e1901ad451b24b1b210b2dc SHA512 4a042e70e6ae1b5f4c5047589d9298d74653513dbb6556d4f786ee5c528e8bbfaf7f9934653fa16a9a3e43197bcbcb168e64e090ccb5ed05a761334a6d88f59d
-DIST pidgin-skypeweb-1.2.tar.gz 323263 BLAKE2B 3a460fc53f53cb82608a9e09bfaa52c5ccd28350a485631725de953e020e9d05fb87a19e5e62198fe37e5590e763798ef8e20efd63ba84b46aeaf1ae314cb02a SHA512 12ff1d67e1eaaf075be49801031f7cd19351a40a599b7495bdb1003557defb72238cbba749d3eb18b5479df63291914a91a0b942ce5ba14f9362eca55428002c
-DIST pidgin-skypeweb-1.4.tar.gz 436177 BLAKE2B 1d78456a12d2ac52b7c0c6019148fad14ecb5a85f4d113dfa5c5916d64ecfaf6035b11cc348b8f3b0a7254a92ee0e35fef0fcacdb0ea69b092e528fab461728d SHA512 58a5bc0db5ddaeb3614366eecbb0d72f02e504bb10278a5df3075c8d2aa29e2f9cc18242616d8380044982a76440f51bdceec20b277d826e8b3066b1e303145e
 DIST pidgin-skypeweb-1.5.tar.gz 295956 BLAKE2B 0a45c709570c9093df9f0e674e5556a21b832b5e73ab2f32d439aa4fe3ce224df0bab05e054ef352ed337113e6800020cf0da60a7b37a6f39a22fc95ad40d28b SHA512 93043b83132654144f333e90bdff88dec5efe2495412a0b40f0ab64ec96d9427acea553ff73dee054de87e77121cbfd1a7bcaddeb17ab4d91baef55d658b6478
-EBUILD pidgin-skypeweb-1.1.ebuild 473 BLAKE2B 3af05f38d9abfbc70341e97b1a52112dd377593cf167b7ec6577f09f0c93f6851c403781b9f8dd6bbc3ed0356dfc5a20f614bf2bc497ffc55e0f1f15475b85e5 SHA512 98e8120fd0a77060687cb6c7ea8743b044b12c32f2a4b9f1f81fafc46bee9a012805efc7858221872b0c4970a52300b57792bf294ac7b9121b9f8f1cf19a2418
-EBUILD pidgin-skypeweb-1.2.2.ebuild 473 BLAKE2B 7fe90fa975acee70e752b56c9e83f839226088ba4ef164fbd5247096279f466c4620111c0102596f95d08eb08efed058b142adc988c2e647fb38c4e1b5c4a2d3 SHA512 ca2c70f9414f499fc849cc6f16bbbdf4c2ff6b55fb2fdcd557ae1cfff98dd0aa3c883cb1c0c1a6567588429ccbfb8ff8ed85c2ebc38acc5e1c697ab39f768995
-EBUILD pidgin-skypeweb-1.2.ebuild 474 BLAKE2B 8880b942d7fbbe14ec3294e62ba6abb95b70b255ec7ce4ae36255ab61958d3f029877b3af676f53801fc1c3e45e94ae34d5c3462864bbdcaf89e1689997e1739 SHA512 ed0cb78ef57871dd43f415b1fce44ada8a4f49e1e65918fb65818637cea5d7d3188fd01f1d8bd53087c72ab7c6bd633f83e590ec3230d6cf1da6cb37638d1d90
-EBUILD pidgin-skypeweb-1.4.ebuild 657 BLAKE2B 66eb1694b3b1efbc0c04442df492d650a21b82f27de8e94416ef871c6aac11792cca1969393eb615113045175abc22d5d5ce9f3b132456dbfd6e37e68484ee14 SHA512 6dfd66a23c2d98af2fe0d93f3acc2eab68f1c59e71477b207ad54f6ff772d476a1caed07661e19fd9e2eed05880c7c31705b9e597a685ecc98ca6071c2080c5c
 EBUILD pidgin-skypeweb-1.5.ebuild 658 BLAKE2B 4e608465edab12b481ebeab075d9cb9e5de9519c62856de3e2780abb06d302f1d91f4a259d162b7cdb0539ec93e26be57eb51c602e4bfabd09573d0463747552 SHA512 449de42850da9881b7451b5558efc50f3305808da197a30302c2bded746bb464134658f53bea3b54b4931444e6d1596fc25e375dc5a7ed8f4e8d103c2b2e1edb
 EBUILD pidgin-skypeweb-9999.ebuild 408 BLAKE2B c50234601349c4107d201a14625b51c407201c4cee9bab54d8ca965d97eaa3ed5c871ea23dcc15b30ba66e96b8a218c98adf84716dc94c72c5e7297c27ab1bba SHA512 f9cafbad41529d2c308da61cbae62c9e38cb4cd42895d142c443ece9daf4bf47d471e0b7a1f017d45cd88b6414de02542ef8244b1856ae1135344a1fd1ae8398
 MISC metadata.xml 444 BLAKE2B 99319eb5979a7e51ff0699ae5c524c2eee61fcc6407a32c8e5323a1f029b1f9bf2c0f56508bd4bd18e59a70256d6e62f9e0c86973577496e7e990ba565c855da SHA512 dcaaa5cd9f80a414d5931e39228f85482a086f1a55d5b44933feedb0949c2277847df60400bb8cde6a57d3524f8b52f384b1eba5728e6aea523ee6161381f734
diff --git a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.1.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.1.ebuild
deleted file mode 100644
index 2ed0e40e9b04..000000000000
--- a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="SkypeWeb Plugin for Pidgin"
-HOMEPAGE="https://github.com/EionRobb/skype4pidgin"
-SRC_URI="https://github.com/EionRobb/skype4pidgin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="net-im/pidgin
-	dev-libs/json-glib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/skype4pidgin-${PV}/skypeweb"
diff --git a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.2.2.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.2.2.ebuild
deleted file mode 100644
index 32367dcf1bf9..000000000000
--- a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.2.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="SkypeWeb Plugin for Pidgin"
-HOMEPAGE="https://github.com/EionRobb/skype4pidgin"
-SRC_URI="https://github.com/EionRobb/skype4pidgin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="net-im/pidgin
-	dev-libs/json-glib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/skype4pidgin-${PV}/skypeweb"
diff --git a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.2.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.2.ebuild
deleted file mode 100644
index 21a1c4068d5b..000000000000
--- a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="SkypeWeb Plugin for Pidgin"
-HOMEPAGE="https://github.com/EionRobb/skype4pidgin"
-SRC_URI="https://github.com/EionRobb/skype4pidgin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="net-im/pidgin
-	dev-libs/json-glib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/skype4pidgin-${PV}/skypeweb"
diff --git a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.4.ebuild b/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.4.ebuild
deleted file mode 100644
index 558c4ba3ee66..000000000000
--- a/x11-plugins/pidgin-skypeweb/pidgin-skypeweb-1.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="SkypeWeb Plugin for Pidgin"
-HOMEPAGE="https://github.com/EionRobb/skype4pidgin"
-SRC_URI="https://github.com/EionRobb/skype4pidgin/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="net-im/pidgin
-	dev-libs/json-glib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/skype4pidgin-${PV}/skypeweb"
-
-pkg_postinst() {
-	elog "If you get error message like 'Failed getting Magic T value':"
-	elog "Go to https://web.skype.com ; Log In and follow the instructions to enable your account!"
-}
diff --git a/x11-plugins/wmfire/Manifest b/x11-plugins/wmfire/Manifest
index 922448b6733a..89bfb59fa777 100644
--- a/x11-plugins/wmfire/Manifest
+++ b/x11-plugins/wmfire/Manifest
@@ -3,5 +3,5 @@ AUX wmfire-1.2.4-inline_c99.patch 653 BLAKE2B 5ae6f48c1062f46d22609a1707945b9a1b
 AUX wmfire-1.2.4-lastprocessor_SMP.patch 3890 BLAKE2B 5b53fd87f6dfce827e5d2403c32e303a7b8dc5d663e93223c6dee6c5bec70f7ad3c07e2261edac7330886eb907bbda72e2635ca3a308d5e0f63b701f31e90976 SHA512 2d0bdc693e53c9c8669f1277134629c3fb506f6c20d67121aef7a624878d56db7a5afa227aaca7c669d0f8ad999ceeadd48380a3f8e9d061ddb853d09f0eb539
 AUX wmfire-1.2.4-no_display.patch 560 BLAKE2B 505f4ba45ecaa5a7d7cf1f8c17f4eedf80c96afd028302243d47ccbef047dc17a12b008e6b10730f16aa037d3047b06c11ba6074e446dbaf3d3660afe67b1447 SHA512 8329fd7912b765f19fb5f72e8bb42f71e0a99a2c350e71e84f604efcec61d43f78557fec5338ffcb86d6cd1ed57e886e9b8eb474bdf47f4e6639795c194500ce
 DIST wmfire-1.2.4.tar.gz 91144 BLAKE2B b51595dfbafefb26cfb28c729683e01e8eee5683c0379bc831fd5c9172576c4375b3262da9a167ce157a67317e15d25179d6fba067c70d04ebe3e362fc3db315 SHA512 391a76c5f7292751591becebdb6267c29270e24cf9faff7e748431ffa51e74806a7b407a6493f9d4cfdc7865e4d8e8b803567b0a54caddb9b42f82160938c82b
-EBUILD wmfire-1.2.4-r3.ebuild 887 BLAKE2B a39a7a23fb906ae4cc9eb78fb83159c647d6a17f740c6d6d7fafa97097453f3b09acf3196d83dc5feb4619fe0eecff93dace007b67ba64a9fd69a97ad5e99442 SHA512 9c2131d2230369bdbf8411a4f2e7027f5383cf5c991d658384c595ce9c2f848af923b9de7ccdfedfc980911eb055f63339e67bfaa590e05a9d406d371b68dc34
+EBUILD wmfire-1.2.4-r3.ebuild 902 BLAKE2B c4af3aac54f4d8418bc13d8b096cc5bc68e20899fccf5a0819e57178d1e8a03ac70b85ccd4fe1850c8636b2937198741335ba4bd23e5f6e223e8685b7d0e641c SHA512 d4018bf6398f0c400b3e4a854906dceb1467213201f9585a4c133f708264d7772b0184cc02bbdb6b05355439d3bdeee583b0c3b04f8b14ea29cadca977f029cb
 MISC metadata.xml 573 BLAKE2B c75563b4bec05cc6903b69585a1d456d81ba429a99109e841ec3c0ab51327ad91c323c1ef4321b47e56cf5e9ccbff257f7efc6f042afd8715d5224143fe2ac9d SHA512 fcc7884a474831f97f318d07eb4732842e00b570e9f74374fb99eff8071e26b10ad2862df8150ae532069194514085c6e1e85b1d256468ce80d2760eac438502
diff --git a/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild b/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
index 7058dc5281e5..5e83618ae434 100644
--- a/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
+++ b/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.improbability.net/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="session"
+IUSE="+session"
 
 RDEPEND="x11-libs/gtk+:2
 	gnome-base/libgtop:2
@@ -35,5 +35,5 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable session)
+	econf $(usex session --enable-session '')
 }
diff --git a/x11-plugins/wmxres/Manifest b/x11-plugins/wmxres/Manifest
index 2c62092403d5..2771601b62b5 100644
--- a/x11-plugins/wmxres/Manifest
+++ b/x11-plugins/wmxres/Manifest
@@ -2,5 +2,7 @@ AUX wmxres-1.2-gcc-10.patch 460 BLAKE2B 4335f8a0f332efd800c8909d047146304f995d31
 AUX wmxres-1.2-r1-fix-build-system.patch 584 BLAKE2B 2ea4860274791edb2dcd1c03ee0753c413f919ab1648c7a2c684e8f45698355d0a7132052705b71210b9ba3eeddb35815bd1219dc151484a919d5b67b0caecc6 SHA512 c505490234aa5ec366ae37b5bc95c04cefed93599dfd37d14a015c03daacf0b71fc611bc6962c31be12a60c61c82e7b1f29db80e7826e058433abf9f9f2279eb
 AUX wmxres-debian-1.1-1.2.patch 1699 BLAKE2B a07ed3bc2c26d9bc73d4340d658ff9754eb9109fbd5bd0ffe973d90af32bf0b5e8e9edc6a03ee822c41d89a934e5270ad81774f35c0d62867f6b788071ea0fca SHA512 d2043b9ff22415f03ec7a3c46770562b7d6ee0180d1048dbd447f27c49149b405faca3c2e863a91abc71c766ce461464f6c4fdea54d2b5916c88a85e8f2d8051
 DIST wmxres-1.1-0.tar.gz 9948 BLAKE2B e9d0952a0cba30733f0b28ab0b1f37e7b0215ba71abda255646321ee673a09f8510384466919dd27679a6b91c68f7a31fe3ff646c7eb453193c9de29b46c5710 SHA512 e7b5bfb061822fb827da50b24287ab9c6b14d3ddf9a89ff6cd5e1bb61939905c901b4a0ff7a6492e0ccce3b39b8bb4d8ffb13cbf7978075a73a30080e25c18ad
+DIST wmxres-1.4.tar.gz 87647 BLAKE2B 23a4ce2ea3b3371c105efdf05c250bf199988924530def6ac12581d591e36149f027ef2a9133ab53aa137e920d3e02a32bca3c2eab995b20c127a247a3be8755 SHA512 5fb69b1a34b90a5eb88de843adb59d88cf72654524bc6f6b90c5f03a9035eb07ebd53dd3babe19d4750d4a298b0a9f1e2cb1f21a1780498114c1fce2c1669213
 EBUILD wmxres-1.2-r1.ebuild 757 BLAKE2B aeb2309cd232a9433f93d37aa28fe4fd7b0ff620cdba93b959f19479d444d9f89b39b6ef8fa5f4ce8be3e97e89b6b85329fe6b43088cd7eb3ac9f8cb524951c8 SHA512 96850b9e1b570cc37ed80c071be01de94900a44ca21f496800287e01eff28587158bb4b502e66b324406fb868314b6f99d22b60a8f01069ecab61994f558e666
+EBUILD wmxres-1.4.ebuild 499 BLAKE2B 967c7d2b3db745a4859a8d7d2359d81f5e47ffd27e36a2ec98c9deaceefdde6ac4b6fbe4ba1857a335a6069a40f3bfd6ece083f332eddbc4aa9b73ea786b090c SHA512 15ac8aa26ad3e31ebedac8c41cd01c36a8468578fb647ec4b82ad202530fc921d9e9eb1b5effb2949e4570259f277fe6fe7494a7956a5afdc9d1357989d5dcb8
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmxres/wmxres-1.4.ebuild b/x11-plugins/wmxres/wmxres-1.4.ebuild
new file mode 100644
index 000000000000..8fd981588032
--- /dev/null
+++ b/x11-plugins/wmxres/wmxres-1.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dock application to select your display mode among those possible"
+HOMEPAGE="https://www.dockapps.net/wmxres"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 836aa3b98d67..b40eaa1ddde1 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
index e0b0ae727a3d..3be8b28e55e8 100644
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@@ -1,3 +1,5 @@
 DIST mate-terminal-1.24.0.tar.xz 2084772 BLAKE2B 82909eb210bf5f0848e35b06b8569b22ba35ff515b2f90bc20e1766564997c7a44080597ac2efa825a8f9793f64c56136dd977b86e4d88e0886bb0e70c772e79 SHA512 2ad25411a8e720d3ef43964dc9f80732e215b1b5154e904069d25e73910c0c8f0e1b100d21f85b9a1eec06f6b17f891791445f7830bb52fc44b67fa3f8cebf76
+DIST mate-terminal-1.24.1.tar.xz 2032824 BLAKE2B d5c6e97fbb22550f8caf0042422ea9104b947f04e3dacb42bee4e6d1dcdbd59c8cb6765889ac86ea5850ac5ca293a9f796aa5c41d5e1707df2bb37670b3832f3 SHA512 83090667f823605ef0681efeff66c30729df83e7335c100171017ee5f2e819ec0bb219fdc71ed54a27c4a846fcc8db01c4462ef5b9c1e3f31d9c5838427566dc
 EBUILD mate-terminal-1.24.0.ebuild 751 BLAKE2B 851756536ba0a9e0ef4a5c7f5047df8bc989c18b03a7d7565d8d5b230e35abf4f57bd0a52f5f5e4f3032eaa940adb5fec8faacd2d8df7ab3f1e0fb1652cecbcf SHA512 83b620c03d4e8c63724807855d49dafd6c32ceea94a0cab623a6bdee811c4f7191315705e27f435d106dc2d7f4b99a3efe439e0a864d3257b846b662aa620388
+EBUILD mate-terminal-1.24.1.ebuild 751 BLAKE2B 6c692044bcbeefe6090054311fa3689d40c94b98305e6e3df6dfc5b6ae8d6d0c5770a1a3535ccf7f112f2964a3a92209fa5f008c6232dbb4d9dcbfeed0881349 SHA512 ef4d0a6c00379d8621e66ff9bade901a63952e6f904752ac8966d83a994f5a24aabb691942cc31f7446852cec0c35495ab5122f5ac302bc0f7cb93c29bef2f90
 MISC metadata.xml 342 BLAKE2B 811cbd769e0b0c1b5766cde7b50689d7c921289cf776132d66c79203373555c83d9059505da2a441030c4aa576179130aa985c7deee4f75c8bb6c56f4968cc13 SHA512 9edc7ffa3bbd772e794786c786eeca99dc500d9f22632a54bc700ce648084f096d9fc7c1786af446711293bf0e294078abe5ce94073de091b9d48248875e7cb9
diff --git a/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild
new file mode 100644
index 000000000000..6582117e42a9
--- /dev/null
+++ b/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The MATE Terminal"
+LICENSE="FDL-1.1+ GPL-3+ LGPL-3+"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/dconf-0.13.4
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/pango
+	>=x11-libs/gtk+-3.22:3[X]
+	>=x11-libs/vte-0.48:2.91
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=mate-base/mate-desktop-1.6
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/x11-terms/pangoterm/Manifest b/x11-terms/pangoterm/Manifest
index 33aa6572428a..91944456b4dc 100644
--- a/x11-terms/pangoterm/Manifest
+++ b/x11-terms/pangoterm/Manifest
@@ -1,11 +1,3 @@
-DIST pangoterm-0.0_pre20150323.tar.gz 22053 BLAKE2B 853691df002c9afb04b6c0e715685a8e84a0baf8ad108bdb4f84a02c194b55cd2b1950d2b71712eb15133bbcae041c0e7a69c6fd473340b3a319c4987a6a7d91 SHA512 c8614d51459c68bb03a95e1a59a31d5c199c94001995f880f23a369b9aa6ee72a6769790a8c4592d8829eb52ea246ef051fd36fd729f35c4a80931fd9e42b916
-DIST pangoterm-0.0_pre20150913.tar.gz 22074 BLAKE2B 9c6f7e3601ba44c360d777e0773ffa76b23691cdffd54c1f4d638caafe9fbdf1b09ad494595bf1c831317d3d35c7ee2dfd70e9de4c68f2497e60e038076d6ba6 SHA512 2efed960bde9378ea25d96e41460245925952d50f60a4f0580ffc71519acb278101cd16c3aedaa8037c2734f09d14a0590731a1a42fe2f357ef9222a8e0bd260
-DIST pangoterm-0.0_pre20151022.tar.gz 22588 BLAKE2B 635edd2536cc484eb6cbcbd21714b37feb3247624a655ee473d60459b060c59f1a1954576a74779ae12755db01761dbe41be8d1fb78ac628256f0e2c4eeae7de SHA512 716acd0c47fbca35961aff21a8dba886ec4cb152d89544f20d9752828f9e005a5561090959be64f1db864bde71db1d205d045b8a7baa36d23471e1a87c7fee14
-DIST pangoterm-0.0_pre20160305.tar.gz 22802 BLAKE2B 4dfc4a81b67caf95fabec38b815488d951e0c298859754cd77366149e0263964f7eeffd7f87f4eace7f228f8bf36c5c38201d58a181409b7e83359f99af6a2f4 SHA512 570c8fe1f7233884a849aa9b9160930b77682a9c3ef6f9c26891eb604c861e01a3ce13d418c8febc92e1cdb2794d5a1cf0097c27183395098c505540146f8467
 DIST pangoterm-0.0_pre20171111.tar.gz 23650 BLAKE2B 04270f98ab70a3d89a814e7d1e12e9a430a0c203cf5116a0c09813d0b52d8a9e37fc697d0104c3f58a99215b2922d7dac0f0b840cd226701510a8176a40ac540 SHA512 007c9dd4e623a04a1a0b8fd600d08adb1e9729a8f9ee9cbf5af93a33c902874deaf8cfb8227240369dc0ec0c9b93d6459693cb27e66f05163016f851e27cb4b3
-EBUILD pangoterm-0.0_pre20150323.ebuild 628 BLAKE2B 1e4c160d194d7fd74fd2e22205bcc362109e002af4913f897ba638b53e2899b013527235e3277fb0121b50a3c4fe89f47c8034523d55791f85b96f78d0021bd8 SHA512 8545395a2d87ea702b2933ebd98190b812ff69e5a910f402facdc18b6407b575877f862d511043482d754b8ab4ba0bc2feca51573dc33cb9c359d9106c722f2c
-EBUILD pangoterm-0.0_pre20150913.ebuild 611 BLAKE2B 8d329e4a4189c310854b34416823e035ff45f544314882c8b6a479d672b856afc08f284c53fd66a8e915b83c659a8e390beea5d897301d9ce415f44c4712e497 SHA512 79c5bb7b25f843b4947cdd5dc94e7a7f44d81a6c6276817177f4d56f5f575a4a0d41f4127973ffffd45ff5e7c027ccf9ed92f3435c47b2b79d1a58f180ee66b0
-EBUILD pangoterm-0.0_pre20151022.ebuild 622 BLAKE2B 2d4350c24d033ce8498abbb5cb882073778913e906395f22f7881b4fbc7dcbb97a8cce90a36b783a512037dec449fe008be1baadc022c559e685a51ec5daaaf7 SHA512 82b3f5dc51d565257232b732ae6abb2366751fa14326af570036b3a711dcff4071fc49a47f40d53ccb40057c5a0d98fb02e1b883d25c758888bce7f91bed4062
-EBUILD pangoterm-0.0_pre20160305.ebuild 622 BLAKE2B 3f65bac5771109dcbf7fdc2f13aa0fff29a2f335456eedeb1a085b433b2bde915bc8c3594c9a66ec39e3f58fba2e9dabbf30bc07b015c58f29b7905ee1f3980e SHA512 a694df69939569b7b574a13f13f230e47d133661f01560d9ae3f0b7732f1fe96492c45d87f21567725dc31cd464d5a549c7bbe18dabbca72d05e2dc67bd4324e
 EBUILD pangoterm-0.0_pre20171111.ebuild 622 BLAKE2B 326b1c23b4861811c435d201f143d980aad65ffa9310921ed9251b7b84508c05690daad5c1910124a809d9a2ec58f2b216dda8b9ef34a081f6ac678c89491413 SHA512 8cd2174e44d3a1cc882048ff36f6d9fa11b87caea1c333ddcce0514a8649f118305d422686f4e3e9e57d1cab64ae697a96f2a00d77742b1cf0a800416a202868
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/x11-terms/pangoterm/pangoterm-0.0_pre20150323.ebuild b/x11-terms/pangoterm/pangoterm-0.0_pre20150323.ebuild
deleted file mode 100644
index f731f0a5896f..000000000000
--- a/x11-terms/pangoterm/pangoterm-0.0_pre20150323.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A GTK/Pango-based terminal that uses libvterm to provide terminal emulation"
-HOMEPAGE="http://www.leonerd.org.uk/code/pangoterm/"
-SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="=dev-libs/libvterm-neovim-0.0_pre20150309"
-RDEPEND="${DEPEND}
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-"
-
-S=${WORKDIR}/pangoterm-0
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-}
diff --git a/x11-terms/pangoterm/pangoterm-0.0_pre20150913.ebuild b/x11-terms/pangoterm/pangoterm-0.0_pre20150913.ebuild
deleted file mode 100644
index e67980475a8b..000000000000
--- a/x11-terms/pangoterm/pangoterm-0.0_pre20150913.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A GTK/Pango-based terminal that uses libvterm to provide terminal emulation"
-HOMEPAGE="http://www.leonerd.org.uk/code/pangoterm/"
-SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-libs/libvterm-neovim"
-RDEPEND="${DEPEND}
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-"
-
-S=${WORKDIR}/pangoterm-0
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-}
diff --git a/x11-terms/pangoterm/pangoterm-0.0_pre20151022.ebuild b/x11-terms/pangoterm/pangoterm-0.0_pre20151022.ebuild
deleted file mode 100644
index 46525d76f3e7..000000000000
--- a/x11-terms/pangoterm/pangoterm-0.0_pre20151022.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A GTK/Pango-based terminal that uses libvterm to provide terminal emulation"
-HOMEPAGE="http://www.leonerd.org.uk/code/pangoterm/"
-SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-libs/libvterm-0.0_pre20151022"
-RDEPEND="${DEPEND}
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-"
-
-S=${WORKDIR}/pangoterm-0
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-}
diff --git a/x11-terms/pangoterm/pangoterm-0.0_pre20160305.ebuild b/x11-terms/pangoterm/pangoterm-0.0_pre20160305.ebuild
deleted file mode 100644
index ba7acaacaa4d..000000000000
--- a/x11-terms/pangoterm/pangoterm-0.0_pre20160305.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A GTK/Pango-based terminal that uses libvterm to provide terminal emulation"
-HOMEPAGE="http://www.leonerd.org.uk/code/pangoterm/"
-SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-libs/libvterm-0.0_pre20151022"
-RDEPEND="${DEPEND}
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-"
-
-S=${WORKDIR}/pangoterm-0
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-}
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index 9e087272f671..1820089219f3 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,5 +1,3 @@
-DIST terminology-1.7.0.tar.xz 4922616 BLAKE2B 40ca7bfff534e773b4c188970ecd82e44c2eee7a75eb2a6d4fc6a8635c57857e2037a319818a437843271faa42995f25b613091a4463c02427d835c6ae572722 SHA512 9635da6a51344fbbafd333592252c2539daa795600b4a1d5ea5710e294f18ff9f5667706c789a3c91378b493ae631df47faec2bc43b4cc48d0266506ab3f2e78
 DIST terminology-1.8.1.tar.xz 4939080 BLAKE2B a87f6f27eca41b4e98d0d26c488ff9075e99e9ba99ef098db54069254a162c9e6f626716d650b6d04004e8f24fd2bcc36422de1834c575f95556612167b4f8a5 SHA512 9b12540d0e907ee1499c3249f1e2dbf7786f401e2154856a804dc0a1afbe389cb297b237fdc1c38aff8b81ba1f65d70cf3a27c986ec8cccef6f03894feadf14f
-EBUILD terminology-1.7.0-r1.ebuild 925 BLAKE2B 576eb4f1307cb5fbe3ee38f9d5dbdbe1fb6c717f5a1d608c0d82b31431998ca33c0431baedcb51f22e43ada748b40c8c03982f3516fffbfdacc0bfaec944076e SHA512 03ca28e8b7cc30a2a0b71ff13e102e2c4fe45a673bee375f6e0ab564836fe7335fae24ede6f16e6a5d250d1a0a468581f2d84711bcb51f96632d265f6420abfc
-EBUILD terminology-1.8.1.ebuild 917 BLAKE2B e7ae57a98ef2e12595447d39d6097ce1026f2bf4928475d04ea18597d9533d545030b2ef6d0b66c5a71117c28083e26c798546114581de13a6287f15dd74a6fd SHA512 ec8c7722604366b68695c4bca84d939947170c320ff8db0d0d8e523916f63fc2ac0bfb1a91a7dff54b18207162d9518ca811bd43e42b6a6df5231580b56dc7cc
+EBUILD terminology-1.8.1.ebuild 924 BLAKE2B 138c9ca7753d75238e8e682ac8c61782ce2983a4f60ae6223fb7104bed214358058d0140605292f30f898b82f23b12409c241c4f13d93227d98570d3d850bbbd SHA512 137b1567c9385e0e777a21c075e21b7e6fcea1240aef0b8abe0c91510d72af212fc1e1278e5312c315fb5863fd7e11085a695a1747997eb7968541fdec1c734b
 MISC metadata.xml 335 BLAKE2B 284db47c691f29fa5b409845f970dde0aa4f2db13d11c4f383bf3b6d13ec8ce05786817a774755a1711e3c748a007733f6a55941a25f7fefa6a87d16df2de625 SHA512 050b1e1ebe7f891d60a1cdb1e6156535eeaa91e7a8064f9dfa9dd0ae948444b13c568761ff7d1f980d78c9afefdb9df1b33813fa2167b7347bcb3f43cb95fb96
diff --git a/x11-terms/terminology/terminology-1.7.0-r1.ebuild b/x11-terms/terminology/terminology-1.7.0-r1.ebuild
deleted file mode 100644
index 6b3a9662a1c8..000000000000
--- a/x11-terms/terminology/terminology-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
-HOMEPAGE="https://www.enlightenment.org/about-terminology"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="extras nls"
-
-RDEPEND="|| (
-		|| (
-			>=dev-libs/efl-1.24.3[gles2-only]
-			<dev-libs/efl-1.24.3[gles2]
-		)
-		dev-libs/efl[opengl]
-	)
-	|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
-	app-arch/lz4
-	dev-libs/efl[eet,fontconfig]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use nls)
-		$(meson_use extras tests)
-	)
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/terminology/terminology-1.8.1.ebuild b/x11-terms/terminology/terminology-1.8.1.ebuild
index 5eb44db84d33..23f7b14205ba 100644
--- a/x11-terms/terminology/terminology-1.8.1.ebuild
+++ b/x11-terms/terminology/terminology-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/terminology/${P}.tar.xz htt
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="extras nls"
 
 RDEPEND="|| ( dev-libs/efl[gles2-only] dev-libs/efl[opengl] )
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index bcd5d57b528a..48d3586892b1 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/gtk-engines-unico/Manifest b/x11-themes/gtk-engines-unico/Manifest
index 12600a71c455..ea6e097acb38 100644
--- a/x11-themes/gtk-engines-unico/Manifest
+++ b/x11-themes/gtk-engines-unico/Manifest
@@ -1,5 +1,3 @@
-DIST unico-1.0.3_pre20121212.tar.bz2 276446 BLAKE2B 637a746ddd10758d83aac537562a300b2cee5c9d98bc2909d4ef8877494b102a45fb7325b26922c0d7da4c8ef1a483de9639a5f47b90e5d147f090f5d8ebefd6 SHA512 654a3ce9532a1f9537b45f0549b9cdd956232e6b0d933460ea58f85065fa6b82d1d82856b71c09a9227a47b237ebcc0c8f6759c34ff685c238dbe104529c1954
 DIST unico_1.0.3+14.04.20140109.orig.tar.gz 19416 BLAKE2B f34ed477406acb36cb9533218d0fdcf57418fc25ff043ec90d2aaa05ee3ad8fe4e3c430d83001a0e399859adaaf720ca2b3d2e6d70543c460f367cbe03529c0f SHA512 8112240d63ffca2cbbaecc6731ef446153d8dd8b2b100c2d258013faa20b683761ba4768e71e91bdc885d1174874341e68400d1d3ebf95dc92db47cca7221de5
-EBUILD gtk-engines-unico-1.0.3_pre20121212.ebuild 929 BLAKE2B 64f5c8e29c544f192fe2e37b1e4ee335e439ba8601c1f873eb6689f1b110dc6bcc15f20252c762c4f9dea2cb8cf8bb4c0042b5b04065419d56c3a3276f7c1a95 SHA512 939b2fa12ca2ea7e9a11ee61a468a0e615fa990da3a8c14ffafc2f7e6b30185f412a9c38ed6cf00f75567be65ea78d4e286ceed4ebd342ee19235cc8f839ec75
 EBUILD gtk-engines-unico-1.0.3_pre20140109.ebuild 991 BLAKE2B f7ae6886ccb1420fab51c43b03029c8a6e71d2c344a4ab1ed083777c71ec8c178320444107b1503258e3f6e8537e890a866001b47209d478d4e44e3854e6bdb5 SHA512 34e814cf5af7527097d5571c32982b169193f6a58583afec69ba8e700fb4d445ac6945025beb8a996d16ffbdc1342364a5c4a3887eb9904760a369e44ccee0ba
 MISC metadata.xml 327 BLAKE2B a1f9e9275d1cc8493acf4651d23e41ae74410d65be0535398fecb4a881ceb8c5a81487a7e09c4fe0ee04f80d159ef3fe1403a8f4b3318b53279880cb319a17d0 SHA512 50637d6e2095fd5da68a15cbbb984c66fdf50301f32d036dfa38600f517f8d602093506b1e294fca5e041c219e8e41803cf011dabc71c8dbc17db804b91c6370
diff --git a/x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20121212.ebuild b/x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20121212.ebuild
deleted file mode 100644
index e23d16fcc9e7..000000000000
--- a/x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20121212.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils ltprune
-
-MY_PN=${PN/gtk-engines-}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="The Unico GTK+ 3.x theming engine"
-HOMEPAGE="https://launchpad.net/unico"
-#SRC_URI="https://launchpad.net/${MY_PN}/${PV%.*}/${PV}/+download/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.26:2
-	>=x11-libs/cairo-1.10[glib]
-	>=x11-libs/gtk+-3.5.2:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}-1.0.2
-
-src_configure() {
-	# $(use_enable debug) controls CPPFLAGS -D_DEBUG and -DNDEBUG but they are currently
-	# unused in the code itself.
-	econf \
-		--disable-static \
-		--disable-debug \
-		--disable-maintainer-flags
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/x11-themes/mate-icon-theme/Manifest b/x11-themes/mate-icon-theme/Manifest
index c57650c9b4f5..b9d68354c8b7 100644
--- a/x11-themes/mate-icon-theme/Manifest
+++ b/x11-themes/mate-icon-theme/Manifest
@@ -1,3 +1,4 @@
 DIST mate-icon-theme-1.24.0.tar.xz 22178384 BLAKE2B 7e1dbfcc83da49f30bad89106bfadf8d19d1ef3074d1302edad2934a46e6caac1aab003a126c823757e4a75127279107945e921d6463a05476ca98cf898ff74f SHA512 18ad6a236f02b7536697fed9086eadd997f0c47cc8311324e43641b21ccf942d0dbd52fa6c49623e679d3b23d82619cc256c98d9f8ccc3b3d4cda5d9a6e465f1
+EBUILD mate-icon-theme-1.24.0-r1.ebuild 566 BLAKE2B 523b7f66f5b068567e0d8a2c4c2c9f1eeb3028cf76c5ea87bac0de9ac565db6cd2db85641e9df90ff9eb5fe0fb780f9f902d59e4b2c2ee574428614041724dc5 SHA512 3a3701e153511a54bdcf9b8d23197703843515e2fab5e89d8ef84753ea4ace500854230a2451416162d90b3a62073d74ab6d319469d853480ec75e4bf7929f57
 EBUILD mate-icon-theme-1.24.0.ebuild 567 BLAKE2B 80afe25183dfa10b2a522c40365b19f7ea12cc8264ccb174186a3f460d0238c1210ff7fccadedf7dea62fe2723964e1acbd3d51579c5b37f33e928f86d9ca1b8 SHA512 1a2dfe0ad93407b7b1cce87013583e22f701b440a4c543e5c2cc6c7731cbd1286e9d22b181b5d07f72c5de188a19459228ce09b428e11d1911aa27ac3c9bfd8f
 MISC metadata.xml 344 BLAKE2B 68e920d9ee5bc270b90b69afd553a9010971d678bcaa94e11345369c0ac5be27719f2acb9d213ec48a42e6be609b2f8ea392a72d39b43bd24b2ebf76f162ce48 SHA512 fc069bbf06319886e8f884c8ffe2d869e4224a062f3aa26af997442db92015261c3e1ebe73e6e9c9e4d8dc69d1d3f7d8df12134967bebbbadaea98911dad05bf
diff --git a/x11-themes/mate-icon-theme/mate-icon-theme-1.24.0-r1.ebuild b/x11-themes/mate-icon-theme/mate-icon-theme-1.24.0-r1.ebuild
new file mode 100644
index 000000000000..06e91019f82a
--- /dev/null
+++ b/x11-themes/mate-icon-theme/mate-icon-theme-1.24.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE default icon themes"
+LICENSE="CC-BY-SA-3.0 CC-PD GPL-1+"
+SLOT="0"
+
+COMMON_DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=x11-misc/icon-naming-utils-0.8.7:0
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+RESTRICT="binchecks strip"
+
+src_configure() {
+	mate_src_configure --enable-icon-mapping
+}
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index 678ebe8f81f0..542224c86119 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -9,6 +9,7 @@ DIST papirus-icon-theme-20200430.tar.gz 22659357 BLAKE2B 55c68d06375f1713650e908
 DIST papirus-icon-theme-20200602.tar.gz 23108544 BLAKE2B fced236cd7318ad26df0ccbf0ad2800a8678265d2060746a17143b20193d6a96193de0950b77cb29df160757dae833755d6489286a0f4b52db4164e8158d0704 SHA512 c860efd6ab863cbeb7b5f0d3afb7e652bbd9daca9c5028b0c466d1930f7bacba137fce40220f858b2cff0ef575d1c9eb979d7ba1c79481d7dccdbd6a273953c0
 DIST papirus-icon-theme-20200702.tar.gz 23456769 BLAKE2B 4e4c9466c14a18231526c3a6db33cc35841a1e5787f03e186914f57f67ee19579e4822099e82fb9b295a6da393b1097110b7ef3b86737794fe0f5aa8c62de50d SHA512 ff2aa30bb70361f2952be203b3e3d00aae248726b5413a3a8e9ad7d6e7d0759e9bfd156cc65520175aba0e5436e9e58453ae0058d7d639d5c9a818e7f158761c
 DIST papirus-icon-theme-20200801.tar.gz 23673134 BLAKE2B 6562a6445008de3b465a8c1b7db9ba62d057ba9937058de5355482a063df3b93db5cdd3867ffee113b1c2a0152735ac0b0fdb0dfa46119e7ed31ef8ebcd0765a SHA512 fd8262b4b56c825f145db466c7237f29322c76f8ec10c59a9cb97315b4a6ae3667c6e6e4910a8165529e762c5420298949f5b283ee4d37ac14135be35cdbf993
+DIST papirus-icon-theme-20200901.tar.gz 24109177 BLAKE2B c30aefa8d056c4c8e86425b3ebca4720d01ca7b0853f33edfb382a280f347df5da75815b354549c96285478fd4e6bacf5469a4212047fe0ba14cc6d2d1b7e292 SHA512 0c1abdf58aeaff6aa8bce2b1db541377633e15282024f757d949adc4cf3e73d08b66b5188fa31530394cb804e88881b5a66c4d80772469d606cfc192c076224e
 EBUILD papirus-icon-theme-20191009.ebuild 639 BLAKE2B ef9a22646126e41e14a546df6026eb0debe8d5665e18a4954b78eadfe2b7e18778413806bdf376a96b0411bbcb3fccfe6c6eed43112a19a960cb971c1a3b4d1c SHA512 9b242cb7f2aef3725cb4a1b805111fe8440b039c8d824a74689c2594292e09fe03b41518950583fd7cbac095c87da1f7aa8cf38292bc319ae3f1476e764fab2d
 EBUILD papirus-icon-theme-20191101.ebuild 642 BLAKE2B 851b739b3eaab77f10dd8f74e6f87f3f41b55da71125794f302a35f2254b2f4596bfe70c07d00bcd06a1388f76cb1eac4ea0f4939de92736090861172cc32e65 SHA512 53efb1cfc6419f226295ef90e0d78296dfcb3eec19cd7442f40a49f5a47490dff1e76dc1267608e7a0f4f31600472639d7268b93e48b4123e0995e963deef73f
 EBUILD papirus-icon-theme-20191201.ebuild 642 BLAKE2B 851b739b3eaab77f10dd8f74e6f87f3f41b55da71125794f302a35f2254b2f4596bfe70c07d00bcd06a1388f76cb1eac4ea0f4939de92736090861172cc32e65 SHA512 53efb1cfc6419f226295ef90e0d78296dfcb3eec19cd7442f40a49f5a47490dff1e76dc1267608e7a0f4f31600472639d7268b93e48b4123e0995e963deef73f
@@ -20,4 +21,5 @@ EBUILD papirus-icon-theme-20200430.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362
 EBUILD papirus-icon-theme-20200602.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362e6d31767ed385b1787d7610347519daba97e98e0b61278ef5d68db41ffe3c4b9003f238ce13b055b433641a7dfdebda043241a SHA512 c62035432dcc74695307f915d1ccc6b67264c21e6211ed4302464e63ef5d7467e8a6e33cc7414c86b8684046ad73ad12e9a4471388fb65e6449248e5773ecce6
 EBUILD papirus-icon-theme-20200702.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362e6d31767ed385b1787d7610347519daba97e98e0b61278ef5d68db41ffe3c4b9003f238ce13b055b433641a7dfdebda043241a SHA512 c62035432dcc74695307f915d1ccc6b67264c21e6211ed4302464e63ef5d7467e8a6e33cc7414c86b8684046ad73ad12e9a4471388fb65e6449248e5773ecce6
 EBUILD papirus-icon-theme-20200801.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362e6d31767ed385b1787d7610347519daba97e98e0b61278ef5d68db41ffe3c4b9003f238ce13b055b433641a7dfdebda043241a SHA512 c62035432dcc74695307f915d1ccc6b67264c21e6211ed4302464e63ef5d7467e8a6e33cc7414c86b8684046ad73ad12e9a4471388fb65e6449248e5773ecce6
+EBUILD papirus-icon-theme-20200901.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362e6d31767ed385b1787d7610347519daba97e98e0b61278ef5d68db41ffe3c4b9003f238ce13b055b433641a7dfdebda043241a SHA512 c62035432dcc74695307f915d1ccc6b67264c21e6211ed4302464e63ef5d7467e8a6e33cc7414c86b8684046ad73ad12e9a4471388fb65e6449248e5773ecce6
 MISC metadata.xml 346 BLAKE2B 2d58a9d14140c9604368097a28fc9c0042172bf4d023cb8efe6cab6b06b43226e5ed6f221cf55a7b7ec02ce4724426ffca9c025e44a515fdf16f5f0f33ca9a9a SHA512 6e71bcff36afe7da780a7241f0a32d39d78b9ffdc1b3c7b9b1025ccd9c37b38d9b519e44584c78af431d124b97a7c6303921be3716f43c9769da0eff525e4235
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200901.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200901.ebuild
new file mode 100644
index 000000000000..72805a2a9317
--- /dev/null
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200901.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="icon theme for Linux"
+HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
+SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r ePapirus Papirus{,-Dark,-Light}
+
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 140b763d2081..6341720f680f 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index b12efc259818..7243de2e88d3 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,5 +1,5 @@
 DIST enlightenment-0.24.1.tar.xz 28713452 BLAKE2B 1d4713a4887a687a5425888e65b358cd01fe12e42865799265f5092dc6784eb29c25b5563805d1c7be9856037b0570027c2f01a8eb848299e7729d905e291470 SHA512 3835d898f1fdb96ab6539543e9af910b4a9078372af5cfd90abb33c0d5ecb41496499629c54613e3fec4c230233b69bf1abde68f3ffba4996c69979a526da418
 DIST enlightenment-0.24.2.tar.xz 28716060 BLAKE2B 432722693beaece97eeb318a1120b6101bf76e1536347b824b00ba4378326c093f3333eefa634d7266a59c09dc4337c8bd1f9a4d89e0a4c9a223fdcacd924fa0 SHA512 5d96b17d89e822271048a0a6a8356658fd02680f54da2f15dde7c632752bbf0a396eaf23986164402e61f631e68937b3ba7c29d9dd787ddd470cff4a390abace
 EBUILD enlightenment-0.24.1.ebuild 2838 BLAKE2B 3beb5dde2734c53a3647e7b8ae7c70698030d7c933c66acf290f98037541d2b6225ab0b36e97711122440b9e22a2a1366b3853dc1fbcdfa386ff47d630298d9b SHA512 d863b7bdebe49c476368c00b9eb4022a859cdbea32873bfd692c2f2d4d9af1eb23bddc34f9262c9ff7e2f29aee47788ce5fa977fba80ffa2450f51c1fdf58f9e
-EBUILD enlightenment-0.24.2.ebuild 2838 BLAKE2B 3beb5dde2734c53a3647e7b8ae7c70698030d7c933c66acf290f98037541d2b6225ab0b36e97711122440b9e22a2a1366b3853dc1fbcdfa386ff47d630298d9b SHA512 d863b7bdebe49c476368c00b9eb4022a859cdbea32873bfd692c2f2d4d9af1eb23bddc34f9262c9ff7e2f29aee47788ce5fa977fba80ffa2450f51c1fdf58f9e
+EBUILD enlightenment-0.24.2.ebuild 2845 BLAKE2B d347d2f36eda1ff9a2a5026c4db8f6e4ccd7f198dbfdcae6f73b6c2af99c96ab7d390c7bedb4af599954e4e9d69cc01e7223f96989542bfa62d4e93476a4ff52 SHA512 baf8290219fc7b560ea9c31565c3bc5ab0e5236b670dd575bbb61bdd548672f48b9b37b3d3bca7d0cdf6c31953ea949c8f8d329a905fa6dcf5ddf666670ee4a3
 MISC metadata.xml 721 BLAKE2B 85587a677b7e22cd1dbfe187c367574ccef7ad88a1bdde00acecc9fc5f62d48adb9e14c2086953287efc728cc616d6d286fde1b659a44404086fef5e6bde90b1 SHA512 6d22a2f8639b3b75fd1113c0b381edc2869d91e5d3d04d6c67c845c15fae9ba0e370918e30b45e89e91c695f873f1d0ef5966f7720ab5e9cd270c6254c792dc5
diff --git a/x11-wm/enlightenment/enlightenment-0.24.2.ebuild b/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
index cbc938e2391a..6120d4f829f3 100644
--- a/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.24.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0.17/${PV%%_*}"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="acpi bluetooth connman doc geolocation nls pam policykit systemd udisks wayland wifi xwayland"
 
 REQUIRED_USE="xwayland? ( wayland )"
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 1e62d9a004c5..caf7083ab85d 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -3,6 +3,6 @@ AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d34
 DIST lumina-1.5.0.tar.gz 20657364 BLAKE2B 62b064e1be3ce69c078e68524e011a8ce4d61c680a4732da7992a7b72833363fceb0a0895a228ec9de7921d989253c70c518810b91c23226aded1f54b23b1aea SHA512 37106d71a9ba7188c4ded0614d2d4424f732519e11288ae312dfcd9a0b5b26dd31dfa812e74a96c0e3e0fb99fae4dc00806fd7a24183746688c72d997054af7d
 DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
 EBUILD lumina-1.5.0-r1.ebuild 2416 BLAKE2B 3ac8557090047e11dc95cb497549767d2bd9d8b222faa4ee8ee1ca978d6fefd259070347f1194f8dbea6b619fdacb14d2e4d261d2c59acf8b1f95d25db56c956 SHA512 6ffdee6ef07be2f20b50e63bf8b49ad99b0a38ec28897fafd98c0be4029c35d2187ef1f52b7e97ce45a120041742cbab65e1871e86ea825f167b93cf37d502fd
-EBUILD lumina-1.6.0.ebuild 2416 BLAKE2B 3ac8557090047e11dc95cb497549767d2bd9d8b222faa4ee8ee1ca978d6fefd259070347f1194f8dbea6b619fdacb14d2e4d261d2c59acf8b1f95d25db56c956 SHA512 6ffdee6ef07be2f20b50e63bf8b49ad99b0a38ec28897fafd98c0be4029c35d2187ef1f52b7e97ce45a120041742cbab65e1871e86ea825f167b93cf37d502fd
-EBUILD lumina-9999.ebuild 1389 BLAKE2B f38168a489101f25833660e2de3ff1666d69b47b620469376cde8825ca4d0a6f6ded5739be7f791df80d94a950e86cd3d8bbd1bb018712e94956df80ac8dfc81 SHA512 30168658fccea7521658148c795202513fbe07e089d1207b895270b0e28002a7a77f450c1af27e5c0e0f3e707f81cd6a46f966010239d457cedf43ee14b58ac1
+EBUILD lumina-1.6.0.ebuild 2396 BLAKE2B 015adabd82ff9b479e7e3f69519ab4f80f58f233df88b1f0462ee9956e8af5bc34e4197b0c18237390cbcf23a4c9950d91e277263d60069a3d115c4f30324e47 SHA512 7e7244aab8a0ab934523fb5714ec67a70e66fe62c4f3cb2abfe6345af6d6697f3b91fb89dfb81706045c956cb97e8c14c3941701f07979d0db5c87e7ab399db6
+EBUILD lumina-9999.ebuild 1366 BLAKE2B 0da2fd0940f6ebdb0dcbe0424b81458f90b20fe66cfb3c65f3bc1164c45deb5293981eb30886bdcc40d56e1ffe0ffc79660c91c62531fb038c56b5fa584d45be SHA512 758c5ac50e8673155abf452dbe28ba54d5f59ff5f1b91f59dcb061d5ed1c979aab7c8101dab4b928e24ca79491c9bf5b8c27a83a7277ba9d10b7f016c8674d13
 MISC metadata.xml 1981 BLAKE2B 260d71ea029aa07a26cc0af9d937c51253029b0bc4c70f11d4330da3a10d371be15959c93f4b1af1436b7a3c5a8a1ecb2a8f3cdea2078133384bcec3015f9940 SHA512 a55aba75dcdfc78363be5a59ebbcb7760fb1370685d7a893b976aba9497094f9674e7493ed0df3899ad917165967c3a58984bc04f3651b46416fa91fcb29de6c
diff --git a/x11-wm/lumina/lumina-1.6.0.ebuild b/x11-wm/lumina/lumina-1.6.0.ebuild
index a55056735a3b..1c86507bdd95 100644
--- a/x11-wm/lumina/lumina-1.6.0.ebuild
+++ b/x11-wm/lumina/lumina-1.6.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
+EAPI=7
 
+PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
 inherit qmake-utils l10n xdg-utils
+
 DESCRIPTION="Lumina desktop environment"
 HOMEPAGE="https://lumina-desktop.org/"
 SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
@@ -14,35 +15,38 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="desktop-utils"
 
-COMMON_DEPEND="dev-qt/qtcore:5
+DEPEND="
 	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtsvg:5
 	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	dev-qt/qtgui:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtdbus:5
 	x11-libs/libxcb:0
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-wm
 	desktop-utils? ( app-text/poppler[qt5] )"
 
-DEPEND="$COMMON_DEPEND
-	dev-qt/linguist-tools:5"
-
-RDEPEND="$COMMON_DEPEND
-	sys-fs/inotify-tools
-	x11-misc/numlockx
-	x11-wm/fluxbox
-	|| ( x11-apps/xbacklight
-		sys-power/acpilight )
+RDEPEND="${DEPEND}
+	app-admin/sysstat
 	media-sound/alsa-utils
+	sys-fs/inotify-tools
 	sys-power/acpi
-	app-admin/sysstat"
+	|| (
+		x11-apps/xbacklight
+		sys-power/acpilight
+	)
+	x11-misc/numlockx
+	x11-wm/fluxbox"
+
+BDEPEND="
+	dev-qt/linguist-tools:5"
 
 S="${WORKDIR}/${P/_/-}"
 
@@ -55,7 +59,7 @@ DOCS=( README.md )
 src_prepare() {
 	default
 
-	if use !desktop-utils ; then
+	if ! use desktop-utils ; then
 		rm -rf src-qt5/desktop-utils || die
 		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
 	fi
@@ -77,7 +81,7 @@ src_install() {
 	newexe "${FILESDIR}/lumina-session" lumina ||die
 
 	remove_locale() {
-		rm -f "${ED%/}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
+		rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
 
 	}
 	l10n_for_each_disabled_locale_do remove_locale
diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild
index 6881413499cb..8e1fb965a9a2 100644
--- a/x11-wm/lumina/lumina-9999.ebuild
+++ b/x11-wm/lumina/lumina-9999.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit git-r3 qmake-utils
+
 DESCRIPTION="Lumina desktop environment"
 HOMEPAGE="https://lumina-desktop.org/"
 EGIT_REPO_URI="https://github.com/trueos/lumina"
@@ -13,32 +14,35 @@ SLOT="0"
 KEYWORDS=""
 IUSE="desktop-utils"
 
-COMMON_DEPEND="dev-qt/qtcore:5
+DEPEND="
 	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtsvg:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	dev-qt/qtgui:5
-	dev-qt/qtdeclarative:5
 	x11-libs/libxcb:0
 	x11-libs/xcb-util
 	x11-libs/xcb-util-image
 	x11-libs/xcb-util-wm"
 
-DEPEND="$COMMON_DEPEND
-	dev-qt/linguist-tools:5"
-
-RDEPEND="$COMMON_DEPEND
-	sys-fs/inotify-tools
-	x11-misc/numlockx
-	x11-wm/fluxbox
-	|| ( x11-apps/xbacklight
-	sys-power/acpilight )
+RDEPEND="${DEPEND}
+	app-admin/sysstat
 	media-sound/alsa-utils
+	sys-fs/inotify-tools
 	sys-power/acpi
-	app-admin/sysstat"
+	|| (
+		x11-apps/xbacklight
+		sys-power/acpilight
+	)
+	x11-misc/numlockx
+	x11-wm/fluxbox"
+
+BDEPEND="
+	dev-qt/linguist-tools:5"
 
 S="${WORKDIR}/${P/_/-}"
 
@@ -49,7 +53,7 @@ PATCHES=(
 src_prepare() {
 	default
 
-	if use !desktop-utils ; then
+	if ! use desktop-utils ; then
 		rm -rf src-qt5/desktop-utils || die
 		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
 	fi
@@ -62,6 +66,6 @@ src_configure() {
 
 src_install() {
 	default
-	mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die
-	rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die
+	mv "${ED}"/etc/luminaDesktop.conf{.dist,} || die
+	rm "${ED}"/${PN}-* "${ED}"/start-${PN}-desktop || die
 }
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index f4d7b133dc71..bbf1abcd66c5 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,5 +1,6 @@
 DIST marco-1.24.0.tar.xz 1827076 BLAKE2B e4bcf8584199cbe4f9f813c7512176dd9b84a39ed162cd051f1f174c428828d1d73d6ab64c19ca681f0aea966742e0474256935f2a7c0c490b77dda91147162c SHA512 b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428
 DIST marco-1.24.1.tar.xz 1860008 BLAKE2B b147e6ce8aad9382b2e8d96eec2da0356cce91977f4387776359ffb1f26903d7f0b9d9a1d43a436d1a64033f545600e7f810a29e3ae6ecdfb0d73ef8073b782c SHA512 55607898b64f0da3a85dd8d7fd092d847c8f67cefa096a63dbe074c197157a3d661fcb3f2a495b4425340b583b600cda3d1c92ac08b7327904dbd4aab8e92c85
 EBUILD marco-1.24.0-r2.ebuild 1504 BLAKE2B 58da594bf9ce3e1930ccfd1f43b64cdddd5c74ce54d9fb4199aa5c99fa96961640c40bd1b67cabb306a5c72a4780d77d9eea078e488d8d133d7fef657a9ef98b SHA512 506253ae98268e699848c937f826b1072f13e41868a4057f30b6090f9ae2cea30ad319183a3ec2ff709a9bf5767d25a3f503eed281242b836e8c83095b5ae5b6
+EBUILD marco-1.24.1-r1.ebuild 1483 BLAKE2B e03106fde2cd93d6f26c25a58ed3984d38b4968cef4e4c52c076622586e16053575227b06cb78d00f71af25ca7cef06094b51fe5b239fe2a330f5f49570290fe SHA512 d5a15bdd165f326ad3782a2e77f5fcf3020b16c54aa1a9f6fe2fc029cf7ee38c9efd951e6a9f5e454827abf7c9824bc21cc94840d803ec7e5ebecb3655460eea
 EBUILD marco-1.24.1.ebuild 1506 BLAKE2B 23a2e5ed1605eb0457fe6ec558374aaea77775b9cc0aa9321209da72b4ac509ef896efed15b9665e7c50490b9f0b84f1f24a7e2f271a46e18f0282861f8e466d SHA512 aa40eae15416b859fc2c9c23b16c46b97763908325709743c14ef24596bae37a35e407f28ff7b876481df8586f8bc320c518a08df638ef734ff55916afd4dbfd
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.24.1-r1.ebuild b/x11-wm/marco/marco-1.24.1-r1.ebuild
new file mode 100644
index 000000000000..cd92c1853eea
--- /dev/null
+++ b/x11-wm/marco/marco-1.24.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE2_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE default window manager"
+LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
+SLOT="0/2"
+
+IUSE="startup-notification test xinerama"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.58:2
+	>=gnome-base/libgtop-2:2=
+	media-libs/libcanberra[gtk3]
+	x11-libs/cairo
+	>=x11-libs/pango-1.2[X]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.3
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXpresent
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	>=x11-libs/startup-notification-0.7
+	xinerama? ( x11-libs/libXinerama )
+	!!x11-wm/mate-window-manager
+"
+
+RDEPEND="${COMMON_DEPEND}
+	gnome-extra/zenity
+	>=mate-base/mate-desktop-1.20.0
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.0.0
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	mate_src_configure \
+		--enable-compositor \
+		--enable-render \
+		--enable-shape \
+		--enable-sm \
+		--enable-xsync \
+		$(use_enable startup-notification) \
+		$(use_enable xinerama)
+}
+
+src_install() {
+	mate_src_install
+	dodoc doc/*.txt
+}
diff --git a/x11-wm/notion/Manifest b/x11-wm/notion/Manifest
index 793a44d750d5..d14267dd0f1e 100644
--- a/x11-wm/notion/Manifest
+++ b/x11-wm/notion/Manifest
@@ -1,9 +1,7 @@
 AUX notion 26 BLAKE2B b39f9f65f79f85b8af02c52334f71f0eb171abf2e48af8698b4eb51929a718d1aa24cce3b0c76b5d2c05843a4e6c1485b76081704004b03f0dfb92049aad252c SHA512 4d5aa2efb7ff7c9927ec6c2d8b0e5fd9ad1fcd10c7c40b20312342cb5a01ea9a835bbdfa88a054fb639f4a1a94dd4e05cb5f77a47d46ff43326086aba0cd69d8
 AUX notion-3_p2015061300-pkg-config.patch 2533 BLAKE2B 98b1c54fc92067702b77a6f4d51b87d829e124135e4004bec32ab71eaefc39c69c944810730bba8defb7e082138f12e2169cd48879177671c149a86407eef49c SHA512 7fb084b35dc274e8d943a4801f2a38d43bead5eb94d33282903416120e5116d37811b6388b61f4f402d1efeed01cf36606537cb7c0aaf8a3362e99d05c9c3fda
 AUX notion.desktop 208 BLAKE2B 7d138a583a49325901e3c1682c22dbdc1da02b4dcaa2ae6581c66e2676277de1a7b5a87e1c25465cb4ae6beebd7e93ab473e92b3ad6949ad97c833f2293e40da SHA512 3c0a0c5787d77afc94b0f0f9187be5c32374c2dbc51d2d9de3729b2c4e18572d6d8d79a554b017ba33c7276bc2aca8182f93b2d7268f92101385ab6a06f8191f
-DIST notion-3-2013030200-src.tar.bz2 625211 BLAKE2B c3909bb0d9e3eba582c1adc2a275c1ab9b7d23c9a2c172be526fe96de1f76165f131857e7ff5b549c8452ef0b7e6157c71377dd4bf28a2b4ecc5261e3866a59f SHA512 266df9ca2f3613c7138a3bfe7bab1fadd27c1ad40078d134be827167b9407b900bc240780cb5375e6996777978bb8a3bc12fbfa45bb4d8d619ee93335c6039b2
 DIST notion-3_p2015061300.tar.gz 797057 BLAKE2B 55258bb1d47a1c2506e9cb6654e5d68d69494a749174eaace2a53416ae40cac908b0398400a5a377dbb07618aa800529cbdfc0c7ef946d285681e1dfccfd9c48 SHA512 254be12a8ece555d9f6253d99891bb51214379d0c04b6bf9595b7e5bf9493cb5d2fada37438f89621e7157f9e3647e446b5e173847498ee3608081f006b86679
-EBUILD notion-3_p2013030200.ebuild 1994 BLAKE2B b68456398a5d19f9e729b44d17becccea5fbb0024634aa0c47eb7b76b648e0623632f7f09932e21ef55fbc676c25bd10347b1857eb45ce20cd64b6acf8e618c0 SHA512 27f747f5b25e9e8f79b267843ac5ec6d9d17af66110352d14c1e288bf388ab1eb01bc643d5891d7038c7d719d2fb729fa438cd310dae7070e8e36a06a3e1efe2
 EBUILD notion-3_p2015061300-r1.ebuild 2234 BLAKE2B 3ce2236197618615e6f1bc1ce86d964aa855996ef2739c9b357a2c2e5023aec69239ac3a20fd42f7d311777bbb3958910387077c0bb4b89df46a37933d8d4c53 SHA512 ba7058f9a713c7b89d11857614e012ccd69ffe953a7a1f5b0c361cfc93ff4be4c916322a9443d5c09d92766832e09e070baca0f7db24a2e9472363b7f61ef487
 EBUILD notion-9999.ebuild 2190 BLAKE2B 74d2802871b888c0bae7c9a6d90f257847ff1468790d6d74ac1b4b360ed8b422c61418bdf5247e1c91dcc41a4cfd858d414b208b179651464d1dbbdb6bb3f849 SHA512 fb09070ca7e4a0d479e4d539919360073dda1112e6a117aef2b8a3f8735f806de0cd91b9cfad45c9c4635e80d60865bfec8452a45e11fcfb6f9c1e7f3e466c46
 MISC metadata.xml 440 BLAKE2B a967115c8e255bb279de1a7a231ea2c45209383ae50bb03ee5e0aeea428e71afdb32ae027286e82820ce3f67849bba51a35ad263c32961de5191d4e053af782e SHA512 e113a6d332d785d2f6fb25d55796d499ccb67978b40130b06be408ae4ba4b9551e35ee928c43c95962e202f12f11ab152073f9d5cbfc16067385c7b34e25dcba
diff --git a/x11-wm/notion/notion-3_p2013030200.ebuild b/x11-wm/notion/notion-3_p2013030200.ebuild
deleted file mode 100644
index 743153bd4a20..000000000000
--- a/x11-wm/notion/notion-3_p2013030200.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Notion is a tiling, tabbed window manager for the X window system"
-HOMEPAGE="https://notionwm.net/"
-SRC_URI="mirror://sourceforge/${PN}/files/${P/_p/-}-src.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls xinerama +xrandr"
-
-RDEPEND=">=dev-lang/lua-5.1:0=
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	nls? ( sys-devel/gettext )
-	xinerama? ( x11-libs/libXinerama )
-	xrandr? ( x11-libs/libXrandr )"
-
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-# needs luaposix,slingshot,... not in tree
-RESTRICT=test
-
-S=${WORKDIR}/${P/_p/-}
-
-src_prepare() {
-	sed -e "/^CFLAGS=/s:=:+=:" \
-		-e "/^CFLAGS/{s:-Os:: ; s:-g::}" \
-		-e "/^LDFLAGS=/{s:=:+=: ; s:-Wl,--as-needed::}" \
-		-e "/^CC=/s:=:?=:" \
-		-e "s:^\(PREFIX=\).*$:\1${ROOT}usr:" \
-		-e "s:^\(ETCDIR=\).*$:\1${ROOT}etc/notion:" \
-		-e "s:^\(LIBDIR=\).*:\1\$(PREFIX)/$(get_libdir):" \
-		-e "s:^\(DOCDIR=\).*:\1\$(PREFIX)/share/doc/${PF}:" \
-		-e "s:^\(LUA_DIR=\).*$:\1\$(PREFIX)/usr:" \
-		-e "s:^\(VARDIR=\).*$:\1${ROOT}var/cache/${PN}:" \
-		-e "s:^\(X11_PREFIX=\).*:\1\$(PREFIX)/usr:" \
-		-i system-autodetect.mk || die
-	sed -e 's/gcc/$(CC)/g' \
-		-i ioncore/Makefile || die
-	export STRIPPROG=true
-
-	tc-export CC
-}
-
-src_configure() {
-	use nls || export DEFINES=" -DCF_NO_LOCALE -DCF_NO_GETTEXT"
-
-	if ! use xinerama ; then
-		sed -e 's/mod_xinerama//g' -i modulelist.mk || die
-	fi
-
-	if ! use xrandr ; then
-		sed -e 's/mod_xrandr//g' -i modulelist.mk || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
-	default
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/notion
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/notion.desktop
-}
-
-pkg_postinst() {
-	elog "If you want notion to have an ability to view a file based on its"
-	elog "guessed MIME type you should emerge app-misc/run-mailcap."
-}
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index ca407acbf9a3..9dc242b15757 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -5,6 +5,8 @@ AUX wmfs-99999999-desktop.patch 153 BLAKE2B e9a3f1039bddd76ddc05955e843e89c1ab81
 AUX wmfs-99999999-fno-common.patch 1986 BLAKE2B 096becca88a23b15e3fee115640b50baca0f1f3ba58c15903a74fd4da75bc2e1662d672982940ac55c506f79f3820ffa9e851981008f82d9163eaf291e4339cf SHA512 b7593e0c0c0e3e73421a1636cdc2b3cebd6c51896e404bad9bec378e733b54cb0168a53dea40466128210f47459a2bb5e04074d588d33b07908efd1581472eaf
 AUX wmfs-99999999-strncat.patch 598 BLAKE2B e80fd233e895162e24f7264cf152c9a570665d5f6ff48ea1ec9212963c2b786b5707c8052d33a1a354b283042af0c2b7d5ac45f34e8dc57a68abd517d7e410aa SHA512 9141bd044a122fbe0aa10189f38d02e127c453665ae7d926dee852bb16ec7812450357e86ab6dfc8f48a41ce16891759a8229bb4a67f1bb5a970c7e6452298fd
 DIST wmfs-201003.tar.gz 59593 BLAKE2B b2e1f2cf73ca3d8881fa8de7b52fb6cae947a6006549f05dd06179b8b44b10fd1157a8e180b2b3177177fe0edf4c39b9a3fbf36ebb2b6470f1ed802a641a4c89 SHA512 117a238d6a8d8d147291ec9fb4e0aaf2bf8bab8ea794cf00deeaeaac1df15f0122bc705cb1bff54abe80d7228a19e67a79e4b3e0de0ced82abaf98fab3778a90
+DIST wmfs-20180520.tar.xz 56364 BLAKE2B 23530193ba2c37ae4129fd23dda2ff8cd301b0bd92d32e06b264efd990b7957b38170de31f04afca6fd9875d2e0450c8bede416e5f49d6e19962718fe2e240a3 SHA512 bcff251397d8483db49c037c51eef7b3dcc87a6d94650ae9e9cabc7104177216e0efa7e67bfb34978bae67dc4853884673ce288bb8087e95cb2993d519ab4f2f
 EBUILD wmfs-201003.ebuild 968 BLAKE2B 89d8b905ba1c0a6c0016e9b0b40e0f3bd5ef538134e72b7b560dac4547a5f875081d3275604fc66a274ebb118556295433516ee884aa815fe8572cb2a766fc24 SHA512 4afaf1556dd33aa42c749a22929a815ec7970156963e39cc6e78e2d56dbbf465554889e4bb1ed1534e92ee0fbdc00803cf873408d8a014d197702c82ac803bc2
-EBUILD wmfs-99999999.ebuild 1141 BLAKE2B 29ab0a030dafb7f482dda9c06ae49c26bad2c5a77099e58b4148ee635a003d03e5a9a21c265800319a4a467c4d07a831e874c0279e6ac6adfd1f8de78065fb15 SHA512 e68aacf763356986ada1101eb77226c9efb94a23a7e1e619110f8e5f954a9b73168aa997c39a88c8c9744c5365a8709d9fbef0a3c176c9b65b2d8b47155eb823
+EBUILD wmfs-20180520.ebuild 1132 BLAKE2B cb7e3aebeb66a9c09f0984f6ef7d3b1971e1365c12af12a2ba33484aa05b67bbe62f24a586b04c3d0000a69941378868c2104813ea5a43618617c1a48f4a88ba SHA512 49d7081c5c0f5cf9177b898b3eb81e9275fa06aa9a45afeb235b5c3742e92f28edbc80fca9310fc1c4172fa5ab8eac3d90b2822afb5f331e88d82b8aee380dc0
+EBUILD wmfs-99999999.ebuild 1130 BLAKE2B d0e2ae315de0ce2a810b0ff2b7bfb5dcd0ea6f2e98201ade65e7f4154c61a421a1c642c541078379ef3ff6d31ce2aa78f50423454251bba4649286b3cef38d46 SHA512 b52a4cbb7ef9268c7e3da454d08ea38df0d1f585ea94ca71f4dc7da157f19b85f50749b9ef7f71226c2ec0304c23c3de1ca8b07bbfb4961a7a85a7c517bff2ad
 MISC metadata.xml 380 BLAKE2B 318de05f3f531b8c35e71a0563525f7c8a1397e0ba4adbd086b768c93d792d8c336da47bc7582dfc7b0f4ce2917dcccb21191f46c064b02317477ef3a568ee17 SHA512 644e88ac0ca2d999cd273f807d45400a8438a9800b3b744f764c914fa41d819efd55ecaa27de6cbcf4403491f2986299fc1c032afd26fee67822cfc2c6368359
diff --git a/x11-wm/wmfs/wmfs-20180520.ebuild b/x11-wm/wmfs/wmfs-20180520.ebuild
new file mode 100644
index 000000000000..f01f6ce2129b
--- /dev/null
+++ b/x11-wm/wmfs/wmfs-20180520.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Window Manager From Scratch, A tiling window manager highly configurable"
+HOMEPAGE="https://github.com/xorg62/wmfs"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+imlib2 +xinerama"
+
+RDEPEND="
+	media-libs/freetype
+	media-libs/imlib2[X]
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999999-Debian.patch
+	"${FILESDIR}"/${PN}-99999999-desktop.patch
+	"${FILESDIR}"/${PN}-99999999-fno-common.patch
+	"${FILESDIR}"/${PN}-99999999-strncat.patch
+)
+DOCS=(
+	README
+	scripts/keybind_help.sh
+	scripts/status.sh
+)
+
+src_configure() {
+	tc-export CC
+	# not autotools based
+	local ECHO
+	for ECHO in echo ''; do
+		${ECHO} sh configure \
+			$(usex xinerama '' --without-xinerama) \
+			$(usex imlib2 '' --without-imlib2) \
+			--prefix /usr \
+			--man-prefix /usr/share/man \
+			--xdg-config-dir /etc/xdg \
+			|| die
+	done
+}
diff --git a/x11-wm/wmfs/wmfs-99999999.ebuild b/x11-wm/wmfs/wmfs-99999999.ebuild
index 416f8f678db2..286281b6f1f6 100644
--- a/x11-wm/wmfs/wmfs-99999999.ebuild
+++ b/x11-wm/wmfs/wmfs-99999999.ebuild
@@ -32,6 +32,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-99999999-fno-common.patch
 	"${FILESDIR}"/${PN}-99999999-strncat.patch
 )
+DOCS=(
+	README
+	scripts/keybind_help.sh
+	scripts/status.sh
+)
 
 src_configure() {
 	tc-export CC
@@ -47,9 +52,3 @@ src_configure() {
 			|| die
 	done
 }
-
-src_install() {
-	default
-	rm -r "${D}"/usr/share/${PN}
-	dodoc README
-}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index bb1394a507c6..c33255a63d49 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 49f726e1b056..1bea51064995 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,5 +1,6 @@
+AUX xfdesktop-4.14.2-memleak.patch 1166 BLAKE2B a034bfcadfa9156fc2a204f838df999641d8fb8230e6a0a7e3fc99ddfd4511bb9360b8e6c4f4ada79e3db7dd0525cca3a17d004c96877a1aa72e770f9b309bcd SHA512 e0dd39ea9c691f8bdfa2ff5b0bff19ce0170e4e39cef24010d46f15d7ff00a9e0f4cacd2e21fe9c7c9e91b47601d923ac5aeeaf7e396c8b05843068a2c292c1a
 DIST xfdesktop-4.14.2.tar.bz2 1513121 BLAKE2B afe5dad03ed4d084bd7578074f91fbc8dc121bf67b8f4793ca5c6abb67dea4f61cfa484404d79d14cf2abf64227cee883bc8f36af05802071f5b9f79300704d4 SHA512 8515fc1c048da50c8c2986ea8590144203fdf3107b81e2d2dd44ee408938fb71281abe52cc098508dc2ae20ef2cbc31903086941206c0cbbc92a661dbfb2c472
 DIST xfdesktop-4.15.0.tar.bz2 1509639 BLAKE2B fe63ba8731095622e8b5701c30a5cc786c1b8cc7bff5cb66cc477281198749887879f001fdc4652d86d01765543d4474ce52170d318af6e43124a7d7208f97ee SHA512 cb5266ab7edc5a068756ec30a3fd92af50150c3523575e2c727fc8d7eb8660259e6e8c5d59d7bc02ec85b052f779e332dcea55414fcc706f608b1eea8242897a
-EBUILD xfdesktop-4.14.2.ebuild 1154 BLAKE2B 065908ca5d908a837bdd3edf753c0f8b2bd59ea51e4aeca51e68fa06e52dde8246c6af97c225f15c4a3aed95ce4ab45bb5884b19e83518744f5888ff6af65693 SHA512 01d3302fc5927bb6ca7ead4d47ba2ded68856d56500d68a3ebc41c85cd7d569bc6695c40b0e1386e07940ac176c6f5e9e07c032f5f21e98e38dd1db6180f4517
+EBUILD xfdesktop-4.14.2-r1.ebuild 1201 BLAKE2B 2d1ec83ca3a96374e44133acccafdb17f9ae4372ef9293c507108113ee5cea782996a4f2bc0943bb0b647fdea6f04df7d69f7a121c4c213b0a9b1b0274a129dc SHA512 38856d3e4c36db25532cc03af3ce4b5fdcb7f18996c71d1f155a966b194ac879bce1b21aab87d5d660fdcec06aec7df1d31b97451c112ac72eefd53c6ff474fc
 EBUILD xfdesktop-4.15.0.ebuild 1159 BLAKE2B c700d0cee41fd788ac2809efae9f9c77942926542565540ca2e7be2b800eaef88bd449b32e3f2f3c9b52a12d636556f73ae79d38844ec7b0ce4c830dded65e60 SHA512 b1a33f3af5644294c1f5f6265ae939d3ac29424cc9678576b2eec1076fbdaff577a961e26cf0dd0a6be4332afa1b0e4579ebcb42e8f165bb7cc827a0a8d02563
 MISC metadata.xml 364 BLAKE2B 64544c9e89e370bb213647843ebc3c5d4ca08aa46564b02830ff041e74db5018d7503106cba4e7c1dd562f359649974f12b841e32136eb73e9d84ea0ed36f456 SHA512 3140dbe5320efba5393874f93b907ef2dff1cc8dd44cda7340abaf19dcbbd709beb7649ac72f1e9f92da546e010f966cd9f5d51b867c6df8c49332bf9de67dac
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.14.2-memleak.patch b/xfce-base/xfdesktop/files/xfdesktop-4.14.2-memleak.patch
new file mode 100644
index 000000000000..e99167cb91af
--- /dev/null
+++ b/xfce-base/xfdesktop/files/xfdesktop-4.14.2-memleak.patch
@@ -0,0 +1,37 @@
+From bd6cd3ce62057370a9e7c6699e52385f479e3390 Mon Sep 17 00:00:00 2001
+From: Jan Ziak <0xe2.0x9a.0x9b@gmail.com>
+Date: Sat, 11 Apr 2020 15:43:55 +0200
+Subject: Fix memory leak when reconnecting DP monitor (Bug #16314)
+
+Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b@gmail.com>
+---
+ src/xfce-backdrop.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/xfce-backdrop.c b/src/xfce-backdrop.c
+index bd9180e6..955e51f8 100644
+--- a/src/xfce-backdrop.c
++++ b/src/xfce-backdrop.c
+@@ -1599,6 +1599,11 @@ xfce_backdrop_image_data_release(XfceBackdropImageData *image_data)
+ 
+     if(image_data->loader)
+         g_object_unref(image_data->loader);
++
++    if(image_data->backdrop) {
++        g_object_unref(image_data->backdrop);
++        image_data->backdrop = NULL;
++    }
+ }
+ 
+ /**
+@@ -1671,6 +1676,7 @@ xfce_backdrop_generate_async(XfceBackdrop *backdrop)
+     backdrop->priv->image_data = image_data;
+ 
+     image_data->backdrop = backdrop;
++    g_object_ref(backdrop);
+     image_data->loader = gdk_pixbuf_loader_new();
+     image_data->cancellable = g_cancellable_new();
+     image_data->image_buffer = g_new0(guchar, XFCE_BACKDROP_BUFFER_SIZE);
+-- 
+cgit v1.2.3
+
diff --git a/xfce-base/xfdesktop/xfdesktop-4.14.2-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.14.2-r1.ebuild
new file mode 100644
index 000000000000..36257356e8ca
--- /dev/null
+++ b/xfce-base/xfdesktop/xfdesktop-4.14.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Desktop 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-linux ~x86-linux ~x86-solaris"
+IUSE="debug libnotify +thunar"
+
+RDEPEND=">=x11-libs/cairo-1.12
+	>=dev-libs/glib-2.42
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libwnck-3.14:3
+	x11-libs/libX11
+	>=xfce-base/exo-0.11:=
+	>=xfce-base/garcon-0.6:=
+	>=xfce-base/libxfce4ui-4.13:=
+	>=xfce-base/libxfce4util-4.13:=
+	>=xfce-base/xfconf-4.12.1:=
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	thunar? ( >=xfce-base/thunar-1.7:= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-memleak.patch
+)
+
+src_configure() {
+	local myconf=(
+		$(use_enable thunar file-icons)
+		$(use_enable thunar thunarx)
+		$(use_enable libnotify notifications)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild b/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild
deleted file mode 100644
index 64d22d2e74d8..000000000000
--- a/xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Desktop 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-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify +thunar"
-
-RDEPEND=">=x11-libs/cairo-1.12
-	>=dev-libs/glib-2.42
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libwnck-3.14:3
-	x11-libs/libX11
-	>=xfce-base/exo-0.11:=
-	>=xfce-base/garcon-0.6:=
-	>=xfce-base/libxfce4ui-4.13:=
-	>=xfce-base/libxfce4util-4.13:=
-	>=xfce-base/xfconf-4.12.1:=
-	libnotify? ( >=x11-libs/libnotify-0.7:= )
-	thunar? ( >=xfce-base/thunar-1.7:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable thunar file-icons)
-		$(use_enable thunar thunarx)
-		$(use_enable libnotify notifications)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index 876f67bafa77..3d62d5d163f0 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -2,6 +2,6 @@ DIST xfwm4-4.14.2.tar.bz2 1158799 BLAKE2B 87270997688a44e1476935f2158842999befeb
 DIST xfwm4-4.14.5.tar.bz2 1165140 BLAKE2B 3f598b5cb8ce58a8aa4a4c82e53a5b02a870e26ddd0487796aeab86695c5dc6bc132daac32630dc109ec12dd10dab370a91c00dfbdf1109815cf5a9ae82fc88b SHA512 d2b5b198f3ffa91b0b07d5258f5f14f45e431fd7d992143bf9fc381f647ea0ee47ae447122ef8c7a40606c08955f83975fcff94b6f7ceb331a0a8681b57050fd
 DIST xfwm4-4.15.1.tar.bz2 1179671 BLAKE2B c358f8050dd6fcc356c2d300dab959dbfb5f452484e0998b25755aa6c6dd1783ca117ba43f44e18a9555542a1794000a768765a5b98e1e381367260df1d503ba SHA512 ae4cea9da4bc852aa3ce19039b66cc05f7c7cabe07637837bf1a51c37b6c9536a46b6af85e9402c33578e8da305b28bac23792afa080076e625a7df9f769935c
 EBUILD xfwm4-4.14.2.ebuild 1639 BLAKE2B 9ce4b689b7edbfc708a47fe45f3fa7aad4e5f65b148045edfd1ccc560d40a13e7f1294db936b93fd0759dda92a022662e0215ca4d319a63e088a693e857514c8 SHA512 81c8a383599a5f1c0ca0e39ff4e1e2bc3e785b0b5c553746cb268d4150d7070d42ff7836abdd6a575260c2517180e2594b61d8f5a343e54f19a9321d09bbd692
-EBUILD xfwm4-4.14.5.ebuild 1658 BLAKE2B 11be3def54db50e845e7f3ef73aae63042402a31ff78feb40103a1208cf113845739cbfc418f5cf4022307fdb52f7db79186c25c9b6c0004c2a72cee5d7fad19 SHA512 500567714d51d6fb68f78b13a1ed305060ccc1cc1a5a2c62dde6a7c2b2a66080d162cb4c4a8a3d1a54743bf272b1ed6aa317af35151f2dda383a76ccad170535
+EBUILD xfwm4-4.14.5.ebuild 1657 BLAKE2B 1ab8099643ce1df13fdceb9e9392a41cdd4702fe5988f3aed77ab1d458dac95c2fe1349eae47a931b978813f7d943a4e5862578aa7419feae72efe46ac2294ec SHA512 91ef2257a1f57051692291375bc0dbb280e27a886fb92d0d8bbdd5e916f47b7708c2dc0e852f7c4370550cba31b7cf20cccaabca50d1935ff05a23a04b2b2e24
 EBUILD xfwm4-4.15.1.ebuild 1662 BLAKE2B 454431488c93296760ea36e53c3e8a9135244b4146b861b354067e8dceb7debf0dc183dae67cd787dc2d563db88871ea45fc1317700e778cffc360426c01c9f8 SHA512 e6d3f2d2cad1273db7c2c129b67218603b22fdbdf8e331b7770ca60c3c4f62ee124d15143af15c304bdc33b384d24f206d9a0e7ef9e1f6c3694adb48538c9c48
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/xfwm4-4.14.5.ebuild b/xfce-base/xfwm4/xfwm4-4.14.5.ebuild
index f642f5ec43ab..58a16b960ecc 100644
--- a/xfce-base/xfwm4/xfwm4-4.14.5.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.14.5.ebuild
@@ -11,7 +11,7 @@ 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-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="opengl startup-notification +xcomposite +xpresent"
 
 RDEPEND=">=dev-libs/glib-2.20
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index fcc0198abdd9..681b9ef69823 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index 2401c2c238f7..a6021dfd6bb2 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -2,6 +2,6 @@ DIST tumbler-0.2.8.tar.bz2 591099 BLAKE2B 50cb9a0e8859e2f092356fd25a3ca68400b615
 DIST tumbler-0.2.9.tar.bz2 557794 BLAKE2B 564b0d91489ee617799749db13085301f8b7195736ee01cd44d1e4bee7130a34235deaaac973f9be902b63eab46c69a5a277872204f53067d15645556f00dd42 SHA512 df9cf9b2ba77e220f11c5ca3ec4601c973802b802e989dcd24d1b2c7c13e97c185071488c866f3ed5ed1cc6defde1a4879b5fc2c48bfc015456508e526d6bf0f
 DIST tumbler-0.3.0.tar.bz2 559424 BLAKE2B e9f9674a5fb3d9acba6435e9a5d1eada27269c24c395211a71dc3c3d751aa20f82ee154b5ebb36c2aecf34710e975b9167277e25cf8b210e8d4014e429a0d944 SHA512 e216a9c8c659457c6e6dbb40d95cd9a34d64d204fea9523d0a66f1c331108f6e01fb83d668b99eed73ed26579ae3a717cd3215ddceaebfff888d942ecb18469b
 EBUILD tumbler-0.2.8.ebuild 1519 BLAKE2B a81a65908ada232820909bcb584c7cea3bf3beaa19dac3c30cea459474f72605416949e9c81ea8b7edc86a1eb75f17ea8d48f9d95a8159d7aeb8c2cf59ab7000 SHA512 f22ac81f25795bd3e4ed679673b0544d6c814a5a60a2a8d5ac117e12a471b534aaf09bddf590c2d45dda9fec617f818bee34c136d5c2a889d101468fcd175658
-EBUILD tumbler-0.2.9.ebuild 1520 BLAKE2B 23823d5f8d2caf36a35966617365cd97fd3ec3ee28e97c0208ebace09ab29dc40e91159806cd781a02c8d93f58d31c1a88a7258e397161037f7c735768624540 SHA512 b3b9b4dfa1b9f4eec38870bb773b8a128422e556b7a0345b7e25d9b763165a5ff9386851c049cf07cbd5900c1c1fff1f52efe3d00a32d7e2a75dfffa817603f4
+EBUILD tumbler-0.2.9.ebuild 1519 BLAKE2B a81a65908ada232820909bcb584c7cea3bf3beaa19dac3c30cea459474f72605416949e9c81ea8b7edc86a1eb75f17ea8d48f9d95a8159d7aeb8c2cf59ab7000 SHA512 f22ac81f25795bd3e4ed679673b0544d6c814a5a60a2a8d5ac117e12a471b534aaf09bddf590c2d45dda9fec617f818bee34c136d5c2a889d101468fcd175658
 EBUILD tumbler-0.3.0.ebuild 1524 BLAKE2B 22d72c4e19041a9988d598affe7fff7a1da31ecfe2a0d84ef4db66f2a39cbed8c8745a6969c6d122d0fbcb9b3592f9268ec2c6b633751eeb713eeaf52e6f8681 SHA512 362c657c97c298adf6d7937be96634fa96f38f7eeb12123e03afcca858a378a31adc18b7248fcd06c2f76515e3118275c2fc1d0d9488bf36c9a6d0e6f10ab71a
 MISC metadata.xml 368 BLAKE2B c50d2774a8ecb50f7eaf2436c89508d6b7b06d22b02be9e33329a152032ba500bc54e132280b3fef166ad824be432a75514a859c2da208bf2a19b69288809b79 SHA512 5adf546b54a71ff52292602144a8d459db2984115a88c893725d2101d2ef851ac855cee078dbf492f6a3b0c01980596acb1c2afca09fd68cbd2b1940ea06bbd3
diff --git a/xfce-extra/tumbler/tumbler-0.2.9.ebuild b/xfce-extra/tumbler/tumbler-0.2.9.ebuild
index c4d8f69ebad2..9421282d86ae 100644
--- a/xfce-extra/tumbler/tumbler-0.2.9.ebuild
+++ b/xfce-extra/tumbler/tumbler-0.2.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl ffmpeg gstreamer jpeg odf pdf raw"
 
 COMMON_DEPEND=">=dev-libs/glib-2.42:2